This commit was manufactured by cvs2svn to create branch 'ACE-4_4'.ACE-4_4

1009 files changed, 0 insertions, 256664 deletions

diff --git a/TAO/Benchmark/Marshal_Test/Orbix/Makefile b/TAO/Benchmark/Marshal_Test/Orbix/Makefile
deleted file mode 100644
index df6cd4a0673..00000000000
--- a/TAO/Benchmark/Marshal_Test/Orbix/Makefile
+++ /dev/null
@@ -1,75 +0,0 @@
-#----------------------------------------------------------------------------
-#	$Id$
-#
-#	Top-level Makefile for the Orbix Marshal Benchmark
-#----------------------------------------------------------------------------
-
-#----------------------------------------------------------------------------
-#	Local macros
-#----------------------------------------------------------------------------
-
-LDLIBS     	= -lACE -lbenchmark 
-
-PROG_SRCS 	= marshalC.cpp marshalS.cpp orbix_marshal_client.cpp orbix_marshal_server.cpp \
-		  orbix_marshal_impl.cpp client.cpp server.cpp
-
-LSRC = $(PROG_SRCS)
-
-MARSHAL_CLIENT_OBJS = marshalC.o orbix_marshal_client.o client.o
-
-ifdef dsi
-MARSHAL_SERVER_OBJS = orbix_marshal_impl.o orbix_marshal_server.o server.o
-else
-MARSHAL_SERVER_OBJS = marshalS.o orbix_marshal_impl.o orbix_marshal_server.o server.o
-endif
-BIN = client server
-
-BUILD = $(BIN)
-
-#CLIENT_LIBS	= -lITini -liiop -lorbix
-#SERVER_LIBS	= -lITini -liiop -lDSI -lorbix -lIRclt
-CLIENT_LIBS	= -liiop -lorbix
-SERVER_LIBS	= -liiop -lDSI -lorbix -lIRclt
-
-VLDLIBS = $(LDLIBS:%=%$(VAR))
-
-#----------------------------------------------------------------------------
-#	Include macros and targets
-#----------------------------------------------------------------------------
-
-include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-include $(ACE_ROOT)/include/makeinclude/macros.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.lib.GNU
-#include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
-# include Orbix specific file
-include /project/mambo/gokhale/CONFIG/orbixsol2s4.mk
-
-#----------------------------------------------------------------------------
-# Local modifications to variables imported by includes above.
-#----------------------------------------------------------------------------
-
-ifndef TAO_ROOT
-TAO_ROOT = $(ACE_ROOT)/TAO
-endif
-
-CPPFLAGS += -I$(TAO_ROOT)/Benchmark
-
-server:	$(addprefix $(VDIR),$(MARSHAL_SERVER_OBJS))
-	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(SERVER_LIBS)
-
-client:	$(addprefix $(VDIR),$(MARSHAL_CLIENT_OBJS))
-	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(CLIENT_LIBS)
-
-marshal.h marshalC.cpp marshalS.cpp: marshal.idl
-	$(IDL) $(IDLFLAGS) $< 
-
-clean:
-	rm -f core *.o *~ client server *C.cpp *S.cpp *S.h *C.h
-	$(MAKE) realclean
-
-
-
-
diff --git a/TAO/Benchmark/Marshal_Test/Orbix/client.cpp b/TAO/Benchmark/Marshal_Test/Orbix/client.cpp
deleted file mode 100644
index 690221a2b4e..00000000000
--- a/TAO/Benchmark/Marshal_Test/Orbix/client.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-#include "benchmark/driver.h"
-#include "orbix_marshal_client.h"
-
-int main (int argc, char *argv [])
-{
-  // instantiate a DRIVER with the Orbix_Client_Proxy as the template
-  CORBA_Benchmark_Driver<Orbix_Marshal_Client_Proxy>  driver (new
-							     Orbix_Marshal_Client_Proxy ());
-
-  // let the driver do everything for us so that we remain very simple
-  return driver.run (argc, argv);
-}
diff --git a/TAO/Benchmark/Marshal_Test/Orbix/marshal.h b/TAO/Benchmark/Marshal_Test/Orbix/marshal.h
deleted file mode 100644
index 77c4651cfc3..00000000000
--- a/TAO/Benchmark/Marshal_Test/Orbix/marshal.h
+++ /dev/null
@@ -1,1325 +0,0 @@
-
-#ifndef marshal_h
-#define marshal_h
-
-#include <CORBA.h>
-
-#include <string.h>
-
-
-#ifndef _IDL_SEQUENCE_any_defined
-#define _IDL_SEQUENCE_any_defined
-
-class _IDL_SEQUENCE_any {
-    CORBA::ULong _maximum;
-    CORBA::ULong _length;
-    CORBA::any* _buffer;
-    unsigned char _release;
-
-    public:
-    _IDL_SEQUENCE_any& operator= (const _IDL_SEQUENCE_any&);
-    _IDL_SEQUENCE_any (const _IDL_SEQUENCE_any&);
-
-    _IDL_SEQUENCE_any (CORBA::ULong max);
-    _IDL_SEQUENCE_any (CORBA::ULong max, CORBA::ULong length, CORBA::any* data, CORBA::Boolean release = 0);
-    _IDL_SEQUENCE_any ();
-
-    ~_IDL_SEQUENCE_any ();
-
-    static CORBA::any* allocbuf(CORBA::ULong nelems);
-    static void freebuf(CORBA::any* data);
-
-    CORBA::ULong maximum() const;
-    CORBA::ULong length() const;
-    void length (CORBA::ULong len);
-
-    CORBA::any& operator [] (CORBA::ULong IT_i);
-
-    const CORBA::any& operator [] (CORBA::ULong IT_i) const;
-
-    void encodeOp (CORBA::Request &IT_r) const;
-    void decodeOp (CORBA::Request &IT_r);
-    void decodeInOutOp (CORBA::Request &IT_r);
-};
-
-extern const CORBA::TypeCode_ptr _tc__IDL_SEQUENCE_any;
-
-#ifndef _IDL_SEQUENCE_anyVarH
-#define _IDL_SEQUENCE_anyVarH
-
-#ifndef _IDL_SEQUENCE_anyvPtr
-#define _IDL_SEQUENCE_anyvPtr
-typedef _IDL_SEQUENCE_any* _IDL_SEQUENCE_any_vPtr;
-typedef const _IDL_SEQUENCE_any* _IDL_SEQUENCE_any_cvPtr;
-#endif
-
-class _IDL_SEQUENCE_any_var : public CORBA::_var
-{
-    private:
-
-    unsigned char copyHelper (const _IDL_SEQUENCE_any_var &IT_s) {
-        if (!IT_s._ptr) {
-            _ptr = IT_s._ptr;
-        } else
-        {
-            _ptr = new _IDL_SEQUENCE_any;
-            *(_ptr) =  *(IT_s._ptr);
-        }
-        return 1;
-    }
-
-    public:
-
-    _IDL_SEQUENCE_any_var (const _IDL_SEQUENCE_any_var &IT_s) {
-        (void) copyHelper (IT_s);
-    }
-
-    _IDL_SEQUENCE_any_var () {
-        _ptr = NULL;
-    }
-
-    _IDL_SEQUENCE_any_var (_IDL_SEQUENCE_any *IT_p) {
-        _ptr = IT_p;
-    }
-
-    _IDL_SEQUENCE_any_var &operator= (_IDL_SEQUENCE_any *IT_p) {
-        if (_ptr != IT_p) {
-            delete _ptr;
-        }
-        _ptr = IT_p;
-        return (*this);
-    }
-
-    _IDL_SEQUENCE_any_var &operator= (const _IDL_SEQUENCE_any_var &IT_s) {
-        if (_ptr != IT_s._ptr) {
-            delete _ptr;
-        }
-        _ptr = new _IDL_SEQUENCE_any;
-        *(_ptr) =  *(IT_s._ptr);
-        return (*this);
-    }
-
-    ~_IDL_SEQUENCE_any_var () {
-        delete _ptr;
-    }
-
-    _IDL_SEQUENCE_any* operator-> () {
-        return _ptr;
-    }
-
-    operator _IDL_SEQUENCE_any_cvPtr () const { return _ptr;}
-    operator _IDL_SEQUENCE_any_vPtr& () { return _ptr;}
-    operator _IDL_SEQUENCE_any& () const { return * _ptr;}
-
-    const CORBA::any& operator[] (CORBA::ULong index) const;
-
-    CORBA::any& operator[] (CORBA::ULong index);
-
-    protected:
-    _IDL_SEQUENCE_any *_ptr;
-    private:
-    _IDL_SEQUENCE_any_var &operator= (const CORBA::_var &IT_s);
-    _IDL_SEQUENCE_any_var (const CORBA::_var &IT_s);
-};
-
-#endif
-
-
-#endif
-
-
-#ifndef _Marshal_defined
-#define _Marshal_defined
-class Marshal_dispatch : public virtual CORBA::PPTR {
-public:
-
-      Marshal_dispatch (void *IT_p, CORBA::Object* IT_o, const char *IT_m, 
-        CORBA::LoaderClass *IT_l, char *IT_i, void* IT_im)
-       : PPTR (IT_p,IT_o,IT_m,IT_l,IT_i,IT_im) {}
-
-
-   Marshal_dispatch (char *IT_OR, void *IT_p, CORBA::Object *IT_o)
-       : PPTR (IT_OR,IT_p,IT_o) {}
-
-
-   Marshal_dispatch () {}
-
-   Marshal_dispatch (ObjectReference *IT_OR, void *IT_p, CORBA::Object *IT_o)
-       : PPTR (IT_OR,IT_p,IT_o) {}
-
-
-   Marshal_dispatch (void *IT_p, CORBA::Object *IT_o, const char *IT_m, 
-        char *IT_i, CORBA::Object* IT_ob, void* IT_im)
-       : PPTR (IT_p,IT_o,IT_m,IT_i,IT_ob,IT_im) {}
-
-
-   virtual unsigned char dispatch (CORBA::Request &IT_r, 
-        unsigned char IT_isTarget, void* IT_pp=NULL);
-
-
-};
-
-class Marshal;
-
-#ifndef MarshalPtr
-#define MarshalPtr
-
-typedef Marshal* Marshal_ptr;
-
-typedef Marshal* MarshalRef;
-
-#endif
-
-
-#ifndef MarshalForwH
-#define MarshalForwH
-CORBA::ObjectRef Marshal_getBase (void *);
-void Marshal_release (Marshal *, CORBA::Environment &IT_env);
-void Marshal_release (Marshal_ptr);
-Marshal* Marshal_duplicate (Marshal_ptr, CORBA::Environment &IT_env);
-Marshal* Marshal_duplicate (Marshal_ptr );
-Marshal_ptr Marshal_nil (CORBA::Environment &IT_env);
-Marshal_ptr Marshal_nil ();
-#endif
-#define Marshal_IMPL "Marshal"
-
-
-class Marshal;
-
-typedef Marshal MarshalProxy;
-#define Marshal_IR "Marshal"
-#define Marshal_IMPL "Marshal"
-
-#ifndef MarshalPtr
-#define MarshalPtr
-
-typedef Marshal* Marshal_ptr;
-
-typedef Marshal* MarshalRef;
-
-#endif
-
-class Marshal: public virtual CORBA::Object  {
-public:
-        Marshal (char *IT_OR);
-    Marshal (ObjectReference *IT_OR);
-    Marshal () : CORBA::Object  (1) {}
-protected:
-    Marshal_ptr __duplicate(
-            CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) {
-       CORBA::Object::__duplicate (IT_env);
-       return this;
-    }
-public:
-    static Marshal_ptr _duplicate(
-            Marshal_ptr, 
-            CORBA::Environment &IT_pEnv=CORBA::IT_chooseDefaultEnv ());
-public:
-   static Marshal* _bind (const char* IT_markerServer, const char* host,
-		const CORBA::Context &IT_c, 
-		CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-   static Marshal* _bind (CORBA::Environment &IT_env);
-   static Marshal* _bind (const char* IT_markerServer=NULL, const char* host=NULL,
-                 CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-    static Marshal* _narrow (CORBA::Object* , CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-private:
-    static const void* IT_impl;
-public:
-    static Marshal_ptr _nil (CORBA::Environment &IT_pEnv=CORBA::IT_chooseDefaultEnv ()) {
-        CORBA::EnvExcRaiser IT_raise;
-        CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-        return (Marshal_ptr) CORBA::OBJECT_NIL;}
-
-#ifndef Marshal_Marshal_Struct_defined
-#define Marshal_Marshal_Struct_defined
-
-struct Marshal_Struct {
-    CORBA::Short s;
-    CORBA::Long l;
-    CORBA::Char c;
-    CORBA::Octet o;
-    CORBA::Double d;
-
-    void encodeOp (CORBA::Request &IT_r) const;
-    void decodeOp (CORBA::Request &IT_r);
-    void decodeInOutOp (CORBA::Request &IT_r);
-    static void* IT_anySupport (CORBA::Request &IT_r,
-    			void *&, void*, const CORBA::Flags&);
-    static const void *IT_fn;
-    Marshal_Struct(const Marshal_Struct &);
-    Marshal_Struct();
-    ~Marshal_Struct();
-    Marshal_Struct& operator= (const Marshal_Struct&);
-};
-
-static const CORBA::TypeCode_ptr _tc_Marshal_Struct;
-
-#ifndef Marshal_Marshal_StructVarH
-#define Marshal_Marshal_StructVarH
-
-#ifndef Marshal_Marshal_StructvPtr
-#define Marshal_Marshal_StructvPtr
-typedef Marshal_Struct* Marshal_Struct_vPtr;
-typedef const Marshal_Struct* Marshal_Struct_cvPtr;
-#endif
-
-class Marshal_Struct_var : public CORBA::_var
-{
-    private:
-
-    unsigned char copyHelper (const Marshal_Struct_var &IT_s) {
-        if (!IT_s._ptr) {
-            _ptr = IT_s._ptr;
-        } else
-        {
-            _ptr = new Marshal_Struct;
-            *(_ptr) =  *(IT_s._ptr);
-        }
-        return 1;
-    }
-
-    public:
-
-    Marshal_Struct_var (const Marshal_Struct_var &IT_s) {
-        (void) copyHelper (IT_s);
-    }
-
-    Marshal_Struct_var () {
-        _ptr =  new Marshal_Struct;
-;
-    }
-
-    Marshal_Struct_var (Marshal_Struct *IT_p) {
-        _ptr = IT_p;
-    }
-
-    Marshal_Struct_var &operator= (Marshal_Struct *IT_p) {
-        if (_ptr != IT_p) {
-            delete _ptr;
-        }
-        _ptr = IT_p;
-        return (*this);
-    }
-
-    Marshal_Struct_var &operator= (const Marshal_Struct_var &IT_s) {
-        if (_ptr != IT_s._ptr) {
-            delete _ptr;
-        }
-        _ptr = new Marshal_Struct;
-        *(_ptr) =  *(IT_s._ptr);
-        return (*this);
-    }
-
-    ~Marshal_Struct_var () {
-        delete _ptr;
-    }
-
-    Marshal_Struct* operator-> () {
-        return _ptr;
-    }
-
-    operator Marshal_Struct_cvPtr () const { return _ptr;}
-    operator Marshal_Struct_vPtr& () { return _ptr;}
-    operator Marshal_Struct& () const { return * _ptr;}
-
-    protected:
-    Marshal_Struct *_ptr;
-    private:
-    Marshal_Struct_var &operator= (const CORBA::_var &IT_s);
-    Marshal_Struct_var (const CORBA::_var &IT_s);
-};
-
-#endif
-
-
-#endif
-
-static const CORBA::TypeCode_ptr _tc_discrim;
-
-enum discrim {e_0th,e_1st,e_2nd,e_3rd,e_4th,e_5th,e_6th, IT__ENUM_Marshal_discrim=CORBA_ULONG_MAX};
-
-#ifndef Marshal_Marshal_Union_defined
-#define Marshal_Marshal_Union_defined
-
-struct Marshal_Union {
-    private:
-
-    discrim __d;
-    union {
-        CORBA::Short _s_;
-        CORBA::Long _l_;
-        CORBA::Char _c_;
-        CORBA::Octet _o_;
-        CORBA::Double _d_;
-        Marshal_Struct * _ms_;
-    };
-
-    public:
-
-    void encodeOp (CORBA::Request &IT_r) const;
-    void decodeOp (CORBA::Request &IT_r);
-    void decodeInOutOp (CORBA::Request &IT_r);
-    static void* IT_anySupport (CORBA::Request &IT_r,
-    			void *&, void*, const CORBA::Flags&);
-    static const void *IT_fn;
-
-    private:
-
-    unsigned char isSet;
-
-    public:
-
-    discrim _d () const { return __d; }
-
-    CORBA::Short s () const {
-        return _s_;
-    }
-
-    void s (CORBA::Short IT_member) {
-        if (isSet && (__d != Marshal::e_0th))
-        {
-            this-> Marshal_Union::~Marshal_Union();
-            memset(this, 0, sizeof(*this));
-        }
-
-        __d = Marshal::e_0th;
-        isSet = 1;
-        _s_ = IT_member;
-    }
-
-    CORBA::Long l () const {
-        return _l_;
-    }
-
-    void l (CORBA::Long IT_member) {
-        if (isSet && (__d != Marshal::e_1st))
-        {
-            this-> Marshal_Union::~Marshal_Union();
-            memset(this, 0, sizeof(*this));
-        }
-
-        __d = Marshal::e_1st;
-        isSet = 1;
-        _l_ = IT_member;
-    }
-
-    CORBA::Char c () const {
-        return _c_;
-    }
-
-    void c (CORBA::Char IT_member) {
-        if (isSet && (__d != Marshal::e_2nd))
-        {
-            this-> Marshal_Union::~Marshal_Union();
-            memset(this, 0, sizeof(*this));
-        }
-
-        __d = Marshal::e_2nd;
-        isSet = 1;
-        _c_ = IT_member;
-    }
-
-    CORBA::Octet o () const {
-        return _o_;
-    }
-
-    void o (CORBA::Octet IT_member) {
-        if (isSet && (__d != Marshal::e_3rd))
-        {
-            this-> Marshal_Union::~Marshal_Union();
-            memset(this, 0, sizeof(*this));
-        }
-
-        __d = Marshal::e_3rd;
-        isSet = 1;
-        _o_ = IT_member;
-    }
-
-    CORBA::Double d () const {
-        return _d_;
-    }
-
-    void d (CORBA::Double IT_member) {
-        if (isSet && (__d != Marshal::e_4th))
-        {
-            this-> Marshal_Union::~Marshal_Union();
-            memset(this, 0, sizeof(*this));
-        }
-
-        __d = Marshal::e_4th;
-        isSet = 1;
-        _d_ = IT_member;
-    }
-
-    Marshal_Struct& ms () {
-        return (*_ms_);
-    }
-
-    const Marshal_Struct& ms () const {
-        return (*_ms_);
-    }
-
-    void ms (const Marshal_Struct& IT_member) {
-        if (isSet && (__d != Marshal::e_6th))
-        {
-            this-> Marshal_Union::~Marshal_Union();
-            memset(this, 0, sizeof(*this));
-        }
-
-        __d = Marshal::e_6th;
-
-        if (!isSet) {
-            _ms_ = new Marshal_Struct;
-            isSet = 1;
-        }
-        *(_ms_) = IT_member;
-    }
-
-
-    Marshal_Union();
-    Marshal_Union(const Marshal_Union &);
-    ~Marshal_Union();
-    Marshal_Union& operator= (const Marshal_Union&);
-};
-
-static const CORBA::TypeCode_ptr _tc_Marshal_Union;
-
-#ifndef Marshal_Marshal_UnionVarH
-#define Marshal_Marshal_UnionVarH
-
-#ifndef Marshal_Marshal_UnionvPtr
-#define Marshal_Marshal_UnionvPtr
-typedef Marshal_Union* Marshal_Union_vPtr;
-typedef const Marshal_Union* Marshal_Union_cvPtr;
-#endif
-
-class Marshal_Union_var : public CORBA::_var
-{
-    private:
-
-    unsigned char copyHelper (const Marshal_Union_var &IT_s) {
-        if (!IT_s._ptr) {
-            _ptr = IT_s._ptr;
-        } else
-        {
-            _ptr = new Marshal_Union;
-            *(_ptr) =  *(IT_s._ptr);
-        }
-        return 1;
-    }
-
-    public:
-
-    Marshal_Union_var (const Marshal_Union_var &IT_s) {
-        (void) copyHelper (IT_s);
-    }
-
-    Marshal_Union_var () {
-        _ptr = NULL;
-    }
-
-    Marshal_Union_var (Marshal_Union *IT_p) {
-        _ptr = IT_p;
-    }
-
-    Marshal_Union_var &operator= (Marshal_Union *IT_p) {
-        if (_ptr != IT_p) {
-            delete _ptr;
-        }
-        _ptr = IT_p;
-        return (*this);
-    }
-
-    Marshal_Union_var &operator= (const Marshal_Union_var &IT_s) {
-        if (_ptr != IT_s._ptr) {
-            delete _ptr;
-        }
-        _ptr = new Marshal_Union;
-        *(_ptr) =  *(IT_s._ptr);
-        return (*this);
-    }
-
-    ~Marshal_Union_var () {
-        delete _ptr;
-    }
-
-    Marshal_Union* operator-> () {
-        return _ptr;
-    }
-
-    operator Marshal_Union_cvPtr () const { return _ptr;}
-    operator Marshal_Union_vPtr& () { return _ptr;}
-    operator Marshal_Union& () const { return * _ptr;}
-
-    protected:
-    Marshal_Union *_ptr;
-    private:
-    Marshal_Union_var &operator= (const CORBA::_var &IT_s);
-    Marshal_Union_var (const CORBA::_var &IT_s);
-};
-
-#endif
-
-
-#endif
-static const CORBA::TypeCode_ptr _tc_AnySeq;
-
-typedef _IDL_SEQUENCE_any AnySeq;
-typedef const _IDL_SEQUENCE_any AnySeq_IT_const;
-
-typedef _IDL_SEQUENCE_any_var AnySeq_var;
-
-
-#ifndef Marshal__IDL_SEQUENCE_Marshal_Marshal_Recursive_defined
-#define Marshal__IDL_SEQUENCE_Marshal_Marshal_Recursive_defined
-
-struct Marshal_Recursive;
-class _IDL_SEQUENCE_Marshal_Marshal_Recursive {
-    CORBA::ULong _maximum;
-    CORBA::ULong _length;
-    Marshal_Recursive* _buffer;
-    unsigned char _release;
-
-    public:
-    _IDL_SEQUENCE_Marshal_Marshal_Recursive& operator= (const _IDL_SEQUENCE_Marshal_Marshal_Recursive&);
-    _IDL_SEQUENCE_Marshal_Marshal_Recursive (const _IDL_SEQUENCE_Marshal_Marshal_Recursive&);
-
-    _IDL_SEQUENCE_Marshal_Marshal_Recursive (CORBA::ULong max);
-    _IDL_SEQUENCE_Marshal_Marshal_Recursive (CORBA::ULong max, CORBA::ULong length, Marshal_Recursive* data, CORBA::Boolean release = 0);
-    _IDL_SEQUENCE_Marshal_Marshal_Recursive ();
-
-    ~_IDL_SEQUENCE_Marshal_Marshal_Recursive ();
-
-    static Marshal_Recursive* allocbuf(CORBA::ULong nelems);
-    static void freebuf(Marshal_Recursive* data);
-
-    CORBA::ULong maximum() const;
-    CORBA::ULong length() const;
-    void length (CORBA::ULong len);
-
-    Marshal_Recursive& operator [] (CORBA::ULong IT_i);
-
-    const Marshal_Recursive& operator [] (CORBA::ULong IT_i) const;
-
-    void encodeOp (CORBA::Request &IT_r) const;
-    void decodeOp (CORBA::Request &IT_r);
-    void decodeInOutOp (CORBA::Request &IT_r);
-};
-
-static const CORBA::TypeCode_ptr _tc__IDL_SEQUENCE_Marshal_Marshal_Recursive;
-
-#ifndef Marshal__IDL_SEQUENCE_Marshal_Marshal_RecursiveVarH
-#define Marshal__IDL_SEQUENCE_Marshal_Marshal_RecursiveVarH
-
-#ifndef Marshal__IDL_SEQUENCE_Marshal_Marshal_RecursivevPtr
-#define Marshal__IDL_SEQUENCE_Marshal_Marshal_RecursivevPtr
-typedef _IDL_SEQUENCE_Marshal_Marshal_Recursive* _IDL_SEQUENCE_Marshal_Marshal_Recursive_vPtr;
-typedef const _IDL_SEQUENCE_Marshal_Marshal_Recursive* _IDL_SEQUENCE_Marshal_Marshal_Recursive_cvPtr;
-#endif
-
-class _IDL_SEQUENCE_Marshal_Marshal_Recursive_var : public CORBA::_var
-{
-    private:
-
-    unsigned char copyHelper (const _IDL_SEQUENCE_Marshal_Marshal_Recursive_var &IT_s) {
-        if (!IT_s._ptr) {
-            _ptr = IT_s._ptr;
-        } else
-        {
-            _ptr = new _IDL_SEQUENCE_Marshal_Marshal_Recursive;
-            *(_ptr) =  *(IT_s._ptr);
-        }
-        return 1;
-    }
-
-    public:
-
-    _IDL_SEQUENCE_Marshal_Marshal_Recursive_var (const _IDL_SEQUENCE_Marshal_Marshal_Recursive_var &IT_s) {
-        (void) copyHelper (IT_s);
-    }
-
-    _IDL_SEQUENCE_Marshal_Marshal_Recursive_var () {
-        _ptr = NULL;
-    }
-
-    _IDL_SEQUENCE_Marshal_Marshal_Recursive_var (_IDL_SEQUENCE_Marshal_Marshal_Recursive *IT_p) {
-        _ptr = IT_p;
-    }
-
-    _IDL_SEQUENCE_Marshal_Marshal_Recursive_var &operator= (_IDL_SEQUENCE_Marshal_Marshal_Recursive *IT_p) {
-        if (_ptr != IT_p) {
-            delete _ptr;
-        }
-        _ptr = IT_p;
-        return (*this);
-    }
-
-    _IDL_SEQUENCE_Marshal_Marshal_Recursive_var &operator= (const _IDL_SEQUENCE_Marshal_Marshal_Recursive_var &IT_s) {
-        if (_ptr != IT_s._ptr) {
-            delete _ptr;
-        }
-        _ptr = new _IDL_SEQUENCE_Marshal_Marshal_Recursive;
-        *(_ptr) =  *(IT_s._ptr);
-        return (*this);
-    }
-
-    ~_IDL_SEQUENCE_Marshal_Marshal_Recursive_var () {
-        delete _ptr;
-    }
-
-    _IDL_SEQUENCE_Marshal_Marshal_Recursive* operator-> () {
-        return _ptr;
-    }
-
-    operator _IDL_SEQUENCE_Marshal_Marshal_Recursive_cvPtr () const { return _ptr;}
-    operator _IDL_SEQUENCE_Marshal_Marshal_Recursive_vPtr& () { return _ptr;}
-    operator _IDL_SEQUENCE_Marshal_Marshal_Recursive& () const { return * _ptr;}
-
-    const Marshal_Recursive& operator[] (CORBA::ULong index) const;
-
-    Marshal_Recursive& operator[] (CORBA::ULong index);
-
-    protected:
-    _IDL_SEQUENCE_Marshal_Marshal_Recursive *_ptr;
-    private:
-    _IDL_SEQUENCE_Marshal_Marshal_Recursive_var &operator= (const CORBA::_var &IT_s);
-    _IDL_SEQUENCE_Marshal_Marshal_Recursive_var (const CORBA::_var &IT_s);
-};
-
-#endif
-
-
-#endif
-
-
-#ifndef Marshal_Marshal_Recursive_defined
-#define Marshal_Marshal_Recursive_defined
-
-struct Marshal_Recursive {
-    CORBA::any value;
-    _IDL_SEQUENCE_Marshal_Marshal_Recursive next;
-
-    void encodeOp (CORBA::Request &IT_r) const;
-    void decodeOp (CORBA::Request &IT_r);
-    void decodeInOutOp (CORBA::Request &IT_r);
-    static void* IT_anySupport (CORBA::Request &IT_r,
-    			void *&, void*, const CORBA::Flags&);
-    static const void *IT_fn;
-    Marshal_Recursive(const Marshal_Recursive &);
-    Marshal_Recursive();
-    ~Marshal_Recursive();
-    Marshal_Recursive& operator= (const Marshal_Recursive&);
-};
-
-static const CORBA::TypeCode_ptr _tc_Marshal_Recursive;
-
-#ifndef Marshal_Marshal_RecursiveVarH
-#define Marshal_Marshal_RecursiveVarH
-
-#ifndef Marshal_Marshal_RecursivevPtr
-#define Marshal_Marshal_RecursivevPtr
-typedef Marshal_Recursive* Marshal_Recursive_vPtr;
-typedef const Marshal_Recursive* Marshal_Recursive_cvPtr;
-#endif
-
-class Marshal_Recursive_var : public CORBA::_var
-{
-    private:
-
-    unsigned char copyHelper (const Marshal_Recursive_var &IT_s) {
-        if (!IT_s._ptr) {
-            _ptr = IT_s._ptr;
-        } else
-        {
-            _ptr = new Marshal_Recursive;
-            *(_ptr) =  *(IT_s._ptr);
-        }
-        return 1;
-    }
-
-    public:
-
-    Marshal_Recursive_var (const Marshal_Recursive_var &IT_s) {
-        (void) copyHelper (IT_s);
-    }
-
-    Marshal_Recursive_var () {
-        _ptr = NULL;
-    }
-
-    Marshal_Recursive_var (Marshal_Recursive *IT_p) {
-        _ptr = IT_p;
-    }
-
-    Marshal_Recursive_var &operator= (Marshal_Recursive *IT_p) {
-        if (_ptr != IT_p) {
-            delete _ptr;
-        }
-        _ptr = IT_p;
-        return (*this);
-    }
-
-    Marshal_Recursive_var &operator= (const Marshal_Recursive_var &IT_s) {
-        if (_ptr != IT_s._ptr) {
-            delete _ptr;
-        }
-        _ptr = new Marshal_Recursive;
-        *(_ptr) =  *(IT_s._ptr);
-        return (*this);
-    }
-
-    ~Marshal_Recursive_var () {
-        delete _ptr;
-    }
-
-    Marshal_Recursive* operator-> () {
-        return _ptr;
-    }
-
-    operator Marshal_Recursive_cvPtr () const { return _ptr;}
-    operator Marshal_Recursive_vPtr& () { return _ptr;}
-    operator Marshal_Recursive& () const { return * _ptr;}
-
-    protected:
-    Marshal_Recursive *_ptr;
-    private:
-    Marshal_Recursive_var &operator= (const CORBA::_var &IT_s);
-    Marshal_Recursive_var (const CORBA::_var &IT_s);
-};
-
-#endif
-
-
-#endif
-
-        virtual void test_short (CORBA::Short s1, CORBA::Short& s2, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual void test_long (CORBA::Long l1, CORBA::Long& l2, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual void test_octet (CORBA::Octet o1, CORBA::Octet& o2, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual void test_char (CORBA::Char c1, CORBA::Char& c2, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual void test_double (CORBA::Double d1, CORBA::Double& d2, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual void test_struct (const Marshal_Struct& ms1, Marshal_Struct& ms2, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual void test_union (const Marshal_Union& u1, Marshal_Union& u2, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual void test_any (const CORBA::any& a1, CORBA::any*& a2, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual void test_sequence (const AnySeq& as1, AnySeq*& as2, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual void test_recursive (const Marshal_Recursive& mr1, Marshal_Recursive*& mr2, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-};
-
-extern const CORBA::TypeCode_ptr _tc_MarshalRef;
-
-#ifndef MarshalVarH
-#define MarshalVarH
-
-#ifndef MarshalvPtr
-#define MarshalvPtr
-typedef Marshal* Marshal_vPtr;
-typedef const Marshal* Marshal_cvPtr;
-#endif
-
-class Marshal_var : public CORBA::_var
-{
-    private:
-
-    unsigned char copyHelper (const Marshal_var &IT_s) {
-        {
-            _ptr = Marshal_duplicate (IT_s._ptr);
-        }
-        return 1;
-    }
-
-    public:
-
-    Marshal_var (const Marshal_var &IT_s) {
-        (void) copyHelper (IT_s);
-    }
-
-    Marshal_var () {
-        _ptr = Marshal_nil ();
-    }
-
-    Marshal_var (Marshal *IT_p) {
-        _ptr = IT_p;
-    }
-
-    Marshal_var &operator= (Marshal *IT_p) {
-        Marshal_release (_ptr);
-        _ptr = IT_p;
-        return (*this);
-    }
-
-    Marshal_var &operator= (const Marshal_var &IT_s) {
-        Marshal_release (_ptr);
-        _ptr = Marshal_duplicate (IT_s._ptr);
-        return (*this);
-    }
-
-    ~Marshal_var () {
-        Marshal_release (_ptr);
-    }
-
-    Marshal* operator-> () {
-        return _ptr;
-    }
-
-    operator Marshal_cvPtr () const { return _ptr;}
-    operator Marshal_vPtr& () { return _ptr;}
-
-    protected:
-    Marshal *_ptr;
-    private:
-    Marshal_var &operator= (const CORBA::_var &IT_s);
-    Marshal_var (const CORBA::_var &IT_s);
-    Marshal_var &operator= (const CORBA::_mgr &IT_s);
-    Marshal_var &operator= (const CORBA::_SeqElem &IT_s);
-    Marshal_var (const CORBA::_mgr &IT_s);
-    Marshal_var (const CORBA::_SeqElem &IT_s);
-};
-
-#endif
-
-
-#ifndef MarshalMgrH
-#define MarshalMgrH
-
-class Marshal_mgr : public CORBA::_mgr
-{
-    public:
-
-    Marshal_mgr () {
-        _ptr = Marshal_nil ();
-        _release = 1;
-    }
-
-    Marshal_mgr (const Marshal_mgr &IT_s) {
-        _ptr = Marshal_duplicate (IT_s._ptr);
-        _release = 1;
-    }
-
-    Marshal_mgr &operator= (Marshal *IT_p) {
-        if (_ptr && _release)
-            Marshal_release (_ptr);
-        _ptr = IT_p;
-        _release = 1;
-        return (*this);
-    }
-
-    Marshal_mgr &operator= (const Marshal_mgr &IT_s) {
-        if (_ptr && _release)
-            Marshal_release (_ptr);
-        _ptr = Marshal_duplicate(IT_s._ptr);
-        _release = 1;
-        return (*this);
-    }
-
-    Marshal_mgr &operator= (Marshal_var &IT_s) {
-        if (_ptr && _release)
-            Marshal_release (_ptr);
-        _ptr = Marshal_duplicate(IT_s);
-        _release = 1;
-        return (*this);
-    }
-
-    ~Marshal_mgr () {
-        if (_release)
-            Marshal_release (_ptr);
-    }
-
-    unsigned char release () {
-        return _release;
-    }
-
-    void release (unsigned char rel) {
-        _release = rel;
-    }
-
-    operator int () const {
-        return (((CORBA::Object_ptr) _ptr) ? 1 : 0);
-    }
-
-    operator void* () const {
-        return _ptr;
-    }
-
-    operator CORBA::Object * () const {
-        return (CORBA::Object *) _ptr;
-    }
-
-    operator Marshal* () const {
-        return (Marshal*) _ptr;
-    }
-
-    Marshal_ptr operator-> () const {
-        return _ptr;
-    }
-
-    Marshal *_ptr;
-
-    protected:
-
-    unsigned char _release;
-};
-
-typedef Marshal_mgr Marshal_mgr_IT_const;
-#endif
-
-#ifndef MarshalSeqElemH
-#define MarshalSeqElemH
-
-class Marshal_SeqElem : public CORBA::_SeqElem
-{
-    public:
-
-    Marshal_SeqElem (Marshal_ptr* IT_p, unsigned char rel) {
-        _ptr = IT_p;
-        _release = rel;
-    }
-
-    Marshal_SeqElem &operator= (Marshal_ptr IT_p) {
-        if (_ptr) {
-            if (*(_ptr) && _release)
-                Marshal_release (*(_ptr));
-            *(_ptr) = IT_p;
-        }
-        return (*this);
-    }
-
-    Marshal_SeqElem &operator= (const Marshal_SeqElem &IT_s) {
-        if (_ptr && IT_s._ptr) {
-            if (*(_ptr) && _release)
-                Marshal_release (*(_ptr));
-            *(_ptr) = Marshal_duplicate(*(IT_s._ptr));
-        }
-        return (*this);
-    }
-
-    operator Marshal_ptr () const {
-        return _ptr ? (Marshal_ptr) (*_ptr) : Marshal_nil(); 
-    }
-
-    Marshal_ptr operator->() const { return *_ptr;}
-
-    protected:
-    Marshal_ptr *_ptr;
-    unsigned char _release;
-};
-
-#endif
-
-
-#define TIE_Marshal(X) Marshal##X
-
-#define DEF_TIE_Marshal(X) \
-	class Marshal##X : public virtual Marshal {		\
-	  X* m_obj;						\
-	public:							\
-								\
-								\
-	   Marshal##X  (X *objp, const char* m="", CORBA::LoaderClass *l=0)\
-		: Marshal(), m_obj(objp) {	\
-		m_pptr = new Marshal_dispatch		\
-			(( Marshal*)this,(CORBA::Object*)this,m,l,Marshal_IR,m_obj);	\
-	   }								\
-	   Marshal##X  (CORBA::Object *IT_p, const char* IT_m="", void *IT_q=0)\
-		: Marshal() {	\
-		m_pptr = new Marshal_dispatch		\
-			(( Marshal*)this,(CORBA::Object*)this,IT_m,Marshal_IR,IT_p,IT_q);	\
-		m_obj = (X*)(m_pptr->getImplObj ());			\
-	   }								\
-								\
-	   virtual ~Marshal##X  () {				\
-		if (_okToDeleteImpl ()) delete m_obj; }					\
-	   virtual void* _deref () {					\
-		return m_obj; }					\
-								\
-virtual void test_short (CORBA::Short s1, CORBA::Short& s2, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-m_obj->test_short (  s1, s2,IT_env);\
-}\
-	\
-virtual void test_long (CORBA::Long l1, CORBA::Long& l2, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-m_obj->test_long (  l1, l2,IT_env);\
-}\
-	\
-virtual void test_octet (CORBA::Octet o1, CORBA::Octet& o2, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-m_obj->test_octet (  o1, o2,IT_env);\
-}\
-	\
-virtual void test_char (CORBA::Char c1, CORBA::Char& c2, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-m_obj->test_char (  c1, c2,IT_env);\
-}\
-	\
-virtual void test_double (CORBA::Double d1, CORBA::Double& d2, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-m_obj->test_double (  d1, d2,IT_env);\
-}\
-	\
-virtual void test_struct (const Marshal::Marshal_Struct& ms1, Marshal::Marshal_Struct& ms2, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-m_obj->test_struct (  ms1, ms2,IT_env);\
-}\
-	\
-virtual void test_union (const Marshal::Marshal_Union& u1, Marshal::Marshal_Union& u2, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-m_obj->test_union (  u1, u2,IT_env);\
-}\
-	\
-virtual void test_any (const CORBA::any& a1, CORBA::any*& a2, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-m_obj->test_any (  a1, a2,IT_env);\
-}\
-	\
-virtual void test_sequence (const Marshal::AnySeq& as1, Marshal::AnySeq*& as2, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-m_obj->test_sequence (  as1, as2,IT_env);\
-}\
-	\
-virtual void test_recursive (const Marshal::Marshal_Recursive& mr1, Marshal::Marshal_Recursive*& mr2, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-m_obj->test_recursive (  mr1, mr2,IT_env);\
-}\
-								\
-	};						\
-
-
-#define QUALS_Marshal	\
-virtual void test_short (CORBA::Short s1, CORBA::Short& s2, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-m_obj->test_short (  s1, s2,IT_env);\
-}\
-	\
-virtual void test_long (CORBA::Long l1, CORBA::Long& l2, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-m_obj->test_long (  l1, l2,IT_env);\
-}\
-	\
-virtual void test_octet (CORBA::Octet o1, CORBA::Octet& o2, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-m_obj->test_octet (  o1, o2,IT_env);\
-}\
-	\
-virtual void test_char (CORBA::Char c1, CORBA::Char& c2, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-m_obj->test_char (  c1, c2,IT_env);\
-}\
-	\
-virtual void test_double (CORBA::Double d1, CORBA::Double& d2, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-m_obj->test_double (  d1, d2,IT_env);\
-}\
-	\
-virtual void test_struct (const Marshal_Struct& ms1, Marshal_Struct& ms2, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-m_obj->test_struct (  ms1, ms2,IT_env);\
-}\
-	\
-virtual void test_union (const Marshal_Union& u1, Marshal_Union& u2, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-m_obj->test_union (  u1, u2,IT_env);\
-}\
-	\
-virtual void test_any (const CORBA::any& a1, CORBA::any*& a2, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-m_obj->test_any (  a1, a2,IT_env);\
-}\
-	\
-virtual void test_sequence (const AnySeq& as1, AnySeq*& as2, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-m_obj->test_sequence (  as1, as2,IT_env);\
-}\
-	\
-virtual void test_recursive (const Marshal_Recursive& mr1, Marshal_Recursive*& mr2, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-m_obj->test_recursive (  mr1, mr2,IT_env);\
-}\
-
-
-
-
-class MarshalProxyFactoryClass : public virtual CORBA::ObjectFactoryClass {
-public:
-   MarshalProxyFactoryClass (unsigned char IT_p=0)
-		: CORBA::ProxyFactory (Marshal_IR, IT_p) {}
-
-    virtual void* New (char *IT_OR, CORBA::Environment&);
-
-    virtual void* New (ObjectReference *IT_OR, CORBA::Environment&);
-
-    virtual void* New2 (); 
-
-    virtual CORBA::Object* NewObject (char *IT_OR, CORBA::Environment&);
-
-    virtual CORBA::Object* NewObject (ObjectReference *IT_OR, CORBA::Environment&);
-
-    virtual CORBA::Object* New2Object (); 
-
-    virtual void* IT_castUp (void *IT_p, char* IT_s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-
-    virtual CORBA::PPTR* pptr (void *IT_p);
-
-    virtual void baseInterfaces (_IDL_SEQUENCE_string&);
-
-
-};
-
-extern MarshalProxyFactoryClass MarshalProxyFactory;
-
-class MarshalBOAImpl : public virtual Marshal  {
-public:
-    MarshalBOAImpl (const char *m="", CORBA::LoaderClass *l=NULL) {
-  if (CORBA::PPTR::isOK (m_pptr, Marshal_IR))
-    m_pptr = new Marshal_dispatch ( (Marshal*)this,
-   	 (CORBA::Object*)this, m, l, Marshal_IR, this);
-}
-
-        virtual void test_short (CORBA::Short s1, CORBA::Short& s2, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual void test_long (CORBA::Long l1, CORBA::Long& l2, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual void test_octet (CORBA::Octet o1, CORBA::Octet& o2, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual void test_char (CORBA::Char c1, CORBA::Char& c2, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual void test_double (CORBA::Double d1, CORBA::Double& d2, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual void test_struct (const Marshal_Struct& ms1, Marshal_Struct& ms2, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual void test_union (const Marshal_Union& u1, Marshal_Union& u2, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual void test_any (const CORBA::any& a1, CORBA::any*& a2, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual void test_sequence (const AnySeq& as1, AnySeq*& as2, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual void test_recursive (const Marshal_Recursive& mr1, Marshal_Recursive*& mr2, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-};
-
-
-#endif
-
-
-#ifndef _IDL_SEQUENCE_Marshal_Marshal_Recursive_defined
-#define _IDL_SEQUENCE_Marshal_Marshal_Recursive_defined
-
-class _IDL_SEQUENCE_Marshal_Marshal_Recursive {
-    CORBA::ULong _maximum;
-    CORBA::ULong _length;
-    Marshal::Marshal_Recursive* _buffer;
-    unsigned char _release;
-
-    public:
-    _IDL_SEQUENCE_Marshal_Marshal_Recursive& operator= (const _IDL_SEQUENCE_Marshal_Marshal_Recursive&);
-    _IDL_SEQUENCE_Marshal_Marshal_Recursive (const _IDL_SEQUENCE_Marshal_Marshal_Recursive&);
-
-    _IDL_SEQUENCE_Marshal_Marshal_Recursive (CORBA::ULong max);
-    _IDL_SEQUENCE_Marshal_Marshal_Recursive (CORBA::ULong max, CORBA::ULong length, Marshal::Marshal_Recursive* data, CORBA::Boolean release = 0);
-    _IDL_SEQUENCE_Marshal_Marshal_Recursive ();
-
-    ~_IDL_SEQUENCE_Marshal_Marshal_Recursive ();
-
-    static Marshal::Marshal_Recursive* allocbuf(CORBA::ULong nelems);
-    static void freebuf(Marshal::Marshal_Recursive* data);
-
-    CORBA::ULong maximum() const;
-    CORBA::ULong length() const;
-    void length (CORBA::ULong len);
-
-    Marshal::Marshal_Recursive& operator [] (CORBA::ULong IT_i);
-
-    const Marshal::Marshal_Recursive& operator [] (CORBA::ULong IT_i) const;
-
-    void encodeOp (CORBA::Request &IT_r) const;
-    void decodeOp (CORBA::Request &IT_r);
-    void decodeInOutOp (CORBA::Request &IT_r);
-};
-
-extern const CORBA::TypeCode_ptr _tc__IDL_SEQUENCE_Marshal_Marshal_Recursive;
-
-#ifndef _IDL_SEQUENCE_Marshal_Marshal_RecursiveVarH
-#define _IDL_SEQUENCE_Marshal_Marshal_RecursiveVarH
-
-#ifndef _IDL_SEQUENCE_Marshal_Marshal_RecursivevPtr
-#define _IDL_SEQUENCE_Marshal_Marshal_RecursivevPtr
-typedef _IDL_SEQUENCE_Marshal_Marshal_Recursive* _IDL_SEQUENCE_Marshal_Marshal_Recursive_vPtr;
-typedef const _IDL_SEQUENCE_Marshal_Marshal_Recursive* _IDL_SEQUENCE_Marshal_Marshal_Recursive_cvPtr;
-#endif
-
-class _IDL_SEQUENCE_Marshal_Marshal_Recursive_var : public CORBA::_var
-{
-    private:
-
-    unsigned char copyHelper (const _IDL_SEQUENCE_Marshal_Marshal_Recursive_var &IT_s) {
-        if (!IT_s._ptr) {
-            _ptr = IT_s._ptr;
-        } else
-        {
-            _ptr = new _IDL_SEQUENCE_Marshal_Marshal_Recursive;
-            *(_ptr) =  *(IT_s._ptr);
-        }
-        return 1;
-    }
-
-    public:
-
-    _IDL_SEQUENCE_Marshal_Marshal_Recursive_var (const _IDL_SEQUENCE_Marshal_Marshal_Recursive_var &IT_s) {
-        (void) copyHelper (IT_s);
-    }
-
-    _IDL_SEQUENCE_Marshal_Marshal_Recursive_var () {
-        _ptr = NULL;
-    }
-
-    _IDL_SEQUENCE_Marshal_Marshal_Recursive_var (_IDL_SEQUENCE_Marshal_Marshal_Recursive *IT_p) {
-        _ptr = IT_p;
-    }
-
-    _IDL_SEQUENCE_Marshal_Marshal_Recursive_var &operator= (_IDL_SEQUENCE_Marshal_Marshal_Recursive *IT_p) {
-        if (_ptr != IT_p) {
-            delete _ptr;
-        }
-        _ptr = IT_p;
-        return (*this);
-    }
-
-    _IDL_SEQUENCE_Marshal_Marshal_Recursive_var &operator= (const _IDL_SEQUENCE_Marshal_Marshal_Recursive_var &IT_s) {
-        if (_ptr != IT_s._ptr) {
-            delete _ptr;
-        }
-        _ptr = new _IDL_SEQUENCE_Marshal_Marshal_Recursive;
-        *(_ptr) =  *(IT_s._ptr);
-        return (*this);
-    }
-
-    ~_IDL_SEQUENCE_Marshal_Marshal_Recursive_var () {
-        delete _ptr;
-    }
-
-    _IDL_SEQUENCE_Marshal_Marshal_Recursive* operator-> () {
-        return _ptr;
-    }
-
-    operator _IDL_SEQUENCE_Marshal_Marshal_Recursive_cvPtr () const { return _ptr;}
-    operator _IDL_SEQUENCE_Marshal_Marshal_Recursive_vPtr& () { return _ptr;}
-    operator _IDL_SEQUENCE_Marshal_Marshal_Recursive& () const { return * _ptr;}
-
-    const Marshal::Marshal_Recursive& operator[] (CORBA::ULong index) const;
-
-    Marshal::Marshal_Recursive& operator[] (CORBA::ULong index);
-
-    protected:
-    _IDL_SEQUENCE_Marshal_Marshal_Recursive *_ptr;
-    private:
-    _IDL_SEQUENCE_Marshal_Marshal_Recursive_var &operator= (const CORBA::_var &IT_s);
-    _IDL_SEQUENCE_Marshal_Marshal_Recursive_var (const CORBA::_var &IT_s);
-};
-
-#endif
-
-
-#endif
-
-
-void operator<<= (CORBA::any &IT_a, const Marshal::Marshal_Union& IT_t);
-CORBA::Boolean operator>>= (const CORBA::any &IT_a, Marshal::Marshal_Union*& IT_t);
-
-
-void operator<<= (CORBA::any &IT_a, const Marshal::Marshal_Recursive& IT_t);
-CORBA::Boolean operator>>= (const CORBA::any &IT_a, Marshal::Marshal_Recursive*& IT_t);
-
-
-void operator<<= (CORBA::any &IT_a, Marshal_ptr IT_t);
-CORBA::Boolean operator>>= (const CORBA::any &IT_a, Marshal_ptr& IT_t);
-
-
-void operator<<= (CORBA::any &IT_a, const Marshal::_IDL_SEQUENCE_Marshal_Marshal_Recursive& IT_t);
-CORBA::Boolean operator>>= (const CORBA::any &IT_a, Marshal::_IDL_SEQUENCE_Marshal_Marshal_Recursive*& IT_t);
-
-
-void operator<<= (CORBA::any &IT_a, const _IDL_SEQUENCE_Marshal_Marshal_Recursive& IT_t);
-CORBA::Boolean operator>>= (const CORBA::any &IT_a, _IDL_SEQUENCE_Marshal_Marshal_Recursive*& IT_t);
-
-
-void operator<<= (CORBA::any &IT_a, Marshal::discrim IT_t);
-CORBA::Boolean operator>>= (const CORBA::any &IT_a, Marshal::discrim& IT_t);
-
-
-void operator<<= (CORBA::any &IT_a, const _IDL_SEQUENCE_any& IT_t);
-CORBA::Boolean operator>>= (const CORBA::any &IT_a, _IDL_SEQUENCE_any*& IT_t);
-
-
-void operator<<= (CORBA::any &IT_a, const Marshal::Marshal_Struct& IT_t);
-CORBA::Boolean operator>>= (const CORBA::any &IT_a, Marshal::Marshal_Struct*& IT_t);
-
-
-#endif
diff --git a/TAO/Benchmark/Marshal_Test/Orbix/marshal.idl b/TAO/Benchmark/Marshal_Test/Orbix/marshal.idl
deleted file mode 100644
index 16d60e1064f..00000000000
--- a/TAO/Benchmark/Marshal_Test/Orbix/marshal.idl
+++ /dev/null
@@ -1,88 +0,0 @@
-// Interface for the marshal benchmark
-
-interface Marshal 
-{
-  struct Marshal_Struct
-  {
-    short s;
-    long  l;
-    char  c;
-    octet o;
-    double d;
-  };
-
-  enum discrim {e_0th, e_1st, e_2nd, e_3rd, e_4th, e_5th, e_6th};
-
-  union Marshal_Union
-    switch (discrim)
-      {
-      case e_0th:
-	short s;
-      case e_1st:
-	long  l;
-      case e_2nd:
-	char  c;
-      case e_3rd:
-	octet o;
-      case e_4th:
-	double d;
-      default:      // this will test typecode indirection
-	Marshal_Struct ms;
-      };
-
-  /*
-  typedef sequence<short> ShortSeq;
-  typedef sequence<long>  LongSeq;
-  typedef sequence<octet> OctetSeq;
-  typedef sequence<char>  CharSeq;
-  typedef sequence<double> DoubleSeq;
-  typedef sequence<Marshal_Struct> StructSeq;
-  typedef sequence<Marshal_Union> UnionSeq;
-  */
-  // for testing sequences of Any
-  typedef sequence<any> AnySeq;
-
-  // testing recursive behavior
-  // complex.
-  struct Marshal_Recursive
-  {
-    // we use this to test the limited recursion allowed by IDL. This is an
-    // ideal test for indirected typecodes.
-
-    // simulate a behavior of a list node
-    any value;
-    sequence <Marshal_Recursive> next;
-  };
-
-  void test_short (in short s1, out short s2); // test a short
-  void test_long (in long l1, out long l2); // test a long
-  void test_octet (in octet o1, out octet o2); // test an octet
-  void test_char (in char c1, out char c2); // test a char
-  void test_double (in double d1, out double d2); // test a double
-  void test_struct (in Marshal_Struct ms1, out Marshal_Struct ms2); // test a
-								    // struct 
-  void test_union (in Marshal_Union u1, out Marshal_Union u2); // test a
-							       // union.
-  void test_any (in any a1, out any a2); // test an Any
-  /*
-  void test_sequence (in ShortSeq ss1, in LongSeq ls1, in OctetSeq os1, in
-		      CharSeq cs1, in DoubleSeq ds1, in StructSeq Ss1, in
-		      UnionSeq us1, in AnySeq as1,
-		      out ShortSeq ss2, out LongSeq ls2, out OctetSeq os2, out
-		      CharSeq cs2, out DoubleSeq ds2, out StructSeq Ss2, out
-		      UnionSeq us2, out AnySeq as2);
-		      */
-  void test_sequence (in AnySeq as1, out AnySeq as2); // this will result in a
-						      // 3 level indirection -
-						      // sequence, any, and its
-						      // value type
-  void test_recursive (in Marshal_Recursive mr1, out Marshal_Recursive mr2); //
-						      // very complicated
-};
-
-
-
-
-
-
-
diff --git a/TAO/Benchmark/Marshal_Test/Orbix/orbix_marshal_client.cpp b/TAO/Benchmark/Marshal_Test/Orbix/orbix_marshal_client.cpp
deleted file mode 100644
index 94058ebac1a..00000000000
--- a/TAO/Benchmark/Marshal_Test/Orbix/orbix_marshal_client.cpp
+++ /dev/null
@@ -1,1334 +0,0 @@
-// ============================================================================
-//
-// = LIBRARY
-//    CORBA Orbix marshal benchmark
-// 
-// = FILENAME
-//    orbix_marshal_proxy.cpp
-//
-// = AUTHOR
-//    Aniruddha Gokhale
-// 
-// ============================================================================
-
-//#define USE_INIT
-#include "orbix_marshal_client.h"
-
-#if !defined (__ACE_INLINE__)
-#include "orbix_marshal_client.i"
-#endif /* __ACE_INLINE__ */
-
-int
-Orbix_Marshal_Client_Proxy::run (CORBA_Marshal_Proxy::OPTIONS &options,
-				CORBA_Marshal_Proxy::RESULTS &results)
-{
-  char **argv;
-  int argc;
-  CORBA::Object_ptr target;
-  char *markerserver;
-  int mlen=0, slen=0; // length of marker and service name
-
-#if 0
-  // get the argument list to be passed on to the ORB_init method
-  argv = options.orb_init_args (argc);
-
-  // get the orb. Pass any ORB_init arguments
-  this->orb_ = CORBA::ORB_init (argc, (char *const *)argv, "Orbix");
-  if (this->orb_ == 0)
-    {
-      ACE_DEBUG ((LM_DEBUG, "ORB_init failed\n"));
-      return -1;
-    }
-#endif
-
-  // create a marker server
-  if (options.service_name ())
-    slen = ACE_OS::strlen (options.service_name ());
-  if (options.object_name ())
-    mlen = ACE_OS::strlen (options.object_name ());
-
-  if (slen > 0)
-    {
-      markerserver = new char [mlen+slen+1+1];
-      ACE_OS::sprintf (markerserver, "%s:%s", (mlen ? options.object_name ():""),
-		   options.service_name ()); 
-      ACE_DEBUG ((LM_DEBUG, "markerserver = %s\n", markerserver));
-    }
-  else // server name is required
-    {
-      markerserver = NULL;
-    }
-
-  // get the obj ref by binding it to the specified host using the specified obj_name
-  try {
-    target = Marshal::_bind (markerserver, options.hostname ());
-  }
-  catch (CORBA::SystemException &se)
-    {
-      cerr << "failed to bind: " << &se << endl;
-      return 0;
-    }
-  if (CORBA::is_nil (target))
-    {
-      ACE_DEBUG ((LM_DEBUG, "bind call failed\n"));
-      return -1;
-    }
-
-  this->ref_ = Marshal::_narrow (target);
-  if (CORBA::is_nil (this->ref_))
-    {
-      ACE_DEBUG ((LM_DEBUG, "narrow to Marshal failed\n"));
-      return -1;
-    }
-
-  // tell the "results" object what file it must store the results into
-  results.filename (options.filename ());
-
-  // use SII or DII accordingly
-  switch (options.policy ())
-    {
-    case CORBA_Marshal_Options::STATIC : // use SII
-      return this->use_sii (options, results);
-      break;
-    case CORBA_Marshal_Options::DYNAMIC : // use DII
-      return this->use_dii (options, results);
-      break;
-    default:
-      ACE_DEBUG ((LM_DEBUG, "bad policy\n"));
-      return -1;
-    }
-  // hopefully we are never here, else something is seriously wrong
-  return -1;
-}
-
-int
-Orbix_Marshal_Client_Proxy::use_sii (CORBA_Marshal_Proxy::OPTIONS &options,
-				    CORBA_Marshal_Proxy::RESULTS &results)
-{
-  int i;
-  int status = 0;
-  // This method tests the static invocation interface
-
-  for (i=0; i < options.iterations () && !status; i++)
-    {
-      switch (options.data_type ())
-	{
-	  // shorts
-	case CORBA_Marshal_Options::SHORT:
-	  status = sii_test_short (options, results);
-	  break;
-	  // longs
-	case CORBA_Marshal_Options::LONG:
-	  status = sii_test_long (options, results);
-	  break;
-	  // octets
-	case CORBA_Marshal_Options::OCTET:
-	  status = sii_test_octet (options, results);
-	  break;
-	  // chars
-	case CORBA_Marshal_Options::CHAR:
-	  status = sii_test_char (options, results);
-	  break;
-	  // doubles
-	case CORBA_Marshal_Options::DOUBLE:
-	  status = sii_test_double (options, results);
-	  break;
-	  // Structs
-	case CORBA_Marshal_Options::STRUCT:
-	  status = sii_test_struct (options, results);
-	  break;
-	  // unions
-	case CORBA_Marshal_Options::UNION:
-	  status = sii_test_union (options, results);
-	  break;
-	  // anys
-	case CORBA_Marshal_Options::ANY:
-	  status = sii_test_any (options, results);
-	  break;
-	  // sequences
-	case CORBA_Marshal_Options::SEQUENCE:
-	  status = sii_test_sequence (options, results);
-	  break;
-	  // longs
-	case CORBA_Marshal_Options::RECURSIVE:
-	  //	  status = sii_test_recursive (options, results);
-	  // doesn't work
-	  break;
-	default:
-	  status = -1;
-	} // end of switch
-    } // for loop
-
-  if (!status)
-    return 0;
-  else
-    return -1;
-}
-
-int
-Orbix_Marshal_Client_Proxy::use_dii (CORBA_Marshal_Proxy::OPTIONS &options,
-				    CORBA_Marshal_Proxy::RESULTS &results)
-{
-  int i;
-  int status = 0;
-  // This method tests the dynamic invocation interface
-
-  for (i=0; i < options.iterations () && !status; i++)
-    {
-      switch (options.data_type ())
-	{
-	  // shorts
-	case CORBA_Marshal_Options::SHORT:
-	  status = dii_test_short (options, results);
-	  break;
-	  // longs
-	case CORBA_Marshal_Options::LONG:
-	  status = dii_test_long (options, results);
-	  break;
-	  // octets
-	case CORBA_Marshal_Options::OCTET:
-	  status = dii_test_octet (options, results);
-	  break;
-	  // chars
-	case CORBA_Marshal_Options::CHAR:
-	  status = dii_test_char (options, results);
-	  break;
-	  // doubles
-	case CORBA_Marshal_Options::DOUBLE:
-	  status = dii_test_double (options, results);
-	  break;
-	  // Structs
-	case CORBA_Marshal_Options::STRUCT:
-	  status = dii_test_struct (options, results);
-	  break;
-	  // unions
-	case CORBA_Marshal_Options::UNION:
-	  status = dii_test_union (options, results);
-	  break;
-	  // anys
-	case CORBA_Marshal_Options::ANY:
-	  status = dii_test_any (options, results);
-	  break;
-	  // sequences
-	case CORBA_Marshal_Options::SEQUENCE:
-	  status = dii_test_sequence (options, results);
-	  break;
-	  // longs
-	case CORBA_Marshal_Options::RECURSIVE:
-	  //	  status = dii_test_recursive (options, results);
-	  // doesn't work
-	  break;
-	default:
-	  status = -1;
-	} // end of switch
-    } // for loop
-
-  if (!status)
-    return 0;
-  else
-    return -1;
-}
-
-
-// all helper functions : SII
-int
-Orbix_Marshal_Client_Proxy::sii_test_short (CORBA_Marshal_Proxy::OPTIONS &options,
-					   CORBA_Marshal_Proxy::RESULTS &results)
-{
-  CORBA::Short s1, s2;
-  s1 = 3;
-  ref_->test_short (s1, s2);
-  if (s2 == 2*s1)
-    {
-      ACE_DEBUG ((LM_DEBUG, "SII test_short success: s1 = %d, s2 = %d\n", s1, s2));
-      return 0;
-    }
-  else
-    {
-      ACE_DEBUG ((LM_DEBUG, "SII test_short failed: s1 = %d, s2 = %d\n", s1, s2));
-      return -1;
-    }
-}
-
-int
-Orbix_Marshal_Client_Proxy::sii_test_long (CORBA_Marshal_Proxy::OPTIONS &options,
-					  CORBA_Marshal_Proxy::RESULTS &results)
-{
-  CORBA::Long l1, l2;
-  l1 = 256;
-  ref_->test_long (l1, l2);
-  if (l2 == 3*l1)
-    {
-      ACE_DEBUG ((LM_DEBUG, "SII test_long success: l1 = %d, l2 = %d\n", l1, l2));
-      return 0;
-    }
-  else
-    {
-      ACE_DEBUG ((LM_DEBUG, "SII test_long failed: l1 = %d, l2 = %d\n", l1, l2));
-      return -1;
-    }
-}
-
-int
-Orbix_Marshal_Client_Proxy::sii_test_octet (CORBA_Marshal_Proxy::OPTIONS &options,
-					   CORBA_Marshal_Proxy::RESULTS &results)
-  // octets
-{
-  CORBA::Octet o1, o2;
-  o1 = (CORBA::Octet) 127;
-  ref_->test_octet (o1, o2);
-  if (o1 == o2)
-    {
-      ACE_DEBUG ((LM_DEBUG, "SII test_octet success: o1 = %c, o2 = %c\n", o1, o2));
-      return 0;
-    }
-  else
-    {
-      ACE_DEBUG ((LM_DEBUG, "SII test_octet failed: o1 = %c, o2 = %c\n", o1, o2));
-      return -1;
-    }
-}
-
-int
-Orbix_Marshal_Client_Proxy::sii_test_char (CORBA_Marshal_Proxy::OPTIONS &options,
-					  CORBA_Marshal_Proxy::RESULTS &results)
-  // chars
-{
-  CORBA::Char c1, c2;
-  c1 = 'B';
-  ref_->test_char (c1, c2);
-  if (c1 == c2)
-    {
-      ACE_DEBUG ((LM_DEBUG, "SII test_char success: c1 = %c, c2 = %c\n", c1, c2));
-      return 0;
-    }
-  else
-    {
-      ACE_DEBUG ((LM_DEBUG, "SII test_char failed: c1 = %c, c2 = %c\n", c1, c2));
-      return -1;
-    }
-}
-
-int
-Orbix_Marshal_Client_Proxy::sii_test_double (CORBA_Marshal_Proxy::OPTIONS &options,
-					    CORBA_Marshal_Proxy::RESULTS &results)
-  // doubles
-{
-  CORBA::Double d1, d2;
-  d1 = 3.1415;
-  ref_->test_double (d1, d2);
-  if (d2 == d1/2)
-    {
-      ACE_DEBUG ((LM_DEBUG, "SII test_double success: d1 = %f, d2 = %f\n", d1, d2));
-      return 0;
-    }
-  else
-    {
-      ACE_DEBUG ((LM_DEBUG, "SII test_double failed: d1 = %f, d2 = %f\n", d1, d2));
-      return -1;
-    }
-}
-
-int
-Orbix_Marshal_Client_Proxy::sii_test_struct (CORBA_Marshal_Proxy::OPTIONS &options,
-					    CORBA_Marshal_Proxy::RESULTS &results)
-  // structs
-{
-  Marshal::Marshal_Struct ms1, ms2;
-
-  ms1.s = 3;
-  ms1.l = 256;
-  ms1.c = 'B';
-  ms1.o = (CORBA::Octet) 127;
-  ms1.d = 3.1415;
-
-  ref_->test_struct (ms1, ms2);
-  if (ms1.s == ms2.s && ms1.l == ms2.l && ms1.c == ms2.c && ms1.o == ms2.o &&
-      ms1.d == ms2.d)
-    {
-      ACE_DEBUG ((LM_DEBUG, "SII test_struct success\n"));
-      return 0;
-    }
-  else
-    {
-      ACE_DEBUG ((LM_DEBUG, "SII test_struct failed\n"));
-      return -1;
-    }
-}
-
-int
-Orbix_Marshal_Client_Proxy::sii_test_union (CORBA_Marshal_Proxy::OPTIONS &options,
-					   CORBA_Marshal_Proxy::RESULTS &results)
-  // unions
-{
-  Marshal::Marshal_Union u1, u2;
-  Marshal::Marshal_Struct ms;
-
-  // first test an enumerated case
-  //  u1._d (Marshal::e_1st); Orbix does this on its own
-  u1.l (4567);
-
-  ref_->test_union (u1, u2);
-  if ( (u1._d () == u2._d()) && (u1.l () == u2.l ()))
-    {
-      ACE_DEBUG ((LM_DEBUG, "SII test_union for long (case e_1st) success\n"));
-    }
-  else
-    {
-      ACE_DEBUG ((LM_DEBUG, "SII test_union for long (case e_1st) failed\n"));
-      return -1;
-    }
-
-  // now test the default case
-  // In Orbix, setting each field like this will not work because the poor
-  // Union has no clue what discriminant it must set to.
-#if 0
-  u1.ms ().s = 3;
-  u1.ms ().l = 256;
-  u1.ms ().c = 'B';
-  u1.ms ().o = (CORBA::Octet) 127;
-  u1.ms ().d = 3.1415;
-#endif
-  ms.s = 3;
-  ms.l = 256;
-  ms.c = 'B';
-  ms.o = (CORBA::Octet) 127;
-  ms.d = 3.1415;
-
-  u1.ms (ms);
-
-  ref_->test_union (u1, u2);
-
-  if (u1.ms ().s == u2.ms ().s && u1.ms ().l == u2.ms ().l && u1.ms ().c == u2.ms ().c && u1.ms ().o == u2.ms ().o &&
-      u1.ms ().d == u2.ms ().d)
-    {
-      ACE_DEBUG ((LM_DEBUG, "SII test_union for default (case e_6th) success\n"));
-      return 0;
-    }
-  else
-    {
-      ACE_DEBUG ((LM_DEBUG, "SII test_union for default (case e_6th) failed\n"));
-      return -1;
-    }
-}
-
-int
-Orbix_Marshal_Client_Proxy::sii_test_any (CORBA_Marshal_Proxy::OPTIONS &options,
-					 CORBA_Marshal_Proxy::RESULTS &results)
-{
-  // we send a struct thru the any
-  CORBA::Any a1, *a2;
-  Marshal::Marshal_Struct ms1, *ms2;
-
-  ms1.s = 3;
-  ms1.l = 256;
-  ms1.c = 'B';
-  ms1.o = (CORBA::Octet) 127;
-  ms1.d = 3.1415;
-
-  // populate the any with a MarshalStruct
-  a1 <<= ms1;
-
-  a2 = new CORBA::Any;
-
-  // now test it
-  ref_->test_any (a1, a2);
-  
-  // check if the two typecodes are equal
-  if (a2->type ()->equal (Marshal::_tc_Marshal_Struct))
-    {
-      // now see if the values are same
-      ms2 = (Marshal::Marshal_Struct *)a2->value ();
-      if (ms1.s == ms2->s && ms1.l == ms2->l && ms1.c == ms2->c && ms1.o == ms2->o &&
-	  ms1.d == ms2->d)
-	{
-	  ACE_DEBUG ((LM_DEBUG, "SII test_any success\n"));
-	  return 0;
-	}
-      else
-	{
-	  ACE_DEBUG ((LM_DEBUG, "SII test_any value match failed\n"));
-	  return -1;
-	}
-    }
-  else
-    {
-      ACE_DEBUG ((LM_DEBUG, "SII test_any failed due to typecode mismatch\n"));
-    }
-  return 0;
-}
-
-int
-Orbix_Marshal_Client_Proxy::sii_test_sequence (CORBA_Marshal_Proxy::OPTIONS &options,
-					      CORBA_Marshal_Proxy::RESULTS &results)
-{
-  // make a sequence of Anys and fill each one with a different data type
-  Marshal::AnySeq as1 (7), *as2;
-  Marshal::Marshal_Struct ms;
-  Marshal::Marshal_Union u;
-
-  ms.s = 3;
-  ms.l = 256;
-  ms.c = 'B';
-  ms.o = (CORBA::Octet) 127;
-  ms.d = 3.1415;
-
-  u.ms (ms);
-
-  // it looks like we must tell the sequence how many elements it is going to
-  // carry. By just fixing the max value does not work.
-
-  as1.length (7);
-
-  as1[0] <<= (CORBA::Short)3;
-  as1[1] <<= (CORBA::Long) 256;
-  as1[2] <<= CORBA::Any::from_octet ((CORBA::Octet)127);
-  as1[3] <<= CORBA::Any::from_char ('B');
-  as1[4] <<= (CORBA::Double)3.1415; // double
-  as1[5] <<= ms;     // struct
-  as1[6] <<= u;      // union
-
-  as2 = new Marshal::AnySeq;
-
-  ref_->test_sequence (as1, as2);
-
-  ACE_DEBUG ((LM_DEBUG, "SII test_sequence\n"));
-  if (as1.length () == as2->length ())
-    {
-      // now make sure that the elements are same
-      for (int i=0; i < as1.length (); i++)
-	{
-	  if (as1[i].type ()->equal ((*as2)[i].type ()))
-	    {
-	      // now see if the values are same
-	      switch (i)
-		{
-		case 0:
-		  if (*(CORBA::Short *)as1[i].value () == *(CORBA::Short
-							    *)(*as2)[i].value ())
-		    {
-		      ACE_DEBUG ((LM_DEBUG, "\tSII test_sequence, shorts matched\n"));
-		    }
-		  else
-		    {
-		      ACE_DEBUG ((LM_DEBUG, "\tSII test_sequence failed on shorts match\n"));
-		    }
-		  break;
-		case 1:
-		  if (*(CORBA::Long *)as1[i].value () == *(CORBA::Long
-							    *)(*as2)[i].value ())
-		    {
-		      ACE_DEBUG ((LM_DEBUG, "\tSII test_sequence, longs matched\n"));
-		    }
-		  else
-		    {
-		      ACE_DEBUG ((LM_DEBUG, "\tSII test_sequence failed on longs match\n"));
-		    }
-		  break;
-		case 2:
-		  if (*(CORBA::Octet *)as1[i].value () == *(CORBA::Octet
-							    *)(*as2)[i].value ())
-		    {
-		      ACE_DEBUG ((LM_DEBUG, "\tSII test_sequence, octets matched\n"));
-		    }
-		  else
-		    {
-		      ACE_DEBUG ((LM_DEBUG, "\tSII test_sequence failed on octets match\n"));
-		    }
-		  break;
-		case 3:
-		  if (*(CORBA::Char *)as1[i].value () == *(CORBA::Char
-							    *)(*as2)[i].value ())
-		    {
-		      ACE_DEBUG ((LM_DEBUG, "\tSII test_sequence, chars matched\n"));
-		    }
-		  else
-		    {
-		      ACE_DEBUG ((LM_DEBUG, "\tSII test_sequence failed on chars match\n"));
-		    }
-		  break;
-		case 4:
-		  if (*(CORBA::Double *)as1[i].value () == *(CORBA::Double
-							    *)(*as2)[i].value ())
-		    {
-		      ACE_DEBUG ((LM_DEBUG, "\tSII test_sequence, doubles matched\n"));
-		    }
-		  else
-		    {
-		      ACE_DEBUG ((LM_DEBUG, "\tSII test_sequence failed on doubles match\n"));
-		    }
-		  break;
-		case 5:
-		  {
-		    Marshal::Marshal_Struct *ms1, *ms2;
-		    
-		    ms1 = (Marshal::Marshal_Struct *)as1[i].value ();
-		    ms2 = (Marshal::Marshal_Struct *)(*as2)[i].value ();
-
-		    if (ms1->s == ms2->s && ms1->l == ms2->l && ms1->c == ms2->c && ms1->o == ms2->o &&
-			ms1->d == ms2->d)
-		    {
-		      ACE_DEBUG ((LM_DEBUG, "\tSII test_sequence, structs matched\n"));
-		    }
-		  else
-		    {
-		      ACE_DEBUG ((LM_DEBUG, "\tSII test_sequence failed on structs match\n"));
-		    }
-		  }
-		  break;
-		case 6:
-		  {
-		    Marshal::Marshal_Union *u1, *u2;
-		    
-		    u1 = (Marshal::Marshal_Union *)as1[i].value ();
-		    u2 = (Marshal::Marshal_Union *)(*as2)[i].value ();
-
-		    if (u1->_d () == u2->_d () && u1->ms ().s == u2->ms ().s &&
-			u1->ms ().l == u2->ms ().l && 
-			u1->ms ().c == u2->ms ().c && u1->ms ().o == u2->ms ().o &&
-			u1->ms ().d == u2->ms ().d)
-		    {
-		      ACE_DEBUG ((LM_DEBUG, "\tSII test_sequence, unions matched\n"));
-		    }
-		  else
-		    {
-		      ACE_DEBUG ((LM_DEBUG, "\tSII test_sequence failed on unions match\n"));
-		    }
-		  }
-		  break;
-		}
-	    }
-	  else
-	    {
-	      ACE_DEBUG ((LM_DEBUG, 
-			  "SII test_sequence: typecode mismatch for element %d\n", i));
-	      break;
-	    }
-	}
-    }
-  else
-    {
-      ACE_DEBUG ((LM_DEBUG, "SII test_sequence failed: as2->length = %d\n",
-		  as2->length ()));
-    }
-  return 0;
-}
-
-int
-Orbix_Marshal_Client_Proxy::sii_test_recursive (CORBA_Marshal_Proxy::OPTIONS &options,
-					       CORBA_Marshal_Proxy::RESULTS &results)
-{
-  // we will try a simple one here
-  Marshal::Marshal_Recursive mr1, *elem1, *mr2, *elem2;
-
-  mr1.value <<= (CORBA::Long)1;
-  mr1.next.length (1);  // sequence of length 1
-
-  // fill the element
-  elem1 = &mr1.next[0];
-  elem1->value <<= CORBA::Any::from_char ('D');
-  elem1->next.length (0); // end of seq
-
-  mr2 = new Marshal::Marshal_Recursive;
-
-  try {
-  ref_->test_recursive (mr1, mr2);
-  }
-  catch (CORBA::SystemException &se){
-    cerr << "error invoking request: " << se << endl;
-  }
-
-  elem2 = &mr2->next[0];
-
-  if ((*(CORBA::Long *)mr1.value.value () == *(CORBA::Long*)mr2->value.value ())
-      && (mr1.next.length () == mr2->next.length ()) // same length sequence
-      && (*(CORBA::Char *)elem1->value.value () == *(CORBA::Char *)elem2->value.value ())
-      && (elem1->next.length () == elem2->next.length ()))
-    {
-      ACE_DEBUG ((LM_DEBUG, "SII test_recursive success\n"));
-    }
-  else
-    {
-      ACE_DEBUG ((LM_DEBUG, "SII test_recursive failure\n"));
-    }
-      
-  return 0;
-}
-
-// -------------------------------------------------------
-// all helper functions : DII
-// -------------------------------------------------------
-
-int
-Orbix_Marshal_Client_Proxy::dii_test_short (CORBA_Marshal_Proxy::OPTIONS &options,
-					   CORBA_Marshal_Proxy::RESULTS &results)
-{
-  // DII variables
-  CORBA::Request_ptr     request = CORBA::Request::_nil(); // DII request
-  CORBA::NVList_ptr      arglist = CORBA::NVList::_nil();  // argument list
-  CORBA::Context_ptr     ctx     = CORBA::Context::_nil(); // context
-  CORBA::NVList_ptr result_list  = CORBA::NVList::_nil();  // result list
-  CORBA::NamedValue_ptr result = CORBA::NamedValue::_nil();// actual result
-  CORBA::Short s1, s2;
-
-  s1 = 3;
-  s2 = 0;
-
-  orb_->create_list(2, arglist); // 2 arguments to be added
-  *(arglist->add (CORBA::ARG_IN)->value ()) <<= s1;
-  // this usage is also correct. All we care is to supply a storage area for
-  // the OUT parameter
-  //  arglist->add (CORBA::ARG_OUT)->value ()->replace (CORBA::_tc_short, &s2);
-  *(arglist->add (CORBA::ARG_OUT)->value ()) <<= s2;
-  orb_->create_list(1, result_list); // 1 result
-  result = result_list->item (0);
-
-  // create a request
-  ref_->_create_request(ctx,
-			"test_short",
-			arglist,
-			result,
-			request,
-			0);
-  
-  request->invoke (); // 2 way
-  *(arglist->item(1)->value()) >>= s2;
-
-  if (s2 == 2*s1)
-    {
-      ACE_DEBUG ((LM_DEBUG, "DII test_short success: s1 = %d, s2 = %d\n", s1, s2));
-    }
-  else
-    {
-      ACE_DEBUG ((LM_DEBUG, "DII test_short failed: s1 = %d, s2 = %d\n", s1, s2));
-    }
-  CORBA::release (request);
-  CORBA::release (arglist);
-  CORBA::release (result);
-  CORBA::release (result_list);
-  return 0;
-}
-
-int
-Orbix_Marshal_Client_Proxy::dii_test_long (CORBA_Marshal_Proxy::OPTIONS &options,
-					  CORBA_Marshal_Proxy::RESULTS &results)
-{
-  // DII variables
-  CORBA::Request_ptr     request = CORBA::Request::_nil(); // DII request
-  CORBA::NVList_ptr      arglist = CORBA::NVList::_nil();  // argument list
-  CORBA::Context_ptr     ctx     = CORBA::Context::_nil(); // context
-  CORBA::NVList_ptr result_list  = CORBA::NVList::_nil();  // result list
-  CORBA::NamedValue_ptr result = CORBA::NamedValue::_nil();// actual result
-  CORBA::Long l1, l2;
-
-  l1 = 256;
-
-  orb_->create_list(2, arglist); // 2 arguments to be added
-  *(arglist->add(CORBA::ARG_IN)->value()) <<= l1;
-  arglist->add(CORBA::ARG_OUT)->value()->replace (CORBA::_tc_long, &l2);
-  orb_->create_list(1, result_list); // 1 result
-  result = result_list->item(0);
-
-  // create a request
-  ref_->_create_request(ctx,
-			"test_long",
-			arglist,
-			result,
-			request,
-			0);
-  
-  request->invoke (); // 2 way
-  *(arglist->item(1)->value()) >>= l2;
-
-  if (l2 == 3*l1)
-    {
-      ACE_DEBUG ((LM_DEBUG, "DII: test_long success: l1 = %d, l2 = %d\n", l1, l2));
-    }
-  else
-    {
-      ACE_DEBUG ((LM_DEBUG, "DII: test_long failed: l1 = %d, l2 = %d\n", l1, l2));
-    }
-  CORBA::release (request);
-  CORBA::release (arglist);
-  CORBA::release (result);
-  CORBA::release (result_list);
-  return 0;
-}
-
-int
-Orbix_Marshal_Client_Proxy::dii_test_octet (CORBA_Marshal_Proxy::OPTIONS &options,
-					   CORBA_Marshal_Proxy::RESULTS &results)
-  // octets
-{
-  // DII variables
-  CORBA::Request_ptr     request = CORBA::Request::_nil(); // DII request
-  CORBA::NVList_ptr      arglist = CORBA::NVList::_nil();  // argument list
-  CORBA::Context_ptr     ctx     = CORBA::Context::_nil(); // context
-  CORBA::NVList_ptr result_list  = CORBA::NVList::_nil();  // result list
-  CORBA::NamedValue_ptr result = CORBA::NamedValue::_nil();// actual result
-  CORBA::Octet o1, o2;
-
-  o1 = (CORBA::Octet) 127;
-
-  orb_->create_list(2, arglist); // 2 arguments to be added
-  *(arglist->add(CORBA::ARG_IN)->value()) <<= CORBA::Any::from_octet (o1);
-  arglist->add(CORBA::ARG_OUT)->value()->replace (CORBA::_tc_octet, &o2);
-  orb_->create_list(1, result_list); // 1 result
-  result = result_list->item(0);
-
-  // create a request
-  ref_->_create_request(ctx,
-			"test_octet",
-			arglist,
-			result,
-			request,
-			0);
-  
-  request->invoke (); // 2 way
-  *(arglist->item(1)->value()) >>= CORBA::Any::to_octet (o2);
-
-  if (o1 == o2)
-    {
-      ACE_DEBUG ((LM_DEBUG, "DII test_octet success: o1 = %c, o2 = %c\n", o1, o2));
-    }
-  else
-    {
-      ACE_DEBUG ((LM_DEBUG, "DII test_octet failed: o1 = %c, o2 = %c\n", o1, o2));
-    }
-  CORBA::release (request);
-  CORBA::release (arglist);
-  CORBA::release (result);
-  CORBA::release (result_list);
-  return 0;
-}
-
-int
-Orbix_Marshal_Client_Proxy::dii_test_char (CORBA_Marshal_Proxy::OPTIONS &options,
-					  CORBA_Marshal_Proxy::RESULTS &results)
-  // chars
-{
-  // DII variables
-  CORBA::Request_ptr     request = CORBA::Request::_nil(); // DII request
-  CORBA::NVList_ptr      arglist = CORBA::NVList::_nil();  // argument list
-  CORBA::Context_ptr     ctx     = CORBA::Context::_nil(); // context
-  CORBA::NVList_ptr result_list  = CORBA::NVList::_nil();  // result list
-  CORBA::NamedValue_ptr result = CORBA::NamedValue::_nil();// actual result
-  CORBA::Char c1, c2;
-
-  c1 = 'B';
-
-  orb_->create_list(2, arglist); // 2 arguments to be added
-  *(arglist->add(CORBA::ARG_IN)->value()) <<= CORBA::Any::from_char (c1);
-  arglist->add(CORBA::ARG_OUT)->value()->replace (CORBA::_tc_char, &c2);
-  orb_->create_list(1, result_list); // 1 result
-  result = result_list->item(0);
-
-  // create a request
-  ref_->_create_request(ctx,
-			"test_char",
-			arglist,
-			result,
-			request,
-			0);
-  
-  request->invoke (); // 2 way
-  *(arglist->item(1)->value()) >>= CORBA::Any::to_char (c2);
-
-  if (c1 == c2)
-    {
-      ACE_DEBUG ((LM_DEBUG, "DII test_char success: c1 = %c, c2 = %c\n", c1, c2));
-    }
-  else
-    {
-      ACE_DEBUG ((LM_DEBUG, "DII test_char failed: c1 = %c, c2 = %c\n", c1, c2));
-    }
-  CORBA::release (request);
-  CORBA::release (arglist);
-  CORBA::release (result);
-  CORBA::release (result_list);
-  return 0;
-}
-
-int
-Orbix_Marshal_Client_Proxy::dii_test_double (CORBA_Marshal_Proxy::OPTIONS &options,
-					    CORBA_Marshal_Proxy::RESULTS &results)
-  // doubles
-{
-  // DII variables
-  CORBA::Request_ptr     request = CORBA::Request::_nil(); // DII request
-  CORBA::NVList_ptr      arglist = CORBA::NVList::_nil();  // argument list
-  CORBA::Context_ptr     ctx     = CORBA::Context::_nil(); // context
-  CORBA::NVList_ptr result_list  = CORBA::NVList::_nil();  // result list
-  CORBA::NamedValue_ptr result = CORBA::NamedValue::_nil();// actual result
-  CORBA::Double d1, d2;
-
-  d1 = 3.1415;
-
-  orb_->create_list(2, arglist); // 2 arguments to be added
-  *(arglist->add(CORBA::ARG_IN)->value()) <<= d1;
-  arglist->add(CORBA::ARG_OUT)->value()->replace (CORBA::_tc_double, &d2);
-  orb_->create_list(1, result_list); // 1 result
-  result = result_list->item(0);
-
-  // create a request
-  ref_->_create_request(ctx,
-			"test_double",
-			arglist,
-			result,
-			request,
-			0);
-  
-  request->invoke (); // 2 way
-  *(arglist->item(1)->value()) >>= d2;
-
-  if (d2 == d1/2)
-    {
-      ACE_DEBUG ((LM_DEBUG, "DII test_double success: d1 = %f, d2 = %f\n", d1, d2));
-    }
-  else
-    {
-      ACE_DEBUG ((LM_DEBUG, "DII test_double failed: d1 = %f, d2 = %f\n", d1, d2));
-    }
-  CORBA::release (request);
-  CORBA::release (arglist);
-  CORBA::release (result);
-  CORBA::release (result_list);
-  return 0;
-}
-
-int
-Orbix_Marshal_Client_Proxy::dii_test_struct (CORBA_Marshal_Proxy::OPTIONS &options,
-					    CORBA_Marshal_Proxy::RESULTS &results)
-  // structs
-{
-  // DII variables
-  CORBA::Request_ptr     request = CORBA::Request::_nil(); // DII request
-  CORBA::NVList_ptr      arglist = CORBA::NVList::_nil();  // argument list
-  CORBA::Context_ptr     ctx     = CORBA::Context::_nil(); // context
-  CORBA::NVList_ptr result_list  = CORBA::NVList::_nil();  // result list
-  CORBA::NamedValue_ptr result = CORBA::NamedValue::_nil();// actual result
-  Marshal::Marshal_Struct ms1, *ms2=0;
-
-  ms1.s = 3;
-  ms1.l = 256;
-  ms1.c = 'B';
-  ms1.o = (CORBA::Octet) 127;
-  ms1.d = 3.1415;
-
-  orb_->create_list(2, arglist); // 2 arguments to be added
-  *(arglist->add(CORBA::ARG_IN)->value()) <<= ms1;
-  arglist->add(CORBA::ARG_OUT)->value()->replace (Marshal::_tc_Marshal_Struct, ms2);
-  orb_->create_list(1, result_list); // 1 result
-  result = result_list->item(0);
-
-  // create a request
-  ref_->_create_request(ctx,
-			"test_struct",
-			arglist,
-			result,
-			request,
-			0);
-  
-  request->invoke (); // 2 way
-  *(arglist->item(1)->value()) >>= ms2;
-
-  if (ms1.s == ms2->s && ms1.l == ms2->l && ms1.c == ms2->c && ms1.o == ms2->o &&
-      ms1.d == ms2->d)
-    {
-      ACE_DEBUG ((LM_DEBUG, "DII test_struct success\n"));
-    }
-  else
-    {
-      ACE_DEBUG ((LM_DEBUG, "DII test_struct failed\n"));
-    }
-  CORBA::release (request);
-  CORBA::release (arglist);
-  CORBA::release (result);
-  CORBA::release (result_list);
-  return 0;
-}
-
-int
-Orbix_Marshal_Client_Proxy::dii_test_union (CORBA_Marshal_Proxy::OPTIONS &options,
-					   CORBA_Marshal_Proxy::RESULTS &results)
-  // unions
-{
-  // DII variables
-  CORBA::Request_ptr     request = CORBA::Request::_nil(); // DII request
-  CORBA::NVList_ptr      arglist = CORBA::NVList::_nil();  // argument list
-  CORBA::Context_ptr     ctx     = CORBA::Context::_nil(); // context
-  CORBA::NVList_ptr result_list  = CORBA::NVList::_nil();  // result list
-  CORBA::NamedValue_ptr result = CORBA::NamedValue::_nil();// actual result
-  Marshal::Marshal_Union u1, *u2 = 0;
-  Marshal::Marshal_Struct ms;
-
-
-  // first test an enumerated case
-  //  u1._d (Marshal::e_1st);
-  u1.l (4567);
-
-  orb_->create_list(2, arglist); // 2 arguments to be added
-  *(arglist->add(CORBA::ARG_IN)->value()) <<= u1;
-  arglist->add(CORBA::ARG_OUT)->value()->replace (Marshal::_tc_Marshal_Union, u2);
-  orb_->create_list(1, result_list); // 1 result
-  result = result_list->item(0);
-
-  // create a request
-  ref_->_create_request(ctx,
-			"test_union",
-			arglist,
-			result,
-			request,
-			0);
-  
-  request->invoke (); // 2 way
-  *(arglist->item(1)->value()) >>= u2;
-
-  if ( (u1._d () == u2->_d()) && (u1.l () == u2->l ()))
-    {
-      ACE_DEBUG ((LM_DEBUG, "DII test_union for long (case e_1st) success\n"));
-    }
-  else
-    {
-      ACE_DEBUG ((LM_DEBUG, "DII test_union for long (case e_1st) failed\n"));
-    }
-  delete u2;
-  CORBA::release (request);
-  CORBA::release (arglist);
-  CORBA::release (result);
-  CORBA::release (result_list);
-
-  // test the default case
-  ms.s = 3;
-  ms.l = 256;
-  ms.c = 'B';
-  ms.o = (CORBA::Octet) 127;
-  ms.d = 3.1415;
-
-  u1.ms (ms);
-  u2 = 0;
-
-  orb_->create_list(2, arglist); // 2 arguments to be added
-  *(arglist->add(CORBA::ARG_IN)->value()) <<= u1;
-  arglist->add(CORBA::ARG_OUT)->value()->replace (Marshal::_tc_Marshal_Union, u2);
-  orb_->create_list(1, result_list); // 1 result
-  result = result_list->item(0);
-
-  // create a request
-  ref_->_create_request(ctx,
-			"test_union",
-			arglist,
-			result,
-			request,
-			0);
-  
-  request->invoke (); // 2 way
-  *(arglist->item(1)->value()) >>= u2;
-
-  if (u1.ms ().s == u2->ms ().s && u1.ms ().l == u2->ms ().l && u1.ms ().c == u2->ms ().c && u1.ms ().o == u2->ms ().o &&
-      u1.ms ().d == u2->ms ().d)
-    {
-      ACE_DEBUG ((LM_DEBUG, "DII test_union for default (case e_6th) success\n"));
-    }
-  else
-    {
-      ACE_DEBUG ((LM_DEBUG, "DII test_union for default (case e_6th) failed\n"));
-    }
-  CORBA::release (request);
-  CORBA::release (arglist);
-  CORBA::release (result);
-  CORBA::release (result_list);
-  return 0;
-}
-
-int
-Orbix_Marshal_Client_Proxy::dii_test_any (CORBA_Marshal_Proxy::OPTIONS &options,
-					 CORBA_Marshal_Proxy::RESULTS &results)
-{
-  // DII variables
-  CORBA::Request_ptr     request = CORBA::Request::_nil(); // DII request
-  CORBA::NVList_ptr      arglist = CORBA::NVList::_nil();  // argument list
-  CORBA::Context_ptr     ctx     = CORBA::Context::_nil(); // context
-  CORBA::NVList_ptr result_list  = CORBA::NVList::_nil();  // result list
-  CORBA::NamedValue_ptr result = CORBA::NamedValue::_nil();// actual result
-  // we send a struct thru the any
-  CORBA::Any a1, *a2;
-  Marshal::Marshal_Struct ms1, *ms2;
-
-  ms1.s = 3;
-  ms1.l = 256;
-  ms1.c = 'B';
-  ms1.o = (CORBA::Octet) 127;
-  ms1.d = 3.1415;
-
-  // populate the any with a MarshalStruct
-  a1 <<= ms1;
-
-  a2 = new CORBA::Any;
-
-  // now test it
-  orb_->create_list(2, arglist); // 2 arguments to be added
-  *(arglist->add(CORBA::ARG_IN)->value()) <<= a1;
-  arglist->add(CORBA::ARG_OUT)->value()->replace (CORBA::_tc_any, a2);
-  orb_->create_list(1, result_list); // 1 result
-  result = result_list->item(0);
-
-  // create a request
-  ref_->_create_request(ctx,
-			"test_any",
-			arglist,
-			result,
-			request,
-			0);
-  
-  request->invoke (); // 2 way
-  *(arglist->item(1)->value()) >>= (*a2);
-
-  // check if the two typecodes are equal
-  if (a2->type ()->equal (Marshal::_tc_Marshal_Struct))
-    {
-      // now see if the values are same
-      ms2 = (Marshal::Marshal_Struct *)a2->value ();
-      if (ms1.s == ms2->s && ms1.l == ms2->l && ms1.c == ms2->c && ms1.o == ms2->o &&
-	  ms1.d == ms2->d)
-	{
-	  ACE_DEBUG ((LM_DEBUG, "DII test_any success\n"));
-	}
-      else
-	{
-	  ACE_DEBUG ((LM_DEBUG, "DII test_any value match failed\n"));
-	}
-    }
-  else
-    {
-      ACE_DEBUG ((LM_DEBUG, "DII test_any failed due to typecode mismatch\n"));
-    }
-  CORBA::release (request);
-  CORBA::release (arglist);
-  CORBA::release (result);
-  CORBA::release (result_list);
-  return 0;
-}
-
-int
-Orbix_Marshal_Client_Proxy::dii_test_sequence (CORBA_Marshal_Proxy::OPTIONS &options,
-					      CORBA_Marshal_Proxy::RESULTS &results)
-{
-  // DII variables
-  CORBA::Request_ptr     request = CORBA::Request::_nil(); // DII request
-  CORBA::NVList_ptr      arglist = CORBA::NVList::_nil();  // argument list
-  CORBA::Context_ptr     ctx     = CORBA::Context::_nil(); // context
-  CORBA::NVList_ptr result_list  = CORBA::NVList::_nil();  // result list
-  CORBA::NamedValue_ptr result = CORBA::NamedValue::_nil();// actual result
-  // make a sequence of Anys and fill each one with a different data type
-  Marshal::AnySeq as1 (7), *as2;
-  Marshal::Marshal_Struct ms;
-  Marshal::Marshal_Union u;
-
-  ms.s = 3;
-  ms.l = 256;
-  ms.c = 'B';
-  ms.o = (CORBA::Octet) 127;
-  ms.d = 3.1415;
-
-  u.ms (ms);
-
-  // it looks like we must tell the sequence how many elements it is going to
-  // carry. By just fixing the max value does not work.
-
-  as1.length (7);
-
-  as1[0] <<= (CORBA::Short)3;
-  as1[1] <<= (CORBA::Long) 256;
-  as1[2] <<= CORBA::Any::from_octet ((CORBA::Octet)127);
-  as1[3] <<= CORBA::Any::from_char ('B');
-  as1[4] <<= (CORBA::Double)3.1415; // double
-  as1[5] <<= ms;     // struct
-  as1[6] <<= u;      // union
-
-  as2 = new Marshal::AnySeq;
-
-  orb_->create_list(2, arglist); // 2 arguments to be added
-  *(arglist->add(CORBA::ARG_IN)->value()) <<= as1;
-  arglist->add(CORBA::ARG_OUT)->value()->replace (Marshal::_tc_AnySeq, as2);
-  orb_->create_list(1, result_list); // 1 result
-  result = result_list->item(0);
-
-  // create a request
-  ref_->_create_request(ctx,
-			"test_sequence",
-			arglist,
-			result,
-			request,
-			0);
-  
-  request->invoke (); // 2 way
-  *(arglist->item(1)->value()) >>= as2;
-
-  ACE_DEBUG ((LM_DEBUG, "DII test_sequence\n"));
-  if (as1.length () == as2->length ())
-    {
-      // now make sure that the elements are same
-      for (int i=0; i < as1.length (); i++)
-	{
-	  if (as1[i].type ()->equal ((*as2)[i].type ()))
-	    {
-	      // now see if the values are same
-	      switch (i)
-		{
-		case 0:
-		  if (*(CORBA::Short *)as1[i].value () == *(CORBA::Short
-							    *)(*as2)[i].value ())
-		    {
-		      ACE_DEBUG ((LM_DEBUG, "\tDII test_sequence, shorts matched\n"));
-		    }
-		  else
-		    {
-		      ACE_DEBUG ((LM_DEBUG, "\tDII test_sequence failed on shorts match\n"));
-		    }
-		  break;
-		case 1:
-		  if (*(CORBA::Long *)as1[i].value () == *(CORBA::Long
-							    *)(*as2)[i].value ())
-		    {
-		      ACE_DEBUG ((LM_DEBUG, "\tDII test_sequence, longs matched\n"));
-		    }
-		  else
-		    {
-		      ACE_DEBUG ((LM_DEBUG, "\tDII test_sequence failed on longs match\n"));
-		    }
-		  break;
-		case 2:
-		  if (*(CORBA::Octet *)as1[i].value () == *(CORBA::Octet
-							    *)(*as2)[i].value ())
-		    {
-		      ACE_DEBUG ((LM_DEBUG, "\tDII test_sequence, octets matched\n"));
-		    }
-		  else
-		    {
-		      ACE_DEBUG ((LM_DEBUG, "\tDII test_sequence failed on octets match\n"));
-		    }
-		  break;
-		case 3:
-		  if (*(CORBA::Char *)as1[i].value () == *(CORBA::Char
-							    *)(*as2)[i].value ())
-		    {
-		      ACE_DEBUG ((LM_DEBUG, "\tDII test_sequence, chars matched\n"));
-		    }
-		  else
-		    {
-		      ACE_DEBUG ((LM_DEBUG, "\tDII test_sequence failed on chars match\n"));
-		    }
-		  break;
-		case 4:
-		  if (*(CORBA::Double *)as1[i].value () == *(CORBA::Double
-							    *)(*as2)[i].value ())
-		    {
-		      ACE_DEBUG ((LM_DEBUG, "\tDII test_sequence, doubles matched\n"));
-		    }
-		  else
-		    {
-		      ACE_DEBUG ((LM_DEBUG, "\tDII test_sequence failed on doubles match\n"));
-		    }
-		  break;
-		case 5:
-		  {
-		    Marshal::Marshal_Struct *ms1, *ms2;
-		    
-		    ms1 = (Marshal::Marshal_Struct *)as1[i].value ();
-		    ms2 = (Marshal::Marshal_Struct *)(*as2)[i].value ();
-
-		    if (ms1->s == ms2->s && ms1->l == ms2->l && ms1->c == ms2->c && ms1->o == ms2->o &&
-			ms1->d == ms2->d)
-		    {
-		      ACE_DEBUG ((LM_DEBUG, "\tDII test_sequence, structs matched\n"));
-		    }
-		  else
-		    {
-		      ACE_DEBUG ((LM_DEBUG, "\tDII test_sequence failed on structs match\n"));
-		    }
-		  }
-		  break;
-		case 6:
-		  {
-		    Marshal::Marshal_Union *u1, *u2;
-		    
-		    u1 = (Marshal::Marshal_Union *)as1[i].value ();
-		    u2 = (Marshal::Marshal_Union *)(*as2)[i].value ();
-
-		    if (u1->_d () == u2->_d () && u1->ms ().s == u2->ms ().s &&
-			u1->ms ().l == u2->ms ().l && 
-			u1->ms ().c == u2->ms ().c && u1->ms ().o == u2->ms ().o &&
-			u1->ms ().d == u2->ms ().d)
-		    {
-		      ACE_DEBUG ((LM_DEBUG, "\tDII test_sequence, unions matched\n"));
-		    }
-		  else
-		    {
-		      ACE_DEBUG ((LM_DEBUG, "\tDII test_sequence failed on unions match\n"));
-		    }
-		  }
-		  break;
-		}
-	    }
-	  else
-	    {
-	      ACE_DEBUG ((LM_DEBUG, 
-			  "DII test_sequence: typecode mismatch for element %d\n", i));
-	      break;
-	    }
-	}
-    }
-  else
-    {
-      ACE_DEBUG ((LM_DEBUG, "DII test_sequence failed: as2->length = %d\n",
-		  as2->length ()));
-    }
-  CORBA::release (request);
-  CORBA::release (arglist);
-  CORBA::release (result);
-  CORBA::release (result_list);
-  return 0;
-}
-
-int
-Orbix_Marshal_Client_Proxy::dii_test_recursive (CORBA_Marshal_Proxy::OPTIONS &options,
-					       CORBA_Marshal_Proxy::RESULTS &results)
-{
-  // we will try a simple one here
-  Marshal::Marshal_Recursive mr1, *elem1, *mr2, *elem2;
-
-  mr1.value <<= (CORBA::Long)1;
-  mr1.next.length (1);  // sequence of length 1
-
-  // fill the element
-  elem1 = &mr1.next[0];
-  elem1->value <<= CORBA::Any::from_char ('D');
-  elem1->next.length (0); // end of seq
-
-  mr2 = new Marshal::Marshal_Recursive;
-
-  try {
-    ref_->test_recursive (mr1, mr2);
-  }
-  catch (CORBA::SystemException &se){
-    cerr << "error invoking request: " << se << endl;
-  }
-
-  elem2 = &mr2->next[0];
-
-  if ((*(CORBA::Long *)mr1.value.value () == *(CORBA::Long*)mr2->value.value ())
-      && (mr1.next.length () == mr2->next.length ()) // same length sequence
-      && (*(CORBA::Char *)elem1->value.value () == *(CORBA::Char *)elem2->value.value ())
-      && (elem1->next.length () == elem2->next.length ()))
-    {
-      ACE_DEBUG ((LM_DEBUG, "DII test_recursive success\n"));
-    }
-  else
-    {
-      ACE_DEBUG ((LM_DEBUG, "DII test_recursive failure\n"));
-    }
-      
-  return 0;
-}
-
diff --git a/TAO/Benchmark/Marshal_Test/Orbix/orbix_marshal_client.h b/TAO/Benchmark/Marshal_Test/Orbix/orbix_marshal_client.h
deleted file mode 100644
index c1d06d03c06..00000000000
--- a/TAO/Benchmark/Marshal_Test/Orbix/orbix_marshal_client.h
+++ /dev/null
@@ -1,123 +0,0 @@
-// ============================================================================
-//
-// = LIBRARY
-//    CORBA Marshal Orbix Benchmark
-// 
-// = FILENAME
-//    orbix_marshal_client.h
-//
-// = AUTHOR
-//    Aniruddha Gokhale
-// 
-// ============================================================================
-
-#if !defined(_ORBIX_MARSHAL_CLIENT_H_)
-#define _ORBIX_MARSHAL_CLIENT_H_
-
-// benchmark library includes
-#include "benchmark/marshal_options.h"
-#include "benchmark/marshal_results.h"
-#include "benchmark/marshal_proxy.h"
-
-// include Orbix specific include files
-#include "marshal.h"  // generated by IDL compiler
-
-class Orbix_Marshal_Client_Proxy : public CORBA_Marshal_Proxy
-{
-  // =TITLE
-  //  Orbix_Marshal_Client_Proxy
-  // =DESCRIPTION
-  //  Orbix client size specialization of the CORBA Marshal proxy class
-public:
-  Orbix_Marshal_Client_Proxy (void);
-  // constructor
-
-  ~Orbix_Marshal_Client_Proxy (void);
-  // destructor
-
-  virtual int run (CORBA_Marshal_Proxy::OPTIONS &options,
-		   CORBA_Marshal_Proxy::RESULTS &results);
-  // do the actual work
-
-  virtual int use_sii (CORBA_Marshal_Proxy::OPTIONS &options,
-		       CORBA_Marshal_Proxy::RESULTS &results);
-  // use the static invocation interface
-
-  virtual int use_dii (CORBA_Marshal_Proxy::OPTIONS &options,
-		       CORBA_Marshal_Proxy::RESULTS &results);
-  // use the dynamic invocation interface
-private:
-  // =helper functions
-  int sii_test_short (CORBA_Marshal_Proxy::OPTIONS &options,
-		      CORBA_Marshal_Proxy::RESULTS &results);
-
-  int sii_test_long (CORBA_Marshal_Proxy::OPTIONS &options,
-		     CORBA_Marshal_Proxy::RESULTS &results);
-
-  int sii_test_octet (CORBA_Marshal_Proxy::OPTIONS &options,
-		      CORBA_Marshal_Proxy::RESULTS &results);
-
-  int sii_test_char (CORBA_Marshal_Proxy::OPTIONS &options,
-		     CORBA_Marshal_Proxy::RESULTS &results);
-
-  int sii_test_double (CORBA_Marshal_Proxy::OPTIONS &options,
-		       CORBA_Marshal_Proxy::RESULTS &results);
-
-  int sii_test_struct (CORBA_Marshal_Proxy::OPTIONS &options,
-		       CORBA_Marshal_Proxy::RESULTS &results);
-
-  int sii_test_union (CORBA_Marshal_Proxy::OPTIONS &options,
-		      CORBA_Marshal_Proxy::RESULTS &results);
-
-  int sii_test_any (CORBA_Marshal_Proxy::OPTIONS &options,
-		    CORBA_Marshal_Proxy::RESULTS &results);
-
-  int sii_test_sequence (CORBA_Marshal_Proxy::OPTIONS &options,
-			 CORBA_Marshal_Proxy::RESULTS &results);
-
-  int sii_test_recursive (CORBA_Marshal_Proxy::OPTIONS &options,
-			  CORBA_Marshal_Proxy::RESULTS &results);
-
-  // all the DII helpers
-  int dii_test_short (CORBA_Marshal_Proxy::OPTIONS &options,
-		      CORBA_Marshal_Proxy::RESULTS &results);
-
-  int dii_test_long (CORBA_Marshal_Proxy::OPTIONS &options,
-		     CORBA_Marshal_Proxy::RESULTS &results);
-
-  int dii_test_octet (CORBA_Marshal_Proxy::OPTIONS &options,
-		      CORBA_Marshal_Proxy::RESULTS &results);
-
-  int dii_test_char (CORBA_Marshal_Proxy::OPTIONS &options,
-		     CORBA_Marshal_Proxy::RESULTS &results);
-
-  int dii_test_double (CORBA_Marshal_Proxy::OPTIONS &options,
-		       CORBA_Marshal_Proxy::RESULTS &results);
-
-  int dii_test_struct (CORBA_Marshal_Proxy::OPTIONS &options,
-		       CORBA_Marshal_Proxy::RESULTS &results);
-
-  int dii_test_union (CORBA_Marshal_Proxy::OPTIONS &options,
-		      CORBA_Marshal_Proxy::RESULTS &results);
-
-  int dii_test_any (CORBA_Marshal_Proxy::OPTIONS &options,
-		    CORBA_Marshal_Proxy::RESULTS &results);
-
-  int dii_test_sequence (CORBA_Marshal_Proxy::OPTIONS &options,
-			 CORBA_Marshal_Proxy::RESULTS &results);
-
-  int dii_test_recursive (CORBA_Marshal_Proxy::OPTIONS &options,
-			  CORBA_Marshal_Proxy::RESULTS &results);
-
-  CORBA::ORB_ptr orb_;
-  // handle to the underlying orb
-
-  Marshal_ptr ref_;
-  // the object reference
-};
-
-#if defined (__ACE_INLINE__)
-#include "orbix_marshal_client.i"
-#endif /* __ACE_INLINE__ */
-
-#endif
diff --git a/TAO/Benchmark/Marshal_Test/Orbix/orbix_marshal_client.i b/TAO/Benchmark/Marshal_Test/Orbix/orbix_marshal_client.i
deleted file mode 100644
index 1165f92fde8..00000000000
--- a/TAO/Benchmark/Marshal_Test/Orbix/orbix_marshal_client.i
+++ /dev/null
@@ -1,21 +0,0 @@
-
-ACE_INLINE
-Orbix_Marshal_Client_Proxy::Orbix_Marshal_Client_Proxy (void)
-  : orb_ (CORBA::ORB::_nil ()),
-    ref_ (0)
-{
-}
-
-ACE_INLINE
-Orbix_Marshal_Client_Proxy::~Orbix_Marshal_Client_Proxy (void)
-{
-  // releasing order is important
-
-  // release the reference
-  CORBA::release (ref_);
-
-  // release the ORB
-  CORBA::release (orb_);
-}
-
-
diff --git a/TAO/Benchmark/Marshal_Test/Orbix/orbix_marshal_impl.cpp b/TAO/Benchmark/Marshal_Test/Orbix/orbix_marshal_impl.cpp
deleted file mode 100644
index 877b8bd1626..00000000000
--- a/TAO/Benchmark/Marshal_Test/Orbix/orbix_marshal_impl.cpp
+++ /dev/null
@@ -1,309 +0,0 @@
-#include "orbix_marshal_impl.h"
-
-#if !defined (__ACE_INLINE__)
-#include "orbix_marshal_impl.i"
-#endif /* __ACE_INLINE__ */
-
-// All the methods of the SSI class
-void
-Marshal_SSI_Impl::test_short (CORBA::Short s1,
-			      CORBA::Short &s2,
-			      CORBA::Environment &IT_env)
-{
-  s2 = 2*s1;
-}
-
-void
-Marshal_SSI_Impl::test_long (CORBA::Long l1,
-			     CORBA::Long &l2,
-			     CORBA::Environment &IT_env)
-{
-  l2 = 3*l1;
-}
-
-void
-Marshal_SSI_Impl::test_octet (CORBA::Octet o1,
-			      CORBA::Octet &o2,
-			      CORBA::Environment &IT_env)
-{
-  o2 = o1;
-}
-
-void
-Marshal_SSI_Impl::test_char (CORBA::Char c1,
-			     CORBA::Char &c2,
-			     CORBA::Environment &IT_env)
-{
-  c2 = c1;
-}
-
-void
-Marshal_SSI_Impl::test_double (CORBA::Double d1,
-			       CORBA::Double &d2,
-			       CORBA::Environment &IT_env)
-{
-  d2 = d1/2;
-}
-
-void
-Marshal_SSI_Impl::test_struct (const Marshal::Marshal_Struct& ms1,
-			       Marshal::Marshal_Struct& ms2,
-			       CORBA::Environment &IT_env)
-{
-  ms2.s = ms1.s;
-  ms2.l = ms1.l;
-  ms2.c = ms1.c;
-  ms2.o = ms1.o;
-  ms2.d = ms1.d;
-}
-
-void
-Marshal_SSI_Impl::test_union (const Marshal::Marshal_Union& u1,
-			      Marshal::Marshal_Union& u2,
-			      CORBA::Environment &IT_env)
-{
-  switch (u1._d ())
-    {
-    case Marshal::e_0th:
-      u2.s (u1.s ()); // set short
-      break;
-    case Marshal::e_1st:
-      u2.l (u1.l ()); // set long
-      break;
-    case Marshal::e_2nd:
-      u2.c (u1.c ()); // set char
-      break;
-    case Marshal::e_3rd:
-      u2.o (u1.o ()); // set octet
-      break;
-    case Marshal::e_4th:
-      u2.d (u1.d ()); // set double
-      break;
-    case Marshal::e_5th:
-    default:
-      u2.ms (u1. ms ()); // set structs
-      break;
-    }
-}
-
-void
-Marshal_SSI_Impl::test_any (const CORBA::Any &a1,
-			    CORBA::Any *&a2,
-			    CORBA::Environment &IT_env)
-{
-  a2 = new CORBA::Any (a1.type (), (void *)a1.value ()); // will do a deep copy
-}
-
-void 
-Marshal_SSI_Impl::test_sequence (const Marshal::AnySeq& as1,
-				 Marshal::AnySeq *& as2,
-				 CORBA::Environment &IT_env)
-{
-  as2 = new Marshal::AnySeq (as1);
-}
-
-void 
-Marshal_SSI_Impl::test_recursive (const Marshal::Marshal_Recursive &mr1,
-				  Marshal::Marshal_Recursive *&mr2,
-				  CORBA::Environment &IT_env)
-{
-}
-
-//----------------------------------------------------------------------------
-//the methods of the DSI implementation class
-
-void
-Marshal_DSI_Impl::invoke (CORBA::ServerRequest& req, CORBA::Environment_ptr
-			  ep, CORBA::Environment &IT_env)
-{
-  ACE_DEBUG ((LM_DEBUG, "************ inside invoke **********\n"));
-  // parse the incoming request and find out for what operation it is. We use a
-  // simple linear search here
-  if (!ACE_OS::strcmp (req.op_name (IT_env), "test_short"))
-    {
-      test_short_skel (req);
-    }
-  else if (!ACE_OS::strcmp (req.op_name (), "test_long"))
-    {
-    }
-  else if (!ACE_OS::strcmp (req.op_name (), "test_octet"))
-    {
-    }
-  else if (!ACE_OS::strcmp (req.op_name (), "test_char"))
-    {
-    }
-  else if (!ACE_OS::strcmp (req.op_name (), "test_double"))
-    {
-    }
-  else if (!ACE_OS::strcmp (req.op_name (), "test_struct"))
-    {
-    }
-  else if (!ACE_OS::strcmp (req.op_name (), "test_union"))
-    {
-    }
-  else if (!ACE_OS::strcmp (req.op_name (), "test_any"))
-    {
-    }
-  else if (!ACE_OS::strcmp (req.op_name (), "test_sequence"))
-    {
-    }
-}
-
-void
-Marshal_DSI_Impl::test_short (CORBA::Short s1,
-			      CORBA::Short &s2)
-{
-  s2 = 5*s1;
-}
-
-void
-Marshal_DSI_Impl::test_long (CORBA::Long l1,
-			     CORBA::Long &l2)
-{
-  l2 = l1;
-}
-
-void
-Marshal_DSI_Impl::test_octet (CORBA::Octet o1,
-			      CORBA::Octet &o2)
-{
-  o2 = o1;
-}
-
-void
-Marshal_DSI_Impl::test_char (CORBA::Char c1,
-			     CORBA::Char &c2)
-{
-  c2 = c1;
-}
-
-void
-Marshal_DSI_Impl::test_double (CORBA::Double d1,
-			       CORBA::Double &d2)
-{
-  d2 = d1;
-}
-
-void
-Marshal_DSI_Impl::test_struct (const Marshal::Marshal_Struct& ms1,
-			       Marshal::Marshal_Struct& ms2)
-{
-  ms2.s = ms1.s;
-  ms2.l = ms1.l;
-  ms2.c = ms1.c;
-  ms2.o = ms1.o;
-  ms2.d = ms1.d;
-}
-
-void
-Marshal_DSI_Impl::test_union (const Marshal::Marshal_Union& u1,
-			      Marshal::Marshal_Union& u2)
-{
-  switch (u1._d ())
-    {
-    case Marshal::e_0th:
-      u2.s (u1.s ()); // set short
-      break;
-    case Marshal::e_1st:
-      u2.l (u1.l ()); // set long
-      break;
-    case Marshal::e_2nd:
-      u2.c (u1.c ()); // set char
-      break;
-    case Marshal::e_3rd:
-      u2.o (u1.o ()); // set octet
-      break;
-    case Marshal::e_4th:
-      u2.d (u1.d ()); // set double
-      break;
-    case Marshal::e_5th:
-    default:
-      u2.ms (u1. ms ()); // set structs
-      break;
-    }
-}
-
-void
-Marshal_DSI_Impl::test_any (const CORBA::Any &a1,
-			    CORBA::Any *&a2)
-{
-  a2 = new CORBA::Any (a1.type (), (void *)a1.value ()); // will do a deep copy
-}
-
-void 
-Marshal_DSI_Impl::test_sequence (const Marshal::AnySeq& as1,
-				 Marshal::AnySeq *& as2)
-{
-  as2 = new Marshal::AnySeq (as1);
-}
-
-void 
-Marshal_DSI_Impl::test_recursive (const Marshal::Marshal_Recursive &mr1,
-				  Marshal::Marshal_Recursive *&mr2)
-{
-}
-
-// all the helper functions for the DSI class
-void 
-Marshal_DSI_Impl::test_short_skel (CORBA::ServerRequest& req)
-{
-  CORBA::NVList_ptr short_nv;
-  CORBA::Any *any_s1, *any_s2;
-  CORBA::Short s1 = 0, s2 = 0;
-
-  orb_->create_list (2, short_nv); // parse 2 args
-  any_s1 = new CORBA::Any (CORBA::_tc_short, &s1, 0);
-  any_s2 = new CORBA::Any (CORBA::_tc_short, &s2, 0);
-  short_nv->add_value ("s1", *any_s1, CORBA::ARG_IN);
-  short_nv->add_value ("s2", *any_s2, CORBA::ARG_OUT);
-
-  req.params (short_nv);
-
-  test_short (s1, s2);
-  ACE_DEBUG ((LM_DEBUG, ">>>>>>>s1 = %d and s2 = %d\n<<<<<<<<", s1, s2));
-}
-
-void 
-Marshal_DSI_Impl::test_long_skel (CORBA::ServerRequest& req)
-{
-}
-
-void 
-Marshal_DSI_Impl::test_octet_skel (CORBA::ServerRequest& req)
-{
-}
-
-void 
-Marshal_DSI_Impl::test_char_skel (CORBA::ServerRequest& req)
-{
-}
-
-void 
-Marshal_DSI_Impl::test_double_skel (CORBA::ServerRequest& req)
-{
-}
-
-void 
-Marshal_DSI_Impl::test_struct_skel (CORBA::ServerRequest& req)
-{
-}
-
-void 
-Marshal_DSI_Impl::test_union_skel (CORBA::ServerRequest& req)
-{
-}
-
-void 
-Marshal_DSI_Impl::test_any_skel (CORBA::ServerRequest& req)
-{
-}
-
-void 
-Marshal_DSI_Impl::test_sequence_skel (CORBA::ServerRequest& req)
-{
-}
-
-void 
-Marshal_DSI_Impl::test_recursive_skel (CORBA::ServerRequest& req)
-{
-}
diff --git a/TAO/Benchmark/Marshal_Test/Orbix/orbix_marshal_impl.h b/TAO/Benchmark/Marshal_Test/Orbix/orbix_marshal_impl.h
deleted file mode 100644
index 850e99c2bee..00000000000
--- a/TAO/Benchmark/Marshal_Test/Orbix/orbix_marshal_impl.h
+++ /dev/null
@@ -1,189 +0,0 @@
-#if !defined (ORBIX_MARSHAL_IMPL_H)
-#define ORBIX_MARSHAL_IMPL_H
-
-// to include DSI related files
-
-#include "ace/OS.h"
-
-#include "marshal.h"
-
-
-class Marshal_SSI_Impl 
-  : public virtual MarshalBOAImpl
-{
-  // =TITLE
-  //  Marshal_SSI_Impl
-  // =DESCRIPTION
-  //  Implementation of the interface using the static skeleton interface
-public:
-  Marshal_SSI_Impl (const char *object_name = (const char *)NULL);
-  // constructor
-
-  ~Marshal_SSI_Impl (void);
-  // destructor
-
-  virtual void test_short (CORBA::Short s1,
-			   CORBA::Short& s2,
-			   CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-  // test short
-	
-  virtual void test_long (CORBA::Long l1,
-			  CORBA::Long& l2,
-			  CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-  // test long
-	
-  virtual void test_octet (CORBA::Octet o1,
-			   CORBA::Octet& o2,
-			   CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-  // test octet
-	
-  virtual void test_char (CORBA::Char c1,
-			  CORBA::Char& c2,
-			  CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-  // test char
-	
-  virtual void test_double (CORBA::Double d1,
-			    CORBA::Double& d2,
-			    CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-  // test double
-	
-  virtual void test_struct (const Marshal::Marshal_Struct& ms1,
-			    Marshal::Marshal_Struct& ms2,
-			    CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-  // test struct
-	
-  virtual void test_union (const Marshal::Marshal_Union& u1,
-			   Marshal::Marshal_Union& u2,
-			   CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-  // test union
-	
-  virtual void test_any (const CORBA::Any& a1,
-			 CORBA::Any *& a2,
-			 CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-  // test any
-	
-  /*
-  virtual void test_sequence (const Marshal::ShortSeq& s1,
-			     const Marshal::LongSeq& l1,
-			     const Marshal::OctetSeq& o1,
-			     const Marshal::CharSeq& c1,
-			     const Marshal::DoubleSeq& d1,
-			     const Marshal::StructSeq& S1,
-			     const Marshal::UnionSeq& U1,
-			     const Marshal::AnySeq& a1,
-			     Marshal::ShortSeq *& s2,
-			     Marshal::LongSeq *& l2,
-			     Marshal::OctetSeq *& o2,
-			     Marshal::CharSeq *& c2,
-			     Marshal::DoubleSeq *& d2,
-			     Marshal::StructSeq *& S2,
-			     Marshal::UnionSeq *& U2,
-			     Marshal::AnySeq *& a2);
-			     */
-  virtual void test_sequence (const Marshal::AnySeq& a1,
-			      Marshal::AnySeq *& a2,
-			      CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-  // test sequence
-
-  virtual void test_recursive (const Marshal::Marshal_Recursive& mr1,
-			       Marshal::Marshal_Recursive *& mr2,
-			       CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-  // test struct
-	
-};
-
-class Marshal_DSI_Impl : public CORBA::DynamicImplementation
-{
-  // =TITLE
-  //  Marshal_DSI_Impl
-  // =DESCRIPTION
-  //  Implementation of the interface using the dynamic skeleton interface
-public:
-  Marshal_DSI_Impl (CORBA::ORB_ptr orb, const char *object_name = (const char *)NULL);
-  // constructor
-
-  ~Marshal_DSI_Impl (void);
-  // destructor
-
-private:
-  virtual void invoke (CORBA::ServerRequest& req, CORBA::Environment_ptr,
-		       CORBA::Environment&IT_env =
-		       CORBA::IT_chooseDefaultEnv()); 
-  // This method is a must
-
-  void test_short (CORBA::Short s1,
-		   CORBA::Short& s2);
-  // test short
-	
-  void test_long (CORBA::Long l1,
-		  CORBA::Long& l2);
-  // test long
-	
-  void test_octet (CORBA::Octet o1,
-		   CORBA::Octet& o2);
-  // test octet
-	
-  void test_char (CORBA::Char c1,
-		  CORBA::Char& c2);
-  // test char
-	
-  void test_double (CORBA::Double d1,
-		    CORBA::Double& d2);
-  // test double
-	
-  void test_struct (const Marshal::Marshal_Struct& ms1,
-		    Marshal::Marshal_Struct& ms2);
-  // test struct
-	
-  void test_union (const Marshal::Marshal_Union& u1,
-		   Marshal::Marshal_Union& u2);
-  // test union
-	
-  void test_any (const CORBA::Any& a1,
-		 CORBA::Any *& a2);
-  // test any
-	
-  void test_sequence (const Marshal::AnySeq& a1,
-		      Marshal::AnySeq *& a2);
-  // test sequence
-
-  void test_recursive (const Marshal::Marshal_Recursive& mr1,
-		       Marshal::Marshal_Recursive *& mr2);
-  // test struct
-	
-private:
-  //= helper functions - they behave as if they were skeletons
-  void test_short_skel (CORBA::ServerRequest& req);
-  void test_long_skel (CORBA::ServerRequest& req);
-  void test_octet_skel (CORBA::ServerRequest& req);
-  void test_char_skel (CORBA::ServerRequest& req);
-  void test_double_skel (CORBA::ServerRequest& req);
-  void test_struct_skel (CORBA::ServerRequest& req);
-  void test_union_skel (CORBA::ServerRequest& req);
-  void test_any_skel (CORBA::ServerRequest& req);
-  void test_sequence_skel (CORBA::ServerRequest& req);
-  void test_recursive_skel (CORBA::ServerRequest& req);
-
-  // we need the orb to create argument lists (NVList) for us
-  CORBA::ORB_ptr orb_; // not owned by us
-
-#if 0
-  CORBA::NVList_ptr short_nv_;
-  CORBA::NVList_ptr long_nv_;
-  CORBA::NVList_ptr octet_nv_;
-  CORBA::NVList_ptr char_nv_;
-  CORBA::NVList_ptr double_nv_;
-  CORBA::NVList_ptr struct_nv_;
-  CORBA::NVList_ptr union_nv_;
-  CORBA::NVList_ptr any_nv_;
-  CORBA::NVList_ptr seq_nv_;
-  CORBA::NVList_ptr recursive_nv_;
-  CORBA::Any_ptr result_; // void result
-#endif
-};
-
-#if defined (__ACE_INLINE__)
-#include "orbix_marshal_impl.i"
-#endif /* __ACE_INLINE__ */
-
-#endif // defined (ORBIX_MARSHAL_IMPL_H)
diff --git a/TAO/Benchmark/Marshal_Test/Orbix/orbix_marshal_impl.i b/TAO/Benchmark/Marshal_Test/Orbix/orbix_marshal_impl.i
deleted file mode 100644
index 4ea7ef56421..00000000000
--- a/TAO/Benchmark/Marshal_Test/Orbix/orbix_marshal_impl.i
+++ /dev/null
@@ -1,27 +0,0 @@
-// constructor
-ACE_INLINE
-Marshal_SSI_Impl::Marshal_SSI_Impl (const char *obj_name)
-  : MarshalBOAImpl (obj_name)
-{
-}
-
-// destructor
-ACE_INLINE
-Marshal_SSI_Impl::~Marshal_SSI_Impl (void)
-{
-}
-
-// constructor
-ACE_INLINE
-Marshal_DSI_Impl::Marshal_DSI_Impl (CORBA::ORB_ptr orb, const char *obj_name)
-  : orb_ (orb)
-{
-}
-
-// destructor
-ACE_INLINE
-Marshal_DSI_Impl::~Marshal_DSI_Impl (void)
-{
-  orb_ = CORBA::ORB::_nil ();
-}
-
diff --git a/TAO/Benchmark/Marshal_Test/Orbix/orbix_marshal_server.cpp b/TAO/Benchmark/Marshal_Test/Orbix/orbix_marshal_server.cpp
deleted file mode 100644
index fb060a2b5e8..00000000000
--- a/TAO/Benchmark/Marshal_Test/Orbix/orbix_marshal_server.cpp
+++ /dev/null
@@ -1,93 +0,0 @@
-// ============================================================================
-//
-// = LIBRARY
-//    CORBA Orbix marshal benchmark
-// 
-// = FILENAME
-//    orbix_marshal_server.cpp
-//
-// = AUTHOR
-//    Aniruddha Gokhale
-// 
-// ============================================================================
-
-//#define USE_INIT
-
-#include "orbix_marshal_server.h"
-
-#if !defined (__ACE_INLINE__)
-#include "orbix_marshal_server.i"
-#endif /* __ACE_INLINE__ */
-
-int
-Orbix_Marshal_Server_Proxy::run (CORBA_Marshal_Proxy::OPTIONS &options,
-				CORBA_Marshal_Proxy::RESULTS &results)
-{
-  char **argv;
-  int argc;
-
-#if 0
-  // get the argument list to be passed on to the ORB_init method
-  argv = options.orb_init_args (argc);
-
-  // get the orb. Pass any ORB_init arguments
-  this->orb_ = CORBA::ORB_init (argc, (char *const *)argv, "Orbix");
-  if (this->orb_ == 0)
-    {
-      ACE_DEBUG ((LM_DEBUG, "ORB_init failed\n"));
-      return -1;
-    }
-
-  // get the argument list to be passed on to the BOA_init method
-  argv = options.orb_init_args (argc);
-
-  // get the orb. Pass any ORB_init arguments
-  this->boa_ = this->orb_->BOA_init (argc, (char *const *)argv, "Orbix_BOA");
-  if (this->boa_ == 0)
-    {
-      ACE_DEBUG ((LM_DEBUG, "ORB_init failed\n"));
-      return -1;
-    }
-#endif
-  // tell the "results" object what file it must store the results into
-  results.filename (options.filename ());
-
-  // use SII or DII accordingly
-  switch (options.policy ())
-    {
-    case CORBA_Marshal_Options::STATIC : // use SSI
-      this->ssi_ = new Marshal_SSI_Impl (options.object_name ());
-      break;
-    case CORBA_Marshal_Options::DYNAMIC : // use DSI
-      //      this->dsi_ = new Marshal_DSI_Impl (this->orb_, ACE_OS::strdup (options.object_name ()));
-      this->dsi_ = new Marshal_DSI_Impl (&CORBA::Orbix, ACE_OS::strdup (options.object_name ()));
-      // register with the BOA
-      try {
-	// we need to do a setImpl
-	//this->boa_->setImpl ("Marshal", *this->dsi_);
-	CORBA::Orbix.setImpl ("Marshal", *this->dsi_);
-      }
-      catch (CORBA::SystemException &se)
-	{
-	  cerr << "system exception in obj_is_ready" << se << endl;
-	}
-      break;
-    default:
-      ACE_DEBUG ((LM_DEBUG, "bad policy\n"));
-      return -1;
-    }
-  
-  ACE_DEBUG ((LM_DEBUG, "Calling impl is ready\n"));
-  try {
-    // call impl_is_ready
-    //    this->boa_->impl_is_ready ((char *)options.service_name ());
-    CORBA::Orbix.impl_is_ready ("marshalDSI");
-  }
-  catch (CORBA::SystemException &se)
-    {
-      cerr << "system exception: " << se << endl;
-    }
-
-  return 0;
-}
-
diff --git a/TAO/Benchmark/Marshal_Test/Orbix/orbix_marshal_server.h b/TAO/Benchmark/Marshal_Test/Orbix/orbix_marshal_server.h
deleted file mode 100644
index fe72344a8bb..00000000000
--- a/TAO/Benchmark/Marshal_Test/Orbix/orbix_marshal_server.h
+++ /dev/null
@@ -1,57 +0,0 @@
-// ============================================================================
-//
-// = LIBRARY
-//    CORBA Marshal Orbix Benchmark
-// 
-// = FILENAME
-//    orbix_marshal_server.h
-//
-// = AUTHOR
-//    Aniruddha Gokhale
-// 
-// ============================================================================
-
-#if !defined(_ORBIX_MARSHAL_SERVER_H_)
-#define _ORBIX_MARSHAL_SERVER_H_
-
-// benchmark library includes
-#include "benchmark/marshal_options.h"
-#include "benchmark/marshal_results.h"
-#include "benchmark/marshal_proxy.h"
-
-// implementation classes
-#include "orbix_marshal_impl.h"
-
-// include Orbix specific include files
-#include "marshal.h"  // generated by IDL compiler
-
-class Orbix_Marshal_Server_Proxy : public CORBA_Marshal_Proxy
-{
-public:
-  Orbix_Marshal_Server_Proxy (void);
-  // constructor
-
-  ~Orbix_Marshal_Server_Proxy (void);
-  // destructor
-
-  virtual int run (CORBA_Marshal_Proxy::OPTIONS &options,
-		   CORBA_Marshal_Proxy::RESULTS &results);
-  // do the actual work
-private:
-  CORBA::ORB_ptr orb_;
-  // underlying orb;
-
-  CORBA::BOA_ptr boa_;
-  // underlying boa;
-
-  Marshal_SSI_Impl *ssi_;
-  Marshal_DSI_Impl *dsi_;
-  // the implementation (SSI or DSI)
-};
-
-
-#if defined (__ACE_INLINE__)
-#include "orbix_marshal_server.i"
-#endif /* __ACE_INLINE__ */
-
-#endif
diff --git a/TAO/Benchmark/Marshal_Test/Orbix/orbix_marshal_server.i b/TAO/Benchmark/Marshal_Test/Orbix/orbix_marshal_server.i
deleted file mode 100644
index f6c5fe36fd3..00000000000
--- a/TAO/Benchmark/Marshal_Test/Orbix/orbix_marshal_server.i
+++ /dev/null
@@ -1,26 +0,0 @@
-// constructor
-ACE_INLINE
-Orbix_Marshal_Server_Proxy::Orbix_Marshal_Server_Proxy (void)
-  : orb_ (0),
-    boa_ (0),
-    ssi_ (0),
-    dsi_ (0)
-{
-}
-
-// destructor
-ACE_INLINE
-Orbix_Marshal_Server_Proxy::~Orbix_Marshal_Server_Proxy (void)
-{
-  // releasing order is important
-
-  // release the impl
-  delete ssi_;
-  delete dsi_;
-
-  // release the BOA
-  CORBA::release (boa_);
-
-  // release the ORB
-  CORBA::release (orb_);
-}
diff --git a/TAO/Benchmark/Marshal_Test/Orbix/run_client b/TAO/Benchmark/Marshal_Test/Orbix/run_client
deleted file mode 100755
index b0f7503d7bc..00000000000
--- a/TAO/Benchmark/Marshal_Test/Orbix/run_client
+++ /dev/null
@@ -1,23 +0,0 @@
-echo "********* Static Invocation Interface **********"
-client -i 1 -h mambo -R s -P S -o ssi_marshal -n marshalSSI -T s
-client -i 1 -h mambo -R s -P S -o ssi_marshal -n marshalSSI -T l
-client -i 1 -h mambo -R s -P S -o ssi_marshal -n marshalSSI -T o
-client -i 1 -h mambo -R s -P S -o ssi_marshal -n marshalSSI -T c
-client -i 1 -h mambo -R s -P S -o ssi_marshal -n marshalSSI -T d
-client -i 1 -h mambo -R s -P S -o ssi_marshal -n marshalSSI -T S
-client -i 1 -h mambo -R s -P S -o ssi_marshal -n marshalSSI -T U
-client -i 1 -h mambo -R s -P S -o ssi_marshal -n marshalSSI -T A
-client -i 1 -h mambo -R s -P S -o ssi_marshal -n marshalSSI -T Q
-#client -i 1 -h mambo -R s -P S -o ssi_marshal -n marshalSSI -T R
-#
-echo "********* Dynamic Invocation Interface **********"
-client -i 1 -h mambo -R s -P D -o ssi_marshal -n marshalSSI -T s
-client -i 1 -h mambo -R s -P D -o ssi_marshal -n marshalSSI -T l
-client -i 1 -h mambo -R s -P D -o ssi_marshal -n marshalSSI -T o
-client -i 1 -h mambo -R s -P D -o ssi_marshal -n marshalSSI -T c
-client -i 1 -h mambo -R s -P D -o ssi_marshal -n marshalSSI -T d
-client -i 1 -h mambo -R s -P D -o ssi_marshal -n marshalSSI -T S
-client -i 1 -h mambo -R s -P D -o ssi_marshal -n marshalSSI -T U
-client -i 1 -h mambo -R s -P D -o ssi_marshal -n marshalSSI -T A
-client -i 1 -h mambo -R s -P D -o ssi_marshal -n marshalSSI -T Q
-
diff --git a/TAO/Benchmark/Marshal_Test/Orbix/run_dsi b/TAO/Benchmark/Marshal_Test/Orbix/run_dsi
deleted file mode 100755
index f44f488aee7..00000000000
--- a/TAO/Benchmark/Marshal_Test/Orbix/run_dsi
+++ /dev/null
@@ -1,4 +0,0 @@
-echo "********* Static Invocation Interface **********"
-client -i 1 -h mambo -R s -P S -n marshalDSI -T s
-echo "********* Dynamic Invocation Interface **********"
-client -i 1 -h mambo -R s -P D -n marshalDSI -T s
diff --git a/TAO/Benchmark/Marshal_Test/Orbix/run_dsi_server b/TAO/Benchmark/Marshal_Test/Orbix/run_dsi_server
deleted file mode 100755
index 19dc309e0dc..00000000000
--- a/TAO/Benchmark/Marshal_Test/Orbix/run_dsi_server
+++ /dev/null
@@ -1 +0,0 @@
-putit marshalDSI "${TAO_ROOT}/Benchmark/Marshal_Test/Orbix/server -R r -P D -I V -o dsi_marshal -n marshalDSI"
\ No newline at end of file
diff --git a/TAO/Benchmark/Marshal_Test/Orbix/run_ssi b/TAO/Benchmark/Marshal_Test/Orbix/run_ssi
deleted file mode 100755
index 9a1ca614e4e..00000000000
--- a/TAO/Benchmark/Marshal_Test/Orbix/run_ssi
+++ /dev/null
@@ -1,4 +0,0 @@
-echo "********* Static Invocation Interface **********"
-client -i 1 -h mambo -R s -P S -o ssi_marshal -n marshalSSI -T s
-echo "********* Dynamic Invocation Interface **********"
-client -i 1 -h mambo -R s -P D -o ssi_marshal -n marshalSSI -T s
diff --git a/TAO/Benchmark/Marshal_Test/Orbix/run_ssi_server b/TAO/Benchmark/Marshal_Test/Orbix/run_ssi_server
deleted file mode 100755
index a0af5a0dcf4..00000000000
--- a/TAO/Benchmark/Marshal_Test/Orbix/run_ssi_server
+++ /dev/null
@@ -1 +0,0 @@
-putit marshalSSI "${TAO_ROOT}/Benchmark/Marshal_Test/Orbix/server -R r -P S -I V -o ssi_marshal -n marshalSSI"
\ No newline at end of file
diff --git a/TAO/Benchmark/Marshal_Test/Orbix/server.cpp b/TAO/Benchmark/Marshal_Test/Orbix/server.cpp
deleted file mode 100644
index dd6902a012d..00000000000
--- a/TAO/Benchmark/Marshal_Test/Orbix/server.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-#include "benchmark/driver.h"
-#include "orbix_marshal_server.h"
-
-int main (int argc, char *argv [])
-{
-  // instantiate a DRIVER with the Orbix_Client_Proxy as the template
-  CORBA_Benchmark_Driver<Orbix_Marshal_Server_Proxy>  driver (new
-							     Orbix_Marshal_Server_Proxy ());
-
-  // let the driver do everything for us so that we remain very simple
-  return driver.run (argc, argv);
-}
diff --git a/TAO/Benchmark/Marshal_Test/TAO/Makefile b/TAO/Benchmark/Marshal_Test/TAO/Makefile
deleted file mode 100644
index 8089081ecce..00000000000
--- a/TAO/Benchmark/Marshal_Test/TAO/Makefile
+++ /dev/null
@@ -1,64 +0,0 @@
-#----------------------------------------------------------------------------
-#	$Id$
-#
-#	Top-level Makefile for the Tao Marshal Benchmark
-#----------------------------------------------------------------------------
-
-#----------------------------------------------------------------------------
-#	Local macros
-#----------------------------------------------------------------------------
-
-LDLIBS     	= -lACE -lbenchmark -lTAO
-
-PROG_SRCS 	= marshalC.cpp marshalS.cpp tao_marshal_client.cpp tao_marshal_server.cpp \
-		  tao_marshal_impl.cpp client.cpp server.cpp
-
-LSRC = $(PROG_SRCS)
-
-MARSHAL_CLIENT_OBJS = marshalC.o tao_marshal_client.o client.o
-
-MARSHAL_SERVER_OBJS = marshalC.o marshalS.o tao_marshal_impl.o tao_marshal_server.o server.o
-
-BIN = client server
-
-BUILD = $(BIN)
-
-VLDLIBS = $(LDLIBS:%=%$(VAR))
-
-#----------------------------------------------------------------------------
-#	Include macros and targets
-#----------------------------------------------------------------------------
-
-include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-include $(ACE_ROOT)/include/makeinclude/macros.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.lib.GNU
-#include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
-
-#----------------------------------------------------------------------------
-# Local modifications to variables imported by includes above.
-#----------------------------------------------------------------------------
-
-ifndef TAO_ROOT
-TAO_ROOT = $(ACE_ROOT)/TAO
-endif
-
-CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/Benchmark -I$(TAO_ROOT)/tao/compat
-server:	$(addprefix $(VDIR),$(MARSHAL_SERVER_OBJS))
-	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS)
-
-client:	$(addprefix $(VDIR),$(MARSHAL_CLIENT_OBJS))
-	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS)
-
-clean:
-	rm -f core *.o *~ client server
-	$(MAKE) realclean
-
-
-
-
-
-
-
diff --git a/TAO/Benchmark/Marshal_Test/TAO/client.cpp b/TAO/Benchmark/Marshal_Test/TAO/client.cpp
deleted file mode 100644
index b38fef81023..00000000000
--- a/TAO/Benchmark/Marshal_Test/TAO/client.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-#include "benchmark/driver.h"
-#include "tao_marshal_client.h"
-
-int main (int argc, char *argv [])
-{
-  // instantiate a DRIVER with the Tao_Client_Proxy as the template
-  CORBA_Benchmark_Driver<Tao_Marshal_Client_Proxy>  driver (new
-							     Tao_Marshal_Client_Proxy ());
-
-  // let the driver do everything for us so that we remain very simple
-  return driver.run (argc, argv);
-}
diff --git a/TAO/Benchmark/Marshal_Test/TAO/marshal.idl b/TAO/Benchmark/Marshal_Test/TAO/marshal.idl
deleted file mode 100644
index 7ddc5423db4..00000000000
--- a/TAO/Benchmark/Marshal_Test/TAO/marshal.idl
+++ /dev/null
@@ -1,89 +0,0 @@
-// Interface for the marshal benchmark
-
-interface Marshal 
-{
-  struct Marshal_Struct
-  {
-    short s;
-    long  l;
-    char  c;
-    octet o;
-    double d;
-  };
-
-  enum discrim {e_0th, e_1st, e_2nd, e_3rd, e_4th, e_5th, e_6th};
-
-  union Marshal_Union
-    switch (discrim)
-      {
-      case e_0th:
-	short s;
-      case e_1st:
-	long  l;
-      case e_2nd:
-	char  c;
-      case e_3rd:
-	octet o;
-      case e_4th:
-	double d;
-      case e_5th:
-      default:      // this will test typecode indirection
-	Marshal_Struct ms;
-      };
-
-  /*
-  typedef sequence<short> ShortSeq;
-  typedef sequence<long>  LongSeq;
-  typedef sequence<octet> OctetSeq;
-  typedef sequence<char>  CharSeq;
-  typedef sequence<double> DoubleSeq;
-  typedef sequence<Marshal_Struct> StructSeq;
-  typedef sequence<Marshal_Union> UnionSeq;
-  */
-  // for testing sequences of Any
-  typedef sequence<any> AnySeq;
-
-  // testing recursive behavior
-  // complex.
-  struct Marshal_Recursive
-  {
-    // we use this to test the limited recursion allowed by IDL. This is an
-    // ideal test for indirected typecodes.
-
-    // simulate a behavior of a list node
-    any value;
-    sequence <Marshal_Recursive> next;
-  };
-
-  void test_short (in short s1, out short s2); // test a short
-  void test_long (in long l1, out long l2); // test a long
-  void test_octet (in octet o1, out octet o2); // test an octet
-  void test_char (in char c1, out char c2); // test a char
-  void test_double (in double d1, out double d2); // test a double
-  void test_struct (in Marshal_Struct ms1, out Marshal_Struct ms2); // test a
-								    // struct 
-  void test_union (in Marshal_Union u1, out Marshal_Union u2); // test a
-							       // union.
-  void test_any (in any a1, out any a2); // test an Any
-  /*
-  void test_sequence (in ShortSeq ss1, in LongSeq ls1, in OctetSeq os1, in
-		      CharSeq cs1, in DoubleSeq ds1, in StructSeq Ss1, in
-		      UnionSeq us1, in AnySeq as1,
-		      out ShortSeq ss2, out LongSeq ls2, out OctetSeq os2, out
-		      CharSeq cs2, out DoubleSeq ds2, out StructSeq Ss2, out
-		      UnionSeq us2, out AnySeq as2);
-		      */
-  void test_sequence (in AnySeq as1, out AnySeq as2); // this will result in a
-						      // 3 level indirection -
-						      // sequence, any, and its
-						      // value type
-  void test_recursive (in Marshal_Recursive mr1, out Marshal_Recursive mr2); //
-						      // very complicated
-};
-
-
-
-
-
-
-
diff --git a/TAO/Benchmark/Marshal_Test/TAO/marshalC.cpp b/TAO/Benchmark/Marshal_Test/TAO/marshalC.cpp
deleted file mode 100644
index 3a8b4465fba..00000000000
--- a/TAO/Benchmark/Marshal_Test/TAO/marshalC.cpp
+++ /dev/null
@@ -1,585 +0,0 @@
-#include <stdio.h>
-#include "marshalC.h"
-
-// constructor
-Marshal::Marshal(STUB_Object *refdata)
-  : CORBA_Object(refdata)
-{
-}
-
-// static duplicate method
-Marshal_ptr Marshal::_duplicate(Marshal_ptr obj)
-{
-  void *dupl;
-
-  if (obj)
-    {
-      obj->AddRef();
-    }
-  return obj;
-}
-
-// static _narrow method
-Marshal_ptr Marshal::_narrow(CORBA_Object_ptr obj)
-{
-  CORBA_Environment env;
-  if (obj->_is_a("IDL:Marshal:1.0", env)){
-    STUB_Object *istub;
-    if (obj->QueryInterface(IID_STUB_Object, (void **)&istub) != NOERROR){
-      return Marshal::_nil();
-    }
-    Marshal_ptr new_obj = new Marshal(istub);
-    return Marshal::_duplicate(new_obj);
-  }
-  return Marshal::_nil();
-}
-
-Marshal_ptr Marshal::_nil()
-{
-  return (Marshal_ptr)NULL;
-}
-
-Marshal::Marshal_Union::Marshal_Union(const Marshal::Marshal_Union& obj) 
-{
-  _disc = obj._d();
-  switch (_disc) {
-  case e_0th:
-    __s = obj.__s;
-    break;
-  case e_1st:
-    __l = obj.__l;
-    break;
-  case e_2nd:
-    __c = obj.__c;
-    break;
-  case e_3rd:
-    __o = obj.__o;
-    break;
-  case e_4th:
-    __d = obj.__d;
-    break;
-  case e_5th:
-  default:
-    __ms = obj.__ms;
-    break;
-  }
-}
-
-Marshal::Marshal_Union& Marshal::Marshal_Union::operator=(const Marshal::Marshal_Union& obj)
-{
-  _disc = obj._d();
-  switch (_disc) {
-  case e_0th:
-    __s = obj.__s;
-    break;
-  case e_1st:
-    __l = obj.__l;
-    break;
-  case e_2nd:
-    __c = obj.__c;
-    break;
-  case e_3rd:
-    __o = obj.__o;
-    break;
-  case e_4th:
-    __d = obj.__d;
-    break;
-  case e_5th:
-  default:
-    __ms = obj.__ms;
-    break;
-  }
-  return *this;
-}
-
-// AnySeq methods
-Marshal::AnySeq::AnySeq (CORBA_ULong max)
-  : _maximum(max),
-    _length(0),
-    _release(CORBA_B_FALSE)
-{
-  if (this->_maximum > 0){
-    this->_buffer = new CORBA_Any [this->_maximum];
-  } else {
-    this->_buffer = 0;
-  }
-}
-
-Marshal::AnySeq::AnySeq (CORBA_ULong max, CORBA_ULong length,
-				  CORBA_Any *value, CORBA_Boolean release)
-  : _maximum(max),
-    _length(length),
-    _buffer(value),
-    _release(release)
-{
-}
-
-Marshal::AnySeq::~AnySeq()
-{
-  this->_maximum = this->_length = 0;
-  if (this->_release != CORBA_B_FALSE)
-    delete this->_buffer;
-}
-
-void Marshal::AnySeq::length (CORBA_ULong newlen)
-{
-  if (newlen > this->_maximum) {
-    CORBA_Any *temp = new CORBA_Any [newlen];
-    ::memcpy(temp, this->_buffer, (size_t(this->_length) * sizeof (CORBA_Any)));
-    if (this->_release)
-      delete this->_buffer;
-    else
-      this->_release = 1;
-
-    this->_maximum = newlen;
-    this->_buffer = temp;
-  }
-  if (newlen > this->_length)
-    memset(&this->_buffer[this->_length], 0, size_t(newlen - this->_length) *
-	   sizeof(CORBA_Any));
-  this->_length = newlen;
-}
-
-CORBA_ULong Marshal::AnySeq::length() const
-{
-  return this->_length;
-}
-
-CORBA_Any &Marshal::AnySeq::operator[](CORBA_ULong index)
-{
-        if (index >= this->_length)
-	  exit(1);
-        return this->_buffer[index];
-}
-
-const CORBA_Any& Marshal::AnySeq::operator[](CORBA_ULong index) const
-{
-        if (index >= this->_length)
-	  exit(1);
-        return this->_buffer[index];
-}
-
-
-/***************** TypeCodes **************/
-// In the typecode, all repoIDs and names are omitted by providing their length
-// as 1 that stands for the NULL terminator
-
-// encapsulated parameters for struct Marshal_Struct typecode
-static const CORBA_Long _oc_Marshal_Struct [] = {
-  MY_BYTE_SEX,   // byte order
-  1, 0, // repoID omitted (16, "IDL:Marshal/Marshal:1.0")
-  1, 0, // struct name (15, "Marshal_Struct") omitted
-  5,     // 5 struct elements
-
-  // short
-  1, 0,  // should be 2, "s",  
-  tk_short,
-
-  // long
-  1, 0, // should be 2, "l",
-  tk_long,
-
-  // char
-  1, 0, // should be 2, "c",
-  tk_char,
-
-  // octet
-  1, 0, // should be 2, "o",
-  tk_octet,
-
-  // double
-  1, 0, // should be 2, "d",
-  tk_double,
-};
-
-
-static CORBA_TypeCode _tc__tc_Marshal_Struct (tk_struct, 
-					      sizeof _oc_Marshal_Struct, 
-					      (unsigned char *) &_oc_Marshal_Struct,
-					      CORBA_B_FALSE);
-CORBA_TypeCode_ptr Marshal::_tc_Marshal_Struct = &_tc__tc_Marshal_Struct;
-
-
-static const CORBA_Long _oc_discrim [] = {
-  MY_BYTE_SEX,          // byte order flag (TRICKY)
-  1, 0, // should be 20, "IDL:Marshal/discrim",
-  1, 0, // should be   8, "discrim",   
-  7,          // 7 elements in the enum
-  
-  1, 0, // 6, "e_0th",       // omitted member name, "e_0th"
-  1, 0, // 6, "e_1st",       // omitted member name, "e_1st"
-  1, 0, // 6, "e_2nd",       // omitted member name, "e_2nd"
-  1, 0, // 6, "e_3rd",       // omitted member name, "e_3rd" 
-  1, 0, // 6, "e_4th",       // omitted member name, "e_4th" 
-  1, 0, // 6, "e_5th",       // omitted member name, "e_5th"
-  1, 0  //6, "e_6th"       // omitted member name, "e_6th"
-};
-
-static CORBA_TypeCode _tc__tc_discrim (tk_enum, 
-				       sizeof _oc_discrim, 
-				       (unsigned char *) &_oc_discrim,
-				       CORBA_B_FALSE);
-
-CORBA_TypeCode_ptr Marshal::_tc_discrim = &_tc__tc_discrim;
-
-// Union
-static const CORBA_Long _oc_Marshal_Union [] = 
-{
-   MY_BYTE_SEX,          // byte order flag (TRICKY)
-   1, 0, // 26, "IDL:Marshal/Marshal_Union",       // omitted repository/type ID
-   1, 0, // 14, "Marshal_Union",       // union name
-   
-   //
-   // discriminant typecode:
-   //
-
-   tk_enum,    // tk_enum
-   80,         // encapsulation length
-     MY_BYTE_SEX,
-     1, 0,         // repoID
-     1, 0,         // name
-     7,                  // 7 elements in the enum
-   
-     1, 0,       // e_Oth
-     1, 0,
-     1, 0,
-     1, 0,
-     1, 0,
-     1, 0,
-     1, 0,       // e_6th
-
-   5,       	// default member index (zero based)
-   6,       	// number of union members
-   
-   // the 1st union branch arm
-   Marshal::e_0th,       // member label value
-   1, 0,       // omitted member name, "s"
-   tk_short,   // member typecode
-   
-   // the 2nd union branch arm
-   Marshal::e_1st,      // member label value
-   1, 0,       // omitted member name, "l"
-   tk_long,    // member typecode
-
-   // the 3rd union branch arm
-   Marshal::e_2nd,      // member label value
-   1, 0,        // omitted member name, "c"
-   tk_char,     // member typecode
-   
-   // the 4th union branch arm
-   Marshal::e_3rd,      // member label value
-   1, 0,        // omitted member name, "o"
-   tk_octet,    // member typecode
-   
-   // the 5th union branch arm
-   Marshal::e_4th,      // member label value
-   1, 0,       // omitted member name, "d"
-   tk_double,
-
-   // the 6th union branch
-   Marshal::e_5th, // member label value
-   1, 0,           // omitted member name, "ms"
-   tk_struct,  // tk_struct
-   84,  // encapsulation length
-   
-     MY_BYTE_SEX,   // byte order
-     1, 0, // repoID omitted (16, "IDL:Marshal/Marshal:1.0")
-     1, 0, // struct name (15, "Marshal_Struct") omitted
-     5,     // 5 struct elements
-
-     // short
-     1, 0,  // should be 2, "s",  
-     tk_short,
-
-     // long
-     1, 0, // should be 2, "l",
-     tk_long,
-
-     // char
-     1, 0, // should be 2, "c",
-     tk_char,
-
-     // octet
-     1, 0, // should be 2, "o",
-     tk_octet,
-
-     // double
-     1, 0, // should be 2, "d",
-     tk_double,
- 
-   // default case
-   6,    // 7th member, default index val
-   1, 0, // struct name "ms"
-   ~0,   // indirected typecode
-   -108  // has to point to tk_struct in this stream
-};
-
-static CORBA_TypeCode _tc__tc_Marshal_Union (tk_union, 
-					     sizeof _oc_Marshal_Union, 
-					     (unsigned char *) &_oc_Marshal_Union,
-					     CORBA_B_FALSE);
-
-CORBA_TypeCode_ptr Marshal::_tc_Marshal_Union = &_tc__tc_Marshal_Union;
-
-// AnySeq
-static const CORBA_Long _oc_AnySeq [] = {
-  MY_BYTE_SEX,  // byte order
-  tk_any,  // sequence of any
-  0,   // a length of 0 => unbounded sequence
-};
-static CORBA_TypeCode _tc__tc_AnySeq (tk_sequence,
-					      sizeof
-					      _oc_AnySeq, 
-					      (unsigned char *)
-					      &_oc_AnySeq,
-					      CORBA_B_FALSE);
-
-CORBA_TypeCode_ptr Marshal::_tc_AnySeq = &_tc__tc_AnySeq; 
-
-/***************** All the methods ********************/
-// test_short
-static const TAO_Param_Data marshal_test_short_paramdata [] = {
-  {_tc_CORBA_Void, PARAM_RETURN, 0},
-  {_tc_CORBA_Short, PARAM_IN, 0},
-  {_tc_CORBA_Short, PARAM_OUT, 0}
-};
-
-static const TAO_Call_Data marshal_test_short_calldata = {
-  "test_short",  // op_name
-  CORBA_B_TRUE,  // twoway, although it returns void
-  3,             // param count
-  & marshal_test_short_paramdata [0], //
-  0, 0
-};
-
-// The stub
-void Marshal::test_short (CORBA_Short s1, CORBA_Short &s2, CORBA_Environment &env)
-{
-  STUB_Object *istub;
-  if (this->QueryInterface (IID_STUB_Object, (void **) &istub) != NOERROR){
-    env.exception (new CORBA_DATA_CONVERSION (COMPLETED_NO));
-    return;
-  }
-  // twoway
-  istub->do_call(env, &marshal_test_short_calldata, 0, &s1, &s2);
-}
-
-// test_long
-static const TAO_Param_Data marshal_test_long_paramdata [] = {
-  {_tc_CORBA_Void, PARAM_RETURN, 0},
-  {_tc_CORBA_Long, PARAM_IN, 0},
-  {_tc_CORBA_Long, PARAM_OUT, 0}
-};
-
-static const TAO_Call_Data marshal_test_long_calldata = {
-  "test_long",  // op_name
-  CORBA_B_TRUE,  // twoway, although it returns void
-  3,             // param count
-  & marshal_test_long_paramdata [0], //
-  0, 0
-};
-
-// The stub
-void Marshal::test_long (CORBA_Long l1, CORBA_Long &l2, CORBA_Environment &env)
-{
-  STUB_Object *istub;
-  if (this->QueryInterface (IID_STUB_Object, (void **) &istub) != NOERROR){
-    env.exception (new CORBA_DATA_CONVERSION (COMPLETED_NO));
-    return;
-  }
-  // twoway
-  istub->do_call(env, &marshal_test_long_calldata, 0, &l1, &l2);
-}
-
-// test_octet
-static const TAO_Param_Data marshal_test_octet_paramdata [] = {
-  {_tc_CORBA_Void, PARAM_RETURN, 0},
-  {_tc_CORBA_Octet, PARAM_IN, 0},
-  {_tc_CORBA_Octet, PARAM_OUT, 0}
-};
-
-static const TAO_Call_Data marshal_test_octet_calldata = {
-  "test_octet",  // op_name
-  CORBA_B_TRUE,  // twoway, although it returns void
-  3,             // param count
-  & marshal_test_octet_paramdata [0], //
-  0, 0
-};
-
-// The stub
-void Marshal::test_octet (CORBA_Octet o1, CORBA_Octet &o2, CORBA_Environment &env)
-{
-  STUB_Object *istub;
-  if (this->QueryInterface (IID_STUB_Object, (void **) &istub) != NOERROR){
-    env.exception (new CORBA_DATA_CONVERSION (COMPLETED_NO));
-    return;
-  }
-  // twoway
-  istub->do_call(env, &marshal_test_octet_calldata, 0, &o1, &o2);
-}
-
-// test_char
-static const TAO_Param_Data marshal_test_char_paramdata [] = {
-  {_tc_CORBA_Void, PARAM_RETURN, 0},
-  {_tc_CORBA_Char, PARAM_IN, 0},
-  {_tc_CORBA_Char, PARAM_OUT, 0}
-};
-
-static const TAO_Call_Data marshal_test_char_calldata = {
-  "test_char",  // op_name
-  CORBA_B_TRUE,  // twoway, although it returns void
-  3,             // param count
-  & marshal_test_char_paramdata [0], //
-  0, 0
-};
-
-// The stub
-void Marshal::test_char (CORBA_Char c1, CORBA_Char &c2, CORBA_Environment &env)
-{
-  STUB_Object *istub;
-  if (this->QueryInterface (IID_STUB_Object, (void **) &istub) != NOERROR){
-    env.exception (new CORBA_DATA_CONVERSION (COMPLETED_NO));
-    return;
-  }
-  // twoway
-  istub->do_call(env, &marshal_test_char_calldata, 0, &c1, &c2);
-}
-
-// test_double
-static const TAO_Param_Data marshal_test_double_paramdata [] = {
-  {_tc_CORBA_Void, PARAM_RETURN, 0},
-  {_tc_CORBA_Double, PARAM_IN, 0},
-  {_tc_CORBA_Double, PARAM_OUT, 0}
-};
-
-static const TAO_Call_Data marshal_test_double_calldata = {
-  "test_double",  // op_name
-  CORBA_B_TRUE,  // twoway, although it returns void
-  3,             // param count
-  & marshal_test_double_paramdata [0], //
-  0, 0
-};
-
-// The stub
-void Marshal::test_double (CORBA_Double d1, CORBA_Double &d2, CORBA_Environment &env)
-{
-  STUB_Object *istub;
-  if (this->QueryInterface (IID_STUB_Object, (void **) &istub) != NOERROR){
-    env.exception (new CORBA_DATA_CONVERSION (COMPLETED_NO));
-    return;
-  }
-  // twoway
-  istub->do_call (env, &marshal_test_double_calldata, 0, &d1, &d2);
-}
-
-// test_struct
-static const TAO_Param_Data marshal_test_struct_paramdata [] = {
-  {_tc_CORBA_Void, PARAM_RETURN, 0},
-  {Marshal::_tc_Marshal_Struct, PARAM_IN, 0},
-  {Marshal::_tc_Marshal_Struct, PARAM_OUT, 0}
-};
-
-static const TAO_Call_Data marshal_test_struct_calldata = {
-  "test_struct",  // op_name
-  CORBA_B_TRUE,  // twoway, although it returns void
-  3,             // param count
-  & marshal_test_struct_paramdata [0], //
-  0, 0
-};
-
-// The stub
-void Marshal::test_struct (const Marshal::Marshal_Struct &ms1, Marshal::Marshal_Struct
-			   &ms2, CORBA_Environment &env) 
-{
-  STUB_Object *istub;
-  if (this->QueryInterface (IID_STUB_Object, (void **) &istub) != NOERROR){
-    env.exception (new CORBA_DATA_CONVERSION (COMPLETED_NO));
-    return;
-  }
-  // twoway
-  istub->do_call(env, &marshal_test_struct_calldata, 0, &ms1, &ms2);
-}
-
-// test_union
-static const TAO_Param_Data marshal_test_union_paramdata [] = {
-  {_tc_CORBA_Void, PARAM_RETURN, 0},
-  {Marshal::_tc_Marshal_Union, PARAM_IN, 0},
-  {Marshal::_tc_Marshal_Union, PARAM_OUT, 0}
-};
-
-static const TAO_Call_Data marshal_test_union_calldata = {
-  "test_union",  // op_name
-  CORBA_B_TRUE,  // twoway, although it returns void
-  3,             // param count
-  & marshal_test_union_paramdata [0], //
-  0, 0
-};
-
-// The stub
-void Marshal::test_union (const Marshal_Union &u1, Marshal::Marshal_Union
-			   &u2, CORBA_Environment &env) 
-{
-  STUB_Object *istub;
-  if (this->QueryInterface (IID_STUB_Object, (void **) &istub) != NOERROR){
-    env.exception (new CORBA_DATA_CONVERSION (COMPLETED_NO));
-    return;
-  }
-  // twoway
-  istub->do_call (env, &marshal_test_union_calldata, 0, &u1, &u2);
-}
-
-// test_any
-static const TAO_Param_Data marshal_test_any_paramdata [] = {
-  {_tc_CORBA_Void, PARAM_RETURN, 0},
-  {_tc_CORBA_Any, PARAM_IN, 0},
-  {_tc_CORBA_Any, PARAM_OUT, 0}
-};
-
-static const TAO_Call_Data marshal_test_any_calldata = {
-  "test_any",  // op_name
-  CORBA_B_TRUE,  // twoway, although it returns void
-  3,             // param count
-  & marshal_test_any_paramdata[0], //
-  0, 0
-};
-
-// The stub
-void Marshal::test_any (const CORBA_Any &a1, CORBA_Any *&a2, CORBA_Environment &env)
-{
-  STUB_Object *istub;
-  if (this->QueryInterface (IID_STUB_Object, (void **) &istub) != NOERROR){
-    env.exception (new CORBA_DATA_CONVERSION (COMPLETED_NO));
-    return;
-  }
-  // twoway
-  istub->do_call(env, &marshal_test_any_calldata, 0, &a1, &a2);
-}
-
-// test_sequence
-static const TAO_Param_Data marshal_test_sequence_paramdata [] = {
-  { _tc_CORBA_Void, PARAM_RETURN, 0},
-  { Marshal::_tc_AnySeq, PARAM_IN, 0},
-  { Marshal::_tc_AnySeq, PARAM_OUT, 0}
-};
-
-static const TAO_Call_Data marshal_test_sequence_calldata = {
-  "test_sequence",  // opname
-  CORBA_B_TRUE,   // twoway
-  2,               // param count
-  &marshal_test_sequence_paramdata [0],
-  0, 0
-};
-
-// stub
-void Marshal::test_sequence (const Marshal::AnySeq &as1, Marshal::AnySeq *&as2,
-				 CORBA_Environment &env)
-{
-  STUB_Object *istub;
-  if (this->QueryInterface (IID_STUB_Object, (void **) &istub) != NOERROR){
-    env.exception (new CORBA_DATA_CONVERSION (COMPLETED_NO));
-    return;
-  }
-  // twoway
-  istub->do_call(env, &marshal_test_sequence_calldata, 0, &as1, &as2);
-}
-
diff --git a/TAO/Benchmark/Marshal_Test/TAO/marshalC.h b/TAO/Benchmark/Marshal_Test/TAO/marshalC.h
deleted file mode 100644
index 505de16fafb..00000000000
--- a/TAO/Benchmark/Marshal_Test/TAO/marshalC.h
+++ /dev/null
@@ -1,194 +0,0 @@
-/**************************************************************************
-This file has been hand-crafted to work with the ORB API of TAO
-***************************************************************************/
-
-#ifndef MARSHAL_C_H
-#define MARSHAL_C_H
-
-#include <stdlib.h>
-#include <string.h>
-
-#include "tao/orb.h"
-#include "tao/orbobj.h"
-#include "tao/object.h"
-#include "tao/stub.h"
-#include "tao/typecode.h"
-#include "tao/cdr.h"
-
-class Marshal;
-typedef Marshal *Marshal_ptr;
-typedef Marshal_ptr MarshalRef;
-
-class Marshal: public virtual CORBA_Object
-{
-public:
-  static Marshal_ptr _duplicate (Marshal_ptr obj);
-  static Marshal_ptr _narrow (CORBA_Object_ptr obj);
-  static Marshal_ptr _nil ();
-
-  struct Marshal_Struct {
-    CORBA_Short	s;
-    CORBA_Long	l;
-    CORBA_Char	c;
-    CORBA_Octet	o;
-    CORBA_Double	d;
-  };
-  static CORBA_TypeCode_ptr _tc_Marshal_Struct;
-
-  enum discrim {
-    e_0th,
-    e_1st,
-    e_2nd,
-    e_3rd,
-    e_4th,
-    e_5th,
-    e_6th
-  };
-
-  static CORBA_TypeCode_ptr _tc_discrim;
-
-  class Marshal_Union
-  {
-  private:
-    discrim	_disc;
-    CORBA_Short	__s;
-    CORBA_Long	__l;
-    CORBA_Char	__c;
-    CORBA_Octet	__o;
-    CORBA_Double	__d;
-    Marshal::Marshal_Struct	__ms;
-  public:
-    Marshal_Union() : _disc(discrim(0)) {}
-    ~Marshal_Union() {}
-    Marshal_Union(const Marshal_Union& obj);
-    Marshal_Union& operator=(const Marshal_Union& obj);
-	
-    void _d(discrim val) { _disc = val; }
-    discrim _d() const { return _disc; }
-	
-    void s(CORBA_Short val) {
-      __s = val;
-      _disc = Marshal::e_0th;
-    }
-    CORBA_Short s() const { return __s; }
-	
-    void l(CORBA_Long val) {
-      __l = val;
-      _disc = Marshal::e_1st;
-    }
-    CORBA_Long l() const { return __l; }
-	
-    void c(CORBA_Char val) {
-      __c = val;
-      _disc = Marshal::e_2nd;
-    }
-    CORBA_Char c() const { return __c; }
-	
-    void o(CORBA_Octet val) {
-      __o = val;
-      _disc = Marshal::e_3rd;
-    }
-    CORBA_Octet o() const { return __o; }
-	
-    void d(CORBA_Double val) {
-      __d = val;
-      _disc = Marshal::e_4th;
-    }
-    CORBA_Double d() const { return __d; }
-	
-    void ms(const Marshal::Marshal_Struct& val) {
-      __ms = val;
-      _disc = Marshal::e_5th;
-    }
-    const Marshal::Marshal_Struct& ms() const { return __ms; }
-    Marshal::Marshal_Struct& ms() { return __ms; }
-	
-  };
-	
-  static CORBA_TypeCode_ptr _tc_Marshal_Union;
-
-  class AnySeq
-  {
-  public:
-    static CORBA_Any *allocbuf (CORBA_ULong nelems);
-    static void freebuf (CORBA_Any *data);
-    AnySeq (CORBA_ULong max=0);
-    AnySeq (CORBA_ULong max,
-	    CORBA_ULong length,
-	    CORBA_Any *value,
-	    CORBA_Boolean release = CORBA_B_FALSE
-	    );
-    //    AnySeq (const AnySeq&);
-    ~AnySeq ();
-    CORBA_ULong maximum () const;
-    void length (CORBA_ULong);
-    CORBA_ULong length () const;
-    CORBA_Any &operator[] (CORBA_ULong index);
-    const CORBA_Any &operator[] (CORBA_ULong index) const;
-  private:
-    CORBA_ULong _maximum;
-    CORBA_ULong _length;
-    CORBA_Any *_buffer;
-    CORBA_Boolean _release;
-  };
-  static CORBA_TypeCode_ptr _tc_AnySeq;
-
-
-  // now the methods
-  virtual void test_short(CORBA_Short s1,
-			  CORBA_Short& s2,
-			  CORBA_Environment &env);
-	
-  virtual void test_long(CORBA_Long l1,
-			 CORBA_Long& l2,
-			 CORBA_Environment &env);
-	
-  virtual void test_octet(CORBA_Octet o1,
-			  CORBA_Octet& o2,
-			  CORBA_Environment &env);
-	
-  virtual void test_char(CORBA_Char c1,
-			 CORBA_Char& c2,
-			 CORBA_Environment &env);
-	
-  virtual void test_double(CORBA_Double d1,
-			   CORBA_Double& d2,
-			   CORBA_Environment &env);
-	
-  virtual void test_struct(const Marshal::Marshal_Struct& ms1,
-			   Marshal::Marshal_Struct& ms2,
-			   CORBA_Environment &env);
-	
-  virtual void test_union(const Marshal::Marshal_Union& u1,
-			  Marshal::Marshal_Union& u2,
-			  CORBA_Environment &env);
-	
-  virtual void test_any(const CORBA_Any& a1,
-			CORBA_Any *& a2,
-			CORBA_Environment &env);
-	
-  virtual void test_sequence(const Marshal::AnySeq& as1,
-			     Marshal::AnySeq *& as2,
-			     CORBA_Environment &env);
-	
-#if 0
-  virtual void test_recursive(const Marshal::Marshal_Recursive& mr1,
-			      Marshal::Marshal_Recursive *& mr2,
-			      CORBA_Environment &env);
-#endif
-
-protected:
-  Marshal() {}
-  Marshal(STUB_Object *refdata);
-  virtual ~Marshal() {}
-
-private:
-  Marshal(const Marshal &) {}
-  void operator=(const Marshal &) {}
-};
-
-#endif
-
-
-
-
diff --git a/TAO/Benchmark/Marshal_Test/TAO/marshalS.cpp b/TAO/Benchmark/Marshal_Test/TAO/marshalS.cpp
deleted file mode 100644
index c265e7c9c2f..00000000000
--- a/TAO/Benchmark/Marshal_Test/TAO/marshalS.cpp
+++ /dev/null
@@ -1,168 +0,0 @@
-#include <iostream.h>
-#include "marshalS.h"
-
-static const TAO_operation_db_entry Marshal_operations[] = {
-  {"_is_a", &_skel_Marshal::_Marshal_is_a_skel},
-  { "test_short", &_skel_Marshal::_Marshal_test_short_skel},
-  { "test_long", &_skel_Marshal::_Marshal_test_long_skel},
-  { "test_octet", &_skel_Marshal::_Marshal_test_octet_skel},
-  { "test_char", &_skel_Marshal::_Marshal_test_char_skel},
-  { "test_double", &_skel_Marshal::_Marshal_test_double_skel},
-  { "test_struct", &_skel_Marshal::_Marshal_test_struct_skel},
-  { "test_union", &_skel_Marshal::_Marshal_test_union_skel},
-  { "test_any", &_skel_Marshal::_Marshal_test_any_skel},
-  { "test_sequence", &_skel_Marshal::_Marshal_test_sequence_skel},
-  { 0, 0 }
-};
-
-TAO_Dynamic_Hash_OpTable tao_Marshal_optable(Marshal_operations, 10,
-					     // 9 + 1 operations on our 
-					     // interface 
-					     20);
-// constructor
-_skel_Marshal::_skel_Marshal (const char *obj_name)
-{
-  const CORBA_String repoID = "IDL:Marshal:1.0"; // repository ID
-  IIOP_Object *data;  // IIOP object 
-  CORBA_BOA_ptr oa = TAO_OA_PARAMS::instance()->oa(); // underlying BOA
-  this->optable_ = &tao_Marshal_optable;     // operation database
-  CORBA_Long i;
-
-  // setup an IIOP object
-  data = new IIOP_Object (CORBA_string_dup (repoID));
-  data->profile.iiop_version.major = IIOP::MY_MAJOR;
-  data->profile.iiop_version.minor = IIOP::MY_MINOR;
-  data->profile.host = ACE_OS::strdup(oa->get_addr().get_host_name());
-  data->profile.port = oa->get_addr().get_port_number();
-  data->profile.object_key.length = ACE_OS::strlen(obj_name);
-  data->profile.object_key.maximum = data->profile.object_key.length;
-  data->profile.object_key.buffer = new CORBA_Octet [(size_t)data->profile.object_key.length+1];
-  ACE_OS::memcpy (data->profile.object_key.buffer, obj_name,
-		  data->profile.object_key.length); // set the object key
-  this->set_parent(data);  // store the IIOP obj reference with ourselves
-  this->sub_ = this;               // set the most derived class to be ourselves
-  if (oa) oa->bind(data->profile.object_key, this);// register ourselves
-}
-
-// skeletons
-void _skel_Marshal::_Marshal_test_short_skel(CORBA_ServerRequest &req, 
-					     CORBA_Object_ptr obj, 
-					     CORBA_Environment &env)
-{
-#if 0
-  CORBA_NVList_ptr        nvlist;
-  CORBA_NamedValue_ptr    nv;
-  CORBA_Any               temp_value(_tc_CORBA_Short);
-  Marshal_ptr       impl;
-
-  // now create a request and populate it with the typecodes
-  req.orb()->create_list (0, nvlist);
-  nv = nvlist->add_value(0, temp_value, CORBA_ARG_IN, env);
-
-  // retrieve params - call the interpreter to interpret the parameters for us.
-  req.params(nvlist, env);
-
-  Marshal::ShortSeq *value = (Marshal::ShortSeq *)nv->value()->value();
-
-  // now invoke the implementation
-  impl = (Marshal_ptr)(obj->get_subclass());
-  // now the magic of dynamic binding
-  impl->sendShortSeq(*value, env);
-
-  // result - NO result
-  CORBA_Any *any = new CORBA_Any(_tc_CORBA_Void, 0, CORBA_B_TRUE);
-  req.result(any, env);
-#endif
-
-  // One immediate thought is to do the following:
-  // define a specialized marshal factory derived from TAO_Marshal_Factory
-  // then:
-  // CDR compiledStream (req._incoming.next, req._incoming.remaining,
-  // byte_order, consume_buf = 0, instance of our marshal factory
-}
-
-void _skel_Marshal::_Marshal_test_long_skel(CORBA_ServerRequest &req, 
-					    CORBA_Object_ptr obj, 
-					    CORBA_Environment &env)
-{
-}
-
-void _skel_Marshal::_Marshal_test_octet_skel(CORBA_ServerRequest &req, 
-					     CORBA_Object_ptr obj, 
-					     CORBA_Environment &env)
-{
-}
-
-void _skel_Marshal::_Marshal_test_char_skel(CORBA_ServerRequest &req, 
-					    CORBA_Object_ptr obj, 
-					    CORBA_Environment &env)
-{
-}
-
-void _skel_Marshal::_Marshal_test_double_skel(CORBA_ServerRequest &req, 
-					      CORBA_Object_ptr obj, 
-					      CORBA_Environment &env)
-{
-}
-
-void _skel_Marshal::_Marshal_test_struct_skel(CORBA_ServerRequest &req, 
-					      CORBA_Object_ptr obj, 
-					      CORBA_Environment &env)
-{
-}
-
-void _skel_Marshal::_Marshal_test_union_skel(CORBA_ServerRequest &req, 
-					     CORBA_Object_ptr obj, 
-					     CORBA_Environment &env)
-{
-}
-
-void _skel_Marshal::_Marshal_test_any_skel(CORBA_ServerRequest &req, 
-					   CORBA_Object_ptr obj, 
-					   CORBA_Environment &env)
-{
-}
-
-void _skel_Marshal::_Marshal_test_sequence_skel(CORBA_ServerRequest &req, 
-						CORBA_Object_ptr obj, 
-						CORBA_Environment &env)
-{
-}
-
-void _skel_Marshal::_Marshal_is_a_skel (
-					CORBA_ServerRequest	&req,
-					CORBA_Object_ptr    obj,
-					CORBA_Environment		&env
-					)
-{
-  CORBA_NVList_ptr		nvlist;
-  CORBA_NamedValue_ptr	nv;
-  CORBA_Any			temp_value (_tc_CORBA_String);
-  char *type_id = "IDL:Marshal:1.0";
-
-  req.orb()->create_list (0, nvlist);
-  nv = nvlist->add_value (0, temp_value, CORBA_ARG_IN, env);
-
-  req.params (nvlist, env);
-  if (env.exception () != 0) {
-    dexc (env, "is_a_skel, get params");
-    return;
-  }
-
-  CORBA_Boolean		*retval;
-  CORBA_String		value = *(CORBA_String *)nv->value ()->value ();
-
-  cout << "object id = " << ((char *)value) << endl;
-  if (strcmp ((char *)value, (char *)type_id) == 0
-      || strcmp ((char *)value, _tc_CORBA_Object->id(env)) == 0)
-    retval = new CORBA_Boolean (CORBA_B_TRUE);
-  else
-    retval = new CORBA_Boolean (CORBA_B_FALSE);
-
-  CORBA_Any  		*any =
-    new CORBA_Any (_tc_CORBA_Boolean, retval, CORBA_B_TRUE);
-
-  req.result (any, env);
-  dexc (env, "_is_a, result");
-}
-
diff --git a/TAO/Benchmark/Marshal_Test/TAO/marshalS.h b/TAO/Benchmark/Marshal_Test/TAO/marshalS.h
deleted file mode 100644
index 5980be4f737..00000000000
--- a/TAO/Benchmark/Marshal_Test/TAO/marshalS.h
+++ /dev/null
@@ -1,108 +0,0 @@
-/**************************************************************************
-This file has been hand-crafted to work with the ORB API of TAO
-***************************************************************************/
-
-#ifndef MARSHAL_S_H
-#define MARSHAL_S_H
-
-#include <stdlib.h>
-#include <string.h>
-
-#include "marshalC.h"
-#include "tao/connect.h"
-#include "tao/orb.h"
-#include "tao/params.h"
-#include "tao/iiopobj.h"
-#include "tao/optable.h"  // for registering our methods
-#include "tao/corbacom.h"
-#include "tao/nvlist.h"
-#include "tao/orbobj.h"
-#include "tao/debug.h"
-
-
-class _skel_Marshal;
-typedef _skel_Marshal *_skel_Marshal_ptr;
-typedef _skel_Marshal *_skel_Marshal_ref;
-
-class _skel_Marshal: public Marshal
-{
-public:
-  // pure virtual functions implemented by the implementation class
-  virtual void test_short(CORBA_Short s1,
-			  CORBA_Short& s2,
-			  CORBA_Environment &env) = 0;
-	
-  virtual void test_long(CORBA_Long l1,
-			 CORBA_Long& l2,
-			 CORBA_Environment &env) = 0;
-	
-  virtual void test_octet(CORBA_Octet o1,
-			  CORBA_Octet& o2,
-			  CORBA_Environment &env) = 0;
-	
-  virtual void test_char(CORBA_Char c1,
-			 CORBA_Char& c2,
-			 CORBA_Environment &env) = 0;
-	
-  virtual void test_double(CORBA_Double d1,
-			   CORBA_Double& d2,
-			   CORBA_Environment &env) = 0;
-	
-  virtual void test_struct(const Marshal::Marshal_Struct& ms1,
-			   Marshal::Marshal_Struct& ms2,
-			   CORBA_Environment &env) = 0;
-	
-  virtual void test_union(const Marshal::Marshal_Union& u1,
-			  Marshal::Marshal_Union& u2,
-			  CORBA_Environment &env) = 0;
-	
-  virtual void test_any(const CORBA_Any& a1,
-			CORBA_Any *& a2,
-			CORBA_Environment &env) = 0;
-	
-  virtual void test_sequence(const Marshal::AnySeq& as1,
-			     Marshal::AnySeq *& as2,
-			     CORBA_Environment &env) = 0;
-	
-
-  // skeletons that do the upcall
-  static void _Marshal_is_a_skel (CORBA_ServerRequest &req, 
-				  CORBA_Object_ptr obj,
-				  CORBA_Environment &env);
-  static void _Marshal_test_short_skel (CORBA_ServerRequest &req,
-					CORBA_Object_ptr obj,
-					CORBA_Environment &env);
-  static void _Marshal_test_long_skel  (CORBA_ServerRequest &req,
-					CORBA_Object_ptr obj,
-					CORBA_Environment &env);
-  static void _Marshal_test_octet_skel (CORBA_ServerRequest &req,
-					CORBA_Object_ptr obj,
-					CORBA_Environment &env);
-  static void _Marshal_test_char_skel (CORBA_ServerRequest &req,
-				       CORBA_Object_ptr obj,
-				       CORBA_Environment &env);
-  static void _Marshal_test_double_skel (CORBA_ServerRequest &req,
-					 CORBA_Object_ptr obj,
-					 CORBA_Environment &env);
-  static void _Marshal_test_struct_skel (CORBA_ServerRequest &req,
-					 CORBA_Object_ptr obj,
-					 CORBA_Environment &env);
-  static void _Marshal_test_union_skel (CORBA_ServerRequest &req,
-					CORBA_Object_ptr obj,
-					CORBA_Environment &env);
-  static void _Marshal_test_any_skel (CORBA_ServerRequest &req,
-				      CORBA_Object_ptr obj,
-				      CORBA_Environment &env);
-  static void _Marshal_test_sequence_skel (CORBA_ServerRequest &req,
-					   CORBA_Object_ptr obj,
-					   CORBA_Environment &env);
-protected:
-  _skel_Marshal (const char *obj_name = 0);
-  virtual ~_skel_Marshal () {}
-};
-
-#endif
-
-
-
-
diff --git a/TAO/Benchmark/Marshal_Test/TAO/server.cpp b/TAO/Benchmark/Marshal_Test/TAO/server.cpp
deleted file mode 100644
index 930322be5c3..00000000000
--- a/TAO/Benchmark/Marshal_Test/TAO/server.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-#include "benchmark/driver.h"
-#include "tao_marshal_server.h"
-
-int main (int argc, char *argv [])
-{
-  // instantiate a DRIVER with the Tao_Client_Proxy as the template
-  CORBA_Benchmark_Driver<Tao_Marshal_Server_Proxy>  driver (new
-							     Tao_Marshal_Server_Proxy ());
-
-  // let the driver do everything for us so that we remain very simple
-  return driver.run (argc, argv);
-}
diff --git a/TAO/Benchmark/Marshal_Test/TAO/tao_marshal_client.cpp b/TAO/Benchmark/Marshal_Test/TAO/tao_marshal_client.cpp
deleted file mode 100644
index 157050ba3d8..00000000000
--- a/TAO/Benchmark/Marshal_Test/TAO/tao_marshal_client.cpp
+++ /dev/null
@@ -1,1424 +0,0 @@
-// ============================================================================
-//
-// = LIBRARY
-//    CORBA Tao marshal benchmark
-// 
-// = FILENAME
-//    tao_marshal_proxy.cpp
-//
-// = AUTHOR
-//    Aniruddha Gokhale
-// 
-// ============================================================================
-
-#include <iostream.h>
-#include <fstream.h>
-#include "tao_marshal_client.h"
-
-#if !defined (__ACE_INLINE__)
-#include "tao_marshal_client.i"
-#endif /* __ACE_INLINE__ */
-
-int
-Tao_Marshal_Client_Proxy::run (CORBA_Marshal_Proxy::OPTIONS &options,
-				CORBA_Marshal_Proxy::RESULTS &results)
-{
-  char **argv;
-  int argc;
-  CORBA_Object_ptr target;
-  CORBA_Environment env;
-  CORBA_String str; // IOR
-  fstream iorfile; // persistent storage
-
-  // get the argument list to be passed on to the ORB_init method
-  argv = options.orb_init_args (argc);
-
-  // get the orb. Pass any ORB_init arguments
-  this->orb_ = CORBA_ORB_init (argc, (char *const *)argv, "IOR", env);
-  if (this->orb_ == 0)
-    {
-      ACE_DEBUG ((LM_DEBUG, "ORB_init failed\n"));
-      return -1;
-    }
-
-  str = CORBA_string_alloc(500);
-
-  // read the IOR from the file ior.txt
-  iorfile.open("ior.txt", ios::in);
-  iorfile >> ((char *)str);
-  iorfile.close();
-
-  cout << "Read IOR string as: " << ((char *)str) << endl;
-
-  target = this->orb_->string_to_object(str, env);
-  if (env.exception() != 0){
-    ACE_DEBUG ((LM_ERROR, "str to obj failed"));
-    return 1;
-  }
-  CORBA_string_free(str);
-
-#if 0
-  // get the obj ref by binding it to the specified host using the specified obj_name
-  target = Marshal::_bind (options.object_name (), options.hostname ());
-  if (CORBA_is_nil (target))
-    {
-      ACE_DEBUG ((LM_DEBUG, "bind call failed\n"));
-      return -1;
-    }
-#endif
-
-  this->ref_ = Marshal::_narrow (target);
-  if (CORBA_is_nil (this->ref_))
-    {
-      ACE_DEBUG ((LM_DEBUG, "narrow to Marshal failed\n"));
-      return -1;
-    }
-
-  // tell the "results" object what file it must store the results into
-  results.filename (options.filename ());
-
-  // use SII or DII accordingly
-  switch (options.policy ())
-    {
-    case CORBA_Marshal_Options::STATIC : // use SII
-      return this->use_sii (options, results);
-      break;
-    case CORBA_Marshal_Options::DYNAMIC : // use DII
-      return this->use_dii (options, results);
-      break;
-    default:
-      ACE_DEBUG ((LM_DEBUG, "bad policy\n"));
-      return -1;
-    }
-  // hopefully we are never here, else something is seriously wrong
-  return -1;
-}
-
-int
-Tao_Marshal_Client_Proxy::use_sii (CORBA_Marshal_Proxy::OPTIONS &options,
-				    CORBA_Marshal_Proxy::RESULTS &results)
-{
-  int i;
-  int status = 0;
-  // This method tests the static invocation interface
-
-  for (i=0; i < options.iterations () && !status; i++)
-    {
-      switch (options.data_type ())
-	{
-	  // shorts
-	case CORBA_Marshal_Options::SHORT:
-	  status = sii_test_short (options, results);
-	  break;
-	  // longs
-	case CORBA_Marshal_Options::LONG:
-	  status = sii_test_long (options, results);
-	  break;
-	  // octets
-	case CORBA_Marshal_Options::OCTET:
-	  status = sii_test_octet (options, results);
-	  break;
-	  // chars
-	case CORBA_Marshal_Options::CHAR:
-	  status = sii_test_char (options, results);
-	  break;
-	  // doubles
-	case CORBA_Marshal_Options::DOUBLE:
-	  status = sii_test_double (options, results);
-	  break;
-	  // Structs
-	case CORBA_Marshal_Options::STRUCT:
-	  status = sii_test_struct (options, results);
-	  break;
-	  // unions
-	case CORBA_Marshal_Options::UNION:
-	  status = sii_test_union (options, results);
-	  break;
-	  // anys
-	case CORBA_Marshal_Options::ANY:
-	  status = sii_test_any (options, results);
-	  break;
-	  // sequences
-	case CORBA_Marshal_Options::SEQUENCE:
-	  status = sii_test_sequence (options, results);
-	  break;
-	  // longs
-	case CORBA_Marshal_Options::RECURSIVE:
-	  //	  status = sii_test_recursive (options, results);
-	  // doesn't work
-	  break;
-	default:
-	  status = -1;
-	} // end of switch
-    } // for loop
-
-  if (!status)
-    return 0;
-  else
-    return -1;
-}
-
-int
-Tao_Marshal_Client_Proxy::use_dii (CORBA_Marshal_Proxy::OPTIONS &options,
-				    CORBA_Marshal_Proxy::RESULTS &results)
-{
-  int i;
-  int status = 0;
-  // This method tests the dynamic invocation interface
-
-  for (i=0; i < options.iterations () && !status; i++)
-    {
-      switch (options.data_type ())
-	{
-	  // shorts
-	case CORBA_Marshal_Options::SHORT:
-	  status = dii_test_short (options, results);
-	  break;
-	  // longs
-	case CORBA_Marshal_Options::LONG:
-	  status = dii_test_long (options, results);
-	  break;
-	  // octets
-	case CORBA_Marshal_Options::OCTET:
-	  status = dii_test_octet (options, results);
-	  break;
-	  // chars
-	case CORBA_Marshal_Options::CHAR:
-	  status = dii_test_char (options, results);
-	  break;
-	  // doubles
-	case CORBA_Marshal_Options::DOUBLE:
-	  status = dii_test_double (options, results);
-	  break;
-	  // Structs
-	case CORBA_Marshal_Options::STRUCT:
-	  status = dii_test_struct (options, results);
-	  break;
-	  // unions
-	case CORBA_Marshal_Options::UNION:
-	  status = dii_test_union (options, results);
-	  break;
-	  // anys
-	case CORBA_Marshal_Options::ANY:
-	  status = dii_test_any (options, results);
-	  break;
-	  // sequences
-	case CORBA_Marshal_Options::SEQUENCE:
-	  status = dii_test_sequence (options, results);
-	  break;
-	  // longs
-	case CORBA_Marshal_Options::RECURSIVE:
-	  //	  status = dii_test_recursive (options, results);
-	  // doesn't work
-	  break;
-	default:
-	  status = -1;
-	} // end of switch
-    } // for loop
-
-  if (!status)
-    return 0;
-  else
-    return -1;
-}
-
-
-// all helper functions : SII
-int
-Tao_Marshal_Client_Proxy::sii_test_short (CORBA_Marshal_Proxy::OPTIONS &options,
-					   CORBA_Marshal_Proxy::RESULTS &results)
-{
-  CORBA_Short s1, s2;
-  CORBA_Environment env;
-
-  s1 = 3;
-  ref_->test_short (s1, s2, env);
-  if (s2 == 2*s1)
-    {
-      ACE_DEBUG ((LM_DEBUG, "SII test_short success: s1 = %d, s2 = %d\n", s1, s2));
-    }
-  else
-    {
-      ACE_DEBUG ((LM_DEBUG, "SII test_short failed: s1 = %d, s2 = %d\n", s1, s2));
-    }
-  return 0;
-}
-
-int
-Tao_Marshal_Client_Proxy::sii_test_long (CORBA_Marshal_Proxy::OPTIONS &options,
-					  CORBA_Marshal_Proxy::RESULTS &results)
-{
-  CORBA_Long l1, l2;
-  CORBA_Environment env;
-
-  l1 = 256;
-  ref_->test_long (l1, l2, env);
-  if (l2 == 3*l1)
-    {
-      ACE_DEBUG ((LM_DEBUG, "SII test_long success: l1 = %d, l2 = %d\n", l1, l2));
-    }
-  else
-    {
-      ACE_DEBUG ((LM_DEBUG, "SII test_long failed: l1 = %d, l2 = %d\n", l1, l2));
-    }
-  return 0;
-}
-
-int
-Tao_Marshal_Client_Proxy::sii_test_octet (CORBA_Marshal_Proxy::OPTIONS &options,
-					   CORBA_Marshal_Proxy::RESULTS &results)
-  // octets
-{
-  CORBA_Octet o1, o2;
-  CORBA_Environment env;
-
-  o1 = (CORBA_Octet) 127;
-  ref_->test_octet (o1, o2, env);
-  if (o1 == o2)
-    {
-      ACE_DEBUG ((LM_DEBUG, "SII test_octet success: o1 = %c, o2 = %c\n", o1, o2));
-    }
-  else
-    {
-      ACE_DEBUG ((LM_DEBUG, "SII test_octet failed: o1 = %c, o2 = %c\n", o1, o2));
-    }
-  return 0;
-}
-
-int
-Tao_Marshal_Client_Proxy::sii_test_char (CORBA_Marshal_Proxy::OPTIONS &options,
-					  CORBA_Marshal_Proxy::RESULTS &results)
-  // chars
-{
-  CORBA_Char c1, c2;
-  CORBA_Environment env;
-
-  c1 = 'B';
-  ref_->test_char (c1, c2, env);
-  if (c1 == c2)
-    {
-      ACE_DEBUG ((LM_DEBUG, "SII test_char success: c1 = %c, c2 = %c\n", c1, c2));
-    }
-  else
-    {
-      ACE_DEBUG ((LM_DEBUG, "SII test_char failed: c1 = %c, c2 = %c\n", c1, c2));
-    }
-  return 0;
-}
-
-int
-Tao_Marshal_Client_Proxy::sii_test_double (CORBA_Marshal_Proxy::OPTIONS &options,
-					    CORBA_Marshal_Proxy::RESULTS &results)
-  // doubles
-{
-  CORBA_Double d1, d2;
-  CORBA_Environment env;
-
-  d1 = 3.1415;
-  ref_->test_double (d1, d2, env);
-  if (d2 == d1/2)
-    {
-      ACE_DEBUG ((LM_DEBUG, "SII test_double success: d1 = %f, d2 = %f\n", d1, d2));
-    }
-  else
-    {
-      ACE_DEBUG ((LM_DEBUG, "SII test_double failed: d1 = %f, d2 = %f\n", d1, d2));
-    }
-  return 0;
-}
-
-int
-Tao_Marshal_Client_Proxy::sii_test_struct (CORBA_Marshal_Proxy::OPTIONS &options,
-					    CORBA_Marshal_Proxy::RESULTS &results)
-  // structs
-{
-  Marshal::Marshal_Struct ms1, ms2;
-  CORBA_Environment env;
-
-
-  ms1.s = 3;
-  ms1.l = 256;
-  ms1.c = 'B';
-  ms1.o = (CORBA_Octet) 127;
-  ms1.d = 3.1415;
-
-  ref_->test_struct (ms1, ms2, env);
-  if (ms1.s == ms2.s && ms1.l == ms2.l && ms1.c == ms2.c && ms1.o == ms2.o &&
-      ms1.d == ms2.d)
-    {
-      ACE_DEBUG ((LM_DEBUG, "SII test_struct success\n"));
-    }
-  else
-    {
-      ACE_DEBUG ((LM_DEBUG, "SII test_struct failed\n"));
-    }
-  return 0;
-}
-
-int
-Tao_Marshal_Client_Proxy::sii_test_union (CORBA_Marshal_Proxy::OPTIONS &options,
-					   CORBA_Marshal_Proxy::RESULTS &results)
-  // unions
-{
-  Marshal::Marshal_Union u1, u2;
-  Marshal::Marshal_Struct ms1, ms2;
-  CORBA_Environment env;
-
-  // first test an enumerated case
-  u1._d (Marshal::e_1st);
-  u1.l (4567);
-
-  ref_->test_union (u1, u2, env);
-  if ( (u1._d () == u2._d()) && (u1.l () == u2.l ()))
-    {
-      ACE_DEBUG ((LM_DEBUG, "SII test_union for long (case e_1st) success\n"));
-    }
-  else
-    {
-      ACE_DEBUG ((LM_DEBUG, "SII test_union for long (case e_1st) failed\n"));
-    }
-
-  // now test the default case
-  u1._d (Marshal::e_6th); // this case doesn't exist which will lead to using
-			  // the default case
-
-  u1.ms ().s = 3;
-  u1.ms ().l = 256;
-  u1.ms ().c = 'B';
-  u1.ms ().o = (CORBA_Octet) 127;
-  u1.ms ().d = 3.1415;
-
-  ref_->test_union (u1, u2, env);
-
-  if (u1.ms ().s == u2.ms ().s && u1.ms ().l == u2.ms ().l && u1.ms ().c == u2.ms ().c && u1.ms ().o == u2.ms ().o &&
-      u1.ms ().d == u2.ms ().d)
-    {
-      ACE_DEBUG ((LM_DEBUG, "SII test_union for default (case e_6th) success\n"));
-    }
-  else
-    {
-      ACE_DEBUG ((LM_DEBUG, "SII test_union for default (case e_6th) failed\n"));
-    }
-  return 0;
-}
-
-int
-Tao_Marshal_Client_Proxy::sii_test_any (CORBA_Marshal_Proxy::OPTIONS &options,
-					 CORBA_Marshal_Proxy::RESULTS &results)
-{
-  // we send a struct thru the any
-  CORBA_Any a1, *a2;
-  Marshal::Marshal_Struct ms1, *ms2;
-  CORBA_Environment env;
-
-
-  ms1.s = 3;
-  ms1.l = 256;
-  ms1.c = 'B';
-  ms1.o = (CORBA_Octet) 127;
-  ms1.d = 3.1415;
-
-  // populate the any with a MarshalStruct
-  //  a1 <<= ms1;  // not in TAO yet
-  a1.replace (Marshal::_tc_Marshal_Struct, &ms1, 0, env);
-
-  a2 = new CORBA_Any;
-
-  // now test it
-  ref_->test_any (a1, a2, env);
-  
-  // check if the two typecodes are equal
-  if (a2->type ()->equal (Marshal::_tc_Marshal_Struct, env))
-    {
-      // now see if the values are same
-      ms2 = (Marshal::Marshal_Struct *)a2->value ();
-      if (ms1.s == ms2->s && ms1.l == ms2->l && ms1.c == ms2->c && ms1.o == ms2->o &&
-	  ms1.d == ms2->d)
-	{
-	  ACE_DEBUG ((LM_DEBUG, "SII test_any success\n"));
-	}
-      else
-	{
-	  ACE_DEBUG ((LM_DEBUG, "SII test_any value match failed\n"));
-	}
-    }
-  else
-    {
-      ACE_DEBUG ((LM_DEBUG, "SII test_any failed due to typecode mismatch\n"));
-    }
-  return 0;
-}
-
-int
-Tao_Marshal_Client_Proxy::sii_test_sequence (CORBA_Marshal_Proxy::OPTIONS &options,
-					      CORBA_Marshal_Proxy::RESULTS &results)
-{
-  // make a sequence of Anys and fill each one with a different data type
-  Marshal::AnySeq as1 (7), *as2;
-  Marshal::Marshal_Struct ms;
-  Marshal::Marshal_Union u;
-  CORBA_Environment env;
-
-
-  ms.s = 3;
-  ms.l = 256;
-  ms.c = 'B';
-  ms.o = (CORBA_Octet) 127;
-  ms.d = 3.1415;
-
-  u._d (Marshal::e_5th); // somehow, the default case e_6th doesn't seem to
-			 // work here
-  u.ms ().s = 3;
-  u.ms ().l = 256;
-  u.ms ().c = 'B';
-  u.ms ().o = (CORBA_Octet) 127;
-  u.ms ().d = 3.1415;
-
-  // it looks like we must tell the sequence how many elements it is going to
-  // carry. By just fixing the max value does not work.
-
-  as1.length (7);
-
-#if 0 // to be supported later
-  as1[0] <<= (CORBA_Short)3;
-  as1[1] <<= (CORBA_Long) 256;
-  as1[2] <<= CORBA_Any::from_octet ((CORBA_Octet)127);
-  as1[3] <<= CORBA_Any::from_char ('B');
-  as1[4] <<= (CORBA_Double)3.1415; // double
-  as1[5] <<= ms;     // struct
-  as1[6] <<= u;      // union
-#endif
-  as1[0].replace (_tc_CORBA_Short, new CORBA_Short (3), 1, env);
-  as1[1].replace (_tc_CORBA_Long, new CORBA_Long (256), 1, env); 
-  as1[2].replace (_tc_CORBA_Octet, new CORBA_Octet ((CORBA_Octet)127), 1, env);
-  as1[3].replace (_tc_CORBA_Char, new CORBA_Char ('B'), 1, env); 
-  as1[4].replace (_tc_CORBA_Double, new CORBA_Double (3.1415), 1, env); 
-  as1[5].replace (Marshal::_tc_Marshal_Struct, new Marshal::Marshal_Struct
-		  (ms), 1, env);
-  as1[6].replace (Marshal::_tc_Marshal_Union, new Marshal::Marshal_Union (u), 1, env);
-
-  as2 = new Marshal::AnySeq;
-
-  ref_->test_sequence (as1, as2, env);
-
-  ACE_DEBUG ((LM_DEBUG, "SII test_sequence\n"));
-  if (as1.length () == as2->length ())
-    {
-      // now make sure that the elements are same
-      for (int i=0; i < as1.length (); i++)
-	{
-	  if (as1[i].type ()->equal ((*as2)[i].type (), env))
-	    {
-	      // now see if the values are same
-	      switch (i)
-		{
-		case 0:
-		  if (*(CORBA_Short *)as1[i].value () == *(CORBA_Short
-							    *)(*as2)[i].value ())
-		    {
-		      ACE_DEBUG ((LM_DEBUG, "\tSII test_sequence, shorts matched\n"));
-		    }
-		  else
-		    {
-		      ACE_DEBUG ((LM_DEBUG, "\tSII test_sequence failed on shorts match\n"));
-		    }
-		  break;
-		case 1:
-		  if (*(CORBA_Long *)as1[i].value () == *(CORBA_Long
-							    *)(*as2)[i].value ())
-		    {
-		      ACE_DEBUG ((LM_DEBUG, "\tSII test_sequence, longs matched\n"));
-		    }
-		  else
-		    {
-		      ACE_DEBUG ((LM_DEBUG, "\tSII test_sequence failed on longs match\n"));
-		    }
-		  break;
-		case 2:
-		  if (*(CORBA_Octet *)as1[i].value () == *(CORBA_Octet
-							    *)(*as2)[i].value ())
-		    {
-		      ACE_DEBUG ((LM_DEBUG, "\tSII test_sequence, octets matched\n"));
-		    }
-		  else
-		    {
-		      ACE_DEBUG ((LM_DEBUG, "\tSII test_sequence failed on octets match\n"));
-		    }
-		  break;
-		case 3:
-		  if (*(CORBA_Char *)as1[i].value () == *(CORBA_Char
-							    *)(*as2)[i].value ())
-		    {
-		      ACE_DEBUG ((LM_DEBUG, "\tSII test_sequence, chars matched\n"));
-		    }
-		  else
-		    {
-		      ACE_DEBUG ((LM_DEBUG, "\tSII test_sequence failed on chars match\n"));
-		    }
-		  break;
-		case 4:
-		  if (*(CORBA_Double *)as1[i].value () == *(CORBA_Double
-							    *)(*as2)[i].value ())
-		    {
-		      ACE_DEBUG ((LM_DEBUG, "\tSII test_sequence, doubles matched\n"));
-		    }
-		  else
-		    {
-		      ACE_DEBUG ((LM_DEBUG, "\tSII test_sequence failed on doubles match\n"));
-		    }
-		  break;
-		case 5:
-		  {
-		    Marshal::Marshal_Struct *ms1, *ms2;
-		    
-		    ms1 = (Marshal::Marshal_Struct *)as1[i].value ();
-		    ms2 = (Marshal::Marshal_Struct *)(*as2)[i].value ();
-
-		    if (ms1->s == ms2->s && ms1->l == ms2->l && ms1->c == ms2->c && ms1->o == ms2->o &&
-			ms1->d == ms2->d)
-		    {
-		      ACE_DEBUG ((LM_DEBUG, "\tSII test_sequence, structs matched\n"));
-		    }
-		  else
-		    {
-		      ACE_DEBUG ((LM_DEBUG, "\tSII test_sequence failed on structs match\n"));
-		    }
-		  }
-		  break;
-		case 6:
-		  {
-		    Marshal::Marshal_Union *u1, *u2;
-		    
-		    u1 = (Marshal::Marshal_Union *)as1[i].value ();
-		    u2 = (Marshal::Marshal_Union *)(*as2)[i].value ();
-
-		    if (u1->_d () == u2->_d () && u1->ms ().s == u2->ms ().s &&
-			u1->ms ().l == u2->ms ().l && 
-			u1->ms ().c == u2->ms ().c && u1->ms ().o == u2->ms ().o &&
-			u1->ms ().d == u2->ms ().d)
-		    {
-		      ACE_DEBUG ((LM_DEBUG, "\tSII test_sequence, unions matched\n"));
-		    }
-		  else
-		    {
-		      ACE_DEBUG ((LM_DEBUG, "\tSII test_sequence failed on unions match\n"));
-		    }
-		  }
-		  break;
-		}
-	    }
-	  else
-	    {
-	      ACE_DEBUG ((LM_DEBUG, 
-			  "SII test_sequence: typecode mismatch for element %d\n", i));
-	      break;
-	    }
-	}
-    }
-  else
-    {
-      ACE_DEBUG ((LM_DEBUG, "SII test_sequence failed: as2->length = %d\n",
-		  as2->length ()));
-    }
-  return 0;
-}
-
-#if 0
-int
-Tao_Marshal_Client_Proxy::sii_test_recursive (CORBA_Marshal_Proxy::OPTIONS &options,
-					       CORBA_Marshal_Proxy::RESULTS &results)
-{
-  // we will try a simple one here
-  Marshal::Marshal_Recursive mr1, *elem1, *mr2, *elem2;
-  CORBA_Environment env;
-
-
-  mr1.value <<= (CORBA_Long)1;
-  mr1.next.length (1);  // sequence of length 1
-
-  // fill the element
-  elem1 = &mr1.next[0];
-  elem1->value <<= CORBA_Any::from_char ('D');
-  elem1->next.length (0); // end of seq
-
-  mr2 = new Marshal::Marshal_Recursive;
-
-  try {
-  ref_->test_recursive (mr1, mr2, env);
-  }
-  catch (CORBA_SystemException &se){
-    cerr << "error invoking request: " << se << endl;
-  }
-
-  elem2 = &mr2->next[0];
-
-  if ((*(CORBA_Long *)mr1.value.value () == *(CORBA_Long*)mr2->value.value ())
-      && (mr1.next.length () == mr2->next.length ()) // same length sequence
-      && (*(CORBA_Char *)elem1->value.value () == *(CORBA_Char *)elem2->value.value ())
-      && (elem1->next.length () == elem2->next.length ()))
-    {
-      ACE_DEBUG ((LM_DEBUG, "SII test_recursive success\n"));
-    }
-  else
-    {
-      ACE_DEBUG ((LM_DEBUG, "SII test_recursive failure\n"));
-    }
-      
-  return 0;
-}
-#endif
-
-// -------------------------------------------------------
-// all helper functions : DII
-// -------------------------------------------------------
-
-int
-Tao_Marshal_Client_Proxy::dii_test_short (CORBA_Marshal_Proxy::OPTIONS &options,
-					   CORBA_Marshal_Proxy::RESULTS &results)
-{
-  // DII variables
-  CORBA_Request_ptr     request = 0; //CORBA_Request::_nil(); // DII request
-  CORBA_NVList_ptr      arglist = 0; //CORBA_NVList::_nil();  // argument list
-  //  CORBA_Context_ptr     ctx     = CORBA_Context::_nil(); // context
-  CORBA_NVList_ptr result_list  = 0; //CORBA_NVList::_nil();  // result list
-  CORBA_NamedValue_ptr result = 0; //CORBA_NamedValue::_nil();// actual result
-  CORBA_Short s1, s2;
-  CORBA_Environment env;
-
-  s1 = 3;
-  s2 = 0;
-
-  orb_->create_list(0, arglist); // 2 arguments to be added
-  //  *(arglist->add (CORBA_ARG_IN)->value ()) <<= s1;
-  arglist->add_value ("s1", CORBA_Any (_tc_CORBA_Short, &s1, CORBA_B_FALSE),
-		      CORBA_ARG_IN, env);
-  // this usage is also correct. All we care is to supply a storage area for
-  // the OUT parameter
-  //  arglist->add (CORBA_ARG_OUT)->value ()->replace (CORBA__tc_short, &s2);
-  //  *(arglist->add (CORBA_ARG_OUT)->value ()) <<= s2;
-  arglist->add_value ("s2", CORBA_Any (_tc_CORBA_Short, &s2, CORBA_B_FALSE),
-		      CORBA_ARG_OUT, env);
-  orb_->create_list(1, result_list); // 1 result
-  result = result_list->item (0);
-
-  // create a request
-  ref_->_create_request(//ctx,
-			"test_short",
-			arglist,
-			result,
-			request,
-			0, env);
-  
-  request->invoke (); // 2 way
-  //  *(arglist->item(1)->value()) >>= s2;
-  s2 = *(CORBA_Short *)arglist->item(1)->value()->value();
-
-  if (s2 == 2*s1)
-    {
-      ACE_DEBUG ((LM_DEBUG, "DII test_short success: s1 = %d, s2 = %d\n", s1, s2));
-    }
-  else
-    {
-      ACE_DEBUG ((LM_DEBUG, "DII test_short failed: s1 = %d, s2 = %d\n", s1, s2));
-    }
-  CORBA_release (request);
-  CORBA_release (arglist);
-  CORBA_release (result);
-  CORBA_release (result_list);
-  return 0;
-}
-
-int
-Tao_Marshal_Client_Proxy::dii_test_long (CORBA_Marshal_Proxy::OPTIONS &options,
-					  CORBA_Marshal_Proxy::RESULTS &results)
-{
-  // DII variables
-  CORBA_Request_ptr     request = 0; //CORBA_Request::_nil(); // DII request
-  CORBA_NVList_ptr      arglist = 0; //CORBA_NVList::_nil();  // argument list
-  //  CORBA_Context_ptr     ctx     = CORBA_Context::_nil(); // context
-  CORBA_NVList_ptr result_list  = 0; //CORBA_NVList::_nil();  // result list
-  CORBA_NamedValue_ptr result = 0; //CORBA_NamedValue::_nil();// actual result
-  CORBA_Long l1, l2;
-  CORBA_Environment env;
-
-  l1 = 256;
-
-  orb_->create_list(0, arglist); // 2 arguments to be added
-  //  *(arglist->add(CORBA_ARG_IN)->value()) <<= l1;
-  arglist->add_value ("l1", CORBA_Any (_tc_CORBA_Long, &l1, CORBA_B_FALSE),
-		      CORBA_ARG_IN, env);
-  //  arglist->add(CORBA_ARG_OUT)->value()->replace (CORBA__tc_long, &l2);
-  arglist->add_value ("l2", CORBA_Any (_tc_CORBA_Long, &l2, CORBA_B_FALSE),
-		      CORBA_ARG_OUT, env);
-  orb_->create_list(1, result_list); // 1 result
-  result = result_list->item(0);
-
-  // create a request
-  ref_->_create_request(//ctx,
-			"test_long",
-			arglist,
-			result,
-			request,
-			0, env);
-  
-  request->invoke (); // 2 way
-  //  *(arglist->item(1)->value()) >>= l2;
-  l2 = *(CORBA_Long *)arglist->item (1)->value ()->value ();
-
-  if (l2 == 3*l1)
-    {
-      ACE_DEBUG ((LM_DEBUG, "DII: test_long success: l1 = %d, l2 = %d\n", l1, l2));
-    }
-  else
-    {
-      ACE_DEBUG ((LM_DEBUG, "DII: test_long failed: l1 = %d, l2 = %d\n", l1, l2));
-    }
-  CORBA_release (request);
-  CORBA_release (arglist);
-  CORBA_release (result);
-  CORBA_release (result_list);
-  return 0;
-}
-
-int
-Tao_Marshal_Client_Proxy::dii_test_octet (CORBA_Marshal_Proxy::OPTIONS &options,
-					   CORBA_Marshal_Proxy::RESULTS &results)
-  // octets
-{
-  // DII variables
-  CORBA_Request_ptr     request = 0; //CORBA_Request::_nil(); // DII request
-  CORBA_NVList_ptr      arglist = 0; //CORBA_NVList::_nil();  // argument list
-  //  CORBA_Context_ptr     ctx     = CORBA_Context::_nil(); // context
-  CORBA_NVList_ptr result_list  = 0; //CORBA_NVList::_nil();  // result list
-  CORBA_NamedValue_ptr result = 0; //CORBA_NamedValue::_nil();// actual result
-  CORBA_Octet o1, o2;
-  CORBA_Environment env;
-
-  o1 = (CORBA_Octet) 127;
-
-  orb_->create_list(0, arglist); // 2 arguments to be added
-  //  *(arglist->add(CORBA_ARG_IN)->value()) <<= CORBA_Any::from_octet (o1);
-  //  arglist->add(CORBA_ARG_OUT)->value()->replace (CORBA__tc_octet, &o2);
-  arglist->add_value ("o1", CORBA_Any (_tc_CORBA_Octet, &o1, CORBA_B_FALSE),
-		      CORBA_ARG_IN, env);
-  arglist->add_value ("o2", CORBA_Any (_tc_CORBA_Octet, &o2, CORBA_B_FALSE),
-		      CORBA_ARG_OUT, env);
-  orb_->create_list(1, result_list); // 1 result
-  result = result_list->item(0);
-
-  // create a request
-  ref_->_create_request(//ctx,
-			"test_octet",
-			arglist,
-			result,
-			request,
-			0, env);
-  
-  request->invoke (); // 2 way
-  //  *(arglist->item(1)->value()) >>= CORBA_Any::to_octet (o2);
-  o2 = *(CORBA_Octet *)arglist->item (1)->value ()->value ();
-
-  if (o1 == o2)
-    {
-      ACE_DEBUG ((LM_DEBUG, "DII test_octet success: o1 = %c, o2 = %c\n", o1, o2));
-    }
-  else
-    {
-      ACE_DEBUG ((LM_DEBUG, "DII test_octet failed: o1 = %c, o2 = %c\n", o1, o2));
-    }
-  CORBA_release (request);
-  CORBA_release (arglist);
-  CORBA_release (result);
-  CORBA_release (result_list);
-  return 0;
-}
-
-int
-Tao_Marshal_Client_Proxy::dii_test_char (CORBA_Marshal_Proxy::OPTIONS &options,
-					  CORBA_Marshal_Proxy::RESULTS &results)
-  // chars
-{
-  // DII variables
-  CORBA_Request_ptr     request = 0; //CORBA_Request::_nil(); // DII request
-  CORBA_NVList_ptr      arglist = 0; //CORBA_NVList::_nil();  // argument list
-  //  CORBA_Context_ptr     ctx     = CORBA_Context::_nil(); // context
-  CORBA_NVList_ptr result_list  = 0; //CORBA_NVList::_nil();  // result list
-  CORBA_NamedValue_ptr result = 0; //CORBA_NamedValue::_nil();// actual result
-  CORBA_Char c1, c2;
-  CORBA_Environment env;
-
-  c1 = 'B';
-
-  orb_->create_list(0, arglist); // 2 arguments to be added
-  //  *(arglist->add(CORBA_ARG_IN)->value()) <<= CORBA_Any::from_char (c1);
-  //  arglist->add(CORBA_ARG_OUT)->value()->replace (CORBA__tc_char, &c2);
-  arglist->add_value ("c1", CORBA_Any (_tc_CORBA_Char, &c1, CORBA_B_FALSE),
-		      CORBA_ARG_IN, env);
-  arglist->add_value ("c2", CORBA_Any (_tc_CORBA_Char, &c2, CORBA_B_FALSE),
-		      CORBA_ARG_OUT, env);
-  orb_->create_list(1, result_list); // 1 result
-  result = result_list->item(0);
-
-  // create a request
-  ref_->_create_request(//ctx,
-			"test_char",
-			arglist,
-			result,
-			request,
-			0, env);
-  
-  request->invoke (); // 2 way
-  //  *(arglist->item(1)->value()) >>= CORBA_Any::to_char (c2);
-  c2 = *(CORBA_Char *)arglist->item (1)->value ()->value ();
-
-  if (c1 == c2)
-    {
-      ACE_DEBUG ((LM_DEBUG, "DII test_char success: c1 = %c, c2 = %c\n", c1, c2));
-    }
-  else
-    {
-      ACE_DEBUG ((LM_DEBUG, "DII test_char failed: c1 = %c, c2 = %c\n", c1, c2));
-    }
-  CORBA_release (request);
-  CORBA_release (arglist);
-  CORBA_release (result);
-  CORBA_release (result_list);
-  return 0;
-}
-
-int
-Tao_Marshal_Client_Proxy::dii_test_double (CORBA_Marshal_Proxy::OPTIONS &options,
-					    CORBA_Marshal_Proxy::RESULTS &results)
-  // doubles
-{
-  // DII variables
-  CORBA_Request_ptr     request = 0; //CORBA_Request::_nil(); // DII request
-  CORBA_NVList_ptr      arglist = 0; //CORBA_NVList::_nil();  // argument list
-  //  CORBA_Context_ptr     ctx     = CORBA_Context::_nil(); // context
-  CORBA_NVList_ptr result_list  = 0; //CORBA_NVList::_nil();  // result list
-  CORBA_NamedValue_ptr result = 0; //CORBA_NamedValue::_nil();// actual result
-  CORBA_Double d1, d2;
-  CORBA_Environment env;
-
-  d1 = 3.1415;
-
-  orb_->create_list(0, arglist); // 2 arguments to be added
-  //  *(arglist->add(CORBA_ARG_IN)->value()) <<= d1;
-  //  arglist->add(CORBA_ARG_OUT)->value()->replace (CORBA__tc_double, &d2);
-  arglist->add_value ("d1", CORBA_Any (_tc_CORBA_Double, &d1, CORBA_B_FALSE),
-		      CORBA_ARG_IN, env);
-  arglist->add_value ("d2", CORBA_Any (_tc_CORBA_Double, &d2, CORBA_B_FALSE),
-		      CORBA_ARG_OUT, env);
-  orb_->create_list(1, result_list); // 1 result
-  result = result_list->item(0);
-
-  // create a request
-  ref_->_create_request(//ctx,
-			"test_double",
-			arglist,
-			result,
-			request,
-			0, env);
-  
-  request->invoke (); // 2 way
-  //  *(arglist->item(1)->value()) >>= d2;
-  d2 = *(CORBA_Double *)arglist->item (1)->value ()->value ();
-
-  if (d2 == d1/2)
-    {
-      ACE_DEBUG ((LM_DEBUG, "DII test_double success: d1 = %f, d2 = %f\n", d1, d2));
-    }
-  else
-    {
-      ACE_DEBUG ((LM_DEBUG, "DII test_double failed: d1 = %f, d2 = %f\n", d1, d2));
-    }
-  CORBA_release (request);
-  CORBA_release (arglist);
-  CORBA_release (result);
-  CORBA_release (result_list);
-  return 0;
-}
-
-int
-Tao_Marshal_Client_Proxy::dii_test_struct (CORBA_Marshal_Proxy::OPTIONS &options,
-					    CORBA_Marshal_Proxy::RESULTS &results)
-  // structs
-{
-  // DII variables
-  CORBA_Request_ptr     request = 0; //CORBA_Request::_nil(); // DII request
-  CORBA_NVList_ptr      arglist = 0; //CORBA_NVList::_nil();  // argument list
-  //  CORBA_Context_ptr     ctx     = CORBA_Context::_nil(); // context
-  CORBA_NVList_ptr result_list  = 0; //CORBA_NVList::_nil();  // result list
-  CORBA_NamedValue_ptr result = 0; //CORBA_NamedValue::_nil();// actual result
-  Marshal::Marshal_Struct ms1, ms2;
-  CORBA_Environment env;
-
-  ms1.s = 3;
-  ms1.l = 256;
-  ms1.c = 'B';
-  ms1.o = (CORBA_Octet) 127;
-  ms1.d = 3.1415;
-
-  orb_->create_list(0, arglist); // 2 arguments to be added
-  //  *(arglist->add(CORBA_ARG_IN)->value()) <<= ms1;
-  //  arglist->add(CORBA_ARG_OUT)->value()->replace (Marshal::_tc_Marshal_Struct, &ms2);
-  arglist->add_value ("ms1", CORBA_Any (Marshal::_tc_Marshal_Struct, &ms1, CORBA_B_FALSE),
-		      CORBA_ARG_IN, env);
-  arglist->add_value ("ms2", CORBA_Any (Marshal::_tc_Marshal_Struct, &ms2, CORBA_B_FALSE),
-		      CORBA_ARG_OUT, env);
-  orb_->create_list(1, result_list); // 1 result
-  result = result_list->item(0);
-
-  // create a request
-  ref_->_create_request(//ctx,
-			"test_struct",
-			arglist,
-			result,
-			request,
-			0, env);
-  
-  request->invoke (); // 2 way
-  //  *(arglist->item(1)->value()) >>= ms2;
-  ms2 = *(Marshal::Marshal_Struct *)arglist->item (1)->value ()->value ();
-
-  if (ms1.s == ms2.s && ms1.l == ms2.l && ms1.c == ms2.c && ms1.o == ms2.o &&
-      ms1.d == ms2.d)
-    {
-      ACE_DEBUG ((LM_DEBUG, "DII test_struct success\n"));
-    }
-  else
-    {
-      ACE_DEBUG ((LM_DEBUG, "DII test_struct failed\n"));
-    }
-  CORBA_release (request);
-  CORBA_release (arglist);
-  CORBA_release (result);
-  CORBA_release (result_list);
-  return 0;
-}
-
-int
-Tao_Marshal_Client_Proxy::dii_test_union (CORBA_Marshal_Proxy::OPTIONS &options,
-					   CORBA_Marshal_Proxy::RESULTS &results)
-  // unions
-{
-  // DII variables
-  CORBA_Request_ptr     request = 0; //CORBA_Request::_nil(); // DII request
-  CORBA_NVList_ptr      arglist = 0; //CORBA_NVList::_nil();  // argument list
-  //  CORBA_Context_ptr     ctx     = CORBA_Context::_nil(); // context
-  CORBA_NVList_ptr result_list  = 0; //CORBA_NVList::_nil();  // result list
-  CORBA_NamedValue_ptr result = 0; //CORBA_NamedValue::_nil();// actual result
-  Marshal::Marshal_Union u1, u2;
-  Marshal::Marshal_Struct ms1, ms2;
-  CORBA_Environment env;
-
-
-  // first test an enumerated case
-  u1._d (Marshal::e_1st);
-  u1.l (4567);
-
-  orb_->create_list(0, arglist); // 2 arguments to be added
-  //  *(arglist->add(CORBA_ARG_IN)->value()) <<= u1;
-  //  arglist->add(CORBA_ARG_OUT)->value()->replace (Marshal::_tc_Marshal_Union, &u2);
-  arglist->add_value ("u1", CORBA_Any (Marshal::_tc_Marshal_Union, &u1, CORBA_B_FALSE),
-		      CORBA_ARG_IN, env);
-  arglist->add_value ("u2", CORBA_Any (Marshal::_tc_Marshal_Union, &u2, CORBA_B_FALSE),
-		      CORBA_ARG_OUT, env);
-  orb_->create_list(1, result_list); // 1 result
-  result = result_list->item(0);
-
-  // create a request
-  ref_->_create_request(//ctx,
-			"test_union",
-			arglist,
-			result,
-			request,
-			0, env);
-  
-  request->invoke (); // 2 way
-  //  *(arglist->item(1)->value()) >>= u2;
-  u2 = *(Marshal::Marshal_Union *)arglist->item (1)->value ()->value ();
-
-  if ( (u1._d () == u2._d()) && (u1.l () == u2.l ()))
-    {
-      ACE_DEBUG ((LM_DEBUG, "DII test_union for long (case e_1st) success\n"));
-    }
-  else
-    {
-      ACE_DEBUG ((LM_DEBUG, "DII test_union for long (case e_1st) failed\n"));
-    }
-  CORBA_release (request);
-  CORBA_release (arglist);
-  CORBA_release (result);
-  CORBA_release (result_list);
-
-  // now test the default case
-  u1._d (Marshal::e_5th); // e_6th doesn't work
-
-  u1.ms ().s = 3;
-  u1.ms ().l = 256;
-  u1.ms ().c = 'B';
-  u1.ms ().o = (CORBA_Octet) 127;
-  u1.ms ().d = 3.1415;
-
-
-  orb_->create_list(0, arglist); // 2 arguments to be added
-  //  *(arglist->add(CORBA_ARG_IN)->value()) <<= u1;
-  //arglist->add(CORBA_ARG_OUT)->value()->replace (Marshal::_tc_Marshal_Union, &u2);
-  arglist->add_value ("u1", CORBA_Any (Marshal::_tc_Marshal_Union, &u1, CORBA_B_FALSE),
-		      CORBA_ARG_IN, env);
-  arglist->add_value ("u2", CORBA_Any (Marshal::_tc_Marshal_Union, &u2, CORBA_B_FALSE),
-		      CORBA_ARG_OUT, env);
-  orb_->create_list(1, result_list); // 1 result
-  result = result_list->item(0);
-
-  // create a request
-  ref_->_create_request(//ctx,
-			"test_union",
-			arglist,
-			result,
-			request,
-			0, env);
-  
-  request->invoke (); // 2 way
-  //  *(arglist->item(1)->value()) >>= u2;
-  u2 = *(Marshal::Marshal_Union *)arglist->item (1)->value ()->value ();
-
-  if (u1.ms ().s == u2.ms ().s && u1.ms ().l == u2.ms ().l && u1.ms ().c == u2.ms ().c && u1.ms ().o == u2.ms ().o &&
-      u1.ms ().d == u2.ms ().d)
-    {
-      ACE_DEBUG ((LM_DEBUG, "DII test_union for default (case e_6th) success\n"));
-    }
-  else
-    {
-      ACE_DEBUG ((LM_DEBUG, "DII test_union for default (case e_6th) failed\n"));
-    }
-  CORBA_release (request);
-  CORBA_release (arglist);
-  CORBA_release (result);
-  CORBA_release (result_list);
-  return 0;
-}
-
-int
-Tao_Marshal_Client_Proxy::dii_test_any (CORBA_Marshal_Proxy::OPTIONS &options,
-					 CORBA_Marshal_Proxy::RESULTS &results)
-{
-  // DII variables
-  CORBA_Request_ptr     request = 0; //CORBA_Request::_nil(); // DII request
-  CORBA_NVList_ptr      arglist = 0; //CORBA_NVList::_nil();  // argument list
-  //  CORBA_Context_ptr     ctx     = CORBA_Context::_nil(); // context
-  CORBA_NVList_ptr result_list  = 0; //CORBA_NVList::_nil();  // result list
-  CORBA_NamedValue_ptr result = 0; //CORBA_NamedValue::_nil();// actual result
-  // we send a struct thru the any
-  CORBA_Any a1, *a2;
-  Marshal::Marshal_Struct ms1, *ms2;
-  CORBA_Environment env;
-
-  ms1.s = 3;
-  ms1.l = 256;
-  ms1.c = 'B';
-  ms1.o = (CORBA_Octet) 127;
-  ms1.d = 3.1415;
-
-  // populate the any with a MarshalStruct
-  //  a1 <<= ms1;
-  a1.replace (Marshal::_tc_Marshal_Struct, &ms1, CORBA_B_FALSE, env);
-
-  a2 = new CORBA_Any;
-
-  // now test it
-  orb_->create_list(0, arglist); // 2 arguments to be added
-  //  *(arglist->add(CORBA_ARG_IN)->value()) <<= a1;
-  //  arglist->add(CORBA_ARG_OUT)->value()->replace (CORBA__tc_any, a2);
-  arglist->add_value ("a1", CORBA_Any (_tc_CORBA_Any, &a1, CORBA_B_FALSE),
-		      CORBA_ARG_IN, env);
-  arglist->add_value ("a2", CORBA_Any (_tc_CORBA_Any, a2, CORBA_B_FALSE),
-		      CORBA_ARG_OUT, env);
-  orb_->create_list(1, result_list); // 1 result
-  result = result_list->item(0);
-
-  // create a request
-  ref_->_create_request(//ctx,
-			"test_any",
-			arglist,
-			result,
-			request,
-			0, env);
-  
-  request->invoke (); // 2 way
-  //  *(arglist->item(1)->value()) >>= (*a2);
-  a2->replace (_tc_CORBA_Any, (CORBA_Any *)arglist->item (1)->value ()->value
-	      (), 1, env);
-
-  // check if the two typecodes are equal
-  if (a2->type ()->equal (Marshal::_tc_Marshal_Struct, env))
-    {
-      // now see if the values are same
-      ms2 = (Marshal::Marshal_Struct *)a2->value ();
-      if (ms1.s == ms2->s && ms1.l == ms2->l && ms1.c == ms2->c && ms1.o == ms2->o &&
-	  ms1.d == ms2->d)
-	{
-	  ACE_DEBUG ((LM_DEBUG, "DII test_any success\n"));
-	}
-      else
-	{
-	  ACE_DEBUG ((LM_DEBUG, "DII test_any value match failed\n"));
-	}
-    }
-  else
-    {
-      ACE_DEBUG ((LM_DEBUG, "DII test_any failed due to typecode mismatch\n"));
-    }
-  CORBA_release (request);
-  CORBA_release (arglist);
-  CORBA_release (result);
-  CORBA_release (result_list);
-  return 0;
-}
-
-int
-Tao_Marshal_Client_Proxy::dii_test_sequence (CORBA_Marshal_Proxy::OPTIONS &options,
-					      CORBA_Marshal_Proxy::RESULTS &results)
-{
-  // DII variables
-  CORBA_Request_ptr     request = 0; //CORBA_Request::_nil(); // DII request
-  CORBA_NVList_ptr      arglist = 0; //CORBA_NVList::_nil();  // argument list
-  //  CORBA_Context_ptr     ctx     = CORBA_Context::_nil(); // context
-  CORBA_NVList_ptr result_list  = 0; //CORBA_NVList::_nil();  // result list
-  CORBA_NamedValue_ptr result = 0; //CORBA_NamedValue::_nil();// actual result
-  // make a sequence of Anys and fill each one with a different data type
-  Marshal::AnySeq as1 (7), *as2;
-  Marshal::Marshal_Struct ms;
-  Marshal::Marshal_Union u;
-  CORBA_Environment env;
-
-  ms.s = 3;
-  ms.l = 256;
-  ms.c = 'B';
-  ms.o = (CORBA_Octet) 127;
-  ms.d = 3.1415;
-
-  u._d (Marshal::e_5th); // somehow, the default case e_6th doesn't seem to
-			 // work here
-  u.ms ().s = 3;
-  u.ms ().l = 256;
-  u.ms ().c = 'B';
-  u.ms ().o = (CORBA_Octet) 127;
-  u.ms ().d = 3.1415;
-
-  // it looks like we must tell the sequence how many elements it is going to
-  // carry. By just fixing the max value does not work.
-
-  as1.length (7);
-
-#if 0
-  as1[0] <<= (CORBA_Short)3;
-  as1[1] <<= (CORBA_Long) 256;
-  as1[2] <<= CORBA_Any::from_octet ((CORBA_Octet)127);
-  as1[3] <<= CORBA_Any::from_char ('B');
-  as1[4] <<= (CORBA_Double)3.1415; // double
-  as1[5] <<= ms;     // struct
-  as1[6] <<= u;      // union
-#endif
-  as1[0].replace (_tc_CORBA_Short, new CORBA_Short (3), 1, env);
-  as1[1].replace (_tc_CORBA_Long, new CORBA_Long (256), 1, env); 
-  as1[2].replace (_tc_CORBA_Octet, new CORBA_Octet ((CORBA_Octet)127), 1, env);
-  as1[3].replace (_tc_CORBA_Char, new CORBA_Char ('B'), 1, env); 
-  as1[4].replace (_tc_CORBA_Double, new CORBA_Double (3.1415), 1, env); 
-  as1[5].replace (Marshal::_tc_Marshal_Struct, new Marshal::Marshal_Struct
-		  (ms), 1, env);
-  as1[6].replace (Marshal::_tc_Marshal_Union, new Marshal::Marshal_Union (u), 1, env);
-
-  as2 = new Marshal::AnySeq;
-
-  orb_->create_list(0, arglist); // 2 arguments to be added
-  //  *(arglist->add(CORBA_ARG_IN)->value()) <<= as1;
-  //  arglist->add(CORBA_ARG_OUT)->value()->replace (Marshal::_tc_AnySeq, as2);
-  arglist->add_value ("as1", CORBA_Any (Marshal::_tc_AnySeq, &as1, CORBA_B_FALSE),
-		      CORBA_ARG_IN, env);
-  arglist->add_value ("o2", CORBA_Any (Marshal::_tc_AnySeq, as2, CORBA_B_FALSE),
-		      CORBA_ARG_OUT, env);
-  orb_->create_list(1, result_list); // 1 result
-  result = result_list->item(0);
-
-  // create a request
-  ref_->_create_request(//ctx,
-			"test_sequence",
-			arglist,
-			result,
-			request,
-			0, env);
-  
-  request->invoke (); // 2 way
-  //  *(arglist->item(1)->value()) >>= (*as2);
-  *as2 = *(Marshal::AnySeq *)arglist->item (1)->value ()->value ();
-
-  ACE_DEBUG ((LM_DEBUG, "DII test_sequence\n"));
-  if (as1.length () == as2->length ())
-    {
-      // now make sure that the elements are same
-      for (int i=0; i < as1.length (); i++)
-	{
-	  if (as1[i].type ()->equal ((*as2)[i].type (), env))
-	    {
-	      // now see if the values are same
-	      switch (i)
-		{
-		case 0:
-		  if (*(CORBA_Short *)as1[i].value () == *(CORBA_Short
-							    *)(*as2)[i].value ())
-		    {
-		      ACE_DEBUG ((LM_DEBUG, "\tDII test_sequence, shorts matched\n"));
-		    }
-		  else
-		    {
-		      ACE_DEBUG ((LM_DEBUG, "\tDII test_sequence failed on shorts match\n"));
-		    }
-		  break;
-		case 1:
-		  if (*(CORBA_Long *)as1[i].value () == *(CORBA_Long
-							    *)(*as2)[i].value ())
-		    {
-		      ACE_DEBUG ((LM_DEBUG, "\tDII test_sequence, longs matched\n"));
-		    }
-		  else
-		    {
-		      ACE_DEBUG ((LM_DEBUG, "\tDII test_sequence failed on longs match\n"));
-		    }
-		  break;
-		case 2:
-		  if (*(CORBA_Octet *)as1[i].value () == *(CORBA_Octet
-							    *)(*as2)[i].value ())
-		    {
-		      ACE_DEBUG ((LM_DEBUG, "\tDII test_sequence, octets matched\n"));
-		    }
-		  else
-		    {
-		      ACE_DEBUG ((LM_DEBUG, "\tDII test_sequence failed on octets match\n"));
-		    }
-		  break;
-		case 3:
-		  if (*(CORBA_Char *)as1[i].value () == *(CORBA_Char
-							    *)(*as2)[i].value ())
-		    {
-		      ACE_DEBUG ((LM_DEBUG, "\tDII test_sequence, chars matched\n"));
-		    }
-		  else
-		    {
-		      ACE_DEBUG ((LM_DEBUG, "\tDII test_sequence failed on chars match\n"));
-		    }
-		  break;
-		case 4:
-		  if (*(CORBA_Double *)as1[i].value () == *(CORBA_Double
-							    *)(*as2)[i].value ())
-		    {
-		      ACE_DEBUG ((LM_DEBUG, "\tDII test_sequence, doubles matched\n"));
-		    }
-		  else
-		    {
-		      ACE_DEBUG ((LM_DEBUG, "\tDII test_sequence failed on doubles match\n"));
-		    }
-		  break;
-		case 5:
-		  {
-		    Marshal::Marshal_Struct *ms1, *ms2;
-		    
-		    ms1 = (Marshal::Marshal_Struct *)as1[i].value ();
-		    ms2 = (Marshal::Marshal_Struct *)(*as2)[i].value ();
-
-		    if (ms1->s == ms2->s && ms1->l == ms2->l && ms1->c == ms2->c && ms1->o == ms2->o &&
-			ms1->d == ms2->d)
-		    {
-		      ACE_DEBUG ((LM_DEBUG, "\tDII test_sequence, structs matched\n"));
-		    }
-		  else
-		    {
-		      ACE_DEBUG ((LM_DEBUG, "\tDII test_sequence failed on structs match\n"));
-		    }
-		  }
-		  break;
-		case 6:
-		  {
-		    Marshal::Marshal_Union *u1, *u2;
-		    
-		    u1 = (Marshal::Marshal_Union *)as1[i].value ();
-		    u2 = (Marshal::Marshal_Union *)(*as2)[i].value ();
-
-		    if (u1->_d () == u2->_d () && u1->ms ().s == u2->ms ().s &&
-			u1->ms ().l == u2->ms ().l && 
-			u1->ms ().c == u2->ms ().c && u1->ms ().o == u2->ms ().o &&
-			u1->ms ().d == u2->ms ().d)
-		    {
-		      ACE_DEBUG ((LM_DEBUG, "\tDII test_sequence, unions matched\n"));
-		    }
-		  else
-		    {
-		      ACE_DEBUG ((LM_DEBUG, "\tDII test_sequence failed on unions match\n"));
-		    }
-		  }
-		  break;
-		}
-	    }
-	  else
-	    {
-	      ACE_DEBUG ((LM_DEBUG, 
-			  "DII test_sequence: typecode mismatch for element %d\n", i));
-	      break;
-	    }
-	}
-    }
-  else
-    {
-      ACE_DEBUG ((LM_DEBUG, "DII test_sequence failed: as2->length = %d\n",
-		  as2->length ()));
-    }
-  CORBA_release (request);
-  CORBA_release (arglist);
-  CORBA_release (result);
-  CORBA_release (result_list);
-  return 0;
-}
-
-#if 0
-int
-Tao_Marshal_Client_Proxy::dii_test_recursive (CORBA_Marshal_Proxy::OPTIONS &options,
-					       CORBA_Marshal_Proxy::RESULTS &results)
-{
-  // we will try a simple one here
-  Marshal::Marshal_Recursive mr1, *elem1, *mr2, *elem2;
-
-  mr1.value <<= (CORBA_Long)1;
-  mr1.next.length (1);  // sequence of length 1
-
-  // fill the element
-  elem1 = &mr1.next[0];
-  elem1->value <<= CORBA_Any::from_char ('D');
-  elem1->next.length (0); // end of seq
-
-  mr2 = new Marshal::Marshal_Recursive;
-
-  try {
-    ref_->test_recursive (mr1, mr2);
-  }
-  catch (CORBA_SystemException &se){
-    cerr << "error invoking request: " << se << endl;
-  }
-
-  elem2 = &mr2->next[0];
-
-  if ((*(CORBA_Long *)mr1.value.value () == *(CORBA_Long*)mr2->value.value ())
-      && (mr1.next.length () == mr2->next.length ()) // same length sequence
-      && (*(CORBA_Char *)elem1->value.value () == *(CORBA_Char *)elem2->value.value ())
-      && (elem1->next.length () == elem2->next.length ()))
-    {
-      ACE_DEBUG ((LM_DEBUG, "DII test_recursive success\n"));
-    }
-  else
-    {
-      ACE_DEBUG ((LM_DEBUG, "DII test_recursive failure\n"));
-    }
-      
-  return 0;
-}
-#endif
diff --git a/TAO/Benchmark/Marshal_Test/TAO/tao_marshal_client.h b/TAO/Benchmark/Marshal_Test/TAO/tao_marshal_client.h
deleted file mode 100644
index 0bf7ef78660..00000000000
--- a/TAO/Benchmark/Marshal_Test/TAO/tao_marshal_client.h
+++ /dev/null
@@ -1,124 +0,0 @@
-// ============================================================================
-//
-// = LIBRARY
-//    CORBA Marshal Tao Benchmark
-// 
-// = FILENAME
-//    tao_marshal_client.h
-//
-// = AUTHOR
-//    Aniruddha Gokhale
-// 
-// ============================================================================
-
-#if !defined(_TAO_MARSHAL_CLIENT_H_)
-#define _TAO_MARSHAL_CLIENT_H_
-
-// benchmark library includes
-#include "benchmark/marshal_options.h"
-#include "benchmark/marshal_results.h"
-#include "benchmark/marshal_proxy.h"
-
-// include Tao specific include files
-#include "marshalC.h"  // generated by IDL compiler
-#include "tao/nvlist.h"
-
-class Tao_Marshal_Client_Proxy : public CORBA_Marshal_Proxy
-{
-  // =TITLE
-  //  Tao_Marshal_Client_Proxy
-  // =DESCRIPTION
-  //  Tao client size specialization of the CORBA Marshal proxy class
-public:
-  Tao_Marshal_Client_Proxy (void);
-  // constructor
-
-  ~Tao_Marshal_Client_Proxy (void);
-  // destructor
-
-  virtual int run (CORBA_Marshal_Proxy::OPTIONS &options,
-		   CORBA_Marshal_Proxy::RESULTS &results);
-  // do the actual work
-
-  virtual int use_sii (CORBA_Marshal_Proxy::OPTIONS &options,
-		       CORBA_Marshal_Proxy::RESULTS &results);
-  // use the static invocation interface
-
-  virtual int use_dii (CORBA_Marshal_Proxy::OPTIONS &options,
-		       CORBA_Marshal_Proxy::RESULTS &results);
-  // use the dynamic invocation interface
-private:
-  // =helper functions
-  int sii_test_short (CORBA_Marshal_Proxy::OPTIONS &options,
-		      CORBA_Marshal_Proxy::RESULTS &results);
-
-  int sii_test_long (CORBA_Marshal_Proxy::OPTIONS &options,
-		     CORBA_Marshal_Proxy::RESULTS &results);
-
-  int sii_test_octet (CORBA_Marshal_Proxy::OPTIONS &options,
-		      CORBA_Marshal_Proxy::RESULTS &results);
-
-  int sii_test_char (CORBA_Marshal_Proxy::OPTIONS &options,
-		     CORBA_Marshal_Proxy::RESULTS &results);
-
-  int sii_test_double (CORBA_Marshal_Proxy::OPTIONS &options,
-		       CORBA_Marshal_Proxy::RESULTS &results);
-
-  int sii_test_struct (CORBA_Marshal_Proxy::OPTIONS &options,
-		       CORBA_Marshal_Proxy::RESULTS &results);
-
-  int sii_test_union (CORBA_Marshal_Proxy::OPTIONS &options,
-		      CORBA_Marshal_Proxy::RESULTS &results);
-
-  int sii_test_any (CORBA_Marshal_Proxy::OPTIONS &options,
-		    CORBA_Marshal_Proxy::RESULTS &results);
-
-  int sii_test_sequence (CORBA_Marshal_Proxy::OPTIONS &options,
-			 CORBA_Marshal_Proxy::RESULTS &results);
-
-  int sii_test_recursive (CORBA_Marshal_Proxy::OPTIONS &options,
-			  CORBA_Marshal_Proxy::RESULTS &results);
-
-  // all the DII helpers
-  int dii_test_short (CORBA_Marshal_Proxy::OPTIONS &options,
-		      CORBA_Marshal_Proxy::RESULTS &results);
-
-  int dii_test_long (CORBA_Marshal_Proxy::OPTIONS &options,
-		     CORBA_Marshal_Proxy::RESULTS &results);
-
-  int dii_test_octet (CORBA_Marshal_Proxy::OPTIONS &options,
-		      CORBA_Marshal_Proxy::RESULTS &results);
-
-  int dii_test_char (CORBA_Marshal_Proxy::OPTIONS &options,
-		     CORBA_Marshal_Proxy::RESULTS &results);
-
-  int dii_test_double (CORBA_Marshal_Proxy::OPTIONS &options,
-		       CORBA_Marshal_Proxy::RESULTS &results);
-
-  int dii_test_struct (CORBA_Marshal_Proxy::OPTIONS &options,
-		       CORBA_Marshal_Proxy::RESULTS &results);
-
-  int dii_test_union (CORBA_Marshal_Proxy::OPTIONS &options,
-		      CORBA_Marshal_Proxy::RESULTS &results);
-
-  int dii_test_any (CORBA_Marshal_Proxy::OPTIONS &options,
-		    CORBA_Marshal_Proxy::RESULTS &results);
-
-  int dii_test_sequence (CORBA_Marshal_Proxy::OPTIONS &options,
-			 CORBA_Marshal_Proxy::RESULTS &results);
-
-  int dii_test_recursive (CORBA_Marshal_Proxy::OPTIONS &options,
-			  CORBA_Marshal_Proxy::RESULTS &results);
-
-  CORBA_ORB_ptr orb_;
-  // handle to the underlying orb
-
-  Marshal_ptr ref_;
-  // the object reference
-};
-
-#if defined (__ACE_INLINE__)
-#include "tao_marshal_client.i"
-#endif /* __ACE_INLINE__ */
-
-#endif
diff --git a/TAO/Benchmark/Marshal_Test/TAO/tao_marshal_client.i b/TAO/Benchmark/Marshal_Test/TAO/tao_marshal_client.i
deleted file mode 100644
index 2606962892b..00000000000
--- a/TAO/Benchmark/Marshal_Test/TAO/tao_marshal_client.i
+++ /dev/null
@@ -1,21 +0,0 @@
-
-ACE_INLINE
-Tao_Marshal_Client_Proxy::Tao_Marshal_Client_Proxy (void)
-  : orb_ (0),
-    ref_ (0)
-{
-}
-
-ACE_INLINE
-Tao_Marshal_Client_Proxy::~Tao_Marshal_Client_Proxy (void)
-{
-  // releasing order is important
-
-  // release the reference
-  CORBA_release (ref_);
-
-  // release the ORB
-  CORBA_release (orb_);
-}
-
-
diff --git a/TAO/Benchmark/Marshal_Test/TAO/tao_marshal_impl.cpp b/TAO/Benchmark/Marshal_Test/TAO/tao_marshal_impl.cpp
deleted file mode 100644
index 6d5005f83ad..00000000000
--- a/TAO/Benchmark/Marshal_Test/TAO/tao_marshal_impl.cpp
+++ /dev/null
@@ -1,650 +0,0 @@
-#include "tao_marshal_impl.h"
-
-#if !defined (__ACE_INLINE__)
-#include "tao_marshal_impl.i"
-#endif /* __ACE_INLINE__ */
-
-// All the methods of the SSI class
-void
-Marshal_SSI_Impl::test_short (CORBA_Short s1,
-			      CORBA_Short &s2,
-			      CORBA_Environment &env)
-{
-  s2 = 2*s1;
-}
-
-void
-Marshal_SSI_Impl::test_long (CORBA_Long l1,
-			     CORBA_Long &l2,
-			      CORBA_Environment &env)
-{
-  l2 = 3*l1;
-}
-
-void
-Marshal_SSI_Impl::test_octet (CORBA_Octet o1,
-			      CORBA_Octet &o2,
-			      CORBA_Environment &env)
-{
-  o2 = o1;
-}
-
-void
-Marshal_SSI_Impl::test_char (CORBA_Char c1,
-			     CORBA_Char &c2,
-			      CORBA_Environment &env)
-{
-  c2 = c1;
-}
-
-void
-Marshal_SSI_Impl::test_double (CORBA_Double d1,
-			       CORBA_Double &d2,
-			      CORBA_Environment &env)
-{
-  d2 = d1/2;
-}
-
-void
-Marshal_SSI_Impl::test_struct (const Marshal::Marshal_Struct& ms1,
-			       Marshal::Marshal_Struct& ms2,
-			      CORBA_Environment &env)
-{
-  ms2.s = ms1.s;
-  ms2.l = ms1.l;
-  ms2.c = ms1.c;
-  ms2.o = ms1.o;
-  ms2.d = ms1.d;
-}
-
-void
-Marshal_SSI_Impl::test_union (const Marshal::Marshal_Union& u1,
-			      Marshal::Marshal_Union& u2,
-			      CORBA_Environment &env)
-{
-  u2._d (u1._d ()); // set the discriminant value
-
-  switch (u1._d ())
-    {
-    case Marshal::e_0th:
-      u2.s (u1.s ()); // set short
-      break;
-    case Marshal::e_1st:
-      u2.l (u1.l ()); // set long
-      break;
-    case Marshal::e_2nd:
-      u2.c (u1.c ()); // set char
-      break;
-    case Marshal::e_3rd:
-      u2.o (u1.o ()); // set octet
-      break;
-    case Marshal::e_4th:
-      u2.d (u1.d ()); // set double
-      break;
-    case Marshal::e_5th:
-    default:
-      u2.ms (u1. ms ()); // set structs
-      break;
-    }
-}
-
-void
-Marshal_SSI_Impl::test_any (const CORBA_Any &a1,
-			    CORBA_Any *&a2,
-			      CORBA_Environment &env)
-{
-  a2 = new CORBA_Any (a1.type (), (void *)a1.value ()); // will do a deep copy
-}
-
-void 
-Marshal_SSI_Impl::test_sequence (const Marshal::AnySeq& as1,
-				 Marshal::AnySeq *& as2,
-			      CORBA_Environment &env)
-{
-  as2 = new Marshal::AnySeq (as1);
-}
-
-#if 0
-void 
-Marshal_SSI_Impl::test_recursive (const Marshal::Marshal_Recursive &mr1,
-				  Marshal::Marshal_Recursive *&mr2,
-			      CORBA_Environment &env)
-{
-}
-#endif
-
-//----------------------------------------------------------------------------
-//the methods of the DSI implementation class
-
-static const TAO_operation_db_entry Marshal_DSI_operations[] = {
-  {"_is_a", &Marshal_DSI_Impl::_Marshal_is_a_skel},
-  { "test_short", &Marshal_DSI_Impl::_Marshal_test_short_skel},
-  { "test_long", &Marshal_DSI_Impl::_Marshal_test_long_skel},
-  { "test_octet", &Marshal_DSI_Impl::_Marshal_test_octet_skel},
-  { "test_char", &Marshal_DSI_Impl::_Marshal_test_char_skel},
-  { "test_double", &Marshal_DSI_Impl::_Marshal_test_double_skel},
-  { "test_struct", &Marshal_DSI_Impl::_Marshal_test_struct_skel},
-  { "test_union", &Marshal_DSI_Impl::_Marshal_test_union_skel},
-  { "test_any", &Marshal_DSI_Impl::_Marshal_test_any_skel},
-  { "test_sequence", &Marshal_DSI_Impl::_Marshal_test_sequence_skel},
-  { 0, 0 }
-};
-
-// Note that we use a linear table because rest of the DSI implementations we
-// compare with also use linear search in their "invoke" method.
-TAO_Linear_OpTable tao_Marshal_DSI_optable (Marshal_DSI_operations, 10);
-
-// constructor
-Marshal_DSI_Impl::Marshal_DSI_Impl (CORBA_ORB_ptr orb, const char *obj_name)
-  : orb_ (orb)
-  //,CORBA_DynamicImplementation ("Marshal", obj_name) // interface name is necessary
-{
-  // Note that this is a HACK to achieve DSI behavior. But this way we can
-  // cleanly integrate ourselves with the dispatch mechanism of the OA.
-
-  const CORBA_String repoID = "IDL:Marshal:1.0"; // repository ID
-  IIOP_Object *data;  // IIOP object 
-  CORBA_BOA_ptr oa = TAO_OA_PARAMS::instance()->oa(); // underlying BOA
-  this->optable_ = &tao_Marshal_DSI_optable;     // operation database
-  CORBA_Long i;
-
-  // setup an IIOP object
-  data = new IIOP_Object (CORBA_string_dup (repoID));
-  data->profile.iiop_version.major = IIOP::MY_MAJOR;
-  data->profile.iiop_version.minor = IIOP::MY_MINOR;
-  data->profile.host = ACE_OS::strdup (oa->get_addr ().get_host_name ());
-  data->profile.port = oa->get_addr ().get_port_number ();
-  data->profile.object_key.length = ACE_OS::strlen (obj_name);
-  data->profile.object_key.maximum = data->profile.object_key.length;
-  data->profile.object_key.buffer = new CORBA_Octet [(size_t)data->profile.object_key.length+1];
-  ACE_OS::memcpy (data->profile.object_key.buffer, obj_name,
-		  data->profile.object_key.length); // set the object key
-  this->set_parent (data);  // store the IIOP obj reference with ourselves
-  this->sub_ = this;               // set the most derived class to be ourselves
-  if (oa) oa->bind (data->profile.object_key, this);// register ourselves
-}
-
-void
-Marshal_DSI_Impl::invoke (CORBA_ServerRequest& req, CORBA_Environment &env)
-{
-  // parse the incoming request and find out for what operation it is. We use a
-  // simple linear search here
-  if (!ACE_OS::strcmp (req.op_name (), "test_short"))
-    {
-    }
-  else if (!ACE_OS::strcmp (req.op_name (), "test_long"))
-    {
-    }
-  else if (!ACE_OS::strcmp (req.op_name (), "test_octet"))
-    {
-    }
-  else if (!ACE_OS::strcmp (req.op_name (), "test_char"))
-    {
-    }
-  else if (!ACE_OS::strcmp (req.op_name (), "test_double"))
-    {
-    }
-  else if (!ACE_OS::strcmp (req.op_name (), "test_struct"))
-    {
-    }
-  else if (!ACE_OS::strcmp (req.op_name (), "test_union"))
-    {
-    }
-  else if (!ACE_OS::strcmp (req.op_name (), "test_any"))
-    {
-    }
-  else if (!ACE_OS::strcmp (req.op_name (), "test_sequence"))
-    {
-    }
-}
-
-// simulate the skeletons
-void Marshal_DSI_Impl::_Marshal_is_a_skel(CORBA_ServerRequest &req, 
-						CORBA_Object_ptr obj, 
-						CORBA_Environment &env)
-{
-  CORBA_NVList_ptr		nvlist;
-  CORBA_NamedValue_ptr	nv;
-  CORBA_Any			temp_value (_tc_CORBA_String);
-  char *type_id = "IDL:Marshal:1.0";
-
-  req.orb()->create_list (0, nvlist);
-  nv = nvlist->add_value (0, temp_value, CORBA_ARG_IN, env);
-
-  req.params (nvlist, env);
-  if (env.exception () != 0) {
-    dexc (env, "is_a_skel, get params");
-    return;
-  }
-
-  CORBA_Boolean		*retval;
-  CORBA_String		value = *(CORBA_String *)nv->value ()->value ();
-
-  cout << "object id = " << ((char *)value) << endl;
-  if (strcmp ((char *)value, (char *)type_id) == 0
-      || strcmp ((char *)value, _tc_CORBA_Object->id(env)) == 0)
-    retval = new CORBA_Boolean (CORBA_B_TRUE);
-  else
-    retval = new CORBA_Boolean (CORBA_B_FALSE);
-
-  CORBA_Any  		*any =
-    new CORBA_Any (_tc_CORBA_Boolean, retval, CORBA_B_TRUE);
-
-  req.result (any, env);
-  dexc (env, "_is_a, result");
-}
-
-void Marshal_DSI_Impl::_Marshal_test_short_skel(CORBA_ServerRequest &req, 
-						CORBA_Object_ptr obj, 
-						CORBA_Environment &env)
-{
-  CORBA_NVList_ptr        nvlist;
-  CORBA_NamedValue_ptr    nv1, nv2;
-  CORBA_Any               any_s1 (_tc_CORBA_Short);
-  CORBA_Any               any_s2 (_tc_CORBA_Short);
-  Marshal_DSI_Impl*       impl;
-  CORBA_Short s1, s2;
-
-  // now create a request and populate it with the typecodes
-  req.orb()->create_list (0, nvlist);
-  nv1 = nvlist->add_value (0, any_s1, CORBA_ARG_IN, env);
-  nv2 = nvlist->add_value (0, any_s2, CORBA_ARG_OUT, env);
-
-  // retrieve params - call the interpreter to interpret the parameters for us.
-  req.params(nvlist, env);
-
-  s1 = *(CORBA_Short *) nv1->value ()->value ();
-
-  // now invoke the implementation
-  impl = (Marshal_DSI_Impl *)(obj->get_subclass ());
-  // now the magic of dynamic binding
-  impl->test_short (s1, s2, env);
-
-  nv2->value ()->replace (_tc_CORBA_Short, &s2, 0, env);
-
-  // result - NO result
-  CORBA_Any *any = new CORBA_Any(_tc_CORBA_Void, 0, CORBA_B_TRUE);
-  req.result(any, env);
-}
-
-void Marshal_DSI_Impl::_Marshal_test_long_skel(CORBA_ServerRequest &req, 
-						CORBA_Object_ptr obj, 
-						CORBA_Environment &env)
-{
-  CORBA_NVList_ptr        nvlist;
-  CORBA_NamedValue_ptr    nv1, nv2;
-  CORBA_Any               any_l1 (_tc_CORBA_Long);
-  CORBA_Any               any_l2 (_tc_CORBA_Long);
-  Marshal_DSI_Impl*       impl;
-  CORBA_Long l1, l2;
-
-  // now create a request and populate it with the typecodes
-  req.orb()->create_list (0, nvlist);
-  nv1 = nvlist->add_value (0, any_l1, CORBA_ARG_IN, env);
-  nv2 = nvlist->add_value (0, any_l2, CORBA_ARG_OUT, env);
-
-  // retrieve params - call the interpreter to interpret the parameters for us.
-  req.params(nvlist, env);
-
-  l1 = *(CORBA_Long *) nv1->value ()->value ();
-
-  // now invoke the implementation
-  impl = (Marshal_DSI_Impl *)(obj->get_subclass ());
-  // now the magic of dynamic binding
-  impl->test_long (l1, l2, env);
-
-  nv2->value ()->replace (_tc_CORBA_Long, &l2, 0, env);
-
-  // result - NO result
-  CORBA_Any *any = new CORBA_Any(_tc_CORBA_Void, 0, CORBA_B_TRUE);
-  req.result(any, env);
-}
-
-void Marshal_DSI_Impl::_Marshal_test_octet_skel(CORBA_ServerRequest &req, 
-						CORBA_Object_ptr obj, 
-						CORBA_Environment &env)
-{
-  CORBA_NVList_ptr        nvlist;
-  CORBA_NamedValue_ptr    nv1, nv2;
-  CORBA_Any               any_o1 (_tc_CORBA_Octet);
-  CORBA_Any               any_o2 (_tc_CORBA_Octet);
-  Marshal_DSI_Impl*       impl;
-  CORBA_Octet o1, o2;
-
-  // now create a request and populate it with the typecodes
-  req.orb()->create_list (0, nvlist);
-  nv1 = nvlist->add_value (0, any_o1, CORBA_ARG_IN, env);
-  nv2 = nvlist->add_value (0, any_o2, CORBA_ARG_OUT, env);
-
-  // retrieve params - call the interpreter to interpret the parameters for us.
-  req.params(nvlist, env);
-
-  o1 = *(CORBA_Octet *) nv1->value ()->value ();
-
-  // now invoke the implementation
-  impl = (Marshal_DSI_Impl *)(obj->get_subclass ());
-  // now the magic of dynamic binding
-  impl->test_octet (o1, o2, env);
-
-  nv2->value ()->replace (_tc_CORBA_Octet, &o2, 0, env);
-
-  // result - NO result
-  CORBA_Any *any = new CORBA_Any(_tc_CORBA_Void, 0, CORBA_B_TRUE);
-  req.result(any, env);
-}
-
-void Marshal_DSI_Impl::_Marshal_test_char_skel(CORBA_ServerRequest &req, 
-					       CORBA_Object_ptr obj, 
-					       CORBA_Environment &env)
-{
-  CORBA_NVList_ptr        nvlist;
-  CORBA_NamedValue_ptr    nv1, nv2;
-  CORBA_Any               any_c1 (_tc_CORBA_Char);
-  CORBA_Any               any_c2 (_tc_CORBA_Char);
-  Marshal_DSI_Impl*       impl;
-  CORBA_Char c1, c2;
-
-  // now create a request and populate it with the typecodes
-  req.orb()->create_list (0, nvlist);
-  nv1 = nvlist->add_value (0, any_c1, CORBA_ARG_IN, env);
-  nv2 = nvlist->add_value (0, any_c2, CORBA_ARG_OUT, env);
-
-  // retrieve params - call the interpreter to interpret the parameters for us.
-  req.params(nvlist, env);
-
-  c1 = *(CORBA_Char *) nv1->value ()->value ();
-
-  // now invoke the implementation
-  impl = (Marshal_DSI_Impl *)(obj->get_subclass ());
-  // now the magic of dynamic binding
-  impl->test_char (c1, c2, env);
-
-  nv2->value ()->replace (_tc_CORBA_Char, &c2, 0, env);
-
-  // result - NO result
-  CORBA_Any *any = new CORBA_Any(_tc_CORBA_Void, 0, CORBA_B_TRUE);
-  req.result(any, env);
-}
-
-void Marshal_DSI_Impl::_Marshal_test_double_skel(CORBA_ServerRequest &req, 
-						CORBA_Object_ptr obj, 
-						CORBA_Environment &env)
-{
-  CORBA_NVList_ptr        nvlist;
-  CORBA_NamedValue_ptr    nv1, nv2;
-  CORBA_Any               any_d1 (_tc_CORBA_Double);
-  CORBA_Any               any_d2 (_tc_CORBA_Double);
-  Marshal_DSI_Impl*       impl;
-  CORBA_Double d1, d2;
-
-  // now create a request and populate it with the typecodes
-  req.orb()->create_list (0, nvlist);
-  nv1 = nvlist->add_value (0, any_d1, CORBA_ARG_IN, env);
-  nv2 = nvlist->add_value (0, any_d2, CORBA_ARG_OUT, env);
-
-  // retrieve params - call the interpreter to interpret the parameters for us.
-  req.params(nvlist, env);
-
-  d1 = *(CORBA_Double *) nv1->value ()->value ();
-
-  // now invoke the implementation
-  impl = (Marshal_DSI_Impl *)(obj->get_subclass ());
-  // now the magic of dynamic binding
-  impl->test_double (d1, d2, env);
-
-  nv2->value ()->replace (_tc_CORBA_Double, &d2, 0, env);
-
-  // result - NO result
-  CORBA_Any *any = new CORBA_Any(_tc_CORBA_Void, 0, CORBA_B_TRUE);
-  req.result(any, env);
-}
-
-void Marshal_DSI_Impl::_Marshal_test_struct_skel(CORBA_ServerRequest &req, 
-						CORBA_Object_ptr obj, 
-						CORBA_Environment &env)
-{
-  CORBA_NVList_ptr        nvlist;
-  CORBA_NamedValue_ptr    nv1, nv2;
-  CORBA_Any               any_ms1 (Marshal::_tc_Marshal_Struct);
-  CORBA_Any               any_ms2 (Marshal::_tc_Marshal_Struct);
-  Marshal_DSI_Impl*       impl;
-  Marshal::Marshal_Struct ms1, *ms2;
-
-  // now create a request and populate it with the typecodes
-  req.orb()->create_list (0, nvlist);
-  nv1 = nvlist->add_value (0, any_ms1, CORBA_ARG_IN, env);
-  nv2 = nvlist->add_value (0, any_ms2, CORBA_ARG_OUT, env);
-
-  // retrieve params - call the interpreter to interpret the parameters for us.
-  req.params(nvlist, env);
-
-  // note that the second parameter being an out parameter, we are allocating
-  // it from heap and filling it up. We will then insert it into the Any that
-  // will get written to the stream. We should have done this for the
-  // primitives too, but somehow they worked (because nothing got written onto
-  // the stack frame onto which they existed, but this phenomenon was occuring
-  // here and possibly will occur for the rest of the case
-  ms1 = *(Marshal::Marshal_Struct *) nv1->value ()->value ();
-  ms2 = new Marshal::Marshal_Struct;
-
-  // now invoke the implementation
-  impl = (Marshal_DSI_Impl *)(obj->get_subclass ());
-  // now the magic of dynamic binding
-  impl->test_struct (ms1, *ms2, env);
-
-  nv2->value ()->replace (Marshal::_tc_Marshal_Struct, ms2, 1, env);
-
-  // result - NO result
-  //  CORBA_Any *any = new CORBA_Any(_tc_CORBA_Void, 0, CORBA_B_TRUE);
-  //  req.result(any, env);
-}
-
-void Marshal_DSI_Impl::_Marshal_test_union_skel(CORBA_ServerRequest &req, 
-						CORBA_Object_ptr obj, 
-						CORBA_Environment &env)
-{
-  CORBA_NVList_ptr        nvlist;
-  CORBA_NamedValue_ptr    nv1, nv2;
-  CORBA_Any               any_u1 (Marshal::_tc_Marshal_Union);
-  CORBA_Any               any_u2 (Marshal::_tc_Marshal_Union);
-  Marshal_DSI_Impl*       impl;
-  Marshal::Marshal_Union u1, *u2;
-
-  // now create a request and populate it with the typecodes
-  req.orb()->create_list (0, nvlist);
-  nv1 = nvlist->add_value (0, any_u1, CORBA_ARG_IN, env);
-  nv2 = nvlist->add_value (0, any_u2, CORBA_ARG_OUT, env);
-
-  // retrieve params - call the interpreter to interpret the parameters for us.
-  req.params(nvlist, env);
-
-  u1 = *(Marshal::Marshal_Union *) nv1->value ()->value ();
-  u2 = new Marshal::Marshal_Union;
-
-  // now invoke the implementation
-  impl = (Marshal_DSI_Impl *)(obj->get_subclass ());
-  // now the magic of dynamic binding
-  impl->test_union (u1, *u2, env);
-
-  nv2->value ()->replace (Marshal::_tc_Marshal_Union, u2, 0, env);
-
-  // result - NO result
-  //  CORBA_Any *any = new CORBA_Any(_tc_CORBA_Void, 0, CORBA_B_TRUE);
-  //  req.result(any, env);
-}
-
-void Marshal_DSI_Impl::_Marshal_test_any_skel(CORBA_ServerRequest &req, 
-					      CORBA_Object_ptr obj, 
-					      CORBA_Environment &env)
-{
-  CORBA_NVList_ptr        nvlist;
-  CORBA_NamedValue_ptr    nv1, nv2;
-  CORBA_Any *a1=0, *a2=0;
-  CORBA_Any               any_a1 (_tc_CORBA_Any, &a1);
-  CORBA_Any               any_a2 (_tc_CORBA_Any);
-  Marshal_DSI_Impl*       impl;
-
-  // now create a request and populate it with the typecodes
-  req.orb()->create_list (0, nvlist);
-  nv1 = nvlist->add_value (0, any_a1, CORBA_ARG_IN, env);
-  nv2 = nvlist->add_value (0, any_a2, CORBA_ARG_OUT, env);
-
-  // retrieve params - call the interpreter to interpret the parameters for us.
-  req.params(nvlist, env);
-
-  a1 = (CORBA_Any *) nv1->value ()->value ();
-
-  // now invoke the implementation
-  impl = (Marshal_DSI_Impl *)(obj->get_subclass ());
-  // now the magic of dynamic binding
-  impl->test_any (*a1, a2, env);
-
-  nv2->value ()->replace (_tc_CORBA_Any, a2, 1, env);
-
-  // result - NO result
-  //  CORBA_Any *any = new CORBA_Any(_tc_CORBA_Void, 0, CORBA_B_TRUE);
-  //  req.result(any, env);
-}
-
-void Marshal_DSI_Impl::_Marshal_test_sequence_skel(CORBA_ServerRequest &req, 
-						   CORBA_Object_ptr obj, 
-						   CORBA_Environment &env)
-{
-  CORBA_NVList_ptr        nvlist;
-  CORBA_NamedValue_ptr    nv1, nv2;
-  CORBA_Any               any_as1 (Marshal::_tc_AnySeq);
-  CORBA_Any               any_as2 (Marshal::_tc_AnySeq);
-  Marshal_DSI_Impl*       impl;
-  Marshal::AnySeq  *as1, *as2;
-
-  // now create a request and populate it with the typecodes
-  req.orb()->create_list (0, nvlist);
-  nv1 = nvlist->add_value (0, any_as1, CORBA_ARG_IN, env);
-  nv2 = nvlist->add_value (0, any_as2, CORBA_ARG_OUT, env);
-
-  // retrieve params - call the interpreter to interpret the parameters for us.
-  req.params(nvlist, env);
-
-  as1 = (Marshal::AnySeq *) nv1->value ()->value ();
-
-  // now invoke the implementation
-  impl = (Marshal_DSI_Impl *)(obj->get_subclass ());
-  // now the magic of dynamic binding
-  impl->test_sequence (*as1, as2, env);
-
-  nv2->value ()->replace (Marshal::_tc_AnySeq, as2, 1, env);
-
-  // result - NO result
-  //  CORBA_Any *any = new CORBA_Any(_tc_CORBA_Void, 0, CORBA_B_TRUE);
-  //  req.result(any, env);
-}
-
-// private methods of our DSI class
-void
-Marshal_DSI_Impl::test_short (CORBA_Short s1,
-			      CORBA_Short &s2,
-			      CORBA_Environment &env)
-{
-  s2 = 2*s1;
-}
-
-void
-Marshal_DSI_Impl::test_long (CORBA_Long l1,
-			     CORBA_Long &l2,
-			     CORBA_Environment &env)
-{
-  l2 = 3*l1;
-}
-
-void
-Marshal_DSI_Impl::test_octet (CORBA_Octet o1,
-			      CORBA_Octet &o2,
-			      CORBA_Environment &env)
-{
-  o2 = o1;
-}
-
-void
-Marshal_DSI_Impl::test_char (CORBA_Char c1,
-			     CORBA_Char &c2,
-			     CORBA_Environment &env)
-{
-  c2 = c1;
-}
-
-void
-Marshal_DSI_Impl::test_double (CORBA_Double d1,
-			       CORBA_Double &d2,
-			       CORBA_Environment &env)
-{
-  d2 = d1/2;
-}
-
-void
-Marshal_DSI_Impl::test_struct (const Marshal::Marshal_Struct& ms1,
-			       Marshal::Marshal_Struct& ms2,
-			       CORBA_Environment &env)
-{
-  ms2.s = ms1.s;
-  ms2.l = ms1.l;
-  ms2.c = ms1.c;
-  ms2.o = ms1.o;
-  ms2.d = ms1.d;
-}
-
-void
-Marshal_DSI_Impl::test_union (const Marshal::Marshal_Union& u1,
-			      Marshal::Marshal_Union& u2,
-			      CORBA_Environment &env)
-{
-  u2._d (u1._d ()); // set the discriminant value
-
-  switch (u1._d ())
-    {
-    case Marshal::e_0th:
-      u2.s (u1.s ()); // set short
-      break;
-    case Marshal::e_1st:
-      u2.l (u1.l ()); // set long
-      break;
-    case Marshal::e_2nd:
-      u2.c (u1.c ()); // set char
-      break;
-    case Marshal::e_3rd:
-      u2.o (u1.o ()); // set octet
-      break;
-    case Marshal::e_4th:
-      u2.d (u1.d ()); // set double
-      break;
-    case Marshal::e_5th:
-    default:
-      u2.ms (u1. ms ()); // set structs
-      break;
-    }
-}
-
-void
-Marshal_DSI_Impl::test_any (const CORBA_Any &a1,
-			    CORBA_Any *&a2,
-			    CORBA_Environment &env)
-{
-  a2 = new CORBA_Any (a1.type (), (void *)a1.value ()); // will do a deep copy
-}
-
-void 
-Marshal_DSI_Impl::test_sequence (const Marshal::AnySeq& as1,
-				 Marshal::AnySeq *& as2,
-				 CORBA_Environment &env)
-{
-  as2 = new Marshal::AnySeq (as1);
-}
-
-#if 0
-void 
-Marshal_DSI_Impl::test_recursive (const Marshal::Marshal_Recursive &mr1,
-				  Marshal::Marshal_Recursive *&mr2,
-				  CORBA_Environment &env)
-{
-}
-#endif
-
diff --git a/TAO/Benchmark/Marshal_Test/TAO/tao_marshal_impl.h b/TAO/Benchmark/Marshal_Test/TAO/tao_marshal_impl.h
deleted file mode 100644
index 0ecec0fc87c..00000000000
--- a/TAO/Benchmark/Marshal_Test/TAO/tao_marshal_impl.h
+++ /dev/null
@@ -1,190 +0,0 @@
-#if !defined (TAO_MARSHAL_IMPL_H)
-#define TAO_MARSHAL_IMPL_H
-
-// to include DSI related files
-
-#include "ace/OS.h"
-
-#include "marshalS.h"
-//#include "tao/dynimpl.h"
-
-class Marshal_SSI_Impl 
-  : public virtual _skel_Marshal
-{
-  // =TITLE
-  //  Marshal_SSI_Impl
-  // =DESCRIPTION
-  //  Implementation of the interface using the static skeleton interface
-public:
-  Marshal_SSI_Impl (const char *object_name = (const char *)NULL);
-  // constructor
-
-  ~Marshal_SSI_Impl (void);
-  // destructor
-
-  virtual void test_short (CORBA_Short s1,
-			  CORBA_Short& s2,
-			   CORBA_Environment &env);
-  // test short
-	
-  virtual void test_long (CORBA_Long l1,
-			 CORBA_Long& l2,
-			   CORBA_Environment &env);
-  // test long
-	
-  virtual void test_octet (CORBA_Octet o1,
-			  CORBA_Octet& o2,
-			   CORBA_Environment &env);
-  // test octet
-	
-  virtual void test_char (CORBA_Char c1,
-			 CORBA_Char& c2,
-			   CORBA_Environment &env);
-  // test char
-	
-  virtual void test_double (CORBA_Double d1,
-			   CORBA_Double& d2,
-			   CORBA_Environment &env);
-  // test double
-	
-  virtual void test_struct (const Marshal::Marshal_Struct& ms1,
-			   Marshal::Marshal_Struct& ms2,
-			   CORBA_Environment &env);
-  // test struct
-	
-  virtual void test_union (const Marshal::Marshal_Union& u1,
-			  Marshal::Marshal_Union& u2,
-			   CORBA_Environment &env);
-  // test union
-	
-  virtual void test_any (const CORBA_Any& a1,
-			CORBA_Any *& a2,
-			   CORBA_Environment &env);
-  // test any
-	
-  virtual void test_sequence (const Marshal::AnySeq& a1,
-			     Marshal::AnySeq *& a2,
-			   CORBA_Environment &env);
-  // test sequence
-
-#if 0
-  virtual void test_recursive (const Marshal::Marshal_Recursive& mr1,
-			       Marshal::Marshal_Recursive *& mr2,
-			   CORBA_Environment &env);
-  // test struct
-#endif
-	
-};
-
-class Marshal_DSI_Impl : public CORBA_Object //: public CORBA_DynamicImplementation
-{
-  // =TITLE
-  //  Marshal_DSI_Impl
-  // =DESCRIPTION
-  //  Implementation of the interface using the dynamic skeleton interface
-  // =NOTES
-  // We do not have a DynamicImplementation as yet. So we do a trick here. We
-  // simulate the skeletons here and these call the private methods defined below:
-public:
-  Marshal_DSI_Impl (CORBA_ORB_ptr orb, const char *object_name = (const char *)NULL);
-  // constructor
-
-  ~Marshal_DSI_Impl (void);
-  // destructor
-
-  virtual void invoke (CORBA_ServerRequest & req, CORBA_Environment &env);
-  // This method is a must, but of no use
-
-  // skeletons that do the upcall
-  static void _Marshal_is_a_skel (CORBA_ServerRequest &req, 
-				  CORBA_Object_ptr obj,
-				  CORBA_Environment &env);
-  static void _Marshal_test_short_skel (CORBA_ServerRequest &req,
-					CORBA_Object_ptr obj,
-					CORBA_Environment &env);
-  static void _Marshal_test_long_skel  (CORBA_ServerRequest &req,
-					CORBA_Object_ptr obj,
-					CORBA_Environment &env);
-  static void _Marshal_test_octet_skel (CORBA_ServerRequest &req,
-					CORBA_Object_ptr obj,
-					CORBA_Environment &env);
-  static void _Marshal_test_char_skel (CORBA_ServerRequest &req,
-				       CORBA_Object_ptr obj,
-				       CORBA_Environment &env);
-  static void _Marshal_test_double_skel (CORBA_ServerRequest &req,
-					 CORBA_Object_ptr obj,
-					 CORBA_Environment &env);
-  static void _Marshal_test_struct_skel (CORBA_ServerRequest &req,
-					 CORBA_Object_ptr obj,
-					 CORBA_Environment &env);
-  static void _Marshal_test_union_skel (CORBA_ServerRequest &req,
-					CORBA_Object_ptr obj,
-					CORBA_Environment &env);
-  static void _Marshal_test_any_skel (CORBA_ServerRequest &req,
-				      CORBA_Object_ptr obj,
-				      CORBA_Environment &env);
-  static void _Marshal_test_sequence_skel (CORBA_ServerRequest &req,
-					   CORBA_Object_ptr obj,
-					   CORBA_Environment &env);
-private:
-  void test_short (CORBA_Short s1,
-		   CORBA_Short& s2,
-		   CORBA_Environment &env);
-  // test short
-	
-  void test_long (CORBA_Long l1,
-		  CORBA_Long& l2,
-		  CORBA_Environment &env);
-  // test long
-	
-  void test_octet (CORBA_Octet o1,
-		   CORBA_Octet& o2,
-		   CORBA_Environment &env);
-  // test octet
-	
-  void test_char (CORBA_Char c1,
-		  CORBA_Char& c2,
-		  CORBA_Environment &env);
-  // test char
-	
-  void test_double (CORBA_Double d1,
-		    CORBA_Double& d2,
-		    CORBA_Environment &env);
-  // test double
-	
-  void test_struct (const Marshal::Marshal_Struct& ms1,
-		    Marshal::Marshal_Struct& ms2,
-		    CORBA_Environment &env);
-  // test struct
-	
-  void test_union (const Marshal::Marshal_Union& u1,
-		   Marshal::Marshal_Union& u2,
-		   CORBA_Environment &env);
-  // test union
-	
-  void test_any (const CORBA_Any& a1,
-		 CORBA_Any *& a2,
-		 CORBA_Environment &env);
-  // test any
-	
-  void test_sequence (const Marshal::AnySeq& a1,
-		      Marshal::AnySeq *& a2,
-		      CORBA_Environment &env);
-  // test sequence
-
-#if 0
-  void test_recursive (const Marshal::Marshal_Recursive& mr1,
-		       Marshal::Marshal_Recursive *& mr2,
-		       CORBA_Environment &env);
-  // test struct
-#endif
-	
-  // we need the orb to create argument lists (NVList) for us
-  CORBA_ORB_ptr orb_; // not owned by us
-};
-
-#if defined (__ACE_INLINE__)
-#include "tao_marshal_impl.i"
-#endif /* __ACE_INLINE__ */
-
-#endif // defined (TAO_MARSHAL_IMPL_H)
diff --git a/TAO/Benchmark/Marshal_Test/TAO/tao_marshal_impl.i b/TAO/Benchmark/Marshal_Test/TAO/tao_marshal_impl.i
deleted file mode 100644
index aee9bc6b043..00000000000
--- a/TAO/Benchmark/Marshal_Test/TAO/tao_marshal_impl.i
+++ /dev/null
@@ -1,21 +0,0 @@
-// constructor
-ACE_INLINE
-Marshal_SSI_Impl::Marshal_SSI_Impl (const char *obj_name)
-  : _skel_Marshal (obj_name)
-{
-}
-
-// destructor
-ACE_INLINE
-Marshal_SSI_Impl::~Marshal_SSI_Impl (void)
-{
-}
-
-// destructor
-ACE_INLINE
-Marshal_DSI_Impl::~Marshal_DSI_Impl (void)
-{
-  orb_ = 0;//CORBA::ORB::_nil ();
-}
-
-
diff --git a/TAO/Benchmark/Marshal_Test/TAO/tao_marshal_server.cpp b/TAO/Benchmark/Marshal_Test/TAO/tao_marshal_server.cpp
deleted file mode 100644
index ed6a5a041c7..00000000000
--- a/TAO/Benchmark/Marshal_Test/TAO/tao_marshal_server.cpp
+++ /dev/null
@@ -1,110 +0,0 @@
-// ============================================================================
-//
-// = LIBRARY
-//    CORBA Tao marshal benchmark
-// 
-// = FILENAME
-//    tao_marshal_server.cpp
-//
-// = AUTHOR
-//    Aniruddha Gokhale
-// 
-// ============================================================================
-
-#include "tao_marshal_server.h"
-#include <iostream.h>
-#include <fstream.h>
-
-#if !defined (__ACE_INLINE__)
-#include "tao_marshal_server.i"
-#endif /* __ACE_INLINE__ */
-
-int
-Tao_Marshal_Server_Proxy::run (CORBA_Marshal_Proxy::OPTIONS &options,
-				CORBA_Marshal_Proxy::RESULTS &results)
-{
-  char **argv;
-  int argc;
-  CORBA_Environment env;
-  CORBA_String str; // for the IOR string
-  fstream iorfile;  // persistent storage for IOR
-
-  // get the argument list to be passed on to the ORB_init method
-  argv = options.orb_init_args (argc);
-
-  // get the orb. Pass any ORB_init arguments
-  this->orb_ = CORBA_ORB_init (argc, (char *const *)argv, "IOR", env);
-  if (this->orb_ == 0)
-    {
-      ACE_DEBUG ((LM_DEBUG, "ORB_init failed\n"));
-      return -1;
-    }
-
-  // get the argument list to be passed on to the BOA_init method
-  argv = options.boa_init_args (argc);
-
-  char *foo [] = {"-OAhost","mambo"}; argc = 2;
-  // get the orb. Pass any ORB_init arguments
-  this->boa_ = this->orb_->BOA_init (argc, foo, "ROA");//(argc, (char *const *)argv);
-  if (this->boa_ == 0)
-    {
-      ACE_DEBUG ((LM_DEBUG, "ORB_init failed\n"));
-      return -1;
-    }
-
-  // tell the "results" object what file it must store the results into
-  results.filename (options.filename ());
-
-  // use SII or DII accordingly
-  switch (options.policy ())
-    {
-    case CORBA_Marshal_Options::STATIC : // use SSI
-      this->ssi_ = new Marshal_SSI_Impl (options.object_name ());
-      // register with the BOA
-      //      this->boa_->obj_is_ready (this->ssi_);
-
-      // get a stringified representation of the object reference created above
-      str = this->orb_->object_to_string (this->dsi_, env);
-      if (env.exception() != 0)
-	{
-	  //	  print_exception (env.exception(), "object_to_string", stdout);
-	  return 1;
-	}
-
-      // save the IOR in persistent storage so that clients can read this and obtain
-      // object references. We need to do this since we do not yet have some kind
-      // of a naming service that will allow clients to "bind" to desired objects
-      iorfile.open ("./ior.txt", ios::out);
-      iorfile << ((char *)str) << endl;
-      iorfile.close ();
-      break;
-    case CORBA_Marshal_Options::DYNAMIC : // use DSI
-      this->dsi_ = new Marshal_DSI_Impl (this->orb_, ACE_OS::strdup (options.object_name ()));
-      // register with the BOA
-      //      this->boa_->obj_is_ready (this->dsi_);
-
-      // get a stringified representation of the object reference created above
-      str = this->orb_->object_to_string (this->dsi_, env);
-      if (env.exception() != 0)
-	{
-	  ACE_DEBUG ((LM_ERROR, "cannot get IOR from DSI object" ));
-	  //	  print_exception (env.exception(), "object_to_string", stdout);
-	  return 1;
-	}
-
-      // save the IOR in persistent storage so that clients can read this and obtain
-      // object references. We need to do this since we do not yet have some kind
-      // of a naming service that will allow clients to "bind" to desired objects
-      iorfile.open ("./ior.txt", ios::out);
-      iorfile << ((char *)str) << endl;
-      iorfile.close ();
-      break;
-    default:
-      ACE_DEBUG ((LM_DEBUG, "bad policy\n"));
-      return -1;
-    }
-
-  ACE_Reactor::run_event_loop (); // should be replaced by impl_is_ready
-  return 0;
-}
-
diff --git a/TAO/Benchmark/Marshal_Test/TAO/tao_marshal_server.h b/TAO/Benchmark/Marshal_Test/TAO/tao_marshal_server.h
deleted file mode 100644
index adbd782c3d3..00000000000
--- a/TAO/Benchmark/Marshal_Test/TAO/tao_marshal_server.h
+++ /dev/null
@@ -1,57 +0,0 @@
-// ============================================================================
-//
-// = LIBRARY
-//    CORBA Marshal Tao Benchmark
-// 
-// = FILENAME
-//    tao_marshal_server.h
-//
-// = AUTHOR
-//    Aniruddha Gokhale
-// 
-// ============================================================================
-
-#if !defined(_TAO_MARSHAL_SERVER_H_)
-#define _TAO_MARSHAL_SERVER_H_
-
-// benchmark library includes
-#include "benchmark/marshal_options.h"
-#include "benchmark/marshal_results.h"
-#include "benchmark/marshal_proxy.h"
-
-// implementation classes
-#include "tao_marshal_impl.h"
-
-// include Tao specific include files
-#include "marshalS.h"  // generated by IDL compiler
-
-class Tao_Marshal_Server_Proxy : public CORBA_Marshal_Proxy
-{
-public:
-  Tao_Marshal_Server_Proxy (void);
-  // constructor
-
-  ~Tao_Marshal_Server_Proxy (void);
-  // destructor
-
-  virtual int run (CORBA_Marshal_Proxy::OPTIONS &options,
-		   CORBA_Marshal_Proxy::RESULTS &results);
-  // do the actual work
-private:
-  CORBA_ORB_ptr orb_;
-  // underlying orb;
-
-  CORBA_BOA_ptr boa_;
-  // underlying boa;
-
-  Marshal_SSI_Impl *ssi_;
-  Marshal_DSI_Impl *dsi_;
-  // the implementation (SSI or DSI)
-};
-
-
-#if defined (__ACE_INLINE__)
-#include "tao_marshal_server.i"
-#endif /* __ACE_INLINE__ */
-
-#endif
diff --git a/TAO/Benchmark/Marshal_Test/TAO/tao_marshal_server.i b/TAO/Benchmark/Marshal_Test/TAO/tao_marshal_server.i
deleted file mode 100644
index 721a329c03b..00000000000
--- a/TAO/Benchmark/Marshal_Test/TAO/tao_marshal_server.i
+++ /dev/null
@@ -1,26 +0,0 @@
-// constructor
-ACE_INLINE
-Tao_Marshal_Server_Proxy::Tao_Marshal_Server_Proxy (void)
-  : orb_ (0),
-    boa_ (0),
-    ssi_ (0),
-    dsi_ (0)
-{
-}
-
-// destructor
-ACE_INLINE
-Tao_Marshal_Server_Proxy::~Tao_Marshal_Server_Proxy (void)
-{
-  // releasing order is important
-
-  // release the impl
-  delete ssi_;
-  delete dsi_;
-
-  // release the BOA
-  CORBA_release (boa_);
-
-  // release the ORB
-  CORBA_release (orb_);
-}
diff --git a/TAO/Benchmark/Marshal_Test/VisiBroker/Makefile b/TAO/Benchmark/Marshal_Test/VisiBroker/Makefile
deleted file mode 100644
index aceae10804c..00000000000
--- a/TAO/Benchmark/Marshal_Test/VisiBroker/Makefile
+++ /dev/null
@@ -1,64 +0,0 @@
-#----------------------------------------------------------------------------
-#	$Id$
-#
-#	Top-level Makefile for the VisiBroker Marshal Benchmark
-#----------------------------------------------------------------------------
-
-#----------------------------------------------------------------------------
-#	Local macros
-#----------------------------------------------------------------------------
-
-LDLIBS     	= -lACE -lbenchmark -lorb
-
-PROG_SRCS 	= marshalC.cpp marshalS.cpp visi_marshal_client.cpp visi_marshal_server.cpp \
-		  visi_marshal_impl.cpp client.cpp server.cpp
-
-LSRC = $(PROG_SRCS)
-
-MARSHAL_CLIENT_OBJS = marshalC.o visi_marshal_client.o client.o
-
-MARSHAL_SERVER_OBJS = marshalC.o marshalS.o visi_marshal_impl.o visi_marshal_server.o server.o
-
-BIN = client server
-
-BUILD = $(BIN)
-
-VLDLIBS = $(LDLIBS:%=%$(VAR))
-
-#----------------------------------------------------------------------------
-#	Include macros and targets
-#----------------------------------------------------------------------------
-
-include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-include $(ACE_ROOT)/include/makeinclude/macros.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.lib.GNU
-#include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
-# include VisiBroker specific file
-include /project/mambo/gokhale/CONFIG/orbeline_defaults.mk
-
-#----------------------------------------------------------------------------
-# Local modifications to variables imported by includes above.
-#----------------------------------------------------------------------------
-
-ifndef TAO_ROOT
-TAO_ROOT = $(ACE_ROOT)/TAO
-endif
-
-CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/Benchmark -D_PMC_INCLUDE_DSI
-
-server:	$(addprefix $(VDIR),$(MARSHAL_SERVER_OBJS))
-	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS)
-
-client:	$(addprefix $(VDIR),$(MARSHAL_CLIENT_OBJS))
-	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS)
-
-marshalC.h marshalS.h marshalC.cpp marshalS.cpp: marshal.idl
-	$(IDL) $(IDLFLAGS) $< 
-
-clean:
-	rm -f core *.o *~ client server *C.cpp *S.cpp *S.h *C.h
-	$(MAKE) realclean
-
diff --git a/TAO/Benchmark/Marshal_Test/VisiBroker/client.cpp b/TAO/Benchmark/Marshal_Test/VisiBroker/client.cpp
deleted file mode 100644
index ed996e4b9e0..00000000000
--- a/TAO/Benchmark/Marshal_Test/VisiBroker/client.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-#include "benchmark/driver.h"
-#include "visi_marshal_client.h"
-
-int main (int argc, char *argv [])
-{
-  // instantiate a DRIVER with the Visi_Client_Proxy as the template
-  CORBA_Benchmark_Driver<Visi_Marshal_Client_Proxy>  driver (new
-							     Visi_Marshal_Client_Proxy ());
-
-  // let the driver do everything for us so that we remain very simple
-  return driver.run (argc, argv);
-}
diff --git a/TAO/Benchmark/Marshal_Test/VisiBroker/marshal.idl b/TAO/Benchmark/Marshal_Test/VisiBroker/marshal.idl
deleted file mode 100644
index 7ddc5423db4..00000000000
--- a/TAO/Benchmark/Marshal_Test/VisiBroker/marshal.idl
+++ /dev/null
@@ -1,89 +0,0 @@
-// Interface for the marshal benchmark
-
-interface Marshal 
-{
-  struct Marshal_Struct
-  {
-    short s;
-    long  l;
-    char  c;
-    octet o;
-    double d;
-  };
-
-  enum discrim {e_0th, e_1st, e_2nd, e_3rd, e_4th, e_5th, e_6th};
-
-  union Marshal_Union
-    switch (discrim)
-      {
-      case e_0th:
-	short s;
-      case e_1st:
-	long  l;
-      case e_2nd:
-	char  c;
-      case e_3rd:
-	octet o;
-      case e_4th:
-	double d;
-      case e_5th:
-      default:      // this will test typecode indirection
-	Marshal_Struct ms;
-      };
-
-  /*
-  typedef sequence<short> ShortSeq;
-  typedef sequence<long>  LongSeq;
-  typedef sequence<octet> OctetSeq;
-  typedef sequence<char>  CharSeq;
-  typedef sequence<double> DoubleSeq;
-  typedef sequence<Marshal_Struct> StructSeq;
-  typedef sequence<Marshal_Union> UnionSeq;
-  */
-  // for testing sequences of Any
-  typedef sequence<any> AnySeq;
-
-  // testing recursive behavior
-  // complex.
-  struct Marshal_Recursive
-  {
-    // we use this to test the limited recursion allowed by IDL. This is an
-    // ideal test for indirected typecodes.
-
-    // simulate a behavior of a list node
-    any value;
-    sequence <Marshal_Recursive> next;
-  };
-
-  void test_short (in short s1, out short s2); // test a short
-  void test_long (in long l1, out long l2); // test a long
-  void test_octet (in octet o1, out octet o2); // test an octet
-  void test_char (in char c1, out char c2); // test a char
-  void test_double (in double d1, out double d2); // test a double
-  void test_struct (in Marshal_Struct ms1, out Marshal_Struct ms2); // test a
-								    // struct 
-  void test_union (in Marshal_Union u1, out Marshal_Union u2); // test a
-							       // union.
-  void test_any (in any a1, out any a2); // test an Any
-  /*
-  void test_sequence (in ShortSeq ss1, in LongSeq ls1, in OctetSeq os1, in
-		      CharSeq cs1, in DoubleSeq ds1, in StructSeq Ss1, in
-		      UnionSeq us1, in AnySeq as1,
-		      out ShortSeq ss2, out LongSeq ls2, out OctetSeq os2, out
-		      CharSeq cs2, out DoubleSeq ds2, out StructSeq Ss2, out
-		      UnionSeq us2, out AnySeq as2);
-		      */
-  void test_sequence (in AnySeq as1, out AnySeq as2); // this will result in a
-						      // 3 level indirection -
-						      // sequence, any, and its
-						      // value type
-  void test_recursive (in Marshal_Recursive mr1, out Marshal_Recursive mr2); //
-						      // very complicated
-};
-
-
-
-
-
-
-
diff --git a/TAO/Benchmark/Marshal_Test/VisiBroker/run_client b/TAO/Benchmark/Marshal_Test/VisiBroker/run_client
deleted file mode 100755
index 2a35700495f..00000000000
--- a/TAO/Benchmark/Marshal_Test/VisiBroker/run_client
+++ /dev/null
@@ -1,23 +0,0 @@
-echo "********* Static Invocation Interface **********"
-client -i 1 -h mambo -R s -P S -o marshal -T s
-client -i 1 -h mambo -R s -P S -o marshal -T l
-client -i 1 -h mambo -R s -P S -o marshal -T o
-client -i 1 -h mambo -R s -P S -o marshal -T c
-client -i 1 -h mambo -R s -P S -o marshal -T d
-client -i 1 -h mambo -R s -P S -o marshal -T S
-client -i 1 -h mambo -R s -P S -o marshal -T U
-client -i 1 -h mambo -R s -P S -o marshal -T A
-client -i 1 -h mambo -R s -P S -o marshal -T Q
-#client -i 1 -h mambo -R s -P S -o marshal -T R
-#
-echo "********* Dynamic Invocation Interface **********"
-client -i 1 -h mambo -R s -P D -o marshal -T s
-client -i 1 -h mambo -R s -P D -o marshal -T l
-client -i 1 -h mambo -R s -P D -o marshal -T o
-client -i 1 -h mambo -R s -P D -o marshal -T c
-client -i 1 -h mambo -R s -P D -o marshal -T d
-client -i 1 -h mambo -R s -P D -o marshal -T S
-client -i 1 -h mambo -R s -P D -o marshal -T U
-client -i 1 -h mambo -R s -P D -o marshal -T A
-client -i 1 -h mambo -R s -P D -o marshal -T Q
-
diff --git a/TAO/Benchmark/Marshal_Test/VisiBroker/run_server b/TAO/Benchmark/Marshal_Test/VisiBroker/run_server
deleted file mode 100755
index c5ff4cdc2f0..00000000000
--- a/TAO/Benchmark/Marshal_Test/VisiBroker/run_server
+++ /dev/null
@@ -1 +0,0 @@
-server -R r -P S -I V -o marshal
\ No newline at end of file
diff --git a/TAO/Benchmark/Marshal_Test/VisiBroker/server.cpp b/TAO/Benchmark/Marshal_Test/VisiBroker/server.cpp
deleted file mode 100644
index 2706589fa93..00000000000
--- a/TAO/Benchmark/Marshal_Test/VisiBroker/server.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-#include "benchmark/driver.h"
-#include "visi_marshal_server.h"
-
-int main (int argc, char *argv [])
-{
-  // instantiate a DRIVER with the Visi_Client_Proxy as the template
-  CORBA_Benchmark_Driver<Visi_Marshal_Server_Proxy>  driver (new
-							     Visi_Marshal_Server_Proxy ());
-
-  // let the driver do everything for us so that we remain very simple
-  return driver.run (argc, argv);
-}
diff --git a/TAO/Benchmark/Marshal_Test/VisiBroker/visi_marshal_client.cpp b/TAO/Benchmark/Marshal_Test/VisiBroker/visi_marshal_client.cpp
deleted file mode 100644
index 3801165cc8b..00000000000
--- a/TAO/Benchmark/Marshal_Test/VisiBroker/visi_marshal_client.cpp
+++ /dev/null
@@ -1,1344 +0,0 @@
-// ============================================================================
-//
-// = LIBRARY
-//    CORBA Visibroker marshal benchmark
-// 
-// = FILENAME
-//    visi_marshal_proxy.cpp
-//
-// = AUTHOR
-//    Aniruddha Gokhale
-// 
-// ============================================================================
-
-#include "visi_marshal_client.h"
-
-#if !defined (__ACE_INLINE__)
-#include "visi_marshal_client.i"
-#endif /* __ACE_INLINE__ */
-
-int
-Visi_Marshal_Client_Proxy::run (CORBA_Marshal_Proxy::OPTIONS &options,
-				CORBA_Marshal_Proxy::RESULTS &results)
-{
-  char **argv;
-  int argc;
-  CORBA::Object_ptr target;
-
-  // get the argument list to be passed on to the ORB_init method
-  argv = options.orb_init_args (argc);
-
-  // get the orb. Pass any ORB_init arguments
-  this->orb_ = CORBA::ORB_init (argc, (char *const *)argv);
-  if (this->orb_ == 0)
-    {
-      ACE_DEBUG ((LM_DEBUG, "ORB_init failed\n"));
-      return -1;
-    }
-
-  // get the obj ref by binding it to the specified host using the specified obj_name
-  target = Marshal::_bind (options.object_name (), options.hostname ());
-  if (CORBA::is_nil (target))
-    {
-      ACE_DEBUG ((LM_DEBUG, "bind call failed\n"));
-      return -1;
-    }
-
-  this->ref_ = Marshal::_narrow (target);
-  if (CORBA::is_nil (this->ref_))
-    {
-      ACE_DEBUG ((LM_DEBUG, "narrow to Marshal failed\n"));
-      return -1;
-    }
-
-  // tell the "results" object what file it must store the results into
-  results.filename (options.filename ());
-
-  // use SII or DII accordingly
-  switch (options.policy ())
-    {
-    case CORBA_Marshal_Options::STATIC : // use SII
-      return this->use_sii (options, results);
-      break;
-    case CORBA_Marshal_Options::DYNAMIC : // use DII
-      return this->use_dii (options, results);
-      break;
-    default:
-      ACE_DEBUG ((LM_DEBUG, "bad policy\n"));
-      return -1;
-    }
-  // hopefully we are never here, else something is seriously wrong
-  return -1;
-}
-
-int
-Visi_Marshal_Client_Proxy::use_sii (CORBA_Marshal_Proxy::OPTIONS &options,
-				    CORBA_Marshal_Proxy::RESULTS &results)
-{
-  int i;
-  int status = 0;
-  // This method tests the static invocation interface
-
-  for (i=0; i < options.iterations () && !status; i++)
-    {
-      switch (options.data_type ())
-	{
-	  // shorts
-	case CORBA_Marshal_Options::SHORT:
-	  status = sii_test_short (options, results);
-	  break;
-	  // longs
-	case CORBA_Marshal_Options::LONG:
-	  status = sii_test_long (options, results);
-	  break;
-	  // octets
-	case CORBA_Marshal_Options::OCTET:
-	  status = sii_test_octet (options, results);
-	  break;
-	  // chars
-	case CORBA_Marshal_Options::CHAR:
-	  status = sii_test_char (options, results);
-	  break;
-	  // doubles
-	case CORBA_Marshal_Options::DOUBLE:
-	  status = sii_test_double (options, results);
-	  break;
-	  // Structs
-	case CORBA_Marshal_Options::STRUCT:
-	  status = sii_test_struct (options, results);
-	  break;
-	  // unions
-	case CORBA_Marshal_Options::UNION:
-	  status = sii_test_union (options, results);
-	  break;
-	  // anys
-	case CORBA_Marshal_Options::ANY:
-	  status = sii_test_any (options, results);
-	  break;
-	  // sequences
-	case CORBA_Marshal_Options::SEQUENCE:
-	  status = sii_test_sequence (options, results);
-	  break;
-	  // longs
-	case CORBA_Marshal_Options::RECURSIVE:
-	  //	  status = sii_test_recursive (options, results);
-	  // doesn't work
-	  break;
-	default:
-	  status = -1;
-	} // end of switch
-    } // for loop
-
-  if (!status)
-    return 0;
-  else
-    return -1;
-}
-
-int
-Visi_Marshal_Client_Proxy::use_dii (CORBA_Marshal_Proxy::OPTIONS &options,
-				    CORBA_Marshal_Proxy::RESULTS &results)
-{
-  int i;
-  int status = 0;
-  // This method tests the dynamic invocation interface
-
-  for (i=0; i < options.iterations () && !status; i++)
-    {
-      switch (options.data_type ())
-	{
-	  // shorts
-	case CORBA_Marshal_Options::SHORT:
-	  status = dii_test_short (options, results);
-	  break;
-	  // longs
-	case CORBA_Marshal_Options::LONG:
-	  status = dii_test_long (options, results);
-	  break;
-	  // octets
-	case CORBA_Marshal_Options::OCTET:
-	  status = dii_test_octet (options, results);
-	  break;
-	  // chars
-	case CORBA_Marshal_Options::CHAR:
-	  status = dii_test_char (options, results);
-	  break;
-	  // doubles
-	case CORBA_Marshal_Options::DOUBLE:
-	  status = dii_test_double (options, results);
-	  break;
-	  // Structs
-	case CORBA_Marshal_Options::STRUCT:
-	  status = dii_test_struct (options, results);
-	  break;
-	  // unions
-	case CORBA_Marshal_Options::UNION:
-	  status = dii_test_union (options, results);
-	  break;
-	  // anys
-	case CORBA_Marshal_Options::ANY:
-	  status = dii_test_any (options, results);
-	  break;
-	  // sequences
-	case CORBA_Marshal_Options::SEQUENCE:
-	  status = dii_test_sequence (options, results);
-	  break;
-	  // longs
-	case CORBA_Marshal_Options::RECURSIVE:
-	  //	  status = dii_test_recursive (options, results);
-	  // doesn't work
-	  break;
-	default:
-	  status = -1;
-	} // end of switch
-    } // for loop
-
-  if (!status)
-    return 0;
-  else
-    return -1;
-}
-
-
-// all helper functions : SII
-int
-Visi_Marshal_Client_Proxy::sii_test_short (CORBA_Marshal_Proxy::OPTIONS &options,
-					   CORBA_Marshal_Proxy::RESULTS &results)
-{
-  CORBA::Short s1, s2;
-  s1 = 3;
-  ref_->test_short (s1, s2);
-  if (s1 == s2)
-    {
-      ACE_DEBUG ((LM_DEBUG, "SII test_short success: s1 = %d, s2 = %d\n", s1, s2));
-      return 0;
-    }
-  else
-    {
-      ACE_DEBUG ((LM_DEBUG, "SII test_short failed: s1 = %d, s2 = %d\n", s1, s2));
-      return -1;
-    }
-}
-
-int
-Visi_Marshal_Client_Proxy::sii_test_long (CORBA_Marshal_Proxy::OPTIONS &options,
-					  CORBA_Marshal_Proxy::RESULTS &results)
-{
-  CORBA::Long l1, l2;
-  l1 = 256;
-  ref_->test_long (l1, l2);
-  if (l1 == l2)
-    {
-      ACE_DEBUG ((LM_DEBUG, "SII test_long success: l1 = %d, l2 = %d\n", l1, l2));
-      return 0;
-    }
-  else
-    {
-      ACE_DEBUG ((LM_DEBUG, "SII test_long failed: l1 = %d, l2 = %d\n", l1, l2));
-      return -1;
-    }
-}
-
-int
-Visi_Marshal_Client_Proxy::sii_test_octet (CORBA_Marshal_Proxy::OPTIONS &options,
-					   CORBA_Marshal_Proxy::RESULTS &results)
-  // octets
-{
-  CORBA::Octet o1, o2;
-  o1 = (CORBA::Octet) 127;
-  ref_->test_octet (o1, o2);
-  if (o1 == o2)
-    {
-      ACE_DEBUG ((LM_DEBUG, "SII test_octet success: o1 = %c, o2 = %c\n", o1, o2));
-      return 0;
-    }
-  else
-    {
-      ACE_DEBUG ((LM_DEBUG, "SII test_octet failed: o1 = %c, o2 = %c\n", o1, o2));
-      return -1;
-    }
-}
-
-int
-Visi_Marshal_Client_Proxy::sii_test_char (CORBA_Marshal_Proxy::OPTIONS &options,
-					  CORBA_Marshal_Proxy::RESULTS &results)
-  // chars
-{
-  CORBA::Char c1, c2;
-  c1 = 'B';
-  ref_->test_char (c1, c2);
-  if (c1 == c2)
-    {
-      ACE_DEBUG ((LM_DEBUG, "SII test_char success: c1 = %c, c2 = %c\n", c1, c2));
-      return 0;
-    }
-  else
-    {
-      ACE_DEBUG ((LM_DEBUG, "SII test_char failed: c1 = %c, c2 = %c\n", c1, c2));
-      return -1;
-    }
-}
-
-int
-Visi_Marshal_Client_Proxy::sii_test_double (CORBA_Marshal_Proxy::OPTIONS &options,
-					    CORBA_Marshal_Proxy::RESULTS &results)
-  // doubles
-{
-  CORBA::Double d1, d2;
-  d1 = 3.1415;
-  ref_->test_double (d1, d2);
-  if (d1 == d2)
-    {
-      ACE_DEBUG ((LM_DEBUG, "SII test_double success: d1 = %f, d2 = %f\n", d1, d2));
-      return 0;
-    }
-  else
-    {
-      ACE_DEBUG ((LM_DEBUG, "SII test_double failed: d1 = %f, d2 = %f\n", d1, d2));
-      return -1;
-    }
-}
-
-int
-Visi_Marshal_Client_Proxy::sii_test_struct (CORBA_Marshal_Proxy::OPTIONS &options,
-					    CORBA_Marshal_Proxy::RESULTS &results)
-  // structs
-{
-  Marshal::Marshal_Struct ms1, ms2;
-
-  ms1.s = 3;
-  ms1.l = 256;
-  ms1.c = 'B';
-  ms1.o = (CORBA::Octet) 127;
-  ms1.d = 3.1415;
-
-  ref_->test_struct (ms1, ms2);
-  if (ms1.s == ms2.s && ms1.l == ms2.l && ms1.c == ms2.c && ms1.o == ms2.o &&
-      ms1.d == ms2.d)
-    {
-      ACE_DEBUG ((LM_DEBUG, "SII test_struct success\n"));
-      return 0;
-    }
-  else
-    {
-      ACE_DEBUG ((LM_DEBUG, "SII test_struct failed\n"));
-      return -1;
-    }
-}
-
-int
-Visi_Marshal_Client_Proxy::sii_test_union (CORBA_Marshal_Proxy::OPTIONS &options,
-					   CORBA_Marshal_Proxy::RESULTS &results)
-  // unions
-{
-  Marshal::Marshal_Union u1, u2;
-  Marshal::Marshal_Struct ms1, ms2;
-
-
-  // first test an enumerated case
-  u1._d (Marshal::e_1st);
-  u1.l (4567);
-
-  ref_->test_union (u1, u2);
-  if ( (u1._d () == u2._d()) && (u1.l () == u2.l ()))
-    {
-      ACE_DEBUG ((LM_DEBUG, "SII test_union for long (case e_1st) success\n"));
-    }
-  else
-    {
-      ACE_DEBUG ((LM_DEBUG, "SII test_union for long (case e_1st) failed\n"));
-      return -1;
-    }
-
-  // now test the default case
-  u1._d (Marshal::e_6th); // this case doesn't exist which will lead to using
-			  // the default case
-
-  u1.ms ().s = 3;
-  u1.ms ().l = 256;
-  u1.ms ().c = 'B';
-  u1.ms ().o = (CORBA::Octet) 127;
-  u1.ms ().d = 3.1415;
-
-  ref_->test_union (u1, u2);
-
-  if (u1.ms ().s == u2.ms ().s && u1.ms ().l == u2.ms ().l && u1.ms ().c == u2.ms ().c && u1.ms ().o == u2.ms ().o &&
-      u1.ms ().d == u2.ms ().d)
-    {
-      ACE_DEBUG ((LM_DEBUG, "SII test_union for default (case e_6th) success\n"));
-      return 0;
-    }
-  else
-    {
-      ACE_DEBUG ((LM_DEBUG, "SII test_union for default (case e_6th) failed\n"));
-      return -1;
-    }
-}
-
-int
-Visi_Marshal_Client_Proxy::sii_test_any (CORBA_Marshal_Proxy::OPTIONS &options,
-					 CORBA_Marshal_Proxy::RESULTS &results)
-{
-  // we send a struct thru the any
-  CORBA::Any a1, *a2;
-  Marshal::Marshal_Struct ms1, *ms2;
-
-  ms1.s = 3;
-  ms1.l = 256;
-  ms1.c = 'B';
-  ms1.o = (CORBA::Octet) 127;
-  ms1.d = 3.1415;
-
-  // populate the any with a MarshalStruct
-  a1 <<= ms1;
-
-  a2 = new CORBA::Any;
-
-  // now test it
-  ref_->test_any (a1, a2);
-  
-  // check if the two typecodes are equal
-  if (a2->type ()->equal (Marshal::_tc_Marshal_Struct))
-    {
-      // now see if the values are same
-      ms2 = (Marshal::Marshal_Struct *)a2->value ();
-      if (ms1.s == ms2->s && ms1.l == ms2->l && ms1.c == ms2->c && ms1.o == ms2->o &&
-	  ms1.d == ms2->d)
-	{
-	  ACE_DEBUG ((LM_DEBUG, "SII test_any success\n"));
-	  return 0;
-	}
-      else
-	{
-	  ACE_DEBUG ((LM_DEBUG, "SII test_any value match failed\n"));
-	  return -1;
-	}
-    }
-  else
-    {
-      ACE_DEBUG ((LM_DEBUG, "SII test_any failed due to typecode mismatch\n"));
-    }
-  return 0;
-}
-
-int
-Visi_Marshal_Client_Proxy::sii_test_sequence (CORBA_Marshal_Proxy::OPTIONS &options,
-					      CORBA_Marshal_Proxy::RESULTS &results)
-{
-  // make a sequence of Anys and fill each one with a different data type
-  Marshal::AnySeq as1 (7), *as2;
-  Marshal::Marshal_Struct ms;
-  Marshal::Marshal_Union u;
-
-  ms.s = 3;
-  ms.l = 256;
-  ms.c = 'B';
-  ms.o = (CORBA::Octet) 127;
-  ms.d = 3.1415;
-
-  u._d (Marshal::e_5th); // somehow, the default case e_6th doesn't seem to
-			 // work here
-  u.ms ().s = 3;
-  u.ms ().l = 256;
-  u.ms ().c = 'B';
-  u.ms ().o = (CORBA::Octet) 127;
-  u.ms ().d = 3.1415;
-
-  // it looks like we must tell the sequence how many elements it is going to
-  // carry. By just fixing the max value does not work.
-
-  as1.length (7);
-
-  as1[0] <<= (CORBA::Short)3;
-  as1[1] <<= (CORBA::Long) 256;
-  as1[2] <<= CORBA::Any::from_octet ((CORBA::Octet)127);
-  as1[3] <<= CORBA::Any::from_char ('B');
-  as1[4] <<= (CORBA::Double)3.1415; // double
-  as1[5] <<= ms;     // struct
-  as1[6] <<= u;      // union
-
-  as2 = new Marshal::AnySeq;
-
-  ref_->test_sequence (as1, as2);
-
-#if 0
-  // the following is extremely weird. I do not understand why it is not the
-  // same as _tc_Marshal_Union, but its _kind field does have _tk_union in it.
-  if ((*as2)[6].type ()->equal (Marshal::_tc_Marshal_Union))
-    {
-      cerr << "6th elem has union typecode" << endl;
-    }
-  else
-    {
-      cerr << "6th elem doesnot have union typecode" << endl;
-      cerr << "its typecode kind = " << (*as2)[6].type ()->kind () << endl;
-    }
-#endif
-
-  ACE_DEBUG ((LM_DEBUG, "SII test_sequence\n"));
-  if (as1.length () == as2->length ())
-    {
-      // now make sure that the elements are same
-      for (int i=0; i < as1.length (); i++)
-	{
-#if 0
-	  if (as1[i].type ()->equal ((*as2)[i].type ()))
-	    {
-#endif
-	      // now see if the values are same
-	      switch (i)
-		{
-		case 0:
-		  if (*(CORBA::Short *)as1[i].value () == *(CORBA::Short
-							    *)(*as2)[i].value ())
-		    {
-		      ACE_DEBUG ((LM_DEBUG, "\tSII test_sequence, shorts matched\n"));
-		    }
-		  else
-		    {
-		      ACE_DEBUG ((LM_DEBUG, "\tSII test_sequence failed on shorts match\n"));
-		    }
-		  break;
-		case 1:
-		  if (*(CORBA::Long *)as1[i].value () == *(CORBA::Long
-							    *)(*as2)[i].value ())
-		    {
-		      ACE_DEBUG ((LM_DEBUG, "\tSII test_sequence, longs matched\n"));
-		    }
-		  else
-		    {
-		      ACE_DEBUG ((LM_DEBUG, "\tSII test_sequence failed on longs match\n"));
-		    }
-		  break;
-		case 2:
-		  if (*(CORBA::Octet *)as1[i].value () == *(CORBA::Octet
-							    *)(*as2)[i].value ())
-		    {
-		      ACE_DEBUG ((LM_DEBUG, "\tSII test_sequence, octets matched\n"));
-		    }
-		  else
-		    {
-		      ACE_DEBUG ((LM_DEBUG, "\tSII test_sequence failed on octets match\n"));
-		    }
-		  break;
-		case 3:
-		  if (*(CORBA::Char *)as1[i].value () == *(CORBA::Char
-							    *)(*as2)[i].value ())
-		    {
-		      ACE_DEBUG ((LM_DEBUG, "\tSII test_sequence, chars matched\n"));
-		    }
-		  else
-		    {
-		      ACE_DEBUG ((LM_DEBUG, "\tSII test_sequence failed on chars match\n"));
-		    }
-		  break;
-		case 4:
-		  if (*(CORBA::Double *)as1[i].value () == *(CORBA::Double
-							    *)(*as2)[i].value ())
-		    {
-		      ACE_DEBUG ((LM_DEBUG, "\tSII test_sequence, doubles matched\n"));
-		    }
-		  else
-		    {
-		      ACE_DEBUG ((LM_DEBUG, "\tSII test_sequence failed on doubles match\n"));
-		    }
-		  break;
-		case 5:
-		  {
-		    Marshal::Marshal_Struct *ms1, *ms2;
-		    
-		    ms1 = (Marshal::Marshal_Struct *)as1[i].value ();
-		    ms2 = (Marshal::Marshal_Struct *)(*as2)[i].value ();
-
-		    if (ms1->s == ms2->s && ms1->l == ms2->l && ms1->c == ms2->c && ms1->o == ms2->o &&
-			ms1->d == ms2->d)
-		    {
-		      ACE_DEBUG ((LM_DEBUG, "\tSII test_sequence, structs matched\n"));
-		    }
-		  else
-		    {
-		      ACE_DEBUG ((LM_DEBUG, "\tSII test_sequence failed on structs match\n"));
-		    }
-		  }
-		  break;
-		case 6:
-		  {
-		    Marshal::Marshal_Union *u1, *u2;
-		    
-		    u1 = (Marshal::Marshal_Union *)as1[i].value ();
-		    u2 = (Marshal::Marshal_Union *)(*as2)[i].value ();
-
-		    if (u1->_d () == u2->_d () && u1->ms ().s == u2->ms ().s &&
-			u1->ms ().l == u2->ms ().l && 
-			u1->ms ().c == u2->ms ().c && u1->ms ().o == u2->ms ().o &&
-			u1->ms ().d == u2->ms ().d)
-		    {
-		      ACE_DEBUG ((LM_DEBUG, "\tSII test_sequence, unions matched\n"));
-		    }
-		  else
-		    {
-		      ACE_DEBUG ((LM_DEBUG, "\tSII test_sequence failed on unions match\n"));
-		    }
-		  }
-		  break;
-		}
-#if 0
-	    }
-	  else
-	    {
-	      ACE_DEBUG ((LM_DEBUG, 
-			  "SII test_sequence: typecode mismatch for element %d\n", i));
-	      break;
-	    }
-#endif
-	}
-    }
-  else
-    {
-      ACE_DEBUG ((LM_DEBUG, "SII test_sequence failed: as2->length = %d\n",
-		  as2->length ()));
-    }
-  return 0;
-}
-
-int
-Visi_Marshal_Client_Proxy::sii_test_recursive (CORBA_Marshal_Proxy::OPTIONS &options,
-					       CORBA_Marshal_Proxy::RESULTS &results)
-{
-  // we will try a simple one here
-  Marshal::Marshal_Recursive mr1, *elem1, *mr2, *elem2;
-
-  mr1.value <<= (CORBA::Long)1;
-  mr1.next.length (1);  // sequence of length 1
-
-  // fill the element
-  elem1 = &mr1.next[0];
-  elem1->value <<= CORBA::Any::from_char ('D');
-  elem1->next.length (0); // end of seq
-
-  mr2 = new Marshal::Marshal_Recursive;
-
-  try {
-  ref_->test_recursive (mr1, mr2);
-  }
-  catch (CORBA::SystemException &se){
-    cerr << "error invoking request: " << se << endl;
-  }
-
-  elem2 = &mr2->next[0];
-
-  if ((*(CORBA::Long *)mr1.value.value () == *(CORBA::Long*)mr2->value.value ())
-      && (mr1.next.length () == mr2->next.length ()) // same length sequence
-      && (*(CORBA::Char *)elem1->value.value () == *(CORBA::Char *)elem2->value.value ())
-      && (elem1->next.length () == elem2->next.length ()))
-    {
-      ACE_DEBUG ((LM_DEBUG, "SII test_recursive success\n"));
-    }
-  else
-    {
-      ACE_DEBUG ((LM_DEBUG, "SII test_recursive failure\n"));
-    }
-      
-  return 0;
-}
-
-// -------------------------------------------------------
-// all helper functions : DII
-// -------------------------------------------------------
-
-int
-Visi_Marshal_Client_Proxy::dii_test_short (CORBA_Marshal_Proxy::OPTIONS &options,
-					   CORBA_Marshal_Proxy::RESULTS &results)
-{
-  // DII variables
-  CORBA::Request_ptr     request = CORBA::Request::_nil(); // DII request
-  CORBA::NVList_ptr      arglist = CORBA::NVList::_nil();  // argument list
-  CORBA::Context_ptr     ctx     = CORBA::Context::_nil(); // context
-  CORBA::NVList_ptr result_list  = CORBA::NVList::_nil();  // result list
-  CORBA::NamedValue_ptr result = CORBA::NamedValue::_nil();// actual result
-  CORBA::Short s1, s2;
-
-  s1 = 3;
-  s2 = 0;
-
-  orb_->create_list(0, arglist); // 2 arguments to be added
-  *(arglist->add (CORBA::ARG_IN)->value ()) <<= s1;
-  // this usage is also correct. All we care is to supply a storage area for
-  // the OUT parameter
-  //  arglist->add (CORBA::ARG_OUT)->value ()->replace (CORBA::_tc_short, &s2);
-  *(arglist->add (CORBA::ARG_OUT)->value ()) <<= s2;
-  orb_->create_list(1, result_list); // 1 result
-  result = result_list->item (0);
-
-  // create a request
-  ref_->_create_request(ctx,
-			"test_short",
-			arglist,
-			result,
-			request,
-			0);
-  
-  request->invoke (); // 2 way
-  *(arglist->item(1)->value()) >>= s2;
-
-  if (s1 == s2)
-    {
-      ACE_DEBUG ((LM_DEBUG, "DII test_short success: s1 = %d, s2 = %d\n", s1, s2));
-    }
-  else
-    {
-      ACE_DEBUG ((LM_DEBUG, "DII test_short failed: s1 = %d, s2 = %d\n", s1, s2));
-    }
-  CORBA::release (request);
-  CORBA::release (arglist);
-  CORBA::release (result);
-  CORBA::release (result_list);
-  return 0;
-}
-
-int
-Visi_Marshal_Client_Proxy::dii_test_long (CORBA_Marshal_Proxy::OPTIONS &options,
-					  CORBA_Marshal_Proxy::RESULTS &results)
-{
-  // DII variables
-  CORBA::Request_ptr     request = CORBA::Request::_nil(); // DII request
-  CORBA::NVList_ptr      arglist = CORBA::NVList::_nil();  // argument list
-  CORBA::Context_ptr     ctx     = CORBA::Context::_nil(); // context
-  CORBA::NVList_ptr result_list  = CORBA::NVList::_nil();  // result list
-  CORBA::NamedValue_ptr result = CORBA::NamedValue::_nil();// actual result
-  CORBA::Long l1, l2;
-
-  l1 = 256;
-
-  orb_->create_list(0, arglist); // 2 arguments to be added
-  *(arglist->add(CORBA::ARG_IN)->value()) <<= l1;
-  arglist->add(CORBA::ARG_OUT)->value()->replace (CORBA::_tc_long, &l2);
-  orb_->create_list(1, result_list); // 1 result
-  result = result_list->item(0);
-
-  // create a request
-  ref_->_create_request(ctx,
-			"test_long",
-			arglist,
-			result,
-			request,
-			0);
-  
-  request->invoke (); // 2 way
-  *(arglist->item(1)->value()) >>= l2;
-
-  if (l1 == l2)
-    {
-      ACE_DEBUG ((LM_DEBUG, "DII: test_long success: l1 = %d, l2 = %d\n", l1, l2));
-    }
-  else
-    {
-      ACE_DEBUG ((LM_DEBUG, "DII: test_long failed: l1 = %d, l2 = %d\n", l1, l2));
-    }
-  CORBA::release (request);
-  CORBA::release (arglist);
-  CORBA::release (result);
-  CORBA::release (result_list);
-  return 0;
-}
-
-int
-Visi_Marshal_Client_Proxy::dii_test_octet (CORBA_Marshal_Proxy::OPTIONS &options,
-					   CORBA_Marshal_Proxy::RESULTS &results)
-  // octets
-{
-  // DII variables
-  CORBA::Request_ptr     request = CORBA::Request::_nil(); // DII request
-  CORBA::NVList_ptr      arglist = CORBA::NVList::_nil();  // argument list
-  CORBA::Context_ptr     ctx     = CORBA::Context::_nil(); // context
-  CORBA::NVList_ptr result_list  = CORBA::NVList::_nil();  // result list
-  CORBA::NamedValue_ptr result = CORBA::NamedValue::_nil();// actual result
-  CORBA::Octet o1, o2;
-
-  o1 = (CORBA::Octet) 127;
-
-  orb_->create_list(0, arglist); // 2 arguments to be added
-  *(arglist->add(CORBA::ARG_IN)->value()) <<= CORBA::Any::from_octet (o1);
-  arglist->add(CORBA::ARG_OUT)->value()->replace (CORBA::_tc_octet, &o2);
-  orb_->create_list(1, result_list); // 1 result
-  result = result_list->item(0);
-
-  // create a request
-  ref_->_create_request(ctx,
-			"test_octet",
-			arglist,
-			result,
-			request,
-			0);
-  
-  request->invoke (); // 2 way
-  *(arglist->item(1)->value()) >>= CORBA::Any::to_octet (o2);
-
-  if (o1 == o2)
-    {
-      ACE_DEBUG ((LM_DEBUG, "DII test_octet success: o1 = %c, o2 = %c\n", o1, o2));
-    }
-  else
-    {
-      ACE_DEBUG ((LM_DEBUG, "DII test_octet failed: o1 = %c, o2 = %c\n", o1, o2));
-    }
-  CORBA::release (request);
-  CORBA::release (arglist);
-  CORBA::release (result);
-  CORBA::release (result_list);
-  return 0;
-}
-
-int
-Visi_Marshal_Client_Proxy::dii_test_char (CORBA_Marshal_Proxy::OPTIONS &options,
-					  CORBA_Marshal_Proxy::RESULTS &results)
-  // chars
-{
-  // DII variables
-  CORBA::Request_ptr     request = CORBA::Request::_nil(); // DII request
-  CORBA::NVList_ptr      arglist = CORBA::NVList::_nil();  // argument list
-  CORBA::Context_ptr     ctx     = CORBA::Context::_nil(); // context
-  CORBA::NVList_ptr result_list  = CORBA::NVList::_nil();  // result list
-  CORBA::NamedValue_ptr result = CORBA::NamedValue::_nil();// actual result
-  CORBA::Char c1, c2;
-
-  c1 = 'B';
-
-  orb_->create_list(0, arglist); // 2 arguments to be added
-  *(arglist->add(CORBA::ARG_IN)->value()) <<= CORBA::Any::from_char (c1);
-  arglist->add(CORBA::ARG_OUT)->value()->replace (CORBA::_tc_char, &c2);
-  orb_->create_list(1, result_list); // 1 result
-  result = result_list->item(0);
-
-  // create a request
-  ref_->_create_request(ctx,
-			"test_char",
-			arglist,
-			result,
-			request,
-			0);
-  
-  request->invoke (); // 2 way
-  *(arglist->item(1)->value()) >>= CORBA::Any::to_char (c2);
-
-  if (c1 == c2)
-    {
-      ACE_DEBUG ((LM_DEBUG, "DII test_char success: c1 = %c, c2 = %c\n", c1, c2));
-    }
-  else
-    {
-      ACE_DEBUG ((LM_DEBUG, "DII test_char failed: c1 = %c, c2 = %c\n", c1, c2));
-    }
-  CORBA::release (request);
-  CORBA::release (arglist);
-  CORBA::release (result);
-  CORBA::release (result_list);
-  return 0;
-}
-
-int
-Visi_Marshal_Client_Proxy::dii_test_double (CORBA_Marshal_Proxy::OPTIONS &options,
-					    CORBA_Marshal_Proxy::RESULTS &results)
-  // doubles
-{
-  // DII variables
-  CORBA::Request_ptr     request = CORBA::Request::_nil(); // DII request
-  CORBA::NVList_ptr      arglist = CORBA::NVList::_nil();  // argument list
-  CORBA::Context_ptr     ctx     = CORBA::Context::_nil(); // context
-  CORBA::NVList_ptr result_list  = CORBA::NVList::_nil();  // result list
-  CORBA::NamedValue_ptr result = CORBA::NamedValue::_nil();// actual result
-  CORBA::Double d1, d2;
-
-  d1 = 3.1415;
-
-  orb_->create_list(0, arglist); // 2 arguments to be added
-  *(arglist->add(CORBA::ARG_IN)->value()) <<= d1;
-  arglist->add(CORBA::ARG_OUT)->value()->replace (CORBA::_tc_double, &d2);
-  orb_->create_list(1, result_list); // 1 result
-  result = result_list->item(0);
-
-  // create a request
-  ref_->_create_request(ctx,
-			"test_double",
-			arglist,
-			result,
-			request,
-			0);
-  
-  request->invoke (); // 2 way
-  *(arglist->item(1)->value()) >>= d2;
-
-  if (d1 == d2)
-    {
-      ACE_DEBUG ((LM_DEBUG, "DII test_double success: d1 = %f, d2 = %f\n", d1, d2));
-    }
-  else
-    {
-      ACE_DEBUG ((LM_DEBUG, "DII test_double failed: d1 = %f, d2 = %f\n", d1, d2));
-    }
-  CORBA::release (request);
-  CORBA::release (arglist);
-  CORBA::release (result);
-  CORBA::release (result_list);
-  return 0;
-}
-
-int
-Visi_Marshal_Client_Proxy::dii_test_struct (CORBA_Marshal_Proxy::OPTIONS &options,
-					    CORBA_Marshal_Proxy::RESULTS &results)
-  // structs
-{
-  // DII variables
-  CORBA::Request_ptr     request = CORBA::Request::_nil(); // DII request
-  CORBA::NVList_ptr      arglist = CORBA::NVList::_nil();  // argument list
-  CORBA::Context_ptr     ctx     = CORBA::Context::_nil(); // context
-  CORBA::NVList_ptr result_list  = CORBA::NVList::_nil();  // result list
-  CORBA::NamedValue_ptr result = CORBA::NamedValue::_nil();// actual result
-  Marshal::Marshal_Struct ms1, ms2;
-
-  ms1.s = 3;
-  ms1.l = 256;
-  ms1.c = 'B';
-  ms1.o = (CORBA::Octet) 127;
-  ms1.d = 3.1415;
-
-  orb_->create_list(0, arglist); // 2 arguments to be added
-  *(arglist->add(CORBA::ARG_IN)->value()) <<= ms1;
-  arglist->add(CORBA::ARG_OUT)->value()->replace (Marshal::_tc_Marshal_Struct, &ms2);
-  orb_->create_list(1, result_list); // 1 result
-  result = result_list->item(0);
-
-  // create a request
-  ref_->_create_request(ctx,
-			"test_struct",
-			arglist,
-			result,
-			request,
-			0);
-  
-  request->invoke (); // 2 way
-  *(arglist->item(1)->value()) >>= ms2;
-
-  if (ms1.s == ms2.s && ms1.l == ms2.l && ms1.c == ms2.c && ms1.o == ms2.o &&
-      ms1.d == ms2.d)
-    {
-      ACE_DEBUG ((LM_DEBUG, "DII test_struct success\n"));
-    }
-  else
-    {
-      ACE_DEBUG ((LM_DEBUG, "DII test_struct failed\n"));
-    }
-  CORBA::release (request);
-  CORBA::release (arglist);
-  CORBA::release (result);
-  CORBA::release (result_list);
-  return 0;
-}
-
-int
-Visi_Marshal_Client_Proxy::dii_test_union (CORBA_Marshal_Proxy::OPTIONS &options,
-					   CORBA_Marshal_Proxy::RESULTS &results)
-  // unions
-{
-  // DII variables
-  CORBA::Request_ptr     request = CORBA::Request::_nil(); // DII request
-  CORBA::NVList_ptr      arglist = CORBA::NVList::_nil();  // argument list
-  CORBA::Context_ptr     ctx     = CORBA::Context::_nil(); // context
-  CORBA::NVList_ptr result_list  = CORBA::NVList::_nil();  // result list
-  CORBA::NamedValue_ptr result = CORBA::NamedValue::_nil();// actual result
-  Marshal::Marshal_Union u1, u2;
-  Marshal::Marshal_Struct ms1, ms2;
-
-
-  // first test an enumerated case
-  u1._d (Marshal::e_1st);
-  u1.l (4567);
-
-  orb_->create_list(0, arglist); // 2 arguments to be added
-  *(arglist->add(CORBA::ARG_IN)->value()) <<= u1;
-  arglist->add(CORBA::ARG_OUT)->value()->replace (Marshal::_tc_Marshal_Union, &u2);
-  orb_->create_list(1, result_list); // 1 result
-  result = result_list->item(0);
-
-  // create a request
-  ref_->_create_request(ctx,
-			"test_union",
-			arglist,
-			result,
-			request,
-			0);
-  
-  request->invoke (); // 2 way
-  *(arglist->item(1)->value()) >>= u2;
-
-  if ( (u1._d () == u2._d()) && (u1.l () == u2.l ()))
-    {
-      ACE_DEBUG ((LM_DEBUG, "DII test_union for long (case e_1st) success\n"));
-    }
-  else
-    {
-      ACE_DEBUG ((LM_DEBUG, "DII test_union for long (case e_1st) failed\n"));
-    }
-  CORBA::release (request);
-  CORBA::release (arglist);
-  CORBA::release (result);
-  CORBA::release (result_list);
-
-  // now test the default case
-  u1._d (Marshal::e_5th); // e_6th doesn't work
-
-  u1.ms ().s = 3;
-  u1.ms ().l = 256;
-  u1.ms ().c = 'B';
-  u1.ms ().o = (CORBA::Octet) 127;
-  u1.ms ().d = 3.1415;
-
-
-  orb_->create_list(0, arglist); // 2 arguments to be added
-  *(arglist->add(CORBA::ARG_IN)->value()) <<= u1;
-  arglist->add(CORBA::ARG_OUT)->value()->replace (Marshal::_tc_Marshal_Union, &u2);
-  orb_->create_list(1, result_list); // 1 result
-  result = result_list->item(0);
-
-  // create a request
-  ref_->_create_request(ctx,
-			"test_union",
-			arglist,
-			result,
-			request,
-			0);
-  
-  request->invoke (); // 2 way
-  *(arglist->item(1)->value()) >>= u2;
-
-  if (u1.ms ().s == u2.ms ().s && u1.ms ().l == u2.ms ().l && u1.ms ().c == u2.ms ().c && u1.ms ().o == u2.ms ().o &&
-      u1.ms ().d == u2.ms ().d)
-    {
-      ACE_DEBUG ((LM_DEBUG, "DII test_union for default (case e_6th) success\n"));
-    }
-  else
-    {
-      ACE_DEBUG ((LM_DEBUG, "DII test_union for default (case e_6th) failed\n"));
-    }
-  CORBA::release (request);
-  CORBA::release (arglist);
-  CORBA::release (result);
-  CORBA::release (result_list);
-  return 0;
-}
-
-int
-Visi_Marshal_Client_Proxy::dii_test_any (CORBA_Marshal_Proxy::OPTIONS &options,
-					 CORBA_Marshal_Proxy::RESULTS &results)
-{
-  // DII variables
-  CORBA::Request_ptr     request = CORBA::Request::_nil(); // DII request
-  CORBA::NVList_ptr      arglist = CORBA::NVList::_nil();  // argument list
-  CORBA::Context_ptr     ctx     = CORBA::Context::_nil(); // context
-  CORBA::NVList_ptr result_list  = CORBA::NVList::_nil();  // result list
-  CORBA::NamedValue_ptr result = CORBA::NamedValue::_nil();// actual result
-  // we send a struct thru the any
-  CORBA::Any a1, *a2;
-  Marshal::Marshal_Struct ms1, *ms2;
-
-  ms1.s = 3;
-  ms1.l = 256;
-  ms1.c = 'B';
-  ms1.o = (CORBA::Octet) 127;
-  ms1.d = 3.1415;
-
-  // populate the any with a MarshalStruct
-  a1 <<= ms1;
-
-  a2 = new CORBA::Any;
-
-  // now test it
-  orb_->create_list(0, arglist); // 2 arguments to be added
-  *(arglist->add(CORBA::ARG_IN)->value()) <<= a1;
-  arglist->add(CORBA::ARG_OUT)->value()->replace (CORBA::_tc_any, a2);
-  orb_->create_list(1, result_list); // 1 result
-  result = result_list->item(0);
-
-  // create a request
-  ref_->_create_request(ctx,
-			"test_any",
-			arglist,
-			result,
-			request,
-			0);
-  
-  request->invoke (); // 2 way
-  *(arglist->item(1)->value()) >>= (*a2);
-
-  // check if the two typecodes are equal
-  if (a2->type ()->equal (Marshal::_tc_Marshal_Struct))
-    {
-      // now see if the values are same
-      ms2 = (Marshal::Marshal_Struct *)a2->value ();
-      if (ms1.s == ms2->s && ms1.l == ms2->l && ms1.c == ms2->c && ms1.o == ms2->o &&
-	  ms1.d == ms2->d)
-	{
-	  ACE_DEBUG ((LM_DEBUG, "DII test_any success\n"));
-	}
-      else
-	{
-	  ACE_DEBUG ((LM_DEBUG, "DII test_any value match failed\n"));
-	}
-    }
-  else
-    {
-      ACE_DEBUG ((LM_DEBUG, "DII test_any failed due to typecode mismatch\n"));
-    }
-  CORBA::release (request);
-  CORBA::release (arglist);
-  CORBA::release (result);
-  CORBA::release (result_list);
-  return 0;
-}
-
-int
-Visi_Marshal_Client_Proxy::dii_test_sequence (CORBA_Marshal_Proxy::OPTIONS &options,
-					      CORBA_Marshal_Proxy::RESULTS &results)
-{
-  // DII variables
-  CORBA::Request_ptr     request = CORBA::Request::_nil(); // DII request
-  CORBA::NVList_ptr      arglist = CORBA::NVList::_nil();  // argument list
-  CORBA::Context_ptr     ctx     = CORBA::Context::_nil(); // context
-  CORBA::NVList_ptr result_list  = CORBA::NVList::_nil();  // result list
-  CORBA::NamedValue_ptr result = CORBA::NamedValue::_nil();// actual result
-  // make a sequence of Anys and fill each one with a different data type
-  Marshal::AnySeq as1 (7), *as2;
-  Marshal::Marshal_Struct ms;
-  Marshal::Marshal_Union u;
-
-  ms.s = 3;
-  ms.l = 256;
-  ms.c = 'B';
-  ms.o = (CORBA::Octet) 127;
-  ms.d = 3.1415;
-
-  u._d (Marshal::e_5th); // somehow, the default case e_6th doesn't seem to
-			 // work here
-  u.ms ().s = 3;
-  u.ms ().l = 256;
-  u.ms ().c = 'B';
-  u.ms ().o = (CORBA::Octet) 127;
-  u.ms ().d = 3.1415;
-
-  // it looks like we must tell the sequence how many elements it is going to
-  // carry. By just fixing the max value does not work.
-
-  as1.length (7);
-
-  as1[0] <<= (CORBA::Short)3;
-  as1[1] <<= (CORBA::Long) 256;
-  as1[2] <<= CORBA::Any::from_octet ((CORBA::Octet)127);
-  as1[3] <<= CORBA::Any::from_char ('B');
-  as1[4] <<= (CORBA::Double)3.1415; // double
-  as1[5] <<= ms;     // struct
-  as1[6] <<= u;      // union
-
-  as2 = new Marshal::AnySeq;
-
-  orb_->create_list(0, arglist); // 2 arguments to be added
-  *(arglist->add(CORBA::ARG_IN)->value()) <<= as1;
-  arglist->add(CORBA::ARG_OUT)->value()->replace (Marshal::_tc_AnySeq, as2);
-  orb_->create_list(1, result_list); // 1 result
-  result = result_list->item(0);
-
-  // create a request
-  ref_->_create_request(ctx,
-			"test_sequence",
-			arglist,
-			result,
-			request,
-			0);
-  
-  request->invoke (); // 2 way
-  *(arglist->item(1)->value()) >>= (*as2);
-
-#if 0
-  // the following is extremely weird. I do not understand why it is not the
-  // same as _tc_Marshal_Union, but its _kind field does have _tk_union in it.
-  if ((*as2)[6].type ()->equal (Marshal::_tc_Marshal_Union))
-    {
-      cerr << "6th elem has union typecode" << endl;
-    }
-  else
-    {
-      cerr << "6th elem doesnot have union typecode" << endl;
-      cerr << "its typecode kind = " << (*as2)[6].type ()->kind () << endl;
-    }
-#endif
-
-  ACE_DEBUG ((LM_DEBUG, "DII test_sequence\n"));
-  if (as1.length () == as2->length ())
-    {
-      // now make sure that the elements are same
-      for (int i=0; i < as1.length (); i++)
-	{
-#if 0
-	  if (as1[i].type ()->equal ((*as2)[i].type ()))
-	    {
-#endif
-	      // now see if the values are same
-	      switch (i)
-		{
-		case 0:
-		  if (*(CORBA::Short *)as1[i].value () == *(CORBA::Short
-							    *)(*as2)[i].value ())
-		    {
-		      ACE_DEBUG ((LM_DEBUG, "\tDII test_sequence, shorts matched\n"));
-		    }
-		  else
-		    {
-		      ACE_DEBUG ((LM_DEBUG, "\tDII test_sequence failed on shorts match\n"));
-		    }
-		  break;
-		case 1:
-		  if (*(CORBA::Long *)as1[i].value () == *(CORBA::Long
-							    *)(*as2)[i].value ())
-		    {
-		      ACE_DEBUG ((LM_DEBUG, "\tDII test_sequence, longs matched\n"));
-		    }
-		  else
-		    {
-		      ACE_DEBUG ((LM_DEBUG, "\tDII test_sequence failed on longs match\n"));
-		    }
-		  break;
-		case 2:
-		  if (*(CORBA::Octet *)as1[i].value () == *(CORBA::Octet
-							    *)(*as2)[i].value ())
-		    {
-		      ACE_DEBUG ((LM_DEBUG, "\tDII test_sequence, octets matched\n"));
-		    }
-		  else
-		    {
-		      ACE_DEBUG ((LM_DEBUG, "\tDII test_sequence failed on octets match\n"));
-		    }
-		  break;
-		case 3:
-		  if (*(CORBA::Char *)as1[i].value () == *(CORBA::Char
-							    *)(*as2)[i].value ())
-		    {
-		      ACE_DEBUG ((LM_DEBUG, "\tDII test_sequence, chars matched\n"));
-		    }
-		  else
-		    {
-		      ACE_DEBUG ((LM_DEBUG, "\tDII test_sequence failed on chars match\n"));
-		    }
-		  break;
-		case 4:
-		  if (*(CORBA::Double *)as1[i].value () == *(CORBA::Double
-							    *)(*as2)[i].value ())
-		    {
-		      ACE_DEBUG ((LM_DEBUG, "\tDII test_sequence, doubles matched\n"));
-		    }
-		  else
-		    {
-		      ACE_DEBUG ((LM_DEBUG, "\tDII test_sequence failed on doubles match\n"));
-		    }
-		  break;
-		case 5:
-		  {
-		    Marshal::Marshal_Struct *ms1, *ms2;
-		    
-		    ms1 = (Marshal::Marshal_Struct *)as1[i].value ();
-		    ms2 = (Marshal::Marshal_Struct *)(*as2)[i].value ();
-
-		    if (ms1->s == ms2->s && ms1->l == ms2->l && ms1->c == ms2->c && ms1->o == ms2->o &&
-			ms1->d == ms2->d)
-		    {
-		      ACE_DEBUG ((LM_DEBUG, "\tDII test_sequence, structs matched\n"));
-		    }
-		  else
-		    {
-		      ACE_DEBUG ((LM_DEBUG, "\tDII test_sequence failed on structs match\n"));
-		    }
-		  }
-		  break;
-		case 6:
-		  {
-		    Marshal::Marshal_Union *u1, *u2;
-		    
-		    u1 = (Marshal::Marshal_Union *)as1[i].value ();
-		    u2 = (Marshal::Marshal_Union *)(*as2)[i].value ();
-
-		    if (u1->_d () == u2->_d () && u1->ms ().s == u2->ms ().s &&
-			u1->ms ().l == u2->ms ().l && 
-			u1->ms ().c == u2->ms ().c && u1->ms ().o == u2->ms ().o &&
-			u1->ms ().d == u2->ms ().d)
-		    {
-		      ACE_DEBUG ((LM_DEBUG, "\tDII test_sequence, unions matched\n"));
-		    }
-		  else
-		    {
-		      ACE_DEBUG ((LM_DEBUG, "\tDII test_sequence failed on unions match\n"));
-		    }
-		  }
-		  break;
-		}
-#if 0
-	    }
-	  else
-	    {
-	      ACE_DEBUG ((LM_DEBUG, 
-			  "DII test_sequence: typecode mismatch for element %d\n", i));
-	      break;
-	    }
-#endif
-	}
-    }
-  else
-    {
-      ACE_DEBUG ((LM_DEBUG, "DII test_sequence failed: as2->length = %d\n",
-		  as2->length ()));
-    }
-  CORBA::release (request);
-  CORBA::release (arglist);
-  CORBA::release (result);
-  CORBA::release (result_list);
-  return 0;
-}
-
-int
-Visi_Marshal_Client_Proxy::dii_test_recursive (CORBA_Marshal_Proxy::OPTIONS &options,
-					       CORBA_Marshal_Proxy::RESULTS &results)
-{
-  // we will try a simple one here
-  Marshal::Marshal_Recursive mr1, *elem1, *mr2, *elem2;
-
-  mr1.value <<= (CORBA::Long)1;
-  mr1.next.length (1);  // sequence of length 1
-
-  // fill the element
-  elem1 = &mr1.next[0];
-  elem1->value <<= CORBA::Any::from_char ('D');
-  elem1->next.length (0); // end of seq
-
-  mr2 = new Marshal::Marshal_Recursive;
-
-  try {
-    ref_->test_recursive (mr1, mr2);
-  }
-  catch (CORBA::SystemException &se){
-    cerr << "error invoking request: " << se << endl;
-  }
-
-  elem2 = &mr2->next[0];
-
-  if ((*(CORBA::Long *)mr1.value.value () == *(CORBA::Long*)mr2->value.value ())
-      && (mr1.next.length () == mr2->next.length ()) // same length sequence
-      && (*(CORBA::Char *)elem1->value.value () == *(CORBA::Char *)elem2->value.value ())
-      && (elem1->next.length () == elem2->next.length ()))
-    {
-      ACE_DEBUG ((LM_DEBUG, "DII test_recursive success\n"));
-    }
-  else
-    {
-      ACE_DEBUG ((LM_DEBUG, "DII test_recursive failure\n"));
-    }
-      
-  return 0;
-}
-
diff --git a/TAO/Benchmark/Marshal_Test/VisiBroker/visi_marshal_client.h b/TAO/Benchmark/Marshal_Test/VisiBroker/visi_marshal_client.h
deleted file mode 100644
index d45a5f0b773..00000000000
--- a/TAO/Benchmark/Marshal_Test/VisiBroker/visi_marshal_client.h
+++ /dev/null
@@ -1,140 +0,0 @@
-// ============================================================================
-//
-// = LIBRARY
-//    CORBA Marshal Visibroker Benchmark
-// 
-// = FILENAME
-//    visi_marshal_client.h
-//
-// = AUTHOR
-//    Aniruddha Gokhale
-// 
-// ============================================================================
-
-#if !defined(_VISI_MARSHAL_CLIENT_H_)
-#define _VISI_MARSHAL_CLIENT_H_
-
-// benchmark library includes
-#include "benchmark/marshal_options.h"
-#include "benchmark/marshal_results.h"
-#include "benchmark/marshal_proxy.h"
-
-// include VisiBroker specific include files
-#include "marshalC.h"  // generated by IDL compiler
-#include "pmcext.h"    // VisiBroker extensions
-
-#if 0
-// Define an event handler specific to this class
-class marshal_event_handler: public PMC_EXT::ClientEventHandler
-{
-  // =TITLE
-  // marshal_event_handler
-  // =DESCRIPTION
-  // event handler. Specifically, we use this to set socket buffer and no delay
-  // flags
-public:
-  void bind_succeeded(CORBA::Object_ptr obj,
-		      const PMC_EXT::ConnectionInfo &);
-  // on success from a bind call, set the desired quantities
-};
-#endif
-
-class Visi_Marshal_Client_Proxy : public CORBA_Marshal_Proxy
-{
-  // =TITLE
-  //  Visi_Marshal_Client_Proxy
-  // =DESCRIPTION
-  //  VisiBroker client size specialization of the CORBA Marshal proxy class
-public:
-  Visi_Marshal_Client_Proxy (void);
-  // constructor
-
-  ~Visi_Marshal_Client_Proxy (void);
-  // destructor
-
-  virtual int run (CORBA_Marshal_Proxy::OPTIONS &options,
-		   CORBA_Marshal_Proxy::RESULTS &results);
-  // do the actual work
-
-  virtual int use_sii (CORBA_Marshal_Proxy::OPTIONS &options,
-		       CORBA_Marshal_Proxy::RESULTS &results);
-  // use the static invocation interface
-
-  virtual int use_dii (CORBA_Marshal_Proxy::OPTIONS &options,
-		       CORBA_Marshal_Proxy::RESULTS &results);
-  // use the dynamic invocation interface
-private:
-  // =helper functions
-  int sii_test_short (CORBA_Marshal_Proxy::OPTIONS &options,
-		      CORBA_Marshal_Proxy::RESULTS &results);
-
-  int sii_test_long (CORBA_Marshal_Proxy::OPTIONS &options,
-		     CORBA_Marshal_Proxy::RESULTS &results);
-
-  int sii_test_octet (CORBA_Marshal_Proxy::OPTIONS &options,
-		      CORBA_Marshal_Proxy::RESULTS &results);
-
-  int sii_test_char (CORBA_Marshal_Proxy::OPTIONS &options,
-		     CORBA_Marshal_Proxy::RESULTS &results);
-
-  int sii_test_double (CORBA_Marshal_Proxy::OPTIONS &options,
-		       CORBA_Marshal_Proxy::RESULTS &results);
-
-  int sii_test_struct (CORBA_Marshal_Proxy::OPTIONS &options,
-		       CORBA_Marshal_Proxy::RESULTS &results);
-
-  int sii_test_union (CORBA_Marshal_Proxy::OPTIONS &options,
-		      CORBA_Marshal_Proxy::RESULTS &results);
-
-  int sii_test_any (CORBA_Marshal_Proxy::OPTIONS &options,
-		    CORBA_Marshal_Proxy::RESULTS &results);
-
-  int sii_test_sequence (CORBA_Marshal_Proxy::OPTIONS &options,
-			 CORBA_Marshal_Proxy::RESULTS &results);
-
-  int sii_test_recursive (CORBA_Marshal_Proxy::OPTIONS &options,
-			  CORBA_Marshal_Proxy::RESULTS &results);
-
-  // all the DII helpers
-  int dii_test_short (CORBA_Marshal_Proxy::OPTIONS &options,
-		      CORBA_Marshal_Proxy::RESULTS &results);
-
-  int dii_test_long (CORBA_Marshal_Proxy::OPTIONS &options,
-		     CORBA_Marshal_Proxy::RESULTS &results);
-
-  int dii_test_octet (CORBA_Marshal_Proxy::OPTIONS &options,
-		      CORBA_Marshal_Proxy::RESULTS &results);
-
-  int dii_test_char (CORBA_Marshal_Proxy::OPTIONS &options,
-		     CORBA_Marshal_Proxy::RESULTS &results);
-
-  int dii_test_double (CORBA_Marshal_Proxy::OPTIONS &options,
-		       CORBA_Marshal_Proxy::RESULTS &results);
-
-  int dii_test_struct (CORBA_Marshal_Proxy::OPTIONS &options,
-		       CORBA_Marshal_Proxy::RESULTS &results);
-
-  int dii_test_union (CORBA_Marshal_Proxy::OPTIONS &options,
-		      CORBA_Marshal_Proxy::RESULTS &results);
-
-  int dii_test_any (CORBA_Marshal_Proxy::OPTIONS &options,
-		    CORBA_Marshal_Proxy::RESULTS &results);
-
-  int dii_test_sequence (CORBA_Marshal_Proxy::OPTIONS &options,
-			 CORBA_Marshal_Proxy::RESULTS &results);
-
-  int dii_test_recursive (CORBA_Marshal_Proxy::OPTIONS &options,
-			  CORBA_Marshal_Proxy::RESULTS &results);
-
-  CORBA::ORB_ptr orb_;
-  // handle to the underlying orb
-
-  Marshal_ptr ref_;
-  // the object reference
-};
-
-#if defined (__ACE_INLINE__)
-#include "visi_marshal_client.i"
-#endif /* __ACE_INLINE__ */
-
-#endif
diff --git a/TAO/Benchmark/Marshal_Test/VisiBroker/visi_marshal_client.i b/TAO/Benchmark/Marshal_Test/VisiBroker/visi_marshal_client.i
deleted file mode 100644
index fb8c5823848..00000000000
--- a/TAO/Benchmark/Marshal_Test/VisiBroker/visi_marshal_client.i
+++ /dev/null
@@ -1,21 +0,0 @@
-
-ACE_INLINE
-Visi_Marshal_Client_Proxy::Visi_Marshal_Client_Proxy (void)
-  : orb_ (CORBA_ORB::_nil ()),
-    ref_ (0)
-{
-}
-
-ACE_INLINE
-Visi_Marshal_Client_Proxy::~Visi_Marshal_Client_Proxy (void)
-{
-  // releasing order is important
-
-  // release the reference
-  CORBA::release (ref_);
-
-  // release the ORB
-  CORBA::release (orb_);
-}
-
-
diff --git a/TAO/Benchmark/Marshal_Test/VisiBroker/visi_marshal_impl.cpp b/TAO/Benchmark/Marshal_Test/VisiBroker/visi_marshal_impl.cpp
deleted file mode 100644
index 7ae2a3f04e9..00000000000
--- a/TAO/Benchmark/Marshal_Test/VisiBroker/visi_marshal_impl.cpp
+++ /dev/null
@@ -1,329 +0,0 @@
-#include "visi_marshal_impl.h"
-
-#if !defined (__ACE_INLINE__)
-#include "visi_marshal_impl.i"
-#endif /* __ACE_INLINE__ */
-
-// All the methods of the SSI class
-void
-Marshal_SSI_Impl::test_short (CORBA::Short s1,
-			      CORBA::Short &s2)
-{
-  s2 = s1;
-}
-
-void
-Marshal_SSI_Impl::test_long (CORBA::Long l1,
-			     CORBA::Long &l2)
-{
-  l2 = l1;
-}
-
-void
-Marshal_SSI_Impl::test_octet (CORBA::Octet o1,
-			      CORBA::Octet &o2)
-{
-  o2 = o1;
-}
-
-void
-Marshal_SSI_Impl::test_char (CORBA::Char c1,
-			     CORBA::Char &c2)
-{
-  c2 = c1;
-}
-
-void
-Marshal_SSI_Impl::test_double (CORBA::Double d1,
-			       CORBA::Double &d2)
-{
-  d2 = d1;
-}
-
-void
-Marshal_SSI_Impl::test_struct (const Marshal::Marshal_Struct& ms1,
-			       Marshal::Marshal_Struct& ms2)
-{
-  ms2.s = ms1.s;
-  ms2.l = ms1.l;
-  ms2.c = ms1.c;
-  ms2.o = ms1.o;
-  ms2.d = ms1.d;
-}
-
-void
-Marshal_SSI_Impl::test_union (const Marshal::Marshal_Union& u1,
-			      Marshal::Marshal_Union& u2)
-{
-  u2._d (u1._d ()); // set the discriminant value
-
-  switch (u1._d ())
-    {
-    case Marshal::e_0th:
-      u2.s (u1.s ()); // set short
-      break;
-    case Marshal::e_1st:
-      u2.l (u1.l ()); // set long
-      break;
-    case Marshal::e_2nd:
-      u2.c (u1.c ()); // set char
-      break;
-    case Marshal::e_3rd:
-      u2.o (u1.o ()); // set octet
-      break;
-    case Marshal::e_4th:
-      u2.d (u1.d ()); // set double
-      break;
-    case Marshal::e_5th:
-    default:
-      u2.ms (u1. ms ()); // set structs
-      break;
-    }
-}
-
-void
-Marshal_SSI_Impl::test_any (const CORBA::Any &a1,
-			    CORBA::Any *&a2)
-{
-  a2 = new CORBA::Any (a1.type (), (void *)a1.value ()); // will do a deep copy
-}
-
-void 
-Marshal_SSI_Impl::test_sequence (const Marshal::AnySeq& as1,
-				 Marshal::AnySeq *& as2)
-{
-  as2 = new Marshal::AnySeq (as1);
-}
-
-void 
-Marshal_SSI_Impl::test_recursive (const Marshal::Marshal_Recursive &mr1,
-				  Marshal::Marshal_Recursive *&mr2)
-{
-}
-
-//----------------------------------------------------------------------------
-//the methods of the DSI implementation class
-
-void
-Marshal_DSI_Impl::invoke (CORBA::ServerRequest_ptr req)
-{
-  // parse the incoming request and find out for what operation it is. We use a
-  // simple linear search here
-  if (!ACE_OS::strcmp (req->op_name (), "test_short"))
-    {
-      test_short_skel (req);
-    }
-  else if (!ACE_OS::strcmp (req->op_name (), "test_long"))
-    {
-    }
-  else if (!ACE_OS::strcmp (req->op_name (), "test_octet"))
-    {
-    }
-  else if (!ACE_OS::strcmp (req->op_name (), "test_char"))
-    {
-    }
-  else if (!ACE_OS::strcmp (req->op_name (), "test_double"))
-    {
-    }
-  else if (!ACE_OS::strcmp (req->op_name (), "test_struct"))
-    {
-    }
-  else if (!ACE_OS::strcmp (req->op_name (), "test_union"))
-    {
-    }
-  else if (!ACE_OS::strcmp (req->op_name (), "test_any"))
-    {
-    }
-  else if (!ACE_OS::strcmp (req->op_name (), "test_sequence"))
-    {
-    }
-}
-
-void
-Marshal_DSI_Impl::test_short (CORBA::Short s1,
-			      CORBA::Short &s2)
-{
-  s2 = 5*s1;
-}
-
-void
-Marshal_DSI_Impl::test_long (CORBA::Long l1,
-			     CORBA::Long &l2)
-{
-  l2 = l1;
-}
-
-void
-Marshal_DSI_Impl::test_octet (CORBA::Octet o1,
-			      CORBA::Octet &o2)
-{
-  o2 = o1;
-}
-
-void
-Marshal_DSI_Impl::test_char (CORBA::Char c1,
-			     CORBA::Char &c2)
-{
-  c2 = c1;
-}
-
-void
-Marshal_DSI_Impl::test_double (CORBA::Double d1,
-			       CORBA::Double &d2)
-{
-  d2 = d1;
-}
-
-void
-Marshal_DSI_Impl::test_struct (const Marshal::Marshal_Struct& ms1,
-			       Marshal::Marshal_Struct& ms2)
-{
-  ms2.s = ms1.s;
-  ms2.l = ms1.l;
-  ms2.c = ms1.c;
-  ms2.o = ms1.o;
-  ms2.d = ms1.d;
-}
-
-void
-Marshal_DSI_Impl::test_union (const Marshal::Marshal_Union& u1,
-			      Marshal::Marshal_Union& u2)
-{
-  u2._d (u1._d ()); // set the discriminant value
-
-  switch (u1._d ())
-    {
-    case Marshal::e_0th:
-      u2.s (u1.s ()); // set short
-      break;
-    case Marshal::e_1st:
-      u2.l (u1.l ()); // set long
-      break;
-    case Marshal::e_2nd:
-      u2.c (u1.c ()); // set char
-      break;
-    case Marshal::e_3rd:
-      u2.o (u1.o ()); // set octet
-      break;
-    case Marshal::e_4th:
-      u2.d (u1.d ()); // set double
-      break;
-    case Marshal::e_5th:
-    default:
-      u2.ms (u1. ms ()); // set structs
-      break;
-    }
-}
-
-void
-Marshal_DSI_Impl::test_any (const CORBA::Any &a1,
-			    CORBA::Any *&a2)
-{
-  a2 = new CORBA::Any (a1.type (), (void *)a1.value ()); // will do a deep copy
-}
-
-void 
-Marshal_DSI_Impl::test_sequence (const Marshal::AnySeq& as1,
-				 Marshal::AnySeq *& as2)
-{
-  as2 = new Marshal::AnySeq (as1);
-}
-
-void 
-Marshal_DSI_Impl::test_recursive (const Marshal::Marshal_Recursive &mr1,
-				  Marshal::Marshal_Recursive *&mr2)
-{
-}
-
-// all the helper functions for the DSI class
-void 
-Marshal_DSI_Impl::test_short_skel (CORBA::ServerRequest_ptr req)
-{
-  CORBA::NVList_var short_nv_;
-  CORBA::Any *any_s1, *any_s2;
-  CORBA::Short s1=0, 
-    *s2=0;
-
-  orb_->create_list (0, short_nv_);
-
-  ACE_DEBUG ((LM_DEBUG, "short_nv_ created with %d nodes\n", short_nv_->count ()));
-
-  any_s1 = new CORBA::Any (CORBA::_tc_short, &s1, 0);
-  s2 = new CORBA::Short;
-  any_s2 = new CORBA::Any (CORBA::_tc_short, s2, 1);
-
-  short_nv_->add_value ("s1", *any_s1, CORBA::ARG_IN);
-  // if I do the next line, I get CORBA::Marshal exception from
-  // req->params. I don't know why
-  short_nv_->add_value ("s2", *any_s2, CORBA::ARG_OUT);
-  // However, the following line works. I think I know what is the
-  // problem. Since the 2nd argument is a ARG_OUT, we cannot add_value. We must
-  // just tell it what type to expect and leave it to the ORB to allocate the
-  // memory 
-  //short_nv_->add_item ("s2", CORBA::ARG_OUT);
-  // My explanation is confirmed if I use the following in which case I get a
-  // marshaling exception. Thus, for OUT args, only add_item works.
-  // *(short_nv_->add (CORBA::ARG_OUT)->value ()) <<= s2;
-
-  ACE_DEBUG ((LM_DEBUG, "short_nv_ created with %d nodes\n", short_nv_->count ()));
-
-  try {
-    req->params (short_nv_);
-  }
-  catch (CORBA::SystemException &se)
-    {
-      cerr << "System Exception doing params: " << se << endl;
-    }
-  cout << "after params" << endl;
-  *(short_nv_->item (0)->value ()) >>= s1;
-  ACE_DEBUG ((LM_DEBUG, "s1 = %d\n", s1));
-  test_short (s1, *s2);
-  //  *(short_nv_->item (1)->value ()) <<= s2;
-  ACE_DEBUG ((LM_DEBUG, "s1 = %d, s2 = %d\n", s1, *s2));
-  ACE_DEBUG ((LM_DEBUG, "short_nv_ after the call has %d nodes\n", short_nv_->count ()));
-}
-
-void 
-Marshal_DSI_Impl::test_long_skel (CORBA::ServerRequest_ptr req)
-{
-}
-
-void 
-Marshal_DSI_Impl::test_octet_skel (CORBA::ServerRequest_ptr req)
-{
-}
-
-void 
-Marshal_DSI_Impl::test_char_skel (CORBA::ServerRequest_ptr req)
-{
-}
-
-void 
-Marshal_DSI_Impl::test_double_skel (CORBA::ServerRequest_ptr req)
-{
-}
-
-void 
-Marshal_DSI_Impl::test_struct_skel (CORBA::ServerRequest_ptr req)
-{
-}
-
-void 
-Marshal_DSI_Impl::test_union_skel (CORBA::ServerRequest_ptr req)
-{
-}
-
-void 
-Marshal_DSI_Impl::test_any_skel (CORBA::ServerRequest_ptr req)
-{
-}
-
-void 
-Marshal_DSI_Impl::test_sequence_skel (CORBA::ServerRequest_ptr req)
-{
-}
-
-void 
-Marshal_DSI_Impl::test_recursive_skel (CORBA::ServerRequest_ptr req)
-{
-}
diff --git a/TAO/Benchmark/Marshal_Test/VisiBroker/visi_marshal_impl.h b/TAO/Benchmark/Marshal_Test/VisiBroker/visi_marshal_impl.h
deleted file mode 100644
index 20938f49cde..00000000000
--- a/TAO/Benchmark/Marshal_Test/VisiBroker/visi_marshal_impl.h
+++ /dev/null
@@ -1,177 +0,0 @@
-#if !defined (VISI_MARSHAL_IMPL_H)
-#define VISI_MARSHAL_IMPL_H
-
-// to include DSI related files
-
-#include "ace/OS.h"
-
-#include "marshalS.h"
-
-
-class Marshal_SSI_Impl 
-  : public virtual _sk_Marshal
-{
-  // =TITLE
-  //  Marshal_SSI_Impl
-  // =DESCRIPTION
-  //  Implementation of the interface using the static skeleton interface
-public:
-  Marshal_SSI_Impl (const char *object_name = (const char *)NULL);
-  // constructor
-
-  ~Marshal_SSI_Impl (void);
-  // destructor
-
-  virtual void test_short (CORBA::Short s1,
-			  CORBA::Short& s2);
-  // test short
-	
-  virtual void test_long (CORBA::Long l1,
-			 CORBA::Long& l2);
-  // test long
-	
-  virtual void test_octet (CORBA::Octet o1,
-			  CORBA::Octet& o2);
-  // test octet
-	
-  virtual void test_char (CORBA::Char c1,
-			 CORBA::Char& c2);
-  // test char
-	
-  virtual void test_double (CORBA::Double d1,
-			   CORBA::Double& d2);
-  // test double
-	
-  virtual void test_struct (const Marshal::Marshal_Struct& ms1,
-			   Marshal::Marshal_Struct& ms2);
-  // test struct
-	
-  virtual void test_union (const Marshal::Marshal_Union& u1,
-			  Marshal::Marshal_Union& u2);
-  // test union
-	
-  virtual void test_any (const CORBA::Any& a1,
-			CORBA::Any *& a2);
-  // test any
-	
-  /*
-  virtual void test_sequence (const Marshal::ShortSeq& s1,
-			     const Marshal::LongSeq& l1,
-			     const Marshal::OctetSeq& o1,
-			     const Marshal::CharSeq& c1,
-			     const Marshal::DoubleSeq& d1,
-			     const Marshal::StructSeq& S1,
-			     const Marshal::UnionSeq& U1,
-			     const Marshal::AnySeq& a1,
-			     Marshal::ShortSeq *& s2,
-			     Marshal::LongSeq *& l2,
-			     Marshal::OctetSeq *& o2,
-			     Marshal::CharSeq *& c2,
-			     Marshal::DoubleSeq *& d2,
-			     Marshal::StructSeq *& S2,
-			     Marshal::UnionSeq *& U2,
-			     Marshal::AnySeq *& a2);
-			     */
-  virtual void test_sequence (const Marshal::AnySeq& a1,
-			     Marshal::AnySeq *& a2);
-  // test sequence
-
-  virtual void test_recursive (const Marshal::Marshal_Recursive& mr1,
-			       Marshal::Marshal_Recursive *& mr2);
-  // test struct
-	
-};
-
-class Marshal_DSI_Impl : public CORBA::DynamicImplementation
-{
-  // =TITLE
-  //  Marshal_DSI_Impl
-  // =DESCRIPTION
-  //  Implementation of the interface using the dynamic skeleton interface
-public:
-  Marshal_DSI_Impl (CORBA::ORB_ptr orb, const char *object_name = (const char *)NULL);
-  // constructor
-
-  ~Marshal_DSI_Impl (void);
-  // destructor
-
-  virtual void invoke (CORBA::ServerRequest_ptr req);
-  // This method is a must
-
-private:
-  void test_short (CORBA::Short s1,
-			  CORBA::Short& s2);
-  // test short
-	
-  void test_long (CORBA::Long l1,
-			 CORBA::Long& l2);
-  // test long
-	
-  void test_octet (CORBA::Octet o1,
-			  CORBA::Octet& o2);
-  // test octet
-	
-  void test_char (CORBA::Char c1,
-			 CORBA::Char& c2);
-  // test char
-	
-  void test_double (CORBA::Double d1,
-			   CORBA::Double& d2);
-  // test double
-	
-  void test_struct (const Marshal::Marshal_Struct& ms1,
-			   Marshal::Marshal_Struct& ms2);
-  // test struct
-	
-  void test_union (const Marshal::Marshal_Union& u1,
-			  Marshal::Marshal_Union& u2);
-  // test union
-	
-  void test_any (const CORBA::Any& a1,
-			CORBA::Any *& a2);
-  // test any
-	
-  void test_sequence (const Marshal::AnySeq& a1,
-			     Marshal::AnySeq *& a2);
-  // test sequence
-
-  void test_recursive (const Marshal::Marshal_Recursive& mr1,
-			       Marshal::Marshal_Recursive *& mr2);
-  // test struct
-	
-private:
-  //= helper functions - they behave as if they were skeletons
-  void test_short_skel (CORBA::ServerRequest_ptr req);
-  void test_long_skel (CORBA::ServerRequest_ptr req);
-  void test_octet_skel (CORBA::ServerRequest_ptr req);
-  void test_char_skel (CORBA::ServerRequest_ptr req);
-  void test_double_skel (CORBA::ServerRequest_ptr req);
-  void test_struct_skel (CORBA::ServerRequest_ptr req);
-  void test_union_skel (CORBA::ServerRequest_ptr req);
-  void test_any_skel (CORBA::ServerRequest_ptr req);
-  void test_sequence_skel (CORBA::ServerRequest_ptr req);
-  void test_recursive_skel (CORBA::ServerRequest_ptr req);
-
-  // we need the orb to create argument lists (NVList) for us
-  CORBA::ORB_ptr orb_; // not owned by us
-
-#if 0
-  CORBA::NVList_ptr short_nv_;
-  CORBA::NVList_ptr long_nv_;
-  CORBA::NVList_ptr octet_nv_;
-  CORBA::NVList_ptr char_nv_;
-  CORBA::NVList_ptr double_nv_;
-  CORBA::NVList_ptr struct_nv_;
-  CORBA::NVList_ptr union_nv_;
-  CORBA::NVList_ptr any_nv_;
-  CORBA::NVList_ptr seq_nv_;
-  CORBA::NVList_ptr recursive_nv_;
-  CORBA::Any_ptr result_; // void result
-#endif
-};
-
-#if defined (__ACE_INLINE__)
-#include "visi_marshal_impl.i"
-#endif /* __ACE_INLINE__ */
-
-#endif // defined (VISI_MARSHAL_IMPL_H)
diff --git a/TAO/Benchmark/Marshal_Test/VisiBroker/visi_marshal_impl.i b/TAO/Benchmark/Marshal_Test/VisiBroker/visi_marshal_impl.i
deleted file mode 100644
index b9eefcfbd12..00000000000
--- a/TAO/Benchmark/Marshal_Test/VisiBroker/visi_marshal_impl.i
+++ /dev/null
@@ -1,28 +0,0 @@
-// constructor
-ACE_INLINE
-Marshal_SSI_Impl::Marshal_SSI_Impl (const char *obj_name)
-  : _sk_Marshal (obj_name)
-{
-}
-
-// destructor
-ACE_INLINE
-Marshal_SSI_Impl::~Marshal_SSI_Impl (void)
-{
-}
-
-// constructor
-ACE_INLINE
-Marshal_DSI_Impl::Marshal_DSI_Impl (CORBA::ORB_ptr orb, const char *obj_name)
-  : orb_ (orb),
-    CORBA::DynamicImplementation ("Marshal", obj_name) // interface name is necessary
-{
-}
-
-// destructor
-ACE_INLINE
-Marshal_DSI_Impl::~Marshal_DSI_Impl (void)
-{
-  orb_ = CORBA::ORB::_nil ();
-}
-
diff --git a/TAO/Benchmark/Marshal_Test/VisiBroker/visi_marshal_server.cpp b/TAO/Benchmark/Marshal_Test/VisiBroker/visi_marshal_server.cpp
deleted file mode 100644
index 1a81241a843..00000000000
--- a/TAO/Benchmark/Marshal_Test/VisiBroker/visi_marshal_server.cpp
+++ /dev/null
@@ -1,86 +0,0 @@
-// ============================================================================
-//
-// = LIBRARY
-//    CORBA Visibroker marshal benchmark
-// 
-// = FILENAME
-//    visi_marshal_server.cpp
-//
-// = AUTHOR
-//    Aniruddha Gokhale
-// 
-// ============================================================================
-
-#include "visi_marshal_server.h"
-
-#if !defined (__ACE_INLINE__)
-#include "visi_marshal_server.i"
-#endif /* __ACE_INLINE__ */
-
-int
-Visi_Marshal_Server_Proxy::run (CORBA_Marshal_Proxy::OPTIONS &options,
-				CORBA_Marshal_Proxy::RESULTS &results)
-{
-  char **argv;
-  int argc;
-
-  // get the argument list to be passed on to the ORB_init method
-  argv = options.orb_init_args (argc);
-
-  // get the orb. Pass any ORB_init arguments
-  this->orb_ = CORBA::ORB_init (argc, (char *const *)argv);
-  if (this->orb_ == 0)
-    {
-      ACE_DEBUG ((LM_DEBUG, "ORB_init failed\n"));
-      return -1;
-    }
-
-  // get the argument list to be passed on to the BOA_init method
-  argv = options.orb_init_args (argc);
-
-  // get the orb. Pass any ORB_init arguments
-  this->boa_ = this->orb_->BOA_init (argc, (char *const *)argv);
-  if (this->boa_ == 0)
-    {
-      ACE_DEBUG ((LM_DEBUG, "ORB_init failed\n"));
-      return -1;
-    }
-
-  // tell the "results" object what file it must store the results into
-  results.filename (options.filename ());
-
-  // use SII or DII accordingly
-  switch (options.policy ())
-    {
-    case CORBA_Marshal_Options::STATIC : // use SSI
-      this->ssi_ = new Marshal_SSI_Impl (options.object_name ());
-      // register with the BOA
-      this->boa_->obj_is_ready (this->ssi_);
-      break;
-    case CORBA_Marshal_Options::DYNAMIC : // use DSI
-      this->dsi_ = new Marshal_DSI_Impl (this->orb_, ACE_OS::strdup (options.object_name ()));
-      // register with the BOA
-      try {
-      this->boa_->obj_is_ready (this->dsi_);
-      }
-      catch (CORBA::SystemException &se)
-	{
-	  cerr << "system exception in obj_is_ready" << se << endl;
-	}
-      break;
-    default:
-      ACE_DEBUG ((LM_DEBUG, "bad policy\n"));
-      return -1;
-    }
-  
-  try {
-    // call impl_is_ready
-    this->boa_->impl_is_ready ();
-  }
-  catch (CORBA::SystemException &se)
-    {
-      cerr << "system exception: " << se << endl;
-    }
-  return 0;
-}
-
diff --git a/TAO/Benchmark/Marshal_Test/VisiBroker/visi_marshal_server.h b/TAO/Benchmark/Marshal_Test/VisiBroker/visi_marshal_server.h
deleted file mode 100644
index bfe9b1d9879..00000000000
--- a/TAO/Benchmark/Marshal_Test/VisiBroker/visi_marshal_server.h
+++ /dev/null
@@ -1,58 +0,0 @@
-// ============================================================================
-//
-// = LIBRARY
-//    CORBA Marshal Visibroker Benchmark
-// 
-// = FILENAME
-//    visi_marshal_server.h
-//
-// = AUTHOR
-//    Aniruddha Gokhale
-// 
-// ============================================================================
-
-#if !defined(_VISI_MARSHAL_SERVER_H_)
-#define _VISI_MARSHAL_SERVER_H_
-
-// benchmark library includes
-#include "benchmark/marshal_options.h"
-#include "benchmark/marshal_results.h"
-#include "benchmark/marshal_proxy.h"
-
-// implementation classes
-#include "visi_marshal_impl.h"
-
-// include VisiBroker specific include files
-#include "marshalS.h"  // generated by IDL compiler
-#include "pmcext.h"    // VisiBroker extensions
-
-class Visi_Marshal_Server_Proxy : public CORBA_Marshal_Proxy
-{
-public:
-  Visi_Marshal_Server_Proxy (void);
-  // constructor
-
-  ~Visi_Marshal_Server_Proxy (void);
-  // destructor
-
-  virtual int run (CORBA_Marshal_Proxy::OPTIONS &options,
-		   CORBA_Marshal_Proxy::RESULTS &results);
-  // do the actual work
-private:
-  CORBA::ORB_ptr orb_;
-  // underlying orb;
-
-  CORBA::BOA_ptr boa_;
-  // underlying boa;
-
-  Marshal_SSI_Impl *ssi_;
-  Marshal_DSI_Impl *dsi_;
-  // the implementation (SSI or DSI)
-};
-
-
-#if defined (__ACE_INLINE__)
-#include "visi_marshal_server.i"
-#endif /* __ACE_INLINE__ */
-
-#endif
diff --git a/TAO/Benchmark/Marshal_Test/VisiBroker/visi_marshal_server.i b/TAO/Benchmark/Marshal_Test/VisiBroker/visi_marshal_server.i
deleted file mode 100644
index 3c83a78af29..00000000000
--- a/TAO/Benchmark/Marshal_Test/VisiBroker/visi_marshal_server.i
+++ /dev/null
@@ -1,26 +0,0 @@
-// constructor
-ACE_INLINE
-Visi_Marshal_Server_Proxy::Visi_Marshal_Server_Proxy (void)
-  : orb_ (0),
-    boa_ (0),
-    ssi_ (0),
-    dsi_ (0)
-{
-}
-
-// destructor
-ACE_INLINE
-Visi_Marshal_Server_Proxy::~Visi_Marshal_Server_Proxy (void)
-{
-  // releasing order is important
-
-  // release the impl
-  delete ssi_;
-  delete dsi_;
-
-  // release the BOA
-  CORBA::release (boa_);
-
-  // release the ORB
-  CORBA::release (orb_);
-}
diff --git a/TAO/Benchmark/benchmark/Makefile b/TAO/Benchmark/benchmark/Makefile
deleted file mode 100644
index fadaf340108..00000000000
--- a/TAO/Benchmark/benchmark/Makefile
+++ /dev/null
@@ -1,125 +0,0 @@
-#----------------------------------------------------------------------------
-#	$Id$
-#
-#	Top-level Makefile for the CORBA_Benchmark
-#----------------------------------------------------------------------------
-
-#----------------------------------------------------------------------------
-#	Local macros
-#----------------------------------------------------------------------------
-
-LIBNAME  = libbenchmark
-LIB      = $(LIBNAME).a
-SHLIB    = $(LIBNAME).$(SOEXT)
-
-FILES 	= driver \
-	  marshal_options \
-	  marshal_results \
-	  marshal_proxy
-
-LSRC	= $(addsuffix .cpp,$(FILES))
-
-LDLIBS = -lACE
-LIBS = -lACE
-VLDLIBS = $(LDLIBS:%=%$(VAR))
-
-BUILD	= $(VSHLIB) $(VLIB)
-
-ifndef TAO_ROOT
-TAO_ROOT = $(WRAPPER_ROOT)/TAO
-endif
-
-#----------------------------------------------------------------------------
-#	Include macros and targets
-#----------------------------------------------------------------------------
-
-include $(WRAPPER_ROOT)/include/makeinclude/wrapper_macros.GNU
-include $(WRAPPER_ROOT)/include/makeinclude/macros.GNU
-include $(WRAPPER_ROOT)/include/makeinclude/rules.common.GNU
-include $(WRAPPER_ROOT)/include/makeinclude/rules.nonested.GNU
-include $(WRAPPER_ROOT)/include/makeinclude/rules.lib.GNU
-#include $(WRAPPER_ROOT)/include/makeinclude/rules.bin.GNU
-include $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU
-
-#----------------------------------------------------------------------------
-# Local modifications to variables imported by includes above.
-#----------------------------------------------------------------------------
-
-CPPFLAGS += -I$(TAO_ROOT)/Benchmark/
-
-# DO NOT DELETE THIS LINE -- g++dep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-
-.obj/driver.o .shobj/driver.so: driver.cpp \
- $(ACE_ROOT)/TAO/Benchmark/benchmark/driver.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/stdcpp.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i
-.obj/marshal_options.o .shobj/marshal_options.so: marshal_options.cpp \
- $(ACE_ROOT)/TAO/Benchmark/benchmark/marshal_options.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/stdcpp.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/TAO/Benchmark/benchmark/marshal_options.i \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i
-.obj/marshal_results.o .shobj/marshal_results.so: marshal_results.cpp \
- $(ACE_ROOT)/TAO/Benchmark/benchmark/marshal_results.h \
- $(ACE_ROOT)/ace/Profile_Timer.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/stdcpp.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/High_Res_Timer.h \
- $(ACE_ROOT)/ace/High_Res_Timer.i \
- $(ACE_ROOT)/ace/Profile_Timer.i \
- $(ACE_ROOT)/TAO/Benchmark/benchmark/marshal_results.i
-.obj/marshal_proxy.o .shobj/marshal_proxy.so: marshal_proxy.cpp \
- $(ACE_ROOT)/TAO/Benchmark/benchmark/marshal_proxy.h \
- $(ACE_ROOT)/TAO/Benchmark/benchmark/marshal_options.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/stdcpp.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/TAO/Benchmark/benchmark/marshal_options.i \
- $(ACE_ROOT)/TAO/Benchmark/benchmark/marshal_results.h \
- $(ACE_ROOT)/ace/Profile_Timer.h \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/High_Res_Timer.h \
- $(ACE_ROOT)/ace/High_Res_Timer.i \
- $(ACE_ROOT)/ace/Profile_Timer.i \
- $(ACE_ROOT)/TAO/Benchmark/benchmark/marshal_results.i \
- $(ACE_ROOT)/TAO/Benchmark/benchmark/marshal_proxy.i
-
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/Benchmark/benchmark/driver.cpp b/TAO/Benchmark/benchmark/driver.cpp
deleted file mode 100644
index b2e5a413cdb..00000000000
--- a/TAO/Benchmark/benchmark/driver.cpp
+++ /dev/null
@@ -1,56 +0,0 @@
-#include "benchmark/driver.h"
-
-template <class T>
-CORBA_Benchmark_Driver<T>::CORBA_Benchmark_Driver (T *proxy)
-  : proxy_ (proxy)
-{
-}
-
-template <class T>
-CORBA_Benchmark_Driver<T>::~CORBA_Benchmark_Driver (void)
-{
-  delete proxy_;
-}
-
-template <class T>
-int
-CORBA_Benchmark_Driver<T>::run (int argc, char *argv[])
-{
-  // The run method delegates the task of parsing the command line options to
-  // the options data member
-  if (this->options_.parse_args (argc, argv) == -1)
-    {
-      ACE_DEBUG ((LM_DEBUG, "CORBA_Benchmark_Driver cannot parse arguments\n"));
-      return -1;
-    }
-
-#if 0
-  // get a handle to the proxy
-  this->proxy_ = this->options_.make_proxy ();
-  if (this->proxy_ == 0)
-    {
-      ACE_DEBUG ((LM_DEBUG, "CORBA_Benchmark_Driver cannot make proxy\n"));
-      return -1;
-    }
-#endif
-
-  // The driver delegates the task of running the test to the newly created
-  // proxy 
-  if (this->proxy_->run (this->options_, this->results_) == -1)
-    {
-      ACE_DEBUG ((LM_DEBUG, "CORBA_Benchmark_Driver cannot run\n"));
-      return -1;
-    }
-
-  // The driver delegates the task of printing the results to the TTCP_Results
-  // class 
-  if (this->results_.print_results () == -1)
-    {
-      ACE_DEBUG ((LM_DEBUG, "CORBA_Benchmark_Driver cannot print results\n"));
-      return -1;
-    }
-
-  return 0;
-}
-
-
diff --git a/TAO/Benchmark/benchmark/driver.h b/TAO/Benchmark/benchmark/driver.h
deleted file mode 100644
index 06a928125f6..00000000000
--- a/TAO/Benchmark/benchmark/driver.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/* -*- C++ -*- */
-
-// ============================================================================
-//
-// = LIBRARY
-//    CORBA Benchmark
-// 
-// = FILENAME
-//    driver.h
-//
-// = AUTHOR
-//    Aniruddha Gokhale
-// 
-// ============================================================================
-
-#if !defined (_CORBA_BENCHMARK_DRIVER_H_)
-#define _CORBA_BENCHMARK_DRIVER_H_
-
-#include "ace/Log_Msg.h"
-
-template <class PROXY>
-class CORBA_Benchmark_Driver
-{
-  // = TITLE
-  //    CORBA Benchmark Driver.
-  //
-  // = DESCRIPTION
-  //    This class encapsulates all the driver common to the CORBA benchmark
-  //    tests. It provides a template to run the benchmarking code. The real
-  //    work will be done by the PROXY class.
-public:
-
-  CORBA_Benchmark_Driver (PROXY *p);
-  // Constructor.
-
-  ~CORBA_Benchmark_Driver (void);
-  // Destructor
-
-  int run (int argc, char *argv[]);
-  // This is the starting point of all CORBA benchmark tests.
-  // Returns 0 on success, -1 on error.
-
-private:
-  PROXY *proxy_;
-  // the actual object that will do the work
-
-  PROXY::RESULTS results_;
-  // Storage of test results.
-
-  PROXY::OPTIONS options_;
-  // CORBA test command line options
-};
-
-#endif /* CORBA_BENCHMARK_DRIVER_H */
diff --git a/TAO/Benchmark/benchmark/marshal_options.cpp b/TAO/Benchmark/benchmark/marshal_options.cpp
deleted file mode 100644
index 2473032f5da..00000000000
--- a/TAO/Benchmark/benchmark/marshal_options.cpp
+++ /dev/null
@@ -1,278 +0,0 @@
-// ============================================================================
-//
-// = LIBRARY
-//    CORBA Benchmark
-// 
-// = FILENAME
-//    marshal_options.cpp
-//
-// = AUTHOR
-//    Aniruddha Gokhale
-// 
-// ============================================================================
-
-#include "benchmark/marshal_options.h"
-#include "ace/Get_Opt.h"
-
-#if !defined (__ACE_INLINE__)
-#include "benchmark/marshal_options.i"
-#endif /* __ACE_INLINE__ */
-
-static char *usage_string = 
-"Marshal_Test available options: \n\
--d                      : set debug ON \n\
--D                      : set TCP NO DELAY on \n\
--n <service name>       : set the service name\n\
--s <snd sock bufsize>   : set sender sock buf \n\
--r <rcv sock bufsize>   : set recv sock buf \n\
--h <hostname>           : hostname to listen/connect \n\
--p <portnum>            : port num to listen \n\
--i <iters>              : number of iters \n\
--R <ROLE>               : s(ender)/r(eceiver) \n\
--T <datatype>           : s(hort)/l(ong)/d(ouble)/o(ctet)/c(har)/\n\
-                          S(truct)/U(nion)/A(ny)/(se)Q/R(ecursive)\n\
--P <policy>             : S(II/SI)/D(II/SI) depending on role \n\
--I <CORBA impl>         : O(rbix)/V(isiBroker)/T(AO)\n\
--o <obj name>           : obj to bind to \n\
--f <filename>           : filename to store results \n\
-";
-
-int
-CORBA_Marshal_Options::Usage (void)
-{
-  ACE_DEBUG ((LM_DEBUG, "%s\n", usage_string));
-  return -1;
-}
-
-int
-CORBA_Marshal_Options::parse_args (int argc, char *argv [])
-{
-  int c; // option letter used
-  ACE_Get_Opt get_opt (argc, argv, "dDn:s:r:h:p:i:R:T:P:I:o:f:");
-
-  //  ACE_DEBUG ((LM_DEBUG, "CORBA_Marshal_Options::parse_args\n"));
-
-  while ((c = get_opt ()) != -1)
-    {
-      switch (c)
-	{
-	case 'd': // debug
-	  this->debug (1);
-	  break;
-	case 'D': // TCP NODELAY
-	  this->disable_nagle (1);
-	  break;
-	case 'n':
-	  this->service_name (get_opt.optarg);
-	  break;
-	case 's': // sender socket size
-	  this->snd_socket_queue_size (ACE_OS::atoi (get_opt.optarg));
-	  break;
-	case 'r': // receive socket size
-	  this->rcv_socket_queue_size (ACE_OS::atoi (get_opt.optarg));
-	  break;
-	case 'h': // hostname
-	  this->hostname (ACE_OS::strdup (get_opt.optarg));
-	  break;
-	case 'p': // port number
-	  this->port (ACE_OS::atoi (get_opt.optarg));
-	  break;
-	case 'i': // port number
-	  this->iterations (ACE_OS::atoi (get_opt.optarg));
-	  break;
-	case 'R': // role
-	  switch (*get_opt.optarg)
-	    {
-	    case 'S': // sender
-	    case 's': // sender
-	      this->role (SENDER);
-	      break;
-	    case 'R': // receiver
-	    case 'r': // receiver
-	      this->role (RECEIVER);
-	      break;
-	    default:
-	      return this->Usage ();
-	    }
-	  break;
-	case 'T': // data type to test
-	  switch (*get_opt.optarg)
-	    {
-	    case 's': // short
-	      this->data_type (SHORT);
-	      break;
-	    case 'd': // double
-	      this->data_type (DOUBLE);
-	      break;
-	    case 'o': // octet
-	      this->data_type (OCTET);
-	      break;
-	    case 'c': // char
-	      this->data_type (CHAR);
-	      break;
-	    case 'S': // Struct
-	      this->data_type (STRUCT);
-	      break;
-	    case 'U': // Union
-	      this->data_type (UNION);
-	      break;
-	    case 'A': // Any
-	      this->data_type (ANY);
-	      break;
-	    case 'Q': // Sequence
-	      this->data_type (SEQUENCE);
-	      break;
-	    case 'R': // Recursive
-	      this->data_type (RECURSIVE);
-	      break;
-	    case 'l': // long, also the default
-	    default:
-	      this->data_type (LONG);
-	      break;
-	    }
-	  break;
-	case 'P': // policy
-	  switch (*get_opt.optarg)
-	    {
-	    case 'S':
-	    case 's':
-	      this->policy (STATIC);
-	      break;
-	    case 'D':
-	    case 'd':
-	      this->policy (DYNAMIC);
-	      break;
-	    default:
-	      return this->Usage ();
-	    }
-	  break;
-	case 'I': // impl
-	  switch (*get_opt.optarg)
-	    {
-	    case 'O': // Orbix
-	      this->proxy_type (ORBIX);
-	      break;
-	    case 'V': // VisiBroker
-	      this->proxy_type (VISIBROKER);
-	      break;
-	    case 'T': // TAO
-	      this->proxy_type (TAO);
-	      break;
-	    }
-	  break;
-	case 'o': // obj name
-	  this->object_name (ACE_OS::strdup (get_opt.optarg));
-	  break;
-	case 'f': // file name to save results
-	  this->filename (ACE_OS::strdup (get_opt.optarg));
-	  break;
-	default:  // error
-	  return this->Usage ();
-	}
-    }
-  return 0;
-}
-
-int
-CORBA_Marshal_Options::orb_init_args (int &argc, char *argv [])
-{
-  char buffer [200];
-
-  argc = 0;
-  switch (this->proxy_type_)
-    {
-    case ORBIX:
-      break;
-    case VISIBROKER:
-      {
-	ACE_OS::memset (buffer, '\0', 200);
-	if (snd_socket_queue_size_ > 0)
-	  {
-	    ACE_OS::sprintf (buffer, "-ORBsendbufsize %d", snd_socket_queue_size_);
-	    orb_init_args_ += ACE_CString (buffer);
-	    argc ++;
-	  }
-
-	ACE_OS::memset (buffer, '\0', 200);
-	if (rcv_socket_queue_size_ > 0)
-	  {
-	    ACE_OS::sprintf (buffer, "-ORBrcvbufsize %d", rcv_socket_queue_size_);
-	    orb_init_args_ += ACE_CString (buffer);
-	    argc ++;
-	  }
-      }
-      break;
-    case TAO:
-      break;
-    }
-  ACE_OS::memset (buffer, '\0', 200);
-  ACE_OS::memcpy (buffer, boa_init_args_.rep (), boa_init_args_.length ());
-  return 0;
-}
-
-static char buffer [20][200];
-
-int
-CORBA_Marshal_Options::boa_init_args (int &argc, char *argv [])
-{
-  argc = 0;
-  switch (this->proxy_type_)
-    {
-    case ORBIX:
-      break;
-    case VISIBROKER:
-      {
-	ACE_OS::memset (buffer[argc], '\0', 200);
-	if (snd_socket_queue_size_ > 0)
-	  {
-	    ACE_OS::sprintf (buffer[argc], "-OAsendbufsize %d", snd_socket_queue_size_);
-	    //	    boa_init_args_ += ACE_CString (buffer[argc]);
-	    argc ++;
-	  }
-	ACE_OS::memset (buffer[argc], '\0', 200);
-	if (rcv_socket_queue_size_ > 0)
-	  {
-	    ACE_OS::sprintf (buffer[argc], "-OArcvbufsize %d", rcv_socket_queue_size_);
-	    //	    boa_init_args_ += ACE_CString (buffer[argc]);
-	    argc ++;
-	  }
-	ACE_OS::memset (buffer[argc], '\0', 200);
-	if (port_ > 0)
-	  {
-	    ACE_OS::sprintf (buffer[argc], "-OAport %d", port_);
-	    //	    boa_init_args_ += ACE_CString (buffer[argc]);
-	    argc ++;
-	  }
-	ACE_OS::memset (buffer[argc], '\0', 200);
-	if (hostname_ != 0 && role_ == RECEIVER)
-	  {
-	    ACE_OS::sprintf (buffer[argc], "-OAipaddr %s", hostname_);
-	    //	    boa_init_args_ += ACE_CString (buffer[argc]);
-	    argc ++;
-	  }
-      }
-      break;
-    case TAO:
-      {
-	ACE_OS::memset (buffer[argc], '\0', 200);
-	if (port_ > 0)
-	  {
-	    ACE_OS::sprintf (buffer[argc], "-OAport %d", port_);
-	    //	    boa_init_args_ += ACE_CString (buffer);
-	    argc ++;
-	  }
-	ACE_OS::memset (buffer[argc], '\0', 200);
-	if (hostname_ != 0 && role_ == RECEIVER)
-	  {
-	    ACE_OS::sprintf (buffer[argc], "-OAhostname %s", hostname_);
-	    //	    boa_init_args_ += ACE_CString (buffer);
-	    argc ++;
-	  }
-      }
-      break;
-    }
-  //  ACE_OS::memset (buffer, '\0', 200);
-  //  ACE_OS::memcpy (buffer, boa_init_args_.rep (), boa_init_args_.length ());
-  return 0;
-}
-
diff --git a/TAO/Benchmark/benchmark/marshal_options.h b/TAO/Benchmark/benchmark/marshal_options.h
deleted file mode 100644
index 49639cd74f1..00000000000
--- a/TAO/Benchmark/benchmark/marshal_options.h
+++ /dev/null
@@ -1,207 +0,0 @@
-// ============================================================================
-//
-// = LIBRARY
-//    CORBA Benchmark/Marshal
-// 
-// = FILENAME
-//    marshal_options.h
-//
-// = AUTHOR
-//    Aniruddha Gokhale
-// 
-// ============================================================================
-
-#if !defined (_CORBA_MARSHAL_OPTIONS_H_)
-#define _CORBA_MARSHAL_OPTIONS_H_
-
-#include "ace/OS.h"
-#include "ace/SString.h"
-
-class CORBA_Marshal_Options
-{
-  // = TITLE
-  //    CORBA_Marshal_Options
-  // = DESCRIPTION
-  //    An encapsulation of all the CORBA_MARSHAL test parameters.  This is
-  //    used to communicate between the ACE_CORBA_Marshal_Driver and all
-  //    specializations of CORBA_Marshal_Proxy. It must be noted that not all
-  //    options will be valid for a given specialization of CORBA_Marshal_Proxy. This is
-  //    a "all-encompassing" class.
-public:
-  // The following data types will be tested
-  enum DATATYPE 
-  {
-    NO_DATATYPE,
-    SHORT,
-    LONG,
-    DOUBLE,
-    CHAR,
-    OCTET,
-    STRUCT,
-    UNION,
-    ANY,
-    SEQUENCE,
-    RECURSIVE
-  };
-
-  // The following CORBA implementations will be tested
-  enum PROXY_TYPE 
-  {
-    NO_PROXY,
-    TAO, 
-    ORBIX, 
-    VISIBROKER
-  };
-
-  // Invocation policy
-  enum POLICY 
-  {
-    NO_POLICY,
-    STATIC,  // SII, SSI
-    DYNAMIC  // DII, DSI
-  };
-
-  // what role do we play?
-  enum ROLE 
-  {
-    NO_ROLE,
-    SENDER,
-    RECEIVER
-  };
-
-  CORBA_Marshal_Options (void);
-  // Construction.  Sets default values.
-
-  ~CORBA_Marshal_Options (void);
-  // Destructor
-
-  int parse_args (int argc, char *argv[]);
-  // Parse command line arguments.  This decides what type of CORBA_MARSHAL
-  // test to run.
-
-  // All the command line options
-
-  //= Get/Set the data type to be sent/received
-  CORBA_Marshal_Options::DATATYPE data_type (void);
-  void data_type (CORBA_Marshal_Options::DATATYPE);
-
-  //= Get/set the proxy type
-  CORBA_Marshal_Options::PROXY_TYPE proxy_type (void);
-  void proxy_type (CORBA_Marshal_Options::PROXY_TYPE);
-
-  //= Get/Set the policy used by clients/servers for communication
-  CORBA_Marshal_Options::POLICY policy (void);
-  void policy (CORBA_Marshal_Options::POLICY);
-
-  //= Get/Set whether we are client or server (sender/receiver)
-  CORBA_Marshal_Options::ROLE role (void);
-  void role (CORBA_Marshal_Options::ROLE);
-
-  //= Get/Set the hostname client connects to or the interface on which the
-  //server listens to
-  const char *hostname (void);
-  void hostname (const char *);
-
-  //= Get/set the port number on which the server listens
-  short port (void);
-  void port (short);
-  
-  //= Get/Set the object name (to which to connect to)
-  const char *object_name (void);
-  void object_name (const char *);
-
-  //= Get/Set the service name (for impl is ready)
-  const char *service_name (void);
-  void service_name (const char *);
-
-  // = Get/set receive sockbufsize.
-  int rcv_socket_queue_size (void);
-  void rcv_socket_queue_size (int);
-
-  // = Get/set send sockbufsize.
-  int snd_socket_queue_size (void);
-  void snd_socket_queue_size (int);
-
-  // = Get/set whether to use TCP_NODELAY or not
-  unsigned short disable_nagle (void);
-  void disable_nagle (unsigned short);
-
-  // = Get/set whether to print debug messages.
-  unsigned short debug (void);
-  void debug (unsigned short);
-
-  // =Get/Set filename to store results
-  const char *filename (void);
-  void filename (const char *fname);
-
-  // =Get/set number of iterations
-  int iterations (void);
-  void iterations (int iter);
-
-  int Usage (void);
-  // prints a usage message and always returns -1
-
-  int orb_init_args (int &argc, char * argv []);
-  // return a string that will be passed to the ORB init method based on the
-  // other options and proxy type
-
-  int boa_init_args (int &argc, char * argv []);
-  // return a string that will be passed to the BOA init method based on the
-  // other options and proxy type
-
-private:
-  const char *object_name_;
-  // name of the object.
-  
-  const char *service_name_;
-  // name of the service.
-  
-  CORBA_Marshal_Options::DATATYPE data_type_;
-  // data type to send/receive
-
-  CORBA_Marshal_Options::PROXY_TYPE proxy_type_;
-  // the proxy type, e.g., ACE, Orbix, VisiBroker, etc
-
-  CORBA_Marshal_Options::POLICY policy_;
-  // communications policy used by the communicating entity
-
-  CORBA_Marshal_Options::ROLE role_;
-  // Are we creating a sender or receiver?
-
-  int rcv_socket_queue_size_;
-  // Size of socket queue.
-
-  int snd_socket_queue_size_;
-  // Size of socket queue.
-
-  unsigned short disable_nagle_;
-  // Nagle must be stopped.
-
-  unsigned short debug_;
-  // Should we print debug messages?
-
-  short port_;
-  // Port for socket connections to use.
-
-  const  char *hostname_;
-  // Host for senders to connect to. and servers to listen on
-
-  const char *filename_;
-  // filename in which to store the results
-
-  int iterations_;
-  // number of times to run the same test
-
-  ACE_CString orb_init_args_;
-  // arguments to orb_init
-
-  ACE_CString boa_init_args_;
-  // arguments to boa_init
-
-};
-
-#if defined (__ACE_INLINE__)
-#include "benchmark/marshal_options.i"
-#endif /* __ACE_INLINE__ */
-
-#endif
diff --git a/TAO/Benchmark/benchmark/marshal_options.i b/TAO/Benchmark/benchmark/marshal_options.i
deleted file mode 100644
index cb3506aa35f..00000000000
--- a/TAO/Benchmark/benchmark/marshal_options.i
+++ /dev/null
@@ -1,233 +0,0 @@
-// ============================================================================
-//
-// = LIBRARY
-//    CORBA Benchmark/Marshal
-// 
-// = FILENAME
-//    marshal_options.i
-//
-// = AUTHOR
-//    Aniruddha Gokhale
-// 
-// ============================================================================
-
-// constructor
-ACE_INLINE
-CORBA_Marshal_Options::CORBA_Marshal_Options (void)
-  : object_name_ (0),
-    data_type_ (CORBA_Marshal_Options::NO_DATATYPE),
-    proxy_type_ (CORBA_Marshal_Options::NO_PROXY),
-    policy_ (CORBA_Marshal_Options::NO_POLICY),
-    role_ (CORBA_Marshal_Options::NO_ROLE),
-    rcv_socket_queue_size_ (-1),
-    snd_socket_queue_size_ (-1),
-    disable_nagle_ (0),
-    debug_ (0),
-    hostname_ (0),
-    port_ (-1),
-    iterations_ (0)
-{
-}
-
-    
-// destructor
-ACE_INLINE
-CORBA_Marshal_Options::~CORBA_Marshal_Options (void)
-{
-}
-
-// set the data type to be transferred
-ACE_INLINE void
-CORBA_Marshal_Options::data_type (CORBA_Marshal_Options::DATATYPE dt)
-{
-  data_type_ = dt;
-}
-
-// get the data type to be transferred
-ACE_INLINE CORBA_Marshal_Options::DATATYPE
-CORBA_Marshal_Options::data_type (void)
-{
-  return data_type_;
-}
-
-// set the proxy type to be transferred
-ACE_INLINE void
-CORBA_Marshal_Options::proxy_type (CORBA_Marshal_Options::PROXY_TYPE pt)
-{
-  proxy_type_ = pt;
-}
-
-// get the data type to be transferred
-ACE_INLINE CORBA_Marshal_Options::PROXY_TYPE
-CORBA_Marshal_Options::proxy_type (void)
-{
-  return proxy_type_;
-}
-
-// set the policy type to be transferred
-ACE_INLINE void
-CORBA_Marshal_Options::policy (CORBA_Marshal_Options::POLICY inv)
-{
-  policy_ = inv;
-}
-
-// get the policy type to be transferred
-ACE_INLINE CORBA_Marshal_Options::POLICY
-CORBA_Marshal_Options::policy (void)
-{
-  return policy_;
-}
-
-// set the role type to be transferred
-ACE_INLINE void
-CORBA_Marshal_Options::role (CORBA_Marshal_Options::ROLE my_role)
-{
-  role_ = my_role;
-}
-
-// get the role type to be transferred
-ACE_INLINE CORBA_Marshal_Options::ROLE
-CORBA_Marshal_Options::role (void)
-{
-  return role_;
-}
-
-// set the hostname
-ACE_INLINE void
-CORBA_Marshal_Options::hostname (const char *hname)
-{
-  hostname_ = hname;
-}
-
-// get the hostname
-ACE_INLINE const char*
-CORBA_Marshal_Options::hostname (void)
-{
-  return hostname_;
-}
-
-// set the post
-ACE_INLINE void
-CORBA_Marshal_Options::port (short portnum)
-{
-  port_ = portnum;
-}
-
-// get the port
-ACE_INLINE short
-CORBA_Marshal_Options::port (void)
-{
-  return port_;
-}
-
-// set the object name
-ACE_INLINE void
-CORBA_Marshal_Options::object_name (const char *objname)
-{
-  object_name_ = objname;
-}
-
-// get the object name
-ACE_INLINE const char *
-CORBA_Marshal_Options::object_name (void)
-{
-  return object_name_;
-}
-
-// set the service name
-ACE_INLINE void
-CORBA_Marshal_Options::service_name (const char *srvname)
-{
-  service_name_ = srvname;
-}
-
-// get the service name
-ACE_INLINE const char *
-CORBA_Marshal_Options::service_name (void)
-{
-  return service_name_;
-}
-
-// set the receive sock size
-ACE_INLINE void
-CORBA_Marshal_Options::rcv_socket_queue_size (int socksize)
-{
-  rcv_socket_queue_size_ = socksize;
-}
-
-// get the receive sock size
-ACE_INLINE int
-CORBA_Marshal_Options::rcv_socket_queue_size (void)
-{
-  return rcv_socket_queue_size_;
-}
-
-// set the sender sock size
-ACE_INLINE void
-CORBA_Marshal_Options::snd_socket_queue_size (int socksize)
-{
-  snd_socket_queue_size_ = socksize;
-}
-
-// get the snd sock size
-ACE_INLINE int
-CORBA_Marshal_Options::snd_socket_queue_size (void)
-{
-  return snd_socket_queue_size_;
-}
-
-// set whether Nagle algo is to be disabled
-ACE_INLINE void
-CORBA_Marshal_Options::disable_nagle (unsigned short val)
-{
-  disable_nagle_ = (val ? 1 : 0);
-}
-
-// get whether Nagle algo is disabled
-ACE_INLINE unsigned short
-CORBA_Marshal_Options::disable_nagle (void)
-{
-  return disable_nagle_;
-}
-
-// set whether debug is to be disabled
-ACE_INLINE void
-CORBA_Marshal_Options::debug (unsigned short val)
-{
-  debug_ = (val ? 1 : 0);
-}
-
-// get whether debug is disabled
-ACE_INLINE unsigned short
-CORBA_Marshal_Options::debug (void)
-{
-  return debug_;
-}
-
-// set the filename
-ACE_INLINE void
-CORBA_Marshal_Options::filename (const char *fname)
-{
-  filename_ = fname;
-}
-
-// get the filename
-ACE_INLINE const char*
-CORBA_Marshal_Options::filename (void)
-{
-  return filename_;
-}
-
-// set the iterations
-ACE_INLINE void
-CORBA_Marshal_Options::iterations (int iter)
-{
-  iterations_ = iter;
-}
-
-// get the iterations
-ACE_INLINE int
-CORBA_Marshal_Options::iterations (void)
-{
-  return iterations_;
-}
diff --git a/TAO/Benchmark/benchmark/marshal_proxy.cpp b/TAO/Benchmark/benchmark/marshal_proxy.cpp
deleted file mode 100644
index aa6aa1e631c..00000000000
--- a/TAO/Benchmark/benchmark/marshal_proxy.cpp
+++ /dev/null
@@ -1,19 +0,0 @@
-// ============================================================================
-//
-// = LIBRARY
-//    CORBA Benchmark
-// 
-// = FILENAME
-//    marshal_proxy.cpp
-//
-// = AUTHOR
-//    Aniruddha Gokhale
-// 
-// ============================================================================
-
-#include "benchmark/marshal_proxy.h"
-
-#if !defined (__ACE_INLINE__)
-#include "benchmark/marshal_proxy.i"
-#endif /* __ACE_INLINE__ */
-
diff --git a/TAO/Benchmark/benchmark/marshal_proxy.h b/TAO/Benchmark/benchmark/marshal_proxy.h
deleted file mode 100644
index de81ccf95ea..00000000000
--- a/TAO/Benchmark/benchmark/marshal_proxy.h
+++ /dev/null
@@ -1,46 +0,0 @@
-// ============================================================================
-//
-// = LIBRARY
-//    CORBA Benchmark
-// 
-// = FILENAME
-//    marshal_proxy.h
-//
-// = AUTHOR
-//    Aniruddha Gokhale
-// 
-// ============================================================================
-
-#if !defined(_CORBA_MARSHAL_PROXY_H_)
-#define _CORBA_MARSHAL_PROXY_H_
-
-#include "benchmark/marshal_options.h"
-#include "benchmark/marshal_results.h"
-
-class CORBA_Marshal_Proxy
-{
-  // = TITLE
-  //    Abstract handle for all CORBA_Marshal tests.
-  // = DESCRIPTION
-  //   The IMPL class is the CORBA specific class which does the real work. The
-  //   IMPL class must support the run method
-public:
-  typedef CORBA_Marshal_Options OPTIONS;
-  typedef CORBA_Marshal_Results RESULTS;
-
-  CORBA_Marshal_Proxy (void);
-  // constructor
-
-  virtual ~CORBA_Marshal_Proxy (void);
-  // destructor
-
-  virtual int run (OPTIONS &, RESULTS &) = 0;
-  // run the test
-
-};
-
-#if defined (__ACE_INLINE__)
-#include "benchmark/marshal_proxy.i"
-#endif /* __ACE_INLINE__ */
-
-#endif
diff --git a/TAO/Benchmark/benchmark/marshal_proxy.i b/TAO/Benchmark/benchmark/marshal_proxy.i
deleted file mode 100644
index 746651741b3..00000000000
--- a/TAO/Benchmark/benchmark/marshal_proxy.i
+++ /dev/null
@@ -1,10 +0,0 @@
-
-ACE_INLINE
-CORBA_Marshal_Proxy::CORBA_Marshal_Proxy (void)
-{
-}
-
-ACE_INLINE
-CORBA_Marshal_Proxy::~CORBA_Marshal_Proxy (void)
-{
-}
diff --git a/TAO/Benchmark/benchmark/marshal_results.cpp b/TAO/Benchmark/benchmark/marshal_results.cpp
deleted file mode 100644
index 416827a08d7..00000000000
--- a/TAO/Benchmark/benchmark/marshal_results.cpp
+++ /dev/null
@@ -1,32 +0,0 @@
-// ============================================================================
-//
-// = LIBRARY
-//    CORBA Benchmark/Marshal
-// 
-// = FILENAME
-//    marshal_results.cpp
-//
-// = AUTHOR
-//    Aniruddha Gokhale
-// 
-// ============================================================================
-
-#include "benchmark/marshal_results.h"
-
-#if !defined (__ACE_INLINE__)
-#include "benchmark/marshal_results.i"
-#endif /* __ACE_INLINE__ */
-
-int 
-CORBA_Marshal_Results::log_results (void)
-{
-  return 0;
-}
-
-int
-CORBA_Marshal_Results::print_results (void)
-{
-  //  ACE_DEBUG ((LM_DEBUG, "CORBA_Marshal_Results::print_results\n"));
-
-  return 0; // success
-}
diff --git a/TAO/Benchmark/benchmark/marshal_results.h b/TAO/Benchmark/benchmark/marshal_results.h
deleted file mode 100644
index 5f7647c77a3..00000000000
--- a/TAO/Benchmark/benchmark/marshal_results.h
+++ /dev/null
@@ -1,70 +0,0 @@
-// ============================================================================
-//
-// = LIBRARY
-//    CORBA Benchmark
-// 
-// = FILENAME
-//    marshal_results.h
-//
-// = AUTHOR
-//    Aniruddha Gokhale
-// 
-// ============================================================================
-
-#if !defined (_CORBA_MARSHAL_RESULTS_H_)
-#define _CORBA_MARSHAL_RESULTS_H_
-
-#include "ace/Profile_Timer.h"
-
-class CORBA_Marshal_Results
-{
-public:
-  CORBA_Marshal_Results (void);
-  // Construction.
-
-  ~CORBA_Marshal_Results (void);
-  // destructor.
-
-  void clear (void);
-  // Clear all results.
-
-  ACE_Profile_Timer::ACE_Elapsed_Time & elapsed_time (void);
-  // Get the elapsed time.
-
-  ACE_Profile_Timer::Rusage elapsed_rusage (void);
-  // compute the rusage
-
-  int start_timer (void);
-  // starts a profile timer.
-
-  int stop_timer (void);
-  // stops the profile timer.
-
-  void filename (const char *fname);
-  // set the name of the file to store results
-
-  int log_results (void);
-  // log results
-
-  int print_results (void);
-  // prints the results
-
-private:
-
-  // = Used for performance statistics
-  ACE_Profile_Timer timer_;
-  ACE_Profile_Timer::ACE_Elapsed_Time et_;
-  ACE_Profile_Timer::Rusage rusage_;
-
-  double elapsed_time_;
-  // Real elapsed time in seconds.
-
-  const char *filename_;
-  // filename
-};
-
-#if defined (__ACE_INLINE__)
-#include "benchmark/marshal_results.i"
-#endif /* __ACE_INLINE__ */
-
-#endif
diff --git a/TAO/Benchmark/benchmark/marshal_results.i b/TAO/Benchmark/benchmark/marshal_results.i
deleted file mode 100644
index 85c6dfce5f9..00000000000
--- a/TAO/Benchmark/benchmark/marshal_results.i
+++ /dev/null
@@ -1,59 +0,0 @@
-
-// ============================================================================
-//
-// = LIBRARY
-//    CORBA Benchmark/Marshal
-// 
-// = FILENAME
-//    marshal_results.i
-//
-// = AUTHOR
-//    Aniruddha Gokhale
-// 
-// ============================================================================
-
-ACE_INLINE
-CORBA_Marshal_Results::CORBA_Marshal_Results (void)
-  : filename_ (0),
-    elapsed_time_ (0)
-{
-}
-
-ACE_INLINE
-CORBA_Marshal_Results::~CORBA_Marshal_Results (void)
-{
-}
-
-ACE_INLINE int
-CORBA_Marshal_Results::start_timer (void)
-{
-  return this->timer_.start ();
-}
-
-ACE_INLINE int
-CORBA_Marshal_Results::stop_timer (void)
-{
-  return this->timer_.stop ();
-}
-
-ACE_INLINE ACE_Profile_Timer::ACE_Elapsed_Time &
-CORBA_Marshal_Results::elapsed_time (void)
-{
-  (void) this->timer_.elapsed_time (this->et_);
-  return this->et_;
-}
-
-ACE_INLINE ACE_Profile_Timer::Rusage
-CORBA_Marshal_Results::elapsed_rusage (void)
-{
-  (void) this->timer_.elapsed_rusage (this->rusage_);
-  return this->rusage_;
-}
-
-ACE_INLINE void
-CORBA_Marshal_Results::filename (const char *fname)
-{
-  this->filename_ = fname;
-}
-
-
diff --git a/TAO/COPYING b/TAO/COPYING
deleted file mode 100644
index c64992e2875..00000000000
--- a/TAO/COPYING
+++ /dev/null
@@ -1,40 +0,0 @@
-COPYRIGHT INFORMATION FOR TAO
-
-TAO is copyrighted by Douglas C. Schmidt and his research group at
-Washington University, Copyright (c) 1997, all rights reserved.  In
-addition, some portions of TAO (particularly the IIOP protocol engine)
-are copyrighted by SunSoft (see the ./IIOP/lib/COPYING.sun file for
-more details).  Likewise, TAO relies heavily on ACE, which is also
-copyrighted by Douglas C. Schmidt and his research group at Washington
-University (see the ../COPYING file for more details).
-
-You are free to do anything you like with the Wash. U. portions of
-TAO's source code (and object code produced from the source).  For
-instance, you can include it in commercial software, as long as you
-include this copyright statement along with code built using TAO.
-
-You are under no obligation to freely redistribute any of your source
-code that is built using TAO.  Please note, however, that you may not
-do anything to the ACE code that will prevent it from being
-distributed freely (such as copyrighting it or claiming authorship).
-
-TAO is provided as is with no warranties of any kind including the
-warranties of design, merchantibility and fitness for a particular
-purpose, noninfringement, or arising from a course of dealing, usage
-or trade practice.
-
-TAO is provided with no support and without any obligation on the part
-of Washington University, its employees, or students to assist in its
-use, correction, modification or enhancement.
-
-Washington University, its employees, and students shall have no
-liability with respect to the infringement of copyrights, trade
-secrets or any patents by TAO or any part thereof.
-
-In no event will Washington University, its employees, or students be
-liable for any lost revenue or profits or other special, indirect and
-consequential damages.
-
-        Douglas C. Schmidt 
-        schmidt@cs.wustl.edu 
-
diff --git a/TAO/COPYING.sun b/TAO/COPYING.sun
deleted file mode 100644
index 7cd6795a942..00000000000
--- a/TAO/COPYING.sun
+++ /dev/null
@@ -1,67 +0,0 @@
-This notice applies to all files in this software distribution that
-were originally derived from SunSoft IIOP code (these files contain
-Sun Microsystems copyright notices).
-
-COPYRIGHT AND LICENSING
------------------------
-
-Copyright 1995 Sun Microsystems, Inc.
-Printed in the United States of America.
-All Rights Reserved.
-
-This software product (LICENSED PRODUCT), implementing the Object
-Management Group's "Internet Inter-ORB Protocol", is protected by
-copyright and is distributed under the following license restricting
-its use.  Portions of LICENSED PRODUCT may be protected by one or more
-U.S. or foreign patents, or pending applications.
-
-LICENSED PRODUCT is made available for your use provided that you
-include this license and copyright notice on all media and
-documentation and the software program in which this product is
-incorporated in whole or part.
-
-You may copy, modify, distribute, or sublicense the LICENCED PRODUCT
-without charge as part of a product or software program developed by
-you, so long as you preserve the functionality of interoperating with
-the Object Management Group's "Internet Inter-ORB Protocol" version
-one.  However, any uses other than the foregoing uses shall require
-the express written consent of Sun Microsystems, Inc.
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of the LICENSED PRODUCT as permitted herein.
-
-This license is effective until terminated by Sun for failure to
-comply with this license.  Upon termination, you shall destroy or
-return all code and documentation for the LICENSED PRODUCT.
-
-LICENSED PRODUCT IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND
-INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A
-PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-LICENSED PRODUCT IS PROVIDED WITH NO SUPPORT AND WITHOUT ANY
-OBLIGATION ON THE PART OF SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY
-WITH RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY
-PATENTS BY LICENSED PRODUCT OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE
-LIABLE FOR ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND
-CONSEQUENTIAL DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY
-OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and
-FAR 52.227-19.
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems and the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
diff --git a/TAO/ChangeLog-98c b/TAO/ChangeLog-98c
deleted file mode 100644
index 06fccb77a29..00000000000
--- a/TAO/ChangeLog-98c
+++ /dev/null
@@ -1,5511 +0,0 @@
-Mon Nov 24 20:40:47 1997  Carlos O'Ryan  <coryan@macarena.cs.wustl.edu>
-
-	* tao/corbacom.i: 
-	  Fixed string allocation problem for String_var(char*): if it
-	  does not copy the string we run into problems with the
-	  demarshalling code.
-
-	* orbsvcs/lib/Event_Utilities.cpp: 
-	* orbsvcs/lib/Event_Utilities.h: 
-	* orbsvcs/lib/Event_Utilities.i: 
-	* orbsvcs/lib/RtecEventChannelAdmin.idl: 
-	* orbsvcs/lib/RtecEventChannelAdminC.cpp: 
-	* orbsvcs/lib/RtecEventChannelAdminC.h: 
-	  Removed the unused forward_event parameter in the ConsumerQoS.
-
-	* orbsvcs/lib/RtecSchedulerC.h: 
-	* orbsvcs/lib/RtecSchedulerC.i: 
-	  Hand crafted the T_out constructors to take a "const T_out&"
-	  instead of just "T_out&".
-
-Sat Nov 22 18:21:10 1997  Aniruddha Gokhale  <gokhale@mambo.cs.wustl.edu>
-
-	* TAO_IDL/be_include/be_codegen.h, be/be_codegen.cpp: Added a
-	number of states to handle attributes
-
-	* TAO_IDL/be/{be_attribute,be_state_attribute}.cpp: Code added to
-	handle attributes. This code is a mix of code that is used to
-	handle operations as well as arguments because for attributes we
-	have 2 methods, one to set the value and one which returns the
-	value. For a readonly attribute, there is only the get method.
-
-	A special note: Due to the large switch statement, I had to use
-	-fPIC for g++. We are working on abstracting all the commin
-	functionality once we have the basic IDL compiler working.
-
-	* TAO_IDL/be/be_interface.cpp: Operation table now also includes
-	methods to set and get the attributes if they are present. In
-	addition, the variable name for the operation tables is now the
-	full flattened name to avoid conflicts.
-
-	* TAO_IDL/be/be_sequence.cpp: In the length method, the index of
-	lookp variable "i" is changed from "int" to CORBA::ULong as g++
-	was issuing a warning.
-
-	* TAO_IDL/be/be_string.cpp, be_state_argument,cpp: Proper handling
-	of in, inout, and out strings that are either anonymous or are
-	typedefed.
-
-Fri Nov 21 13:22:39 1997  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-	* TAO version 0.0.40, released Fri Nov 21 13:22:39 1997.
-
-Thu Nov 20 10:31:24 1997  Chris Cleeland  <cleeland@cs.wustl.edu>
-
-	* tao/orbconf.h (SIZEOF_LONG_DOUBLE): Made sure this is defined
- 	properly for Chorus.  Thanks to Wei Chiang <chiang@tele.nokia.fi>
- 	for submitting these!
-
-	* tao/orb_core.cpp (init): Added some changes for Chorus.  Thanks
- 	to Wei Chiang <chiang@tele.nokia.fi> for submitting these!
-
-	* tao/object.cpp (_is_a): Explicitly specify which conversion
- 	operator to use when comparing type_id to 0.
-
-Thu Nov 20 00:10:52 1997  Sergio Flores  <sergio@cs.wustl.edu>
-
-	* orbsvcs/tests/Logger/clnt.h :
-	* orbsvcs/tests/Logger/clnt.cpp (Logger_Client): Fixed a bug
- 	dealing with using "_bind" when the naming service is not
- 	available.
-
-Thu Nov 20 00:06:03 1997  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-	* TAO version 0.0.39, released Thu Nov 20 00:06:03 1997.
-
-Thu Nov 20 00:01:06 1997  Douglas C. Schmidt  <schmidt@merengue.cs.wustl.edu>
-
-	* tao/Makefile: Reordered the files so they are built in
- 	alphabetic order (within each grouping of targets).  This makes it
- 	easier to see how the compilation process is doing ;-).
-
-Wed Nov 19 22:59:18 1997  Sergio Flores  <sergio@cs.wustl.edu>
-
-	* tao/orbobj.cpp (resolve_name_service): Minor change to output
- 	debug statement.
-
-Wed Nov 19 23:01:46 1997  Aniruddha Gokhale  <gokhale@mambo.cs.wustl.edu>
-
-	* TAO_IDL/be/be_state_operation.cpp: Fixed the problem with
- 	strings as return values.  Thanks to Mark L Boriack
- 	<mark@vtcibm4a> for reporting this.
-
-Wed Nov 19 20:48:01 1997  James C Hu  <jxh@cs.wustl.edu>
-
-	* tests/Thruput_test/server.cpp: Commented out some unreachable
-	  code at the bottom of main.
-
-Wed Nov 19 19:04:53 1997  Sergio Flores  <sergio@tango.cs.wustl.edu>
-
-	* tao/decode.cpp (decode): Added a cast so that compiler would
- 	know which operator to call.
-
-	* orbsvcs/bin/Naming_Service/svr.cpp (handle_input): Change port
- 	number received to host byte order.  Minor changes.
-
-	* tao/orbobj.cpp (resolve_name_service): Send port number in
- 	network byte order.
-
-Wed Nov 19 17:45:52 1997  Chris Cleeland  <cleeland@cs.wustl.edu>
-
-	* tests/Cubit/TAO/IDL_Cubit/clnt.cpp: Put in proper release of
- 	resources after _narrow operation.
-
-	* tao/stub.h: Used CORBA::String_var as the underlying type for
- 	'type_id' in STUB_Object.  In the long run this may be a bad idea
- 	for performance considerations, but we may be able to improve that
- 	by improving the implementation of String_var.
-
-	* tao/orbobj.cpp: Removed unreachable ACE_NOTSUP_RETURN.
-
-	* tao/decode.cpp: Made allocation and free semantics of
- 	'type_hint' consistent with its type of CORBA::String.
-
-Wed Nov 19 17:33:42 1997  Sumedh Mungee  <sumedh@lindy.cs.wustl.edu>
-
-	* Task_Client.cpp: Fixed error_count.. Thanks to James Hu.
-
-Wed Nov 19 17:20:45 1997  James C Hu  <jxh@cs.wustl.edu>
-
-	* TAO_IDL/be/be_operation.cpp: Removed an unreachable return
-	  statement.  There was already a return above it.
-
-	* TAO_IDL/ast/ast_expression.cpp: Added casts to comparisons of
-	  char variables to 0, since chars are unsigned by default in
-	  SGI.
-
-	* tests/Cubit/TAO/MT_Cubit/client/Task_Client.cpp: Removed a
-	  couple of unreachable return statements.  There are still
-	  unreachable statements remaining.  Need help with them.
-
-	* tests/Cubit/TAO/IDL_Cubit/clnt.cpp:
-	* tests/Cubit/TAO/DII_Cubit/clnt.cpp:
-	  Meaningless type qualifier (const ...) removed.
-
-	  Some functions were returning `retval' before it was set.  I had
-	  these functions return a passed in paramenter instead.
-
-Wed Nov 19 13:50:36 1997  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-	* TAO version 0.0.38, released Wed Nov 19 13:50:36 1997.
-
-Wed Nov 19 13:11:53 1997  David L. Levine  <levine@cs.wustl.edu>
-
-        * orbsvcs/lib/Scheduler_Factory.cpp (dump_schedule): changed loop
-          index from int to u_int to avoid signed/unsigned comparison.
-          (use_runtime): return 0.
-
-        * orbsvcs/lib/Event_Utilities.cpp (debug): changed loop
-          index from int to u_int to avoid signed/unsigned comparison.
-
-Wed Nov 19 12:22:50 1997  Chris Cleeland  <cleeland@cs.wustl.edu>
-
-	* tao/orbobj.cpp (resolve_name_service): Reverted some of the
- 	minor changes below, specifically the use of ACE_ERROR_RETURN
- 	rather than ACE_ERROR/return.  ACE_ERROR_RETURN cannot be used
- 	as-is because the 2nd parameter is used as an 'int' to specify the
- 	operational status, and the return value of this function is NOT
- 	an int.  Also had to add a missing semi-colon which caused none of
- 	the code to compile.
-
-Wed Nov 19 12:07:42 1997  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-	* TAO version 0.0.37, released Wed Nov 19 12:07:42 1997.
-
-Wed Nov 19 10:37:19 1997  Carlos O'Ryan  <coryan@macarena.cs.wustl.edu>
-
-	* orbsvcs/lib/Scheduler_Factory.cpp:
-	  The type declared for the rt_info array was wrong.
-
-Wed Nov 19 09:18:30 1997  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-	* TAO version 0.0.36, released Wed Nov 19 09:18:30 1997.
-
-Wed Nov 19 09:15:15 1997  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-	* tao/orbobj.cpp (resolve_name_service): Made a bunch of minor
- 	  Changes for resolving the Naming service.
-
-Wed Nov 19 08:44:12 1997  Brian Mendel <brian.r.mendel@boeing.com>
-
-	* tests/Cubit/TAO/DII_Cubit/default.bld:
-	* tests/Cubit/TAO/DII_Cubit/clnt.bld:
-	* tests/Cubit/TAO/DII_Cubit/svr.bld:
-	* tests/Cubit/TAO/IDL_Cubit/default.bld:
-	* tests/Cubit/TAO/IDL_Cubit/clnt.bld:
-	* tests/Cubit/TAO/IDL_Cubit/svr.bld:
-	* tests/Cubit/TAO/MT_Cubit/default.bld:
-	* tests/Cubit/TAO/MT_Cubit/clnt.bld:
-	* tests/Cubit/TAO/MT_Cubit/svr.bld:  Added build files in the new
-          test structure for VxWorks using the GHS compiler.
-
-	* tests/Cubit/Build: Removed the obsolete build directory for vxWorks.
-
-Wed Nov 19 07:47:13 1997  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-	* TAO version 0.0.35, released Wed Nov 19 07:47:13 1997.
-
-Wed Nov 19 05:53:42 1997  Sergio Flores  <sergio@tango.cs.wustl.edu>
-
-	* tests/Cubit/TAO/DII_Cubit/clnt.cpp:
-	* tests/Cubit/TAO/DII_Cubit/clnt.h:
-	* tests/Cubit/TAO/IDL_Cubit/clnt.cpp:
-	* tests/Cubit/TAO/IDL_Cubit/clnt.h: Changed code to add loop
- 	around all cube calls, and make output more consistent.
-
-	* orbsvcs/tests/Logger/Makefile:
-	* orbsvcs/tests/Logger/ior_multicast.cpp:
-	* orbsvcs/tests/Logger/ior_multicast.h: Removed unneeded
- 	ior_multicast.* source files from the logger example.  It now uses
- 	the resolve_initial_references() to use the naming service for its
- 	advertisement.
-
-	* orbsvcs/lib/Makefile (realclean): Updated with realclean & clean
- 	rules to delete CosNamingS.* and CosNamingC.*
-
-	* docs/releasenotes/index.html: Updated status of the naming
- 	service to working implementation.
-
-	* orbsvcs/lib/CosNamingS.cpp:
-	* orbsvcs/lib/CosNamingS.i:
-	* orbsvcs/lib/CosNamingS.h:
-	* orbsvcs/lib/CosNamingC.cpp:
-	* orbsvcs/lib/CosNamingC.i:
-	* orbsvcs/lib/CosNamingC.h: Removed these files from the
- 	repository, since the IDL compiler generates these correctly.
-
-	* orbsvcs/bin/Naming_Service/CosNaming_i.cpp (list): Remove
- 	warning for unused variable.
-
-	* orbsvcs/bin/Naming_Service/svr.h: Constructor of event handler
- 	for multicast doesn't need reply port anymore.
-
-	* orbsvcs/bin/Naming_Service/svr.cpp (handle_input): Now receives
- 	the port number in the multicast request.  Suggested by Doug
- 	Schmidt.
-
-	* tao/orbobj.cpp (resolve_name_service): changed return value
- 	variable to be signed.  Added code to send the port number in the
- 	multicast resolution mechanism as a CORBA::Short.
-
-	* orbsvcs/bin/Naming_Service/NS_CosNaming.cpp (NS_ExtId):
- 	Reordered initializers in the constructor.
-
-	* tests/Cubit/TAO/IDL_Cubit/clnt.h:
-	* tests/Cubit/TAO/IDL_Cubit/clnt.cpp (run): Added a loop around
- 	all cube calls and added calls/sec stats for them.
-
-	* tao/corba.h: Changed order of inclusion of marshal.i, due to
- 	warnings of the declaration of the inline function
- 	make_marshal_object().
-
-	* tao/orbobj.i: reorder the declaration of inline
- 	CORBA_OBJ::Add_Ref(), to remove a warning.
-
-	* tests/Cubit/TAO/MT_Cubit/server/svr.cpp (main):
-	removed return statement that was causing a warning.
-
-Wed Nov 19 04:22:48 1997  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-	* TAO version 0.0.34, released Wed Nov 19 04:22:48 1997.
-
-Tue Nov 18 01:29:00 1997    <nw1@COYOTE>
-
-	* tao/TAO.dsp:  Added Arg_Shifter.cpp into project file.
-
-Tue Nov 18 18:53:57 1997  Sergio Flores  <sergio@polka.cs.wustl.edu>
-
-	* TAO_IDL/be/be_state_typedef.cpp (gen_code):
-	* TAO_IDL/be/be_state_structure.cpp (gen_code):
-	* TAO_IDL/be/be_state_sequence.cpp (gen_code):
-	* TAO_IDL/be/be_state_operation.cpp (gen_code):
-	* TAO_IDL/be/be_state_array.cpp (gen_code): Comment out
- 	unreachable break statements.
-
-	* TAO_IDL/ast/ast_array.cpp (n_dims):
-	* TAO_IDL/include/ast_array.h (AST_Array::n_dims):
-	* TAO_IDL/ast/ast_attribute.cpp (readonly):
-	* TAO_IDL/include/ast_attribute.h (AST_Attribute::readonly):
-	* TAO_IDL/ast/ast_argument.cpp (direction):
-	* TAO_IDL/include/ast_argument.h (AST_Argument::direction):
-	* tao/nvlist.h (CORBA_NamedValue::name):
-	* TAO_IDL/include/utl_scope.h (UTL_Scope::scope_node_type):
-	* TAO_IDL/ast/ast_predefined_type.cpp (pt):
-	* TAO_IDL/include/ast_predefined_type.h (AST_PredefinedType::pt):
- 	removed const from declarations that it didn't have a meaning for.
-  	Also from return statements.  These changes were suggested by
- 	James Hu and the SGI compiler.
-
-Tue Nov 18 18:34:16 1997  Sumedh Mungee  <sumedh@lindy.cs.wustl.edu>
-
-	* tests/Cubit/COOL/client.cpp: ORB_init is now called in
-	Task_Client.cpp instead of the main program, to insure that its
-	called in the right thread.
-
-	* tests/Cubit/COOL/Task_Client.{h,cpp}: Used the COOL_Activity to
-	create threads instead of ACE_Task.
-
-	* tests/Cubit/COOL/server.cpp: Used the createActivity stuff to
-	create threads.  The server now creates two servants, one for high
-	and the other for low priority clients.
-
-Tue Nov 18 17:44:02 1997  Chris Cleeland  <cleeland@cs.wustl.edu>
-
-	* tao/corbacom.h: Added special case for CORBA::WChar to be a
- 	short on VxWorks/GreenHills.
-
-	* TAO_IDL/be/be_state.cpp: Added template instantiations for SGI.
-
-	* tao/deep_free.cpp (deep_free): Removed unused 'alignment'
- 	variable.
-
-	* tao/deep_copy.cpp (deep_copy): Removed unused 'alignment'
- 	variable.
-
-	* tao/encode.cpp (encode): Removed unused 'continue_encoding'
- 	variable.
-
-	* tao/orbobj.cpp (POA_init): Removed options which were no longer
- 	supported/necessary, as well as their corresponding variables.
-
-Tue Nov 18 17:33:20 1997  Carlos O'Ryan  <coryan@macarena.cs.wustl.edu>
-
-	* orbsvcs/lib/RtecEventChannelAdmin.idl:
-	* orbsvcs/lib/RtecEventComm.idl:
-	  Changed several operations to "oneway" to avoid dead-locks in
-	  the Event Channel tests.
-
-	* orbsvcs/lib/Runtime_Scheduler.h:
-	* orbsvcs/lib/Runtime_Scheduler.cpp:
-	  This class is a servant, event though it is only used
-	  collocated, so it must inherit from the POA class.
-
-	* orbsvcs/lib/Scheduler_Factory.cpp:
-	  Care must be exercised to create the Runtime_Scheduler instance
-	  only once the ORB is up and running.
-
-	* orbsvcs/lib/CosNamingC.cpp:
-	* orbsvcs/lib/CosNamingC.h:
-	* orbsvcs/lib/CosNamingS.cpp:
-	* orbsvcs/lib/CosNamingS.h:
-	* orbsvcs/lib/RtecEventChannelAdminC.cpp:
-	* orbsvcs/lib/RtecEventChannelAdminC.h:
-	* orbsvcs/lib/RtecEventChannelAdminS.cpp:
-	* orbsvcs/lib/RtecEventChannelAdminS.h:
-	* orbsvcs/lib/RtecEventCommC.cpp:
-	* orbsvcs/lib/RtecEventCommC.h:
-	* orbsvcs/lib/RtecEventCommS.cpp:
-	* orbsvcs/lib/RtecEventCommS.h:
-	* orbsvcs/lib/RtecSchedulerC.cpp:
-	* orbsvcs/lib/RtecSchedulerC.h:
-	* orbsvcs/lib/RtecSchedulerS.cpp:
-	* orbsvcs/lib/RtecSchedulerS.h:
-	  Regenerated all the stubs and skeletons using the latest IDL
-	  compiler, but still some hand crafting is required, namely for
-	  operations in base classes.
-
-Tue Nov 18 14:27:02 1997  Chris Cleeland  <cleeland@cs.wustl.edu>
-
-	* tao/cdr.cpp (CDR): Changed TAO_PURIFY to ACE_PURIFY.
-
-	* tests/Cubit/TAO/MT_Cubit/serdatever/svr.cpp: Added code to put use a
- 	kinder, gentler high priority value on VxWorks.  This makes it
- 	easier for the machine to remain running. :-\
-
-	* tao/corbacom.h: Added CVS id keyword.
-
-	* tao/{corba.h,tao_internals.h,tao_internals.cpp}: Backed out
- 	tao_internals.h, which is not intended to be publicly visible.
-  	corba.h should contain only headers/inlines for things which
- 	should be externally visible.
-
-Tue Nov 18 04:00:46 1997  Carlos O'Ryan  <coryan@macarena.cs.wustl.edu>
-
-	* tao/poa.cpp:
-	  An operation lookup on the dispatching code will cause an error
-	  message and the CORBA::BAD_OPERATION exception to be raised.
-
-	* tao/orb_core.cpp:
-	  Somehow the options for setting the Event Service and the
-	  Scheduling Service IOR were lost. Eventually they must be
-	  removed, but we are still testing the Naming Service.
-
-Tue Nov 18 02:17:24 1997  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-	* TAO version 0.0.33, released Tue Nov 18 02:17:24 1997.
-
-Tue Nov 18 02:03:22 1997  Sergio Flores  <sergio@tango.cs.wustl.edu>
-
-	* orbsvcs/tests/Logger/svr.cpp:
-	* orbsvcs/tests/Logger/clnt.cpp: This test example now uses the
- 	naming service in the server and client.  Also changed the code to
- 	have a default use in case the naming service is not available.
-
-	* tao/orbobj.cpp (resolve_name_service): Fixed a bug, dealing with
- 	closing the endpoint of communication for the response of the
- 	multicast mechanism.
-
-Tue Nov 18 01:37:42 1997  Aniruddha Gokhale  <gokhale@mambo.cs.wustl.edu>
-
-	* TAO_IDL/be/{be_operation.cpp,be_state_operation}.cpp: We now
- 	properly handle the declaration and assigning to the return value.
-
-	* TAO_IDL/be/be_state_argument.cpp: Removed a spurious ()
-	appearing after a function call.
-
-	* TAO_IDL/be/{be_structure,be_union}.cpp: Carlos had removed the
-	if !imported check in the member counting function, but it had
-	crept in again, maybe due to me. So this is fixed again.
-
-	* test/Cubit/TAO/IDL/svr.cpp: Removed the hack which was
-	separating command line arguments starting with O. We leave this
-	task to the newly added Arg_Shifter.
-
-	* tao.orbobj.cpp: In ORB_init, the call to
-	TAO_ORb_Core_instance->init needed a char ** argv and we were
-	passing a char * const* argv. So we cast this. g++ was giving this
-	error.
-
-	* TAO_IDL/be_include/be_codegen.h, TAO_IDL/be/be_codegen.cpp:
-	Added 5 new states for code generation. All of these for
-	operations and arguments.
-
-	* TAO_IDL/be/be_argument.cpp: Made all methods uniform so that the
-	state will be set by the corresponding be_operation method. Thus
-	the be_operation method will vary the state but still invoke the
-	same be_argument method.
-
-	* TAO_IDL/be/be_enum.cpp, be_structure.cpp, be_union.cpp, be_field.cpp,
-	be_sequence.cpp: Some reformatting, removed unused variables.
-
-	* TAO_IDL/be/be_scope.cpp: Changes include adding ACE_ERROR_RETURN
-	with file name, line number capability. In addition, we were not
-	testing for return status of the various gen methods called.
-
-	* Most important changes in these files:
-
-	TAO_IDL/be/{be_operation,be_state_argument,be_state_operation}.cpp:
-
-	Large scale changes that include a uniform way to invoke methods
-	of the be_argument class from the be_operation methods. Added the
-	5 new states. Added proper handling of _out parameters in stubs
-	and skeletons.
-
-Mon Nov 17 20:05:40 1997  Chris Cleeland  <cleeland@cs.wustl.edu>
-
-	* tests/Cubit/TAO/IDL_Cubit/clnt.cpp: Cleaned up lots of places
- 	where the allocated stuff wasn't being deallocated.
-
-	* tao/request.cpp: Insured that the CTOR adds a reference for the
- 	dynamically-allocated NamedValue.
-
-	* tao/orb_core.cpp: Freed the faked service configurator argv.
-
-	* tao/iiopobj.h: Removed anachronistic comments.
-
-	* tao/iiopobj.{i,cpp}: Changed allocation of IIOP::Profile.host to use
- 	new/delete rather than strdup/free b/c the decoder, which is
- 	generic, must use new to allocate the space.  Thus, the strdup had
- 	to go.  Purify now happier.
-
-	* tao/cdr.cpp: Added call to memset bracketed by #if
- 	defined(TAO_PURIFY) in order to appease the purify gods.
-
-Mon Nov 17 20:05:16 1997  Seth Benjamin Widoff  <sbw1@waltz.cs.wustl.edu>
-
-	* arg_shifter.cpp:
-	fixed a bug where in new, gcc used the address of an integer
-	reference rather than its value. weird.
-
-	* tao/orb_core.cpp:
-	  Modified the init routine to "consume" command line arguments it
-	  recognizes by placing them in the rear of argv, and adjusting
-	  argc. It uses the Arg_Shifter class to accomplish this.
-
-	* tao/arg_shifter.h:
-	* tao/arg_shifter.cpp:
-	  The Arg_Shifter class is an iterator that, as it iterates over
-	  argv, places consumed arguments at the end of the vector,
-	  ignored ones in their original order at the beginning of the
-	  vector, and adjusts argc to hide the consumed arguments.
-
-Mon Nov 17 18:40:49 1997  Carlos O'Ryan  <coryan@macarena.cs.wustl.edu>
-
-	* tao/orb_core.i:
-	  Some data was not initialized when used from a thread different
-	  than the one doing ORB_init (even though we choose a global ORB
-	  in the svc.conf file). Chris found a fix for this. The affected
-	  methods are reactor(), thr_mgr(), connector() and acceptor().
-
-	* TAO_IDL/be/be_sequence.cpp:
-	  length was not working if the value was <= than the maximum.
-
-	* orbsvcs/lib/CosNamingC.cpp:
-	* orbsvcs/lib/RtecEventChannelAdminC.cpp:
-	* orbsvcs/lib/RtecEventCommC.cpp:
-	* orbsvcs/lib/RtecSchedulerC.cpp:
-	* orbsvcs/lib/RtecSchedulerS.cpp:
-	  Fixed the length() problem by hand, even though the new IDL
-	  compiler should do it right.
-
-Mon Nov 17 11:52:54 1997  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-	* TAO_IDL/be/be_codegen.cpp (server_header),
-	  TAO_IDL/util/utl_global.cpp (be_change_idl_file_extension):
- 	  Updated several methods to ensure const correctness for the
- 	  updated ACE_OS::str*() methods.  Thanks to David Levine for
- 	  reporting this.
-
-Mon Nov 17 02:40:14 1997  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-	* TAO version 0.0.32, released Mon Nov 17 02:40:14 1997.
-
-Mon Nov 17 01:48:17 1997  Carlos O'Ryan  <coryan@macarena.cs.wustl.edu>
-
-	* TAO_IDL/be/be_scope.cpp:
-	  TypeCode generation was failing for imported members.
-
-	* TAO_IDL/be/be_structure.cpp:
-	  Member count must include all members, imported or not.
-
-	* TAO_IDL/be/be_typedef.cpp:
-	  Added missing decr_indent() in the typecode generation which was
-	  making the generated code completely unreadable.
-
-	* orbsvcs/lib/RtecEventChannelAdmin.idl:
-	* orbsvcs/lib/RtecEventComm.idl:
-	  Removed the PullConsumer and PullSupplier classes, they are not
-	  supported.
-
-	* orbsvcs/lib/CosNamingC.cpp:
-	* orbsvcs/lib/CosNamingS.cpp:
-	* orbsvcs/lib/RtecEventChannelAdminC.cpp:
-	* orbsvcs/lib/RtecEventChannelAdminC.h:
-	* orbsvcs/lib/RtecEventChannelAdminC.i:
-	* orbsvcs/lib/RtecEventChannelAdminS.cpp:
-	* orbsvcs/lib/RtecEventChannelAdminS.h:
-	* orbsvcs/lib/RtecEventChannelAdminS.i:
-	* orbsvcs/lib/RtecEventCommC.cpp:
-	* orbsvcs/lib/RtecEventCommC.h:
-	* orbsvcs/lib/RtecEventCommC.i:
-	* orbsvcs/lib/RtecEventCommS.cpp:
-	* orbsvcs/lib/RtecEventCommS.h:
-	* orbsvcs/lib/RtecEventCommS.i:
-	* orbsvcs/lib/RtecSchedulerC.cpp:
-	* orbsvcs/lib/RtecSchedulerS.cpp:
-	  New version of the generated files, this last version is almost
-	  making in it, but still needs hand crafting.
-
-	* TAO_IDL/be/be_array.cpp:
-	* TAO_IDL/be/be_sequence.cpp:
-	* TAO_IDL/be/be_typedef.cpp:
-	  Fixed buggy TypeCode lenght computation, it was only taking into
-	  account the tc_encap_len() for the base type but it should use
-	  the full tc_size().
-
-	* tao/encode.cpp:
-	  Object references *must* be passed a pointer to Object_ptr in
-	  the marshalling code.
-
-	* TAO_IDL/be/be_operation.cpp:
-	* TAO_IDL/be/be_state_operation.cpp:
-	  Fixed generated code for Object references as return values. It
-	  allocates the Object_ptr in the heap, stores the result there
-	  and creates an Any for it.
-
-Sun Nov 16 23:30:26 1997  Sergio Flores  <sergio@tango.cs.wustl.edu>
-
-	* orbsvcs/tests/Logger/svr.cpp (main):
-	Changed the code to use the resolve_initial_references ()
-	interface to get the object refrence to the naming service.
-
-	* orbsvcs/tests/Logger/clnt.cpp (main): Now uses the
- 	resolve_initial_references() to get the naming service object
- 	reference, to get the logger factory object reference.
-
-	* orbsvcs/bin/Naming_Service/svr.cpp (main):
-	* orbsvcs/bin/Naming_Service/svr.h:
-	Added code to respond to multicast requests for the IOR.
-
-	Added code to respond to multicast requests for the IOR.
-
-	* tests/Cubit/TAO/IDL_Cubit/clnt.cpp: Fixed some formatting
- 	problems dealing with the precision of the output.
-
-Sun Nov 16 14:48:00 1997    <nw1@COYOTE>
-
-	* test/Cubit/TAO/IDL_Cubit/{server,client}.dsp: Updated library
- 	  path for release version.
-
-	* TAO_IDL/TAO_IDL.mak:
-	* TAO_IDL/tao_idl.dsp: Added new files (be_state_*.cpp) into
- 	  project file.
-
-Sun Nov 16 12:56:24 1997  Aniruddha Gokhale  <gokhale@mambo.cs.wustl.edu>
-
-	* TAO_IDL/be/be_interface.cpp: The _is_a_skel method's signature
-	had an Object_ptr obj parameter which was unused. Instead of
-	generating the ACE_UNUSED_ARG (obj) line of code, we use /* obj */
-	in the signature.
-
-Sun Nov 16 05:51:38 1997  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-	* TAO version 0.0.31, released Sun Nov 16 05:51:38 1997.
-
-Sun Nov 16 00:22:04 1997  Carlos O'Ryan  <coryan@macarena.cs.wustl.edu>
-
-	* tests/Cubit/TAO/IDL_Cubit/clnt.cpp:
-	  Fixed output for structs and union test.
-
-	* tao/iiopobj.cpp:
-	  If the user provides no key for an object we generate one, based
-	  on the object address.
-
-	* TAO_IDL/be/be_sequence.cpp:
-	  The length() method should get the maximum if reallocation
-	  occurs.
-
-	* tao/orb_core.cpp:
-	* tao/orbobj.cpp:
-	* tao/orbobj.h:
-	* tao/params.cpp:
-	* tao/params.h:
-	  Added new options to the ORB (-ORBeventserviceior,
-	  -ORBscheduleserviceior), this should go away once the Naming
-	  Service works properly, but are needed now to locate this
-	  services.
-
-	* orbsvcs/lib/Makefile:
-	  Added several small classes that help when using the Scheduling
-	  and/or the Event Service.
-
-	* orbsvcs/lib/Scheduler_Factory.cpp:
-	* orbsvcs/lib/Scheduler_Factory.h:
-	* orbsvcs/lib/Scheduler_Factory.i:
-	  Encapsulate the construction and configuration of the Scheduling
-	  Service.
-
-	* orbsvcs/lib/Runtime_Scheduler.cpp:
-	* orbsvcs/lib/Runtime_Scheduler.h:
-	* orbsvcs/lib/Runtime_Scheduler.i:
-	  Implement a simple, but fast, Scheduling Service based on a
-	  precomputed scheduling.
-
-	* orbsvcs/lib/Event_Utilities.cpp:
-	* orbsvcs/lib/Event_Utilities.h:
-	* orbsvcs/lib/Event_Utilities.i:
-	  Simplify the creation of QoS structures for the Event Service.
-
-	* orbsvcs/lib/Scheduler_Utilities.cpp:
-	* orbsvcs/lib/Scheduler_Utilities.h:
-	* orbsvcs/lib/Scheduler_Utilities.i:
-	  Simplify manipulation of the RT_Infos for the Scheduling
-	  Service.
-
-	* orbsvcs/lib/Channel_Clients.cpp:
-	* orbsvcs/lib/Channel_Clients.h:
-	* orbsvcs/lib/Channel_Clients_T.cpp:
-	* orbsvcs/lib/Channel_Clients_T.h:
-	  Helpers to adapt PushSuppliers and PushConsumers.
-
-	* orbsvcs/lib/CosNamingC.cpp:
-	* orbsvcs/lib/CosNamingC.h:
-	* orbsvcs/lib/CosNamingC.i:
-	* orbsvcs/lib/CosNamingS.cpp:
-	* orbsvcs/lib/RtecEventChannelAdminC.cpp:
-	* orbsvcs/lib/RtecEventChannelAdminC.h:
-	* orbsvcs/lib/RtecEventChannelAdminC.i:
-	* orbsvcs/lib/RtecEventChannelAdminS.cpp:
-	* orbsvcs/lib/RtecEventChannelAdminS.h:
-	* orbsvcs/lib/RtecEventComm.idl:
-	* orbsvcs/lib/RtecEventCommC.cpp:
-	* orbsvcs/lib/RtecEventCommC.h:
-	* orbsvcs/lib/RtecEventCommC.i:
-	* orbsvcs/lib/RtecEventCommS.cpp:
-	* orbsvcs/lib/RtecSchedulerC.cpp:
-	* orbsvcs/lib/RtecSchedulerC.h:
-	* orbsvcs/lib/RtecSchedulerC.i:
-	* orbsvcs/lib/RtecSchedulerS.cpp:
-	  This files were generated by the IDL compiler and don't need any
-	  hand crafting (so far). I still maintain them in CVS because the
-	  compiler is not stable enough.
-
-	* orbsvcs/bin/Naming_Service/Makefile:
-	  Removed spurious call to rm.
-
-	* orbsvcs/lib/RtecEventComm.idl:
-	  Removed the (already commented out) include of "orb.idl".
-
-Sat Nov 15 21:38:48 1997  Carlos O'Ryan  <coryan@macarena.cs.wustl.edu>
-
-	* TAO_IDL/be/be_sequence.cpp:
-	  The generated length() method will reallocate the sequences
-	  now.
-
-	* TAO_IDL/be/be_constant.cpp:
-	  It was initializing nested constants in the client header file,
-	  Andy told me how to fix it.
-
-	* TAO_IDL/be/be_operation.cpp:
-	  Fixed typo in generated code:
-	  s/_tao_enviroment/_tao_environment/
-
-	* TAO_IDL/be/be_field.cpp:
-	  Only generate the inline members of the field type if the type
-	  is not imported.
-
-	* TAO_IDL/driver/drv_fork.cpp:
-	* TAO_IDL/driver/drv_preproc.cpp:
-	  Removed old code to support plain fork (without ACE).
-	  Also removed temporary files *unless* we are on Win32, were
-	  removing the file and keeping it open fails.
-
-	* TAO_IDL/include/idl_global.h:
-	* TAO_IDL/util/utl_global.cpp:
-	  Added routines to obtain the generated names of any IDL file,
-	  not only the one we are processing.
-
-	* TAO_IDL/be/be_codegen.cpp:
-	  The compiler now generate all the required include directives
-	  when the IDL file contains some.
-
-	* tao/params.cpp:
-	  Initialize name_service_port_ to zero in the constructor.
-
-Sat Nov 15 21:20:01 1997  Aniruddha Gokhale  <gokhale@mambo.cs.wustl.edu>
-
-	* TAO_IDL/be/be_string.cpp: The typecode info was getting
-	generated in a wrong file because of setting the worng file to
-	generate it in.
-
-	* TAO_IDL/be/be_typedef.cpp: Some extra indentation was getting
-	generated for typecodes. This is fixed.
-
-	* TAO_IDL/be/be_state_argument.cpp: For parameters of type
-	ObjRefs, we were not passing the address of the object_ptr to the
-	Any constructor. This would have caused seg faults when
-	decoding. This is now fixed.
-
-	* TAO_IDL/be: Split be_state.cpp into a number of files based on
-	the IDL types, e.g., be_state_struct.cpp, be_state_union.cpp, ...
-
-	* TAO_IDL/be/be_sequence.cpp: Name creation now uses a uniform
-	strategy rather than typedefed sequences assuming the name of the
-	typedef and anonymous sequences getting a generated name. This was
-	required to eliminate a number of multiple declarations errors.
-
-	* TAO_IDL/be/be_state_union.cpp: Since C++ does not allow
-	instances of classes to appear inside a union declaration, the
-	private data members for data members of type objref, strings,
-	sequences, and anys must be pointers. This changes code in the
-	accessor methods defined in the generated *.i files for the union.
-
-	* TAO_IDL/be/be_operation.cpp: There were some instances of the
-	incorrectly spelled _tao_enviroment remaining which have been
-	corrected.
-
-	* TAO/tao/managed_types.{h,i,cpp}: Added these 3 files that define
-	the self managed data type similar to a String_var. These self
-	managed data types are required for struct/union members that are
-	strings or obj references, as well as for element types of
-	sequences.
-
-	* TAO_IDL/be/be_typedef.cpp: Added code to generate the typecode
-	structure for typedefs. These use the tk_alias kind field.
-
-	* TAO_IDL/be/{be_union,be_state}.cpp: Improvements to union with
-	string members. However, this is still incomplete and will be
-	done by the next couple of commits.
-
-	* tests/Cubit/TAO/IDL_Cubit/cubit_i.cpp: Removed the ACE_DEBUG
-	stmt for printing object keys.
-
-Sat Nov 15 18:03:39 1997  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-	* tests/Cubit/TAO/IDL_Cubit/cubit_i.cpp (make_cubit): We don't
- 	  need to free up the object key since it's no longer allocated
- 	  dynamically.
-
-	* tao/object: Changed the _get_name() method to return const char
- 	  * to be consistent with the iiopobj change below.
-
-	* tao/iiopobj: Fixed _get_name() so that it doesn't allocate
- 	  memory by having it return const char * and just return the
- 	  pointer.  This should fix some subtle problems.
-
-Sat Nov 15 12:19:55 1997  Nanbor Wang  <nw1@merengue.cs.wustl.edu>
-
-	* TAO_IDL/be/be_codegen.cpp: Changed two loop counters from type
-	  int to type size_t.
-
-Sat Nov 15 01:33:08 1997  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-	* TAO version 0.0.30, released Sat Nov 15 01:33:08 1997.
-
-Fri Nov 14 19:45:01 1997  Sergio Flores  <sergio@polka.cs.wustl.edu>
-
-	* tests/Cubit/TAO/DII_Cubit/clnt.cpp :
-	* tests/Cubit/TAO/DII_Cubit/clnt.h :
-	* tests/Cubit/TAO/IDL_Cubit/clnt.cpp :
-	- Fixed the difference in latency problem from DII and IDL.
-	- Changed the DII_Cubit client interface to be similar to IDL, now
- 	you can specify hostname and port number, instead of the IOR.
-
-Fri Nov 14 17:48:14 1997  Carlos O'Ryan  <coryan@macarena.cs.wustl.edu>
-
-	* orbsvcs/bin/Naming_Service/CosNaming_i.cpp:
-	  Fixed problem with the new Environment parameter for _narrow ().
-
-	* orbsvcs/bin/Naming_Service/Makefile:
-	  No need to include rules.bin.GNU.
-
-Fri Nov 14 17:08:20 1997  Douglas C. Schmidt  <schmidt@flamenco.cs.wustl.edu>
-
-	* tao/iiopobj.cpp: Make sure that host is set to 0 in all the
- 	  constructors.
-
-	* tao/iiopobj.cpp (Profile): Modified the code to consistently
-	  store a NUL at the end of each object key string.
-
-Fri Nov 14 17:10:20 1997  Sumedh Mungee  <sumedh@lindy.cs.wustl.edu>
-
-	* cubit_i.cpp: Changed &d to %d in ACE_ERROR
-
-Fri Nov 14 16:42:21 1997  Chris Cleeland  <cleeland@tango.cs.wustl.edu>
-
-	* tao/tao_internals.cpp (fake_service_entries_i): Made sure that
- 	the resource factory faked entry had the proper number of
- 	arguments specified.
-
-Fri Nov 14 14:11:47 1997  Carlos O'Ryan  <coryan@macarena.cs.wustl.edu>
-
-	* orbsvcs/lib/Makefile:
-	  Added new library that contains the stubs and skeletons for the
-	  TAO services.
-
-	* orbsvcs/Makefile:
-	* orbsvcs/bin/Makefile:
-	* orbsvcs/tests/Makefile:
-	  Added top level Makefiles.
-
-	* orbsvcs/bin/Naming_Service/Makefile:
-	* orbsvcs/bin/Naming_Service/svr.cpp:
-	* orbsvcs/bin/Naming_Service/svc.conf:
-	* orbsvcs/bin/Naming_Service/NS_CosNaming.h:
-	* orbsvcs/bin/Naming_Service/NS_CosNaming.cpp:
-	* orbsvcs/bin/Naming_Service/CosNaming_i.h:
-	* orbsvcs/bin/Naming_Service/CosNaming_i.cpp:
-	  Moved the naming service implementation from the TAO
-	  subdirectory to this place.
-
-	* orbsvcs/tests/Simple_Naming/Makefile:
-	* orbsvcs/tests/Simple_Naming/svc.conf:
-	* orbsvcs/tests/Simple_Naming/clnt.h:
-	* orbsvcs/tests/Simple_Naming/clnt.cpp:
-	  A simple test program for the naming service, it simply tries to
-	  locate it and connect to it.
-
-	* orbsvcs/bin/Naming_Service/Orbix/Client.cpp:
-	* orbsvcs/bin/Naming_Service/Orbix/CosNaming.idl:
-	* orbsvcs/bin/Naming_Service/Orbix/Makefile:
-	* orbsvcs/bin/Naming_Service/Orbix/NS_CosNaming.cpp:
-	* orbsvcs/bin/Naming_Service/Orbix/NS_CosNaming.h:
-	* orbsvcs/bin/Naming_Service/Orbix/logger-main.cpp:
-	* orbsvcs/bin/Naming_Service/Orbix/logger.idl:
-	* orbsvcs/bin/Naming_Service/Orbix/logger_tie.cpp:
-	* orbsvcs/bin/Naming_Service/Orbix/logger_tie.h:
-	* orbsvcs/bin/Naming_Service/Orbix/server-main.cpp:
-	* orbsvcs/bin/Naming_Service/TAO/CosNaming.idl:
-	* orbsvcs/bin/Naming_Service/TAO/CosNaming_i.cpp:
-	* orbsvcs/bin/Naming_Service/TAO/CosNaming_i.h:
-	* orbsvcs/bin/Naming_Service/TAO/Makefile:
-	* orbsvcs/bin/Naming_Service/TAO/NS_CosNaming.cpp:
-	* orbsvcs/bin/Naming_Service/TAO/NS_CosNaming.h:
-	* orbsvcs/bin/Naming_Service/TAO/clnt.cpp:
-	* orbsvcs/bin/Naming_Service/TAO/clnt.h:
-	* orbsvcs/bin/Naming_Service/TAO/svc.conf:
-	* orbsvcs/bin/Naming_Service/TAO/svr.cpp:
-	  We will only maintain the TAO version for the naming service, no
-	  need to keep this subdirectories.
-
-	* orbsvcs/lib/RtecScheduler.idl:
-	  The Real Time Scheduling Service. This module declares the QoS
-	  structures (RT_Info) and the interface for the global scheduler.
-
-	* orbsvcs/lib/RtecEventComm.idl:
-	  Part of the Real Time Event Services interface, this file
-	  contains the Event type, the basic interfaces for consumers and
-	  suppliers and some exceptions.
-
-	* orbsvcs/lib/RtecEventChannelAdmin.idl:
-	  Part of the Real Time Event Services interface, in particular
-	  this module defines the event channel, the proxy interfaces and
-	  the QoS aware subscription and registration interfaces.
-
-	* orbsvcs/lib/Event_Service_Constants.h:
-	  The Event Service implementation and the Scheduling Service
-	  implementation require this file, which defines some constants
-	  and static limits. For lack of a better place I putted it here.
-
-	* orbsvcs/lib/CosNaming.idl:
-	  Moved the IDL file to the library, otherwise it cannot be used
-	  by clients.
-
-	* tao/corba.h:
-	  Added some macros that support portable exception handling,
-	  either through C++ exceptions or the CORBA::Enviroment
-	  parameter.
-
-	* orbsvcs/lib/RtecEventCommC.h:
-	* orbsvcs/lib/RtecEventCommC.i:
-	* orbsvcs/lib/RtecEventCommC.cpp:
-	* orbsvcs/lib/RtecEventCommS.h:
-	* orbsvcs/lib/RtecEventCommS.i:
-	* orbsvcs/lib/RtecEventCommS.cpp:
-	* orbsvcs/lib/RtecEventChannelAdminS.h:
-	* orbsvcs/lib/RtecEventChannelAdminS.i:
-	* orbsvcs/lib/RtecEventChannelAdminS.cpp:
-	* orbsvcs/lib/RtecEventChannelAdminC.h:
-	* orbsvcs/lib/RtecEventChannelAdminC.i:
-	* orbsvcs/lib/RtecEventChannelAdminC.cpp:
-	* orbsvcs/lib/CosNamingC.h:
-	* orbsvcs/lib/CosNamingC.i:
-	* orbsvcs/lib/CosNamingC.cpp:
-	* orbsvcs/lib/CosNamingS.h:
-	* orbsvcs/lib/CosNamingS.i:
-	* orbsvcs/lib/CosNamingS.cpp:
-	  I had to modify the IDL compiler generated files, I will keep
-	  the files in CVS until we no longer need to modify it.
-
-Fri Nov 14 13:02:52 1997  Aniruddha Gokhale  <gokhale@mambo.cs.wustl.edu>
-
-	* tao/decode.cpp: TAO_Marshal_Objref::decode line 615 which tried
-	to set the underlying object_addr was invoking an incorrect inline
-	function because of lack of passing an argument to the object_addr
-	() method. Specifically, due to the lask of argment, the
-	"retrieve" method was getting called whereas we wanted the "set"
-	method. All we do is pass a 0 (NUL) argument. This suffices
-	because we have already decoded the host and port number. So all
-	information is with us to set the server address.
-
-Fri Nov 14 00:29:09 1997  David L. Levine  <levine@cs.wustl.edu>
-
-        * TAO_IDL/fe/lex.yy.cpp: set RCS -ko option so that the Id keyword
-          won't get expanded on checkout.  That was causing CVS to think
-          that a merge was needed.
-
-Thu Nov 13 19:11:36 1997  Douglas C. Schmidt  <schmidt@flamenco.cs.wustl.edu>
-
-	* tao/giop.cpp (start): Updated the code to use the new
-	  object_addr() style.
-
-	* tao/iiopobj: Added many fixes to the Profile code to fix nasty
- 	  bugs.  Also, renamed {get|set}_object_addr() to simply
- 	  object_addr(), which is the correct style.
-
-	* tao/iiopobj.h: Replaced the use of "localhost" with
- 	   ACE_DEFAULT_SERVER_HOST.  This is necessary to support broken
- 	   platforms like MVS that don't support "localhost"...
-
-	* TAO/tests/Cubit/TAO/IDL_Cubit/svr.cpp (parse_args): Assume for
- 	  the moment that any arguments starting with `-O' are `-ORB' or
- 	  `-OA'.  This should be fixed by having the ORB_init() and
- 	  POA_init() methods consume their argv/argc's.
-
-Thu Nov 13 16:18:32 1997    <nw1@CHA-CHA>
-
-	* tao/orb_core.h:
-	* tao/default_client.h:
-	* tao/default_server.h:  Changed ACE_SVC_FACTORY_DECLARE to
-	  ACE_FACTORY_DECLARE.
-
-	* tao/orb_core.cpp:
-	* tao/default_client.cpp:
-	* tao/default_server.cpp:  Changed ACE_SVC_FACTORY_DEFINE to
-	  ACE_FACTORY_DEFINE.
-
-	* tao/corba.h: Added include "tao/tao_internals.h".
-
-	* tao/tao_internals.h: Disable header file inclusions.  I've put
- 	  this file into corba.h.
-
-	* tao/tao_internals.cpp: Changed to use "tao/corba.h".
-
-	* tao/TAO.mak:
-	* tao/TAO.dsp:  Replaced ACE_BUILD_SVC_DLL with TAO_BUILD_DLL.
-
-	* tao/corba.h: Added TAO_Export definition.
-
-	* tao/*.h:  Replaced ACE_Svc_Export with TAO_Export.  Added
-	  default definition to build TAO DLL on Win32.
-
-Thu Nov 13 01:47:02 1997  Chris Cleeland  <cleeland@macarena.cs.wustl.edu>
-
-	* tao/iiopobj.cpp (IIOP_Object): Removed the duplicate CTORs that
- 	I'd accidentally included here during the prior merge/commit
- 	phase.
-
-Wed Nov 12 23:59:29 1997    <nw1@COYOTE>
-
-	* TAO/TAO_IDL/tao_idl.dsp: Changed to generate multithreaded codes
- 	  on NT.
-
-	* TAO/TAO_IDL/be/be_scope.cpp:
-	* TAO/TAO_IDL/fe/idl.ll:
-	* TAO/TAO_IDL/fe/lex.yy.cpp:
-	* TAO/TAO_IDL/fe/y.tab.cpp:
-	* TAO/TAO_IDL/include/ast_decl.h:
-	* TAO/TAO_IDL/include/idl.h:
-	* TAO/TAO_IDL/include/utl_identifier.h:
-	* TAO/TAO_IDL/include/utl_idlist.h:
-	* TAO/TAO_IDL/include/utl_tmpl/utl_decllist.h:
-	* TAO/TAO_IDL/include/utl_tmpl/utl_exceptlist.h:
-	* TAO/TAO_IDL/include/utl_tmpl/utl_exprlist.h:
-	* TAO/TAO_IDL/include/utl_tmpl/utl_idlist.h:
-	* TAO/TAO_IDL/include/utl_tmpl/utl_labellist.h:
-	* TAO/TAO_IDL/include/utl_tmpl/utl_namelist.h:
-	* TAO/TAO_IDL/include/utl_tmpl/utl_strlist.h:  Changed to use
-	  "ace/stdcpp.h" and removed inclusion of header files that
-	  conflict with standard C++ library.
-
-Wed Nov 12 18:59:20 1997  Chris Cleeland  <cleeland@cs.wustl.edu>
-
-	* tao/iioporb.cpp: Added call to set object address in Profile.
-
-	* tao/iiopobj.cpp: Corrected code in the copy CTOR where the host
- 	was being copied over the old host.  This could prove bad if the
- 	amount of space allocated previously was too small for the
- 	hostname we're copying in.  Ideally we'd use something smarter
- 	than this, but hopefully (if you read the comment below) this will
- 	go away soon.
-
-	* tao/iiopobj.*: Added an ACE_INET_Addr to IIOP::Profile so that
- 	we only need to do a gethostbyname() once.  After that we can used
- 	the cached information.  I'd really like to remove the host/port
- 	as explicit public data members, but for now we take one step at a
- 	time.
-
-	* tao/giop.cpp: Use the IIOP::Profile object address when making a
- 	connection.
-
-	* tao/decode.cpp: Added code to set the object address in the
- 	Profile when an object ref is decoded.
-
-	* tao/debug.h: Removed old questions in comments.
-
-	* tao/connect.h: Added some documentation.
-
-Wed Nov 12 17:41:02 1997  Aniruddha Gokhale  <gokhale@mambo.cs.wustl.edu>
-
-	* tao/iiopobj.cpp: I had forgotten to update the return type of
-	_get_name in iiopobj.cpp to "char *" instead of "const char *".
-
-Wed Nov 12 14:28:48 1997  Aniruddha Gokhale  <gokhale@mambo.cs.wustl.edu>
-
-	* TAO_IDL/ast/ast_union.cpp: Fixed a problem where the front end
-	would not give any error if there were duplicate case labels. This
-	was happening since an overloaded == operator taking an
-	AST_Expression* was not getting called. Instead a simple
-	comparison of addresses was taking place. We now use the "compare"
-	method defined on the AST_Expression class to fix this problem.
-
-	* TAO_IDL/be/be_interface.cpp: Removed some code under #if 0. The
-	noteworthy change, however, has to do with code that gets
-	generated for the "_is_a_skel". Some compilers were issuing a
-	warning saying "unused argument obj". Since we cannot change the
-	signature of the generated "_is_a_skel", we use the trick of
-	generatung ACE_UNUSED_ARG (obj); in the code. Some other
-	formatting changes made.
-
-	* TAO_IDL/be/be_operation.cpp: Some very minor changes so that the
-	generated code is properly indented.
-
-	* tao/{iiopobj,object,stub}.h, iiopobj.cpp: Changed the return
-	type of _get_name to return a heap-allocated "char *". In the
-	earlier case we were erroneously returning a pointer to local
-	array. This was a change I made a couple of days back to deal with
-	the fact that object keys are octet arrays and are not null
-	terminated. Now we take the object key and make a NULL terminated
-	copy in a heap allocated string. It is the caller's responsibility
-	to free this.
-
-	* tao/tests/Cubit/TAO/IDL_Cubit/cubit_i.cpp: Used string_free to
-	free the string returned by _get_name.
-
-	* tao/tests/Thruput/client.cpp: _narrow now uses the additional
-	env parameter.
-
-Wed Nov 12 09:22:47 1997  David L. Levine  <levine@cs.wustl.edu>
-
-        * tao/tao_internals.cpp (open_services): added ACE_UNUSED_ARGs
-          for argc and argv if TAO_PLATFORM_SVC_CONF_FILE_NOTSUP.
-
-        * TAO_IDL/Makefile: disabled clean and realclean targets on VxWorks,
-          so that they don't remove tao_idl from the host build tree.
-
-Tue Nov 11 23:50:06 1997  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-	* TAO version 0.0.29, released Tue Nov 11 23:50:06 1997.
-
-Tue Nov 11 20:45:26 1997  Douglas C. Schmidt  <schmidt@macarena.cs.wustl.edu>
-
-	* tao/default_server.cpp (parse_args): Replaced NULL with 0.
-
-	* tao/corbacom.h: Fixed the macro for TAO_SYSTEM_EXCEPTION so
- 	  compilers don't whine about extra semi-colons.
-
-	* tao/iioporb.cpp (iiop_string_to_object): Added a cast of (char
- 	  *) 0 to disambiguate one of the methods.
-
-	* tao/iiopobj.cpp: Moved the constructors and destructors of
- 	  IIOP_Object from the *.i file to the *.cpp file and made them
- 	  non-inline.
-
-Tue Nov 11 18:19:16 1997  Aniruddha Gokhale  <gokhale@mambo.cs.wustl.edu>
-
-	* tao/iiopobj.{h,cpp}: Added two new constructors one of which is
-	useful for the _bind call generated by the IDL compiler. This
-	constructor takes the host name, port number, and key value
-	thereby avoiding the costly string2object call inside the _bind
-	method. The second constructor is used to reduce the amount of
-	code that gets generated to set a IIOP_Object in the constructor
-	of the skeleton class.
-
-	Additionally, these constructors use the REENTRANT get_host_name
-	method of the INET_Addr class to retrieve the host name.
-
-	* tao/iiopobj.h,stub.h: Modified the signature of _get_name to
-	return a const char*. So users will have to copy this value.
-
-	* tao/iiopobj.cpp: The method _get_name uses an internal character
-	array in which the object key is copied. This is necessary so that
-	we can NULL terminate the opaque key and return it to the user.
-
-	* tao/orbconf.h,cdr.h: Commented (and will eventually remove) the
-	defintion of MY_BYTE_SEX from cdr.h. Instead, we now use the macro
-	TAO_ENCAP_BYTE_ORDER which gets defined in orbconf.h. The files
-	affected due to this renaming are:
-
-	tao/{iioporb.cpp, giop.cpp, except.cpp, cdr.cpp, encode.cpp,
-	interp.cpp, tc_const.cpp}
-
-	The following files in the IDL compiler source were affected since
-	they had to generate TAO_ENCAP_BYTE_ORDER instead of MY_BYTE_SEX.
-	TAO_IDL/be/{be_array,be_enum,be_interface,be_sequence,be_structure,
-		be_union}.cpp
-
-	* tao/{typecode,decode}.cpp: some reformatting, indentation.
-
-	* TAO_IDL/be/be_interface.cpp: code generated for _bind uses the
-	newly added constructor to class IIOP_Object.
-
-	* TAO_IDL/be/{be_interface.be_state}.cpp: Code generated for
-	_narrow now takes an additional CORBA::Environment parameter.
-
-	* tests/Cubit/TAO/IDL_Cubit: cubit_i.cpp - in the method
-	make_cubit, we make a copy of the string returned by _get_name and
-	then free that memory.
-
-	clnt.cpp: The tests for unions have been uncommented. The reason
-	they were not working and resulting in seg fault was that methods
-	of the cubit interface were being invoked on the factory object.
-
-Tue Nov 11 10:07:04 1997  David L. Levine  <levine@cs.wustl.edu>
-
-        * tests/Cubit/TAO/DII_Cubit/Makefile: added missing $ before (VAR)
-          in VBIN definition.
-
-        * tao/orbconf.h: added __i386 to TAO_WORDS_BIGENDIAN check,
-          because that's what g++/VxWorks uses.  Also added __alpha
-          to little endian CPUs.
-
-        * tao/orb_core.i: fixed preprocessor test for using the
-          ACE_Hash_Addr<ACE_INET_Addr>::hash_i specialization.
-
-Tue Nov 11 04:22:44 1997  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-	* TAO version 0.0.28, released Tue Nov 11 04:22:44 1997.
-
-Tue Nov 11 01:16:07 1997  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-	* tao/orbobj.cpp (resolve_name_service): Reformatted the
-	  multicast Name Service locator just a bit.
-
-	* tao/orbconf.h: Started putting a more sane way of automatically
- 	  determining the size of various datatypes into TAO.
-
-Tue Nov 11 00:36:39 1997  Sergio Flores  <sergio@macarena.cs.wustl.edu>
-
-	* orbsvcs/bin/Logger/ior_multicast.h:
-	* orbsvcs/bin/Logger/ior_multicast.cpp:
-	* orbsvcs/bin/Logger/clnt.cpp:
-	* orbsvcs/bin/Logger/clnt.cpp:
-	* orbsvcs/bin/Logger/svr.cpp:
-	* orbsvcs/bin/Logger/Makefile:
-	Added multicast resolution of the logger service example.
-
-Tue Nov 11 00:36:39 1997  Sergio Flores  <sergio@macarena.cs.wustl.edu>
-
-	* tao/orbobj.cpp (resolve_name_service): changed macro for default
- 	multicast port.
-	- Added support for multicast mechanism to resolve the name
- 	service.
-
-	* tao/orbconf.h: Added some definitions for TAO's default
- 	multicast and reply port, and the default timeout value.
-
-Tue Nov 11 00:00:25 1997  David L. Levine  <levine@cs.wustl.edu>
-
-        * tests/Cubit/TAO/IDL_Cubit/Makefile: removed MUNCHED because
-          it's no longer needed for g++/VxWorks.
-
-Mon Nov 10 22:02:42 1997  Douglas C. Schmidt  <schmidt@macarena.cs.wustl.edu>
-
-	* tao/interp.cpp (declare_entry): Moved TAO_ALIGNMENT_MAGIC_NUMBER
- 	  to orbconf.h instead of burying it in interp.cpp.
-
-	* tao/corbacom.h: Rather than trying to guess what the size of
- 	  wchar_t, let's just use what's in ACE.
-
-Mon Nov 10 19:26:03 1997  Sumedh Mungee  <sumedh@lindy.cs.wustl.edu>
-
-	* tao/orbconf.h (SIZEOF_INT): FreeBSD and NetBSD have 4 byte
-	  ints. Thanks to Nanbor for pointing this out.
-
-	* tao/orbobj.cpp: Added template instantiation for ACE_Atomic_Op.
-
-	* tao/orbconf.h: NetBSD has a long double of size 12, as does
-	  FreeBSD. Fixed SIZEOF_LONG_DOUBLE to fix this.
-
-	* tests/Cubit/TAO/MT_Cubit/server/svr.cpp (main): Removed cerr's
- 	  and replaced them with ACE_ERROR_RETURN's and the like.
-
-Mon Nov 10 01:25:19 1997    <nw1@COYOTE>
-
-	* tao/giop.h: Added ACE_Svc_Export to classes
- 	  (TAO_GIOP_Request_Header, TAO_GIOP_Invocation, TAO_GIOP.)  Some
- 	  of them may not be necessary.
-
-Mon Nov 10 00:09:24 1997  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-	* TAO version 0.0.27, released Mon Nov 10 00:09:24 1997.
-
-Sun Nov 09 23:43:04 1997    <irfan@TWOSTEP>
-
-	* tao/corba.h: Reordered the inclusion of poa.i, giop.i,
- 	  iioporb.i, and iiopobj.i
-
-	* tao/tao_internals.cpp (close_services): Fixed typo.
-
-Sun Nov 09 23:32:58 1997  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-	* TAO version 0.0.26, released Sun Nov 09 23:32:58 1997.
-
-Sun Nov 09 22:04:12 1997    <irfan@TWOSTEP>
-
-	* tao/orbobj.cpp (ORB_init):
-	* tao/tao_internals.cpp (close_services):
-
-	  Changed ACE_Recursive_Thread_Mutex to ACE_SYNCH_RECURSIVE_MUTEX.
-
-Sun Nov  9 16:05:56 1997  Sergio Flores  <sergio@macarena.cs.wustl.edu>
-
-	* tests/Cubit/TAO/DII_Cubit/clnt.cpp: *
- 	tests/Cubit/TAO/DII_Cubit/clnt.h: Added clnt.h and restructured
- 	the code so it is similar to the IDL_Cubit example.  It doesn't,
- 	however, have the same options because the DII example uses an ior
- 	as input.
-
-	* tao/debug.cpp: Added dummy function to get rid of
- 	"'debug_stream' defined but not used" warning.
-
-Sun Nov  9 13:03:37 1997  Douglas C. Schmidt  <schmidt@macarena.cs.wustl.edu>
-
-	* tao: Removed the svc.conf.eg file since it was out of date.
-
-	* tao/svrrqst: Removed the #include for svrrqst.i since we don't
- 	  need any inline functions now.
-
-	* tao/tao_internals: Removed the #include for tao_internals.i
- 	  since we don't need any inline functions now.
-
-	* tao/varout.h: Cleaned up the programming style.
-
-	* tao: Continued to replace all fields with names _foo to foo_.
-
-	* tao/iioporb.cpp: Move the hex routines into ACE since they are
- 	  more general.
-
-	* tao/iioporb.cpp: Removed the inclusion of iioporb.i since it is
- 	  already included in corba.h.
-
-	* tao: Replaced all uses of ACE_Thread_Mutex with ACE_SYNCH_MUTEX
- 	  since this is portable...
-
-	* tao/iiopobj.cpp: Removed the inclusion of iiopobj.i since it is
- 	  already included in corba.h.
-
-	* tao/giop.cpp: Moved several large inlined methods into the *.cpp
- 	  file.
-
-	* tao/giop: Removed the enormous (and unused) incoming_message()
- 	  method.
-
-	* tao/giop.cpp: Removed the inclusion of giop.i since that is
- 	  handled in corba.h.
-
-	* tao: Removed the factories.i and factories.cpp files since they
- 	  don't seem to be used by anything.
-
-	* tao/{corbacom,except}.*: Changed SYSEX to the more politically
-	  correct TAO_SYSTEM_EXCEPTION.
-
-	* tao: Replaced all uses of wslen() and wscpy() with the
- 	  corresponding ACE_OS wide string functions.
-
-	* tao/orbconf.h: Removed all the HAVE_WIDEC_H stuff.  This should
-	  be handed by ACE.
-
-	* tao/connect.i: Removed the template instantiations since they
- 	  were commented out and didn't appear to be used.
-
-	* tao/connect.cpp: connect.i was already being included in corba.h,
-	  so don't include it again.
-
-	* tao/client_factory.cpp: Moved inlined constructor/destructor
-	  from the *.i file into the *.cpp file.
-
-	* tao/cdr.cpp (CDR): Moved a bunch of absurdly long inlined methods
-	  from the *.i file into the *.cpp file.
-
-	* tao/any.cpp (CORBA_Any): refcount_ has previously been
-	  uninitialized.  I gave it a value of 1.
-
-	* tao/any.cpp (CORBA_Any): Moved the initialization into the
- 	  base/member section, where it belongs.
-
-	* tao/any.h: Corrected a spelling mistake in an enumeral and
- 	  upper-cased the minor codes for exceptional returns.  Are these
- 	  actually used anywhere?
-
-	* tao: Removed all the unnecessary #if 0 ... #endif header files.
-  	  I don't know why there were still there.
-
-	* tao/except.h: Moved the #ifdef for minor and major into
- 	  orbconf.h, where they belong.
-
-	* tao/orbconf.h: Removed all the DECLARED_* macros since they
-	  no longer made sense once we've got ACE.
-
-	* tao/orbconf.h: Moved the TAO_DEFAULT* macros from ace/OS.h
-	  here, which is more where they belong.
-
-	* tao/default_server.cpp (TAO_Default_Server_Strategy_Factory):
-
-	* tao/{debug.h,orbconf.h}: Removed the DECLARED_STRERROR macro
- 	  since ACE handles this.
-
-Sun Nov 09 10:18:06 1997  David L. Levine  <levine@cs.wustl.edu>
-
-        * tao/connect.cpp: fixed RCS keyword (Id instead of id).
-
-Sat Nov 08 23:23:41 1997  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-	* TAO version 0.0.25, released Sat Nov 08 23:23:41 1997.
-
-Sat Nov  8 21:27:34 1997  Douglas C. Schmidt  <schmidt@macarena.cs.wustl.edu>
-
-	* tao/orb_core.cpp (init): Removed the code that always binded us
- 	  to our hostname.  This is unnecessary and makes it hard to use
- 	  other interfaces on the same host (such as localhost or some ATM
- 	  interface, etc.).  With this change (and the corresponding
- 	  changes to ACE_INET_Addr::get_host_name()), we can now bind to
- 	  INADDR_ANY.
-
-	* docs/releasenotes: Added Marina's documentation for the Trader
- 	  and cleaned up all the other entries to make them consistent.
-
-	* tao: Changed ProfileBody to Profile, TaggedProfile to
- 	  Tagged_Profile, ProfileSeq to Profile_Sequence, and ProfileId to
- 	  Profile_ID.
-
-	* tao/iiopobj.cpp (ProfileBody): For some god knows why reason,
- 	  the CORBA::String and CORBA::UShort parameters to ProfileBody
- 	  where being passed as references.  This is silly, so I changed
- 	  them to non-references.
-
-	* tao/connect.cpp (open),
-	  tao/poa.cpp (create): Replaced a use of
- 	  ACE_INET_Addr::get_host_name(void) with
- 	  ACE_INET_Addr::get_host_name (char *, size_t), which is
- 	  reentrant.
-
-	* tao/Makefile: Removed the DCFLAGS, OCFLAGS, and the TAO_ORB_CORE
- 	  target macros from the Makefile since they were unnecessary.
-  	  Thanks to Arturo for reporting this.
-
-	* tao/except.cpp (print_exception): Fixed a strange format code in
- 	  print_exception that was causing a seg fault.  What the heck
- 	  does %#lx mean?  Thanks to Mark L Boriack <mark@vtcibm4a> for
- 	  reporting this.
-
-Fri Nov 07 21:23:35 1997  Carlos O'Ryan  <coryan@MILONGA>
-
-	* tao/orb_core.h:
-	* tao/marshal.h:
-	* tao/corbacom.h:
-	  Added ACE_Svc_Export to some classes.
-
-	* tao/any.cpp:
-	  Removed delete after DEEP_FREE call, it crashes on NT and it
-	  should be unneeded.
-
-	* TAO_IDL/be/be_state.cpp (gen_code):
-	  When generating arguments for the server header don't use nested
-	  types. The fully qualified type name is needed, even on NT.
-
-	* TAO_IDL/be/be_exception.cpp:
-	  Added code to generate a default constructor.
-
-Fri Nov 07 17:26:49 1997    <nw1@CHA-CHA>
-
-	* tao/TAO.dsp:
-	* tests/Cubit/TAO/DII_Cubit/{client,server}.dsp:
-	* tests/Cubit/TAO/IDL_Cubit/{client,server}.dsp:
-	* tests/Cubit/TAO/MT_Cubit/client/client.dsp:  Removed
-	  ACE_HAS_TSS_ORB_CORE flag.
-
-	* tests/Cubit/TAO/MT_Cubit/client/client.cpp (main): Added a
- 	  return statement to satisfy MSVC.
-
-Fri Nov  7 18:20:46 1997  Chris Cleeland  <cleeland@cs.wustl.edu>
-
-	* tests/Cubit/TAO/MT_Cubit/{client,server}/svc.conf: Updated to
- 	reflect the proper combination of options to achieve the
- 	thread-per-ORB-per-rate concurrency model.
-
-	* docs/components.html: Updated to refer to seminal documentation
- 	referred to below.
-
-	* docs/configurations.html: Started some new documentation.  It's
- 	got a ways to go right now. :-)
-
-Fri Nov 07 15:42:45 1997  David L. Levine  <levine@cs.wustl.edu>
-
-        * tao/default_server.cpp (parse_args): check for 0 argv[curarg]
-          before calling strcmp on it.
-
-        * tests/Cubit/TAO/IDL_Cubit/Makefile: added MUNCHED for
-          VxWorks/g++.
-
-Fri Nov  7 10:30:59 1997  Chris Cleeland  <cleeland@cs.wustl.edu>
-
-	* tao/tao_internals.cpp (fake_service_entries_i): Updated faked
- 	service entries to include new Resource Factory.  This is the
- 	fallback for VxWorks.
-
-	* tao/orb_core.h (TAO_Resource_Factory): Added much comments.
-
-Fri Nov 07 02:45:56 1997  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-	* TAO version 0.0.24, released Fri Nov 07 02:45:56 1997.
-
-Fri Nov  7 01:58:30 1997  Nanbor Wang  <nw1@coyote.wolfpack.cs.wustl.edu>
-
-	* TAO_IDL/driver/drv_preproc.cpp:
-	* TAO_IDL/driver/drv_fork.cpp: Added the (__FreeBSD__) flag to
- 	  correctly include wait.h file.
-
-	* tao/orb_core.cpp: Replaced ACE_NETBSD with ACE_HAS_THREADS in
- 	  template instantiation segment.
-
-	* tao/orbconf.h: Added the (__FreeBSD__) flag to exclude inclusion of
- 	  widec.h.
-
-	* tao/orbobj.cpp (Release): Wrapped ACE_GUARD with ACE_MT macro.
-
-Fri Nov 07 01:46:04 1997    <irfan@TWOSTEP>
-
-	* tests/Cubit/TAO/DII_Cubit/(cubitC.cpp, cubit.cpp): Byte order
- 	  changed from 1 to MY_BYTE_SEX.
-
-Thu Nov  6 23:59:45 1997  Douglas C. Schmidt  <schmidt@macarena.cs.wustl.edu>
-
-	* tao/params.cpp: Moved all the inlined methods out of the header
- 	  file and put them in the *.cpp file.  I hope this doesn't cause
- 	  problems for GCC on VxWorks.
-
-	* tests/Thruput_test/client.cpp: Fixed a mistake with how
-	  the long string constant was defined.  The scheme being
-	  used wasn't portable.
-
-Thu Nov 06 20:58:52 1997    <irfan@TWOSTEP>
-
-	* tao/connect.cpp: Made sure that TAO_Server_Connection_Handler
- 	  and TAO_Client_Connection_Handler have a zero Reactor pointer.
-  	  If this is not the case, they will try to deregister from a
- 	  sometimes non-existent Reactor.
-
-Thu Nov  6 19:06:59 1997  Sergio Flores  <sergio@polka.cs.wustl.edu>
-
-	* docs/releasenotes/index.html: Updated status of Naming Service
- 	port to TAO.
-
-	* TAO_IDL/be/be_exception.cpp (gen_client_header):
-	removed warning for unused variable.
-
-Thu Nov  6 17:07:58 1997  Chris Cleeland  <cleeland@cs.wustl.edu>
-
-	* tao/tao_internals.i: Added missing #include file.
-
-	* tao/tao_internals.i: Change lock used as monitor for service
- 	count to use ACE_Static_Object_Lock::instance().  This pleases
- 	VxWorks (but makes me nauseous).
-
-	* tao/tao_internals.h: Removed static instances of locks to please
- 	VxWorks.
-
-	* tao/orbobj.cpp (ORB_init): Changed lock used for the monitor
- 	here to be ACE_Static_Object_Lock::instance().  This pleases
- 	VxWorks (but makes me nauseous).
-
-	* tao/orb_core.cpp (init): Merged in changes for new Naming
- 	Service-related options that got accidentally overwritten last
- 	night.
-
-	* docs/Options.html: Added documentation for new Naming
- 	Service-related options in.
-
-	* tao/orbobj.h: Added documentation for a few static methods.
-
-	* tao/params.h: Changed LOCAL_INLINE macro to TAO_LOCAL_INLINE to
- 	avoid possible collisions with application macros.
-
-Thu Nov  6 14:51:22 1997  Sumedh Mungee  <sumedh@lindy.cs.wustl.edu>
-
-	* TAO_IDL/Makefile: Renamed libutil to libtao_idl_util. libutil is
-	a system library on NetBSD. Updated TAO_IDL/util/Makefile to be
-	compatible with this.
-
-	* TAO_IDL/be/be_codegen.cpp (server_header): Changed ::toupper to
-	be toupper, since toupper is a macro on some platforms (like
-	netbsd).
-
-	* TAO_IDL/driver/{drv_preproc.cpp, drv_fork.cpp}: NetBSD has
-	sys/wait.h, instead of wait.h. Added #define to fix it.
-
-Thu Nov  6 01:40:29 1997  Sumedh Mungee  <sumedh@macarena.cs.wustl.edu>
-
-	* tao/tao_internals.h: #defined ACE_Thread_Mutex to be
-	ACE_Null_Mutex for NetBSD.
-
-	* tao/orbconf.h: Added NetBSD to the #define around HAVE_WIDEC_H.
-
-	* tao/orb_core.cpp: #defined around some thread-specific template
-	instantiations which are not needed on NetBSD.
-
-	* tao/except.h: Undefined "minor" and "major, since these are
-	defined in NetBSD.
-
-Thu Nov 06 14:47:15 1997  David L. Levine  <levine@cs.wustl.edu>
-
-        * tao/params.[hi]: inlined some functions in the class declaration
-          because g++ for VxWorks couldn't deal with them in the .i file.
-
-        * tao/tao_internals.*,orbobj.cpp: fixed replacement of orbinit_lock_
-          and service_lock_ with ACE_Static_Object_Lock::instance ().
-
-Thu Nov 06 02:17:02 1997  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-	* TAO version 0.0.23, released Thu Nov 06 02:17:02 1997.
-
-Wed Nov  5 23:44:42 1997  Douglas C. Schmidt  <schmidt@macarena.cs.wustl.edu>
-
-	* tao/{orbobj,iioporb}.h: Made the first parameter to
- 	  string_to_object() a const CORBA::String rather than just a
- 	  CORBA::String.
-
-	* tao/params (addr): Fixed a bug where we should have been using
- 	  const ACE_INET_Addr & rather than just ACE_INET_Addr &.
-
-	* tao/orbobj: Began adding the hooks for a multicast-based
- 	  implementation of resolve_initial_references().
-
-	* tao/params: Added a new set/get interface to optionally set/get
- 	  the IOR of the configured Naming Service.
-
-	* tao/orb_core.cpp (init): Added a -ORBnameservice command-line
- 	  option.  If this option is given, it indicates the IOR where the
- 	  Naming Service resides.
-
-	* tao/params: Changed the signature of TAO_ORB_Parameters::addr()
- 	  to return a const ACE_INET_Addr & rather than an ACE_INET_Addr.
-
-	* tao/params: Added new get/set name_service_port() methods to
- 	  get/set the name service multicast port.
-
-Wed Nov  5 22:38:08 1997  Sergio Flores  <sergio@macarena.cs.wustl.edu>
-
-	* tests/Thruput_test/client.cpp (main):
-	* tests/Thruput_test/server.cpp (main): Fixed missing declarations
- 	and unused variables and labels.  Fixed uninitialized and unused
- 	variables.
-
-	* tests/Thruput_test/ttcp_i.cpp (ttcp_sequence_i):
-	* tests/Thruput_test/ttcp_i.h (class ttcp_sequence_i): Change to
- 	use POA.
-
-	* tests/Cubit/TAO/DII_Cubit/README (server): Changed comment on
- 	how to start the server to indicate the use of "-d" to see the
- 	IOR.
-
-	* tests/Cubit/TAO/IDL_Cubit/clnt.cpp (Cubit_Client): Reordered
- 	member initializers to match declaration order
-
-	* tests/Cubit/TAO/DII_Cubit/svr.cpp (main): Fixed comparison of
- 	">=" on an unsigned variable to compare only ">".
-
-Wed Nov 05 20:35:52 1997    <irfan@TWOSTEP>
-
-	* tao/orb_core.cpp (fini): Close down the connector. Other
- 	ORB_Core specific objects also need to be cleaned up (and
- 	deleted).
-
-	* tests: Made sure that the orb pointer returned by ORB::init() is
- 	correctly freed up.  Following files were updated:
-
-	  TAO/tests/Cubit/TAO/DII_Cubit/clnt.cpp
-	  TAO/tests/Cubit/TAO/DII_Cubit/svr.cpp
-	  TAO/tests/Cubit/TAO/IDL_Cubit/clnt.cpp
-	  TAO/tests/Cubit/TAO/IDL_Cubit/clnt.h
-	  TAO/tests/Cubit/TAO/IDL_Cubit/svr.cpp
-	  TAO/tests/Cubit/TAO/MT_Cubit/client/Task_Client.cpp
-	  TAO/tests/Cubit/TAO/MT_Cubit/server/svr.cpp
-	  TAO/tests/Cubit/VisiBroker/base_server/server.cpp
-
-Wed Nov  5 19:37:25 1997  Aniruddha Gokhale  <gokhale@mambo.cs.wustl.edu>
-
-	* TAO_IDL compiler:
-
-	files be_array.cpp, be_interface.cpp, be_sequence.cpp,
-	be_structure.cpp, be_union.cpp, be_enum.cpp - Added MY_BYTE_SEX to
-	the typecode generation methods.
-
-	be_operation.cpp, be_argument.cpp, be_state.cpp, be_codegen.* -
-	Modified to deal with _out parameters that are passed to the
-	actual upcalls in the server-side skeleton.
-
-	Some minor changes involving removing commented-out code in the
-	constructors of some classes.
-
-	* tests/Thruput_test: Some modifications. Still needs more work
-	get it to run.
-
-Wed Nov 05 19:26:44 1997    <nw1@COYOTE>
-
-	* tests/Cubit/TAO/DII_Cubit/DII_Cubit.dsp:
-	* tests/Cubit/TAO/IDL_Cubit/IDL_Cubit.dsp:
-	* tests/Cubit/TAO/MT_Cubit/client/client.dsp:
-	* tests/Cubit/TAO/MT_Cubit/server/server.dsp:
-	* tao/TAO.dsp: Renamed debeg version of TAO library to TAO.dll for
- 	  NT.
-
-Wed Nov 05 13:39:19 1997  David L. Levine  <levine@cs.wustl.edu>
-
-        * TAO_IDL/Makefile: more hacks to not build the IDL compiler
-          on VxWorks.
-
-Wed Nov 05 12:53:53 1997    <irfan@TWOSTEP>
-
-	* tao/interp.cpp:
-
-	  - Win32 does not use "fixed" byte alignment.  Fixed the
- 	    setup_entry macro to take this into account.
-
-	  - (declare_entry) Seperated the declaration of the structs from
- 	    their use.  This is necessary for the VC++4.2 compiler.
-
-	* tests/Cubit/TAO/DII_Cubit/svr.cpp (main): Commented out debug
- 	  message, since obj is not declared.
-
-Wed Nov 05 01:41:34 1997  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-	* TAO version 0.0.22, released Wed Nov 05 01:41:34 1997.
-
-Wed Nov  5 00:48:58 1997  Sergio Flores  <sergio@macarena.cs.wustl.edu>
-
-	* tests/Thruput_test/utils.cpp: Delete static definitions of
-	functions.
-
-	* tests/Thruput_test/ttcpS.cpp:
-	* tests/Thruput_test/ttcpC.cpp (_duplicate):
-	* tests/Thruput_test/client.cpp (main):
-	* tests/Thruput_test/ttcp_i.cpp (sendStructSeq):
-	* tests/Cubit/TAO/DII_Cubit/clnt.cpp:
-	* tests/Cubit/TAO/DII_Cubit/svr.cpp: Removed a couple of warnings
-	of unused and uninitialized variables.  Included "ace/ACE.h" to
-	be able to have the _REENTRANT flag.
-
-Wed Nov  5 00:18:17 1997  Aniruddha Gokhale  <gokhale@mambo.cs.wustl.edu>
-
-	* TAO_IDL/be/be_sequence.cpp: Added code to generate the missing
-	operator [] for sequences.
-
-Tue Nov  4 23:38:54 1997  Sumedh Mungee  <sumedh@macarena.cs.wustl.edu>
-
-	* tests/Cubit/TAO/MT_Cubit/{server,client}/Makefile: Removed the
-	(evil) TAO_HAS_TSS_ORB_CORE flag. Now this functionality is
-	provided by svc.conf.
-
-	* tests/Cubit/TAO/MT_Cubit/: Fixed the server code to use the new
-	IDL compiler generated code.
-
-	* TAO/tests/Cubit/TAO/MT_Cubit/client/Task_Client.cpp: Changed the
-	order of the initializers to remove g++ warnings, and added some
-	ACE_UNUSED_ARGs. Also removed the hand-crafted stubs, to make way
-	for the idl-compiler generated files.
-
-Tue Nov  4 23:21:29 1997  Sergio Flores  <sergio@macarena.cs.wustl.edu>
-
-	* tests/Cubit/TAO/DII_Cubit/clnt.cpp (main):
-	* tests/Cubit/TAO/IDL_Cubit/clnt.cpp (run): Changed the format of the
-	output to be more readable.  Also, fixed resolution of the time for
-	the cube_struct_dii() call.
-
-Tue Nov  4 21:12:48 1997  Douglas C. Schmidt  <schmidt@macarena.cs.wustl.edu>
-
-	* tao/except.h: Removed print_exception().  It seems unnecessary
-	and pollutes the global namespace.
-
-Tue Nov  4 16:58:12 1997  Chris Cleeland  <cleeland@cs.wustl.edu>
-
-	* {tests/Cubit/TAO/DII_Cubit,tests/Cubit/TAO/IDL_Cubit,
- 	tests/Cubit/TAO/MT_Cubit,tests/Demux_Test,
- 	tests/Thruput_test}/Makefile: Added an explicit definition for
- 	VBIN so that VxWorks can build properly.
-
-	* tao/orb_core.*: Modified TAO_Resource_Factory so that it divides
- 	the information that it tracks between pre-allocated resources and
- 	resources which are allocated by the application.  Specifically,
- 	the orb and root poa pointers are in here (though it's possible
- 	that when we move to a full POA implementation that the root poa
- 	can be pre-allocated as well).  These pointers are initialized to
- 	zero and are given values by the TAO_ORB_Core instance writing
- 	through back to the TAO_Resource_Factory instance.
-
-	Also, this implementation reduced the number of singletons/TSS
- 	singletons utilized by the resource factory.  The initial
- 	"get-it-working" cut used a singleton/tss singleton pair for every
- 	resource, which was quite wasteful in environments such as NT that
- 	don't have many TSS slots available.  Perhaps if we get even more
- 	clever this can be reduced even further.
-
-	* tao/except.*: Added print_exception() function for backwards
- 	compatibility.  It simply calls
- 	CORBA::Environment::print_exception().
-
-Tue Nov 04 10:45:07 1997    <nw1@CHA-CHA>
-
-	* TAO_IDL/fe/y.tab.cpp: Enclosed a #pragma ident with #if !defined
- 	  ACE_WIN32.  Compilers other than SunCC might also need this.
-
-Tue Nov  4 13:47:26 1997  Aniruddha Gokhale  <gokhale@mambo.cs.wustl.edu>
-
-	* TAO/tests/Cubit/TAO/MT_Cubit: Modified the Makefiles in the
-	client and server directory so that they use the TAO IDL
-	compiler. Also added the clean and realclean targets. Updated the
-	server side cubit.idl because it was different from what the
-	client was using.
-
-	* TAO_IDL compiler: Fixed the following problems
-
-	(1) Removed the extra call to Release in the generated _narrow
-	method  in be_interface.cpp
-
-	(2) Used ACE_CORBA_1 (Object) instead of CORBA::Object in the
-	class declaration for interfaces - in be_interface.cpp
-
-	(3) be_interface_fwd.cpp - var_impl had to be updated to generate
-	code that uses the ptr () method in the calls to _duplicate
-
-	* TAO/tests/Cubit/TAO/IDL_Cubit: Fixed some outstanding issues and
-	made sure that it works. Updated the README file.
-
-Tue Nov 04 09:48:51 1997  David L. Levine  <levine@cs.wustl.edu>
-
-        * tao/orb_core.i: disabled the ACE_Hash_Addr<ACE_INET_Addr>::hash_i ()
-          template specialization on g++/VxWorks because g++
-          cygnus-2.7.2-960126 can't handle it.
-
-        * tao/except.h (line 118): removed backslash at end of comment line.
-          Some compilers complain about that.
-
-        * tao/except.cpp (CORBA_SystemException): reordered initializers to
-          match declaration order.
-
-        * TAO_IDL/Makefile: don't build the IDL compiler on VxWorks.
-
-Tue Nov 04 06:26:14 1997  Carlos O'Ryan  <coryan@MILONGA>
-
-	* TAO_IDL/be/be_state.cpp:
-	  It still generated fully qualified names for some sequences,
-	  that will not work on NT.
-
-Tue Nov 04 05:32:44 1997  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-	* TAO version 0.0.21, released Tue Nov 04 05:32:44 1997.
-
-Tue Nov  4 04:42:17 1997  Sergio Flores  <sergio@macarena.cs.wustl.edu>
-
-	* tests/Thruput_test/server.cpp:
-	* tests/Thruput_test/client.cpp:
-	* tests/Thruput_test/ttcpS.cpp:
-	Fixed "print_exception" errors and errors due to some changes in
- 	the orb compiler.
-
-	* tests/Cubit/TAO/MT_Cubit/server/svr.cpp (svc): Use unsigned
-	int for variable that is used for positive comparisons only.
-
-Tue Nov 04 01:00:51 1997    <nw1@COYOTE>
-
-	* tests/Cubit/TAO/IDL_Cubit/IDL_Cubit.dsw: Renamed former test.dsw
- 	  to IDL_Cubit.dsw.
-
-	* tests/Cubit/TAO/IDL_Cubit/{client,server}.dsp: Renamed
- 	  executables for debug version to client.exe and server.exe on
- 	  NT.
-
-	* tests/Cubit/TAO/DII_Cubit/DII_Cubit.dsw: Renamed former test.dsw
-	  to DII_Cubit.dsw.
-
-	* tests/Cubit/TAO/DII_Cubit/{client,server}.dsp: Renamed
-	  executables for debug version to client.exe and server.exe on
-	  NT.
-
-	* tests/Cubit/TAO/IDL_Cubit/Cubit.mak: Added cubit.idl into
-	  makefile and its custom build settings.
-
-	* tests/Cubit/TAO/MT_Cubit/MT_Cubit.dsw: Renamed former
-	  MTCubit.dsw to MT_Cubit.dsw.
-
-Mon Nov 03 23:16:06 1997    <nw1@COYOTE>
-
-	* TAO_IDL/ast/ast_expression.cpp (coerce_value): Added an explicit
-	  cast (float) to avoid NT warnging messages.
-
-	* tests/Cubit/TAO/MT_Cubit/server/svr.cpp (svc): Removed
-	  declaration of function print_exception.  It's now a member
-	  function of CORBA_Environment.
-
-	* TAO_IDL/fe/y.tab.cpp: Commented out include <values.h>.  This
- 	  was causing compilation errors on NT.
-
-	* tests/Cubit/TAO/DII_Cubit/svr.cpp:
-	* tests/Cubit/TAO/DII_Cubit/clnt.cpp: Changed to use the new
-	  CORBA_Environment::print_exception.
-
-	* tao/except.h (CORBA_Environment):  Added ACE_Svc_Export to this
-	  class.
-
-	* tests/Cubit/TAO/MT_Cubit/MTCubit.dsw:
-	* tests/Cubit/TAO/MT_Cubit/client/client.dsp:
-	* tests/Cubit/TAO/MT_Cubit/server/server.dsp:
-	* tests/Cubit/TAO/IDL_Cubit/client.dsp:
-	* tests/Cubit/TAO/IDL_Cubit/server.dsp:
-	* tests/Cubit/TAO/IDL_Cubit/test.dsw:  Added new workspace and
-	  project files.
-
-	* TAO_IDL/tao_idl.dsp:  Moved the output executables to the usual
-	  place.
-
-	* TAO_IDL/be/be.h: Added #ifdef'ed pragma to diable warning 4250
-	  on NT.  This is only temporary and should be fixed later.
-
-	* TAO_IDL/be/be_union.cpp (gen_var_defn):
-	* TAO_IDL/be/be_structure.cpp (gen_var_defn):
-	* TAO_IDL/be/be_array.cpp (gen_var_defn): Removed unused local
-	  variables declaration (s).
-
-Mon Nov  3 23:25:30 1997  Aniruddha Gokhale  <gokhale@mambo.cs.wustl.edu>
-
-	* TAO_IDL Compiler: Files be_sequence.cpp, be_typedef.cpp,
-	be_state.cpp: Lots of improvements to get sequences to
-	work. Support for sequences of strings or obj references is
-	limited. But for all other cases, this seems to be working fine.
-
-	There were some unnecessary lines of code in be_state.cpp that
-	were giving rise to multiple declarations errors. These are
-	removed.
-
-Mon Nov  3 18:30:09 1997  Sergio Flores  <sergio@macarena.cs.wustl.edu>
-
-	* tests/Cubit/TAO/IDL_Cubit/clnt.cpp (main): compare with
-	"!= 0" rather than "== -1" for errors.
-
-	* tests/Cubit/TAO/IDL_Cubit/cubit.idl (enum discrim): Deleted
-	enumerations not used.
-
-	* tests/Cubit/TAO/IDL_Cubit/cubit_i.cpp (please_exit): Fixed
-	unused variable.
-
-	* tests/Cubit/TAO/IDL_Cubit/cubit_i.h (Cubit_Factory_i):
-	* tests/Cubit/TAO/IDL_Cubit/cubit_i.h (objrefs): Fixed invalid
-	comparison between a signed and unsigned variable.
-
-	* tests/Cubit/TAO/IDL_Cubit/svr.cpp (main): Fixed comparison of
-	">=" on an unsigned variable to compare only ">".
-
-	* TAO_IDL/be/be_typedef.cpp (gen_client_stubs): Removed unused
-	variable warning.
-
-	* TAO_IDL/fe/y.tab.cpp (yytoks): Added brackets to the array
-	 of structures being initialized.
-
-Mon Nov 03 18:43:37 1997  Carlos O'Ryan  <coryan@MILONGA>
-
-	* TAO_IDL/be/be_operation.cpp:
-	  "Fixed" skeleton generation code. Sometimes the formal parameter
-	  names for the skeleton can clash with the user defined names for
-	  the (IDL) method parameter names.
-	  To minimize the chances of such a problem I choose very long
-	  parameter names for the skeleton (things like <_tao_enviroment>
-	  instead of just <env>), but the right solution is to ignore the
-	  user defined parameter names and generate them using some
-	  numbering scheme.
-
-	* TAO_IDL/be/be_predefined_type.cpp:
-	  Generate CORBA::_tc_Object as the TypeCode for all pseudo
-	  object, this is a hack but works for the files we are using
-	  right now (maybe it will fail for complex things, like the
-	  interface repository).
-
-	* TAO_IDL/be/be_sequence.cpp:
-	  Fixed a number of minor problems:
-	  Missing _ptr type for sequences.
-	  The return type for T_var::operator-> was different in the
-	  .h and .i file.
-
-	* TAO_IDL/be/be_type.cpp:
-	  tc_name_ and type_name_ were not initialized, producing some
-	  segfaults under NT.
-
-Mon Nov  3 13:45:54 1997  Chris Cleeland  <cleeland@cs.wustl.edu>
-
-	* {tao,TAO_IDL/util,TAO_IDL/narrow,TAO_IDL/fe,TAO_IDL/driver,
- 	TAO_IDL/be,TAO_IDL/ast,Benchmark/benchmark}/Makefile (SHLIB):
- 	Fixed definition so that the extension was $(SOEXT) rather than
- 	hard-coded to "so".  This makes things compile on VxWorks better.
-  	Thanks to David Levine for pointing this out.
-
-Sun Nov 02 19:42:08 1997  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-	* TAO version 0.0.20, released Sun Nov 02 19:42:08 1997.
-
-Sun Nov  2 19:20:57 1997  Aniruddha Gokhale  <gokhale@mambo.cs.wustl.edu>
-
-	* TAO/tao/except.*: Made the "print_exception" utility function
-	as a method of class Environment.
-
-	* TAO/tao/giop.cpp: In the TAO_GIOP_Invocation::start method, we
-	were previously not returning even if the connection establishment
-	phase was failing. A return statement is inserted. However, there
-	still are problems when the GIOP_Invocation variable called "call"
-	goes out of scope.
-
-	* TAO_IDL Compiler: be_interface.cpp - The _bind call now
-	generates a "char IOR" instead of "static char IOR" since the
-	latter will be problematic with multiple threads. Thanks to
-	Arturo Montes <mitosys@colomsat.net.co> for pointing that out.
-
-	* TAO/test/Cubit/TAO/IDL_Cubit : Improved the code so that it uses
-	the "print_exception" which is now defined on class
-	CORBA::Environment. The clnt still needs improvement in terms of
-	handling invalid parameters and gracefully exiting.
-
-	* IDL_Compiler: The bug resulting out of encoding object
-	references has been fixed atleast on Solaris using g++ as well as
-	SunCC. Changes made to be_operation.cpp and be_state.cpp such that
-	the return value for object references is always of type
-	CORBA::Object_ptr rather than the real interface type. In
-	addition, keeping in perspective the change that Irfan made and
-	described below (in encode.cpp), the Any that holds the result
-	*does not* own the value. In contrast, for the rest of the cases
-	the result (of type Any) owns the result.
-
-	* be_sequence.cpp: Additional work in progress. Full changelog
-	entry will be available in the next commit.
-
-Fri Oct 31 22:20:06 1997    <irfan@TWOSTEP>
-
-	* tao/encode.cpp (encode): Changed cast of data from
- 	  *(CORBA::Object_ptr *) to (CORBA::Object_ptr).
-
-	* tao/default_server.cpp (parse_args): Manipulation of curarg was
- 	  all messed up.  Fixed it such that it was not incremented
- 	  unnecessarily.
-
-Fri Oct 31 13:46:04 1997  Chris Cleeland  <cleeland@cs.wustl.edu>
-
-	* docs/Options.html: Updated to specify new TAO_Resource_Factory
- 	service and its options.
-
-	* docs/releasenotes/orbcore.html: Updated to reflect recent work.
-
-	* tao/orb_core.*: Added the acceptor and related members and
- 	methods from CORBA_ORB.  Made TAO_Resource_Factory a Service
- 	Object so that it can be loaded via the Service Configurator.  The
- 	option to change its resources between global and thread-specific
- 	is "-ORBresources global" and "-ORBresources tss", respectively.
-
-	* tao/orbobj.*: Moved the acceptor and related members and methods
- 	to TAO_ORB_Core.
-
-	* tests/.../svc.conf: Added Resource Factory as a service.
-
-	* tests/Cubit/TAO/{DII_Cubit,MT_Cubit}/cubitS.cpp,
- 	tests/Thruput_test/ttcpS.cpp, tao/poa.cpp: Changed acceses that
- 	used to go to CORBA_ORB::params() to go to TAO_ORB_Core::params().
-
-Fri Oct 31 08:39:54 1997  Aniruddha Gokhale  <gokhale@mambo.cs.wustl.edu>
-
-	* TAO_IDL Compiler - Intermediate commit of all improved features.
-
-	* be/be_type.* : Improved the nested_type_name method such that it
-	now takes an additional parameter called suffix that has a default
-	value of NULL. Carlos, Sergio, and myself independently found an
-	extremely bad piece of code that was getting generated that looked
-	like the following:
-		ACE_NESTED_CLASS (XXXX, YYYY)_ptr
-
-	The new convention is to pass the suffix such as "_ptr", or "_var"
-	or "_out" to this method so that it can generate valid code of the
-	form:
-		ACE_NESTED_CLASS (XXXX, YYYY_ptr)
-
-	* be/be_decl.cpp : All the methods such as repoID (), flatname
-	(), etc now check if the corresponding data member was created or
-	not. If they are not, the corresponding private method e.g.,
-	compute_repoID (), are invoked. This way we do not have to call
-	all these private methods in the constructors of all the derived
-	be classes. The one compelling reason to do it this way is because
-	the "names" for certain types are not available at construction
-	time, e.g., sequences. A name to a sequence is assigned from the
-	context it is in i.e., whether it was a named sequence in the form
-	of a "typedef" statement or it was an anonymous sequence.
-
-	As of this commit, all calls to such compute_*  methods in the
-	constructors of all the derived be classes are commented out and
-	will eventually disappear in the next commit.
-
-	* be/be_decl.cpp : One more change in be_decl.cpp is to add the
-	case for "interface_fwd" in the generation of the _var and _out
-	definitions and implementations.
-
-	* be/be_helper.* : Added two new methods called "gen_ifdef_macro"
-	and "gen_endif". These are required to generate the #if !defined
-	(...) <code> #endif macros. These are very essential if the IDL
-	has forward declarations of interfaces. Forward declarations of
-	interfaces must generate a forward class declaration. In addition,
-	it has to typedef the "_ptr" type and define the "_var" and "_out"
-	types. However, the real "be_interface" class does this too which
-	can result in "multiple declarations" errors from the C++
-	compiler. Hence we use this scheme. As in the case of the
-	nested_type_name method mentioned above, this method also takes a
-	default "suffix" parameter (= 0). This is required for the "_var",
-	"_ptr", and "_out" suffixes.
-
-	* be/be_interface.cpp
-	  be/be_interface_fwd.cpp:
-
-	Used the TAO_OutStream::gen_ifdef_macro () and gen_endif methods
-	for the definitions of the _ptr, _var, and _out classes and their
-	implementations.
-
-	*be/be_sequence.* : Lot of modifications and change in the design
-	in terms of handling the base types that themselves could be
-	sequences. Although the AST_Sequence i.e., OMG IDL does not define
-	a "sequence" to be a scope producing construct like structs or
-	unions, we choose to make "be_sequence" to be a scope producing
-	construct. This is no way alters the OMG IDL language because the
-	front-end is still the same. "be_sequence" was made to inherit
-	from scope because the sequence mapping gives rise to a C++ class
-	which is a scoping construct. This way, base types that turn out
-	to be anonymous sequences can be assigned a parent scope and their
-	name generation will fall in line with other classes.
-
-	There are certain features missing with sequences at this commit
-	time, but this should reduce tweaking the generated code to a
-	large extent.
-
-	* be/be_state.cpp: Update the code for handling sequences and
-	typedefs. Typedefs should be handled properly now.
-
-	* All other *.cpp files: Either commented out the compute_* calls
-	in the constructors or removed them.
-
-Fri Oct 31 03:00:09 1997  Chris Cleeland  <cleeland@cs.wustl.edu>
-
-	* tao/orb_core.cpp: Moved call to connector's open() into init(),
- 	thus insuring that it gets called only AFTER all the resources are
- 	available from the Resource Factory.
-
-	* tao/orb_core.*: Changed data members to be associations rather
- 	than containment.  This allows decoupling of the
- 	"thread-specificness" of these resources from the
- 	thread-specificness of the general TAO_ORB_Core container.  Also
- 	added set accessors for those resources.
-
-	Added TAO_Resource_Factory class from which the TAO_ORB_Core
- 	container initializes itself.  For now this remains a singleton
- 	which is, at compile-time, determined to be either TSS or not.
-  	But, soon, it will be loaded via the Service Configurator and its
- 	TSS nature determined at runtime.
-
-	* tao/giop.h: Updated to use the new ACE macro
- 	ACE_CLASS_IS_NAMESPACE.
-
-	* tao/default_server.*: Implemented the new open() method so that
- 	it initializes the Reactive and Threaded strategies from the
- 	information in TAO_ORB_Core.
-
-	* tao/server_factory.*: Added open() method to be called after all
- 	ORB resources are loaded up.  This method can then be used by a
- 	strategy factory to further initialize its contained strategies if
- 	they require handles to resources to which the ORB might legislate
- 	access.  The default implementation does nothing.
-
-Fri Oct 31 01:03:05 1997    <irfan@TWOSTEP>
-
-	* tests/Cubit/TAO/IDL_Cubit/svr.cpp (main): obj was not declared.
-  	  Commented out use of obj in dmsg1.
-
-	* tests/Cubit/TAO/IDL_Cubit/cubit_i.cpp (Cubit_Factory_i):
- 	  numobjs_ was used before it was assigned.
-
-	* TAO/TAO_IDL/TAO_IDL.{mak,mdp}: Added VC++4.2 make files.
-
-	* TAO_IDL/ast/ast_expression.cpp (dump): Streaming the enum was
- 	  ambiguous.  Therefore the enum was cast to an int.
-
-Thu Oct 30 22:50:44 1997  Carlos O'Ryan  <coryan@MILONGA>
-
-	* tao/corba.h:
-	  Added a definition for ACE_NESTED_CLASS, maybe it is defined in
-	  some place else, but I couldn't find it.
-
-	* TAO_IDL/be/be_interface.cpp:
-	  Fixed the definition for skeleton destructors.
-
-	* TAO_IDL/be/be_helper.cpp:
-	  Added a lot of redundant ACE_OS::fflush() calls. Apparently we
-	  have two FILE* or file descriptors over the same file, bt the
-	  fflush hides the problem.
-
-	* TAO_IDL/be/be_decl.cpp:
-	  Fixed inconsistency between operator-> declaration and
-	  definition for _out classes.
-
-Thu Oct 30 14:06:54 1997  Sergio Flores  <sergio@polka.cs.wustl.edu>
-
-	* TAO_IDL/fe/Makefile:
-	Added an expression to the sed command in the rule to construct
-	lex.yy.cpp, that replaces ECHO with TAO_ECHO, because a
-	different ECHO macro is already defined in
-	/usr/include/sys/termios.h
-
-	* TAO_IDL/fe/idl.ll:
-	Fixed some warnings about nested comments.
-	Changed the declaration of variable i to outside of
-	the 'for' initialization to avoid obsolete binding warnings.
-
-	* TAO_IDL/be/be_interface_fwd.cpp (gen_client_header):
-	Added ACE_UNUSED_ARG macro to avoid unused variable warning,
-	for variable i.
-
-	* TAO_IDL/be/be_constant.cpp (exprtype_to_string):
-	* TAO_IDL/util/utl_error.cpp (exprtype_to_string):
-	Added case statements to handle the rest of un-handled
-	enumerations from AST_Expression::ExprType.  These will
-	handle a default value (i.e. NULL).  Enumerations added are:
-	AST_Expression::EV_wstring
-	AST_Expression::EV_wchar
-	AST_Expression::EV_longdouble
-	AST_Expression::EV_ulonglong
-	AST_Expression::EV_longlong
-
-Thu Oct 30 09:56:41 1997  Chris Cleeland  <cleeland@cs.wustl.edu>
-
-	* tao/giop.h: Added comments to TAO_GIOP class explicitly pointing
- 	out its use as a namespace.  Concurrently, I also scoped the CTOR,
- 	Copy CTOR, and DTOR as 'private' so nobody can mistakenly
- 	instantiate one of these puppies.
-
-Thu Oct 30 03:40:26 1997    <nw1@COYOTE>
-
-	* tests/Cubit/TAO/DII_Cubit/client.dsp:
-	* tests/Cubit/TAO/DII_Cubit/server.dsp:  Updated include files
-	  path and libarary path.
-
-	* tao/giop.cpp (close_connection): Use ACE_HANDLE instead of int.
-
-Thu Oct 30 02:53:20 1997  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-	* TAO version 0.0.19, released Thu Oct 30 02:53:20 1997.
-
-Thu Oct 30 02:20:21 1997  Sergio Flores  <sergio@polka.cs.wustl.edu>
-
-	* tests/IDL_Cubit:
-	Added more comments and changed the header to be ACE'ified.
-	Make output more consistent.
-
-Thu Oct 30 02:12:27 1997 Sumedh Mungee  <sumedh@macarena.cs.wustl.edu>
-
-	* tests/{TAO, Cubit}: Changed the directory heirarchy to the
-	following: tests/Cubit/TAO/ now contains all the Cubit examples,
-	i.e. IDL_Cubit, MT_Cubit and DII_Cubit, instead of tests/. Updated
-	the README and Makefiles to reflect this. DII_Cubit is the
-	handcrafted "original" Cubit example.
-
-	* tests/Cubit/COOL: Added the COOL version of the Cubit test. The
-	COOL version is written for Chorus COOL version 4.1.
-
-Wed Oct 29 22:26:10 1997  Douglas C. Schmidt  <schmidt@flamenco.cs.wustl.edu>
-
-	* tests/IDL_Cubit/clnt.cpp (init): Fixed the error handling so we
- 	exit correctly when things go wrong.
-
-	* tao/connect.cpp (open): Revised the code to use the new
- 	ACE_LACKS_SOCKET_BUFSIZ to detect when this feature isn't
- 	supported.
-
-	* tao/{giop,connect}: Added a nifty typedef called TAO_SVC_HANDLER
- 	to remove the drudgery of expanding the template each time.
-
-	* tao: Changed the name of TAO_OA_Connection_Handler to
- 	TAO_Server_Connection_Handler to be compliant with the
- 	TAO_Client_Connection_Handler.
-
-Wed Oct 29 20:47:47 1997  Sergio Flores  <sergio@polka.cs.wustl.edu>
-
-	* tests/IDL_Cubit/clnt.cpp:
-	* tests/IDL_Cubit/clnt.h:
-	Cleaned up the code.  Added ACE_Profile_Timer to time the calls.
-	Changed copyright header.  Added more comments.
-
-Wed Oct 29 18:55:57 1997  Douglas C. Schmidt  <schmidt@flamenco.cs.wustl.edu>
-
-	* tao/giop: Added "_"'s to the data members in
- 	TAO_GIOP_Invocation.
-
-	* tao/giop (send_request): Swaped the order of the parameters for
- 	send_request() so that it would be consistent with recv_request.
-
-	* tao/{connect,giop}: Changed read_message() to recv_request(),
- 	and send_message() to send_request() since these things really
- 	work on GIOP requests.
-
-	* tao/{connect,giop}: Changed read_message() to recv_message(),
- 	which is more like other parts of ACE.
-
-	* tao/connect.cpp: Fixed the calls to read_message() and
- 	send_message() so that they don't try to modify "this."
-
-	* tao/giop: Changed the send_message() and read_message() in the
- 	TAO_GIOP class to take ACE_Svc_Handler<ACE_SOCK_STREAM,
- 	ACE_NULL_SYNCH> rather than TAO_Client_Connection_Handler.
-
-Wed Oct 29 17:53:12 1997    <irfan@CHA-CHA>
-
-	* tao: Added TAO_HAS_TSS_ORB_CORE to tao and Cubit NT makefiles.
-  	  This probably needs to be added to the other NT makefiles.
-
-	* tests/Cubit/TAO/svc.conf: Updated files to pass the correct
- 	  options to the factory.
-
-Wed Oct 29 16:07:20 1997  Chris Cleeland  <cleeland@cs.wustl.edu>
-
-	* tao/giop.*: Changed most methods that took ACE_SOCK_Stream&
- 	parameters to take TAO_Client_Connection_Handler*& parameters.
-  	This makes it easier to clean up properly after errors.  Also
- 	#ifdef'd out seemingly unused code (TAO_GIOP::incoming_message).
-  	Fixed call to ACE_Svc_Handler::idle() to not contain an argument.
-
-	* docs/Options.html: Updated the documentation to reflect recent
- 	changes.
-
-Wed Oct 29 15:59:30 1997  Sergio Flores  <sergio@polka.cs.wustl.edu>
-
-	* tests/IDL_Cubit/clnt.cpp: OO'ified the code. Added class
-	Cubit_Client.
-	* tests/IDL_Cubit/clnt.h: added this file to contain  the class
-	definition.
-
-Wed Oct 29 11:01:11 1997  Aniruddha Gokhale  <gokhale@mambo.cs.wustl.edu>
-
-	* TAO_IDL compiler: be_type.cpp::nested_type_name: A quick commit
-	made that includes an improvement over the previous scheme of
-	generating ACE_NESTED_CLASS macros. We handle the problem of
-	generating fully scoped names for types that were defined in some
-	ancestor of the scope in which that type is being used.
-
-	* Makefiles under TAO_IDL: Fixed a bug in the Makefiles under all
-	the subdirectories. This bug was reported by "ARTURO MONTES"
-	<mitosys@colomsat.net.co>. The bug was causing circular
-	dependencies on the libraru that was getting compiled.
-
-Wed Oct 29 06:17:36 1997  Nanbor Wang  <nw1@cumbia.cs.wustl.edu>
-
-	* tao/default_server.cpp (parse_args): Must increase the loop
-	  counter.
-
-Wed Oct 29 02:11:43 1997  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-	* TAO version 0.0.18, released Wed Oct 29 02:11:43 1997.
-
-Wed Oct 29 00:56:26 1997  Chris Cleeland  <cleeland@cs.wustl.edu>
-
-	* tests/Cubit/TAO/svc.conf: Updated documentation comments to
- 	reflect factory option changes.
-
-	* tao/orbobj.*: Wiped argvec_shift and all its bugs off the face
- 	of the earth.  Manojkumar Acharya <cvsf325.gpt.co.uk> should prove
- 	to be very happy about this turn of events. :-)
-
-	* tao/orbobj.cpp: Weeded out old, dead code here and there and
- 	migrated much of what had been in ORB_init() into
- 	TAO_ORB_Core::init().
-
-	* tao/orb_core.*: Added methods init() and fini() which perform
- 	ORB Core-related initializations and cleanups, respectively.  This
- 	is all in anticipation of having a Unified Factory which provides
- 	ORB Core as well as other information.  Also began stubbing out
- 	and migrating various data members and associated accessors so
- 	that they are pointers rather than actual members.  The next step
- 	is to actually make them pointers and have everything get
- 	initialized properly and deterministically and keep everything
- 	working.
-
-	* tao/{giop,orb_core}.cpp: Revised code due to recent changes in
- 	ACE related to the Caching connector.
-
-	* tao/default_server.{h,cpp} (parse_args): This method now uses
- 	options of the style -ORBfoo rather than the previously-cryptic
- 	single-letter options.  This should allow us to eventually allow
- 	this same routine to parse args from the command line as well as
- 	inside the svc.conf file.  The price we pay for consistency,
- 	however, is verbosity to the point of insanity (e.g.,
- 	-ORBconcurrency...blech!)  These options are briefly documented in
- 	the method header as well as in subsequent svc.conf files.
-
-	* tao/decode.cpp: Added some comments for arguments.
-
-	* tao/connect.{h,cpp}: Moved Connector-related typedefs and
- 	corresponding template instantiations into the proper
- 	file--orb_core.*.
-
-	* tao/orb_core.cpp (init): Moved much of what used to be
- 	ORB_init() into here.  Changed the manner in which objref style
- 	was determined--it's no longer via a special ORB name but rather
- 	by the -ORBobjrefstyle option which can have either the value
- 	"IOR" or "URL" (default is URL).
-
-Tue Oct 28 21:15:36 1997  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-	* build/SunOS5.5/TAO/tests/IDL_Cubit/clnt.cpp (main): Fixed the
- 	code so that if you give incorrect parameters the program exits
- 	cleanly, rather than segfaulting.
-
-Tue Oct 28 20:49:28 1997  Nanbor Wang  <nw1@cumbia.cs.wustl.edu>
-
-	* tao/giop.cpp (start): NT Access Violation error, AGAIN! Added
-	  codes to reset this->handler_ so that
-	  ACE_Cached_Connect_Strategy won't complain.
-
-Tue Oct 28 19:19:05 1997  Aniruddha Gokhale  <gokhale@mambo.cs.wustl.edu>
-
-	* TAO_IDL/be/{be_state.cpp, be_union.cpp, be_struct.cpp}: Added code
-	that will generate the ACE_NESTED_CLASS macro
-
-	*TAO_IDL/be/be_type.cpp: Implemented be_type::nexted_type_name
-	that will generate the ACE_NESTED_CLASS macro. However, this may
-	not be completely correct at this point because we want to see if
-	teh compiler fails for types defined in some ancestor and whose
-	fully scoped names are generated .
-
-	* TAO_IDL/be/be_interface.cpp: Added code that will generate the
-	_bind call on the interface class.
-
-	* TAO/tests/IDL_Cubit: Added the _bind call in clnt.cpp. Improved
-	the README file.
-
-	*MAXNAMELEN : There was a clash with TAO_CodeGen::MAXNAMELEN. So
-	it has been substituted by NAMEBUFSIZE as a macro in be_codegen.h
-
-Mon Oct 27 22:22:22 1997  Aniruddha Gokhale  <gokhale@mambo.cs.wustl.edu>
-
-	* TAO_IDL/be_decl.cpp: Added a ptr () function to the _var classes
-	hat returns the underlying ptr_ data member. This ptr () member
-	function is now used to pass a pointer type to constructor and
-	assignment operator from a T_var class.
-
-	* TAO_IDL/be_state.cpp: Important changes related to generation of
-	return values of operations in the stubs. In addition, an & was
-	missing for passing string types. Some additional bugs arising out
-	of operations with void return type have been fixed.
-
-	* ./tests/IDL_Cubit: This test has been modified to include a
-	factory interface that reads a key for the cubit object and
-	produces an obj reference for Cubit. In addition, a preliminary
-	version of the _bind call has been tested with IDL_Cubit.
-
-	*MAXNAMELEN : Carlos informed me that MAXNAMELEN was a small
-	constant on some platforms. This has been changed to
-	TAO_CodeGen::MAXNAMELEN with a value of 100.
-
-Mon Oct 27 22:07:58 1997  Carlos O'Ryan  <coryan@MILONGA>
-
-	* TAO_IDL/be/be_array.cpp:
-	* TAO_IDL/be/be_helper.cpp:
-	* TAO_IDL/be/be_sequence.cpp:
-	* TAO_IDL/be/be_structure.cpp:
-	* TAO_IDL/be/be_typedef.cpp:
-	* TAO_IDL/be/be_union.cpp:
-	  Set this->cli_stub_gen_ to I_TRUE once the code has been
-	  emitted.
-
-Mon Oct 27 19:34:08 1997  Carlos O'Ryan  <coryan@MILONGA>
-
-	* TAO_IDL/be/be_exception.cpp:
-	* TAO_IDL/be/be_enum.cpp:
-	  Set this->cli_stub_gen_ to I_TRUE at the end.
-
-	* TAO_IDL/be/be_typedef.cpp:
-	  Set the state to TAO_CodeGen::TAO_TYPEDEF_CH instead of just
-	  struct.
-
-Mon Oct 27 15:22:24 1997  Sergio Flores  <sergio@polka.cs.wustl.edu>
-
-	* TAO_IDL/be/be_state.cpp:
-	* TAO_IDL/be_include/be_codegen.h:
-	* TAO_IDL/be_include/be_factory.h:
-	* TAO_IDL/be_include/be_state.h:
-	* tao/iioporb.cpp:
-	* tao/marshal.cpp:
-	* tao/optable.cpp:
-	* tao/optable.h:
-	* tao/singletons.h:
-	The ACE_Singleton lock type needs to be changed from
- 	ACE_SYNCH_MUTEX (or ACE_SYNCH_RW_MUTEX) ACE_SYNCH_RECURSIVE_MUTEX.
-  	ACE handles those more efficiently for its singletons.  Change
- 	suggested by David Levine.
-
-Mon Oct 27 11:59:51 1997  Chris Cleeland  <cleeland@cs.wustl.edu>
-
-	* tao/orbconf.h: Made it so _FAR is defined all the time.  Thanks
- 	to Manojkumar Acharya <cvsf325.gpt.co.uk> for reporting this.
-
-Sun Oct 26 22:18:01 1997  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-	* TAO version 0.0.17, released Sun Oct 26 22:18:01 1997.
-
-Sun Oct 26 17:53:25 1997  Douglas C. Schmidt  <schmidt@macarena.cs.wustl.edu>
-
-	* {tao,tests}/Makefile: Commented out the TAO_HAS_TSS_ORBCORE in
- 	these Makefiles since it is going away anyhow and is confusing...
-
-	* tests/IDL_Cubit/svc.conf,
-	  tests/Cubit/TAO/svc.conf:
-	Changed the default concurrency policy to be reactive so that
- 	things work correctly if TAO_HAS_TSS_ORBCORE.  Thanks to Sumedh
-	for pointing this out.
-
-	* tao/orbobj.cpp (ORB_init): Put the TAO_DEFAULT_SERVER_PORT into
- 	ACE's OS.h file and used it in TAO.
-
-Sun Oct 26 15:07:18 1997  Chris Cleeland  <cleeland@cs.wustl.edu>
-
-	* tao/params.h: Eliminated forward decls of the now-defunct ROA
- 	class.
-
-	* tao/orb_core.h (TAO_DEFAULT_PORT): Added manifest constant for
- 	default port.
-
-	* tao/orbobj.cpp (ORB_init): Eliminated ugly anonymous constant
- 	use for hbuf's size.  Utilized manifest constant for default port.
-
-	* tao/giop.cpp: Changed calls to
- 	TAO_Client_Connection_Handler::in_use() to call the underlying
- 	Svc_Handler::idle().
-
-	* tao/connect.{h,i}: Eliminated in_use() flags because they're no
- 	longer needed with the new Strategy Connector.
-
-	* tao/iioporb.cpp (string_to_object): Removed setting of the orb
- 	in the underlying CORBA::Object because it's no longer there.
-
-	* tao/object.{h,i} (CORBA_Object): Eliminated the pointer to an orb
- 	within this object.  This should help solve some problems in
- 	passing object references across the wire.
-
-	* tao/connect.cpp: Added template instantiations for
- 	ACE_Hash_Map_Iterator to reflect Irfan's recent changes.
-
-	* tests/IDL_Cubit/README: Updated documentation on the server to
- 	reflect current reality.
-
-Sun Oct 26 01:01:32 1997  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-	* tao/orbobj.cpp: Redid the template specialization of Hash_Addr
- 	to account for the new changes.
-
-Sun Oct 26 01:05:36 1997    <nw1@COYOTE>
-
-	* tao/corba.h: Changed from using Strategies_T.h to Strategies.h.
-
-	* tao/connect.h: Removed a template argument form ACE_Hash_Addr.
-	  Removed explicit instantiation of compare_i.
-
-	* tao/connect.cpp:  Removed a template argument from explicit
-	  instantiation of ACE_Hash_Addr.
-
-	* tests/Cubit/TAO/clnt.cpp (main): Added a simple class
-	  ACE_Winsock_proper_shutdown here to shutdown winsock properly.
-  	  This class should be removed later once we figure out how to
-	  close down winsock properly from ACE.
-
-	* tests/Cubit/TAO/svc.conf: Changed the name of shared object from
-	  libTAO to TAO.  Added configuration lines for using debug
-	  version of TAO library on NT.
-
-Sun Oct 26 01:47:04 1997  Sergio Flores  <sergio@macarena.cs.wustl.edu>
-
-	* TAO_IDL/be/be_codegen.cpp (upcase):
-	* TAO_IDL/util/utl_string.cpp (canonicalize):
-	* TAO_IDL/be/be_decl.cpp (tc_name2long):
-	Added "unsigned" to index variable "i" used in for() loop,
-	to avoid warning "comparison between unsigned and signed"
-
-	* TAO_IDL/be/be_decl.cpp (compute_flatname):
-	* TAO_IDL/be/be_decl.cpp (compute_repoID):
-	* TAO_IDL/be/be_interface.cpp (compute_fullskelname):
-	Fixed error "second - I_FALSE;", should be "second = I_FALSE;"
-
-	* TAO_IDL/be/be_operation.cpp (gen_server_skeletons):
-	* TAO_IDL/be/be_state.cpp (gen_code):
-	Initialized pointers to 0
-
-	* TAO_IDL/driver/drv_preproc.cpp (DRV_pre_proc):
-	* TAO_IDL/be/be_operation.cpp (gen_server_header):
-	* TAO_IDL/be/be_operation.cpp (gen_client_header):
-	* TAO_IDL/be/be_decl.cpp (gen_out_defn):
-	* TAO_IDL/be/be_decl.cpp (gen_var_defn):
-	* TAO_IDL/be/be_scope.cpp (gen_client_header):
-	* TAO_IDL/be/be_state.cpp (gen_code):
-	* TAO_IDL/be/be_helper.cpp (operator<<):
-	* TAO_IDL/be/be_union.cpp (tc_encap_len):
-	* TAO_IDL/be/be_typedef.cpp (gen_client_stubs):
-	* TAO_IDL/be/be_string.cpp (gen_client_header):
-	* TAO_IDL/be/be_root.cpp (gen_idl2cplusplus_mapping):
-	* TAO_IDL/be/be_predefined_type.cpp (gen_typecode):
-	* TAO_IDL/be/be_interface.cpp (gen_client_stubs):
-	* TAO_IDL/be/be_interface.cpp (gen_server_skeletons):
-	* TAO_IDL/be/be_interface.cpp (gen_operation_table):
-	* TAO_IDL/be/be_interface.cpp (gen_server_inline):
-	* TAO_IDL/be/be_interface.cpp (tc_encap_len):
-	* TAO_IDL/be/be_field.cpp (gen_encapsulation):
-	* TAO_IDL/be/be_field.cpp (tc_encap_len):
-	* TAO_IDL/be/be_enum_val.cpp (gen_encapsulation):
-	* TAO_IDL/be/be_enum.cpp (tc_encap_len):
-	* TAO_IDL/be/be_constant.cpp (gen_client_header):
-	* TAO_IDL/be/be_constant.cpp (gen_client_stubs):
-	* TAO_IDL/be/be_argument.cpp (gen_client_header):
-	* TAO_IDL/be/be_argument.cpp (gen_client_stubs):
-	* TAO_IDL/be/be_argument.cpp (gen_server_header):
-	* TAO_IDL/be/be_argument.cpp (gen_server_skeletons):
-	* TAO_IDL/be/be_array.cpp (be_array):
-	* TAO_IDL/be/be_array.cpp (gen_client_header):
-	* TAO_IDL/be/be_array.cpp (gen_client_inline):
-	* TAO_IDL/be/be_array.cpp (gen_forany_defn):
-	* TAO_IDL/be/be_array.cpp (gen_forany_impl):
-	* TAO_IDL/util/utl_stack.cpp (push):
-	Added ACE_UNUSED_ARG macro to avoid unused variable warning,
-	for variable slen.
-
-	* TAO_IDL/be_include/be_helper.h (class TAO_OutStream):
-	Made destructor virtual; we have virtual member functions.
-
-	* TAO_IDL/be/be_codegen.cpp (TAO_CodeGen):
-	* TAO_IDL/be/be_decl.cpp (be_decl):
-	* TAO_IDL/util/utl_stack.cpp (UTL_ScopeStack):
-	* TAO_IDL/util/utl_scope.cpp (UTL_ScopeActiveIterator):
-	Reordered member initializers to match declaration order to
-	satisfy the compiler.
-
-	* TAO_IDL/util/utl_scope.cpp (lookup_primitive_type):
-	Added "default" case to switch to return NULL.
-
-	* TAO_IDL/util/utl_scope.cpp (add_attribute):
-	* TAO_IDL/util/utl_scope.cpp (add_operation):
-	* TAO_IDL/util/utl_scope.cpp (add_argument):
-	* TAO_IDL/util/utl_scope.cpp (add_union_branch):
-	* TAO_IDL/util/utl_scope.cpp (add_field):
-	* TAO_IDL/util/utl_scope.cpp (add_typedef):
-	* TAO_IDL/util/utl_scope.cpp (add_sequence):
-	* TAO_IDL/util/utl_scope.cpp (add_array):
-	Use 0 instead of NULL to initialize pointers in the
-	member initialization list, again to avoid ANSI C++ forbids
-	implicit (void *) conversions warnings.
-
-Sun Oct 26 01:01:32 1997  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-	* TAO version 0.0.16, released Sun Oct 26 01:01:32 1997.
-
-Sun Oct 26 00:32:29 1997  Douglas C. Schmidt  <schmidt@macarena.cs.wustl.edu>
-
-	* TAO/TAO_IDL/fe/idl.ll: Reverted a change that Carlos had
- 	overwritten.  I guess he's not getting enough sleep these
- 	days... ;-)
-
-Sun Oct 26 00:31:38 1997    <irfan@TWOSTEP>
-
-	* tao/orb_core.i (hash_i): Redid the specialization in view of the
- 	  new changes.
-
-Sat Oct 25 18:14:14 1997  Douglas C. Schmidt  <schmidt@macarena.cs.wustl.edu>
-
-	* TAO_IDL/be/be_interface.cpp (be_interface): Worked around a
- 	nasty MSVC++ compiler bug that doesn't like CORBA::Object
-	(object_ptr).  So we use an existing ACE macro for this.
-
-	* TAO_IDL/be/be_interface.cpp (be_interface): Fixed yet another
- 	round of uninitialized data members.  It is clear that the
- 	original authors of this code wouldn't pass my ugrad programming
- 	course...
-
-	* TAO_IDL/fe/idl.ll (idl_parse_line_and_file): Had to make a minor
- 	change to skip over the #line directive from Microsoft.  In
- 	addition, had to add some code to put Microsoft-style pathnames
- 	into a canonical form (i.e., replacing = '\\' with '\').  Thanks
- 	to Darrell for helping with this.
-
-	* TAO_IDL/fe/idl.ll: Added a new rule to handle the fact
-	that the Microsoft C++ preprocessor generates tags of the
-	form
-
-	#line 1 "bar.idl"
-
-	rather than
-
-	#1 "bar.idl"
-
-	which is what UNIX C++ compilers seem to do.
-
-	* TAO_IDL/be/be_decl.cpp (compute_fullname, compute_flatname):
- 	Fixed a nasty bug where the original author thought new always
- 	returned 0'd memory...  Sheesh!
-
-	* TAO_IDL/driver/drv_preproc.cpp: Changed fd < 0 to fd ==
-	ACE_INVALID_HANDLE to be more portable.
-
-	* TAO_IDL/be/be_decl.cpp (be_decl): There were two fields,
- 	flatname_ and repoID_, that weren't given initial values of 0.
-  	Thanks to Purify for finding this!
-
-	* TAO_IDL/fe/idl.{yy,ll}: Replaced all uses of type names <name>
- 	(e.g., FLOAT) with IDL_<name> (e.g., IDL_FLOAT) so that the code
- 	won't bomb on lame systems like NT that typedef basic types to all
- 	capitals (e.g., typedef float FLOAT).
-
-Sat Oct 25 22:28:42 1997  Carlos O'Ryan  <coryan@MILONGA>
-
-	* TAO_IDL/fe/idl.ll: Since yytext may be an "unsigned char*" under
- 	  HP-UX they define an "alias" __yytext. This hack fails miserably
- 	  when using flex, since then the yytext thing can change on the
- 	  fly. I use an inline function instead.  Added support for #line
- 	  preprocessor directives.
-
-	* TAO_IDL/driver/drv_preproc.cpp: Documented some of my changes
- 	  for NT, namely the fact that unlinking the output file while
- 	  still open causes the parsing to fail on NT.
-
-	* TAO_IDL/tao_idl.dsp: Added new folders for source files, header
- 	  files, template files, etc. I modelled this based on the ACE
- 	  project files.
-
-Sat Oct 25 22:05:43 1997  Sergio Flores  <sergio@macarena.cs.wustl.edu>
-
-	* TAO_IDL/ast/ast_constant.cpp (exprtype_to_string):
-	Added case statements to handle the rest of un-handled
-	enumerations from AST_Expression::ExprType.  These will
-	handle a default value (i.e. the same case as
-	AST_Expression::EV_none).
-
-	* TAO_IDL/ast/ast_expression.cpp (operator==):
-	* TAO_IDL/ast/ast_expression.cpp (compare):
-	Make the default return value I_FALSE instead of NULL which
-	was  giving "lacks a cast" warning.
-
-	* TAO_IDL/ast/ast_expression.cpp (fill_definition_details):
-	Use 0 instead of NULL to initialize pointers in the
-	member initialization list, again to avoid ANSI C++ forbids
-	implicit (void *) conversions warnings.
-
-	* TAO_IDL/ast/ast_expression.cpp (eval_symbol):
-	Initialized pointers to 0.
-
-Sat Oct 25 17:45:17 1997  Aniruddha Gokhale  <gokhale@mambo.cs.wustl.edu>
-
-	* TAO_IDL/driver/drv_preproc.cpp: Fixed the same bug that Sumedh
-	fixed. In addition, ACEified the calls to strcat and strcmp in
-	that file.
-
-	* TAO_IDL/fe/idl.ll: Used %array in the defintion section so that
-	flex uses yytext as an array of characters rather than pointer to
-	char. The pointer case was resulting in a segmentation fault due
-	to lack of memory allocation for the yytext variable. However, we
-	choose to use the array approach to be compatile with "lex"
-	behavior.
-
-Sat Oct 25 1997  Sumedh Mungee  <sumedh@lindy.cs.wustl.edu>
-
-	* TAO_IDL/driver/drv_preproc.cpp: Fixed proper tmp filename
-	creation.
-
-Sat Oct 25 14:14:53 1997  Carlos O'Ryan  <coryan@MILONGA>
-
-	* TAO_IDL/tao_idl.dsw:
-	* TAO_IDL/tao_idl.dsp:
-	  Added a MSVC++ project file for the IDL compiler, needs several
-	  revisions byt the NT experts before shipping, but it has served
-	  me well.
-
-	* TAO_IDL/driver/drv_fork.cpp:
-	* TAO_IDL/driver/drv_preproc.cpp:
-	  We use ACE components to fork&exec subprocesses, get the default
-	  TMP directory and generate protable pathnames.
-	  In one case the mapping to NT is not clear: the use case is fork
-	  to get a "fresh" copy of the process and provide a unit of
-	  protection for the parent; this feature is only used if more
-	  than one IDL file is compiled at the same time.
-
-	* TAO_IDL/be/be_decl.cpp:
-	  Fixed minor bug, it said "second - I_FALSE;", it should be
-	  "second = I_FALSE
-
-	* TAO_IDL/ast/ast_argument.cpp:
-	* TAO_IDL/ast/ast_array.cpp:
-	* TAO_IDL/ast/ast_attribute.cpp:
-	* TAO_IDL/ast/ast_check.cpp:
-	* TAO_IDL/ast/ast_concrete_type.cpp:
-	* TAO_IDL/ast/ast_constant.cpp:
-	* TAO_IDL/ast/ast_decl.cpp:
-	* TAO_IDL/ast/ast_enum.cpp:
-	* TAO_IDL/ast/ast_enum_val.cpp:
-	* TAO_IDL/ast/ast_exception.cpp:
-	* TAO_IDL/ast/ast_expression.cpp:
-	* TAO_IDL/ast/ast_field.cpp:
-	* TAO_IDL/ast/ast_generator.cpp:
-	* TAO_IDL/ast/ast_interface.cpp:
-	* TAO_IDL/ast/ast_interface_fwd.cpp:
-	* TAO_IDL/ast/ast_module.cpp:
-	* TAO_IDL/ast/ast_operation.cpp:
-	* TAO_IDL/ast/ast_predefined_type.cpp:
-	* TAO_IDL/ast/ast_recursive.cpp:
-	* TAO_IDL/ast/ast_redef.cpp:
-	* TAO_IDL/ast/ast_root.cpp:
-	* TAO_IDL/ast/ast_sequence.cpp:
-	* TAO_IDL/ast/ast_string.cpp:
-	* TAO_IDL/ast/ast_structure.cpp:
-	* TAO_IDL/ast/ast_type.cpp:
-	* TAO_IDL/ast/ast_union.cpp:
-	* TAO_IDL/ast/ast_union_branch.cpp:
-	* TAO_IDL/ast/ast_union_label.cpp:
-	* TAO_IDL/be/be_args.cpp:
-	* TAO_IDL/be/be_constant.cpp:
-	* TAO_IDL/be/be_generator.cpp:
-	* TAO_IDL/be/be_init.cpp:
-	* TAO_IDL/be/be_produce.cpp:
-	* TAO_IDL/be_include/be.h:
-	* TAO_IDL/be_include/be_generator.h:
-	* TAO_IDL/driver/drv_args.cpp:
-	* TAO_IDL/driver/drv_fork.cpp:
-	* TAO_IDL/driver/drv_init.cpp:
-	* TAO_IDL/driver/drv_main.cpp:
-	* TAO_IDL/driver/drv_preproc.cpp:
-	* TAO_IDL/driver/drv_private.cpp:
-	* TAO_IDL/fe/fe_declarator.cpp:
-	* TAO_IDL/fe/fe_extern.cpp:
-	* TAO_IDL/fe/fe_init.cpp:
-	* TAO_IDL/fe/fe_interface_header.cpp:
-	* TAO_IDL/fe/fe_private.cpp:
-	* TAO_IDL/fe/lex.yy.cpp:
-	* TAO_IDL/fe/y.tab.cpp:
-	* TAO_IDL/include/ast.h:
-	* TAO_IDL/include/ast_argument.h:
-	* TAO_IDL/include/ast_array.h:
-	* TAO_IDL/include/ast_attribute.h:
-	* TAO_IDL/include/ast_concrete_type.h:
-	* TAO_IDL/include/ast_constant.h:
-	* TAO_IDL/include/ast_decl.h:
-	* TAO_IDL/include/ast_enum.h:
-	* TAO_IDL/include/ast_enum_val.h:
-	* TAO_IDL/include/ast_exception.h:
-	* TAO_IDL/include/ast_expression.h:
-	* TAO_IDL/include/ast_extern.h:
-	* TAO_IDL/include/ast_field.h:
-	* TAO_IDL/include/ast_generator.h:
-	* TAO_IDL/include/ast_interface.h:
-	* TAO_IDL/include/ast_interface_fwd.h:
-	* TAO_IDL/include/ast_module.h:
-	* TAO_IDL/include/ast_operation.h:
-	* TAO_IDL/include/ast_predefined_type.h:
-	* TAO_IDL/include/ast_root.h:
-	* TAO_IDL/include/ast_sequence.h:
-	* TAO_IDL/include/ast_string.h:
-	* TAO_IDL/include/ast_structure.h:
-	* TAO_IDL/include/ast_type.h:
-	* TAO_IDL/include/ast_typedef.h:
-	* TAO_IDL/include/ast_union.h:
-	* TAO_IDL/include/ast_union_branch.h:
-	* TAO_IDL/include/ast_union_label.h:
-	* TAO_IDL/include/be_extern.h:
-	* TAO_IDL/include/drv_extern.h:
-	* TAO_IDL/include/drv_private.h:
-	* TAO_IDL/include/fe_declarator.h:
-	* TAO_IDL/include/fe_extern.h:
-	* TAO_IDL/include/fe_interface_header.h:
-	* TAO_IDL/include/fe_private.h:
-	* TAO_IDL/include/global_extern.h:
-	* TAO_IDL/include/idl.h:
-	* TAO_IDL/include/idl_bool.h:
-	* TAO_IDL/include/idl_defines.h:
-	* TAO_IDL/include/idl_extern.h:
-	* TAO_IDL/include/idl_fwd.h:
-	* TAO_IDL/include/idl_global.h:
-	* TAO_IDL/include/idl_narrow.h:
-	* TAO_IDL/include/intlmacros.h:
-	* TAO_IDL/include/nr_extern.h:
-	* TAO_IDL/include/util.h:
-	* TAO_IDL/include/utl_decllist.h:
-	* TAO_IDL/include/utl_error.h:
-	* TAO_IDL/include/utl_exceptlist.h:
-	* TAO_IDL/include/utl_exprlist.h:
-	* TAO_IDL/include/utl_identifier.h:
-	* TAO_IDL/include/utl_idlist.h:
-	* TAO_IDL/include/utl_indenter.h:
-	* TAO_IDL/include/utl_labellist.h:
-	* TAO_IDL/include/utl_list.h:
-	* TAO_IDL/include/utl_namelist.h:
-	* TAO_IDL/include/utl_scope.h:
-	* TAO_IDL/include/utl_scoped_name.h:
-	* TAO_IDL/include/utl_stack.h:
-	* TAO_IDL/include/utl_string.h:
-	* TAO_IDL/include/utl_strlist.h:
-	* TAO_IDL/include/utl_tmpl/utl_decllist.h:
-	* TAO_IDL/include/utl_tmpl/utl_exceptlist.h:
-	* TAO_IDL/include/utl_tmpl/utl_exprlist.h:
-	* TAO_IDL/include/utl_tmpl/utl_idlist.h:
-	* TAO_IDL/include/utl_tmpl/utl_labellist.h:
-	* TAO_IDL/include/utl_tmpl/utl_list.h:
-	* TAO_IDL/include/utl_tmpl/utl_namelist.h:
-	* TAO_IDL/include/utl_tmpl/utl_strlist.h:
-	* TAO_IDL/narrow/narrow.cpp:
-	* TAO_IDL/util/utl_decllist.cpp:
-	* TAO_IDL/util/utl_error.cpp:
-	* TAO_IDL/util/utl_exceptlist.cpp:
-	* TAO_IDL/util/utl_exprlist.cpp:
-	* TAO_IDL/util/utl_global.cpp:
-	* TAO_IDL/util/utl_identifier.cpp:
-	* TAO_IDL/util/utl_idlist.cpp:
-	* TAO_IDL/util/utl_indenter.cpp:
-	* TAO_IDL/util/utl_labellist.cpp:
-	* TAO_IDL/util/utl_list.cpp:
-	* TAO_IDL/util/utl_namelist.cpp:
-	* TAO_IDL/util/utl_scope.cpp:
-	* TAO_IDL/util/utl_stack.cpp:
-	* TAO_IDL/util/utl_string.cpp:
-	* TAO_IDL/util/utl_strlist.cpp:
-	* TAO_IDL/util/utl_tmpl/utl_decllist.cpp:
-	* TAO_IDL/util/utl_tmpl/utl_exceptlist.cpp:
-	* TAO_IDL/util/utl_tmpl/utl_exprlist.cpp:
-	* TAO_IDL/util/utl_tmpl/utl_idlist.cpp:
-	* TAO_IDL/util/utl_tmpl/utl_labellist.cpp:
-	* TAO_IDL/util/utl_tmpl/utl_list.cpp:
-	* TAO_IDL/util/utl_tmpl/utl_namelist.cpp:
-	* TAO_IDL/util/utl_tmpl/utl_strlist.cpp:
-	  Removed a *big* number of warnings, in an attempt to surface
-	  real problems. The main one was "#pragma ident" and some unused
-	  variables.
-
-Sat Oct 25 06:22:03 1997  Aniruddha Gokhale  <gokhale@mambo.cs.wustl.edu>
-
-	* TAO_IDL/fe/idl.yy: I got errors parsing the idl.yy thru
-	bison. There were errors indicating "type clash on default action".
-
-	This had to do with the fact that the non-terminal "type_dcl" did not
-	have any type defined for it, but it had "struct_type", "union_type"
-	and others on the right-hand side of the rules. The default action of
-	YACC is supposed to assign $1 to $$. So the type for "struct_type"
-	that happened to be a AST_Decl node was getting assigned to the
-	non-terminal "type_dcl" who had no type.
-
-	I am very surprised that the "yacc" on our Sparcs never ever gave this
-	error, but bison did.
-
-	Hence I have modified idl.yy slightly so that I have {$$ = 0;} as the
-	default action. In addition, the non-terminal "type_dcl" is now
-	defined to be of type "ival" which is defined as long inside the
-	%union clause.
-
-	Above all, the bison generated files required some prototypes. So I
-	had to add the following to idl.yy in the declarations section.
-
-	int yylex (void);
-	void yyerror (char *);
-	extern "C" yywrap (void);
-
-	Somehow, this yywrap had to be under extern "C". I don't know why the
-	others need not be under extern "C".
-
-
-Sat Oct 25 00:05:05 1997  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-	* TAO version 0.0.15, released Sat Oct 25 00:05:05 1997.
-
-Sat Oct 25 02:46:05 1997  Sergio Flores  <sergio@macarena.cs.wustl.edu>
-
-	* TAO_IDL/fe/Makefile:
-	Changed the YACC variable to use the bison compiler.
-	Added "-y" to YFLAGS to make bison generate output files like yacc.
-	Changed the LEX variable to use the flex parser instead of lex.
-	These programs generate code that has less warnings and is better
-	code in general.
-	Added "-D_REENTRANT" to CPPFLAGS, to be able to eliminate the warnings
-	in lex.yy.cpp.  This could also be fixed if we include "ace/ACE.h" at
-	the beginning of lex.yy.cpp, but this file is generated with flex.
-
-	* TAO_IDL/fe/idl.yy:
-	Added ACE_UNUSED_ARG macro to avoid unused variable warning,
-	for variable "AST_Decl *v".
-
-	* TAO_IDL/fe/idl.ll (idl_atof):
-	Added ACE_UNUSED_ARG macro to avoid unused variable warning,
-	for variable f and h.
-
-	* TAO_IDL/include/idl.h:
-	Added include file "ace/ACE.h".  This was necessary to eliminate
-	warnings of implicit declarations, which were because the _REENTRANT
-	flag was not defined.
-
-	* TAO_IDL/ast/ast_operation.cpp (AST_Operation):
-	Reordered member initializers to match declaration order to
-	eliminate warnings from the compiler.
-
-	* TAO_IDL/ast/ast_operation.cpp (fe_add_exceptions):
-	Added ACE_UNUSED_ARG macro to avoid unused variable warning,
-	for variable fs.
-
-	* TAO_IDL/ast/ast_interface.cpp (AST_Interface):
-	Reordered member initializers to match declaration order to
-	eliminate warnings from the compiler.
-
-	* TAO_IDL/ast/ast_expression.cpp (operator==):
-	* TAO_IDL/ast/ast_expression.cpp (coerce):
-	* TAO_IDL/ast/ast_expression.cpp (coerce_value):
-	* TAO_IDL/ast/ast_expression.cpp (compare):
-	* TAO_IDL/ast/ast_expression.cpp (dump_expr_val):
-	Added case statements to handle the rest of un-handled
-	enumerations from AST_Expression::ExprType.  These will
-	handle a default value (i.e. the same case as
-	AST_Expression::EV_none).  Enumerations added are:
-	AST_Expression::EV_wstring
-	AST_Expression::EV_wchar
-	AST_Expression::EV_longdouble
-	AST_Expression::EV_ulonglong
-	AST_Expression::EV_longlong
-
-	* TAO_IDL/ast/ast_expression.cpp (AST_Expression):
-	Reordered member initializers to match declaration order to
-	eliminate warnings from the compiler.
-
-	* TAO_IDL/ast/ast_decl.cpp (AST_Decl):
-	Reordered member initializers to match declaration order to
-	eliminate warnings from the compiler.
-	Also, use 0 instead of NULL to initialize pointers in the
-	member initialization list, again to avoid ANSI C++ forbids
-	implicit (void *) conversions warnings.
-
-	* TAO_IDL/ast/ast_array.cpp (dump):
-	Added "unsigned" to index variable "i" used in for() loop,
-	to avoid warning "comparison between unsigned and signed"
-
-	* TAO_IDL/ast/ast_array.cpp (compute_dims):
-	Added "unsigned" to index variable "i" used in for() loop,
-	to avoid warning "comparison between unsigned and signed"
-
-	* TAO_IDL/ast/ast_array.cpp (AST_Array):
-	Reordered member initializers to match declaration order to
-	eliminate warnings from the compiler.
-
-	* TAO_IDL/fe/fe_declarator.cpp (FE_Declarator):
-	Reordered member initializers to match declaration order to
-	eliminate warnings from the compiler.
-
-	* TAO_IDL/driver/drv_main.cpp (DRV_drive):
-	Added ACE_UNUSED_ARG macro to avoid unused variable warning.
-
-	* TAO_IDL/ast/ast_recursive.cpp (AST_illegal_recursive_type):
-	Initialized pointer variables to avoid warnings.
-
-Fri Oct 24 19:18:22 1997  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-	* tao: Changed remaining uses of BOA to POA.
-
-	* cubit_i.cpp (please_exit): Replaced the call to
- 	please_shutdown() on the POA (which no longer exists) with the
- 	shutdown() call on the ORB.
-
-	* tests/IDL_Cubit/svr.cpp: Removed
-
-	oa_ptr->clean_shutdown (env);
-
-	since this is no longer supported in TAO's POA.
-
-	* tao/poa.h: Changed the get_boa() method to get_poa().  Even this
- 	will probably go away soon.
-
-Fri Oct 24 18:25:00 1997  Aniruddha Gokhale  <gokhale@flamenco.cs.wustl.edu>
-
-	* TAO/tao/svrrqst.cpp: Method params was allocating memory even
- 	when the Any's already had memory allocated for the IN and INOUT
- 	parameters. Due to this the params would retrieve results in the
- 	allocated storage whereas the stubs/skeletons would continue to
- 	use variables that they had defined to hold the values.
-
-Fri Oct 24 17:33:21 1997  Chris Cleeland  <cleeland@cs.wustl.edu>
-
-	* tao/poa.*: #ifdef'd out the IIOP 1.4 references to shutdown.
-  	I'm leaving them in there right now because they might be useful
- 	as private member later when we need to figure out how to get OAs
- 	to cooperate and shut themselves down in the face of an ORB
- 	shutdown.
-
-	* tao/orbobj.h (shutdown): Fixed up documentation.
-
-	* tao/orbobj.i (shutdown): Provided appropriate arg default.
-
-	* tests/Cubit/TAO/svr.cpp: Eliminated unnecessary Object Adapter
- 	name from POA_init() invocation.
-
-	* tests/Cubit/TAO/cubit_i.cpp (Cubit_please_exit): Revised to use
- 	the new ORB::shutdown() method.
-
-	* tests/Cubit/TAO/clnt.cpp: Got rid of IIOP 1.4-style debug
- 	message calls.
-
-	* tao/orbobj.cpp (CORBA_ORB::ORB_init): Corrected a heinous
- 	problem in the option parsing loop where argvec_shift() would be
- 	asked to shift two argv elements when there was only one.  This
- 	could cause problems if an option that required an argument didn't
- 	include the argument.  Thanks to Manojkumar Acharya
- 	<cvsf325.gpt.co.uk> for sending in a bug report that lead to my
- 	finding this!
-
-Fri Oct 24 14:08:12  Aniruddha Gokhale  <gokhale@mambo.cs.wustl.edu>
-
-	* Improved the compiler to make Unions work. The most subtle error
-	was the way the private section of the class for unions was being
-	generated. TAO's Typecode library expected the union members to be
-	inside of a C++  union declaration inside the private
-	section. Whereas the compiler was generating each member
-	separately.
-
-	Another source of error was bad typecode tables getting
-	generated. This is now fixed.
-
-	* TAO/tests/IDL_Cubit: The cubit_i.cpp for cube_union was doing
-	wrong calculations for structs. This was due to my copy-paste
-	tendency and not verifying if it was correct or not. This has been
-	fixed. The README file is updated to reflect the fact that this
-	directory contains code that uses the IDL compiler.
-
-Fri Oct 24 01:54:00 1997  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-	* TAO version 0.0.14, released Fri Oct 24 01:54:00 1997.
-
-Fri Oct 24 01:02:01 1997  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-	* clnt.cpp: Removed mysterious obsolete definitions of
-	cube_union_stub() and cube_union_dii().
-
-	* be_state.h: Added definitions for the methods in class
- 	be_state_attribute.  For some reason, they were missing.
-
-	* TAO_IDL/be/be_state.cpp: Added the necessary template
- 	specializations so that the TAO IDL compiler will work with GCC.
-
-Thu Oct 23 22:46:10 1997  Aniruddha Gokhale  <gokhale@mambo.cs.wustl.edu>
-
-	* TAO IDL Compiler: More progress in terms of getting the Cubit
-	example to work with the IDL generated code. However, we are still
-	finding some problems with using the client-side cubit_union_dii
-	to work properly.
-
-	Much of the improvements were to the server-side skeletons for
-	operations. In addition, code for union constructors, assignment
-	operator, and accessor for discriminant added.
-
-	Some bugs in typecode generation are fixed. This had to do with
-	the encapsulation length for predefined types. It was returning -1
-	as opposed to 0.
-
-	* TAO/tests/IDL_Cubit: Added this directory with the cubit
-	example. Use this to test the IDL compiler. The makefile will
-	invoke the IDL compiler to create the required files.
-
-Thu Oct 23 18:34:02 1997  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-	* tests/*/Makefile: Fixed the Makefiles so that it has the correct
- 	files and dependencies.  Thanks to Steven Wohlever
- 	<wohlever@mitre.org> for reporting this.
-
-Wed Oct 22 20:02:39 1997  Chris Cleeland  <cleeland@cs.wustl.edu>
-
-	* README.sun: Added an explicit reminder at the top that the
- 	information in this file is historical in nature and does not
- 	necessarily apply to current reality.
-
-	* tao/orbobj.* (shutdown): Added code to the run() event loop so
- 	that it will terminate when it finds a flag set.  This involved
- 	adding the flag to the ORB's state and minimally implementing the
- 	shutdown() method.  The shutdown method still does not honor the
- 	"wait for completion" flag which can be passed to it, though.
-
-	* README: Updated the season from "summer" to "Fall" ;-) Also
- 	added a note that warned people not to try to link TAO with a
- 	version of ACE that's linked with another ORB library, e.g.,
- 	liborbix.so.  Thanks to Steven Wohlever <wohlever@mitre.org> for
- 	bringing this instructional omission to our attention.
-
-	* tao/tao_internals.cpp (fake_service_entries_i): Made the body of
- 	this function conditional on the TAO_PLATFORM_SVC_CONF_FILE_NOTSUP
- 	preprocessor definition since it doesn't need to exist in
- 	platforms that grok the Service Configurator.  This will also
- 	reduce the memory footprint :-).  Thanks to David Miron
- 	<dxm@crapper.dsto.defence.gov.au> for pointing this out!
-
-	* tao/orb_core.cpp (TAO_ORB_Core): Removed explicit CTOR
- 	initialization of reactor_ member.
-
-Wed Oct 22 19:37:22 1997  Aniruddha Gokhale  <gokhale@mambo.cs.wustl.edu>
-
-	* TAO IDL Compiler: Improvements made so that the server-side
-	skeletons for operations now generate valid code. The code
-	generated for the Cubit.idl was compiling cleanly. It is under
-	test currently to see if it runs.
-
-	* Some progress in handling forward declarations of interfaces.
-
-Wed Oct 22 12:55:19 1997    <nw1@CHA-CHA>
-
-	* tao/poa.h:  Added ACE_Svc_Export to class CORBA_POA.
-
-	* tao/TAO.{mdp,mak}:  Updated files in project file.
-
-	* tao/TAO.dsp: Removed boa, Orb_Core and added poa, orb_core to
- 	  the project file.
-
-Tue Oct 21 17:21:51 1997  Chris Cleeland  <cleeland@cs.wustl.edu>
-
-	* docs/releasenotes/orbcore.html: Updated to reflect daily
- 	progress.
-
-	* tests/Cubit/TAO/Makefile: Updated dependencies.
-
-	* tests/Cubit/TAO/svc.conf: Updated to eliminate empty quotes at
- 	the end that tickled a deficiency in the Service Configurator's
- 	grammar.
-
-	* tests/multiCubit/svr.cpp: Updated to reflect POA_init change.
-
-	* tests/Thruput_test/Makefile: Modified to reflect filename
- 	changes.
-
-	* tests/Thruput_test/server.cpp: Changed type of argv so that it
- 	matched properly.
-
-	* tao/boa.*: Renamed to tao/poa.*.
-
-	* tao/Orb_Core.*: Renamed to tao/orb_core.*.
-
-	* tao/{Makefile,corba.h,default_client.cpp,default_server.cpp,orb.h,orbobj.cpp,params.h}:
- 	Modified to reflect filename changes.
-
-Tue Oct 21 13:23:48 1997 Brian Mendel  <brian.r.mendel@boeing.com>
-
-	* tao/connect.i: Moved hash_i and compare_i template
- 	  specialization to Orb_Core.i.  Original code was left comment
- 	  out until this mod is checked on all platforms.
-
-	* tao/Orb_Core.i: Added hash_i and compare_i code from connect.i.
-
-Tue Oct 21 03:23:29 1997  Nanbor Wang  <nw1@cumbia.cs.wustl.edu>
-
-	* tao/Orb_Core.cpp: Removed conditional inclusion of Orb_Core.i
-	  since, according to corba.h, it is always included as an inline
-	  function file.
-
-Tue Oct 21 02:24:14 1997  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-	* TAO version 0.0.13, released Tue Oct 21 02:24:14 1997.
-
-Mon Oct 20 23:42:48 1997  Douglas C. Schmidt  <schmidt@flamenco.cs.wustl.edu>
-
-	* TAO/boa: Changed BOA_init() to POA_init() to be
-	  more consistent...
-
-	* TAO_IDL/be/be_interface.cpp,
-          tests/TAO/Thruput_test/server.cpp,
-	  tests/TAO/Thruput_test/ttcpS.cpp,
-	  tests/TAO/RT_test/Task_Client.cpp,
-	  tests/TAO/RT_test/cubit_impl.cpp,
-	  tests/TAO/multiCubit/cubitS.cpp,
-	  tests/TAO/multiCubit/svr.cpp,
-	  tests/TAO/Demux_Test/server.cpp,
-	  tests/TAO/Demux_Test/CodeGen/skel.cpp,
-	  tests/TAO/MT-Cubit/client/Task_Client.cpp,
-	  tests/TAO/MT-Cubit/server/cubitS.cpp,
-	  tests/TAO/MT-Cubit/server/svr.cpp,
-	  tests/TAO/cubitS.cpp,
-	  tests/TAO/svr.cpp,
-	  tests/TAO/test1_svr.cpp: Changed BOA to POA to reflect the
-	  new naming conventions.
-
-	* tao/stub.i (STUB_Object): Removed a stray default value from the
- 	STUB_Object constructor...  Thanks to Carlos for noticing this.
-
-MOn Oct 20 10:14:09 1997  Aniruddha Gokhale  <gokhale@mambo.cs.wustl.edu>
-
-	* Improved version of the TAO IDL compiler. The executable has
- 	been renamed to tao_idl. There are a number of improvements as
- 	well as shortcomings. These are explained in the
- 	docs/releasenotes/index.html page, which can be viewed online at
- 	http://www.cs.wustl.edu/~schmidt/ACE_wrappers/TAO/docs/releasenotes/.
-
-Mon Oct 20 16:30:29 1997  Chris Cleeland  <cleeland@cs.wustl.edu>
-
-	* tao/tao_internals.cpp (fake_service_entries_i): Based the
- 	arguments to the faked server service entry for VxWorks on the
- 	TAO_HAS_TSS_ORBCORE compilation flag.  This should hopefully
- 	eliminate the problems Boeing was seeing in the early rounds of
- 	testing the most recent release of TAO.
-
-	* tao/{iiopobj.*,giop.h}: Moved a lock that had been in
- 	TAO_GIOP_Invocation (why?  I don't know) into IIOP_Object.  It
- 	protects the fwd_profile_ pointer, which has now become private.
-  	Also added accessors for the data member as well as the lock.
-  	Accessors come in two flavors--thead-safe (fwd_profile()) and
- 	non-thread-safe (fwd_profile_i()).  The non-thread-safe variety
- 	expect that the lock will be taken and held for the duration of
- 	their usage, but no checking is performed in this respect.
-
-	* tao/giop.cpp: Changed references to the IIOP_Object::fwd_profile
- 	data member to go through the new accessors (see above).
-
-	* tao/stub.i: Created new file with inline methods for
- 	STUB_Object.
-
-	* tao/stub.h: Moved inline method definitions into a new
- 	file--stub.i.
-
-	* tao/orbobj.cpp (BOA_init): Eliminated dead code and unused
- 	variable.
-
-	* tao/except.cpp (print_exception): Eliminated unused argument
- 	warning detected by gcc.
-
-	* tao/corba.h: Re-ordered inclusion of Orb_Core.i to eliminate
- 	'function used before declared inline' errors detected by gcc.
-
-	* tao/{Orb_Core,boa,corbacom,orb,orbobj,svrrqst}.*: Renamed BOA to
- 	POA.
-
-	* docs/releasenotes*: Moved releasenotes.html into a directory
- 	named "releasenotes" so that the various status pages can live
- 	independently.  Currently only the ORB Core's status page is
- 	broken out, but the documentation should eventually turn into two
- 	frames with the one at the top acting as the guide and the lower
- 	frame being the actual status document.
-
-Fri Oct 17 17:42:27 1997  Chris Cleeland  <cleeland@cs.wustl.edu>
-
-	* docs/releasenotes.html: Updated to reflect current status.
-
-	* tao/orbobj.*: Added some documentation for open() method.
-
-	* tao/roa.*: Gone.  Bye-bye.  Removed.
-
-Fri Oct 17 15:43:04 1997    <nw1@CHA-CHA>
-
-	* tao/connect.h: Added template instantiation supression directive
- 	  for Win32.  VC was complaining about duplicate symbols definition.
-
-Fri Oct 17 06:25:23 1997  Chris Cleeland  <cleeland@cs.wustl.edu>
-
-	* tao/{boa,roa}.*: Merged class ROA into class
- 	CORBA_BOA. Hopefully everything still works ;-)
-
-	* docs/releasenotes.html: Quick update for new TODO list.  Will be
- 	updated within the next day or so with dates, too.
-
-	* tao/{server_factory,orbobj,Orb_Core}.cpp: Corrected incorrect
- 	explicit template instantiations and added missing ones.
-
-Thu Oct 16 23:48:04 1997  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-	* TAO version 0.0.12, released Thu Oct 16 23:48:04 1997.
-
-Thu Oct 16 11:15:00 1997  Brian R. Mendel <brian.r.mendel@boeing.com>
-
-        * tao/server_factory.cpp: Added instantiation pragma for VxWorks for
-          ACE_Acceptor.  Added the template to the specialization section, also.
-
-        * tao/orbobj.cpp: Added instantiation pragma for VxWorks for
-          ACE_Cached_Connect_Strategy and ACE_Hash_Map_Manager for
-          ACE_Null_Mutex instantiations.  Also, added these to the template
-          specialization sections.
-
-        * tests/Cubit/Build/default.bld: Added TAO_PLATFORM_SVC_CONF_FILE_NOTSUP
-          to defines section of GHS build file.
-
-Tue Oct 14 21:11:20 1997  Douglas C. Schmidt  <schmidt@flamenco.cs.wustl.edu>
-
-	* tao/xdr.h: Changed int _fd to ACE_HANDLE _fd to work on NT.
-  	  Thanks to Satheesh Kumar <satheesh@aspectdv.com> for reporting
- 	  this.
-
-Tue Oct 14 02:48:21 1997  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-	* TAO version 0.0.11, released Tue Oct 14 02:48:21 1997.
-
-Mon Oct 13 23:30:16 1997    <irfan@TWOSTEP>
-
-	* tao/connect.h: If we are using TSS, there is no reason to use
- 	  locking in the connector. Therefore, I added a new typedef that
- 	  defines the type of lock that should be used for the
- 	  cached_connect_strategy.  It is ACE_SYNCH_RW_MUTEX in the
- 	  non-TSS case, and ACE_SYNCH_NULL_MUTEX in the TSS case.
-
-Mon Oct 13 21:34:00 1997  Douglas C. Schmidt  <schmidt@flamenco.cs.wustl.edu>
-
-	* tao/svrrqst.cpp (oa): Cleaned up the coding style a bit.
-
-Sun Oct 12 15:38:35 1997  Douglas C. Schmidt  <schmidt@flamenco.cs.wustl.edu>
-
-	* tao/client_factory: Gutted the client factory code related to
- 	  the Strategy_Connector so that it's either in the TAO_Orb_Core.
-
-	* tao/default_client.h: Removed the connector() from the
- 	  Default_Client_Factory entirely since it's all been put into the
- 	  TAO_ORB_Core now.
-
-	* tao/giop.cpp (start): Hacked up the code so that we extract our
- 	  connector from thread-specific storage if we're using the
- 	  thread-per-rate concurrency model.  This needs to be integrated
- 	  more cleverly in the ORB.
-
-	* tao/orbobj.h: Put an instance of the TAO_CONNECTOR into each
- 	  TAO_ORB_Core object so that we don't have to share these things
- 	  among all of the threads in a process, but instead can have them
- 	  be located in thread-specific storage.
-
-	* tao/orbobj.cpp (perform_work): Updated the run() and
- 	  perform_work() methods to take optional ACE_Time_Value *'s (so
- 	  they can return from timeouts) and to return error flags if
- 	  things go wrong.
-
-	* tao/orbobj.h (CORBA_ORB): Changed the set_up_for_listening()
- 	  call to open(), which is more consistent with other usage in
- 	  ACE/TAO.
-
-	* tao/orbobj: Changed the name client_acceptor_ to peer_acceptor_
- 	  to reflect the fact that the connection model is more generic
- 	  than the notion of client/server interactions (which really take
- 	  place as the result of particular communication roles).
-
-	* tao/corba.h: Moved the order of #includes around so that
-	  "connect.h" is included before "client_factory.h"
-
-	* tao/connect.h: Moved the typedef of the ACE_Strategy_Connector<>
- 	  from the TAO_Client_Strategy_Factory into the global space and
- 	  renamed it TAO_CONNECTOR file so that it will be equivalent with
- 	  the TAO_ACCEPTOR.
-
-Thu Oct  9 23:17:37 1997  Douglas C. Schmidt  <schmidt@merengue.cs.wustl.edu>
-
-	* tao/giop.cpp (invoke): If an error occurs, make sure to mark the
- 	  handler_ as no longer being in use before we set it to 0.
-
-	* tao/giop.cpp (TAO_GIOP_Invocation): We need to make sure that
- 	  handler_ isn't 0 before we mark it as no longer being in use.
-
-Thu Oct  9 11:33:46 1997  Carlos O'Ryan  <coryan@macarena.cs.wustl.edu>
-
-	* tao/giop.cpp:
-	  There was a minor sintax error.
-
-Tue Oct 07 09:34:35 1997    <brian.r.mendel@boeing.com>
-
-        * tao/Orb_Core.h{cpp}: Added ACE_Svc_Export label to global
-        TAO_ORB_Core_instance() method.  Needed for DLL support on NT.i
-
-        * default.bld, tao.bld: Modified VxWorks build files to add new files.
-
-Tue Oct 07 07:05:38 1997  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-	* TAO version 0.0.10, released Tue Oct 07 07:05:38 1997.
-
-Mon Oct 06 22:11:40 1997    <nw1@CHA-CHA>
-
-	* tests/Cubit/TAO/cubit_i.cpp (Cubit_please_exit):
-	* tests/Cubit/TAO/cubitS.cpp (_skel_Cubit): Changed to use the new
-	  TAO_ORB_CORE_instance () global function.
-
-Mon Oct  6 20:06:05 1997  Chris Cleeland  <cleeland@cs.wustl.edu>
-
-	* tao/{boa.h,connect.cpp,giop.cpp,giop.h,roa.cpp,roa.h}:
- 	Eliminated unused methods and code.
-
-	* tao/Orb_Core.*: Created new global function called
- 	TAO_ORB_Core_instance() which will return the correct instance of
- 	the ORB Core state.  This had previously been accessed using
- 	TAO_ORB_CORE::instance(), but Win32s linking procedures made the
- 	template for TAO_ORB_CORE expand in both the application and the
- 	library/DLL, thus creating two singletons.  Bad scene.  The
- 	function should force the expansion of the template to only be in
- 	the DLL.
-
-	* tao/{connect,default_client,default_server,orbobj,roa}.cpp:
- 	Changed references to TAO_ORB_CORE::instance() to
- 	TAO_ORB_Core_instance().
-
-	* tao/singletons.h: Removed definition of TAO_ORB_CORE.
-
-Sat Oct  4 20:08:57 1997  Nanbor Wang  <nw1@cumbia.cs.wustl.edu>
-
-	* tao/TAO.{dsp,dsw}: Added tao_internals.cpp into project file
-	  list.
-
-	* tao/tao_internals.h (TAO_Internal): Added ACE_Svc_Export and
-	  $ I d $.
-
-	* tao/tao_internals.i (open_services): Added default return value
-	  0.
-
-	* tao/tao_internals.cpp: Added #include "tao/tao_internals.h" and
-	  the CVS $ I d $ field.  Also, we should include inline (.i) file
-	  for inline code.
-
-Fri Oct  3 09:29:05 1997  Chris Cleeland  <cleeland@merengue.cs.wustl.edu>
-
-	* tests/multiCubit/svr.cpp: Changed the key naming scheme back to
- 	not be unique throughout the process.  Process-unique code is
- 	still there, but conditionally compiled mutually-exclusive to the
- 	other scheme.
-
-	* tao/server_factory.*: The object_lookup_strategy method is gone
- 	and is replaced by the create_object_table factor method.  See
- 	more information below.
-
-	* tao/default_server.*: The server factory no longer holds on to a
- 	single pointer for the object lookup strategy.  In previous
- 	incarnations of TAO, this didn't cause problems, but the advent of
- 	ORB-per-thread highlighted the inherent badness in this
- 	implementation choice.  Gone is the object_lookup_strategy method,
- 	and in comes the create_object_table factory method, which creates
- 	and returns (and doesn't hold onto) an object table in accordance
- 	with parameters such as size and search algorithm.
-
-	* tao/roa.cpp: Changed to use the create_object_table method.
-
-Thu Oct  2 13:48:31 1997  Chris Cleeland  <cleeland@merengue.cs.wustl.edu>
-
-	* tests/multiCubit/svr.cpp: Modified the key generation scheme to
- 	include thread ID.  This works around a current shortcoming in the
- 	ORB Core in which the object table is shared throughout all object
- 	adapters (yes, this is being fixed).
-
-	* tao/tao_internals.*: Added new class to scope static operations
- 	and data completely internal to the ORB.
-
-	* tao/orbobj.{i,cpp}: Moved CORBA_ORB DTOR into cpp file.  Finally
- 	got rid of icky static mutex in ORB_init().  Moved service config
- 	initialization into TAO_Internal method.
-
-	* tao/Orb_Core.h: Added comments.
-
-Wed Oct  1 12:51:48 1997  Nanbor Wang  <nw1@cumbia.cs.wustl.edu>
-
-	* tao/corbacom.h: Removed CORBA:: name resolution from the class
-	  String_out which is itself defined in class CORBA.  MSVC doesn't
-	  like that.
-
-Wed Oct  1 10:44:55 1997  Aniruddha Gokhale  <gokhale@mambo.cs.wustl.edu>
-
-	* tao/varout.h: Fixed some template errors in class
-	TAO_Object_out. This was pointed to me by Carlos as he was
-	compiling TAO in SGI.
-
-Wed Oct  1 09:10:38 1997  Carlos O'Ryan  <coryan@macarena.cs.wustl.edu>
-
-	* docs/releasenotes.html:
-	  Updated information on the Event Channel, the use of the Naming
-	  Service is no longer a plan, it is done already.
-
-Tue Sep 30 20:14:29 1997  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-	* TAO version 0.0.9, released Tue Sep 30 20:14:29 1997.
-
-Tue Sep 30 19:42:09 1997  Douglas C. Schmidt  <schmidt@flamenco.cs.wustl.edu>
-
-        * Makefile: Removed "docs" from DIRS so we don't try to run
-	make in this directory.
-
-Tue Sep 30 17:27:00 1997  Chris Cleeland  <cleeland@cs.wustl.edu>
-
-	* <RELEASE>: Tagged a release for limited consumption until the
- 	Service Configurator bug is fixed.
-
-	* tests/multiCubit/svr.cpp: Added code to properly release CORBA
- 	objects.  Delays between task activations simply aid in debugging
- 	and are not necessary.
-
-	* tao/singletons.h: Made TAO_ORB_Core's singleton type
- 	compile-time selectable via the TAO_HAS_TSS_ORBCORE compiler flag.
-
-	* tao/orbobj.cpp: Corrected an incorrect shift count, and the ORB
- 	Core now defaults to using the host name of the local host.
-
-	* tao/Orb_Core.[hi]: Added explicit CTOR.
-
-	* tao/Orb_Core.cpp: Insured that the correct template type was
- 	instantiated.
-
-	* tao/Makefile: Added -DTAO_HAS_TSS_ORBCORE to CPPFLAGS.
-
-Tue Sep 30 16:43:12 1997  Chris Cleeland  <cleeland@cs.wustl.edu>
-
-	* docs/releasenotes.html: Added some notes on the ORB Core.
-
-Mon Sep 29 14:39:51 1997  Chris Cleeland  <cleeland@cs.wustl.edu>
-
-	* docs/{index,components,releasenotes}.html: Added additional
- 	documentation.
-
-Mon Sep 29 13:50:34 1997  Aniruddha Gokhale  <gokhale@mambo.cs.wustl.edu>
-
-	* TAO ORB changes:
-
-	any.*: Added _var and _out classes.
-
-	corbacom.{h,i} : Added _out types for primitive types, added _out and
-	updated _var classes for String. Added corbacom.i for implementing
-	the String's _var and _out classes
-
-	sequence.{h,i}: Added a number of templates for _var and _out
-	classes. However, these are yet to be used and tested.
-
-	* Alpha release of TAO IDL compiler added to this release. This is
-	an alpha release and we are currently putting it to rigorous
-	test. A large amount of code for the back end is added under the
-	TAO/TAO_IDL/be_include and TAO/TAO_IDL/be/ directories.
-
-	In addition, some amount of ACEification done to methods belonging
-	to the TAO/TAO_IDL/utils/ classes.
-
-	A few errors in the IDL grammar have been fixed in
-	fe/idl.yy. These had to do with the valid types for parameters and
-	operation return types. There are still some errors recognizing
-	unions which will be fixed later. The scanner (fe/idl.l) was
-	modified to recognize the OMG IDL data type "any".
-
-	* The ChangeLog file under TAO/TAO_IDL is removed and its contents
-	are inserted appropriately in this ChangeLog file
-
-Sun Sep 28 17:01:27 1997  Chris Cleeland  <cleeland@cs.wustl.edu>
-
-	* tests/multiCubit: Added a multi-threaded version of Cubit.
-
-	* tao/orbobj.cpp: At long last, Andy has his wish for not having
- 	to provide a "-ORBhost <me>" argument to a server.  It now uses
- 	ACE_OS::hostname() to determine the canonical hostname, and
- 	listens on that address.
-
-	* tao/singletons.h: Changed the ORB Core singleton to be a TSS
- 	singleton; this will eventually be conditionally compiled in
- 	(before release).  Also added comments and "safety defines".
-
-	* tao/except.cpp: Changed some usage of fputs() in
- 	print_exception() to use ACE_DEBUG.
-
-Sun Sep 28 03:18:24 1997  Nanbor Wang  <nw1@cumbia.cs.wustl.edu>
-
-	* tests/Cubit/TAO/cubitC.h (Object): Changed references of base
-	  class from "CORBA::Object" to "CORBA_Object."  MSVC doesn't
-	  allow this.
-
-	* tao/Orb_Core.h: Added ACE_Svc_Export to TAO_Orb_Core class.
-
-	* tao/corbacom.h: Added ACE_Svc_Export to all IID constants.
-	  Notice that we must put ACE_Svc_Export _after_ extern "C".
-
-Sat Sep 27 09:31:42 1997  Chris Cleeland  <cleeland@cs.wustl.edu>
-
-	* tao/Orb_Core.h: Fixed the friend declaration for
- 	CORBA::ORB_init().
-
-	* tests/Cubit/TAO/svr.cpp: Modified to use ORB::run() for event
- 	loop and eliminated code cruft.
-
-	* tao/orbobj.*: Added stubs for 4 methods on the ORB from the
- 	POA spec: work_pending, perform_work, run, and shutdown.  Of all
- 	of these, only run is reasonably implemented, and there not even
- 	according to the spec (because the way the spec works isn't really
- 	good for our purposes...need to work on that).  See the docs for
- 	information.
-
-	Moved the initialization of the Acceptor into its own method,
- 	set_up_for_listening (which is a one-shot style method), and
- 	placed a call to this within the aforementioned run method.
-
-	* tao/default_client.h: Miscellaneous comments added.
-
-	* tao/connect.cpp: Corrected an errant ACE_DEBUG () call.
-
-	* tao/Orb_Core.*: Added private methods to allow setting of the
- 	orb and extended the laurel of friendship to CORBA::ORB_init().
-
-Fri Sep 26 10:20:06 1997  Chris Cleeland  <cleeland@cs.wustl.edu>
-
-	* tao/orbobj.*: Added acceptor initialization code to CORBA_ORB
- 	CTOR.  (We still need to find a way to NOT do this on the client
- 	side.)  Moved CORBA_ORB CTOR into .cpp to avoid nasty
- 	interdependencies caused when it was in the .i file.  Moved the
- 	specification of host and port to be ORB parameters rather than OA
- 	parameters, i.e., -OAhost is now -ORBhost and -OAport is now
- 	-ORBport.
-
-	* tao/roa.*: Removed server-side connection endpoint
- 	initialization (Acceptor stuff) and put it into the ORB.
-
-	* tao/connect.h: Renamed ROA_Acceptor to TAO_Acceptor (since it's
- 	not related to the OA any longer), and restored explicit inclusion
- 	of ace headers to avoid having to include "corba.h".
-
-	* tao/boa.h: Removed unneeded get_addr() method.
-
-	* tests/Cubit/TAO/cubitS.cpp: Updates to support changes in ORB
- 	Core.
-
-Thu Sep 25 12:28:02 1997  Chris Cleeland  <cleeland@cs.wustl.edu>
-
-	* tao/params.*: Added explicit CTOR & DTOR for
- 	TAO_{OA,ORB}_Parameters classes that somehow got removed in the
- 	previous round of attacks.  Also specified all methods which go
- 	into the .i file as "LOCAL_INLINE" within the header.  This avoids
- 	having to unravel ugly, complex order interdependencies.
-
-Thu Sep 25 03:48:02 1997  Chris Cleeland  <cleeland@cs.wustl.edu>
-
-	* docs/Options.html: Terse documentation on options available for
- 	the abstract factories.
-
-	* tao/Orb_Core.*: Added this class (TAO_ORB_Core) to hold the
- 	"state" of an ORB.  The intent is that as we move towards
- 	different concurrency models, this can be thrown into
- 	thread-specific storage and remain a singleton, essentially
- 	allowing the running of an ORB-per-thread.
-
-	* tao/singletons.h: Added this file to contain type definitions
- 	for *ALL* ACE_Singleton<> types used within TAO.  This was
- 	motivated by a desire to eliminate the multitude of warnings
- 	generated by g++ regarding methods being called before declared
- 	inline, and the only way to eliminate this was to insure that all
- 	inlined methods were seen by the compiler before the
- 	ACE_Singleton<> definition.  Thus, corba.h includes singleton.h as
- 	the very last thing that it does.
-
-	* tao/params.*: TAO_OA_Parameters is no longer a singleton, and
- 	because of new recognition of associations in the object model for
- 	an ORB, lots of data members and their methods have been shuffled
- 	to other places or eliminated.  addr() now belongs in
- 	TAO_ORB_Parameters, and root_poa_ is in TAO_ORB_Core.  The
- 	using_threads_, thread_flags_, upcall_, and forwarder_ members
- 	have been eliminated and their roles taken over by the Concurrency
- 	Strategies and the new Dispatch call chain implemented in my last
- 	round of changes.
-
-	* tao/orbobj.cpp: Changed references to the ORB singleton to go
- 	through TAO_ORB_CORE::instance().  Also eliminated an unnecessary
- 	global function (_orb()).
-
-	* tao/marshal.h: Moved all ACE_Singleton<> typedefs into
- 	singleton.h.  See comment on tao/corba.h for more information.
-
-	* tao/iioporb.h: Removed unnecessary TAO_ORB singleton.  This is
- 	now assumed by TAO_ORB_Core instances.
-
-	* tao/corbacom.h: Added CORBA::POA_ptr for upward compatibility.
-
-	* tao/corba.h: Added Orb_Core.[hi] to the appropriate places.
-  	Moved iiop{orb,obj}.i inclusions around and moved typedef'ing of
- 	all ACE_Singletons into singletons.h, which must be #included
- 	AFTER all the inline files.  This eliminated all of the
- 	used-before-declared-inline warnings.
-
-	* tao/{connect,default_client,default_server,roa}.*: Updated
- 	singleton usages to go through the TAO_ORB_CORE singleton.
-
-	* tests/Cubit/TAO/{cubitS,cubit_i}.cpp: Updated singleton usages
- 	to go through the TAO_ORB_CORE singleton.
-
-Wed Sep 17 12:26:56 1997  Nanbor Wang  <nw1@CHA-CHA>
-
-	* tao/TAO.dsp: Updated source file list.
-
-Mon Sep 15 16:52:28 1997  Chris Cleeland  <cleeland@merengue.cs.wustl.edu>
-
-	* tests/Cubit/TAO/{cubitS,cubit_i}.cpp: Updated references to oa()
- 	to root_pos().
-
-	* tao/orbobj.cpp: Corrected some adjustments made for Service
- 	Configurator rework.
-
-	* tao/giop.h: Moved the def for TAO_GIOP_EndOfFile out of the
- 	range of valid GIOP messages.
-
-	* tao/connect.cpp: Added special case for TAO_GIOP_Reply to break
- 	out, and distinguished TAO_GIOP_EndOfFile from other errors by
- 	setting errno.
-
-	* tao/boa.cpp: The complete reply header is now stuck into the
- 	response stream...what a novel concept!
-
-Fri Sep 12 05:40:50 1997  Chris Cleeland  <cleeland@cs.wustl.edu>
-
-	* params.h: Renamed oa() method to be root_poa() in preparation
- 	for the future.
-
-	* orbobj.cpp: Adjusted the FAKE_SVC_ENTRY macro to catch up to
- 	recent changes in ACE.
-
-	* giop.*: Major surgery including elimination of GIOP as a giant
- 	namespace (now only static methods are in it).  Changed names of
- 	things to TAO_*.
-
-	* {encode,decode,iiopobj,invoke,roa}.*: Name changes resulting
- 	from giop.cpp surgery.
-
-	* corbacom.h: Moved TAO_opaque decl into here.
-
-	* corba.h: Re-ordered the inline #includes so that the stuff that
- 	is ALWAYS inlined is included prior to the stuff that's only
- 	inlined when __ACE_INLINE__ is turned on.
-
-	* connect.*: Modified handle_input() substantially.  Added 3
- 	template methods: read_message, handle_message, and send_response.
-
-	* {cdr,marshal,object,typecode}.h: Removed the old "always include
- 	inlines" hackery.
-
-	* boa.*: Added handle_request() method.
-
-Wed Sep 03 06:15:00 1997  Brian Mendel  <brian.r.mendel@boeing.com>
-
-	* tao/default_client.cpp:  Added conditional sections around the code for setting the
-	socket options for VxWorks.  VxWorks does not support a 64K buffer size.
-
-Tue Sep 02 18:32:12 1997  Brian Mendel  <brian.r.mendel@boeing.com>
-
-	* tao/orbobj.cpp:  Added include for Service_Repository.h to orbobj.h
-
-	* tao/debug.cpp: Removed the TAO_NEEDS_UNUSED_VARIABLES #defines
- 	around the debug_stream declaration.  debug_stream is used by
- 	dmsg_filter in debug.cpp.  Changed SYSTEM_EXCEPTION to
- 	CORBA::SYSTEM_EXCEPTION.
-
-	* tao/default_client.cpp: Removed extra parameter from
- 	ACE_Hash_Map_Entry #pragma instantiate statement.
-
-	* tao/objtable.cpp: Deleted pragmas for instantiating ACE_Guard,
- 	ACE_Read_Guard, and ACE_Write_Guard to eliminate duplicate
- 	instantiations.  Also, removed the instantiations from
- 	ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION for the same reason.
-
-	* tao/orbobj.cpp: Added a typecast to void * in argvec_shift
- 	method.
-
-	* tao/default.bld - Modified VxWorks Build File to change template
- 	instantiation modes.
-
-	* tao/tao.bld - Added default_client.cpp, default_server.cpp,
- 	client_factory.cpp, and server_factory.cpp to the VxWorks build
- 	file.
-
-	* tao/tao.dsp - Added default_client.cpp, default_server.cpp,
- 	client_factory.cpp, and server_factory.cpp to the Win NT project
- 	file.
-
-Tue Sep  2 07:31:45 1997  Chris Cleeland  <cleeland@cs.wustl.edu>
-
-	* tao/orbobj.cpp (ORB_init): VxWorks doesn't use
- 	ACE_Service_Config for now; the default factories are used.  The
- 	Service Repository is still used, but the appropriate values are
- 	"stuffed" in manually.
-
-Sat Aug 30 17:07:18 1997  Aniruddha Gokhale  <gokhale@mambo.cs.wustl.edu>
-
-	* tests/Thruput: First attempt at ACEifying it and removing the
-	tremendous amount of unnecessary stuff that was in there. This
-	modified version still needs testing on other platforms.
-
-Fri Aug 29 10:59:34 1997  Chris Cleeland  <cleeland@lambada.cs.wustl.edu>
-
-	* tao/Makefile (TAO_ROOT): FINALLY corrected the default
- 	definition of TAO_ROOT.
-
-Thu Aug 28 14:04:44 1997  Chris Cleeland  <cleeland@cs.wustl.edu>
-
-	* tao/orbobj.i (CORBA_ORB): Removed assertion that was incorrect
- 	b/c our ORB object is a singleton and not dynamically allocated,
- 	thus the refcount can only reach zero at the end of its life.
-
-	* tao/typecode.cpp (TC_Private_State): Relocated the delete of
- 	tc_discriminator_type_ to be after the deletion of the label list.
-  	This is because the discriminator will be inside each of the
- 	CORBA::Any instances within the label list, and deleting it before
- 	deleting the label list results in extreme badness.
-
-	* tao/typecode.* (operator delete): Added CORBA_TypeCode::operator
- 	delete() to simplify deletion of both automatically and
- 	dynamically allocated instances of CORBA_TypeCode.  This fixes the
- 	problem of freeing non-heap memory.
-
-	* tao/nvlist.h (CORBA_NamedValue): Initialized refcount_ in the
- 	CTOR.
-
-Mon Aug 18 16:39:40 1997  Carlos O'Ryan  <coryan@mambo.cs.wustl.edu>
-
-	* Makefile for TAO compiler:
-	  $(SOEXT) must be used instead of just .so, the former does not
-	  work on all platforms, notably HP-UX.
-
-Mon Aug 18 16:39:29 1997  Carlos O'Ryan  <coryan@mambo.cs.wustl.edu>
-
-	* tao/Makefile:
-	* tests/Demux_Test/CodeGen/Makefile:
-	  $(SOEXT) must be used instead of just .so, the former does not
-	  work on all platforms, notably HP-UX.
-
-Sun Aug 17 16:53:42 1997  Carlos O'Ryan  <coryan@swarm.cs.wustl.edu>
-
-	* IIOP/test/Orbeline/client/Profile_Timer.h:
-	* IIOP/tests/Cubit/VisiBroker/base_server/Profile_Timer.cpp:
-	* IIOP/tests/Cubit/VisiBroker/base_server/Profile_Timer.h:
-	* IIOP/tests/Cubit/VisiBroker/client/Profile_Timer.cpp:
-	* IIOP/tests/Cubit/VisiBroker/client/Profile_Timer.h:
-	* tests/Cubit/VisiBroker/base_server/Profile_Timer.cpp:
-	* tests/Cubit/VisiBroker/base_server/Profile_Timer.h:
-	* tests/Cubit/VisiBroker/client/Profile_Timer.cpp:
-	* tests/Cubit/VisiBroker/client/Profile_Timer.h:
-	We no longer use timestruct_t in ACE, it is a SYSVism; we use
-	timespec_t instead.
-
-Sat Aug 16 01:11:56 1997  Chris Cleeland  <cleeland@cs.wustl.edu>
-
-	* tests/Cubit/TAO/svc.conf: Added this as an example of an
- 	application's service config configuration file.  It also serves
- 	as the documentation for various strategy factory options at the
- 	moment.
-
-	* tao/orbobj.cpp: Options parsed by the ORB are now
-	-ORBsvcconf <filename>    specifies the service configurator
- 	                          file to be used
-	-ORBdaemon                turn this into a daemon
-	-ORBdebug                 turns debugging on in the service
-	                          configurator
-
-	BOA_init() now sets the itself in the TAO_OA_Parameters singleton.
-
-	* tao/orbobj.*: Changed client_factory(), server_factory(), and
- 	params() to return pointers rather than references.
-
-	* tao/{roa,giop}.cpp: Updated code that uses the
- 	CORBA::ORB::client_factory() to deal with the fact that it now
- 	returns a pointer rather than a reference.
-
-	* tao/default_server.cpp (init): This method now properly
- 	initializes the contained reactive and threaded strategies so that
- 	they're actually usable!
-
-	* tao/connect.cpp: Added #endif comments.
-
-Wed Aug 13 17:42:39 1997  Chris Cleeland  <cleeland@cs.wustl.edu>
-
-	* tests/Cubit/TAO/*: Converted to the CORBA:: namespace.
-
-	* tao/default_server.h: Eliminated a few strategy accessors since
- 	they aren't provided by this implementation.
-
-	* tao/default_server.cpp: Made this compile.
-
-	* tao/corbacom.h: Slight reformatting of code.  More importantly,
- 	added 'static' to the decl of ORB_init().
-
-	* tao/corba.h: Added fake comment to trigger C++ mode.
-
-	* tao/any.h: Added #endif comments.
-
-Tue Aug 12 22:37:06 1997  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-        * tao/{any,typecode,cdr}.h: Finished appeasing the compiler gods
-	so that we can remove the ACE_INLINE hack.  Things now seem to be
-	in order.
-
-	* tao/corba.h: Got all the frigging header *.i files #included in
- 	the right order so that the GCC compiler stops complaining.
-
-	* tao/giop.cpp: We had method definitions that were defined inline
- 	within the giop.h file.  This was causing problems for GCC, which
- 	kept warning that methods in the cdi.i file were being used before
- 	being inlined.  I've fixed this by creating a giop.i file.
-
-	* tao/corba.h: Add #include files should be prefixed by "tao/".
-  	I've fixed this in the release.
-
-Tue Aug 12 16:23:17 1997  Chris Cleeland  <cleeland@cs.wustl.edu>
-
-	* tao/any.i: Added a missing replace() method used by overloaded
- 	operators.
-
-	* tao/{any,cdr}.h: Added conditional ACE_INLINE before the decl
- 	for a few methods whose usage in other inlined methods appears
- 	prior to their definition.
-
-	* tao/default_client.cpp: Eliminated names of unused arguments to
- 	stop the compiler from complaining.
-
-	* tao/server_factory.cpp: Properly scoped return type names for
- 	several methods.
-
-	* tao/{typecode,decode,deep_copy,debug}.cpp: Bracketed unused
- 	variables with #if defined(TAO_NEEDS_UNUSED_VARIABLES)/#endif;
- 	this leaves them around for right now in case they're important.
-
-	* tao/client_factory.i (connector): Properly scoped return type's
- 	name.
-
-	* tao/{client_factory,default_client}.cpp: Added necessary
- 	template instantiations.
-
-	* tao/{typecode,cdr}.h: Added conditional ACE_INLINE in front of
- 	inlined methods to appease the compiler gods.
-
-	* tao/boa.cpp (dispatch): Declared argument unused to get rid of
- 	warnings.
-
-	* tao/corbacom.h: Moved #include of sequence.h before the decl for
- 	class CORBA.
-
-Sun Aug 10 10:58:21 1997  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-	* tao/client_factory: Moved the template specializations from the
- 	*.cpp file into the *.i file in order to get this stuff to link
- 	without multiply defined symbols.  Thanks to Brian Mendel for
- 	giving me the idea to do this.
-
-	* tao/client_factory.cpp: Added a template specialization for
- 	ACE_Hash_Addr.
-
-Sun Aug 10 08:56:20 1997  Aniruddha Gokhale  <gokhale@mambo.cs.wustl.edu>
-
-	* CORBA_ to CORBA:: transformation complete. All the files in the
-	TAO/tao distribution have been affected. The most notable changes
-	are:
-	(1) A file called "tao/corba.h" is now the master file. All *.cpp
-	files include *just* this file and nothing else.
-
-	(2) "tao/corbacom.h" is the file that defines the CORBA namespace
-	i.e., class CORBA. Individual CORBA classes such as TypeCode, BOA,
-	etc are now defined inside the CORBA namespace. This will allow
-	users and developers to use CORBA::TypeCode as opposed to the
-	previous CORBA_TypeCode. Instead of nesting the classes, however,
-	we use typedefs to define individual CORBA classes inside class
-	CORBA e.g., typedef CORBA_TypeCode TypeCode;
-
-	(3) All *.i files are included at the end of "tao/corba.h" and
-	nowhere else. However, if __ACE_INLINE__ isnot defined, then each
-	individual *.i file is not yet included in their corresponding
-	.cpp file. This will be done next.
-
-	* TAO/tests/Demux_Test: Included code that tests various
-	demultiplexing strategies in TAO. At this point, however, the code
-	will not work because of changes in TAO. This will be done
-	next. A README file provides additional details.
-
-	* TAO/Benchmark: A suite of benchmarking tests have been
-	included. This is still in the preliminary stages of
-	development. The idea is to compare various aspects of CORBA such
-	as marshaling overhead, demux costs, throughput, latency, and
-	others for a range of ORBs including TAO. Since there are
-	differences in programming different ORBs, this suite tries to
-	abstract out all the common features or atleast provide a uniform
-	interface so that minimal efforts are required to port an
-	application from one ORB to another.
-
-	Benchmark/benchmark: This directory contains thecommon features
-	Benchmark/Marshal_Test: Tests marshaling overhead in 3 ORBs -
-	Orbix, VisiBroker, and TAO. More will be added. There are a few
-	problems getting DSI to work. The tech support at IONA and
-	VisiBroker have been contacted.
-
-Sat Aug  9 14:05:08 1997  Douglas C. Schmidt  <schmidt@merengue.cs.wustl.edu>
-
-	* tao: Continued to clean up all the code so that it is more
- 	  consistent with ACE programming style.
-
-	* tao/orbconf.h: Cleaned up a lot of the unnecessary #defines.
-
-	* tao/default_server.h: Make sure we inherit from
- 	  TAO_Server_Strategy_Factory, not TAO_Server_Factory.
-
-	* tao/server_factory.cpp: Moved all the inline methods to be
- 	  non-inline since this code will always be dynamically bound.
-
-	* tao/client_factory.cpp: Cleaned things up a bit.
-
-Sat Aug  9 12:37:05 1997  Brian Mendel  <brian.r.mendel@boeing.com>
-
-        * tao/corba.h:  Deleted include for xdr.h from corba.h.  xdr.h
-        is obsolete.
-
-        * tao/objtable.cpp:  Deleted pragmas for instantiating ACE_Guard,
-        ACE_Read_Guard, and ACE_Write_Guard to eliminate duplicate
-        instantiations.  The templates are instantiated by ACE.  Can these
-        templates also be removed from the
-        ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION section as well?
-
-        * tao/default.bld: Added build file for VxWorks.
-
-        * tao/tao.bld: Added build file for VxWorks.
-
-Fri Aug  8 14:25:20 1997  Chris Cleeland  <cleeland@cs.wustl.edu>
-
-	* tao/orbobj.*: Updated various methods to use the new
- 	dynamically-linked strategy factories discussed below.
-
-	* tao/default_client.*: This file now contains the default client
- 	strategy factory which is (a) dynamically linkable by the service
- 	configurator and (b) can be configured by flags passed in via
- 	service configurator.
-
-	* tao/client_factory.*: This file now contains the abstract base
- 	class for the client strategy factory.
-
-	* tao/default_server.*: This file now contains the default server
- 	strategy factory which is (a) dynamically linkable by the service
- 	configurator and (b) can be configured by flags passed in via
- 	service configurator.
-
-	* tao/server_factory.*: This file now contains the abstract base
- 	class for the server strategy factory.
-
-	* tao/params.*: Renamed DEMUX_STRATEGY enum to TAO_Demux_Strategy
- 	and put it at global scope instead of within TAO_OA_Parameters.
-
-	* tao/svc.conf.eg: Created this file to serve as an example of
- 	various lines one might find in an application's svc.conf.
-
-Thu Aug  7 09:51:31 1997  Aniruddha Gokhale  <gokhale@mambo.cs.wustl.edu>
-
-	* factories.cpp: Incorrect use of ACE_ASSERT in
-	TAO_Server_Factory::object_lookup_strategy removed.
-
-	* objtable.cpp: The octet sequence object key was being cast into
-	a char* resulting in undefined behavior at times due to the lack
-	of a NULL character to terminate it. Changes were made in the bind
-	and find methods of TAO_Active_Demux_Table.
-
-Thu Aug 07 03:52:31 1997  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-	* TAO version 0.0.8, released Thu Aug 07 03:52:31 1997.
-
-Thu Aug  7 00:43:14 1997  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-	* tao/typecode.cpp: A couple of errors involving TAO_CONST crept
-	in when Brian checked in his code.  I fixed these.
-
-Wed Aug  6 18:28:41 1997  Chris Cleeland  <cleeland@swarm.cs.wustl.edu>
-
-	* tests/Cubit/TAO/clnt.cpp (main): Corrected the format
- 	specifications when timing was printing out from %ld to %d.  For
- 	some reason this never caused a problem on other platforms.
-
-Wed Aug  6 17:27:44 1997  Brian R. Mendel  <brian.r.mendel@boeing.com>
-
-        * tao/typecode.h: Removed qualified name in typecode.h to eliminate
-          compiler warnings by the GHS compiler.  Line 297.
-
-        * tao/decode.cpp: Changed wchar_t* to CORBA_WChar* to eliminate
-          compiler errors on GHS compiler.  Lines 142, 216, 729, 1371, and 1475.
-
-        * tao/typecode.cpp: Deleted unreachable break statements at lines
-          429, and 477, 904, and 947.
-
-Wed Aug  6 16:31:29 1997  Chris Cleeland  <cleeland@swarm.cs.wustl.edu>
-
-	* tao/*: Changed 'const' to 'TAO_CONST' in contexts where the
- 	const didn't make sense.  For example, this occurred in situations
- 	where methods declared their return type as 'const CORBA_String',
- 	which does not translate to 'const char*' but rather 'char*
- 	const'.
-
-	* tao/corbacom.h: Added #define for TAO_CONST.  See above for
- 	explanation.
-
-	* tao/{connect,factories,giop,iiopobj,marshal,objtable,
- 	optable,orbobj,roa}.cpp: Removed errant trailing semi-colon on all
- 	the #pragma instantiate directives.
-
-Wed Aug  6 13:56:40 1997  Chris Cleeland  <cleeland@cs.wustl.edu>
-
-	* tao/{connect,factories,giop,iiopobj,marshal,objtable,
- 	optable,orbobj,roa}.cpp: Changed explicit template instantiations
- 	to use the new ACE enabling macro as well as adding the #pragma
- 	instantiate to placate Edison Design Group compilers.
-
-	* tao/cdr.h: Changed default for CDR CTOR marshal factory to
- 	reflect the new name of the default marshal factory variable.
-
-	* tao/orbobj.cpp (CORBA_ORB_init): Inserted call to
- 	TAO_Marshal::initialize().
-
-	* tao/marshal.*: Added TAO_Marshal class to scope static
- 	initialization methods for the marshalling engine.
-  	TAO_DEFAULT_MARSHAL_FACTORY has moved inside of this.
-
-Sun Aug  3 13:12:03 1997  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-	* tests/Cubit/TAO: Continued to improve the formatting of these
- 	tests.
-
-Sat Aug  2 13:55:40 1997  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-	* tests/Cubit/TAO: Cleaned up some of the formatting so that
-	it is easier to read.
-
-Thu Jul 31 16:19:43 1997  Chris Cleeland  <cleeland@cs.wustl.edu>
-
-	* tao/corba.h: Removed incorrect #include "tao/corba.h" in this
- 	file.  Bad form.
-
-Thu Jul 31 15:19:43 1997  Chris Cleeland  <cleeland@cs.wustl.edu>
-
-	* tests/Cubit/TAO/*.{h,i,cpp}: Changed all #include of specific
- 	header files to include the application-level "tao/corba.h".
-
-	* tests/Cubit/TAO/Makefile (BIN): Removed test1_svr and test1_clnt
- 	for now until we can get them working again.  They stopped working
- 	after the BOA API changed and the non-standard get_request()
- 	method removed.
-
-	* tao/any.h: Inserted #includes which insure that this header file
- 	is not position-dependent on other header files.
-
-	* tao/corba.h: Created this catch-all header file for APPLICATIONS
- 	to use as a single entry point.  Currently it just includes all
- 	TAO header files, but will eventually be pared down to only those
- 	headers which warrant public exposure.
-
-Wed Jul 30 16:55:02 1997  Chris Cleeland  <cleeland@cs.wustl.edu>
-
-	* tao/typecode.i (CORBA_TypeCode): Re-ordered member
- 	initialization to correspond to declaration order.
-
-	* tao/{typecode,orbobj,optable,decode,cdr}.cpp: Added explicit
- 	typecast to CORBA_ULong/unsigned long to eliminate warnings about
- 	comparisons btw. signed and unsigned entities.
-
-	* tao/optable.cpp (bind): Put in explicit return type for
- 	TAO_Active_Demux_OpTable::bind().
-
-Wed Jul 30 14:18:02 1997  Chris Cleeland  <cleeland@cs.wustl.edu>
-
-	* tao/Makefile: Corrected automatic definition of TAO_ROOT and
- 	fixed all dependencies on tao header/inline files.
-
-	* tao/{typecode,object}.i: Moved a few methods to the beginning of the file
- 	so that the compiler KNOWS that they are inlined when it hits the
- 	first reference to them later in the file.
-
-	* tao/object.cpp: Added an end-of-line to silence a very picky SGI
- 	compiler.
-
-Wed Jul 30 10:05:38 1997  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-	* tao/connect.cpp: Removed a number of explicit template
- 	instantiations that are already included in ACE.
-
-Wed Jul 30 14:20:18 1997  Darrell Brunsch <brunsch@cs.wustl.edu>
-
-	* tao/boa.{i,h,cpp}: Removed the #include of "tao/objtable.h" and
-	instead moved the methods that needed it from boa.i to boa.cpp
-
-Wed Jul 30 13:58:02 1997  Darrell Brunsch <brunsch@cs.wustl.edu>
-
-	* tao/boa.h: Added #include of "tao/objtable.h" since it is needed
-	in boa.i (which is included here when inlining is turned on)
-
-Wed Jul 30 10:05:38 1997  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-	* tao/boa.h: Removed the #include of "tao/objtable.h" which seems
- 	to be unnecessary and may cause problems for template
- 	specialization.
-
-	* tao/iiopobj.i (IIOP_Object): Changed the second parameter to the
- 	IIOP_Object constructor so that we can is a const
- 	IIOP::ProfileBody &.  This prevents a compiler warning.
-
-	* tao/typecode.cpp (private_id): Removed unused variable status.
-
-	* tao/objtable.cpp (bind): Removed the temp variable, which
-	was unused.
-
-Tue Jul 29 19:31:11 1997  Douglas C. Schmidt  <schmidt@flamenco.cs.wustl.edu>
-
-	* tao/boa.cpp (get_boa): Added casts of ACE_UINT32 so that we
- 	don't have ambiguous calls to the constructor of ACE_INET_Addr.
-
-	* tao/deep_copy.cpp (deep_copy): Removed an unreachable return
- 	value.
-
-Mon Jul 21 15:08:36 1997  Chris Cleeland  <cleeland@cs.wustl.edu>
-
-	* TAO version 0.0.7, released Mon Jul 21 15:08:36 1997.
-
-Mon Jul 21 12:06:16 1997  Darrell Brunsch <brunsch@cs.wustl.edu>
-
-	* tao/object.cpp: removed the #include of object.i since it will
-	always be #included in object.h
-
-Thu Jul 17 16:54:38 1997  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-	* TAO version 0.0.6, released Thu Jul 17 16:54:38 1997.
-
-Thu Jul 17 16:43:23 1997  Chris Cleeland  <cleeland@cs.wustl.edu>
-
-	* tao/{optable,objtable}.cpp: Updated the explicit template
- 	instantiations at the end of these files to reflect the changes
- 	that Andy made.
-
-Thu Jul 17 10:08:45 1997  Aniruddha Gokhale  <gokhale@merengue.cs.wustl.edu>
-
-	* tao/align.h: A very subtle error in "align_binary" was corrected. I
- 	was assuming that align_binary is always called by
- 	"ptr_align_binary". In the original inline function versions of
- 	align_binary and ptr_align_binary, the function align_binary would
- 	subtract 1 from the specified alignment that ptr_align_binary
- 	provided. Since I assumed that "align_binary" would always be
- 	called by "ptr_align_binary", I subtracted the 1 in
- 	ptr_align_binary and passed the result to "align_binary". This
- 	caused all sorts of problems for application code that directly
- 	called "align_binary". This error has been fixed. The macros for
- 	align_binary and ptr_align_binary are now exactly as the original
- 	inline functions.
-
-	* tao/any.{h,cpp}: Added comments. In addition, in the code for
-	Any::replace, we check if "_value" exists before trying to
-	DEEP_FREE it. Otherwise this was resulting in a segmentation fault
-	violation.
-
-	* tao/boa.{h,i}: Added comments and changed "release" to CORBA_release
-
-	* tao/cdr.{h,cpp}: Added some comments and removed some stuff that was
-	under #if 0 .. #endif
-
-	* tao/corbacom.h: Added lots of comments for the CORBA_String_var class
-
-	* tao/decode.cpp: Made TAO_Marshal_Union::decode to work, added comments.
-
-	* tao/encode.cpp: Made TAO_Marshal_Union::encode to work, added comments.
-
-	* tao/factories.{h,cpp}: Added lots of comments. Removed "void
-	object_lookup_strategy" method since we do this in the parameters
-	class. Added code that will use a user defined lookup strategy if
-	the corresponding flag is set. This needs to be tested.
-
-	* tao/iiopobj.{i,cpp}: In the allocation and deallocation of the buffer
-	for object key, we now use "new/delete" instead of "malloc/free".
-
-	* tao/interp.cpp: commented out a line that decremented 4 from the
-	offset provided for indirected typecodes. I guess this was plain
-	hack to get some broken things to work.
-
-	* tao/objtable.{h,cpp}: Added lots of comments. Added code that will use
-	template specialization for the dynamic hashing case. In addition,
-	improved the destructors of the classes since previously, these
-	were not releasing occupied memory.
-
-	* tao/optable.{h,cpp}: Added lots of comments. Added template
-	specialization for dynamic hashing scheme. Made dynamic hashing
-	scheme the default. Added a new definition for "struct
-	TAO_operation_db_entry". The idea is that an IDL compiler will
-	generate a database of operations and their corresponding
-	skel_ptrs. Such a database is now passed to teh constructors of
-	the operation lookup tables. This way, only one instance of such
-	lookup tables can be shared by any number of objects implementing
-	the same interface.
-
-	* tao/params.{h,i,cpp}: Made dynamic hashing the default. Added a hook
-	by which users can supply their lookup strategies. *Needs testing*.
-
-	* tao/typecode.{h,i,cpp}: Added comments and many changes. The private
-	state's constructor now takes an argument that is a TCKind
-	representing the TypeCode kind of the object of which we are the
-	private state. Removed "child_free". Instead, we introduced a
-	destructor for the private state that frees all the
-	children. Another important change is to the constructor of the
-	TypeCode class. We pass a "parent" pointer, if any, to the
-	constructor. All children typecodes will share the octet buffer of
-	the parent. Only freestanding typecodes will allocate octet
-	buffers. We have a new data member called "non_aligned_buffer_"
-	because the buffer we allocate may not be aligned on a 4 byte
-	boundary. As a result, we may start using the buffer at a shifted
-	position to the right. However, we do not want to lose a handle to
-	the original buffer that was allocated because at the time of
-	freeing, this pointer needs to be freed.
-
-	* tests/Cubit/TAO: Modified a few files (method_db.i, cubitS.cpp)
-	so that they use the modified optable and objtable classes. Added
-	a README file to indicate how to run the example.
-
-	* tests/Thruput_test: Modified virtually all the files to make it
-	work with the latest TAO release and its include files. Also,
-	changes similar to Cubit were necessary due to changes in the
-	objtable and optable classes.
-
-Wed Jul 16 14:17:01 1997  Chris Cleeland  <cleeland@merengue.cs.wustl.edu>
-
-	* tao/params.*: Eliminated unnecessary
- 	ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES checks from
- 	TAO_OA_Parameters (unnecessary b/c it's not a template).  Also
- 	corrected the type of TAO_OA_Parameters::ace_singleton_lock_.
-
-Wed Jul 16 11:34:36 1997  Chris Cleeland  <cleeland@cs.wustl.edu>
-
-	* tao/boa.cpp: Removed some unused code.
-
-	* tao/compat/objbase.h: Added explicit check for prior inclusion
- 	of ace/OS.h, with an error being produced if it's not included.
-  	This will help keep me honest and remember to always include OS.h
- 	beforehand, since I do most of my development on non-WIN32
- 	platforms.
-
-	* tao/*.{h,cpp}: Added #include "ace/OS.h" before every inclusion
- 	of <objbase.h>.  This is required on WIN32 platforms because
- 	objbase.h eventually ends up including <winsock.h>, which is the
- 	wrong version of winsock from what ACE requires.  Thus, by
- 	including OS.h prior to objbase.h, objbase.h ends up not trying to
- 	include a winsock header.
-
-	* tao/orbobj.cpp: Added missing #include for tao/debug.h.
-
-Wed Jul 16 10:55:55 1997  Darrell Brunsch <brunsch@cs.wustl.edu>
-
-	* tao/PC_Install.bat: removed it since it isn't needed anymore
-
-	* tao/TAO.dsp: Changed include path and removed calling of
-	  PC_Install.bat
-
-	* tests/Cubit/TAO/{client,server}.dsp: Changed include path
-
-Tue Jul 15 16:13:53 1997  Chris Cleeland  <cleeland@cs.wustl.edu>
-
-	* tests/Cubit/TAO/cubitC.cpp: Added missing calls to Release()
- 	after QueryInterface() calls.  The tip-off that this wasn't
- 	happening was the fact that, upon client exit, there were upwards
- 	of 15 references to the object references.  Now it's only 5-7
- 	(more work to go).
-
-	* tests/Cubit/TAO/*: Changed all #include paths to be "tao/...".
-  	Also, changes to orb.h (see below) obviated additional header
- 	inclusion in certain files.
-
-	* tao/compat/*.h: Changed the guts of these files so that they
- 	work more like their "real" counterparts in the VC++ 5.0.  This
- 	should encourage compatibility.  Note that, unlike the previous
- 	files, objbase.h MUST be included before initguid.h; this is
- 	consistent with the model on WIN32.
-
-	* tao/*.{h,cpp}: Changed all #include paths to be "tao/...".
-  	Also, changes to orb.h (see below) obviated additional header
- 	inclusion in certain files.
-
-	* tao/giop.cpp: Removed get_request() crufty old code.
-
-	* tao/iiopobj.cpp: Backed out many prior special-code additions
- 	for defining IIDs.  Hopefully the need for these is negated by
- 	changes elsewhere in the "compat" files.
-
-	* tao/object.cpp: Corrected the conditional compilation switch
- 	used to determine if we define IID_IUnknown.  This now happens
- 	whenever WIN32 isn't defined, instead of before when it was only
- 	on unix or vxworks platforms.
-
-	* tao/Makefile: Eliminated the need to copy files into a "proto/"
- 	directory; now, everything is built into and used from the "tao"
- 	directory.
-
-	There is also a new, optional, environment
- 	variable--TAO_ROOT--which should be set to the ".../TAO"
- 	directory.  If it's not set, the Makefile will set it to
- 	$WRAPPER_ROOT/TAO.
-
-	Lastly, libcorba.* has changed to libTAO.*.
-
-	* tao/orb.h: Eliminated many header files which had been
- 	explicitly included here and were causing all manner of problems
- 	with circular includes.  Library components must now be careful to
- 	include appropriate headers for all components they use, and we
- 	will likely have to create a corba.h file for clients to use.
-
-Fri Jul 11 12:12:40 1997  Darrell Brunsch <brunsch@cs.wustl.edu>
-
-	* tao/TAO.dsp: changed to use ace-r.dll in the release
-	  version
-
-	* tests/Cubit/TAO/{client,server}.dsp: changed to use ace-r.dll
-	  and tao-r.dll for the release versions.
-
-Thu Jul 10 15:47:24 1997  Chris Cleeland  <cleeland@cs.wustl.edu>
-
-	* docs/: Removed the following obsolete files: README.apm,
- 	BUILDING, and TESTS.
-
-	* tao/params.*: Moved the instance() methods into the .cpp from
- 	the .i, as well as the declaration for the singleton locks.
-  	Having the singleton locks declared in the .i file caused much
- 	consternation when ACE inlining was turned on.
-
-	* tao/iiopobj.cpp: #ifdef'd the IID_STUB_Object declaration added
- 	a few days ago so that it happens one way on NT, and another in
- 	the rest of the Universe.  I would have preferred to find a more
- 	general solution, but didn't find one quickly enough to satisfy my
- 	current requirements.
-
-	* tao/roa.*: Removed get_request() method.  This should improve
- 	our McCabe scores ;-)
-
-	* tao/boa.h: Removed get_request() method.
-
-Wed Jul  9 14:44:31 1997  Darrell Brunsch <brunsch@cs.wustl.edu>
-
-	* TAO-Install: Added installation instructions for NT
-
-Tue Jul  8 20:52:06 1997  Darrell Brunsch <brunsch@cs.wustl.edu>
-
-	* tao/PC_Install.bat: Made it very quiet.
-
-	* tao/params.{cpp,h,i}: Changed TAO_OA_PARAMS from a
-	  ACE_Singleton to a plain singleton by just integrating the
-	  ACE_Singleton code into the class.
-
-Tue Jul  8 14:27:47 1997  Darrell Brunsch <brunsch@cs.wustl.edu>
-
-	* tao/except.h: added ACE_Svc_Export to SYSEX macro
-
-	* tao/iiopobj.cpp: changed declaration of IID_STUB_Object
-	  to include ACE_Svc_Export
-
-	* tao/stub.h: added ACE_Svc_Export to IID_STUB_Object
-
-Tue Jul  8 12:44:14 1997  Darrell Brunsch <brunsch@cs.wustl.edu>
-
-	* tao/orbobj.cpp: Put the "*" in before the comment since it is
-	  supposed to be there.  Put a space between it and the comment
-	  to get rid of the warning which VC was giving originally.
-
-Tue Jul  8 10:21:27 1997  Darrell Brunsch <brunsch@cs.wustl.edu>
-
-	* tao/typecode.cpp: Changed a few loop counters from int to
-	  CORBA_ULong to get rid of unsigned/signed comparison warnings
-
-	* tao/orbobj.cpp: Got rid of a "*" before a comment.  Looked like
-	  a typo
-
-	* tao/PC_Install.bat: Replaced "#...." with "rem ...."
-
-Mon Jul  7 20:59:05 1997  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-	* tests/Cubit/TAO/test1_{svr,clnt}.cpp (main): Added template
-	  specialization code and updated the formatting.  Thanks to Arturo
-	  Montes <mitosys@colomsat.net.co> for reporting this.
-
-	* tests/Cubit/TAO/test1_svr.cpp (main): Added the -i options to
-	  getopt().  Thanks to Arturo Montes <mitosys@colomsat.net.co> for
-	  reporting this.
-
-	* TAO/tao/orbconf.h (SIZEOF_LONG_DOUBLE): Added a
-	  #define for M_UNIX.  Thanks to Arturo Montes
-	  <mitosys@colomsat.net.co> for reporting this.
-
-Sun Jul 06 02:37:24 1997  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-	* TAO version 0.0.5, released Sun Jul 06 02:37:24 1997.
-
-Sun Jul  6 00:10:28 1997  Douglas C. Schmidt  <schmidt@flamenco.cs.wustl.edu>
-
-	* tao: Fixed all the code so that we put ACE_MT around all the
-	  ACE_GUARD_RETURN macros.
-
-	* tao: Updated all of TAO to make sure we use [] when deleting
-	  arrays in order to avoid memory leaks.  This looks like lots of
-	  sloppiness left over from the original SunSoft IIOP code.
-
-Sat Jul  5 16:12:31 1997  Douglas C. Schmidt  <schmidt@flamenco.cs.wustl.edu>
-
-	* tao/{any,iiopobj,nvlist,principa,request,roa,svrrqst,typecode}.cpp:
-	  Fixed a double-deletion of a lock.
-
-	* tao/typecode.i: Cleaned up lots of minor warnings with the code
-	  that are only revealed when running GCC.  The code should now
-	  compile almost completely cleanly with -wall.
-
-	* tao/typecode.{i,h}: Changed the name of TC_PRV_State to
-	  TC_Private_State.
-
-	* tao: Replaced ACE_Thread_Mutex with ACE_SYNCH_MUTEX so that the
-	  code will compile on non-threaded and threaded platforms alike.
-
-	* tao/marshal.cpp: Added template specializations for the Marshal
- 	primitives.  Thanks to Arturo Montes <mitosys@colomsat.net.co> for
- 	reporting this.
-
-	* tao/Makefile (LDLIBS): Replaced -lcorba with -lACE so that we no
- 	longer have problems with circular link dependencies.  Thanks to
- 	Arturo Montes <mitosys@colomsat.net.co> for reporting this.
-
-Sat Jul 05 13:25:23 1997  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-	* TAO version 0.0.4, released Sat Jul 05 13:25:23 1997.
-
-Sat Jul  5 12:39:57 1997  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-        * tao: All throughout TAO I removed the direct use of system
- 	include files in lieu of using ace/OS.h.
-
-	* tao/{orbobj,typecode}.cpp: orb.h must be included before others
- 	include files. Previous includes prevent correct use of ACE config
- 	flags, therefore, I removed them.  Thanks to Arturo Montes
- 	<mitosys@colomsat.net.co> for reporting this.
-
-        * tao/{debug,roa}.cpp: changed _POSIX_THREADS to ACE_HAS_PTHREADS.
-  	Thanks to Arturo Montes <mitosys@colomsat.net.co> for reporting
- 	this.
-
-	* tao/decode.cpp (decode): The casting (CORBA_ULong) kind is
- 	unnessary and wrong so I removed it.  Thanks to Arturo Montes
- 	<mitosys@colomsat.net.co> for reporting this.
-
-	* tao/debug.cpp (emit_prefix): Changed line 99 from
-
-	#define emit_prefix (stream) ...
-
-	to
-
-	#define emit_prefix(stream) ...
-
-	The blank character prevent after macro name (emit_prefix) prevent
- 	correct definition.  Thanks to Arturo Montes
- 	<mitosys@colomsat.net.co> for reporting this.
-
-Sat Jul  5 01:04:24 1997  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-	* TAO/tao/xdr.cpp: Removed unistd.h and string.h from the xdr.cpp
- 	  file since those aren't necessary.  Thanks to Arturo Montes
- 	  <mitosys@colomsat.net.co> for reporting this.
-
-Fri Jul  4 00:18:21 1997  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-	* tao/roa.h: Removed derogatory COMments ;-).  Thanks to Anton van
- 	  Straaten <anton@appsolutions.com> for reporting this.
-
-Thu Jul  3 16:16:14 1997  Darrell Brunsch <brunsch@cs.wustl.edu>
-
-	* Added ACE_Svc_Export to a couple of declarations to make NT
-	  happier
-
-Thu Jul  3 13:43:20 1997  Darrell Brunsch <brunsch@cs.wustl.edu>
-
-	* Added Visual C++ 5.0 project and workspace files for the TAO
-	  library and Cubit test
-
-Wed Jul  2 12:44:42 1997  Aniruddha Gokhale  <gokhale@mambo.cs.wustl.edu>
-
-	* TAO/tests: Moved tests from TAO/IIOP/tests to TAO/tests
-
-Wed Jul 02 00:20:28 1997  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-	* Compiled the first alpha release of TAO on Solaris just
-	  to make sure it still works.  So far, so good... hence,
-	  the first alpha release is out the door!
-
-Tue Jul  1 23:35:53 1997  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-	* VERSION: Added a VERSION file, starting at version 0.0.0...
-
-Tue Jul  1 23:00:15 1997  Aniruddha Gokhale  <gokhale@mambo.cs.wustl.edu>
-
-	* Added a new tests directory with the Cubit and TTCP
-	examples. The older test directory will be deleted soon.
-
-	In addition, the tc_constants in the tc_constants.cpp  file are
-	declared with an ACE_Svc_Export to make the Win NT compiler
-	happy. Extern declarations in typecode.h had the same changes.
-
-	* Updated the PC_install.bat file. In addition, there was one more
- 	warning in typecode.cpp (Win NT compiler) that was fixed. Finally,
- 	in the the tc_const.cpp file, the ACE_Svc_Export was used
- 	accidently. This has been fixed.
-
-	* A number of files were updated with ACE_Svc_Export so that
-	variables and classes do not remain unresolved for Win32
-	platform. Similarly, Irfan had sent me a list of warnings that the
-	Win NT compiler was giving. These are fixed.
-
-	* marshal.*: Changed the way make_marshal_object works. Instead of
-	having a switch statement, we index into a private table of
-	marshal objects using the TypeCode _kind field. MarshalFactory now
-	maintains this private table.
-
-Mon Jun 30 17:39:02 1997  Douglas C. Schmidt  <schmidt@flamenco.cs.wustl.edu>
-
-	* Added a new README file and a COPYING file that explains the
- 	contents of TAO and clarifies its copyright status.
-
-Sun Jun 29 10:06:50 1997  Aniruddha Gokhale  <gokhale@mambo.cs.wustl.edu>
-
-	* marshal.*: Added CORBA_Environment as a parameter to
-	make_marshal_object factory method. The reason for doing this was
-	to enable inlining of the CDR::encode and CDR::decode methods.
-
-	* typecode.*: Changed the way typecodes get deleted. Constant
-	typecodes are now owned by the ORB and their private state freed
-	when the ORB dies. IDL generated typecodes are not owned by the
-	ORB and are the only ones whose refcount matters. Typecodes
-	belonging to the IDL generated typecodes are also not owned by the
-	ORB and there is no effect on their refcount. They get freed only
-	if the parent is destroying itself.
-
-	In typecode.i, methods such as length and content_type were not
-	getting inlined due to presence of switch statements. Converted to
-	if/else.
-
-	* interp.cpp: Bug fix: Had previously forgotten to update the
-	size/alignment of the private state of the typecode.
-
-Fri Jun 27 14:27:49 1997  Aniruddha Gokhale  <gokhale@mambo.cs.wustl.edu>
-
-	* any.cpp: The deep_copy and deep_free optimizations applied. In
-	the previous release, I had forgotten to add these to the Any
-	constructor (that calls deep_copy) and Any destructor/replace
-	(that call deep_free).
-
-	* connect.cp, factories.cpp: Added code that hardcodes the socket
-	buffer sizes to 64K. This is a hack for the time being.
-
-Thu Jun 26 10:02:47 1997  Aniruddha Gokhale  <gokhale@merengue.cs.wustl.edu>
-
-	* Some more progress on IDL compiler. Generates the client and
-	server side files without much contents in it.
-
-Thu Jun 26 09:49:38 1997  Aniruddha Gokhale  <gokhale@merengue.cs.wustl.edu>
-
-	* Added a full range of optimizations to the TAO IIOP interpretive
-	marshaling engine. The static methods encoder and decoder have
-	been removed from the CDR class. Instead, separate classes for
-	marshaling have been created for each individual data type. The
-	CDR stream maintains a factory that returns an appropriate
-	marshaling object depending on the data type to be
-	marshaled. Files added include marshal.h, marshal.i, encode.cpp,
-	decode.cpp, deep_free.cpp, and deep_copy.cpp. The marshal.h file
-	defines classes for an abstract MarshalObject. The factory is
-	responsible to return a concrete specialized instance of the
-	MarshalObject.
-
-	* Updated the CORBA_TypeCode class so that it now provides all the
-	CORBA_2.0 compliant operations. These include length(),
-	content_type(), member_type(), member_label(),
-	discriminant_type(), id(), default_index(). The equal() operations
-	is still not implemented. In addition, precomputation
-	optimizations are applied to the TypeCode class. This includes
-	precomputing various parameters (if any) of a TypeCode. For
-	example, a struct TypeCode keeps track of the member count and
-	member types. As a result, it is not necessary to interpret the
-	CDR encapsulated stream to retrieve these parameters.
-
-	* At this time, there are some problems getting the Unions to work.
-
-Thu Jun 12 15:45:49 1997  Chris Cleeland  <cleeland@cs.wustl.edu>
-
-	* IIOP/lib/objtable.cpp: Added explicit template instantiations
- 	for ACE_Hash_Map_Manager<>.
-
-	* IIOP/lib/giop.*: Finally got rid of all those methods that took
- 	ACE_HANDLE as the argument.  Now, all those operate on
- 	ACE_SOCK_Streams.
-
-Thu Jun  5 10:15:21 1997  Chris Cleeland  <cleeland@cs.wustl.edu>
-
-	* IIOP/lib/giop.cpp: Corrected output format in error message.
-
-Thu Jun  5 10:09:01 1997  Chris Cleeland  <cleeland@merengue.cs.wustl.edu>
-
-	* IIOP/test/svr.cpp: Added a new class to catch SIGINT and
- 	terminate.  This was necessary to Quantify the server process.
-
-	* IIOP/lib/orbobj.h: Added ACE_INLINE to forward decls of
- 	CORBA_release() and CORBA_is_nil().
-
-Wed May 23 14:39:01 1997  Brian Mendel  <bmendel@mdc.com>
-
-        * IIOP/lib/objtable.{h,cpp}:  Added template specialization of
-        ACE_Hash_Map_Manager for char*'s.
-
-        * IIOP/test/cubitS.cpp:  Fixed type_id to be of type CORBA_String_var.
-        Also, added a debug msg to print the object address to show the
-        object for which the request is made.
-
-        * IIOP/test/svr.cpp:  Added capability to create multiple Cubit
-        objects via command line options.  Added -n for number of objects and
-        -k for specifying a base name.  For instance, -k Beevis -n 2 creates
-        Beevis1 and Beevis2 objects.  The clnt can then specify a specific
-        object for the request as usual.
-
-Wed May 22 12:28:45 1997  Brian Mendel  <bmendel@mdc.com>
-
-        * IIOP/test/clnt.cpp:  Deleted VxWorks specific sections.  Command
-        line is now working for VxWorks.
-        * IIOP/test/svr.cpp:  Deleted VxWOrks specific sections.  Command line
-        is now working for VxWorks.
-
-Wed May 22 11:31:42 1997  Chris Cleeland  <cleeland@cs.wustl.edu>
-
-	* IIOP/test/svr.cpp: Added better error checking and messages, and
- 	performed general re-formatting.
-
-	* IIOP/test/method_db.i (initialize_method_db): Changed arg type
- 	to use a pointer to the abstract class TAO_Operation_Table.
-
-	* IIOP/test/cubitS.cpp (_skel_Cubit::_skel_Cubit): Added better
- 	error checking and messages.  Also defaulted to use the linear
- 	object table implementation rather than the hashed to simplify
- 	debugging.
-
-	* IIOP/test/clnt.cpp: Moved some code around so that more of the
- 	code is common is less is specific to VxWorks and other platforms.
-  	Also did general re-formatting.
-
-	* IIOP/lib/optable.cpp (TAO_Linear_OpTable::find): Initialization
- 	of the loop variable makes the loop work properly.
-
-	* IIOP/lib/objtable.cpp (TAO_Dynamic_Hash_ObjTable::find):
- 	Explicitly specified length of object key in CTOR for ACE_CString
- 	because object keys are not zero-terminated.
-
-	* IIOP/lib/giop.cpp: Added newlines to the end of all ACE_DEBUG()
- 	messages.
-
-	* IIOP/lib/factories.cpp: Added template specializations for
- 	ACE_Hash_Addr<ACE_INET_Addr, TAO_Client_Connection_Handler>.
-
-Tue May 22 09:32:41 1997  Brian Mendel  <bmendel@mdc.com>
-
-        * IIOP/lib/cdr.h: Deleted #define old_value ACE_INLINE and
-        #define ACE_INLINE old_value lines. Added #undefs for ACE_INLINE
-        prior to redefines.  Changes required to compile on Windows NT.
-
-Tue May 20 14:47:46 1997  Chris Cleeland  <cleeland@cs.wustl.edu>
-
-	* IIOP/test/cubitS.h: Removed forward decl of
- 	TAO_Active_Operation_Table.
-
-	* IIOP/test/{cubitC,cubitS}.*: Changed include quoting characters
- 	from [<>] to double-quotes.
-
-	* IIOP/test/Makefile: Removed cubit.o from clnt and svr target
- 	(this has been subsumed by cubit[CS]).
-
-	* IIOP/lib/optable.h: Changed ACE_RW_Mutex to ACE_SYNCH_RW_MUTEX.
-
-	* IIOP/lib/optable.cpp: Inserted explicit template instantiations.
-
-	* IIOP/lib/Makefile: Added optable to the Makefile.
-
-	* IIOP/lib/optable.cpp: Moved ~TAO_Operation_Table() into here.
-
-	* IIOP/lib/object.i: Moved find() and bind() into the cpp file.
-  	Moved ~TAO_Operation_Table() into optable.cpp.
-
-Tue May 20 14:39:00 1997  Brian Mendel  <bmendel@mdc.com>
-
-	* IIOP/test/*: Commited changes to Cubit Example as a current snapshot
-          of required changes.
-
-        * IIOP/lib/*: Changes required for header file includes.  Added
-          conditionals around _IIOP_BUILD_
-
-Tue May 20 13:55:58 1997  Chris Cleeland  <cleeland@merengue.cs.wustl.edu>
-
-	* IIOP/test/*: Commited this stuff in-process so that Brian
- 	M. doesn't have to duplicate effort.
-
-Tue May 20 13:04:00 1997  Brian Mendel <bmendel@mdc.com>
-
-	* IIOP/lib/debug.cpp: Deleted spaces between flockfile (f) and
-	funlockfile (f).  Changed instances of debug_filter to
-	TAO_debug_filter.  Deleted space between emit_prefix (stream).
-
-	* IIOP/lib/cdr.cpp Added undef(s) for ACE_INLINE and
-          do_undef_on_ACE_INLINE to eliminate redefinition problems.
-
-
-Tue May 20 10:55:09 1997  Chris Cleeland  <cleeland@cs.wustl.edu>
-
-	* IIOP/lib/cdr.h: Fixed the automatic inclusion of cdr.i into
- 	cdr.h by checking to see if __ACE_INLINE__ is not defined and, if
- 	so, defining ACE_INLINE to be "inline" (we tidy up the namespace
- 	immediately after the inclusion of cdr.i, too).  See source for
- 	comments regarding why this is done.
-
-	* IIOP/lib/optable.cpp (TAO_Linear_OpTable_Entry): Removed setting
- 	of opname and skel_ptr to zero in CTOR since the CTOR for those
- 	already insures this.  Moreover, NT's compiler was complaining
- 	about ambiguous resolutions.
-
-	* IIOP/lib/{orbobj,giop,debug,boa}.cpp: Fixed reference to
- 	debug_level so it's TAO_debug_level.
-
-	* IIOP/lib/object.h: Replaced inclusion of optable.h with forward
- 	decl of TAO_Operation_Table.
-
-	* IIOP/lib/optable.cpp: Fixed names of methods that were changed
- 	in the header but never changed in the source.  Amazing that
- 	neither g++ nor Sun C++ caught these gaffs!  (Finally, the NT
- 	compiler wins).
-
-	* IIOP/lib/{orbobj,object}.h: Changed the forward decls of
- 	CORBA_release() and CORBA_is_nil() so that they are only in effect
- 	when inlining is NOT being used.
-
-	* IIOP/lib/giop.cpp: Fixed incorrect passing of an object to
- 	ACE_DEBUG() where an int is expected.
-
-Mon May 19 17:16:34 1997  Chris Cleeland  <cleeland@merengue.cs.wustl.edu>
-
-	* IIOP/lib/roa.cpp: Explicit cast rids us of a warning.
-
-	* IIOP/lib/params.h: Fixed CTOR name.  Once again I'm surprised
- 	G++ didn't catch this.
-
-	* IIOP/lib/optable.h: Corrected erroneous method signature on
- 	bind().
-
-	* IIOP/lib/objtable.cpp: Corrected erroneous method signature on
- 	TAO_Linear_ObjTable::bind().
-
-	* IIOP/lib/{object,orbobj}.h: Forward declaration of
- 	CORBA_release(CORBA_Object_ptr) and CORBA_is_nil(CORBA_Object_ptr)
- 	were commented out.  I think this will cause a problem when we
- 	DON'T inline, but I'll cross that bridge later.
-
-	* IIOP/lib/{orb,factories}.h: Made inclusion of some headers
- 	conditional on the compilation phase (building the library or an
- 	application).
-
-	* IIOP/lib/cdr.i: Removed incorrect default arguments (g++ didn't
- 	catch them).
-
-	* IIOP/lib/Makefile: Removed thread from the header list.
-
-Mon May 19 10:07:00 1997  Chris Cleeland  <cleeland@cs.wustl.edu>
-
-	* IIOP/lib/optable.cpp: Changed implementation of the operation
- 	table and the parameters repository so that they use the right
- 	class names.
-
-Sat May 17 17:18:38 1997  Aniruddha Gokhale  <gokhale@mambo.cs.wustl.edu>
-
-	* First pass at providing a backend to the SunSoft's CORBA IDL
-	compiler front end.
-
-Fri May 16 17:30:31 1997  Chris Cleeland  <cleeland@cs.wustl.edu>
-
-	* IIOP/lib/svrrqst.*: Corrected some comments, adjusted some
- 	argument type names to reflect their new, namespace-sanitized
- 	names, and moved short methods into a new inline file.
-
-	* IIOP/lib/stub.h: Corrected some comments and adjusted some
- 	argument type names to reflect their new, namespace-sanitized
- 	names.
-
-	* IIOP/lib/roa.cpp: Corrected syntax error and fixed up typedef.
-
-	* IIOP/lib/params.*: Removed extraneous comments and fixed
- 	argument type on demux_strategy().
-
-	* IIOP/lib/orbobj.*: Added comments, removed static pointer to
- 	the ORB.
-
-	* IIOP/lib/optable.h: Removed extraneous comments and fixed
- 	typedefs.
-
-	* IIOP/lib/objtable.cpp: Fixed some syntax errors introduced by
- 	reformating.
-
-	* IIOP/lib/object.cpp: Adjusted some argument type names to
- 	reflect their new, namespace-sanitized names.
-
-	* IIOP/lib/invoke.cpp: Removed crufty #includes and adjusted some
- 	argument type names to reflect their new, namespace-sanitized
- 	names.
-
-	* IIOP/lib/iioporb.*: Moved short methods into inline file, added
- 	IIOP_ORB_ptr typedef, and changed data member to conform to ace
- 	standards.
-
-	* IIOP/lib/iiopobj.*: Added the second CTOR that I forgot last
- 	time and adjusted some argument type names to reflect their new,
- 	namespace-sanitized names.
-
-	* IIOP/lib/giop.h: Added comments for various enums and
- 	structures.
-
-	* IIOP/lib/giop.cpp: Switched various GIOP::Invocation methods to
- 	use handler_->peer() for socket communication rather than going
- 	through a file descriptor.  Also began the arduous (no other word
- 	could explain it!) process of converting the homegrown debugging
- 	message macro uses into ACE_DEBUG() uses.
-
-	* IIOP/lib/factories.*: Added explicit DTOR for TAO_Client_Factory
- 	and completed all the darn explicit template instantiations.
-  	Changed 'Svc_Handler' to 'TAO_Client_Connection_Handler', and
- 	added the forgotton TAO_Client_Factory::connector() method.
-
-	* IIOP/lib/debug.*: Added 'TAO_' prefix to global debug state
- 	variables and removed crufty #includes.
-
-	* IIOP/lib/connect.cpp: Change ROA_Handler to
- 	TOA_OA_Connection_Handler (missed these the last time through).
-
-	* IIOP/lib/cdr.cpp: Added responsive commentary.
-
-	* IIOP/lib/boa.cpp: Added comments to the dispatching code.
-
-	* IIOP/lib/{any,boa,request,typecode}.cpp: Removed references to
- 	thread.h/connmgr.*.
-
-Thu May 15 19:08:16 1997  Douglas C. Schmidt  <schmidt@flamenco.cs.wustl.edu>
-
-	* Finished updating all the reformatting.
-
-Thu May 15 15:54:49 1997  Chris Cleeland  <cleeland@cs.wustl.edu>
-
-	* IIOP/lib/principa.h: Corrected syntax error which eliminated the
- 	_refcount data member.
-
-	* IIOP/lib/{params,roa}.*: Updated class names to reflect ROA -->
- 	TOA_OA pseudo-namespace change.
-
-	* IIOP/lib/orbobj.*: Updated CORBA_ORB_init() to return pointer to
- 	new ORB singleton.
-
-	* IIOP/lib/orb.h: Commented out some include files to eliminate
- 	wierd circular dependencies.
-
-	* IIOP/lib/optable.h: Moved TAP_Operation_Table into here.  Put
- 	OpTable* classes into the TAO_Operation_Table* pseudo-namespace.
-
-	* IIOP/lib/objtable.*: Moved TAO_Object_Table into here.  Moved
- 	the Entry classes out of the scope of their respective concrete
- 	operation tables, so they're now named <concrete_table>_Entry.
-
-	* IIOP/lib/object.*: Moved TAO_Operation_Table into optable.*, and
- 	added a data member which carries a pointer to the ORB with which
- 	the object is associated.
-
-	* IIOP/lib/iioporb.*: Added a singleton typedef for the ORB which
- 	is what CORBA_ORB_init() will now return.  Modified
- 	string_to_object() so that it sets the ORB on the CORBA_Object
- 	that it returns.
-
-	* IIOP/lib/{iiopobj,nvlist}.h: Added some responsive commentary.
-
-	* IIOP/lib/giop.cpp: Modified connection establishment code in
- 	GIOP::Invocation::start() to utilize the client connection manager
- 	in the ORB.
-
-	* IIOP/lib/giop.h: Put a TAO_Client_Connection_Handler* into
- 	GIOP::Invocation in place of the client_endpoint.
-
-	* IIOP/lib/factories.*: Updated explicit template instantiations,
- 	added TAO_Client_Connection_Handler.
-
-	* IIOP/lib/connect.*: Renamed things--ROA_Parameters -->
- 	TOA_OA_Parameters, ROA_Handler --> TOA_OA_Connection_Handler.
-
-	* IIOP/lib/boa.h: Moved TAO_Object_Table into objtable.*, added
- 	comments where appropriate.
-
-	* IIOP/lib/{any,cdr,iioporb,invoke}.*: Re-formatting and creation
- 	of inline method file.
-
-Tue May 13 21:51:22 1997  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-	* Continued to update the format of the TAO source code so that it
- 	  will be consistent with the style used in ACE.
-
-Mon May 12 17:02:29 1997  Chris Cleeland  <cleeland@cs.wustl.edu>
-
-	* IIOP/lib/roa.*: Moved short method into an inline file.
-  	Miscellaneous reformatting.  Adjustment to new type names
- 	(prefaced by TAO_ for namespace protection).
-
-	* IIOP/lib/object.*: Moved short methods into an inline file.
-  	Changed lookup()/register_op() to find()/bind() for consistency
- 	with established ACE APIs.  Miscellaneous reformatting.
-
-	* IIOP/lib/iiopobj.*: Moved short methods into an inline file.
-  	Added CTOR for IIOP::Version and IIOP::ProfileBody.  Added
- 	convenience CTOR for IIOP_Object where the profile can be
- 	supplied.  Miscellaneous reformatting.
-
-	* IIOP/lib/boa.*: Moved short methods into an inline file.  Changed
- 	lookup()/register_obj() to find()/bind() for consistency with
- 	established ACE APIs.
-
-	* headers: Added comments to force C++ mode in emacs for header
-	files, and changed SCCS version tag info to RCS version tag info.
-
-Wed May  7 14:49:46 1997  Aniruddha Gokhale  <gokhale@mambo.cs.wustl.edu>
-
-	* IIOP/lib/corbacom.cpp: Some bugs from the CORBA_String_var class
-	have been fixed. Thanks to Brian Mendel for noticing these.
-
-	* IIOP/lib/boa.cpp: In CORBA_BOA::dispatch, the opname local
-	variable of type CORBA_String_var is changed to be of type
-	CORBA_String. This was because the String_var class would assume
-	ownership of the quantity assigned and delete it. Thanks again to
-	Brian Mendel for noticing this.
-
-Tue May  6 14:06:49 1997  Aniruddha Gokhale  <gokhale@mambo.cs.wustl.edu>
-
-	* IIOP/lib/boa.hh: the register_obj's 2nd argument is changed from
-	CORBA_Object_ptr& to CORBA_Object_ptr
-
-	* IIOP/lib/object.hh: the return type for register_op method on
-	CORBA_Object is changed from void to int to be consistent.
-
-	Added a new method "get_subclass" to CORBA_Object that returns a
-	pointer to the subclass. Typeically, this would be pointer to an
-	object that implements an interface.
-
-	* IIOP/lib/objtable.{hh,cpp}: @nd argument of register_obj changed
-	from CORBA_Object_ptr& to CORBA_Object_ptr.
-
-	* IIOP/lib/orb.hh: the type signature of "skeleton" is changed to
-	take CORBA_Object_ptr rather than CORBA_Object_ptr& as its 2nd argument.
-
-Mon May  5 20:28:54 1997  Aniruddha Gokhale  <gokhale@mambo.cs.wustl.edu>
-
-	* IIOP/lib/boa.cpp: commented out code that uses the "void
-	*context" field. It doesn't make any sense to have it.
-
-	* IIOP/lib/boa.hh: Added 2 pure virtual methods (shutting_down and
-	clean_shutdown).
-
-	In addition, the "register_obj" method was added. It was missing before.
-
-	* IIOP/lib/corbacom.cpp: String_var's constructor bug is fixed. It
-	was trying to free storage that was never allocated.
-
-	* IIOP/lib/iiopobj.{hh,cpp}: Added a method - "get_name" that
-	retrieves the object name.
-
-	* IIOP/lib/object.{hh,cpp}: Added a method - "get_name" that
-	retrieves the object's name or key. This is for debugging purposes.
-
-	* IIOP/lib/orbobj.cpp: There was an infinite loop in parsing the
-	options to BOA_init. Fixed.
-
-	* IIOP/lib/stub.hh: Added the "get_name" virtual method.
-
-Sat May  3 22:45:23 1997  Aniruddha Gokhale  <gokhale@mambo.cs.wustl.edu>
-
-	* IIOP/lib/boa.cpp: Added code temporarily that invokes the
-	skeleton that is looked up. We still need to add code that will
-	handle the case when no match is found on the operation names.
-
-	* IIOP/lib/boa.hh: The register_obj method on TAO_Object_Table
-	now returns an integer indicating status of registering (-1 =>
-	failure, 0 for success).
-
-	* IIOP/lib/object.hh: The register_op method on
-	TAO_Operation_Table now returns an integer code (O for success, -1
-	for failure).
-
-	* IIOP/lib/objtable.{hh,cpp}: The register_obj method returns an
-	integer code representing either success or failure.
-
-	* IIOP/lib/optable.{hh,cpp}: Added new files that implement
-	concrete strategies for operation name lookup.
-
-Fri May  2 08:48:29 1997  Aniruddha Gokhale  <gokhale@mambo.cs.wustl.edu>
-
-	* IIOP/lib/object.hh: Modified the signature of register_op on
-	TAO_Operation_Table to take a second argument to be a pointer to
-	the actual skeleton.
-
-	Thanks to Brian Mendel for reporting this.
-
-Thu May  1 16:46:11 1997  Aniruddha Gokhale  <gokhale@mambo.cs.wustl.edu>
-
-	* IIOP/lib/object.{hh,cpp}: Added a method that can set the parent
-	pointer.
-
-	* IIOP/lib/params.cpp: A hook has been provided in ROA_Factory to
-	enable the user to use a user-defined demux strategy.
-
-Wed Apr 30 22:00:51 1997  Aniruddha Gokhale  <gokhale@mambo.cs.wustl.edu>
-
-	* IIOP/lib/objtable.{hh,cpp}: Added two new files that define
-	different object demultiplexing strategies.
-
-	* IIOP/lib/Makefile: Added objtable as additional source file to compile.
-
-	* IIOP/lib/boa.cpp: Provided the default destructor for the
-	TAO_Object_Table.
-
-	* IIOP/lib/boa.cpp: Provided the default destructor for the
-	TAO_Operation_Table.
-
-	* IIOP/lib/orbobj.cpp: Added support for the -OAtablesize option
-	in the call to CORBA_ORB::BOA_init method.
-
-	* IIOP/lib/params.{hh,i,cpp}: Added support to ROA_Factory to return
-	a specific object lookup strategy.
-
-	*IIOP/lib/roa.cpp: The ROA constructor initializes its "objtable_"
-	private data member with the object lookup strategy returned by
-	ROA factory.
-
-Tue Apr 29 11:52:48 1997  Aniruddha Gokhale  <gokhale@mambo.cs.wustl.edu>
-
-	* IIOP/lib/any.hh: Moved CORBA_Any_ptr declaration to orb.hh.
-
-	* IIOP/lib/boa.{hh,cpp}: Renamed BOA to CORBA_BOA. The CORBA_BOA class
-	maintains a pointer to an abstract TAO_ObjectTable class. Concrete
-	classes inheriting from TAO_ObjectTable will provide strategies
-	for lookup.
-
-	Added virtual functions to do dispatch based on object key. In
-	addition, added a lookup method based on object key that delegates
-	the task of looking the object to the object table it maintains.
-
-	Changed the signature of typedef CORBA_BOA::dsi_handler to be pointer to
-	member function of class CORBA_BOA. Eventually, this will point to
-	the dispatch method of class CORBA_BOA.
-
-	Moved "struct Dispatch_Context" from roa.hh to boa.hh since we
-	want BOA to be a full fledged OA eventually and not remain an
-	abstract class as it is now. All other OA's such as ROA inherit
-	from BOA and only add extra functionality.
-
-	* IIOP/lib/connect.cpp: There was a syntax error (missing comma)
-	in one of the ACE_DEBUG statements which has been fixed.
-
-	* IIOP/lib/corbacom.{hh,cpp}: Added class CORBA_String_var as well
-	as the CORBA compliant CORBA_string_dup.
-
-	* IIOP/lib/except.hh: Moved CORBA_Exception_ptr declaration to orb.hh.
-
-	* IIOP/lib/object.hh: Added an abstract class
-	TAO_Operation_Table. CORBA_Object maintains a pointer to this
-	abstract class. The IDL compiler will eventually generate concrete
-	classes that employ different lookup strategies for operation name
-	lookup.
-
-	* IIOP/lib/orb.hh: Added forward declarations to all CORBA_*
-	classes. In addition, moved all the CORBA_*_ptr declarations here.
-
-	* IIOP/lib/orbobj.{hh,cpp}: Added the CORBA compliant BOA_init
-	method to class CORBA_ORB. Users can now pass arguments to
-	BOA_init. Eventually, we want to make this method return any of
-	the specialized OA's depending on the arguments. Right now, we get
-	a pointer to the ROA.
-
-	* IIOP/lib/params.{hh,i}: Added some more methods and enum
-	declarations to the ROA_PARAMS singleton.
-
-	* IIOP/lib/principa.hh: Moved the CORBA_Principal_ptr declaration
-	to orb.hh.
-
-	* IIOP/lib/roa.{hh,cpp}: Moved some functionality to boa.hh. ROA
-	is now only a specialized form of BOA.
-
-	* IIOP/lib/stub.hh: Moved the typedef for "skeleton" to orb.hh.
-
-	* IIOP/lib/svrrqst.{hh,cpp}: Had to rename BOA to CORBA_BOA.
-
-	* IIOP/lib/typecode.hh: Moved the CORBA_TypeCode_ptr declaration
-	to orb.hh.
-
-Tue Apr 22 23:30:19 1997  Chris Cleeland  <cleeland@cs.wustl.edu>
-
-	* IIOP/lib/connect.cpp (open): Added log message.
-
-	* IIOP/lib/params.cpp (concurrency_strategy): Uses reactive
- 	strategy when appropriate.
-
-	* IIOP/lib/params.hh: Reactive strategy added.
-
-Tue Apr 22 21:03:15 1997  Chris Cleeland  <cleeland@tango.cs.wustl.edu>
-
-	* IIOP/lib/giop.cpp: Changed erroneous ACE_GUARD calls to ACE_GUARD_RETURN
- 	calls.
-
-Tue Apr 22 16:15:52 1997  Chris Cleeland  <cleeland@cs.wustl.edu>
-
-	* IIOP/lib/roa.cpp: Removed more POSIX thread calls.
-
-	* IIOP/lib/invoke.cpp: Changed ForceSynchronousCancellation to
- 	ACE_Synchronous_Cancellation_Required and made it use the ACE_OS
- 	calls.
-
-	* IIOP/lib/{typecode,svrrqst,request,principa,orbobj,nvlist,iiopobj,giop,except,any}.*:
- 	Removed all vestiges of pthread mutexes...they are now
- 	ACE_Thread_Mutexes.  This will likely have to change if we want to
- 	compile something completely devoid of threads, but that's another
- 	day.  Also, the mutexes have moved from being globals to being
- 	members on the respective classes.  No files should be dependent
- 	on thread.hh any longer.
-
-	* IIOP/lib/connect.cpp (open): Removed code obsoleted by use of
- 	the Strategy_Acceptor.
-
-	* IIOP/lib/{roa.cpp,connect.cpp},IIOP/tests/svr.cpp: Changes to
- 	use new singletons described below.
-
-	* IIOP/lib/params.*: Changed ROA_Parameters and ROA_Factory to use
- 	ACE_Singleton<>.  The singleton types are now named ROA_PARAMS and
- 	ROA_FACTORY.
-
-Mon Apr 21 23:44:34 1997  Douglas C. Schmidt  <schmidt@flamenco.cs.wustl.edu>
-
-	* IIOP/lib/roa.cpp (ROA): Changed spelling of clientAcceptor_ to
- 	client_acceptor_ to be consistent with ACE style conventions.
-
-Mon Apr 21 10:52:42 1997  Chris Cleeland  <cleeland@cs.wustl.edu>
-
-	* IIOP/test/clnt.cpp: Moved call to CORBA_ORB_init() prior to the
- 	parsing of the command line args.  This got switched around during
- 	porting to VxWorks.
-
-	* IIOP/lib/roa.cpp: Changed calls using clientAcceptor_to use APIs
- 	vended by ACE_Strategy_Acceptor.
-
-	* IIOP/lib/roa.hh: Moved default thread flags into ROA_Factory.
-
-	* IIOP/lib/params.*: Added ROA_Factory, a singleton which is the
- 	beginning of an abstract factory dynamically producing runtime
- 	strategies based on information found in ROA_Parameters.
-
-	* IIOP/lib/connect.cpp: Added call to ROA_Handler's base class
- 	CTOR in initializer list.
-
-	* IIOP/lib/connect.hh: Changed ROA_Handler's CTOR so that it can
- 	take an optional ACE_Thread_Manager* arg.  This makes it
- 	compatible with the CTORs for the base class.  Also changed base
- 	class for ROA_Acceptor to ACE_Strategy_Acceptor.
-
-	* IIOP/lib/svrrqst.*: Changed references to BOA_ptr from TOA_ptr.
-
-	* IIOP/lib/connect.*: ROA_Handler/ROA_Acceptor moved from roa.*
- 	into here.
-
-	* IIOP/lib/params.*: ROA_Parameters moved from roa.* into here.
-
-	* IIOP/lib/boa.*: What used to be TOA is now BOA, and lives in
- 	here.
-
-	* IIOP/lib/roa.*: Major restructuring required removal of all
- 	classes (see other log entries) from here.  This file now houses
- 	only the ROA class.
-
-	* IIOP/lib/{tcpoa.*,toa.*}: Removed because of name changes from
- 	TCP_OA->ROA and TOA->BOA.
-
-Fri Apr 18 08:09:19 1997  Brian Mendel   <bmendel@mdc.com>
-
-	* cdr.hh,corbacom.{hh,cpp},giop.cpp,marshall.cpp,typecode.cpp:
- 	Changes required for WChar missed in earlier committed code.
-
-	* connmgr.cpp: Changes required for select statement.
-
-	* nvlist.cpp: Conditional include for memory.h added.  VxWorks
- 	does not have memory.h.
-
-	* object.cpp: Added conditional for VXWORKS to define
- 	IID_IUnknown.
-
-	* orbconf.hh: Minor tuning of the configuration file.
-
-	* tcpoa.{hh,cpp}: Added VXWORKS conditional includes.
-
-	* toa.cpp: Added VXWORKS conditional includes.
-
-
-Mon Apr 15 17:01:00 1997  Brian Mendel  <bmendel@mdc.com>
-
-	* roa.cpp: Added return statement to ROA_Handler::open(void*)
- 	method.
-
-	* giop.cpp: Modified giop::read_buffer to replace undefined fc
- 	with peer.get_handle().  Modified giop::incoming_message method
- 	parameter list to match function prototype exactly.
-
-	* tcpoa.cpp: Replaced fd instances in debug messages with
- 	peer.get_handle() calls.
-
-Mon Apr 14 13:45:54 1997  Chris Cleeland  <cleeland@cs.wustl.edu>
-
-	* roa.{hh,i,cpp},tcpoa.cpp,svr.cpp: Replaced ACE_ROA with
- 	ROA_Parameters, which is a GoF-style singleton.
-
-Sun Apr 13 00:01:56 1997  Chris Cleeland  <cleeland@tango.cs.wustl.edu>
-
-	* roa.cpp: Fix continuation condition in ROA_Handler::svc()'s loop
- 	so that it doesn't stop after one iteration.  Also added some
- 	debug messages.
-
-	* giop.cpp: Fixed some returns being called with no value.  This
- 	should have been caught in the previous round of changes.
-
-Sat Apr 12 23:10:08 1997  Chris Cleeland  <cleeland@cs.wustl.edu>
-
-	* tcpoa.{hh,cpp}: TCP_OA::handle_message() now returns a value
- 	indicating how a message was handled.
-
-	* roa.cpp: ROA_Handler::handle_input() now returns a meaningful
- 	value based on what TCP_OA::handle_message() returns.
-
-	* giop.{hh,cpp}: Added end-of-file detection on socket
- 	connections, and that is now propagated all the way back up
- 	through GIOP::incoming_message().  I don't know if I violated
- 	something in the spec by doing this, but it was necessary.  I'll
- 	look into it later.
-
-Thu Apr 10 11:49:44 1997  Chris Cleeland  <cleeland@cs.wustl.edu>
-
-	* giop.{hh,cpp}: Overloaded all methods dealing with connections
- 	so that there are two, one taking a file descriptor as argument,
- 	the other taking an ACE_SOCK_Stream.  Right now, the *_Stream
- 	version simply forwards to the fd-based one.  I would have
- 	preferred to get rid of the fd-based methods altogether, but we've
- 	only converted the server runtime; the client is still using the
- 	original sun code, which is effectively fd-based.  In the course
- 	of doing this, I also simplified the decls for incoming_message by
- 	creating typedefs for some of the function pointers passed as
- 	args.
-
-	* orbconf.hh: Fixed the stupid auto-endian-ness detector
- 	AGAIN...had my logic reversed!
-
-	* roa.cpp: Adjusted code in accordance with changes to tcpoa.hh.
-
-	* tcpoa.hh: Moved and renamed TCP_OA::dispatch_context to be
- 	::Dispatch_Context, and changed its endpoint member to be an
- 	ACE_SOCK_Stream.
-
-	* roa.hh: Fixed handle_input() to use the underlying peer() data
- 	member for reading data, rather than using its argument.  This is
- 	so that when a different thread handles each connection,
- 	handle_input() can simply be called repeatedly by svc().
-
-Wed Apr  9 16:19:21 1997  Chris Cleeland  <cleeland@tango.cs.wustl.edu>
-
-	* tcpoa.cpp: Fixed a problem that G++ didn't notice regarding
- 	changing the notion of endpoints in servers from server_endpoint
- 	to an ACE_HANDLE.
-
-Wed Apr  9 15:43:37 1997  Chris Cleeland  <cleeland@cs.wustl.edu>
-
-	* svr.cpp: The -p option is gone, and -e takes its place and is
- 	required.  This requires the user to specify not only the port
- 	number, but also the IP address of on which the server should
- 	listen for requests.  See ACE_INET_Addr documentation for valid
- 	string formats for addresses.  Also, the -t option sets the "use
- 	threads" global.
-
-	* orbconf.hh: Hopefully resolved the tension between MS and Unix
- 	platforms in inferring endian-ness of the target platform based on
- 	preprocessor defines.  We now check for i386, _M_X86, and vax
- 	(yeah, like we really worry about that, but it's easy to do).
-
-	* roa.{hh,i,cpp}: Added support for spawning threads to handle
- 	incoming requests.  This involves a state flag for whether or not
- 	to use threads, calling activate() in ROA_Handler::open() if that
- 	flag is set, and creating ROA_Handler::svc() that simply loops
- 	calling handle_input().
-
-Tue Apr  8 11:14:57 1997  Chris Cleeland  <cleeland@cs.wustl.edu>
-
-	* IIOP/test/svr.cpp: Moved setting of upcall(), forwarder(),
- 	context(), etc. into here rather than in TCP_OA::TCP_OA(), which
- 	is where I mistakenly stuck them a few days ago (duh!).
-
-	* IIOP/lib/tcpoa.cpp: Removed setting of ACE_ROA::upcall(), which belongs
- 	in the server code.  I got confused because the function names
- 	were so similar: tcpoa.cpp contains ::tcp_oa_dispatcher(), and
- 	svr.cpp contains ::tcpoa_dispatch().
-
-	* IIOP/lib/roa.{hh,i,cpp}: Added forwarding function to ACE_ROA global namespace
- 	hack.
-
-	* IIOP/lib/orbconf.hh: Fixed preprocessor checks that auto-detect
- 	endian-ness of this processor.
-
-Mon Apr  7 21:08:24 1997  Chris Cleeland  <cleeland@cs.wustl.edu>
-
-	* IIOP/test/test1_{clnt,svr}.cpp: THESE HAVE NOT BEEN CONVERTED TO
- 	USE ACE EVENT HANDLING!!  This round of changes explicitly
- 	instantiates templates where required.
-
-	* IIOP/test/svr.cpp: Global function ::OA_listen() no longer
- 	exists; its functionality is now fully contained within ::main().
-  	If USE_ACE_EVENT_HANDLING is defined, a Reactor-based event loop
- 	is used.  The original intent was to allow conditional compilation
- 	to select btw. the original method and a Reactor-based method.
-  	However, weaving that into the library proved far more difficult
- 	than anticipated, so more than likely not defining
- 	USE_ACE_EVENT_HANDLING will cause massive grief.
-
-	* IIOP/lib/toa.cpp: Changed call to TCP_OA::init() to reflect new
- 	ACE_INET_Addr argument type.
-
-	* IIOP/lib/tcpoa.cpp (TCP_OA): All initialization methods were
- 	changed, specifically the CTOR and TCP_OA::init, to reflect the
- 	introduction of ACE_INET_Addr.  Two side-effects of using
- 	ACE_INET_Addr are that (1) a server can specify the address on
- 	which it wants to listen and (2) best that I can tell, the server
- 	MUST specify the address on which it wants to listen because
- 	otherwise it won't be able to publish a rational IOR.  The event
- 	loop is now changed to simply loop on Reactor::handle_events().
-
-	* IIOP/lib/tcpoa.hh (TCP_OA): Removed vestiges of this component's
- 	use of the original connection management scheme.  Where
- 	appropriate, hostnames and ports were replaces by ACE_INET_Addr,
- 	endpoints by ACE_HANDLEs, etc.  One particularly nasty thing done
- 	was to declare ROA_Handler as a friend so that handle_message()
- 	can be called from ROA_Handler::handle_input(), which to me
- 	exposes a hole in the original architecture wherein input is
- 	"pulled" rather than waited-for.  We might need to re-think how
- 	this is handled within TAO.
-
-	* IIOP/lib/roa.{hh,i,cpp}: These files contain the required
- 	components to support the new server-side ACE-based
- 	connection/event substrate.  The client side remains, as always,
- 	using the connection mgmt scheme used by the original Sun IIOP
- 	code.
-
-	* IIOP/lib/giop.cpp: Added explicit template instantiation for
- 	when this is needed.
-
-	* IIOP/lib/corbacom.hh: Now protects itself from multiple
- 	inclusion.
-
-	* IIOP/lib/Makefile: Added roa.* where appropriate.
-
-Wed Mar 19 10:25:21 1997  Chris Cleeland  <cleeland@cs.wustl.edu>
-
-	* IIOP/docs/us/codecount/*.count: Added to repository.
-
-	* Makefile: Added to repository.
-
-	* IIOP/objbase.h: Moved to IIOP/compat.
-
-	* IIOP/initguid.h: Moved to IIOP/compat.
-
-Thu Mar 13 14:06:28 1997  Chris Cleeland  <cleeland@cs.wustl.edu>
-
-	* ChangeLog: Added the ChangeLog.
diff --git a/TAO/IIOP/Build/default.bld b/TAO/IIOP/Build/default.bld
deleted file mode 100755
index 7b67d4a13c9..00000000000
--- a/TAO/IIOP/Build/default.bld
+++ /dev/null
@@ -1,16 +0,0 @@
-#!build
-default:
-	nobuild
-	:debuglevel=multi
-tao.bld
-	library
-	:cx_e_option=nomsgnumbers
-	:dependency=nodepend
-	:cx_silent=1
-	:cx_silent=21
-	:cx_silent=191
-	:sourcedirs=/home/ace/ACE_wrappers.vxworks
-	:sourcedirs=../lib
-	:sourcedirs=..
-	:libraries=/home/ace/ACE_wrappers.vxworks/libACE.a
-	:libraries=/appl/newgreen/vxppc603/indlib.o
diff --git a/TAO/IIOP/Build/tao.bld b/TAO/IIOP/Build/tao.bld
deleted file mode 100755
index 21007d8ab61..00000000000
--- a/TAO/IIOP/Build/tao.bld
+++ /dev/null
@@ -1,53 +0,0 @@
-#!build
-default:
-	library
-	:defines=__IIOP_BUILD
-	:defines=DEBUG
-../lib/any.cpp
-	C++
-../lib/cdr.cpp
-	C++
-../lib/connmgr.cpp
-	C++
-../lib/corbacom.cpp
-	C++
-../lib/debug.cpp
-	C++
-../lib/except.cpp
-	C++
-../lib/giop.cpp
-	C++
-../lib/iiopobj.cpp
-	C++
-../lib/iioporb.cpp
-	C++
-../lib/interp.cpp
-	C++
-../lib/invoke.cpp
-	C++
-../lib/marshal.cpp
-	C++
-../lib/nvlist.cpp
-	C++
-../lib/object.cpp
-	C++
-../lib/orbobj.cpp
-	C++
-../lib/principa.cpp
-	C++
-../lib/request.cpp
-	C++
-../lib/svrrqst.cpp
-	C++
-../lib/t-sizes.cpp
-	C++
-../lib/tc_const.cpp
-	C++
-../lib/tcpoa.cpp
-	C++
-../lib/toa.cpp
-	C++
-../lib/typecode.cpp
-	C++
-../lib/roa.cpp
-	C++
diff --git a/TAO/IIOP/Makefile b/TAO/IIOP/Makefile
deleted file mode 100644
index f6dba1717ab..00000000000
--- a/TAO/IIOP/Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
-#----------------------------------------------------------------------------
-#	$Id$
-#
-#	Top-level Makefile for the ACE-ified Sun Ref. implementation
-#	of IIOP ORB
-#----------------------------------------------------------------------------
-
-#----------------------------------------------------------------------------
-#	Local macros
-#----------------------------------------------------------------------------
-
-INFO	= 
-
-DIRS	= lib #test
-
-CLONE	= 
-
-#----------------------------------------------------------------------------
-#	Include macros and targets
-#----------------------------------------------------------------------------
-
-include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-include $(ACE_ROOT)/include/makeinclude/macros.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.nested.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.nolocal.GNU
-
diff --git a/TAO/IIOP/docs/us/codecounts/align.hh.cccc b/TAO/IIOP/docs/us/codecounts/align.hh.cccc
deleted file mode 100644
index 13cb1ddca0e..00000000000
--- a/TAO/IIOP/docs/us/codecounts/align.hh.cccc
+++ /dev/null
@@ -1,29 +0,0 @@
-
-CCCC - a code counter for C and C++
-===================================
-
-A program to analyse C and C++ source code and report on
-some simple software metrics
-Version  1.00 
-Copyright Tim Littlefair, 1995
-
-The development of this program was heavily dependent on
-the Purdue Compiler Construction Tool Set (PCCTS) 
-by Terence Parr, Will Cohen, Hank Dietz, Russel Quoung
-and others.
-
-This software is provided with NO WARRANTY
-
-
-Scope: ../../../lib/align.hh
-Canonical name                       From   To   COM   LOC   MVG   L/C   M/C
---------------------                 ---- ---- ----- ----- ----- ----- -----
-typedef unsigned int ptr_arith_t;    1    21      14     2     0   0.1   0.0
-typedef unsigned long ptr_arith_t;   24   24       0     0     0            
-typedef unsigned long long ptr_arit  27   27       0     0     0            
-static inline ptr_arith_t align_bin  35   46       5     5     1   1.0   0.2
-static inline unsigned char*ptr_ali  49   61       8     4     1   0.5   0.1
---------------------                 ---- ---- ----- ----- ----- ----- -----
-Summary for scope:                                27    16     2   0.6   0.1
---------------------                 ---- ---- ----- ----- ----- ----- -----
-
diff --git a/TAO/IIOP/docs/us/codecounts/any.cpp.cccc b/TAO/IIOP/docs/us/codecounts/any.cpp.cccc
deleted file mode 100644
index 44e6cce66e5..00000000000
--- a/TAO/IIOP/docs/us/codecounts/any.cpp.cccc
+++ /dev/null
@@ -1,41 +0,0 @@
-
-CCCC - a code counter for C and C++
-===================================
-
-A program to analyse C and C++ source code and report on
-some simple software metrics
-Version  1.00 
-Copyright Tim Littlefair, 1995
-
-The development of this program was heavily dependent on
-the Purdue Compiler Construction Tool Set (PCCTS) 
-by Terence Parr, Will Cohen, Hank Dietz, Russel Quoung
-and others.
-
-This software is provided with NO WARRANTY
-
-
-Scope: ../../../lib/any.cpp
-Canonical name                       From   To   COM   LOC   MVG   L/C   M/C
---------------------                 ---- ---- ----- ----- ----- ----- -----
-static pthread_mutex_t any_lock=PTH  1    48      34     1     0   0.0   0.0
-CORBA_TypeCode_ptr CORBA_Any::type(  53   57       0     4     1 ! *** ! ***
-void*CORBA_Any::value()const{return  59   63       0     4     1 ! *** ! ***
-CORBA_Any::CORBA_Any(){}             65   78       7     6     0   0.9   0.0
-CORBA_Any::CORBA_Any(){}             81   97       5    11     0   2.2   0.0
-static CORBA_TypeCode::traverse_sta  100  305     44 ? 131 !  30   3.0   0.7
-CORBA_Any::CORBA_Any(){}             308  329      4    13     1   3.3   0.3
-static CORBA_TypeCode::traverse_sta  332  457     46    60 !  21   1.3   0.5
-CORBA_Any::~CORBA_Any(){}            460  481     10     9     2   0.9   0.2
-void CORBA_Any::replace(){}          484  509      3    19     2   6.3   0.7
-DEFINE_GUID(IID_CORBA_Any,0xa201e4c  511  517      4     2     0   0.5   0.0
-ULONG __stdcall CORBA_Any::AddRef()  520  529      0     6     1 ! *** ! ***
-ULONG __stdcall CORBA_Any::Release(  531  548      0    10     3 ! *** ! ***
-HRESULT __stdcall CORBA_Any::QueryI  550  567      0    14     5 ! *** ! ***
-CORBA_Any::CORBA_Any(){}             570  583      4     8     0   2.0   0.0
-CORBA_Any&CORBA_Any::operator=(){}   585  660     16    45 ?  15   2.8   0.9
-CORBA_Any::operator VARIANT(){VARIA  662  670      1     5     1   5.0   1.0
---------------------                 ---- ---- ----- ----- ----- ----- -----
-Summary for scope:                               178   365    83   2.1   0.5
---------------------                 ---- ---- ----- ----- ----- ----- -----
-
diff --git a/TAO/IIOP/docs/us/codecounts/any.hh.cccc b/TAO/IIOP/docs/us/codecounts/any.hh.cccc
deleted file mode 100644
index 6cfac7fd831..00000000000
--- a/TAO/IIOP/docs/us/codecounts/any.hh.cccc
+++ /dev/null
@@ -1,27 +0,0 @@
-
-CCCC - a code counter for C and C++
-===================================
-
-A program to analyse C and C++ source code and report on
-some simple software metrics
-Version  1.00 
-Copyright Tim Littlefair, 1995
-
-The development of this program was heavily dependent on
-the Purdue Compiler Construction Tool Set (PCCTS) 
-by Terence Parr, Will Cohen, Hank Dietz, Russel Quoung
-and others.
-
-This software is provided with NO WARRANTY
-
-
-Scope: ../../../lib/any.hh
-Canonical name                       From   To   COM   LOC   MVG   L/C   M/C
---------------------                 ---- ---- ----- ----- ----- ----- -----
-typedef CORBA_Any*CORBA_Any_ptr;     1    10       9     0     0   0.0   0.0
-extern const IID IID_CORBA_Any;      12   12       0     0     0            
-class CORBA_Any{};                   14   87      16    46     2   2.9   0.1
---------------------                 ---- ---- ----- ----- ----- ----- -----
-Summary for scope:                                25    49     2   2.0   0.1
---------------------                 ---- ---- ----- ----- ----- ----- -----
-
diff --git a/TAO/IIOP/docs/us/codecounts/cdr.cpp.cccc b/TAO/IIOP/docs/us/codecounts/cdr.cpp.cccc
deleted file mode 100644
index aa92c9f81bd..00000000000
--- a/TAO/IIOP/docs/us/codecounts/cdr.cpp.cccc
+++ /dev/null
@@ -1,36 +0,0 @@
-
-CCCC - a code counter for C and C++
-===================================
-
-A program to analyse C and C++ source code and report on
-some simple software metrics
-Version  1.00 
-Copyright Tim Littlefair, 1995
-
-The development of this program was heavily dependent on
-the Purdue Compiler Construction Tool Set (PCCTS) 
-by Terence Parr, Will Cohen, Hank Dietz, Russel Quoung
-and others.
-
-This software is provided with NO WARRANTY
-
-
-Scope: ../../../lib/cdr.cpp
-Canonical name                       From   To   COM   LOC   MVG   L/C   M/C
---------------------                 ---- ---- ----- ----- ----- ----- -----
-CORBA_Boolean CDR::put_byte(){}      1    60      37    11     4   0.3   0.1
-CORBA_Boolean CDR::put_short(){}     63   90       7    18     4   2.6   0.6
-CORBA_Boolean CDR::put_long(){}      92   120      7    18     4   2.6   0.6
-CORBA_Boolean CDR::put_longlong(){}  122  149      7    18     4   2.6   0.6
-CORBA_Boolean CDR::put_longdouble()  151  178      7    18     4   2.6   0.6
-CORBA_Boolean CDR::get_byte(){}      181  196      3    11     3   3.7   1.0
-CORBA_Boolean CDR::get_short(){}     199  230      6    22     4   3.7   0.7
-CORBA_Boolean CDR::get_long(){}      232  269     10    24     4   2.4   0.4
-CORBA_Boolean CDR::get_longlong(){}  271  312     10    28     4   2.8   0.4
-CORBA_Boolean CDR::get_longdouble()  315  363      9    36     4   4.0   0.4
-CORBA_Boolean CDR::skip_string(){CO  366  377      2     8     4   4.0   2.0
-CORBA_Boolean CDR::grow(){}          380  460     37    34 ?   9   0.9   0.2
---------------------                 ---- ---- ----- ----- ----- ----- -----
-Summary for scope:                               142   258    52   1.8   0.4
---------------------                 ---- ---- ----- ----- ----- ----- -----
-
diff --git a/TAO/IIOP/docs/us/codecounts/cdr.hh.cccc b/TAO/IIOP/docs/us/codecounts/cdr.hh.cccc
deleted file mode 100644
index 627ff33a9d9..00000000000
--- a/TAO/IIOP/docs/us/codecounts/cdr.hh.cccc
+++ /dev/null
@@ -1,26 +0,0 @@
-
-CCCC - a code counter for C and C++
-===================================
-
-A program to analyse C and C++ source code and report on
-some simple software metrics
-Version  1.00 
-Copyright Tim Littlefair, 1995
-
-The development of this program was heavily dependent on
-the Purdue Compiler Construction Tool Set (PCCTS) 
-by Terence Parr, Will Cohen, Hank Dietz, Russel Quoung
-and others.
-
-This software is provided with NO WARRANTY
-
-
-Scope: ../../../lib/cdr.hh
-Canonical name                       From   To   COM   LOC   MVG   L/C   M/C
---------------------                 ---- ---- ----- ----- ----- ----- -----
-struct _EXPCLASS CDR{enum{SHORT_SIZ  1    362    155 ? 142 !  25   0.9   0.2
-;                                    362  362      0     0     0            
---------------------                 ---- ---- ----- ----- ----- ----- -----
-Summary for scope:                               155   143    25   0.9   0.2
---------------------                 ---- ---- ----- ----- ----- ----- -----
-
diff --git a/TAO/IIOP/docs/us/codecounts/connmgr.cpp.cccc b/TAO/IIOP/docs/us/codecounts/connmgr.cpp.cccc
deleted file mode 100644
index e934a7ebd12..00000000000
--- a/TAO/IIOP/docs/us/codecounts/connmgr.cpp.cccc
+++ /dev/null
@@ -1,38 +0,0 @@
-
-CCCC - a code counter for C and C++
-===================================
-
-A program to analyse C and C++ source code and report on
-some simple software metrics
-Version  1.00 
-Copyright Tim Littlefair, 1995
-
-The development of this program was heavily dependent on
-the Purdue Compiler Construction Tool Set (PCCTS) 
-by Terence Parr, Will Cohen, Hank Dietz, Russel Quoung
-and others.
-
-This software is provided with NO WARRANTY
-
-
-Scope: ../../../lib/connmgr.cpp
-Canonical name                       From   To   COM   LOC   MVG   L/C   M/C
---------------------                 ---- ---- ----- ----- ----- ----- -----
-static client_endpoint*client_list;  1    77      40     2     0   0.1   0.0
-static server_endpoint*server_list;  78   78       0     0     0            
-static pthread_mutex_t client_lock=  82   88       6     0     0   0.0   0.0
-static pthread_mutex_t server_lock=  89   89       0     0     0            
-static ACE_HANDLE signal_fd;         91   97       6     0     0   0.0   0.0
-static ACE_HANDLE signal_in_fd;      99   103      4     0     0   0.0   0.0
-void client_endpoint::release(){}    108  120      3     6     0   2.0   0.0
-client_endpoint*client_endpoint::lo  123  290     75    69 ?  18   0.9   0.2
-void client_endpoint::dump(){}       295  318      6    12     1   2.0   0.2
-void server_endpoint::release(){}    324  354     17     7     0   0.4   0.0
-server_endpoint*server_endpoint::in  357  507     50    72 ?  16   1.4   0.3
-server_endpoint*server_endpoint::bl  510  742     89 ? 105 !  27   1.2   0.3
-void server_endpoint::shutdown_conn  744  765      0    16     2 ! *** ! ***
-void server_endpoint::dump(){}       770  790      3    12     2   4.0   0.7
---------------------                 ---- ---- ----- ----- ----- ----- -----
-Summary for scope:                               299   315    66   1.1   0.2
---------------------                 ---- ---- ----- ----- ----- ----- -----
-
diff --git a/TAO/IIOP/docs/us/codecounts/connmgr.hh.cccc b/TAO/IIOP/docs/us/codecounts/connmgr.hh.cccc
deleted file mode 100644
index e688b27d271..00000000000
--- a/TAO/IIOP/docs/us/codecounts/connmgr.hh.cccc
+++ /dev/null
@@ -1,27 +0,0 @@
-
-CCCC - a code counter for C and C++
-===================================
-
-A program to analyse C and C++ source code and report on
-some simple software metrics
-Version  1.00 
-Copyright Tim Littlefair, 1995
-
-The development of this program was heavily dependent on
-the Purdue Compiler Construction Tool Set (PCCTS) 
-by Terence Parr, Will Cohen, Hank Dietz, Russel Quoung
-and others.
-
-This software is provided with NO WARRANTY
-
-
-Scope: ../../../lib/connmgr.hh
-Canonical name                       From   To   COM   LOC   MVG   L/C   M/C
---------------------                 ---- ---- ----- ----- ----- ----- -----
-template<>class autorelease{};       1    47      14    16     6   1.1   0.4
-struct client_endpoint{};            50   85      11    15     0   1.4   0.0
-class server_endpoint{};             88   141     15    27     0   1.8   0.0
---------------------                 ---- ---- ----- ----- ----- ----- -----
-Summary for scope:                                40    61     6   1.5   0.2
---------------------                 ---- ---- ----- ----- ----- ----- -----
-
diff --git a/TAO/IIOP/docs/us/codecounts/corbacom.cpp.cccc b/TAO/IIOP/docs/us/codecounts/corbacom.cpp.cccc
deleted file mode 100644
index b7859bad94a..00000000000
--- a/TAO/IIOP/docs/us/codecounts/corbacom.cpp.cccc
+++ /dev/null
@@ -1,32 +0,0 @@
-
-CCCC - a code counter for C and C++
-===================================
-
-A program to analyse C and C++ source code and report on
-some simple software metrics
-Version  1.00 
-Copyright Tim Littlefair, 1995
-
-The development of this program was heavily dependent on
-the Purdue Compiler Construction Tool Set (PCCTS) 
-by Terence Parr, Will Cohen, Hank Dietz, Russel Quoung
-and others.
-
-This software is provided with NO WARRANTY
-
-
-Scope: ../../../lib/corbacom.cpp
-Canonical name                       From   To   COM   LOC   MVG   L/C   M/C
---------------------                 ---- ---- ----- ----- ----- ----- -----
-CORBA_String CORBA_string_alloc(){}  1    26      10     5     1   0.5   0.1
-CORBA_String CORBA_string_copy(){}   28   37       0     7     3 ! *** ! ***
-void CORBA_string_free(){}           39   43       0     4     0 ! ***      
-extern"unsigned wslen(const wchar_t  47   60       4     8     2   2.0   0.5
-extern"wchar_t*wscpy(wchar_t*dest,c  62   70       0     7     2 ! *** ! ***
-CORBA_WString CORBA_wstring_alloc()  74   82       4     4     1   1.0   0.3
-CORBA_WString CORBA_wstring_copy(){  84   92       0     7     3 ! *** ! ***
-void CORBA_wstring_free(){}          94   98       0     4     0 ! ***      
---------------------                 ---- ---- ----- ----- ----- ----- -----
-Summary for scope:                                18    54    12   3.0   0.7
---------------------                 ---- ---- ----- ----- ----- ----- -----
-
diff --git a/TAO/IIOP/docs/us/codecounts/corbacom.hh.cccc b/TAO/IIOP/docs/us/codecounts/corbacom.hh.cccc
deleted file mode 100644
index 256095a8f3e..00000000000
--- a/TAO/IIOP/docs/us/codecounts/corbacom.hh.cccc
+++ /dev/null
@@ -1,59 +0,0 @@
-
-CCCC - a code counter for C and C++
-===================================
-
-A program to analyse C and C++ source code and report on
-some simple software metrics
-Version  1.00 
-Copyright Tim Littlefair, 1995
-
-The development of this program was heavily dependent on
-the Purdue Compiler Construction Tool Set (PCCTS) 
-by Terence Parr, Will Cohen, Hank Dietz, Russel Quoung
-and others.
-
-This software is provided with NO WARRANTY
-
-
-Scope: ../../../lib/corbacom.hh
-Canonical name                       From   To   COM   LOC   MVG   L/C   M/C
---------------------                 ---- ---- ----- ----- ----- ----- -----
-typedef bool CORBA_Boolean;          1    13       6     1     0   0.2   0.0
-typedef int CORBA_Boolean;           18   18       0     0     0            
-enum{CORBA_B_FALSE=0,CORBA_B_TRUE=1  19   19       0     0     0            
-;                                    19   19       0     0     0            
-typedef unsigned char CORBA_Octet;   22   22       0     0     0            
-typedef short CORBA_Short;           24   24       0     0     0            
-typedef unsigned short CORBA_UShort  25   25       0     0     0            
-typedef long CORBA_Long;             27   32       4     0     0   0.0   0.0
-typedef unsigned long CORBA_ULong;   33   33       0     0     0            
-typedef int CORBA_Long;              35   36       1     0     0   0.0   0.0
-typedef unsigned CORBA_ULong;        37   37       0     0     0            
-typedef long long CORBA_LongLong;    40   47       6     0     0   0.0   0.0
-typedef unsigned long long CORBA_UL  48   48       0     0     0            
-typedef long CORBA_LongLong;         50   50       0     0     0            
-typedef unsigned long CORBA_ULongLo  51   51       0     0     0            
-typedef __int64 CORBA_LongLong;      53   53       0     0     0            
-typedef unsigned __int64 CORBA_ULon  54   54       0     0     0            
-struct CORBA_LongLong{};             56   64       6     0     0   0.0   0.0
-struct CORBA_ULongLong{};            65   65       0     0     0            
-struct CORBA_LongLong{};             67   67       0     0     0            
-struct CORBA_ULongLong{};            68   68       0     0     0            
-typedef float CORBA_Float;           72   72       0     0     0            
-typedef double CORBA_Double;         73   73       0     0     0            
-typedef long double CORBA_LongDoubl  75   83       7     0     0   0.0   0.0
-struct CORBA_LongDouble{};           86   88       0     2     0 ! ***      
-typedef char CORBA_Char;             91   91       0     0     0            
-typedef CORBA_Char*CORBA_String;     92   92       0     0     0            
-CORBA_String CORBA_string_alloc();   94   94       0     0     0            
-CORBA_String CORBA_string_copy();    95   95       0     0     0            
-void CORBA_string_free();            96   96       0     0     0            
-typedef wchar_t CORBA_WChar;         98   104      6     0     0   0.0   0.0
-typedef CORBA_WChar*CORBA_WString;   105  105      0     0     0            
-CORBA_WString CORBA_wstring_alloc()  107  107      0     0     0            
-CORBA_WString CORBA_wstring_copy();  108  108      0     0     0            
-void CORBA_wstring_free();           109  109      0     0     0            
---------------------                 ---- ---- ----- ----- ----- ----- -----
-Summary for scope:                                36    37     0   1.0   0.0
---------------------                 ---- ---- ----- ----- ----- ----- -----
-
diff --git a/TAO/IIOP/docs/us/codecounts/debug.cpp.cccc b/TAO/IIOP/docs/us/codecounts/debug.cpp.cccc
deleted file mode 100644
index 486b8373461..00000000000
--- a/TAO/IIOP/docs/us/codecounts/debug.cpp.cccc
+++ /dev/null
@@ -1,39 +0,0 @@
-
-CCCC - a code counter for C and C++
-===================================
-
-A program to analyse C and C++ source code and report on
-some simple software metrics
-Version  1.00 
-Copyright Tim Littlefair, 1995
-
-The development of this program was heavily dependent on
-the Purdue Compiler Construction Tool Set (PCCTS) 
-by Terence Parr, Will Cohen, Hank Dietz, Russel Quoung
-and others.
-
-This software is provided with NO WARRANTY
-
-
-Scope: ../../../lib/debug.cpp
-Canonical name                       From   To   COM   LOC   MVG   L/C   M/C
---------------------                 ---- ---- ----- ----- ----- ----- -----
-unsigned debug_level=0;              1    43      13     1     0   0.1   0.0
-char*debug_filter=";                 44   44       0     0     0            
-static FILE*debug_stream=stderr;     45   45       0     0     0            
-static pid_t my_pid;                 48   63      13     1     0   0.1   0.0
-static pthread_once_t debug_init=PT  68   71       3     0     0   0.0   0.0
-static void setup_once(){}           75   79       0     4     0 ! ***      
-static void emit_prefix(){}          81   87       0     5     0 ! ***      
-static void setup(){}                91   102      5     6     1   1.2   0.2
-static void setup(){}                109  120      5     6     1   1.2   0.2
-void _EXPFUNC dmsg_filter(const cha  130  170      3    28 ?  12 ? 9.3   4.0
-void _EXPFUNC dmsg_filter(unsigned   172  193      1    15     3 ?15.0   3.0
-void _EXPFUNC dmsg_v(const char*_FA  195  213      1    13     1 ?13.0   1.0
-void _EXPFUNC _dmsg_x(CORBA_Environ  215  239      1    18     1 ?18.0   1.0
-void _EXPFUNC dmsg_opaque(char*_FAR  241  286      1    38 ?  10 !38.0 ?10.0
-void _EXPFUNC dmsg_opaque_full(char  288  335      1    39 ?  11 !39.0 ?11.0
---------------------                 ---- ---- ----- ----- ----- ----- -----
-Summary for scope:                                47   189    40   4.0   0.9
---------------------                 ---- ---- ----- ----- ----- ----- -----
-
diff --git a/TAO/IIOP/docs/us/codecounts/debug.hh.cccc b/TAO/IIOP/docs/us/codecounts/debug.hh.cccc
deleted file mode 100644
index 932d9fb5a19..00000000000
--- a/TAO/IIOP/docs/us/codecounts/debug.hh.cccc
+++ /dev/null
@@ -1,29 +0,0 @@
-
-CCCC - a code counter for C and C++
-===================================
-
-A program to analyse C and C++ source code and report on
-some simple software metrics
-Version  1.00 
-Copyright Tim Littlefair, 1995
-
-The development of this program was heavily dependent on
-the Purdue Compiler Construction Tool Set (PCCTS) 
-by Terence Parr, Will Cohen, Hank Dietz, Russel Quoung
-and others.
-
-This software is provided with NO WARRANTY
-
-
-Scope: ../../../lib/debug.hh
-Canonical name                       From   To   COM   LOC   MVG   L/C   M/C
---------------------                 ---- ---- ----- ----- ----- ----- -----
-extern"char*strerror(int);           1    12       6     1     0   0.2   0.0
-extern unsigned debug_level;         15   22       7     0     0   0.0   0.0
-extern char*debug_filter;            22   23       1     0     0   0.0   0.0
-_dmsg_x(env,s);                      23   43       8     3     0   0.4   0.0
-line 43: syntax error at "}" missing Eof
---------------------                 ---- ---- ----- ----- ----- ----- -----
-Summary for scope:                                42    21     0   0.5   0.0
---------------------                 ---- ---- ----- ----- ----- ----- -----
-
diff --git a/TAO/IIOP/docs/us/codecounts/except.cpp.cccc b/TAO/IIOP/docs/us/codecounts/except.cpp.cccc
deleted file mode 100644
index 8b1b2294821..00000000000
--- a/TAO/IIOP/docs/us/codecounts/except.cpp.cccc
+++ /dev/null
@@ -1,53 +0,0 @@
-
-CCCC - a code counter for C and C++
-===================================
-
-A program to analyse C and C++ source code and report on
-some simple software metrics
-Version  1.00 
-Copyright Tim Littlefair, 1995
-
-The development of this program was heavily dependent on
-the Purdue Compiler Construction Tool Set (PCCTS) 
-by Terence Parr, Will Cohen, Hank Dietz, Russel Quoung
-and others.
-
-This software is provided with NO WARRANTY
-
-
-Scope: ../../../lib/except.cpp
-Canonical name                       From   To   COM   LOC   MVG   L/C   M/C
---------------------                 ---- ---- ----- ----- ----- ----- -----
-static pthread_mutex_t except_lock=  1    31      12     1     0   0.1   0.0
-DEFINE_GUID(IID_CORBA_Exception,0x7  35   45       2     2     0   1.0   0.0
-DEFINE_GUID(IID_CORBA_UserException  47   49       1     1     0   1.0   0.0
-DEFINE_GUID(IID_CORBA_SystemExcepti  51   53       1     1     0   1.0   0.0
-CORBA_Exception::CORBA_Exception(){  56   66       0    10     1 ! *** ! ***
-CORBA_Exception::CORBA_Exception(){  68   78       0    10     1 ! *** ! ***
-CORBA_Exception::~CORBA_Exception()  80   91       5     5     0   1.0   0.0
-CORBA_Exception&CORBA_Exception::op  93   107      0    13     3 ! *** ! ***
-const CORBA_String CORBA_Exception:  109  119      0     9     3 ! *** ! ***
-const CORBA_TypeCode_ptr CORBA_Exce  121  126      0     5     1 ! *** ! ***
-ULONG __stdcall CORBA_Exception::Ad  128  141      3     7     1   2.3   0.3
-ULONG __stdcall CORBA_Exception::Re  143  167      2    12     3   6.0   1.5
-HRESULT __stdcall CORBA_Exception::  169  192      4    15     5   3.8   1.3
-CORBA_UserException::CORBA_UserExce  195  203      3     5     0   1.7   0.0
-CORBA_UserException::~CORBA_UserExc  205  207      0     2     0 ! ***      
-CORBA_SystemException::CORBA_System  209  218      0     9     0 ! ***      
-CORBA_SystemException::~CORBA_Syste  220  222      0     2     0 ! ***      
-static CORBA_TypeCode_ptr sys_excep  228  228      0     0     0            
-CORBA_ExceptionList __system_except  229  229      0     0     0            
-static void make_standard_typecode(  231  318     29    49 ?  10   1.7   0.3
-SYSEX(UNKNOWN)SYSEX(BAD_PARAM)SYSEX  321  396     24    36     1   1.5   0.0
-static CORBA_Octet tc_buf_Bounds[]=  400  418      7    11     0   1.6   0.0
-static CORBA_TypeCode tc_std_Bounds  419  420      0     1     0 ! ***      
-CORBA_TypeCode_ptr _tc_CORBA_Bounds  421  421      0     0     0            
-static CORBA_Octet tc_buf_BadKind[]  423  437      3    11     0   3.7   0.0
-static CORBA_TypeCode tc_std_BadKin  438  439      0     1     0 ! ***      
-CORBA_TypeCode_ptr _tc_CORBA_BadKin  440  440      0     0     0            
-CORBA_ExceptionType CORBA_Environme  444  469      8    13     6   1.6   0.8
-void _EXPFUNC print_exception(const  472  535     24    35     7   1.5   0.3
---------------------                 ---- ---- ----- ----- ----- ----- -----
-Summary for scope:                               128   295    42   2.3   0.3
---------------------                 ---- ---- ----- ----- ----- ----- -----
-
diff --git a/TAO/IIOP/docs/us/codecounts/except.hh.cccc b/TAO/IIOP/docs/us/codecounts/except.hh.cccc
deleted file mode 100644
index 430ef037b0d..00000000000
--- a/TAO/IIOP/docs/us/codecounts/except.hh.cccc
+++ /dev/null
@@ -1,37 +0,0 @@
-
-CCCC - a code counter for C and C++
-===================================
-
-A program to analyse C and C++ source code and report on
-some simple software metrics
-Version  1.00 
-Copyright Tim Littlefair, 1995
-
-The development of this program was heavily dependent on
-the Purdue Compiler Construction Tool Set (PCCTS) 
-by Terence Parr, Will Cohen, Hank Dietz, Russel Quoung
-and others.
-
-This software is provided with NO WARRANTY
-
-
-Scope: ../../../lib/except.hh
-Canonical name                       From   To   COM   LOC   MVG   L/C   M/C
---------------------                 ---- ---- ----- ----- ----- ----- -----
-extern const IID IID_CORBA_Exceptio  1    15      13     1     0   0.1   0.0
-extern const IID IID_CORBA_UserExce  16   16       0     0     0            
-extern const IID IID_CORBA_SystemEx  17   17       0     0     0            
-class _EXPCLASS CORBA_Exception:pub  19   52       3    25     2 ? 8.3   0.7
-;                                    52   52       0     0     0            
-typedef CORBA_Exception*CORBA_Excep  53   53       0     0     0            
-class _EXPCLASS CORBA_UserException  55   65       5     5     0   1.0   0.0
-;                                    65   65       0     0     0            
-enum CORBA_CompletionStatus{};       67   75       7     1     0   0.1   0.0
-class _EXPCLASS CORBA_SystemExcepti  77   99       2    16     2 ? 8.0   1.0
-;                                    99   99       0     0     0            
-extern CORBA_TypeCode_ptr _tc_CORBA  102  117      6     4     0   0.7   0.0
-line 117: syntax error at "}" missing Eof
---------------------                 ---- ---- ----- ----- ----- ----- -----
-Summary for scope:                                44   112     6   2.5   0.1
---------------------                 ---- ---- ----- ----- ----- ----- -----
-
diff --git a/TAO/IIOP/docs/us/codecounts/generate b/TAO/IIOP/docs/us/codecounts/generate
deleted file mode 100755
index c04f8b92e19..00000000000
--- a/TAO/IIOP/docs/us/codecounts/generate
+++ /dev/null
@@ -1,24 +0,0 @@
-#/bin/sh
-
-error()
-{
-  ret=$1; shift
-  echo "ERROR: " $@
-  return $ret
-}
-
-test -x ${CCCC:=/usr/local/bin/cccc} \
-	|| error 1 "Value of \$CCCC ($CCCC) not found."
-
-test -d ${TOPDIR:=../../../lib} \
-	|| error 1 "Unable to locate \$TOPDIR ($TOPDIR)."
-
-find $TOPDIR \( -name '*.h' -o -name '*.i' -o -name '*.hh' -o -name '*.cpp' \) -print |
-while read file
-do
-  outname=`basename $file`.cccc
-  $CCCC $file > $outname 2>&1
-  echo -n "."
-done
-
-echo
diff --git a/TAO/IIOP/docs/us/codecounts/giop.cpp.cccc b/TAO/IIOP/docs/us/codecounts/giop.cpp.cccc
deleted file mode 100644
index d4aa24bb14b..00000000000
--- a/TAO/IIOP/docs/us/codecounts/giop.cpp.cccc
+++ /dev/null
@@ -1,50 +0,0 @@
-
-CCCC - a code counter for C and C++
-===================================
-
-A program to analyse C and C++ source code and report on
-some simple software metrics
-Version  1.00 
-Copyright Tim Littlefair, 1995
-
-The development of this program was heavily dependent on
-the Purdue Compiler Construction Tool Set (PCCTS) 
-by Terence Parr, Will Cohen, Hank Dietz, Russel Quoung
-and others.
-
-This software is provided with NO WARRANTY
-
-
-Scope: ../../../lib/giop.cpp
-Canonical name                       From   To   COM   LOC   MVG   L/C   M/C
---------------------                 ---- ---- ----- ----- ----- ----- -----
-static pthread_mutex_t fwd_info_loc  1    79      45     2     0   0.0   0.0
-static inline CORBA_Boolean start_m  83   112      6    19     3   3.2   0.5
-static const char digits[]=";        115  115      0     0     0            
-static const char*names[]={};        116  120      0     4     0 ! ***      
-static void dump_msg(){}             122  136      0    13     4 ! *** ! ***
-CORBA_Boolean GIOP::send_message(){  142  226     30    43 ?  12   1.4   0.4
-static const char close_message[]={  229  250     16     5     0   0.3   0.0
-void GIOP::close_connection(ACE_HAN  253  272      8    11     0   1.4   0.0
-static const char error_message[]={  274  286      7     5     0   0.7   0.0
-static inline void send_error(ACE_H  288  297      0     9     0 ! ***      
-static int read_buffer(){}           300  331      6    18     4   3.0   0.7
-GIOP::MsgType GIOP::read_message(){  334  481     75    56 ?  18   0.7   0.2
-GIOP::Invocation::Invocation(IIOP_O  484  524     22    14     0   0.6   0.0
-GIOP::Invocation::~Invocation(){}    526  528      0     2     0 ! ***      
-static const CORBA_Long _oc_opaque[  530  543     13     0     0   0.0   0.0
-CORBA_TypeCode TC_opaque();          544  546      0     2     0 ! ***      
-static const CORBA_Long _oc_svc_ctx  549  610     50     9     0   0.2   0.0
-static CORBA_TypeCode TC_ServiceCon  611  613      0     2     0 ! ***      
-void GIOP::Invocation::start(CORBA_  616  729     58    45 ?  15   0.8   0.3
-extern CORBA_ExceptionList __system  731  731      0     0     0            
-GIOP::ReplyStatusType GIOP::Invocat  733  1086   175 ? 144 !  38   0.8   0.2
-void GIOP::incoming_message(){}      1089 1353    79 ? 151 !  24   1.9   0.3
-template class autorelease<client_e  1356 1356     0     0     0            
-template class CORBA_SEQUENCE<GIOP:  1357 1357     0     0     0            
-template class CORBA_SEQUENCE<CORBA  1358 1358     0     0     0            
-template class CORBA_SEQUENCE<CORBA  1359 1359     0     0     0            
---------------------                 ---- ---- ----- ----- ----- ----- -----
-Summary for scope:                               590   580   118   1.0   0.2
---------------------                 ---- ---- ----- ----- ----- ----- -----
-
diff --git a/TAO/IIOP/docs/us/codecounts/giop.hh.cccc b/TAO/IIOP/docs/us/codecounts/giop.hh.cccc
deleted file mode 100644
index d533e8f911a..00000000000
--- a/TAO/IIOP/docs/us/codecounts/giop.hh.cccc
+++ /dev/null
@@ -1,27 +0,0 @@
-
-CCCC - a code counter for C and C++
-===================================
-
-A program to analyse C and C++ source code and report on
-some simple software metrics
-Version  1.00 
-Copyright Tim Littlefair, 1995
-
-The development of this program was heavily dependent on
-the Purdue Compiler Construction Tool Set (PCCTS) 
-by Terence Parr, Will Cohen, Hank Dietz, Russel Quoung
-and others.
-
-This software is provided with NO WARRANTY
-
-
-Scope: ../../../lib/giop.hh
-Canonical name                       From   To   COM   LOC   MVG   L/C   M/C
---------------------                 ---- ---- ----- ----- ----- ----- -----
-typedef CORBA_SEQUENCE<CORBA_Octet>  1    37      19     1     0   0.1   0.0
-class IOP{};                         39   109     45    21     0   0.5   0.0
-class GIOP{};                        112  321     65 ? 120     0   1.8   0.0
---------------------                 ---- ---- ----- ----- ----- ----- -----
-Summary for scope:                               129   145     0   1.1   0.0
---------------------                 ---- ---- ----- ----- ----- ----- -----
-
diff --git a/TAO/IIOP/docs/us/codecounts/iiopobj.cpp.cccc b/TAO/IIOP/docs/us/codecounts/iiopobj.cpp.cccc
deleted file mode 100644
index b440bf69b76..00000000000
--- a/TAO/IIOP/docs/us/codecounts/iiopobj.cpp.cccc
+++ /dev/null
@@ -1,34 +0,0 @@
-
-CCCC - a code counter for C and C++
-===================================
-
-A program to analyse C and C++ source code and report on
-some simple software metrics
-Version  1.00 
-Copyright Tim Littlefair, 1995
-
-The development of this program was heavily dependent on
-the Purdue Compiler Construction Tool Set (PCCTS) 
-by Terence Parr, Will Cohen, Hank Dietz, Russel Quoung
-and others.
-
-This software is provided with NO WARRANTY
-
-
-Scope: ../../../lib/iiopobj.cpp
-Canonical name                       From   To   COM   LOC   MVG   L/C   M/C
---------------------                 ---- ---- ----- ----- ----- ----- -----
-static pthread_mutex_t iiopobj_lock  1    30      13     1     0   0.1   0.0
-IIOP::ProfileBody::ProfileBody(cons  35   50       0    13     0 ! ***      
-CORBA_ULong IIOP_Object::hash(){}    53   81      10    15     2   1.5   0.2
-CORBA_Boolean IIOP_Object::is_equiv  84   124     10    25 ?   9   2.5   0.9
-DEFINE_GUID(IID_IIOP_Object,0xa201e  127  133      4     2     0   0.5   0.0
-DEFINE_GUID(IID_STUB_Object,0xa201e  135  141      4     2     0   0.5   0.0
-DEFINE_GUID(IID_CORBA_Object,0xa201  143  145      1     1     0   1.0   0.0
-ULONG __stdcall IIOP_Object::AddRef  147  160      3     7     1   2.3   0.3
-ULONG __stdcall IIOP_Object::Releas  162  179      0    10     3 ! *** ! ***
-HRESULT __stdcall IIOP_Object::Quer  182  214     11    18     7   1.6   0.6
---------------------                 ---- ---- ----- ----- ----- ----- -----
-Summary for scope:                                56   104    22   1.9   0.4
---------------------                 ---- ---- ----- ----- ----- ----- -----
-
diff --git a/TAO/IIOP/docs/us/codecounts/iiopobj.hh.cccc b/TAO/IIOP/docs/us/codecounts/iiopobj.hh.cccc
deleted file mode 100644
index 866ab27c769..00000000000
--- a/TAO/IIOP/docs/us/codecounts/iiopobj.hh.cccc
+++ /dev/null
@@ -1,30 +0,0 @@
-
-CCCC - a code counter for C and C++
-===================================
-
-A program to analyse C and C++ source code and report on
-some simple software metrics
-Version  1.00 
-Copyright Tim Littlefair, 1995
-
-The development of this program was heavily dependent on
-the Purdue Compiler Construction Tool Set (PCCTS) 
-by Terence Parr, Will Cohen, Hank Dietz, Russel Quoung
-and others.
-
-This software is provided with NO WARRANTY
-
-
-Scope: ../../../lib/iiopobj.hh
-Canonical name                       From   To   COM   LOC   MVG   L/C   M/C
---------------------                 ---- ---- ----- ----- ----- ----- -----
-typedef CORBA_SEQUENCE<CORBA_Octet>  1    15      10     1     0   0.1   0.0
-class _EXPCLASS IIOP{public:struct   17   48       8    17     0   2.1   0.0
-;                                    48   48       0     0     0            
-extern"const IID IID_IIOP_Object;    51   59       8     0     0   0.0   0.0
-class _EXPCLASS IIOP_Object:public   61   152     33    47     0   1.4   0.0
-;                                    152  152      0     0     0            
---------------------                 ---- ---- ----- ----- ----- ----- -----
-Summary for scope:                                59    69     0   1.2   0.0
---------------------                 ---- ---- ----- ----- ----- ----- -----
-
diff --git a/TAO/IIOP/docs/us/codecounts/iioporb.cpp.cccc b/TAO/IIOP/docs/us/codecounts/iioporb.cpp.cccc
deleted file mode 100644
index 6d1e462cf27..00000000000
--- a/TAO/IIOP/docs/us/codecounts/iioporb.cpp.cccc
+++ /dev/null
@@ -1,35 +0,0 @@
-
-CCCC - a code counter for C and C++
-===================================
-
-A program to analyse C and C++ source code and report on
-some simple software metrics
-Version  1.00 
-Copyright Tim Littlefair, 1995
-
-The development of this program was heavily dependent on
-the Purdue Compiler Construction Tool Set (PCCTS) 
-by Terence Parr, Will Cohen, Hank Dietz, Russel Quoung
-and others.
-
-This software is provided with NO WARRANTY
-
-
-Scope: ../../../lib/iioporb.cpp
-Canonical name                       From   To   COM   LOC   MVG   L/C   M/C
---------------------                 ---- ---- ----- ----- ----- ----- -----
-static const char ior_prefix[]=";    1    27       9     1     0   0.1   0.0
-static const char iiop_prefix[]=";   28   28       0     0     0            
-static const char xchars[]=";        29   29       0     0     0            
-static inline char nibble2hex(unsig  32   39       3     4     1   1.3   0.3
-static inline unsigned char hex2byt  41   51       0    10     5 ! *** ! ***
-CORBA_String IIOP_ORB::object_to_st  54   174     42    64 ?  17   1.5   0.4
-static CORBA_Object_ptr ior_string_  177  231     14    33 ?  10   2.4   0.7
-static CORBA_Object_ptr iiop_string  234  349     34    68 !  22   2.0   0.6
-CORBA_Object_ptr IIOP_ORB::string_t  352  374      6    13     5   2.2   0.8
-DEFINE_GUID(IID_IIOP_ORB,0xa201e4c4  376  382      4     2     0   0.5   0.0
-HRESULT __stdcall IIOP_ORB::QueryIn  385  408      3    16     6   5.3   2.0
---------------------                 ---- ---- ----- ----- ----- ----- -----
-Summary for scope:                               115   222    66   1.9   0.6
---------------------                 ---- ---- ----- ----- ----- ----- -----
-
diff --git a/TAO/IIOP/docs/us/codecounts/iioporb.hh.cccc b/TAO/IIOP/docs/us/codecounts/iioporb.hh.cccc
deleted file mode 100644
index e016469fd1e..00000000000
--- a/TAO/IIOP/docs/us/codecounts/iioporb.hh.cccc
+++ /dev/null
@@ -1,28 +0,0 @@
-
-CCCC - a code counter for C and C++
-===================================
-
-A program to analyse C and C++ source code and report on
-some simple software metrics
-Version  1.00 
-Copyright Tim Littlefair, 1995
-
-The development of this program was heavily dependent on
-the Purdue Compiler Construction Tool Set (PCCTS) 
-by Terence Parr, Will Cohen, Hank Dietz, Russel Quoung
-and others.
-
-This software is provided with NO WARRANTY
-
-
-Scope: ../../../lib/iioporb.hh
-Canonical name                       From   To   COM   LOC   MVG   L/C   M/C
---------------------                 ---- ---- ----- ----- ----- ----- -----
-typedef class IIOP_ORB*IIOP_ORB_ptr  1    13       9     1     0   0.1   0.0
-extern const IID IID_IIOP_ORB;       15   15       0     0     0            
-class _EXPCLASS IIOP_ORB:public COR  17   47       4    22     0   5.5   0.0
-;                                    47   47       0     0     0            
---------------------                 ---- ---- ----- ----- ----- ----- -----
-Summary for scope:                                13    26     0   2.0   0.0
---------------------                 ---- ---- ----- ----- ----- ----- -----
-
diff --git a/TAO/IIOP/docs/us/codecounts/initguid.h.cccc b/TAO/IIOP/docs/us/codecounts/initguid.h.cccc
deleted file mode 100644
index b106c9a8731..00000000000
--- a/TAO/IIOP/docs/us/codecounts/initguid.h.cccc
+++ /dev/null
@@ -1,25 +0,0 @@
-
-CCCC - a code counter for C and C++
-===================================
-
-A program to analyse C and C++ source code and report on
-some simple software metrics
-Version  1.00 
-Copyright Tim Littlefair, 1995
-
-The development of this program was heavily dependent on
-the Purdue Compiler Construction Tool Set (PCCTS) 
-by Terence Parr, Will Cohen, Hank Dietz, Russel Quoung
-and others.
-
-This software is provided with NO WARRANTY
-
-
-Scope: ../../../lib/initguid.h
-Canonical name                       From   To   COM   LOC   MVG   L/C   M/C
---------------------                 ---- ---- ----- ----- ----- ----- -----
-const IID name={0}                   1    6        2     1     0   0.5   0.0
---------------------                 ---- ---- ----- ----- ----- ----- -----
-Summary for scope:                                 2     2     0   1.0   0.0
---------------------                 ---- ---- ----- ----- ----- ----- -----
-
diff --git a/TAO/IIOP/docs/us/codecounts/interp.cpp.cccc b/TAO/IIOP/docs/us/codecounts/interp.cpp.cccc
deleted file mode 100644
index 690563b2274..00000000000
--- a/TAO/IIOP/docs/us/codecounts/interp.cpp.cccc
+++ /dev/null
@@ -1,40 +0,0 @@
-
-CCCC - a code counter for C and C++
-===================================
-
-A program to analyse C and C++ source code and report on
-some simple software metrics
-Version  1.00 
-Copyright Tim Littlefair, 1995
-
-The development of this program was heavily dependent on
-the Purdue Compiler Construction Tool Set (PCCTS) 
-by Terence Parr, Will Cohen, Hank Dietz, Russel Quoung
-and others.
-
-This software is provided with NO WARRANTY
-
-
-Scope: ../../../lib/interp.cpp
-Canonical name                       From   To   COM   LOC   MVG   L/C   M/C
---------------------                 ---- ---- ----- ----- ----- ----- -----
-typedef size_t attribute_calculator  1    86      69     6     0   0.1   0.0
-static attribute_calculator calc_st  88   88       0     0     0            
-static attribute_calculator calc_ex  89   89       0     0     0            
-static attribute_calculator calc_un  90   90       0     0     0            
-static attribute_calculator calc_al  91   91       0     0     0            
-static attribute_calculator calc_ar  92   92       0     0     0            
-typedef CORBA_Boolean param_skip_rt  95   99       4     0     0   0.0   0.0
-static CORBA_Boolean skip_encapsula  101  105      0     4     1 ! *** ! ***
-static CORBA_Boolean skip_long(){}   107  113      0     5     1 ! *** ! ***
-struct table_element{};              116  139     18     5     0   0.3   0.0
-static table_element table[]={};     141  188     37    10     0   0.3   0.0
-{struct align_struct_ x one;char du  191  221     23     4     0   0.2   0.0
-;                                    221  221      0     0     0            
-align_struct_ table[t].size=sizeof(  223  224      0     0     0            
-table[t].alignment=(char*)&align.tw  225  226      0     1     0 ! ***      
-line 227: syntax error at "}" missing Eof
---------------------                 ---- ---- ----- ----- ----- ----- -----
-Summary for scope:                               603   709   174   1.2   0.3
---------------------                 ---- ---- ----- ----- ----- ----- -----
-
diff --git a/TAO/IIOP/docs/us/codecounts/invoke.cpp.cccc b/TAO/IIOP/docs/us/codecounts/invoke.cpp.cccc
deleted file mode 100644
index a6b006f91e5..00000000000
--- a/TAO/IIOP/docs/us/codecounts/invoke.cpp.cccc
+++ /dev/null
@@ -1,26 +0,0 @@
-
-CCCC - a code counter for C and C++
-===================================
-
-A program to analyse C and C++ source code and report on
-some simple software metrics
-Version  1.00 
-Copyright Tim Littlefair, 1995
-
-The development of this program was heavily dependent on
-the Purdue Compiler Construction Tool Set (PCCTS) 
-by Terence Parr, Will Cohen, Hank Dietz, Russel Quoung
-and others.
-
-This software is provided with NO WARRANTY
-
-
-Scope: ../../../lib/invoke.cpp
-Canonical name                       From   To   COM   LOC   MVG   L/C   M/C
---------------------                 ---- ---- ----- ----- ----- ----- -----
-void IIOP_Object::do_call(CORBA_Env  1    193     87    77 !  24   0.9   0.3
-void IIOP_Object::do_dynamic_call(c  196  346     44    85 !  26   1.9   0.6
---------------------                 ---- ---- ----- ----- ----- ----- -----
-Summary for scope:                               131   164    50   1.3   0.4
---------------------                 ---- ---- ----- ----- ----- ----- -----
-
diff --git a/TAO/IIOP/docs/us/codecounts/marshal.cpp.cccc b/TAO/IIOP/docs/us/codecounts/marshal.cpp.cccc
deleted file mode 100644
index 90175d333fb..00000000000
--- a/TAO/IIOP/docs/us/codecounts/marshal.cpp.cccc
+++ /dev/null
@@ -1,30 +0,0 @@
-
-CCCC - a code counter for C and C++
-===================================
-
-A program to analyse C and C++ source code and report on
-some simple software metrics
-Version  1.00 
-Copyright Tim Littlefair, 1995
-
-The development of this program was heavily dependent on
-the Purdue Compiler Construction Tool Set (PCCTS) 
-by Terence Parr, Will Cohen, Hank Dietz, Russel Quoung
-and others.
-
-This software is provided with NO WARRANTY
-
-
-Scope: ../../../lib/marshal.cpp
-Canonical name                       From   To   COM   LOC   MVG   L/C   M/C
---------------------                 ---- ---- ----- ----- ----- ----- -----
-extern"{unsigned wslen(const wchar_  1    58      39     4     0   0.1   0.0
-extern CORBA_TypeCode TC_opaque;     61   61       0     0     0            
-CORBA_TypeCode::traverse_status CDR  64   494    146 ? 230 !  71   1.6   0.5
-const CORBA_TypeCode_ptr __tc_const  497  548     23    24     0   1.0   0.0
-;                                    548  548      0     0     0            
-CORBA_TypeCode::traverse_status CDR  551  1107   163 ? 323 !  88   2.0   0.5
---------------------                 ---- ---- ----- ----- ----- ----- -----
-Summary for scope:                               371   586   159   1.6   0.4
---------------------                 ---- ---- ----- ----- ----- ----- -----
-
diff --git a/TAO/IIOP/docs/us/codecounts/nvlist.cpp.cccc b/TAO/IIOP/docs/us/codecounts/nvlist.cpp.cccc
deleted file mode 100644
index d07414860b1..00000000000
--- a/TAO/IIOP/docs/us/codecounts/nvlist.cpp.cccc
+++ /dev/null
@@ -1,40 +0,0 @@
-
-CCCC - a code counter for C and C++
-===================================
-
-A program to analyse C and C++ source code and report on
-some simple software metrics
-Version  1.00 
-Copyright Tim Littlefair, 1995
-
-The development of this program was heavily dependent on
-the Purdue Compiler Construction Tool Set (PCCTS) 
-by Terence Parr, Will Cohen, Hank Dietz, Russel Quoung
-and others.
-
-This software is provided with NO WARRANTY
-
-
-Scope: ../../../lib/nvlist.cpp
-Canonical name                       From   To   COM   LOC   MVG   L/C   M/C
---------------------                 ---- ---- ----- ----- ----- ----- -----
-static pthread_mutex_t nvlist_lock=  1    21       9     1     0   0.1   0.0
-DEFINE_GUID(IID_CORBA_NamedValue,0x  26   32       4     2     0   0.5   0.0
-ULONG __stdcall CORBA_NamedValue::A  35   44       0     6     1 ! *** ! ***
-ULONG __stdcall CORBA_NamedValue::R  46   61       0    10     3 ! *** ! ***
-HRESULT __stdcall CORBA_NamedValue:  63   80       0    14     5 ! *** ! ***
-void CORBA_release(){}               82   90       3     5     1   1.7   0.3
-CORBA_Boolean CORBA_is_nil(){}       92   96       0     4     1 ! *** ! ***
-CORBA_NamedValue::~CORBA_NamedValue  98   102      0     4     1 ! *** ! ***
-DEFINE_GUID(IID_CORBA_NVList,0x7742  105  111      4     2     0   0.5   0.0
-ULONG __stdcall CORBA_NVList::AddRe  114  123      0     6     1 ! *** ! ***
-ULONG __stdcall CORBA_NVList::Relea  125  140      0    10     3 ! *** ! ***
-HRESULT __stdcall CORBA_NVList::Que  142  159      0    14     5 ! *** ! ***
-void CORBA_release(){}               161  169      3     5     1   1.7   0.3
-CORBA_Boolean CORBA_is_nil(){}       171  175      0     4     1 ! *** ! ***
-CORBA_NVList::~CORBA_NVList(){}      177  188      0     9     2 ! *** ! ***
-CORBA_NamedValue_ptr CORBA_NVList::  190  262     32    35     6   1.1   0.2
---------------------                 ---- ---- ----- ----- ----- ----- -----
-Summary for scope:                                55   147    31   2.7   0.6
---------------------                 ---- ---- ----- ----- ----- ----- -----
-
diff --git a/TAO/IIOP/docs/us/codecounts/nvlist.hh.cccc b/TAO/IIOP/docs/us/codecounts/nvlist.hh.cccc
deleted file mode 100644
index b680140d4b9..00000000000
--- a/TAO/IIOP/docs/us/codecounts/nvlist.hh.cccc
+++ /dev/null
@@ -1,37 +0,0 @@
-
-CCCC - a code counter for C and C++
-===================================
-
-A program to analyse C and C++ source code and report on
-some simple software metrics
-Version  1.00 
-Copyright Tim Littlefair, 1995
-
-The development of this program was heavily dependent on
-the Purdue Compiler Construction Tool Set (PCCTS) 
-by Terence Parr, Will Cohen, Hank Dietz, Russel Quoung
-and others.
-
-This software is provided with NO WARRANTY
-
-
-Scope: ../../../lib/nvlist.hh
-Canonical name                       From   To   COM   LOC   MVG   L/C   M/C
---------------------                 ---- ---- ----- ----- ----- ----- -----
-class _EXPCLASS CORBA_NamedValue;    1    13      12     0     0   0.0   0.0
-void CORBA_release();                15   15       0     0     0            
-CORBA_Boolean CORBA_is_nil();        16   16       0     0     0            
-enum{CORBA_ARG_IN=0x01,CORBA_ARG_OU  18   25       1     6     0   6.0   0.0
-;                                    25   25       0     0     0            
-class _EXPCLASS CORBA_NamedValue{pu  27   57       3    21     3   7.0   1.0
-;                                    57   57       0     0     0            
-class _EXPCLASS CORBA_NVList;        60   71      11     0     0   0.0   0.0
-void CORBA_release();                73   73       0     0     0            
-CORBA_Boolean CORBA_is_nil();        74   74       0     0     0            
-extern"const IID IID_CORBA_NVList;   76   76       0     0     0            
-class _EXPCLASS CORBA_NVList{public  78   119      3    31     2 ?10.3   0.7
-;                                    119  119      0     0     0            
---------------------                 ---- ---- ----- ----- ----- ----- -----
-Summary for scope:                                30    68     5   2.3   0.2
---------------------                 ---- ---- ----- ----- ----- ----- -----
-
diff --git a/TAO/IIOP/docs/us/codecounts/objbase.h.cccc b/TAO/IIOP/docs/us/codecounts/objbase.h.cccc
deleted file mode 100644
index 02225ed7d9f..00000000000
--- a/TAO/IIOP/docs/us/codecounts/objbase.h.cccc
+++ /dev/null
@@ -1,37 +0,0 @@
-
-CCCC - a code counter for C and C++
-===================================
-
-A program to analyse C and C++ source code and report on
-some simple software metrics
-Version  1.00 
-Copyright Tim Littlefair, 1995
-
-The development of this program was heavily dependent on
-the Purdue Compiler Construction Tool Set (PCCTS) 
-by Terence Parr, Will Cohen, Hank Dietz, Russel Quoung
-and others.
-
-This software is provided with NO WARRANTY
-
-
-Scope: ../../../lib/objbase.h
-Canonical name                       From   To   COM   LOC   MVG   L/C   M/C
---------------------                 ---- ---- ----- ----- ----- ----- -----
-typedef unsigned long ULONG;         1    23      18     1     0   0.1   0.0
-typedef unsigned long HRESULT;       24   24       0     0     0            
-typedef char IID[16];                26   36       8     1     0   0.1   0.0
-typedef const IID&REFIID;            36   37       1     0     0   0.0   0.0
-DEFINE_GUID(IID_IUnknown,b,c,d,e,f,  41   55       4     9     0   2.3   0.0
-;                                    55   55       0     0     0            
-typedef unsigned long SCODE;         59   61       1     1     0   1.0   0.0
-inline HRESULT ResultFromScode(SCOD  63   63       0     0     1       ! ***
-typedef unsigned short VARTYPE;      69   79      10     0     0   0.0   0.0
-enum VARENUM{};                      80   98      18     0     0   0.0   0.0
-struct CY{};                         100  111      3     5     0   1.7   0.0
-typedef double DATE;                 113  117      4     0     0   0.0   0.0
-struct VARIANT{};                    119  160     35     6     0   0.2   0.0
---------------------                 ---- ---- ----- ----- ----- ----- -----
-Summary for scope:                               102    34     1   0.3   0.0
---------------------                 ---- ---- ----- ----- ----- ----- -----
-
diff --git a/TAO/IIOP/docs/us/codecounts/object.cpp.cccc b/TAO/IIOP/docs/us/codecounts/object.cpp.cccc
deleted file mode 100644
index 82d8215949f..00000000000
--- a/TAO/IIOP/docs/us/codecounts/object.cpp.cccc
+++ /dev/null
@@ -1,55 +0,0 @@
-
-CCCC - a code counter for C and C++
-===================================
-
-A program to analyse C and C++ source code and report on
-some simple software metrics
-Version  1.00 
-Copyright Tim Littlefair, 1995
-
-The development of this program was heavily dependent on
-the Purdue Compiler Construction Tool Set (PCCTS) 
-by Terence Parr, Will Cohen, Hank Dietz, Russel Quoung
-and others.
-
-This software is provided with NO WARRANTY
-
-
-Scope: ../../../lib/object.cpp
-Canonical name                       From   To   COM   LOC   MVG   L/C   M/C
---------------------                 ---- ---- ----- ----- ----- ----- -----
-CORBA_Object::CORBA_Object(){}       1    25       9     5     0   0.6   0.0
-CORBA_Object::~CORBA_Object(){}      27   29       0     2     0 ! ***      
-void CORBA_release(){}               31   41       3     7     1   2.3   0.3
-CORBA_Object_ptr CORBA_Object::_dup  43   49       0     6     2 ! *** ! ***
-CORBA_Object_ptr CORBA_Object::_nil  51   58       3     4     1   1.3   0.3
-CORBA_Boolean CORBA_is_nil(){}       60   64       0     4     1 ! *** ! ***
-void __stdcall CORBA_Object::_creat  67   86       6    13     0   2.2   0.0
-CORBA_Request_ptr __stdcall CORBA_O  89   98       0     9     1 ! *** ! ***
-static const paramdata Object_get_i  101  108      5     2     0   0.4   0.0
-static const calldata Object_get_in  109  113      0     4     0 ! ***      
-;                                    113  113      0     0     0            
-CORBA_InterfaceDef_ptr __stdcall CO  116  150     16    15     3   0.9   0.2
-static const paramdata Object_is_a_  153  160      4     3     0   0.8   0.0
-static const calldata Object_is_a_c  161  165      0     4     0 ! ***      
-;                                    165  165      0     0     0            
-CORBA_Boolean __stdcall CORBA_Objec  168  218     27    19     6   0.7   0.2
-static const paramdata Object_get_i  221  228      5     2     0   0.4   0.0
-static const calldata Object_get_im  229  233      0     4     0 ! ***      
-;                                    233  233      0     0     0            
-CORBA_ImplementationDef_ptr __stdca  236  253      0    15     3 ! *** ! ***
-static const paramdata Object_non_e  256  263      5     2     0   0.4   0.0
-static const calldata Object_non_ex  264  268      0     4     0 ! ***      
-;                                    268  268      0     0     0            
-CORBA_Boolean __stdcall CORBA_Objec  271  306      3    28 ?   8 ? 9.3   2.7
-CORBA_ULong __stdcall CORBA_Object:  309  329      4    14     3   3.5   0.8
-CORBA_Boolean __stdcall CORBA_Objec  332  360      7    18     5   2.6   0.7
-DEFINE_GUID(IID_IUnknown,0x77420089  363  374      7     3     0   0.4   0.0
-DEFINE_GUID(IID_CORBA_Object,0xa201  378  380      1     1     0   1.0   0.0
-ULONG __stdcall CORBA_Object::AddRe  384  389      0     5     1 ! *** ! ***
-ULONG __stdcall CORBA_Object::Relea  391  396      0     5     1 ! *** ! ***
-HRESULT __stdcall CORBA_Object::Que  398  406      0     8     1 ! *** ! ***
---------------------                 ---- ---- ----- ----- ----- ----- -----
-Summary for scope:                               105   233    37   2.2   0.4
---------------------                 ---- ---- ----- ----- ----- ----- -----
-
diff --git a/TAO/IIOP/docs/us/codecounts/object.hh.cccc b/TAO/IIOP/docs/us/codecounts/object.hh.cccc
deleted file mode 100644
index b8f3b41f6c5..00000000000
--- a/TAO/IIOP/docs/us/codecounts/object.hh.cccc
+++ /dev/null
@@ -1,31 +0,0 @@
-
-CCCC - a code counter for C and C++
-===================================
-
-A program to analyse C and C++ source code and report on
-some simple software metrics
-Version  1.00 
-Copyright Tim Littlefair, 1995
-
-The development of this program was heavily dependent on
-the Purdue Compiler Construction Tool Set (PCCTS) 
-by Terence Parr, Will Cohen, Hank Dietz, Russel Quoung
-and others.
-
-This software is provided with NO WARRANTY
-
-
-Scope: ../../../lib/object.hh
-Canonical name                       From   To   COM   LOC   MVG   L/C   M/C
---------------------                 ---- ---- ----- ----- ----- ----- -----
-typedef class CORBA_Object*CORBA_Ob  1    11      10     0     0   0.0   0.0
-void CORBA_release();                12   12       0     0     0            
-CORBA_Boolean CORBA_is_nil();        13   13       0     0     0            
-extern const IID IID_CORBA_Object;   15   15       0     0     0            
-class _EXPCLASS CORBA_Object:public  17   109     28    58     0   2.1   0.0
-;                                    109  109      0     0     0            
-line 112: syntax error at "ÿ" missing Start
---------------------                 ---- ---- ----- ----- ----- ----- -----
-Summary for scope:                                39    63     0   1.6   0.0
---------------------                 ---- ---- ----- ----- ----- ----- -----
-
diff --git a/TAO/IIOP/docs/us/codecounts/orb.hh.cccc b/TAO/IIOP/docs/us/codecounts/orb.hh.cccc
deleted file mode 100644
index c5687f297f9..00000000000
--- a/TAO/IIOP/docs/us/codecounts/orb.hh.cccc
+++ /dev/null
@@ -1,33 +0,0 @@
-
-CCCC - a code counter for C and C++
-===================================
-
-A program to analyse C and C++ source code and report on
-some simple software metrics
-Version  1.00 
-Copyright Tim Littlefair, 1995
-
-The development of this program was heavily dependent on
-the Purdue Compiler Construction Tool Set (PCCTS) 
-by Terence Parr, Will Cohen, Hank Dietz, Russel Quoung
-and others.
-
-This software is provided with NO WARRANTY
-
-
-Scope: ../../../lib/orb.hh
-Canonical name                       From   To   COM   LOC   MVG   L/C   M/C
---------------------                 ---- ---- ----- ----- ----- ----- -----
-typedef class CORBA_TypeCode*CORBA_  1    112     90     5     0   0.1   0.0
-typedef class CORBA_Any*CORBA_Any_p  113  113      0     0     0            
-typedef class CORBA_ImplementationD  115  115      0     0     0            
-typedef class CORBA_InterfaceDef*CO  117  117      0     0     0            
-typedef class CORBA_Request*CORBA_R  119  119      0     0     0            
-typedef class CORBA_NamedValue*CORB  121  121      0     0     0            
-typedef class CORBA_NVList*CORBA_NV  123  123      0     0     0            
-typedef unsigned CORBA_Flags;        125  125      0     0     0            
-line 160: syntax error at "ÿ" missing Start
---------------------                 ---- ---- ----- ----- ----- ----- -----
-Summary for scope:                               101    17     0   0.2   0.0
---------------------                 ---- ---- ----- ----- ----- ----- -----
-
diff --git a/TAO/IIOP/docs/us/codecounts/orbconf.hh.cccc b/TAO/IIOP/docs/us/codecounts/orbconf.hh.cccc
deleted file mode 100644
index 12c296cc020..00000000000
--- a/TAO/IIOP/docs/us/codecounts/orbconf.hh.cccc
+++ /dev/null
@@ -1,26 +0,0 @@
-
-CCCC - a code counter for C and C++
-===================================
-
-A program to analyse C and C++ source code and report on
-some simple software metrics
-Version  1.00 
-Copyright Tim Littlefair, 1995
-
-The development of this program was heavily dependent on
-the Purdue Compiler Construction Tool Set (PCCTS) 
-by Terence Parr, Will Cohen, Hank Dietz, Russel Quoung
-and others.
-
-This software is provided with NO WARRANTY
-
-
-Scope: ../../../lib/orbconf.hh
-Canonical name                       From   To   COM   LOC   MVG   L/C   M/C
---------------------                 ---- ---- ----- ----- ----- ----- -----
-typedef unsigned long pid_t;         1    148     56    24     0   0.4   0.0
-line 183: syntax error at "ÿ" missing Start
---------------------                 ---- ---- ----- ----- ----- ----- -----
-Summary for scope:                                67    27     0   0.4   0.0
---------------------                 ---- ---- ----- ----- ----- ----- -----
-
diff --git a/TAO/IIOP/docs/us/codecounts/orbobj.cpp.cccc b/TAO/IIOP/docs/us/codecounts/orbobj.cpp.cccc
deleted file mode 100644
index 927fc2f58fb..00000000000
--- a/TAO/IIOP/docs/us/codecounts/orbobj.cpp.cccc
+++ /dev/null
@@ -1,41 +0,0 @@
-
-CCCC - a code counter for C and C++
-===================================
-
-A program to analyse C and C++ source code and report on
-some simple software metrics
-Version  1.00 
-Copyright Tim Littlefair, 1995
-
-The development of this program was heavily dependent on
-the Purdue Compiler Construction Tool Set (PCCTS) 
-by Terence Parr, Will Cohen, Hank Dietz, Russel Quoung
-and others.
-
-This software is provided with NO WARRANTY
-
-
-Scope: ../../../lib/orbobj.cpp
-Canonical name                       From   To   COM   LOC   MVG   L/C   M/C
---------------------                 ---- ---- ----- ----- ----- ----- -----
-extern void __TC_init_table();       1    28      10     1     0   0.1   0.0
-extern void __TC_init_standard_exce  29   29       0     0     0            
-static pthread_mutex_t refcnt_lock=  32   32       0     0     0            
-CORBA_ORB::CORBA_ORB(){}             41   47       3     3     0   1.0   0.0
-CORBA_ORB::~CORBA_ORB(){}            49   52       0     3     0 ! ***      
-void CORBA_release(){}               54   64       3     7     1   2.3   0.3
-CORBA_ORB_ptr CORBA_ORB::_duplicate  66   72       0     6     2 ! *** ! ***
-CORBA_ORB_ptr CORBA_ORB::_nil(){}    74   81       3     4     1   1.3   0.3
-CORBA_Boolean CORBA_is_nil(){}       83   87       0     4     1 ! *** ! ***
-DEFINE_GUID(IID_CORBA_ORB,0xa201e4c  90   96       4     2     0   0.5   0.0
-DEFINE_GUID(IID_STUB_Object,0xa201e  99   101      1     1     0   1.0   0.0
-ULONG __stdcall CORBA_ORB::AddRef()  105  114      0     6     1 ! *** ! ***
-ULONG __stdcall CORBA_ORB::Release(  116  135      0    11     3 ! *** ! ***
-static CORBA_ORB_ptr the_orb;        138  145      7     0     0   0.0   0.0
-CORBA_ORB_ptr CORBA_ORB_init(int&,c  147  290     59    60 !  23   1.0   0.4
-void CORBA_ORB::create_list(){}      292  308      0    14     1 ! *** ! ***
-CORBA_ORB_ptr _orb(){}               311  322      7     4     1   0.6   0.1
---------------------                 ---- ---- ----- ----- ----- ----- -----
-Summary for scope:                                97   143    34   1.5   0.4
---------------------                 ---- ---- ----- ----- ----- ----- -----
-
diff --git a/TAO/IIOP/docs/us/codecounts/orbobj.hh.cccc b/TAO/IIOP/docs/us/codecounts/orbobj.hh.cccc
deleted file mode 100644
index ccc192d6a06..00000000000
--- a/TAO/IIOP/docs/us/codecounts/orbobj.hh.cccc
+++ /dev/null
@@ -1,31 +0,0 @@
-
-CCCC - a code counter for C and C++
-===================================
-
-A program to analyse C and C++ source code and report on
-some simple software metrics
-Version  1.00 
-Copyright Tim Littlefair, 1995
-
-The development of this program was heavily dependent on
-the Purdue Compiler Construction Tool Set (PCCTS) 
-by Terence Parr, Will Cohen, Hank Dietz, Russel Quoung
-and others.
-
-This software is provided with NO WARRANTY
-
-
-Scope: ../../../lib/orbobj.hh
-Canonical name                       From   To   COM   LOC   MVG   L/C   M/C
---------------------                 ---- ---- ----- ----- ----- ----- -----
-typedef class CORBA_ORB*CORBA_ORB_p  1    8        7     0     0   0.0   0.0
-void CORBA_release();                9    9        0     0     0            
-CORBA_Boolean CORBA_is_nil();        10   10       0     0     0            
-extern const IID IID_CORBA_ORB;      12   12       0     0     0            
-CORBA_ORB_ptr CORBA_ORB_init();      14   23       3     6     0   2.0   0.0
-class _EXPCLASS CORBA_ORB:public IU  25   71      13    26     0   2.0   0.0
-;                                    71   71       0     0     0            
---------------------                 ---- ---- ----- ----- ----- ----- -----
-Summary for scope:                                23    38     0   1.7   0.0
---------------------                 ---- ---- ----- ----- ----- ----- -----
-
diff --git a/TAO/IIOP/docs/us/codecounts/principa.cpp.cccc b/TAO/IIOP/docs/us/codecounts/principa.cpp.cccc
deleted file mode 100644
index 6486125713e..00000000000
--- a/TAO/IIOP/docs/us/codecounts/principa.cpp.cccc
+++ /dev/null
@@ -1,33 +0,0 @@
-
-CCCC - a code counter for C and C++
-===================================
-
-A program to analyse C and C++ source code and report on
-some simple software metrics
-Version  1.00 
-Copyright Tim Littlefair, 1995
-
-The development of this program was heavily dependent on
-the Purdue Compiler Construction Tool Set (PCCTS) 
-by Terence Parr, Will Cohen, Hank Dietz, Russel Quoung
-and others.
-
-This software is provided with NO WARRANTY
-
-
-Scope: ../../../lib/principa.cpp
-Canonical name                       From   To   COM   LOC   MVG   L/C   M/C
---------------------                 ---- ---- ----- ----- ----- ----- -----
-static pthread_mutex_t principal_lo  1    22       9     1     0   0.1   0.0
-void CORBA_release(){}               26   31       0     5     1 ! *** ! ***
-CORBA_Boolean CORBA_is_nil(){}       33   37       0     4     1 ! *** ! ***
-CORBA_Principal::CORBA_Principal(){  39   41       0     2     0 ! ***      
-CORBA_Principal::~CORBA_Principal()  43   49       0     5     1 ! *** ! ***
-DEFINE_GUID(IID_CORBA_Principal,0xa  51   57       4     2     0   0.5   0.0
-ULONG __stdcall CORBA_Principal::Ad  60   69       0     6     1 ! *** ! ***
-ULONG __stdcall CORBA_Principal::Re  71   88       0    10     3 ! *** ! ***
-HRESULT __stdcall CORBA_Principal::  90   107      0    14     5 ! *** ! ***
---------------------                 ---- ---- ----- ----- ----- ----- -----
-Summary for scope:                                13    58    12   4.5   0.9
---------------------                 ---- ---- ----- ----- ----- ----- -----
-
diff --git a/TAO/IIOP/docs/us/codecounts/principa.hh.cccc b/TAO/IIOP/docs/us/codecounts/principa.hh.cccc
deleted file mode 100644
index eee81276ec6..00000000000
--- a/TAO/IIOP/docs/us/codecounts/principa.hh.cccc
+++ /dev/null
@@ -1,30 +0,0 @@
-
-CCCC - a code counter for C and C++
-===================================
-
-A program to analyse C and C++ source code and report on
-some simple software metrics
-Version  1.00 
-Copyright Tim Littlefair, 1995
-
-The development of this program was heavily dependent on
-the Purdue Compiler Construction Tool Set (PCCTS) 
-by Terence Parr, Will Cohen, Hank Dietz, Russel Quoung
-and others.
-
-This software is provided with NO WARRANTY
-
-
-Scope: ../../../lib/principa.hh
-Canonical name                       From   To   COM   LOC   MVG   L/C   M/C
---------------------                 ---- ---- ----- ----- ----- ----- -----
-typedef class CORBA_Principal*CORBA  1    8        7     0     0   0.0   0.0
-void CORBA_release();                10   10       0     0     0            
-CORBA_Boolean CORBA_is_nil();        11   11       0     0     0            
-extern const IID IID_CORBA_Principa  13   13       0     0     0            
-class _EXPCLASS CORBA_Principal:pub  15   52      12    17     0   1.4   0.0
-;                                    52   52       0     0     0            
---------------------                 ---- ---- ----- ----- ----- ----- -----
-Summary for scope:                                19    22     0   1.2   0.0
---------------------                 ---- ---- ----- ----- ----- ----- -----
-
diff --git a/TAO/IIOP/docs/us/codecounts/request.cpp.cccc b/TAO/IIOP/docs/us/codecounts/request.cpp.cccc
deleted file mode 100644
index 5b717985743..00000000000
--- a/TAO/IIOP/docs/us/codecounts/request.cpp.cccc
+++ /dev/null
@@ -1,36 +0,0 @@
-
-CCCC - a code counter for C and C++
-===================================
-
-A program to analyse C and C++ source code and report on
-some simple software metrics
-Version  1.00 
-Copyright Tim Littlefair, 1995
-
-The development of this program was heavily dependent on
-the Purdue Compiler Construction Tool Set (PCCTS) 
-by Terence Parr, Will Cohen, Hank Dietz, Russel Quoung
-and others.
-
-This software is provided with NO WARRANTY
-
-
-Scope: ../../../lib/request.cpp
-Canonical name                       From   To   COM   LOC   MVG   L/C   M/C
---------------------                 ---- ---- ----- ----- ----- ----- -----
-DEFINE_GUID(IID_CORBA_Request,0x774  1    19       7     2     0   0.3   0.0
-static pthread_mutex_t refcnt_lock=  22   22       0     0     0            
-ULONG __stdcall CORBA_Request::AddR  26   35       0     6     1 ! *** ! ***
-ULONG __stdcall CORBA_Request::Rele  37   52       0    10     3 ! *** ! ***
-HRESULT __stdcall CORBA_Request::Qu  54   71       0    14     5 ! *** ! ***
-void CORBA_release(){}               73   81       3     5     1   1.7   0.3
-CORBA_Boolean CORBA_is_nil(){}       83   87       0     4     1 ! *** ! ***
-CORBA_Request::CORBA_Request(CORBA_  89   106      3    14     0   4.7   0.0
-CORBA_Request::CORBA_Request(){}     109  121      0    11     0 ! ***      
-CORBA_Request::~CORBA_Request(){}    123  131      0     7     0 ! ***      
-void CORBA_Request::invoke(){}       133  154      8    11     2   1.4   0.3
-void CORBA_Request::send_oneway(){}  156  168      0    11     2 ! *** ! ***
---------------------                 ---- ---- ----- ----- ----- ----- -----
-Summary for scope:                                21   107    15   5.1   0.7
---------------------                 ---- ---- ----- ----- ----- ----- -----
-
diff --git a/TAO/IIOP/docs/us/codecounts/request.hh.cccc b/TAO/IIOP/docs/us/codecounts/request.hh.cccc
deleted file mode 100644
index 6859f7eaf38..00000000000
--- a/TAO/IIOP/docs/us/codecounts/request.hh.cccc
+++ /dev/null
@@ -1,31 +0,0 @@
-
-CCCC - a code counter for C and C++
-===================================
-
-A program to analyse C and C++ source code and report on
-some simple software metrics
-Version  1.00 
-Copyright Tim Littlefair, 1995
-
-The development of this program was heavily dependent on
-the Purdue Compiler Construction Tool Set (PCCTS) 
-by Terence Parr, Will Cohen, Hank Dietz, Russel Quoung
-and others.
-
-This software is provided with NO WARRANTY
-
-
-Scope: ../../../lib/request.hh
-Canonical name                       From   To   COM   LOC   MVG   L/C   M/C
---------------------                 ---- ---- ----- ----- ----- ----- -----
-void CORBA_release();                1    8        6     1     0   0.2   0.0
-CORBA_Boolean CORBA_is_nil();        9    9        0     0     0            
-typedef CORBA_SEQUENCE<CORBA_TypeCo  11   11       0     0     0            
-typedef CORBA_ExceptionList*CORBA_E  12   12       0     0     0            
-extern const IID IID_CORBA_Request;  14   14       0     0     0            
-class _EXPCLASS CORBA_Request:publi  16   69       6    39     6   6.5   1.0
-;                                    69   69       0     0     0            
---------------------                 ---- ---- ----- ----- ----- ----- -----
-Summary for scope:                                12    46     6   3.8   0.5
---------------------                 ---- ---- ----- ----- ----- ----- -----
-
diff --git a/TAO/IIOP/docs/us/codecounts/roa.cpp.cccc b/TAO/IIOP/docs/us/codecounts/roa.cpp.cccc
deleted file mode 100644
index 4386a9f01da..00000000000
--- a/TAO/IIOP/docs/us/codecounts/roa.cpp.cccc
+++ /dev/null
@@ -1,43 +0,0 @@
-
-CCCC - a code counter for C and C++
-===================================
-
-A program to analyse C and C++ source code and report on
-some simple software metrics
-Version  1.00 
-Copyright Tim Littlefair, 1995
-
-The development of this program was heavily dependent on
-the Purdue Compiler Construction Tool Set (PCCTS) 
-by Terence Parr, Will Cohen, Hank Dietz, Russel Quoung
-and others.
-
-This software is provided with NO WARRANTY
-
-
-Scope: ../../../lib/roa.cpp
-Canonical name                       From   To   COM   LOC   MVG   L/C   M/C
---------------------                 ---- ---- ----- ----- ----- ----- -----
-int ACE_ROA::end_reactor_event_loop  5    5        0     0     0            
-ACE_Reactor ACE_ROA::theReactor;     6    6        0     0     0            
-int ACE_ROA::usingThreads_=0;        7    7        0     0     0            
-void*ACE_ROA::context_p=0;           8    8        0     0     0            
-ACE_ROA::UpcallFunc ACE_ROA::theUpc  9    9        0     0     0            
-ACE_ROA::ForwardFunc ACE_ROA::theFo  10   10       0     0     0            
-TCP_OA_ptr ACE_ROA::theOA=0;         11   11       0     0     0            
-ROA_Handler::ROA_Handler(){}         13   15       0     2     0 ! ***      
-int ROA_Handler::open(){}            17   35       0    17     4 ! *** ! ***
-int ROA_Handler::handle_close(){}    37   40       0     3     0 ! ***      
-int ROA_Handler::handle_input(){}    42   75      11    16     1   1.5   0.1
-template class ACE_Acceptor<ROA_Han  82   83       1     0     0   0.0   0.0
-template class ACE_Svc_Handler<ACE_  84   84       0     0     0            
-template class ACE_Task<ACE_NULL_SY  85   86       1     0     0   0.0   0.0
-template class ACE_TSS<ACE_Dynamic>  86   87       1     0     0   0.0   0.0
-template class ACE_Message_Queue<AC  87   88       1     0     0   0.0   0.0
-template class ACE_Module<ACE_NULL_  88   89       1     0     0   0.0   0.0
-template class ACE_Thru_Task<ACE_NU  89   90       1     0     0   0.0   0.0
-line 92: syntax error at "ÿ" missing Start
---------------------                 ---- ---- ----- ----- ----- ----- -----
-Summary for scope:                                18    51     5   2.8   0.3
---------------------                 ---- ---- ----- ----- ----- ----- -----
-
diff --git a/TAO/IIOP/docs/us/codecounts/roa.hh.cccc b/TAO/IIOP/docs/us/codecounts/roa.hh.cccc
deleted file mode 100644
index 32849e09c09..00000000000
--- a/TAO/IIOP/docs/us/codecounts/roa.hh.cccc
+++ /dev/null
@@ -1,30 +0,0 @@
-
-CCCC - a code counter for C and C++
-===================================
-
-A program to analyse C and C++ source code and report on
-some simple software metrics
-Version  1.00 
-Copyright Tim Littlefair, 1995
-
-The development of this program was heavily dependent on
-the Purdue Compiler Construction Tool Set (PCCTS) 
-by Terence Parr, Will Cohen, Hank Dietz, Russel Quoung
-and others.
-
-This software is provided with NO WARRANTY
-
-
-Scope: ../../../lib/roa.hh
-Canonical name                       From   To   COM   LOC   MVG   L/C   M/C
---------------------                 ---- ---- ----- ----- ----- ----- -----
-class TCP_OA;                        1    18       1     1     0   1.0   0.0
-typedef TCP_OA*TCP_OA_ptr;           19   19       0     0     0            
-class ACE_ROA{};                     21   62       9    24     0   2.7   0.0
-class ROA_Handler:public ACE_Svc_Ha  64   72       0     8     0 ! ***      
-;                                    72   72       0     0     0            
-typedef ACE_Acceptor<ROA_Handler,AC  74   74       0     0     0            
---------------------                 ---- ---- ----- ----- ----- ----- -----
-Summary for scope:                                10    38     0   3.8   0.0
---------------------                 ---- ---- ----- ----- ----- ----- -----
-
diff --git a/TAO/IIOP/docs/us/codecounts/roa.i.cccc b/TAO/IIOP/docs/us/codecounts/roa.i.cccc
deleted file mode 100644
index 9b2669b8251..00000000000
--- a/TAO/IIOP/docs/us/codecounts/roa.i.cccc
+++ /dev/null
@@ -1,35 +0,0 @@
-
-CCCC - a code counter for C and C++
-===================================
-
-A program to analyse C and C++ source code and report on
-some simple software metrics
-Version  1.00 
-Copyright Tim Littlefair, 1995
-
-The development of this program was heavily dependent on
-the Purdue Compiler Construction Tool Set (PCCTS) 
-by Terence Parr, Will Cohen, Hank Dietz, Russel Quoung
-and others.
-
-This software is provided with NO WARRANTY
-
-
-Scope: ../../../lib/roa.i
-Canonical name                       From   To   COM   LOC   MVG   L/C   M/C
---------------------                 ---- ---- ----- ----- ----- ----- -----
-ACE_INLINE ACE_Reactor*ACE_ROA::rea  1    1        0     0     1       ! ***
-ACE_INLINE int ACE_ROA::usingThread  3    3        0     0     1       ! ***
-ACE_INLINE void ACE_ROA::usingThrea  4    4        0     0     0            
-ACE_INLINE void*ACE_ROA::context(){  6    6        0     0     1       ! ***
-ACE_INLINE void ACE_ROA::context(vo  7    7        0     0     0            
-ACE_INLINE ACE_ROA::UpcallFunc ACE_  9    9        0     0     1       ! ***
-ACE_INLINE void ACE_ROA::upcall(ACE  10   10       0     0     0            
-ACE_INLINE ACE_ROA::ForwardFunc ACE  12   12       0     0     1       ! ***
-ACE_INLINE void ACE_ROA::forwarder(  13   13       0     0     0            
-ACE_INLINE TCP_OA_ptr ACE_ROA::oa()  15   15       0     0     1       ! ***
-ACE_INLINE void ACE_ROA::oa(TCP_OA_  16   16       0     0     0            
---------------------                 ---- ---- ----- ----- ----- ----- -----
-Summary for scope:                                 0    11     6 ! *** ! ***
---------------------                 ---- ---- ----- ----- ----- ----- -----
-
diff --git a/TAO/IIOP/docs/us/codecounts/sequence.hh.cccc b/TAO/IIOP/docs/us/codecounts/sequence.hh.cccc
deleted file mode 100644
index 6cb51165aba..00000000000
--- a/TAO/IIOP/docs/us/codecounts/sequence.hh.cccc
+++ /dev/null
@@ -1,26 +0,0 @@
-
-CCCC - a code counter for C and C++
-===================================
-
-A program to analyse C and C++ source code and report on
-some simple software metrics
-Version  1.00 
-Copyright Tim Littlefair, 1995
-
-The development of this program was heavily dependent on
-the Purdue Compiler Construction Tool Set (PCCTS) 
-by Terence Parr, Will Cohen, Hank Dietz, Russel Quoung
-and others.
-
-This software is provided with NO WARRANTY
-
-
-Scope: ../../../lib/sequence.hh
-Canonical name                       From   To   COM   LOC   MVG   L/C   M/C
---------------------                 ---- ---- ----- ----- ----- ----- -----
-template<>struct CORBA_SEQUENCE{};   1    21       5    10     0   2.0   0.0
-typedef CORBA_SEQUENCE<CORBA_Octet>  23   23       0     0     0            
---------------------                 ---- ---- ----- ----- ----- ----- -----
-Summary for scope:                                 5    12     0   2.4   0.0
---------------------                 ---- ---- ----- ----- ----- ----- -----
-
diff --git a/TAO/IIOP/docs/us/codecounts/stub.hh.cccc b/TAO/IIOP/docs/us/codecounts/stub.hh.cccc
deleted file mode 100644
index 2dad231e858..00000000000
--- a/TAO/IIOP/docs/us/codecounts/stub.hh.cccc
+++ /dev/null
@@ -1,32 +0,0 @@
-
-CCCC - a code counter for C and C++
-===================================
-
-A program to analyse C and C++ source code and report on
-some simple software metrics
-Version  1.00 
-Copyright Tim Littlefair, 1995
-
-The development of this program was heavily dependent on
-the Purdue Compiler Construction Tool Set (PCCTS) 
-by Terence Parr, Will Cohen, Hank Dietz, Russel Quoung
-and others.
-
-This software is provided with NO WARRANTY
-
-
-Scope: ../../../lib/stub.hh
-Canonical name                       From   To   COM   LOC   MVG   L/C   M/C
---------------------                 ---- ---- ----- ----- ----- ----- -----
-enum param_type{};                   1    27      20     4     0   0.2   0.0
-struct paramdata{};                  29   49      19     1     0   0.1   0.0
-struct calldata{};                   52   83      28     3     0   0.1   0.0
-typedef void(*skeleton)();           86   98      12     0     0   0.0   0.0
-struct skel_entry{};                 100  103      1     2     0   2.0   0.0
-extern const IID IID_STUB_Object;    107  117     10     0     0   0.0   0.0
-class _EXPCLASS STUB_Object:public   119  224     63    34     0   0.5   0.0
-;                                    224  224      0     0     0            
---------------------                 ---- ---- ----- ----- ----- ----- -----
-Summary for scope:                               153    51     0   0.3   0.0
---------------------                 ---- ---- ----- ----- ----- ----- -----
-
diff --git a/TAO/IIOP/docs/us/codecounts/svrrqst.cpp.cccc b/TAO/IIOP/docs/us/codecounts/svrrqst.cpp.cccc
deleted file mode 100644
index b9e9230c2e0..00000000000
--- a/TAO/IIOP/docs/us/codecounts/svrrqst.cpp.cccc
+++ /dev/null
@@ -1,39 +0,0 @@
-
-CCCC - a code counter for C and C++
-===================================
-
-A program to analyse C and C++ source code and report on
-some simple software metrics
-Version  1.00 
-Copyright Tim Littlefair, 1995
-
-The development of this program was heavily dependent on
-the Purdue Compiler Construction Tool Set (PCCTS) 
-by Terence Parr, Will Cohen, Hank Dietz, Russel Quoung
-and others.
-
-This software is provided with NO WARRANTY
-
-
-Scope: ../../../lib/svrrqst.cpp
-Canonical name                       From   To   COM   LOC   MVG   L/C   M/C
---------------------                 ---- ---- ----- ----- ----- ----- -----
-DEFINE_GUID(IID_IIOP_ServerRequest,  1    20       7     2     0   0.3   0.0
-DEFINE_GUID(IID_CORBA_ServerRequest  22   24       1     1     0   1.0   0.0
-static pthread_mutex_t svrqst_lock=  29   29       0     0     0            
-IIOP_ServerRequest::~IIOP_ServerReq  33   42       0     9     3 ! *** ! ***
-ULONG __stdcall IIOP_ServerRequest:  45   55       0     7     1 ! *** ! ***
-ULONG __stdcall IIOP_ServerRequest:  57   73       0    11     3 ! *** ! ***
-HRESULT __stdcall IIOP_ServerReques  75   95       0    17     6 ! *** ! ***
-void __stdcall IIOP_ServerRequest::  98   173     36    31     3   0.9   0.1
-void __stdcall IIOP_ServerRequest::  176  196      6    12     3   2.0   0.5
-void __stdcall IIOP_ServerRequest::  199  219      4    15     3   3.8   0.8
-CORBA_String __stdcall IIOP_ServerR  222  230      3     5     1   1.7   0.3
-CORBA_Object_ptr __stdcall IIOP_Ser  232  238      1     5     1   5.0   1.0
-CORBA_Principal_ptr __stdcall IIOP_  240  246      1     5     1   5.0   1.0
-CORBA_ORB_ptr __stdcall IIOP_Server  248  253      0     5     1 ! *** ! ***
-TOA_ptr __stdcall IIOP_ServerReques  255  260      0     5     1 ! *** ! ***
---------------------                 ---- ---- ----- ----- ----- ----- -----
-Summary for scope:                                59   145    27   2.5   0.5
---------------------                 ---- ---- ----- ----- ----- ----- -----
-
diff --git a/TAO/IIOP/docs/us/codecounts/svrrqst.hh.cccc b/TAO/IIOP/docs/us/codecounts/svrrqst.hh.cccc
deleted file mode 100644
index aa6da40edce..00000000000
--- a/TAO/IIOP/docs/us/codecounts/svrrqst.hh.cccc
+++ /dev/null
@@ -1,35 +0,0 @@
-
-CCCC - a code counter for C and C++
-===================================
-
-A program to analyse C and C++ source code and report on
-some simple software metrics
-Version  1.00 
-Copyright Tim Littlefair, 1995
-
-The development of this program was heavily dependent on
-the Purdue Compiler Construction Tool Set (PCCTS) 
-by Terence Parr, Will Cohen, Hank Dietz, Russel Quoung
-and others.
-
-This software is provided with NO WARRANTY
-
-
-Scope: ../../../lib/svrrqst.hh
-Canonical name                       From   To   COM   LOC   MVG   L/C   M/C
---------------------                 ---- ---- ----- ----- ----- ----- -----
-typedef class CORBA_ServerRequest*C  1    16       9     1     0   0.1   0.0
-typedef class CORBA_ORB*CORBA_ORB_p  17   17       0     0     0            
-typedef class TOA*TOA_ptr;           18   18       0     0     0            
-void CORBA_release();                20   20       0     0     0            
-CORBA_Boolean CORBA_is_nil();        21   21       0     0     0            
-extern const IID IID_CORBA_ServerRe  23   23       0     0     0            
-class _EXPCLASS CORBA_ServerRequest  25   78      29    21     0   0.7   0.0
-;                                    78   78       0     0     0            
-extern const IID IID_IIOP_ServerReq  80   80       0     0     0            
-class _EXPCLASS IIOP_ServerRequest:  82   159     17    51     0   3.0   0.0
-;                                    159  159      0     0     0            
---------------------                 ---- ---- ----- ----- ----- ----- -----
-Summary for scope:                                55    82     0   1.5   0.0
---------------------                 ---- ---- ----- ----- ----- ----- -----
-
diff --git a/TAO/IIOP/docs/us/codecounts/t-sizes.cpp.cccc b/TAO/IIOP/docs/us/codecounts/t-sizes.cpp.cccc
deleted file mode 100644
index 24592ade908..00000000000
--- a/TAO/IIOP/docs/us/codecounts/t-sizes.cpp.cccc
+++ /dev/null
@@ -1,25 +0,0 @@
-
-CCCC - a code counter for C and C++
-===================================
-
-A program to analyse C and C++ source code and report on
-some simple software metrics
-Version  1.00 
-Copyright Tim Littlefair, 1995
-
-The development of this program was heavily dependent on
-the Purdue Compiler Construction Tool Set (PCCTS) 
-by Terence Parr, Will Cohen, Hank Dietz, Russel Quoung
-and others.
-
-This software is provided with NO WARRANTY
-
-
-Scope: ../../../lib/t-sizes.cpp
-Canonical name                       From   To   COM   LOC   MVG   L/C   M/C
---------------------                 ---- ---- ----- ----- ----- ----- -----
-int main(){}                         6    15       0     9     0 ! ***      
---------------------                 ---- ---- ----- ----- ----- ----- -----
-Summary for scope:                                 0    10     0 ! ***      
---------------------                 ---- ---- ----- ----- ----- ----- -----
-
diff --git a/TAO/IIOP/docs/us/codecounts/t-xdr.cpp.cccc b/TAO/IIOP/docs/us/codecounts/t-xdr.cpp.cccc
deleted file mode 100644
index b32010c4109..00000000000
--- a/TAO/IIOP/docs/us/codecounts/t-xdr.cpp.cccc
+++ /dev/null
@@ -1,29 +0,0 @@
-
-CCCC - a code counter for C and C++
-===================================
-
-A program to analyse C and C++ source code and report on
-some simple software metrics
-Version  1.00 
-Copyright Tim Littlefair, 1995
-
-The development of this program was heavily dependent on
-the Purdue Compiler Construction Tool Set (PCCTS) 
-by Terence Parr, Will Cohen, Hank Dietz, Russel Quoung
-and others.
-
-This software is provided with NO WARRANTY
-
-
-Scope: ../../../lib/t-xdr.cpp
-Canonical name                       From   To   COM   LOC   MVG   L/C   M/C
---------------------                 ---- ---- ----- ----- ----- ----- -----
-typedef CORBA_SEQUENCE<CORBA_Octet>  1    34      12     2     0   0.2   0.0
-struct interesting{};                36   73      18    12     0   0.7   0.0
-extern CORBA_TypeCode TC_opaque;     75   78       2     1     0   0.5   0.0
-static void do_test(){}              80   225     34    82 !  30   2.4   0.9
-int main(){}                         228  264      3    29     3 ? 9.7   1.0
---------------------                 ---- ---- ----- ----- ----- ----- -----
-Summary for scope:                                69   131    33   1.9   0.5
---------------------                 ---- ---- ----- ----- ----- ----- -----
-
diff --git a/TAO/IIOP/docs/us/codecounts/tc_const.cpp.cccc b/TAO/IIOP/docs/us/codecounts/tc_const.cpp.cccc
deleted file mode 100644
index e606b23721b..00000000000
--- a/TAO/IIOP/docs/us/codecounts/tc_const.cpp.cccc
+++ /dev/null
@@ -1,68 +0,0 @@
-
-CCCC - a code counter for C and C++
-===================================
-
-A program to analyse C and C++ source code and report on
-some simple software metrics
-Version  1.00 
-Copyright Tim Littlefair, 1995
-
-The development of this program was heavily dependent on
-the Purdue Compiler Construction Tool Set (PCCTS) 
-by Terence Parr, Will Cohen, Hank Dietz, Russel Quoung
-and others.
-
-This software is provided with NO WARRANTY
-
-
-Scope: ../../../lib/tc_const.cpp
-Canonical name                       From   To   COM   LOC   MVG   L/C   M/C
---------------------                 ---- ---- ----- ----- ----- ----- -----
-static CORBA_TypeCode tc_null();     1    25      18     1     0   0.1   0.0
-const CORBA_TypeCode_ptr _tc_CORBA_  26   26       0     0     0            
-CORBA_TypeCode_ptr CORBA_TypeCode::  28   32       0     4     1 ! *** ! ***
-static CORBA_TypeCode tc_void();     34   34       0     0     0            
-const CORBA_TypeCode_ptr _tc_CORBA_  35   35       0     0     0            
-static CORBA_TypeCode tc_short();    37   40       3     0     0   0.0   0.0
-const CORBA_TypeCode_ptr _tc_CORBA_  41   41       0     0     0            
-static CORBA_TypeCode tc_long();     43   43       0     0     0            
-const CORBA_TypeCode_ptr _tc_CORBA_  44   44       0     0     0            
-static CORBA_TypeCode tc_longlong()  46   46       0     0     0            
-const CORBA_TypeCode_ptr _tc_CORBA_  47   47       0     0     0            
-static CORBA_TypeCode tc_ushort();   49   49       0     0     0            
-const CORBA_TypeCode_ptr _tc_CORBA_  50   50       0     0     0            
-static CORBA_TypeCode tc_ulong();    52   52       0     0     0            
-const CORBA_TypeCode_ptr _tc_CORBA_  53   53       0     0     0            
-static CORBA_TypeCode tc_ulonglong(  55   55       0     0     0            
-const CORBA_TypeCode_ptr _tc_CORBA_  56   56       0     0     0            
-static CORBA_TypeCode tc_float();    58   61       3     0     0   0.0   0.0
-const CORBA_TypeCode_ptr _tc_CORBA_  62   62       0     0     0            
-static CORBA_TypeCode tc_double();   64   64       0     0     0            
-const CORBA_TypeCode_ptr _tc_CORBA_  65   65       0     0     0            
-static CORBA_TypeCode tc_longdouble  67   67       0     0     0            
-const CORBA_TypeCode_ptr _tc_CORBA_  68   68       0     0     0            
-static CORBA_TypeCode tc_boolean();  70   73       3     0     0   0.0   0.0
-const CORBA_TypeCode_ptr _tc_CORBA_  74   74       0     0     0            
-static CORBA_TypeCode tc_octet();    76   76       0     0     0            
-const CORBA_TypeCode_ptr _tc_CORBA_  77   77       0     0     0            
-static CORBA_TypeCode tc_char();     79   84       5     0     0   0.0   0.0
-const CORBA_TypeCode_ptr _tc_CORBA_  85   85       0     0     0            
-static CORBA_TypeCode tc_wchar();    87   87       0     0     0            
-const CORBA_TypeCode_ptr _tc_CORBA_  88   88       0     0     0            
-static CORBA_TypeCode tc_string();   90   90       0     0     0            
-const CORBA_TypeCode_ptr _tc_CORBA_  91   91       0     0     0            
-static CORBA_TypeCode tc_wstring();  93   93       0     0     0            
-const CORBA_TypeCode_ptr _tc_CORBA_  94   94       0     0     0            
-static CORBA_TypeCode tc_any();      96   100      4     0     0   0.0   0.0
-const CORBA_TypeCode_ptr _tc_CORBA_  101  101      0     0     0            
-static CORBA_TypeCode tc_typecode()  103  103      0     0     0            
-const CORBA_TypeCode_ptr _tc_CORBA_  104  104      0     0     0            
-static CORBA_TypeCode tc_principal(  106  106      0     0     0            
-const CORBA_TypeCode_ptr _tc_CORBA_  107  107      0     0     0            
-static const unsigned char oc_objre  109  128      8    11     0   1.4   0.0
-static CORBA_TypeCode tc_objref();   129  131      0     2     0 ! ***      
-const CORBA_TypeCode_ptr _tc_CORBA_  132  132      0     0     0            
---------------------                 ---- ---- ----- ----- ----- ----- -----
-Summary for scope:                                44    62     1   1.4   0.0
---------------------                 ---- ---- ----- ----- ----- ----- -----
-
diff --git a/TAO/IIOP/docs/us/codecounts/tcpoa.cpp.cccc b/TAO/IIOP/docs/us/codecounts/tcpoa.cpp.cccc
deleted file mode 100644
index a5e145edfe2..00000000000
--- a/TAO/IIOP/docs/us/codecounts/tcpoa.cpp.cccc
+++ /dev/null
@@ -1,51 +0,0 @@
-
-CCCC - a code counter for C and C++
-===================================
-
-A program to analyse C and C++ source code and report on
-some simple software metrics
-Version  1.00 
-Copyright Tim Littlefair, 1995
-
-The development of this program was heavily dependent on
-the Purdue Compiler Construction Tool Set (PCCTS) 
-by Terence Parr, Will Cohen, Hank Dietz, Russel Quoung
-and others.
-
-This software is provided with NO WARRANTY
-
-
-Scope: ../../../lib/tcpoa.cpp
-Canonical name                       From   To   COM   LOC   MVG   L/C   M/C
---------------------                 ---- ---- ----- ----- ----- ----- -----
-static TCP_OA*the_oa;                1    44      14     1     0   0.1   0.0
-static pthread_key_t request_key;    47   47       0     0     0            
-static pthread_mutex_t tcpoa_mutex=  48   48       0     0     0            
-static pthread_mutex_t tcpoa_lock=P  49   49       0     0     0            
-static pthread_attr_t thread_attr;   50   50       0     0     0            
-static void tcp_oa_dispatcher(){}    53   180     45    59 ?  10   1.3   0.2
-static GIOP::LocateStatusType tcp_o  182  206      4    18     5   4.5   1.3
-TCP_OA::TCP_OA(CORBA_ORB_ptr owning  209  237      5    19     3   3.8   0.6
-TCP_OA::~TCP_OA(){}                  239  241      0     2     0 ! ***      
-TCP_OA_ptr TCP_OA::init(){}          244  288     11    18     3   1.6   0.3
-CORBA_Object_ptr __stdcall TCP_OA::  291  348      9    41 ?   8   4.6   0.9
-CORBA_OctetSeq*__stdcall TCP_OA::ge  351  364      4     9     1   2.3   0.3
-((GIOP::RequestHeader*)pthread_gets  368  382      9     1     0   0.1   0.0
-CORBA_Object_ptr __stdcall _this(){  386  436     23    22     6   1.0   0.3
-CORBA_OctetSeq*__stdcall TCP_OA::ge  439  454      6     8     1   1.3   0.2
-CORBA_Principal_ptr __stdcall TCP_O  457  472      6     8     1   1.3   0.2
-void TCP_OA::handle_message(){}      474  489      3     8     1   2.7   0.3
-void*TCP_OA::worker(){}              493  527     16    15     4   0.9   0.3
-void __stdcall TCP_OA::get_request(  531  779    128    82 ?  14   0.6   0.1
-void __stdcall TCP_OA::please_shutd  782  797      3     9     0   3.0   0.0
-void __stdcall TCP_OA::clean_shutdo  799  824      3    15     2   5.0   0.7
-void __stdcall TCP_OA::register_dir  827  848      3    16     2   5.3   0.7
-void __stdcall TCP_OA::get_request(  850  873      9    13     2   1.4   0.2
-DEFINE_GUID(IID_TCP_OA,0xa201e4c4,0  876  882      4     2     0   0.5   0.0
-ULONG __stdcall TCP_OA::AddRef(){Cr  885  894      0     6     1 ! *** ! ***
-ULONG __stdcall TCP_OA::Release(){C  896  913      0    10     3 ! *** ! ***
-HRESULT __stdcall TCP_OA::QueryInte  915  934      0    16     6 ! *** ! ***
---------------------                 ---- ---- ----- ----- ----- ----- -----
-Summary for scope:                               305   425    73   1.4   0.2
---------------------                 ---- ---- ----- ----- ----- ----- -----
-
diff --git a/TAO/IIOP/docs/us/codecounts/tcpoa.hh.cccc b/TAO/IIOP/docs/us/codecounts/tcpoa.hh.cccc
deleted file mode 100644
index 8feca7cce56..00000000000
--- a/TAO/IIOP/docs/us/codecounts/tcpoa.hh.cccc
+++ /dev/null
@@ -1,31 +0,0 @@
-
-CCCC - a code counter for C and C++
-===================================
-
-A program to analyse C and C++ source code and report on
-some simple software metrics
-Version  1.00 
-Copyright Tim Littlefair, 1995
-
-The development of this program was heavily dependent on
-the Purdue Compiler Construction Tool Set (PCCTS) 
-by Terence Parr, Will Cohen, Hank Dietz, Russel Quoung
-and others.
-
-This software is provided with NO WARRANTY
-
-
-Scope: ../../../lib/tcpoa.hh
-Canonical name                       From   To   COM   LOC   MVG   L/C   M/C
---------------------                 ---- ---- ----- ----- ----- ----- -----
-class _EXPCLASS TCP_OA;              1    33      26     1     0   0.0   0.0
-typedef TCP_OA*TCP_OA_ptr;           34   34       0     0     0            
-extern const IID IID_TCP_OA;         38   38       0     0     0            
-class _EXPCLASS TCP_OA:public TOA{p  40   224     93    61     2   0.7   0.0
-;                                    224  224      0     0     0            
-typedef TCP_OA*TCP_OA_ptr;           226  226      0     0     0            
-extern CORBA_Object_ptr __stdcall _  229  245     16     0     0   0.0   0.0
---------------------                 ---- ---- ----- ----- ----- ----- -----
-Summary for scope:                               135    68     2   0.5   0.0
---------------------                 ---- ---- ----- ----- ----- ----- -----
-
diff --git a/TAO/IIOP/docs/us/codecounts/thread.hh.cccc b/TAO/IIOP/docs/us/codecounts/thread.hh.cccc
deleted file mode 100644
index 4b1e08a0cfd..00000000000
--- a/TAO/IIOP/docs/us/codecounts/thread.hh.cccc
+++ /dev/null
@@ -1,35 +0,0 @@
-
-CCCC - a code counter for C and C++
-===================================
-
-A program to analyse C and C++ source code and report on
-some simple software metrics
-Version  1.00 
-Copyright Tim Littlefair, 1995
-
-The development of this program was heavily dependent on
-the Purdue Compiler Construction Tool Set (PCCTS) 
-by Terence Parr, Will Cohen, Hank Dietz, Russel Quoung
-and others.
-
-This software is provided with NO WARRANTY
-
-
-Scope: ../../../lib/thread.hh
-Canonical name                       From   To   COM   LOC   MVG   L/C   M/C
---------------------                 ---- ---- ----- ----- ----- ----- -----
-typedef thread_t pthread_t;          1    67      39     4     0   0.1   0.0
-typedef mutex_t pthread_mutex_t;     68   68       0     0     0            
-typedef cond_t pthread_cond_t;       69   69       0     0     0            
-typedef unsigned long pthread_attr_  70   70       0     0     0            
-typedef thread_key_t pthread_key_t;  71   71       0     0     0            
-struct pthread_once_t{};             81   84       0     3     0 ! ***      
-inline void pthread_once(pthread_on  88   97       0     9     1 ! *** ! ***
-inline void*pthread_getspecific(pth  107  114      0     6     1 ! *** ! ***
-inline int pthread_create(pthread_t  118  127      0     9     1 ! *** ! ***
-class Critical{};                    133  156      6    14     0   2.3   0.0
-class ForceSynchronousCancel{};      159  181     10     8     0   0.8   0.0
---------------------                 ---- ---- ----- ----- ----- ----- -----
-Summary for scope:                                55    64     3   1.2   0.1
---------------------                 ---- ---- ----- ----- ----- ----- -----
-
diff --git a/TAO/IIOP/docs/us/codecounts/toa.cpp.cccc b/TAO/IIOP/docs/us/codecounts/toa.cpp.cccc
deleted file mode 100644
index 98d352ea297..00000000000
--- a/TAO/IIOP/docs/us/codecounts/toa.cpp.cccc
+++ /dev/null
@@ -1,27 +0,0 @@
-
-CCCC - a code counter for C and C++
-===================================
-
-A program to analyse C and C++ source code and report on
-some simple software metrics
-Version  1.00 
-Copyright Tim Littlefair, 1995
-
-The development of this program was heavily dependent on
-the Purdue Compiler Construction Tool Set (PCCTS) 
-by Terence Parr, Will Cohen, Hank Dietz, Russel Quoung
-and others.
-
-This software is provided with NO WARRANTY
-
-
-Scope: ../../../lib/toa.cpp
-Canonical name                       From   To   COM   LOC   MVG   L/C   M/C
---------------------                 ---- ---- ----- ----- ----- ----- -----
-DEFINE_GUID(IID_TOA,0xa201e4c8,0xf2  1    44      14     3     0   0.2   0.0
-TOA_ptr TOA::get_named_toa(){}       47   102     28    22     5   0.8   0.2
-TOA_ptr TOA::get_toa(){}             105  147     15    22     5   1.5   0.3
---------------------                 ---- ---- ----- ----- ----- ----- -----
-Summary for scope:                                57    50    10   0.9   0.2
---------------------                 ---- ---- ----- ----- ----- ----- -----
-
diff --git a/TAO/IIOP/docs/us/codecounts/toa.hh.cccc b/TAO/IIOP/docs/us/codecounts/toa.hh.cccc
deleted file mode 100644
index 3229e548e61..00000000000
--- a/TAO/IIOP/docs/us/codecounts/toa.hh.cccc
+++ /dev/null
@@ -1,30 +0,0 @@
-
-CCCC - a code counter for C and C++
-===================================
-
-A program to analyse C and C++ source code and report on
-some simple software metrics
-Version  1.00 
-Copyright Tim Littlefair, 1995
-
-The development of this program was heavily dependent on
-the Purdue Compiler Construction Tool Set (PCCTS) 
-by Terence Parr, Will Cohen, Hank Dietz, Russel Quoung
-and others.
-
-This software is provided with NO WARRANTY
-
-
-Scope: ../../../lib/toa.hh
-Canonical name                       From   To   COM   LOC   MVG   L/C   M/C
---------------------                 ---- ---- ----- ----- ----- ----- -----
-typedef class TOA*TOA_ptr;           1    18      10     1     0   0.1   0.0
-CORBA_Boolean is_nil();              20   20       0     0     0            
-void release();                      21   21       0     0     0            
-extern const IID IID_TOA;            23   23       0     0     0            
-class TOA:public IUnknown{public:vi  25   187    113    41     0   0.4   0.0
-;                                    187  187      0     0     0            
---------------------                 ---- ---- ----- ----- ----- ----- -----
-Summary for scope:                               123    47     0   0.4   0.0
---------------------                 ---- ---- ----- ----- ----- ----- -----
-
diff --git a/TAO/IIOP/docs/us/codecounts/typecode.cpp.cccc b/TAO/IIOP/docs/us/codecounts/typecode.cpp.cccc
deleted file mode 100644
index 11a4a8c0c88..00000000000
--- a/TAO/IIOP/docs/us/codecounts/typecode.cpp.cccc
+++ /dev/null
@@ -1,41 +0,0 @@
-
-CCCC - a code counter for C and C++
-===================================
-
-A program to analyse C and C++ source code and report on
-some simple software metrics
-Version  1.00 
-Copyright Tim Littlefair, 1995
-
-The development of this program was heavily dependent on
-the Purdue Compiler Construction Tool Set (PCCTS) 
-by Terence Parr, Will Cohen, Hank Dietz, Russel Quoung
-and others.
-
-This software is provided with NO WARRANTY
-
-
-Scope: ../../../lib/typecode.cpp
-Canonical name                       From   To   COM   LOC   MVG   L/C   M/C
---------------------                 ---- ---- ----- ----- ----- ----- -----
-static pthread_mutex_t refcnt_lock=  1    38      20     1     0   0.1   0.0
-void CORBA_release(){}               42   47       0     5     1 ! *** ! ***
-CORBA_Boolean CORBA_is_nil(){}       49   53       0     4     1 ! *** ! ***
-CORBA_TypeCode::CORBA_TypeCode(CORB  55   69       4    10     0   2.5   0.0
-CORBA_TypeCode::CORBA_TypeCode(CORB  72   115     20    21     1   1.0   0.1
-CORBA_TypeCode::~CORBA_TypeCode(){}  118  129      5     6     2   1.2   0.4
-DEFINE_GUID(IID_CORBA_TypeCode,0xa2  132  139      5     2     0   0.4   0.0
-ULONG __stdcall CORBA_TypeCode::Add  142  151      0     6     1 ! *** ! ***
-ULONG __stdcall CORBA_TypeCode::Rel  153  168      0    11     4 ! *** ! ***
-HRESULT __stdcall CORBA_TypeCode::Q  170  187      0    14     5 ! *** ! ***
-CORBA_TCKind CORBA_TypeCode::kind(C  190  200      3     7     1   2.3   0.3
-static CORBA_Boolean skip_typecode(  203  252     15    29 ?   9   1.9   0.6
-CORBA_Any_ptr CORBA_TypeCode::membe  255  341     29    44 ?  19   1.5   0.7
-CORBA_ULong CORBA_TypeCode::param_c  344  434     23    53 !  22   2.3   1.0
-CORBA_ULong CORBA_TypeCode::ulong_p  437  507     26    36 ?  16   1.4   0.6
-CORBA_TypeCode_ptr CORBA_TypeCode::  510  672     43    99 !  58   2.3   1.3
-CORBA_String CORBA_TypeCode::id(COR  675  711     15    19     3   1.3   0.2
---------------------                 ---- ---- ----- ----- ----- ----- -----
-Summary for scope:                               208   384   143   1.8   0.7
---------------------                 ---- ---- ----- ----- ----- ----- -----
-
diff --git a/TAO/IIOP/docs/us/codecounts/typecode.hh.cccc b/TAO/IIOP/docs/us/codecounts/typecode.hh.cccc
deleted file mode 100644
index 494931168d4..00000000000
--- a/TAO/IIOP/docs/us/codecounts/typecode.hh.cccc
+++ /dev/null
@@ -1,36 +0,0 @@
-
-CCCC - a code counter for C and C++
-===================================
-
-A program to analyse C and C++ source code and report on
-some simple software metrics
-Version  1.00 
-Copyright Tim Littlefair, 1995
-
-The development of this program was heavily dependent on
-the Purdue Compiler Construction Tool Set (PCCTS) 
-by Terence Parr, Will Cohen, Hank Dietz, Russel Quoung
-and others.
-
-This software is provided with NO WARRANTY
-
-
-Scope: ../../../lib/typecode.hh
-Canonical name                       From   To   COM   LOC   MVG   L/C   M/C
---------------------                 ---- ---- ----- ----- ----- ----- -----
-enum CORBA_TCKind{};                 1    50      23    26     0   1.1   0.0
-extern CORBA_TypeCode_ptr _tc_CORBA  53   56       3     0     0   0.0   0.0
-class CORBA_Bounds{};                57   62       0     5     0 ! ***      
-extern CORBA_TypeCode_ptr _tc_CORBA  64   64       0     0     0            
-class CORBA_BadKind{};               65   70       0     5     0 ! ***      
-typedef class CORBA_TypeCode*CORBA_  73   82       9     0     0   0.0   0.0
-void CORBA_release();                83   83       0     0     0            
-CORBA_Boolean CORBA_is_nil();        84   84       0     0     0            
-extern const IID IID_CORBA_TypeCode  86   86       0     0     0            
-class _EXPCLASS CORBA_TypeCode:publ  88   266    101    56     2   0.6   0.0
-;                                    266  266      0     0     0            
-extern const CORBA_TypeCode_ptr _tc  268  298      3    21     0   7.0   0.0
---------------------                 ---- ---- ----- ----- ----- ----- -----
-Summary for scope:                               139   124     2   0.9   0.0
---------------------                 ---- ---- ----- ----- ----- ----- -----
-
diff --git a/TAO/IIOP/docs/us/codecounts/xdr.cpp.cccc b/TAO/IIOP/docs/us/codecounts/xdr.cpp.cccc
deleted file mode 100644
index 90d59d8dd98..00000000000
--- a/TAO/IIOP/docs/us/codecounts/xdr.cpp.cccc
+++ /dev/null
@@ -1,33 +0,0 @@
-
-CCCC - a code counter for C and C++
-===================================
-
-A program to analyse C and C++ source code and report on
-some simple software metrics
-Version  1.00 
-Copyright Tim Littlefair, 1995
-
-The development of this program was heavily dependent on
-the Purdue Compiler Construction Tool Set (PCCTS) 
-by Terence Parr, Will Cohen, Hank Dietz, Russel Quoung
-and others.
-
-This software is provided with NO WARRANTY
-
-
-Scope: ../../../lib/xdr.cpp
-Canonical name                       From   To   COM   LOC   MVG   L/C   M/C
---------------------                 ---- ---- ----- ----- ----- ----- -----
-CORBA_Boolean XDR_stream::put_longl  1    52      31     6     1   0.2   0.0
-CORBA_Boolean XDR_stream::get_longl  54   59       0     5     1 ! *** ! ***
-CORBA_Boolean XDR_stream::put_longd  62   70       3     5     1   1.7   0.3
-CORBA_Boolean XDR_stream::get_longd  72   77       0     5     1 ! *** ! ***
-CORBA_TypeCode::traverse_status XDR  80   406     82 ? 202 !  65   2.5   0.8
-extern CORBA_TypeCode_ptr __tc_cons  410  413      3     0     0   0.0   0.0
-CORBA_TypeCode::traverse_status XDR  416  766     82 ? 220 !  60   2.7   0.7
-CORBA_Boolean XDR_stream::flush_fra  769  801     10    15     3   1.5   0.3
-CORBA_Boolean XDR_stream::read_frag  804  815      5     5     1   1.0   0.2
---------------------                 ---- ---- ----- ----- ----- ----- -----
-Summary for scope:                               216   472   133   2.2   0.6
---------------------                 ---- ---- ----- ----- ----- ----- -----
-
diff --git a/TAO/IIOP/docs/us/codecounts/xdr.hh.cccc b/TAO/IIOP/docs/us/codecounts/xdr.hh.cccc
deleted file mode 100644
index 45e2ca773c7..00000000000
--- a/TAO/IIOP/docs/us/codecounts/xdr.hh.cccc
+++ /dev/null
@@ -1,27 +0,0 @@
-
-CCCC - a code counter for C and C++
-===================================
-
-A program to analyse C and C++ source code and report on
-some simple software metrics
-Version  1.00 
-Copyright Tim Littlefair, 1995
-
-The development of this program was heavily dependent on
-the Purdue Compiler Construction Tool Set (PCCTS) 
-by Terence Parr, Will Cohen, Hank Dietz, Russel Quoung
-and others.
-
-This software is provided with NO WARRANTY
-
-
-Scope: ../../../lib/xdr.hh
-Canonical name                       From   To   COM   LOC   MVG   L/C   M/C
---------------------                 ---- ---- ----- ----- ----- ----- -----
-class XDR_stream{};                  1    269     78 ? 149 !  32   1.9   0.4
-inline CORBA_Boolean XDR_stream::ou  271  275      0     4     1 ! *** ! ***
-inline CORBA_Boolean XDR_stream::pu  277  287      0    10     4 ! *** ! ***
---------------------                 ---- ---- ----- ----- ----- ----- -----
-Summary for scope:                                78   166    37   2.1   0.5
---------------------                 ---- ---- ----- ----- ----- ----- -----
-
diff --git a/TAO/IIOP/docs/us/plan.html b/TAO/IIOP/docs/us/plan.html
deleted file mode 100644
index 5650257a330..00000000000
--- a/TAO/IIOP/docs/us/plan.html
+++ /dev/null
@@ -1,29 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
-<html>
-  <head>
-    <title>IIOP Notes</title>
-  </head>
-
-  <body>
-      <h1>IIOP Notes</h1>
-
-      <p>
-	The current plan for transforming the Sun IIOP Reference
-	implementation into the basis of the TAO is:
-
-      <ol>
-	<li>Replace selected portions of code with ACE components while maintaining the current architecture and design.
-	<li>Distill the design patterns and begin re-architecting.
-      </ol>
-
-      <p>
-	Please feel free to email additions to this list!
-
-      <hr>
-      <address><a href="mailto:cleeland@cs.wustl.edu">Chris Cleeland</a></address>
-<!-- Created: Fri Feb 14 15:22:32 CST 1997 -->
-<!-- hhmts start -->
-Last modified: Fri Feb 14 15:46:52 CST 
-<!-- hhmts end -->
-  </body>
-</html>
diff --git a/TAO/IIOP/docs/us/server b/TAO/IIOP/docs/us/server
deleted file mode 100644
index afad69638a8..00000000000
--- a/TAO/IIOP/docs/us/server
+++ /dev/null
@@ -1,5 +0,0 @@
-This note describes architectural differences between the Sun IIOP
-Reference implementation (SIR) and a new architecture based on ACE.
-After narrating the SIR architecture, shortcomings of that design are
-highlighted, and a solution known as The ACE ORB (TAO) presented.
-
diff --git a/TAO/IIOP/test/Build/clnt.bld b/TAO/IIOP/test/Build/clnt.bld
deleted file mode 100755
index 76e60ef8967..00000000000
--- a/TAO/IIOP/test/Build/clnt.bld
+++ /dev/null
@@ -1,8 +0,0 @@
-#!build
-default:
-	program
-	:debuglevel=multi
-../cubit.cpp
-	C++
-../clnt.cpp
-	C++
diff --git a/TAO/IIOP/test/Build/default.bld b/TAO/IIOP/test/Build/default.bld
deleted file mode 100755
index cdf3e2e8210..00000000000
--- a/TAO/IIOP/test/Build/default.bld
+++ /dev/null
@@ -1,19 +0,0 @@
-#!build
-default:
-	nobuild
-	:debuglevel=multi
-	:target=vxwppc
-	:sourcedirs=/home/ace/ACE_wrappers.vxworks
-	:sourcedirs=../../proto/include
-	:sourcedirs=../..
-	:libraries=../../proto/lib/tao.a
-	:libraries=/home/ace/ACE_wrappers.vxworks/ace/libACE.a
-	:libraries=/appl/newgreen/vxppc603/indlib.o
-	:defines=DEBUG
-clnt.bld
-	program
-	:debuglevel=multi
-svr.bld
-	program
-	:debuglevel=multi
-	:defines=USE_ACE_EVENT_HANDLING
diff --git a/TAO/IIOP/test/Build/svr.bld b/TAO/IIOP/test/Build/svr.bld
deleted file mode 100755
index 7c8725356b2..00000000000
--- a/TAO/IIOP/test/Build/svr.bld
+++ /dev/null
@@ -1,8 +0,0 @@
-#!build
-default:
-	program
-	:debuglevel=multi
-../svr.cpp
-	C++
-../cubit.cpp
-	C++
diff --git a/TAO/IIOP/test/Makefile b/TAO/IIOP/test/Makefile
deleted file mode 100644
index 3184ea5ecf4..00000000000
--- a/TAO/IIOP/test/Makefile
+++ /dev/null
@@ -1,121 +0,0 @@
-#----------------------------------------------------------------------------
-#	$Id$
-#
-#	Top-level Makefile for the ACE-ified Sun Ref. implementation
-#	of IIOP ORB
-#----------------------------------------------------------------------------
-
-#----------------------------------------------------------------------------
-#	Local macros
-#----------------------------------------------------------------------------
-
-LDLIBS     =  -lcorba
-
-PROG_SRCS =	svr.cpp clnt.cpp cubit.cpp \
-		test1.cpp test1_clnt.cpp test1_svr.cpp \
-		echo_clnt.cpp echo_svr.cpp
-
-LSRC = $(PROG_SRCS)
-
-CUBIT_SVR_OBJS = svr.o cubit_i.o cubitS.o
-CUBIT_CLT_OBJS = clnt.o cubitC.o
-
-BASIC_SVR_OBJS = test1.o test1_svr.o
-BASIC_CLT_OBJS = test1.o test1_clnt.o
-
-ECHO_SVR_OBJS = test1.o echo_svr.o
-ECHO_CLT_OBJS = test1.o echo_clnt.o
-
-BIN = svr clnt test1_svr test1_clnt
-BUILD = $(BIN)
-VLDLIBS = $(LDLIBS:%=%$(VAR))
-
-#----------------------------------------------------------------------------
-#	Include macros and targets
-#----------------------------------------------------------------------------
-
-include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-include $(ACE_ROOT)/include/makeinclude/macros.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
-
-# Local modifications to variables imported by includes above.
-LDFLAGS    += -L../proto/lib
-CPPFLAGS   += -I../proto/include -DUSE_ACE_EVENT_HANDLING -DDEBUG
-
-svr:	$(addprefix $(VDIR),$(CUBIT_SVR_OBJS))
-	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS)
-
-clnt:	$(addprefix $(VDIR),$(CUBIT_CLT_OBJS))
-	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS)
-
-test1_svr:	$(addprefix $(VDIR),$(BASIC_SVR_OBJS))
-	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS)
-
-test1_clnt:	$(addprefix $(VDIR),$(BASIC_CLT_OBJS))
-	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS)
-
-########
-# Sanity check builds by running basic functionality tests.
-#
-# "sleep 5" in the server startup is usually enough to get the
-# objref into the file so the client can read it.
-#
-check:	$(TESTS)
-	@echo "testing with 'cube' calls, stub + DII, IOR strings"
-	@./svr -i30 -o non-internet > obj.1 & sleep 5
-	@./clnt -n250 -O `cat obj.1` -x
-	@echo ''
-	@echo "testing request forwarding with 'cube' calls, stub + DII"
-	@./svr -f -i30 > obj.2 & sleep 5
-	@./clnt -n250 -O `cat obj.2` -x
-	@echo ''
-	@echo "testing transmission of primitive data types"
-	@./test1_svr -i30 > obj.3 & sleep 5
-	@./test1_clnt -n50 -O `cat obj.3` -x
-	@echo ''
-#	@echo "testing echo of primitive data values"
-#	@./echo_svr -i30 > obj.4 & sleep 5
-#	@./echo_clnt -O `cat obj.4` -x
-#	@echo ''
-	@echo "testing with 'cube' calls, MT-ized (no forwarding)"
-	@./svr -t -i30 -o non-internet > obj.5 & sleep 5
-	@./clnt -n250 -O `cat obj.5` -x
-	@echo ''
-
-ifdef LOCALRULES
-########
-# CUBIT test
-svr:		svr.o cubit.o
-	$(LINK.cc) -o svr svr.o cubit.o $(LDLIBS)
-clnt:		cubit.o clnt.o
-	$(LINK.cc) -o clnt clnt.o cubit.o $(LDLIBS)
-
-########
-# BASIC DATATYPES test
-test1_clnt:	test1.o test1_clnt.o
-	$(LINK.cc) -o test1_clnt test1_clnt.o test1.o $(LDLIBS)
-test1_svr:	test1.o test1_svr.o
-	$(LINK.cc) -o test1_svr test1_svr.o test1.o $(LDLIBS)
-
-########
-# ECHO test ... "test1" where the operation semantics are violated;
-# this aids some porting work, but is a less rigorous test
-echo_clnt:	test1.o echo_clnt.o
-	$(LINK.cc) -o echo_clnt echo_clnt.o test1.o $(LDLIBS)
-echo_svr:	test1.o echo_svr.o
-	$(LINK.cc) -o echo_svr echo_svr.o test1.o $(LDLIBS)
-endif
-
-clean:
-	-rm -rf *.o Log $(BIN) obj.* core Templates.DB .make.state
-
-install:
-	-@echo "Nothing to install, these are tests!"
-
-
-
-
-
diff --git a/TAO/IIOP/test/Orbeline/base_server/Makefile b/TAO/IIOP/test/Orbeline/base_server/Makefile
deleted file mode 100644
index 9fdad280ffc..00000000000
--- a/TAO/IIOP/test/Orbeline/base_server/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-include stdmk
-
-EXE = server 	
-
-all: $(EXE)
-
-clean:
-	-rm -f core *.o cubitC.* cubitS.* $(EXE) 
-	-rm -rf Templates.DB
-
-cubitS.cpp: cubit.idl
-	$(ORBCC) cubit.idl
-
-cubitC.cpp: cubit.idl
-	$(ORBCC) cubit.idl
-
-server: cubitS.o cubitC.o server.o Profile_Timer.o cubit_impl.o
-	$(CC) -o server cubitS.o cubitC.o cubit_impl.o server.o Profile_Timer.o \
-	$(LIBPATH) $(LIBORB) $(STDCC_LIBS)
diff --git a/TAO/IIOP/test/Orbeline/base_server/Profile_Timer.cpp b/TAO/IIOP/test/Orbeline/base_server/Profile_Timer.cpp
deleted file mode 100644
index a871b9cf179..00000000000
--- a/TAO/IIOP/test/Orbeline/base_server/Profile_Timer.cpp
+++ /dev/null
@@ -1,127 +0,0 @@
-#include "Profile_Timer.h"
-
-/* Initialize interval timer. */
-
-Profile_Timer::Profile_Timer (void)
-{
-  char buf[20];
-  ::sprintf(buf, "/proc/%d", ::getpid ());
-
-  ::memset (&this->end_usage_, 0, sizeof this->end_usage_);
-  ::memset (&this->begin_usage_, 0, sizeof this->begin_usage_);
-  ::memset (&this->last_usage_, 0, sizeof this->last_usage_);
-  if ((this->proc_fd_ = ::open (buf, O_RDONLY, 0)) == -1)
-    ::perror (buf);
-}
-
-/* Terminate the interval timer. */
-Profile_Timer::~Profile_Timer (void)
-{
-  if (::close (this->proc_fd_) == -1)
-    ::perror ("Profile_Timer::~Profile_Timer");
-}
-
-/* Return the resource utilization. */
-
-void
-Profile_Timer::get_rusage (prusage_t &rusage)
-{
-  rusage = this->end_usage_;
-}
-
-/* Compute the amount of resource utilization since the start time. */
-
-void
-Profile_Timer::elapsed_rusage (prusage_t &rusage)
-{
-  rusage.pr_lwpid = this->end_usage_.pr_lwpid - this->last_usage_.pr_lwpid;
-  rusage.pr_count = this->end_usage_.pr_count - this->last_usage_.pr_count;
-  rusage.pr_minf  = this->end_usage_.pr_minf - this->last_usage_.pr_minf;
-  rusage.pr_majf  = this->end_usage_.pr_majf - this->last_usage_.pr_majf;
-  rusage.pr_inblk = this->end_usage_.pr_inblk - this->last_usage_.pr_inblk;
-  rusage.pr_oublk = this->end_usage_.pr_oublk - this->last_usage_.pr_oublk;
-  rusage.pr_msnd  = this->end_usage_.pr_msnd - this->last_usage_.pr_msnd;
-  rusage.pr_mrcv  = this->end_usage_.pr_mrcv - this->last_usage_.pr_mrcv;
-  rusage.pr_sigs  = this->end_usage_.pr_sigs - this->last_usage_.pr_sigs;
-  this->subtract (rusage.pr_wtime, this->end_usage_.pr_wtime, this->last_usage_.pr_wtime);
-  this->subtract (rusage.pr_ltime, this->end_usage_.pr_ltime, this->last_usage_.pr_ltime);
-  this->subtract (rusage.pr_slptime, this->end_usage_.pr_slptime, this->last_usage_.pr_slptime);
-  rusage.pr_vctx  = this->end_usage_.pr_vctx - this->last_usage_.pr_vctx;
-  rusage.pr_ictx  = this->end_usage_.pr_ictx - this->last_usage_.pr_ictx;
-  rusage.pr_sysc  = this->end_usage_.pr_sysc - this->last_usage_.pr_sysc;
-  rusage.pr_ioch  = this->end_usage_.pr_ioch - this->last_usage_.pr_ioch;
-}
-
-/* Compute the elapsed time. */
-
-void
-Profile_Timer::compute_times (Elapsed_Time &et, prusage_t &end, prusage_t &begin)
-{
-  timespec_t td;
-
-  this->subtract (td, end.pr_tstamp, begin.pr_tstamp);
-  et.real_time = td.tv_sec + ((double) td.tv_nsec) / (1000 * 1000 * 1000);
-  this->subtract (td, end.pr_utime, begin.pr_utime);
-  et.user_time = td.tv_sec + ((double) td.tv_nsec) / (1000 * 1000 * 1000);
-  this->subtract (td, end.pr_stime,  begin.pr_stime);
-  et.system_time = td.tv_sec + ((double) td.tv_nsec) / (1000 * 1000 * 1000);
-}
-
-/* Compute the amount of time that has elapsed between start and stop. */
-
-int
-Profile_Timer::elapsed_time (Elapsed_Time &et)
-{
-  this->compute_times (et, this->end_usage_, this->begin_usage_);
-  return 0;
-}
-
-/* Determine the difference between T1 and T2. */
-
-void
-Profile_Timer::subtract (timespec_t &tdiff, timespec_t &t1, timespec_t &t0)
-{
-  tdiff.tv_sec  = t1.tv_sec - t0.tv_sec;
-  tdiff.tv_nsec = t1.tv_nsec - t0.tv_nsec;
-
-  /* Normalize the time. */
-
-  while (tdiff.tv_nsec < 0)
-    {
-      tdiff.tv_sec--;
-      tdiff.tv_nsec += (1000 * 1000 * 1000);
-    }
-}
-
-#if defined (DEBUG)
-#include <stdlib.h>
-extern "C" int gettimeofday (timeval *tp);
-
-const int DEFAULT_ITERATIONS = 1000000;
-
-int
-main (int argc, char *argv[])
-{
-  Profile_Timer timer;
-  int           iterations = argc > 1 ? atoi (argv[1]) : DEFAULT_ITERATIONS;
-  timeval	tv;
-
-  timer.start ();
-
-  for (int i = 0; i < iterations; i++)
-    gettimeofday (&tv);
-
-  timer.stop ();
-
-  Profile_Timer::Elapsed_Time et;
-
-  timer.elapsed_time (et);
-
-  printf ("iterations = %d\n", iterations);
-  printf ("real time = %f secs, user time = %f secs, system time = %f secs\n",
-	  et.real_time, et.user_time, et.system_time);
-
-  printf ("time per call = %f usecs\n", (et.real_time / double (iterations)) * 1000000);
-  return 0;
-}
-#endif /* DEBUG */
diff --git a/TAO/IIOP/test/Orbeline/base_server/Profile_Timer.h b/TAO/IIOP/test/Orbeline/base_server/Profile_Timer.h
deleted file mode 100644
index f001f59be9a..00000000000
--- a/TAO/IIOP/test/Orbeline/base_server/Profile_Timer.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/* -*- C++ -*- */
-/* An interval timer class using C++. */
-
-#if !defined (ACE_PROFILE_TIMER_H)
-#define ACE_PROFILE_TIMER_H
-
-#include <sys/types.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <sys/procfs.h>
-#include <stdio.h>
-#include <memory.h>
-
-class Profile_Timer
-{
-public:
-  struct Elapsed_Time
-    {
-      double real_time;
-      double user_time;
-      double system_time;
-    };
-
-  Profile_Timer (void);
-  ~Profile_Timer (void);
-  int  start (void);
-  int  stop (void);
-  int  elapsed_time (Elapsed_Time &et);
-  void elapsed_rusage (prusage_t &rusage);
-  void get_rusage (prusage_t &rusage);
-
-private:
-  void subtract (timespec_t &tdiff, timespec_t &t0, timespec_t &t1);
-  void compute_times (Elapsed_Time &et, prusage_t &, prusage_t &);
-
-  prusage_t begin_usage_;
-  prusage_t end_usage_;
-  prusage_t last_usage_;
-  int	    proc_fd_;
-};
-
-/* Start timing */
-
-inline int 
-Profile_Timer::start (void) 
-{
-  return ::ioctl (this->proc_fd_, PIOCUSAGE, &this->begin_usage_);
-}
-
-/* Stop timing */
-
-inline int 
-Profile_Timer::stop (void) 
-{
-  this->last_usage_ = this->end_usage_;
-  return ::ioctl (this->proc_fd_, PIOCUSAGE, &this->end_usage_);
-}
-
-#endif /* ACE_PROFILE_TIMER_H */
-
diff --git a/TAO/IIOP/test/Orbeline/base_server/cubit.idl b/TAO/IIOP/test/Orbeline/base_server/cubit.idl
deleted file mode 100644
index 3e2ea392619..00000000000
--- a/TAO/IIOP/test/Orbeline/base_server/cubit.idl
+++ /dev/null
@@ -1,40 +0,0 @@
-// @(#)cubit.idl	1.1 95/09/10
-// Copyright 1994-1995 by Sun Microsystems, Inc.
-//
-//#pragma prefix	"Eng.SUN.COM"
-//#pragma version Cubit 1.1
-
-interface Cubit {
-    octet	cube_octet (in octet o);
-    short	cube_short (in short s);
-    long	cube_long (in long l);
-
-    struct Many {
-	octet	o;		// + 3 bytes padding (normally) ...
-	long	l;
-	short	s;		// + 2 bytes padding (normally) ...
-    };
-
-    Many	cube_struct (in Many values);
-
-    enum discrim {e_0th, e_1st, e_2nd, e_3rd, e_4th, e_5th};
-
-    union oneof
-    switch (discrim) {
-	// this is an easy union to interpret; no padding
-	// is needed between discriminant and value.
-      case e_0th:
-        octet		o;
-      case e_1st:
-        short		s;
-      case e_2nd:
-        long		l;
-      case e_3rd:
-      default:
-        Many		cm;
-    };
-
-    oneof	cube_union (in oneof values);
-
-    oneway void	please_exit ();
-};
diff --git a/TAO/IIOP/test/Orbeline/base_server/cubit_impl.cpp b/TAO/IIOP/test/Orbeline/base_server/cubit_impl.cpp
deleted file mode 100644
index 63c0bb3105f..00000000000
--- a/TAO/IIOP/test/Orbeline/base_server/cubit_impl.cpp
+++ /dev/null
@@ -1,46 +0,0 @@
-#include "cubit_impl.h"
-
-CORBA::Octet Cubit_Impl:: cube_octet (CORBA::Octet o) {
-  return (CORBA::Octet) (o * o * o); 
-}
-
-CORBA::Short Cubit_Impl:: cube_short (CORBA::Short s) {
-  return (CORBA::Short) (s * s * s);
-}
-
-CORBA::Long Cubit_Impl:: cube_long (CORBA::Long l) {
-   return (CORBA::Long) (l * l * l);
-}
-
-Cubit::Many Cubit_Impl:: cube_struct (const Cubit::Many& values) {
-  Cubit::Many out_values;
-  out_values.o = values.o * values.o * values.o;
-  out_values.s = values.s * values.s * values.s;
-  out_values.l = values.l * values.l * values.l;
-  return out_values; 
-}
-
-Cubit::oneof Cubit_Impl:: cube_union (const Cubit::oneof& values) {
-  Cubit::oneof out_values;
-   switch (values._d ()) {
-   case Cubit::e_0th:
-     out_values.o (values.o () * values.o ()  * values.o ());
-     break;
-   case Cubit::e_1st:
-     out_values.s (values.s () * values.s () * values.s ());
-     break;
-   case Cubit::e_2nd:
-     out_values.l (values.l () * values.l () * values.l ());
-     break;
-   case Cubit::e_3rd:
-   default:
-     out_values.cm ().o = values.cm ().o * values.cm ().o * values.cm ().o ;
-     out_values.cm ().s = values.cm ().s * values.cm ().s * values.cm ().s ;
-     out_values.cm ().l = values.cm ().l * values.cm ().l * values.cm ().l ;
-     break;
-   }
-   return out_values;  
-}
-
-void Cubit_Impl:: please_exit () 
-  {}
diff --git a/TAO/IIOP/test/Orbeline/base_server/cubit_impl.h b/TAO/IIOP/test/Orbeline/base_server/cubit_impl.h
deleted file mode 100644
index 0f6fd7dd6db..00000000000
--- a/TAO/IIOP/test/Orbeline/base_server/cubit_impl.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-#ifndef cubit_ih
-#define cubit_ih
-
-#include "cubitS.h"
-
-
-#ifdef Cubit_USE_BOA
-class Cubit_Impl : public virtual _sk_Cubit {
-#else
-class Cubit_Impl {
-#endif /* Cubit_USE_BOA */
-
-public:
-
-#ifdef Cubit_USE_BOA
-  Cubit_Impl (const char *obj_name = NULL) :
-             _sk_Cubit(obj_name)
-    {}
-#else
-  Cubit_Impl (const char *obj_name = NULL)
-    {}
-#endif /* Cubit_USE_BOA */
-
-   virtual CORBA::Octet cube_octet(CORBA::Octet o);
-   virtual CORBA::Short cube_short(CORBA::Short s);
-   virtual CORBA::Long cube_long(CORBA::Long l);
-   virtual Cubit::Many cube_struct(const Cubit::Many& values);
-   virtual Cubit::oneof cube_union(const Cubit::oneof& values);
-   virtual void please_exit();
-};
-
-#endif
diff --git a/TAO/IIOP/test/Orbeline/base_server/server.cpp b/TAO/IIOP/test/Orbeline/base_server/server.cpp
deleted file mode 100644
index a4a1c85ed47..00000000000
--- a/TAO/IIOP/test/Orbeline/base_server/server.cpp
+++ /dev/null
@@ -1,49 +0,0 @@
-//**************************************************************************
-//
-// NAME :   tpr_server.cpp 
-// DESCRIPTION:  
-//
-// Server mainline
-//
-//****************************************************************************
-#include "cubit_impl.h"		// server header file
-
-int 
-main (int argc, char** argv)
-{
-
-  CORBA::ORB_var orb = CORBA::ORB_init(argc, argv);
-  CORBA::BOA_var boa = orb->BOA_init(argc, argv);
-
-#ifdef Cubit_USE_BOA
-  Cubit_Impl cb("Cubit");
-  cout << "Using BOA approach" << endl;
-#else
-  Cubit_Impl tied("Cubit");
-  _tie_Cubit<Cubit_Impl> cb(tied, "Cubit");
-
-  cout << "Using TIE approach" << endl;
-#endif /* Cubit_USE_BOA */
-  
-  //
-  // Go get some work to do....
-  //
-  try {
-
-    boa->obj_is_ready(&cb);
-
-    boa->impl_is_ready();
-
-  } catch (const CORBA::Exception &excep) {
-    cerr << "Server error: " << excep << endl;
-    return -1;
-  } catch (...) {
-    cerr << "Unknown exception" << endl;
-    return -1;
-  }
-
-  cout << "Cubit server is exiting." << endl;
-
-
-  return 0;
-}
diff --git a/TAO/IIOP/test/Orbeline/base_server/stdmk b/TAO/IIOP/test/Orbeline/base_server/stdmk
deleted file mode 100644
index df4125a38d8..00000000000
--- a/TAO/IIOP/test/Orbeline/base_server/stdmk
+++ /dev/null
@@ -1,36 +0,0 @@
-CC = CC
-DEBUG = 
-
-ORBELINEDIR = /project/waltz/Orbeline2.0
-
-ORBCC = $(ORBELINEDIR)/bin/orbeline -v C -m S -c cpp -h h
-
-CCINCLUDES = -I. -I$(ORBELINEDIR)/include -I$(STL_DIR) -I$(ACE_DIR)
-
-CCFLAGS = -g $(CCINCLUDES) $(DEBUG) -DCubit_USE_BOA
-
-LIBPATH = -L$(ORBELINEDIR)/lib -L$(ACE_DIR)/ace
-
-STDCC_LIBS = -lsocket -lnsl -ldl -mt 
-
-LIBORB = -lorb
-
-LIBACE = -lACE
-
-.SUFFIXES: .C .o .h .hh .cc .cpp
-
-.C.o:
-	$(CC) $(CCFLAGS) -c -o $@ $<
- 
-.cc.o:
-	$(CC) $(CCFLAGS) -c -o $@ $<
-.cpp.o:
-	$(CC) $(CCFLAGS) -c -o $@ $<
- 
-.C.cpp:
-	$(CC) -E $(CCFLAGS) $< > $@
- 
-.cc.cpp:
-	$(CC) -E $(CCFLAGS) $< > $@
-
-
diff --git a/TAO/IIOP/test/Orbeline/client/Makefile b/TAO/IIOP/test/Orbeline/client/Makefile
deleted file mode 100644
index d9c26fe56f0..00000000000
--- a/TAO/IIOP/test/Orbeline/client/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-include stdmk
-
-EXE = client 	
-
-all: $(EXE)
-
-clean:
-	-rm -f core *.o cubitC.* cubitS.* $(EXE) 
-	-rm -rf Templates.DB
-
-cubitS.cpp: cubit.idl
-	$(ORBCC) cubit.idl
-
-cubitC.cpp: cubit.idl
-	$(ORBCC) cubit.idl
-
-client: cubitC.o Profile_Timer.o client.o
-	$(CC) -o client cubitC.o Profile_Timer.o client.o \
-	$(LIBPATH) $(LIBORB) $(STDCC_LIBS)
diff --git a/TAO/IIOP/test/Orbeline/client/Profile_Timer.cpp b/TAO/IIOP/test/Orbeline/client/Profile_Timer.cpp
deleted file mode 100644
index a871b9cf179..00000000000
--- a/TAO/IIOP/test/Orbeline/client/Profile_Timer.cpp
+++ /dev/null
@@ -1,127 +0,0 @@
-#include "Profile_Timer.h"
-
-/* Initialize interval timer. */
-
-Profile_Timer::Profile_Timer (void)
-{
-  char buf[20];
-  ::sprintf(buf, "/proc/%d", ::getpid ());
-
-  ::memset (&this->end_usage_, 0, sizeof this->end_usage_);
-  ::memset (&this->begin_usage_, 0, sizeof this->begin_usage_);
-  ::memset (&this->last_usage_, 0, sizeof this->last_usage_);
-  if ((this->proc_fd_ = ::open (buf, O_RDONLY, 0)) == -1)
-    ::perror (buf);
-}
-
-/* Terminate the interval timer. */
-Profile_Timer::~Profile_Timer (void)
-{
-  if (::close (this->proc_fd_) == -1)
-    ::perror ("Profile_Timer::~Profile_Timer");
-}
-
-/* Return the resource utilization. */
-
-void
-Profile_Timer::get_rusage (prusage_t &rusage)
-{
-  rusage = this->end_usage_;
-}
-
-/* Compute the amount of resource utilization since the start time. */
-
-void
-Profile_Timer::elapsed_rusage (prusage_t &rusage)
-{
-  rusage.pr_lwpid = this->end_usage_.pr_lwpid - this->last_usage_.pr_lwpid;
-  rusage.pr_count = this->end_usage_.pr_count - this->last_usage_.pr_count;
-  rusage.pr_minf  = this->end_usage_.pr_minf - this->last_usage_.pr_minf;
-  rusage.pr_majf  = this->end_usage_.pr_majf - this->last_usage_.pr_majf;
-  rusage.pr_inblk = this->end_usage_.pr_inblk - this->last_usage_.pr_inblk;
-  rusage.pr_oublk = this->end_usage_.pr_oublk - this->last_usage_.pr_oublk;
-  rusage.pr_msnd  = this->end_usage_.pr_msnd - this->last_usage_.pr_msnd;
-  rusage.pr_mrcv  = this->end_usage_.pr_mrcv - this->last_usage_.pr_mrcv;
-  rusage.pr_sigs  = this->end_usage_.pr_sigs - this->last_usage_.pr_sigs;
-  this->subtract (rusage.pr_wtime, this->end_usage_.pr_wtime, this->last_usage_.pr_wtime);
-  this->subtract (rusage.pr_ltime, this->end_usage_.pr_ltime, this->last_usage_.pr_ltime);
-  this->subtract (rusage.pr_slptime, this->end_usage_.pr_slptime, this->last_usage_.pr_slptime);
-  rusage.pr_vctx  = this->end_usage_.pr_vctx - this->last_usage_.pr_vctx;
-  rusage.pr_ictx  = this->end_usage_.pr_ictx - this->last_usage_.pr_ictx;
-  rusage.pr_sysc  = this->end_usage_.pr_sysc - this->last_usage_.pr_sysc;
-  rusage.pr_ioch  = this->end_usage_.pr_ioch - this->last_usage_.pr_ioch;
-}
-
-/* Compute the elapsed time. */
-
-void
-Profile_Timer::compute_times (Elapsed_Time &et, prusage_t &end, prusage_t &begin)
-{
-  timespec_t td;
-
-  this->subtract (td, end.pr_tstamp, begin.pr_tstamp);
-  et.real_time = td.tv_sec + ((double) td.tv_nsec) / (1000 * 1000 * 1000);
-  this->subtract (td, end.pr_utime, begin.pr_utime);
-  et.user_time = td.tv_sec + ((double) td.tv_nsec) / (1000 * 1000 * 1000);
-  this->subtract (td, end.pr_stime,  begin.pr_stime);
-  et.system_time = td.tv_sec + ((double) td.tv_nsec) / (1000 * 1000 * 1000);
-}
-
-/* Compute the amount of time that has elapsed between start and stop. */
-
-int
-Profile_Timer::elapsed_time (Elapsed_Time &et)
-{
-  this->compute_times (et, this->end_usage_, this->begin_usage_);
-  return 0;
-}
-
-/* Determine the difference between T1 and T2. */
-
-void
-Profile_Timer::subtract (timespec_t &tdiff, timespec_t &t1, timespec_t &t0)
-{
-  tdiff.tv_sec  = t1.tv_sec - t0.tv_sec;
-  tdiff.tv_nsec = t1.tv_nsec - t0.tv_nsec;
-
-  /* Normalize the time. */
-
-  while (tdiff.tv_nsec < 0)
-    {
-      tdiff.tv_sec--;
-      tdiff.tv_nsec += (1000 * 1000 * 1000);
-    }
-}
-
-#if defined (DEBUG)
-#include <stdlib.h>
-extern "C" int gettimeofday (timeval *tp);
-
-const int DEFAULT_ITERATIONS = 1000000;
-
-int
-main (int argc, char *argv[])
-{
-  Profile_Timer timer;
-  int           iterations = argc > 1 ? atoi (argv[1]) : DEFAULT_ITERATIONS;
-  timeval	tv;
-
-  timer.start ();
-
-  for (int i = 0; i < iterations; i++)
-    gettimeofday (&tv);
-
-  timer.stop ();
-
-  Profile_Timer::Elapsed_Time et;
-
-  timer.elapsed_time (et);
-
-  printf ("iterations = %d\n", iterations);
-  printf ("real time = %f secs, user time = %f secs, system time = %f secs\n",
-	  et.real_time, et.user_time, et.system_time);
-
-  printf ("time per call = %f usecs\n", (et.real_time / double (iterations)) * 1000000);
-  return 0;
-}
-#endif /* DEBUG */
diff --git a/TAO/IIOP/test/Orbeline/client/Profile_Timer.h b/TAO/IIOP/test/Orbeline/client/Profile_Timer.h
deleted file mode 100644
index f001f59be9a..00000000000
--- a/TAO/IIOP/test/Orbeline/client/Profile_Timer.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/* -*- C++ -*- */
-/* An interval timer class using C++. */
-
-#if !defined (ACE_PROFILE_TIMER_H)
-#define ACE_PROFILE_TIMER_H
-
-#include <sys/types.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <sys/procfs.h>
-#include <stdio.h>
-#include <memory.h>
-
-class Profile_Timer
-{
-public:
-  struct Elapsed_Time
-    {
-      double real_time;
-      double user_time;
-      double system_time;
-    };
-
-  Profile_Timer (void);
-  ~Profile_Timer (void);
-  int  start (void);
-  int  stop (void);
-  int  elapsed_time (Elapsed_Time &et);
-  void elapsed_rusage (prusage_t &rusage);
-  void get_rusage (prusage_t &rusage);
-
-private:
-  void subtract (timespec_t &tdiff, timespec_t &t0, timespec_t &t1);
-  void compute_times (Elapsed_Time &et, prusage_t &, prusage_t &);
-
-  prusage_t begin_usage_;
-  prusage_t end_usage_;
-  prusage_t last_usage_;
-  int	    proc_fd_;
-};
-
-/* Start timing */
-
-inline int 
-Profile_Timer::start (void) 
-{
-  return ::ioctl (this->proc_fd_, PIOCUSAGE, &this->begin_usage_);
-}
-
-/* Stop timing */
-
-inline int 
-Profile_Timer::stop (void) 
-{
-  this->last_usage_ = this->end_usage_;
-  return ::ioctl (this->proc_fd_, PIOCUSAGE, &this->end_usage_);
-}
-
-#endif /* ACE_PROFILE_TIMER_H */
-
diff --git a/TAO/IIOP/test/Orbeline/client/client.cpp b/TAO/IIOP/test/Orbeline/client/client.cpp
deleted file mode 100644
index c2b1d4070ae..00000000000
--- a/TAO/IIOP/test/Orbeline/client/client.cpp
+++ /dev/null
@@ -1,230 +0,0 @@
-//**************************************************************************
-//
-// NAME :   client.C 
-// DESCRIPTION:  
-//
-// Client for the Cubit example
-//
-//****************************************************************************
-
-#include <iostream.h>
-#include <stdio.h>
-#include <string.h>
-#include <time.h>
-#include <stdlib.h>
-#include "cubitC.h"
-#include "Profile_Timer.h"
-
-int LOOP_COUNT;
-char SERVER_HOST [1024];
-
-inline int func (unsigned i) { return i - 117; }
-void run_tests (Cubit_var, int);
-
-// = TITLE
-//     Parses the command line arguments and returns an error status
-//
-// = DESCRIPTION
-//     This method parses the command line arguments
-int parse_args(int argc, char *argv[])
-{
-  if (argc != 3) {
-    cerr << "Format: client <machine name> <loop count>" << endl;
-    return -1;
-  }
-
-  strcpy(SERVER_HOST, argv[1]);
-
-  LOOP_COUNT = atoi(argv[2]);
-  
-  return 0;  // Indicates successful parsing of command line
-}
-
-
-//
-// Mainline
-//
-int
-main (int argc, char *argv[])
-{
-  if (parse_args (argc, argv) != 0)
-    return -1;
-
-  Cubit_var cb;
-  // cout << "attempting to contact server at host " << SERVER_HOST << '\n' ;
- 
-  //
-  // Initialise client's binding to an
-  // arbitrary cubit server (at some host)
-  // 
-  try {
-    cb = Cubit::_bind ("Cubit", SERVER_HOST);
-
-  } catch (const CORBA::Exception & sysEx) {
-    cerr << "Binding failed: " << endl;
-    cerr << sysEx;
-  } catch (...) {
-    cerr << "Unexpected exception" << endl;
-  }       
-  
-  run_tests (cb, LOOP_COUNT);
-  return 0;
-}
-
-
-void
-run_tests (Cubit_var cb, int loop_count) 
-{
-    //
-  // Make the calls in a loop.
-  //
-  unsigned i;
-  unsigned call_count, error_count;
-
-  call_count = 0;
-  error_count = 0;
-
-  Profile_Timer pt;
-
-  pt.start();
-  //
-  // Cube an octet.
-  //
-  
-  for (i = 0; i < loop_count; i++)
-    {
-
-      call_count++;
-
-      CORBA::Octet arg_octet = func (i), ret_octet;
-
-      try {
-	ret_octet = cb->cube_octet (arg_octet);
-      
-      } catch (const CORBA::Exception &sysEx) {
-	cerr << "Call failed: " << endl;
-	cerr << sysEx;
-	error_count++;
-      } catch (...) {
-	cerr << "Unexpected exception" << endl;
-	error_count++;
-      }       
-
-      arg_octet = arg_octet * arg_octet * arg_octet;
-      if (arg_octet != ret_octet) {
-        printf ("** cube_octet(%d)  (--> %d)\n", arg_octet , ret_octet);
-        error_count++;
-      }
-    
-  
-  //
-  // Cube a short.
-  //
-      call_count++;
-
-      CORBA::Short arg_short = func (i), ret_short;
-
-      try {
-	ret_short = cb->cube_short (arg_short);
-       
-      } catch (const CORBA::Exception &sysEx) {
-	cerr << "Call failed: " << endl;
-	cerr << sysEx;
-	error_count++;
-      } catch (...) {
-	cerr << "Unexpected exception" << endl;
-	error_count++;
-      }       
-
-      arg_short = arg_short * arg_short * arg_short;
-      if (arg_short != ret_short) {
-        printf ("** cube_short(%d)  (--> %d)\n", arg_short , ret_short);
-        error_count++;
-      }
-
-  //
-  // Cube a long.
-  //
-  
-      call_count++;
-
-      CORBA::Long arg_long = func (i), ret_long;
-
-      try {
-	ret_long = cb->cube_long (arg_long);
-      } catch (const CORBA::Exception &sysEx) {
-	cerr << "Call failed: " << endl;
-	cerr << sysEx;
-	error_count++;
-      } catch (...) {
-	cerr << "Unexpected exception" << endl;
-	error_count++;
-      }       
-
-      arg_long = arg_long * arg_long * arg_long;
-      if (arg_long != ret_long) {
-        printf ("** cube_long(%d)  (--> %d)\n", arg_long , ret_long);
-        error_count++;
-      }
-
-
-      //
-      // Cube a "struct" ...
-      //
-      Cubit::Many	arg_struct, ret_struct;
-      
-       call_count++;
-       
-       arg_struct.l = func (i);
-       arg_struct.s = func (i);
-       arg_struct.o = func (i);
-       
-       try {
-         ret_struct = cb->cube_struct (arg_struct);
-
-       } catch (const CORBA::Exception &sysEx) {
-	 cerr << "Call failed: " << endl;
-	 cerr << sysEx;
-	 error_count++;
-       } catch (...) {
-	 cerr << "Unexpected exception" << endl;
-	 error_count++;
-       }       
-
-
-       arg_struct.l = arg_struct.l  * arg_struct.l  * arg_struct.l ;
-       arg_struct.s = arg_struct.s  * arg_struct.s  * arg_struct.s ;
-       arg_struct.o = arg_struct.o  * arg_struct.o  * arg_struct.o ;
-       
-       if (arg_struct.l  != ret_struct.l 
-           || arg_struct.s  != ret_struct.s 
-           || arg_struct.o  != ret_struct.o )
-         {
-           cerr << "** cube_struct ERROR\n";
-           error_count++;
-         }
-    }
-    
-  pt.stop();
-
-  Elapsed_Time et;
-  pt.elapsed_time(et);
-  
-  if (call_count > 0) 
-    {
-      if (error_count == 0)
-        {
-          unsigned long	us = et.real_time * 1000 * 1000;
-          
-          us /= call_count;
-          
-          if (us > 0)
-            printf ("cube average call ACE_OS::time\t= %ld.%.03ldms, \t"
-                            "%ld calls/second\n",
-                            us / 1000, us % 1000,
-                            1000000L / us);
-        }
-      
-      printf ("%d calls, %d errors\n", call_count, error_count);
-    }
-}
diff --git a/TAO/IIOP/test/Orbeline/client/cubit.idl b/TAO/IIOP/test/Orbeline/client/cubit.idl
deleted file mode 100644
index 3e2ea392619..00000000000
--- a/TAO/IIOP/test/Orbeline/client/cubit.idl
+++ /dev/null
@@ -1,40 +0,0 @@
-// @(#)cubit.idl	1.1 95/09/10
-// Copyright 1994-1995 by Sun Microsystems, Inc.
-//
-//#pragma prefix	"Eng.SUN.COM"
-//#pragma version Cubit 1.1
-
-interface Cubit {
-    octet	cube_octet (in octet o);
-    short	cube_short (in short s);
-    long	cube_long (in long l);
-
-    struct Many {
-	octet	o;		// + 3 bytes padding (normally) ...
-	long	l;
-	short	s;		// + 2 bytes padding (normally) ...
-    };
-
-    Many	cube_struct (in Many values);
-
-    enum discrim {e_0th, e_1st, e_2nd, e_3rd, e_4th, e_5th};
-
-    union oneof
-    switch (discrim) {
-	// this is an easy union to interpret; no padding
-	// is needed between discriminant and value.
-      case e_0th:
-        octet		o;
-      case e_1st:
-        short		s;
-      case e_2nd:
-        long		l;
-      case e_3rd:
-      default:
-        Many		cm;
-    };
-
-    oneof	cube_union (in oneof values);
-
-    oneway void	please_exit ();
-};
diff --git a/TAO/IIOP/test/Orbeline/client/stdmk b/TAO/IIOP/test/Orbeline/client/stdmk
deleted file mode 100644
index df4125a38d8..00000000000
--- a/TAO/IIOP/test/Orbeline/client/stdmk
+++ /dev/null
@@ -1,36 +0,0 @@
-CC = CC
-DEBUG = 
-
-ORBELINEDIR = /project/waltz/Orbeline2.0
-
-ORBCC = $(ORBELINEDIR)/bin/orbeline -v C -m S -c cpp -h h
-
-CCINCLUDES = -I. -I$(ORBELINEDIR)/include -I$(STL_DIR) -I$(ACE_DIR)
-
-CCFLAGS = -g $(CCINCLUDES) $(DEBUG) -DCubit_USE_BOA
-
-LIBPATH = -L$(ORBELINEDIR)/lib -L$(ACE_DIR)/ace
-
-STDCC_LIBS = -lsocket -lnsl -ldl -mt 
-
-LIBORB = -lorb
-
-LIBACE = -lACE
-
-.SUFFIXES: .C .o .h .hh .cc .cpp
-
-.C.o:
-	$(CC) $(CCFLAGS) -c -o $@ $<
- 
-.cc.o:
-	$(CC) $(CCFLAGS) -c -o $@ $<
-.cpp.o:
-	$(CC) $(CCFLAGS) -c -o $@ $<
- 
-.C.cpp:
-	$(CC) -E $(CCFLAGS) $< > $@
- 
-.cc.cpp:
-	$(CC) -E $(CCFLAGS) $< > $@
-
-
diff --git a/TAO/IIOP/test/Orbix/Makefile b/TAO/IIOP/test/Orbix/Makefile
deleted file mode 100644
index 96935fb78fc..00000000000
--- a/TAO/IIOP/test/Orbix/Makefile
+++ /dev/null
@@ -1,28 +0,0 @@
-#----------------------------------------------------------------------------
-#	@(#)Makefile	1.1	10/18/96
-#
-#	Makefile for the Gateway application
-#----------------------------------------------------------------------------
-
-#----------------------------------------------------------------------------
-#	Local macros
-#----------------------------------------------------------------------------
-
-INFO  = README
-
-DIRS  =	base_server \
-	client \
-	tpr \
-	tpool \
-	tps
-
-#----------------------------------------------------------------------------
-#	Include macros and targets
-#----------------------------------------------------------------------------
-
-include	$(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-include	$(ACE_ROOT)/include/makeinclude/macros.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.common.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.nested.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.nolocal.GNU
-
diff --git a/TAO/IIOP/test/Orbix/base_server/Makefile b/TAO/IIOP/test/Orbix/base_server/Makefile
deleted file mode 100644
index dc3604d3f35..00000000000
--- a/TAO/IIOP/test/Orbix/base_server/Makefile
+++ /dev/null
@@ -1,89 +0,0 @@
-#----------------------------------------------------------------------------
-#	@(#)Makefile	1.1	10/18/96
-#
-#	Makefile for the ACE_MT_CORBA_Handler tests
-#----------------------------------------------------------------------------
-
-#----------------------------------------------------------------------------
-#	Local macros
-#----------------------------------------------------------------------------
-
-SRC = cubitS.cpp cubit_impl.cpp server.cpp
-
-SVR_OBJS = cubitS.o cubit_impl.o server.o
-
-LDLIBS	 = 
-
-VLDLIBS	 = $(LDLIBS:%=%$(VAR))
-
-#----------------------------------------------------------------------------
-#	Include macros and targets
-#----------------------------------------------------------------------------
-
-include		$(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-include		$(ACE_ROOT)/include/makeinclude/macros.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.common.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.lib.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.bin.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
-
-#----------------------------------------------------------------------------
-#	Orbix related macros and target settings.
-#----------------------------------------------------------------------------
-
-
-ORBIX_BINDIR    = $(ORBIX_ROOT)/bin
-ORBIX_LIBDIR    = $(ORBIX_ROOT)/corba2/lib
-ORBIX_INCDIR    = $(ORBIX_ROOT)/corba2/include
-
-# Remove -DCubit_USE_BOA from below to use the TIE approach
-
-CPPFLAGS += -DEXCEPTIONS -I$(ORBIX_INCDIR) -DWANT_ORBIX_FDS -DCubit_USE_BOA
-LDFLAGS  += -L$(ORBIX_LIBDIR) -R $(ORBIX_LIBDIR) -L$(ACE)/ace
-
-IDLFLAGS = -s S.cpp -c C.cpp -B
-
-#----------------------------------------------------------------------------
-#	Local targets
-#----------------------------------------------------------------------------
-
-all: server
-
-server: $(addprefix $(VDIR),$(SVR_OBJS))
-	$(LINK.cc) -o server $(addprefix $(VDIR),$(SVR_OBJS)) $(LDFLAGS) $(ITIIOP) $(ITSRV) $(VLDLIBS)
-
-#----------------------------------------------------------------------------
-#	Dependencies
-#----------------------------------------------------------------------------
-# DO NOT DELETE THIS LINE -- g++dep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-
-.obj/cubit_impl.o .shobj/cubit_impl.so: cubit_impl.cpp cubit_impl.h cubit.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/config-sunos5.5-sunc++-4.x.h \
- $(ACE_ROOT)/ace/stdcpp.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i
-.obj/server.o .shobj/server.so: server.cpp cubit_impl.h cubit.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/config-sunos5.5-sunc++-4.x.h \
- $(ACE_ROOT)/ace/stdcpp.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i
-
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/IIOP/test/Orbix/base_server/cubit.h b/TAO/IIOP/test/Orbix/base_server/cubit.h
deleted file mode 100644
index 1c868a6597d..00000000000
--- a/TAO/IIOP/test/Orbix/base_server/cubit.h
+++ /dev/null
@@ -1,727 +0,0 @@
-
-#ifndef cubit_hh
-#define cubit_hh
-
-#include "ace/OS.h"
-#include <CORBA.h>
-
-
-#ifndef _Cubit_defined
-#define _Cubit_defined
-class Cubit_dispatch : public virtual CORBA::PPTR {
-public:
-
-      Cubit_dispatch (void *IT_p, CORBA::Object* IT_o, const char *IT_m, 
-        CORBA::LoaderClass *IT_l, char *IT_i, void* IT_im)
-       : PPTR (IT_p,IT_o,IT_m,IT_l,IT_i,IT_im) {}
-
-
-   Cubit_dispatch (char *IT_OR, void *IT_p, CORBA::Object *IT_o)
-       : PPTR (IT_OR,IT_p,IT_o) {}
-
-
-   Cubit_dispatch () {}
-
-   Cubit_dispatch (ObjectReference *IT_OR, void *IT_p, CORBA::Object *IT_o)
-       : PPTR (IT_OR,IT_p,IT_o) {}
-
-
-   Cubit_dispatch (void *IT_p, CORBA::Object *IT_o, const char *IT_m, 
-        char *IT_i, CORBA::Object* IT_ob, void* IT_im)
-       : PPTR (IT_p,IT_o,IT_m,IT_i,IT_ob,IT_im) {}
-
-
-   virtual unsigned char dispatch (CORBA::Request &IT_r, 
-        unsigned char IT_isTarget, void* IT_pp=NULL);
-
-
-};
-
-class Cubit;
-
-#ifndef CubitPtr
-#define CubitPtr
-
-typedef Cubit* Cubit_ptr;
-
-typedef Cubit* CubitRef;
-
-#endif
-
-
-#ifndef CubitForwH
-#define CubitForwH
-CORBA::ObjectRef Cubit_getBase (void *);
-void Cubit_release (Cubit *, CORBA::Environment &IT_env);
-void Cubit_release (Cubit_ptr);
-Cubit* Cubit_duplicate (Cubit_ptr, CORBA::Environment &IT_env);
-Cubit* Cubit_duplicate (Cubit_ptr );
-Cubit_ptr Cubit_nil (CORBA::Environment &IT_env);
-Cubit_ptr Cubit_nil ();
-#endif
-#define Cubit_IMPL "Cubit"
-
-
-class Cubit;
-
-typedef Cubit CubitProxy;
-#define Cubit_IR "Cubit$v1.1"
-#define Cubit_IMPL "Cubit"
-
-#ifndef CubitPtr
-#define CubitPtr
-
-typedef Cubit* Cubit_ptr;
-
-typedef Cubit* CubitRef;
-
-#endif
-
-class Cubit: public virtual CORBA::Object  {
-public:
-        Cubit (char *IT_OR);
-    Cubit (ObjectReference *IT_OR);
-    Cubit () : CORBA::Object  (1) {}
-protected:
-    Cubit_ptr __duplicate(
-            CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) {
-       CORBA::Object::__duplicate (IT_env);
-       return this;
-    }
-public:
-    static Cubit_ptr _duplicate(
-            Cubit_ptr, 
-            CORBA::Environment &IT_pEnv=CORBA::IT_chooseDefaultEnv ());
-public:
-   static Cubit* _bind (const char* IT_markerServer, const char* host,
-		const CORBA::Context &IT_c, 
-		CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-   static Cubit* _bind (CORBA::Environment &IT_env);
-   static Cubit* _bind (const char* IT_markerServer=NULL, const char* host=NULL,
-                 CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-    static Cubit* _narrow (CORBA::Object* , CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-    static Cubit_ptr _nil (CORBA::Environment &IT_pEnv=CORBA::IT_chooseDefaultEnv ()) {
-        CORBA::EnvExcRaiser IT_raise;
-        CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-        return (Cubit_ptr) CORBA::OBJECT_NIL;}
-
-#ifndef Cubit_Many_defined
-#define Cubit_Many_defined
-
-struct Many {
-    CORBA::Octet o;
-    CORBA::Long l;
-    CORBA::Short s;
-
-    void encodeOp (CORBA::Request &IT_r) const;
-    void decodeOp (CORBA::Request &IT_r);
-    void decodeInOutOp (CORBA::Request &IT_r);
-    Many(const Many &);
-    Many();
-    ~Many();
-    Many& operator= (const Many&);
-};
-
-#ifndef Cubit_ManyVarH
-#define Cubit_ManyVarH
-
-#ifndef Cubit_ManyvPtr
-#define Cubit_ManyvPtr
-typedef Many* Many_vPtr;
-typedef const Many* Many_cvPtr;
-#endif
-
-class Many_var : public CORBA::_var
-{
-    private:
-
-    unsigned char copyHelper (const Many_var &IT_s) {
-        if (!IT_s._ptr) {
-            _ptr = IT_s._ptr;
-        } else
-        {
-            _ptr = new Many;
-            *(_ptr) =  *(IT_s._ptr);
-        }
-        return 1;
-    }
-
-    public:
-
-    Many_var (const Many_var &IT_s) {
-        (void) copyHelper (IT_s);
-    }
-
-    Many_var () {
-        _ptr =  new Many;
-;
-    }
-
-    Many_var (Many *IT_p) {
-        _ptr = IT_p;
-    }
-
-    Many_var &operator= (Many *IT_p) {
-        if (_ptr != IT_p) {
-            delete _ptr;
-        }
-        _ptr = IT_p;
-        return (*this);
-    }
-
-    Many_var &operator= (const Many_var &IT_s) {
-        if (_ptr != IT_s._ptr) {
-            delete _ptr;
-        }
-        _ptr = new Many;
-        *(_ptr) =  *(IT_s._ptr);
-        return (*this);
-    }
-
-    ~Many_var () {
-        delete _ptr;
-    }
-
-    Many* operator-> () {
-        return _ptr;
-    }
-
-    operator Many_cvPtr () const { return _ptr;}
-    operator Many_vPtr& () { return _ptr;}
-    operator Many& () const { return * _ptr;}
-
-    protected:
-    Many *_ptr;
-    private:
-    Many_var &operator= (const CORBA::_var &IT_s);
-    Many_var (const CORBA::_var &IT_s);
-};
-
-#endif
-
-
-#endif
-
-enum discrim {e_0th,e_1st,e_2nd,e_3rd,e_4th,e_5th, IT__ENUM_Cubit_discrim=CORBA_ULONG_MAX};
-
-#ifndef Cubit_oneof_defined
-#define Cubit_oneof_defined
-
-struct oneof {
-    private:
-
-    discrim __d;
-    union {
-        CORBA::Octet _o_;
-        CORBA::Short _s_;
-        CORBA::Long _l_;
-        Many * _cm_;
-    };
-
-    public:
-
-    void encodeOp (CORBA::Request &IT_r) const;
-    void decodeOp (CORBA::Request &IT_r);
-    void decodeInOutOp (CORBA::Request &IT_r);
-
-    private:
-
-    unsigned char isSet;
-
-    public:
-
-    discrim _d () const { return __d; }
-
-    CORBA::Octet o () const {
-      return _o_;
-    }
-
-    void o (CORBA::Octet IT_member) {
-        if (isSet && (__d != Cubit::e_0th))
-        {
-            this-> oneof::~oneof();
-            memset(this, 0, sizeof(*this));
-        }
-
-        __d = Cubit::e_0th;
-        isSet = 1;
-        _o_ = IT_member;
-    }
-
-    CORBA::Short s () const {
-        return _s_;
-    }
-
-    void s (CORBA::Short IT_member) {
-        if (isSet && (__d != Cubit::e_1st))
-        {
-            this-> oneof::~oneof();
-            memset(this, 0, sizeof(*this));
-        }
-
-        __d = Cubit::e_1st;
-        isSet = 1;
-        _s_ = IT_member;
-    }
-
-    CORBA::Long l () const {
-        return _l_;
-    }
-
-    void l (CORBA::Long IT_member) {
-        if (isSet && (__d != Cubit::e_2nd))
-        {
-            this-> oneof::~oneof();
-            memset(this, 0, sizeof(*this));
-        }
-
-        __d = Cubit::e_2nd;
-        isSet = 1;
-        _l_ = IT_member;
-    }
-
-    Many& cm () {
-        return (*_cm_);
-    }
-
-    const Many& cm () const {
-        return (*_cm_);
-    }
-
-    void cm (const Many& IT_member) {
-        if (isSet && (__d != Cubit::e_3rd))
-        {
-            this-> oneof::~oneof();
-            memset(this, 0, sizeof(*this));
-        }
-
-        __d = Cubit::e_3rd;
-
-        if (!isSet) {
-            _cm_ = new Many;
-            isSet = 1;
-        }
-        *(_cm_) = IT_member;
-    }
-
-
-    oneof();
-    oneof(const oneof &);
-    ~oneof();
-    oneof& operator= (const oneof&);
-};
-
-#ifndef Cubit_oneofVarH
-#define Cubit_oneofVarH
-
-#ifndef Cubit_oneofvPtr
-#define Cubit_oneofvPtr
-typedef oneof* oneof_vPtr;
-typedef const oneof* oneof_cvPtr;
-#endif
-
-class oneof_var : public CORBA::_var
-{
-    private:
-
-    unsigned char copyHelper (const oneof_var &IT_s) {
-        if (!IT_s._ptr) {
-            _ptr = IT_s._ptr;
-        } else
-        {
-            _ptr = new oneof;
-            *(_ptr) =  *(IT_s._ptr);
-        }
-        return 1;
-    }
-
-    public:
-
-    oneof_var (const oneof_var &IT_s) {
-        (void) copyHelper (IT_s);
-    }
-
-    oneof_var () {
-        _ptr = NULL;
-    }
-
-    oneof_var (oneof *IT_p) {
-        _ptr = IT_p;
-    }
-
-    oneof_var &operator= (oneof *IT_p) {
-        if (_ptr != IT_p) {
-            delete _ptr;
-        }
-        _ptr = IT_p;
-        return (*this);
-    }
-
-    oneof_var &operator= (const oneof_var &IT_s) {
-        if (_ptr != IT_s._ptr) {
-            delete _ptr;
-        }
-        _ptr = new oneof;
-        *(_ptr) =  *(IT_s._ptr);
-        return (*this);
-    }
-
-    ~oneof_var () {
-        delete _ptr;
-    }
-
-    oneof* operator-> () {
-        return _ptr;
-    }
-
-    operator oneof_cvPtr () const { return _ptr;}
-    operator oneof_vPtr& () { return _ptr;}
-    operator oneof& () const { return * _ptr;}
-
-    protected:
-    oneof *_ptr;
-    private:
-    oneof_var &operator= (const CORBA::_var &IT_s);
-    oneof_var (const CORBA::_var &IT_s);
-};
-
-#endif
-
-
-#endif
-        virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual Many cube_struct (const Many& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual oneof cube_union (const oneof& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual void please_exit (CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-};
-
-#ifndef CubitVarH
-#define CubitVarH
-
-#ifndef CubitvPtr
-#define CubitvPtr
-typedef Cubit* Cubit_vPtr;
-typedef const Cubit* Cubit_cvPtr;
-#endif
-
-class Cubit_var : public CORBA::_var
-{
-    private:
-
-    unsigned char copyHelper (const Cubit_var &IT_s) {
-        {
-            _ptr = Cubit_duplicate (IT_s._ptr);
-        }
-        return 1;
-    }
-
-    public:
-
-    Cubit_var (const Cubit_var &IT_s) {
-        (void) copyHelper (IT_s);
-    }
-
-    Cubit_var () {
-        _ptr = Cubit_nil ();
-    }
-
-    Cubit_var (Cubit *IT_p) {
-        _ptr = IT_p;
-    }
-
-    Cubit_var &operator= (Cubit *IT_p) {
-        Cubit_release (_ptr);
-        _ptr = IT_p;
-        return (*this);
-    }
-
-    Cubit_var &operator= (const Cubit_var &IT_s) {
-        Cubit_release (_ptr);
-        _ptr = Cubit_duplicate (IT_s._ptr);
-        return (*this);
-    }
-
-    ~Cubit_var () {
-        Cubit_release (_ptr);
-    }
-
-    Cubit* operator-> () {
-        return _ptr;
-    }
-
-    operator Cubit_cvPtr () const { return _ptr;}
-    operator Cubit_vPtr& () { return _ptr;}
-
-    protected:
-    Cubit *_ptr;
-    private:
-    Cubit_var &operator= (const CORBA::_var &IT_s);
-    Cubit_var (const CORBA::_var &IT_s);
-    Cubit_var &operator= (const CORBA::_mgr &IT_s);
-    Cubit_var &operator= (const CORBA::_SeqElem &IT_s);
-    Cubit_var (const CORBA::_mgr &IT_s);
-    Cubit_var (const CORBA::_SeqElem &IT_s);
-};
-
-#endif
-
-
-#ifndef CubitMgrH
-#define CubitMgrH
-
-class Cubit_mgr : public CORBA::_mgr
-{
-    public:
-
-    Cubit_mgr () {
-        _ptr = Cubit_nil ();
-        _release = 1;
-    }
-
-    Cubit_mgr (const Cubit_mgr &IT_s) {
-        _ptr = Cubit_duplicate (IT_s._ptr);
-        _release = 1;
-    }
-
-    Cubit_mgr &operator= (Cubit *IT_p) {
-        if (_ptr && _release)
-            Cubit_release (_ptr);
-        _ptr = IT_p;
-        _release = 1;
-        return (*this);
-    }
-
-    Cubit_mgr &operator= (const Cubit_mgr &IT_s) {
-        if (_ptr && _release)
-            Cubit_release (_ptr);
-        _ptr = Cubit_duplicate(IT_s._ptr);
-        _release = 1;
-        return (*this);
-    }
-
-    Cubit_mgr &operator= (Cubit_var &IT_s) {
-        if (_ptr && _release)
-            Cubit_release (_ptr);
-        _ptr = Cubit_duplicate(IT_s);
-        _release = 1;
-        return (*this);
-    }
-
-    ~Cubit_mgr () {
-        if (_release)
-            Cubit_release (_ptr);
-    }
-
-    unsigned char release () {
-        return _release;
-    }
-
-    void release (unsigned char rel) {
-        _release = rel;
-    }
-
-    operator int () const {
-        return (((CORBA::Object_ptr) _ptr) ? 1 : 0);
-    }
-
-    operator void* () const {
-        return _ptr;
-    }
-
-    operator CORBA::Object * () const {
-        return (CORBA::Object *) _ptr;
-    }
-
-    operator Cubit* () const {
-        return (Cubit*) _ptr;
-    }
-
-    Cubit_ptr operator-> () const {
-        return _ptr;
-    }
-
-    Cubit *_ptr;
-
-    protected:
-
-    unsigned char _release;
-};
-
-typedef Cubit_mgr Cubit_mgr_IT_const;
-#endif
-
-#ifndef CubitSeqElemH
-#define CubitSeqElemH
-
-class Cubit_SeqElem : public CORBA::_SeqElem
-{
-    public:
-
-    Cubit_SeqElem (Cubit_ptr* IT_p, unsigned char rel) {
-        _ptr = IT_p;
-        _release = rel;
-    }
-
-    Cubit_SeqElem &operator= (Cubit_ptr IT_p) {
-        if (_ptr) {
-            if (*(_ptr) && _release)
-                Cubit_release (*(_ptr));
-            *(_ptr) = IT_p;
-        }
-        return (*this);
-    }
-
-    Cubit_SeqElem &operator= (const Cubit_SeqElem &IT_s) {
-        if (_ptr && IT_s._ptr) {
-            if (*(_ptr) && _release)
-                Cubit_release (*(_ptr));
-            *(_ptr) = Cubit_duplicate(*(IT_s._ptr));
-        }
-        return (*this);
-    }
-
-    operator Cubit_ptr () const {
-        return _ptr ? (Cubit_ptr) (*_ptr) : Cubit_nil(); 
-    }
-
-    Cubit_ptr operator->() const { return *_ptr;}
-
-    protected:
-    Cubit_ptr *_ptr;
-    unsigned char _release;
-};
-
-#endif
-
-
-#define TIE_Cubit(X) Cubit##X
-
-#define DEF_TIE_Cubit(X) \
-	class Cubit##X : public virtual Cubit {		\
-	  X* m_obj;						\
-	public:							\
-								\
-								\
-	   Cubit##X  (X *objp, const char* m="", CORBA::LoaderClass *l=0)\
-		: Cubit(), m_obj(objp) {	\
-		m_pptr = new Cubit_dispatch		\
-			(( Cubit*)this,(CORBA::Object*)this,m,l,Cubit_IR,m_obj);	\
-	   }								\
-	   Cubit##X  (CORBA::Object *IT_p, const char* IT_m="", void *IT_q=0)\
-		: Cubit() {	\
-		m_pptr = new Cubit_dispatch		\
-			(( Cubit*)this,(CORBA::Object*)this,IT_m,Cubit_IR,IT_p,IT_q);	\
-		m_obj = (X*)(m_pptr->getImplObj ());			\
-	   }								\
-								\
-	   virtual ~Cubit##X  () {				\
-		if (_okToDeleteImpl ()) delete m_obj; }					\
-	   virtual void* _deref () {					\
-		return m_obj; }					\
-								\
-virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_octet (  o,IT_env);\
-}\
-	\
-virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_short (  s,IT_env);\
-}\
-	\
-virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_long (  l,IT_env);\
-}\
-	\
-virtual Cubit::Many cube_struct (const Cubit::Many& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_struct (  values,IT_env);\
-}\
-	\
-virtual Cubit::oneof cube_union (const Cubit::oneof& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_union (  values,IT_env);\
-}\
-	\
-virtual void please_exit (CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-m_obj->please_exit (IT_env);\
-}\
-								\
-	};						\
-
-
-#define QUALS_Cubit	\
-virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_octet (  o,IT_env);\
-}\
-	\
-virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_short (  s,IT_env);\
-}\
-	\
-virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_long (  l,IT_env);\
-}\
-	\
-virtual Many cube_struct (const Many& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_struct (  values,IT_env);\
-}\
-	\
-virtual oneof cube_union (const oneof& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_union (  values,IT_env);\
-}\
-	\
-virtual void please_exit (CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-m_obj->please_exit (IT_env);\
-}\
-
-
-
-
-class CubitProxyFactoryClass : public virtual CORBA::ObjectFactoryClass {
-public:
-   CubitProxyFactoryClass (unsigned char IT_p=0)
-		: CORBA::ProxyFactory (Cubit_IR, IT_p) {}
-
-    virtual void* New (char *IT_OR, CORBA::Environment&);
-
-    virtual void* New (ObjectReference *IT_OR, CORBA::Environment&);
-
-    virtual void* New2 (); 
-
-    virtual CORBA::Object* NewObject (char *IT_OR, CORBA::Environment&);
-
-    virtual CORBA::Object* NewObject (ObjectReference *IT_OR, CORBA::Environment&);
-
-    virtual CORBA::Object* New2Object (); 
-
-    virtual void* IT_castUp (void *IT_p, char* IT_s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-
-    virtual CORBA::PPTR* pptr (void *IT_p);
-
-    virtual void baseInterfaces (_IDL_SEQUENCE_string&);
-
-
-};
-
-extern CubitProxyFactoryClass CubitProxyFactory;
-
-class CubitBOAImpl : public virtual Cubit  {
-public:
-    CubitBOAImpl (const char *m="", CORBA::LoaderClass *l=NULL) {
-  if (CORBA::PPTR::isOK (m_pptr, Cubit_IR))
-    m_pptr = new Cubit_dispatch ( (Cubit*)this,
-   	 (CORBA::Object*)this, m, l, Cubit_IR, this);
-}
-
-        virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual Many cube_struct (const Many& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual oneof cube_union (const oneof& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual void please_exit (CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-};
-
-
-#endif
-
-
-#endif
diff --git a/TAO/IIOP/test/Orbix/base_server/cubit.idl b/TAO/IIOP/test/Orbix/base_server/cubit.idl
deleted file mode 100644
index d9b38c34a2a..00000000000
--- a/TAO/IIOP/test/Orbix/base_server/cubit.idl
+++ /dev/null
@@ -1,40 +0,0 @@
-// @(#)cubit.idl	1.1 95/09/10
-// Copyright 1994-1995 by Sun Microsystems, Inc.
-
-#pragma prefix	"Eng.SUN.COM"
-#pragma version Cubit 1.1
-
-interface Cubit {
-    octet	cube_octet (in octet o);
-    short	cube_short (in short s);
-    long	cube_long (in long l);
-
-    struct Many {
-	octet	o;		// + 3 bytes padding (normally) ...
-	long	l;
-	short	s;		// + 2 bytes padding (normally) ...
-    };
-
-    Many	cube_struct (in Many values);
-
-    enum discrim {e_0th, e_1st, e_2nd, e_3rd, e_4th, e_5th};
-
-    union oneof
-    switch (discrim) {
-	// this is an easy union to interpret; no padding
-	// is needed between discriminant and value.
-      case e_0th:
-        octet		o;
-      case e_1st:
-        short		s;
-      case e_2nd:
-        long		l;
-      case e_3rd:
-      default:
-        Many		cm;
-    };
-
-    oneof	cube_union (in oneof values);
-
-    oneway void	please_exit ();
-};
diff --git a/TAO/IIOP/test/Orbix/base_server/cubitC.cpp b/TAO/IIOP/test/Orbix/base_server/cubitC.cpp
deleted file mode 100644
index c47e38f26ee..00000000000
--- a/TAO/IIOP/test/Orbix/base_server/cubitC.cpp
+++ /dev/null
@@ -1,557 +0,0 @@
-#include "cubit.h"
-
-Cubit::Cubit (char *IT_OR) {
-      m_pptr = new Cubit_dispatch (IT_OR, this,(CORBA::Object*)this);
-} 
-Cubit::Cubit (ObjectReference *IT_OR) {
-      m_pptr = new Cubit_dispatch (IT_OR, this,(CORBA::Object*)this);
-} 
-
-#ifndef CubitForwC
-#define CubitForwC
-CORBA::ObjectRef Cubit_getBase(void *IT_p){
-    return (Cubit*) IT_p;}
-
-void Cubit_release (Cubit_ptr IT_p, CORBA::Environment &IT_env) {
-    CORBA::release(IT_p, IT_env);}
-
-void Cubit_release (Cubit_ptr IT_p) {
-    Cubit_release (IT_p, CORBA::IT_chooseDefaultEnv ()); }
-
-Cubit_ptr Cubit_nil (CORBA::Environment &) {
-    return Cubit:: _nil ();}
-
-Cubit_ptr Cubit_nil () {
-    return Cubit_nil (CORBA::IT_chooseDefaultEnv ());}
-
-Cubit_ptr Cubit_duplicate (Cubit_ptr IT_p, CORBA::Environment &IT_env) {
-    return (Cubit::_duplicate(IT_p, IT_env)); }
-Cubit_ptr Cubit_duplicate (Cubit_ptr IT_p) {
-    return Cubit_duplicate (IT_p, CORBA::IT_chooseDefaultEnv ()); }
-#endif
-
-Cubit_ptr Cubit::_duplicate(Cubit_ptr obj, CORBA::Environment& IT_pEnv) {
-        CORBA::EnvExcRaiser IT_raise;
-        CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-       if (!obj) {
-          return (obj);
-       }
-       Cubit_ptr IT_obj = obj->__duplicate (IT_env);
-       return IT_obj;
-}
-
-
-
-Cubit* Cubit:: _bind (const char* IT_markerServer, const char* host,
-		const CORBA::Context &IT_c, 
-		CORBA::Environment &IT_env) {
-       return (Cubit*)CORBA::Factory.New (IT_markerServer, IT_env, IT_c, host, 
-		Cubit_IMPL, Cubit_IR);
-}
-
-
-
-Cubit* Cubit:: _bind (CORBA::Environment &IT_env) {
-       return _bind (NULL,NULL,CORBA::Context(), IT_env); }
-
-
-Cubit* Cubit:: _bind (const char* IT_markerServer, const char* host,
-                CORBA::Environment &IT_env) {
-       return _bind (IT_markerServer, host, CORBA::Context (), IT_env); }
-Cubit* Cubit::_narrow (CORBA::Object* IT_obj, CORBA::Environment &IT_pEnv) {
-        CORBA::EnvExcRaiser IT_raise;
-        CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-        if (CORBA::is_nil (IT_obj)) {
-                return Cubit:: _nil();
-        }
-
-       Cubit* IT_p = (Cubit*)CORBA::Object::_castDown (IT_obj, Cubit_IR, IT_env);
-        IT_p = IT_p ? IT_p->__duplicate(IT_env) : NULL;
-        if ((IT_env) &&(!strcmp(IT_env.exception()->id(), "CORBA::StExcep::BAD_PARAM")) && (((CORBA::BAD_PARAM*)IT_env.exception())-> minor() == NARROW_FAILED)) {
-                IT_env.exception_free();
-        }
-        return IT_p;
-   }
-
-
-#ifndef Cubit_Many_Ops
-#define Cubit_Many_Ops
-
-void Cubit::Many:: encodeOp (CORBA::Request &IT_r) const {
-
-    IT_r.insertOctet (o);
-
-    IT_r << l;
-
-    IT_r << s;
-}
-
-void Cubit::Many:: decodeOp (CORBA::Request &IT_r) {
-
-    IT_r.extractOctet (o);
-
-    IT_r >> l;
-
-    IT_r >> s;
-}
-
-void Cubit::Many:: decodeInOutOp (CORBA::Request &IT_r) {
-
-    IT_r.extractOctet (o);
-
-    IT_r >> l;
-
-    IT_r >> s;
-}
-
-Cubit::Many ::~Many () {
-}
-
-Cubit::Many:: Many (const Cubit::Many &IT_s) 
-	 {
-    o = IT_s.o;
-    l = IT_s.l;
-    s = IT_s.s;
-}
-
-Cubit::Many:: Many () {
-}
-
-Cubit::Many &Cubit::Many:: operator= (const Cubit::Many& IT_s) {
-    if (this == &IT_s) return *this;
-    o = IT_s.o;
-    l = IT_s.l;
-    s = IT_s.s;
-    return *this;
-}
-
-
-#endif
-
-
-#ifndef Cubit_oneof_Ops
-#define Cubit_oneof_Ops
-void Cubit::oneof:: encodeOp (CORBA::Request &IT_r) const {
-    if (!isSet) return;
-    {
-    CORBA::ULong IT_0 = (CORBA::ULong) __d;
-    IT_r << IT_0;
-    }
-    switch (__d) {
-        case Cubit::e_0th: 
-        IT_r.insertOctet (_o_);
-        break;
-        case Cubit::e_1st: 
-        IT_r << _s_;
-        break;
-        case Cubit::e_2nd: 
-        IT_r << _l_;
-        break;
-        case Cubit::e_3rd: 
-        default: 
-        (*_cm_).encodeOp (IT_r);
-        break;
-    }
-
-}
-
-void Cubit::oneof:: decodeOp (CORBA::Request &IT_r) {
-    isSet = 0;
-    {
-    CORBA::ULong IT_1;
-    IT_r >> IT_1;
-    __d = Cubit::discrim(IT_1);
-    }
-    switch (__d) {
-        case Cubit::e_0th: 
-        if (!isSet) {
-            isSet = 1;
-        }
-        IT_r.extractOctet (_o_);
-        break;
-        case Cubit::e_1st: 
-        if (!isSet) {
-            isSet = 1;
-        }
-        IT_r >> _s_;
-        break;
-        case Cubit::e_2nd: 
-        if (!isSet) {
-            isSet = 1;
-        }
-        IT_r >> _l_;
-        break;
-        case Cubit::e_3rd: 
-        default: 
-        if (!isSet) {
-            _cm_ = new Cubit::Many;
-            isSet = 1;
-        }
-        (*_cm_).decodeOp (IT_r);
-        break;
-    }
-
-}
-void Cubit::oneof:: decodeInOutOp (CORBA::Request &IT_r) {
-    Cubit::discrim IT_d;
-    {
-    CORBA::ULong IT_2;
-    IT_r >> IT_2;
-    IT_d = Cubit::discrim(IT_2);
-    }
-    if (IT_d == __d)
-        switch (__d) {
-            case Cubit::e_0th: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r.extractOctet (_o_);
-            break;
-            case Cubit::e_1st: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r >> _s_;
-            break;
-            case Cubit::e_2nd: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r >> _l_;
-            break;
-            case Cubit::e_3rd: 
-            default: 
-            if (!isSet) {
-                _cm_ = new Cubit::Many;
-                isSet = 1;
-            }
-            (*_cm_).decodeInOutOp (IT_r);
-            break;
-        }
-
-    else {
-        this->oneof:: ~oneof();
-        memset(this, 0, sizeof(*this));
-        __d = IT_d;
-        switch (__d) {
-            case Cubit::e_0th: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r.extractOctet (_o_);
-            break;
-            case Cubit::e_1st: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r >> _s_;
-            break;
-            case Cubit::e_2nd: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r >> _l_;
-            break;
-            case Cubit::e_3rd: 
-            default: 
-            if (!isSet) {
-                _cm_ = new Cubit::Many;
-                isSet = 1;
-            }
-            (*_cm_).decodeOp (IT_r);
-            break;
-        }
-        isSet = 1;
-    }
-
-}
-
-Cubit::oneof:: oneof() { 
-    memset(this, 0, sizeof(*this));
-    isSet = 0;
-}
-
-Cubit::oneof ::~oneof() {
-    if (!isSet) return;
-    switch (__d) { 
-        case Cubit::e_0th:         break;
-        case Cubit::e_1st:         break;
-        case Cubit::e_2nd:         break;
-        case Cubit::e_3rd: 
-        default:         if (_cm_) delete _cm_;
-        break;
-    }
-
-    isSet = 0;
-}
-
-Cubit::oneof:: oneof (const Cubit::oneof &IT_s) {
-    isSet = 0;
-    memset(this, 0, sizeof(*this));
-    __d = IT_s.__d;
-    switch (__d) {
-        case Cubit::e_0th:         isSet = 1;
-        _o_ = IT_s._o_;
-        break;
-        case Cubit::e_1st:         isSet = 1;
-        _s_ = IT_s._s_;
-        break;
-        case Cubit::e_2nd:         isSet = 1;
-        _l_ = IT_s._l_;
-        break;
-        case Cubit::e_3rd: 
-        default: 
-        if (!isSet) {
-            _cm_ = new Cubit::Many;
-            isSet = 1;
-        }
-        *(_cm_) = *(IT_s._cm_);
-        break;
-    }
-    isSet = 1;
-}
-
-Cubit::oneof& Cubit::oneof:: operator= (const Cubit::oneof & IT_s) {
-    if (this == &IT_s) return *this;
-    if (isSet && (__d != IT_s.__d))
-    {
-        this-> oneof::~oneof();
-        memset(this, 0, sizeof(*this));
-    }
-
-    __d = IT_s.__d;
-    switch (__d) {
-        case Cubit::e_0th:         isSet = 1;
-        _o_ = IT_s._o_;
-        break;
-        case Cubit::e_1st:         isSet = 1;
-        _s_ = IT_s._s_;
-        break;
-        case Cubit::e_2nd:         isSet = 1;
-        _l_ = IT_s._l_;
-        break;
-        case Cubit::e_3rd: 
-        default: 
-        if (!isSet) {
-            _cm_ = new Cubit::Many;
-            isSet = 1;
-        }
-        *(_cm_) = *(IT_s._cm_);
-        break;
-    }
-    isSet = 1;
-    return *this;
-}
-
-
-#endif
-
-void* CubitProxyFactoryClass::New (char *IT_OR, CORBA::Environment&) {
-        return  new class Cubit(IT_OR);}
-
-void* CubitProxyFactoryClass::New (ObjectReference *IT_OR, CORBA::Environment&) {
-        return  new class Cubit(IT_OR);}
-
-void* CubitProxyFactoryClass::New2 () {
-        return  new class Cubit((char*)0);}
-
-CORBA::Object* CubitProxyFactoryClass::NewObject (char *IT_OR, CORBA::Environment&) {
-        return  new class Cubit(IT_OR);}
-
-CORBA::Object* CubitProxyFactoryClass::NewObject (ObjectReference *IT_OR, CORBA::Environment&) {
-        return  new class Cubit(IT_OR);}
-
-CORBA::Object* CubitProxyFactoryClass::New2Object () {
-        return  new class Cubit((char*)0);}
-
-void* CubitProxyFactoryClass::IT_castUp (void *IT_p, char* IT_s, CORBA::Environment &IT_env) {
-      void *IT_l;
-      if (!CORBA::_interfaceCmp (IT_s,Cubit_IR, IT_env))
-         return IT_p;
-      else if (IT_l=CORBA::ObjectFactoryClass::IT_castUp((CORBA::Object*)((class Cubit*)IT_p),IT_s, IT_env))
-         return IT_l;
-      else return NULL;
-    }
-
-
-CORBA::PPTR* CubitProxyFactoryClass::pptr (void *IT_p) {
-       return ((class Cubit*)IT_p)->_pptr ();}
-
-void CubitProxyFactoryClass::baseInterfaces (_IDL_SEQUENCE_string& seq) {
-      add (seq, Cubit_IR);
-      CORBA::ObjectFactoryClass::baseInterfaces (seq);
-}
-
-CubitProxyFactoryClass CubitProxyFactory(1);
-
-CORBA::Octet Cubit:: cube_octet (CORBA::Octet o, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        return 0;
-    }
-    CORBA::Request IT_r (this, "cube_octet",IT_env,1,0);
-    if (!IT_r.isException (IT_env)) {
-
-        IT_r.insertOctet (o);
-    }
-
-    IT_r.invoke (CORBA::Flags(0),IT_env);
-    if (!IT_r.isException (IT_env)) {
-        CORBA::Octet IT_result;
-        IT_r.extractOctet (IT_result);
-        IT_r.checkEnv (IT_env);
-        return IT_result;
-    }
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-    return 0;
-}
-
-CORBA::Short Cubit:: cube_short (CORBA::Short s, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        return 0;
-    }
-    CORBA::Request IT_r (this, "cube_short",IT_env,1,0);
-    if (!IT_r.isException (IT_env)) {
-
-        IT_r << s;
-    }
-
-    IT_r.invoke (CORBA::Flags(0),IT_env);
-    if (!IT_r.isException (IT_env)) {
-        CORBA::Short IT_result;
-        IT_r >> IT_result;
-        IT_r.checkEnv (IT_env);
-        return IT_result;
-    }
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-    return 0;
-}
-
-CORBA::Long Cubit:: cube_long (CORBA::Long l, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        return 0;
-    }
-    CORBA::Request IT_r (this, "cube_long",IT_env,1,0);
-    if (!IT_r.isException (IT_env)) {
-
-        IT_r << l;
-    }
-
-    IT_r.invoke (CORBA::Flags(0),IT_env);
-    if (!IT_r.isException (IT_env)) {
-        CORBA::Long IT_result;
-        IT_r >> IT_result;
-        IT_r.checkEnv (IT_env);
-        return IT_result;
-    }
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-    return 0;
-}
-
-Cubit::Many Cubit:: cube_struct (const Cubit::Many& values, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        { 
-            Cubit::Many IT_l0;
-            return IT_l0;
-        }
-    }
-    CORBA::Request IT_r (this, "cube_struct",IT_env,1,0);
-    if (!IT_r.isException (IT_env)) {
-
-        values.encodeOp (IT_r);
-    }
-
-    IT_r.invoke (CORBA::Flags(0),IT_env);
-    if (!IT_r.isException (IT_env)) {
-        Cubit::Many IT_result;
-        IT_result.decodeOp (IT_r);
-        IT_r.checkEnv (IT_env);
-        return IT_result;
-    }
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-    { 
-        Cubit::Many IT_l1;
-        return IT_l1;
-    }
-}
-
-Cubit::oneof Cubit:: cube_union (const Cubit::oneof& values, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        { 
-            Cubit::oneof IT_l0;
-            return IT_l0;
-        }
-    }
-    CORBA::Request IT_r (this, "cube_union",IT_env,1,0);
-    if (!IT_r.isException (IT_env)) {
-
-        values.encodeOp (IT_r);
-    }
-
-    IT_r.invoke (CORBA::Flags(0),IT_env);
-    if (!IT_r.isException (IT_env)) {
-        Cubit::oneof IT_result;
-        IT_result.decodeOp (IT_r);
-        IT_r.checkEnv (IT_env);
-        return IT_result;
-    }
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-    { 
-        Cubit::oneof IT_l1;
-        return IT_l1;
-    }
-}
-
-void Cubit:: please_exit (CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        return ;
-    }
-    CORBA::Request IT_r (this, "please_exit",IT_env,1,1);
-
-    IT_r.invoke (CORBA::Flags(CORBA::INV_NO_RESPONSE), IT_env);
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-}
-
-
-
-
-
-#ifndef Cubit_dispatch_impl
-
-unsigned char Cubit_dispatch::dispatch (CORBA::Request &IT_r, 
-    unsigned char, void *) {
-      IT_r.makeRuntimeException1 ("Cubit");
-      return 0;
-}
- 
-#endif
-
diff --git a/TAO/IIOP/test/Orbix/base_server/cubitC.h b/TAO/IIOP/test/Orbix/base_server/cubitC.h
deleted file mode 100644
index 15247168d3c..00000000000
--- a/TAO/IIOP/test/Orbix/base_server/cubitC.h
+++ /dev/null
@@ -1,343 +0,0 @@
-#ifndef _cubitC_h
-#define _cubitC_h
-
-/************************************************************************/
-/*                                                                      */
-/* This file is automatically generated by ORBeline IDL compiler        */
-/* Do not modify this file.                                             */
-/*                                                                      */
-/* ORBeline (c) is copyrighted by PostModern Computing, Inc.            */
-/*                                                                      */
-/* The generated code conforms to OMG's IDL C++ mapping as              */
-/* specified in OMG Document Number: 94-9-14.                           */
-/*                                                                      */
-/************************************************************************/
-
-#include "corba.h"
-
-
-
-class Cubit;
-typedef Cubit *Cubit_ptr;
-typedef Cubit_ptr CubitRef;
-
-#ifndef _Cubit_var_
-#define _Cubit_var_
-class Cubit_var
-{
-    public:
-	Cubit_var();
-	Cubit_var(Cubit_ptr);
-	Cubit_var(const Cubit_var&);
-	~Cubit_var();
-	Cubit_var& operator=(Cubit_ptr);
-	operator Cubit_ptr() const { return _ptr; }
-#if defined(_HPCC_BUG)
-	operator Cubit *&() { return _ptr; }
-#else
-	operator Cubit_ptr&() { return _ptr; }
-#endif
-	Cubit_ptr operator->() const { return _ptr;}
-	friend NCistream& operator>>(NCistream&, Cubit_var&);
-	friend NCostream& operator<<(NCostream&, const Cubit_var&);
-	friend istream& operator>>(istream&, Cubit_var&);
-	friend ostream& operator<<(ostream&, const Cubit_var&);
-    private:
-	Cubit_ptr	_ptr;
-	void operator=(const Cubit_var&) {}
-};
-#endif
-class Cubit: public virtual CORBA_Object
-{
-    private:
-	static const CORBA::TypeInfo _class_info;
-	Cubit(const Cubit&) {}
-	void operator=(const Cubit&){}
-    public:
-	static const CORBA::TypeInfo *_desc();
-	virtual const CORBA::TypeInfo *_type_info() const;
-	virtual void *_safe_narrow(const CORBA::TypeInfo& ) const;
-	static CORBA::Object *_factory();
-    protected:
-	Cubit(const char *obj_name = NULL) :CORBA_Object(obj_name, 1) {}
-	Cubit(NCistream& strm) :CORBA_Object(strm) {}
-	virtual ~Cubit() {}
-    public:
-	static Cubit_ptr _duplicate(Cubit_ptr obj) {
-		if (obj ) obj->_ref();
-		return obj;
-	}
-	static Cubit_ptr _nil() { return (Cubit_ptr)NULL;}
-	static Cubit_ptr _narrow(CORBA::Object *obj);
-	static Cubit_ptr _clone(Cubit_ptr obj) {
-		CORBA::Object_var obj_var(__clone(obj));
-
-#if defined(_HPCC_BUG)
-		return _narrow(obj_var.operator CORBA::Object_ptr());
-#else
-		return _narrow(obj_var);
-#endif
-	}
-	static Cubit_ptr _bind(const char *object_name = NULL,
-		const char *host_name = NULL,
-		const CORBA::BindOptions* opt = NULL); 
-
-	virtual CORBA::Octet cube_octet(CORBA::Octet o);
-	
-	virtual CORBA::Short cube_short(CORBA::Short s);
-	
-	virtual CORBA::Long cube_long(CORBA::Long l);
-	
-	struct Many {
-		CORBA::Octet	o;
-		CORBA::Long	l;
-		CORBA::Short	s;
-	};
-	friend NCostream& operator<<(NCostream&, const Many& );
-	friend NCistream& operator>>(NCistream&, Many& );
-	
-	friend ostream& operator<<(ostream&, const Many& );
-	inline friend istream& operator>>(istream& _strm, Many& _obj) {
-		NCistream _istrm(_strm);
-		_istrm >> _obj;
-		return _strm;
-	}
-	
-	
-	typedef Many *Many_ptr;
-	class Many_var
-	{
-	    public:
-		Many_var() { _ptr = (Many*)NULL;}
-		Many_var(Many *ptr) {
-			_ptr = ptr;
-		}
-		Many_var(const Many_var& var) {
-			if (var._ptr)
-				_ptr = new Many(*var._ptr);
-			else
-				_ptr = (Many *)NULL;
-		}
-		~Many_var() {
-			if (_ptr != (Many *)NULL) delete _ptr;
-		}
-		Many_var& operator=(Many *ptr) {
-			if (_ptr != (Many *)NULL) delete _ptr;
-			_ptr = ptr;
-			return *this;
-		}
-		Many_var& operator=(const Many_var& var) {
-			if (_ptr != (Many *)NULL) delete _ptr;
-			if (var._ptr)
-				_ptr = new Many(*var._ptr);
-			else
-				_ptr = (Many *)NULL;
-			return *this;
-		}
-		Many *operator->() { return _ptr; }
-		operator Many () const { return *_ptr; }
-		operator Many& () { return *_ptr; }
-		inline friend NCostream& operator<<(NCostream& strm,
-				const Many_var& var) {
-			if (var._ptr == (Many *)NULL) {
-				throw CORBA::BAD_PARAM();
-			}
-			else
-				strm << *var._ptr;
-			return strm;
-		}
-		inline friend NCistream& operator>>(NCistream& strm,
-				Many_var& var) {
-			if ( ! var._ptr)
-				var._ptr = new Many;
-			strm >> *var._ptr;
-			return strm;
-		}
-	    private:
-		Many *_ptr;
-	};
-	
-	
-	virtual Cubit::Many cube_struct(const Cubit::Many& values);
-	
-	enum discrim {
-		e_0th,
-		e_1st,
-		e_2nd,
-		e_3rd,
-		e_4th,
-		e_5th
-	};
-	inline friend NCostream& operator<<(NCostream& _strm, discrim _enum_type) {
-		_strm << (CORBA::ULong)_enum_type;
-		return _strm;
-	}
-	inline friend NCistream& operator>>(NCistream& _strm, discrim& _enum_type) {
-		CORBA::ULong _temp;
-		_strm >> _temp;
-		if (_temp >= 6)
-			throw CORBA::BAD_PARAM();
-		_enum_type = discrim(_temp);
-		return _strm;
-	}
-	inline friend ostream& operator<<(ostream& _strm, discrim _enum_type) {
-		if( &_strm == &cout || &_strm == &cerr || &_strm == &clog) {
-			_strm << "discrim:";
-			switch(_enum_type) {
-				case e_0th:
-					_strm << "e_0th" << endl;
-					break;
-				case e_1st:
-					_strm << "e_1st" << endl;
-					break;
-				case e_2nd:
-					_strm << "e_2nd" << endl;
-					break;
-				case e_3rd:
-					_strm << "e_3rd" << endl;
-					break;
-				case e_4th:
-					_strm << "e_4th" << endl;
-					break;
-				case e_5th:
-					_strm << "e_5th" << endl;
-					break;
-			}
-		}
-		else 
-			_strm << (CORBA::ULong)_enum_type;
-		return _strm;
-	}
-	inline friend istream& operator>>(istream& _strm, discrim& _enum_type) {
-		CORBA::ULong _temp;
-		_strm >> _temp;
-		_enum_type = discrim(_temp);
-		return _strm;
-	}
-	
-	
-	class oneof
-	{
-	    public:
-	    private:
-		discrim	_disc;
-		CORBA::Octet	__o;
-		CORBA::Short	__s;
-		CORBA::Long	__l;
-		Cubit::Many	__cm;
-	    public:
-		oneof() : _disc(discrim(0)) {}
-		~oneof() {}
-		oneof(const oneof& obj);
-		oneof& operator=(const oneof& obj);
-	
-		void _d(discrim val) { _disc = val; }
-		discrim _d() const { return _disc; }
-	
-		void o(CORBA::Octet val) {
-			__o = val;
-			_disc = Cubit::e_0th;
-		}
-		CORBA::Octet o() const { return __o; }
-	
-		void s(CORBA::Short val) {
-			__s = val;
-			_disc = Cubit::e_1st;
-		}
-		CORBA::Short s() const { return __s; }
-	
-		void l(CORBA::Long val) {
-			__l = val;
-			_disc = Cubit::e_2nd;
-		}
-		CORBA::Long l() const { return __l; }
-	
-		void cm(const Cubit::Many& val) {
-			__cm = val;
-			_disc = Cubit::e_3rd;
-		}
-		const Cubit::Many& cm() const { return __cm; }
-		Cubit::Many& cm() { return __cm; }
-	
-		friend NCostream& operator<<(NCostream&, const oneof& );
-		friend NCistream& operator>>(NCistream&, oneof& );
-		friend ostream& operator<<(ostream&, const oneof&);
-		inline friend istream& operator>>(istream& strm, oneof& obj) {
-			NCistream istrm(strm);
-			strm >> obj;
-			return strm;
-		}
-	};
-	
-	typedef oneof *oneof_ptr;
-	class oneof_var
-	{
-	    public:
-		oneof_var() { _ptr = (oneof*)NULL;}
-		oneof_var(oneof *ptr) {
-			_ptr = ptr;
-		}
-		oneof_var(const oneof_var& var) {
-			_ptr = new oneof(*var._ptr);
-		}
-		~oneof_var() {
-			if (_ptr != (oneof *)NULL) delete _ptr;
-		}
-		oneof_var& operator=(oneof *ptr) {
-			if (_ptr != (oneof *)NULL) delete _ptr;
-			_ptr = ptr;
-			return *this;
-		}
-		oneof_var& operator=(const oneof_var& var) {
-			if (_ptr != (oneof *)NULL) delete _ptr;
-			_ptr = new oneof(*var._ptr);
-			return *this;
-		}
-		oneof *operator->() { return _ptr; }
-		operator oneof () const { return *_ptr; }
-		operator oneof& () { return *_ptr; }
-		inline friend NCostream& operator<<(NCostream& strm,
-				const oneof_var& var) {
-			if (var._ptr == (oneof *)NULL) {
-				throw CORBA::BAD_PARAM();
-			}
-			else
-				strm << *var._ptr;
-			return strm;
-		}
-		inline friend NCistream& operator>>(NCistream& strm,
-				oneof_var& var) {
-			if ( ! var._ptr)
-				var._ptr = new oneof;
-			strm >> *var._ptr;
-			return strm;
-		}
-	    private:
-		oneof *_ptr;
-	};
-	
-	
-	virtual Cubit::oneof cube_union(const Cubit::oneof& values);
-	
-	virtual void please_exit();
-	
-	inline friend NCistream& operator>>(NCistream& strm, Cubit_ptr& obj) {
-		CORBA::Object_var _obj(obj);
-		_obj = CORBA::Object::_read(strm, Cubit::_desc());
-		obj = Cubit::_narrow(_obj);
-		return strm;
-	}
-	inline friend ostream& operator<<(ostream& strm, const Cubit_ptr obj) {
-		strm << (CORBA::Object_ptr)obj;
-		return strm;
-	}
-	inline friend istream& operator>>(istream& strm, Cubit_ptr& obj) {
-		NCistream istrm(strm);
-		istrm >> obj;
-		return strm;
-	}
-};
-
-
-#endif
-
diff --git a/TAO/IIOP/test/Orbix/base_server/cubitS.cpp b/TAO/IIOP/test/Orbix/base_server/cubitS.cpp
deleted file mode 100644
index 449a8c23548..00000000000
--- a/TAO/IIOP/test/Orbix/base_server/cubitS.cpp
+++ /dev/null
@@ -1,226 +0,0 @@
-#include "cubit.h"
-
-
-#define Cubit_dispatch_impl
-
-unsigned char Cubit_dispatch::dispatch (CORBA::Request &IT_r, 
- unsigned char IT_isTarget, void *IT_pp) {
-    if (!IT_pp)
-       IT_pp = m_obj;
-    const char *IT_s = IT_r.getOperation ();
-    if (!strcmp(IT_s,"cube_octet")) {
-        CORBA::Octet IT_result;
-        CORBA::Environment IT_env (IT_r);
-        CORBA::Filter* IT_f = CORBA::Orbix.getFilter ();
-        if (!IT_r.tcAssert ("\
-Ro~cube_octet~+o{o},>{o},N{}\
-"))
-            return 1;
-        CORBA::Octet o;
-
-        IT_r.extractOctet (o);
-
-        if (IT_f && !IT_r.isException (IT_env))
-        	IT_f->inRequestPostM (IT_r, IT_env);
-        if (!IT_r.isException (IT_env)) {
-            try {
-                	IT_result = ((Cubit*)IT_pp)->cube_octet (  o, IT_env);
-
-            } catch (CORBA::SystemException &IT_exSys) {
-            IT_env.propagate (&IT_exSys);
-            } catch (CORBA::UserException &IT_exUsr) {
-            IT_env.propagate (&IT_exUsr);
-            }
-        }
-
-        if (!IT_r.isException (IT_env)) {
-            if (!IT_r.convertToReply ("\
-o\
-", IT_env)) return 1;
-            IT_r.insertOctet (IT_result);
-            }
-
-        else IT_r.makeSystemException (IT_env);
-        return 1;
-    }
-
-    if (!strcmp(IT_s,"cube_short")) {
-        CORBA::Short IT_result;
-        CORBA::Environment IT_env (IT_r);
-        CORBA::Filter* IT_f = CORBA::Orbix.getFilter ();
-        if (!IT_r.tcAssert ("\
-Ro~cube_short~+s{s},>{s},N{}\
-"))
-            return 1;
-        CORBA::Short s;
-
-        IT_r >> s;
-
-        if (IT_f && !IT_r.isException (IT_env))
-        	IT_f->inRequestPostM (IT_r, IT_env);
-        if (!IT_r.isException (IT_env)) {
-            try {
-                	IT_result = ((Cubit*)IT_pp)->cube_short (  s, IT_env);
-
-            } catch (CORBA::SystemException &IT_exSys) {
-            IT_env.propagate (&IT_exSys);
-            } catch (CORBA::UserException &IT_exUsr) {
-            IT_env.propagate (&IT_exUsr);
-            }
-        }
-
-        if (!IT_r.isException (IT_env)) {
-            if (!IT_r.convertToReply ("\
-s\
-", IT_env)) return 1;
-            IT_r << IT_result;
-            }
-
-        else IT_r.makeSystemException (IT_env);
-        return 1;
-    }
-
-    if (!strcmp(IT_s,"cube_long")) {
-        CORBA::Long IT_result;
-        CORBA::Environment IT_env (IT_r);
-        CORBA::Filter* IT_f = CORBA::Orbix.getFilter ();
-        if (!IT_r.tcAssert ("\
-Ro~cube_long~+l{l},>{l},N{}\
-"))
-            return 1;
-        CORBA::Long l;
-
-        IT_r >> l;
-
-        if (IT_f && !IT_r.isException (IT_env))
-        	IT_f->inRequestPostM (IT_r, IT_env);
-        if (!IT_r.isException (IT_env)) {
-            try {
-                	IT_result = ((Cubit*)IT_pp)->cube_long (  l, IT_env);
-
-            } catch (CORBA::SystemException &IT_exSys) {
-            IT_env.propagate (&IT_exSys);
-            } catch (CORBA::UserException &IT_exUsr) {
-            IT_env.propagate (&IT_exUsr);
-            }
-        }
-
-        if (!IT_r.isException (IT_env)) {
-            if (!IT_r.convertToReply ("\
-l\
-", IT_env)) return 1;
-            IT_r << IT_result;
-            }
-
-        else IT_r.makeSystemException (IT_env);
-        return 1;
-    }
-
-    if (!strcmp(IT_s,"cube_struct")) {
-        Cubit::Many IT_result;
-        CORBA::Environment IT_env (IT_r);
-        CORBA::Filter* IT_f = CORBA::Orbix.getFilter ();
-        if (!IT_r.tcAssert ("\
-Ro~cube_struct~+values{R~Cubit::Many~o{o},l{l},s{s}},>{R~Cubit::Many~o{o},l{l},s{s}},N{}\
-"))
-            return 1;
-        Cubit::Many values;
-
-        values.decodeOp (IT_r);
-
-        if (IT_f && !IT_r.isException (IT_env))
-        	IT_f->inRequestPostM (IT_r, IT_env);
-        if (!IT_r.isException (IT_env)) {
-            try {
-                	IT_result = ((Cubit*)IT_pp)->cube_struct (  values, IT_env);
-
-            } catch (CORBA::SystemException &IT_exSys) {
-            IT_env.propagate (&IT_exSys);
-            } catch (CORBA::UserException &IT_exUsr) {
-            IT_env.propagate (&IT_exUsr);
-            }
-        }
-
-        if (!IT_r.isException (IT_env)) {
-            if (!IT_r.convertToReply ("\
-R~Cubit::Many~o{o},l{l},s{s}\
-", IT_env)) return 1;
-            IT_result.encodeOp (IT_r);
-            }
-
-        else IT_r.makeSystemException (IT_env);
-        return 1;
-    }
-
-    if (!strcmp(IT_s,"cube_union")) {
-        Cubit::oneof IT_result;
-        CORBA::Environment IT_env (IT_r);
-        CORBA::Filter* IT_f = CORBA::Orbix.getFilter ();
-        IT_r.tcPreAssert (
-"\
-Ro~cube_union~+values{U~Cubit::oneof~{E~Cubit::discrim~e_0th,e_1st,e_2nd,e_3rd,e_4th,e_5th}~Cubit::e_0th o{o};Cubit::e_1st s{s};Cubit::e_2nd l{l};Cubit::e_3rd,$ cm{R~Cubit::Many~o{o},l{l},s{s}}},>{U~Cubit::oneof~{E~Cubit::discrim~e_0th,e_1st,e_2nd,e_3rd,\
-");
-        if (!IT_r.tcAssert ("\
-e_4th,e_5th}~Cubit::e_0th o{o};Cubit::e_1st s{s};Cubit::e_2nd l{l};Cubit::e_3rd,$ cm{R~Cubit::Many~o{o},l{l},s{s}}},N{}\
-"))
-            return 1;
-        Cubit::oneof values;
-
-        values.decodeOp (IT_r);
-
-        if (IT_f && !IT_r.isException (IT_env))
-        	IT_f->inRequestPostM (IT_r, IT_env);
-        if (!IT_r.isException (IT_env)) {
-            try {
-                	IT_result = ((Cubit*)IT_pp)->cube_union (  values, IT_env);
-
-            } catch (CORBA::SystemException &IT_exSys) {
-            IT_env.propagate (&IT_exSys);
-            } catch (CORBA::UserException &IT_exUsr) {
-            IT_env.propagate (&IT_exUsr);
-            }
-        }
-
-        if (!IT_r.isException (IT_env)) {
-            if (!IT_r.convertToReply ("\
-U~Cubit::oneof~{E~Cubit::discrim~e_0th,e_1st,e_2nd,e_3rd,e_4th,e_5th}~Cubit::e_0th o{o};Cubit::e_1st s{s};Cubit::e_2nd l{l};Cubit::e_3rd,$ cm{R~Cubit::Many~o{o},l{l},s{s}}\
-", IT_env)) return 1;
-            IT_result.encodeOp (IT_r);
-            }
-
-        else IT_r.makeSystemException (IT_env);
-        return 1;
-    }
-
-    if (!strcmp(IT_s,"please_exit")) {
-        CORBA::Environment IT_env (IT_r);
-        CORBA::Filter* IT_f = CORBA::Orbix.getFilter ();
-        if (!IT_r.tcAssert ("\
-Ro~please_exit~>{v},O{}\
-"))
-            return 1;
-
-        if (IT_f && !IT_r.isException (IT_env))
-        	IT_f->inRequestPostM (IT_r, IT_env);
-        if (!IT_r.isException (IT_env)) {
-            try {
-                ((Cubit*)IT_pp)->please_exit (IT_env);
-
-            } catch (CORBA::SystemException &IT_exSys) {
-            IT_env.propagate (&IT_exSys);
-            } catch (CORBA::UserException &IT_exUsr) {
-            IT_env.propagate (&IT_exUsr);
-            }
-        }
-        IT_r.replyNoResults (CORBA::Flags(CORBA::INV_NO_RESPONSE),IT_env);
-        return 1;
-    }
-
-    if (IT_isTarget)
-        IT_r.makeRuntimeException2 ();
-
-    return 0;
-}
-
-#include "cubitC.cpp"
-
diff --git a/TAO/IIOP/test/Orbix/base_server/cubitS.h b/TAO/IIOP/test/Orbix/base_server/cubitS.h
deleted file mode 100644
index 757af4664ad..00000000000
--- a/TAO/IIOP/test/Orbix/base_server/cubitS.h
+++ /dev/null
@@ -1,118 +0,0 @@
-#ifndef _cubitS_h
-#define _cubitS_h
-
-#include "cubitC.h"
-
-/************************************************************************/
-/*                                                                      */
-/* This file is automatically generated by ORBeline IDL compiler        */
-/* Do not modify this file.                                             */
-/*                                                                      */
-/* ORBeline (c) is copyrighted by PostModern Computing, Inc.            */
-/*                                                                      */
-/* The generated code conforms to OMG's IDL C++ mapping as              */
-/* specified in OMG Document Number: 94-9-14.                           */
-/*                                                                      */
-/************************************************************************/
-
-class _sk_Cubit : public Cubit
-{
-    protected:
-	_sk_Cubit(const char *object_name = (const char *)NULL);
-	_sk_Cubit(const char *service_name, const CORBA::ReferenceData& data);
-	virtual ~_sk_Cubit() {}
-    public:
-	static const CORBA::TypeInfo _skel_info;
-
-	// The following operations need to be implemented by the server.
-	virtual CORBA::Octet cube_octet(CORBA::Octet o) = 0;
-	virtual CORBA::Short cube_short(CORBA::Short s) = 0;
-	virtual CORBA::Long cube_long(CORBA::Long l) = 0;
-	virtual Cubit::Many cube_struct(const Cubit::Many& values) = 0;
-	virtual Cubit::oneof cube_union(const Cubit::oneof& values) = 0;
-	virtual void please_exit() = 0;
-	
-	// Skeleton Operations implemented automatically
-	
-	static void _cube_octet(void *obj,
-			CORBA::MarshalStream &strm,
-			CORBA::Principal_ptr principal,
-			const char *oper,
-			void *priv_data);
-	
-	static void _cube_short(void *obj,
-			CORBA::MarshalStream &strm,
-			CORBA::Principal_ptr principal,
-			const char *oper,
-			void *priv_data);
-	
-	static void _cube_long(void *obj,
-			CORBA::MarshalStream &strm,
-			CORBA::Principal_ptr principal,
-			const char *oper,
-			void *priv_data);
-	
-	static void _cube_struct(void *obj,
-			CORBA::MarshalStream &strm,
-			CORBA::Principal_ptr principal,
-			const char *oper,
-			void *priv_data);
-	
-	static void _cube_union(void *obj,
-			CORBA::MarshalStream &strm,
-			CORBA::Principal_ptr principal,
-			const char *oper,
-			void *priv_data);
-	
-	static void _please_exit(void *obj,
-			CORBA::MarshalStream &strm,
-			CORBA::Principal_ptr principal,
-			const char *oper,
-			void *priv_data);
-	
-};
-template <class T>
-class _tie_Cubit : public Cubit
-{
-    public:
-	_tie_Cubit(T& t, const char *obj_name=(char*)NULL) : 
-			Cubit(obj_name), 
-			_ref(t) {
-		_object_name(obj_name);
-	}
-	_tie_Cubit(T& t, const char *service_name,
-			const CORBA::ReferenceData& id)
-			:_ref(t) {
-		_service(service_name, id);
-	}
-	~_tie_Cubit() {}
-	CORBA::Octet cube_octet(CORBA::Octet o) {
-		return _ref.cube_octet(
-		o);
-	}
-	CORBA::Short cube_short(CORBA::Short s) {
-		return _ref.cube_short(
-		s);
-	}
-	CORBA::Long cube_long(CORBA::Long l) {
-		return _ref.cube_long(
-		l);
-	}
-	Cubit::Many cube_struct(const Cubit::Many& values) {
-		return _ref.cube_struct(
-		values);
-	}
-	Cubit::oneof cube_union(const Cubit::oneof& values) {
-		return _ref.cube_union(
-		values);
-	}
-	void please_exit() {
-		_ref.please_exit();
-	}
-
-    private:
-	T& _ref;
-};
-
-#endif
-
diff --git a/TAO/IIOP/test/Orbix/base_server/cubit_impl.cpp b/TAO/IIOP/test/Orbix/base_server/cubit_impl.cpp
deleted file mode 100644
index e35f1084118..00000000000
--- a/TAO/IIOP/test/Orbix/base_server/cubit_impl.cpp
+++ /dev/null
@@ -1,46 +0,0 @@
-#include "cubit_impl.h"
-
-CORBA::Octet Cubit_Impl:: cube_octet (CORBA::Octet o, CORBA::Environment &IT_env) throw (CORBA::SystemException) {
-  return (CORBA::Octet) (o * o * o); 
-}
-
-CORBA::Short Cubit_Impl:: cube_short (CORBA::Short s, CORBA::Environment &IT_env) throw (CORBA::SystemException) {
-  return (CORBA::Short) (s * s * s);
-}
-
-CORBA::Long Cubit_Impl:: cube_long (CORBA::Long l, CORBA::Environment &IT_env) throw (CORBA::SystemException) {
-   return (CORBA::Long) (l * l * l);
-}
-
-Cubit::Many Cubit_Impl:: cube_struct (const Cubit::Many& values, CORBA::Environment &IT_env) throw (CORBA::SystemException) {
-  Cubit::Many out_values;
-  out_values.o = values.o * values.o * values.o;
-  out_values.s = values.s * values.s * values.s;
-  out_values.l = values.l * values.l * values.l;
-  return out_values; 
-}
-
-Cubit::oneof Cubit_Impl:: cube_union (const Cubit::oneof& values, CORBA::Environment &IT_env) throw (CORBA::SystemException) {
-  Cubit::oneof out_values;
-   switch (values._d ()) {
-   case Cubit::e_0th:
-     out_values.o (values.o () * values.o ()  * values.o ());
-     break;
-   case Cubit::e_1st:
-     out_values.s (values.s () * values.s () * values.s ());
-     break;
-   case Cubit::e_2nd:
-     out_values.l (values.l () * values.l () * values.l ());
-     break;
-   case Cubit::e_3rd:
-   default:
-     out_values.cm ().o = values.cm ().o * values.cm ().o * values.cm ().o ;
-     out_values.cm ().s = values.cm ().s * values.cm ().s * values.cm ().s ;
-     out_values.cm ().l = values.cm ().l * values.cm ().l * values.cm ().l ;
-     break;
-   }
-   return out_values;  
-}
-
-void Cubit_Impl:: please_exit (CORBA::Environment &IT_env) throw (CORBA::SystemException) {
-}
diff --git a/TAO/IIOP/test/Orbix/base_server/cubit_impl.h b/TAO/IIOP/test/Orbix/base_server/cubit_impl.h
deleted file mode 100644
index 1e710bb15d1..00000000000
--- a/TAO/IIOP/test/Orbix/base_server/cubit_impl.h
+++ /dev/null
@@ -1,27 +0,0 @@
-
-#ifndef cubit_ih
-#define cubit_ih
-
-#include "cubit.h"
-
-
-#ifdef Cubit_USE_BOA
-class Cubit_Impl : public virtual CubitBOAImpl {
-#else
-class Cubit_Impl {
-#endif /* Cubit_USE_BOA */
-
-public:
-        virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env=CORBA::default_environment) throw (CORBA::SystemException);
-        virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env=CORBA::default_environment) throw (CORBA::SystemException);
-        virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env=CORBA::default_environment) throw (CORBA::SystemException);
-        virtual Cubit::Many cube_struct (const Cubit::Many& values, CORBA::Environment &IT_env=CORBA::default_environment) throw (CORBA::SystemException);
-        virtual Cubit::oneof cube_union (const Cubit::oneof& values, CORBA::Environment &IT_env=CORBA::default_environment) throw (CORBA::SystemException);
-        virtual void please_exit (CORBA::Environment &IT_env=CORBA::default_environment) throw (CORBA::SystemException);
-};
-
-#ifndef Cubit_USE_BOA
-DEF_TIE_Cubit (Cubit_Impl)
-#endif /* Cubit_USE_BOA */
-
-#endif
diff --git a/TAO/IIOP/test/Orbix/base_server/server.cpp b/TAO/IIOP/test/Orbix/base_server/server.cpp
deleted file mode 100644
index 96117fe3e0d..00000000000
--- a/TAO/IIOP/test/Orbix/base_server/server.cpp
+++ /dev/null
@@ -1,40 +0,0 @@
-//**************************************************************************
-//
-// NAME :   tpr_server.cpp 
-// DESCRIPTION:  
-//
-// Server mainline
-//
-//****************************************************************************
-#define IT_EX_MACROS
-
-#include "cubit_impl.h"		// server header file
-
-int 
-main (int , char**)
-{
-
-#ifdef Cubit_USE_BOA
-  Cubit_var cb = new Cubit_Impl;
-  cout << "Using BOA approach" << endl;
-#else
-  Cubit_var cb = new TIE_Cubit (Cubit_Impl) (new Cubit_Impl);
-  cout << "Using TIE approach" << endl;
-#endif /* Cubit_USE_BOA */
-  
-  //
-  // Go get some work to do....
-  //
-  IT_TRY {
-      CORBA::Orbix.impl_is_ready("Cubit", IT_X);
-  }
-  IT_CATCHANY {
-     cout << IT_X << endl;
-  }
-  IT_ENDTRY;
-
-  cout << "Cubit server is exiting." << endl;
-
-
-  return 0;
-}
diff --git a/TAO/IIOP/test/Orbix/base_server/tpr.cpp b/TAO/IIOP/test/Orbix/base_server/tpr.cpp
deleted file mode 100644
index 415410aea9f..00000000000
--- a/TAO/IIOP/test/Orbix/base_server/tpr.cpp
+++ /dev/null
@@ -1,26 +0,0 @@
-#include "tpr.h"
-
-void *
-worker(void *vp)
-{
-  ACE_Thread_Control tc (ACE_Thread_Manager::instance ());
-  CORBA::Orbix.continueThreadDispatch (*(CORBA::Request *)vp);
-  return NULL;
-}
-
-
-int
-tpr_filter::inRequestPreMarshal(CORBA::Request &r,  CORBA::Environment&)
-{
-//   thread_t	tid;
-//   thr_create(NULL, 0, worker, (void *)&r, THR_DETACHED, &tid);
-
-  ACE_Thread_Manager *thr_mgr = ACE_Thread_Manager::instance ();
-  thr_mgr->spawn (ACE_THR_FUNC (worker),
-                  (void *) &r, 
-                  THR_DETACHED);
-
-  return -1;
-}
-
-tpr_filter tpr_dispatcher;
diff --git a/TAO/IIOP/test/Orbix/base_server/tpr.h b/TAO/IIOP/test/Orbix/base_server/tpr.h
deleted file mode 100644
index 38c2ccc7069..00000000000
--- a/TAO/IIOP/test/Orbix/base_server/tpr.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#include "cubit.h"
-#include "ace/Service_Config.h"
-#include "ace/Thread_Manager.h"
-
-//
-// Create a thread filter to dispatch incoming calls
-//
-class tpr_filter : public CORBA::ThreadFilter {
-	virtual int inRequestPreMarshal(CORBA::Request &, CORBA::Environment&);
-};
diff --git a/TAO/IIOP/test/Orbix/client/Makefile b/TAO/IIOP/test/Orbix/client/Makefile
deleted file mode 100644
index 70b3257447d..00000000000
--- a/TAO/IIOP/test/Orbix/client/Makefile
+++ /dev/null
@@ -1,89 +0,0 @@
-#----------------------------------------------------------------------------
-#	@(#)Makefile	1.1	10/18/96
-#
-#	Makefile for the ACE_MT_CORBA_Handler tests
-#----------------------------------------------------------------------------
-
-#----------------------------------------------------------------------------
-#	Local macros
-#----------------------------------------------------------------------------
-
-SRC = cubitC.cpp client.cpp
-
-CLT_OBJS = cubitC.o client.o
-
-LDLIBS	 = 
-
-VLDLIBS	 = $(LDLIBS:%=%$(VAR))
-
-#----------------------------------------------------------------------------
-#	Include macros and targets
-#----------------------------------------------------------------------------
-
-include		$(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-include		$(ACE_ROOT)/include/makeinclude/macros.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.common.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.lib.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.bin.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
-
-#----------------------------------------------------------------------------
-#	Orbix related macros and target settings.
-#----------------------------------------------------------------------------
-
-
-ORBIX_BINDIR    = $(ORBIX_ROOT)/bin
-ORBIX_LIBDIR    = $(ORBIX_ROOT)/corba2/lib
-ORBIX_INCDIR    = $(ORBIX_ROOT)/corba2/include
-
-CPPFLAGS += -DEXCEPTIONS -I$(ORBIX_INCDIR) -DWANT_ORBIX_FDS
-LDFLAGS  += -L$(ORBIX_LIBDIR) -R $(ORBIX_LIBDIR) -L$(ACE)/ace
-
-IDLFLAGS = -s S.cpp -c C.cpp -B
-
-#----------------------------------------------------------------------------
-#	Local targets
-#----------------------------------------------------------------------------
-
-all: client 
-
-client: $(addprefix $(VDIR),$(CLT_OBJS))
-	$(LINK.cc) -o client $(addprefix $(VDIR),$(CLT_OBJS)) $(LDFLAGS) $(ITIIOP) $(ITCLT) $(VLDLIBS)
-
-
-#----------------------------------------------------------------------------
-#	Dependencies
-#----------------------------------------------------------------------------
-# DO NOT DELETE THIS LINE -- g++dep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-
-.obj/cubitC.o .shobj/cubitC.so: cubitC.cpp cubit.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/config-sunos5.5-sunc++-4.x.h \
- $(ACE_ROOT)/ace/stdcpp.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i
-.obj/client.o .shobj/client.so: client.cpp $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/config-sunos5.5-sunc++-4.x.h \
- $(ACE_ROOT)/ace/stdcpp.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i cubit.h
-
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/IIOP/test/Orbix/client/client.cpp b/TAO/IIOP/test/Orbix/client/client.cpp
deleted file mode 100644
index fcf45bdf706..00000000000
--- a/TAO/IIOP/test/Orbix/client/client.cpp
+++ /dev/null
@@ -1,232 +0,0 @@
-//**************************************************************************
-//
-// NAME :   client.C 
-// DESCRIPTION:  
-//
-// Client for the Cubit example
-//
-//****************************************************************************
-
-#include "ace/OS.h"
-#include "ace/Get_Opt.h"
-#include "cubit.h"
-
-int LOOP_COUNT;
-char SERVER_HOST [1024];
-
-inline int func (unsigned i) { return i - 117; }
-void run_tests (Cubit_var, int);
-
-// = TITLE
-//     Parses the command line arguments and returns an error status
-//
-// = DESCRIPTION
-//     This method parses the command line arguments
-int parse_args(int argc, char *argv[])
-{
-  ACE_OS::strcpy (SERVER_HOST, "localhost");
-  ACE_Get_Opt opts (argc, argv, "dh:n:O:x");
-  int			c;
-  
-  while ((c = opts ()) != -1)
-    switch (c) {
-    case 'h':
-      ACE_OS::strcpy (SERVER_HOST, opts.optarg);
-      continue;
-    case 'd':  // debug flag
-      continue;
-      
-    case 'n':			// loop count
-      LOOP_COUNT = (unsigned) ACE_OS::atoi (opts.optarg);
-      continue;
-      
-    case 'O':			// stringified objref
-      continue;
-      
-    case 'x':
-      continue;
-      
-    case '?':
-    default:
-      ACE_OS::fprintf (stderr, "usage:  %s"
-                       " [-d]"
-                       " [-n loopcount]"
-                       " [-h SERVER_HOST]"
-                       " [-x]"
-                       "\n", argv [0]
-                       );
-      return 1;
-    }
-  
-  return 0;  // Indicates successful parsing of command line
-}
-
-
-//
-// Mainline
-//
-int
-main (int argc, char *argv[])
-{
-  if (parse_args (argc, argv) != 0)
-    return -1;
-
-  Cubit_var cb;
-  // cout << "attempting to contact server at host " << SERVER_HOST << '\n' ;
- 
-  //
-  // Initialise client's binding to an
-  // arbitrary cubit server (at some host)
-  // 
-  TRY {
-    cb = Cubit::_bind ("", SERVER_HOST, IT_X);
-  }
-  CATCHANY {
-    cerr << "Binding failed: " << IT_X;
-  }
-  ENDTRY;
-  
-  run_tests (cb, LOOP_COUNT);
-  return 0;
-}
-
-
-void
-run_tests (Cubit_var cb, int loop_count) 
-{
-    //
-  // Make the calls in a loop.
-  //
-  unsigned i;
-  unsigned call_count, error_count;
-
-  call_count = 0;
-  error_count = 0;
-
-  ACE_Time_Value before, after;
-
-  before = ACE_OS::gettimeofday();
-  
-  //
-  // Cube an octet.
-  //
-  
-  for (i = 0; i < loop_count; i++)
-    {
-
-      call_count++;
-
-      CORBA::Octet arg_octet = func (i), ret_octet;
-
-      TRY {
-      ret_octet = cb->cube_octet (arg_octet);
-      } 
-      CATCHANY {
-        cerr << "Call failed: " << IT_X;
-        error_count++;
-      } 
-      ENDTRY;
-      arg_octet = arg_octet * arg_octet * arg_octet;
-      if (arg_octet != ret_octet) {
-        ACE_OS::printf ("** cube_octet(%d)  (--> %d)\n", arg_octet , ret_octet);
-        error_count++;
-      }
-    
-  
-  //
-  // Cube a short.
-  //
-      call_count++;
-
-      CORBA::Short arg_short = func (i), ret_short;
-
-      TRY {
-      ret_short = cb->cube_short (arg_short);
-      } 
-      CATCHANY {
-        cerr << "Call failed: " << IT_X;
-        error_count++;
-      } 
-      ENDTRY;
-      arg_short = arg_short * arg_short * arg_short;
-      if (arg_short != ret_short) {
-        ACE_OS::printf ("** cube_short(%d)  (--> %d)\n", arg_short , ret_short);
-        error_count++;
-      }
-
-  //
-  // Cube a long.
-  //
-  
-      call_count++;
-
-      CORBA::Long arg_long = func (i), ret_long;
-
-      TRY {
-      ret_long = cb->cube_long (arg_long);
-      } 
-      CATCHANY {
-        cerr << "Call failed: " << IT_X;
-      } 
-      ENDTRY;
-      arg_long = arg_long * arg_long * arg_long;
-      if (arg_long != ret_long) {
-        ACE_OS::printf ("** cube_long(%d)  (--> %d)\n", arg_long , ret_long);
-        error_count++;
-      }
-
-
-      //
-      // Cube a "struct" ...
-      //
-      Cubit::Many	arg_struct, ret_struct;
-      
-       call_count++;
-       
-       arg_struct.l = func (i);
-       arg_struct.s = func (i);
-       arg_struct.o = func (i);
-       
-       TRY {
-         ret_struct = cb->cube_struct (arg_struct);
-       }
-       CATCHANY {
-         cerr << "Call failed: " << IT_X;
-         error_count++;
-       } 
-       ENDTRY;
-       arg_struct.l = arg_struct.l  * arg_struct.l  * arg_struct.l ;
-       arg_struct.s = arg_struct.s  * arg_struct.s  * arg_struct.s ;
-       arg_struct.o = arg_struct.o  * arg_struct.o  * arg_struct.o ;
-       
-       if (arg_struct.l  != ret_struct.l 
-           || arg_struct.s  != ret_struct.s 
-           || arg_struct.o  != ret_struct.o )
-         {
-           cerr << "** cube_struct ERROR\n";
-           error_count++;
-         }
-    }
-    
-  
-  after = ACE_OS::gettimeofday();
-  
-  if (call_count > 0) 
-    {
-      if (error_count == 0)
-        {
-          ACE_Time_Value diff = after - before;
-          unsigned long	us = diff.sec() * 1000 * 1000 + diff.usec();
-          
-          us /= call_count;
-          
-          if (us > 0)
-            ACE_OS::printf ("cube average call ACE_OS::time\t= %ld.%.03ldms, \t"
-                            "%ld calls/second\n",
-                            us / 1000, us % 1000,
-                            1000000L / us);
-        }
-      
-      ACE_OS::printf ("%d calls, %d errors\n", call_count, error_count);
-    }
-}
diff --git a/TAO/IIOP/test/Orbix/client/cubit.h b/TAO/IIOP/test/Orbix/client/cubit.h
deleted file mode 100644
index 1c868a6597d..00000000000
--- a/TAO/IIOP/test/Orbix/client/cubit.h
+++ /dev/null
@@ -1,727 +0,0 @@
-
-#ifndef cubit_hh
-#define cubit_hh
-
-#include "ace/OS.h"
-#include <CORBA.h>
-
-
-#ifndef _Cubit_defined
-#define _Cubit_defined
-class Cubit_dispatch : public virtual CORBA::PPTR {
-public:
-
-      Cubit_dispatch (void *IT_p, CORBA::Object* IT_o, const char *IT_m, 
-        CORBA::LoaderClass *IT_l, char *IT_i, void* IT_im)
-       : PPTR (IT_p,IT_o,IT_m,IT_l,IT_i,IT_im) {}
-
-
-   Cubit_dispatch (char *IT_OR, void *IT_p, CORBA::Object *IT_o)
-       : PPTR (IT_OR,IT_p,IT_o) {}
-
-
-   Cubit_dispatch () {}
-
-   Cubit_dispatch (ObjectReference *IT_OR, void *IT_p, CORBA::Object *IT_o)
-       : PPTR (IT_OR,IT_p,IT_o) {}
-
-
-   Cubit_dispatch (void *IT_p, CORBA::Object *IT_o, const char *IT_m, 
-        char *IT_i, CORBA::Object* IT_ob, void* IT_im)
-       : PPTR (IT_p,IT_o,IT_m,IT_i,IT_ob,IT_im) {}
-
-
-   virtual unsigned char dispatch (CORBA::Request &IT_r, 
-        unsigned char IT_isTarget, void* IT_pp=NULL);
-
-
-};
-
-class Cubit;
-
-#ifndef CubitPtr
-#define CubitPtr
-
-typedef Cubit* Cubit_ptr;
-
-typedef Cubit* CubitRef;
-
-#endif
-
-
-#ifndef CubitForwH
-#define CubitForwH
-CORBA::ObjectRef Cubit_getBase (void *);
-void Cubit_release (Cubit *, CORBA::Environment &IT_env);
-void Cubit_release (Cubit_ptr);
-Cubit* Cubit_duplicate (Cubit_ptr, CORBA::Environment &IT_env);
-Cubit* Cubit_duplicate (Cubit_ptr );
-Cubit_ptr Cubit_nil (CORBA::Environment &IT_env);
-Cubit_ptr Cubit_nil ();
-#endif
-#define Cubit_IMPL "Cubit"
-
-
-class Cubit;
-
-typedef Cubit CubitProxy;
-#define Cubit_IR "Cubit$v1.1"
-#define Cubit_IMPL "Cubit"
-
-#ifndef CubitPtr
-#define CubitPtr
-
-typedef Cubit* Cubit_ptr;
-
-typedef Cubit* CubitRef;
-
-#endif
-
-class Cubit: public virtual CORBA::Object  {
-public:
-        Cubit (char *IT_OR);
-    Cubit (ObjectReference *IT_OR);
-    Cubit () : CORBA::Object  (1) {}
-protected:
-    Cubit_ptr __duplicate(
-            CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) {
-       CORBA::Object::__duplicate (IT_env);
-       return this;
-    }
-public:
-    static Cubit_ptr _duplicate(
-            Cubit_ptr, 
-            CORBA::Environment &IT_pEnv=CORBA::IT_chooseDefaultEnv ());
-public:
-   static Cubit* _bind (const char* IT_markerServer, const char* host,
-		const CORBA::Context &IT_c, 
-		CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-   static Cubit* _bind (CORBA::Environment &IT_env);
-   static Cubit* _bind (const char* IT_markerServer=NULL, const char* host=NULL,
-                 CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-    static Cubit* _narrow (CORBA::Object* , CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-    static Cubit_ptr _nil (CORBA::Environment &IT_pEnv=CORBA::IT_chooseDefaultEnv ()) {
-        CORBA::EnvExcRaiser IT_raise;
-        CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-        return (Cubit_ptr) CORBA::OBJECT_NIL;}
-
-#ifndef Cubit_Many_defined
-#define Cubit_Many_defined
-
-struct Many {
-    CORBA::Octet o;
-    CORBA::Long l;
-    CORBA::Short s;
-
-    void encodeOp (CORBA::Request &IT_r) const;
-    void decodeOp (CORBA::Request &IT_r);
-    void decodeInOutOp (CORBA::Request &IT_r);
-    Many(const Many &);
-    Many();
-    ~Many();
-    Many& operator= (const Many&);
-};
-
-#ifndef Cubit_ManyVarH
-#define Cubit_ManyVarH
-
-#ifndef Cubit_ManyvPtr
-#define Cubit_ManyvPtr
-typedef Many* Many_vPtr;
-typedef const Many* Many_cvPtr;
-#endif
-
-class Many_var : public CORBA::_var
-{
-    private:
-
-    unsigned char copyHelper (const Many_var &IT_s) {
-        if (!IT_s._ptr) {
-            _ptr = IT_s._ptr;
-        } else
-        {
-            _ptr = new Many;
-            *(_ptr) =  *(IT_s._ptr);
-        }
-        return 1;
-    }
-
-    public:
-
-    Many_var (const Many_var &IT_s) {
-        (void) copyHelper (IT_s);
-    }
-
-    Many_var () {
-        _ptr =  new Many;
-;
-    }
-
-    Many_var (Many *IT_p) {
-        _ptr = IT_p;
-    }
-
-    Many_var &operator= (Many *IT_p) {
-        if (_ptr != IT_p) {
-            delete _ptr;
-        }
-        _ptr = IT_p;
-        return (*this);
-    }
-
-    Many_var &operator= (const Many_var &IT_s) {
-        if (_ptr != IT_s._ptr) {
-            delete _ptr;
-        }
-        _ptr = new Many;
-        *(_ptr) =  *(IT_s._ptr);
-        return (*this);
-    }
-
-    ~Many_var () {
-        delete _ptr;
-    }
-
-    Many* operator-> () {
-        return _ptr;
-    }
-
-    operator Many_cvPtr () const { return _ptr;}
-    operator Many_vPtr& () { return _ptr;}
-    operator Many& () const { return * _ptr;}
-
-    protected:
-    Many *_ptr;
-    private:
-    Many_var &operator= (const CORBA::_var &IT_s);
-    Many_var (const CORBA::_var &IT_s);
-};
-
-#endif
-
-
-#endif
-
-enum discrim {e_0th,e_1st,e_2nd,e_3rd,e_4th,e_5th, IT__ENUM_Cubit_discrim=CORBA_ULONG_MAX};
-
-#ifndef Cubit_oneof_defined
-#define Cubit_oneof_defined
-
-struct oneof {
-    private:
-
-    discrim __d;
-    union {
-        CORBA::Octet _o_;
-        CORBA::Short _s_;
-        CORBA::Long _l_;
-        Many * _cm_;
-    };
-
-    public:
-
-    void encodeOp (CORBA::Request &IT_r) const;
-    void decodeOp (CORBA::Request &IT_r);
-    void decodeInOutOp (CORBA::Request &IT_r);
-
-    private:
-
-    unsigned char isSet;
-
-    public:
-
-    discrim _d () const { return __d; }
-
-    CORBA::Octet o () const {
-      return _o_;
-    }
-
-    void o (CORBA::Octet IT_member) {
-        if (isSet && (__d != Cubit::e_0th))
-        {
-            this-> oneof::~oneof();
-            memset(this, 0, sizeof(*this));
-        }
-
-        __d = Cubit::e_0th;
-        isSet = 1;
-        _o_ = IT_member;
-    }
-
-    CORBA::Short s () const {
-        return _s_;
-    }
-
-    void s (CORBA::Short IT_member) {
-        if (isSet && (__d != Cubit::e_1st))
-        {
-            this-> oneof::~oneof();
-            memset(this, 0, sizeof(*this));
-        }
-
-        __d = Cubit::e_1st;
-        isSet = 1;
-        _s_ = IT_member;
-    }
-
-    CORBA::Long l () const {
-        return _l_;
-    }
-
-    void l (CORBA::Long IT_member) {
-        if (isSet && (__d != Cubit::e_2nd))
-        {
-            this-> oneof::~oneof();
-            memset(this, 0, sizeof(*this));
-        }
-
-        __d = Cubit::e_2nd;
-        isSet = 1;
-        _l_ = IT_member;
-    }
-
-    Many& cm () {
-        return (*_cm_);
-    }
-
-    const Many& cm () const {
-        return (*_cm_);
-    }
-
-    void cm (const Many& IT_member) {
-        if (isSet && (__d != Cubit::e_3rd))
-        {
-            this-> oneof::~oneof();
-            memset(this, 0, sizeof(*this));
-        }
-
-        __d = Cubit::e_3rd;
-
-        if (!isSet) {
-            _cm_ = new Many;
-            isSet = 1;
-        }
-        *(_cm_) = IT_member;
-    }
-
-
-    oneof();
-    oneof(const oneof &);
-    ~oneof();
-    oneof& operator= (const oneof&);
-};
-
-#ifndef Cubit_oneofVarH
-#define Cubit_oneofVarH
-
-#ifndef Cubit_oneofvPtr
-#define Cubit_oneofvPtr
-typedef oneof* oneof_vPtr;
-typedef const oneof* oneof_cvPtr;
-#endif
-
-class oneof_var : public CORBA::_var
-{
-    private:
-
-    unsigned char copyHelper (const oneof_var &IT_s) {
-        if (!IT_s._ptr) {
-            _ptr = IT_s._ptr;
-        } else
-        {
-            _ptr = new oneof;
-            *(_ptr) =  *(IT_s._ptr);
-        }
-        return 1;
-    }
-
-    public:
-
-    oneof_var (const oneof_var &IT_s) {
-        (void) copyHelper (IT_s);
-    }
-
-    oneof_var () {
-        _ptr = NULL;
-    }
-
-    oneof_var (oneof *IT_p) {
-        _ptr = IT_p;
-    }
-
-    oneof_var &operator= (oneof *IT_p) {
-        if (_ptr != IT_p) {
-            delete _ptr;
-        }
-        _ptr = IT_p;
-        return (*this);
-    }
-
-    oneof_var &operator= (const oneof_var &IT_s) {
-        if (_ptr != IT_s._ptr) {
-            delete _ptr;
-        }
-        _ptr = new oneof;
-        *(_ptr) =  *(IT_s._ptr);
-        return (*this);
-    }
-
-    ~oneof_var () {
-        delete _ptr;
-    }
-
-    oneof* operator-> () {
-        return _ptr;
-    }
-
-    operator oneof_cvPtr () const { return _ptr;}
-    operator oneof_vPtr& () { return _ptr;}
-    operator oneof& () const { return * _ptr;}
-
-    protected:
-    oneof *_ptr;
-    private:
-    oneof_var &operator= (const CORBA::_var &IT_s);
-    oneof_var (const CORBA::_var &IT_s);
-};
-
-#endif
-
-
-#endif
-        virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual Many cube_struct (const Many& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual oneof cube_union (const oneof& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual void please_exit (CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-};
-
-#ifndef CubitVarH
-#define CubitVarH
-
-#ifndef CubitvPtr
-#define CubitvPtr
-typedef Cubit* Cubit_vPtr;
-typedef const Cubit* Cubit_cvPtr;
-#endif
-
-class Cubit_var : public CORBA::_var
-{
-    private:
-
-    unsigned char copyHelper (const Cubit_var &IT_s) {
-        {
-            _ptr = Cubit_duplicate (IT_s._ptr);
-        }
-        return 1;
-    }
-
-    public:
-
-    Cubit_var (const Cubit_var &IT_s) {
-        (void) copyHelper (IT_s);
-    }
-
-    Cubit_var () {
-        _ptr = Cubit_nil ();
-    }
-
-    Cubit_var (Cubit *IT_p) {
-        _ptr = IT_p;
-    }
-
-    Cubit_var &operator= (Cubit *IT_p) {
-        Cubit_release (_ptr);
-        _ptr = IT_p;
-        return (*this);
-    }
-
-    Cubit_var &operator= (const Cubit_var &IT_s) {
-        Cubit_release (_ptr);
-        _ptr = Cubit_duplicate (IT_s._ptr);
-        return (*this);
-    }
-
-    ~Cubit_var () {
-        Cubit_release (_ptr);
-    }
-
-    Cubit* operator-> () {
-        return _ptr;
-    }
-
-    operator Cubit_cvPtr () const { return _ptr;}
-    operator Cubit_vPtr& () { return _ptr;}
-
-    protected:
-    Cubit *_ptr;
-    private:
-    Cubit_var &operator= (const CORBA::_var &IT_s);
-    Cubit_var (const CORBA::_var &IT_s);
-    Cubit_var &operator= (const CORBA::_mgr &IT_s);
-    Cubit_var &operator= (const CORBA::_SeqElem &IT_s);
-    Cubit_var (const CORBA::_mgr &IT_s);
-    Cubit_var (const CORBA::_SeqElem &IT_s);
-};
-
-#endif
-
-
-#ifndef CubitMgrH
-#define CubitMgrH
-
-class Cubit_mgr : public CORBA::_mgr
-{
-    public:
-
-    Cubit_mgr () {
-        _ptr = Cubit_nil ();
-        _release = 1;
-    }
-
-    Cubit_mgr (const Cubit_mgr &IT_s) {
-        _ptr = Cubit_duplicate (IT_s._ptr);
-        _release = 1;
-    }
-
-    Cubit_mgr &operator= (Cubit *IT_p) {
-        if (_ptr && _release)
-            Cubit_release (_ptr);
-        _ptr = IT_p;
-        _release = 1;
-        return (*this);
-    }
-
-    Cubit_mgr &operator= (const Cubit_mgr &IT_s) {
-        if (_ptr && _release)
-            Cubit_release (_ptr);
-        _ptr = Cubit_duplicate(IT_s._ptr);
-        _release = 1;
-        return (*this);
-    }
-
-    Cubit_mgr &operator= (Cubit_var &IT_s) {
-        if (_ptr && _release)
-            Cubit_release (_ptr);
-        _ptr = Cubit_duplicate(IT_s);
-        _release = 1;
-        return (*this);
-    }
-
-    ~Cubit_mgr () {
-        if (_release)
-            Cubit_release (_ptr);
-    }
-
-    unsigned char release () {
-        return _release;
-    }
-
-    void release (unsigned char rel) {
-        _release = rel;
-    }
-
-    operator int () const {
-        return (((CORBA::Object_ptr) _ptr) ? 1 : 0);
-    }
-
-    operator void* () const {
-        return _ptr;
-    }
-
-    operator CORBA::Object * () const {
-        return (CORBA::Object *) _ptr;
-    }
-
-    operator Cubit* () const {
-        return (Cubit*) _ptr;
-    }
-
-    Cubit_ptr operator-> () const {
-        return _ptr;
-    }
-
-    Cubit *_ptr;
-
-    protected:
-
-    unsigned char _release;
-};
-
-typedef Cubit_mgr Cubit_mgr_IT_const;
-#endif
-
-#ifndef CubitSeqElemH
-#define CubitSeqElemH
-
-class Cubit_SeqElem : public CORBA::_SeqElem
-{
-    public:
-
-    Cubit_SeqElem (Cubit_ptr* IT_p, unsigned char rel) {
-        _ptr = IT_p;
-        _release = rel;
-    }
-
-    Cubit_SeqElem &operator= (Cubit_ptr IT_p) {
-        if (_ptr) {
-            if (*(_ptr) && _release)
-                Cubit_release (*(_ptr));
-            *(_ptr) = IT_p;
-        }
-        return (*this);
-    }
-
-    Cubit_SeqElem &operator= (const Cubit_SeqElem &IT_s) {
-        if (_ptr && IT_s._ptr) {
-            if (*(_ptr) && _release)
-                Cubit_release (*(_ptr));
-            *(_ptr) = Cubit_duplicate(*(IT_s._ptr));
-        }
-        return (*this);
-    }
-
-    operator Cubit_ptr () const {
-        return _ptr ? (Cubit_ptr) (*_ptr) : Cubit_nil(); 
-    }
-
-    Cubit_ptr operator->() const { return *_ptr;}
-
-    protected:
-    Cubit_ptr *_ptr;
-    unsigned char _release;
-};
-
-#endif
-
-
-#define TIE_Cubit(X) Cubit##X
-
-#define DEF_TIE_Cubit(X) \
-	class Cubit##X : public virtual Cubit {		\
-	  X* m_obj;						\
-	public:							\
-								\
-								\
-	   Cubit##X  (X *objp, const char* m="", CORBA::LoaderClass *l=0)\
-		: Cubit(), m_obj(objp) {	\
-		m_pptr = new Cubit_dispatch		\
-			(( Cubit*)this,(CORBA::Object*)this,m,l,Cubit_IR,m_obj);	\
-	   }								\
-	   Cubit##X  (CORBA::Object *IT_p, const char* IT_m="", void *IT_q=0)\
-		: Cubit() {	\
-		m_pptr = new Cubit_dispatch		\
-			(( Cubit*)this,(CORBA::Object*)this,IT_m,Cubit_IR,IT_p,IT_q);	\
-		m_obj = (X*)(m_pptr->getImplObj ());			\
-	   }								\
-								\
-	   virtual ~Cubit##X  () {				\
-		if (_okToDeleteImpl ()) delete m_obj; }					\
-	   virtual void* _deref () {					\
-		return m_obj; }					\
-								\
-virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_octet (  o,IT_env);\
-}\
-	\
-virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_short (  s,IT_env);\
-}\
-	\
-virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_long (  l,IT_env);\
-}\
-	\
-virtual Cubit::Many cube_struct (const Cubit::Many& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_struct (  values,IT_env);\
-}\
-	\
-virtual Cubit::oneof cube_union (const Cubit::oneof& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_union (  values,IT_env);\
-}\
-	\
-virtual void please_exit (CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-m_obj->please_exit (IT_env);\
-}\
-								\
-	};						\
-
-
-#define QUALS_Cubit	\
-virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_octet (  o,IT_env);\
-}\
-	\
-virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_short (  s,IT_env);\
-}\
-	\
-virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_long (  l,IT_env);\
-}\
-	\
-virtual Many cube_struct (const Many& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_struct (  values,IT_env);\
-}\
-	\
-virtual oneof cube_union (const oneof& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_union (  values,IT_env);\
-}\
-	\
-virtual void please_exit (CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-m_obj->please_exit (IT_env);\
-}\
-
-
-
-
-class CubitProxyFactoryClass : public virtual CORBA::ObjectFactoryClass {
-public:
-   CubitProxyFactoryClass (unsigned char IT_p=0)
-		: CORBA::ProxyFactory (Cubit_IR, IT_p) {}
-
-    virtual void* New (char *IT_OR, CORBA::Environment&);
-
-    virtual void* New (ObjectReference *IT_OR, CORBA::Environment&);
-
-    virtual void* New2 (); 
-
-    virtual CORBA::Object* NewObject (char *IT_OR, CORBA::Environment&);
-
-    virtual CORBA::Object* NewObject (ObjectReference *IT_OR, CORBA::Environment&);
-
-    virtual CORBA::Object* New2Object (); 
-
-    virtual void* IT_castUp (void *IT_p, char* IT_s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-
-    virtual CORBA::PPTR* pptr (void *IT_p);
-
-    virtual void baseInterfaces (_IDL_SEQUENCE_string&);
-
-
-};
-
-extern CubitProxyFactoryClass CubitProxyFactory;
-
-class CubitBOAImpl : public virtual Cubit  {
-public:
-    CubitBOAImpl (const char *m="", CORBA::LoaderClass *l=NULL) {
-  if (CORBA::PPTR::isOK (m_pptr, Cubit_IR))
-    m_pptr = new Cubit_dispatch ( (Cubit*)this,
-   	 (CORBA::Object*)this, m, l, Cubit_IR, this);
-}
-
-        virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual Many cube_struct (const Many& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual oneof cube_union (const oneof& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual void please_exit (CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-};
-
-
-#endif
-
-
-#endif
diff --git a/TAO/IIOP/test/Orbix/client/cubit.idl b/TAO/IIOP/test/Orbix/client/cubit.idl
deleted file mode 100644
index d9b38c34a2a..00000000000
--- a/TAO/IIOP/test/Orbix/client/cubit.idl
+++ /dev/null
@@ -1,40 +0,0 @@
-// @(#)cubit.idl	1.1 95/09/10
-// Copyright 1994-1995 by Sun Microsystems, Inc.
-
-#pragma prefix	"Eng.SUN.COM"
-#pragma version Cubit 1.1
-
-interface Cubit {
-    octet	cube_octet (in octet o);
-    short	cube_short (in short s);
-    long	cube_long (in long l);
-
-    struct Many {
-	octet	o;		// + 3 bytes padding (normally) ...
-	long	l;
-	short	s;		// + 2 bytes padding (normally) ...
-    };
-
-    Many	cube_struct (in Many values);
-
-    enum discrim {e_0th, e_1st, e_2nd, e_3rd, e_4th, e_5th};
-
-    union oneof
-    switch (discrim) {
-	// this is an easy union to interpret; no padding
-	// is needed between discriminant and value.
-      case e_0th:
-        octet		o;
-      case e_1st:
-        short		s;
-      case e_2nd:
-        long		l;
-      case e_3rd:
-      default:
-        Many		cm;
-    };
-
-    oneof	cube_union (in oneof values);
-
-    oneway void	please_exit ();
-};
diff --git a/TAO/IIOP/test/Orbix/client/cubitC.cpp b/TAO/IIOP/test/Orbix/client/cubitC.cpp
deleted file mode 100644
index c47e38f26ee..00000000000
--- a/TAO/IIOP/test/Orbix/client/cubitC.cpp
+++ /dev/null
@@ -1,557 +0,0 @@
-#include "cubit.h"
-
-Cubit::Cubit (char *IT_OR) {
-      m_pptr = new Cubit_dispatch (IT_OR, this,(CORBA::Object*)this);
-} 
-Cubit::Cubit (ObjectReference *IT_OR) {
-      m_pptr = new Cubit_dispatch (IT_OR, this,(CORBA::Object*)this);
-} 
-
-#ifndef CubitForwC
-#define CubitForwC
-CORBA::ObjectRef Cubit_getBase(void *IT_p){
-    return (Cubit*) IT_p;}
-
-void Cubit_release (Cubit_ptr IT_p, CORBA::Environment &IT_env) {
-    CORBA::release(IT_p, IT_env);}
-
-void Cubit_release (Cubit_ptr IT_p) {
-    Cubit_release (IT_p, CORBA::IT_chooseDefaultEnv ()); }
-
-Cubit_ptr Cubit_nil (CORBA::Environment &) {
-    return Cubit:: _nil ();}
-
-Cubit_ptr Cubit_nil () {
-    return Cubit_nil (CORBA::IT_chooseDefaultEnv ());}
-
-Cubit_ptr Cubit_duplicate (Cubit_ptr IT_p, CORBA::Environment &IT_env) {
-    return (Cubit::_duplicate(IT_p, IT_env)); }
-Cubit_ptr Cubit_duplicate (Cubit_ptr IT_p) {
-    return Cubit_duplicate (IT_p, CORBA::IT_chooseDefaultEnv ()); }
-#endif
-
-Cubit_ptr Cubit::_duplicate(Cubit_ptr obj, CORBA::Environment& IT_pEnv) {
-        CORBA::EnvExcRaiser IT_raise;
-        CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-       if (!obj) {
-          return (obj);
-       }
-       Cubit_ptr IT_obj = obj->__duplicate (IT_env);
-       return IT_obj;
-}
-
-
-
-Cubit* Cubit:: _bind (const char* IT_markerServer, const char* host,
-		const CORBA::Context &IT_c, 
-		CORBA::Environment &IT_env) {
-       return (Cubit*)CORBA::Factory.New (IT_markerServer, IT_env, IT_c, host, 
-		Cubit_IMPL, Cubit_IR);
-}
-
-
-
-Cubit* Cubit:: _bind (CORBA::Environment &IT_env) {
-       return _bind (NULL,NULL,CORBA::Context(), IT_env); }
-
-
-Cubit* Cubit:: _bind (const char* IT_markerServer, const char* host,
-                CORBA::Environment &IT_env) {
-       return _bind (IT_markerServer, host, CORBA::Context (), IT_env); }
-Cubit* Cubit::_narrow (CORBA::Object* IT_obj, CORBA::Environment &IT_pEnv) {
-        CORBA::EnvExcRaiser IT_raise;
-        CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-        if (CORBA::is_nil (IT_obj)) {
-                return Cubit:: _nil();
-        }
-
-       Cubit* IT_p = (Cubit*)CORBA::Object::_castDown (IT_obj, Cubit_IR, IT_env);
-        IT_p = IT_p ? IT_p->__duplicate(IT_env) : NULL;
-        if ((IT_env) &&(!strcmp(IT_env.exception()->id(), "CORBA::StExcep::BAD_PARAM")) && (((CORBA::BAD_PARAM*)IT_env.exception())-> minor() == NARROW_FAILED)) {
-                IT_env.exception_free();
-        }
-        return IT_p;
-   }
-
-
-#ifndef Cubit_Many_Ops
-#define Cubit_Many_Ops
-
-void Cubit::Many:: encodeOp (CORBA::Request &IT_r) const {
-
-    IT_r.insertOctet (o);
-
-    IT_r << l;
-
-    IT_r << s;
-}
-
-void Cubit::Many:: decodeOp (CORBA::Request &IT_r) {
-
-    IT_r.extractOctet (o);
-
-    IT_r >> l;
-
-    IT_r >> s;
-}
-
-void Cubit::Many:: decodeInOutOp (CORBA::Request &IT_r) {
-
-    IT_r.extractOctet (o);
-
-    IT_r >> l;
-
-    IT_r >> s;
-}
-
-Cubit::Many ::~Many () {
-}
-
-Cubit::Many:: Many (const Cubit::Many &IT_s) 
-	 {
-    o = IT_s.o;
-    l = IT_s.l;
-    s = IT_s.s;
-}
-
-Cubit::Many:: Many () {
-}
-
-Cubit::Many &Cubit::Many:: operator= (const Cubit::Many& IT_s) {
-    if (this == &IT_s) return *this;
-    o = IT_s.o;
-    l = IT_s.l;
-    s = IT_s.s;
-    return *this;
-}
-
-
-#endif
-
-
-#ifndef Cubit_oneof_Ops
-#define Cubit_oneof_Ops
-void Cubit::oneof:: encodeOp (CORBA::Request &IT_r) const {
-    if (!isSet) return;
-    {
-    CORBA::ULong IT_0 = (CORBA::ULong) __d;
-    IT_r << IT_0;
-    }
-    switch (__d) {
-        case Cubit::e_0th: 
-        IT_r.insertOctet (_o_);
-        break;
-        case Cubit::e_1st: 
-        IT_r << _s_;
-        break;
-        case Cubit::e_2nd: 
-        IT_r << _l_;
-        break;
-        case Cubit::e_3rd: 
-        default: 
-        (*_cm_).encodeOp (IT_r);
-        break;
-    }
-
-}
-
-void Cubit::oneof:: decodeOp (CORBA::Request &IT_r) {
-    isSet = 0;
-    {
-    CORBA::ULong IT_1;
-    IT_r >> IT_1;
-    __d = Cubit::discrim(IT_1);
-    }
-    switch (__d) {
-        case Cubit::e_0th: 
-        if (!isSet) {
-            isSet = 1;
-        }
-        IT_r.extractOctet (_o_);
-        break;
-        case Cubit::e_1st: 
-        if (!isSet) {
-            isSet = 1;
-        }
-        IT_r >> _s_;
-        break;
-        case Cubit::e_2nd: 
-        if (!isSet) {
-            isSet = 1;
-        }
-        IT_r >> _l_;
-        break;
-        case Cubit::e_3rd: 
-        default: 
-        if (!isSet) {
-            _cm_ = new Cubit::Many;
-            isSet = 1;
-        }
-        (*_cm_).decodeOp (IT_r);
-        break;
-    }
-
-}
-void Cubit::oneof:: decodeInOutOp (CORBA::Request &IT_r) {
-    Cubit::discrim IT_d;
-    {
-    CORBA::ULong IT_2;
-    IT_r >> IT_2;
-    IT_d = Cubit::discrim(IT_2);
-    }
-    if (IT_d == __d)
-        switch (__d) {
-            case Cubit::e_0th: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r.extractOctet (_o_);
-            break;
-            case Cubit::e_1st: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r >> _s_;
-            break;
-            case Cubit::e_2nd: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r >> _l_;
-            break;
-            case Cubit::e_3rd: 
-            default: 
-            if (!isSet) {
-                _cm_ = new Cubit::Many;
-                isSet = 1;
-            }
-            (*_cm_).decodeInOutOp (IT_r);
-            break;
-        }
-
-    else {
-        this->oneof:: ~oneof();
-        memset(this, 0, sizeof(*this));
-        __d = IT_d;
-        switch (__d) {
-            case Cubit::e_0th: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r.extractOctet (_o_);
-            break;
-            case Cubit::e_1st: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r >> _s_;
-            break;
-            case Cubit::e_2nd: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r >> _l_;
-            break;
-            case Cubit::e_3rd: 
-            default: 
-            if (!isSet) {
-                _cm_ = new Cubit::Many;
-                isSet = 1;
-            }
-            (*_cm_).decodeOp (IT_r);
-            break;
-        }
-        isSet = 1;
-    }
-
-}
-
-Cubit::oneof:: oneof() { 
-    memset(this, 0, sizeof(*this));
-    isSet = 0;
-}
-
-Cubit::oneof ::~oneof() {
-    if (!isSet) return;
-    switch (__d) { 
-        case Cubit::e_0th:         break;
-        case Cubit::e_1st:         break;
-        case Cubit::e_2nd:         break;
-        case Cubit::e_3rd: 
-        default:         if (_cm_) delete _cm_;
-        break;
-    }
-
-    isSet = 0;
-}
-
-Cubit::oneof:: oneof (const Cubit::oneof &IT_s) {
-    isSet = 0;
-    memset(this, 0, sizeof(*this));
-    __d = IT_s.__d;
-    switch (__d) {
-        case Cubit::e_0th:         isSet = 1;
-        _o_ = IT_s._o_;
-        break;
-        case Cubit::e_1st:         isSet = 1;
-        _s_ = IT_s._s_;
-        break;
-        case Cubit::e_2nd:         isSet = 1;
-        _l_ = IT_s._l_;
-        break;
-        case Cubit::e_3rd: 
-        default: 
-        if (!isSet) {
-            _cm_ = new Cubit::Many;
-            isSet = 1;
-        }
-        *(_cm_) = *(IT_s._cm_);
-        break;
-    }
-    isSet = 1;
-}
-
-Cubit::oneof& Cubit::oneof:: operator= (const Cubit::oneof & IT_s) {
-    if (this == &IT_s) return *this;
-    if (isSet && (__d != IT_s.__d))
-    {
-        this-> oneof::~oneof();
-        memset(this, 0, sizeof(*this));
-    }
-
-    __d = IT_s.__d;
-    switch (__d) {
-        case Cubit::e_0th:         isSet = 1;
-        _o_ = IT_s._o_;
-        break;
-        case Cubit::e_1st:         isSet = 1;
-        _s_ = IT_s._s_;
-        break;
-        case Cubit::e_2nd:         isSet = 1;
-        _l_ = IT_s._l_;
-        break;
-        case Cubit::e_3rd: 
-        default: 
-        if (!isSet) {
-            _cm_ = new Cubit::Many;
-            isSet = 1;
-        }
-        *(_cm_) = *(IT_s._cm_);
-        break;
-    }
-    isSet = 1;
-    return *this;
-}
-
-
-#endif
-
-void* CubitProxyFactoryClass::New (char *IT_OR, CORBA::Environment&) {
-        return  new class Cubit(IT_OR);}
-
-void* CubitProxyFactoryClass::New (ObjectReference *IT_OR, CORBA::Environment&) {
-        return  new class Cubit(IT_OR);}
-
-void* CubitProxyFactoryClass::New2 () {
-        return  new class Cubit((char*)0);}
-
-CORBA::Object* CubitProxyFactoryClass::NewObject (char *IT_OR, CORBA::Environment&) {
-        return  new class Cubit(IT_OR);}
-
-CORBA::Object* CubitProxyFactoryClass::NewObject (ObjectReference *IT_OR, CORBA::Environment&) {
-        return  new class Cubit(IT_OR);}
-
-CORBA::Object* CubitProxyFactoryClass::New2Object () {
-        return  new class Cubit((char*)0);}
-
-void* CubitProxyFactoryClass::IT_castUp (void *IT_p, char* IT_s, CORBA::Environment &IT_env) {
-      void *IT_l;
-      if (!CORBA::_interfaceCmp (IT_s,Cubit_IR, IT_env))
-         return IT_p;
-      else if (IT_l=CORBA::ObjectFactoryClass::IT_castUp((CORBA::Object*)((class Cubit*)IT_p),IT_s, IT_env))
-         return IT_l;
-      else return NULL;
-    }
-
-
-CORBA::PPTR* CubitProxyFactoryClass::pptr (void *IT_p) {
-       return ((class Cubit*)IT_p)->_pptr ();}
-
-void CubitProxyFactoryClass::baseInterfaces (_IDL_SEQUENCE_string& seq) {
-      add (seq, Cubit_IR);
-      CORBA::ObjectFactoryClass::baseInterfaces (seq);
-}
-
-CubitProxyFactoryClass CubitProxyFactory(1);
-
-CORBA::Octet Cubit:: cube_octet (CORBA::Octet o, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        return 0;
-    }
-    CORBA::Request IT_r (this, "cube_octet",IT_env,1,0);
-    if (!IT_r.isException (IT_env)) {
-
-        IT_r.insertOctet (o);
-    }
-
-    IT_r.invoke (CORBA::Flags(0),IT_env);
-    if (!IT_r.isException (IT_env)) {
-        CORBA::Octet IT_result;
-        IT_r.extractOctet (IT_result);
-        IT_r.checkEnv (IT_env);
-        return IT_result;
-    }
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-    return 0;
-}
-
-CORBA::Short Cubit:: cube_short (CORBA::Short s, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        return 0;
-    }
-    CORBA::Request IT_r (this, "cube_short",IT_env,1,0);
-    if (!IT_r.isException (IT_env)) {
-
-        IT_r << s;
-    }
-
-    IT_r.invoke (CORBA::Flags(0),IT_env);
-    if (!IT_r.isException (IT_env)) {
-        CORBA::Short IT_result;
-        IT_r >> IT_result;
-        IT_r.checkEnv (IT_env);
-        return IT_result;
-    }
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-    return 0;
-}
-
-CORBA::Long Cubit:: cube_long (CORBA::Long l, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        return 0;
-    }
-    CORBA::Request IT_r (this, "cube_long",IT_env,1,0);
-    if (!IT_r.isException (IT_env)) {
-
-        IT_r << l;
-    }
-
-    IT_r.invoke (CORBA::Flags(0),IT_env);
-    if (!IT_r.isException (IT_env)) {
-        CORBA::Long IT_result;
-        IT_r >> IT_result;
-        IT_r.checkEnv (IT_env);
-        return IT_result;
-    }
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-    return 0;
-}
-
-Cubit::Many Cubit:: cube_struct (const Cubit::Many& values, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        { 
-            Cubit::Many IT_l0;
-            return IT_l0;
-        }
-    }
-    CORBA::Request IT_r (this, "cube_struct",IT_env,1,0);
-    if (!IT_r.isException (IT_env)) {
-
-        values.encodeOp (IT_r);
-    }
-
-    IT_r.invoke (CORBA::Flags(0),IT_env);
-    if (!IT_r.isException (IT_env)) {
-        Cubit::Many IT_result;
-        IT_result.decodeOp (IT_r);
-        IT_r.checkEnv (IT_env);
-        return IT_result;
-    }
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-    { 
-        Cubit::Many IT_l1;
-        return IT_l1;
-    }
-}
-
-Cubit::oneof Cubit:: cube_union (const Cubit::oneof& values, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        { 
-            Cubit::oneof IT_l0;
-            return IT_l0;
-        }
-    }
-    CORBA::Request IT_r (this, "cube_union",IT_env,1,0);
-    if (!IT_r.isException (IT_env)) {
-
-        values.encodeOp (IT_r);
-    }
-
-    IT_r.invoke (CORBA::Flags(0),IT_env);
-    if (!IT_r.isException (IT_env)) {
-        Cubit::oneof IT_result;
-        IT_result.decodeOp (IT_r);
-        IT_r.checkEnv (IT_env);
-        return IT_result;
-    }
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-    { 
-        Cubit::oneof IT_l1;
-        return IT_l1;
-    }
-}
-
-void Cubit:: please_exit (CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        return ;
-    }
-    CORBA::Request IT_r (this, "please_exit",IT_env,1,1);
-
-    IT_r.invoke (CORBA::Flags(CORBA::INV_NO_RESPONSE), IT_env);
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-}
-
-
-
-
-
-#ifndef Cubit_dispatch_impl
-
-unsigned char Cubit_dispatch::dispatch (CORBA::Request &IT_r, 
-    unsigned char, void *) {
-      IT_r.makeRuntimeException1 ("Cubit");
-      return 0;
-}
- 
-#endif
-
diff --git a/TAO/IIOP/test/Orbix/factory_client/Makefile b/TAO/IIOP/test/Orbix/factory_client/Makefile
deleted file mode 100644
index de2877537b6..00000000000
--- a/TAO/IIOP/test/Orbix/factory_client/Makefile
+++ /dev/null
@@ -1,77 +0,0 @@
-#----------------------------------------------------------------------------
-#	@(#)Makefile	1.1	10/18/96
-#
-#	Makefile for the ACE_MT_CORBA_Handler tests
-#----------------------------------------------------------------------------
-
-#----------------------------------------------------------------------------
-#	Local macros
-#----------------------------------------------------------------------------
-
-SRC = cubitC.cpp client.cpp
-
-CLT_OBJS = cubitC.o client.o
-
-LDLIBS	 = 
-
-VLDLIBS	 = $(LDLIBS:%=%$(VAR))
-
-#----------------------------------------------------------------------------
-#	Include macros and targets
-#----------------------------------------------------------------------------
-
-include		$(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-include		$(ACE_ROOT)/include/makeinclude/macros.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.common.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.lib.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.bin.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
-
-#----------------------------------------------------------------------------
-#	Orbix related macros and target settings.
-#----------------------------------------------------------------------------
-
-
-ORBIX_BINDIR    = $(ORBIX_ROOT)/bin
-ORBIX_LIBDIR    = $(ORBIX_ROOT)/corba2/lib
-ORBIX_INCDIR    = $(ORBIX_ROOT)/corba2/include
-
-CPPFLAGS += -DEXCEPTIONS -I$(ORBIX_INCDIR) -DWANT_ORBIX_FDS
-LDFLAGS  += -L$(ORBIX_LIBDIR) -R $(ORBIX_LIBDIR) -L$(ACE)/ace
-
-IDLFLAGS = -s S.cpp -c C.cpp -B
-
-#----------------------------------------------------------------------------
-#	Local targets
-#----------------------------------------------------------------------------
-
-all: client 
-
-client: $(addprefix $(VDIR),$(CLT_OBJS))
-	$(LINK.cc) -o client $(addprefix $(VDIR),$(CLT_OBJS)) $(LDFLAGS) $(ITIIOP) $(ITCLT) $(VLDLIBS)
-
-
-#----------------------------------------------------------------------------
-#	Dependencies
-#----------------------------------------------------------------------------
-# DO NOT DELETE THIS LINE -- g++dep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-
-.obj/cubitC.o .shobj/cubitC.so: cubitC.cpp cubit.h
-.obj/client.o .shobj/client.so: client.cpp $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/config-sunos5.5-sunc++-4.x.h \
- $(ACE_ROOT)/ace/stdcpp.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i cubit.h
-
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/IIOP/test/Orbix/factory_client/client.cpp b/TAO/IIOP/test/Orbix/factory_client/client.cpp
deleted file mode 100644
index c61cfbc85a5..00000000000
--- a/TAO/IIOP/test/Orbix/factory_client/client.cpp
+++ /dev/null
@@ -1,235 +0,0 @@
-//**************************************************************************
-//
-// NAME :   client.C 
-// DESCRIPTION:  
-//
-// Client for the Cubit example
-//
-//****************************************************************************
-
-#include "ace/OS.h"
-#include "ace/Get_Opt.h"
-#include "cubit.h"
-
-int LOOP_COUNT;
-char SERVER_HOST [1024];
-
-inline int func (unsigned i) { return i - 117; }
-void run_tests (Cubit_var, int);
-
-// = TITLE
-//     Parses the command line arguments and returns an error status
-//
-// = DESCRIPTION
-//     This method parses the command line arguments
-int parse_args(int argc, char *argv[])
-{
-  ACE_OS::strcpy (SERVER_HOST, "localhost");
-  ACE_Get_Opt opts (argc, argv, "dh:n:O:x");
-  int			c;
-  
-  while ((c = opts ()) != -1)
-    switch (c) {
-    case 'h':
-      ACE_OS::strcpy (SERVER_HOST, opts.optarg);
-      continue;
-    case 'd':  // debug flag
-      continue;
-      
-    case 'n':			// loop count
-      LOOP_COUNT = (unsigned) ACE_OS::atoi (opts.optarg);
-      continue;
-      
-    case 'O':			// stringified objref
-      continue;
-      
-    case 'x':
-      continue;
-      
-    case '?':
-    default:
-      ACE_OS::fprintf (stderr, "usage:  %s"
-                       " [-d]"
-                       " [-n loopcount]"
-                       " [-h SERVER_HOST]"
-                       " [-x]"
-                       "\n", argv [0]
-                       );
-      return 1;
-    }
-  
-  return 0;  // Indicates successful parsing of command line
-}
-
-
-//
-// Mainline
-//
-int
-main (int argc, char *argv[])
-{
-  if (parse_args (argc, argv) != 0)
-    return -1;
-
-  Cubit_var cb;
-  Cubit_Factory_var cf;
-  
-  // cout << "attempting to contact server at host " << SERVER_HOST << '\n' ;
- 
-  //
-  // Initialise client's binding to an
-  // arbitrary cubit server (at some host)
-  // 
-  TRY {
-    cf = Cubit_Factory::_bind ("", SERVER_HOST, IT_X);
-  }
-  CATCHANY {
-    cerr << "Binding failed: " << IT_X;
-  }
-  ENDTRY;
-  cb = cf->create_cubit ("My_Cubit");
-  
-  run_tests (cb, LOOP_COUNT);
-  return 0;
-}
-
-
-void
-run_tests (Cubit_var cb, int loop_count) 
-{
-    //
-  // Make the calls in a loop.
-  //
-  unsigned i;
-  unsigned call_count, error_count;
-
-  call_count = 0;
-  error_count = 0;
-
-  ACE_Time_Value before, after;
-
-  before = ACE_OS::gettimeofday();
-  
-  //
-  // Cube an octet.
-  //
-  
-  for (i = 0; i < loop_count; i++)
-    {
-
-      call_count++;
-
-      CORBA::Octet arg_octet = func (i), ret_octet;
-
-      TRY {
-      ret_octet = cb->cube_octet (arg_octet);
-      } 
-      CATCHANY {
-        cerr << "Call failed: " << IT_X;
-        error_count++;
-      } 
-      ENDTRY;
-      arg_octet = arg_octet * arg_octet * arg_octet;
-      if (arg_octet != ret_octet) {
-        ACE_OS::printf ("** cube_octet(%d)  (--> %d)\n", arg_octet , ret_octet);
-        error_count++;
-      }
-    
-  
-  //
-  // Cube a short.
-  //
-      call_count++;
-
-      CORBA::Short arg_short = func (i), ret_short;
-
-      TRY {
-      ret_short = cb->cube_short (arg_short);
-      } 
-      CATCHANY {
-        cerr << "Call failed: " << IT_X;
-        error_count++;
-      } 
-      ENDTRY;
-      arg_short = arg_short * arg_short * arg_short;
-      if (arg_short != ret_short) {
-        ACE_OS::printf ("** cube_short(%d)  (--> %d)\n", arg_short , ret_short);
-        error_count++;
-      }
-
-  //
-  // Cube a long.
-  //
-  
-      call_count++;
-
-      CORBA::Long arg_long = func (i), ret_long;
-
-      TRY {
-      ret_long = cb->cube_long (arg_long);
-      } 
-      CATCHANY {
-        cerr << "Call failed: " << IT_X;
-      } 
-      ENDTRY;
-      arg_long = arg_long * arg_long * arg_long;
-      if (arg_long != ret_long) {
-        ACE_OS::printf ("** cube_long(%d)  (--> %d)\n", arg_long , ret_long);
-        error_count++;
-      }
-
-
-      //
-      // Cube a "struct" ...
-      //
-      Cubit::Many	arg_struct, ret_struct;
-      
-       call_count++;
-       
-       arg_struct.l = func (i);
-       arg_struct.s = func (i);
-       arg_struct.o = func (i);
-       
-       TRY {
-         ret_struct = cb->cube_struct (arg_struct);
-       }
-       CATCHANY {
-         cerr << "Call failed: " << IT_X;
-         error_count++;
-       } 
-       ENDTRY;
-       arg_struct.l = arg_struct.l  * arg_struct.l  * arg_struct.l ;
-       arg_struct.s = arg_struct.s  * arg_struct.s  * arg_struct.s ;
-       arg_struct.o = arg_struct.o  * arg_struct.o  * arg_struct.o ;
-       
-       if (arg_struct.l  != ret_struct.l 
-           || arg_struct.s  != ret_struct.s 
-           || arg_struct.o  != ret_struct.o )
-         {
-           cerr << "** cube_struct ERROR\n";
-           error_count++;
-         }
-    }
-    
-  
-  after = ACE_OS::gettimeofday();
-  
-  if (call_count > 0) 
-    {
-      if (error_count == 0)
-        {
-          ACE_Time_Value diff = after - before;
-          unsigned long	us = diff.sec() * 1000 * 1000 + diff.usec();
-          
-          us /= call_count;
-          
-          if (us > 0)
-            ACE_OS::printf ("cube average call ACE_OS::time\t= %ld.%.03ldms, \t"
-                            "%ld calls/second\n",
-                            us / 1000, us % 1000,
-                            1000000L / us);
-        }
-      
-      ACE_OS::printf ("%d calls, %d errors\n", call_count, error_count);
-    }
-}
diff --git a/TAO/IIOP/test/Orbix/factory_client/cubit.h b/TAO/IIOP/test/Orbix/factory_client/cubit.h
deleted file mode 100644
index 72e2fb81395..00000000000
--- a/TAO/IIOP/test/Orbix/factory_client/cubit.h
+++ /dev/null
@@ -1,1111 +0,0 @@
-
-#ifndef cubit_hh
-#define cubit_hh
-
-#include <CORBA.h>
-
-#include <string.h>
-
-
-#ifndef _Cubit_defined
-#define _Cubit_defined
-class Cubit_dispatch : public virtual CORBA::PPTR {
-public:
-
-      Cubit_dispatch (void *IT_p, CORBA::Object* IT_o, const char *IT_m, 
-        CORBA::LoaderClass *IT_l, char *IT_i, void* IT_im)
-       : PPTR (IT_p,IT_o,IT_m,IT_l,IT_i,IT_im) {}
-
-
-   Cubit_dispatch (char *IT_OR, void *IT_p, CORBA::Object *IT_o)
-       : PPTR (IT_OR,IT_p,IT_o) {}
-
-
-   Cubit_dispatch () {}
-
-   Cubit_dispatch (ObjectReference *IT_OR, void *IT_p, CORBA::Object *IT_o)
-       : PPTR (IT_OR,IT_p,IT_o) {}
-
-
-   Cubit_dispatch (void *IT_p, CORBA::Object *IT_o, const char *IT_m, 
-        char *IT_i, CORBA::Object* IT_ob, void* IT_im)
-       : PPTR (IT_p,IT_o,IT_m,IT_i,IT_ob,IT_im) {}
-
-
-   virtual unsigned char dispatch (CORBA::Request &IT_r, 
-        unsigned char IT_isTarget, void* IT_pp=NULL);
-
-
-};
-
-class Cubit;
-
-#ifndef CubitPtr
-#define CubitPtr
-
-typedef Cubit* Cubit_ptr;
-
-typedef Cubit* CubitRef;
-
-#endif
-
-
-#ifndef CubitForwH
-#define CubitForwH
-CORBA::ObjectRef Cubit_getBase (void *);
-void Cubit_release (Cubit *, CORBA::Environment &IT_env);
-void Cubit_release (Cubit_ptr);
-Cubit* Cubit_duplicate (Cubit_ptr, CORBA::Environment &IT_env);
-Cubit* Cubit_duplicate (Cubit_ptr );
-Cubit_ptr Cubit_nil (CORBA::Environment &IT_env);
-Cubit_ptr Cubit_nil ();
-#endif
-#define Cubit_IMPL "Cubit"
-
-
-class Cubit;
-
-typedef Cubit CubitProxy;
-#define Cubit_IR "Cubit$v1.1"
-#define Cubit_IMPL "Cubit"
-
-#ifndef CubitPtr
-#define CubitPtr
-
-typedef Cubit* Cubit_ptr;
-
-typedef Cubit* CubitRef;
-
-#endif
-
-class Cubit: public virtual CORBA::Object  {
-public:
-        Cubit (char *IT_OR);
-    Cubit (ObjectReference *IT_OR);
-    Cubit () : CORBA::Object  (1) {}
-protected:
-    Cubit_ptr __duplicate(
-            CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) {
-       CORBA::Object::__duplicate (IT_env);
-       return this;
-    }
-public:
-    static Cubit_ptr _duplicate(
-            Cubit_ptr, 
-            CORBA::Environment &IT_pEnv=CORBA::IT_chooseDefaultEnv ());
-public:
-   static Cubit* _bind (const char* IT_markerServer, const char* host,
-		const CORBA::Context &IT_c, 
-		CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-   static Cubit* _bind (CORBA::Environment &IT_env);
-   static Cubit* _bind (const char* IT_markerServer=NULL, const char* host=NULL,
-                 CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-    static Cubit* _narrow (CORBA::Object* , CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-    static Cubit_ptr _nil (CORBA::Environment &IT_pEnv=CORBA::IT_chooseDefaultEnv ()) {
-        CORBA::EnvExcRaiser IT_raise;
-        CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-        return (Cubit_ptr) CORBA::OBJECT_NIL;}
-
-#ifndef Cubit_Many_defined
-#define Cubit_Many_defined
-
-struct Many {
-    CORBA::Octet o;
-    CORBA::Long l;
-    CORBA::Short s;
-
-    void encodeOp (CORBA::Request &IT_r) const;
-    void decodeOp (CORBA::Request &IT_r);
-    void decodeInOutOp (CORBA::Request &IT_r);
-    Many(const Many &);
-    Many();
-    ~Many();
-    Many& operator= (const Many&);
-};
-
-#ifndef Cubit_ManyVarH
-#define Cubit_ManyVarH
-
-#ifndef Cubit_ManyvPtr
-#define Cubit_ManyvPtr
-typedef Many* Many_vPtr;
-typedef const Many* Many_cvPtr;
-#endif
-
-class Many_var : public CORBA::_var
-{
-    private:
-
-    unsigned char copyHelper (const Many_var &IT_s) {
-        if (!IT_s._ptr) {
-            _ptr = IT_s._ptr;
-        } else
-        {
-            _ptr = new Many;
-            *(_ptr) =  *(IT_s._ptr);
-        }
-        return 1;
-    }
-
-    public:
-
-    Many_var (const Many_var &IT_s) {
-        (void) copyHelper (IT_s);
-    }
-
-    Many_var () {
-        _ptr =  new Many;
-;
-    }
-
-    Many_var (Many *IT_p) {
-        _ptr = IT_p;
-    }
-
-    Many_var &operator= (Many *IT_p) {
-        if (_ptr != IT_p) {
-            delete _ptr;
-        }
-        _ptr = IT_p;
-        return (*this);
-    }
-
-    Many_var &operator= (const Many_var &IT_s) {
-        if (_ptr != IT_s._ptr) {
-            delete _ptr;
-        }
-        _ptr = new Many;
-        *(_ptr) =  *(IT_s._ptr);
-        return (*this);
-    }
-
-    ~Many_var () {
-        delete _ptr;
-    }
-
-    Many* operator-> () {
-        return _ptr;
-    }
-
-    operator Many_cvPtr () const { return _ptr;}
-    operator Many_vPtr& () { return _ptr;}
-    operator Many& () const { return * _ptr;}
-
-    protected:
-    Many *_ptr;
-    private:
-    Many_var &operator= (const CORBA::_var &IT_s);
-    Many_var (const CORBA::_var &IT_s);
-};
-
-#endif
-
-
-#endif
-
-enum discrim {e_0th,e_1st,e_2nd,e_3rd,e_4th,e_5th, IT__ENUM_Cubit_discrim=CORBA_ULONG_MAX};
-
-#ifndef Cubit_oneof_defined
-#define Cubit_oneof_defined
-
-struct oneof {
-    private:
-
-    discrim __d;
-    union {
-        CORBA::Octet _o_;
-        CORBA::Short _s_;
-        CORBA::Long _l_;
-        Many * _cm_;
-    };
-
-    public:
-
-    void encodeOp (CORBA::Request &IT_r) const;
-    void decodeOp (CORBA::Request &IT_r);
-    void decodeInOutOp (CORBA::Request &IT_r);
-
-    private:
-
-    unsigned char isSet;
-
-    public:
-
-    discrim _d () const { return __d; }
-
-    CORBA::Octet o () const {
-        return _o_;
-    }
-
-    void o (CORBA::Octet IT_member) {
-        if (isSet && (__d != Cubit::e_0th))
-        {
-            this-> oneof::~oneof();
-            memset(this, 0, sizeof(*this));
-        }
-
-        __d = Cubit::e_0th;
-        isSet = 1;
-        _o_ = IT_member;
-    }
-
-    CORBA::Short s () const {
-        return _s_;
-    }
-
-    void s (CORBA::Short IT_member) {
-        if (isSet && (__d != Cubit::e_1st))
-        {
-            this-> oneof::~oneof();
-            memset(this, 0, sizeof(*this));
-        }
-
-        __d = Cubit::e_1st;
-        isSet = 1;
-        _s_ = IT_member;
-    }
-
-    CORBA::Long l () const {
-        return _l_;
-    }
-
-    void l (CORBA::Long IT_member) {
-        if (isSet && (__d != Cubit::e_2nd))
-        {
-            this-> oneof::~oneof();
-            memset(this, 0, sizeof(*this));
-        }
-
-        __d = Cubit::e_2nd;
-        isSet = 1;
-        _l_ = IT_member;
-    }
-
-    Many& cm () {
-        return (*_cm_);
-    }
-
-    const Many& cm () const {
-        return (*_cm_);
-    }
-
-    void cm (const Many& IT_member) {
-        if (isSet && (__d != Cubit::e_3rd))
-        {
-            this-> oneof::~oneof();
-            memset(this, 0, sizeof(*this));
-        }
-
-        __d = Cubit::e_3rd;
-
-        if (!isSet) {
-            _cm_ = new Many;
-            isSet = 1;
-        }
-        *(_cm_) = IT_member;
-    }
-
-
-    oneof();
-    oneof(const oneof &);
-    ~oneof();
-    oneof& operator= (const oneof&);
-};
-
-#ifndef Cubit_oneofVarH
-#define Cubit_oneofVarH
-
-#ifndef Cubit_oneofvPtr
-#define Cubit_oneofvPtr
-typedef oneof* oneof_vPtr;
-typedef const oneof* oneof_cvPtr;
-#endif
-
-class oneof_var : public CORBA::_var
-{
-    private:
-
-    unsigned char copyHelper (const oneof_var &IT_s) {
-        if (!IT_s._ptr) {
-            _ptr = IT_s._ptr;
-        } else
-        {
-            _ptr = new oneof;
-            *(_ptr) =  *(IT_s._ptr);
-        }
-        return 1;
-    }
-
-    public:
-
-    oneof_var (const oneof_var &IT_s) {
-        (void) copyHelper (IT_s);
-    }
-
-    oneof_var () {
-        _ptr = NULL;
-    }
-
-    oneof_var (oneof *IT_p) {
-        _ptr = IT_p;
-    }
-
-    oneof_var &operator= (oneof *IT_p) {
-        if (_ptr != IT_p) {
-            delete _ptr;
-        }
-        _ptr = IT_p;
-        return (*this);
-    }
-
-    oneof_var &operator= (const oneof_var &IT_s) {
-        if (_ptr != IT_s._ptr) {
-            delete _ptr;
-        }
-        _ptr = new oneof;
-        *(_ptr) =  *(IT_s._ptr);
-        return (*this);
-    }
-
-    ~oneof_var () {
-        delete _ptr;
-    }
-
-    oneof* operator-> () {
-        return _ptr;
-    }
-
-    operator oneof_cvPtr () const { return _ptr;}
-    operator oneof_vPtr& () { return _ptr;}
-    operator oneof& () const { return * _ptr;}
-
-    protected:
-    oneof *_ptr;
-    private:
-    oneof_var &operator= (const CORBA::_var &IT_s);
-    oneof_var (const CORBA::_var &IT_s);
-};
-
-#endif
-
-
-#endif
-        virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual Many cube_struct (const Many& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual oneof cube_union (const oneof& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual void please_exit (CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-};
-
-#ifndef CubitVarH
-#define CubitVarH
-
-#ifndef CubitvPtr
-#define CubitvPtr
-typedef Cubit* Cubit_vPtr;
-typedef const Cubit* Cubit_cvPtr;
-#endif
-
-class Cubit_var : public CORBA::_var
-{
-    private:
-
-    unsigned char copyHelper (const Cubit_var &IT_s) {
-        {
-            _ptr = Cubit_duplicate (IT_s._ptr);
-        }
-        return 1;
-    }
-
-    public:
-
-    Cubit_var (const Cubit_var &IT_s) {
-        (void) copyHelper (IT_s);
-    }
-
-    Cubit_var () {
-        _ptr = Cubit_nil ();
-    }
-
-    Cubit_var (Cubit *IT_p) {
-        _ptr = IT_p;
-    }
-
-    Cubit_var &operator= (Cubit *IT_p) {
-        Cubit_release (_ptr);
-        _ptr = IT_p;
-        return (*this);
-    }
-
-    Cubit_var &operator= (const Cubit_var &IT_s) {
-        Cubit_release (_ptr);
-        _ptr = Cubit_duplicate (IT_s._ptr);
-        return (*this);
-    }
-
-    ~Cubit_var () {
-        Cubit_release (_ptr);
-    }
-
-    Cubit* operator-> () {
-        return _ptr;
-    }
-
-    operator Cubit_cvPtr () const { return _ptr;}
-    operator Cubit_vPtr& () { return _ptr;}
-
-    protected:
-    Cubit *_ptr;
-    private:
-    Cubit_var &operator= (const CORBA::_var &IT_s);
-    Cubit_var (const CORBA::_var &IT_s);
-    Cubit_var &operator= (const CORBA::_mgr &IT_s);
-    Cubit_var &operator= (const CORBA::_SeqElem &IT_s);
-    Cubit_var (const CORBA::_mgr &IT_s);
-    Cubit_var (const CORBA::_SeqElem &IT_s);
-};
-
-#endif
-
-
-#ifndef CubitMgrH
-#define CubitMgrH
-
-class Cubit_mgr : public CORBA::_mgr
-{
-    public:
-
-    Cubit_mgr () {
-        _ptr = Cubit_nil ();
-        _release = 1;
-    }
-
-    Cubit_mgr (const Cubit_mgr &IT_s) {
-        _ptr = Cubit_duplicate (IT_s._ptr);
-        _release = 1;
-    }
-
-    Cubit_mgr &operator= (Cubit *IT_p) {
-        if (_ptr && _release)
-            Cubit_release (_ptr);
-        _ptr = IT_p;
-        _release = 1;
-        return (*this);
-    }
-
-    Cubit_mgr &operator= (const Cubit_mgr &IT_s) {
-        if (_ptr && _release)
-            Cubit_release (_ptr);
-        _ptr = Cubit_duplicate(IT_s._ptr);
-        _release = 1;
-        return (*this);
-    }
-
-    Cubit_mgr &operator= (Cubit_var &IT_s) {
-        if (_ptr && _release)
-            Cubit_release (_ptr);
-        _ptr = Cubit_duplicate(IT_s);
-        _release = 1;
-        return (*this);
-    }
-
-    ~Cubit_mgr () {
-        if (_release)
-            Cubit_release (_ptr);
-    }
-
-    unsigned char release () {
-        return _release;
-    }
-
-    void release (unsigned char rel) {
-        _release = rel;
-    }
-
-    operator int () const {
-        return (((CORBA::Object_ptr) _ptr) ? 1 : 0);
-    }
-
-    operator void* () const {
-        return _ptr;
-    }
-
-    operator CORBA::Object * () const {
-        return (CORBA::Object *) _ptr;
-    }
-
-    operator Cubit* () const {
-        return (Cubit*) _ptr;
-    }
-
-    Cubit_ptr operator-> () const {
-        return _ptr;
-    }
-
-    Cubit *_ptr;
-
-    protected:
-
-    unsigned char _release;
-};
-
-typedef Cubit_mgr Cubit_mgr_IT_const;
-#endif
-
-#ifndef CubitSeqElemH
-#define CubitSeqElemH
-
-class Cubit_SeqElem : public CORBA::_SeqElem
-{
-    public:
-
-    Cubit_SeqElem (Cubit_ptr* IT_p, unsigned char rel) {
-        _ptr = IT_p;
-        _release = rel;
-    }
-
-    Cubit_SeqElem &operator= (Cubit_ptr IT_p) {
-        if (_ptr) {
-            if (*(_ptr) && _release)
-                Cubit_release (*(_ptr));
-            *(_ptr) = IT_p;
-        }
-        return (*this);
-    }
-
-    Cubit_SeqElem &operator= (const Cubit_SeqElem &IT_s) {
-        if (_ptr && IT_s._ptr) {
-            if (*(_ptr) && _release)
-                Cubit_release (*(_ptr));
-            *(_ptr) = Cubit_duplicate(*(IT_s._ptr));
-        }
-        return (*this);
-    }
-
-    operator Cubit_ptr () const {
-        return _ptr ? (Cubit_ptr) (*_ptr) : Cubit_nil(); 
-    }
-
-    Cubit_ptr operator->() const { return *_ptr;}
-
-    protected:
-    Cubit_ptr *_ptr;
-    unsigned char _release;
-};
-
-#endif
-
-
-#define TIE_Cubit(X) Cubit##X
-
-#define DEF_TIE_Cubit(X) \
-	class Cubit##X : public virtual Cubit {		\
-	  X* m_obj;						\
-	public:							\
-								\
-								\
-	   Cubit##X  (X *objp, const char* m="", CORBA::LoaderClass *l=0)\
-		: Cubit(), m_obj(objp) {	\
-		m_pptr = new Cubit_dispatch		\
-			(( Cubit*)this,(CORBA::Object*)this,m,l,Cubit_IR,m_obj);	\
-	   }								\
-	   Cubit##X  (CORBA::Object *IT_p, const char* IT_m="", void *IT_q=0)\
-		: Cubit() {	\
-		m_pptr = new Cubit_dispatch		\
-			(( Cubit*)this,(CORBA::Object*)this,IT_m,Cubit_IR,IT_p,IT_q);	\
-		m_obj = (X*)(m_pptr->getImplObj ());			\
-	   }								\
-								\
-	   virtual ~Cubit##X  () {				\
-		if (_okToDeleteImpl ()) delete m_obj; }					\
-	   virtual void* _deref () {					\
-		return m_obj; }					\
-								\
-virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_octet (  o,IT_env);\
-}\
-	\
-virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_short (  s,IT_env);\
-}\
-	\
-virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_long (  l,IT_env);\
-}\
-	\
-virtual Cubit::Many cube_struct (const Cubit::Many& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_struct (  values,IT_env);\
-}\
-	\
-virtual Cubit::oneof cube_union (const Cubit::oneof& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_union (  values,IT_env);\
-}\
-	\
-virtual void please_exit (CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-m_obj->please_exit (IT_env);\
-}\
-								\
-	};						\
-
-
-#define QUALS_Cubit	\
-virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_octet (  o,IT_env);\
-}\
-	\
-virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_short (  s,IT_env);\
-}\
-	\
-virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_long (  l,IT_env);\
-}\
-	\
-virtual Many cube_struct (const Many& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_struct (  values,IT_env);\
-}\
-	\
-virtual oneof cube_union (const oneof& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_union (  values,IT_env);\
-}\
-	\
-virtual void please_exit (CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-m_obj->please_exit (IT_env);\
-}\
-
-
-
-
-class CubitProxyFactoryClass : public virtual CORBA::ObjectFactoryClass {
-public:
-   CubitProxyFactoryClass (unsigned char IT_p=0)
-		: CORBA::ProxyFactory (Cubit_IR, IT_p) {}
-
-    virtual void* New (char *IT_OR, CORBA::Environment&);
-
-    virtual void* New (ObjectReference *IT_OR, CORBA::Environment&);
-
-    virtual void* New2 (); 
-
-    virtual CORBA::Object* NewObject (char *IT_OR, CORBA::Environment&);
-
-    virtual CORBA::Object* NewObject (ObjectReference *IT_OR, CORBA::Environment&);
-
-    virtual CORBA::Object* New2Object (); 
-
-    virtual void* IT_castUp (void *IT_p, char* IT_s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-
-    virtual CORBA::PPTR* pptr (void *IT_p);
-
-    virtual void baseInterfaces (_IDL_SEQUENCE_string&);
-
-
-};
-
-extern CubitProxyFactoryClass CubitProxyFactory;
-
-class CubitBOAImpl : public virtual Cubit  {
-public:
-    CubitBOAImpl (const char *m="", CORBA::LoaderClass *l=NULL) {
-  if (CORBA::PPTR::isOK (m_pptr, Cubit_IR))
-    m_pptr = new Cubit_dispatch ( (Cubit*)this,
-   	 (CORBA::Object*)this, m, l, Cubit_IR, this);
-}
-
-        virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual Many cube_struct (const Many& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual oneof cube_union (const oneof& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual void please_exit (CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-};
-
-
-#endif
-
-
-#ifndef _Cubit_Factory_defined
-#define _Cubit_Factory_defined
-class Cubit_Factory_dispatch : public virtual CORBA::PPTR {
-public:
-
-      Cubit_Factory_dispatch (void *IT_p, CORBA::Object* IT_o, const char *IT_m, 
-        CORBA::LoaderClass *IT_l, char *IT_i, void* IT_im)
-       : PPTR (IT_p,IT_o,IT_m,IT_l,IT_i,IT_im) {}
-
-
-   Cubit_Factory_dispatch (char *IT_OR, void *IT_p, CORBA::Object *IT_o)
-       : PPTR (IT_OR,IT_p,IT_o) {}
-
-
-   Cubit_Factory_dispatch () {}
-
-   Cubit_Factory_dispatch (ObjectReference *IT_OR, void *IT_p, CORBA::Object *IT_o)
-       : PPTR (IT_OR,IT_p,IT_o) {}
-
-
-   Cubit_Factory_dispatch (void *IT_p, CORBA::Object *IT_o, const char *IT_m, 
-        char *IT_i, CORBA::Object* IT_ob, void* IT_im)
-       : PPTR (IT_p,IT_o,IT_m,IT_i,IT_ob,IT_im) {}
-
-
-   virtual unsigned char dispatch (CORBA::Request &IT_r, 
-        unsigned char IT_isTarget, void* IT_pp=NULL);
-
-
-};
-
-class Cubit_Factory;
-
-#ifndef Cubit_FactoryPtr
-#define Cubit_FactoryPtr
-
-typedef Cubit_Factory* Cubit_Factory_ptr;
-
-typedef Cubit_Factory* Cubit_FactoryRef;
-
-#endif
-
-
-#ifndef Cubit_FactoryForwH
-#define Cubit_FactoryForwH
-CORBA::ObjectRef Cubit_Factory_getBase (void *);
-void Cubit_Factory_release (Cubit_Factory *, CORBA::Environment &IT_env);
-void Cubit_Factory_release (Cubit_Factory_ptr);
-Cubit_Factory* Cubit_Factory_duplicate (Cubit_Factory_ptr, CORBA::Environment &IT_env);
-Cubit_Factory* Cubit_Factory_duplicate (Cubit_Factory_ptr );
-Cubit_Factory_ptr Cubit_Factory_nil (CORBA::Environment &IT_env);
-Cubit_Factory_ptr Cubit_Factory_nil ();
-#endif
-#define Cubit_Factory_IMPL "Cubit_Factory"
-
-
-class Cubit_Factory;
-
-typedef Cubit_Factory Cubit_FactoryProxy;
-#define Cubit_Factory_IR "Cubit_Factory"
-#define Cubit_Factory_IMPL "Cubit_Factory"
-
-#ifndef Cubit_FactoryPtr
-#define Cubit_FactoryPtr
-
-typedef Cubit_Factory* Cubit_Factory_ptr;
-
-typedef Cubit_Factory* Cubit_FactoryRef;
-
-#endif
-
-class Cubit_Factory: public virtual CORBA::Object  {
-public:
-        Cubit_Factory (char *IT_OR);
-    Cubit_Factory (ObjectReference *IT_OR);
-    Cubit_Factory () : CORBA::Object  (1) {}
-protected:
-    Cubit_Factory_ptr __duplicate(
-            CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) {
-       CORBA::Object::__duplicate (IT_env);
-       return this;
-    }
-public:
-    static Cubit_Factory_ptr _duplicate(
-            Cubit_Factory_ptr, 
-            CORBA::Environment &IT_pEnv=CORBA::IT_chooseDefaultEnv ());
-public:
-   static Cubit_Factory* _bind (const char* IT_markerServer, const char* host,
-		const CORBA::Context &IT_c, 
-		CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-   static Cubit_Factory* _bind (CORBA::Environment &IT_env);
-   static Cubit_Factory* _bind (const char* IT_markerServer=NULL, const char* host=NULL,
-                 CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-    static Cubit_Factory* _narrow (CORBA::Object* , CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-    static Cubit_Factory_ptr _nil (CORBA::Environment &IT_pEnv=CORBA::IT_chooseDefaultEnv ()) {
-        CORBA::EnvExcRaiser IT_raise;
-        CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-        return (Cubit_Factory_ptr) CORBA::OBJECT_NIL;}
-        virtual Cubit_ptr create_cubit (const char * name, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-};
-
-#ifndef Cubit_FactoryVarH
-#define Cubit_FactoryVarH
-
-#ifndef Cubit_FactoryvPtr
-#define Cubit_FactoryvPtr
-typedef Cubit_Factory* Cubit_Factory_vPtr;
-typedef const Cubit_Factory* Cubit_Factory_cvPtr;
-#endif
-
-class Cubit_Factory_var : public CORBA::_var
-{
-    private:
-
-    unsigned char copyHelper (const Cubit_Factory_var &IT_s) {
-        {
-            _ptr = Cubit_Factory_duplicate (IT_s._ptr);
-        }
-        return 1;
-    }
-
-    public:
-
-    Cubit_Factory_var (const Cubit_Factory_var &IT_s) {
-        (void) copyHelper (IT_s);
-    }
-
-    Cubit_Factory_var () {
-        _ptr = Cubit_Factory_nil ();
-    }
-
-    Cubit_Factory_var (Cubit_Factory *IT_p) {
-        _ptr = IT_p;
-    }
-
-    Cubit_Factory_var &operator= (Cubit_Factory *IT_p) {
-        Cubit_Factory_release (_ptr);
-        _ptr = IT_p;
-        return (*this);
-    }
-
-    Cubit_Factory_var &operator= (const Cubit_Factory_var &IT_s) {
-        Cubit_Factory_release (_ptr);
-        _ptr = Cubit_Factory_duplicate (IT_s._ptr);
-        return (*this);
-    }
-
-    ~Cubit_Factory_var () {
-        Cubit_Factory_release (_ptr);
-    }
-
-    Cubit_Factory* operator-> () {
-        return _ptr;
-    }
-
-    operator Cubit_Factory_cvPtr () const { return _ptr;}
-    operator Cubit_Factory_vPtr& () { return _ptr;}
-
-    protected:
-    Cubit_Factory *_ptr;
-    private:
-    Cubit_Factory_var &operator= (const CORBA::_var &IT_s);
-    Cubit_Factory_var (const CORBA::_var &IT_s);
-    Cubit_Factory_var &operator= (const CORBA::_mgr &IT_s);
-    Cubit_Factory_var &operator= (const CORBA::_SeqElem &IT_s);
-    Cubit_Factory_var (const CORBA::_mgr &IT_s);
-    Cubit_Factory_var (const CORBA::_SeqElem &IT_s);
-};
-
-#endif
-
-
-#ifndef Cubit_FactoryMgrH
-#define Cubit_FactoryMgrH
-
-class Cubit_Factory_mgr : public CORBA::_mgr
-{
-    public:
-
-    Cubit_Factory_mgr () {
-        _ptr = Cubit_Factory_nil ();
-        _release = 1;
-    }
-
-    Cubit_Factory_mgr (const Cubit_Factory_mgr &IT_s) {
-        _ptr = Cubit_Factory_duplicate (IT_s._ptr);
-        _release = 1;
-    }
-
-    Cubit_Factory_mgr &operator= (Cubit_Factory *IT_p) {
-        if (_ptr && _release)
-            Cubit_Factory_release (_ptr);
-        _ptr = IT_p;
-        _release = 1;
-        return (*this);
-    }
-
-    Cubit_Factory_mgr &operator= (const Cubit_Factory_mgr &IT_s) {
-        if (_ptr && _release)
-            Cubit_Factory_release (_ptr);
-        _ptr = Cubit_Factory_duplicate(IT_s._ptr);
-        _release = 1;
-        return (*this);
-    }
-
-    Cubit_Factory_mgr &operator= (Cubit_Factory_var &IT_s) {
-        if (_ptr && _release)
-            Cubit_Factory_release (_ptr);
-        _ptr = Cubit_Factory_duplicate(IT_s);
-        _release = 1;
-        return (*this);
-    }
-
-    ~Cubit_Factory_mgr () {
-        if (_release)
-            Cubit_Factory_release (_ptr);
-    }
-
-    unsigned char release () {
-        return _release;
-    }
-
-    void release (unsigned char rel) {
-        _release = rel;
-    }
-
-    operator int () const {
-        return (((CORBA::Object_ptr) _ptr) ? 1 : 0);
-    }
-
-    operator void* () const {
-        return _ptr;
-    }
-
-    operator CORBA::Object * () const {
-        return (CORBA::Object *) _ptr;
-    }
-
-    operator Cubit_Factory* () const {
-        return (Cubit_Factory*) _ptr;
-    }
-
-    Cubit_Factory_ptr operator-> () const {
-        return _ptr;
-    }
-
-    Cubit_Factory *_ptr;
-
-    protected:
-
-    unsigned char _release;
-};
-
-typedef Cubit_Factory_mgr Cubit_Factory_mgr_IT_const;
-#endif
-
-#ifndef Cubit_FactorySeqElemH
-#define Cubit_FactorySeqElemH
-
-class Cubit_Factory_SeqElem : public CORBA::_SeqElem
-{
-    public:
-
-    Cubit_Factory_SeqElem (Cubit_Factory_ptr* IT_p, unsigned char rel) {
-        _ptr = IT_p;
-        _release = rel;
-    }
-
-    Cubit_Factory_SeqElem &operator= (Cubit_Factory_ptr IT_p) {
-        if (_ptr) {
-            if (*(_ptr) && _release)
-                Cubit_Factory_release (*(_ptr));
-            *(_ptr) = IT_p;
-        }
-        return (*this);
-    }
-
-    Cubit_Factory_SeqElem &operator= (const Cubit_Factory_SeqElem &IT_s) {
-        if (_ptr && IT_s._ptr) {
-            if (*(_ptr) && _release)
-                Cubit_Factory_release (*(_ptr));
-            *(_ptr) = Cubit_Factory_duplicate(*(IT_s._ptr));
-        }
-        return (*this);
-    }
-
-    operator Cubit_Factory_ptr () const {
-        return _ptr ? (Cubit_Factory_ptr) (*_ptr) : Cubit_Factory_nil(); 
-    }
-
-    Cubit_Factory_ptr operator->() const { return *_ptr;}
-
-    protected:
-    Cubit_Factory_ptr *_ptr;
-    unsigned char _release;
-};
-
-#endif
-
-
-#define TIE_Cubit_Factory(X) Cubit_Factory##X
-
-#define DEF_TIE_Cubit_Factory(X) \
-	class Cubit_Factory##X : public virtual Cubit_Factory {		\
-	  X* m_obj;						\
-	public:							\
-								\
-								\
-	   Cubit_Factory##X  (X *objp, const char* m="", CORBA::LoaderClass *l=0)\
-		: Cubit_Factory(), m_obj(objp) {	\
-		m_pptr = new Cubit_Factory_dispatch		\
-			(( Cubit_Factory*)this,(CORBA::Object*)this,m,l,Cubit_Factory_IR,m_obj);	\
-	   }								\
-	   Cubit_Factory##X  (CORBA::Object *IT_p, const char* IT_m="", void *IT_q=0)\
-		: Cubit_Factory() {	\
-		m_pptr = new Cubit_Factory_dispatch		\
-			(( Cubit_Factory*)this,(CORBA::Object*)this,IT_m,Cubit_Factory_IR,IT_p,IT_q);	\
-		m_obj = (X*)(m_pptr->getImplObj ());			\
-	   }								\
-								\
-	   virtual ~Cubit_Factory##X  () {				\
-		if (_okToDeleteImpl ()) delete m_obj; }					\
-	   virtual void* _deref () {					\
-		return m_obj; }					\
-								\
-virtual Cubit_ptr create_cubit (const char * name, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->create_cubit (  name,IT_env);\
-}\
-								\
-	};						\
-
-
-#define QUALS_Cubit_Factory	\
-virtual Cubit_ptr create_cubit (const char * name, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->create_cubit (  name,IT_env);\
-}\
-
-
-
-
-class Cubit_FactoryProxyFactoryClass : public virtual CORBA::ObjectFactoryClass {
-public:
-   Cubit_FactoryProxyFactoryClass (unsigned char IT_p=0)
-		: CORBA::ProxyFactory (Cubit_Factory_IR, IT_p) {}
-
-    virtual void* New (char *IT_OR, CORBA::Environment&);
-
-    virtual void* New (ObjectReference *IT_OR, CORBA::Environment&);
-
-    virtual void* New2 (); 
-
-    virtual CORBA::Object* NewObject (char *IT_OR, CORBA::Environment&);
-
-    virtual CORBA::Object* NewObject (ObjectReference *IT_OR, CORBA::Environment&);
-
-    virtual CORBA::Object* New2Object (); 
-
-    virtual void* IT_castUp (void *IT_p, char* IT_s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-
-    virtual CORBA::PPTR* pptr (void *IT_p);
-
-    virtual void baseInterfaces (_IDL_SEQUENCE_string&);
-
-
-};
-
-extern Cubit_FactoryProxyFactoryClass Cubit_FactoryProxyFactory;
-
-class Cubit_FactoryBOAImpl : public virtual Cubit_Factory  {
-public:
-    Cubit_FactoryBOAImpl (const char *m="", CORBA::LoaderClass *l=NULL) {
-  if (CORBA::PPTR::isOK (m_pptr, Cubit_Factory_IR))
-    m_pptr = new Cubit_Factory_dispatch ( (Cubit_Factory*)this,
-   	 (CORBA::Object*)this, m, l, Cubit_Factory_IR, this);
-}
-
-        virtual Cubit_ptr create_cubit (const char * name, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-};
-
-
-#endif
-
-
-#endif
diff --git a/TAO/IIOP/test/Orbix/factory_client/cubit.hh b/TAO/IIOP/test/Orbix/factory_client/cubit.hh
deleted file mode 100644
index 72e2fb81395..00000000000
--- a/TAO/IIOP/test/Orbix/factory_client/cubit.hh
+++ /dev/null
@@ -1,1111 +0,0 @@
-
-#ifndef cubit_hh
-#define cubit_hh
-
-#include <CORBA.h>
-
-#include <string.h>
-
-
-#ifndef _Cubit_defined
-#define _Cubit_defined
-class Cubit_dispatch : public virtual CORBA::PPTR {
-public:
-
-      Cubit_dispatch (void *IT_p, CORBA::Object* IT_o, const char *IT_m, 
-        CORBA::LoaderClass *IT_l, char *IT_i, void* IT_im)
-       : PPTR (IT_p,IT_o,IT_m,IT_l,IT_i,IT_im) {}
-
-
-   Cubit_dispatch (char *IT_OR, void *IT_p, CORBA::Object *IT_o)
-       : PPTR (IT_OR,IT_p,IT_o) {}
-
-
-   Cubit_dispatch () {}
-
-   Cubit_dispatch (ObjectReference *IT_OR, void *IT_p, CORBA::Object *IT_o)
-       : PPTR (IT_OR,IT_p,IT_o) {}
-
-
-   Cubit_dispatch (void *IT_p, CORBA::Object *IT_o, const char *IT_m, 
-        char *IT_i, CORBA::Object* IT_ob, void* IT_im)
-       : PPTR (IT_p,IT_o,IT_m,IT_i,IT_ob,IT_im) {}
-
-
-   virtual unsigned char dispatch (CORBA::Request &IT_r, 
-        unsigned char IT_isTarget, void* IT_pp=NULL);
-
-
-};
-
-class Cubit;
-
-#ifndef CubitPtr
-#define CubitPtr
-
-typedef Cubit* Cubit_ptr;
-
-typedef Cubit* CubitRef;
-
-#endif
-
-
-#ifndef CubitForwH
-#define CubitForwH
-CORBA::ObjectRef Cubit_getBase (void *);
-void Cubit_release (Cubit *, CORBA::Environment &IT_env);
-void Cubit_release (Cubit_ptr);
-Cubit* Cubit_duplicate (Cubit_ptr, CORBA::Environment &IT_env);
-Cubit* Cubit_duplicate (Cubit_ptr );
-Cubit_ptr Cubit_nil (CORBA::Environment &IT_env);
-Cubit_ptr Cubit_nil ();
-#endif
-#define Cubit_IMPL "Cubit"
-
-
-class Cubit;
-
-typedef Cubit CubitProxy;
-#define Cubit_IR "Cubit$v1.1"
-#define Cubit_IMPL "Cubit"
-
-#ifndef CubitPtr
-#define CubitPtr
-
-typedef Cubit* Cubit_ptr;
-
-typedef Cubit* CubitRef;
-
-#endif
-
-class Cubit: public virtual CORBA::Object  {
-public:
-        Cubit (char *IT_OR);
-    Cubit (ObjectReference *IT_OR);
-    Cubit () : CORBA::Object  (1) {}
-protected:
-    Cubit_ptr __duplicate(
-            CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) {
-       CORBA::Object::__duplicate (IT_env);
-       return this;
-    }
-public:
-    static Cubit_ptr _duplicate(
-            Cubit_ptr, 
-            CORBA::Environment &IT_pEnv=CORBA::IT_chooseDefaultEnv ());
-public:
-   static Cubit* _bind (const char* IT_markerServer, const char* host,
-		const CORBA::Context &IT_c, 
-		CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-   static Cubit* _bind (CORBA::Environment &IT_env);
-   static Cubit* _bind (const char* IT_markerServer=NULL, const char* host=NULL,
-                 CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-    static Cubit* _narrow (CORBA::Object* , CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-    static Cubit_ptr _nil (CORBA::Environment &IT_pEnv=CORBA::IT_chooseDefaultEnv ()) {
-        CORBA::EnvExcRaiser IT_raise;
-        CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-        return (Cubit_ptr) CORBA::OBJECT_NIL;}
-
-#ifndef Cubit_Many_defined
-#define Cubit_Many_defined
-
-struct Many {
-    CORBA::Octet o;
-    CORBA::Long l;
-    CORBA::Short s;
-
-    void encodeOp (CORBA::Request &IT_r) const;
-    void decodeOp (CORBA::Request &IT_r);
-    void decodeInOutOp (CORBA::Request &IT_r);
-    Many(const Many &);
-    Many();
-    ~Many();
-    Many& operator= (const Many&);
-};
-
-#ifndef Cubit_ManyVarH
-#define Cubit_ManyVarH
-
-#ifndef Cubit_ManyvPtr
-#define Cubit_ManyvPtr
-typedef Many* Many_vPtr;
-typedef const Many* Many_cvPtr;
-#endif
-
-class Many_var : public CORBA::_var
-{
-    private:
-
-    unsigned char copyHelper (const Many_var &IT_s) {
-        if (!IT_s._ptr) {
-            _ptr = IT_s._ptr;
-        } else
-        {
-            _ptr = new Many;
-            *(_ptr) =  *(IT_s._ptr);
-        }
-        return 1;
-    }
-
-    public:
-
-    Many_var (const Many_var &IT_s) {
-        (void) copyHelper (IT_s);
-    }
-
-    Many_var () {
-        _ptr =  new Many;
-;
-    }
-
-    Many_var (Many *IT_p) {
-        _ptr = IT_p;
-    }
-
-    Many_var &operator= (Many *IT_p) {
-        if (_ptr != IT_p) {
-            delete _ptr;
-        }
-        _ptr = IT_p;
-        return (*this);
-    }
-
-    Many_var &operator= (const Many_var &IT_s) {
-        if (_ptr != IT_s._ptr) {
-            delete _ptr;
-        }
-        _ptr = new Many;
-        *(_ptr) =  *(IT_s._ptr);
-        return (*this);
-    }
-
-    ~Many_var () {
-        delete _ptr;
-    }
-
-    Many* operator-> () {
-        return _ptr;
-    }
-
-    operator Many_cvPtr () const { return _ptr;}
-    operator Many_vPtr& () { return _ptr;}
-    operator Many& () const { return * _ptr;}
-
-    protected:
-    Many *_ptr;
-    private:
-    Many_var &operator= (const CORBA::_var &IT_s);
-    Many_var (const CORBA::_var &IT_s);
-};
-
-#endif
-
-
-#endif
-
-enum discrim {e_0th,e_1st,e_2nd,e_3rd,e_4th,e_5th, IT__ENUM_Cubit_discrim=CORBA_ULONG_MAX};
-
-#ifndef Cubit_oneof_defined
-#define Cubit_oneof_defined
-
-struct oneof {
-    private:
-
-    discrim __d;
-    union {
-        CORBA::Octet _o_;
-        CORBA::Short _s_;
-        CORBA::Long _l_;
-        Many * _cm_;
-    };
-
-    public:
-
-    void encodeOp (CORBA::Request &IT_r) const;
-    void decodeOp (CORBA::Request &IT_r);
-    void decodeInOutOp (CORBA::Request &IT_r);
-
-    private:
-
-    unsigned char isSet;
-
-    public:
-
-    discrim _d () const { return __d; }
-
-    CORBA::Octet o () const {
-        return _o_;
-    }
-
-    void o (CORBA::Octet IT_member) {
-        if (isSet && (__d != Cubit::e_0th))
-        {
-            this-> oneof::~oneof();
-            memset(this, 0, sizeof(*this));
-        }
-
-        __d = Cubit::e_0th;
-        isSet = 1;
-        _o_ = IT_member;
-    }
-
-    CORBA::Short s () const {
-        return _s_;
-    }
-
-    void s (CORBA::Short IT_member) {
-        if (isSet && (__d != Cubit::e_1st))
-        {
-            this-> oneof::~oneof();
-            memset(this, 0, sizeof(*this));
-        }
-
-        __d = Cubit::e_1st;
-        isSet = 1;
-        _s_ = IT_member;
-    }
-
-    CORBA::Long l () const {
-        return _l_;
-    }
-
-    void l (CORBA::Long IT_member) {
-        if (isSet && (__d != Cubit::e_2nd))
-        {
-            this-> oneof::~oneof();
-            memset(this, 0, sizeof(*this));
-        }
-
-        __d = Cubit::e_2nd;
-        isSet = 1;
-        _l_ = IT_member;
-    }
-
-    Many& cm () {
-        return (*_cm_);
-    }
-
-    const Many& cm () const {
-        return (*_cm_);
-    }
-
-    void cm (const Many& IT_member) {
-        if (isSet && (__d != Cubit::e_3rd))
-        {
-            this-> oneof::~oneof();
-            memset(this, 0, sizeof(*this));
-        }
-
-        __d = Cubit::e_3rd;
-
-        if (!isSet) {
-            _cm_ = new Many;
-            isSet = 1;
-        }
-        *(_cm_) = IT_member;
-    }
-
-
-    oneof();
-    oneof(const oneof &);
-    ~oneof();
-    oneof& operator= (const oneof&);
-};
-
-#ifndef Cubit_oneofVarH
-#define Cubit_oneofVarH
-
-#ifndef Cubit_oneofvPtr
-#define Cubit_oneofvPtr
-typedef oneof* oneof_vPtr;
-typedef const oneof* oneof_cvPtr;
-#endif
-
-class oneof_var : public CORBA::_var
-{
-    private:
-
-    unsigned char copyHelper (const oneof_var &IT_s) {
-        if (!IT_s._ptr) {
-            _ptr = IT_s._ptr;
-        } else
-        {
-            _ptr = new oneof;
-            *(_ptr) =  *(IT_s._ptr);
-        }
-        return 1;
-    }
-
-    public:
-
-    oneof_var (const oneof_var &IT_s) {
-        (void) copyHelper (IT_s);
-    }
-
-    oneof_var () {
-        _ptr = NULL;
-    }
-
-    oneof_var (oneof *IT_p) {
-        _ptr = IT_p;
-    }
-
-    oneof_var &operator= (oneof *IT_p) {
-        if (_ptr != IT_p) {
-            delete _ptr;
-        }
-        _ptr = IT_p;
-        return (*this);
-    }
-
-    oneof_var &operator= (const oneof_var &IT_s) {
-        if (_ptr != IT_s._ptr) {
-            delete _ptr;
-        }
-        _ptr = new oneof;
-        *(_ptr) =  *(IT_s._ptr);
-        return (*this);
-    }
-
-    ~oneof_var () {
-        delete _ptr;
-    }
-
-    oneof* operator-> () {
-        return _ptr;
-    }
-
-    operator oneof_cvPtr () const { return _ptr;}
-    operator oneof_vPtr& () { return _ptr;}
-    operator oneof& () const { return * _ptr;}
-
-    protected:
-    oneof *_ptr;
-    private:
-    oneof_var &operator= (const CORBA::_var &IT_s);
-    oneof_var (const CORBA::_var &IT_s);
-};
-
-#endif
-
-
-#endif
-        virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual Many cube_struct (const Many& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual oneof cube_union (const oneof& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual void please_exit (CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-};
-
-#ifndef CubitVarH
-#define CubitVarH
-
-#ifndef CubitvPtr
-#define CubitvPtr
-typedef Cubit* Cubit_vPtr;
-typedef const Cubit* Cubit_cvPtr;
-#endif
-
-class Cubit_var : public CORBA::_var
-{
-    private:
-
-    unsigned char copyHelper (const Cubit_var &IT_s) {
-        {
-            _ptr = Cubit_duplicate (IT_s._ptr);
-        }
-        return 1;
-    }
-
-    public:
-
-    Cubit_var (const Cubit_var &IT_s) {
-        (void) copyHelper (IT_s);
-    }
-
-    Cubit_var () {
-        _ptr = Cubit_nil ();
-    }
-
-    Cubit_var (Cubit *IT_p) {
-        _ptr = IT_p;
-    }
-
-    Cubit_var &operator= (Cubit *IT_p) {
-        Cubit_release (_ptr);
-        _ptr = IT_p;
-        return (*this);
-    }
-
-    Cubit_var &operator= (const Cubit_var &IT_s) {
-        Cubit_release (_ptr);
-        _ptr = Cubit_duplicate (IT_s._ptr);
-        return (*this);
-    }
-
-    ~Cubit_var () {
-        Cubit_release (_ptr);
-    }
-
-    Cubit* operator-> () {
-        return _ptr;
-    }
-
-    operator Cubit_cvPtr () const { return _ptr;}
-    operator Cubit_vPtr& () { return _ptr;}
-
-    protected:
-    Cubit *_ptr;
-    private:
-    Cubit_var &operator= (const CORBA::_var &IT_s);
-    Cubit_var (const CORBA::_var &IT_s);
-    Cubit_var &operator= (const CORBA::_mgr &IT_s);
-    Cubit_var &operator= (const CORBA::_SeqElem &IT_s);
-    Cubit_var (const CORBA::_mgr &IT_s);
-    Cubit_var (const CORBA::_SeqElem &IT_s);
-};
-
-#endif
-
-
-#ifndef CubitMgrH
-#define CubitMgrH
-
-class Cubit_mgr : public CORBA::_mgr
-{
-    public:
-
-    Cubit_mgr () {
-        _ptr = Cubit_nil ();
-        _release = 1;
-    }
-
-    Cubit_mgr (const Cubit_mgr &IT_s) {
-        _ptr = Cubit_duplicate (IT_s._ptr);
-        _release = 1;
-    }
-
-    Cubit_mgr &operator= (Cubit *IT_p) {
-        if (_ptr && _release)
-            Cubit_release (_ptr);
-        _ptr = IT_p;
-        _release = 1;
-        return (*this);
-    }
-
-    Cubit_mgr &operator= (const Cubit_mgr &IT_s) {
-        if (_ptr && _release)
-            Cubit_release (_ptr);
-        _ptr = Cubit_duplicate(IT_s._ptr);
-        _release = 1;
-        return (*this);
-    }
-
-    Cubit_mgr &operator= (Cubit_var &IT_s) {
-        if (_ptr && _release)
-            Cubit_release (_ptr);
-        _ptr = Cubit_duplicate(IT_s);
-        _release = 1;
-        return (*this);
-    }
-
-    ~Cubit_mgr () {
-        if (_release)
-            Cubit_release (_ptr);
-    }
-
-    unsigned char release () {
-        return _release;
-    }
-
-    void release (unsigned char rel) {
-        _release = rel;
-    }
-
-    operator int () const {
-        return (((CORBA::Object_ptr) _ptr) ? 1 : 0);
-    }
-
-    operator void* () const {
-        return _ptr;
-    }
-
-    operator CORBA::Object * () const {
-        return (CORBA::Object *) _ptr;
-    }
-
-    operator Cubit* () const {
-        return (Cubit*) _ptr;
-    }
-
-    Cubit_ptr operator-> () const {
-        return _ptr;
-    }
-
-    Cubit *_ptr;
-
-    protected:
-
-    unsigned char _release;
-};
-
-typedef Cubit_mgr Cubit_mgr_IT_const;
-#endif
-
-#ifndef CubitSeqElemH
-#define CubitSeqElemH
-
-class Cubit_SeqElem : public CORBA::_SeqElem
-{
-    public:
-
-    Cubit_SeqElem (Cubit_ptr* IT_p, unsigned char rel) {
-        _ptr = IT_p;
-        _release = rel;
-    }
-
-    Cubit_SeqElem &operator= (Cubit_ptr IT_p) {
-        if (_ptr) {
-            if (*(_ptr) && _release)
-                Cubit_release (*(_ptr));
-            *(_ptr) = IT_p;
-        }
-        return (*this);
-    }
-
-    Cubit_SeqElem &operator= (const Cubit_SeqElem &IT_s) {
-        if (_ptr && IT_s._ptr) {
-            if (*(_ptr) && _release)
-                Cubit_release (*(_ptr));
-            *(_ptr) = Cubit_duplicate(*(IT_s._ptr));
-        }
-        return (*this);
-    }
-
-    operator Cubit_ptr () const {
-        return _ptr ? (Cubit_ptr) (*_ptr) : Cubit_nil(); 
-    }
-
-    Cubit_ptr operator->() const { return *_ptr;}
-
-    protected:
-    Cubit_ptr *_ptr;
-    unsigned char _release;
-};
-
-#endif
-
-
-#define TIE_Cubit(X) Cubit##X
-
-#define DEF_TIE_Cubit(X) \
-	class Cubit##X : public virtual Cubit {		\
-	  X* m_obj;						\
-	public:							\
-								\
-								\
-	   Cubit##X  (X *objp, const char* m="", CORBA::LoaderClass *l=0)\
-		: Cubit(), m_obj(objp) {	\
-		m_pptr = new Cubit_dispatch		\
-			(( Cubit*)this,(CORBA::Object*)this,m,l,Cubit_IR,m_obj);	\
-	   }								\
-	   Cubit##X  (CORBA::Object *IT_p, const char* IT_m="", void *IT_q=0)\
-		: Cubit() {	\
-		m_pptr = new Cubit_dispatch		\
-			(( Cubit*)this,(CORBA::Object*)this,IT_m,Cubit_IR,IT_p,IT_q);	\
-		m_obj = (X*)(m_pptr->getImplObj ());			\
-	   }								\
-								\
-	   virtual ~Cubit##X  () {				\
-		if (_okToDeleteImpl ()) delete m_obj; }					\
-	   virtual void* _deref () {					\
-		return m_obj; }					\
-								\
-virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_octet (  o,IT_env);\
-}\
-	\
-virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_short (  s,IT_env);\
-}\
-	\
-virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_long (  l,IT_env);\
-}\
-	\
-virtual Cubit::Many cube_struct (const Cubit::Many& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_struct (  values,IT_env);\
-}\
-	\
-virtual Cubit::oneof cube_union (const Cubit::oneof& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_union (  values,IT_env);\
-}\
-	\
-virtual void please_exit (CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-m_obj->please_exit (IT_env);\
-}\
-								\
-	};						\
-
-
-#define QUALS_Cubit	\
-virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_octet (  o,IT_env);\
-}\
-	\
-virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_short (  s,IT_env);\
-}\
-	\
-virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_long (  l,IT_env);\
-}\
-	\
-virtual Many cube_struct (const Many& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_struct (  values,IT_env);\
-}\
-	\
-virtual oneof cube_union (const oneof& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_union (  values,IT_env);\
-}\
-	\
-virtual void please_exit (CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-m_obj->please_exit (IT_env);\
-}\
-
-
-
-
-class CubitProxyFactoryClass : public virtual CORBA::ObjectFactoryClass {
-public:
-   CubitProxyFactoryClass (unsigned char IT_p=0)
-		: CORBA::ProxyFactory (Cubit_IR, IT_p) {}
-
-    virtual void* New (char *IT_OR, CORBA::Environment&);
-
-    virtual void* New (ObjectReference *IT_OR, CORBA::Environment&);
-
-    virtual void* New2 (); 
-
-    virtual CORBA::Object* NewObject (char *IT_OR, CORBA::Environment&);
-
-    virtual CORBA::Object* NewObject (ObjectReference *IT_OR, CORBA::Environment&);
-
-    virtual CORBA::Object* New2Object (); 
-
-    virtual void* IT_castUp (void *IT_p, char* IT_s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-
-    virtual CORBA::PPTR* pptr (void *IT_p);
-
-    virtual void baseInterfaces (_IDL_SEQUENCE_string&);
-
-
-};
-
-extern CubitProxyFactoryClass CubitProxyFactory;
-
-class CubitBOAImpl : public virtual Cubit  {
-public:
-    CubitBOAImpl (const char *m="", CORBA::LoaderClass *l=NULL) {
-  if (CORBA::PPTR::isOK (m_pptr, Cubit_IR))
-    m_pptr = new Cubit_dispatch ( (Cubit*)this,
-   	 (CORBA::Object*)this, m, l, Cubit_IR, this);
-}
-
-        virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual Many cube_struct (const Many& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual oneof cube_union (const oneof& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual void please_exit (CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-};
-
-
-#endif
-
-
-#ifndef _Cubit_Factory_defined
-#define _Cubit_Factory_defined
-class Cubit_Factory_dispatch : public virtual CORBA::PPTR {
-public:
-
-      Cubit_Factory_dispatch (void *IT_p, CORBA::Object* IT_o, const char *IT_m, 
-        CORBA::LoaderClass *IT_l, char *IT_i, void* IT_im)
-       : PPTR (IT_p,IT_o,IT_m,IT_l,IT_i,IT_im) {}
-
-
-   Cubit_Factory_dispatch (char *IT_OR, void *IT_p, CORBA::Object *IT_o)
-       : PPTR (IT_OR,IT_p,IT_o) {}
-
-
-   Cubit_Factory_dispatch () {}
-
-   Cubit_Factory_dispatch (ObjectReference *IT_OR, void *IT_p, CORBA::Object *IT_o)
-       : PPTR (IT_OR,IT_p,IT_o) {}
-
-
-   Cubit_Factory_dispatch (void *IT_p, CORBA::Object *IT_o, const char *IT_m, 
-        char *IT_i, CORBA::Object* IT_ob, void* IT_im)
-       : PPTR (IT_p,IT_o,IT_m,IT_i,IT_ob,IT_im) {}
-
-
-   virtual unsigned char dispatch (CORBA::Request &IT_r, 
-        unsigned char IT_isTarget, void* IT_pp=NULL);
-
-
-};
-
-class Cubit_Factory;
-
-#ifndef Cubit_FactoryPtr
-#define Cubit_FactoryPtr
-
-typedef Cubit_Factory* Cubit_Factory_ptr;
-
-typedef Cubit_Factory* Cubit_FactoryRef;
-
-#endif
-
-
-#ifndef Cubit_FactoryForwH
-#define Cubit_FactoryForwH
-CORBA::ObjectRef Cubit_Factory_getBase (void *);
-void Cubit_Factory_release (Cubit_Factory *, CORBA::Environment &IT_env);
-void Cubit_Factory_release (Cubit_Factory_ptr);
-Cubit_Factory* Cubit_Factory_duplicate (Cubit_Factory_ptr, CORBA::Environment &IT_env);
-Cubit_Factory* Cubit_Factory_duplicate (Cubit_Factory_ptr );
-Cubit_Factory_ptr Cubit_Factory_nil (CORBA::Environment &IT_env);
-Cubit_Factory_ptr Cubit_Factory_nil ();
-#endif
-#define Cubit_Factory_IMPL "Cubit_Factory"
-
-
-class Cubit_Factory;
-
-typedef Cubit_Factory Cubit_FactoryProxy;
-#define Cubit_Factory_IR "Cubit_Factory"
-#define Cubit_Factory_IMPL "Cubit_Factory"
-
-#ifndef Cubit_FactoryPtr
-#define Cubit_FactoryPtr
-
-typedef Cubit_Factory* Cubit_Factory_ptr;
-
-typedef Cubit_Factory* Cubit_FactoryRef;
-
-#endif
-
-class Cubit_Factory: public virtual CORBA::Object  {
-public:
-        Cubit_Factory (char *IT_OR);
-    Cubit_Factory (ObjectReference *IT_OR);
-    Cubit_Factory () : CORBA::Object  (1) {}
-protected:
-    Cubit_Factory_ptr __duplicate(
-            CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) {
-       CORBA::Object::__duplicate (IT_env);
-       return this;
-    }
-public:
-    static Cubit_Factory_ptr _duplicate(
-            Cubit_Factory_ptr, 
-            CORBA::Environment &IT_pEnv=CORBA::IT_chooseDefaultEnv ());
-public:
-   static Cubit_Factory* _bind (const char* IT_markerServer, const char* host,
-		const CORBA::Context &IT_c, 
-		CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-   static Cubit_Factory* _bind (CORBA::Environment &IT_env);
-   static Cubit_Factory* _bind (const char* IT_markerServer=NULL, const char* host=NULL,
-                 CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-    static Cubit_Factory* _narrow (CORBA::Object* , CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-    static Cubit_Factory_ptr _nil (CORBA::Environment &IT_pEnv=CORBA::IT_chooseDefaultEnv ()) {
-        CORBA::EnvExcRaiser IT_raise;
-        CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-        return (Cubit_Factory_ptr) CORBA::OBJECT_NIL;}
-        virtual Cubit_ptr create_cubit (const char * name, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-};
-
-#ifndef Cubit_FactoryVarH
-#define Cubit_FactoryVarH
-
-#ifndef Cubit_FactoryvPtr
-#define Cubit_FactoryvPtr
-typedef Cubit_Factory* Cubit_Factory_vPtr;
-typedef const Cubit_Factory* Cubit_Factory_cvPtr;
-#endif
-
-class Cubit_Factory_var : public CORBA::_var
-{
-    private:
-
-    unsigned char copyHelper (const Cubit_Factory_var &IT_s) {
-        {
-            _ptr = Cubit_Factory_duplicate (IT_s._ptr);
-        }
-        return 1;
-    }
-
-    public:
-
-    Cubit_Factory_var (const Cubit_Factory_var &IT_s) {
-        (void) copyHelper (IT_s);
-    }
-
-    Cubit_Factory_var () {
-        _ptr = Cubit_Factory_nil ();
-    }
-
-    Cubit_Factory_var (Cubit_Factory *IT_p) {
-        _ptr = IT_p;
-    }
-
-    Cubit_Factory_var &operator= (Cubit_Factory *IT_p) {
-        Cubit_Factory_release (_ptr);
-        _ptr = IT_p;
-        return (*this);
-    }
-
-    Cubit_Factory_var &operator= (const Cubit_Factory_var &IT_s) {
-        Cubit_Factory_release (_ptr);
-        _ptr = Cubit_Factory_duplicate (IT_s._ptr);
-        return (*this);
-    }
-
-    ~Cubit_Factory_var () {
-        Cubit_Factory_release (_ptr);
-    }
-
-    Cubit_Factory* operator-> () {
-        return _ptr;
-    }
-
-    operator Cubit_Factory_cvPtr () const { return _ptr;}
-    operator Cubit_Factory_vPtr& () { return _ptr;}
-
-    protected:
-    Cubit_Factory *_ptr;
-    private:
-    Cubit_Factory_var &operator= (const CORBA::_var &IT_s);
-    Cubit_Factory_var (const CORBA::_var &IT_s);
-    Cubit_Factory_var &operator= (const CORBA::_mgr &IT_s);
-    Cubit_Factory_var &operator= (const CORBA::_SeqElem &IT_s);
-    Cubit_Factory_var (const CORBA::_mgr &IT_s);
-    Cubit_Factory_var (const CORBA::_SeqElem &IT_s);
-};
-
-#endif
-
-
-#ifndef Cubit_FactoryMgrH
-#define Cubit_FactoryMgrH
-
-class Cubit_Factory_mgr : public CORBA::_mgr
-{
-    public:
-
-    Cubit_Factory_mgr () {
-        _ptr = Cubit_Factory_nil ();
-        _release = 1;
-    }
-
-    Cubit_Factory_mgr (const Cubit_Factory_mgr &IT_s) {
-        _ptr = Cubit_Factory_duplicate (IT_s._ptr);
-        _release = 1;
-    }
-
-    Cubit_Factory_mgr &operator= (Cubit_Factory *IT_p) {
-        if (_ptr && _release)
-            Cubit_Factory_release (_ptr);
-        _ptr = IT_p;
-        _release = 1;
-        return (*this);
-    }
-
-    Cubit_Factory_mgr &operator= (const Cubit_Factory_mgr &IT_s) {
-        if (_ptr && _release)
-            Cubit_Factory_release (_ptr);
-        _ptr = Cubit_Factory_duplicate(IT_s._ptr);
-        _release = 1;
-        return (*this);
-    }
-
-    Cubit_Factory_mgr &operator= (Cubit_Factory_var &IT_s) {
-        if (_ptr && _release)
-            Cubit_Factory_release (_ptr);
-        _ptr = Cubit_Factory_duplicate(IT_s);
-        _release = 1;
-        return (*this);
-    }
-
-    ~Cubit_Factory_mgr () {
-        if (_release)
-            Cubit_Factory_release (_ptr);
-    }
-
-    unsigned char release () {
-        return _release;
-    }
-
-    void release (unsigned char rel) {
-        _release = rel;
-    }
-
-    operator int () const {
-        return (((CORBA::Object_ptr) _ptr) ? 1 : 0);
-    }
-
-    operator void* () const {
-        return _ptr;
-    }
-
-    operator CORBA::Object * () const {
-        return (CORBA::Object *) _ptr;
-    }
-
-    operator Cubit_Factory* () const {
-        return (Cubit_Factory*) _ptr;
-    }
-
-    Cubit_Factory_ptr operator-> () const {
-        return _ptr;
-    }
-
-    Cubit_Factory *_ptr;
-
-    protected:
-
-    unsigned char _release;
-};
-
-typedef Cubit_Factory_mgr Cubit_Factory_mgr_IT_const;
-#endif
-
-#ifndef Cubit_FactorySeqElemH
-#define Cubit_FactorySeqElemH
-
-class Cubit_Factory_SeqElem : public CORBA::_SeqElem
-{
-    public:
-
-    Cubit_Factory_SeqElem (Cubit_Factory_ptr* IT_p, unsigned char rel) {
-        _ptr = IT_p;
-        _release = rel;
-    }
-
-    Cubit_Factory_SeqElem &operator= (Cubit_Factory_ptr IT_p) {
-        if (_ptr) {
-            if (*(_ptr) && _release)
-                Cubit_Factory_release (*(_ptr));
-            *(_ptr) = IT_p;
-        }
-        return (*this);
-    }
-
-    Cubit_Factory_SeqElem &operator= (const Cubit_Factory_SeqElem &IT_s) {
-        if (_ptr && IT_s._ptr) {
-            if (*(_ptr) && _release)
-                Cubit_Factory_release (*(_ptr));
-            *(_ptr) = Cubit_Factory_duplicate(*(IT_s._ptr));
-        }
-        return (*this);
-    }
-
-    operator Cubit_Factory_ptr () const {
-        return _ptr ? (Cubit_Factory_ptr) (*_ptr) : Cubit_Factory_nil(); 
-    }
-
-    Cubit_Factory_ptr operator->() const { return *_ptr;}
-
-    protected:
-    Cubit_Factory_ptr *_ptr;
-    unsigned char _release;
-};
-
-#endif
-
-
-#define TIE_Cubit_Factory(X) Cubit_Factory##X
-
-#define DEF_TIE_Cubit_Factory(X) \
-	class Cubit_Factory##X : public virtual Cubit_Factory {		\
-	  X* m_obj;						\
-	public:							\
-								\
-								\
-	   Cubit_Factory##X  (X *objp, const char* m="", CORBA::LoaderClass *l=0)\
-		: Cubit_Factory(), m_obj(objp) {	\
-		m_pptr = new Cubit_Factory_dispatch		\
-			(( Cubit_Factory*)this,(CORBA::Object*)this,m,l,Cubit_Factory_IR,m_obj);	\
-	   }								\
-	   Cubit_Factory##X  (CORBA::Object *IT_p, const char* IT_m="", void *IT_q=0)\
-		: Cubit_Factory() {	\
-		m_pptr = new Cubit_Factory_dispatch		\
-			(( Cubit_Factory*)this,(CORBA::Object*)this,IT_m,Cubit_Factory_IR,IT_p,IT_q);	\
-		m_obj = (X*)(m_pptr->getImplObj ());			\
-	   }								\
-								\
-	   virtual ~Cubit_Factory##X  () {				\
-		if (_okToDeleteImpl ()) delete m_obj; }					\
-	   virtual void* _deref () {					\
-		return m_obj; }					\
-								\
-virtual Cubit_ptr create_cubit (const char * name, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->create_cubit (  name,IT_env);\
-}\
-								\
-	};						\
-
-
-#define QUALS_Cubit_Factory	\
-virtual Cubit_ptr create_cubit (const char * name, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->create_cubit (  name,IT_env);\
-}\
-
-
-
-
-class Cubit_FactoryProxyFactoryClass : public virtual CORBA::ObjectFactoryClass {
-public:
-   Cubit_FactoryProxyFactoryClass (unsigned char IT_p=0)
-		: CORBA::ProxyFactory (Cubit_Factory_IR, IT_p) {}
-
-    virtual void* New (char *IT_OR, CORBA::Environment&);
-
-    virtual void* New (ObjectReference *IT_OR, CORBA::Environment&);
-
-    virtual void* New2 (); 
-
-    virtual CORBA::Object* NewObject (char *IT_OR, CORBA::Environment&);
-
-    virtual CORBA::Object* NewObject (ObjectReference *IT_OR, CORBA::Environment&);
-
-    virtual CORBA::Object* New2Object (); 
-
-    virtual void* IT_castUp (void *IT_p, char* IT_s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-
-    virtual CORBA::PPTR* pptr (void *IT_p);
-
-    virtual void baseInterfaces (_IDL_SEQUENCE_string&);
-
-
-};
-
-extern Cubit_FactoryProxyFactoryClass Cubit_FactoryProxyFactory;
-
-class Cubit_FactoryBOAImpl : public virtual Cubit_Factory  {
-public:
-    Cubit_FactoryBOAImpl (const char *m="", CORBA::LoaderClass *l=NULL) {
-  if (CORBA::PPTR::isOK (m_pptr, Cubit_Factory_IR))
-    m_pptr = new Cubit_Factory_dispatch ( (Cubit_Factory*)this,
-   	 (CORBA::Object*)this, m, l, Cubit_Factory_IR, this);
-}
-
-        virtual Cubit_ptr create_cubit (const char * name, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-};
-
-
-#endif
-
-
-#endif
diff --git a/TAO/IIOP/test/Orbix/factory_client/cubit.idl b/TAO/IIOP/test/Orbix/factory_client/cubit.idl
deleted file mode 100644
index 7dba408d0db..00000000000
--- a/TAO/IIOP/test/Orbix/factory_client/cubit.idl
+++ /dev/null
@@ -1,46 +0,0 @@
-// @(#)cubit.idl	1.1 95/09/10
-// Copyright 1994-1995 by Sun Microsystems, Inc.
-
-#pragma prefix	"Eng.SUN.COM"
-#pragma version Cubit 1.1
-
-  interface Cubit {
-    octet	cube_octet (in octet o);
-    short	cube_short (in short s);
-    long	cube_long (in long l);
-    
-    struct Many {
-      octet	o;		// + 3 bytes padding (normally) ...
-      long	l;
-      short	s;		// + 2 bytes padding (normally) ...
-    };
-    
-    Many	cube_struct (in Many values);
-    
-    enum discrim {e_0th, e_1st, e_2nd, e_3rd, e_4th, e_5th};
-    
-    union oneof
-      switch (discrim) {
-	// this is an easy union to interpret; no padding
-	// is needed between discriminant and value.
-      case e_0th:
-        octet		o;
-      case e_1st:
-        short		s;
-      case e_2nd:
-        long		l;
-      case e_3rd:
-      default:
-        Many		cm;
-      };
-    
-    oneof	cube_union (in oneof values);
-    
-    oneway void	please_exit ();
-  };
-
-
-  interface Cubit_Factory {
-    Cubit create_cubit (in string name);
-  };
-
diff --git a/TAO/IIOP/test/Orbix/factory_client/cubitC.cpp b/TAO/IIOP/test/Orbix/factory_client/cubitC.cpp
deleted file mode 100644
index c439fc4c800..00000000000
--- a/TAO/IIOP/test/Orbix/factory_client/cubitC.cpp
+++ /dev/null
@@ -1,710 +0,0 @@
-
-
-#include "cubit.h"
-
-Cubit::Cubit (char *IT_OR) {
-      m_pptr = new Cubit_dispatch (IT_OR, this,(CORBA::Object*)this);
-} 
-Cubit::Cubit (ObjectReference *IT_OR) {
-      m_pptr = new Cubit_dispatch (IT_OR, this,(CORBA::Object*)this);
-} 
-
-#ifndef CubitForwC
-#define CubitForwC
-CORBA::ObjectRef Cubit_getBase(void *IT_p){
-    return (Cubit*) IT_p;}
-
-void Cubit_release (Cubit_ptr IT_p, CORBA::Environment &IT_env) {
-    CORBA::release(IT_p, IT_env);}
-
-void Cubit_release (Cubit_ptr IT_p) {
-    Cubit_release (IT_p, CORBA::IT_chooseDefaultEnv ()); }
-
-Cubit_ptr Cubit_nil (CORBA::Environment &) {
-    return Cubit:: _nil ();}
-
-Cubit_ptr Cubit_nil () {
-    return Cubit_nil (CORBA::IT_chooseDefaultEnv ());}
-
-Cubit_ptr Cubit_duplicate (Cubit_ptr IT_p, CORBA::Environment &IT_env) {
-    return (Cubit::_duplicate(IT_p, IT_env)); }
-Cubit_ptr Cubit_duplicate (Cubit_ptr IT_p) {
-    return Cubit_duplicate (IT_p, CORBA::IT_chooseDefaultEnv ()); }
-#endif
-
-Cubit_ptr Cubit::_duplicate(Cubit_ptr obj, CORBA::Environment& IT_pEnv) {
-        CORBA::EnvExcRaiser IT_raise;
-        CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-       if (!obj) {
-          return (obj);
-       }
-       Cubit_ptr IT_obj = obj->__duplicate (IT_env);
-       return IT_obj;
-}
-
-
-
-Cubit* Cubit:: _bind (const char* IT_markerServer, const char* host,
-		const CORBA::Context &IT_c, 
-		CORBA::Environment &IT_env) {
-       return (Cubit*)CORBA::Factory.New (IT_markerServer, IT_env, IT_c, host, 
-		Cubit_IMPL, Cubit_IR);
-}
-
-
-
-Cubit* Cubit:: _bind (CORBA::Environment &IT_env) {
-       return _bind (NULL,NULL,CORBA::Context(), IT_env); }
-
-
-Cubit* Cubit:: _bind (const char* IT_markerServer, const char* host,
-                CORBA::Environment &IT_env) {
-       return _bind (IT_markerServer, host, CORBA::Context (), IT_env); }
-Cubit* Cubit::_narrow (CORBA::Object* IT_obj, CORBA::Environment &IT_pEnv) {
-        CORBA::EnvExcRaiser IT_raise;
-        CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-        if (CORBA::is_nil (IT_obj)) {
-                return Cubit:: _nil();
-        }
-
-       Cubit* IT_p = (Cubit*)CORBA::Object::_castDown (IT_obj, Cubit_IR, IT_env);
-        IT_p = IT_p ? IT_p->__duplicate(IT_env) : NULL;
-        if ((IT_env) &&(!strcmp(IT_env.exception()->id(), "CORBA::StExcep::BAD_PARAM")) && (((CORBA::BAD_PARAM*)IT_env.exception())-> minor() == NARROW_FAILED)) {
-                IT_env.exception_free();
-        }
-        return IT_p;
-   }
-
-
-#ifndef Cubit_Many_Ops
-#define Cubit_Many_Ops
-
-void Cubit::Many:: encodeOp (CORBA::Request &IT_r) const {
-
-    IT_r.insertOctet (o);
-
-    IT_r << l;
-
-    IT_r << s;
-}
-
-void Cubit::Many:: decodeOp (CORBA::Request &IT_r) {
-
-    IT_r.extractOctet (o);
-
-    IT_r >> l;
-
-    IT_r >> s;
-}
-
-void Cubit::Many:: decodeInOutOp (CORBA::Request &IT_r) {
-
-    IT_r.extractOctet (o);
-
-    IT_r >> l;
-
-    IT_r >> s;
-}
-
-Cubit::Many ::~Many () {
-}
-
-Cubit::Many:: Many (const Cubit::Many &IT_s) 
-	 {
-    o = IT_s.o;
-    l = IT_s.l;
-    s = IT_s.s;
-}
-
-Cubit::Many:: Many () {
-}
-
-Cubit::Many &Cubit::Many:: operator= (const Cubit::Many& IT_s) {
-    if (this == &IT_s) return *this;
-    o = IT_s.o;
-    l = IT_s.l;
-    s = IT_s.s;
-    return *this;
-}
-
-
-#endif
-
-
-#ifndef Cubit_oneof_Ops
-#define Cubit_oneof_Ops
-void Cubit::oneof:: encodeOp (CORBA::Request &IT_r) const {
-    if (!isSet) return;
-    {
-    CORBA::ULong IT_0 = (CORBA::ULong) __d;
-    IT_r << IT_0;
-    }
-    switch (__d) {
-        case Cubit::e_0th: 
-        IT_r.insertOctet (_o_);
-        break;
-        case Cubit::e_1st: 
-        IT_r << _s_;
-        break;
-        case Cubit::e_2nd: 
-        IT_r << _l_;
-        break;
-        case Cubit::e_3rd: 
-        default: 
-        (*_cm_).encodeOp (IT_r);
-        break;
-    }
-
-}
-
-void Cubit::oneof:: decodeOp (CORBA::Request &IT_r) {
-    isSet = 0;
-    {
-    CORBA::ULong IT_1;
-    IT_r >> IT_1;
-    __d = Cubit::discrim(IT_1);
-    }
-    switch (__d) {
-        case Cubit::e_0th: 
-        if (!isSet) {
-            isSet = 1;
-        }
-        IT_r.extractOctet (_o_);
-        break;
-        case Cubit::e_1st: 
-        if (!isSet) {
-            isSet = 1;
-        }
-        IT_r >> _s_;
-        break;
-        case Cubit::e_2nd: 
-        if (!isSet) {
-            isSet = 1;
-        }
-        IT_r >> _l_;
-        break;
-        case Cubit::e_3rd: 
-        default: 
-        if (!isSet) {
-            _cm_ = new Cubit::Many;
-            isSet = 1;
-        }
-        (*_cm_).decodeOp (IT_r);
-        break;
-    }
-
-}
-void Cubit::oneof:: decodeInOutOp (CORBA::Request &IT_r) {
-    Cubit::discrim IT_d;
-    {
-    CORBA::ULong IT_2;
-    IT_r >> IT_2;
-    IT_d = Cubit::discrim(IT_2);
-    }
-    if (IT_d == __d)
-        switch (__d) {
-            case Cubit::e_0th: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r.extractOctet (_o_);
-            break;
-            case Cubit::e_1st: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r >> _s_;
-            break;
-            case Cubit::e_2nd: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r >> _l_;
-            break;
-            case Cubit::e_3rd: 
-            default: 
-            if (!isSet) {
-                _cm_ = new Cubit::Many;
-                isSet = 1;
-            }
-            (*_cm_).decodeInOutOp (IT_r);
-            break;
-        }
-
-    else {
-        this->oneof:: ~oneof();
-        memset(this, 0, sizeof(*this));
-        __d = IT_d;
-        switch (__d) {
-            case Cubit::e_0th: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r.extractOctet (_o_);
-            break;
-            case Cubit::e_1st: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r >> _s_;
-            break;
-            case Cubit::e_2nd: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r >> _l_;
-            break;
-            case Cubit::e_3rd: 
-            default: 
-            if (!isSet) {
-                _cm_ = new Cubit::Many;
-                isSet = 1;
-            }
-            (*_cm_).decodeOp (IT_r);
-            break;
-        }
-        isSet = 1;
-    }
-
-}
-
-Cubit::oneof:: oneof() { 
-    memset(this, 0, sizeof(*this));
-    isSet = 0;
-}
-
-Cubit::oneof ::~oneof() {
-    if (!isSet) return;
-    switch (__d) { 
-        case Cubit::e_0th:         break;
-        case Cubit::e_1st:         break;
-        case Cubit::e_2nd:         break;
-        case Cubit::e_3rd: 
-        default:         if (_cm_) delete _cm_;
-        break;
-    }
-
-    isSet = 0;
-}
-
-Cubit::oneof:: oneof (const Cubit::oneof &IT_s) {
-    isSet = 0;
-    memset(this, 0, sizeof(*this));
-    __d = IT_s.__d;
-    switch (__d) {
-        case Cubit::e_0th:         isSet = 1;
-        _o_ = IT_s._o_;
-        break;
-        case Cubit::e_1st:         isSet = 1;
-        _s_ = IT_s._s_;
-        break;
-        case Cubit::e_2nd:         isSet = 1;
-        _l_ = IT_s._l_;
-        break;
-        case Cubit::e_3rd: 
-        default: 
-        if (!isSet) {
-            _cm_ = new Cubit::Many;
-            isSet = 1;
-        }
-        *(_cm_) = *(IT_s._cm_);
-        break;
-    }
-    isSet = 1;
-}
-
-Cubit::oneof& Cubit::oneof:: operator= (const Cubit::oneof & IT_s) {
-    if (this == &IT_s) return *this;
-    if (isSet && (__d != IT_s.__d))
-    {
-        this-> oneof::~oneof();
-        memset(this, 0, sizeof(*this));
-    }
-
-    __d = IT_s.__d;
-    switch (__d) {
-        case Cubit::e_0th:         isSet = 1;
-        _o_ = IT_s._o_;
-        break;
-        case Cubit::e_1st:         isSet = 1;
-        _s_ = IT_s._s_;
-        break;
-        case Cubit::e_2nd:         isSet = 1;
-        _l_ = IT_s._l_;
-        break;
-        case Cubit::e_3rd: 
-        default: 
-        if (!isSet) {
-            _cm_ = new Cubit::Many;
-            isSet = 1;
-        }
-        *(_cm_) = *(IT_s._cm_);
-        break;
-    }
-    isSet = 1;
-    return *this;
-}
-
-
-#endif
-
-void* CubitProxyFactoryClass::New (char *IT_OR, CORBA::Environment&) {
-        return  new class Cubit(IT_OR);}
-
-void* CubitProxyFactoryClass::New (ObjectReference *IT_OR, CORBA::Environment&) {
-        return  new class Cubit(IT_OR);}
-
-void* CubitProxyFactoryClass::New2 () {
-        return  new class Cubit((char*)0);}
-
-CORBA::Object* CubitProxyFactoryClass::NewObject (char *IT_OR, CORBA::Environment&) {
-        return  new class Cubit(IT_OR);}
-
-CORBA::Object* CubitProxyFactoryClass::NewObject (ObjectReference *IT_OR, CORBA::Environment&) {
-        return  new class Cubit(IT_OR);}
-
-CORBA::Object* CubitProxyFactoryClass::New2Object () {
-        return  new class Cubit((char*)0);}
-
-void* CubitProxyFactoryClass::IT_castUp (void *IT_p, char* IT_s, CORBA::Environment &IT_env) {
-      void *IT_l;
-      if (!CORBA::_interfaceCmp (IT_s,Cubit_IR, IT_env))
-         return IT_p;
-      else if (IT_l=CORBA::ObjectFactoryClass::IT_castUp((CORBA::Object*)((class Cubit*)IT_p),IT_s, IT_env))
-         return IT_l;
-      else return NULL;
-    }
-
-
-CORBA::PPTR* CubitProxyFactoryClass::pptr (void *IT_p) {
-       return ((class Cubit*)IT_p)->_pptr ();}
-
-void CubitProxyFactoryClass::baseInterfaces (_IDL_SEQUENCE_string& seq) {
-      add (seq, Cubit_IR);
-      CORBA::ObjectFactoryClass::baseInterfaces (seq);
-}
-
-CubitProxyFactoryClass CubitProxyFactory(1);
-
-CORBA::Octet Cubit:: cube_octet (CORBA::Octet o, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        return 0;
-    }
-    CORBA::Request IT_r (this, "cube_octet",IT_env,1,0);
-    if (!IT_r.isException (IT_env)) {
-
-        IT_r.insertOctet (o);
-    }
-
-    IT_r.invoke (CORBA::Flags(0),IT_env);
-    if (!IT_r.isException (IT_env)) {
-        CORBA::Octet IT_result;
-        IT_r.extractOctet (IT_result);
-        IT_r.checkEnv (IT_env);
-        return IT_result;
-    }
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-    return 0;
-}
-
-CORBA::Short Cubit:: cube_short (CORBA::Short s, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        return 0;
-    }
-    CORBA::Request IT_r (this, "cube_short",IT_env,1,0);
-    if (!IT_r.isException (IT_env)) {
-
-        IT_r << s;
-    }
-
-    IT_r.invoke (CORBA::Flags(0),IT_env);
-    if (!IT_r.isException (IT_env)) {
-        CORBA::Short IT_result;
-        IT_r >> IT_result;
-        IT_r.checkEnv (IT_env);
-        return IT_result;
-    }
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-    return 0;
-}
-
-CORBA::Long Cubit:: cube_long (CORBA::Long l, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        return 0;
-    }
-    CORBA::Request IT_r (this, "cube_long",IT_env,1,0);
-    if (!IT_r.isException (IT_env)) {
-
-        IT_r << l;
-    }
-
-    IT_r.invoke (CORBA::Flags(0),IT_env);
-    if (!IT_r.isException (IT_env)) {
-        CORBA::Long IT_result;
-        IT_r >> IT_result;
-        IT_r.checkEnv (IT_env);
-        return IT_result;
-    }
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-    return 0;
-}
-
-Cubit::Many Cubit:: cube_struct (const Cubit::Many& values, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        { 
-            Cubit::Many IT_l0;
-            return IT_l0;
-        }
-    }
-    CORBA::Request IT_r (this, "cube_struct",IT_env,1,0);
-    if (!IT_r.isException (IT_env)) {
-
-        values.encodeOp (IT_r);
-    }
-
-    IT_r.invoke (CORBA::Flags(0),IT_env);
-    if (!IT_r.isException (IT_env)) {
-        Cubit::Many IT_result;
-        IT_result.decodeOp (IT_r);
-        IT_r.checkEnv (IT_env);
-        return IT_result;
-    }
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-    { 
-        Cubit::Many IT_l1;
-        return IT_l1;
-    }
-}
-
-Cubit::oneof Cubit:: cube_union (const Cubit::oneof& values, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        { 
-            Cubit::oneof IT_l0;
-            return IT_l0;
-        }
-    }
-    CORBA::Request IT_r (this, "cube_union",IT_env,1,0);
-    if (!IT_r.isException (IT_env)) {
-
-        values.encodeOp (IT_r);
-    }
-
-    IT_r.invoke (CORBA::Flags(0),IT_env);
-    if (!IT_r.isException (IT_env)) {
-        Cubit::oneof IT_result;
-        IT_result.decodeOp (IT_r);
-        IT_r.checkEnv (IT_env);
-        return IT_result;
-    }
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-    { 
-        Cubit::oneof IT_l1;
-        return IT_l1;
-    }
-}
-
-void Cubit:: please_exit (CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        return ;
-    }
-    CORBA::Request IT_r (this, "please_exit",IT_env,1,1);
-
-    IT_r.invoke (CORBA::Flags(CORBA::INV_NO_RESPONSE), IT_env);
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-}
-
-
-
-
-
-#ifndef Cubit_dispatch_impl
-
-unsigned char Cubit_dispatch::dispatch (CORBA::Request &IT_r, 
-    unsigned char, void *) {
-      IT_r.makeRuntimeException1 ("Cubit");
-      return 0;
-}
- 
-#endif
-
-Cubit_Factory::Cubit_Factory (char *IT_OR) {
-      m_pptr = new Cubit_Factory_dispatch (IT_OR, this,(CORBA::Object*)this);
-} 
-Cubit_Factory::Cubit_Factory (ObjectReference *IT_OR) {
-      m_pptr = new Cubit_Factory_dispatch (IT_OR, this,(CORBA::Object*)this);
-} 
-
-#ifndef Cubit_FactoryForwC
-#define Cubit_FactoryForwC
-CORBA::ObjectRef Cubit_Factory_getBase(void *IT_p){
-    return (Cubit_Factory*) IT_p;}
-
-void Cubit_Factory_release (Cubit_Factory_ptr IT_p, CORBA::Environment &IT_env) {
-    CORBA::release(IT_p, IT_env);}
-
-void Cubit_Factory_release (Cubit_Factory_ptr IT_p) {
-    Cubit_Factory_release (IT_p, CORBA::IT_chooseDefaultEnv ()); }
-
-Cubit_Factory_ptr Cubit_Factory_nil (CORBA::Environment &) {
-    return Cubit_Factory:: _nil ();}
-
-Cubit_Factory_ptr Cubit_Factory_nil () {
-    return Cubit_Factory_nil (CORBA::IT_chooseDefaultEnv ());}
-
-Cubit_Factory_ptr Cubit_Factory_duplicate (Cubit_Factory_ptr IT_p, CORBA::Environment &IT_env) {
-    return (Cubit_Factory::_duplicate(IT_p, IT_env)); }
-Cubit_Factory_ptr Cubit_Factory_duplicate (Cubit_Factory_ptr IT_p) {
-    return Cubit_Factory_duplicate (IT_p, CORBA::IT_chooseDefaultEnv ()); }
-#endif
-
-Cubit_Factory_ptr Cubit_Factory::_duplicate(Cubit_Factory_ptr obj, CORBA::Environment& IT_pEnv) {
-        CORBA::EnvExcRaiser IT_raise;
-        CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-       if (!obj) {
-          return (obj);
-       }
-       Cubit_Factory_ptr IT_obj = obj->__duplicate (IT_env);
-       return IT_obj;
-}
-
-
-
-Cubit_Factory* Cubit_Factory:: _bind (const char* IT_markerServer, const char* host,
-		const CORBA::Context &IT_c, 
-		CORBA::Environment &IT_env) {
-       return (Cubit_Factory*)CORBA::Factory.New (IT_markerServer, IT_env, IT_c, host, 
-		Cubit_Factory_IMPL, Cubit_Factory_IR);
-}
-
-
-
-Cubit_Factory* Cubit_Factory:: _bind (CORBA::Environment &IT_env) {
-       return _bind (NULL,NULL,CORBA::Context(), IT_env); }
-
-
-Cubit_Factory* Cubit_Factory:: _bind (const char* IT_markerServer, const char* host,
-                CORBA::Environment &IT_env) {
-       return _bind (IT_markerServer, host, CORBA::Context (), IT_env); }
-Cubit_Factory* Cubit_Factory::_narrow (CORBA::Object* IT_obj, CORBA::Environment &IT_pEnv) {
-        CORBA::EnvExcRaiser IT_raise;
-        CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-        if (CORBA::is_nil (IT_obj)) {
-                return Cubit_Factory:: _nil();
-        }
-
-       Cubit_Factory* IT_p = (Cubit_Factory*)CORBA::Object::_castDown (IT_obj, Cubit_Factory_IR, IT_env);
-        IT_p = IT_p ? IT_p->__duplicate(IT_env) : NULL;
-        if ((IT_env) &&(!strcmp(IT_env.exception()->id(), "CORBA::StExcep::BAD_PARAM")) && (((CORBA::BAD_PARAM*)IT_env.exception())-> minor() == NARROW_FAILED)) {
-                IT_env.exception_free();
-        }
-        return IT_p;
-   }
-
-void* Cubit_FactoryProxyFactoryClass::New (char *IT_OR, CORBA::Environment&) {
-        return  new class Cubit_Factory(IT_OR);}
-
-void* Cubit_FactoryProxyFactoryClass::New (ObjectReference *IT_OR, CORBA::Environment&) {
-        return  new class Cubit_Factory(IT_OR);}
-
-void* Cubit_FactoryProxyFactoryClass::New2 () {
-        return  new class Cubit_Factory((char*)0);}
-
-CORBA::Object* Cubit_FactoryProxyFactoryClass::NewObject (char *IT_OR, CORBA::Environment&) {
-        return  new class Cubit_Factory(IT_OR);}
-
-CORBA::Object* Cubit_FactoryProxyFactoryClass::NewObject (ObjectReference *IT_OR, CORBA::Environment&) {
-        return  new class Cubit_Factory(IT_OR);}
-
-CORBA::Object* Cubit_FactoryProxyFactoryClass::New2Object () {
-        return  new class Cubit_Factory((char*)0);}
-
-void* Cubit_FactoryProxyFactoryClass::IT_castUp (void *IT_p, char* IT_s, CORBA::Environment &IT_env) {
-      void *IT_l;
-      if (!CORBA::_interfaceCmp (IT_s,Cubit_Factory_IR, IT_env))
-         return IT_p;
-      else if (IT_l=CORBA::ObjectFactoryClass::IT_castUp((CORBA::Object*)((class Cubit_Factory*)IT_p),IT_s, IT_env))
-         return IT_l;
-      else return NULL;
-    }
-
-
-CORBA::PPTR* Cubit_FactoryProxyFactoryClass::pptr (void *IT_p) {
-       return ((class Cubit_Factory*)IT_p)->_pptr ();}
-
-void Cubit_FactoryProxyFactoryClass::baseInterfaces (_IDL_SEQUENCE_string& seq) {
-      add (seq, Cubit_Factory_IR);
-      CORBA::ObjectFactoryClass::baseInterfaces (seq);
-}
-
-Cubit_FactoryProxyFactoryClass Cubit_FactoryProxyFactory(1);
-
-Cubit_ptr Cubit_Factory:: create_cubit (const char * name, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        return new Cubit;
-    }
-    CORBA::Request IT_r (this, "create_cubit",IT_env,1,0);
-    if (!IT_r.isException (IT_env)) {
-
-        IT_r.encodeStringOp (name);
-    }
-
-    IT_r.invoke (CORBA::Flags(0),IT_env);
-    if (!IT_r.isException (IT_env)) {
-        Cubit_ptr IT_result;
-        IT_result = (Cubit*) IT_r.decodeObjRef (Cubit_IR);
-        IT_r.checkEnv (IT_env);
-        return IT_result;
-    }
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-    return new Cubit;
-}
-
-
-
-
-
-#ifndef Cubit_Factory_dispatch_impl
-
-unsigned char Cubit_Factory_dispatch::dispatch (CORBA::Request &IT_r, 
-    unsigned char, void *) {
-      IT_r.makeRuntimeException1 ("Cubit_Factory");
-      return 0;
-}
- 
-#endif
-
diff --git a/TAO/IIOP/test/Orbix/factory_client/cubitS.cpp b/TAO/IIOP/test/Orbix/factory_client/cubitS.cpp
deleted file mode 100644
index 2f0459962b8..00000000000
--- a/TAO/IIOP/test/Orbix/factory_client/cubitS.cpp
+++ /dev/null
@@ -1,282 +0,0 @@
-
-
-#include "cubit.hh"
-
-
-#define Cubit_dispatch_impl
-
-unsigned char Cubit_dispatch::dispatch (CORBA::Request &IT_r, 
- unsigned char IT_isTarget, void *IT_pp) {
-    if (!IT_pp)
-       IT_pp = m_obj;
-    const char *IT_s = IT_r.getOperation ();
-    if (!strcmp(IT_s,"cube_octet")) {
-        CORBA::Octet IT_result;
-        CORBA::Environment IT_env (IT_r);
-        CORBA::Filter* IT_f = CORBA::Orbix.getFilter ();
-        if (!IT_r.tcAssert ("\
-Ro~cube_octet~+o{o},>{o},N{}\
-"))
-            return 1;
-        CORBA::Octet o;
-
-        IT_r.extractOctet (o);
-
-        if (IT_f && !IT_r.isException (IT_env))
-        	IT_f->inRequestPostM (IT_r, IT_env);
-        if (!IT_r.isException (IT_env)) {
-            try {
-                	IT_result = ((Cubit*)IT_pp)->cube_octet (  o, IT_env);
-
-            } catch (CORBA::SystemException &IT_exSys) {
-            IT_env.propagate (&IT_exSys);
-            } catch (CORBA::UserException &IT_exUsr) {
-            IT_env.propagate (&IT_exUsr);
-            }
-        }
-
-        if (!IT_r.isException (IT_env)) {
-            if (!IT_r.convertToReply ("\
-o\
-", IT_env)) return 1;
-            IT_r.insertOctet (IT_result);
-            }
-
-        else IT_r.makeSystemException (IT_env);
-        return 1;
-    }
-
-    if (!strcmp(IT_s,"cube_short")) {
-        CORBA::Short IT_result;
-        CORBA::Environment IT_env (IT_r);
-        CORBA::Filter* IT_f = CORBA::Orbix.getFilter ();
-        if (!IT_r.tcAssert ("\
-Ro~cube_short~+s{s},>{s},N{}\
-"))
-            return 1;
-        CORBA::Short s;
-
-        IT_r >> s;
-
-        if (IT_f && !IT_r.isException (IT_env))
-        	IT_f->inRequestPostM (IT_r, IT_env);
-        if (!IT_r.isException (IT_env)) {
-            try {
-                	IT_result = ((Cubit*)IT_pp)->cube_short (  s, IT_env);
-
-            } catch (CORBA::SystemException &IT_exSys) {
-            IT_env.propagate (&IT_exSys);
-            } catch (CORBA::UserException &IT_exUsr) {
-            IT_env.propagate (&IT_exUsr);
-            }
-        }
-
-        if (!IT_r.isException (IT_env)) {
-            if (!IT_r.convertToReply ("\
-s\
-", IT_env)) return 1;
-            IT_r << IT_result;
-            }
-
-        else IT_r.makeSystemException (IT_env);
-        return 1;
-    }
-
-    if (!strcmp(IT_s,"cube_long")) {
-        CORBA::Long IT_result;
-        CORBA::Environment IT_env (IT_r);
-        CORBA::Filter* IT_f = CORBA::Orbix.getFilter ();
-        if (!IT_r.tcAssert ("\
-Ro~cube_long~+l{l},>{l},N{}\
-"))
-            return 1;
-        CORBA::Long l;
-
-        IT_r >> l;
-
-        if (IT_f && !IT_r.isException (IT_env))
-        	IT_f->inRequestPostM (IT_r, IT_env);
-        if (!IT_r.isException (IT_env)) {
-            try {
-                	IT_result = ((Cubit*)IT_pp)->cube_long (  l, IT_env);
-
-            } catch (CORBA::SystemException &IT_exSys) {
-            IT_env.propagate (&IT_exSys);
-            } catch (CORBA::UserException &IT_exUsr) {
-            IT_env.propagate (&IT_exUsr);
-            }
-        }
-
-        if (!IT_r.isException (IT_env)) {
-            if (!IT_r.convertToReply ("\
-l\
-", IT_env)) return 1;
-            IT_r << IT_result;
-            }
-
-        else IT_r.makeSystemException (IT_env);
-        return 1;
-    }
-
-    if (!strcmp(IT_s,"cube_struct")) {
-        Cubit::Many IT_result;
-        CORBA::Environment IT_env (IT_r);
-        CORBA::Filter* IT_f = CORBA::Orbix.getFilter ();
-        if (!IT_r.tcAssert ("\
-Ro~cube_struct~+values{R~Cubit::Many~o{o},l{l},s{s}},>{R~Cubit::Many~o{o},l{l},s{s}},N{}\
-"))
-            return 1;
-        Cubit::Many values;
-
-        values.decodeOp (IT_r);
-
-        if (IT_f && !IT_r.isException (IT_env))
-        	IT_f->inRequestPostM (IT_r, IT_env);
-        if (!IT_r.isException (IT_env)) {
-            try {
-                	IT_result = ((Cubit*)IT_pp)->cube_struct (  values, IT_env);
-
-            } catch (CORBA::SystemException &IT_exSys) {
-            IT_env.propagate (&IT_exSys);
-            } catch (CORBA::UserException &IT_exUsr) {
-            IT_env.propagate (&IT_exUsr);
-            }
-        }
-
-        if (!IT_r.isException (IT_env)) {
-            if (!IT_r.convertToReply ("\
-R~Cubit::Many~o{o},l{l},s{s}\
-", IT_env)) return 1;
-            IT_result.encodeOp (IT_r);
-            }
-
-        else IT_r.makeSystemException (IT_env);
-        return 1;
-    }
-
-    if (!strcmp(IT_s,"cube_union")) {
-        Cubit::oneof IT_result;
-        CORBA::Environment IT_env (IT_r);
-        CORBA::Filter* IT_f = CORBA::Orbix.getFilter ();
-        IT_r.tcPreAssert (
-"\
-Ro~cube_union~+values{U~Cubit::oneof~{E~Cubit::discrim~e_0th,e_1st,e_2nd,e_3rd,e_4th,e_5th}~Cubit::e_0th o{o};Cubit::e_1st s{s};Cubit::e_2nd l{l};Cubit::e_3rd,$ cm{R~Cubit::Many~o{o},l{l},s{s}}},>{U~Cubit::oneof~{E~Cubit::discrim~e_0th,e_1st,e_2nd,e_3rd,\
-");
-        if (!IT_r.tcAssert ("\
-e_4th,e_5th}~Cubit::e_0th o{o};Cubit::e_1st s{s};Cubit::e_2nd l{l};Cubit::e_3rd,$ cm{R~Cubit::Many~o{o},l{l},s{s}}},N{}\
-"))
-            return 1;
-        Cubit::oneof values;
-
-        values.decodeOp (IT_r);
-
-        if (IT_f && !IT_r.isException (IT_env))
-        	IT_f->inRequestPostM (IT_r, IT_env);
-        if (!IT_r.isException (IT_env)) {
-            try {
-                	IT_result = ((Cubit*)IT_pp)->cube_union (  values, IT_env);
-
-            } catch (CORBA::SystemException &IT_exSys) {
-            IT_env.propagate (&IT_exSys);
-            } catch (CORBA::UserException &IT_exUsr) {
-            IT_env.propagate (&IT_exUsr);
-            }
-        }
-
-        if (!IT_r.isException (IT_env)) {
-            if (!IT_r.convertToReply ("\
-U~Cubit::oneof~{E~Cubit::discrim~e_0th,e_1st,e_2nd,e_3rd,e_4th,e_5th}~Cubit::e_0th o{o};Cubit::e_1st s{s};Cubit::e_2nd l{l};Cubit::e_3rd,$ cm{R~Cubit::Many~o{o},l{l},s{s}}\
-", IT_env)) return 1;
-            IT_result.encodeOp (IT_r);
-            }
-
-        else IT_r.makeSystemException (IT_env);
-        return 1;
-    }
-
-    if (!strcmp(IT_s,"please_exit")) {
-        CORBA::Environment IT_env (IT_r);
-        CORBA::Filter* IT_f = CORBA::Orbix.getFilter ();
-        if (!IT_r.tcAssert ("\
-Ro~please_exit~>{v},O{}\
-"))
-            return 1;
-
-        if (IT_f && !IT_r.isException (IT_env))
-        	IT_f->inRequestPostM (IT_r, IT_env);
-        if (!IT_r.isException (IT_env)) {
-            try {
-                ((Cubit*)IT_pp)->please_exit (IT_env);
-
-            } catch (CORBA::SystemException &IT_exSys) {
-            IT_env.propagate (&IT_exSys);
-            } catch (CORBA::UserException &IT_exUsr) {
-            IT_env.propagate (&IT_exUsr);
-            }
-        }
-        IT_r.replyNoResults (CORBA::Flags(CORBA::INV_NO_RESPONSE),IT_env);
-        return 1;
-    }
-
-    if (IT_isTarget)
-        IT_r.makeRuntimeException2 ();
-
-    return 0;
-}
-
-#define Cubit_Factory_dispatch_impl
-
-unsigned char Cubit_Factory_dispatch::dispatch (CORBA::Request &IT_r, 
- unsigned char IT_isTarget, void *IT_pp) {
-    if (!IT_pp)
-       IT_pp = m_obj;
-    const char *IT_s = IT_r.getOperation ();
-    if (!strcmp(IT_s,"create_cubit")) {
-        Cubit_ptr IT_result;
-        CORBA::Environment IT_env (IT_r);
-        CORBA::Filter* IT_f = CORBA::Orbix.getFilter ();
-        if (!IT_r.tcAssert ("\
-Ro~create_cubit~+name{0},>{O~Cubit},N{}\
-"))
-            return 1;
-        char * name;
-
-        IT_r.decodeStringOp(name);
-
-        if (IT_f && !IT_r.isException (IT_env))
-        	IT_f->inRequestPostM (IT_r, IT_env);
-        if (!IT_r.isException (IT_env)) {
-            try {
-                	IT_result = ((Cubit_Factory*)IT_pp)->create_cubit (  name, IT_env);
-
-            } catch (CORBA::SystemException &IT_exSys) {
-            IT_env.propagate (&IT_exSys);
-            } catch (CORBA::UserException &IT_exUsr) {
-            IT_env.propagate (&IT_exUsr);
-            }
-        }
-        CORBA::string_free (name);
-
-        if (!IT_r.isException (IT_env)) {
-            if (!IT_r.convertToReply ("\
-O~Cubit\
-", IT_env)) return 1;
-            {
-                CORBA::Object* IT_l1 = (CORBA::Object*) IT_result;
-                IT_r << IT_l1;
-            }
-            if (IT_result) Cubit_release (IT_result);
-            }
-
-        else IT_r.makeSystemException (IT_env);
-        return 1;
-    }
-
-    if (IT_isTarget)
-        IT_r.makeRuntimeException2 ();
-
-    return 0;
-}
-
-#include "cubitC.cpp"
-
diff --git a/TAO/IIOP/test/Orbix/orb.mk b/TAO/IIOP/test/Orbix/orb.mk
deleted file mode 100644
index cf7b12d3b1b..00000000000
--- a/TAO/IIOP/test/Orbix/orb.mk
+++ /dev/null
@@ -1,146 +0,0 @@
-# ------------------------------------------------------------
-# Orbix 2.2 implicit rules for SunOS/GNU Make
-# ------------------------------------------------------------
-#
-# If you cut'n'paste this into your /usr/include/make/default.mk
-# file, beware! This is not officially supported by Iona
-# Technologies, and you may want to be a bit of a Makefile hacker
-# to make it integrate well with your site's setup.
-
-# The best thing to do would be put it in a standard place and
-# anyone who wants the Orbix implicit rule set can include
-# it with an "include <pathname>/orbix.mk" line in their
-# Makefile. A good place to put it might be /usr/include/make.
-
-# These rules define default C++, C++FLAGS and C++SUFFIX.
-# C++ is the C++ compiler to use; C++FLAGS are command-line
-# flags to the C++ compiler for use in compiling C++ source
-# files into objects; C++SUFFIX is the filename suffix
-# indicating C++ source. By default, it's set to "C" for AT&T C++,
-# and "cc" for GNU g++.
-
-# Feel free to override these in your Makefiles *after*
-# including this file.
-
-# IMPORTANT: If the -M switch is specified in IDLFLAGS, the IDL
-# compiler appends to the user-specified file. The dependency for
-# specified_file.o in the linking target should appear _after_ any use
-# of the IDL compiler which takes the -M flag.  Putting it _last_
-# is normally the best approach.
-
-# Note that these rule definitions use pattern matching,
-# and therefore only work with SunOS make and GNU make.
-
-# They may not work with other vendor's versions of make.
-# If they do not, you may wish to try using GNU make, which
-# is free software produced by the Free Software Foundation.
-
-# If the version of make you wish to use does not support
-# pattern matching, use the sample explicit rule set in
-# the comments at the end of this file.
-
-# ------------------------------------------------------------
-# Essential: set these to the locations into which you
-#		have installed Orbix' components:
-
-ORBIX_BINDIR    = /opt/Orbix_2.2MT/corba2/bin
-ORBIX_LIBDIR    = /opt/Orbix_2.2MT/corba2/lib
-ORBIX_INCDIR    = /opt/Orbix_2.2MT/corba2/include
-
-#-------------------------------------------------------------
-# To compile the demos, you should change these values as
-# appropriate for your particular system installation
-#-------------------------------------------------------------
-
-X11BASE         = /usr/openwin
-X11INCDIR       = $(X11BASE)/include
-X11LIBDIR       = $(X11BASE)/lib
-
-# C++             = CC
-# C++FLAGS        = -I$(ORBIX_INCDIR) -I. -mt -D_REENTRANT
-# C++SUFFIX       = cpp
-
-# ------------------------------------------------------------
-# ITCLT, IRCLT and ITSRV can be either statically or dynamically linked
-# Use -Bdynamic or -Bstatic as appropriate.
-# ------------------------------------------------------------
-
-ITCLT 		= -Bstatic -lorbixmt
-IRCLT 		= -Bstatic -lIRcltmt
-ITSRV 		= -Bstatic -lorbixmt
-ITIIOP          = -Bstatic -liiopmt
-ITDSI           = -Bstatic -lDSImt
-ITIFR		= -Bstatic -lifrmt
-
-# ------------------------------------------------------------
-# SYSLIBS must be dynamically linked; otherwise you can expect to
-# get linkage errors for symbols in the nsl library
-# ------------------------------------------------------------
-
-LDFLAGS         += -L$(ORBIX_LIBDIR)
-SYSLIBS         = -Bdynamic -lnsl -lsocket
-
-IDL             = $(ORBIX_BINDIR)/idl 
-IDLFLAGS        =
-
-# ------------------------------------------------------------
-# The following section defines implicit rules for creating
-# *.{C,S}.C files, rules for compiling those
-# into objects, and even a rule for compiling C++ source into
-# objects (in case one isn't already defined).
-
-# ------------------------------------------------------------
-# first, put the new suffixes at the *head* of the suffix list,
-# overriding any existing .C compilation method.
-.SUFFIXES:
-.SUFFIXES: .$(C++SUFFIX) .idl $(SUFFIXES)
-
-# .SUFFIXES: .$(C++SUFFIX) .idl .hh $(SUFFIXES)
-# ------------------------------------------------------------
-# *[CS].o must be compiled here, and depends
-# mostly on the C++ files produced from the IDL file.
-
-%C.o: %C.$(C++SUFFIX)
-	$(C++) -c $(C++FLAGS) $<
-
-%S.o: %S.$(C++SUFFIX)
-	$(C++) -c $(C++FLAGS) $<
-
-%.o: %.$(C++SUFFIX)
-	$(C++) -c $(C++FLAGS) $<
-
-# and here's how to compile C++ files from the IDL file.
-# only ONE of these rules will be run at make-time,
-
-%S.$(C++SUFFIX): %.idl
-	$(IDL) $(IDLFLAGS) $<
-
-%C.$(C++SUFFIX): %.idl
-	$(IDL) $(IDLFLAGS) $<
-
-%.hh: %.idl
-	$(IDL) $(IDLFLAGS) $<
-
-# ------------------------------------------------------------
-# If the version of make you wish to use does not support
-# pattern matching, here's a sample of an explicit rule set.
-
-# We assume the IDL file is called "foobar.idl", we wish
-# to compile "foobarC.o", "foobarS.o", and
-# "foobar.hh", and the C++ file suffix.
-# ------------------------------------------------------------
-
-# foobarC.o: foobar.hh foobarC.C
-#	$(C++) -c ($C++FLAGS) foobarC.C
-#
-# foobarS.o: foobar.hh foobarS.C
-#	$(C++) -c ($C++FLAGS) foobarS.C
-#
-# foobarC.C: foobar.idl
-#	$(IDL) -c ($IDLFLAGS) foobar.idl
-#
-# foobarS.C: foobar.idl
-#	$(IDL) -c ($IDLFLAGS) foobar.idl
-#
-# foobar.hh: foobar.idl
-#	$(IDL) -c ($IDLFLAGS) foobar.idl
diff --git a/TAO/IIOP/test/Orbix/tpool/Makefile b/TAO/IIOP/test/Orbix/tpool/Makefile
deleted file mode 100644
index d4cbaacb6bd..00000000000
--- a/TAO/IIOP/test/Orbix/tpool/Makefile
+++ /dev/null
@@ -1,89 +0,0 @@
-#----------------------------------------------------------------------------
-#	@(#)Makefile	1.1	10/18/96
-#
-#	Makefile for the ACE_MT_CORBA_Handler tests
-#----------------------------------------------------------------------------
-
-#----------------------------------------------------------------------------
-#	Local macros
-#----------------------------------------------------------------------------
-
-SRC = cubitS.cpp cubit_impl.cpp server.cpp tpool.cpp
-
-SVR_OBJS = cubitS.o cubit_impl.o server.o tpool.o
-
-LDLIBS	 = 
-
-VLDLIBS	 = $(LDLIBS:%=%$(VAR))
-
-#----------------------------------------------------------------------------
-#	Include macros and targets
-#----------------------------------------------------------------------------
-
-include		$(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-include		$(ACE_ROOT)/include/makeinclude/macros.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.common.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.lib.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.bin.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
-
-#----------------------------------------------------------------------------
-#	Orbix related macros and target settings.
-#----------------------------------------------------------------------------
-
-
-ORBIX_BINDIR    = $(ORBIX_ROOT)/bin
-ORBIX_LIBDIR    = $(ORBIX_ROOT)/corba2/lib
-ORBIX_INCDIR    = $(ORBIX_ROOT)/corba2/include
-
-# Remove -DCubit_USE_BOA from below to use the TIE approach
-
-CPPFLAGS += -DEXCEPTIONS -I$(ORBIX_INCDIR) -DWANT_ORBIX_FDS -DCubit_USE_BOA
-LDFLAGS  += -L$(ORBIX_LIBDIR) -R $(ORBIX_LIBDIR) -L$(ACE)/ace
-
-IDLFLAGS = -s S.cpp -c C.cpp -B
-
-#----------------------------------------------------------------------------
-#	Local targets
-#----------------------------------------------------------------------------
-
-all: server
-
-server: $(addprefix $(VDIR),$(SVR_OBJS))
-	$(LINK.cc) -o server $(addprefix $(VDIR),$(SVR_OBJS)) $(LDFLAGS) $(ITIIOP) $(ITSRV) $(VLDLIBS)
-
-#----------------------------------------------------------------------------
-#	Dependencies
-#----------------------------------------------------------------------------
-# DO NOT DELETE THIS LINE -- g++dep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-
-.obj/cubit_impl.o .shobj/cubit_impl.so: cubit_impl.cpp cubit_impl.h cubit.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/config-sunos5.5-sunc++-4.x.h \
- $(ACE_ROOT)/ace/stdcpp.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i
-.obj/server.o .shobj/server.so: server.cpp cubit_impl.h cubit.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/config-sunos5.5-sunc++-4.x.h \
- $(ACE_ROOT)/ace/stdcpp.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i
-
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/IIOP/test/Orbix/tpool/cubit.h b/TAO/IIOP/test/Orbix/tpool/cubit.h
deleted file mode 100644
index 1c868a6597d..00000000000
--- a/TAO/IIOP/test/Orbix/tpool/cubit.h
+++ /dev/null
@@ -1,727 +0,0 @@
-
-#ifndef cubit_hh
-#define cubit_hh
-
-#include "ace/OS.h"
-#include <CORBA.h>
-
-
-#ifndef _Cubit_defined
-#define _Cubit_defined
-class Cubit_dispatch : public virtual CORBA::PPTR {
-public:
-
-      Cubit_dispatch (void *IT_p, CORBA::Object* IT_o, const char *IT_m, 
-        CORBA::LoaderClass *IT_l, char *IT_i, void* IT_im)
-       : PPTR (IT_p,IT_o,IT_m,IT_l,IT_i,IT_im) {}
-
-
-   Cubit_dispatch (char *IT_OR, void *IT_p, CORBA::Object *IT_o)
-       : PPTR (IT_OR,IT_p,IT_o) {}
-
-
-   Cubit_dispatch () {}
-
-   Cubit_dispatch (ObjectReference *IT_OR, void *IT_p, CORBA::Object *IT_o)
-       : PPTR (IT_OR,IT_p,IT_o) {}
-
-
-   Cubit_dispatch (void *IT_p, CORBA::Object *IT_o, const char *IT_m, 
-        char *IT_i, CORBA::Object* IT_ob, void* IT_im)
-       : PPTR (IT_p,IT_o,IT_m,IT_i,IT_ob,IT_im) {}
-
-
-   virtual unsigned char dispatch (CORBA::Request &IT_r, 
-        unsigned char IT_isTarget, void* IT_pp=NULL);
-
-
-};
-
-class Cubit;
-
-#ifndef CubitPtr
-#define CubitPtr
-
-typedef Cubit* Cubit_ptr;
-
-typedef Cubit* CubitRef;
-
-#endif
-
-
-#ifndef CubitForwH
-#define CubitForwH
-CORBA::ObjectRef Cubit_getBase (void *);
-void Cubit_release (Cubit *, CORBA::Environment &IT_env);
-void Cubit_release (Cubit_ptr);
-Cubit* Cubit_duplicate (Cubit_ptr, CORBA::Environment &IT_env);
-Cubit* Cubit_duplicate (Cubit_ptr );
-Cubit_ptr Cubit_nil (CORBA::Environment &IT_env);
-Cubit_ptr Cubit_nil ();
-#endif
-#define Cubit_IMPL "Cubit"
-
-
-class Cubit;
-
-typedef Cubit CubitProxy;
-#define Cubit_IR "Cubit$v1.1"
-#define Cubit_IMPL "Cubit"
-
-#ifndef CubitPtr
-#define CubitPtr
-
-typedef Cubit* Cubit_ptr;
-
-typedef Cubit* CubitRef;
-
-#endif
-
-class Cubit: public virtual CORBA::Object  {
-public:
-        Cubit (char *IT_OR);
-    Cubit (ObjectReference *IT_OR);
-    Cubit () : CORBA::Object  (1) {}
-protected:
-    Cubit_ptr __duplicate(
-            CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) {
-       CORBA::Object::__duplicate (IT_env);
-       return this;
-    }
-public:
-    static Cubit_ptr _duplicate(
-            Cubit_ptr, 
-            CORBA::Environment &IT_pEnv=CORBA::IT_chooseDefaultEnv ());
-public:
-   static Cubit* _bind (const char* IT_markerServer, const char* host,
-		const CORBA::Context &IT_c, 
-		CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-   static Cubit* _bind (CORBA::Environment &IT_env);
-   static Cubit* _bind (const char* IT_markerServer=NULL, const char* host=NULL,
-                 CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-    static Cubit* _narrow (CORBA::Object* , CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-    static Cubit_ptr _nil (CORBA::Environment &IT_pEnv=CORBA::IT_chooseDefaultEnv ()) {
-        CORBA::EnvExcRaiser IT_raise;
-        CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-        return (Cubit_ptr) CORBA::OBJECT_NIL;}
-
-#ifndef Cubit_Many_defined
-#define Cubit_Many_defined
-
-struct Many {
-    CORBA::Octet o;
-    CORBA::Long l;
-    CORBA::Short s;
-
-    void encodeOp (CORBA::Request &IT_r) const;
-    void decodeOp (CORBA::Request &IT_r);
-    void decodeInOutOp (CORBA::Request &IT_r);
-    Many(const Many &);
-    Many();
-    ~Many();
-    Many& operator= (const Many&);
-};
-
-#ifndef Cubit_ManyVarH
-#define Cubit_ManyVarH
-
-#ifndef Cubit_ManyvPtr
-#define Cubit_ManyvPtr
-typedef Many* Many_vPtr;
-typedef const Many* Many_cvPtr;
-#endif
-
-class Many_var : public CORBA::_var
-{
-    private:
-
-    unsigned char copyHelper (const Many_var &IT_s) {
-        if (!IT_s._ptr) {
-            _ptr = IT_s._ptr;
-        } else
-        {
-            _ptr = new Many;
-            *(_ptr) =  *(IT_s._ptr);
-        }
-        return 1;
-    }
-
-    public:
-
-    Many_var (const Many_var &IT_s) {
-        (void) copyHelper (IT_s);
-    }
-
-    Many_var () {
-        _ptr =  new Many;
-;
-    }
-
-    Many_var (Many *IT_p) {
-        _ptr = IT_p;
-    }
-
-    Many_var &operator= (Many *IT_p) {
-        if (_ptr != IT_p) {
-            delete _ptr;
-        }
-        _ptr = IT_p;
-        return (*this);
-    }
-
-    Many_var &operator= (const Many_var &IT_s) {
-        if (_ptr != IT_s._ptr) {
-            delete _ptr;
-        }
-        _ptr = new Many;
-        *(_ptr) =  *(IT_s._ptr);
-        return (*this);
-    }
-
-    ~Many_var () {
-        delete _ptr;
-    }
-
-    Many* operator-> () {
-        return _ptr;
-    }
-
-    operator Many_cvPtr () const { return _ptr;}
-    operator Many_vPtr& () { return _ptr;}
-    operator Many& () const { return * _ptr;}
-
-    protected:
-    Many *_ptr;
-    private:
-    Many_var &operator= (const CORBA::_var &IT_s);
-    Many_var (const CORBA::_var &IT_s);
-};
-
-#endif
-
-
-#endif
-
-enum discrim {e_0th,e_1st,e_2nd,e_3rd,e_4th,e_5th, IT__ENUM_Cubit_discrim=CORBA_ULONG_MAX};
-
-#ifndef Cubit_oneof_defined
-#define Cubit_oneof_defined
-
-struct oneof {
-    private:
-
-    discrim __d;
-    union {
-        CORBA::Octet _o_;
-        CORBA::Short _s_;
-        CORBA::Long _l_;
-        Many * _cm_;
-    };
-
-    public:
-
-    void encodeOp (CORBA::Request &IT_r) const;
-    void decodeOp (CORBA::Request &IT_r);
-    void decodeInOutOp (CORBA::Request &IT_r);
-
-    private:
-
-    unsigned char isSet;
-
-    public:
-
-    discrim _d () const { return __d; }
-
-    CORBA::Octet o () const {
-      return _o_;
-    }
-
-    void o (CORBA::Octet IT_member) {
-        if (isSet && (__d != Cubit::e_0th))
-        {
-            this-> oneof::~oneof();
-            memset(this, 0, sizeof(*this));
-        }
-
-        __d = Cubit::e_0th;
-        isSet = 1;
-        _o_ = IT_member;
-    }
-
-    CORBA::Short s () const {
-        return _s_;
-    }
-
-    void s (CORBA::Short IT_member) {
-        if (isSet && (__d != Cubit::e_1st))
-        {
-            this-> oneof::~oneof();
-            memset(this, 0, sizeof(*this));
-        }
-
-        __d = Cubit::e_1st;
-        isSet = 1;
-        _s_ = IT_member;
-    }
-
-    CORBA::Long l () const {
-        return _l_;
-    }
-
-    void l (CORBA::Long IT_member) {
-        if (isSet && (__d != Cubit::e_2nd))
-        {
-            this-> oneof::~oneof();
-            memset(this, 0, sizeof(*this));
-        }
-
-        __d = Cubit::e_2nd;
-        isSet = 1;
-        _l_ = IT_member;
-    }
-
-    Many& cm () {
-        return (*_cm_);
-    }
-
-    const Many& cm () const {
-        return (*_cm_);
-    }
-
-    void cm (const Many& IT_member) {
-        if (isSet && (__d != Cubit::e_3rd))
-        {
-            this-> oneof::~oneof();
-            memset(this, 0, sizeof(*this));
-        }
-
-        __d = Cubit::e_3rd;
-
-        if (!isSet) {
-            _cm_ = new Many;
-            isSet = 1;
-        }
-        *(_cm_) = IT_member;
-    }
-
-
-    oneof();
-    oneof(const oneof &);
-    ~oneof();
-    oneof& operator= (const oneof&);
-};
-
-#ifndef Cubit_oneofVarH
-#define Cubit_oneofVarH
-
-#ifndef Cubit_oneofvPtr
-#define Cubit_oneofvPtr
-typedef oneof* oneof_vPtr;
-typedef const oneof* oneof_cvPtr;
-#endif
-
-class oneof_var : public CORBA::_var
-{
-    private:
-
-    unsigned char copyHelper (const oneof_var &IT_s) {
-        if (!IT_s._ptr) {
-            _ptr = IT_s._ptr;
-        } else
-        {
-            _ptr = new oneof;
-            *(_ptr) =  *(IT_s._ptr);
-        }
-        return 1;
-    }
-
-    public:
-
-    oneof_var (const oneof_var &IT_s) {
-        (void) copyHelper (IT_s);
-    }
-
-    oneof_var () {
-        _ptr = NULL;
-    }
-
-    oneof_var (oneof *IT_p) {
-        _ptr = IT_p;
-    }
-
-    oneof_var &operator= (oneof *IT_p) {
-        if (_ptr != IT_p) {
-            delete _ptr;
-        }
-        _ptr = IT_p;
-        return (*this);
-    }
-
-    oneof_var &operator= (const oneof_var &IT_s) {
-        if (_ptr != IT_s._ptr) {
-            delete _ptr;
-        }
-        _ptr = new oneof;
-        *(_ptr) =  *(IT_s._ptr);
-        return (*this);
-    }
-
-    ~oneof_var () {
-        delete _ptr;
-    }
-
-    oneof* operator-> () {
-        return _ptr;
-    }
-
-    operator oneof_cvPtr () const { return _ptr;}
-    operator oneof_vPtr& () { return _ptr;}
-    operator oneof& () const { return * _ptr;}
-
-    protected:
-    oneof *_ptr;
-    private:
-    oneof_var &operator= (const CORBA::_var &IT_s);
-    oneof_var (const CORBA::_var &IT_s);
-};
-
-#endif
-
-
-#endif
-        virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual Many cube_struct (const Many& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual oneof cube_union (const oneof& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual void please_exit (CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-};
-
-#ifndef CubitVarH
-#define CubitVarH
-
-#ifndef CubitvPtr
-#define CubitvPtr
-typedef Cubit* Cubit_vPtr;
-typedef const Cubit* Cubit_cvPtr;
-#endif
-
-class Cubit_var : public CORBA::_var
-{
-    private:
-
-    unsigned char copyHelper (const Cubit_var &IT_s) {
-        {
-            _ptr = Cubit_duplicate (IT_s._ptr);
-        }
-        return 1;
-    }
-
-    public:
-
-    Cubit_var (const Cubit_var &IT_s) {
-        (void) copyHelper (IT_s);
-    }
-
-    Cubit_var () {
-        _ptr = Cubit_nil ();
-    }
-
-    Cubit_var (Cubit *IT_p) {
-        _ptr = IT_p;
-    }
-
-    Cubit_var &operator= (Cubit *IT_p) {
-        Cubit_release (_ptr);
-        _ptr = IT_p;
-        return (*this);
-    }
-
-    Cubit_var &operator= (const Cubit_var &IT_s) {
-        Cubit_release (_ptr);
-        _ptr = Cubit_duplicate (IT_s._ptr);
-        return (*this);
-    }
-
-    ~Cubit_var () {
-        Cubit_release (_ptr);
-    }
-
-    Cubit* operator-> () {
-        return _ptr;
-    }
-
-    operator Cubit_cvPtr () const { return _ptr;}
-    operator Cubit_vPtr& () { return _ptr;}
-
-    protected:
-    Cubit *_ptr;
-    private:
-    Cubit_var &operator= (const CORBA::_var &IT_s);
-    Cubit_var (const CORBA::_var &IT_s);
-    Cubit_var &operator= (const CORBA::_mgr &IT_s);
-    Cubit_var &operator= (const CORBA::_SeqElem &IT_s);
-    Cubit_var (const CORBA::_mgr &IT_s);
-    Cubit_var (const CORBA::_SeqElem &IT_s);
-};
-
-#endif
-
-
-#ifndef CubitMgrH
-#define CubitMgrH
-
-class Cubit_mgr : public CORBA::_mgr
-{
-    public:
-
-    Cubit_mgr () {
-        _ptr = Cubit_nil ();
-        _release = 1;
-    }
-
-    Cubit_mgr (const Cubit_mgr &IT_s) {
-        _ptr = Cubit_duplicate (IT_s._ptr);
-        _release = 1;
-    }
-
-    Cubit_mgr &operator= (Cubit *IT_p) {
-        if (_ptr && _release)
-            Cubit_release (_ptr);
-        _ptr = IT_p;
-        _release = 1;
-        return (*this);
-    }
-
-    Cubit_mgr &operator= (const Cubit_mgr &IT_s) {
-        if (_ptr && _release)
-            Cubit_release (_ptr);
-        _ptr = Cubit_duplicate(IT_s._ptr);
-        _release = 1;
-        return (*this);
-    }
-
-    Cubit_mgr &operator= (Cubit_var &IT_s) {
-        if (_ptr && _release)
-            Cubit_release (_ptr);
-        _ptr = Cubit_duplicate(IT_s);
-        _release = 1;
-        return (*this);
-    }
-
-    ~Cubit_mgr () {
-        if (_release)
-            Cubit_release (_ptr);
-    }
-
-    unsigned char release () {
-        return _release;
-    }
-
-    void release (unsigned char rel) {
-        _release = rel;
-    }
-
-    operator int () const {
-        return (((CORBA::Object_ptr) _ptr) ? 1 : 0);
-    }
-
-    operator void* () const {
-        return _ptr;
-    }
-
-    operator CORBA::Object * () const {
-        return (CORBA::Object *) _ptr;
-    }
-
-    operator Cubit* () const {
-        return (Cubit*) _ptr;
-    }
-
-    Cubit_ptr operator-> () const {
-        return _ptr;
-    }
-
-    Cubit *_ptr;
-
-    protected:
-
-    unsigned char _release;
-};
-
-typedef Cubit_mgr Cubit_mgr_IT_const;
-#endif
-
-#ifndef CubitSeqElemH
-#define CubitSeqElemH
-
-class Cubit_SeqElem : public CORBA::_SeqElem
-{
-    public:
-
-    Cubit_SeqElem (Cubit_ptr* IT_p, unsigned char rel) {
-        _ptr = IT_p;
-        _release = rel;
-    }
-
-    Cubit_SeqElem &operator= (Cubit_ptr IT_p) {
-        if (_ptr) {
-            if (*(_ptr) && _release)
-                Cubit_release (*(_ptr));
-            *(_ptr) = IT_p;
-        }
-        return (*this);
-    }
-
-    Cubit_SeqElem &operator= (const Cubit_SeqElem &IT_s) {
-        if (_ptr && IT_s._ptr) {
-            if (*(_ptr) && _release)
-                Cubit_release (*(_ptr));
-            *(_ptr) = Cubit_duplicate(*(IT_s._ptr));
-        }
-        return (*this);
-    }
-
-    operator Cubit_ptr () const {
-        return _ptr ? (Cubit_ptr) (*_ptr) : Cubit_nil(); 
-    }
-
-    Cubit_ptr operator->() const { return *_ptr;}
-
-    protected:
-    Cubit_ptr *_ptr;
-    unsigned char _release;
-};
-
-#endif
-
-
-#define TIE_Cubit(X) Cubit##X
-
-#define DEF_TIE_Cubit(X) \
-	class Cubit##X : public virtual Cubit {		\
-	  X* m_obj;						\
-	public:							\
-								\
-								\
-	   Cubit##X  (X *objp, const char* m="", CORBA::LoaderClass *l=0)\
-		: Cubit(), m_obj(objp) {	\
-		m_pptr = new Cubit_dispatch		\
-			(( Cubit*)this,(CORBA::Object*)this,m,l,Cubit_IR,m_obj);	\
-	   }								\
-	   Cubit##X  (CORBA::Object *IT_p, const char* IT_m="", void *IT_q=0)\
-		: Cubit() {	\
-		m_pptr = new Cubit_dispatch		\
-			(( Cubit*)this,(CORBA::Object*)this,IT_m,Cubit_IR,IT_p,IT_q);	\
-		m_obj = (X*)(m_pptr->getImplObj ());			\
-	   }								\
-								\
-	   virtual ~Cubit##X  () {				\
-		if (_okToDeleteImpl ()) delete m_obj; }					\
-	   virtual void* _deref () {					\
-		return m_obj; }					\
-								\
-virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_octet (  o,IT_env);\
-}\
-	\
-virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_short (  s,IT_env);\
-}\
-	\
-virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_long (  l,IT_env);\
-}\
-	\
-virtual Cubit::Many cube_struct (const Cubit::Many& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_struct (  values,IT_env);\
-}\
-	\
-virtual Cubit::oneof cube_union (const Cubit::oneof& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_union (  values,IT_env);\
-}\
-	\
-virtual void please_exit (CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-m_obj->please_exit (IT_env);\
-}\
-								\
-	};						\
-
-
-#define QUALS_Cubit	\
-virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_octet (  o,IT_env);\
-}\
-	\
-virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_short (  s,IT_env);\
-}\
-	\
-virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_long (  l,IT_env);\
-}\
-	\
-virtual Many cube_struct (const Many& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_struct (  values,IT_env);\
-}\
-	\
-virtual oneof cube_union (const oneof& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_union (  values,IT_env);\
-}\
-	\
-virtual void please_exit (CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-m_obj->please_exit (IT_env);\
-}\
-
-
-
-
-class CubitProxyFactoryClass : public virtual CORBA::ObjectFactoryClass {
-public:
-   CubitProxyFactoryClass (unsigned char IT_p=0)
-		: CORBA::ProxyFactory (Cubit_IR, IT_p) {}
-
-    virtual void* New (char *IT_OR, CORBA::Environment&);
-
-    virtual void* New (ObjectReference *IT_OR, CORBA::Environment&);
-
-    virtual void* New2 (); 
-
-    virtual CORBA::Object* NewObject (char *IT_OR, CORBA::Environment&);
-
-    virtual CORBA::Object* NewObject (ObjectReference *IT_OR, CORBA::Environment&);
-
-    virtual CORBA::Object* New2Object (); 
-
-    virtual void* IT_castUp (void *IT_p, char* IT_s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-
-    virtual CORBA::PPTR* pptr (void *IT_p);
-
-    virtual void baseInterfaces (_IDL_SEQUENCE_string&);
-
-
-};
-
-extern CubitProxyFactoryClass CubitProxyFactory;
-
-class CubitBOAImpl : public virtual Cubit  {
-public:
-    CubitBOAImpl (const char *m="", CORBA::LoaderClass *l=NULL) {
-  if (CORBA::PPTR::isOK (m_pptr, Cubit_IR))
-    m_pptr = new Cubit_dispatch ( (Cubit*)this,
-   	 (CORBA::Object*)this, m, l, Cubit_IR, this);
-}
-
-        virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual Many cube_struct (const Many& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual oneof cube_union (const oneof& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual void please_exit (CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-};
-
-
-#endif
-
-
-#endif
diff --git a/TAO/IIOP/test/Orbix/tpool/cubit.idl b/TAO/IIOP/test/Orbix/tpool/cubit.idl
deleted file mode 100644
index d9b38c34a2a..00000000000
--- a/TAO/IIOP/test/Orbix/tpool/cubit.idl
+++ /dev/null
@@ -1,40 +0,0 @@
-// @(#)cubit.idl	1.1 95/09/10
-// Copyright 1994-1995 by Sun Microsystems, Inc.
-
-#pragma prefix	"Eng.SUN.COM"
-#pragma version Cubit 1.1
-
-interface Cubit {
-    octet	cube_octet (in octet o);
-    short	cube_short (in short s);
-    long	cube_long (in long l);
-
-    struct Many {
-	octet	o;		// + 3 bytes padding (normally) ...
-	long	l;
-	short	s;		// + 2 bytes padding (normally) ...
-    };
-
-    Many	cube_struct (in Many values);
-
-    enum discrim {e_0th, e_1st, e_2nd, e_3rd, e_4th, e_5th};
-
-    union oneof
-    switch (discrim) {
-	// this is an easy union to interpret; no padding
-	// is needed between discriminant and value.
-      case e_0th:
-        octet		o;
-      case e_1st:
-        short		s;
-      case e_2nd:
-        long		l;
-      case e_3rd:
-      default:
-        Many		cm;
-    };
-
-    oneof	cube_union (in oneof values);
-
-    oneway void	please_exit ();
-};
diff --git a/TAO/IIOP/test/Orbix/tpool/cubitC.cpp b/TAO/IIOP/test/Orbix/tpool/cubitC.cpp
deleted file mode 100644
index c47e38f26ee..00000000000
--- a/TAO/IIOP/test/Orbix/tpool/cubitC.cpp
+++ /dev/null
@@ -1,557 +0,0 @@
-#include "cubit.h"
-
-Cubit::Cubit (char *IT_OR) {
-      m_pptr = new Cubit_dispatch (IT_OR, this,(CORBA::Object*)this);
-} 
-Cubit::Cubit (ObjectReference *IT_OR) {
-      m_pptr = new Cubit_dispatch (IT_OR, this,(CORBA::Object*)this);
-} 
-
-#ifndef CubitForwC
-#define CubitForwC
-CORBA::ObjectRef Cubit_getBase(void *IT_p){
-    return (Cubit*) IT_p;}
-
-void Cubit_release (Cubit_ptr IT_p, CORBA::Environment &IT_env) {
-    CORBA::release(IT_p, IT_env);}
-
-void Cubit_release (Cubit_ptr IT_p) {
-    Cubit_release (IT_p, CORBA::IT_chooseDefaultEnv ()); }
-
-Cubit_ptr Cubit_nil (CORBA::Environment &) {
-    return Cubit:: _nil ();}
-
-Cubit_ptr Cubit_nil () {
-    return Cubit_nil (CORBA::IT_chooseDefaultEnv ());}
-
-Cubit_ptr Cubit_duplicate (Cubit_ptr IT_p, CORBA::Environment &IT_env) {
-    return (Cubit::_duplicate(IT_p, IT_env)); }
-Cubit_ptr Cubit_duplicate (Cubit_ptr IT_p) {
-    return Cubit_duplicate (IT_p, CORBA::IT_chooseDefaultEnv ()); }
-#endif
-
-Cubit_ptr Cubit::_duplicate(Cubit_ptr obj, CORBA::Environment& IT_pEnv) {
-        CORBA::EnvExcRaiser IT_raise;
-        CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-       if (!obj) {
-          return (obj);
-       }
-       Cubit_ptr IT_obj = obj->__duplicate (IT_env);
-       return IT_obj;
-}
-
-
-
-Cubit* Cubit:: _bind (const char* IT_markerServer, const char* host,
-		const CORBA::Context &IT_c, 
-		CORBA::Environment &IT_env) {
-       return (Cubit*)CORBA::Factory.New (IT_markerServer, IT_env, IT_c, host, 
-		Cubit_IMPL, Cubit_IR);
-}
-
-
-
-Cubit* Cubit:: _bind (CORBA::Environment &IT_env) {
-       return _bind (NULL,NULL,CORBA::Context(), IT_env); }
-
-
-Cubit* Cubit:: _bind (const char* IT_markerServer, const char* host,
-                CORBA::Environment &IT_env) {
-       return _bind (IT_markerServer, host, CORBA::Context (), IT_env); }
-Cubit* Cubit::_narrow (CORBA::Object* IT_obj, CORBA::Environment &IT_pEnv) {
-        CORBA::EnvExcRaiser IT_raise;
-        CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-        if (CORBA::is_nil (IT_obj)) {
-                return Cubit:: _nil();
-        }
-
-       Cubit* IT_p = (Cubit*)CORBA::Object::_castDown (IT_obj, Cubit_IR, IT_env);
-        IT_p = IT_p ? IT_p->__duplicate(IT_env) : NULL;
-        if ((IT_env) &&(!strcmp(IT_env.exception()->id(), "CORBA::StExcep::BAD_PARAM")) && (((CORBA::BAD_PARAM*)IT_env.exception())-> minor() == NARROW_FAILED)) {
-                IT_env.exception_free();
-        }
-        return IT_p;
-   }
-
-
-#ifndef Cubit_Many_Ops
-#define Cubit_Many_Ops
-
-void Cubit::Many:: encodeOp (CORBA::Request &IT_r) const {
-
-    IT_r.insertOctet (o);
-
-    IT_r << l;
-
-    IT_r << s;
-}
-
-void Cubit::Many:: decodeOp (CORBA::Request &IT_r) {
-
-    IT_r.extractOctet (o);
-
-    IT_r >> l;
-
-    IT_r >> s;
-}
-
-void Cubit::Many:: decodeInOutOp (CORBA::Request &IT_r) {
-
-    IT_r.extractOctet (o);
-
-    IT_r >> l;
-
-    IT_r >> s;
-}
-
-Cubit::Many ::~Many () {
-}
-
-Cubit::Many:: Many (const Cubit::Many &IT_s) 
-	 {
-    o = IT_s.o;
-    l = IT_s.l;
-    s = IT_s.s;
-}
-
-Cubit::Many:: Many () {
-}
-
-Cubit::Many &Cubit::Many:: operator= (const Cubit::Many& IT_s) {
-    if (this == &IT_s) return *this;
-    o = IT_s.o;
-    l = IT_s.l;
-    s = IT_s.s;
-    return *this;
-}
-
-
-#endif
-
-
-#ifndef Cubit_oneof_Ops
-#define Cubit_oneof_Ops
-void Cubit::oneof:: encodeOp (CORBA::Request &IT_r) const {
-    if (!isSet) return;
-    {
-    CORBA::ULong IT_0 = (CORBA::ULong) __d;
-    IT_r << IT_0;
-    }
-    switch (__d) {
-        case Cubit::e_0th: 
-        IT_r.insertOctet (_o_);
-        break;
-        case Cubit::e_1st: 
-        IT_r << _s_;
-        break;
-        case Cubit::e_2nd: 
-        IT_r << _l_;
-        break;
-        case Cubit::e_3rd: 
-        default: 
-        (*_cm_).encodeOp (IT_r);
-        break;
-    }
-
-}
-
-void Cubit::oneof:: decodeOp (CORBA::Request &IT_r) {
-    isSet = 0;
-    {
-    CORBA::ULong IT_1;
-    IT_r >> IT_1;
-    __d = Cubit::discrim(IT_1);
-    }
-    switch (__d) {
-        case Cubit::e_0th: 
-        if (!isSet) {
-            isSet = 1;
-        }
-        IT_r.extractOctet (_o_);
-        break;
-        case Cubit::e_1st: 
-        if (!isSet) {
-            isSet = 1;
-        }
-        IT_r >> _s_;
-        break;
-        case Cubit::e_2nd: 
-        if (!isSet) {
-            isSet = 1;
-        }
-        IT_r >> _l_;
-        break;
-        case Cubit::e_3rd: 
-        default: 
-        if (!isSet) {
-            _cm_ = new Cubit::Many;
-            isSet = 1;
-        }
-        (*_cm_).decodeOp (IT_r);
-        break;
-    }
-
-}
-void Cubit::oneof:: decodeInOutOp (CORBA::Request &IT_r) {
-    Cubit::discrim IT_d;
-    {
-    CORBA::ULong IT_2;
-    IT_r >> IT_2;
-    IT_d = Cubit::discrim(IT_2);
-    }
-    if (IT_d == __d)
-        switch (__d) {
-            case Cubit::e_0th: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r.extractOctet (_o_);
-            break;
-            case Cubit::e_1st: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r >> _s_;
-            break;
-            case Cubit::e_2nd: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r >> _l_;
-            break;
-            case Cubit::e_3rd: 
-            default: 
-            if (!isSet) {
-                _cm_ = new Cubit::Many;
-                isSet = 1;
-            }
-            (*_cm_).decodeInOutOp (IT_r);
-            break;
-        }
-
-    else {
-        this->oneof:: ~oneof();
-        memset(this, 0, sizeof(*this));
-        __d = IT_d;
-        switch (__d) {
-            case Cubit::e_0th: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r.extractOctet (_o_);
-            break;
-            case Cubit::e_1st: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r >> _s_;
-            break;
-            case Cubit::e_2nd: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r >> _l_;
-            break;
-            case Cubit::e_3rd: 
-            default: 
-            if (!isSet) {
-                _cm_ = new Cubit::Many;
-                isSet = 1;
-            }
-            (*_cm_).decodeOp (IT_r);
-            break;
-        }
-        isSet = 1;
-    }
-
-}
-
-Cubit::oneof:: oneof() { 
-    memset(this, 0, sizeof(*this));
-    isSet = 0;
-}
-
-Cubit::oneof ::~oneof() {
-    if (!isSet) return;
-    switch (__d) { 
-        case Cubit::e_0th:         break;
-        case Cubit::e_1st:         break;
-        case Cubit::e_2nd:         break;
-        case Cubit::e_3rd: 
-        default:         if (_cm_) delete _cm_;
-        break;
-    }
-
-    isSet = 0;
-}
-
-Cubit::oneof:: oneof (const Cubit::oneof &IT_s) {
-    isSet = 0;
-    memset(this, 0, sizeof(*this));
-    __d = IT_s.__d;
-    switch (__d) {
-        case Cubit::e_0th:         isSet = 1;
-        _o_ = IT_s._o_;
-        break;
-        case Cubit::e_1st:         isSet = 1;
-        _s_ = IT_s._s_;
-        break;
-        case Cubit::e_2nd:         isSet = 1;
-        _l_ = IT_s._l_;
-        break;
-        case Cubit::e_3rd: 
-        default: 
-        if (!isSet) {
-            _cm_ = new Cubit::Many;
-            isSet = 1;
-        }
-        *(_cm_) = *(IT_s._cm_);
-        break;
-    }
-    isSet = 1;
-}
-
-Cubit::oneof& Cubit::oneof:: operator= (const Cubit::oneof & IT_s) {
-    if (this == &IT_s) return *this;
-    if (isSet && (__d != IT_s.__d))
-    {
-        this-> oneof::~oneof();
-        memset(this, 0, sizeof(*this));
-    }
-
-    __d = IT_s.__d;
-    switch (__d) {
-        case Cubit::e_0th:         isSet = 1;
-        _o_ = IT_s._o_;
-        break;
-        case Cubit::e_1st:         isSet = 1;
-        _s_ = IT_s._s_;
-        break;
-        case Cubit::e_2nd:         isSet = 1;
-        _l_ = IT_s._l_;
-        break;
-        case Cubit::e_3rd: 
-        default: 
-        if (!isSet) {
-            _cm_ = new Cubit::Many;
-            isSet = 1;
-        }
-        *(_cm_) = *(IT_s._cm_);
-        break;
-    }
-    isSet = 1;
-    return *this;
-}
-
-
-#endif
-
-void* CubitProxyFactoryClass::New (char *IT_OR, CORBA::Environment&) {
-        return  new class Cubit(IT_OR);}
-
-void* CubitProxyFactoryClass::New (ObjectReference *IT_OR, CORBA::Environment&) {
-        return  new class Cubit(IT_OR);}
-
-void* CubitProxyFactoryClass::New2 () {
-        return  new class Cubit((char*)0);}
-
-CORBA::Object* CubitProxyFactoryClass::NewObject (char *IT_OR, CORBA::Environment&) {
-        return  new class Cubit(IT_OR);}
-
-CORBA::Object* CubitProxyFactoryClass::NewObject (ObjectReference *IT_OR, CORBA::Environment&) {
-        return  new class Cubit(IT_OR);}
-
-CORBA::Object* CubitProxyFactoryClass::New2Object () {
-        return  new class Cubit((char*)0);}
-
-void* CubitProxyFactoryClass::IT_castUp (void *IT_p, char* IT_s, CORBA::Environment &IT_env) {
-      void *IT_l;
-      if (!CORBA::_interfaceCmp (IT_s,Cubit_IR, IT_env))
-         return IT_p;
-      else if (IT_l=CORBA::ObjectFactoryClass::IT_castUp((CORBA::Object*)((class Cubit*)IT_p),IT_s, IT_env))
-         return IT_l;
-      else return NULL;
-    }
-
-
-CORBA::PPTR* CubitProxyFactoryClass::pptr (void *IT_p) {
-       return ((class Cubit*)IT_p)->_pptr ();}
-
-void CubitProxyFactoryClass::baseInterfaces (_IDL_SEQUENCE_string& seq) {
-      add (seq, Cubit_IR);
-      CORBA::ObjectFactoryClass::baseInterfaces (seq);
-}
-
-CubitProxyFactoryClass CubitProxyFactory(1);
-
-CORBA::Octet Cubit:: cube_octet (CORBA::Octet o, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        return 0;
-    }
-    CORBA::Request IT_r (this, "cube_octet",IT_env,1,0);
-    if (!IT_r.isException (IT_env)) {
-
-        IT_r.insertOctet (o);
-    }
-
-    IT_r.invoke (CORBA::Flags(0),IT_env);
-    if (!IT_r.isException (IT_env)) {
-        CORBA::Octet IT_result;
-        IT_r.extractOctet (IT_result);
-        IT_r.checkEnv (IT_env);
-        return IT_result;
-    }
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-    return 0;
-}
-
-CORBA::Short Cubit:: cube_short (CORBA::Short s, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        return 0;
-    }
-    CORBA::Request IT_r (this, "cube_short",IT_env,1,0);
-    if (!IT_r.isException (IT_env)) {
-
-        IT_r << s;
-    }
-
-    IT_r.invoke (CORBA::Flags(0),IT_env);
-    if (!IT_r.isException (IT_env)) {
-        CORBA::Short IT_result;
-        IT_r >> IT_result;
-        IT_r.checkEnv (IT_env);
-        return IT_result;
-    }
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-    return 0;
-}
-
-CORBA::Long Cubit:: cube_long (CORBA::Long l, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        return 0;
-    }
-    CORBA::Request IT_r (this, "cube_long",IT_env,1,0);
-    if (!IT_r.isException (IT_env)) {
-
-        IT_r << l;
-    }
-
-    IT_r.invoke (CORBA::Flags(0),IT_env);
-    if (!IT_r.isException (IT_env)) {
-        CORBA::Long IT_result;
-        IT_r >> IT_result;
-        IT_r.checkEnv (IT_env);
-        return IT_result;
-    }
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-    return 0;
-}
-
-Cubit::Many Cubit:: cube_struct (const Cubit::Many& values, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        { 
-            Cubit::Many IT_l0;
-            return IT_l0;
-        }
-    }
-    CORBA::Request IT_r (this, "cube_struct",IT_env,1,0);
-    if (!IT_r.isException (IT_env)) {
-
-        values.encodeOp (IT_r);
-    }
-
-    IT_r.invoke (CORBA::Flags(0),IT_env);
-    if (!IT_r.isException (IT_env)) {
-        Cubit::Many IT_result;
-        IT_result.decodeOp (IT_r);
-        IT_r.checkEnv (IT_env);
-        return IT_result;
-    }
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-    { 
-        Cubit::Many IT_l1;
-        return IT_l1;
-    }
-}
-
-Cubit::oneof Cubit:: cube_union (const Cubit::oneof& values, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        { 
-            Cubit::oneof IT_l0;
-            return IT_l0;
-        }
-    }
-    CORBA::Request IT_r (this, "cube_union",IT_env,1,0);
-    if (!IT_r.isException (IT_env)) {
-
-        values.encodeOp (IT_r);
-    }
-
-    IT_r.invoke (CORBA::Flags(0),IT_env);
-    if (!IT_r.isException (IT_env)) {
-        Cubit::oneof IT_result;
-        IT_result.decodeOp (IT_r);
-        IT_r.checkEnv (IT_env);
-        return IT_result;
-    }
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-    { 
-        Cubit::oneof IT_l1;
-        return IT_l1;
-    }
-}
-
-void Cubit:: please_exit (CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        return ;
-    }
-    CORBA::Request IT_r (this, "please_exit",IT_env,1,1);
-
-    IT_r.invoke (CORBA::Flags(CORBA::INV_NO_RESPONSE), IT_env);
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-}
-
-
-
-
-
-#ifndef Cubit_dispatch_impl
-
-unsigned char Cubit_dispatch::dispatch (CORBA::Request &IT_r, 
-    unsigned char, void *) {
-      IT_r.makeRuntimeException1 ("Cubit");
-      return 0;
-}
- 
-#endif
-
diff --git a/TAO/IIOP/test/Orbix/tpool/cubitS.cpp b/TAO/IIOP/test/Orbix/tpool/cubitS.cpp
deleted file mode 100644
index 449a8c23548..00000000000
--- a/TAO/IIOP/test/Orbix/tpool/cubitS.cpp
+++ /dev/null
@@ -1,226 +0,0 @@
-#include "cubit.h"
-
-
-#define Cubit_dispatch_impl
-
-unsigned char Cubit_dispatch::dispatch (CORBA::Request &IT_r, 
- unsigned char IT_isTarget, void *IT_pp) {
-    if (!IT_pp)
-       IT_pp = m_obj;
-    const char *IT_s = IT_r.getOperation ();
-    if (!strcmp(IT_s,"cube_octet")) {
-        CORBA::Octet IT_result;
-        CORBA::Environment IT_env (IT_r);
-        CORBA::Filter* IT_f = CORBA::Orbix.getFilter ();
-        if (!IT_r.tcAssert ("\
-Ro~cube_octet~+o{o},>{o},N{}\
-"))
-            return 1;
-        CORBA::Octet o;
-
-        IT_r.extractOctet (o);
-
-        if (IT_f && !IT_r.isException (IT_env))
-        	IT_f->inRequestPostM (IT_r, IT_env);
-        if (!IT_r.isException (IT_env)) {
-            try {
-                	IT_result = ((Cubit*)IT_pp)->cube_octet (  o, IT_env);
-
-            } catch (CORBA::SystemException &IT_exSys) {
-            IT_env.propagate (&IT_exSys);
-            } catch (CORBA::UserException &IT_exUsr) {
-            IT_env.propagate (&IT_exUsr);
-            }
-        }
-
-        if (!IT_r.isException (IT_env)) {
-            if (!IT_r.convertToReply ("\
-o\
-", IT_env)) return 1;
-            IT_r.insertOctet (IT_result);
-            }
-
-        else IT_r.makeSystemException (IT_env);
-        return 1;
-    }
-
-    if (!strcmp(IT_s,"cube_short")) {
-        CORBA::Short IT_result;
-        CORBA::Environment IT_env (IT_r);
-        CORBA::Filter* IT_f = CORBA::Orbix.getFilter ();
-        if (!IT_r.tcAssert ("\
-Ro~cube_short~+s{s},>{s},N{}\
-"))
-            return 1;
-        CORBA::Short s;
-
-        IT_r >> s;
-
-        if (IT_f && !IT_r.isException (IT_env))
-        	IT_f->inRequestPostM (IT_r, IT_env);
-        if (!IT_r.isException (IT_env)) {
-            try {
-                	IT_result = ((Cubit*)IT_pp)->cube_short (  s, IT_env);
-
-            } catch (CORBA::SystemException &IT_exSys) {
-            IT_env.propagate (&IT_exSys);
-            } catch (CORBA::UserException &IT_exUsr) {
-            IT_env.propagate (&IT_exUsr);
-            }
-        }
-
-        if (!IT_r.isException (IT_env)) {
-            if (!IT_r.convertToReply ("\
-s\
-", IT_env)) return 1;
-            IT_r << IT_result;
-            }
-
-        else IT_r.makeSystemException (IT_env);
-        return 1;
-    }
-
-    if (!strcmp(IT_s,"cube_long")) {
-        CORBA::Long IT_result;
-        CORBA::Environment IT_env (IT_r);
-        CORBA::Filter* IT_f = CORBA::Orbix.getFilter ();
-        if (!IT_r.tcAssert ("\
-Ro~cube_long~+l{l},>{l},N{}\
-"))
-            return 1;
-        CORBA::Long l;
-
-        IT_r >> l;
-
-        if (IT_f && !IT_r.isException (IT_env))
-        	IT_f->inRequestPostM (IT_r, IT_env);
-        if (!IT_r.isException (IT_env)) {
-            try {
-                	IT_result = ((Cubit*)IT_pp)->cube_long (  l, IT_env);
-
-            } catch (CORBA::SystemException &IT_exSys) {
-            IT_env.propagate (&IT_exSys);
-            } catch (CORBA::UserException &IT_exUsr) {
-            IT_env.propagate (&IT_exUsr);
-            }
-        }
-
-        if (!IT_r.isException (IT_env)) {
-            if (!IT_r.convertToReply ("\
-l\
-", IT_env)) return 1;
-            IT_r << IT_result;
-            }
-
-        else IT_r.makeSystemException (IT_env);
-        return 1;
-    }
-
-    if (!strcmp(IT_s,"cube_struct")) {
-        Cubit::Many IT_result;
-        CORBA::Environment IT_env (IT_r);
-        CORBA::Filter* IT_f = CORBA::Orbix.getFilter ();
-        if (!IT_r.tcAssert ("\
-Ro~cube_struct~+values{R~Cubit::Many~o{o},l{l},s{s}},>{R~Cubit::Many~o{o},l{l},s{s}},N{}\
-"))
-            return 1;
-        Cubit::Many values;
-
-        values.decodeOp (IT_r);
-
-        if (IT_f && !IT_r.isException (IT_env))
-        	IT_f->inRequestPostM (IT_r, IT_env);
-        if (!IT_r.isException (IT_env)) {
-            try {
-                	IT_result = ((Cubit*)IT_pp)->cube_struct (  values, IT_env);
-
-            } catch (CORBA::SystemException &IT_exSys) {
-            IT_env.propagate (&IT_exSys);
-            } catch (CORBA::UserException &IT_exUsr) {
-            IT_env.propagate (&IT_exUsr);
-            }
-        }
-
-        if (!IT_r.isException (IT_env)) {
-            if (!IT_r.convertToReply ("\
-R~Cubit::Many~o{o},l{l},s{s}\
-", IT_env)) return 1;
-            IT_result.encodeOp (IT_r);
-            }
-
-        else IT_r.makeSystemException (IT_env);
-        return 1;
-    }
-
-    if (!strcmp(IT_s,"cube_union")) {
-        Cubit::oneof IT_result;
-        CORBA::Environment IT_env (IT_r);
-        CORBA::Filter* IT_f = CORBA::Orbix.getFilter ();
-        IT_r.tcPreAssert (
-"\
-Ro~cube_union~+values{U~Cubit::oneof~{E~Cubit::discrim~e_0th,e_1st,e_2nd,e_3rd,e_4th,e_5th}~Cubit::e_0th o{o};Cubit::e_1st s{s};Cubit::e_2nd l{l};Cubit::e_3rd,$ cm{R~Cubit::Many~o{o},l{l},s{s}}},>{U~Cubit::oneof~{E~Cubit::discrim~e_0th,e_1st,e_2nd,e_3rd,\
-");
-        if (!IT_r.tcAssert ("\
-e_4th,e_5th}~Cubit::e_0th o{o};Cubit::e_1st s{s};Cubit::e_2nd l{l};Cubit::e_3rd,$ cm{R~Cubit::Many~o{o},l{l},s{s}}},N{}\
-"))
-            return 1;
-        Cubit::oneof values;
-
-        values.decodeOp (IT_r);
-
-        if (IT_f && !IT_r.isException (IT_env))
-        	IT_f->inRequestPostM (IT_r, IT_env);
-        if (!IT_r.isException (IT_env)) {
-            try {
-                	IT_result = ((Cubit*)IT_pp)->cube_union (  values, IT_env);
-
-            } catch (CORBA::SystemException &IT_exSys) {
-            IT_env.propagate (&IT_exSys);
-            } catch (CORBA::UserException &IT_exUsr) {
-            IT_env.propagate (&IT_exUsr);
-            }
-        }
-
-        if (!IT_r.isException (IT_env)) {
-            if (!IT_r.convertToReply ("\
-U~Cubit::oneof~{E~Cubit::discrim~e_0th,e_1st,e_2nd,e_3rd,e_4th,e_5th}~Cubit::e_0th o{o};Cubit::e_1st s{s};Cubit::e_2nd l{l};Cubit::e_3rd,$ cm{R~Cubit::Many~o{o},l{l},s{s}}\
-", IT_env)) return 1;
-            IT_result.encodeOp (IT_r);
-            }
-
-        else IT_r.makeSystemException (IT_env);
-        return 1;
-    }
-
-    if (!strcmp(IT_s,"please_exit")) {
-        CORBA::Environment IT_env (IT_r);
-        CORBA::Filter* IT_f = CORBA::Orbix.getFilter ();
-        if (!IT_r.tcAssert ("\
-Ro~please_exit~>{v},O{}\
-"))
-            return 1;
-
-        if (IT_f && !IT_r.isException (IT_env))
-        	IT_f->inRequestPostM (IT_r, IT_env);
-        if (!IT_r.isException (IT_env)) {
-            try {
-                ((Cubit*)IT_pp)->please_exit (IT_env);
-
-            } catch (CORBA::SystemException &IT_exSys) {
-            IT_env.propagate (&IT_exSys);
-            } catch (CORBA::UserException &IT_exUsr) {
-            IT_env.propagate (&IT_exUsr);
-            }
-        }
-        IT_r.replyNoResults (CORBA::Flags(CORBA::INV_NO_RESPONSE),IT_env);
-        return 1;
-    }
-
-    if (IT_isTarget)
-        IT_r.makeRuntimeException2 ();
-
-    return 0;
-}
-
-#include "cubitC.cpp"
-
diff --git a/TAO/IIOP/test/Orbix/tpool/cubit_impl.cpp b/TAO/IIOP/test/Orbix/tpool/cubit_impl.cpp
deleted file mode 100644
index e35f1084118..00000000000
--- a/TAO/IIOP/test/Orbix/tpool/cubit_impl.cpp
+++ /dev/null
@@ -1,46 +0,0 @@
-#include "cubit_impl.h"
-
-CORBA::Octet Cubit_Impl:: cube_octet (CORBA::Octet o, CORBA::Environment &IT_env) throw (CORBA::SystemException) {
-  return (CORBA::Octet) (o * o * o); 
-}
-
-CORBA::Short Cubit_Impl:: cube_short (CORBA::Short s, CORBA::Environment &IT_env) throw (CORBA::SystemException) {
-  return (CORBA::Short) (s * s * s);
-}
-
-CORBA::Long Cubit_Impl:: cube_long (CORBA::Long l, CORBA::Environment &IT_env) throw (CORBA::SystemException) {
-   return (CORBA::Long) (l * l * l);
-}
-
-Cubit::Many Cubit_Impl:: cube_struct (const Cubit::Many& values, CORBA::Environment &IT_env) throw (CORBA::SystemException) {
-  Cubit::Many out_values;
-  out_values.o = values.o * values.o * values.o;
-  out_values.s = values.s * values.s * values.s;
-  out_values.l = values.l * values.l * values.l;
-  return out_values; 
-}
-
-Cubit::oneof Cubit_Impl:: cube_union (const Cubit::oneof& values, CORBA::Environment &IT_env) throw (CORBA::SystemException) {
-  Cubit::oneof out_values;
-   switch (values._d ()) {
-   case Cubit::e_0th:
-     out_values.o (values.o () * values.o ()  * values.o ());
-     break;
-   case Cubit::e_1st:
-     out_values.s (values.s () * values.s () * values.s ());
-     break;
-   case Cubit::e_2nd:
-     out_values.l (values.l () * values.l () * values.l ());
-     break;
-   case Cubit::e_3rd:
-   default:
-     out_values.cm ().o = values.cm ().o * values.cm ().o * values.cm ().o ;
-     out_values.cm ().s = values.cm ().s * values.cm ().s * values.cm ().s ;
-     out_values.cm ().l = values.cm ().l * values.cm ().l * values.cm ().l ;
-     break;
-   }
-   return out_values;  
-}
-
-void Cubit_Impl:: please_exit (CORBA::Environment &IT_env) throw (CORBA::SystemException) {
-}
diff --git a/TAO/IIOP/test/Orbix/tpool/cubit_impl.h b/TAO/IIOP/test/Orbix/tpool/cubit_impl.h
deleted file mode 100644
index 1e710bb15d1..00000000000
--- a/TAO/IIOP/test/Orbix/tpool/cubit_impl.h
+++ /dev/null
@@ -1,27 +0,0 @@
-
-#ifndef cubit_ih
-#define cubit_ih
-
-#include "cubit.h"
-
-
-#ifdef Cubit_USE_BOA
-class Cubit_Impl : public virtual CubitBOAImpl {
-#else
-class Cubit_Impl {
-#endif /* Cubit_USE_BOA */
-
-public:
-        virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env=CORBA::default_environment) throw (CORBA::SystemException);
-        virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env=CORBA::default_environment) throw (CORBA::SystemException);
-        virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env=CORBA::default_environment) throw (CORBA::SystemException);
-        virtual Cubit::Many cube_struct (const Cubit::Many& values, CORBA::Environment &IT_env=CORBA::default_environment) throw (CORBA::SystemException);
-        virtual Cubit::oneof cube_union (const Cubit::oneof& values, CORBA::Environment &IT_env=CORBA::default_environment) throw (CORBA::SystemException);
-        virtual void please_exit (CORBA::Environment &IT_env=CORBA::default_environment) throw (CORBA::SystemException);
-};
-
-#ifndef Cubit_USE_BOA
-DEF_TIE_Cubit (Cubit_Impl)
-#endif /* Cubit_USE_BOA */
-
-#endif
diff --git a/TAO/IIOP/test/Orbix/tpool/server.cpp b/TAO/IIOP/test/Orbix/tpool/server.cpp
deleted file mode 100644
index 8cae4135876..00000000000
--- a/TAO/IIOP/test/Orbix/tpool/server.cpp
+++ /dev/null
@@ -1,46 +0,0 @@
-//**************************************************************************
-//
-// NAME :   tpr_server.cpp 
-// DESCRIPTION:  
-//
-// Server mainline
-//
-//****************************************************************************
-#define IT_EX_MACROS
-
-#include "cubit_impl.h"		// server header file
-#include "tpool.h"
-
-int 
-main (int argc, char** argv)
-{
-
-
-#ifdef Cubit_USE_BOA
-  Cubit_var cb = new Cubit_Impl;
-  cout << "Using BOA approach" << endl;
-#else
-  Cubit_var cb = new TIE_Cubit (Cubit_Impl) (new Cubit_Impl);
-  cout << "Using TIE approach" << endl;
-#endif /* Cubit_USE_BOA */
-
-  // Register our thread-pool dispatcher
-  int n_threads = argc > 1 ? ACE_OS::atoi (argv[1]) : ACE_DEFAULT_THREADS;
-  Thread_Pool tpool_dispatcher (n_threads);
- 
-  //
-  // Go get some work to do....
-  //
-  IT_TRY {
-      CORBA::Orbix.impl_is_ready("Cubit", IT_X);
-  }
-  IT_CATCHANY {
-     cout << IT_X << endl;
-  }
-  IT_ENDTRY;
-
-  cout << "Cubit server is exiting." << endl;
-
-
-  return 0;
-}
diff --git a/TAO/IIOP/test/Orbix/tpool/tpool.cpp b/TAO/IIOP/test/Orbix/tpool/tpool.cpp
deleted file mode 100644
index 5d1fbd1a638..00000000000
--- a/TAO/IIOP/test/Orbix/tpool/tpool.cpp
+++ /dev/null
@@ -1,42 +0,0 @@
-#include "tpool.h"
-
-Thread_Pool::Thread_Pool (int n_threads)
-  : ACE_Task<ACE_MT_SYNCH> (ACE_Thread_Manager::instance ())
-{
-  if (this->activate (THR_DETACHED | THR_NEW_LWP, n_threads) == -1)
-    ACE_ERROR ((LM_ERROR, "%p\n", "activate failed"));
-}    
-
-int
-Thread_Pool::svc (void)
-{
-  cout << "Pool thread activated" << endl;
-  while (1) 
-    {
-      // Dequeue message
-      ACE_Message_Block *mb;
-      this->msg_queue ()->dequeue_head (mb);
-      CORBA::Request *vp = (CORBA::Request *) mb->base ();
-      mb->release ();
-      // Hand it off to Orbix
-      CORBA::Orbix.continueThreadDispatch (*vp);
-    }
-  return -1;
-}
-
-
-int
-Thread_Pool::inRequestPreMarshal(CORBA::Request &r,  CORBA::Environment&)
-{
-//   thread_t	tid;
-//   thr_create(NULL, 0, worker, (void *)&r, THR_DETACHED, &tid);
-
-  // Enqueue the request
-  ACE_Message_Block *mb = new ACE_Message_Block ( (char *) (&r));
-  this->msg_queue ()->enqueue (mb);
-  // Done
-  return -1;
-}
-
-
-                             
diff --git a/TAO/IIOP/test/Orbix/tpool/tpool.h b/TAO/IIOP/test/Orbix/tpool/tpool.h
deleted file mode 100644
index 3087ce42052..00000000000
--- a/TAO/IIOP/test/Orbix/tpool/tpool.h
+++ /dev/null
@@ -1,15 +0,0 @@
-#include "cubit.h"
-#include "ace/Service_Config.h"
-#include "ace/Thread_Manager.h"
-#include "ace/Task.h"
-
-class Thread_Pool : public ACE_Task<ACE_MT_SYNCH>, public CORBA::ThreadFilter
-{
-public:
-  Thread_Pool (int n_threads);
-  virtual int inRequestPreMarshal(CORBA::Request &, CORBA::Environment&);
-  virtual int svc (void);
-
-};
-
-
diff --git a/TAO/IIOP/test/Orbix/tpr/Makefile b/TAO/IIOP/test/Orbix/tpr/Makefile
deleted file mode 100644
index cf6149643d3..00000000000
--- a/TAO/IIOP/test/Orbix/tpr/Makefile
+++ /dev/null
@@ -1,89 +0,0 @@
-#----------------------------------------------------------------------------
-#	@(#)Makefile	1.1	10/18/96
-#
-#	Makefile for the ACE_MT_CORBA_Handler tests
-#----------------------------------------------------------------------------
-
-#----------------------------------------------------------------------------
-#	Local macros
-#----------------------------------------------------------------------------
-
-SRC = cubitS.cpp cubit_impl.cpp server.cpp tpr.cpp
-
-SVR_OBJS = cubitS.o cubit_impl.o server.o tpr.o
-
-LDLIBS	 = 
-
-VLDLIBS	 = $(LDLIBS:%=%$(VAR))
-
-#----------------------------------------------------------------------------
-#	Include macros and targets
-#----------------------------------------------------------------------------
-
-include		$(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-include		$(ACE_ROOT)/include/makeinclude/macros.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.common.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.lib.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.bin.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
-
-#----------------------------------------------------------------------------
-#	Orbix related macros and target settings.
-#----------------------------------------------------------------------------
-
-
-ORBIX_BINDIR    = $(ORBIX_ROOT)/bin
-ORBIX_LIBDIR    = $(ORBIX_ROOT)/corba2/lib
-ORBIX_INCDIR    = $(ORBIX_ROOT)/corba2/include
-
-# Remove -DCubit_USE_BOA from below to use the TIE approach
-
-CPPFLAGS += -DEXCEPTIONS -I$(ORBIX_INCDIR) -DWANT_ORBIX_FDS -DCubit_USE_BOA
-LDFLAGS  += -L$(ORBIX_LIBDIR) -R $(ORBIX_LIBDIR) -L$(ACE)/ace
-
-IDLFLAGS = -s S.cpp -c C.cpp -B
-
-#----------------------------------------------------------------------------
-#	Local targets
-#----------------------------------------------------------------------------
-
-all: server
-
-server: $(addprefix $(VDIR),$(SVR_OBJS))
-	$(LINK.cc) -o server $(addprefix $(VDIR),$(SVR_OBJS)) $(LDFLAGS) $(ITIIOP) $(ITSRV) $(VLDLIBS)
-
-#----------------------------------------------------------------------------
-#	Dependencies
-#----------------------------------------------------------------------------
-# DO NOT DELETE THIS LINE -- g++dep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-
-.obj/cubit_impl.o .shobj/cubit_impl.so: cubit_impl.cpp cubit_impl.h cubit.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/config-sunos5.5-sunc++-4.x.h \
- $(ACE_ROOT)/ace/stdcpp.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i
-.obj/server.o .shobj/server.so: server.cpp cubit_impl.h cubit.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/config-sunos5.5-sunc++-4.x.h \
- $(ACE_ROOT)/ace/stdcpp.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i
-
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/IIOP/test/Orbix/tpr/cubit.h b/TAO/IIOP/test/Orbix/tpr/cubit.h
deleted file mode 100644
index 1c868a6597d..00000000000
--- a/TAO/IIOP/test/Orbix/tpr/cubit.h
+++ /dev/null
@@ -1,727 +0,0 @@
-
-#ifndef cubit_hh
-#define cubit_hh
-
-#include "ace/OS.h"
-#include <CORBA.h>
-
-
-#ifndef _Cubit_defined
-#define _Cubit_defined
-class Cubit_dispatch : public virtual CORBA::PPTR {
-public:
-
-      Cubit_dispatch (void *IT_p, CORBA::Object* IT_o, const char *IT_m, 
-        CORBA::LoaderClass *IT_l, char *IT_i, void* IT_im)
-       : PPTR (IT_p,IT_o,IT_m,IT_l,IT_i,IT_im) {}
-
-
-   Cubit_dispatch (char *IT_OR, void *IT_p, CORBA::Object *IT_o)
-       : PPTR (IT_OR,IT_p,IT_o) {}
-
-
-   Cubit_dispatch () {}
-
-   Cubit_dispatch (ObjectReference *IT_OR, void *IT_p, CORBA::Object *IT_o)
-       : PPTR (IT_OR,IT_p,IT_o) {}
-
-
-   Cubit_dispatch (void *IT_p, CORBA::Object *IT_o, const char *IT_m, 
-        char *IT_i, CORBA::Object* IT_ob, void* IT_im)
-       : PPTR (IT_p,IT_o,IT_m,IT_i,IT_ob,IT_im) {}
-
-
-   virtual unsigned char dispatch (CORBA::Request &IT_r, 
-        unsigned char IT_isTarget, void* IT_pp=NULL);
-
-
-};
-
-class Cubit;
-
-#ifndef CubitPtr
-#define CubitPtr
-
-typedef Cubit* Cubit_ptr;
-
-typedef Cubit* CubitRef;
-
-#endif
-
-
-#ifndef CubitForwH
-#define CubitForwH
-CORBA::ObjectRef Cubit_getBase (void *);
-void Cubit_release (Cubit *, CORBA::Environment &IT_env);
-void Cubit_release (Cubit_ptr);
-Cubit* Cubit_duplicate (Cubit_ptr, CORBA::Environment &IT_env);
-Cubit* Cubit_duplicate (Cubit_ptr );
-Cubit_ptr Cubit_nil (CORBA::Environment &IT_env);
-Cubit_ptr Cubit_nil ();
-#endif
-#define Cubit_IMPL "Cubit"
-
-
-class Cubit;
-
-typedef Cubit CubitProxy;
-#define Cubit_IR "Cubit$v1.1"
-#define Cubit_IMPL "Cubit"
-
-#ifndef CubitPtr
-#define CubitPtr
-
-typedef Cubit* Cubit_ptr;
-
-typedef Cubit* CubitRef;
-
-#endif
-
-class Cubit: public virtual CORBA::Object  {
-public:
-        Cubit (char *IT_OR);
-    Cubit (ObjectReference *IT_OR);
-    Cubit () : CORBA::Object  (1) {}
-protected:
-    Cubit_ptr __duplicate(
-            CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) {
-       CORBA::Object::__duplicate (IT_env);
-       return this;
-    }
-public:
-    static Cubit_ptr _duplicate(
-            Cubit_ptr, 
-            CORBA::Environment &IT_pEnv=CORBA::IT_chooseDefaultEnv ());
-public:
-   static Cubit* _bind (const char* IT_markerServer, const char* host,
-		const CORBA::Context &IT_c, 
-		CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-   static Cubit* _bind (CORBA::Environment &IT_env);
-   static Cubit* _bind (const char* IT_markerServer=NULL, const char* host=NULL,
-                 CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-    static Cubit* _narrow (CORBA::Object* , CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-    static Cubit_ptr _nil (CORBA::Environment &IT_pEnv=CORBA::IT_chooseDefaultEnv ()) {
-        CORBA::EnvExcRaiser IT_raise;
-        CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-        return (Cubit_ptr) CORBA::OBJECT_NIL;}
-
-#ifndef Cubit_Many_defined
-#define Cubit_Many_defined
-
-struct Many {
-    CORBA::Octet o;
-    CORBA::Long l;
-    CORBA::Short s;
-
-    void encodeOp (CORBA::Request &IT_r) const;
-    void decodeOp (CORBA::Request &IT_r);
-    void decodeInOutOp (CORBA::Request &IT_r);
-    Many(const Many &);
-    Many();
-    ~Many();
-    Many& operator= (const Many&);
-};
-
-#ifndef Cubit_ManyVarH
-#define Cubit_ManyVarH
-
-#ifndef Cubit_ManyvPtr
-#define Cubit_ManyvPtr
-typedef Many* Many_vPtr;
-typedef const Many* Many_cvPtr;
-#endif
-
-class Many_var : public CORBA::_var
-{
-    private:
-
-    unsigned char copyHelper (const Many_var &IT_s) {
-        if (!IT_s._ptr) {
-            _ptr = IT_s._ptr;
-        } else
-        {
-            _ptr = new Many;
-            *(_ptr) =  *(IT_s._ptr);
-        }
-        return 1;
-    }
-
-    public:
-
-    Many_var (const Many_var &IT_s) {
-        (void) copyHelper (IT_s);
-    }
-
-    Many_var () {
-        _ptr =  new Many;
-;
-    }
-
-    Many_var (Many *IT_p) {
-        _ptr = IT_p;
-    }
-
-    Many_var &operator= (Many *IT_p) {
-        if (_ptr != IT_p) {
-            delete _ptr;
-        }
-        _ptr = IT_p;
-        return (*this);
-    }
-
-    Many_var &operator= (const Many_var &IT_s) {
-        if (_ptr != IT_s._ptr) {
-            delete _ptr;
-        }
-        _ptr = new Many;
-        *(_ptr) =  *(IT_s._ptr);
-        return (*this);
-    }
-
-    ~Many_var () {
-        delete _ptr;
-    }
-
-    Many* operator-> () {
-        return _ptr;
-    }
-
-    operator Many_cvPtr () const { return _ptr;}
-    operator Many_vPtr& () { return _ptr;}
-    operator Many& () const { return * _ptr;}
-
-    protected:
-    Many *_ptr;
-    private:
-    Many_var &operator= (const CORBA::_var &IT_s);
-    Many_var (const CORBA::_var &IT_s);
-};
-
-#endif
-
-
-#endif
-
-enum discrim {e_0th,e_1st,e_2nd,e_3rd,e_4th,e_5th, IT__ENUM_Cubit_discrim=CORBA_ULONG_MAX};
-
-#ifndef Cubit_oneof_defined
-#define Cubit_oneof_defined
-
-struct oneof {
-    private:
-
-    discrim __d;
-    union {
-        CORBA::Octet _o_;
-        CORBA::Short _s_;
-        CORBA::Long _l_;
-        Many * _cm_;
-    };
-
-    public:
-
-    void encodeOp (CORBA::Request &IT_r) const;
-    void decodeOp (CORBA::Request &IT_r);
-    void decodeInOutOp (CORBA::Request &IT_r);
-
-    private:
-
-    unsigned char isSet;
-
-    public:
-
-    discrim _d () const { return __d; }
-
-    CORBA::Octet o () const {
-      return _o_;
-    }
-
-    void o (CORBA::Octet IT_member) {
-        if (isSet && (__d != Cubit::e_0th))
-        {
-            this-> oneof::~oneof();
-            memset(this, 0, sizeof(*this));
-        }
-
-        __d = Cubit::e_0th;
-        isSet = 1;
-        _o_ = IT_member;
-    }
-
-    CORBA::Short s () const {
-        return _s_;
-    }
-
-    void s (CORBA::Short IT_member) {
-        if (isSet && (__d != Cubit::e_1st))
-        {
-            this-> oneof::~oneof();
-            memset(this, 0, sizeof(*this));
-        }
-
-        __d = Cubit::e_1st;
-        isSet = 1;
-        _s_ = IT_member;
-    }
-
-    CORBA::Long l () const {
-        return _l_;
-    }
-
-    void l (CORBA::Long IT_member) {
-        if (isSet && (__d != Cubit::e_2nd))
-        {
-            this-> oneof::~oneof();
-            memset(this, 0, sizeof(*this));
-        }
-
-        __d = Cubit::e_2nd;
-        isSet = 1;
-        _l_ = IT_member;
-    }
-
-    Many& cm () {
-        return (*_cm_);
-    }
-
-    const Many& cm () const {
-        return (*_cm_);
-    }
-
-    void cm (const Many& IT_member) {
-        if (isSet && (__d != Cubit::e_3rd))
-        {
-            this-> oneof::~oneof();
-            memset(this, 0, sizeof(*this));
-        }
-
-        __d = Cubit::e_3rd;
-
-        if (!isSet) {
-            _cm_ = new Many;
-            isSet = 1;
-        }
-        *(_cm_) = IT_member;
-    }
-
-
-    oneof();
-    oneof(const oneof &);
-    ~oneof();
-    oneof& operator= (const oneof&);
-};
-
-#ifndef Cubit_oneofVarH
-#define Cubit_oneofVarH
-
-#ifndef Cubit_oneofvPtr
-#define Cubit_oneofvPtr
-typedef oneof* oneof_vPtr;
-typedef const oneof* oneof_cvPtr;
-#endif
-
-class oneof_var : public CORBA::_var
-{
-    private:
-
-    unsigned char copyHelper (const oneof_var &IT_s) {
-        if (!IT_s._ptr) {
-            _ptr = IT_s._ptr;
-        } else
-        {
-            _ptr = new oneof;
-            *(_ptr) =  *(IT_s._ptr);
-        }
-        return 1;
-    }
-
-    public:
-
-    oneof_var (const oneof_var &IT_s) {
-        (void) copyHelper (IT_s);
-    }
-
-    oneof_var () {
-        _ptr = NULL;
-    }
-
-    oneof_var (oneof *IT_p) {
-        _ptr = IT_p;
-    }
-
-    oneof_var &operator= (oneof *IT_p) {
-        if (_ptr != IT_p) {
-            delete _ptr;
-        }
-        _ptr = IT_p;
-        return (*this);
-    }
-
-    oneof_var &operator= (const oneof_var &IT_s) {
-        if (_ptr != IT_s._ptr) {
-            delete _ptr;
-        }
-        _ptr = new oneof;
-        *(_ptr) =  *(IT_s._ptr);
-        return (*this);
-    }
-
-    ~oneof_var () {
-        delete _ptr;
-    }
-
-    oneof* operator-> () {
-        return _ptr;
-    }
-
-    operator oneof_cvPtr () const { return _ptr;}
-    operator oneof_vPtr& () { return _ptr;}
-    operator oneof& () const { return * _ptr;}
-
-    protected:
-    oneof *_ptr;
-    private:
-    oneof_var &operator= (const CORBA::_var &IT_s);
-    oneof_var (const CORBA::_var &IT_s);
-};
-
-#endif
-
-
-#endif
-        virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual Many cube_struct (const Many& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual oneof cube_union (const oneof& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual void please_exit (CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-};
-
-#ifndef CubitVarH
-#define CubitVarH
-
-#ifndef CubitvPtr
-#define CubitvPtr
-typedef Cubit* Cubit_vPtr;
-typedef const Cubit* Cubit_cvPtr;
-#endif
-
-class Cubit_var : public CORBA::_var
-{
-    private:
-
-    unsigned char copyHelper (const Cubit_var &IT_s) {
-        {
-            _ptr = Cubit_duplicate (IT_s._ptr);
-        }
-        return 1;
-    }
-
-    public:
-
-    Cubit_var (const Cubit_var &IT_s) {
-        (void) copyHelper (IT_s);
-    }
-
-    Cubit_var () {
-        _ptr = Cubit_nil ();
-    }
-
-    Cubit_var (Cubit *IT_p) {
-        _ptr = IT_p;
-    }
-
-    Cubit_var &operator= (Cubit *IT_p) {
-        Cubit_release (_ptr);
-        _ptr = IT_p;
-        return (*this);
-    }
-
-    Cubit_var &operator= (const Cubit_var &IT_s) {
-        Cubit_release (_ptr);
-        _ptr = Cubit_duplicate (IT_s._ptr);
-        return (*this);
-    }
-
-    ~Cubit_var () {
-        Cubit_release (_ptr);
-    }
-
-    Cubit* operator-> () {
-        return _ptr;
-    }
-
-    operator Cubit_cvPtr () const { return _ptr;}
-    operator Cubit_vPtr& () { return _ptr;}
-
-    protected:
-    Cubit *_ptr;
-    private:
-    Cubit_var &operator= (const CORBA::_var &IT_s);
-    Cubit_var (const CORBA::_var &IT_s);
-    Cubit_var &operator= (const CORBA::_mgr &IT_s);
-    Cubit_var &operator= (const CORBA::_SeqElem &IT_s);
-    Cubit_var (const CORBA::_mgr &IT_s);
-    Cubit_var (const CORBA::_SeqElem &IT_s);
-};
-
-#endif
-
-
-#ifndef CubitMgrH
-#define CubitMgrH
-
-class Cubit_mgr : public CORBA::_mgr
-{
-    public:
-
-    Cubit_mgr () {
-        _ptr = Cubit_nil ();
-        _release = 1;
-    }
-
-    Cubit_mgr (const Cubit_mgr &IT_s) {
-        _ptr = Cubit_duplicate (IT_s._ptr);
-        _release = 1;
-    }
-
-    Cubit_mgr &operator= (Cubit *IT_p) {
-        if (_ptr && _release)
-            Cubit_release (_ptr);
-        _ptr = IT_p;
-        _release = 1;
-        return (*this);
-    }
-
-    Cubit_mgr &operator= (const Cubit_mgr &IT_s) {
-        if (_ptr && _release)
-            Cubit_release (_ptr);
-        _ptr = Cubit_duplicate(IT_s._ptr);
-        _release = 1;
-        return (*this);
-    }
-
-    Cubit_mgr &operator= (Cubit_var &IT_s) {
-        if (_ptr && _release)
-            Cubit_release (_ptr);
-        _ptr = Cubit_duplicate(IT_s);
-        _release = 1;
-        return (*this);
-    }
-
-    ~Cubit_mgr () {
-        if (_release)
-            Cubit_release (_ptr);
-    }
-
-    unsigned char release () {
-        return _release;
-    }
-
-    void release (unsigned char rel) {
-        _release = rel;
-    }
-
-    operator int () const {
-        return (((CORBA::Object_ptr) _ptr) ? 1 : 0);
-    }
-
-    operator void* () const {
-        return _ptr;
-    }
-
-    operator CORBA::Object * () const {
-        return (CORBA::Object *) _ptr;
-    }
-
-    operator Cubit* () const {
-        return (Cubit*) _ptr;
-    }
-
-    Cubit_ptr operator-> () const {
-        return _ptr;
-    }
-
-    Cubit *_ptr;
-
-    protected:
-
-    unsigned char _release;
-};
-
-typedef Cubit_mgr Cubit_mgr_IT_const;
-#endif
-
-#ifndef CubitSeqElemH
-#define CubitSeqElemH
-
-class Cubit_SeqElem : public CORBA::_SeqElem
-{
-    public:
-
-    Cubit_SeqElem (Cubit_ptr* IT_p, unsigned char rel) {
-        _ptr = IT_p;
-        _release = rel;
-    }
-
-    Cubit_SeqElem &operator= (Cubit_ptr IT_p) {
-        if (_ptr) {
-            if (*(_ptr) && _release)
-                Cubit_release (*(_ptr));
-            *(_ptr) = IT_p;
-        }
-        return (*this);
-    }
-
-    Cubit_SeqElem &operator= (const Cubit_SeqElem &IT_s) {
-        if (_ptr && IT_s._ptr) {
-            if (*(_ptr) && _release)
-                Cubit_release (*(_ptr));
-            *(_ptr) = Cubit_duplicate(*(IT_s._ptr));
-        }
-        return (*this);
-    }
-
-    operator Cubit_ptr () const {
-        return _ptr ? (Cubit_ptr) (*_ptr) : Cubit_nil(); 
-    }
-
-    Cubit_ptr operator->() const { return *_ptr;}
-
-    protected:
-    Cubit_ptr *_ptr;
-    unsigned char _release;
-};
-
-#endif
-
-
-#define TIE_Cubit(X) Cubit##X
-
-#define DEF_TIE_Cubit(X) \
-	class Cubit##X : public virtual Cubit {		\
-	  X* m_obj;						\
-	public:							\
-								\
-								\
-	   Cubit##X  (X *objp, const char* m="", CORBA::LoaderClass *l=0)\
-		: Cubit(), m_obj(objp) {	\
-		m_pptr = new Cubit_dispatch		\
-			(( Cubit*)this,(CORBA::Object*)this,m,l,Cubit_IR,m_obj);	\
-	   }								\
-	   Cubit##X  (CORBA::Object *IT_p, const char* IT_m="", void *IT_q=0)\
-		: Cubit() {	\
-		m_pptr = new Cubit_dispatch		\
-			(( Cubit*)this,(CORBA::Object*)this,IT_m,Cubit_IR,IT_p,IT_q);	\
-		m_obj = (X*)(m_pptr->getImplObj ());			\
-	   }								\
-								\
-	   virtual ~Cubit##X  () {				\
-		if (_okToDeleteImpl ()) delete m_obj; }					\
-	   virtual void* _deref () {					\
-		return m_obj; }					\
-								\
-virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_octet (  o,IT_env);\
-}\
-	\
-virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_short (  s,IT_env);\
-}\
-	\
-virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_long (  l,IT_env);\
-}\
-	\
-virtual Cubit::Many cube_struct (const Cubit::Many& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_struct (  values,IT_env);\
-}\
-	\
-virtual Cubit::oneof cube_union (const Cubit::oneof& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_union (  values,IT_env);\
-}\
-	\
-virtual void please_exit (CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-m_obj->please_exit (IT_env);\
-}\
-								\
-	};						\
-
-
-#define QUALS_Cubit	\
-virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_octet (  o,IT_env);\
-}\
-	\
-virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_short (  s,IT_env);\
-}\
-	\
-virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_long (  l,IT_env);\
-}\
-	\
-virtual Many cube_struct (const Many& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_struct (  values,IT_env);\
-}\
-	\
-virtual oneof cube_union (const oneof& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_union (  values,IT_env);\
-}\
-	\
-virtual void please_exit (CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-m_obj->please_exit (IT_env);\
-}\
-
-
-
-
-class CubitProxyFactoryClass : public virtual CORBA::ObjectFactoryClass {
-public:
-   CubitProxyFactoryClass (unsigned char IT_p=0)
-		: CORBA::ProxyFactory (Cubit_IR, IT_p) {}
-
-    virtual void* New (char *IT_OR, CORBA::Environment&);
-
-    virtual void* New (ObjectReference *IT_OR, CORBA::Environment&);
-
-    virtual void* New2 (); 
-
-    virtual CORBA::Object* NewObject (char *IT_OR, CORBA::Environment&);
-
-    virtual CORBA::Object* NewObject (ObjectReference *IT_OR, CORBA::Environment&);
-
-    virtual CORBA::Object* New2Object (); 
-
-    virtual void* IT_castUp (void *IT_p, char* IT_s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-
-    virtual CORBA::PPTR* pptr (void *IT_p);
-
-    virtual void baseInterfaces (_IDL_SEQUENCE_string&);
-
-
-};
-
-extern CubitProxyFactoryClass CubitProxyFactory;
-
-class CubitBOAImpl : public virtual Cubit  {
-public:
-    CubitBOAImpl (const char *m="", CORBA::LoaderClass *l=NULL) {
-  if (CORBA::PPTR::isOK (m_pptr, Cubit_IR))
-    m_pptr = new Cubit_dispatch ( (Cubit*)this,
-   	 (CORBA::Object*)this, m, l, Cubit_IR, this);
-}
-
-        virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual Many cube_struct (const Many& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual oneof cube_union (const oneof& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual void please_exit (CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-};
-
-
-#endif
-
-
-#endif
diff --git a/TAO/IIOP/test/Orbix/tpr/cubit.idl b/TAO/IIOP/test/Orbix/tpr/cubit.idl
deleted file mode 100644
index d9b38c34a2a..00000000000
--- a/TAO/IIOP/test/Orbix/tpr/cubit.idl
+++ /dev/null
@@ -1,40 +0,0 @@
-// @(#)cubit.idl	1.1 95/09/10
-// Copyright 1994-1995 by Sun Microsystems, Inc.
-
-#pragma prefix	"Eng.SUN.COM"
-#pragma version Cubit 1.1
-
-interface Cubit {
-    octet	cube_octet (in octet o);
-    short	cube_short (in short s);
-    long	cube_long (in long l);
-
-    struct Many {
-	octet	o;		// + 3 bytes padding (normally) ...
-	long	l;
-	short	s;		// + 2 bytes padding (normally) ...
-    };
-
-    Many	cube_struct (in Many values);
-
-    enum discrim {e_0th, e_1st, e_2nd, e_3rd, e_4th, e_5th};
-
-    union oneof
-    switch (discrim) {
-	// this is an easy union to interpret; no padding
-	// is needed between discriminant and value.
-      case e_0th:
-        octet		o;
-      case e_1st:
-        short		s;
-      case e_2nd:
-        long		l;
-      case e_3rd:
-      default:
-        Many		cm;
-    };
-
-    oneof	cube_union (in oneof values);
-
-    oneway void	please_exit ();
-};
diff --git a/TAO/IIOP/test/Orbix/tpr/cubitC.cpp b/TAO/IIOP/test/Orbix/tpr/cubitC.cpp
deleted file mode 100644
index c47e38f26ee..00000000000
--- a/TAO/IIOP/test/Orbix/tpr/cubitC.cpp
+++ /dev/null
@@ -1,557 +0,0 @@
-#include "cubit.h"
-
-Cubit::Cubit (char *IT_OR) {
-      m_pptr = new Cubit_dispatch (IT_OR, this,(CORBA::Object*)this);
-} 
-Cubit::Cubit (ObjectReference *IT_OR) {
-      m_pptr = new Cubit_dispatch (IT_OR, this,(CORBA::Object*)this);
-} 
-
-#ifndef CubitForwC
-#define CubitForwC
-CORBA::ObjectRef Cubit_getBase(void *IT_p){
-    return (Cubit*) IT_p;}
-
-void Cubit_release (Cubit_ptr IT_p, CORBA::Environment &IT_env) {
-    CORBA::release(IT_p, IT_env);}
-
-void Cubit_release (Cubit_ptr IT_p) {
-    Cubit_release (IT_p, CORBA::IT_chooseDefaultEnv ()); }
-
-Cubit_ptr Cubit_nil (CORBA::Environment &) {
-    return Cubit:: _nil ();}
-
-Cubit_ptr Cubit_nil () {
-    return Cubit_nil (CORBA::IT_chooseDefaultEnv ());}
-
-Cubit_ptr Cubit_duplicate (Cubit_ptr IT_p, CORBA::Environment &IT_env) {
-    return (Cubit::_duplicate(IT_p, IT_env)); }
-Cubit_ptr Cubit_duplicate (Cubit_ptr IT_p) {
-    return Cubit_duplicate (IT_p, CORBA::IT_chooseDefaultEnv ()); }
-#endif
-
-Cubit_ptr Cubit::_duplicate(Cubit_ptr obj, CORBA::Environment& IT_pEnv) {
-        CORBA::EnvExcRaiser IT_raise;
-        CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-       if (!obj) {
-          return (obj);
-       }
-       Cubit_ptr IT_obj = obj->__duplicate (IT_env);
-       return IT_obj;
-}
-
-
-
-Cubit* Cubit:: _bind (const char* IT_markerServer, const char* host,
-		const CORBA::Context &IT_c, 
-		CORBA::Environment &IT_env) {
-       return (Cubit*)CORBA::Factory.New (IT_markerServer, IT_env, IT_c, host, 
-		Cubit_IMPL, Cubit_IR);
-}
-
-
-
-Cubit* Cubit:: _bind (CORBA::Environment &IT_env) {
-       return _bind (NULL,NULL,CORBA::Context(), IT_env); }
-
-
-Cubit* Cubit:: _bind (const char* IT_markerServer, const char* host,
-                CORBA::Environment &IT_env) {
-       return _bind (IT_markerServer, host, CORBA::Context (), IT_env); }
-Cubit* Cubit::_narrow (CORBA::Object* IT_obj, CORBA::Environment &IT_pEnv) {
-        CORBA::EnvExcRaiser IT_raise;
-        CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-        if (CORBA::is_nil (IT_obj)) {
-                return Cubit:: _nil();
-        }
-
-       Cubit* IT_p = (Cubit*)CORBA::Object::_castDown (IT_obj, Cubit_IR, IT_env);
-        IT_p = IT_p ? IT_p->__duplicate(IT_env) : NULL;
-        if ((IT_env) &&(!strcmp(IT_env.exception()->id(), "CORBA::StExcep::BAD_PARAM")) && (((CORBA::BAD_PARAM*)IT_env.exception())-> minor() == NARROW_FAILED)) {
-                IT_env.exception_free();
-        }
-        return IT_p;
-   }
-
-
-#ifndef Cubit_Many_Ops
-#define Cubit_Many_Ops
-
-void Cubit::Many:: encodeOp (CORBA::Request &IT_r) const {
-
-    IT_r.insertOctet (o);
-
-    IT_r << l;
-
-    IT_r << s;
-}
-
-void Cubit::Many:: decodeOp (CORBA::Request &IT_r) {
-
-    IT_r.extractOctet (o);
-
-    IT_r >> l;
-
-    IT_r >> s;
-}
-
-void Cubit::Many:: decodeInOutOp (CORBA::Request &IT_r) {
-
-    IT_r.extractOctet (o);
-
-    IT_r >> l;
-
-    IT_r >> s;
-}
-
-Cubit::Many ::~Many () {
-}
-
-Cubit::Many:: Many (const Cubit::Many &IT_s) 
-	 {
-    o = IT_s.o;
-    l = IT_s.l;
-    s = IT_s.s;
-}
-
-Cubit::Many:: Many () {
-}
-
-Cubit::Many &Cubit::Many:: operator= (const Cubit::Many& IT_s) {
-    if (this == &IT_s) return *this;
-    o = IT_s.o;
-    l = IT_s.l;
-    s = IT_s.s;
-    return *this;
-}
-
-
-#endif
-
-
-#ifndef Cubit_oneof_Ops
-#define Cubit_oneof_Ops
-void Cubit::oneof:: encodeOp (CORBA::Request &IT_r) const {
-    if (!isSet) return;
-    {
-    CORBA::ULong IT_0 = (CORBA::ULong) __d;
-    IT_r << IT_0;
-    }
-    switch (__d) {
-        case Cubit::e_0th: 
-        IT_r.insertOctet (_o_);
-        break;
-        case Cubit::e_1st: 
-        IT_r << _s_;
-        break;
-        case Cubit::e_2nd: 
-        IT_r << _l_;
-        break;
-        case Cubit::e_3rd: 
-        default: 
-        (*_cm_).encodeOp (IT_r);
-        break;
-    }
-
-}
-
-void Cubit::oneof:: decodeOp (CORBA::Request &IT_r) {
-    isSet = 0;
-    {
-    CORBA::ULong IT_1;
-    IT_r >> IT_1;
-    __d = Cubit::discrim(IT_1);
-    }
-    switch (__d) {
-        case Cubit::e_0th: 
-        if (!isSet) {
-            isSet = 1;
-        }
-        IT_r.extractOctet (_o_);
-        break;
-        case Cubit::e_1st: 
-        if (!isSet) {
-            isSet = 1;
-        }
-        IT_r >> _s_;
-        break;
-        case Cubit::e_2nd: 
-        if (!isSet) {
-            isSet = 1;
-        }
-        IT_r >> _l_;
-        break;
-        case Cubit::e_3rd: 
-        default: 
-        if (!isSet) {
-            _cm_ = new Cubit::Many;
-            isSet = 1;
-        }
-        (*_cm_).decodeOp (IT_r);
-        break;
-    }
-
-}
-void Cubit::oneof:: decodeInOutOp (CORBA::Request &IT_r) {
-    Cubit::discrim IT_d;
-    {
-    CORBA::ULong IT_2;
-    IT_r >> IT_2;
-    IT_d = Cubit::discrim(IT_2);
-    }
-    if (IT_d == __d)
-        switch (__d) {
-            case Cubit::e_0th: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r.extractOctet (_o_);
-            break;
-            case Cubit::e_1st: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r >> _s_;
-            break;
-            case Cubit::e_2nd: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r >> _l_;
-            break;
-            case Cubit::e_3rd: 
-            default: 
-            if (!isSet) {
-                _cm_ = new Cubit::Many;
-                isSet = 1;
-            }
-            (*_cm_).decodeInOutOp (IT_r);
-            break;
-        }
-
-    else {
-        this->oneof:: ~oneof();
-        memset(this, 0, sizeof(*this));
-        __d = IT_d;
-        switch (__d) {
-            case Cubit::e_0th: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r.extractOctet (_o_);
-            break;
-            case Cubit::e_1st: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r >> _s_;
-            break;
-            case Cubit::e_2nd: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r >> _l_;
-            break;
-            case Cubit::e_3rd: 
-            default: 
-            if (!isSet) {
-                _cm_ = new Cubit::Many;
-                isSet = 1;
-            }
-            (*_cm_).decodeOp (IT_r);
-            break;
-        }
-        isSet = 1;
-    }
-
-}
-
-Cubit::oneof:: oneof() { 
-    memset(this, 0, sizeof(*this));
-    isSet = 0;
-}
-
-Cubit::oneof ::~oneof() {
-    if (!isSet) return;
-    switch (__d) { 
-        case Cubit::e_0th:         break;
-        case Cubit::e_1st:         break;
-        case Cubit::e_2nd:         break;
-        case Cubit::e_3rd: 
-        default:         if (_cm_) delete _cm_;
-        break;
-    }
-
-    isSet = 0;
-}
-
-Cubit::oneof:: oneof (const Cubit::oneof &IT_s) {
-    isSet = 0;
-    memset(this, 0, sizeof(*this));
-    __d = IT_s.__d;
-    switch (__d) {
-        case Cubit::e_0th:         isSet = 1;
-        _o_ = IT_s._o_;
-        break;
-        case Cubit::e_1st:         isSet = 1;
-        _s_ = IT_s._s_;
-        break;
-        case Cubit::e_2nd:         isSet = 1;
-        _l_ = IT_s._l_;
-        break;
-        case Cubit::e_3rd: 
-        default: 
-        if (!isSet) {
-            _cm_ = new Cubit::Many;
-            isSet = 1;
-        }
-        *(_cm_) = *(IT_s._cm_);
-        break;
-    }
-    isSet = 1;
-}
-
-Cubit::oneof& Cubit::oneof:: operator= (const Cubit::oneof & IT_s) {
-    if (this == &IT_s) return *this;
-    if (isSet && (__d != IT_s.__d))
-    {
-        this-> oneof::~oneof();
-        memset(this, 0, sizeof(*this));
-    }
-
-    __d = IT_s.__d;
-    switch (__d) {
-        case Cubit::e_0th:         isSet = 1;
-        _o_ = IT_s._o_;
-        break;
-        case Cubit::e_1st:         isSet = 1;
-        _s_ = IT_s._s_;
-        break;
-        case Cubit::e_2nd:         isSet = 1;
-        _l_ = IT_s._l_;
-        break;
-        case Cubit::e_3rd: 
-        default: 
-        if (!isSet) {
-            _cm_ = new Cubit::Many;
-            isSet = 1;
-        }
-        *(_cm_) = *(IT_s._cm_);
-        break;
-    }
-    isSet = 1;
-    return *this;
-}
-
-
-#endif
-
-void* CubitProxyFactoryClass::New (char *IT_OR, CORBA::Environment&) {
-        return  new class Cubit(IT_OR);}
-
-void* CubitProxyFactoryClass::New (ObjectReference *IT_OR, CORBA::Environment&) {
-        return  new class Cubit(IT_OR);}
-
-void* CubitProxyFactoryClass::New2 () {
-        return  new class Cubit((char*)0);}
-
-CORBA::Object* CubitProxyFactoryClass::NewObject (char *IT_OR, CORBA::Environment&) {
-        return  new class Cubit(IT_OR);}
-
-CORBA::Object* CubitProxyFactoryClass::NewObject (ObjectReference *IT_OR, CORBA::Environment&) {
-        return  new class Cubit(IT_OR);}
-
-CORBA::Object* CubitProxyFactoryClass::New2Object () {
-        return  new class Cubit((char*)0);}
-
-void* CubitProxyFactoryClass::IT_castUp (void *IT_p, char* IT_s, CORBA::Environment &IT_env) {
-      void *IT_l;
-      if (!CORBA::_interfaceCmp (IT_s,Cubit_IR, IT_env))
-         return IT_p;
-      else if (IT_l=CORBA::ObjectFactoryClass::IT_castUp((CORBA::Object*)((class Cubit*)IT_p),IT_s, IT_env))
-         return IT_l;
-      else return NULL;
-    }
-
-
-CORBA::PPTR* CubitProxyFactoryClass::pptr (void *IT_p) {
-       return ((class Cubit*)IT_p)->_pptr ();}
-
-void CubitProxyFactoryClass::baseInterfaces (_IDL_SEQUENCE_string& seq) {
-      add (seq, Cubit_IR);
-      CORBA::ObjectFactoryClass::baseInterfaces (seq);
-}
-
-CubitProxyFactoryClass CubitProxyFactory(1);
-
-CORBA::Octet Cubit:: cube_octet (CORBA::Octet o, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        return 0;
-    }
-    CORBA::Request IT_r (this, "cube_octet",IT_env,1,0);
-    if (!IT_r.isException (IT_env)) {
-
-        IT_r.insertOctet (o);
-    }
-
-    IT_r.invoke (CORBA::Flags(0),IT_env);
-    if (!IT_r.isException (IT_env)) {
-        CORBA::Octet IT_result;
-        IT_r.extractOctet (IT_result);
-        IT_r.checkEnv (IT_env);
-        return IT_result;
-    }
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-    return 0;
-}
-
-CORBA::Short Cubit:: cube_short (CORBA::Short s, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        return 0;
-    }
-    CORBA::Request IT_r (this, "cube_short",IT_env,1,0);
-    if (!IT_r.isException (IT_env)) {
-
-        IT_r << s;
-    }
-
-    IT_r.invoke (CORBA::Flags(0),IT_env);
-    if (!IT_r.isException (IT_env)) {
-        CORBA::Short IT_result;
-        IT_r >> IT_result;
-        IT_r.checkEnv (IT_env);
-        return IT_result;
-    }
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-    return 0;
-}
-
-CORBA::Long Cubit:: cube_long (CORBA::Long l, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        return 0;
-    }
-    CORBA::Request IT_r (this, "cube_long",IT_env,1,0);
-    if (!IT_r.isException (IT_env)) {
-
-        IT_r << l;
-    }
-
-    IT_r.invoke (CORBA::Flags(0),IT_env);
-    if (!IT_r.isException (IT_env)) {
-        CORBA::Long IT_result;
-        IT_r >> IT_result;
-        IT_r.checkEnv (IT_env);
-        return IT_result;
-    }
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-    return 0;
-}
-
-Cubit::Many Cubit:: cube_struct (const Cubit::Many& values, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        { 
-            Cubit::Many IT_l0;
-            return IT_l0;
-        }
-    }
-    CORBA::Request IT_r (this, "cube_struct",IT_env,1,0);
-    if (!IT_r.isException (IT_env)) {
-
-        values.encodeOp (IT_r);
-    }
-
-    IT_r.invoke (CORBA::Flags(0),IT_env);
-    if (!IT_r.isException (IT_env)) {
-        Cubit::Many IT_result;
-        IT_result.decodeOp (IT_r);
-        IT_r.checkEnv (IT_env);
-        return IT_result;
-    }
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-    { 
-        Cubit::Many IT_l1;
-        return IT_l1;
-    }
-}
-
-Cubit::oneof Cubit:: cube_union (const Cubit::oneof& values, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        { 
-            Cubit::oneof IT_l0;
-            return IT_l0;
-        }
-    }
-    CORBA::Request IT_r (this, "cube_union",IT_env,1,0);
-    if (!IT_r.isException (IT_env)) {
-
-        values.encodeOp (IT_r);
-    }
-
-    IT_r.invoke (CORBA::Flags(0),IT_env);
-    if (!IT_r.isException (IT_env)) {
-        Cubit::oneof IT_result;
-        IT_result.decodeOp (IT_r);
-        IT_r.checkEnv (IT_env);
-        return IT_result;
-    }
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-    { 
-        Cubit::oneof IT_l1;
-        return IT_l1;
-    }
-}
-
-void Cubit:: please_exit (CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        return ;
-    }
-    CORBA::Request IT_r (this, "please_exit",IT_env,1,1);
-
-    IT_r.invoke (CORBA::Flags(CORBA::INV_NO_RESPONSE), IT_env);
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-}
-
-
-
-
-
-#ifndef Cubit_dispatch_impl
-
-unsigned char Cubit_dispatch::dispatch (CORBA::Request &IT_r, 
-    unsigned char, void *) {
-      IT_r.makeRuntimeException1 ("Cubit");
-      return 0;
-}
- 
-#endif
-
diff --git a/TAO/IIOP/test/Orbix/tpr/cubitC.h b/TAO/IIOP/test/Orbix/tpr/cubitC.h
deleted file mode 100644
index 15247168d3c..00000000000
--- a/TAO/IIOP/test/Orbix/tpr/cubitC.h
+++ /dev/null
@@ -1,343 +0,0 @@
-#ifndef _cubitC_h
-#define _cubitC_h
-
-/************************************************************************/
-/*                                                                      */
-/* This file is automatically generated by ORBeline IDL compiler        */
-/* Do not modify this file.                                             */
-/*                                                                      */
-/* ORBeline (c) is copyrighted by PostModern Computing, Inc.            */
-/*                                                                      */
-/* The generated code conforms to OMG's IDL C++ mapping as              */
-/* specified in OMG Document Number: 94-9-14.                           */
-/*                                                                      */
-/************************************************************************/
-
-#include "corba.h"
-
-
-
-class Cubit;
-typedef Cubit *Cubit_ptr;
-typedef Cubit_ptr CubitRef;
-
-#ifndef _Cubit_var_
-#define _Cubit_var_
-class Cubit_var
-{
-    public:
-	Cubit_var();
-	Cubit_var(Cubit_ptr);
-	Cubit_var(const Cubit_var&);
-	~Cubit_var();
-	Cubit_var& operator=(Cubit_ptr);
-	operator Cubit_ptr() const { return _ptr; }
-#if defined(_HPCC_BUG)
-	operator Cubit *&() { return _ptr; }
-#else
-	operator Cubit_ptr&() { return _ptr; }
-#endif
-	Cubit_ptr operator->() const { return _ptr;}
-	friend NCistream& operator>>(NCistream&, Cubit_var&);
-	friend NCostream& operator<<(NCostream&, const Cubit_var&);
-	friend istream& operator>>(istream&, Cubit_var&);
-	friend ostream& operator<<(ostream&, const Cubit_var&);
-    private:
-	Cubit_ptr	_ptr;
-	void operator=(const Cubit_var&) {}
-};
-#endif
-class Cubit: public virtual CORBA_Object
-{
-    private:
-	static const CORBA::TypeInfo _class_info;
-	Cubit(const Cubit&) {}
-	void operator=(const Cubit&){}
-    public:
-	static const CORBA::TypeInfo *_desc();
-	virtual const CORBA::TypeInfo *_type_info() const;
-	virtual void *_safe_narrow(const CORBA::TypeInfo& ) const;
-	static CORBA::Object *_factory();
-    protected:
-	Cubit(const char *obj_name = NULL) :CORBA_Object(obj_name, 1) {}
-	Cubit(NCistream& strm) :CORBA_Object(strm) {}
-	virtual ~Cubit() {}
-    public:
-	static Cubit_ptr _duplicate(Cubit_ptr obj) {
-		if (obj ) obj->_ref();
-		return obj;
-	}
-	static Cubit_ptr _nil() { return (Cubit_ptr)NULL;}
-	static Cubit_ptr _narrow(CORBA::Object *obj);
-	static Cubit_ptr _clone(Cubit_ptr obj) {
-		CORBA::Object_var obj_var(__clone(obj));
-
-#if defined(_HPCC_BUG)
-		return _narrow(obj_var.operator CORBA::Object_ptr());
-#else
-		return _narrow(obj_var);
-#endif
-	}
-	static Cubit_ptr _bind(const char *object_name = NULL,
-		const char *host_name = NULL,
-		const CORBA::BindOptions* opt = NULL); 
-
-	virtual CORBA::Octet cube_octet(CORBA::Octet o);
-	
-	virtual CORBA::Short cube_short(CORBA::Short s);
-	
-	virtual CORBA::Long cube_long(CORBA::Long l);
-	
-	struct Many {
-		CORBA::Octet	o;
-		CORBA::Long	l;
-		CORBA::Short	s;
-	};
-	friend NCostream& operator<<(NCostream&, const Many& );
-	friend NCistream& operator>>(NCistream&, Many& );
-	
-	friend ostream& operator<<(ostream&, const Many& );
-	inline friend istream& operator>>(istream& _strm, Many& _obj) {
-		NCistream _istrm(_strm);
-		_istrm >> _obj;
-		return _strm;
-	}
-	
-	
-	typedef Many *Many_ptr;
-	class Many_var
-	{
-	    public:
-		Many_var() { _ptr = (Many*)NULL;}
-		Many_var(Many *ptr) {
-			_ptr = ptr;
-		}
-		Many_var(const Many_var& var) {
-			if (var._ptr)
-				_ptr = new Many(*var._ptr);
-			else
-				_ptr = (Many *)NULL;
-		}
-		~Many_var() {
-			if (_ptr != (Many *)NULL) delete _ptr;
-		}
-		Many_var& operator=(Many *ptr) {
-			if (_ptr != (Many *)NULL) delete _ptr;
-			_ptr = ptr;
-			return *this;
-		}
-		Many_var& operator=(const Many_var& var) {
-			if (_ptr != (Many *)NULL) delete _ptr;
-			if (var._ptr)
-				_ptr = new Many(*var._ptr);
-			else
-				_ptr = (Many *)NULL;
-			return *this;
-		}
-		Many *operator->() { return _ptr; }
-		operator Many () const { return *_ptr; }
-		operator Many& () { return *_ptr; }
-		inline friend NCostream& operator<<(NCostream& strm,
-				const Many_var& var) {
-			if (var._ptr == (Many *)NULL) {
-				throw CORBA::BAD_PARAM();
-			}
-			else
-				strm << *var._ptr;
-			return strm;
-		}
-		inline friend NCistream& operator>>(NCistream& strm,
-				Many_var& var) {
-			if ( ! var._ptr)
-				var._ptr = new Many;
-			strm >> *var._ptr;
-			return strm;
-		}
-	    private:
-		Many *_ptr;
-	};
-	
-	
-	virtual Cubit::Many cube_struct(const Cubit::Many& values);
-	
-	enum discrim {
-		e_0th,
-		e_1st,
-		e_2nd,
-		e_3rd,
-		e_4th,
-		e_5th
-	};
-	inline friend NCostream& operator<<(NCostream& _strm, discrim _enum_type) {
-		_strm << (CORBA::ULong)_enum_type;
-		return _strm;
-	}
-	inline friend NCistream& operator>>(NCistream& _strm, discrim& _enum_type) {
-		CORBA::ULong _temp;
-		_strm >> _temp;
-		if (_temp >= 6)
-			throw CORBA::BAD_PARAM();
-		_enum_type = discrim(_temp);
-		return _strm;
-	}
-	inline friend ostream& operator<<(ostream& _strm, discrim _enum_type) {
-		if( &_strm == &cout || &_strm == &cerr || &_strm == &clog) {
-			_strm << "discrim:";
-			switch(_enum_type) {
-				case e_0th:
-					_strm << "e_0th" << endl;
-					break;
-				case e_1st:
-					_strm << "e_1st" << endl;
-					break;
-				case e_2nd:
-					_strm << "e_2nd" << endl;
-					break;
-				case e_3rd:
-					_strm << "e_3rd" << endl;
-					break;
-				case e_4th:
-					_strm << "e_4th" << endl;
-					break;
-				case e_5th:
-					_strm << "e_5th" << endl;
-					break;
-			}
-		}
-		else 
-			_strm << (CORBA::ULong)_enum_type;
-		return _strm;
-	}
-	inline friend istream& operator>>(istream& _strm, discrim& _enum_type) {
-		CORBA::ULong _temp;
-		_strm >> _temp;
-		_enum_type = discrim(_temp);
-		return _strm;
-	}
-	
-	
-	class oneof
-	{
-	    public:
-	    private:
-		discrim	_disc;
-		CORBA::Octet	__o;
-		CORBA::Short	__s;
-		CORBA::Long	__l;
-		Cubit::Many	__cm;
-	    public:
-		oneof() : _disc(discrim(0)) {}
-		~oneof() {}
-		oneof(const oneof& obj);
-		oneof& operator=(const oneof& obj);
-	
-		void _d(discrim val) { _disc = val; }
-		discrim _d() const { return _disc; }
-	
-		void o(CORBA::Octet val) {
-			__o = val;
-			_disc = Cubit::e_0th;
-		}
-		CORBA::Octet o() const { return __o; }
-	
-		void s(CORBA::Short val) {
-			__s = val;
-			_disc = Cubit::e_1st;
-		}
-		CORBA::Short s() const { return __s; }
-	
-		void l(CORBA::Long val) {
-			__l = val;
-			_disc = Cubit::e_2nd;
-		}
-		CORBA::Long l() const { return __l; }
-	
-		void cm(const Cubit::Many& val) {
-			__cm = val;
-			_disc = Cubit::e_3rd;
-		}
-		const Cubit::Many& cm() const { return __cm; }
-		Cubit::Many& cm() { return __cm; }
-	
-		friend NCostream& operator<<(NCostream&, const oneof& );
-		friend NCistream& operator>>(NCistream&, oneof& );
-		friend ostream& operator<<(ostream&, const oneof&);
-		inline friend istream& operator>>(istream& strm, oneof& obj) {
-			NCistream istrm(strm);
-			strm >> obj;
-			return strm;
-		}
-	};
-	
-	typedef oneof *oneof_ptr;
-	class oneof_var
-	{
-	    public:
-		oneof_var() { _ptr = (oneof*)NULL;}
-		oneof_var(oneof *ptr) {
-			_ptr = ptr;
-		}
-		oneof_var(const oneof_var& var) {
-			_ptr = new oneof(*var._ptr);
-		}
-		~oneof_var() {
-			if (_ptr != (oneof *)NULL) delete _ptr;
-		}
-		oneof_var& operator=(oneof *ptr) {
-			if (_ptr != (oneof *)NULL) delete _ptr;
-			_ptr = ptr;
-			return *this;
-		}
-		oneof_var& operator=(const oneof_var& var) {
-			if (_ptr != (oneof *)NULL) delete _ptr;
-			_ptr = new oneof(*var._ptr);
-			return *this;
-		}
-		oneof *operator->() { return _ptr; }
-		operator oneof () const { return *_ptr; }
-		operator oneof& () { return *_ptr; }
-		inline friend NCostream& operator<<(NCostream& strm,
-				const oneof_var& var) {
-			if (var._ptr == (oneof *)NULL) {
-				throw CORBA::BAD_PARAM();
-			}
-			else
-				strm << *var._ptr;
-			return strm;
-		}
-		inline friend NCistream& operator>>(NCistream& strm,
-				oneof_var& var) {
-			if ( ! var._ptr)
-				var._ptr = new oneof;
-			strm >> *var._ptr;
-			return strm;
-		}
-	    private:
-		oneof *_ptr;
-	};
-	
-	
-	virtual Cubit::oneof cube_union(const Cubit::oneof& values);
-	
-	virtual void please_exit();
-	
-	inline friend NCistream& operator>>(NCistream& strm, Cubit_ptr& obj) {
-		CORBA::Object_var _obj(obj);
-		_obj = CORBA::Object::_read(strm, Cubit::_desc());
-		obj = Cubit::_narrow(_obj);
-		return strm;
-	}
-	inline friend ostream& operator<<(ostream& strm, const Cubit_ptr obj) {
-		strm << (CORBA::Object_ptr)obj;
-		return strm;
-	}
-	inline friend istream& operator>>(istream& strm, Cubit_ptr& obj) {
-		NCistream istrm(strm);
-		istrm >> obj;
-		return strm;
-	}
-};
-
-
-#endif
-
diff --git a/TAO/IIOP/test/Orbix/tpr/cubitS.cpp b/TAO/IIOP/test/Orbix/tpr/cubitS.cpp
deleted file mode 100644
index 449a8c23548..00000000000
--- a/TAO/IIOP/test/Orbix/tpr/cubitS.cpp
+++ /dev/null
@@ -1,226 +0,0 @@
-#include "cubit.h"
-
-
-#define Cubit_dispatch_impl
-
-unsigned char Cubit_dispatch::dispatch (CORBA::Request &IT_r, 
- unsigned char IT_isTarget, void *IT_pp) {
-    if (!IT_pp)
-       IT_pp = m_obj;
-    const char *IT_s = IT_r.getOperation ();
-    if (!strcmp(IT_s,"cube_octet")) {
-        CORBA::Octet IT_result;
-        CORBA::Environment IT_env (IT_r);
-        CORBA::Filter* IT_f = CORBA::Orbix.getFilter ();
-        if (!IT_r.tcAssert ("\
-Ro~cube_octet~+o{o},>{o},N{}\
-"))
-            return 1;
-        CORBA::Octet o;
-
-        IT_r.extractOctet (o);
-
-        if (IT_f && !IT_r.isException (IT_env))
-        	IT_f->inRequestPostM (IT_r, IT_env);
-        if (!IT_r.isException (IT_env)) {
-            try {
-                	IT_result = ((Cubit*)IT_pp)->cube_octet (  o, IT_env);
-
-            } catch (CORBA::SystemException &IT_exSys) {
-            IT_env.propagate (&IT_exSys);
-            } catch (CORBA::UserException &IT_exUsr) {
-            IT_env.propagate (&IT_exUsr);
-            }
-        }
-
-        if (!IT_r.isException (IT_env)) {
-            if (!IT_r.convertToReply ("\
-o\
-", IT_env)) return 1;
-            IT_r.insertOctet (IT_result);
-            }
-
-        else IT_r.makeSystemException (IT_env);
-        return 1;
-    }
-
-    if (!strcmp(IT_s,"cube_short")) {
-        CORBA::Short IT_result;
-        CORBA::Environment IT_env (IT_r);
-        CORBA::Filter* IT_f = CORBA::Orbix.getFilter ();
-        if (!IT_r.tcAssert ("\
-Ro~cube_short~+s{s},>{s},N{}\
-"))
-            return 1;
-        CORBA::Short s;
-
-        IT_r >> s;
-
-        if (IT_f && !IT_r.isException (IT_env))
-        	IT_f->inRequestPostM (IT_r, IT_env);
-        if (!IT_r.isException (IT_env)) {
-            try {
-                	IT_result = ((Cubit*)IT_pp)->cube_short (  s, IT_env);
-
-            } catch (CORBA::SystemException &IT_exSys) {
-            IT_env.propagate (&IT_exSys);
-            } catch (CORBA::UserException &IT_exUsr) {
-            IT_env.propagate (&IT_exUsr);
-            }
-        }
-
-        if (!IT_r.isException (IT_env)) {
-            if (!IT_r.convertToReply ("\
-s\
-", IT_env)) return 1;
-            IT_r << IT_result;
-            }
-
-        else IT_r.makeSystemException (IT_env);
-        return 1;
-    }
-
-    if (!strcmp(IT_s,"cube_long")) {
-        CORBA::Long IT_result;
-        CORBA::Environment IT_env (IT_r);
-        CORBA::Filter* IT_f = CORBA::Orbix.getFilter ();
-        if (!IT_r.tcAssert ("\
-Ro~cube_long~+l{l},>{l},N{}\
-"))
-            return 1;
-        CORBA::Long l;
-
-        IT_r >> l;
-
-        if (IT_f && !IT_r.isException (IT_env))
-        	IT_f->inRequestPostM (IT_r, IT_env);
-        if (!IT_r.isException (IT_env)) {
-            try {
-                	IT_result = ((Cubit*)IT_pp)->cube_long (  l, IT_env);
-
-            } catch (CORBA::SystemException &IT_exSys) {
-            IT_env.propagate (&IT_exSys);
-            } catch (CORBA::UserException &IT_exUsr) {
-            IT_env.propagate (&IT_exUsr);
-            }
-        }
-
-        if (!IT_r.isException (IT_env)) {
-            if (!IT_r.convertToReply ("\
-l\
-", IT_env)) return 1;
-            IT_r << IT_result;
-            }
-
-        else IT_r.makeSystemException (IT_env);
-        return 1;
-    }
-
-    if (!strcmp(IT_s,"cube_struct")) {
-        Cubit::Many IT_result;
-        CORBA::Environment IT_env (IT_r);
-        CORBA::Filter* IT_f = CORBA::Orbix.getFilter ();
-        if (!IT_r.tcAssert ("\
-Ro~cube_struct~+values{R~Cubit::Many~o{o},l{l},s{s}},>{R~Cubit::Many~o{o},l{l},s{s}},N{}\
-"))
-            return 1;
-        Cubit::Many values;
-
-        values.decodeOp (IT_r);
-
-        if (IT_f && !IT_r.isException (IT_env))
-        	IT_f->inRequestPostM (IT_r, IT_env);
-        if (!IT_r.isException (IT_env)) {
-            try {
-                	IT_result = ((Cubit*)IT_pp)->cube_struct (  values, IT_env);
-
-            } catch (CORBA::SystemException &IT_exSys) {
-            IT_env.propagate (&IT_exSys);
-            } catch (CORBA::UserException &IT_exUsr) {
-            IT_env.propagate (&IT_exUsr);
-            }
-        }
-
-        if (!IT_r.isException (IT_env)) {
-            if (!IT_r.convertToReply ("\
-R~Cubit::Many~o{o},l{l},s{s}\
-", IT_env)) return 1;
-            IT_result.encodeOp (IT_r);
-            }
-
-        else IT_r.makeSystemException (IT_env);
-        return 1;
-    }
-
-    if (!strcmp(IT_s,"cube_union")) {
-        Cubit::oneof IT_result;
-        CORBA::Environment IT_env (IT_r);
-        CORBA::Filter* IT_f = CORBA::Orbix.getFilter ();
-        IT_r.tcPreAssert (
-"\
-Ro~cube_union~+values{U~Cubit::oneof~{E~Cubit::discrim~e_0th,e_1st,e_2nd,e_3rd,e_4th,e_5th}~Cubit::e_0th o{o};Cubit::e_1st s{s};Cubit::e_2nd l{l};Cubit::e_3rd,$ cm{R~Cubit::Many~o{o},l{l},s{s}}},>{U~Cubit::oneof~{E~Cubit::discrim~e_0th,e_1st,e_2nd,e_3rd,\
-");
-        if (!IT_r.tcAssert ("\
-e_4th,e_5th}~Cubit::e_0th o{o};Cubit::e_1st s{s};Cubit::e_2nd l{l};Cubit::e_3rd,$ cm{R~Cubit::Many~o{o},l{l},s{s}}},N{}\
-"))
-            return 1;
-        Cubit::oneof values;
-
-        values.decodeOp (IT_r);
-
-        if (IT_f && !IT_r.isException (IT_env))
-        	IT_f->inRequestPostM (IT_r, IT_env);
-        if (!IT_r.isException (IT_env)) {
-            try {
-                	IT_result = ((Cubit*)IT_pp)->cube_union (  values, IT_env);
-
-            } catch (CORBA::SystemException &IT_exSys) {
-            IT_env.propagate (&IT_exSys);
-            } catch (CORBA::UserException &IT_exUsr) {
-            IT_env.propagate (&IT_exUsr);
-            }
-        }
-
-        if (!IT_r.isException (IT_env)) {
-            if (!IT_r.convertToReply ("\
-U~Cubit::oneof~{E~Cubit::discrim~e_0th,e_1st,e_2nd,e_3rd,e_4th,e_5th}~Cubit::e_0th o{o};Cubit::e_1st s{s};Cubit::e_2nd l{l};Cubit::e_3rd,$ cm{R~Cubit::Many~o{o},l{l},s{s}}\
-", IT_env)) return 1;
-            IT_result.encodeOp (IT_r);
-            }
-
-        else IT_r.makeSystemException (IT_env);
-        return 1;
-    }
-
-    if (!strcmp(IT_s,"please_exit")) {
-        CORBA::Environment IT_env (IT_r);
-        CORBA::Filter* IT_f = CORBA::Orbix.getFilter ();
-        if (!IT_r.tcAssert ("\
-Ro~please_exit~>{v},O{}\
-"))
-            return 1;
-
-        if (IT_f && !IT_r.isException (IT_env))
-        	IT_f->inRequestPostM (IT_r, IT_env);
-        if (!IT_r.isException (IT_env)) {
-            try {
-                ((Cubit*)IT_pp)->please_exit (IT_env);
-
-            } catch (CORBA::SystemException &IT_exSys) {
-            IT_env.propagate (&IT_exSys);
-            } catch (CORBA::UserException &IT_exUsr) {
-            IT_env.propagate (&IT_exUsr);
-            }
-        }
-        IT_r.replyNoResults (CORBA::Flags(CORBA::INV_NO_RESPONSE),IT_env);
-        return 1;
-    }
-
-    if (IT_isTarget)
-        IT_r.makeRuntimeException2 ();
-
-    return 0;
-}
-
-#include "cubitC.cpp"
-
diff --git a/TAO/IIOP/test/Orbix/tpr/cubitS.h b/TAO/IIOP/test/Orbix/tpr/cubitS.h
deleted file mode 100644
index 757af4664ad..00000000000
--- a/TAO/IIOP/test/Orbix/tpr/cubitS.h
+++ /dev/null
@@ -1,118 +0,0 @@
-#ifndef _cubitS_h
-#define _cubitS_h
-
-#include "cubitC.h"
-
-/************************************************************************/
-/*                                                                      */
-/* This file is automatically generated by ORBeline IDL compiler        */
-/* Do not modify this file.                                             */
-/*                                                                      */
-/* ORBeline (c) is copyrighted by PostModern Computing, Inc.            */
-/*                                                                      */
-/* The generated code conforms to OMG's IDL C++ mapping as              */
-/* specified in OMG Document Number: 94-9-14.                           */
-/*                                                                      */
-/************************************************************************/
-
-class _sk_Cubit : public Cubit
-{
-    protected:
-	_sk_Cubit(const char *object_name = (const char *)NULL);
-	_sk_Cubit(const char *service_name, const CORBA::ReferenceData& data);
-	virtual ~_sk_Cubit() {}
-    public:
-	static const CORBA::TypeInfo _skel_info;
-
-	// The following operations need to be implemented by the server.
-	virtual CORBA::Octet cube_octet(CORBA::Octet o) = 0;
-	virtual CORBA::Short cube_short(CORBA::Short s) = 0;
-	virtual CORBA::Long cube_long(CORBA::Long l) = 0;
-	virtual Cubit::Many cube_struct(const Cubit::Many& values) = 0;
-	virtual Cubit::oneof cube_union(const Cubit::oneof& values) = 0;
-	virtual void please_exit() = 0;
-	
-	// Skeleton Operations implemented automatically
-	
-	static void _cube_octet(void *obj,
-			CORBA::MarshalStream &strm,
-			CORBA::Principal_ptr principal,
-			const char *oper,
-			void *priv_data);
-	
-	static void _cube_short(void *obj,
-			CORBA::MarshalStream &strm,
-			CORBA::Principal_ptr principal,
-			const char *oper,
-			void *priv_data);
-	
-	static void _cube_long(void *obj,
-			CORBA::MarshalStream &strm,
-			CORBA::Principal_ptr principal,
-			const char *oper,
-			void *priv_data);
-	
-	static void _cube_struct(void *obj,
-			CORBA::MarshalStream &strm,
-			CORBA::Principal_ptr principal,
-			const char *oper,
-			void *priv_data);
-	
-	static void _cube_union(void *obj,
-			CORBA::MarshalStream &strm,
-			CORBA::Principal_ptr principal,
-			const char *oper,
-			void *priv_data);
-	
-	static void _please_exit(void *obj,
-			CORBA::MarshalStream &strm,
-			CORBA::Principal_ptr principal,
-			const char *oper,
-			void *priv_data);
-	
-};
-template <class T>
-class _tie_Cubit : public Cubit
-{
-    public:
-	_tie_Cubit(T& t, const char *obj_name=(char*)NULL) : 
-			Cubit(obj_name), 
-			_ref(t) {
-		_object_name(obj_name);
-	}
-	_tie_Cubit(T& t, const char *service_name,
-			const CORBA::ReferenceData& id)
-			:_ref(t) {
-		_service(service_name, id);
-	}
-	~_tie_Cubit() {}
-	CORBA::Octet cube_octet(CORBA::Octet o) {
-		return _ref.cube_octet(
-		o);
-	}
-	CORBA::Short cube_short(CORBA::Short s) {
-		return _ref.cube_short(
-		s);
-	}
-	CORBA::Long cube_long(CORBA::Long l) {
-		return _ref.cube_long(
-		l);
-	}
-	Cubit::Many cube_struct(const Cubit::Many& values) {
-		return _ref.cube_struct(
-		values);
-	}
-	Cubit::oneof cube_union(const Cubit::oneof& values) {
-		return _ref.cube_union(
-		values);
-	}
-	void please_exit() {
-		_ref.please_exit();
-	}
-
-    private:
-	T& _ref;
-};
-
-#endif
-
diff --git a/TAO/IIOP/test/Orbix/tpr/cubit_impl.cpp b/TAO/IIOP/test/Orbix/tpr/cubit_impl.cpp
deleted file mode 100644
index e35f1084118..00000000000
--- a/TAO/IIOP/test/Orbix/tpr/cubit_impl.cpp
+++ /dev/null
@@ -1,46 +0,0 @@
-#include "cubit_impl.h"
-
-CORBA::Octet Cubit_Impl:: cube_octet (CORBA::Octet o, CORBA::Environment &IT_env) throw (CORBA::SystemException) {
-  return (CORBA::Octet) (o * o * o); 
-}
-
-CORBA::Short Cubit_Impl:: cube_short (CORBA::Short s, CORBA::Environment &IT_env) throw (CORBA::SystemException) {
-  return (CORBA::Short) (s * s * s);
-}
-
-CORBA::Long Cubit_Impl:: cube_long (CORBA::Long l, CORBA::Environment &IT_env) throw (CORBA::SystemException) {
-   return (CORBA::Long) (l * l * l);
-}
-
-Cubit::Many Cubit_Impl:: cube_struct (const Cubit::Many& values, CORBA::Environment &IT_env) throw (CORBA::SystemException) {
-  Cubit::Many out_values;
-  out_values.o = values.o * values.o * values.o;
-  out_values.s = values.s * values.s * values.s;
-  out_values.l = values.l * values.l * values.l;
-  return out_values; 
-}
-
-Cubit::oneof Cubit_Impl:: cube_union (const Cubit::oneof& values, CORBA::Environment &IT_env) throw (CORBA::SystemException) {
-  Cubit::oneof out_values;
-   switch (values._d ()) {
-   case Cubit::e_0th:
-     out_values.o (values.o () * values.o ()  * values.o ());
-     break;
-   case Cubit::e_1st:
-     out_values.s (values.s () * values.s () * values.s ());
-     break;
-   case Cubit::e_2nd:
-     out_values.l (values.l () * values.l () * values.l ());
-     break;
-   case Cubit::e_3rd:
-   default:
-     out_values.cm ().o = values.cm ().o * values.cm ().o * values.cm ().o ;
-     out_values.cm ().s = values.cm ().s * values.cm ().s * values.cm ().s ;
-     out_values.cm ().l = values.cm ().l * values.cm ().l * values.cm ().l ;
-     break;
-   }
-   return out_values;  
-}
-
-void Cubit_Impl:: please_exit (CORBA::Environment &IT_env) throw (CORBA::SystemException) {
-}
diff --git a/TAO/IIOP/test/Orbix/tpr/cubit_impl.h b/TAO/IIOP/test/Orbix/tpr/cubit_impl.h
deleted file mode 100644
index 1e710bb15d1..00000000000
--- a/TAO/IIOP/test/Orbix/tpr/cubit_impl.h
+++ /dev/null
@@ -1,27 +0,0 @@
-
-#ifndef cubit_ih
-#define cubit_ih
-
-#include "cubit.h"
-
-
-#ifdef Cubit_USE_BOA
-class Cubit_Impl : public virtual CubitBOAImpl {
-#else
-class Cubit_Impl {
-#endif /* Cubit_USE_BOA */
-
-public:
-        virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env=CORBA::default_environment) throw (CORBA::SystemException);
-        virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env=CORBA::default_environment) throw (CORBA::SystemException);
-        virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env=CORBA::default_environment) throw (CORBA::SystemException);
-        virtual Cubit::Many cube_struct (const Cubit::Many& values, CORBA::Environment &IT_env=CORBA::default_environment) throw (CORBA::SystemException);
-        virtual Cubit::oneof cube_union (const Cubit::oneof& values, CORBA::Environment &IT_env=CORBA::default_environment) throw (CORBA::SystemException);
-        virtual void please_exit (CORBA::Environment &IT_env=CORBA::default_environment) throw (CORBA::SystemException);
-};
-
-#ifndef Cubit_USE_BOA
-DEF_TIE_Cubit (Cubit_Impl)
-#endif /* Cubit_USE_BOA */
-
-#endif
diff --git a/TAO/IIOP/test/Orbix/tpr/server.cpp b/TAO/IIOP/test/Orbix/tpr/server.cpp
deleted file mode 100644
index 96117fe3e0d..00000000000
--- a/TAO/IIOP/test/Orbix/tpr/server.cpp
+++ /dev/null
@@ -1,40 +0,0 @@
-//**************************************************************************
-//
-// NAME :   tpr_server.cpp 
-// DESCRIPTION:  
-//
-// Server mainline
-//
-//****************************************************************************
-#define IT_EX_MACROS
-
-#include "cubit_impl.h"		// server header file
-
-int 
-main (int , char**)
-{
-
-#ifdef Cubit_USE_BOA
-  Cubit_var cb = new Cubit_Impl;
-  cout << "Using BOA approach" << endl;
-#else
-  Cubit_var cb = new TIE_Cubit (Cubit_Impl) (new Cubit_Impl);
-  cout << "Using TIE approach" << endl;
-#endif /* Cubit_USE_BOA */
-  
-  //
-  // Go get some work to do....
-  //
-  IT_TRY {
-      CORBA::Orbix.impl_is_ready("Cubit", IT_X);
-  }
-  IT_CATCHANY {
-     cout << IT_X << endl;
-  }
-  IT_ENDTRY;
-
-  cout << "Cubit server is exiting." << endl;
-
-
-  return 0;
-}
diff --git a/TAO/IIOP/test/Orbix/tpr/tpr.cpp b/TAO/IIOP/test/Orbix/tpr/tpr.cpp
deleted file mode 100644
index 415410aea9f..00000000000
--- a/TAO/IIOP/test/Orbix/tpr/tpr.cpp
+++ /dev/null
@@ -1,26 +0,0 @@
-#include "tpr.h"
-
-void *
-worker(void *vp)
-{
-  ACE_Thread_Control tc (ACE_Thread_Manager::instance ());
-  CORBA::Orbix.continueThreadDispatch (*(CORBA::Request *)vp);
-  return NULL;
-}
-
-
-int
-tpr_filter::inRequestPreMarshal(CORBA::Request &r,  CORBA::Environment&)
-{
-//   thread_t	tid;
-//   thr_create(NULL, 0, worker, (void *)&r, THR_DETACHED, &tid);
-
-  ACE_Thread_Manager *thr_mgr = ACE_Thread_Manager::instance ();
-  thr_mgr->spawn (ACE_THR_FUNC (worker),
-                  (void *) &r, 
-                  THR_DETACHED);
-
-  return -1;
-}
-
-tpr_filter tpr_dispatcher;
diff --git a/TAO/IIOP/test/Orbix/tpr/tpr.h b/TAO/IIOP/test/Orbix/tpr/tpr.h
deleted file mode 100644
index 38c2ccc7069..00000000000
--- a/TAO/IIOP/test/Orbix/tpr/tpr.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#include "cubit.h"
-#include "ace/Service_Config.h"
-#include "ace/Thread_Manager.h"
-
-//
-// Create a thread filter to dispatch incoming calls
-//
-class tpr_filter : public CORBA::ThreadFilter {
-	virtual int inRequestPreMarshal(CORBA::Request &, CORBA::Environment&);
-};
diff --git a/TAO/IIOP/test/Orbix/tps/Makefile b/TAO/IIOP/test/Orbix/tps/Makefile
deleted file mode 100644
index f7e949578c2..00000000000
--- a/TAO/IIOP/test/Orbix/tps/Makefile
+++ /dev/null
@@ -1,349 +0,0 @@
-#----------------------------------------------------------------------------
-#	@(#)Makefile	1.1	10/18/96
-#
-#	Makefile for the ACE_MT_CORBA_Handler tests
-#----------------------------------------------------------------------------
-
-#----------------------------------------------------------------------------
-#	Local macros
-#----------------------------------------------------------------------------
-
-SRC = cubitS.cpp cubit_impl.cpp server.cpp tps.cpp
-
-SVR_OBJS = cubitS.o cubit_impl.o server.o tps.o
-
-LDLIBS	 = 
-
-VLDLIBS	 = $(LDLIBS:%=%$(VAR))
-
-#----------------------------------------------------------------------------
-#	Include macros and targets
-#----------------------------------------------------------------------------
-
-include		$(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-include		$(ACE_ROOT)/include/makeinclude/macros.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.common.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.lib.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.bin.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
-
-#----------------------------------------------------------------------------
-#	Orbix related macros and target settings.
-#----------------------------------------------------------------------------
-
-
-ORBIX_BINDIR    = $(ORBIX_ROOT)/bin
-ORBIX_LIBDIR    = $(ORBIX_ROOT)/corba2/lib
-ORBIX_INCDIR    = $(ORBIX_ROOT)/corba2/include
-
-# Remove -DCubit_USE_BOA from below to use the TIE approach
-
-CPPFLAGS += -DEXCEPTIONS -I$(ORBIX_INCDIR) -DWANT_ORBIX_FDS -DCubit_USE_BOA
-LDFLAGS  += -L$(ORBIX_LIBDIR) -R $(ORBIX_LIBDIR) -L$(ACE)/ace
-
-IDLFLAGS = -s S.cpp -c C.cpp -B
-
-#----------------------------------------------------------------------------
-#	Local targets
-#----------------------------------------------------------------------------
-
-all: server
-
-server: $(addprefix $(VDIR),$(SVR_OBJS))
-	$(LINK.cc) -o server $(addprefix $(VDIR),$(SVR_OBJS)) $(LDFLAGS) $(ITIIOP) $(ITSRV) $(VLDLIBS)
-
-#----------------------------------------------------------------------------
-#	Dependencies
-#----------------------------------------------------------------------------
-# DO NOT DELETE THIS LINE -- g++dep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-
-.obj/cubitS.o .shobj/cubitS.so: cubitS.cpp cubit.h cubitC.cpp
-.obj/cubit_impl.o .shobj/cubit_impl.so: cubit_impl.cpp cubit_impl.h cubit.h \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/config-sunos5.5-sunc++-4.x.h \
- $(ACE_ROOT)/ace/stdcpp.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Token.h \
- $(ACE_ROOT)/ace/Token.i \
- $(ACE_ROOT)/ace/Pipe.h \
- $(ACE_ROOT)/ace/Pipe.i \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Proactor.h \
- $(ACE_ROOT)/ace/Asynch_IO.h \
- $(ACE_ROOT)/ace/Timer_List.h \
- $(ACE_ROOT)/ace/Timer_List_T.h \
- $(ACE_ROOT)/ace/Timer_Heap.h \
- $(ACE_ROOT)/ace/Timer_Heap_T.h \
- $(ACE_ROOT)/ace/Timer_Wheel.h \
- $(ACE_ROOT)/ace/Timer_Wheel_T.h \
- $(ACE_ROOT)/ace/ReactorEx.h \
- $(ACE_ROOT)/ace/ReactorEx.i \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/Task_T.i
-.obj/server.o .shobj/server.so: server.cpp cubit_impl.h cubit.h \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/config-sunos5.5-sunc++-4.x.h \
- $(ACE_ROOT)/ace/stdcpp.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Token.h \
- $(ACE_ROOT)/ace/Token.i \
- $(ACE_ROOT)/ace/Pipe.h \
- $(ACE_ROOT)/ace/Pipe.i \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Proactor.h \
- $(ACE_ROOT)/ace/Asynch_IO.h \
- $(ACE_ROOT)/ace/Timer_List.h \
- $(ACE_ROOT)/ace/Timer_List_T.h \
- $(ACE_ROOT)/ace/Timer_Heap.h \
- $(ACE_ROOT)/ace/Timer_Heap_T.h \
- $(ACE_ROOT)/ace/Timer_Wheel.h \
- $(ACE_ROOT)/ace/Timer_Wheel_T.h \
- $(ACE_ROOT)/ace/ReactorEx.h \
- $(ACE_ROOT)/ace/ReactorEx.i \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/Task_T.i
-.obj/tps.o .shobj/tps.so: tps.cpp tps.h cubit.h cubit_impl.h \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/config-sunos5.5-sunc++-4.x.h \
- $(ACE_ROOT)/ace/stdcpp.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Token.h \
- $(ACE_ROOT)/ace/Token.i \
- $(ACE_ROOT)/ace/Pipe.h \
- $(ACE_ROOT)/ace/Pipe.i \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Proactor.h \
- $(ACE_ROOT)/ace/Asynch_IO.h \
- $(ACE_ROOT)/ace/Timer_List.h \
- $(ACE_ROOT)/ace/Timer_List_T.h \
- $(ACE_ROOT)/ace/Timer_Heap.h \
- $(ACE_ROOT)/ace/Timer_Heap_T.h \
- $(ACE_ROOT)/ace/Timer_Wheel.h \
- $(ACE_ROOT)/ace/Timer_Wheel_T.h \
- $(ACE_ROOT)/ace/ReactorEx.h \
- $(ACE_ROOT)/ace/ReactorEx.i \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/Task_T.i
-
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/IIOP/test/Orbix/tps/cubit.h b/TAO/IIOP/test/Orbix/tps/cubit.h
deleted file mode 100644
index 72e2fb81395..00000000000
--- a/TAO/IIOP/test/Orbix/tps/cubit.h
+++ /dev/null
@@ -1,1111 +0,0 @@
-
-#ifndef cubit_hh
-#define cubit_hh
-
-#include <CORBA.h>
-
-#include <string.h>
-
-
-#ifndef _Cubit_defined
-#define _Cubit_defined
-class Cubit_dispatch : public virtual CORBA::PPTR {
-public:
-
-      Cubit_dispatch (void *IT_p, CORBA::Object* IT_o, const char *IT_m, 
-        CORBA::LoaderClass *IT_l, char *IT_i, void* IT_im)
-       : PPTR (IT_p,IT_o,IT_m,IT_l,IT_i,IT_im) {}
-
-
-   Cubit_dispatch (char *IT_OR, void *IT_p, CORBA::Object *IT_o)
-       : PPTR (IT_OR,IT_p,IT_o) {}
-
-
-   Cubit_dispatch () {}
-
-   Cubit_dispatch (ObjectReference *IT_OR, void *IT_p, CORBA::Object *IT_o)
-       : PPTR (IT_OR,IT_p,IT_o) {}
-
-
-   Cubit_dispatch (void *IT_p, CORBA::Object *IT_o, const char *IT_m, 
-        char *IT_i, CORBA::Object* IT_ob, void* IT_im)
-       : PPTR (IT_p,IT_o,IT_m,IT_i,IT_ob,IT_im) {}
-
-
-   virtual unsigned char dispatch (CORBA::Request &IT_r, 
-        unsigned char IT_isTarget, void* IT_pp=NULL);
-
-
-};
-
-class Cubit;
-
-#ifndef CubitPtr
-#define CubitPtr
-
-typedef Cubit* Cubit_ptr;
-
-typedef Cubit* CubitRef;
-
-#endif
-
-
-#ifndef CubitForwH
-#define CubitForwH
-CORBA::ObjectRef Cubit_getBase (void *);
-void Cubit_release (Cubit *, CORBA::Environment &IT_env);
-void Cubit_release (Cubit_ptr);
-Cubit* Cubit_duplicate (Cubit_ptr, CORBA::Environment &IT_env);
-Cubit* Cubit_duplicate (Cubit_ptr );
-Cubit_ptr Cubit_nil (CORBA::Environment &IT_env);
-Cubit_ptr Cubit_nil ();
-#endif
-#define Cubit_IMPL "Cubit"
-
-
-class Cubit;
-
-typedef Cubit CubitProxy;
-#define Cubit_IR "Cubit$v1.1"
-#define Cubit_IMPL "Cubit"
-
-#ifndef CubitPtr
-#define CubitPtr
-
-typedef Cubit* Cubit_ptr;
-
-typedef Cubit* CubitRef;
-
-#endif
-
-class Cubit: public virtual CORBA::Object  {
-public:
-        Cubit (char *IT_OR);
-    Cubit (ObjectReference *IT_OR);
-    Cubit () : CORBA::Object  (1) {}
-protected:
-    Cubit_ptr __duplicate(
-            CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) {
-       CORBA::Object::__duplicate (IT_env);
-       return this;
-    }
-public:
-    static Cubit_ptr _duplicate(
-            Cubit_ptr, 
-            CORBA::Environment &IT_pEnv=CORBA::IT_chooseDefaultEnv ());
-public:
-   static Cubit* _bind (const char* IT_markerServer, const char* host,
-		const CORBA::Context &IT_c, 
-		CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-   static Cubit* _bind (CORBA::Environment &IT_env);
-   static Cubit* _bind (const char* IT_markerServer=NULL, const char* host=NULL,
-                 CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-    static Cubit* _narrow (CORBA::Object* , CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-    static Cubit_ptr _nil (CORBA::Environment &IT_pEnv=CORBA::IT_chooseDefaultEnv ()) {
-        CORBA::EnvExcRaiser IT_raise;
-        CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-        return (Cubit_ptr) CORBA::OBJECT_NIL;}
-
-#ifndef Cubit_Many_defined
-#define Cubit_Many_defined
-
-struct Many {
-    CORBA::Octet o;
-    CORBA::Long l;
-    CORBA::Short s;
-
-    void encodeOp (CORBA::Request &IT_r) const;
-    void decodeOp (CORBA::Request &IT_r);
-    void decodeInOutOp (CORBA::Request &IT_r);
-    Many(const Many &);
-    Many();
-    ~Many();
-    Many& operator= (const Many&);
-};
-
-#ifndef Cubit_ManyVarH
-#define Cubit_ManyVarH
-
-#ifndef Cubit_ManyvPtr
-#define Cubit_ManyvPtr
-typedef Many* Many_vPtr;
-typedef const Many* Many_cvPtr;
-#endif
-
-class Many_var : public CORBA::_var
-{
-    private:
-
-    unsigned char copyHelper (const Many_var &IT_s) {
-        if (!IT_s._ptr) {
-            _ptr = IT_s._ptr;
-        } else
-        {
-            _ptr = new Many;
-            *(_ptr) =  *(IT_s._ptr);
-        }
-        return 1;
-    }
-
-    public:
-
-    Many_var (const Many_var &IT_s) {
-        (void) copyHelper (IT_s);
-    }
-
-    Many_var () {
-        _ptr =  new Many;
-;
-    }
-
-    Many_var (Many *IT_p) {
-        _ptr = IT_p;
-    }
-
-    Many_var &operator= (Many *IT_p) {
-        if (_ptr != IT_p) {
-            delete _ptr;
-        }
-        _ptr = IT_p;
-        return (*this);
-    }
-
-    Many_var &operator= (const Many_var &IT_s) {
-        if (_ptr != IT_s._ptr) {
-            delete _ptr;
-        }
-        _ptr = new Many;
-        *(_ptr) =  *(IT_s._ptr);
-        return (*this);
-    }
-
-    ~Many_var () {
-        delete _ptr;
-    }
-
-    Many* operator-> () {
-        return _ptr;
-    }
-
-    operator Many_cvPtr () const { return _ptr;}
-    operator Many_vPtr& () { return _ptr;}
-    operator Many& () const { return * _ptr;}
-
-    protected:
-    Many *_ptr;
-    private:
-    Many_var &operator= (const CORBA::_var &IT_s);
-    Many_var (const CORBA::_var &IT_s);
-};
-
-#endif
-
-
-#endif
-
-enum discrim {e_0th,e_1st,e_2nd,e_3rd,e_4th,e_5th, IT__ENUM_Cubit_discrim=CORBA_ULONG_MAX};
-
-#ifndef Cubit_oneof_defined
-#define Cubit_oneof_defined
-
-struct oneof {
-    private:
-
-    discrim __d;
-    union {
-        CORBA::Octet _o_;
-        CORBA::Short _s_;
-        CORBA::Long _l_;
-        Many * _cm_;
-    };
-
-    public:
-
-    void encodeOp (CORBA::Request &IT_r) const;
-    void decodeOp (CORBA::Request &IT_r);
-    void decodeInOutOp (CORBA::Request &IT_r);
-
-    private:
-
-    unsigned char isSet;
-
-    public:
-
-    discrim _d () const { return __d; }
-
-    CORBA::Octet o () const {
-        return _o_;
-    }
-
-    void o (CORBA::Octet IT_member) {
-        if (isSet && (__d != Cubit::e_0th))
-        {
-            this-> oneof::~oneof();
-            memset(this, 0, sizeof(*this));
-        }
-
-        __d = Cubit::e_0th;
-        isSet = 1;
-        _o_ = IT_member;
-    }
-
-    CORBA::Short s () const {
-        return _s_;
-    }
-
-    void s (CORBA::Short IT_member) {
-        if (isSet && (__d != Cubit::e_1st))
-        {
-            this-> oneof::~oneof();
-            memset(this, 0, sizeof(*this));
-        }
-
-        __d = Cubit::e_1st;
-        isSet = 1;
-        _s_ = IT_member;
-    }
-
-    CORBA::Long l () const {
-        return _l_;
-    }
-
-    void l (CORBA::Long IT_member) {
-        if (isSet && (__d != Cubit::e_2nd))
-        {
-            this-> oneof::~oneof();
-            memset(this, 0, sizeof(*this));
-        }
-
-        __d = Cubit::e_2nd;
-        isSet = 1;
-        _l_ = IT_member;
-    }
-
-    Many& cm () {
-        return (*_cm_);
-    }
-
-    const Many& cm () const {
-        return (*_cm_);
-    }
-
-    void cm (const Many& IT_member) {
-        if (isSet && (__d != Cubit::e_3rd))
-        {
-            this-> oneof::~oneof();
-            memset(this, 0, sizeof(*this));
-        }
-
-        __d = Cubit::e_3rd;
-
-        if (!isSet) {
-            _cm_ = new Many;
-            isSet = 1;
-        }
-        *(_cm_) = IT_member;
-    }
-
-
-    oneof();
-    oneof(const oneof &);
-    ~oneof();
-    oneof& operator= (const oneof&);
-};
-
-#ifndef Cubit_oneofVarH
-#define Cubit_oneofVarH
-
-#ifndef Cubit_oneofvPtr
-#define Cubit_oneofvPtr
-typedef oneof* oneof_vPtr;
-typedef const oneof* oneof_cvPtr;
-#endif
-
-class oneof_var : public CORBA::_var
-{
-    private:
-
-    unsigned char copyHelper (const oneof_var &IT_s) {
-        if (!IT_s._ptr) {
-            _ptr = IT_s._ptr;
-        } else
-        {
-            _ptr = new oneof;
-            *(_ptr) =  *(IT_s._ptr);
-        }
-        return 1;
-    }
-
-    public:
-
-    oneof_var (const oneof_var &IT_s) {
-        (void) copyHelper (IT_s);
-    }
-
-    oneof_var () {
-        _ptr = NULL;
-    }
-
-    oneof_var (oneof *IT_p) {
-        _ptr = IT_p;
-    }
-
-    oneof_var &operator= (oneof *IT_p) {
-        if (_ptr != IT_p) {
-            delete _ptr;
-        }
-        _ptr = IT_p;
-        return (*this);
-    }
-
-    oneof_var &operator= (const oneof_var &IT_s) {
-        if (_ptr != IT_s._ptr) {
-            delete _ptr;
-        }
-        _ptr = new oneof;
-        *(_ptr) =  *(IT_s._ptr);
-        return (*this);
-    }
-
-    ~oneof_var () {
-        delete _ptr;
-    }
-
-    oneof* operator-> () {
-        return _ptr;
-    }
-
-    operator oneof_cvPtr () const { return _ptr;}
-    operator oneof_vPtr& () { return _ptr;}
-    operator oneof& () const { return * _ptr;}
-
-    protected:
-    oneof *_ptr;
-    private:
-    oneof_var &operator= (const CORBA::_var &IT_s);
-    oneof_var (const CORBA::_var &IT_s);
-};
-
-#endif
-
-
-#endif
-        virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual Many cube_struct (const Many& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual oneof cube_union (const oneof& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual void please_exit (CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-};
-
-#ifndef CubitVarH
-#define CubitVarH
-
-#ifndef CubitvPtr
-#define CubitvPtr
-typedef Cubit* Cubit_vPtr;
-typedef const Cubit* Cubit_cvPtr;
-#endif
-
-class Cubit_var : public CORBA::_var
-{
-    private:
-
-    unsigned char copyHelper (const Cubit_var &IT_s) {
-        {
-            _ptr = Cubit_duplicate (IT_s._ptr);
-        }
-        return 1;
-    }
-
-    public:
-
-    Cubit_var (const Cubit_var &IT_s) {
-        (void) copyHelper (IT_s);
-    }
-
-    Cubit_var () {
-        _ptr = Cubit_nil ();
-    }
-
-    Cubit_var (Cubit *IT_p) {
-        _ptr = IT_p;
-    }
-
-    Cubit_var &operator= (Cubit *IT_p) {
-        Cubit_release (_ptr);
-        _ptr = IT_p;
-        return (*this);
-    }
-
-    Cubit_var &operator= (const Cubit_var &IT_s) {
-        Cubit_release (_ptr);
-        _ptr = Cubit_duplicate (IT_s._ptr);
-        return (*this);
-    }
-
-    ~Cubit_var () {
-        Cubit_release (_ptr);
-    }
-
-    Cubit* operator-> () {
-        return _ptr;
-    }
-
-    operator Cubit_cvPtr () const { return _ptr;}
-    operator Cubit_vPtr& () { return _ptr;}
-
-    protected:
-    Cubit *_ptr;
-    private:
-    Cubit_var &operator= (const CORBA::_var &IT_s);
-    Cubit_var (const CORBA::_var &IT_s);
-    Cubit_var &operator= (const CORBA::_mgr &IT_s);
-    Cubit_var &operator= (const CORBA::_SeqElem &IT_s);
-    Cubit_var (const CORBA::_mgr &IT_s);
-    Cubit_var (const CORBA::_SeqElem &IT_s);
-};
-
-#endif
-
-
-#ifndef CubitMgrH
-#define CubitMgrH
-
-class Cubit_mgr : public CORBA::_mgr
-{
-    public:
-
-    Cubit_mgr () {
-        _ptr = Cubit_nil ();
-        _release = 1;
-    }
-
-    Cubit_mgr (const Cubit_mgr &IT_s) {
-        _ptr = Cubit_duplicate (IT_s._ptr);
-        _release = 1;
-    }
-
-    Cubit_mgr &operator= (Cubit *IT_p) {
-        if (_ptr && _release)
-            Cubit_release (_ptr);
-        _ptr = IT_p;
-        _release = 1;
-        return (*this);
-    }
-
-    Cubit_mgr &operator= (const Cubit_mgr &IT_s) {
-        if (_ptr && _release)
-            Cubit_release (_ptr);
-        _ptr = Cubit_duplicate(IT_s._ptr);
-        _release = 1;
-        return (*this);
-    }
-
-    Cubit_mgr &operator= (Cubit_var &IT_s) {
-        if (_ptr && _release)
-            Cubit_release (_ptr);
-        _ptr = Cubit_duplicate(IT_s);
-        _release = 1;
-        return (*this);
-    }
-
-    ~Cubit_mgr () {
-        if (_release)
-            Cubit_release (_ptr);
-    }
-
-    unsigned char release () {
-        return _release;
-    }
-
-    void release (unsigned char rel) {
-        _release = rel;
-    }
-
-    operator int () const {
-        return (((CORBA::Object_ptr) _ptr) ? 1 : 0);
-    }
-
-    operator void* () const {
-        return _ptr;
-    }
-
-    operator CORBA::Object * () const {
-        return (CORBA::Object *) _ptr;
-    }
-
-    operator Cubit* () const {
-        return (Cubit*) _ptr;
-    }
-
-    Cubit_ptr operator-> () const {
-        return _ptr;
-    }
-
-    Cubit *_ptr;
-
-    protected:
-
-    unsigned char _release;
-};
-
-typedef Cubit_mgr Cubit_mgr_IT_const;
-#endif
-
-#ifndef CubitSeqElemH
-#define CubitSeqElemH
-
-class Cubit_SeqElem : public CORBA::_SeqElem
-{
-    public:
-
-    Cubit_SeqElem (Cubit_ptr* IT_p, unsigned char rel) {
-        _ptr = IT_p;
-        _release = rel;
-    }
-
-    Cubit_SeqElem &operator= (Cubit_ptr IT_p) {
-        if (_ptr) {
-            if (*(_ptr) && _release)
-                Cubit_release (*(_ptr));
-            *(_ptr) = IT_p;
-        }
-        return (*this);
-    }
-
-    Cubit_SeqElem &operator= (const Cubit_SeqElem &IT_s) {
-        if (_ptr && IT_s._ptr) {
-            if (*(_ptr) && _release)
-                Cubit_release (*(_ptr));
-            *(_ptr) = Cubit_duplicate(*(IT_s._ptr));
-        }
-        return (*this);
-    }
-
-    operator Cubit_ptr () const {
-        return _ptr ? (Cubit_ptr) (*_ptr) : Cubit_nil(); 
-    }
-
-    Cubit_ptr operator->() const { return *_ptr;}
-
-    protected:
-    Cubit_ptr *_ptr;
-    unsigned char _release;
-};
-
-#endif
-
-
-#define TIE_Cubit(X) Cubit##X
-
-#define DEF_TIE_Cubit(X) \
-	class Cubit##X : public virtual Cubit {		\
-	  X* m_obj;						\
-	public:							\
-								\
-								\
-	   Cubit##X  (X *objp, const char* m="", CORBA::LoaderClass *l=0)\
-		: Cubit(), m_obj(objp) {	\
-		m_pptr = new Cubit_dispatch		\
-			(( Cubit*)this,(CORBA::Object*)this,m,l,Cubit_IR,m_obj);	\
-	   }								\
-	   Cubit##X  (CORBA::Object *IT_p, const char* IT_m="", void *IT_q=0)\
-		: Cubit() {	\
-		m_pptr = new Cubit_dispatch		\
-			(( Cubit*)this,(CORBA::Object*)this,IT_m,Cubit_IR,IT_p,IT_q);	\
-		m_obj = (X*)(m_pptr->getImplObj ());			\
-	   }								\
-								\
-	   virtual ~Cubit##X  () {				\
-		if (_okToDeleteImpl ()) delete m_obj; }					\
-	   virtual void* _deref () {					\
-		return m_obj; }					\
-								\
-virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_octet (  o,IT_env);\
-}\
-	\
-virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_short (  s,IT_env);\
-}\
-	\
-virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_long (  l,IT_env);\
-}\
-	\
-virtual Cubit::Many cube_struct (const Cubit::Many& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_struct (  values,IT_env);\
-}\
-	\
-virtual Cubit::oneof cube_union (const Cubit::oneof& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_union (  values,IT_env);\
-}\
-	\
-virtual void please_exit (CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-m_obj->please_exit (IT_env);\
-}\
-								\
-	};						\
-
-
-#define QUALS_Cubit	\
-virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_octet (  o,IT_env);\
-}\
-	\
-virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_short (  s,IT_env);\
-}\
-	\
-virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_long (  l,IT_env);\
-}\
-	\
-virtual Many cube_struct (const Many& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_struct (  values,IT_env);\
-}\
-	\
-virtual oneof cube_union (const oneof& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_union (  values,IT_env);\
-}\
-	\
-virtual void please_exit (CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-m_obj->please_exit (IT_env);\
-}\
-
-
-
-
-class CubitProxyFactoryClass : public virtual CORBA::ObjectFactoryClass {
-public:
-   CubitProxyFactoryClass (unsigned char IT_p=0)
-		: CORBA::ProxyFactory (Cubit_IR, IT_p) {}
-
-    virtual void* New (char *IT_OR, CORBA::Environment&);
-
-    virtual void* New (ObjectReference *IT_OR, CORBA::Environment&);
-
-    virtual void* New2 (); 
-
-    virtual CORBA::Object* NewObject (char *IT_OR, CORBA::Environment&);
-
-    virtual CORBA::Object* NewObject (ObjectReference *IT_OR, CORBA::Environment&);
-
-    virtual CORBA::Object* New2Object (); 
-
-    virtual void* IT_castUp (void *IT_p, char* IT_s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-
-    virtual CORBA::PPTR* pptr (void *IT_p);
-
-    virtual void baseInterfaces (_IDL_SEQUENCE_string&);
-
-
-};
-
-extern CubitProxyFactoryClass CubitProxyFactory;
-
-class CubitBOAImpl : public virtual Cubit  {
-public:
-    CubitBOAImpl (const char *m="", CORBA::LoaderClass *l=NULL) {
-  if (CORBA::PPTR::isOK (m_pptr, Cubit_IR))
-    m_pptr = new Cubit_dispatch ( (Cubit*)this,
-   	 (CORBA::Object*)this, m, l, Cubit_IR, this);
-}
-
-        virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual Many cube_struct (const Many& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual oneof cube_union (const oneof& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual void please_exit (CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-};
-
-
-#endif
-
-
-#ifndef _Cubit_Factory_defined
-#define _Cubit_Factory_defined
-class Cubit_Factory_dispatch : public virtual CORBA::PPTR {
-public:
-
-      Cubit_Factory_dispatch (void *IT_p, CORBA::Object* IT_o, const char *IT_m, 
-        CORBA::LoaderClass *IT_l, char *IT_i, void* IT_im)
-       : PPTR (IT_p,IT_o,IT_m,IT_l,IT_i,IT_im) {}
-
-
-   Cubit_Factory_dispatch (char *IT_OR, void *IT_p, CORBA::Object *IT_o)
-       : PPTR (IT_OR,IT_p,IT_o) {}
-
-
-   Cubit_Factory_dispatch () {}
-
-   Cubit_Factory_dispatch (ObjectReference *IT_OR, void *IT_p, CORBA::Object *IT_o)
-       : PPTR (IT_OR,IT_p,IT_o) {}
-
-
-   Cubit_Factory_dispatch (void *IT_p, CORBA::Object *IT_o, const char *IT_m, 
-        char *IT_i, CORBA::Object* IT_ob, void* IT_im)
-       : PPTR (IT_p,IT_o,IT_m,IT_i,IT_ob,IT_im) {}
-
-
-   virtual unsigned char dispatch (CORBA::Request &IT_r, 
-        unsigned char IT_isTarget, void* IT_pp=NULL);
-
-
-};
-
-class Cubit_Factory;
-
-#ifndef Cubit_FactoryPtr
-#define Cubit_FactoryPtr
-
-typedef Cubit_Factory* Cubit_Factory_ptr;
-
-typedef Cubit_Factory* Cubit_FactoryRef;
-
-#endif
-
-
-#ifndef Cubit_FactoryForwH
-#define Cubit_FactoryForwH
-CORBA::ObjectRef Cubit_Factory_getBase (void *);
-void Cubit_Factory_release (Cubit_Factory *, CORBA::Environment &IT_env);
-void Cubit_Factory_release (Cubit_Factory_ptr);
-Cubit_Factory* Cubit_Factory_duplicate (Cubit_Factory_ptr, CORBA::Environment &IT_env);
-Cubit_Factory* Cubit_Factory_duplicate (Cubit_Factory_ptr );
-Cubit_Factory_ptr Cubit_Factory_nil (CORBA::Environment &IT_env);
-Cubit_Factory_ptr Cubit_Factory_nil ();
-#endif
-#define Cubit_Factory_IMPL "Cubit_Factory"
-
-
-class Cubit_Factory;
-
-typedef Cubit_Factory Cubit_FactoryProxy;
-#define Cubit_Factory_IR "Cubit_Factory"
-#define Cubit_Factory_IMPL "Cubit_Factory"
-
-#ifndef Cubit_FactoryPtr
-#define Cubit_FactoryPtr
-
-typedef Cubit_Factory* Cubit_Factory_ptr;
-
-typedef Cubit_Factory* Cubit_FactoryRef;
-
-#endif
-
-class Cubit_Factory: public virtual CORBA::Object  {
-public:
-        Cubit_Factory (char *IT_OR);
-    Cubit_Factory (ObjectReference *IT_OR);
-    Cubit_Factory () : CORBA::Object  (1) {}
-protected:
-    Cubit_Factory_ptr __duplicate(
-            CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) {
-       CORBA::Object::__duplicate (IT_env);
-       return this;
-    }
-public:
-    static Cubit_Factory_ptr _duplicate(
-            Cubit_Factory_ptr, 
-            CORBA::Environment &IT_pEnv=CORBA::IT_chooseDefaultEnv ());
-public:
-   static Cubit_Factory* _bind (const char* IT_markerServer, const char* host,
-		const CORBA::Context &IT_c, 
-		CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-   static Cubit_Factory* _bind (CORBA::Environment &IT_env);
-   static Cubit_Factory* _bind (const char* IT_markerServer=NULL, const char* host=NULL,
-                 CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-    static Cubit_Factory* _narrow (CORBA::Object* , CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-    static Cubit_Factory_ptr _nil (CORBA::Environment &IT_pEnv=CORBA::IT_chooseDefaultEnv ()) {
-        CORBA::EnvExcRaiser IT_raise;
-        CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-        return (Cubit_Factory_ptr) CORBA::OBJECT_NIL;}
-        virtual Cubit_ptr create_cubit (const char * name, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-};
-
-#ifndef Cubit_FactoryVarH
-#define Cubit_FactoryVarH
-
-#ifndef Cubit_FactoryvPtr
-#define Cubit_FactoryvPtr
-typedef Cubit_Factory* Cubit_Factory_vPtr;
-typedef const Cubit_Factory* Cubit_Factory_cvPtr;
-#endif
-
-class Cubit_Factory_var : public CORBA::_var
-{
-    private:
-
-    unsigned char copyHelper (const Cubit_Factory_var &IT_s) {
-        {
-            _ptr = Cubit_Factory_duplicate (IT_s._ptr);
-        }
-        return 1;
-    }
-
-    public:
-
-    Cubit_Factory_var (const Cubit_Factory_var &IT_s) {
-        (void) copyHelper (IT_s);
-    }
-
-    Cubit_Factory_var () {
-        _ptr = Cubit_Factory_nil ();
-    }
-
-    Cubit_Factory_var (Cubit_Factory *IT_p) {
-        _ptr = IT_p;
-    }
-
-    Cubit_Factory_var &operator= (Cubit_Factory *IT_p) {
-        Cubit_Factory_release (_ptr);
-        _ptr = IT_p;
-        return (*this);
-    }
-
-    Cubit_Factory_var &operator= (const Cubit_Factory_var &IT_s) {
-        Cubit_Factory_release (_ptr);
-        _ptr = Cubit_Factory_duplicate (IT_s._ptr);
-        return (*this);
-    }
-
-    ~Cubit_Factory_var () {
-        Cubit_Factory_release (_ptr);
-    }
-
-    Cubit_Factory* operator-> () {
-        return _ptr;
-    }
-
-    operator Cubit_Factory_cvPtr () const { return _ptr;}
-    operator Cubit_Factory_vPtr& () { return _ptr;}
-
-    protected:
-    Cubit_Factory *_ptr;
-    private:
-    Cubit_Factory_var &operator= (const CORBA::_var &IT_s);
-    Cubit_Factory_var (const CORBA::_var &IT_s);
-    Cubit_Factory_var &operator= (const CORBA::_mgr &IT_s);
-    Cubit_Factory_var &operator= (const CORBA::_SeqElem &IT_s);
-    Cubit_Factory_var (const CORBA::_mgr &IT_s);
-    Cubit_Factory_var (const CORBA::_SeqElem &IT_s);
-};
-
-#endif
-
-
-#ifndef Cubit_FactoryMgrH
-#define Cubit_FactoryMgrH
-
-class Cubit_Factory_mgr : public CORBA::_mgr
-{
-    public:
-
-    Cubit_Factory_mgr () {
-        _ptr = Cubit_Factory_nil ();
-        _release = 1;
-    }
-
-    Cubit_Factory_mgr (const Cubit_Factory_mgr &IT_s) {
-        _ptr = Cubit_Factory_duplicate (IT_s._ptr);
-        _release = 1;
-    }
-
-    Cubit_Factory_mgr &operator= (Cubit_Factory *IT_p) {
-        if (_ptr && _release)
-            Cubit_Factory_release (_ptr);
-        _ptr = IT_p;
-        _release = 1;
-        return (*this);
-    }
-
-    Cubit_Factory_mgr &operator= (const Cubit_Factory_mgr &IT_s) {
-        if (_ptr && _release)
-            Cubit_Factory_release (_ptr);
-        _ptr = Cubit_Factory_duplicate(IT_s._ptr);
-        _release = 1;
-        return (*this);
-    }
-
-    Cubit_Factory_mgr &operator= (Cubit_Factory_var &IT_s) {
-        if (_ptr && _release)
-            Cubit_Factory_release (_ptr);
-        _ptr = Cubit_Factory_duplicate(IT_s);
-        _release = 1;
-        return (*this);
-    }
-
-    ~Cubit_Factory_mgr () {
-        if (_release)
-            Cubit_Factory_release (_ptr);
-    }
-
-    unsigned char release () {
-        return _release;
-    }
-
-    void release (unsigned char rel) {
-        _release = rel;
-    }
-
-    operator int () const {
-        return (((CORBA::Object_ptr) _ptr) ? 1 : 0);
-    }
-
-    operator void* () const {
-        return _ptr;
-    }
-
-    operator CORBA::Object * () const {
-        return (CORBA::Object *) _ptr;
-    }
-
-    operator Cubit_Factory* () const {
-        return (Cubit_Factory*) _ptr;
-    }
-
-    Cubit_Factory_ptr operator-> () const {
-        return _ptr;
-    }
-
-    Cubit_Factory *_ptr;
-
-    protected:
-
-    unsigned char _release;
-};
-
-typedef Cubit_Factory_mgr Cubit_Factory_mgr_IT_const;
-#endif
-
-#ifndef Cubit_FactorySeqElemH
-#define Cubit_FactorySeqElemH
-
-class Cubit_Factory_SeqElem : public CORBA::_SeqElem
-{
-    public:
-
-    Cubit_Factory_SeqElem (Cubit_Factory_ptr* IT_p, unsigned char rel) {
-        _ptr = IT_p;
-        _release = rel;
-    }
-
-    Cubit_Factory_SeqElem &operator= (Cubit_Factory_ptr IT_p) {
-        if (_ptr) {
-            if (*(_ptr) && _release)
-                Cubit_Factory_release (*(_ptr));
-            *(_ptr) = IT_p;
-        }
-        return (*this);
-    }
-
-    Cubit_Factory_SeqElem &operator= (const Cubit_Factory_SeqElem &IT_s) {
-        if (_ptr && IT_s._ptr) {
-            if (*(_ptr) && _release)
-                Cubit_Factory_release (*(_ptr));
-            *(_ptr) = Cubit_Factory_duplicate(*(IT_s._ptr));
-        }
-        return (*this);
-    }
-
-    operator Cubit_Factory_ptr () const {
-        return _ptr ? (Cubit_Factory_ptr) (*_ptr) : Cubit_Factory_nil(); 
-    }
-
-    Cubit_Factory_ptr operator->() const { return *_ptr;}
-
-    protected:
-    Cubit_Factory_ptr *_ptr;
-    unsigned char _release;
-};
-
-#endif
-
-
-#define TIE_Cubit_Factory(X) Cubit_Factory##X
-
-#define DEF_TIE_Cubit_Factory(X) \
-	class Cubit_Factory##X : public virtual Cubit_Factory {		\
-	  X* m_obj;						\
-	public:							\
-								\
-								\
-	   Cubit_Factory##X  (X *objp, const char* m="", CORBA::LoaderClass *l=0)\
-		: Cubit_Factory(), m_obj(objp) {	\
-		m_pptr = new Cubit_Factory_dispatch		\
-			(( Cubit_Factory*)this,(CORBA::Object*)this,m,l,Cubit_Factory_IR,m_obj);	\
-	   }								\
-	   Cubit_Factory##X  (CORBA::Object *IT_p, const char* IT_m="", void *IT_q=0)\
-		: Cubit_Factory() {	\
-		m_pptr = new Cubit_Factory_dispatch		\
-			(( Cubit_Factory*)this,(CORBA::Object*)this,IT_m,Cubit_Factory_IR,IT_p,IT_q);	\
-		m_obj = (X*)(m_pptr->getImplObj ());			\
-	   }								\
-								\
-	   virtual ~Cubit_Factory##X  () {				\
-		if (_okToDeleteImpl ()) delete m_obj; }					\
-	   virtual void* _deref () {					\
-		return m_obj; }					\
-								\
-virtual Cubit_ptr create_cubit (const char * name, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->create_cubit (  name,IT_env);\
-}\
-								\
-	};						\
-
-
-#define QUALS_Cubit_Factory	\
-virtual Cubit_ptr create_cubit (const char * name, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->create_cubit (  name,IT_env);\
-}\
-
-
-
-
-class Cubit_FactoryProxyFactoryClass : public virtual CORBA::ObjectFactoryClass {
-public:
-   Cubit_FactoryProxyFactoryClass (unsigned char IT_p=0)
-		: CORBA::ProxyFactory (Cubit_Factory_IR, IT_p) {}
-
-    virtual void* New (char *IT_OR, CORBA::Environment&);
-
-    virtual void* New (ObjectReference *IT_OR, CORBA::Environment&);
-
-    virtual void* New2 (); 
-
-    virtual CORBA::Object* NewObject (char *IT_OR, CORBA::Environment&);
-
-    virtual CORBA::Object* NewObject (ObjectReference *IT_OR, CORBA::Environment&);
-
-    virtual CORBA::Object* New2Object (); 
-
-    virtual void* IT_castUp (void *IT_p, char* IT_s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-
-    virtual CORBA::PPTR* pptr (void *IT_p);
-
-    virtual void baseInterfaces (_IDL_SEQUENCE_string&);
-
-
-};
-
-extern Cubit_FactoryProxyFactoryClass Cubit_FactoryProxyFactory;
-
-class Cubit_FactoryBOAImpl : public virtual Cubit_Factory  {
-public:
-    Cubit_FactoryBOAImpl (const char *m="", CORBA::LoaderClass *l=NULL) {
-  if (CORBA::PPTR::isOK (m_pptr, Cubit_Factory_IR))
-    m_pptr = new Cubit_Factory_dispatch ( (Cubit_Factory*)this,
-   	 (CORBA::Object*)this, m, l, Cubit_Factory_IR, this);
-}
-
-        virtual Cubit_ptr create_cubit (const char * name, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-};
-
-
-#endif
-
-
-#endif
diff --git a/TAO/IIOP/test/Orbix/tps/cubit.idl b/TAO/IIOP/test/Orbix/tps/cubit.idl
deleted file mode 100644
index 7dba408d0db..00000000000
--- a/TAO/IIOP/test/Orbix/tps/cubit.idl
+++ /dev/null
@@ -1,46 +0,0 @@
-// @(#)cubit.idl	1.1 95/09/10
-// Copyright 1994-1995 by Sun Microsystems, Inc.
-
-#pragma prefix	"Eng.SUN.COM"
-#pragma version Cubit 1.1
-
-  interface Cubit {
-    octet	cube_octet (in octet o);
-    short	cube_short (in short s);
-    long	cube_long (in long l);
-    
-    struct Many {
-      octet	o;		// + 3 bytes padding (normally) ...
-      long	l;
-      short	s;		// + 2 bytes padding (normally) ...
-    };
-    
-    Many	cube_struct (in Many values);
-    
-    enum discrim {e_0th, e_1st, e_2nd, e_3rd, e_4th, e_5th};
-    
-    union oneof
-      switch (discrim) {
-	// this is an easy union to interpret; no padding
-	// is needed between discriminant and value.
-      case e_0th:
-        octet		o;
-      case e_1st:
-        short		s;
-      case e_2nd:
-        long		l;
-      case e_3rd:
-      default:
-        Many		cm;
-      };
-    
-    oneof	cube_union (in oneof values);
-    
-    oneway void	please_exit ();
-  };
-
-
-  interface Cubit_Factory {
-    Cubit create_cubit (in string name);
-  };
-
diff --git a/TAO/IIOP/test/Orbix/tps/cubitC.cpp b/TAO/IIOP/test/Orbix/tps/cubitC.cpp
deleted file mode 100644
index c439fc4c800..00000000000
--- a/TAO/IIOP/test/Orbix/tps/cubitC.cpp
+++ /dev/null
@@ -1,710 +0,0 @@
-
-
-#include "cubit.h"
-
-Cubit::Cubit (char *IT_OR) {
-      m_pptr = new Cubit_dispatch (IT_OR, this,(CORBA::Object*)this);
-} 
-Cubit::Cubit (ObjectReference *IT_OR) {
-      m_pptr = new Cubit_dispatch (IT_OR, this,(CORBA::Object*)this);
-} 
-
-#ifndef CubitForwC
-#define CubitForwC
-CORBA::ObjectRef Cubit_getBase(void *IT_p){
-    return (Cubit*) IT_p;}
-
-void Cubit_release (Cubit_ptr IT_p, CORBA::Environment &IT_env) {
-    CORBA::release(IT_p, IT_env);}
-
-void Cubit_release (Cubit_ptr IT_p) {
-    Cubit_release (IT_p, CORBA::IT_chooseDefaultEnv ()); }
-
-Cubit_ptr Cubit_nil (CORBA::Environment &) {
-    return Cubit:: _nil ();}
-
-Cubit_ptr Cubit_nil () {
-    return Cubit_nil (CORBA::IT_chooseDefaultEnv ());}
-
-Cubit_ptr Cubit_duplicate (Cubit_ptr IT_p, CORBA::Environment &IT_env) {
-    return (Cubit::_duplicate(IT_p, IT_env)); }
-Cubit_ptr Cubit_duplicate (Cubit_ptr IT_p) {
-    return Cubit_duplicate (IT_p, CORBA::IT_chooseDefaultEnv ()); }
-#endif
-
-Cubit_ptr Cubit::_duplicate(Cubit_ptr obj, CORBA::Environment& IT_pEnv) {
-        CORBA::EnvExcRaiser IT_raise;
-        CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-       if (!obj) {
-          return (obj);
-       }
-       Cubit_ptr IT_obj = obj->__duplicate (IT_env);
-       return IT_obj;
-}
-
-
-
-Cubit* Cubit:: _bind (const char* IT_markerServer, const char* host,
-		const CORBA::Context &IT_c, 
-		CORBA::Environment &IT_env) {
-       return (Cubit*)CORBA::Factory.New (IT_markerServer, IT_env, IT_c, host, 
-		Cubit_IMPL, Cubit_IR);
-}
-
-
-
-Cubit* Cubit:: _bind (CORBA::Environment &IT_env) {
-       return _bind (NULL,NULL,CORBA::Context(), IT_env); }
-
-
-Cubit* Cubit:: _bind (const char* IT_markerServer, const char* host,
-                CORBA::Environment &IT_env) {
-       return _bind (IT_markerServer, host, CORBA::Context (), IT_env); }
-Cubit* Cubit::_narrow (CORBA::Object* IT_obj, CORBA::Environment &IT_pEnv) {
-        CORBA::EnvExcRaiser IT_raise;
-        CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-        if (CORBA::is_nil (IT_obj)) {
-                return Cubit:: _nil();
-        }
-
-       Cubit* IT_p = (Cubit*)CORBA::Object::_castDown (IT_obj, Cubit_IR, IT_env);
-        IT_p = IT_p ? IT_p->__duplicate(IT_env) : NULL;
-        if ((IT_env) &&(!strcmp(IT_env.exception()->id(), "CORBA::StExcep::BAD_PARAM")) && (((CORBA::BAD_PARAM*)IT_env.exception())-> minor() == NARROW_FAILED)) {
-                IT_env.exception_free();
-        }
-        return IT_p;
-   }
-
-
-#ifndef Cubit_Many_Ops
-#define Cubit_Many_Ops
-
-void Cubit::Many:: encodeOp (CORBA::Request &IT_r) const {
-
-    IT_r.insertOctet (o);
-
-    IT_r << l;
-
-    IT_r << s;
-}
-
-void Cubit::Many:: decodeOp (CORBA::Request &IT_r) {
-
-    IT_r.extractOctet (o);
-
-    IT_r >> l;
-
-    IT_r >> s;
-}
-
-void Cubit::Many:: decodeInOutOp (CORBA::Request &IT_r) {
-
-    IT_r.extractOctet (o);
-
-    IT_r >> l;
-
-    IT_r >> s;
-}
-
-Cubit::Many ::~Many () {
-}
-
-Cubit::Many:: Many (const Cubit::Many &IT_s) 
-	 {
-    o = IT_s.o;
-    l = IT_s.l;
-    s = IT_s.s;
-}
-
-Cubit::Many:: Many () {
-}
-
-Cubit::Many &Cubit::Many:: operator= (const Cubit::Many& IT_s) {
-    if (this == &IT_s) return *this;
-    o = IT_s.o;
-    l = IT_s.l;
-    s = IT_s.s;
-    return *this;
-}
-
-
-#endif
-
-
-#ifndef Cubit_oneof_Ops
-#define Cubit_oneof_Ops
-void Cubit::oneof:: encodeOp (CORBA::Request &IT_r) const {
-    if (!isSet) return;
-    {
-    CORBA::ULong IT_0 = (CORBA::ULong) __d;
-    IT_r << IT_0;
-    }
-    switch (__d) {
-        case Cubit::e_0th: 
-        IT_r.insertOctet (_o_);
-        break;
-        case Cubit::e_1st: 
-        IT_r << _s_;
-        break;
-        case Cubit::e_2nd: 
-        IT_r << _l_;
-        break;
-        case Cubit::e_3rd: 
-        default: 
-        (*_cm_).encodeOp (IT_r);
-        break;
-    }
-
-}
-
-void Cubit::oneof:: decodeOp (CORBA::Request &IT_r) {
-    isSet = 0;
-    {
-    CORBA::ULong IT_1;
-    IT_r >> IT_1;
-    __d = Cubit::discrim(IT_1);
-    }
-    switch (__d) {
-        case Cubit::e_0th: 
-        if (!isSet) {
-            isSet = 1;
-        }
-        IT_r.extractOctet (_o_);
-        break;
-        case Cubit::e_1st: 
-        if (!isSet) {
-            isSet = 1;
-        }
-        IT_r >> _s_;
-        break;
-        case Cubit::e_2nd: 
-        if (!isSet) {
-            isSet = 1;
-        }
-        IT_r >> _l_;
-        break;
-        case Cubit::e_3rd: 
-        default: 
-        if (!isSet) {
-            _cm_ = new Cubit::Many;
-            isSet = 1;
-        }
-        (*_cm_).decodeOp (IT_r);
-        break;
-    }
-
-}
-void Cubit::oneof:: decodeInOutOp (CORBA::Request &IT_r) {
-    Cubit::discrim IT_d;
-    {
-    CORBA::ULong IT_2;
-    IT_r >> IT_2;
-    IT_d = Cubit::discrim(IT_2);
-    }
-    if (IT_d == __d)
-        switch (__d) {
-            case Cubit::e_0th: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r.extractOctet (_o_);
-            break;
-            case Cubit::e_1st: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r >> _s_;
-            break;
-            case Cubit::e_2nd: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r >> _l_;
-            break;
-            case Cubit::e_3rd: 
-            default: 
-            if (!isSet) {
-                _cm_ = new Cubit::Many;
-                isSet = 1;
-            }
-            (*_cm_).decodeInOutOp (IT_r);
-            break;
-        }
-
-    else {
-        this->oneof:: ~oneof();
-        memset(this, 0, sizeof(*this));
-        __d = IT_d;
-        switch (__d) {
-            case Cubit::e_0th: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r.extractOctet (_o_);
-            break;
-            case Cubit::e_1st: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r >> _s_;
-            break;
-            case Cubit::e_2nd: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r >> _l_;
-            break;
-            case Cubit::e_3rd: 
-            default: 
-            if (!isSet) {
-                _cm_ = new Cubit::Many;
-                isSet = 1;
-            }
-            (*_cm_).decodeOp (IT_r);
-            break;
-        }
-        isSet = 1;
-    }
-
-}
-
-Cubit::oneof:: oneof() { 
-    memset(this, 0, sizeof(*this));
-    isSet = 0;
-}
-
-Cubit::oneof ::~oneof() {
-    if (!isSet) return;
-    switch (__d) { 
-        case Cubit::e_0th:         break;
-        case Cubit::e_1st:         break;
-        case Cubit::e_2nd:         break;
-        case Cubit::e_3rd: 
-        default:         if (_cm_) delete _cm_;
-        break;
-    }
-
-    isSet = 0;
-}
-
-Cubit::oneof:: oneof (const Cubit::oneof &IT_s) {
-    isSet = 0;
-    memset(this, 0, sizeof(*this));
-    __d = IT_s.__d;
-    switch (__d) {
-        case Cubit::e_0th:         isSet = 1;
-        _o_ = IT_s._o_;
-        break;
-        case Cubit::e_1st:         isSet = 1;
-        _s_ = IT_s._s_;
-        break;
-        case Cubit::e_2nd:         isSet = 1;
-        _l_ = IT_s._l_;
-        break;
-        case Cubit::e_3rd: 
-        default: 
-        if (!isSet) {
-            _cm_ = new Cubit::Many;
-            isSet = 1;
-        }
-        *(_cm_) = *(IT_s._cm_);
-        break;
-    }
-    isSet = 1;
-}
-
-Cubit::oneof& Cubit::oneof:: operator= (const Cubit::oneof & IT_s) {
-    if (this == &IT_s) return *this;
-    if (isSet && (__d != IT_s.__d))
-    {
-        this-> oneof::~oneof();
-        memset(this, 0, sizeof(*this));
-    }
-
-    __d = IT_s.__d;
-    switch (__d) {
-        case Cubit::e_0th:         isSet = 1;
-        _o_ = IT_s._o_;
-        break;
-        case Cubit::e_1st:         isSet = 1;
-        _s_ = IT_s._s_;
-        break;
-        case Cubit::e_2nd:         isSet = 1;
-        _l_ = IT_s._l_;
-        break;
-        case Cubit::e_3rd: 
-        default: 
-        if (!isSet) {
-            _cm_ = new Cubit::Many;
-            isSet = 1;
-        }
-        *(_cm_) = *(IT_s._cm_);
-        break;
-    }
-    isSet = 1;
-    return *this;
-}
-
-
-#endif
-
-void* CubitProxyFactoryClass::New (char *IT_OR, CORBA::Environment&) {
-        return  new class Cubit(IT_OR);}
-
-void* CubitProxyFactoryClass::New (ObjectReference *IT_OR, CORBA::Environment&) {
-        return  new class Cubit(IT_OR);}
-
-void* CubitProxyFactoryClass::New2 () {
-        return  new class Cubit((char*)0);}
-
-CORBA::Object* CubitProxyFactoryClass::NewObject (char *IT_OR, CORBA::Environment&) {
-        return  new class Cubit(IT_OR);}
-
-CORBA::Object* CubitProxyFactoryClass::NewObject (ObjectReference *IT_OR, CORBA::Environment&) {
-        return  new class Cubit(IT_OR);}
-
-CORBA::Object* CubitProxyFactoryClass::New2Object () {
-        return  new class Cubit((char*)0);}
-
-void* CubitProxyFactoryClass::IT_castUp (void *IT_p, char* IT_s, CORBA::Environment &IT_env) {
-      void *IT_l;
-      if (!CORBA::_interfaceCmp (IT_s,Cubit_IR, IT_env))
-         return IT_p;
-      else if (IT_l=CORBA::ObjectFactoryClass::IT_castUp((CORBA::Object*)((class Cubit*)IT_p),IT_s, IT_env))
-         return IT_l;
-      else return NULL;
-    }
-
-
-CORBA::PPTR* CubitProxyFactoryClass::pptr (void *IT_p) {
-       return ((class Cubit*)IT_p)->_pptr ();}
-
-void CubitProxyFactoryClass::baseInterfaces (_IDL_SEQUENCE_string& seq) {
-      add (seq, Cubit_IR);
-      CORBA::ObjectFactoryClass::baseInterfaces (seq);
-}
-
-CubitProxyFactoryClass CubitProxyFactory(1);
-
-CORBA::Octet Cubit:: cube_octet (CORBA::Octet o, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        return 0;
-    }
-    CORBA::Request IT_r (this, "cube_octet",IT_env,1,0);
-    if (!IT_r.isException (IT_env)) {
-
-        IT_r.insertOctet (o);
-    }
-
-    IT_r.invoke (CORBA::Flags(0),IT_env);
-    if (!IT_r.isException (IT_env)) {
-        CORBA::Octet IT_result;
-        IT_r.extractOctet (IT_result);
-        IT_r.checkEnv (IT_env);
-        return IT_result;
-    }
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-    return 0;
-}
-
-CORBA::Short Cubit:: cube_short (CORBA::Short s, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        return 0;
-    }
-    CORBA::Request IT_r (this, "cube_short",IT_env,1,0);
-    if (!IT_r.isException (IT_env)) {
-
-        IT_r << s;
-    }
-
-    IT_r.invoke (CORBA::Flags(0),IT_env);
-    if (!IT_r.isException (IT_env)) {
-        CORBA::Short IT_result;
-        IT_r >> IT_result;
-        IT_r.checkEnv (IT_env);
-        return IT_result;
-    }
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-    return 0;
-}
-
-CORBA::Long Cubit:: cube_long (CORBA::Long l, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        return 0;
-    }
-    CORBA::Request IT_r (this, "cube_long",IT_env,1,0);
-    if (!IT_r.isException (IT_env)) {
-
-        IT_r << l;
-    }
-
-    IT_r.invoke (CORBA::Flags(0),IT_env);
-    if (!IT_r.isException (IT_env)) {
-        CORBA::Long IT_result;
-        IT_r >> IT_result;
-        IT_r.checkEnv (IT_env);
-        return IT_result;
-    }
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-    return 0;
-}
-
-Cubit::Many Cubit:: cube_struct (const Cubit::Many& values, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        { 
-            Cubit::Many IT_l0;
-            return IT_l0;
-        }
-    }
-    CORBA::Request IT_r (this, "cube_struct",IT_env,1,0);
-    if (!IT_r.isException (IT_env)) {
-
-        values.encodeOp (IT_r);
-    }
-
-    IT_r.invoke (CORBA::Flags(0),IT_env);
-    if (!IT_r.isException (IT_env)) {
-        Cubit::Many IT_result;
-        IT_result.decodeOp (IT_r);
-        IT_r.checkEnv (IT_env);
-        return IT_result;
-    }
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-    { 
-        Cubit::Many IT_l1;
-        return IT_l1;
-    }
-}
-
-Cubit::oneof Cubit:: cube_union (const Cubit::oneof& values, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        { 
-            Cubit::oneof IT_l0;
-            return IT_l0;
-        }
-    }
-    CORBA::Request IT_r (this, "cube_union",IT_env,1,0);
-    if (!IT_r.isException (IT_env)) {
-
-        values.encodeOp (IT_r);
-    }
-
-    IT_r.invoke (CORBA::Flags(0),IT_env);
-    if (!IT_r.isException (IT_env)) {
-        Cubit::oneof IT_result;
-        IT_result.decodeOp (IT_r);
-        IT_r.checkEnv (IT_env);
-        return IT_result;
-    }
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-    { 
-        Cubit::oneof IT_l1;
-        return IT_l1;
-    }
-}
-
-void Cubit:: please_exit (CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        return ;
-    }
-    CORBA::Request IT_r (this, "please_exit",IT_env,1,1);
-
-    IT_r.invoke (CORBA::Flags(CORBA::INV_NO_RESPONSE), IT_env);
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-}
-
-
-
-
-
-#ifndef Cubit_dispatch_impl
-
-unsigned char Cubit_dispatch::dispatch (CORBA::Request &IT_r, 
-    unsigned char, void *) {
-      IT_r.makeRuntimeException1 ("Cubit");
-      return 0;
-}
- 
-#endif
-
-Cubit_Factory::Cubit_Factory (char *IT_OR) {
-      m_pptr = new Cubit_Factory_dispatch (IT_OR, this,(CORBA::Object*)this);
-} 
-Cubit_Factory::Cubit_Factory (ObjectReference *IT_OR) {
-      m_pptr = new Cubit_Factory_dispatch (IT_OR, this,(CORBA::Object*)this);
-} 
-
-#ifndef Cubit_FactoryForwC
-#define Cubit_FactoryForwC
-CORBA::ObjectRef Cubit_Factory_getBase(void *IT_p){
-    return (Cubit_Factory*) IT_p;}
-
-void Cubit_Factory_release (Cubit_Factory_ptr IT_p, CORBA::Environment &IT_env) {
-    CORBA::release(IT_p, IT_env);}
-
-void Cubit_Factory_release (Cubit_Factory_ptr IT_p) {
-    Cubit_Factory_release (IT_p, CORBA::IT_chooseDefaultEnv ()); }
-
-Cubit_Factory_ptr Cubit_Factory_nil (CORBA::Environment &) {
-    return Cubit_Factory:: _nil ();}
-
-Cubit_Factory_ptr Cubit_Factory_nil () {
-    return Cubit_Factory_nil (CORBA::IT_chooseDefaultEnv ());}
-
-Cubit_Factory_ptr Cubit_Factory_duplicate (Cubit_Factory_ptr IT_p, CORBA::Environment &IT_env) {
-    return (Cubit_Factory::_duplicate(IT_p, IT_env)); }
-Cubit_Factory_ptr Cubit_Factory_duplicate (Cubit_Factory_ptr IT_p) {
-    return Cubit_Factory_duplicate (IT_p, CORBA::IT_chooseDefaultEnv ()); }
-#endif
-
-Cubit_Factory_ptr Cubit_Factory::_duplicate(Cubit_Factory_ptr obj, CORBA::Environment& IT_pEnv) {
-        CORBA::EnvExcRaiser IT_raise;
-        CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-       if (!obj) {
-          return (obj);
-       }
-       Cubit_Factory_ptr IT_obj = obj->__duplicate (IT_env);
-       return IT_obj;
-}
-
-
-
-Cubit_Factory* Cubit_Factory:: _bind (const char* IT_markerServer, const char* host,
-		const CORBA::Context &IT_c, 
-		CORBA::Environment &IT_env) {
-       return (Cubit_Factory*)CORBA::Factory.New (IT_markerServer, IT_env, IT_c, host, 
-		Cubit_Factory_IMPL, Cubit_Factory_IR);
-}
-
-
-
-Cubit_Factory* Cubit_Factory:: _bind (CORBA::Environment &IT_env) {
-       return _bind (NULL,NULL,CORBA::Context(), IT_env); }
-
-
-Cubit_Factory* Cubit_Factory:: _bind (const char* IT_markerServer, const char* host,
-                CORBA::Environment &IT_env) {
-       return _bind (IT_markerServer, host, CORBA::Context (), IT_env); }
-Cubit_Factory* Cubit_Factory::_narrow (CORBA::Object* IT_obj, CORBA::Environment &IT_pEnv) {
-        CORBA::EnvExcRaiser IT_raise;
-        CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-        if (CORBA::is_nil (IT_obj)) {
-                return Cubit_Factory:: _nil();
-        }
-
-       Cubit_Factory* IT_p = (Cubit_Factory*)CORBA::Object::_castDown (IT_obj, Cubit_Factory_IR, IT_env);
-        IT_p = IT_p ? IT_p->__duplicate(IT_env) : NULL;
-        if ((IT_env) &&(!strcmp(IT_env.exception()->id(), "CORBA::StExcep::BAD_PARAM")) && (((CORBA::BAD_PARAM*)IT_env.exception())-> minor() == NARROW_FAILED)) {
-                IT_env.exception_free();
-        }
-        return IT_p;
-   }
-
-void* Cubit_FactoryProxyFactoryClass::New (char *IT_OR, CORBA::Environment&) {
-        return  new class Cubit_Factory(IT_OR);}
-
-void* Cubit_FactoryProxyFactoryClass::New (ObjectReference *IT_OR, CORBA::Environment&) {
-        return  new class Cubit_Factory(IT_OR);}
-
-void* Cubit_FactoryProxyFactoryClass::New2 () {
-        return  new class Cubit_Factory((char*)0);}
-
-CORBA::Object* Cubit_FactoryProxyFactoryClass::NewObject (char *IT_OR, CORBA::Environment&) {
-        return  new class Cubit_Factory(IT_OR);}
-
-CORBA::Object* Cubit_FactoryProxyFactoryClass::NewObject (ObjectReference *IT_OR, CORBA::Environment&) {
-        return  new class Cubit_Factory(IT_OR);}
-
-CORBA::Object* Cubit_FactoryProxyFactoryClass::New2Object () {
-        return  new class Cubit_Factory((char*)0);}
-
-void* Cubit_FactoryProxyFactoryClass::IT_castUp (void *IT_p, char* IT_s, CORBA::Environment &IT_env) {
-      void *IT_l;
-      if (!CORBA::_interfaceCmp (IT_s,Cubit_Factory_IR, IT_env))
-         return IT_p;
-      else if (IT_l=CORBA::ObjectFactoryClass::IT_castUp((CORBA::Object*)((class Cubit_Factory*)IT_p),IT_s, IT_env))
-         return IT_l;
-      else return NULL;
-    }
-
-
-CORBA::PPTR* Cubit_FactoryProxyFactoryClass::pptr (void *IT_p) {
-       return ((class Cubit_Factory*)IT_p)->_pptr ();}
-
-void Cubit_FactoryProxyFactoryClass::baseInterfaces (_IDL_SEQUENCE_string& seq) {
-      add (seq, Cubit_Factory_IR);
-      CORBA::ObjectFactoryClass::baseInterfaces (seq);
-}
-
-Cubit_FactoryProxyFactoryClass Cubit_FactoryProxyFactory(1);
-
-Cubit_ptr Cubit_Factory:: create_cubit (const char * name, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        return new Cubit;
-    }
-    CORBA::Request IT_r (this, "create_cubit",IT_env,1,0);
-    if (!IT_r.isException (IT_env)) {
-
-        IT_r.encodeStringOp (name);
-    }
-
-    IT_r.invoke (CORBA::Flags(0),IT_env);
-    if (!IT_r.isException (IT_env)) {
-        Cubit_ptr IT_result;
-        IT_result = (Cubit*) IT_r.decodeObjRef (Cubit_IR);
-        IT_r.checkEnv (IT_env);
-        return IT_result;
-    }
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-    return new Cubit;
-}
-
-
-
-
-
-#ifndef Cubit_Factory_dispatch_impl
-
-unsigned char Cubit_Factory_dispatch::dispatch (CORBA::Request &IT_r, 
-    unsigned char, void *) {
-      IT_r.makeRuntimeException1 ("Cubit_Factory");
-      return 0;
-}
- 
-#endif
-
diff --git a/TAO/IIOP/test/Orbix/tps/cubitS.cpp b/TAO/IIOP/test/Orbix/tps/cubitS.cpp
deleted file mode 100644
index a2898e12914..00000000000
--- a/TAO/IIOP/test/Orbix/tps/cubitS.cpp
+++ /dev/null
@@ -1,282 +0,0 @@
-
-
-#include "cubit.h"
-
-
-#define Cubit_dispatch_impl
-
-unsigned char Cubit_dispatch::dispatch (CORBA::Request &IT_r, 
- unsigned char IT_isTarget, void *IT_pp) {
-    if (!IT_pp)
-       IT_pp = m_obj;
-    const char *IT_s = IT_r.getOperation ();
-    if (!strcmp(IT_s,"cube_octet")) {
-        CORBA::Octet IT_result;
-        CORBA::Environment IT_env (IT_r);
-        CORBA::Filter* IT_f = CORBA::Orbix.getFilter ();
-        if (!IT_r.tcAssert ("\
-Ro~cube_octet~+o{o},>{o},N{}\
-"))
-            return 1;
-        CORBA::Octet o;
-
-        IT_r.extractOctet (o);
-
-        if (IT_f && !IT_r.isException (IT_env))
-        	IT_f->inRequestPostM (IT_r, IT_env);
-        if (!IT_r.isException (IT_env)) {
-            try {
-                	IT_result = ((Cubit*)IT_pp)->cube_octet (  o, IT_env);
-
-            } catch (CORBA::SystemException &IT_exSys) {
-            IT_env.propagate (&IT_exSys);
-            } catch (CORBA::UserException &IT_exUsr) {
-            IT_env.propagate (&IT_exUsr);
-            }
-        }
-
-        if (!IT_r.isException (IT_env)) {
-            if (!IT_r.convertToReply ("\
-o\
-", IT_env)) return 1;
-            IT_r.insertOctet (IT_result);
-            }
-
-        else IT_r.makeSystemException (IT_env);
-        return 1;
-    }
-
-    if (!strcmp(IT_s,"cube_short")) {
-        CORBA::Short IT_result;
-        CORBA::Environment IT_env (IT_r);
-        CORBA::Filter* IT_f = CORBA::Orbix.getFilter ();
-        if (!IT_r.tcAssert ("\
-Ro~cube_short~+s{s},>{s},N{}\
-"))
-            return 1;
-        CORBA::Short s;
-
-        IT_r >> s;
-
-        if (IT_f && !IT_r.isException (IT_env))
-        	IT_f->inRequestPostM (IT_r, IT_env);
-        if (!IT_r.isException (IT_env)) {
-            try {
-                	IT_result = ((Cubit*)IT_pp)->cube_short (  s, IT_env);
-
-            } catch (CORBA::SystemException &IT_exSys) {
-            IT_env.propagate (&IT_exSys);
-            } catch (CORBA::UserException &IT_exUsr) {
-            IT_env.propagate (&IT_exUsr);
-            }
-        }
-
-        if (!IT_r.isException (IT_env)) {
-            if (!IT_r.convertToReply ("\
-s\
-", IT_env)) return 1;
-            IT_r << IT_result;
-            }
-
-        else IT_r.makeSystemException (IT_env);
-        return 1;
-    }
-
-    if (!strcmp(IT_s,"cube_long")) {
-        CORBA::Long IT_result;
-        CORBA::Environment IT_env (IT_r);
-        CORBA::Filter* IT_f = CORBA::Orbix.getFilter ();
-        if (!IT_r.tcAssert ("\
-Ro~cube_long~+l{l},>{l},N{}\
-"))
-            return 1;
-        CORBA::Long l;
-
-        IT_r >> l;
-
-        if (IT_f && !IT_r.isException (IT_env))
-        	IT_f->inRequestPostM (IT_r, IT_env);
-        if (!IT_r.isException (IT_env)) {
-            try {
-                	IT_result = ((Cubit*)IT_pp)->cube_long (  l, IT_env);
-
-            } catch (CORBA::SystemException &IT_exSys) {
-            IT_env.propagate (&IT_exSys);
-            } catch (CORBA::UserException &IT_exUsr) {
-            IT_env.propagate (&IT_exUsr);
-            }
-        }
-
-        if (!IT_r.isException (IT_env)) {
-            if (!IT_r.convertToReply ("\
-l\
-", IT_env)) return 1;
-            IT_r << IT_result;
-            }
-
-        else IT_r.makeSystemException (IT_env);
-        return 1;
-    }
-
-    if (!strcmp(IT_s,"cube_struct")) {
-        Cubit::Many IT_result;
-        CORBA::Environment IT_env (IT_r);
-        CORBA::Filter* IT_f = CORBA::Orbix.getFilter ();
-        if (!IT_r.tcAssert ("\
-Ro~cube_struct~+values{R~Cubit::Many~o{o},l{l},s{s}},>{R~Cubit::Many~o{o},l{l},s{s}},N{}\
-"))
-            return 1;
-        Cubit::Many values;
-
-        values.decodeOp (IT_r);
-
-        if (IT_f && !IT_r.isException (IT_env))
-        	IT_f->inRequestPostM (IT_r, IT_env);
-        if (!IT_r.isException (IT_env)) {
-            try {
-                	IT_result = ((Cubit*)IT_pp)->cube_struct (  values, IT_env);
-
-            } catch (CORBA::SystemException &IT_exSys) {
-            IT_env.propagate (&IT_exSys);
-            } catch (CORBA::UserException &IT_exUsr) {
-            IT_env.propagate (&IT_exUsr);
-            }
-        }
-
-        if (!IT_r.isException (IT_env)) {
-            if (!IT_r.convertToReply ("\
-R~Cubit::Many~o{o},l{l},s{s}\
-", IT_env)) return 1;
-            IT_result.encodeOp (IT_r);
-            }
-
-        else IT_r.makeSystemException (IT_env);
-        return 1;
-    }
-
-    if (!strcmp(IT_s,"cube_union")) {
-        Cubit::oneof IT_result;
-        CORBA::Environment IT_env (IT_r);
-        CORBA::Filter* IT_f = CORBA::Orbix.getFilter ();
-        IT_r.tcPreAssert (
-"\
-Ro~cube_union~+values{U~Cubit::oneof~{E~Cubit::discrim~e_0th,e_1st,e_2nd,e_3rd,e_4th,e_5th}~Cubit::e_0th o{o};Cubit::e_1st s{s};Cubit::e_2nd l{l};Cubit::e_3rd,$ cm{R~Cubit::Many~o{o},l{l},s{s}}},>{U~Cubit::oneof~{E~Cubit::discrim~e_0th,e_1st,e_2nd,e_3rd,\
-");
-        if (!IT_r.tcAssert ("\
-e_4th,e_5th}~Cubit::e_0th o{o};Cubit::e_1st s{s};Cubit::e_2nd l{l};Cubit::e_3rd,$ cm{R~Cubit::Many~o{o},l{l},s{s}}},N{}\
-"))
-            return 1;
-        Cubit::oneof values;
-
-        values.decodeOp (IT_r);
-
-        if (IT_f && !IT_r.isException (IT_env))
-        	IT_f->inRequestPostM (IT_r, IT_env);
-        if (!IT_r.isException (IT_env)) {
-            try {
-                	IT_result = ((Cubit*)IT_pp)->cube_union (  values, IT_env);
-
-            } catch (CORBA::SystemException &IT_exSys) {
-            IT_env.propagate (&IT_exSys);
-            } catch (CORBA::UserException &IT_exUsr) {
-            IT_env.propagate (&IT_exUsr);
-            }
-        }
-
-        if (!IT_r.isException (IT_env)) {
-            if (!IT_r.convertToReply ("\
-U~Cubit::oneof~{E~Cubit::discrim~e_0th,e_1st,e_2nd,e_3rd,e_4th,e_5th}~Cubit::e_0th o{o};Cubit::e_1st s{s};Cubit::e_2nd l{l};Cubit::e_3rd,$ cm{R~Cubit::Many~o{o},l{l},s{s}}\
-", IT_env)) return 1;
-            IT_result.encodeOp (IT_r);
-            }
-
-        else IT_r.makeSystemException (IT_env);
-        return 1;
-    }
-
-    if (!strcmp(IT_s,"please_exit")) {
-        CORBA::Environment IT_env (IT_r);
-        CORBA::Filter* IT_f = CORBA::Orbix.getFilter ();
-        if (!IT_r.tcAssert ("\
-Ro~please_exit~>{v},O{}\
-"))
-            return 1;
-
-        if (IT_f && !IT_r.isException (IT_env))
-        	IT_f->inRequestPostM (IT_r, IT_env);
-        if (!IT_r.isException (IT_env)) {
-            try {
-                ((Cubit*)IT_pp)->please_exit (IT_env);
-
-            } catch (CORBA::SystemException &IT_exSys) {
-            IT_env.propagate (&IT_exSys);
-            } catch (CORBA::UserException &IT_exUsr) {
-            IT_env.propagate (&IT_exUsr);
-            }
-        }
-        IT_r.replyNoResults (CORBA::Flags(CORBA::INV_NO_RESPONSE),IT_env);
-        return 1;
-    }
-
-    if (IT_isTarget)
-        IT_r.makeRuntimeException2 ();
-
-    return 0;
-}
-
-#define Cubit_Factory_dispatch_impl
-
-unsigned char Cubit_Factory_dispatch::dispatch (CORBA::Request &IT_r, 
- unsigned char IT_isTarget, void *IT_pp) {
-    if (!IT_pp)
-       IT_pp = m_obj;
-    const char *IT_s = IT_r.getOperation ();
-    if (!strcmp(IT_s,"create_cubit")) {
-        Cubit_ptr IT_result;
-        CORBA::Environment IT_env (IT_r);
-        CORBA::Filter* IT_f = CORBA::Orbix.getFilter ();
-        if (!IT_r.tcAssert ("\
-Ro~create_cubit~+name{0},>{O~Cubit},N{}\
-"))
-            return 1;
-        char * name;
-
-        IT_r.decodeStringOp(name);
-
-        if (IT_f && !IT_r.isException (IT_env))
-        	IT_f->inRequestPostM (IT_r, IT_env);
-        if (!IT_r.isException (IT_env)) {
-            try {
-                	IT_result = ((Cubit_Factory*)IT_pp)->create_cubit (  name, IT_env);
-
-            } catch (CORBA::SystemException &IT_exSys) {
-            IT_env.propagate (&IT_exSys);
-            } catch (CORBA::UserException &IT_exUsr) {
-            IT_env.propagate (&IT_exUsr);
-            }
-        }
-        CORBA::string_free (name);
-
-        if (!IT_r.isException (IT_env)) {
-            if (!IT_r.convertToReply ("\
-O~Cubit\
-", IT_env)) return 1;
-            {
-                CORBA::Object* IT_l1 = (CORBA::Object*) IT_result;
-                IT_r << IT_l1;
-            }
-            if (IT_result) Cubit_release (IT_result);
-            }
-
-        else IT_r.makeSystemException (IT_env);
-        return 1;
-    }
-
-    if (IT_isTarget)
-        IT_r.makeRuntimeException2 ();
-
-    return 0;
-}
-
-#include "cubitC.cpp"
-
diff --git a/TAO/IIOP/test/Orbix/tps/cubit_impl.cpp b/TAO/IIOP/test/Orbix/tps/cubit_impl.cpp
deleted file mode 100644
index 27ee125e4df..00000000000
--- a/TAO/IIOP/test/Orbix/tps/cubit_impl.cpp
+++ /dev/null
@@ -1,81 +0,0 @@
-#include "cubit_impl.h"
-
-CORBA::Octet Cubit_Impl:: cube_octet (CORBA::Octet o, CORBA::Environment &) throw (CORBA::SystemException) {
-  return (CORBA::Octet) (o * o * o); 
-}
-
-CORBA::Short Cubit_Impl:: cube_short (CORBA::Short s, CORBA::Environment &) throw (CORBA::SystemException) {
-  return (CORBA::Short) (s * s * s);
-}
-
-CORBA::Long Cubit_Impl:: cube_long (CORBA::Long l, CORBA::Environment &) throw (CORBA::SystemException) {
-   return (CORBA::Long) (l * l * l);
-}
-
-Cubit::Many Cubit_Impl:: cube_struct (const Cubit::Many& values, CORBA::Environment &) throw (CORBA::SystemException) {
-  Cubit::Many out_values;
-  out_values.o = values.o * values.o * values.o;
-  out_values.s = values.s * values.s * values.s;
-  out_values.l = values.l * values.l * values.l;
-  return out_values; 
-}
-
-Cubit::oneof Cubit_Impl:: cube_union (const Cubit::oneof& values, CORBA::Environment &) throw (CORBA::SystemException) {
-  Cubit::oneof out_values;
-   switch (values._d ()) {
-   case Cubit::e_0th:
-     out_values.o (values.o () * values.o ()  * values.o ());
-     break;
-   case Cubit::e_1st:
-     out_values.s (values.s () * values.s () * values.s ());
-     break;
-   case Cubit::e_2nd:
-     out_values.l (values.l () * values.l () * values.l ());
-     break;
-   case Cubit::e_3rd:
-   default:
-     out_values.cm ().o = values.cm ().o * values.cm ().o * values.cm ().o ;
-     out_values.cm ().s = values.cm ().s * values.cm ().s * values.cm ().s ;
-     out_values.cm ().l = values.cm ().l * values.cm ().l * values.cm ().l ;
-     break;
-   }
-   return out_values;  
-}
-
-void Cubit_Impl:: please_exit (CORBA::Environment &) throw (CORBA::SystemException) {
-}
-
-Cubit_ptr Cubit_Factory_Impl:: create_cubit (const char * name, CORBA::Environment &) throw (CORBA::SystemException) {
-  cerr << "Creating Cubit for " << name << endl;
-
-#ifdef Cubit_USE_BOA
-  Cubit_Impl_Task *cubit = new Cubit_Impl_Task ();
-#else
-  Cubit_Impl_Task *cubit = new TIE_Cubit (Cubit_Impl) (new Cubit_Impl_Task);
-#endif
-  Cubit::_duplicate ((Cubit *)cubit);
-  cubit->activate (1);
-  return (Cubit *) cubit;
-}
-
-int
-Cubit_Impl_Task::svc (void) 
-{
-  while (1) 
-    {
-      // Dequeue message
-      ACE_Message_Block *mb;
-      this->msg_queue ()->dequeue_head (mb);
-      CORBA::Request *vp = (CORBA::Request *) mb->base ();
-      mb->release ();
-      // Hand it off to Orbix
-      CORBA::Orbix.continueThreadDispatch (*vp);
-    }
-  return 0;
-}
-
-void *
-Cubit_Impl_Task::_deref (void) 
-{
-  return this;
-}
diff --git a/TAO/IIOP/test/Orbix/tps/cubit_impl.h b/TAO/IIOP/test/Orbix/tps/cubit_impl.h
deleted file mode 100644
index 31a8874f07b..00000000000
--- a/TAO/IIOP/test/Orbix/tps/cubit_impl.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-#ifndef cubit_ih
-#define cubit_ih
-
-#include "cubit.h"
-#include "ace/Task.h"
-
-#ifdef Cubit_USE_BOA
-class Cubit_Impl : public virtual CubitBOAImpl {
-#else
-class Cubit_Impl {
-#endif /* Cubit_USE_BOA */
-public:
-  virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env=CORBA::default_environment) throw (CORBA::SystemException);
-  virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env=CORBA::default_environment) throw (CORBA::SystemException);
-  virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env=CORBA::default_environment) throw (CORBA::SystemException);
-  virtual Cubit::Many cube_struct (const Cubit::Many& values, CORBA::Environment &IT_env=CORBA::default_environment) throw (CORBA::SystemException);
-  virtual Cubit::oneof cube_union (const Cubit::oneof& values, CORBA::Environment &IT_env=CORBA::default_environment) throw (CORBA::SystemException);
-  virtual void please_exit (CORBA::Environment &IT_env=CORBA::default_environment) throw (CORBA::SystemException);
-
-};
-
-#ifdef Cubit_USE_BOA
-class Cubit_Factory_Impl : public virtual Cubit_FactoryBOAImpl {
-#else
-class Cubit_Factory_Impl {
-#endif
-
-public:
-        virtual Cubit_ptr create_cubit (const char * name, CORBA::Environment &IT_env=CORBA::default_environment) throw (CORBA::SystemException);
-};
-
-class Cubit_Impl_Task : public virtual Cubit_Impl, public virtual ACE_Task<ACE_MT_SYNCH> {
-public:
-  // For ACE_Task
-  int svc (void);
-  // for narrowing
-  virtual void *_deref ();
-};
-
-#ifndef Cubit_USE_BOA
-DEF_TIE_Cubit (Cubit_Impl)
-DEF_TIE_Cubit_Factory (Cubit_Factory_Impl)
-#endif /* Cubit_USE_BOA */
-
-#endif
diff --git a/TAO/IIOP/test/Orbix/tps/server.cpp b/TAO/IIOP/test/Orbix/tps/server.cpp
deleted file mode 100644
index 4e6baf18886..00000000000
--- a/TAO/IIOP/test/Orbix/tps/server.cpp
+++ /dev/null
@@ -1,40 +0,0 @@
-//**************************************************************************
-//
-// NAME :   tpr_server.cpp 
-// DESCRIPTION:  
-//
-// Server mainline
-//
-//****************************************************************************
-#define IT_EX_MACROS
-
-#include "cubit_impl.h"		// server header file
-
-int 
-main (int , char**)
-{
-
-#ifdef Cubit_USE_BOA
-  Cubit_Factory_var cf = new Cubit_Factory_Impl;
-  cout << "Using BOA approach" << endl;
-#else
-  Cubit_Factory_var cf = new TIE_Cubit_Factory (Cubit_Factory) (new Cubit_Factory);
-  cout << "Using TIE approach" << endl;
-#endif /* Cubit_USE_BOA */
-  
-  //
-  // Go get some work to do....
-  //
-  IT_TRY {
-      CORBA::Orbix.impl_is_ready("Cubit_Factory", IT_X);
-  }
-  IT_CATCHANY {
-     cout << IT_X << endl;
-  }
-  IT_ENDTRY;
-
-  cout << "Cubit server is exiting." << endl;
-
-
-  return 0;
-}
diff --git a/TAO/IIOP/test/Orbix/tps/tps.cpp b/TAO/IIOP/test/Orbix/tps/tps.cpp
deleted file mode 100644
index 1035f1e503f..00000000000
--- a/TAO/IIOP/test/Orbix/tps/tps.cpp
+++ /dev/null
@@ -1,26 +0,0 @@
-#include "tps.h"
-
-int
-TPS_Filter::inRequestPreMarshal(CORBA::Request &r,  CORBA::Environment& env)
-{
-  // Get target
-  CORBA::Object_ptr obj = r.target ();
-  Cubit * cb = Cubit::_narrow (obj, env);
-
-  if (env) // Not for our object!!
-    return 1; // continue in the same thread
-  
-  // Enqueue the request
-  Cubit_Impl_Task *ct;
-  if (CORBA::is_nil (cb))
-      return 1;
-  ct = (Cubit_Impl_Task *) DEREF(cb);
-  if (ct) {
-    ACE_Message_Block *mb = new ACE_Message_Block ( (char *) (&r));
-    ct->msg_queue ()->enqueue (mb);
-  }
-  // Done
-  return -1;
-}
-
-TPS_Filter tps_filter;
diff --git a/TAO/IIOP/test/Orbix/tps/tps.h b/TAO/IIOP/test/Orbix/tps/tps.h
deleted file mode 100644
index 272bc90f20d..00000000000
--- a/TAO/IIOP/test/Orbix/tps/tps.h
+++ /dev/null
@@ -1,11 +0,0 @@
-#include "cubit.h"
-#include "cubit_impl.h"
-#include "ace/Service_Config.h"
-#include "ace/Thread_Manager.h"
-#include "ace/Task.h"
-
-class TPS_Filter : public ACE_Task<ACE_MT_SYNCH>, public CORBA::ThreadFilter
-{
-public:
-  virtual int inRequestPreMarshal(CORBA::Request &, CORBA::Environment&);
-};
diff --git a/TAO/IIOP/test/clnt.cpp b/TAO/IIOP/test/clnt.cpp
deleted file mode 100644
index f0249489889..00000000000
--- a/TAO/IIOP/test/clnt.cpp
+++ /dev/null
@@ -1,508 +0,0 @@
-// @(#)clnt.cpp	1.2 05/14/97
-// Copyright 1994-1995 by Sun Microsystems Inc.
-// All Rights Reserved
-//
-// TEST:	Simple "cube" client, calling hand-crafted stubs.
-//
-// Modified version of Cubit Example written by Sun Microsystems Inc.
-// Modified by: Brian Mendel
-
-#include <ace/Get_Opt.h>
-//#include <crtdbg.h>
-
-#if	unix
-#	include	<unistd.h>
-#	include	<sys/time.h>
-
-#elif defined (VXWORKS)
-#	include	<unistd.h>
-#	include	<time.h>
-
-#else	// windows
-
-#endif	// unix
-
-#include	"cubitC.h"
-
-#include	<corba/debug.h>
-
-
-#if !defined (_WIN32)
-extern char 	*optarg;	// missing on some platforms
-#endif
-
-inline int func (unsigned i) { return i - 117; }
-
-extern void
-print_exception (const CORBA_Exception *, const char *, FILE *f=stdout);
-
-
-//
-// forward declarations
-//
-static void cube_union_stub(unsigned, unsigned&, unsigned&,
-                            CORBA_Object_ptr, CORBA_Environment &);
-
-static void cube_union_dii(unsigned &, unsigned &,
-                           CORBA_Object_ptr, CORBA_Environment &);
-
-// Global variables
-const char* TAO_arg_ior = 0;
-unsigned           loop_count = 1;
-int                exit_later = 0;
-
-// = TITLE
-//     Parses the command line arguments and returns an error status
-//
-// = DESCRIPTION
-//     This method parses the command line arguments
-int parse_args(int argc, char *argv[])
-{
-   ACE_Get_Opt opts (argc, argv, "dn:O:x");
-   int			c;
-   
-   while ((c = opts ()) != -1)
-      switch (c) {
- 
-      case 'd':  // debug flag
-         TAO_debug_level++;
-         continue;
-   
-      case 'n':			// loop count
-         loop_count = (unsigned) ACE_OS::atoi (opts.optarg);
-         continue;
-   
-      case 'O':			// stringified objref
-         {
-           TAO_arg_ior = ACE_OS::strdup(opts.optarg);
-         }
-         continue;
-   
-      case 'x':
-         exit_later++;
-         continue;
-   
-      case '?':
-      default:
-         ACE_OS::fprintf (stderr, "usage:  %s"
-            " [-d]"
-            " [-n loopcount]"
-            " [-O objref]"
-            " [-x]"
-            "\n", argv [0]
-            );
-         return 1;
-      }
-   
-   return 0;  // Indicates successful parsing of command line
-}
-
-int
-main (int    argc, char   *argv[])
-{
-  CORBA_ORB_ptr orb_ptr;
-  CORBA_Object_ptr objref = CORBA_Object::_nil();
-  CORBA_Environment env;
-
-  orb_ptr = CORBA_ORB_init(argc, argv, "internet", env);
-  if (env.exception() != 0)
-    {
-      print_exception(env.exception(), "ORB initialization");
-      return 1;
-    }
-
-  //
-  // Parse command line and verify parameters.
-  //
-  parse_args(argc, argv);
-
-  if (TAO_arg_ior == 0)
-    ACE_ERROR_RETURN((LM_ERROR, "%s: must specify an object reference using -O <ior>\n", argv[0]), 1);
-
-  objref = orb_ptr->string_to_object ((CORBA_String)TAO_arg_ior, env);
-
-  ACE_OS::free((void*)TAO_arg_ior);
-  TAO_arg_ior = 0;
-
-  if (env.exception () != 0)
-    {
-      print_exception (env.exception (), "string2object");
-      return 1;
-    }
-
-  if (CORBA_is_nil (objref) == CORBA_B_TRUE)
-    ACE_ERROR_RETURN((LM_ERROR, "%s:  must identify non-null target objref\n", argv [0]), 1);
-
-  // Narrow the CORBA_Object reference to the stub object, checking
-  // the type along the way using _is_a
-  Cubit_ptr aCubit = Cubit::_narrow(objref);
-  if (aCubit == 0)
-    ACE_ERROR_RETURN((LM_ERROR, "(%P|%t) Unable to narrow object reference to a Cubit_ptr.\n"), 1);
-
-  //
-  // Make the calls in a loop.
-  //
-  unsigned i;
-  unsigned call_count, error_count;
-
-  call_count = 0;
-  error_count = 0;
-
-  ACE_Time_Value before, after;
-
-  before = ACE_OS::gettimeofday();
-
-  for (i = 0; i < loop_count; i++)
-    {
-      //
-      // Cube an octet.
-      //
-      CORBA_Octet	arg_octet, ret_octet;
-       
-      call_count++;
-      ret_octet = aCubit->Cubit_cube_octet (arg_octet = func (i), env);
-      if (env.exception () != 0)
-        {
-          print_exception (env.exception (), "from cube_octet");
-          error_count++;
-        }
-      else
-        {
-          dmsg2 ("cube octet:  %d --> %d\n", arg_octet, ret_octet);
-          arg_octet = arg_octet * arg_octet * arg_octet;
-          if (arg_octet != ret_octet) {
-            ACE_OS::printf ("** cube_octet(%d) ERROR (--> %d)\n",
-                            (CORBA_Octet) func (i), ret_octet);
-            error_count++;
-          }
-        }
-
-      //
-      // Cube a short.
-      //
-      CORBA_Short	arg_short, ret_short;
-       
-      call_count++;
-      ret_short = aCubit->Cubit_cube_short (arg_short = func (i), env);
-      if (env.exception () != 0)
-        {
-          print_exception (env.exception (), "from cube_short");
-          error_count++;
-        }
-      else
-        {
-          dmsg2 ("cube short:  %d --> %d\n", arg_short, ret_short);
-          arg_short = arg_short * arg_short * arg_short;
-          if (arg_short != ret_short)
-            {
-              ACE_OS::printf ("** cube_short(%d) ERROR (--> %d)\n",
-                              (CORBA_Short) func (i), ret_short);
-              error_count++;
-            }
-        }
-
-      //
-      // Cube a long.
-      //
-      CORBA_Long	arg_long, ret_long;
-       
-      call_count++;
-      ret_long = aCubit->Cubit_cube_long (arg_long = func (i), env);
-      if (env.exception () != 0)
-        {
-          print_exception (env.exception (), "from cube_long");
-          error_count++;
-        }
-      else
-        {
-          dmsg2 ("cube long:  %d --> %d\n", arg_long, ret_long);
-          arg_long = arg_long * arg_long * arg_long;
-          if (arg_long != ret_long) {
-            ACE_OS::printf ("** cube_long(%ld) ERROR (--> %ld)\n",
-                            (CORBA_Long) func (i), ret_long);
-            error_count++;
-          }
-        }
-
-      //
-      // Cube a "struct" ...
-      //
-      Cubit_Many	arg_struct, *ret_struct;
-       
-      call_count++;
-       
-      arg_struct.l = func (i);
-      arg_struct.s = func (i);
-      arg_struct.o = func (i);
-       
-      ret_struct = aCubit->Cubit_cube_struct (arg_struct, env);
-      if (env.exception () != 0)
-        {
-          print_exception (env.exception (), "from cube_struct");
-          error_count++;
-        }
-      else
-        {
-          dmsg ("cube struct ...");
-          arg_struct.l = arg_struct.l * arg_struct.l * arg_struct.l;
-          arg_struct.s = arg_struct.s * arg_struct.s * arg_struct.s;
-          arg_struct.o = arg_struct.o * arg_struct.o * arg_struct.o;
-          
-          if (arg_struct.l != ret_struct->l
-              || arg_struct.s != ret_struct->s
-              || arg_struct.o != ret_struct->o)
-            {
-              ACE_OS::printf ("** cube_struct ERROR\n");
-              error_count++;
-            }
-          delete ret_struct;
-        }
-       
-    }
-    
-  after = ACE_OS::gettimeofday();
-    
-  if (call_count > 0) 
-    {
-      if (error_count == 0)
-        {
-          ACE_Time_Value diff = after - before;
-          unsigned long	us = diff.sec() * 1000 * 1000 + diff.usec();
-          
-          us /= call_count;
-          
-          if (us > 0)
-            ACE_OS::printf ("cube average call ACE_OS::time\t= %ld.%.03ldms, \t"
-                            "%ld calls/second\n",
-                            us / 1000, us % 1000,
-                            1000000L / us);
-        }
-
-      ACE_OS::printf ("%d calls, %d errors\n", call_count, error_count);
-    }
-
-  //
-  // Simple test for DII:  call "cube_struct".  (It's not timed
-  // since the copious mallocation of DII would bias numbers against
-  // typical stub-based calls.)
-  //
-  do {
-    //
-    // Create the request ...
-    //
-    CORBA_Request_ptr	req;
-       
-    req = objref->_request ((const CORBA_String) "cube_struct", env);
-    if (env.exception () != 0) {
-      print_exception (env.exception (), "DII request create");
-      break;
-    }
-
-    //
-    // ... initialise the argument list and result ...
-    //
-    Cubit_Many	arg, *result;
-       
-    arg.o = 3; arg.l = 5; arg.s = -7;
-       
-    CORBA_Any	tmp_arg (TC_Cubit_Many, &arg, CORBA_B_FALSE);
-       
-    req->arguments ()->add_value (0, tmp_arg, CORBA_ARG_IN, env);
-    if (env.exception () != 0) {
-      print_exception (env.exception (), "DII request arg add");
-      CORBA_release (req);
-      break;
-    }
-       
-    req->result ()->value ()
-      ->replace (TC_Cubit_Many, 0, CORBA_B_TRUE, env);
-    if (env.exception () != 0) {
-      print_exception (env.exception (), "DII request result type");
-      CORBA_release (req);
-      break;
-    }
-
-    //
-    // Make the invocation, verify the result
-    //
-    req->invoke ();
-    if (req->env ()->exception () != 0) {
-      print_exception (req->env ()->exception (), "DII invoke");
-      CORBA_release (req);
-      break;
-    }
-       
-    result = (Cubit_Many *) req->result ()->value ()->value ();
-       
-    if (result->o != 27 || result->l != 125 || result->s != -343)
-      ACE_OS::fprintf (stderr, "DII cube_struct -- bad results\n");
-    else
-      dmsg ("DII cube_struct ... success!!");
-       
-    CORBA_release (req);
-       
-  } while (0);
-
-  //
-  // Two more tests, using the "cube_union" function
-  //
-  cube_union_dii(call_count, error_count, objref, env);
-  if (env.exception () != 0)
-    error_count++;
-    
-  cube_union_stub(i, call_count, error_count, objref, env);
-  if (env.exception () != 0)
-    error_count++;
-    
-  if (exit_later) {
-    aCubit->Cubit_please_exit (env);
-    dexc (env, "server, please ACE_OS::exit");
-  }
-    
-  CORBA_release (objref);
-    
-  return (error_count == 0) ? 0 : 1;
-}
-
-
-static void
-cube_union_stub(unsigned          i,
-                unsigned          &call_count,
-                unsigned          &error_count,
-                CORBA_Object_ptr  objref,
-                CORBA_Environment &env)
-{
-   Cubit_ptr aCubit = Cubit::_narrow(objref);
-   //
-   // Cube a "union" ...
-   //
-   Cubit_oneof    u, *r;
-   
-   call_count++;
-   
-   u._disc = e_2nd;
-   u.l = 3;
-   
-   r = aCubit->Cubit_cube_union (u, env);
-   if (env.exception () != 0) {
-      print_exception (env.exception (), "from cube_union");
-      error_count++;
-   } else {
-      dmsg ("cube union ...");
-      u.l = u.l  * u.l * u.l ;
-      
-      if (u.l != r->l) {
-         ACE_OS::printf ("** cube_union ERROR\n");
-         error_count++;
-      }
-      
-      delete r;
-   }
-   
-   //
-   // Cube another "union" which uses the default arm ...
-   //
-   call_count++;
-   
-   u._disc = e_5th;
-   u.cm.l = func (i);
-   u.cm.s = func (i);
-   u.cm.o = func (i);
-   
-   u.cm.l = 7;
-   u.cm.s = 5;
-   u.cm.o = 3;
-   
-   r = aCubit->Cubit_cube_union (u, env);
-   if (env.exception () != 0) {
-      print_exception (env.exception (), "from cube_union");
-      error_count++;
-   } else {
-      dmsg ("cube union ...");
-      u.cm.l = u.cm.l * u.cm.l * u.cm.l;
-      u.cm.s = u.cm.s * u.cm.s * u.cm.s;
-      u.cm.o = u.cm.o * u.cm.o * u.cm.o;
-      
-      if (u.cm.l != r->cm.l
-         || u.cm.s != r->cm.s
-         || u.cm.o != r->cm.o) {
-         ACE_OS::printf ("** cube_union ERROR\n");
-         error_count++;
-      }
-      
-      delete r;
-   }
-}
-
-
-static void
-cube_union_dii (unsigned          &call_count,
-                unsigned          &error_count,
-                CORBA_Object_ptr  objref,
-                CORBA_Environment &env)
-{
-   //
-   // Create the request ...
-   //
-   CORBA_Request_ptr	req;
-   
-   call_count++;
-
-   req = objref->_request ((const CORBA_String) "cube_union", env);
-   if (env.exception () != 0) {
-      error_count++;
-      
-      print_exception (env.exception (), "cube_union_dii request create");
-      return;
-   }
-
-   //
-   // ... initialise the argument list and result ...
-   //
-   Cubit_oneof	u, *r;
-   
-   u._disc = e_3rd;
-   u.cm.l = 5;
-   u.cm.s = -7;
-   u.cm.o = 3;
-
-   CORBA_Any	tmp_arg (TC_Cubit_oneof, &u, CORBA_B_FALSE);
-   
-   req->arguments ()->add_value (0, tmp_arg, CORBA_ARG_IN, env);
-   if (env.exception () != 0) {
-      error_count++;
-      print_exception (env.exception (), "cube_union_dii request arg add");
-      CORBA_release (req);
-      return;
-   }
-	
-   req->result ()->value ()->replace (TC_Cubit_oneof, 0, CORBA_B_TRUE, env);
-   if (env.exception () != 0) {
-      error_count++;
-      print_exception (env.exception (), "cube_union_dii result type");
-      CORBA_release (req);
-      return;
-   }
-
-   //
-   // Make the invocation, verify the result
-   //
-   req->invoke ();
-   if (req->env ()->exception () != 0) {
-      error_count++;
-      print_exception (req->env ()->exception (),"cube_union_dii invoke");
-      CORBA_release (req);
-      return;
-   }
-
-   r = (Cubit_oneof *) req->result ()->value ()->value ();
-   
-   if (r->cm.o != 27 || r->cm.l != 125 || r->cm.s != -343) {
-      error_count++;
-      ACE_OS::fprintf (stderr, "cube_union_dii -- bad results\n");
-   }
-   else
-      dmsg ("cube_union_dii ... success!!");
-   
-   CORBA_release (req);
-}
diff --git a/TAO/IIOP/test/cubit.cpp b/TAO/IIOP/test/cubit.cpp
deleted file mode 100644
index d232de8eee8..00000000000
--- a/TAO/IIOP/test/cubit.cpp
+++ /dev/null
@@ -1,576 +0,0 @@
-// @(#)cubit.cpp	1.2 95/09/29
-// Copyright 1994-1995 by Sun Microsystems Inc.
-// All Rights Reserved
-//
-// TEST:	hand-written C-style "Cubit" stubs and "skeletons"
-//
-// NOTE:  these "skeletons" are really the methods, using DSI.  No real
-// ORB would be implemented in this particular way.  Several things would
-// be more typical of real (static) skeletons:
-//
-//	* Most of the "in" (and much of the "out") parameter data would
-//	  be preallocated on the stack, not heap allocated.  (Static
-//	  preallocation doesnt' really work in a multithreaded system,
-//	  and moreover can waste a lot of space.)
-//
-//	* The ORB core wouldn't be told about parameters using heap
-//	  allocated data structures (e.g. NVList).
-//
-//	* Skeletons would need to some kind of "marshal the response NOW"
-//	  API so that stack-allocated "out" values wouldn't become invalid
-//	  up until they were safely marshaled.
-//
-//	* They'd handle exceptions rather than just generating debugging
-//	  messages when they happen.
-//
-//	* Method code would be called by the skeletons, not written as
-//	  part of the "skeleton" itself!
-//
-// A key part of turning this code into a complete ORB would be to ensure
-// that skeletons were always efficient and correct.  They might not need
-// to be sharable between different implementations of the same OMG-IDL
-// object interface, but many ORBs choose to be structured that way.
-//
-
-#include	"cubit.h"		// for stubs ...
-#include	<corba/boa.h>		// ... and skeletons
-
-#include	<corba/debug.h>		// ... and debugging
-
-
-//
-// CUBE OCTET
-//
-
-static const TAO_Param_Data Cubit_cube_octet_params [] = {
-    { _tc_CORBA_Octet, PARAM_RETURN, 0 },
-    { _tc_CORBA_Octet, PARAM_IN, 0 }
-};
-
-static const TAO_Call_Data Cubit_cube_octet_calldata = {
-    "cube_octet", CORBA_B_TRUE,
-    2, &Cubit_cube_octet_params [0],
-    0, 0
-};
-
-
-CORBA_Octet
-Cubit_cube_octet (
-    Cubit_ptr		target,
-    CORBA_Octet		o,
-    CORBA_Environment	&env
-)
-{
-    CORBA_Octet		retval = 0;
-    STUB_Object		*data;
-
-    if (target->QueryInterface (IID_STUB_Object, (void **)&data)
-	    != NOERROR)
-	env.exception (new CORBA_INV_OBJREF (COMPLETED_NO));
-    else {
-	data->do_call (env, &Cubit_cube_octet_calldata,
-	    &retval, &o);
-	data->Release ();
-    }
-    return retval;
-}
-
-static void
-_cube_octet_skel (CORBA_ServerRequest &req,    
-		  CORBA_Object_ptr obj,
-		  CORBA_Environment &env)
-{
-  CORBA_NVList_ptr		nvlist;
-  CORBA_NamedValue_ptr	nv;
-  CORBA_Any			temp_value (_tc_CORBA_Octet);
-
-  req.orb()->create_list (0, nvlist);
-  nv = nvlist->add_value (0, temp_value, CORBA_ARG_IN, env);
-  dexc (env, "cube_octet, add value");
-
-  req.params (nvlist, env);
-  dexc (env, "cube_octet, get params");
-
-  CORBA_Octet* value = new CORBA_Octet;
-
-  *value = *(CORBA_Octet *)nv->value ()->value ();
-  // dmsg1 ("cube octet, parameter '%d'", *value);
-  *value = (CORBA_Octet) ((*value) * (*value) * (*value));
-  // dmsg1 ("cube octet, result '%d'", *value);
-
-  CORBA_Any* any =
-    new CORBA_Any (_tc_CORBA_Octet, value, CORBA_B_TRUE);
-
-  req.result (any, env);
-  dexc (env, "cube_octet, result");
-}
-
-
-//
-// CUBE SHORT
-//
-
-static const TAO_Param_Data Cubit_cube_short_params [] = {
-    { _tc_CORBA_Short, PARAM_RETURN, 0 },
-    { _tc_CORBA_Short, PARAM_IN, 0 }
-};
-
-static const TAO_Call_Data Cubit_cube_short_calldata = {
-    "cube_short", CORBA_B_TRUE,
-    2, &Cubit_cube_short_params [0],
-    0, 0
-};
-
-
-CORBA_Short
-Cubit_cube_short (Cubit_ptr target,
-		  CORBA_Short s,
-		  CORBA_Environment &env)
-{
-    CORBA_Short		retval;
-    STUB_Object		*data;
-
-    if (target->QueryInterface (IID_STUB_Object, (void **)&data)
-	    != NOERROR)
-	env.exception (new CORBA_INV_OBJREF (COMPLETED_NO));
-    else {
-	data->do_call (env, &Cubit_cube_short_calldata,
-		&retval, &s);
-	data->Release ();
-    }
-    return retval;
-}
-
-static void
-_cube_short_skel (CORBA_ServerRequest &req,
-		  CORBA_Object_ptr obj,
-		  CORBA_Environment &env)
-{
-  CORBA_NVList_ptr		nvlist;
-  CORBA_NamedValue_ptr	nv;
-  CORBA_Any			temp_value (_tc_CORBA_Short);
-
-  req.orb()->create_list (0, nvlist);
-  nv = nvlist->add_value (0, temp_value, CORBA_ARG_IN, env);
-  dexc (env, "cube_short, add_value");
-
-  req.params (nvlist, env);
-  dexc (env, "cube_short, get params");
-
-  CORBA_Short* value = new CORBA_Short;
-
-  *value = *(CORBA_Short *)nv->value ()->value ();
-  // dmsg1 ("cube short, parameter '%d'", *value);
-  *value =(CORBA_Short) ((*value) * (*value) * (*value));
-  // dmsg1 ("cube short, result '%d'", *value);
-
-  CORBA_Any* any =
-    new CORBA_Any (_tc_CORBA_Short, value, CORBA_B_TRUE);
-
-  req.result (any, env);
-  dexc (env, "cube_short, result");
-}
-
-
-//
-// CUBE LONG
-//
-
-static const TAO_Param_Data Cubit_cube_long_params [] = {
-    { _tc_CORBA_Long, PARAM_RETURN, 0 },
-    { _tc_CORBA_Long, PARAM_IN, 0 }
-};
-
-static const TAO_Call_Data Cubit_cube_long_calldata = {
-    "cube_long", CORBA_B_TRUE,
-    2, &Cubit_cube_long_params [0],
-    0, 0
-};
-
-
-CORBA_Long
-Cubit_cube_long (Cubit_ptr target,
-		 CORBA_Long l,
-		 CORBA_Environment &env)
-{
-  CORBA_Long		retval;
-  STUB_Object		*data;
-
-  if (target->QueryInterface (IID_STUB_Object, (void **)&data) != NOERROR)
-    env.exception (new CORBA_INV_OBJREF (COMPLETED_NO));
-  else
-    {
-      data->do_call (env, &Cubit_cube_long_calldata,
-		     &retval, &l);
-      data->Release ();
-    }
-  return retval;
-}
-
-
-static void
-_cube_long_skel (CORBA_ServerRequest &req,
-		 CORBA_Object_ptr obj,
-		 CORBA_Environment &env)
-{
-  CORBA_NVList_ptr		nvlist;
-  CORBA_NamedValue_ptr	nv;
-  CORBA_Any			temp_value (_tc_CORBA_Long);
-
-  req.orb()->create_list (0, nvlist);
-  nv = nvlist->add_value (0, temp_value, CORBA_ARG_IN, env);
-  dexc (env, "cube_long, add_value");
-
-  req.params (nvlist, env);
-  dexc (env, "cube_long, get params");
-
-  CORBA_Long* value = new CORBA_Long;
-
-  *value = *(CORBA_Long *)nv->value ()->value ();
-  // dmsg1 ("cube long, parameter '%d'", *value);
-  *value = (*value) * (*value) * (*value);
-  // dmsg1 ("cube long, result '%d'", *value);
-
-  CORBA_Any* any =
-    new CORBA_Any (_tc_CORBA_Long, value, CORBA_B_TRUE);
-
-  req.result (any, env);
-  dexc (env, "cube_long, result");
-}
-
-//
-// Encapsulated parameters for struct "Cubit_Many" typecode.
-// None of these parameters is complicated, so this is just
-// a linear sequence of element encodings
-//
-// NOTE:  it's important that this be longword aligned!!
-//
-static const CORBA_Long _oc_Cubit_Many [] = {
-    1,				// byte order flag (TRICKY!)
-
-    1, 0,			// empty string:  repository/type ID
-    1, 0,			// empty string:  struct name
-
-    3,				// three struct elements
-
-    // First structure element:  name, typecode for Octet
-    1, 0,			// empty string:  name "o"
-    tk_octet,
-
-    // Second structure element:  name, typecode for Long
-    1, 0,			// empty string:  name "l"
-    tk_long,
-
-    // Third structure element:  name, typecode for Short
-    1, 0,			// empty string:  name "s"
-    tk_short,
-};
-
-static CORBA_TypeCode _tc_Cubit_Many (tk_struct,
-    sizeof _oc_Cubit_Many, (unsigned char *) &_oc_Cubit_Many,
-    CORBA_B_FALSE);
-CORBA_TypeCode_ptr TC_Cubit_Many = &_tc_Cubit_Many;
-
-
-//
-// CUBE STRUCT
-//
-
-static const TAO_Param_Data Cubit_cube_struct_params [] = {
-    { &_tc_Cubit_Many, PARAM_RETURN, sizeof (Cubit_Many) },
-    { &_tc_Cubit_Many, PARAM_IN, 0 }
-};
-
-static const TAO_Call_Data Cubit_cube_struct_calldata = {
-    "cube_struct", CORBA_B_TRUE,
-    2, &Cubit_cube_struct_params [0],
-    0, 0
-};
-
-Cubit_Many *
-Cubit_cube_struct (Cubit_ptr target,
-		   Cubit_Many &values,
-		   CORBA_Environment &env)
-{
-  Cubit_Many		*retval;
-  STUB_Object		*data;
-
-  if (target->QueryInterface (IID_STUB_Object, (void **)&data) != NOERROR)
-    env.exception (new CORBA_INV_OBJREF (COMPLETED_NO));
-  else
-    {
-      data->do_call (env, &Cubit_cube_struct_calldata,
-		     &retval, &values);
-      data->Release ();
-    }
-  return retval;
-}
-
-
-static void
-_cube_struct_skel (CORBA_ServerRequest &req,
-		   CORBA_Object_ptr obj,
-		   CORBA_Environment &env)
-{
-  CORBA_NVList_ptr		nvlist;
-  CORBA_NamedValue_ptr	nv;
-  CORBA_Any			temp_value (TC_Cubit_Many);
-
-  req.orb()->create_list (0, nvlist);
-  nv = nvlist->add_value (0, temp_value, CORBA_ARG_IN, env);
-  dexc (env, "cube_struct, add_value");
-
-  req.params (nvlist, env);
-  dexc (env, "cube_struct, get params");
-
-  Cubit_Many *value;
-  Cubit_Many *retval = new Cubit_Many;
-
-  value = (Cubit_Many *)nv->value ()->value ();
-
-  retval->o = (CORBA_Octet) (value->o * value->o * value->o);
-  retval->s = (CORBA_Short) (value->s * value->s * value->s);
-  retval->l = value->l * value->l * value->l;
-
-  // dmsg2 ("cube struct.o, %d -> %d", value->o, retval->o);
-  // dmsg2 ("cube struct.s, %d -> %d", value->s, retval->s);
-  // dmsg2 ("cube struct.l, %d -> %d", value->l, retval->l);
-
-  CORBA_Any *any =
-    new CORBA_Any (TC_Cubit_Many, retval, CORBA_B_TRUE);
-
-  req.result (any, env);
-  dexc (env, "cube_struct, result");
-}
-
-//
-// CUBE UNION
-//
-
-//
-// NOTE:  not all union typecodes can be encoded as an array
-// of "long "values, but this one can.  Ones with discriminants
-// that are one or two bytes long can't easily be coded portably. 
-//
-// The benefit of doing it as an array of "long" values is
-// twofold:  (a) easier to read; (b) on most systems it's then
-// adequately aligned for the typecode interpreter to use, so
-// no additional runtime copy needs to be made.
-//
-static const CORBA_Long _oc_Cubit_oneof [] = {
-    1,				// byte order flag (TRICKY)
-    1, 0,			// omitted repository/type ID
-    1, 0,			// omitted struct name, "oneof"
-
-    //
-    // discriminant typecode:
-    //
-    tk_enum,		// tk_enum
-	72,			// encapsulation length
-
-        1,			// byte order flag (TRICKY)
-        1, 0,			// omitted repository/type ID
-        1, 0,			// omitted enum name, "discrim"
-        6,			// 5 elements in the enum
-
-        1, 0,			// omitted member name, "e_0th"
-        1, 0,			// omitted member name, "e_1st"
-        1, 0,			// omitted member name, "e_2nd"
-        1, 0,			// omitted member name, "e_3rd" 
-        1, 0,			// omitted member name, "e_4th" 
-        1, 0,			// omitted member name, "e_5th" 
-
-    4,				// default member index (zero based)
-    5,				// number of union members
-
-    // the 1st union branch arm
-    e_0th,			// member label value
-    1, 0,			// omitted member name, "o"
-    tk_octet,		// member typecode
-
-    // the 2nd union branch arm
-    e_1st,			// member label value
-    1, 0,			// omitted member name, "s"
-    tk_short,		// member typecode
-
-    // the 3rd union branch arm
-    e_2nd,			// member label value
-    1, 0,			// omitted member name, "l"
-    tk_long,		// member typecode
-
-    // the 4th union branch arm
-    e_3rd,			// member label value
-    1, 0,			// omitted member name, "cm"
-
-    // the 4th union member typecode
-    tk_struct,		// tk_struct
-	60,			// encap length
-
-        1,			// byte order flag (TRICKY)
-        1, 0,			// omitted repository/type ID
-        1, 0,			// omitted struct name, "Many"
-        3,			// three struct members
-
-        // First structure element
-        1, 0,			// omitted member name, "o"
-        tk_octet,	// member type, tk_octet
-
-        // Second structure element
-        1, 0,			// omitted member name, "l"
-        tk_long,	// member type, tk_long
-
-        // Third structure element
-        1, 0,			// omitted member name, "s"
-        tk_short,	// member type, tk_short
-
-    // the 5th union branch arm
-    4,				// the 5th member label value
-    1, 0,			// omitted member name, "cm"
-    ~0,				// indirected typecode (~0)
-	-84			// offset to struct "Many" typecode
-};
-
-static CORBA_TypeCode _tc_Cubit_oneof (tk_union,
-    (sizeof _oc_Cubit_oneof), (unsigned char *) &_oc_Cubit_oneof,
-    CORBA_B_FALSE);
-CORBA_TypeCode_ptr TC_Cubit_oneof = &_tc_Cubit_oneof;
-
-static const TAO_Param_Data Cubit_cube_union_params [] = {
-    { &_tc_Cubit_oneof, PARAM_RETURN, sizeof (Cubit_oneof) },
-    { &_tc_Cubit_oneof, PARAM_IN, 0 }
-};
-
-static const TAO_Call_Data Cubit_cube_union_calldata = {
-    "cube_union", CORBA_B_TRUE,
-    2, &Cubit_cube_union_params [0],
-    0, 0
-};
-
-Cubit_oneof *
-Cubit_cube_union (Cubit_ptr target,
-		  Cubit_oneof &values,
-		  CORBA_Environment &env)
-{
-  Cubit_oneof		*retval;
-  STUB_Object		*data;
-
-  if (target->QueryInterface (IID_STUB_Object, (void **)&data) != NOERROR)
-    env.exception (new CORBA_INV_OBJREF (COMPLETED_NO));
-  else
-    {
-      data->do_call (env, &Cubit_cube_union_calldata,
-		     &retval, &values);
-      data->Release ();
-    }
-  return retval;
-}
-
-
-static void
-_cube_union_skel (CORBA_ServerRequest &req,
-		  CORBA_Object_ptr obj,
-		  CORBA_Environment &env)
-{
-  CORBA_NVList_ptr nvlist;
-  CORBA_NamedValue_ptr nv;
-  CORBA_Any temp_value (TC_Cubit_oneof);
-
-  req.orb()->create_list (0, nvlist);
-  nv = nvlist->add_value (0, temp_value, CORBA_ARG_IN, env);
-  dexc (env, "cube_union_3rd, add_value");
-
-  req.params (nvlist, env);
-  dexc (env, "cube_union_3rd, get params");
-
-  Cubit_oneof *v;
-  Cubit_oneof *r = new Cubit_oneof;
-
-  v = (Cubit_oneof *)nv->value ()->value ();
-  r->_disc = v->_disc;
-
-  switch (v->_disc) {
-  case e_0th:
-    r->o = (CORBA_Octet) (v->o * v->o * v->o);
-    break;
-
-  case e_1st:
-    r->s = (CORBA_Short) (v->s * v->s * v->s);
-    break;
-
-  case e_2nd:
-    r->l = v->l * v->l * v->l;
-    break;
-
-  case e_3rd:
-  default:
-    r->cm.o = (CORBA_Octet) (v->cm.o * v->cm.o * v->cm.o);
-    r->cm.s = (CORBA_Short) (v->cm.s * v->cm.s * v->cm.s);
-    r->cm.l = v->cm.l * v->cm.l * v->cm.l;
-    break;
-  }
-
-  CORBA_Any *any = new CORBA_Any (TC_Cubit_oneof, r, CORBA_B_TRUE);
-
-  req.result (any, env);
-  dexc (env, "cube_struct, result");
-}
-
-
-//
-// PLEASE EXIT
-//
-
-static const TAO_Call_Data Cubit_please_exit_calldata = {
-    "please_exit", CORBA_B_FALSE,
-    0, 0,
-    0, 0
-};
-
-void
-Cubit_please_exit (
-    Cubit_ptr		target,
-    CORBA_Environment	&env
-)
-{
-    STUB_Object		*data;
-
-    if (target->QueryInterface (IID_STUB_Object, (void **)&data)
-	    != NOERROR)
-	env.exception (new CORBA_INV_OBJREF (COMPLETED_NO));
-    else {
-	data->do_call (env, &Cubit_please_exit_calldata
-	    );
-	data->Release ();
-    }
-}
-
-static void
-_please_exit_skel (CORBA_ServerRequest &req,
-		   CORBA_Object_ptr obj,
-		   CORBA_Environment &env)
-{
-    dmsg ("I've been asked to shut down...");
-    req.oa ()->please_shutdown (env);
-    dexc (env, "please_exit, please_shutdown");
-}
-
-
-const CORBA_Char	*Cubit__id = (CORBA_Char *)
-    "IDL:Eng.SUN.COM/Cubit:1.1";
-
-
-//
-// table of all operations, used by operation dispatch to get to the
-// right skeleton ... could be sorted by the IDL compiler so bsearch
-// is effective, perhaps with help from opname hashes and a small cache
-// (e.g. like Obj-C?).  for now, just lsearch.
-//
-const TAO_Skel_Entry Cubit_operations [] = {
-    { &Cubit_cube_octet_calldata, _cube_octet_skel },
-    { &Cubit_cube_short_calldata, _cube_short_skel },
-    { &Cubit_cube_long_calldata, _cube_long_skel },
-    { &Cubit_cube_struct_calldata, _cube_struct_skel },
-    { &Cubit_cube_union_calldata, _cube_union_skel },
-    { &Cubit_please_exit_calldata, _please_exit_skel },
-    { 0, 0 }					// last entry
-};
diff --git a/TAO/IIOP/test/cubit.h b/TAO/IIOP/test/cubit.h
deleted file mode 100644
index 92dd6b381bd..00000000000
--- a/TAO/IIOP/test/cubit.h
+++ /dev/null
@@ -1,106 +0,0 @@
-// @(#)cubit.hh	1.1 95/09/10
-// Copyright 1994-1995 by Sun Microsystems Inc.
-// All Rights Reserved
-//
-// Hand-crafted C language binding glue ...
-//
-// This doesn't use C++ since doing the obvious derivation
-// (all parent interfaces are virtual public parents) makes
-// object references have different "views".  That is, a
-// pointer to a Cubit (i.e. a Cubit_ptr) would not have
-// the same binary value as a pointer to a CORBA_Object
-// (i.e. a CORBA_Object_ptr, generic objref).  That'd
-// mean lots of narrowing/widening/RTTI infrastructure.
-//
-
-#ifndef	_CUBIT_HH
-#define	_CUBIT_HH
-
-#ifdef	_MSC_VER
-#pragma	pack (push, 1)			// VC++, known padding rules
-#endif	// VC++
-
-#include <corba/orb.h>
-#include <corba/stub.h>
-
-
-//
-// C style binding
-//
-
-typedef CORBA_Object	Cubit;
-typedef Cubit *Cubit_ptr, *CubitRef;
-
-extern CORBA_TypeCode_ptr	TC_Cubit_Many;
-extern CORBA_TypeCode_ptr	TC_Cubit_oneof;
-
-struct Cubit_Many {
-    CORBA_Octet	o;
-    CORBA_Long	l;
-    CORBA_Short	s;
-};
-
-enum Cubit_discrim {e_0th = 0, e_1st = 1, e_2nd = 2,
-                    e_3rd = 3, e_4th = 4, e_5th = 5};
-
-struct Cubit_oneof {
-    Cubit_discrim          _disc;
-
-    union {    
-        CORBA_Octet	o;
-        CORBA_Short	s;
-        CORBA_Long	l;
-        Cubit_Many      cm;
-    };
-};
-
-CORBA_Octet
-Cubit_cube_octet (
-    Cubit_ptr		target,
-    CORBA_Octet	o,
-    CORBA_Environment	&env
-);
-
-CORBA_Short
-Cubit_cube_short (
-    Cubit_ptr		target,
-    CORBA_Short	s,
-    CORBA_Environment	&env
-);
-
-CORBA_Long
-Cubit_cube_long (
-    Cubit_ptr		target,
-    CORBA_Long		l,
-    CORBA_Environment	&env
-);
-
-Cubit_Many *
-Cubit_cube_struct (
-    Cubit_ptr		target,
-    Cubit_Many		&values,
-    CORBA_Environment	&env
-);
-
-Cubit_oneof *
-Cubit_cube_union (
-    Cubit_ptr		target,
-    Cubit_oneof         &values,
-    CORBA_Environment	&env
-);
-
-void
-Cubit_please_exit (
-    Cubit_ptr		target,
-    CORBA_Environment	&env
-);
-
-extern const CORBA_Char *Cubit__id;		// type ID
-
-extern const TAO_Skel_Entry Cubit_operations [];
-
-#ifdef	_MSC_VER
-#pragma	pack (pop)			// VC++, go back to other padding rules
-#endif	// VC++
-
-#endif	// _CUBIT_HH
diff --git a/TAO/IIOP/test/cubit.idl b/TAO/IIOP/test/cubit.idl
deleted file mode 100644
index d9b38c34a2a..00000000000
--- a/TAO/IIOP/test/cubit.idl
+++ /dev/null
@@ -1,40 +0,0 @@
-// @(#)cubit.idl	1.1 95/09/10
-// Copyright 1994-1995 by Sun Microsystems, Inc.
-
-#pragma prefix	"Eng.SUN.COM"
-#pragma version Cubit 1.1
-
-interface Cubit {
-    octet	cube_octet (in octet o);
-    short	cube_short (in short s);
-    long	cube_long (in long l);
-
-    struct Many {
-	octet	o;		// + 3 bytes padding (normally) ...
-	long	l;
-	short	s;		// + 2 bytes padding (normally) ...
-    };
-
-    Many	cube_struct (in Many values);
-
-    enum discrim {e_0th, e_1st, e_2nd, e_3rd, e_4th, e_5th};
-
-    union oneof
-    switch (discrim) {
-	// this is an easy union to interpret; no padding
-	// is needed between discriminant and value.
-      case e_0th:
-        octet		o;
-      case e_1st:
-        short		s;
-      case e_2nd:
-        long		l;
-      case e_3rd:
-      default:
-        Many		cm;
-    };
-
-    oneof	cube_union (in oneof values);
-
-    oneway void	please_exit ();
-};
diff --git a/TAO/IIOP/test/cubitC.cpp b/TAO/IIOP/test/cubitC.cpp
deleted file mode 100644
index 99416520c15..00000000000
--- a/TAO/IIOP/test/cubitC.cpp
+++ /dev/null
@@ -1,381 +0,0 @@
-// @(#)cubitC.cpp	05/14/97
-// Copyright 1994-1995 by Sun Microsystems Inc.
-// All Rights Reserved
-//
-// Modified version of Cubit Example written by Sun Microsystems Inc.
-// Modified by: Brian Mendel
-
-#include	"cubitC.h"		// for stubs ...
-
-Cubit_ptr Cubit::_duplicate(Cubit_ptr obj)
-{
-   if (obj)
-      obj->AddRef();
-
-   return obj;
-}
-
-Cubit_ptr Cubit::_narrow(CORBA_Object_ptr obj)
-{
-   CORBA_Environment env;
-   if (obj->_is_a("IDL:Cubit:1.0", env))
-   {
-      STUB_Object *istub;
-      if (obj->QueryInterface(IID_STUB_Object, (void **)&istub) != NOERROR)
-      {
-         return Cubit::_nil();
-      }
-      Cubit_ptr new_obj = new Cubit(istub);
-      return Cubit::_duplicate(new_obj);
-   }
-   return Cubit::_nil();
-}
-
-Cubit_ptr Cubit::_nil()
-{
-   return (Cubit_ptr)NULL;
-}
-
-//
-// CUBE OCTET
-//
-
-static const TAO_Param_Data Cubit_cube_octet_params [] = 
-{
-   { _tc_CORBA_Octet, PARAM_RETURN, 0 },
-   { _tc_CORBA_Octet, PARAM_IN, 0 }
-};
-    
-
-static const TAO_Call_Data Cubit_cube_octet_calldata = 
-{
-   "cube_octet", CORBA_B_TRUE,
-      2, &Cubit_cube_octet_params [0],
-      0, 0
-};
-
-
-CORBA_Octet
-Cubit::Cubit_cube_octet (CORBA_Octet       o, 
-                  CORBA_Environment &env)
-{
-   CORBA_Octet		retval;
-
-   STUB_Object *istub;
-   if (this->QueryInterface(IID_STUB_Object, (void **)&istub) != NOERROR)
-   {
-      env.exception(new CORBA_DATA_CONVERSION (COMPLETED_NO));
-      return 0;
-   }
-
-   istub->do_call (env, &Cubit_cube_octet_calldata,
-                        &retval, &o);
-   istub->Release ();
-
-   return retval;
-}
-
-
-//
-// CUBE SHORT
-//
-
-static const TAO_Param_Data Cubit_cube_short_params [] = 
-{
-   { _tc_CORBA_Short, PARAM_RETURN, 0 },
-   { _tc_CORBA_Short, PARAM_IN, 0 }
-};
-
-static const TAO_Call_Data Cubit_cube_short_calldata = 
-{
-   "cube_short", CORBA_B_TRUE,
-      2, &Cubit_cube_short_params [0],
-      0, 0
-};
-
-
-CORBA_Short
-Cubit::Cubit_cube_short (CORBA_Short       s,
-                  CORBA_Environment &env)
-{
-   CORBA_Short		retval;
-
-   STUB_Object *istub;
-   if (this->QueryInterface(IID_STUB_Object, (void **)&istub) != NOERROR)
-   {
-      env.exception(new CORBA_DATA_CONVERSION (COMPLETED_NO));
-      return 0;
-   }
-
-   istub->do_call(env, &Cubit_cube_short_calldata,
-                  &retval, &s);
-   
-   istub->Release ();
-   
-   return retval;
-}
-
-//
-// CUBE LONG
-//
-
-static const TAO_Param_Data Cubit_cube_long_params [] = 
-{
-   { _tc_CORBA_Long, PARAM_RETURN, 0 },
-   { _tc_CORBA_Long, PARAM_IN, 0 }
-};
-
-static const TAO_Call_Data Cubit_cube_long_calldata = 
-{
-   "cube_long", CORBA_B_TRUE,
-      2, &Cubit_cube_long_params [0],
-      0, 0
-};
-
-
-CORBA_Long
-Cubit::Cubit_cube_long (CORBA_Long        l,
-                 CORBA_Environment &env)
-{
-   CORBA_Long		retval;
-   
-   STUB_Object *istub;
-   if (this->QueryInterface(IID_STUB_Object, (void **)&istub) != NOERROR)
-   {
-      env.exception(new CORBA_DATA_CONVERSION (COMPLETED_NO));
-      return 0;
-   }
-   
-   istub->do_call (env, &Cubit_cube_long_calldata,
-                  &retval, &l);
-   istub->Release ();
-   
-   return retval;
-}
-
-
-//
-// Encapsulated parameters for struct "Cubit_Many" typecode.
-// None of these parameters is complicated, so this is just
-// a linear sequence of element encodings
-//
-// NOTE:  it's important that this be longword aligned!!
-//
-static const CORBA_Long _oc_Cubit_Many [] = 
-{
-   1,          // byte order flag (TRICKY!)
-      
-   1, 0,       // empty string:  repository/type ID
-   1, 0,       // empty string:  struct name
-      
-   3,          // three struct elements
-      
-   // First structure element:  name, typecode for Octet
-   1, 0,       // empty string:  name "o"
-   tk_octet,
-      
-   // Second structure element:  name, typecode for Long
-   1, 0,       // empty string:  name "l"
-   tk_long,
-      
-   // Third structure element:  name, typecode for Short
-   1, 0,       // empty string:  name "s"
-   tk_short,
-};
-
-static CORBA_TypeCode _tc_Cubit_Many (tk_struct,
-                                      sizeof _oc_Cubit_Many, (unsigned char *) &_oc_Cubit_Many,
-                                      CORBA_B_FALSE);
-CORBA_TypeCode_ptr TC_Cubit_Many = &_tc_Cubit_Many;
-
-
-//
-// CUBE STRUCT
-//
-
-static const TAO_Param_Data Cubit_cube_struct_params [] = 
-{
-   { &_tc_Cubit_Many, PARAM_RETURN, sizeof (Cubit_Many) },
-   { &_tc_Cubit_Many, PARAM_IN, 0 }
-};
-
-static const TAO_Call_Data Cubit_cube_struct_calldata = 
-{
-   "cube_struct", CORBA_B_TRUE,
-      2, &Cubit_cube_struct_params [0],
-      0, 0
-};
-
-Cubit_Many*
-Cubit::Cubit_cube_struct (Cubit_Many &values,
-                          CORBA_Environment &env)
-{
-   Cubit_Many		*retval;
-
-   STUB_Object *istub;
-   if (this->QueryInterface(IID_STUB_Object, (void **)&istub) != NOERROR)
-   {
-      env.exception(new CORBA_DATA_CONVERSION (COMPLETED_NO));
-      return 0;
-   }
-  
-   istub->do_call (env, &Cubit_cube_struct_calldata,
-                        &retval, &values);
-   istub->Release ();
-   
-   return retval;
-}
-
-
-//
-// CUBE UNION
-//
-
-//
-// NOTE:  not all union typecodes can be encoded as an array
-// of "long "values, but this one can.  Ones with discriminants
-// that are one or two bytes long can't easily be coded portably. 
-//
-// The benefit of doing it as an array of "long" values is
-// twofold:  (a) easier to read; (b) on most systems it's then
-// adequately aligned for the typecode interpreter to use, so
-// no additional runtime copy needs to be made.
-//
-static const CORBA_Long _oc_Cubit_oneof [] = 
-{
-   1,          // byte order flag (TRICKY)
-   1, 0,       // omitted repository/type ID
-   1, 0,       // omitted struct name, "oneof"
-   
-   //
-   // discriminant typecode:
-   //
-   tk_enum,    // tk_enum
-   72,         // encapsulation length
-   
-   1,          // byte order flag (TRICKY)
-   1, 0,       // omitted repository/type ID
-   1, 0,       // omitted enum name, "discrim"
-   6,          // 5 elements in the enum
-   
-   1, 0,       // omitted member name, "e_0th"
-   1, 0,       // omitted member name, "e_1st"
-   1, 0,       // omitted member name, "e_2nd"
-   1, 0,       // omitted member name, "e_3rd" 
-   1, 0,       // omitted member name, "e_4th" 
-   1, 0,       // omitted member name, "e_5th" 
-   
-   4,       	// default member index (zero based)
-   5,       	// number of union members
-   
-   // the 1st union branch arm
-   e_0th,       // member label value
-   1, 0,        // omitted member name, "o"
-   tk_octet,    // member typecode
-   
-   // the 2nd union branch arm
-   e_1st,      // member label value
-   1, 0,       // omitted member name, "s"
-   tk_short,   // member typecode
-   
-   // the 3rd union branch arm
-   e_2nd,      // member label value
-   1, 0,       // omitted member name, "l"
-   tk_long,    // member typecode
-   
-   // the 4th union branch arm
-   e_3rd,      // member label value
-   1, 0,       // omitted member name, "cm"
-   
-   // the 4th union member typecode
-   tk_struct,  // tk_struct
-   60,         // encap length
-   
-   1,          // byte order flag (TRICKY)
-   1, 0,       // omitted repository/type ID
-   1, 0,       // omitted struct name, "Many"
-   3,          // three struct members
-   
-   // First structure element
-   1, 0,       // omitted member name, "o"
-   tk_octet,   // member type, tk_octet
-   
-   // Second structure element
-   1, 0,       // omitted member name, "l"
-   tk_long,    // member type, tk_long
-   
-   // Third structure element
-   1, 0,       // omitted member name, "s"
-   tk_short,   // member type, tk_short
-   
-   // the 5th union branch arm
-   4,          // the 5th member label value
-   1, 0,       // omitted member name, "cm"
-   ~0,         // indirected typecode (~0)
-   -84         // offset to struct "Many" typecode
-};
-
-static CORBA_TypeCode _tc_Cubit_oneof (tk_union,
-                                       (sizeof _oc_Cubit_oneof), (unsigned char *) &_oc_Cubit_oneof,
-                                       CORBA_B_FALSE);
-CORBA_TypeCode_ptr TC_Cubit_oneof = &_tc_Cubit_oneof;
-
-static const TAO_Param_Data Cubit_cube_union_params [] = 
-{
-   { &_tc_Cubit_oneof, PARAM_RETURN, sizeof (Cubit_oneof) },
-   { &_tc_Cubit_oneof, PARAM_IN, 0 }
-};
-
-static const TAO_Call_Data Cubit_cube_union_calldata = 
-{
-   "cube_union", CORBA_B_TRUE,
-      2, &Cubit_cube_union_params [0],
-      0, 0
-};
-
-Cubit_oneof*
-Cubit::Cubit_cube_union (Cubit_oneof		&values,
-                  CORBA_Environment	&env)
-{
-   Cubit_oneof		*retval;
-
-   STUB_Object *istub;
-   if (this->QueryInterface(IID_STUB_Object, (void **)&istub) != NOERROR)
-   {
-      env.exception(new CORBA_DATA_CONVERSION (COMPLETED_NO));
-      return 0;
-   }
-
-   istub->do_call (env, &Cubit_cube_union_calldata,
-                  &retval, &values);
-   istub->Release ();
-   
-   return retval;
-}
-
-
-
-//
-// PLEASE EXIT
-//
-
-static const TAO_Call_Data Cubit_please_exit_calldata = 
-{
-   "please_exit", CORBA_B_FALSE,
-      0, 0,
-      0, 0
-};
-
-void
-Cubit::Cubit_please_exit (CORBA_Environment	&env)
-{
-   STUB_Object *istub;
-   if (this->QueryInterface(IID_STUB_Object, (void **)&istub) != NOERROR)
-   {
-      env.exception(new CORBA_DATA_CONVERSION (COMPLETED_NO));
-      return;
-   }
-
-   istub->do_call (env, &Cubit_please_exit_calldata);
-   istub->Release ();
-}
diff --git a/TAO/IIOP/test/cubitC.h b/TAO/IIOP/test/cubitC.h
deleted file mode 100644
index 8f9dfe53841..00000000000
--- a/TAO/IIOP/test/cubitC.h
+++ /dev/null
@@ -1,102 +0,0 @@
-// @(#)cubitC.h 05/14/97
-// Copyright 1994-1995 by Sun Microsystems Inc.
-// All Rights Reserved
-//
-// Modified version of Cubit Example written by Sun Microsystems Inc.
-// Modified by: Brian Mendel
-
-/**************************************************************************
-This file has been hand-crafted to work with the ORB API of the SUN's IIOP
-implementation 
-***************************************************************************/
-
-#ifndef	_CUBIT_HH
-#define	_CUBIT_HH
-
-#ifdef	_MSC_VER
-#pragma	pack (push, 1)			// VC++, known padding rules
-#endif	// VC++
-
-#include "corba/orb.h"
-#include "corba/stub.h"
-
-#include <iostream.h>
-
-extern CORBA_TypeCode_ptr	TC_Cubit_Many;
-extern CORBA_TypeCode_ptr	TC_Cubit_oneof;
-
-struct Cubit_Many 
-{
-   CORBA_Octet o;
-   CORBA_Long  l;
-   CORBA_Short s;
-};
-
-enum Cubit_discrim
-  { e_0th = 0, e_1st = 1, e_2nd = 2,
-    e_3rd = 3, e_4th = 4, e_5th = 5 };
-
-struct Cubit_oneof 
-{
-   Cubit_discrim  _disc;
-   
-   union 
-   {    
-      CORBA_Octet o;
-      CORBA_Short s;
-      CORBA_Long  l;
-      Cubit_Many  cm;
-   };
-};
-
-class Cubit;
-typedef Cubit *Cubit_ptr;
-typedef Cubit_ptr Cubit_ref;
-
-class Cubit : public virtual CORBA_Object
-{
-public:
- 
-   static Cubit_ptr _duplicate(Cubit_ptr obj);
-   static Cubit_ptr _narrow(CORBA_Object_ptr obj);
-   static Cubit_ptr _nil();
-
-   virtual 
-   CORBA_Octet Cubit_cube_octet (CORBA_Octet       o,
-                                 CORBA_Environment &env);
-
-   virtual 
-   CORBA_Short Cubit_cube_short (CORBA_Short       s,
-                                 CORBA_Environment &env);
-  
-   virtual 
-   CORBA_Long Cubit_cube_long (CORBA_Long        l,
-                               CORBA_Environment &env);
-  
-   virtual 
-   Cubit_Many* Cubit_cube_struct (Cubit_Many        &values,
-                                  CORBA_Environment &env);
-  
-   virtual 
-   Cubit_oneof* Cubit_cube_union (Cubit_oneof       &values,
-                                  CORBA_Environment &env);
-  
-   virtual 
-   void Cubit_please_exit (CORBA_Environment &env);
-
-protected:
-   Cubit() { }
-   Cubit(STUB_Object *objref)
-      : CORBA_Object(objref) { }
-   virtual ~Cubit() { }
-
-   
-};
-
-extern const CORBA_Char *Cubit__id;		// type ID
-
-#ifdef	_MSC_VER
-#pragma	pack (pop)			// VC++, go back to other padding rules
-#endif	// VC++
-
-#endif	// _CUBIT_HH
diff --git a/TAO/IIOP/test/cubitS.cpp b/TAO/IIOP/test/cubitS.cpp
deleted file mode 100644
index b153b71db1b..00000000000
--- a/TAO/IIOP/test/cubitS.cpp
+++ /dev/null
@@ -1,232 +0,0 @@
-// @(#)cubitS.cpp	05/14/97
-// Copyright 1994-1995 by Sun Microsystems Inc.
-// All Rights Reserved
-//
-// TEST:	hand-written C-style "Cubit" stubs and "skeletons"
-//
-
-#include	"cubitS.h"
-#include	"cubitC.cpp"
-
-#include "connect.h"
-#include "params.h"
-
-#include "corba/debug.h"    // ... and debugging
-#include "corba/optable.h"  // TAO Dynamic Operation Table
-#include "method_db.i"
-#include "iiopobj.h"
-
-#if defined(CUBIT_USE_DYNAMIC_HASH)
-TAO_Dynamic_Hash_OpTable tao_cubit_optable(7);  // Dynamic Operation Table
-#else
-TAO_Linear_OpTable tao_cubit_optable(7);
-#endif
-
-_skel_Cubit::_skel_Cubit(const char* obj_name)
-{
-  const char* mn = "_skel_Cubit::_skel_Cubit()";
-  
-   //  Initialize Method Database
-   initialize_method_db (&tao_cubit_optable);
-
-   char *type_id = "IDL:Cubit:1.0";
-   // CORBA_String type_id = "IDL:Cubit:1.0";
-   IIOP_Object *data;
-
-   CORBA_BOA_ptr oa = TAO_OA_PARAMS::instance()->oa();
-   if (oa == 0)
-     {
-       // We just have to assume that oa will be good, or we have to
-       // throw an exception.  For now we "assume", but we'll
-       ACE_ERROR((LM_ERROR, "(%P|%t) %s Unable to locate a valid object adapter\n", mn));
-       return;
-     }
-   
-   this->optable_ = &tao_cubit_optable;
-   data = new IIOP_Object(type_id);
-
-   data->profile.iiop_version.major = IIOP::MY_MAJOR;
-   data->profile.iiop_version.minor = IIOP::MY_MINOR;
-   data->profile.host = ACE_OS::strdup(oa->get_addr().get_host_name());
-   data->profile.port = oa->get_addr().get_port_number();
-   data->profile.object_key.length =  ACE_OS::strlen(obj_name);
-   data->profile.object_key.maximum = data->profile.object_key.length;
-   data->profile.object_key.buffer = new CORBA_Octet [(size_t)data->profile.object_key.length+1];
-   
-   ACE_OS::memcpy (data->profile.object_key.buffer,
-                   obj_name,
-                   data->profile.object_key.length+1);
-
-   this->set_parent(data);
-   this->sub_ = this;
-
-   if (oa->bind(data->profile.object_key, this) == -1)
-     {
-       ACE_ERROR((LM_ERROR, "(%P|%t) %s Unable to bind object to key '%s': %p\n", mn, data->profile.object_key.buffer));
-       return;
-     }
-}
-
-void
-_skel_Cubit::_cube_octet_skel(CORBA_ServerRequest &req,
-                              CORBA_Object_ptr    obj,
-                              CORBA_Environment   &env)
-{
-   CORBA_NVList_ptr		nvlist;
-   CORBA_NamedValue_ptr	nv;
-   CORBA_Any			temp_value (_tc_CORBA_Octet);
-   
-   req.orb()->create_list (0, nvlist);
-   nv = nvlist->add_value (0, temp_value, CORBA_ARG_IN, env);
-   dexc (env, "cube_octet, add value");
-   
-   req.params (nvlist, env);
-   dexc (env, "cube_octet, get params");
-   
-   // Call Implementation
-   CORBA_Octet		*value = new CORBA_Octet;
-   Cubit *the_cubit = (Cubit*)obj->get_subclass();
-
-   *value = the_cubit->Cubit_cube_octet(*(CORBA_Octet *)nv->value()->value(), env);
-
-   CORBA_Any *any = new CORBA_Any (_tc_CORBA_Octet, value, CORBA_B_TRUE);
-   
-   req.result (any, env);
-   dexc (env, "cube_octet, result");
-}
-
-void
-_skel_Cubit::_cube_short_skel (CORBA_ServerRequest &req,
-                               CORBA_Object_ptr    obj,
-                               CORBA_Environment   &env)
-{
-   CORBA_NVList_ptr		nvlist;
-   CORBA_NamedValue_ptr	nv;
-   CORBA_Any			temp_value (_tc_CORBA_Short);
-   
-   req.orb()->create_list (0, nvlist);
-   nv = nvlist->add_value (0, temp_value, CORBA_ARG_IN, env);
-   dexc (env, "cube_short, add_value");
-   
-   req.params (nvlist, env);
-   dexc (env, "cube_short, get params");
-   
-   // Call Implementation
-   CORBA_Short *value = new CORBA_Short;
-   Cubit *the_cubit = (Cubit*)obj->get_subclass();
-   *value = the_cubit->Cubit_cube_short(*(CORBA_Short *)nv->value ()->value (), env);
-   
-   CORBA_Any *any = new CORBA_Any (_tc_CORBA_Short, value, CORBA_B_TRUE);
-   
-   req.result (any, env);
-   dexc (env, "cube_short, result");
-}
-
-void
-_skel_Cubit::_cube_long_skel (CORBA_ServerRequest &req,
-                              CORBA_Object_ptr    obj,
-                              CORBA_Environment   &env)
-{
-   CORBA_NVList_ptr		nvlist;
-   CORBA_NamedValue_ptr	nv;
-   CORBA_Any			temp_value (_tc_CORBA_Long);
-   
-   req.orb()->create_list (0, nvlist);
-   nv = nvlist->add_value (0, temp_value, CORBA_ARG_IN, env);
-   dexc (env, "cube_long, add_value");
-   
-   req.params (nvlist, env);
-   dexc (env, "cube_long, get params");
-   
-   // Call Implementation
-   CORBA_Long		*value = new CORBA_Long;
-   Cubit *the_cubit = (Cubit*)obj->get_subclass();
-   *value = the_cubit->Cubit_cube_long(*(CORBA_Long *)nv->value ()->value (), env);
-   
-   CORBA_Any  		*any =
-      new CORBA_Any (_tc_CORBA_Long, value, CORBA_B_TRUE);
-   
-   req.result (any, env);
-   dexc (env, "cube_long, result");
-}
-
-void
-_skel_Cubit::_cube_struct_skel (CORBA_ServerRequest &req,
-                                CORBA_Object_ptr    obj,
-                                CORBA_Environment   &env)
-{
-   CORBA_NVList_ptr		nvlist;
-   CORBA_NamedValue_ptr	nv;
-   CORBA_Any			temp_value (TC_Cubit_Many);
-   
-   req.orb()->create_list (0, nvlist);
-   nv = nvlist->add_value (0, temp_value, CORBA_ARG_IN, env);
-   dexc (env, "cube_struct, add_value");
-   
-   req.params (nvlist, env);
-   dexc (env, "cube_struct, get params");
-   
-   // Call Implementation
-   Cubit_Many  *value;
-   Cubit *the_cubit = (Cubit*)obj->get_subclass();
-   value = the_cubit->Cubit_cube_struct(*(Cubit_Many*)nv->value()->value(), env);
-   
-   Cubit_Many  *retval = new Cubit_Many;
-   retval->o = (CORBA_Octet)value->o;
-   retval->s = (CORBA_Short)value->s;
-   retval->l = value->l;
-   
-   // dmsg2 ("cube struct.o, %d -> %d", value->o, retval->o);
-   // dmsg2 ("cube struct.s, %d -> %d", value->s, retval->s);
-   // dmsg2 ("cube struct.l, %d -> %d", value->l, retval->l);
-   
-   CORBA_Any *any = new CORBA_Any (TC_Cubit_Many, retval, CORBA_B_TRUE);
-   
-   req.result (any, env);
-   dexc (env, "cube_struct, result");
-}
-
-void
-_skel_Cubit::_cube_union_skel (CORBA_ServerRequest	&req,
-                               CORBA_Object_ptr    obj,
-                               CORBA_Environment   &env)
-{
-   CORBA_NVList_ptr		nvlist;
-   CORBA_NamedValue_ptr	nv;
-   CORBA_Any			temp_value (TC_Cubit_oneof);
-   
-   req.orb()->create_list (0, nvlist);
-   nv = nvlist->add_value (0, temp_value, CORBA_ARG_IN, env);
-   dexc (env, "cube_union_3rd, add_value");
-   
-   req.params (nvlist, env);
-   dexc (env, "cube_union_3rd, get params");
-   
-   // Call Implementation
-   Cubit_oneof    *v;
-   Cubit *the_cubit = (Cubit*)obj->get_subclass();
-   v = the_cubit->Cubit_cube_union(*(Cubit_oneof *)nv->value ()->value (), env);
-
-   Cubit_oneof    *r = new Cubit_oneof;
-   r->_disc = v->_disc;
-   r->o =    (CORBA_Octet) (v->o);
-   r->s =    (CORBA_Short) (v->s);
-   r->l =     v->l;
-   r->cm.o = (CORBA_Octet) (v->cm.o);
-   r->cm.s = (CORBA_Short) (v->cm.s);
-   r->cm.l =  v->cm.l;
-   
-   CORBA_Any *any = new CORBA_Any (TC_Cubit_oneof, r, CORBA_B_TRUE);
-   
-   req.result (any, env);
-   dexc (env, "cube_struct, result");
-}
-
-void
-_skel_Cubit::_please_exit_skel (CORBA_ServerRequest &req,
-                                CORBA_Object_ptr    obj,
-                                CORBA_Environment   &env)
-{
-   Cubit *the_cubit = (Cubit*)obj->get_subclass();
-   the_cubit->Cubit_please_exit(env);
-}
diff --git a/TAO/IIOP/test/cubitS.h b/TAO/IIOP/test/cubitS.h
deleted file mode 100644
index 84c07b741b0..00000000000
--- a/TAO/IIOP/test/cubitS.h
+++ /dev/null
@@ -1,82 +0,0 @@
-// @(#)cubitS.h 05/14/97
-// Copyright 1994-1995 by Sun Microsystems Inc.
-// All Rights Reserved
-//
-// Modified version of Cubit Example written by Sun Microsystems Inc.
-// Modified by: Brian Mendel
-
-/**************************************************************************
-This file has been hand-crafted to work with the ORB API of the SUN's IIOP
-implementation 
-***************************************************************************/
-
-#ifndef	_SKEL_CUBIT_HH
-#define	_SKEL_CUBIT_HH
-
-#include "cubitC.h"
-
-class _skel_Cubit;
-typedef _skel_Cubit *_skel_Cubit_ptr;
-typedef _skel_Cubit_ptr _skel_Cubit_ref;
-
-class _skel_Cubit : public Cubit
-{
-public:
-   virtual
-   CORBA_Octet Cubit_cube_octet (CORBA_Octet       o,
-                                 CORBA_Environment &env) = 0;
-   static 
-   void _cube_octet_skel(CORBA_ServerRequest &req,
-                         CORBA_Object_ptr    obj,
-                         CORBA_Environment   &env);
-
-   virtual
-   CORBA_Short Cubit_cube_short (CORBA_Short       s,
-                                 CORBA_Environment &env) = 0;
-  
-   static
-   void _cube_short_skel (CORBA_ServerRequest &req,
-                          CORBA_Object_ptr    obj,
-                          CORBA_Environment   &env);
-
-   virtual
-   CORBA_Long Cubit_cube_long (CORBA_Long        l,
-                               CORBA_Environment &env) = 0;
-  
-   static 
-   void _cube_long_skel (CORBA_ServerRequest &req,
-                         CORBA_Object_ptr    obj,
-                         CORBA_Environment   &env);
-
-   virtual
-   Cubit_Many* Cubit_cube_struct (Cubit_Many        &values,
-                                  CORBA_Environment &env) = 0;
-  
-   static 
-   void _cube_struct_skel (CORBA_ServerRequest &req,
-                           CORBA_Object_ptr    obj,
-                           CORBA_Environment   &env);
-
-   virtual 
-   Cubit_oneof* Cubit_cube_union (Cubit_oneof       &values,
-                                  CORBA_Environment &env) = 0;
-  
-   static 
-   void _cube_union_skel (CORBA_ServerRequest &req,
-                          CORBA_Object_ptr    obj,
-                          CORBA_Environment   &env);
-
-   virtual 
-   void Cubit_please_exit (CORBA_Environment &env) = 0;
-
-   static 
-   void _please_exit_skel (CORBA_ServerRequest  &req,
-                           CORBA_Object_ptr     obj,
-                           CORBA_Environment    &env);
-protected:
-   _skel_Cubit(const char* obj_name = 0);
-   virtual ~_skel_Cubit() { }
-
-};
-
-#endif	// _SKEL_CUBIT_HH
diff --git a/TAO/IIOP/test/cubit_i.cpp b/TAO/IIOP/test/cubit_i.cpp
deleted file mode 100644
index ae22b7cd12c..00000000000
--- a/TAO/IIOP/test/cubit_i.cpp
+++ /dev/null
@@ -1,91 +0,0 @@
-// @(#)cubit_i.cpp 05/14/97
-// Copyright 1994-1995 by Sun Microsystems Inc.
-// All Rights Reserved
-//
-// TEST:	hand-written Cubit Implementation
-//
-// Modified version of Cubit Example written by Sun Microsystems Inc.
-// Modified by: Brian Mendel
-
-#include	"cubit_i.h"
-
-#include	<corba/boa.h>    // ... and skeletons
-#include	<corba/debug.h>  // ... and debugging
-
-#include "connect.h"
-#include "params.h"
-
-Cubit_i::Cubit_i(const char* obj_name)
-: _skel_Cubit(obj_name)
-{
-}
-
-Cubit_i::~Cubit_i()
-{
-}
-
-CORBA_Octet
-Cubit_i::Cubit_cube_octet (CORBA_Octet       o,
-                           CORBA_Environment &env)
-{
-
-   return (CORBA_Octet) (o * o * o);
-}
-
-CORBA_Short
-Cubit_i::Cubit_cube_short (CORBA_Short       s, 
-                           CORBA_Environment &env)
-{
-   return (CORBA_Short) (s * s * s);
-}
-
-
-CORBA_Long
-Cubit_i::Cubit_cube_long (CORBA_Long        l,
-                          CORBA_Environment &env)
-{
-   return (CORBA_Long) (l * l * l);
-}
-
-Cubit_Many*
-Cubit_i::Cubit_cube_struct (Cubit_Many        &values,
-                            CORBA_Environment &env)
-{
-   values.o = values.o * values.o * values.o;
-   values.s = values.s * values.s * values.s;
-   values.l = values.l * values.l * values.l;
-   
-   return &values;
-}
-
-Cubit_oneof*
-Cubit_i::Cubit_cube_union (Cubit_oneof       &values,
-                           CORBA_Environment &env)
-{
-   switch (values._disc) {
-   case e_0th:
-      values.o = (CORBA_Octet) (values.o * values.o * values.o);
-      break;
-   case e_1st:
-      values.s = (CORBA_Short) (values.s * values.s * values.s);
-      break;
-   case e_2nd:
-      values.l = values.l * values.l * values.l;
-      break;
-   case e_3rd:
-   default:
-      values.cm.o = (CORBA_Octet) (values.cm.o * values.cm.o * values.cm.o);
-      values.cm.s = (CORBA_Short) (values.cm.s * values.cm.s * values.cm.s);
-      values.cm.l = values.cm.l * values.cm.l * values.cm.l;
-   }
-   return &values;
-}
-
-void Cubit_i::Cubit_please_exit (CORBA_Environment &env)
-{
-   TAO_OA_Parameters* params = TAO_OA_PARAMS::instance();
-   
-   dmsg ("I've been asked to shut down...");
-   params->oa()->please_shutdown(env);
-   dexc (env, "please_exit, please_shutdown");
-}
diff --git a/TAO/IIOP/test/cubit_i.h b/TAO/IIOP/test/cubit_i.h
deleted file mode 100644
index 6f4bee0d486..00000000000
--- a/TAO/IIOP/test/cubit_i.h
+++ /dev/null
@@ -1,54 +0,0 @@
-// @(#)cubit_i.cpp 05/14/97
-// Copyright 1994-1995 by Sun Microsystems Inc.
-// All Rights Reserved
-//
-// TEST:	hand-written Cubit Implementation
-//
-// Modified version of Cubit Example written by Sun Microsystems Inc.
-// Modified by: Brian Mendel
-
-/**************************************************************************
-This file has been hand-crafted to work with the ORB API of the SUN's IIOP
-implementation 
-***************************************************************************/
-
-#ifndef	_CUBIT_I_HH
-#define	_CUBIT_I_HH
-
-#include "cubitS.h"
-
-class Cubit_i;
-typedef Cubit_i *Cubit_i_ptr;
-typedef Cubit_i_ptr Cubit_i_ref;
-
-class Cubit_i : public _skel_Cubit
-{
-public:
-   Cubit_i(const char* obj_name = 0);
-   ~Cubit_i();
-   
-   virtual
-   CORBA_Octet Cubit_cube_octet (CORBA_Octet       o,
-                                 CORBA_Environment &env);
-
-   virtual
-   CORBA_Short Cubit_cube_short (CORBA_Short       s,
-                                 CORBA_Environment &env);
-  
-   virtual
-   CORBA_Long Cubit_cube_long (CORBA_Long        l,
-                               CORBA_Environment &env);
-  
-   virtual
-   Cubit_Many* Cubit_cube_struct (Cubit_Many        &values,
-                                  CORBA_Environment &env);
-  
-   virtual
-   Cubit_oneof* Cubit_cube_union (Cubit_oneof       &values,
-                                  CORBA_Environment &env);
-  
-   virtual
-   void Cubit_please_exit (CORBA_Environment &env);
-};
-
-#endif	// _CUBIT_I_HH
diff --git a/TAO/IIOP/test/method_db.i b/TAO/IIOP/test/method_db.i
deleted file mode 100644
index 6b77cdf040a..00000000000
--- a/TAO/IIOP/test/method_db.i
+++ /dev/null
@@ -1,67 +0,0 @@
-// @(#)method_db.i 05/14/97
-
-// This file provides a way of initializing the method database
-// Written by: Brian Mendel
-
-#include	"cubitS.h"
-
-static void
-is_a_skel (CORBA_ServerRequest &req,
-           CORBA_Object_ptr    obj,
-           CORBA_Environment   &env)
-{
-    CORBA_NVList_ptr		nvlist;
-    CORBA_NamedValue_ptr	nv;
-    CORBA_Any			temp_value (_tc_CORBA_String);
-
-    req.orb()->create_list (0, nvlist);
-    nv = nvlist->add_value (0, temp_value, CORBA_ARG_IN, env);
-
-    req.params (nvlist, env);
-    if (env.exception () != 0) 
-    {
-      dexc (env, "is_a_skel, get params");
-	   return;
-    }
-
-    CORBA_Boolean *retval;
-    CORBA_String value = *(CORBA_String *) nv->value()->value();
-
-    if (ACE_OS::strcmp ((char*)value, "IDL:Cubit:1.0") == 0
-    || ACE_OS::strcmp ((char *)value, _tc_CORBA_Object->id (env)) == 0)
-	   retval = new CORBA_Boolean (CORBA_B_TRUE);
-    else
-	   retval = new CORBA_Boolean (CORBA_B_FALSE);
-
-    CORBA_Any *any = new CORBA_Any (_tc_CORBA_Boolean, retval, CORBA_B_TRUE);
-
-    req.result (any, env);
-    dexc (env, "_is_a, result");
-}
-
-
-struct method_db
-{
-   CORBA_String opname;
-   TAO_Skeleton skel_ptr;
-};
-
-static const method_db cubit_operations[] = {
-   { "_is_a", &is_a_skel },
-   { "cube_octet", &_skel_Cubit::_cube_octet_skel },
-   { "cube_short", &_skel_Cubit::_cube_short_skel },
-   { "cube_long", &_skel_Cubit::_cube_long_skel },
-   { "cube_struct", &_skel_Cubit::_cube_struct_skel },
-   { "cube_union", &_skel_Cubit::_cube_union_skel },
-   { "please_exit", &_skel_Cubit::_please_exit_skel },
-   { 0, 0 }
-};
-   
-
-void initialize_method_db (TAO_Operation_Table *the_optable)
-{
-   for (int ndx = 0; ndx < 7; ndx++)
-      the_optable->bind(cubit_operations[ndx].opname, 
-                        cubit_operations[ndx].skel_ptr);
-   
-}
diff --git a/TAO/IIOP/test/results/Orbix b/TAO/IIOP/test/results/Orbix
deleted file mode 100644
index c3abce78d3f..00000000000
--- a/TAO/IIOP/test/results/Orbix
+++ /dev/null
@@ -1,133 +0,0 @@
-Cubit results over Ethernet with 20,000 calls
----------------------------------------------
-
-                               Clients  Latency (ms)            Calls/Sec
-
-MT-Orbix without filters       1        1.876                   533
-                               2        2.202                   454
-                               3        2.740                   364 
-
-MT-Orbix Thread-Per-Request    1        1.886                   530
-                               2        3.1                     322
-                               3        5.0                     200
-
-MT-Orbix Thread-Pool (25)      1        1.875                   533
-                               2        3.1                     322
-                               3        5.1                     196
-
-MT-Orbix Thread-Per-Session    1        2.002                   499
-                               2        3.306                   302
-                               3        5.15                    194
-        
-
-Cubit results over ATM with 20,000 calls
-----------------------------------------
-
-                               Clients  Latency (ms)            Calls/Sec
-
-MT-Orbix without filters       1        1.818                   550
-                               2        1.968                   508
-                               3        2.803                   356
-
-
-MT-Orbix Thread-Per-Request    1        1.846                   541
-                               2        3.1                     322
-                               3        4.98                    200
-
-MT-Orbix Thread-Pool (25)      1        1.913                   522
-                               2        3.18                    314
-                               3        5.1                     196
-
-MT-Orbix Thread-Per-Session    1        1.959                   510
-                               2        3.29                    303
-                               3        5.15                    194
-
-
-Prime_Factor results over ATM with 20,000 calls
------------------------------------------------
-
-                               Clients  Latency (ms)            Calls/Sec
-
-MT-Orbix without filters       1         7.918                  126
-                               2        14.300                   70                    
-                               3        21.000                   47
-
-
-MT-Orbix Thread-Per-Request    1         8.302                  120
-                               2        10.128                   98
-                               3        13.722                   72
-
-MT-Orbix Thread-Pool (25)      1         8.442                  118
-                               2        15.764                   63  
-                               3        22.595                   44
-
-MT-Orbix Thread-Per-Session    1         8.956                  111
-                               2         9.581                  104
-                               3        16.702                   59
-
-IO-intensive results over ATM with 20,000 calls
------------------------------------------------
-
-                               Clients  Latency (ms)            Calls/Sec
-
-MT-Orbix without filters       1        6.667                   149
-                               2       12.165                    82                    
-                               3       18.634                    54
-                                       
-                                       
-MT-Orbix Thread-Per-Request    1       6.812                    146
-                               2       6.937                    144
-                               3       7.706                    128
-                                       
-MT-Orbix Thread-Pool (25)      1       6.813                    146
-                               2       6.954                    144
-                               3       7.776                    128
-                                       
-MT-Orbix Thread-Per-Session    1       6.85                     145
-                               2       7.253                    137
-                               3       7.645                    130
-
-      TNF client-side profile for MT-Orbix without filters for 20000 calls
-
-Function name         %      self+desc.          mean     max      min     std.
-                     time       ms       calls  ms/call ms/call  ms/call   err
-________________________________________________________________________________
-cond_wait            6.23     4250.242   1824    2.330  106.171    1.205   0.091
-mutex_lock           0.23      159.830  56662    0.003    1.215    0.002   0.000
-mutex_unlock         0.22      146.756  56663    0.003    0.326    0.002   0.000
-cond_signal          0.09       61.030   1825    0.033    0.475    0.009   0.000
-rw_rdlock            0.01        7.179   1826    0.004    0.014    0.003   0.000
-rw_unlock            0.01        6.548   1827    0.004    0.014    0.003   0.000
-rw_wrlock            0.00        0.004      1    0.004    0.004    0.004   0.000
-
-       TNF server-side profile for MT-Orbix without filters for 20000 calls
-
-
-Function name         %      self+desc.          mean     max      min     std.
-                     time       ms       calls  ms/call ms/call  ms/call   err
-________________________________________________________________________________
-cond_timedwait       1.25      923.527    797    1.159   20.219    0.324   0.028
-mutex_lock           0.21      153.839  56435    0.003    4.342    0.002   0.000
-mutex_unlock         0.20      149.208  56433    0.003    3.559    0.002   0.000
-cond_signal          0.03       21.506    809    0.027    1.826    0.003   0.002
-rw_unlock            0.02       16.058   3224    0.005    2.915    0.003   0.001
-rw_rdlock            0.02       11.924   3221    0.004    0.087    0.003   0.000
-rw_wrlock            0.00        0.010      2    0.005    0.005    0.004   0.000
-
-       TNF server-side profile for MT-Orbix with thread-per-request for 20000 calls
-
-
-Function name         %      self+desc.          mean     max      min     std.
-                     time       ms       calls  ms/call ms/call  ms/call   err
-________________________________________________________________________________
-mutex_lock           0.55      797.890  57618    0.014    4.624    0.002   0.000
-cond_timedwait       0.52      748.560    478    1.566    3.918    0.222   0.019
-mutex_unlock         0.36      514.627  57616    0.009    3.975    0.002   0.000
-cond_signal          0.02       24.216   1151    0.021    1.161    0.002   0.001
-rw_rdlock            0.01       13.120   2301    0.006    1.180    0.003   0.001
-rw_unlock            0.01       10.575   2307    0.005    0.316    0.003   0.000
-thr_sigsetmask       0.00        1.949     30    0.065    1.064    0.013   0.035
-rw_wrlock            0.00        0.033      6    0.006    0.008    0.004   0.001
-
-
-
diff --git a/TAO/IIOP/test/results/TAO b/TAO/IIOP/test/results/TAO
deleted file mode 100644
index de4a7bf23ae..00000000000
--- a/TAO/IIOP/test/results/TAO
+++ /dev/null
@@ -1,92 +0,0 @@
-Cubit results over Ethernet with 20,000 calls
----------------------------------------------
-
-                                Clients         Latency (ms)      Calls/Sec
-                
-TAO reactive                    1               1.172             853
-                                2               1.342             745
-                                3               1.902             525
-
-TAO threaded version            1               1.174             851
-                                2               1.219             820
-                                3               1.600             625
-
-
-Cubit results over ATM with 20,000 calls
----------------------------------------------
-
-                                Clients         Latency (ms)      Calls/Sec
-
-TAO reactive                    1               1.161             861
-                                2               1.302             768
-                                3               1.732             577
-
-TAO threaded version            1               1.170             854
-                                2               1.3               769
-                                3               1.600             625
-
-
-Cubit results over ATM after optimizations with 20,000 calls
-------------------------------------------------------------
-
-                                Clients         Latency (ms)      Calls/Sec
-
-TAO reactive                    1               1.127             887
-                                2               1.238             807
-                                3               1.501             666
-
-TAO threaded version            1               1.057             946
-                                2               1.225             816
-                                3               1.471             679
-
-Prime_Factor results over ATM  with 20,000 calls
--------------------------------------------------
-
-                                Clients         Latency (ms)      Calls/Sec
-
-TAO reactive                    1               7.407             135
-                                2              13.7                73
-                                3              19.7                51    
-
-TAO threaded version            1               7.389             135
-                                2               8.080             124
-                                3              10.726              93
-
-IO-bound results over ATM  with 20,000 calls
---------------------------------------------
-
-                                Clients         Latency (ms)      Calls/Sec
-
-TAO reactive                    1               6.404             156
-                                2              11.909              83
-                                3              17.324              57
-                                               
-TAO threaded version            1               6.378             156
-                                2               6.449             155
-                                3               6.500             153
-
-
-
-
-                        Sample client-side profile for TAO for 20000 calls
-
-Function name         %      self+desc.          mean     max      min     std.
-                     time       ms       calls  ms/call ms/call  ms/call   err
-________________________________________________________________________________
-rw_rdlock            0.40      146.579  20006    0.007    1.200    0.005   0.000
-rw_unlock            0.25       91.386  20009    0.005    0.058    0.004   0.000
-mutex_lock           0.06       21.087   5265    0.004    0.178    0.002   0.000
-mutex_unlock         0.04       14.372   5271    0.003    0.075    0.002   0.000
-rw_wrlock            0.00        0.045      3    0.015    0.034    0.005   0.008
-
-
-                       Sample server-side profile for TAO for 20000 calls
-
-Function name         %      self+desc.          mean     max      min     std.
-                     time       ms       calls  ms/call ms/call  ms/call   err
-________________________________________________________________________________
-mutex_lock           1.12      154.491  54507    0.003    0.140    0.002   0.000
-mutex_unlock         1.06      145.638  54508    0.003    0.310    0.002   0.000
-rw_rdlock            0.27       37.265   6813    0.005    0.037    0.004   0.000
-rw_unlock            0.20       27.792   6813    0.004    0.045    0.004   0.000
-
diff --git a/TAO/IIOP/test/results/Visibroker b/TAO/IIOP/test/results/Visibroker
deleted file mode 100644
index 8d6bb2457c7..00000000000
--- a/TAO/IIOP/test/results/Visibroker
+++ /dev/null
@@ -1,79 +0,0 @@
-Cubit results over Ethernet with 20,000 calls
----------------------------------------------
-
-                               Clients  Latency (ms)          Calls/Sec
-
-
-Visibroker reactive            1        1.167                 856
-                               2        1.39                  718
-                               3        1.664                 600
-
-Visibroker thr-per-connection  1        1.077                 928
-                               2        1.228                 814
-                               3        1.789                 558
-        
-
-
-Cubit results over ATM with 20,000 calls
-----------------------------------------
-
-                               Clients  Latency (ms)          Calls/Sec
-
-Visibroker reactive            1        1.195                 836
-                               2        1.241                 805
-                               3        1.56                  641
-
-Visibroker thr-per-connection  1        1.060                 943
-                               2        1.327                 753
-                               3        2.108                 474
-
-
-Prime_Factor results over ATM with 20,000 calls
------------------------------------------------
-
-                               Clients  Latency (ms)            Calls/Sec
-
-Visibroker reactive            1         7.43                   134
-                               2        13.652                   73
-                               3        17.738                   56
-
-Visibroker thr-per-connection  1         7.371                  135
-                               2         8.561                  116
-                               3        11.376                   87
-
-IO-intensive results over ATM with 20,000 calls
------------------------------------------------
-
-                               Clients  Latency (ms)            Calls/Sec
-
-Visibroker reactive            1        6.424                   155
-                               2       11.895                    84
-                               3       17.468                    57
-                                       
-Visibroker thr-per-connection  1       6.41                     156
-                               2       6.496                    154
-                               3       6.524                    153
-
-
-
-
-                        TNF client-side profile for Visibroker for 20000 calls
-
-Function name         %      self+desc.          mean     max      min     std.
-                     time       ms       calls  ms/call ms/call  ms/call   err
-________________________________________________________________________________
-mutex_unlock         1.31      188.930  61797    0.003    1.027    0.002   0.000
-mutex_lock           1.21      175.465  61790    0.003    0.330    0.002   0.000
-
-
-                        TNF server-side profile for Visibroker for 20000 calls
-
-                                     Profile
-
-Function name         %      self+desc.          mean     max      min     std.
-                     time       ms       calls  ms/call ms/call  ms/call   err
-________________________________________________________________________________
-mutex_lock           0.18      165.141  60432    0.003    0.501    0.002   0.000
-mutex_unlock         0.16      153.891  60432    0.003    0.373    0.002   0.000
-
-
diff --git a/TAO/IIOP/test/results/orbs.xls b/TAO/IIOP/test/results/orbs.xls
deleted file mode 100644
index 149078dd383..00000000000
--- a/TAO/IIOP/test/results/orbs.xls
+++ /dev/null
diff --git a/TAO/IIOP/test/svr.cpp b/TAO/IIOP/test/svr.cpp
deleted file mode 100644
index 53fac60bf6d..00000000000
--- a/TAO/IIOP/test/svr.cpp
+++ /dev/null
@@ -1,212 +0,0 @@
-// @(#)svr.cpp	05/14/97
-// Copyright 1994-1995 by Sun Microsystems Inc.
-// All Rights Reserved
-//
-// TEST:	simple IIOP server for "cubit.idl" interface.
-//
-// Starts up, builds an objref, prints its string in debug mode, 
-// listens for messages, responds to them.
-//
-// Modified version of Cubit Example written by Sun Microsystems Inc.
-// Modified by: Brian Mendel
-
-#include "ace/Get_Opt.h"
-#include "ace/Log_Msg.h"
-
-#include "corba/orb.h"
-#include "corba/debug.h"
-#include "connect.h"
-
-#include "cubit_i.h"
-
-extern void
-print_exception (const CORBA_Exception *, const char *, FILE *f=stdout);
-
-// Global Variables
-CORBA_String key = (CORBA_String)"key0";
-int num_of_objs = 1;
-
-// = TITLE
-//     Parses the command line arguments and returns an error status
-//
-// = DESCRIPTION
-//     This method parses the command line arguments
-int parse_args(int argc, char *argv[])
-{
-   ACE_Get_Opt opts (argc, argv, "dk:n:");
-   int			c;
-   
-   while ((c = opts ()) != -1)
-      switch (c) {
- 
-      case 'd':  // debug flag
-         TAO_debug_level++;
-         continue;
-   
-      case 'k':			// key (str)
-         key = (CORBA_String) opts.optarg;
-         continue;
-   
-      case 'n':			// idle seconds b4 exit
-         num_of_objs = ACE_OS::atoi(opts.optarg);
-         continue;
-
-      case '?':
-      default:
-         ACE_OS::fprintf (stderr, "usage:  %s"
-            " [-d]"
-            " [-k {object_key}]"
-            "\n", argv [0]
-            );
-         return 1;
-      }
-   
-   return 0;  // Indicates successful parsing of command line
-}
-
-
-//
-// Standard command line parsing utilities used.
-//
-int
-main (int    argc, char   *argv[])
-{
-  CORBA_Environment	env;
-  CORBA_Object_ptr obj = 0;
-  CORBA_ORB_ptr	orb_ptr;
-  CORBA_BOA_ptr   oa_ptr;
-  char		*orb_name = "internet";
-  int			idle = -1;
-
-  orb_ptr = CORBA_ORB_init (argc, argv, orb_name, env);
-  if (env.exception () != 0) {
-    print_exception (env.exception (), "ORB init");
-    return 1;
-  }
-
-  // Initialize the Basic Object Adapter
-  oa_ptr = orb_ptr->BOA_init(argc, argv, "ROA");
-  if (oa_ptr == 0)
-    ACE_ERROR_RETURN((LM_ERROR, "(%P|%t) Unable to initialize the BOA.\n"), 1);
-  
-
-  //
-  // Parse remaining command line and verify parameters.
-  //
-  parse_args(argc, argv);
-  
-  // Create implementation object with user specified key
-  Cubit_i_ptr  *my_cubit = new Cubit_i_ptr[num_of_objs];
-  for (int ndx = 0; ndx < num_of_objs; ndx++)
-  {
-     CORBA_String obj_str = CORBA_string_alloc(ACE_OS::strlen ((char *)key)+2);
-     sprintf(obj_str, "%s%d", (char*)key, ndx);
-     my_cubit[ndx] = new Cubit_i(obj_str);
-     if (my_cubit[ndx] == 0)
-        ACE_ERROR_RETURN((LM_ERROR, "(%P|%t) Unable to create implementation object&d\n", ndx), 2);
-
-     if (TAO_debug_level >= 1)
-     {
-         // Why are we getting the BOA_ptr from here when we've already
-         // got it above?
-         CORBA_OctetSeq	obj_key;
-         obj_key.buffer = (CORBA_Octet *) obj_str;
-         obj_key.length = obj_key.maximum = ACE_OS::strlen (obj_str);
-     
-         if (oa_ptr->find(obj_key, obj) == -1)
-           ACE_ERROR_RETURN((LM_ERROR, "(%P|%t) Unable to locate object with key '%s', %p\n", key), 3);
-     
-         //
-         // Stringify the objref we'll be implementing, and
-         // print it to stdout.  Someone will take that string
-         // and give it to some client.  Then release the object.
-         //
-         CORBA_String	str;
-         
-         str = orb_ptr->object_to_string (obj, env);
-         if (env.exception () != 0) {
-            print_exception (env.exception (), "object2string");
-            return 1;
-         }
-         ACE_OS::puts ((char *)str);
-         ACE_OS::fflush (stdout);
-         dmsg1 ("Object Created at: '%ul'", obj);
-         dmsg1 ("listening as object '%s'", str);
-         
-     }
-     CORBA_string_free(obj_str);  
-  }
-//  Cubit_i_ptr  my_cubit = new Cubit_i(key);
-//  if (my_cubit1 == 0)
-//    ACE_ERROR_RETURN((LM_ERROR, "(%P|%t) Unable to create implementation object\n"), 2);
-
-/*  if (TAO_debug_level >= 1)
-    {
-      // Why are we getting the BOA_ptr from here when we've already
-      // got it above?
-      CORBA_OctetSeq	obj_key;
-      obj_key.buffer = (CORBA_Octet *) key;
-      obj_key.length = obj_key.maximum = ACE_OS::strlen ((char *)key);
-     
-      if (oa_ptr->find(obj_key, obj) == -1)
-        ACE_ERROR_RETURN((LM_ERROR, "(%P|%t) Unable to locate object with key '%s', %p\n", key), 3);
-     
-      //
-      // Stringify the objref we'll be implementing, and
-      // print it to stdout.  Someone will take that string
-      // and give it to some client.  Then release the object.
-      //
-      CORBA_String	str;
-     
-      str = orb_ptr->object_to_string (obj, env);
-      if (env.exception () != 0) {
-        print_exception (env.exception (), "object2string");
-        return 1;
-      }
-      ACE_OS::puts ((char *)str);
-      ACE_OS::fflush (stdout);
-      dmsg1 ("listening as object '%s'", str);
-
-      obj_key.buffer = (CORBA_Octet *)"key1";
-      obj_key.length = obj_key.maximum = 4;
-      if (oa_ptr->find(obj_key, obj) == -1)
-        ACE_ERROR_RETURN((LM_ERROR, "(%P|%t) Unable to locate object with key '%s', %p\n", key), 3);
-
-      str = orb_ptr->object_to_string (obj, env);
-      if (env.exception () != 0) {
-        print_exception (env.exception (), "object2string");
-        return 1;
-      }
-      ACE_OS::puts ((char *)str);
-      ACE_OS::fflush (stdout);
-      dmsg1 ("listening as object '%s'", str);
-    }
-*/
-  // Handle requests for this object until we're killed, or one of
-  // the methods asks us to exit.
-  //
-  int terminationStatus = 0;
-
-
-#if !defined(USE_HOMEBREW_EVENT_LOOP)
-  ACE_Reactor::run_event_loop();
-#else
-  while (1)
-    {
-      int result = params->reactor()->handle_events ();
-
-      if (result == -1)
-	{
-	  terminationStatus = -1;
-	  break;
-	}
-    }
-#endif
-
-  //
-  // Shut down the OA -- recycles all underlying resources (e.g. file
-  // descriptors, etc).
-  //
-  oa_ptr->clean_shutdown (env);
-  return 0;
-}
diff --git a/TAO/IIOP/test/test.mak b/TAO/IIOP/test/test.mak
deleted file mode 100644
index a27147d5f32..00000000000
--- a/TAO/IIOP/test/test.mak
+++ /dev/null
@@ -1,463 +0,0 @@
-# Microsoft Developer Studio Generated NMAKE File, Format Version 4.20

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Console Application" 0x0103

-

-!IF "$(CFG)" == ""

-CFG=server - Win32 Debug

-!MESSAGE No configuration specified.  Defaulting to server - Win32 Debug.

-!ENDIF 

-

-!IF "$(CFG)" != "client - Win32 Release" && "$(CFG)" != "client - Win32 Debug"\

- && "$(CFG)" != "server - Win32 Release" && "$(CFG)" != "server - Win32 Debug"

-!MESSAGE Invalid configuration "$(CFG)" specified.

-!MESSAGE You can specify a configuration when running NMAKE on this makefile

-!MESSAGE by defining the macro CFG on the command line.  For example:

-!MESSAGE 

-!MESSAGE NMAKE /f "test.mak" CFG="server - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "client - Win32 Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "client - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE "server - Win32 Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "server - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE 

-!ERROR An invalid configuration is specified.

-!ENDIF 

-

-!IF "$(OS)" == "Windows_NT"

-NULL=

-!ELSE 

-NULL=nul

-!ENDIF 

-################################################################################

-# Begin Project

-# PROP Target_Last_Scanned "server - Win32 Debug"

-RSC=rc.exe

-CPP=cl.exe

-

-!IF  "$(CFG)" == "client - Win32 Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "client\Release"

-# PROP BASE Intermediate_Dir "client\Release"

-# PROP BASE Target_Dir "client"

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir ""

-# PROP Intermediate_Dir "Release"

-# PROP Target_Dir "client"

-OUTDIR=.

-INTDIR=.\Release

-

-ALL : "$(OUTDIR)\client.exe"

-

-CLEAN : 

-	-@erase "$(INTDIR)\clnt.obj"

-	-@erase "$(INTDIR)\cubitC.obj"

-	-@erase "$(OUTDIR)\client.exe"

-

-"$(INTDIR)" :

-    if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"

-

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\proto\include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "..\proto\include" /D "WIN32" /D "NDEBUG"\

- /D "_CONSOLE" /Fp"$(INTDIR)/client.pch" /YX /Fo"$(INTDIR)/" /c 

-CPP_OBJS=.\Release/

-CPP_SBRS=.\.

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-BSC32_FLAGS=/nologo /o"$(OUTDIR)/client.bsc" 

-BSC32_SBRS= \

-	

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 ace.lib ..\lib\TAO.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-LINK32_FLAGS=ace.lib ..\lib\TAO.lib kernel32.lib user32.lib gdi32.lib\

- winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib\

- uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /incremental:no\

- /pdb:"$(OUTDIR)/client.pdb" /machine:I386 /out:"$(OUTDIR)/client.exe" 

-LINK32_OBJS= \

-	"$(INTDIR)\clnt.obj" \

-	"$(INTDIR)\cubitC.obj"

-

-"$(OUTDIR)\client.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)

-    $(LINK32) @<<

-  $(LINK32_FLAGS) $(LINK32_OBJS)

-<<

-

-!ELSEIF  "$(CFG)" == "client - Win32 Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "client\Debug"

-# PROP BASE Intermediate_Dir "client\Debug"

-# PROP BASE Target_Dir "client"

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir ""

-# PROP Intermediate_Dir "Debug"

-# PROP Target_Dir "client"

-OUTDIR=.

-INTDIR=.\Debug

-

-ALL : "$(OUTDIR)\client.exe"

-

-CLEAN : 

-	-@erase "$(INTDIR)\clnt.obj"

-	-@erase "$(INTDIR)\cubitC.obj"

-	-@erase "$(INTDIR)\vc40.idb"

-	-@erase "$(INTDIR)\vc40.pdb"

-	-@erase "$(OUTDIR)\client.exe"

-	-@erase "$(OUTDIR)\client.ilk"

-	-@erase "$(OUTDIR)\client.pdb"

-

-"$(INTDIR)" :

-    if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"

-

-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\proto\include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c

-CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\proto\include" /D "WIN32" /D\

- "_DEBUG" /D "_CONSOLE" /Fp"$(INTDIR)/client.pch" /YX /Fo"$(INTDIR)/"\

- /Fd"$(INTDIR)/" /c 

-CPP_OBJS=.\Debug/

-CPP_SBRS=.\.

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-BSC32_FLAGS=/nologo /o"$(OUTDIR)/client.bsc" 

-BSC32_SBRS= \

-	

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386

-# ADD LINK32 aced.lib ..\lib\TAO.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386

-LINK32_FLAGS=aced.lib ..\lib\TAO.lib kernel32.lib user32.lib gdi32.lib\

- winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib\

- uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /incremental:yes\

- /pdb:"$(OUTDIR)/client.pdb" /debug /machine:I386 /out:"$(OUTDIR)/client.exe" 

-LINK32_OBJS= \

-	"$(INTDIR)\clnt.obj" \

-	"$(INTDIR)\cubitC.obj"

-

-"$(OUTDIR)\client.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)

-    $(LINK32) @<<

-  $(LINK32_FLAGS) $(LINK32_OBJS)

-<<

-

-!ELSEIF  "$(CFG)" == "server - Win32 Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "server\Release"

-# PROP BASE Intermediate_Dir "server\Release"

-# PROP BASE Target_Dir "server"

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir ""

-# PROP Intermediate_Dir "Release"

-# PROP Target_Dir "server"

-OUTDIR=.

-INTDIR=.\Release

-

-ALL : "$(OUTDIR)\server.exe"

-

-CLEAN : 

-	-@erase "$(INTDIR)\cubit_i.obj"

-	-@erase "$(INTDIR)\cubitS.obj"

-	-@erase "$(INTDIR)\svr.obj"

-	-@erase "$(OUTDIR)\server.exe"

-

-"$(INTDIR)" :

-    if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"

-

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\proto\include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "..\proto\include" /D "WIN32" /D "NDEBUG"\

- /D "_CONSOLE" /Fp"$(INTDIR)/server.pch" /YX /Fo"$(INTDIR)/" /c 

-CPP_OBJS=.\Release/

-CPP_SBRS=.\.

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-BSC32_FLAGS=/nologo /o"$(OUTDIR)/server.bsc" 

-BSC32_SBRS= \

-	

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 ace.lib ..\lib\TAO.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-LINK32_FLAGS=ace.lib ..\lib\TAO.lib kernel32.lib user32.lib gdi32.lib\

- winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib\

- uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /incremental:no\

- /pdb:"$(OUTDIR)/server.pdb" /machine:I386 /out:"$(OUTDIR)/server.exe" 

-LINK32_OBJS= \

-	"$(INTDIR)\cubit_i.obj" \

-	"$(INTDIR)\cubitS.obj" \

-	"$(INTDIR)\svr.obj"

-

-"$(OUTDIR)\server.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)

-    $(LINK32) @<<

-  $(LINK32_FLAGS) $(LINK32_OBJS)

-<<

-

-!ELSEIF  "$(CFG)" == "server - Win32 Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "server\Debug"

-# PROP BASE Intermediate_Dir "server\Debug"

-# PROP BASE Target_Dir "server"

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir ""

-# PROP Intermediate_Dir "Debug"

-# PROP Target_Dir "server"

-OUTDIR=.

-INTDIR=.\Debug

-

-ALL : "$(OUTDIR)\server.exe"

-

-CLEAN : 

-	-@erase "$(INTDIR)\cubit_i.obj"

-	-@erase "$(INTDIR)\cubitS.obj"

-	-@erase "$(INTDIR)\svr.obj"

-	-@erase "$(INTDIR)\vc40.idb"

-	-@erase "$(INTDIR)\vc40.pdb"

-	-@erase "$(OUTDIR)\server.exe"

-	-@erase "$(OUTDIR)\server.ilk"

-	-@erase "$(OUTDIR)\server.pdb"

-

-"$(INTDIR)" :

-    if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"

-

-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\proto\include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c

-CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\proto\include" /D "WIN32" /D\

- "_DEBUG" /D "_CONSOLE" /Fp"$(INTDIR)/server.pch" /YX /Fo"$(INTDIR)/"\

- /Fd"$(INTDIR)/" /c 

-CPP_OBJS=.\Debug/

-CPP_SBRS=.\.

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-BSC32_FLAGS=/nologo /o"$(OUTDIR)/server.bsc" 

-BSC32_SBRS= \

-	

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386

-# ADD LINK32 aced.lib ..\lib\TAO.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386

-LINK32_FLAGS=aced.lib ..\lib\TAO.lib kernel32.lib user32.lib gdi32.lib\

- winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib\

- uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /incremental:yes\

- /pdb:"$(OUTDIR)/server.pdb" /debug /machine:I386 /out:"$(OUTDIR)/server.exe" 

-LINK32_OBJS= \

-	"$(INTDIR)\cubit_i.obj" \

-	"$(INTDIR)\cubitS.obj" \

-	"$(INTDIR)\svr.obj"

-

-"$(OUTDIR)\server.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)

-    $(LINK32) @<<

-  $(LINK32_FLAGS) $(LINK32_OBJS)

-<<

-

-!ENDIF 

-

-.c{$(CPP_OBJS)}.obj:

-   $(CPP) $(CPP_PROJ) $<  

-

-.cpp{$(CPP_OBJS)}.obj:

-   $(CPP) $(CPP_PROJ) $<  

-

-.cxx{$(CPP_OBJS)}.obj:

-   $(CPP) $(CPP_PROJ) $<  

-

-.c{$(CPP_SBRS)}.sbr:

-   $(CPP) $(CPP_PROJ) $<  

-

-.cpp{$(CPP_SBRS)}.sbr:

-   $(CPP) $(CPP_PROJ) $<  

-

-.cxx{$(CPP_SBRS)}.sbr:

-   $(CPP) $(CPP_PROJ) $<  

-

-################################################################################

-# Begin Target

-

-# Name "client - Win32 Release"

-# Name "client - Win32 Debug"

-

-!IF  "$(CFG)" == "client - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "client - Win32 Debug"

-

-!ENDIF 

-

-################################################################################

-# Begin Source File

-

-SOURCE=.\clnt.cpp

-DEP_CPP_CLNT_=\

-	"..\..\..\ace\config-win32.h"\

-	".\cubitC.h"\

-	{$(INCLUDE)}"\ace\ACE.h"\

-	{$(INCLUDE)}"\ace\ACE.i"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.cpp"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.h"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.i"\

-	{$(INCLUDE)}"\ace\config-win32-common.h"\

-	{$(INCLUDE)}"\ace\config.h"\

-	{$(INCLUDE)}"\ace\Get_Opt.h"\

-	{$(INCLUDE)}"\ace\Get_Opt.i"\

-	{$(INCLUDE)}"\ace\Log_Msg.h"\

-	{$(INCLUDE)}"\ace\Log_Priority.h"\

-	{$(INCLUDE)}"\ace\Log_Record.h"\

-	{$(INCLUDE)}"\ace\Log_Record.i"\

-	{$(INCLUDE)}"\ace\Object_Manager.h"\

-	{$(INCLUDE)}"\ace\Object_Manager.i"\

-	{$(INCLUDE)}"\ace\OS.h"\

-	{$(INCLUDE)}"\ace\OS.i"\

-	{$(INCLUDE)}"\ace\SString.h"\

-	{$(INCLUDE)}"\ace\SString.i"\

-	{$(INCLUDE)}"\ace\stdcpp.h"\

-	{$(INCLUDE)}"\ace\Trace.h"\

-	{$(INCLUDE)}"\ace\ws2tcpip.h"\

-	

-NODEP_CPP_CLNT_=\

-	".\corba\orb.h"\

-	".\corba\stub.h"\

-	

-

-"$(INTDIR)\clnt.obj" : $(SOURCE) $(DEP_CPP_CLNT_) "$(INTDIR)"

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\cubitC.cpp

-DEP_CPP_CUBIT=\

-	".\cubitC.h"\

-	

-NODEP_CPP_CUBIT=\

-	".\corba\orb.h"\

-	".\corba\stub.h"\

-	

-

-"$(INTDIR)\cubitC.obj" : $(SOURCE) $(DEP_CPP_CUBIT) "$(INTDIR)"

-

-

-# End Source File

-# End Target

-################################################################################

-# Begin Target

-

-# Name "server - Win32 Release"

-# Name "server - Win32 Debug"

-

-!IF  "$(CFG)" == "server - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "server - Win32 Debug"

-

-!ENDIF 

-

-################################################################################

-# Begin Source File

-

-SOURCE=.\cubitS.cpp

-DEP_CPP_CUBITS=\

-	".\cubitC.cpp"\

-	".\cubitC.h"\

-	".\cubitS.h"\

-	".\method_db.i"\

-	

-NODEP_CPP_CUBITS=\

-	".\connect.h"\

-	".\corba\debug.h"\

-	".\corba\optable.h"\

-	".\corba\orb.h"\

-	".\corba\stub.h"\

-	".\iiopobj.h"\

-	".\params.h"\

-	

-

-"$(INTDIR)\cubitS.obj" : $(SOURCE) $(DEP_CPP_CUBITS) "$(INTDIR)"

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\cubit_i.cpp

-DEP_CPP_CUBIT_=\

-	".\cubit_i.h"\

-	".\cubitC.h"\

-	".\cubitS.h"\

-	

-NODEP_CPP_CUBIT_=\

-	".\connect.h"\

-	".\corba\orb.h"\

-	".\corba\stub.h"\

-	".\params.h"\

-	

-

-"$(INTDIR)\cubit_i.obj" : $(SOURCE) $(DEP_CPP_CUBIT_) "$(INTDIR)"

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\svr.cpp

-DEP_CPP_SVR_C=\

-	"..\..\..\ace\config-win32.h"\

-	".\cubit_i.h"\

-	".\cubitC.h"\

-	".\cubitS.h"\

-	{$(INCLUDE)}"\ace\ACE.h"\

-	{$(INCLUDE)}"\ace\ACE.i"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.cpp"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.h"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.i"\

-	{$(INCLUDE)}"\ace\config-win32-common.h"\

-	{$(INCLUDE)}"\ace\config.h"\

-	{$(INCLUDE)}"\ace\Get_Opt.h"\

-	{$(INCLUDE)}"\ace\Get_Opt.i"\

-	{$(INCLUDE)}"\ace\Log_Msg.h"\

-	{$(INCLUDE)}"\ace\Log_Priority.h"\

-	{$(INCLUDE)}"\ace\Log_Record.h"\

-	{$(INCLUDE)}"\ace\Log_Record.i"\

-	{$(INCLUDE)}"\ace\Object_Manager.h"\

-	{$(INCLUDE)}"\ace\Object_Manager.i"\

-	{$(INCLUDE)}"\ace\OS.h"\

-	{$(INCLUDE)}"\ace\OS.i"\

-	{$(INCLUDE)}"\ace\SString.h"\

-	{$(INCLUDE)}"\ace\SString.i"\

-	{$(INCLUDE)}"\ace\stdcpp.h"\

-	{$(INCLUDE)}"\ace\Trace.h"\

-	{$(INCLUDE)}"\ace\ws2tcpip.h"\

-	

-NODEP_CPP_SVR_C=\

-	".\connect.h"\

-	".\corba\debug.h"\

-	".\corba\orb.h"\

-	".\corba\stub.h"\

-	

-

-"$(INTDIR)\svr.obj" : $(SOURCE) $(DEP_CPP_SVR_C) "$(INTDIR)"

-

-

-# End Source File

-# End Target

-# End Project

-################################################################################

diff --git a/TAO/IIOP/test/test.mdp b/TAO/IIOP/test/test.mdp
deleted file mode 100644
index dc1aea7d5be..00000000000
--- a/TAO/IIOP/test/test.mdp
+++ /dev/null
diff --git a/TAO/IIOP/test/test1.cpp b/TAO/IIOP/test/test1.cpp
deleted file mode 100644
index a27c29ee378..00000000000
--- a/TAO/IIOP/test/test1.cpp
+++ /dev/null
@@ -1,390 +0,0 @@
-// @(#)test1.cpp	1.4 95/09/28
-// Copyright 1995 by Sun Microsystems, Inc.
-// All Rights Reserved
-//
-// TEST		stubs for "test1"
-//
-
-#include <stdio.h>
-
-#include "test1.h"
-
-
-//
-// Define all the stubs ... it's a lot less error prone to do it with
-// macros than by hand!
-//
-// NOTE:  the "calldata" is exported for use by the skeletons.  At some
-// point skeletons will probably be fully abstracted; for now they aren't.
-//
-// Also, for some reason, name mangling is changed by the explicit
-// declaration as "extern" -- if it's not done, linking fails.
-//
-#define	DEFINE_TEST3(typename, truetype, truetypename) \
-    static const TAO_Param_Data test1_ ## typename ## _paramdata [4] = { \
-    { _tc_CORBA_ ## truetypename, PARAM_RETURN, 0 }, \
-    { _tc_CORBA_ ## truetypename, PARAM_IN, 0 }, \
-    { _tc_CORBA_ ## truetypename, PARAM_OUT, 0 }, \
-    { _tc_CORBA_ ## truetypename, PARAM_INOUT, 0 }, \
-    }; \
-    \
-    extern const TAO_Call_Data test1_ ## typename ## _calldata; \
-    \
-    const TAO_Call_Data test1_ ## typename ## _calldata = { \
-	"test_" #typename, CORBA_B_TRUE, \
-	4, &test1_ ## typename ## _paramdata [0], \
-	0, 0, \
-    }; \
-    \
-    CORBA_ ## truetype \
-    test1_test_ ## typename (test1_ptr target, \
-		CORBA_ ## truetype in_a1, \
-		CORBA_ ## truetype &out_a2, \
-		CORBA_ ## truetype &inout_a3, \
-		CORBA_Environment &env) { \
-	CORBA_ ## truetype _retval; \
-	STUB_Object	*_obj; \
-	if (target->QueryInterface (IID_STUB_Object, (void **)&_obj) \
-		!= NOERROR) \
-	    env.exception (new CORBA_INV_OBJREF (COMPLETED_NO)); \
-	else { \
-	    _obj->do_call (env, &test1_ ## typename ## _calldata, \
-		&_retval, &in_a1, &out_a2, &inout_a3); \
-	    _obj->Release (); \
-	} \
-	return _retval; \
-    }
-
-//  changed extern const calldata test1_ ## typename ## _calldata;
-//  to     const calldata test1_ ## typename ## _calldata; \
-
-//	changed CORBA_ ## truetype _retval = 0; to changed CORBA_ ## truetype _retval;
-
-#define	DEFINE_TEST(typename, truetype) \
-	DEFINE_TEST3(typename, truetype, truetype)
-
-
-//
-// Generate a system exception, passing an operation ID that's
-// not allowed by IIOP (much less this interface) and verifying
-// that the server returns some kind of system exception.
-//
-static const TAO_Call_Data illegal_calldata = {
-    "+_illegal", CORBA_B_TRUE,
-    0, 0,
-    0, 0
-};
-
-void
-test_illegal (test1_ptr target, CORBA_Environment &env)
-{
-    STUB_Object		*data;
-
-    if (target->QueryInterface (IID_STUB_Object, (void **)&data)
-	    != NOERROR)
-	env.exception (new CORBA_INV_OBJREF (COMPLETED_NO));
-    else {
-	data->do_call (env, &illegal_calldata
-	    );
-	data->Release ();
-    }
-}
-
-
-extern const TAO_Call_Data test1_void_calldata;
-const TAO_Call_Data test1_void_calldata = {
-    "test_void", CORBA_B_TRUE,
-    0, 0,
-    0, 0
-};
-
-void
-test1_test_void (test1_ptr target, CORBA_Environment &env)
-{
-    STUB_Object		*data;
-
-    if (target->QueryInterface (IID_STUB_Object, (void **)&data)
-	    != NOERROR)
-	env.exception (new CORBA_INV_OBJREF (COMPLETED_NO));
-    else {
-	data->do_call (env, &test1_void_calldata
-	    );
-	data->Release ();
-    }
-}
-
-DEFINE_TEST (short, Short);
-DEFINE_TEST (long, Long);
-DEFINE_TEST (ushort, UShort);
-DEFINE_TEST (ulong, ULong);
-
-#if	defined(MIPS)
-//
-// NOTE:  C/C++ compilers as a rule pass a "float" in the space that
-// a "double" takes up.  Conversions are evidently optional; portability
-// forces the following "explicit temporary" hack to work on at least
-// one MIPS platform, which converts the parameter to "double" and
-// hence changes the binary representation.  (Even if that is a compiler
-// bug, it's probably required by now for binary compatibility!)
-//
-// A "-k ansi" compiler flag may be needed to get correct behaviour;
-// passing the "in" parameters by reference apparently works too.  At
-// this time, none of these solutions is used by default.
-//
-// This stub-level hackery seems like it could be replaced inside of the
-// stub interpreter, which could just manually convert "float" parameters
-// (all of them) as special cases.  But of course, that would slow the
-// interpreter down on _every_ call, not just the ones that require it
-// (such as this one).  Tradeoffs!
-//
-static const TAO_Param_Data test1_float_paramdata [4] = {
-    { _tc_CORBA_Float , PARAM_RETURN , 0 },
-    { _tc_CORBA_Float , PARAM_IN , 0 },
-    { _tc_CORBA_Float , PARAM_OUT , 0 },
-    { _tc_CORBA_Float , PARAM_INOUT , 0 }
-};
-
-extern const TAO_Call_Data test1_float_calldata;
-
-const TAO_Call_Data test1_float_calldata = {
-    "test_float", CORBA_B_TRUE,
-    4 , &test1_float_paramdata [0],
-    0 , 0
-};
-
-CORBA_Float
-test1_test_float (
-    test1_ptr		target,
-    CORBA_Float	in_a1,
-    CORBA_Float	&out_a2,
-    CORBA_Float	&inout_a3,
-    CORBA_Environment	&env
-)
-{
-    CORBA_Float	_retval;
-
-    // These three temporaries required due to MIPS compiler bug
-    CORBA_Float	_in_a1 = in_a1;
-    CORBA_Float	_out_a2 = out_a2;
-    CORBA_Float	_inout_a3 = inout_a3;
-
-    target -> data -> do_call (env,
-	&test1_float_calldata,
-	&_retval,
-	&_in_a1,
-	&_out_a2,
-	&_inout_a3);
-    return _retval;
-}
-
-#else
-DEFINE_TEST (float, Float);
-#endif	// MIPS
-
-
-DEFINE_TEST (double, Double);
-DEFINE_TEST (boolean, Boolean);
-DEFINE_TEST (char, Char);
-DEFINE_TEST (octet, Octet);
-
-/*
-CORBA_Any *
-test1_test_any (test1_ptr target,
-	const CORBA_Any &in_a1,
-	CORBA_Any *&out_a2,
-	CORBA_Any &inout_a3,
-	CORBA_Environment &env)
-{
-    // XXX implement this stub! ... annoying that C++ mapping
-    // calls for so much special casing
-}
-*/
-
-
-DEFINE_TEST3 (TypeCode, TypeCode_ptr, TypeCode);
-DEFINE_TEST3 (Principal, Principal_ptr, Principal);
-DEFINE_TEST3 (Object, Object_ptr, Object);
-
-// NOTE:  C++ mapping has "in" strings as "const", which doesn't
-// show up in this macro ...
-DEFINE_TEST3 (string, Char *, String);
-
-DEFINE_TEST (longlong, LongLong);
-DEFINE_TEST (ulonglong, ULongLong);
-DEFINE_TEST (wchar, WChar);
-
-// NOTE:  C++ mapping has "in" strings as "const", which doesn't
-// show up in this macro ...
-DEFINE_TEST3 (wstring, WChar *, WString);
-
-#if !defined(NONNATIVE_LONGDOUBLE)
-DEFINE_TEST (longdouble, LongDouble);
-#endif
-
-#undef	DEFINE_TEST
-
-
-//
-// Utility macros used to construct octet codes that are aligned
-// on longword boundaries, and with a known byte order.  This
-// happens to use big endian encoding since it was convenient.
-// (Longword alignment is a happy accident of the specification
-// of OMG-IDL ... it could have been much worse!)
-//
-// It'd be much simpler to lay out such data in assembler!
-//
-
-#if	defined (WORDS_BIGENDIAN)
-#	define	MAKE_BIG_LONG(a,b,c,d) \
-	    ((((a) & 0xff) << 24) | (((b) & 0xff) << 16) \
-	     | (((c) & 0xff) <<  8) | ((d) & 0xff))
-#	define	BIG_ENDIAN_LONG(x)	(x)
-
-#else	// LITTLE_ENDIAN
-#	define	MAKE_BIG_LONG(a,b,c,d) \
-	    ((((d) & 0xff) << 24) | (((c) & 0xff) << 16) \
-	     | (((b) & 0xff) <<  8) | ((a) & 0xff))
-#	define BYTE_FROM(n,integer)    (((integer)>>(8*(n)))&0xff)
-#	define BIG_ENDIAN_LONG(integer) \
-	    MAKE_BIG_LONG (BYTE_FROM(3,integer), BYTE_FROM(2,integer),\
-		BYTE_FROM(1,integer), BYTE_FROM(0,integer))
-#endif
-
-
-
-//
-// "x1" exception typecode ... must be longword aligned
-//
-static CORBA_Long oc_x1 [] = {
-    0,					// big endian flag + padding
-    BIG_ENDIAN_LONG (29),		// length of ID string + NUL
-    MAKE_BIG_LONG ('I', 'D', 'L', ':'),	// bytes of ID string
-    MAKE_BIG_LONG ('E', 'n', 'g', '.'),
-    MAKE_BIG_LONG ('S', 'U', 'N', '.'),
-    MAKE_BIG_LONG ('C', 'O', 'M', '/'),
-    MAKE_BIG_LONG ('t', 'e', 's', 't'),
-    MAKE_BIG_LONG ('1', '/', 'x', '1'),
-    MAKE_BIG_LONG (':', '1', '.', '0'),
-    0,
-    BIG_ENDIAN_LONG (1),		// (empty) namelen + NUL
-    0,
-    BIG_ENDIAN_LONG (1),		// only one struct member
-    BIG_ENDIAN_LONG (1),		// (empty) member name + NUL
-    0,
-    BIG_ENDIAN_LONG (tk_long)
-};
-static CORBA_TypeCode tc_x1 (tk_except, sizeof oc_x1,
-	    (unsigned char *)&oc_x1, CORBA_B_FALSE);
-CORBA_TypeCode_ptr	_tc_test1_x1 = &tc_x1;
-
-
-
-//
-// "x2" exception typecode ... must be longword aligned
-//
-static CORBA_Long oc_x2 [] = {
-    0,					// big endian flag + padding
-    BIG_ENDIAN_LONG (29),		// length of ID string + NUL
-    MAKE_BIG_LONG ('I', 'D', 'L', ':'),	// bytes of ID string
-    MAKE_BIG_LONG ('E', 'n', 'g', '.'),
-    MAKE_BIG_LONG ('S', 'U', 'N', '.'),
-    MAKE_BIG_LONG ('C', 'O', 'M', '/'),
-    MAKE_BIG_LONG ('t', 'e', 's', 't'),
-    MAKE_BIG_LONG ('1', '/', 'x', '2'),
-    MAKE_BIG_LONG (':', '1', '.', '0'),
-    0,
-    BIG_ENDIAN_LONG (1),		// (empty) namelen + NUL
-    0,
-    BIG_ENDIAN_LONG (2),		// two struct members
-
-    BIG_ENDIAN_LONG (1),		// (empty) member name + NUL
-    0,
-    BIG_ENDIAN_LONG (tk_objref),
-    BIG_ENDIAN_LONG (29),		// type ID + NUL
-    MAKE_BIG_LONG ('I', 'D', 'L', ':'),	// bytes of ID string
-    MAKE_BIG_LONG ('o', 'm', 'g', '.'),
-    MAKE_BIG_LONG ('o', 'r', 'g', '/'),
-    MAKE_BIG_LONG ('C', 'O', 'R', 'B'),
-    MAKE_BIG_LONG ('A', '/', 'O', 'b'),
-    MAKE_BIG_LONG ('j', 'e', 'c', 't'),
-    MAKE_BIG_LONG (':', '1', '.', '0'),
-    0,
-
-    BIG_ENDIAN_LONG (1),		// (empty) member name + NUL
-    0,
-    BIG_ENDIAN_LONG (tk_long)
-};
-static CORBA_TypeCode tc_x2 (tk_except, sizeof oc_x2,
-	    (unsigned char *)&oc_x2, CORBA_B_FALSE);
-CORBA_TypeCode_ptr	_tc_test1_x2 = &tc_x2;
-
-
-//
-// parameter, exception, and call descriptions for "test_throw"
-//
-static const TAO_Param_Data test1_test_throw_paramdata [1] = {
-    { _tc_CORBA_Long, PARAM_IN, 0 }
-};
-
-static CORBA_TypeCode_ptr test1_test_throw_excepts [2] = {
-    &tc_x1, &tc_x2
-};
-
-extern const TAO_Call_Data test1_test_throw_calldata;
-
-const TAO_Call_Data test1_test_throw_calldata = {
-    "test_throw", CORBA_B_TRUE,
-    1, &test1_test_throw_paramdata [0],
-    2, &test1_test_throw_excepts [0]
-};
-
-//
-// "test_throw" stub
-//
-void
-test1_test_throw (
-    test1_ptr		target,
-    CORBA_Long	case_num,
-    CORBA_Environment	&env		// throw (x1, x2)
-)
-{
-    STUB_Object		*data;
-
-    if (target->QueryInterface (IID_STUB_Object, (void **)&data)
-	    != NOERROR)
-	env.exception (new CORBA_INV_OBJREF (COMPLETED_NO));
-    else {
-	data->do_call (env, &test1_test_throw_calldata,
-	    &case_num);
-	data->Release ();
-    }
-}
-
-//
-// PLEASE EXIT
-//
-
-static const TAO_Call_Data test1_please_exit_calldata = {
-    "please_exit", CORBA_B_FALSE,
-    0, 0,
-    0, 0
-};
-
-void
-test1_please_exit (
-    test1_ptr		target,
-    CORBA_Environment	&env
-)
-{
-    STUB_Object		*data;
-
-    if (target->QueryInterface (IID_STUB_Object, (void **)&data)
-	    != NOERROR)
-	env.exception (new CORBA_INV_OBJREF (COMPLETED_NO));
-    else {
-	data->do_call (env, &test1_please_exit_calldata
-	    );
-	data->Release ();
-    }
-}
-
diff --git a/TAO/IIOP/test/test1.h b/TAO/IIOP/test/test1.h
deleted file mode 100644
index 7d3bd0e08a5..00000000000
--- a/TAO/IIOP/test/test1.h
+++ /dev/null
@@ -1,124 +0,0 @@
-// @(#)test1.hh	1.2 95/09/12
-// Copyright 1995 by Sun Microsystems, Inc.
-// All Rights Reserved
-//
-// TEST		interface for "test1"
-//
-
-#ifndef	_TEST1_HH
-#define	_TEST1_HH
-
-#include <corba/orb.h>
-#include <corba/stub.h>
-
-
-#ifdef	_MSC_VER
-#pragma	pack (push, 1)			// VC++, known padding rules
-#endif	// VC++
-
-typedef CORBA_UShort		test1_ushort;
-typedef CORBA_ULong		test1_ulong;
-
-typedef CORBA_LongLong	test1_longlong;
-typedef CORBA_ULongLong 	test1_ulonglong;
-typedef CORBA_LongDouble	test1_longdouble;
-
-typedef CORBA_Object		test1;
-typedef test1			*test1_ptr;
-
-#define	DECL_TEST(typename, truetype) \
-    truetype \
-    test1_test_ ## typename ( \
-	test1_ptr		target, \
-	truetype		in_a1, \
-	truetype		&out_a2, \
-	truetype		&inout_a3, \
-	CORBA_Environment	&env \
-    )
-
-void test_illegal (test1_ptr target, CORBA_Environment &env);
-void test1_test_void (test1_ptr target, CORBA_Environment &env);
-
-DECL_TEST (short, CORBA_Short);
-DECL_TEST (long, CORBA_Long);
-DECL_TEST (ushort, CORBA_UShort);
-DECL_TEST (ulong, CORBA_ULong);
-DECL_TEST (float, CORBA_Float);
-DECL_TEST (double, CORBA_Double);
-DECL_TEST (boolean, CORBA_Boolean);
-DECL_TEST (char, CORBA_Char);
-DECL_TEST (octet, CORBA_Octet);
-
-CORBA_Any *
-test1_test_any (
-    test1_ptr		target,
-    const CORBA_Any	&in_a1,
-    CORBA_Any		*&out_a2,
-    CORBA_Any		&inout_a3,
-    CORBA_Environment	&env
-);
-
-DECL_TEST (TypeCode, CORBA_TypeCode_ptr);
-DECL_TEST (Principal, CORBA_Principal_ptr);
-DECL_TEST (Object, CORBA_Object_ptr);
-
-// NOTE:  CORBA C++ mapping says the "in" string is const
-DECL_TEST (string, CORBA_String);
-
-DECL_TEST (longlong, CORBA_LongLong);
-DECL_TEST (ulonglong, CORBA_ULongLong);
-DECL_TEST (wchar, CORBA_WChar);
-
-// NOTE:  CORBA C++ mapping says the "in" string is const
-DECL_TEST (wstring, CORBA_WString);
-
-DECL_TEST (longdouble, CORBA_LongDouble);
-
-#undef	DECL_TEST
-
-extern CORBA_TypeCode_ptr	_tc_test1_x1;
-
-class test1_x1 : public CORBA_UserException {
-  public:
-    CORBA_Long	case_num;
-			
-			test1_x1 (CORBA_Long n)
-			: CORBA_UserException (_tc_test1_x1), case_num (n)
-			{ }
-};
-
-extern CORBA_TypeCode_ptr	_tc_test1_x2;
-
-class test1_x2 : public CORBA_UserException {
-  public:
-    CORBA_Object_ptr	obj;
-    CORBA_Long	case_num;
-
-			test1_x2 (CORBA_Object_ptr obj1,
-				CORBA_Long n)
-			: CORBA_UserException (_tc_test1_x2),
-			    obj (obj1), case_num (n) { }
-
-			~test1_x2 ()
-			{ CORBA_release (obj); }
-};
-
-void
-test1_test_throw (
-    test1_ptr		target,
-    CORBA_Long	case_num,
-    CORBA_Environment	&env		// throw (x1, x2)
-);
-
-void
-test1_please_exit (
-    test1_ptr		target,
-    CORBA_Environment	&env
-);
-
-#ifdef	_MSC_VER
-#pragma	pack (pop)			// VC++, go back to other padding rules
-#endif	// VC++
-
-#endif	// _TEST1_HH
-
diff --git a/TAO/IIOP/test/test1.idl b/TAO/IIOP/test/test1.idl
deleted file mode 100644
index e6cf20cd2de..00000000000
--- a/TAO/IIOP/test/test1.idl
+++ /dev/null
@@ -1,78 +0,0 @@
-// @(#)test1.idl	1.1 95/09/11
-// Copyright 1994-1995 by Sun Microsystems, Inc.
-//
-// TEST		basic marshaling tests for all IDL primitive types, modes
-//
-// This test omits constructed types (struct, union, enum, sequence, and
-// array types), and only tests very simple user defined exceptions.
-//
-// Values returned are well defined functions of the input values:
-//
-//	* For numeric types (octet, short, long, longlong, float, double,
-//	  longdouble, and unsigned variants) the value is cubed.
-//	* For Boolean, it's the negation.
-//	* For Any, TypeCode, Principal, Object, char and wchar,
-//	  string and wstring, it's the input value.
-//
-// The "return" and "out" parameter is the function of the "in" parameter;
-// the "inout" parameter is the function of its original value.
-//
-// The "echo" test has all output values be the input values, with no
-// changes to the bit patterns originally transmitted.  While easier to
-// use to identify some kinds of problem, it is not as complete a test.
-//
-
-#define	DECL_TEST(type) \
-    type test_ ## type ( in type a1, out type a2, inout type a3)
-
-#pragma	prefix	"Eng.SUN.COM"	// only for Sun-defined interfaces
-
-interface test1 {
-    void	test_void ();
-
-    typedef unsigned short ushort;
-    typedef unsigned long ulong;
-
-    typedef long long longlong;
-    typedef unsigned long long ulonglong;
-    typedef long double longdouble;
-
-    DECL_TEST (short);
-    DECL_TEST (long);
-    DECL_TEST (ushort);
-    DECL_TEST (ulong);
-    DECL_TEST (float);
-    DECL_TEST (double);
-    DECL_TEST (boolean);
-    DECL_TEST (char);
-    DECL_TEST (octet);
-    DECL_TEST (any);
-    DECL_TEST (TypeCode);
-    DECL_TEST (Principal);
-    DECL_TEST (Object);		// CORBA::Object
-    DECL_TEST (string);		// unbounded string
-
-    DECL_TEST (longlong);
-    DECL_TEST (ulonglong);
-    DECL_TEST (wchar);
-    DECL_TEST (wstring);	// unbounded wstring
-    DECL_TEST (longdouble);
-
-    //
-    // All cases, "case_num" in the exception is the same as the 'in' param
-    //	* negative or zero, throws x1
-    //	* positive even cases, throws x2 with obj = null objref
-    //	* positive odd cases, throws x2 with obj = target objref
-    //
-    exception x1 { long case_num; };
-    exception x2 { Object obj; long case_num; };
-
-    void test_throw (in long case_num) raises (x1, x2);
-
-    //
-    // Aid for test cleanup in case server's not told to quit after
-    // being idle for some time period
-    //
-    oneway void please_exit ();
-};
-
diff --git a/TAO/IIOP/test/test1_clnt.cpp b/TAO/IIOP/test/test1_clnt.cpp
deleted file mode 100644
index 831a0189371..00000000000
--- a/TAO/IIOP/test/test1_clnt.cpp
+++ /dev/null
@@ -1,636 +0,0 @@
-// @(#)test1_clnt.cpp	1.5 95/09/24
-// Copyright 1995 by Sun Microsystems, Inc.
-// All Rights Reserved
-//
-// TEST		client driver for "test1"
-//
-
-#ifdef	USE_IOSTREAM
-#include <iostream.h>
-#endif
-
-#include <stdio.h>
-#include <string.h>
-#include <ace/Get_Opt.h>
-
-#if	unix
-#	include	<unistd.h>
-
-#else	// windows
-
-#endif	// unix
-
-#include "test1.h"
-#include <corba/debug.h>
-
-
-#if !defined (_WIN32)
-extern char 	*optarg;	// missing on some platforms
-#endif
-
-extern void
-print_exception (const CORBA_Exception *, const char *, FILE *f=stdout);
-
-
-//
-// All tests are specified so that the return value and "out" (second)
-// parameters are easily tested functions of the "in" (first) parameter,
-// and the "inout" (third) parameter is the same function the its
-// initial value.   Caller is expected to specify two different "in"
-// values.   This helps make the marshaled bits vary, and turn up a class
-// of potential problems that'd be hidden if parameter order had no
-// effect on the test.
-//
-// PERFORM_TEST calls a test for a given type, reporting in cases where
-// the ORB or operation failed.  The COMPARE symbol can be redefined
-// to achieve different functions -- e.g. cubing numbers, identity,
-// negation, etc.  It should return true iff the correct result was
-// returned.
-//
-// BAD_COMPARE_VALUES is to produce diagnostics when a test fails,
-// showing the actual and expected values of returned parameters.
-// This helps diagnose specific porting problems.
-//
-// The RELEASE symbol may be defined to free memory, eliminating client
-// side memory leaks in the test.
-//
-#define	RELEASE(X)		// NOP by default
-#define	PERFORM_TEST(name,type,value1,value2) \
-    { \
-	CORBA_ ## type	v1, v2, v3; \
- 	\
-	v1 = (CORBA_ ## type)(value1); \
-	v2 = 0; \
-	v3 = (CORBA_ ## type)(value2); \
- 	\
-	test_count++; \
-	v1 = test1_test_ ## name (target, v1, v2, v3, env); \
-	if (env.exception () != 0) { \
-	    print_exception (env.exception (), "perform test_" #name); \
-	    error_count++; \
-	} else if (!COMPARE (CORBA_ ## type, v1, value1) \
-		|| !COMPARE (CORBA_ ## type, v2, value1) \
-		|| !COMPARE (CORBA_ ## type, v3, value2) ) { \
-	    ACE_OS::fprintf (stderr, "bad comparison, test_" #name "\n"); \
-	    BAD_COMPARE_VALUES(type,v1,v2,v3,value1,value2) \
-	    error_count++; \
-	} \
-	RELEASE (v1); RELEASE (v2); RELEASE (v3); \
-    }
-
-//
-// This messing about is because the ostream op << cannot always
-// be used with all kinds of data ... e.g. LongDouble, TypeCode.
-//
-#ifdef	USE_IOSTREAM
-#	define	DO_IO(x) x
-#else
-#	define	DO_IO(x)
-#endif
-#define BAD_COMPARE_VALUE_OUT(type,v1,v2,v3,value1,value2) \
-	    DO_IO( cerr << " v1=" << v1; \
-            cerr << " expecting " << EXPVAL(CORBA_ ## type, value1) << "\n"; \
-	    cerr << " v2=" << v2; \
-            cerr << " expecting " << EXPVAL(CORBA_ ## type, value1) << "\n"; \
-	    cerr << " v3=" << v3; \
-	    cerr << " expecting " << EXPVAL(CORBA_ ## type, value2) << "\n");
-#define BAD_COMPARE_VALUES(type,v1,v2,v3,value1,value2) \
-    BAD_COMPARE_VALUE_OUT(type,v1,v2,v3,value1,value2)
-
-
-//
-// test utility -- should be able to just use is_equivalent() directly
-// but this implementation uses null pointers for nil, so this must
-// check for nulls first.  (May be noncompliant with C++ mapping!)
-//
-static CORBA_Boolean
-compare_objrefs (
-    CORBA_Object_ptr	v1,
-    CORBA_Object_ptr	v2
-)
-{
-    CORBA_Boolean	temp;
-    CORBA_Environment	env;
-
-    if (v1 == v2)
-	return CORBA_B_TRUE;
-
-    if (CORBA_is_nil (v1))
-	return CORBA_is_nil (v2);
-
-    temp = v1->_is_equivalent (v2, env);
-    if (env.exception () != 0) {
-	print_exception (env.exception (), "compare objref");
-	return CORBA_B_FALSE;
-    }
-    return temp;
-}
-
-
-//
-// Helper routine to help sure math (especially for floating point)
-// gets done correctly.
-//
-template <class Type>
-Type cube (Type arg)
-{
-    Type temp = arg;
-
-    temp = temp * arg;
-    temp = temp * arg;
-    return temp;
-}
-
-
-static int	skip_longdouble = 0;
-
-//
-// This just performs the tests ...
-//
-void
-do_tests (
-    test1_ptr	target,
-    unsigned	loop_count,
-    unsigned	&test_count,
-    unsigned	&error_count
-)
-{
-    int		count;
-
-    for (count = 0; count < loop_count; count++) {
-	CORBA_Environment	env;
-	CORBA_Environment	env2;	// XXX
-
-	//
-	// test_void
-	//
-	test_count++;
-	test1_test_void (target, env);
-	if (env.exception () != 0) { 
-	    print_exception (env.exception (), "perform test_void");
-	    error_count++;
-	}
-
-	//
-	// Numeric tests ... try some variety in computation, no real
-	// rationale in the choice of initial parameter values except
-	// not to use the same values all the time.
-	//
-#define EXPVAL(type,original_value) ((type) cube((type)(original_value)))
-#define COMPARE(type,retval,original_value) \
-	((retval) == EXPVAL(type, original_value))
-
-	PERFORM_TEST (octet, Octet, count + 29, count - 22);
-
-	PERFORM_TEST (short, Short, count - 23, count + 19);
-	PERFORM_TEST (ushort, UShort, count + 23, count - 19);
-
-    	PERFORM_TEST (long, Long, count - 17, count + 20);
-    	PERFORM_TEST (ulong, ULong, count + 17, count - 20);
-
-#if	!defined (NONNATIVE_LONGLONG)
-	// don't try this on platforms that don't support
-	// math on longlongs ...
-	PERFORM_TEST (longlong, LongLong, count - 177, count + 3);
-	PERFORM_TEST (ulonglong, ULongLong, count + 177, count - 3);
-#endif	// !NONNATIVE_LONGLONG
-
-#if	!defined (i386)
-	//
-	// XXX not sure what's wrong with the COMPARE macro with respect to
-	// floating point on x86, since fprintf shows the values basically
-	// look correct ... but these float/double tests fail.
-	//
-	PERFORM_TEST (float, Float, count - 0.29, count + 3.14159);
-	PERFORM_TEST (double, Double, count * 1.77, count * 2.71);
-#endif	// !defined (i386)
-
-
-#ifndef	NONNATIVE_LONGDOUBLE
-#undef	BAD_COMPARE_VALUES
-#define BAD_COMPARE_VALUES(type,v1,v2,v3,value1,value2) // NOP
-
-	//
-	// don't try this between two platforms that don't provide
-	// arithmetic support for LongDouble values ...
-	//
-	if (!skip_longdouble) {
-	    PERFORM_TEST (longdouble, LongDouble,
-		    count - 2.33, count * 3.14159);
-	}
-
-#  undef BAD_COMPARE_VALUES
-#  define BAD_COMPARE_VALUES(type,v1,v2,v3,value1,value2) \
-    BAD_COMPARE_VALUE_OUT(type,v1,v2,v3,value1,value2)
-#endif	// !NONNATIVE_LONGDOUBLE
-
-#undef	COMPARE
-#undef	EXPVAL
-
-
-	//
-	// Boolean -- negation
-	//
-#define EXPVAL(type,original_value) (!(type)(original_value))
-#define COMPARE(type,retval,original_value) \
-		(((type)(retval)) == EXPVAL(type,original_value))
-
-	PERFORM_TEST (boolean, Boolean,
-		(count & 0x01) != 0, (count & 0x01) == 0);
-#undef	COMPARE
-#undef	EXPVAL
-
-	//
-	// Char, WChar -- identity
-	//
-#define EXPVAL(type,original_value) ((type)(original_value))
-#define COMPARE(type,retval,original_value) \
-		(((type)(retval)) == EXPVAL(type,original_value))
-
-	PERFORM_TEST (char, Char, count + 26, count - 5);
-	PERFORM_TEST (wchar, WChar, count, count + 25);
-#undef	COMPARE
-#undef	EXPVAL
-
-	//
-	// Object_ptr -- identity (special comparision)
-	//
-#define EXPVAL(type,original_value) ((type)(original_value))
-#define COMPARE(type,retval,original_value) \
-	    (compare_objrefs (retval, original_value) == CORBA_B_TRUE)
-#undef	RELEASE
-#define	RELEASE(obj) \
-	    { CORBA_release (obj); }
-
-	PERFORM_TEST (Object, Object_ptr, target, CORBA_Object::_nil ());
-#undef	COMPARE
-#undef	EXPVAL
-
-	//
-	// TypeCode_ptr -- identity (special comparision), and verifies
-	// that most of the built-in typecode constants exist.
-	//
-	// XXX should try this on all standard and system exceptions!
-	//
-	// XXX  this currently tests only marshaling/unmarshaling of
-	// "no parameter" TypeCodes ... complex ones (objref, struct,
-	// union, enum, sequence, array, alias, exception) are _NOT_
-	// currently attempted.
-	//
-	// XXX  for the simple typecodes (string, wstring), the single
-	// "bound" parameter isn't exercised/verified as it should be.
-	//
-#define EXPVAL(type,original_value) ((type)(original_value))
-#define	COMPARE(type,retval,original) \
-	    (((retval) == (original)) || \
-		((retval)->_kind == (original)->_kind))
-
-#undef	RELEASE
-#define	RELEASE(tc) \
-	    { CORBA_release (tc); }
-
-#undef	BAD_COMPARE_VALUES
-#define BAD_COMPARE_VALUES(type,v1,v2,v3,value1,value2) // NOP
-
-	{
-	    PERFORM_TEST (TypeCode, TypeCode_ptr,
-		    _tc_CORBA_Null, _tc_CORBA_Void);
-
-	    PERFORM_TEST (TypeCode, TypeCode_ptr,
-		    _tc_CORBA_Short, _tc_CORBA_UShort);
-	    PERFORM_TEST (TypeCode, TypeCode_ptr,
-		    _tc_CORBA_Long, _tc_CORBA_ULong);
-	    PERFORM_TEST (TypeCode, TypeCode_ptr,
-		    _tc_CORBA_LongLong, _tc_CORBA_ULongLong);
-
-	    PERFORM_TEST (TypeCode, TypeCode_ptr,
-		    _tc_CORBA_Float, _tc_CORBA_Double);
-
-	    PERFORM_TEST (TypeCode, TypeCode_ptr,
-		    _tc_CORBA_Boolean, _tc_CORBA_Octet);
-
-	    PERFORM_TEST (TypeCode, TypeCode_ptr,
-		    _tc_CORBA_Any, _tc_CORBA_TypeCode);
-
-	    PERFORM_TEST (TypeCode, TypeCode_ptr,
-		    _tc_CORBA_LongDouble, _tc_CORBA_Principal);
-
-	    PERFORM_TEST (TypeCode, TypeCode_ptr,
-		    _tc_CORBA_Char, _tc_CORBA_String);
-	    PERFORM_TEST (TypeCode, TypeCode_ptr,
-		    _tc_CORBA_WChar, _tc_CORBA_WString);
-
-	    PERFORM_TEST (TypeCode, TypeCode_ptr,
-		    _tc_CORBA_LongDouble, _tc_CORBA_Octet);
-
-	    //
-	    // Try all of the standard exception typecodes.
-	    //
-	    PERFORM_TEST (TypeCode, TypeCode_ptr,
-		    _tc_CORBA_UNKNOWN, _tc_CORBA_BAD_PARAM);
-	    PERFORM_TEST (TypeCode, TypeCode_ptr,
-		    _tc_CORBA_NO_MEMORY, _tc_CORBA_IMP_LIMIT);
-	    PERFORM_TEST (TypeCode, TypeCode_ptr,
-		    _tc_CORBA_COMM_FAILURE, _tc_CORBA_INV_OBJREF);
-	    PERFORM_TEST (TypeCode, TypeCode_ptr,
-		    _tc_CORBA_OBJECT_NOT_EXIST, _tc_CORBA_NO_PERMISSION);
-	    PERFORM_TEST (TypeCode, TypeCode_ptr,
-		    _tc_CORBA_INTERNAL, _tc_CORBA_MARSHAL);
-	    PERFORM_TEST (TypeCode, TypeCode_ptr,
-		    _tc_CORBA_INITIALIZE, _tc_CORBA_NO_IMPLEMENT);
-	    PERFORM_TEST (TypeCode, TypeCode_ptr,
-		    _tc_CORBA_BAD_TYPECODE, _tc_CORBA_BAD_OPERATION);
-	    PERFORM_TEST (TypeCode, TypeCode_ptr,
-		    _tc_CORBA_NO_RESOURCES, _tc_CORBA_NO_RESPONSE);
-	    PERFORM_TEST (TypeCode, TypeCode_ptr,
-		    _tc_CORBA_PERSIST_STORE, _tc_CORBA_BAD_INV_ORDER);
-	    PERFORM_TEST (TypeCode, TypeCode_ptr,
-		    _tc_CORBA_TRANSIENT, _tc_CORBA_FREE_MEM);
-	    PERFORM_TEST (TypeCode, TypeCode_ptr,
-		    _tc_CORBA_INV_IDENT, _tc_CORBA_INV_FLAG);
-	    PERFORM_TEST (TypeCode, TypeCode_ptr,
-		    _tc_CORBA_INTF_REPOS, _tc_CORBA_BAD_CONTEXT);
-	    PERFORM_TEST (TypeCode, TypeCode_ptr,
-		    _tc_CORBA_OBJ_ADAPTER, _tc_CORBA_DATA_CONVERSION);
-
-	    //
-	    // All the built-in "user defined" system exceptions.
-	    //
-	    PERFORM_TEST (TypeCode, TypeCode_ptr,
-		    _tc_CORBA_BadKind, _tc_CORBA_Bounds);
-	}
-#undef	COMPARE
-#undef	RELEASE
-
-	//
-	// string (unbounded)-- identity (special comparision)
-	//
-#define COMPARE(type,retval,original_value) \
-	    (strcmp ((char *)(retval), (char*)(original_value)) == 0)
-#undef	RELEASE
-#define	RELEASE(obj) CORBA_string_free(obj)
-	static const CORBA_Char str1 [] = "small";
-	static const CORBA_Char str2 [] =
-			"relatively long string, constructed"
-			" with the aid of C++ implicit string"
-			" catenation, which simplifies much stuff";
-	PERFORM_TEST (string, String, str1, str2);
-#undef	COMPARE
-#undef	RELEASE
-
-
-	// XXX any, principal, wstring ... output _is_ input
-
-
-	//
-	// Three test cases involve throwing user-defined exceptions.
-	//
-	{
-	    CORBA_Exception	*xp;
-
-	    //
-	    // Case one:  with parameter <= zero, must throw
-	    // an "x1" exception whose "case_num" is that parameter
-	    //
-	    test_count++;
-
-	    test1_test_throw (target, -5, env);
-	    if (env.exception () != 0) {
-		xp = env.exception ();
-
-		if (strcmp ((char *)xp->id (),
-			(char *) _tc_test1_x1->id (env2)) != 0) {
-		    error_count++;
-		    ACE_OS::fprintf (stderr, "test_throw case 1, "
-			    "wrong exception thrown (id = '%s')\n",
-			    xp->id ());
-		} else {
-		    test1_x1	*xp2 = (test1_x1 *) xp;
-
-		    if (xp2->case_num != -5) {
-			error_count++;
-			ACE_OS::fprintf (stderr, "test_throw case 1, "
-				"wrong value (case_num = '%ld')\n",
-				xp2->case_num);
-		    }
-		    
-		    // else, right exception was thrown
-		}
-	    } else {
-		error_count++;
-		ACE_OS::fprintf (stderr, "test_throw case 1, "
-			"no exception thrown !!\n");
-	    }
-
-
-	    //
-	    // Case two:  with positive odd parameter, must throw
-	    // an "x2" exception whose obj is null, and whose case_num
-	    // is that parameter
-	    //
-	    test_count++;
-
-	    test1_test_throw (target, 101, env);
-	    if (env.exception () != 0) {
-		xp = env.exception ();
-
-		if (strcmp ((char *)xp->id (),
-			(char *) _tc_test1_x2->id (env2)) != 0) {
-		    error_count++;
-		    ACE_OS::fprintf (stderr, "test_throw case 2, "
-			    "wrong exception thrown (id = '%s')\n",
-			    xp->id ());
-		} else {
-		    test1_x2	*xp2 = (test1_x2 *) xp;
-
-		    if (xp2->case_num != 101) {
-			error_count++;
-			ACE_OS::fprintf (stderr, "test_throw case 2, "
-				"wrong value (case_num = '%ld')\n",
-				xp2->case_num);
-		    }
-
-		    if (!CORBA_is_nil (xp2->obj)) {
-			error_count++;
-			ACE_OS::fprintf (stderr, "test_throw case 2, "
-				"non-null objref thrown\n");
-		    }
-		    
-		    // else, right exception was thrown
-		}
-	    } else {
-		error_count++;
-		ACE_OS::fprintf (stderr, "test_throw case 2, "
-			"no exception thrown !!\n");
-	    }
-
-
-#if	0
-// 18-sept-95:  commented this out.  Work remains to be done in
-// this area:  (a) ServerRequest::target operation unimplemented,
-// so for the servers of current interest this test is no help;
-// (b) probable pointer leak in exceptions holding data.
-
-	    //
-	    // Case three:  with positive even parameter, must throw
-	    // an "x2" exception whose obj is the target, and whose
-	    // case_num is that parameter
-	    //
-	    test_count++;
-
-	    test1_test_throw (target, 42, env);
-	    if (env.exception () != 0) {
-		xp = env.exception ();
-
-		if (strcmp ((char *)xp->id (),
-			(char *) _tc_test1_x2->id (env2)) != 0) {
-		    error_count++;
-		    ACE_OS::fprintf (stderr, "test_throw case 3, "
-			    "wrong exception thrown (id = '%s')\n",
-			    xp->id ());
-		} else {
-		    test1_x2	*xp2 = (test1_x2 *) xp;
-
-		    if (xp2->case_num != 42) {
-			error_count++;
-			ACE_OS::fprintf (stderr, "test_throw case 3, "
-				"wrong value (case_num = '%ld')\n",
-				xp2->case_num);
-		    }
-
-		    CORBA_Boolean	status;
-
-		    status = target->_is_equivalent (xp2->obj, env);
-
-		    if (env.exception () != 0) {
-			error_count++;
-			print_exception (env.exception (),
-				"test_throw/3 call to is_equivalent");
-		    } else if (status != CORBA_B_TRUE) {
-			error_count++;
-			ACE_OS::fprintf (stderr, "test_throw case 3, "
-				"non-equivalent objref thrown\n");
-		    }
-		    
-		    // else, right exception was thrown
-		}
-	    } else {
-		error_count++;
-		ACE_OS::fprintf (stderr, "test_throw case 3, "
-			"no exception thrown !!\n");
-	    }
-
-	    env.clear ();
-#endif	// 0
-
-	}
-
-	//
-	// test_illegal -- generate a BAD_OPERATION system exception
-	// from the remote process
-	//
-	test_count++;
-	test_illegal (target, env);
-	if (env.exception () == 0
-		|| ACE_OS::strcmp ((char *) env.exception()->id(),
-			(char *) _tc_CORBA_BAD_OPERATION->id (env2)) != 0) { 
-	    ACE_OS::fprintf (stderr, "couldn't generate BAD_OPERATION exception\n");
-	    error_count++;
-	}
-    }
-}
-
-
-int
-main (int    argc, char   *argv[])
-{
-    CORBA_ORB_ptr	orb_ptr;
-    CORBA_Environment	env;
-    CORBA_Object_ptr	objref = CORBA_Object::_nil();
-    unsigned		loop_count = 1;
-    unsigned		tests = 0, errors = 0;
-    int			exit_later = 0;
-
-    orb_ptr = CORBA_ORB_init (argc, argv, "internet", env);
-    if (env.exception () != 0) {
-	dexc (env, "ORB initialisation");
-	return 1;
-    }
-
-    //
-    // Parse and verify parameters.
-    //
-    ACE_Get_Opt get_opt (argc, argv, "dln:O:x");
-    int			c;
-
-    while ((c = get_opt ()) != -1)
-	switch (c) {
-	  case 'd':			// debug flag
-	    TAO_debug_level++;
-	    continue;
-
-	  case 'l':			// skip "long double" test
-	    skip_longdouble++;
-	    continue;
-
-	  case 'n':			// loop count
-	    loop_count = (unsigned) ACE_OS::atoi (get_opt.optarg);
-	    continue;
-
-	  case 'O':			// stringified objref
-	    {
-		objref = orb_ptr->string_to_object (
-			(CORBA_String)get_opt.optarg, env);
-		if (env.exception () != 0) {
-		    dexc (env, "string2object");
-		    return 1;
-		}
-	    }
-	    continue;
-
-	  case 'x':
-	    exit_later++;
-	    continue;
-
-	  case '?':
-	  default:
-	    ACE_OS::fprintf (stderr, "usage:  %s"
-			    " [-d]"
-			    " [-l]"
-			    " [-n loopcount]"
-			    " [-O objref]"
-			    " [-x]"
-			    "\n", argv [0]
-			    );
-	    return 1;
-        }
-    
-    if (CORBA_is_nil (objref) == CORBA_B_TRUE) {
-	ACE_OS::fprintf (stderr, "%s:  must identify non-null target objref\n",
-		argv [0]);
-	return 1;
-    }
-
-
-    do_tests (objref, loop_count, tests, errors);
-
-    char		*progname = ACE_OS::strrchr (argv [0], '/');
-
-    if (progname != 0)
-	progname += 1;
-    else
-	progname = argv [0];
-
-    ACE_OS::fprintf (stderr, "%s:  %d loops, %d tests (%d errors)\n",
-	progname, loop_count, tests, errors);
-
-    if (exit_later) {
-	test1_please_exit (objref, env);
-	if (env.exception () != 0)
-	    print_exception (env.exception (), "test1_please_exit");
-    }
-
-    CORBA_release (objref);
-
-    return errors != 0;
-}
diff --git a/TAO/IIOP/test/test1_svr.cpp b/TAO/IIOP/test/test1_svr.cpp
deleted file mode 100644
index c4a51a036c7..00000000000
--- a/TAO/IIOP/test/test1_svr.cpp
+++ /dev/null
@@ -1,670 +0,0 @@
-// @(#)test1_svr.cpp	1.7 95/09/25
-// Copyright 1995 by Sun Microsystems Inc.
-// All Rights Reserved
-//
-// TEST:	simple IIOP server for "test1.idl" interface.
-//
-// Starts up, builds an objref, prints its string, listens for
-// messages, responds to them.
-//
-
-#include	<stdio.h>
-#include	<string.h>
-#include <ace/Get_Opt.h>
-
-#if	unix
-#	include	<unistd.h>		// for getopt on some systems
-
-#else	// windows
-
-#endif
-
-#include	"test1.h"
-#include	<corba/boa.h>
-#include <roa.h>
-
-#include	<corba/debug.h>
-
-
-
-#if !defined (_WIN32)
-extern char 	*optarg;	// missing on some platforms
-#endif
-
-//
-// Skeleton code ... just a macro for a bunch of DSI-based method code,
-// in lieu of having an IDL compmiler generate static skeletons.  Static
-// skeletons would be more efficient; most mallocation could go away.
-//
-// Use by:  defining OPERATION macro, call DEFINE_SKEL3 as needed, then
-// undef OPERATION.
-//
-// NOTE:  "v1_copy" below is needed to work around a bug with the
-// HP9000 G++ 2.6.3 compiler, with "LongLong".
-//
-// XXX this could probably be a template ... or could even be merged
-// directly into the Dynamic Implementation Routine below.
-//
-// XXX we must currently use IN_COPY_VALUE since the memory consumed
-// by the parameters must be deallocated by the ORB.  When we get an
-// updated version of DSI which provides "send it now" semantics,
-// these should preallocate the values and not use IN_COPY_VALUE.  A
-// net decrease in malloc overhead can be had that way.  (NVList should
-// also get a public constructor, and a way to provide the buffer.)
-//
-#define	DEFINE_SKEL3(name,truetype,truetypename) \
-    static void \
-    _test1_test_ ## name ( \
-	CORBA_ServerRequest	&req, \
-        CORBA_Object_ptr        obj, \
-	CORBA_Environment	&env \
-    ) \
-    { \
-	CORBA_NVList_ptr	nvlist; \
-	CORBA_ ## truetype	scratch = 0; \
-	CORBA_Any		temp_value (_tc_CORBA_ ## truetypename, \
-				    &scratch, CORBA_B_FALSE); \
- 	\
-	req.orb ()->create_list (3, nvlist); \
-	(void) nvlist->add_value (0, temp_value, \
-		CORBA_IN_COPY_VALUE|CORBA_ARG_IN, env); \
-	(void) nvlist->add_value (0, temp_value, \
-		CORBA_IN_COPY_VALUE|CORBA_ARG_OUT, env); \
-	(void) nvlist->add_value (0, temp_value, \
-		CORBA_IN_COPY_VALUE|CORBA_ARG_INOUT, env); \
-	 \
-	req.params (nvlist, env); \
-	if (env.exception () != 0) { \
-	    dexc (env, "test1_test_" # name "skeleton, req.params"); \
-	    return; \
-	} \
- 	\
-	CORBA_ ## truetype 	*v1, *v2, *retval; \
- 	\
-	v1 = (CORBA_ ## truetype *) nvlist->item (0)->value ()->value (); \
-	v2 = new CORBA_ ## truetype; \
-	*v2 = (CORBA_ ## truetype) OPERATION (*v1); \
-	retval = new CORBA_ ## truetype; \
-	*retval = (CORBA_ ## truetype) OPERATION (*v1); \
- 	\
-	CORBA_Any_ptr		any_val; \
- 	\
-	any_val = nvlist->item (1)->value (); \
-	any_val->replace (any_val->type (), v2, CORBA_B_TRUE, env); \
-	if (env.exception () != 0) { \
-	    dexc (env, "test1_test_" # name "skeleton, val2 replace"); \
-	    return; \
-	} \
- 	\
-	v1 = (CORBA_ ## truetype *) nvlist->item (2)->value ()->value (); \
-    	CORBA_ ## truetype v1copy = *v1; \
-	*v1 = (CORBA_ ## truetype) OPERATION (v1copy); \
- 	\
-	any_val = new CORBA_Any (_tc_CORBA_ ## truetypename, \
-		retval, CORBA_B_TRUE); \
-	req.result (any_val, env); \
-	if (env.exception () != 0) { \
-	    dexc (env, "test1_test_" # name "skeleton, result"); \
-	    return; \
-	} \
-    } \
-    extern TAO_Call_Data test1_ ## name ## _calldata;
-
-
-extern const TAO_Call_Data test1_void_calldata;
-
-static void
-_test1_test_void (CORBA_ServerRequest &req,
-		  CORBA_Object_ptr obj,
-		  CORBA_Environment &env)
-{
-  CORBA_NVList_ptr nvlist;
-
-  req.orb ()->create_list (0, nvlist);
-  req.params (nvlist, env);
-
-  if (env.exception () != 0)
-    dexc (env, "test_throw, get params");
-}
-
-
-//
-// Dynamic Skeleton methods for numeric types ... these all just
-// cube their parameters in various permutations
-//
-template <class Type>
-Type cube (Type arg)
-{
-    Type temp = arg;
-
-    temp = temp * arg;
-    temp = temp * arg;
-    return temp;
-}
-
-#define	OPERATION(n)	cube(n)
-
-DEFINE_SKEL3 (octet, Octet, Octet)
-
-DEFINE_SKEL3 (short, Short, Short)
-DEFINE_SKEL3 (ushort, UShort, UShort)
-
-DEFINE_SKEL3 (long, Long, Long)
-DEFINE_SKEL3 (ulong, ULong, ULong)
-
-#if	!defined (NONNATIVE_LONGLONG)
-	// don't try this on platforms that don't support
-	// math on longlongs ...
-DEFINE_SKEL3 (longlong, LongLong, LongLong)
-DEFINE_SKEL3 (ulonglong, ULongLong, ULongLong)
-#endif	// !NONNATIVE_LONGLONG
-
-DEFINE_SKEL3 (float, Float, Float)
-DEFINE_SKEL3 (double, Double, Double)
-
-#if	!defined (NONNATIVE_LONGDOUBLE)
-	// don't try this on platforms that don't support
-	// math on long doubles ...
-DEFINE_SKEL3 (longdouble, LongDouble, LongDouble)
-#endif	// !NONNATIVE_LONGDOUBLE
-
-#undef	OPERATION
-
-//
-// Dynamic Skeleton methods for Boolean type ... just negates its
-// parameters 
-//
-#define	OPERATION(x)	(!(x))
-DEFINE_SKEL3 (boolean, Boolean, Boolean)
-#undef	OPERATION
-
-//
-// For character types, output is same as input, no magic needed.
-//
-#define	OPERATION(x)	(x)
-DEFINE_SKEL3 (char, Char, Char)
-DEFINE_SKEL3 (wchar, WChar, WChar)
-#undef	OPERATION
-
-//
-// For objref, typecode, output is same as input but duplication
-// is needed
-//
-#define	OPERATION(x)	((x) ? (x)->AddRef() : 0, x)
-DEFINE_SKEL3 (Object, Object_ptr, Object)
-DEFINE_SKEL3 (TypeCode, TypeCode_ptr, TypeCode)
-#undef	OPERATION
-
-//
-// For string, output is copy of input
-//
-#define	OPERATION(x)	(CORBA_string_copy(x))
-DEFINE_SKEL3 (string, String, String)
-#undef	OPERATION
-
-//
-// For wstring, output is copy of input
-//
-#define	OPERATION(x)	(CORBA_wstring_copy(x))
-DEFINE_SKEL3 (wstring, WString, WString)
-#undef	OPERATION
-
-//
-// XXX IMPLEMENT THE REST OF THE DATA TYPES
-//
-// any, principal -- out is in
-//
-
-
-//
-// All cases, "case_num" in the exception is the same as the 'in' param
-//	* negative or zero, throws x1
-//	* positive even cases, throws x2 with obj = null objref
-//	* positive odd cases, throws x2 with obj = target objref
-//
-// exception x1 { long case_num; };
-// exception x2 { Object obj; long case_num; };
-// 
-// void test_throw (in long case_num) raises (x1, x2);
-//
-
-extern const TAO_Call_Data test1_test_throw_calldata;
-
-static void
-_test1_test_throw (CORBA_ServerRequest &req,
-		   CORBA_Object_ptr obj,
-		   CORBA_Environment &env)
-{
-  CORBA_NVList_ptr nvlist;
-  CORBA_NamedValue_ptr nv;
-  CORBA_Any temp_value (_tc_CORBA_Long);
-  CORBA_Long value;
-
-  req.orb ()->create_list (0, nvlist);
-  nv = nvlist->add_value (0, temp_value, CORBA_ARG_IN, env);
-
-  req.params (nvlist, env);
-  if (env.exception () != 0)
-    {
-      dexc (env, "test_throw, get params");
-      return;
-    }
-
-  value = *(CORBA_Long *)nv->value ()->value ();
-  if (env.exception () != 0)
-    {
-      dexc (env, "test_throw, param value");
-      return;
-    }
-
-  CORBA_Any_ptr any;
-
-  if (value <= 0) 
-    {
-      test1_x1		*x;
-
-      x = new test1_x1 (value);
-      any = new CORBA_Any (_tc_test1_x1, x, CORBA_B_TRUE);
-
-    }
-  else if (value & 0x01)
-    {
-      test1_x2		*x;
-
-      x = new test1_x2 (CORBA_Object::_nil (), value);
-      any = new CORBA_Any (_tc_test1_x2, x, CORBA_B_TRUE);
-
-    } 
-  else
-    {
-#if	0
-      test1_x2		*x;
-
-      x = new test1_x2 (req.oa()->target (), value);
-      any = new CORBA_Any (_tc_test1_x2, x, CORBA_B_TRUE);
-#else
-      //
-      // XXX right now, we don't have a target() operation on the
-      // BOA ... needs to be added.  Verify the client side memory
-      // leak of pointers embedded in user exceptions is fixed, too.
-      //
-      env.exception (new CORBA_IMP_LIMIT (COMPLETED_NO));
-      return;
-#endif
-    }
-
-  req.exception (USER_EXCEPTION, any, env);
-}
-
-
-//
-// This table is used to associate operation names with the Dynamic
-// Skeleton method ... someday it could return static skeletons.
-//
-#define	DECL_SKEL(name) \
-	{ & test1_ ## name ## _calldata, _test1_test_ ## name }
-
-static const TAO_Skel_Entry test1_operations [] = {
-    DECL_SKEL (void),
-
-    DECL_SKEL (octet),
-    DECL_SKEL (char),
-
-    DECL_SKEL (wchar),
-
-    DECL_SKEL (short),
-    DECL_SKEL (ushort),
-    DECL_SKEL (long),
-    DECL_SKEL (ulong),
-
-#if	!defined (NONNATIVE_LONGLONG)
-    // don't try this on platforms that don't support
-    // math on longlongs ...
-    DECL_SKEL (longlong),
-    DECL_SKEL (ulonglong),
-#endif
-
-    DECL_SKEL (float),
-    DECL_SKEL (double),
-
-#if	!defined (NONNATIVE_LONGDOUBLE)
-	// don't try this on platforms that don't support
-	// math on long doubles ...
-    DECL_SKEL (longdouble),
-#endif	// !NONNATIVE_LONGDOUBLE
-
-    DECL_SKEL (boolean),
-
-    DECL_SKEL (Object),
-    DECL_SKEL (TypeCode),
-
-    DECL_SKEL (string),
-    DECL_SKEL (wstring),
-
-    { & test1_test_throw_calldata, _test1_test_throw },
-
-    { 0, 0 }
-};
-
-
-//
-// Dispatch to method code ...
-//
-// Knows how to interpret "context" to get target objref, and where to
-// get second level skeletons for that target.  Both of those operations
-// will generally be abstracted (into library and stub code) so the main
-// body of this routine would be invisible to most applications.
-//
-// However, there are applications that need to do this stuff themselves
-// (like bridging between environments, e.g. different ORBs, languages, or
-// other object systems).  Everything needed to work without using an IDL
-// compiler is a public, supported API.
-//
-static void
-level1_skeleton (
-    CORBA_OctetSeq		&key,
-    CORBA_ServerRequest		&req,
-    void			*context,
-    CORBA_Environment		&env
-)
-{
-  //
-  // Verify that the target object and "this" object have the
-  // same key.  Normally, this would be used to figure out
-  // which object was the target, and hence which operations
-  // vector to dispatch the request.
-  //
-  CORBA_OctetSeq		*obj_key;
-
-  obj_key = (CORBA_OctetSeq *) context;
-  if (obj_key->length != key.length
-      || ACE_OS::memcmp (obj_key->buffer, key.buffer,
-			 obj_key->length) != 0)
-    {
-    env.exception (new CORBA_OBJECT_NOT_EXIST (COMPLETED_NO));
-#ifdef	DEBUG
-    if (TAO_debug_level)
-      dmsg_opaque ("request to nonexistent object, key = ",
-		   key.buffer, key.length);
-#endif
-    return;
-  }
-
-  //
-  // Find a "level 2 skeleton" for this operation, then
-  // call it with the right per-object state.
-  //
-  const TAO_Skel_Entry	*entry;
-  CORBA_String		opname;
-
-  opname = req.op_name ();
-  for (entry = &test1_operations [0]; entry->op_descriptor; entry++)
-    {
-    if (strcmp ((char *)opname, entry->op_descriptor->opname) == 0)
-      {
-      // We pass a bogus object because this version of the cubit example is
-      // so tightly coupled that it doesn't use it.  Future modifications will,
-      // hopefully!
-      CORBA_Object_ptr bogus_object = 0;
-      entry->impl_skeleton (req, bogus_object, env);
-      return;
-    }
-  }
-
-  //
-  // XXX True top-level skeleton code would also have to understand
-  // the built-in operations:
-  //
-  // * _is_a (for narrowing tests) ... can be derived by searching an
-  //	 appropriately structured graph of level2 skeletons.
-  //
-  // * _non_existent ... if the level1 skeleton consults a module
-  //	 which understands object lifespans, this should be simple.
-  // 
-  // * _get_interface ... could either (a) fail; (b) return the ref
-  //   from some IFR; or most interestingly (c) return a ref to some
-  //	 code in this process that can answer all IFR queries from the
-  //	 skeleton data structures.
-  //
-  // * _get_implementation  ... return some administrative hook to
-  //   the object implementation:
-  //
-  // No other legal operations start with a character that's not an
-  // ASCII alphanumeric, for what it's worth.
-  //
-  // The skeleton might want to use data in the object key to find
-  // the objref's type; if it's integrated with object creation, and
-  // an per-process implementation repository, this should be easy.
-  //
-
-  //
-  // bypass level 2 skeletons for this one ...
-  //
-  if (strcmp ((char *) opname, "please_exit") == 0)
-    {
-    dmsg ("I've been asked to shut down...");
-    req.oa ()->please_shutdown (env);
-    dexc (env, "please_exit, please_shutdown");
-    return;
-  }
-
-  //
-  // No match.  Operation not implemented; say so.
-  //
-  dmsg1 ("unknown operation, %s", opname);
-  env.exception (new CORBA_BAD_OPERATION (COMPLETED_NO));
-}
-
-
-//
-// Create and print the objref, listen for calls on it until done.
-//
-extern void
-print_exception (const CORBA_Exception *, const char *, FILE *f=stdout);
-
-int
-OA_listen (CORBA_ORB_ptr orb_ptr,
-	   CORBA_BOA_ptr oa_ptr,
-	   CORBA_String key,
-	   int idle)
-{
-  //
-  // Create the object we'll be implementing.
-  //
-  CORBA_OctetSeq	obj_key;
-  CORBA_Object_ptr	obj;
-  CORBA_Environment	env;
-
-  obj_key.buffer = (CORBA_Octet *) key;
-  obj_key.length = obj_key.maximum = ACE_OS::strlen (key);
-
-  obj = oa_ptr->create (obj_key, (CORBA_String) "", env);
-  if (env.exception () != 0)
-    {
-      print_exception (env.exception (), "BOA::create");
-      return 1;
-    }
-
-  //
-  // Stringify the objref we'll be implementing, and
-  // print it to stdout.  Someone will take that string
-  // and give it to some client.
-  //
-  CORBA_String	str;
-
-  str = orb_ptr->object_to_string (obj, env);
-  if (env.exception () != 0)
-    {
-      print_exception (env.exception (), "object2string");
-      return 1;
-    }
-  ACE_OS::puts ((char *)str);
-  ACE_OS::fflush (stdout);
-  dmsg1 ("listening as object '%s'", str);
-
-  //
-  // Clean up -- "key" is sufficient to dispatch all requests.
-  //
-  CORBA_release (obj);
-  CORBA_string_free (str);
-  env.clear ();
-
-  //
-  // Handle requests for this object until we're killed, or one of
-  // the methods makes us exit.
-  //
-  // NOTE:  apart from registering the top level skeleton, the rest
-  // of this loop is exactly what BOA::run() does.  It's here to
-  // show there's no magic.
-  //
-#if 0
-  oa_ptr->register_dir (level1_skeleton, &obj_key, env);
-#else
-  oa_ptr->register_dir (oa_ptr->dispatch, &obj_key, env);
-#endif
-  if (env.exception () != 0)
-    {
-      print_exception (env.exception (), "register_dir");
-      return 1;
-    }
-
-  for (;;) {
-    if (idle == -1)
-      oa_ptr->get_request (CORBA_B_FALSE, 0, env);
-    else
-      {
-	timeval		tv;
-
-	tv.tv_sec = idle;
-	tv.tv_usec = 0;
-	oa_ptr->get_request (CORBA_B_FALSE, &tv, env);
-      }
-
-    CORBA_Exception_ptr	xp;
-
-    if ((xp = env.exception ()) != 0)
-      {
-	CORBA_Environment env2;	// XXX
-	char *id;
-
-	id = env.exception ()->id ();
-
-	//
-	// We get BAD_INV_ORDER if we call get_request() after
-	// shutdown was initiated.  Simpler to rely on that
-	// than to arrange any handshaking in this simple app.
-	//
-	if (strcmp (id, _tc_CORBA_BAD_INV_ORDER->id (env2)) == 0)
-	  {
-	    break;
-
-	    //
-	    // Other exceptions are errors.
-	    //
-	  }
-	else
-	  {
-	    print_exception (env.exception (), "BOA::get_request");
-	    return 1;
-	  }
-      }
-    env.clear ();
-  }
-
-  //
-  // Shut down the OA -- recycles all underlying resources (e.g. file
-  // descriptors, etc).
-  //
-  // XXX shutdown is not quite the same as release, unless we want mem
-  // leaks to cause some rude failure modes.  BOA just hasn't been
-  // updated yet to have any handshake about this though.
-  //
-  oa_ptr->Release ();
-  return 0;
-}
-
-
-//
-// Standard command line parsing utilities used.
-//
-int
-main (int    argc, char   *argv[])
-{
-  CORBA_Environment	env;
-  CORBA_ORB_ptr	orb_ptr;
-  CORBA_BOA_ptr		oa_ptr;
-  CORBA_String	key = (CORBA_String) "elvis";
-  char		*oa_name = 0;
-  char		*orb_name = "internet";
-  int			idle = -1;
-
-  //
-  // Parse the command line, get options
-  //
-  ACE_Get_Opt get_opt (argc, argv, "dln:O:x");
-  int			c;
-
-  while ((c = get_opt ()) != -1)
-    switch (c)
-      {
-      case 'd':			// more debug noise
-	TAO_debug_level++;
-	continue;
-
-      case 'i':			// idle seconds b4 exit
-	idle = ACE_OS::atoi (get_opt.optarg);
-	continue;
-
-      case 'k':			// key (str)
-	key = (CORBA_String) get_opt.optarg;
-	continue;
-
-      case 'o':			// orb name
-	orb_name = get_opt.optarg;
-	continue;
-
-      case 'p':			// portnum
-	oa_name = get_opt.optarg;
-	continue;
-
-	// XXX set debug filters ...
-
-	//
-	// XXX ignore OMG-specified options ... hope nobody ever tries
-	// to use that "-ORB* param" and "-OA* param" syntax, it flies
-	// in the face of standard command parsing algorithms which
-	// require single-character option specifiers.
-	//
-
-
-      case '?':
-      default:
-	ACE_OS::fprintf (stderr, "usage:  %s"
-			 " [-d]"
-			 " [-i idle_seconds]"
-			 " [-k object_key=elvis]"
-			 " [-o orbname=internet]"
-			 " [-p oa_name]"
-			 "\n", argv [0]
-			 );
-	return 1;
-      }
-
-  orb_ptr = CORBA_ORB_init (argc, argv, orb_name, env);
-  if (env.exception () != 0) {
-    print_exception (env.exception (), "ORB init");
-    return 1;
-  }
-
-  //
-  // The BOA may or may not actually be named ...
-  //
-  oa_ptr = CORBA_BOA::get_named_boa (orb_ptr, oa_name, env);
-  if (env.exception () != 0) {
-    print_exception (env.exception (), "OA init");
-    return 1;
-  }
-
-  return OA_listen (orb_ptr, oa_ptr, key, idle);
-}
-
diff --git a/TAO/IIOP/test/tnf/Orbix.svr.summary b/TAO/IIOP/test/tnf/Orbix.svr.summary
deleted file mode 100644
index 1c01995f7d5..00000000000
--- a/TAO/IIOP/test/tnf/Orbix.svr.summary
+++ /dev/null
@@ -1,32 +0,0 @@
-                                     Profile for 10000 calls
-
-Function name         %      self+desc.          mean     max      min     std.
-                     time       ms       calls  ms/call ms/call  ms/call   err
-________________________________________________________________________________
-mutex_lock           0.04        8.505   3386    0.003    0.349    0.002   0.000
-mutex_unlock         0.04        8.205   3386    0.002    0.127    0.002   0.000
-
-
-                                     Profile for 20000 calls
-
-Function name         %      self+desc.          mean     max      min     std.
-                     time       ms       calls  ms/call ms/call  ms/call   err
-________________________________________________________________________________
-mutex_lock           0.01        8.875   3386    0.003    0.373    0.002   0.000
-mutex_unlock         0.01        8.353   3386    0.002    0.093    0.002   0.000
-
-                                     Profile for 30000 calls
-
-Function name         %      self+desc.          mean     max      min     std.
-                     time       ms       calls  ms/call ms/call  ms/call   err
-________________________________________________________________________________
-mutex_lock           0.02        8.979   3386    0.003    0.386    0.002   0.000
-mutex_unlock         0.02        8.465   3386    0.002    0.030    0.002   0.000
-
-                                     Profile for 40000 calls
-
-Function name         %      self+desc.          mean     max      min     std.
-                     time       ms       calls  ms/call ms/call  ms/call   err
-________________________________________________________________________________
-mutex_lock           0.01        8.849   3388    0.003    0.355    0.002   0.000
-mutex_unlock         0.01        7.937   3388    0.002    0.029    0.002   0.000
diff --git a/TAO/IIOP/test/tnf/clnt.summary b/TAO/IIOP/test/tnf/clnt.summary
deleted file mode 100644
index bed4a22d35e..00000000000
--- a/TAO/IIOP/test/tnf/clnt.summary
+++ /dev/null
@@ -1,43 +0,0 @@
-                                     Profile for 10000 calls
-
-Function name         %      self+desc.          mean     max      min     std.
-                     time       ms       calls  ms/call ms/call  ms/call   err
-________________________________________________________________________________
-rw_rdlock            0.28       53.642  10006    0.005    0.192    0.004   0.000
-rw_unlock            0.28       52.672  10009    0.005    0.037    0.005   0.000
-mutex_lock           0.06       11.366   2765    0.004    0.161    0.002   0.000
-mutex_unlock         0.04        6.996   2771    0.003    0.028    0.002   0.000
-rw_wrlock            0.00        0.047      3    0.016    0.034    0.006   0.007
-
-                                    Profile for 20000 calls
-
-Function name         %      self+desc.          mean     max      min     std.
-                     time       ms       calls  ms/call ms/call  ms/call   err
-________________________________________________________________________________
-rw_rdlock            0.40      146.579  20006    0.007    1.200    0.005   0.000
-rw_unlock            0.25       91.386  20009    0.005    0.058    0.004   0.000
-mutex_lock           0.06       21.087   5265    0.004    0.178    0.002   0.000
-mutex_unlock         0.04       14.372   5271    0.003    0.075    0.002   0.000
-rw_wrlock            0.00        0.045      3    0.015    0.034    0.005   0.008
-
-                                     Profile for 30000 calls
-
-Function name         %      self+desc.          mean     max      min     std.
-                     time       ms       calls  ms/call ms/call  ms/call   err
-________________________________________________________________________________
-rw_rdlock            0.41      241.807  30006    0.008    1.181    0.005   0.000
-rw_unlock            0.24      141.506  30009    0.005    0.503    0.004   0.000
-mutex_lock           0.07       38.545   7765    0.005    0.171    0.002   0.000
-mutex_unlock         0.03       19.591   7771    0.003    0.078    0.002   0.000
-rw_wrlock            0.00        0.045      3    0.015    0.033    0.005   0.007
-
-                                     Profile for 40000 calls
-
-Function name         %      self+desc.          mean     max      min     std.
-                     time       ms       calls  ms/call ms/call  ms/call   err
-________________________________________________________________________________
-rw_rdlock            0.39      307.763  40006    0.008    2.031    0.005   0.000
-rw_unlock            0.23      184.537  40009    0.005    0.138    0.004   0.000
-mutex_lock           0.05       38.808  10265    0.004    0.173    0.002   0.000
-mutex_unlock         0.03       25.931  10271    0.003    0.078    0.002   0.000
-rw_wrlock            0.00        0.043      3    0.014    0.033    0.004   0.008
diff --git a/TAO/IIOP/test/tnf/svr.summary b/TAO/IIOP/test/tnf/svr.summary
deleted file mode 100644
index 6e1c024aacd..00000000000
--- a/TAO/IIOP/test/tnf/svr.summary
+++ /dev/null
@@ -1,49 +0,0 @@
-                                     Profile for 10000 calls
-
-Function name         %      self+desc.          mean     max      min     std.
-                     time       ms       calls  ms/call ms/call  ms/call   err
-________________________________________________________________________________
-mutex_unlock         1.18      191.077  54588    0.004    1.158    0.003   0.000
-mutex_lock           1.18      190.652  54587    0.003    0.198    0.003   0.000
-rw_rdlock            0.29       46.844   6823    0.007    0.173    0.004   0.000
-rw_unlock            0.18       28.419   6823    0.004    0.064    0.004   0.000
-
-                                     Profile for 20000 calls
-
-Function name         %      self+desc.          mean     max      min     std.
-                     time       ms       calls  ms/call ms/call  ms/call   err
-________________________________________________________________________________
-mutex_lock           1.12      154.491  54507    0.003    0.140    0.002   0.000
-mutex_unlock         1.06      145.638  54508    0.003    0.310    0.002   0.000
-rw_rdlock            0.27       37.265   6813    0.005    0.037    0.004   0.000
-rw_unlock            0.20       27.792   6813    0.004    0.045    0.004   0.000
-
-                                     Profile for 30000 calls
-
-Function name         %      self+desc.          mean     max      min     std.
-                     time       ms       calls  ms/call ms/call  ms/call   err
-________________________________________________________________________________
-mutex_lock           1.19      150.344  54654    0.003    0.621    0.002   0.000
-mutex_unlock         1.15      144.776  54655    0.003    0.071    0.002   0.000
-rw_rdlock            0.27       33.772   6832    0.005    0.078    0.004   0.000
-rw_unlock            0.19       23.613   6832    0.003    0.105    0.003   0.000
-
-                                     Profile for 40000 calls
-
-Function name         %      self+desc.          mean     max      min     std.
-                     time       ms       calls  ms/call ms/call  ms/call   err
-________________________________________________________________________________
-mutex_unlock         1.48      209.259  54770    0.004   18.223    0.002   0.000
-mutex_lock           1.46      206.619  54769    0.004   10.473    0.002   0.000
-rw_rdlock            0.78      110.047   6846    0.016   38.115    0.003   0.006
-rw_unlock            0.17       23.844   6846    0.003    0.112    0.003   0.000
-
-                                     Profile for 50000 calls
-
-Function name         %      self+desc.          mean     max      min     std.
-                     time       ms       calls  ms/call ms/call  ms/call   err
-________________________________________________________________________________
-mutex_unlock         1.19      150.149  54477    0.003    0.152    0.002   0.000
-mutex_lock           1.18      149.113  54477    0.003    1.376    0.002   0.000
-rw_rdlock            0.34       43.048   6809    0.006   10.113    0.003   0.001
-rw_unlock            0.19       23.796   6810    0.003    0.326    0.003   0.000
diff --git a/TAO/IIOP/tests/Cubit/Build/clnt.bld b/TAO/IIOP/tests/Cubit/Build/clnt.bld
deleted file mode 100755
index 76e60ef8967..00000000000
--- a/TAO/IIOP/tests/Cubit/Build/clnt.bld
+++ /dev/null
@@ -1,8 +0,0 @@
-#!build
-default:
-	program
-	:debuglevel=multi
-../cubit.cpp
-	C++
-../clnt.cpp
-	C++
diff --git a/TAO/IIOP/tests/Cubit/Build/default.bld b/TAO/IIOP/tests/Cubit/Build/default.bld
deleted file mode 100755
index cdf3e2e8210..00000000000
--- a/TAO/IIOP/tests/Cubit/Build/default.bld
+++ /dev/null
@@ -1,19 +0,0 @@
-#!build
-default:
-	nobuild
-	:debuglevel=multi
-	:target=vxwppc
-	:sourcedirs=/home/ace/ACE_wrappers.vxworks
-	:sourcedirs=../../proto/include
-	:sourcedirs=../..
-	:libraries=../../proto/lib/tao.a
-	:libraries=/home/ace/ACE_wrappers.vxworks/ace/libACE.a
-	:libraries=/appl/newgreen/vxppc603/indlib.o
-	:defines=DEBUG
-clnt.bld
-	program
-	:debuglevel=multi
-svr.bld
-	program
-	:debuglevel=multi
-	:defines=USE_ACE_EVENT_HANDLING
diff --git a/TAO/IIOP/tests/Cubit/Build/svr.bld b/TAO/IIOP/tests/Cubit/Build/svr.bld
deleted file mode 100755
index 7c8725356b2..00000000000
--- a/TAO/IIOP/tests/Cubit/Build/svr.bld
+++ /dev/null
@@ -1,8 +0,0 @@
-#!build
-default:
-	program
-	:debuglevel=multi
-../svr.cpp
-	C++
-../cubit.cpp
-	C++
diff --git a/TAO/IIOP/tests/Cubit/Orbix/Makefile b/TAO/IIOP/tests/Cubit/Orbix/Makefile
deleted file mode 100644
index 96935fb78fc..00000000000
--- a/TAO/IIOP/tests/Cubit/Orbix/Makefile
+++ /dev/null
@@ -1,28 +0,0 @@
-#----------------------------------------------------------------------------
-#	@(#)Makefile	1.1	10/18/96
-#
-#	Makefile for the Gateway application
-#----------------------------------------------------------------------------
-
-#----------------------------------------------------------------------------
-#	Local macros
-#----------------------------------------------------------------------------
-
-INFO  = README
-
-DIRS  =	base_server \
-	client \
-	tpr \
-	tpool \
-	tps
-
-#----------------------------------------------------------------------------
-#	Include macros and targets
-#----------------------------------------------------------------------------
-
-include	$(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-include	$(ACE_ROOT)/include/makeinclude/macros.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.common.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.nested.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.nolocal.GNU
-
diff --git a/TAO/IIOP/tests/Cubit/Orbix/base_server/Makefile b/TAO/IIOP/tests/Cubit/Orbix/base_server/Makefile
deleted file mode 100644
index dc3604d3f35..00000000000
--- a/TAO/IIOP/tests/Cubit/Orbix/base_server/Makefile
+++ /dev/null
@@ -1,89 +0,0 @@
-#----------------------------------------------------------------------------
-#	@(#)Makefile	1.1	10/18/96
-#
-#	Makefile for the ACE_MT_CORBA_Handler tests
-#----------------------------------------------------------------------------
-
-#----------------------------------------------------------------------------
-#	Local macros
-#----------------------------------------------------------------------------
-
-SRC = cubitS.cpp cubit_impl.cpp server.cpp
-
-SVR_OBJS = cubitS.o cubit_impl.o server.o
-
-LDLIBS	 = 
-
-VLDLIBS	 = $(LDLIBS:%=%$(VAR))
-
-#----------------------------------------------------------------------------
-#	Include macros and targets
-#----------------------------------------------------------------------------
-
-include		$(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-include		$(ACE_ROOT)/include/makeinclude/macros.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.common.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.lib.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.bin.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
-
-#----------------------------------------------------------------------------
-#	Orbix related macros and target settings.
-#----------------------------------------------------------------------------
-
-
-ORBIX_BINDIR    = $(ORBIX_ROOT)/bin
-ORBIX_LIBDIR    = $(ORBIX_ROOT)/corba2/lib
-ORBIX_INCDIR    = $(ORBIX_ROOT)/corba2/include
-
-# Remove -DCubit_USE_BOA from below to use the TIE approach
-
-CPPFLAGS += -DEXCEPTIONS -I$(ORBIX_INCDIR) -DWANT_ORBIX_FDS -DCubit_USE_BOA
-LDFLAGS  += -L$(ORBIX_LIBDIR) -R $(ORBIX_LIBDIR) -L$(ACE)/ace
-
-IDLFLAGS = -s S.cpp -c C.cpp -B
-
-#----------------------------------------------------------------------------
-#	Local targets
-#----------------------------------------------------------------------------
-
-all: server
-
-server: $(addprefix $(VDIR),$(SVR_OBJS))
-	$(LINK.cc) -o server $(addprefix $(VDIR),$(SVR_OBJS)) $(LDFLAGS) $(ITIIOP) $(ITSRV) $(VLDLIBS)
-
-#----------------------------------------------------------------------------
-#	Dependencies
-#----------------------------------------------------------------------------
-# DO NOT DELETE THIS LINE -- g++dep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-
-.obj/cubit_impl.o .shobj/cubit_impl.so: cubit_impl.cpp cubit_impl.h cubit.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/config-sunos5.5-sunc++-4.x.h \
- $(ACE_ROOT)/ace/stdcpp.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i
-.obj/server.o .shobj/server.so: server.cpp cubit_impl.h cubit.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/config-sunos5.5-sunc++-4.x.h \
- $(ACE_ROOT)/ace/stdcpp.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i
-
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/IIOP/tests/Cubit/Orbix/base_server/cubit.h b/TAO/IIOP/tests/Cubit/Orbix/base_server/cubit.h
deleted file mode 100644
index 1c868a6597d..00000000000
--- a/TAO/IIOP/tests/Cubit/Orbix/base_server/cubit.h
+++ /dev/null
@@ -1,727 +0,0 @@
-
-#ifndef cubit_hh
-#define cubit_hh
-
-#include "ace/OS.h"
-#include <CORBA.h>
-
-
-#ifndef _Cubit_defined
-#define _Cubit_defined
-class Cubit_dispatch : public virtual CORBA::PPTR {
-public:
-
-      Cubit_dispatch (void *IT_p, CORBA::Object* IT_o, const char *IT_m, 
-        CORBA::LoaderClass *IT_l, char *IT_i, void* IT_im)
-       : PPTR (IT_p,IT_o,IT_m,IT_l,IT_i,IT_im) {}
-
-
-   Cubit_dispatch (char *IT_OR, void *IT_p, CORBA::Object *IT_o)
-       : PPTR (IT_OR,IT_p,IT_o) {}
-
-
-   Cubit_dispatch () {}
-
-   Cubit_dispatch (ObjectReference *IT_OR, void *IT_p, CORBA::Object *IT_o)
-       : PPTR (IT_OR,IT_p,IT_o) {}
-
-
-   Cubit_dispatch (void *IT_p, CORBA::Object *IT_o, const char *IT_m, 
-        char *IT_i, CORBA::Object* IT_ob, void* IT_im)
-       : PPTR (IT_p,IT_o,IT_m,IT_i,IT_ob,IT_im) {}
-
-
-   virtual unsigned char dispatch (CORBA::Request &IT_r, 
-        unsigned char IT_isTarget, void* IT_pp=NULL);
-
-
-};
-
-class Cubit;
-
-#ifndef CubitPtr
-#define CubitPtr
-
-typedef Cubit* Cubit_ptr;
-
-typedef Cubit* CubitRef;
-
-#endif
-
-
-#ifndef CubitForwH
-#define CubitForwH
-CORBA::ObjectRef Cubit_getBase (void *);
-void Cubit_release (Cubit *, CORBA::Environment &IT_env);
-void Cubit_release (Cubit_ptr);
-Cubit* Cubit_duplicate (Cubit_ptr, CORBA::Environment &IT_env);
-Cubit* Cubit_duplicate (Cubit_ptr );
-Cubit_ptr Cubit_nil (CORBA::Environment &IT_env);
-Cubit_ptr Cubit_nil ();
-#endif
-#define Cubit_IMPL "Cubit"
-
-
-class Cubit;
-
-typedef Cubit CubitProxy;
-#define Cubit_IR "Cubit$v1.1"
-#define Cubit_IMPL "Cubit"
-
-#ifndef CubitPtr
-#define CubitPtr
-
-typedef Cubit* Cubit_ptr;
-
-typedef Cubit* CubitRef;
-
-#endif
-
-class Cubit: public virtual CORBA::Object  {
-public:
-        Cubit (char *IT_OR);
-    Cubit (ObjectReference *IT_OR);
-    Cubit () : CORBA::Object  (1) {}
-protected:
-    Cubit_ptr __duplicate(
-            CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) {
-       CORBA::Object::__duplicate (IT_env);
-       return this;
-    }
-public:
-    static Cubit_ptr _duplicate(
-            Cubit_ptr, 
-            CORBA::Environment &IT_pEnv=CORBA::IT_chooseDefaultEnv ());
-public:
-   static Cubit* _bind (const char* IT_markerServer, const char* host,
-		const CORBA::Context &IT_c, 
-		CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-   static Cubit* _bind (CORBA::Environment &IT_env);
-   static Cubit* _bind (const char* IT_markerServer=NULL, const char* host=NULL,
-                 CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-    static Cubit* _narrow (CORBA::Object* , CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-    static Cubit_ptr _nil (CORBA::Environment &IT_pEnv=CORBA::IT_chooseDefaultEnv ()) {
-        CORBA::EnvExcRaiser IT_raise;
-        CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-        return (Cubit_ptr) CORBA::OBJECT_NIL;}
-
-#ifndef Cubit_Many_defined
-#define Cubit_Many_defined
-
-struct Many {
-    CORBA::Octet o;
-    CORBA::Long l;
-    CORBA::Short s;
-
-    void encodeOp (CORBA::Request &IT_r) const;
-    void decodeOp (CORBA::Request &IT_r);
-    void decodeInOutOp (CORBA::Request &IT_r);
-    Many(const Many &);
-    Many();
-    ~Many();
-    Many& operator= (const Many&);
-};
-
-#ifndef Cubit_ManyVarH
-#define Cubit_ManyVarH
-
-#ifndef Cubit_ManyvPtr
-#define Cubit_ManyvPtr
-typedef Many* Many_vPtr;
-typedef const Many* Many_cvPtr;
-#endif
-
-class Many_var : public CORBA::_var
-{
-    private:
-
-    unsigned char copyHelper (const Many_var &IT_s) {
-        if (!IT_s._ptr) {
-            _ptr = IT_s._ptr;
-        } else
-        {
-            _ptr = new Many;
-            *(_ptr) =  *(IT_s._ptr);
-        }
-        return 1;
-    }
-
-    public:
-
-    Many_var (const Many_var &IT_s) {
-        (void) copyHelper (IT_s);
-    }
-
-    Many_var () {
-        _ptr =  new Many;
-;
-    }
-
-    Many_var (Many *IT_p) {
-        _ptr = IT_p;
-    }
-
-    Many_var &operator= (Many *IT_p) {
-        if (_ptr != IT_p) {
-            delete _ptr;
-        }
-        _ptr = IT_p;
-        return (*this);
-    }
-
-    Many_var &operator= (const Many_var &IT_s) {
-        if (_ptr != IT_s._ptr) {
-            delete _ptr;
-        }
-        _ptr = new Many;
-        *(_ptr) =  *(IT_s._ptr);
-        return (*this);
-    }
-
-    ~Many_var () {
-        delete _ptr;
-    }
-
-    Many* operator-> () {
-        return _ptr;
-    }
-
-    operator Many_cvPtr () const { return _ptr;}
-    operator Many_vPtr& () { return _ptr;}
-    operator Many& () const { return * _ptr;}
-
-    protected:
-    Many *_ptr;
-    private:
-    Many_var &operator= (const CORBA::_var &IT_s);
-    Many_var (const CORBA::_var &IT_s);
-};
-
-#endif
-
-
-#endif
-
-enum discrim {e_0th,e_1st,e_2nd,e_3rd,e_4th,e_5th, IT__ENUM_Cubit_discrim=CORBA_ULONG_MAX};
-
-#ifndef Cubit_oneof_defined
-#define Cubit_oneof_defined
-
-struct oneof {
-    private:
-
-    discrim __d;
-    union {
-        CORBA::Octet _o_;
-        CORBA::Short _s_;
-        CORBA::Long _l_;
-        Many * _cm_;
-    };
-
-    public:
-
-    void encodeOp (CORBA::Request &IT_r) const;
-    void decodeOp (CORBA::Request &IT_r);
-    void decodeInOutOp (CORBA::Request &IT_r);
-
-    private:
-
-    unsigned char isSet;
-
-    public:
-
-    discrim _d () const { return __d; }
-
-    CORBA::Octet o () const {
-      return _o_;
-    }
-
-    void o (CORBA::Octet IT_member) {
-        if (isSet && (__d != Cubit::e_0th))
-        {
-            this-> oneof::~oneof();
-            memset(this, 0, sizeof(*this));
-        }
-
-        __d = Cubit::e_0th;
-        isSet = 1;
-        _o_ = IT_member;
-    }
-
-    CORBA::Short s () const {
-        return _s_;
-    }
-
-    void s (CORBA::Short IT_member) {
-        if (isSet && (__d != Cubit::e_1st))
-        {
-            this-> oneof::~oneof();
-            memset(this, 0, sizeof(*this));
-        }
-
-        __d = Cubit::e_1st;
-        isSet = 1;
-        _s_ = IT_member;
-    }
-
-    CORBA::Long l () const {
-        return _l_;
-    }
-
-    void l (CORBA::Long IT_member) {
-        if (isSet && (__d != Cubit::e_2nd))
-        {
-            this-> oneof::~oneof();
-            memset(this, 0, sizeof(*this));
-        }
-
-        __d = Cubit::e_2nd;
-        isSet = 1;
-        _l_ = IT_member;
-    }
-
-    Many& cm () {
-        return (*_cm_);
-    }
-
-    const Many& cm () const {
-        return (*_cm_);
-    }
-
-    void cm (const Many& IT_member) {
-        if (isSet && (__d != Cubit::e_3rd))
-        {
-            this-> oneof::~oneof();
-            memset(this, 0, sizeof(*this));
-        }
-
-        __d = Cubit::e_3rd;
-
-        if (!isSet) {
-            _cm_ = new Many;
-            isSet = 1;
-        }
-        *(_cm_) = IT_member;
-    }
-
-
-    oneof();
-    oneof(const oneof &);
-    ~oneof();
-    oneof& operator= (const oneof&);
-};
-
-#ifndef Cubit_oneofVarH
-#define Cubit_oneofVarH
-
-#ifndef Cubit_oneofvPtr
-#define Cubit_oneofvPtr
-typedef oneof* oneof_vPtr;
-typedef const oneof* oneof_cvPtr;
-#endif
-
-class oneof_var : public CORBA::_var
-{
-    private:
-
-    unsigned char copyHelper (const oneof_var &IT_s) {
-        if (!IT_s._ptr) {
-            _ptr = IT_s._ptr;
-        } else
-        {
-            _ptr = new oneof;
-            *(_ptr) =  *(IT_s._ptr);
-        }
-        return 1;
-    }
-
-    public:
-
-    oneof_var (const oneof_var &IT_s) {
-        (void) copyHelper (IT_s);
-    }
-
-    oneof_var () {
-        _ptr = NULL;
-    }
-
-    oneof_var (oneof *IT_p) {
-        _ptr = IT_p;
-    }
-
-    oneof_var &operator= (oneof *IT_p) {
-        if (_ptr != IT_p) {
-            delete _ptr;
-        }
-        _ptr = IT_p;
-        return (*this);
-    }
-
-    oneof_var &operator= (const oneof_var &IT_s) {
-        if (_ptr != IT_s._ptr) {
-            delete _ptr;
-        }
-        _ptr = new oneof;
-        *(_ptr) =  *(IT_s._ptr);
-        return (*this);
-    }
-
-    ~oneof_var () {
-        delete _ptr;
-    }
-
-    oneof* operator-> () {
-        return _ptr;
-    }
-
-    operator oneof_cvPtr () const { return _ptr;}
-    operator oneof_vPtr& () { return _ptr;}
-    operator oneof& () const { return * _ptr;}
-
-    protected:
-    oneof *_ptr;
-    private:
-    oneof_var &operator= (const CORBA::_var &IT_s);
-    oneof_var (const CORBA::_var &IT_s);
-};
-
-#endif
-
-
-#endif
-        virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual Many cube_struct (const Many& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual oneof cube_union (const oneof& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual void please_exit (CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-};
-
-#ifndef CubitVarH
-#define CubitVarH
-
-#ifndef CubitvPtr
-#define CubitvPtr
-typedef Cubit* Cubit_vPtr;
-typedef const Cubit* Cubit_cvPtr;
-#endif
-
-class Cubit_var : public CORBA::_var
-{
-    private:
-
-    unsigned char copyHelper (const Cubit_var &IT_s) {
-        {
-            _ptr = Cubit_duplicate (IT_s._ptr);
-        }
-        return 1;
-    }
-
-    public:
-
-    Cubit_var (const Cubit_var &IT_s) {
-        (void) copyHelper (IT_s);
-    }
-
-    Cubit_var () {
-        _ptr = Cubit_nil ();
-    }
-
-    Cubit_var (Cubit *IT_p) {
-        _ptr = IT_p;
-    }
-
-    Cubit_var &operator= (Cubit *IT_p) {
-        Cubit_release (_ptr);
-        _ptr = IT_p;
-        return (*this);
-    }
-
-    Cubit_var &operator= (const Cubit_var &IT_s) {
-        Cubit_release (_ptr);
-        _ptr = Cubit_duplicate (IT_s._ptr);
-        return (*this);
-    }
-
-    ~Cubit_var () {
-        Cubit_release (_ptr);
-    }
-
-    Cubit* operator-> () {
-        return _ptr;
-    }
-
-    operator Cubit_cvPtr () const { return _ptr;}
-    operator Cubit_vPtr& () { return _ptr;}
-
-    protected:
-    Cubit *_ptr;
-    private:
-    Cubit_var &operator= (const CORBA::_var &IT_s);
-    Cubit_var (const CORBA::_var &IT_s);
-    Cubit_var &operator= (const CORBA::_mgr &IT_s);
-    Cubit_var &operator= (const CORBA::_SeqElem &IT_s);
-    Cubit_var (const CORBA::_mgr &IT_s);
-    Cubit_var (const CORBA::_SeqElem &IT_s);
-};
-
-#endif
-
-
-#ifndef CubitMgrH
-#define CubitMgrH
-
-class Cubit_mgr : public CORBA::_mgr
-{
-    public:
-
-    Cubit_mgr () {
-        _ptr = Cubit_nil ();
-        _release = 1;
-    }
-
-    Cubit_mgr (const Cubit_mgr &IT_s) {
-        _ptr = Cubit_duplicate (IT_s._ptr);
-        _release = 1;
-    }
-
-    Cubit_mgr &operator= (Cubit *IT_p) {
-        if (_ptr && _release)
-            Cubit_release (_ptr);
-        _ptr = IT_p;
-        _release = 1;
-        return (*this);
-    }
-
-    Cubit_mgr &operator= (const Cubit_mgr &IT_s) {
-        if (_ptr && _release)
-            Cubit_release (_ptr);
-        _ptr = Cubit_duplicate(IT_s._ptr);
-        _release = 1;
-        return (*this);
-    }
-
-    Cubit_mgr &operator= (Cubit_var &IT_s) {
-        if (_ptr && _release)
-            Cubit_release (_ptr);
-        _ptr = Cubit_duplicate(IT_s);
-        _release = 1;
-        return (*this);
-    }
-
-    ~Cubit_mgr () {
-        if (_release)
-            Cubit_release (_ptr);
-    }
-
-    unsigned char release () {
-        return _release;
-    }
-
-    void release (unsigned char rel) {
-        _release = rel;
-    }
-
-    operator int () const {
-        return (((CORBA::Object_ptr) _ptr) ? 1 : 0);
-    }
-
-    operator void* () const {
-        return _ptr;
-    }
-
-    operator CORBA::Object * () const {
-        return (CORBA::Object *) _ptr;
-    }
-
-    operator Cubit* () const {
-        return (Cubit*) _ptr;
-    }
-
-    Cubit_ptr operator-> () const {
-        return _ptr;
-    }
-
-    Cubit *_ptr;
-
-    protected:
-
-    unsigned char _release;
-};
-
-typedef Cubit_mgr Cubit_mgr_IT_const;
-#endif
-
-#ifndef CubitSeqElemH
-#define CubitSeqElemH
-
-class Cubit_SeqElem : public CORBA::_SeqElem
-{
-    public:
-
-    Cubit_SeqElem (Cubit_ptr* IT_p, unsigned char rel) {
-        _ptr = IT_p;
-        _release = rel;
-    }
-
-    Cubit_SeqElem &operator= (Cubit_ptr IT_p) {
-        if (_ptr) {
-            if (*(_ptr) && _release)
-                Cubit_release (*(_ptr));
-            *(_ptr) = IT_p;
-        }
-        return (*this);
-    }
-
-    Cubit_SeqElem &operator= (const Cubit_SeqElem &IT_s) {
-        if (_ptr && IT_s._ptr) {
-            if (*(_ptr) && _release)
-                Cubit_release (*(_ptr));
-            *(_ptr) = Cubit_duplicate(*(IT_s._ptr));
-        }
-        return (*this);
-    }
-
-    operator Cubit_ptr () const {
-        return _ptr ? (Cubit_ptr) (*_ptr) : Cubit_nil(); 
-    }
-
-    Cubit_ptr operator->() const { return *_ptr;}
-
-    protected:
-    Cubit_ptr *_ptr;
-    unsigned char _release;
-};
-
-#endif
-
-
-#define TIE_Cubit(X) Cubit##X
-
-#define DEF_TIE_Cubit(X) \
-	class Cubit##X : public virtual Cubit {		\
-	  X* m_obj;						\
-	public:							\
-								\
-								\
-	   Cubit##X  (X *objp, const char* m="", CORBA::LoaderClass *l=0)\
-		: Cubit(), m_obj(objp) {	\
-		m_pptr = new Cubit_dispatch		\
-			(( Cubit*)this,(CORBA::Object*)this,m,l,Cubit_IR,m_obj);	\
-	   }								\
-	   Cubit##X  (CORBA::Object *IT_p, const char* IT_m="", void *IT_q=0)\
-		: Cubit() {	\
-		m_pptr = new Cubit_dispatch		\
-			(( Cubit*)this,(CORBA::Object*)this,IT_m,Cubit_IR,IT_p,IT_q);	\
-		m_obj = (X*)(m_pptr->getImplObj ());			\
-	   }								\
-								\
-	   virtual ~Cubit##X  () {				\
-		if (_okToDeleteImpl ()) delete m_obj; }					\
-	   virtual void* _deref () {					\
-		return m_obj; }					\
-								\
-virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_octet (  o,IT_env);\
-}\
-	\
-virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_short (  s,IT_env);\
-}\
-	\
-virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_long (  l,IT_env);\
-}\
-	\
-virtual Cubit::Many cube_struct (const Cubit::Many& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_struct (  values,IT_env);\
-}\
-	\
-virtual Cubit::oneof cube_union (const Cubit::oneof& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_union (  values,IT_env);\
-}\
-	\
-virtual void please_exit (CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-m_obj->please_exit (IT_env);\
-}\
-								\
-	};						\
-
-
-#define QUALS_Cubit	\
-virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_octet (  o,IT_env);\
-}\
-	\
-virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_short (  s,IT_env);\
-}\
-	\
-virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_long (  l,IT_env);\
-}\
-	\
-virtual Many cube_struct (const Many& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_struct (  values,IT_env);\
-}\
-	\
-virtual oneof cube_union (const oneof& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_union (  values,IT_env);\
-}\
-	\
-virtual void please_exit (CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-m_obj->please_exit (IT_env);\
-}\
-
-
-
-
-class CubitProxyFactoryClass : public virtual CORBA::ObjectFactoryClass {
-public:
-   CubitProxyFactoryClass (unsigned char IT_p=0)
-		: CORBA::ProxyFactory (Cubit_IR, IT_p) {}
-
-    virtual void* New (char *IT_OR, CORBA::Environment&);
-
-    virtual void* New (ObjectReference *IT_OR, CORBA::Environment&);
-
-    virtual void* New2 (); 
-
-    virtual CORBA::Object* NewObject (char *IT_OR, CORBA::Environment&);
-
-    virtual CORBA::Object* NewObject (ObjectReference *IT_OR, CORBA::Environment&);
-
-    virtual CORBA::Object* New2Object (); 
-
-    virtual void* IT_castUp (void *IT_p, char* IT_s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-
-    virtual CORBA::PPTR* pptr (void *IT_p);
-
-    virtual void baseInterfaces (_IDL_SEQUENCE_string&);
-
-
-};
-
-extern CubitProxyFactoryClass CubitProxyFactory;
-
-class CubitBOAImpl : public virtual Cubit  {
-public:
-    CubitBOAImpl (const char *m="", CORBA::LoaderClass *l=NULL) {
-  if (CORBA::PPTR::isOK (m_pptr, Cubit_IR))
-    m_pptr = new Cubit_dispatch ( (Cubit*)this,
-   	 (CORBA::Object*)this, m, l, Cubit_IR, this);
-}
-
-        virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual Many cube_struct (const Many& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual oneof cube_union (const oneof& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual void please_exit (CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-};
-
-
-#endif
-
-
-#endif
diff --git a/TAO/IIOP/tests/Cubit/Orbix/base_server/cubit.idl b/TAO/IIOP/tests/Cubit/Orbix/base_server/cubit.idl
deleted file mode 100644
index d9b38c34a2a..00000000000
--- a/TAO/IIOP/tests/Cubit/Orbix/base_server/cubit.idl
+++ /dev/null
@@ -1,40 +0,0 @@
-// @(#)cubit.idl	1.1 95/09/10
-// Copyright 1994-1995 by Sun Microsystems, Inc.
-
-#pragma prefix	"Eng.SUN.COM"
-#pragma version Cubit 1.1
-
-interface Cubit {
-    octet	cube_octet (in octet o);
-    short	cube_short (in short s);
-    long	cube_long (in long l);
-
-    struct Many {
-	octet	o;		// + 3 bytes padding (normally) ...
-	long	l;
-	short	s;		// + 2 bytes padding (normally) ...
-    };
-
-    Many	cube_struct (in Many values);
-
-    enum discrim {e_0th, e_1st, e_2nd, e_3rd, e_4th, e_5th};
-
-    union oneof
-    switch (discrim) {
-	// this is an easy union to interpret; no padding
-	// is needed between discriminant and value.
-      case e_0th:
-        octet		o;
-      case e_1st:
-        short		s;
-      case e_2nd:
-        long		l;
-      case e_3rd:
-      default:
-        Many		cm;
-    };
-
-    oneof	cube_union (in oneof values);
-
-    oneway void	please_exit ();
-};
diff --git a/TAO/IIOP/tests/Cubit/Orbix/base_server/cubitC.cpp b/TAO/IIOP/tests/Cubit/Orbix/base_server/cubitC.cpp
deleted file mode 100644
index c47e38f26ee..00000000000
--- a/TAO/IIOP/tests/Cubit/Orbix/base_server/cubitC.cpp
+++ /dev/null
@@ -1,557 +0,0 @@
-#include "cubit.h"
-
-Cubit::Cubit (char *IT_OR) {
-      m_pptr = new Cubit_dispatch (IT_OR, this,(CORBA::Object*)this);
-} 
-Cubit::Cubit (ObjectReference *IT_OR) {
-      m_pptr = new Cubit_dispatch (IT_OR, this,(CORBA::Object*)this);
-} 
-
-#ifndef CubitForwC
-#define CubitForwC
-CORBA::ObjectRef Cubit_getBase(void *IT_p){
-    return (Cubit*) IT_p;}
-
-void Cubit_release (Cubit_ptr IT_p, CORBA::Environment &IT_env) {
-    CORBA::release(IT_p, IT_env);}
-
-void Cubit_release (Cubit_ptr IT_p) {
-    Cubit_release (IT_p, CORBA::IT_chooseDefaultEnv ()); }
-
-Cubit_ptr Cubit_nil (CORBA::Environment &) {
-    return Cubit:: _nil ();}
-
-Cubit_ptr Cubit_nil () {
-    return Cubit_nil (CORBA::IT_chooseDefaultEnv ());}
-
-Cubit_ptr Cubit_duplicate (Cubit_ptr IT_p, CORBA::Environment &IT_env) {
-    return (Cubit::_duplicate(IT_p, IT_env)); }
-Cubit_ptr Cubit_duplicate (Cubit_ptr IT_p) {
-    return Cubit_duplicate (IT_p, CORBA::IT_chooseDefaultEnv ()); }
-#endif
-
-Cubit_ptr Cubit::_duplicate(Cubit_ptr obj, CORBA::Environment& IT_pEnv) {
-        CORBA::EnvExcRaiser IT_raise;
-        CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-       if (!obj) {
-          return (obj);
-       }
-       Cubit_ptr IT_obj = obj->__duplicate (IT_env);
-       return IT_obj;
-}
-
-
-
-Cubit* Cubit:: _bind (const char* IT_markerServer, const char* host,
-		const CORBA::Context &IT_c, 
-		CORBA::Environment &IT_env) {
-       return (Cubit*)CORBA::Factory.New (IT_markerServer, IT_env, IT_c, host, 
-		Cubit_IMPL, Cubit_IR);
-}
-
-
-
-Cubit* Cubit:: _bind (CORBA::Environment &IT_env) {
-       return _bind (NULL,NULL,CORBA::Context(), IT_env); }
-
-
-Cubit* Cubit:: _bind (const char* IT_markerServer, const char* host,
-                CORBA::Environment &IT_env) {
-       return _bind (IT_markerServer, host, CORBA::Context (), IT_env); }
-Cubit* Cubit::_narrow (CORBA::Object* IT_obj, CORBA::Environment &IT_pEnv) {
-        CORBA::EnvExcRaiser IT_raise;
-        CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-        if (CORBA::is_nil (IT_obj)) {
-                return Cubit:: _nil();
-        }
-
-       Cubit* IT_p = (Cubit*)CORBA::Object::_castDown (IT_obj, Cubit_IR, IT_env);
-        IT_p = IT_p ? IT_p->__duplicate(IT_env) : NULL;
-        if ((IT_env) &&(!strcmp(IT_env.exception()->id(), "CORBA::StExcep::BAD_PARAM")) && (((CORBA::BAD_PARAM*)IT_env.exception())-> minor() == NARROW_FAILED)) {
-                IT_env.exception_free();
-        }
-        return IT_p;
-   }
-
-
-#ifndef Cubit_Many_Ops
-#define Cubit_Many_Ops
-
-void Cubit::Many:: encodeOp (CORBA::Request &IT_r) const {
-
-    IT_r.insertOctet (o);
-
-    IT_r << l;
-
-    IT_r << s;
-}
-
-void Cubit::Many:: decodeOp (CORBA::Request &IT_r) {
-
-    IT_r.extractOctet (o);
-
-    IT_r >> l;
-
-    IT_r >> s;
-}
-
-void Cubit::Many:: decodeInOutOp (CORBA::Request &IT_r) {
-
-    IT_r.extractOctet (o);
-
-    IT_r >> l;
-
-    IT_r >> s;
-}
-
-Cubit::Many ::~Many () {
-}
-
-Cubit::Many:: Many (const Cubit::Many &IT_s) 
-	 {
-    o = IT_s.o;
-    l = IT_s.l;
-    s = IT_s.s;
-}
-
-Cubit::Many:: Many () {
-}
-
-Cubit::Many &Cubit::Many:: operator= (const Cubit::Many& IT_s) {
-    if (this == &IT_s) return *this;
-    o = IT_s.o;
-    l = IT_s.l;
-    s = IT_s.s;
-    return *this;
-}
-
-
-#endif
-
-
-#ifndef Cubit_oneof_Ops
-#define Cubit_oneof_Ops
-void Cubit::oneof:: encodeOp (CORBA::Request &IT_r) const {
-    if (!isSet) return;
-    {
-    CORBA::ULong IT_0 = (CORBA::ULong) __d;
-    IT_r << IT_0;
-    }
-    switch (__d) {
-        case Cubit::e_0th: 
-        IT_r.insertOctet (_o_);
-        break;
-        case Cubit::e_1st: 
-        IT_r << _s_;
-        break;
-        case Cubit::e_2nd: 
-        IT_r << _l_;
-        break;
-        case Cubit::e_3rd: 
-        default: 
-        (*_cm_).encodeOp (IT_r);
-        break;
-    }
-
-}
-
-void Cubit::oneof:: decodeOp (CORBA::Request &IT_r) {
-    isSet = 0;
-    {
-    CORBA::ULong IT_1;
-    IT_r >> IT_1;
-    __d = Cubit::discrim(IT_1);
-    }
-    switch (__d) {
-        case Cubit::e_0th: 
-        if (!isSet) {
-            isSet = 1;
-        }
-        IT_r.extractOctet (_o_);
-        break;
-        case Cubit::e_1st: 
-        if (!isSet) {
-            isSet = 1;
-        }
-        IT_r >> _s_;
-        break;
-        case Cubit::e_2nd: 
-        if (!isSet) {
-            isSet = 1;
-        }
-        IT_r >> _l_;
-        break;
-        case Cubit::e_3rd: 
-        default: 
-        if (!isSet) {
-            _cm_ = new Cubit::Many;
-            isSet = 1;
-        }
-        (*_cm_).decodeOp (IT_r);
-        break;
-    }
-
-}
-void Cubit::oneof:: decodeInOutOp (CORBA::Request &IT_r) {
-    Cubit::discrim IT_d;
-    {
-    CORBA::ULong IT_2;
-    IT_r >> IT_2;
-    IT_d = Cubit::discrim(IT_2);
-    }
-    if (IT_d == __d)
-        switch (__d) {
-            case Cubit::e_0th: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r.extractOctet (_o_);
-            break;
-            case Cubit::e_1st: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r >> _s_;
-            break;
-            case Cubit::e_2nd: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r >> _l_;
-            break;
-            case Cubit::e_3rd: 
-            default: 
-            if (!isSet) {
-                _cm_ = new Cubit::Many;
-                isSet = 1;
-            }
-            (*_cm_).decodeInOutOp (IT_r);
-            break;
-        }
-
-    else {
-        this->oneof:: ~oneof();
-        memset(this, 0, sizeof(*this));
-        __d = IT_d;
-        switch (__d) {
-            case Cubit::e_0th: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r.extractOctet (_o_);
-            break;
-            case Cubit::e_1st: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r >> _s_;
-            break;
-            case Cubit::e_2nd: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r >> _l_;
-            break;
-            case Cubit::e_3rd: 
-            default: 
-            if (!isSet) {
-                _cm_ = new Cubit::Many;
-                isSet = 1;
-            }
-            (*_cm_).decodeOp (IT_r);
-            break;
-        }
-        isSet = 1;
-    }
-
-}
-
-Cubit::oneof:: oneof() { 
-    memset(this, 0, sizeof(*this));
-    isSet = 0;
-}
-
-Cubit::oneof ::~oneof() {
-    if (!isSet) return;
-    switch (__d) { 
-        case Cubit::e_0th:         break;
-        case Cubit::e_1st:         break;
-        case Cubit::e_2nd:         break;
-        case Cubit::e_3rd: 
-        default:         if (_cm_) delete _cm_;
-        break;
-    }
-
-    isSet = 0;
-}
-
-Cubit::oneof:: oneof (const Cubit::oneof &IT_s) {
-    isSet = 0;
-    memset(this, 0, sizeof(*this));
-    __d = IT_s.__d;
-    switch (__d) {
-        case Cubit::e_0th:         isSet = 1;
-        _o_ = IT_s._o_;
-        break;
-        case Cubit::e_1st:         isSet = 1;
-        _s_ = IT_s._s_;
-        break;
-        case Cubit::e_2nd:         isSet = 1;
-        _l_ = IT_s._l_;
-        break;
-        case Cubit::e_3rd: 
-        default: 
-        if (!isSet) {
-            _cm_ = new Cubit::Many;
-            isSet = 1;
-        }
-        *(_cm_) = *(IT_s._cm_);
-        break;
-    }
-    isSet = 1;
-}
-
-Cubit::oneof& Cubit::oneof:: operator= (const Cubit::oneof & IT_s) {
-    if (this == &IT_s) return *this;
-    if (isSet && (__d != IT_s.__d))
-    {
-        this-> oneof::~oneof();
-        memset(this, 0, sizeof(*this));
-    }
-
-    __d = IT_s.__d;
-    switch (__d) {
-        case Cubit::e_0th:         isSet = 1;
-        _o_ = IT_s._o_;
-        break;
-        case Cubit::e_1st:         isSet = 1;
-        _s_ = IT_s._s_;
-        break;
-        case Cubit::e_2nd:         isSet = 1;
-        _l_ = IT_s._l_;
-        break;
-        case Cubit::e_3rd: 
-        default: 
-        if (!isSet) {
-            _cm_ = new Cubit::Many;
-            isSet = 1;
-        }
-        *(_cm_) = *(IT_s._cm_);
-        break;
-    }
-    isSet = 1;
-    return *this;
-}
-
-
-#endif
-
-void* CubitProxyFactoryClass::New (char *IT_OR, CORBA::Environment&) {
-        return  new class Cubit(IT_OR);}
-
-void* CubitProxyFactoryClass::New (ObjectReference *IT_OR, CORBA::Environment&) {
-        return  new class Cubit(IT_OR);}
-
-void* CubitProxyFactoryClass::New2 () {
-        return  new class Cubit((char*)0);}
-
-CORBA::Object* CubitProxyFactoryClass::NewObject (char *IT_OR, CORBA::Environment&) {
-        return  new class Cubit(IT_OR);}
-
-CORBA::Object* CubitProxyFactoryClass::NewObject (ObjectReference *IT_OR, CORBA::Environment&) {
-        return  new class Cubit(IT_OR);}
-
-CORBA::Object* CubitProxyFactoryClass::New2Object () {
-        return  new class Cubit((char*)0);}
-
-void* CubitProxyFactoryClass::IT_castUp (void *IT_p, char* IT_s, CORBA::Environment &IT_env) {
-      void *IT_l;
-      if (!CORBA::_interfaceCmp (IT_s,Cubit_IR, IT_env))
-         return IT_p;
-      else if (IT_l=CORBA::ObjectFactoryClass::IT_castUp((CORBA::Object*)((class Cubit*)IT_p),IT_s, IT_env))
-         return IT_l;
-      else return NULL;
-    }
-
-
-CORBA::PPTR* CubitProxyFactoryClass::pptr (void *IT_p) {
-       return ((class Cubit*)IT_p)->_pptr ();}
-
-void CubitProxyFactoryClass::baseInterfaces (_IDL_SEQUENCE_string& seq) {
-      add (seq, Cubit_IR);
-      CORBA::ObjectFactoryClass::baseInterfaces (seq);
-}
-
-CubitProxyFactoryClass CubitProxyFactory(1);
-
-CORBA::Octet Cubit:: cube_octet (CORBA::Octet o, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        return 0;
-    }
-    CORBA::Request IT_r (this, "cube_octet",IT_env,1,0);
-    if (!IT_r.isException (IT_env)) {
-
-        IT_r.insertOctet (o);
-    }
-
-    IT_r.invoke (CORBA::Flags(0),IT_env);
-    if (!IT_r.isException (IT_env)) {
-        CORBA::Octet IT_result;
-        IT_r.extractOctet (IT_result);
-        IT_r.checkEnv (IT_env);
-        return IT_result;
-    }
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-    return 0;
-}
-
-CORBA::Short Cubit:: cube_short (CORBA::Short s, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        return 0;
-    }
-    CORBA::Request IT_r (this, "cube_short",IT_env,1,0);
-    if (!IT_r.isException (IT_env)) {
-
-        IT_r << s;
-    }
-
-    IT_r.invoke (CORBA::Flags(0),IT_env);
-    if (!IT_r.isException (IT_env)) {
-        CORBA::Short IT_result;
-        IT_r >> IT_result;
-        IT_r.checkEnv (IT_env);
-        return IT_result;
-    }
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-    return 0;
-}
-
-CORBA::Long Cubit:: cube_long (CORBA::Long l, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        return 0;
-    }
-    CORBA::Request IT_r (this, "cube_long",IT_env,1,0);
-    if (!IT_r.isException (IT_env)) {
-
-        IT_r << l;
-    }
-
-    IT_r.invoke (CORBA::Flags(0),IT_env);
-    if (!IT_r.isException (IT_env)) {
-        CORBA::Long IT_result;
-        IT_r >> IT_result;
-        IT_r.checkEnv (IT_env);
-        return IT_result;
-    }
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-    return 0;
-}
-
-Cubit::Many Cubit:: cube_struct (const Cubit::Many& values, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        { 
-            Cubit::Many IT_l0;
-            return IT_l0;
-        }
-    }
-    CORBA::Request IT_r (this, "cube_struct",IT_env,1,0);
-    if (!IT_r.isException (IT_env)) {
-
-        values.encodeOp (IT_r);
-    }
-
-    IT_r.invoke (CORBA::Flags(0),IT_env);
-    if (!IT_r.isException (IT_env)) {
-        Cubit::Many IT_result;
-        IT_result.decodeOp (IT_r);
-        IT_r.checkEnv (IT_env);
-        return IT_result;
-    }
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-    { 
-        Cubit::Many IT_l1;
-        return IT_l1;
-    }
-}
-
-Cubit::oneof Cubit:: cube_union (const Cubit::oneof& values, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        { 
-            Cubit::oneof IT_l0;
-            return IT_l0;
-        }
-    }
-    CORBA::Request IT_r (this, "cube_union",IT_env,1,0);
-    if (!IT_r.isException (IT_env)) {
-
-        values.encodeOp (IT_r);
-    }
-
-    IT_r.invoke (CORBA::Flags(0),IT_env);
-    if (!IT_r.isException (IT_env)) {
-        Cubit::oneof IT_result;
-        IT_result.decodeOp (IT_r);
-        IT_r.checkEnv (IT_env);
-        return IT_result;
-    }
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-    { 
-        Cubit::oneof IT_l1;
-        return IT_l1;
-    }
-}
-
-void Cubit:: please_exit (CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        return ;
-    }
-    CORBA::Request IT_r (this, "please_exit",IT_env,1,1);
-
-    IT_r.invoke (CORBA::Flags(CORBA::INV_NO_RESPONSE), IT_env);
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-}
-
-
-
-
-
-#ifndef Cubit_dispatch_impl
-
-unsigned char Cubit_dispatch::dispatch (CORBA::Request &IT_r, 
-    unsigned char, void *) {
-      IT_r.makeRuntimeException1 ("Cubit");
-      return 0;
-}
- 
-#endif
-
diff --git a/TAO/IIOP/tests/Cubit/Orbix/base_server/cubitC.h b/TAO/IIOP/tests/Cubit/Orbix/base_server/cubitC.h
deleted file mode 100644
index 15247168d3c..00000000000
--- a/TAO/IIOP/tests/Cubit/Orbix/base_server/cubitC.h
+++ /dev/null
@@ -1,343 +0,0 @@
-#ifndef _cubitC_h
-#define _cubitC_h
-
-/************************************************************************/
-/*                                                                      */
-/* This file is automatically generated by ORBeline IDL compiler        */
-/* Do not modify this file.                                             */
-/*                                                                      */
-/* ORBeline (c) is copyrighted by PostModern Computing, Inc.            */
-/*                                                                      */
-/* The generated code conforms to OMG's IDL C++ mapping as              */
-/* specified in OMG Document Number: 94-9-14.                           */
-/*                                                                      */
-/************************************************************************/
-
-#include "corba.h"
-
-
-
-class Cubit;
-typedef Cubit *Cubit_ptr;
-typedef Cubit_ptr CubitRef;
-
-#ifndef _Cubit_var_
-#define _Cubit_var_
-class Cubit_var
-{
-    public:
-	Cubit_var();
-	Cubit_var(Cubit_ptr);
-	Cubit_var(const Cubit_var&);
-	~Cubit_var();
-	Cubit_var& operator=(Cubit_ptr);
-	operator Cubit_ptr() const { return _ptr; }
-#if defined(_HPCC_BUG)
-	operator Cubit *&() { return _ptr; }
-#else
-	operator Cubit_ptr&() { return _ptr; }
-#endif
-	Cubit_ptr operator->() const { return _ptr;}
-	friend NCistream& operator>>(NCistream&, Cubit_var&);
-	friend NCostream& operator<<(NCostream&, const Cubit_var&);
-	friend istream& operator>>(istream&, Cubit_var&);
-	friend ostream& operator<<(ostream&, const Cubit_var&);
-    private:
-	Cubit_ptr	_ptr;
-	void operator=(const Cubit_var&) {}
-};
-#endif
-class Cubit: public virtual CORBA_Object
-{
-    private:
-	static const CORBA::TypeInfo _class_info;
-	Cubit(const Cubit&) {}
-	void operator=(const Cubit&){}
-    public:
-	static const CORBA::TypeInfo *_desc();
-	virtual const CORBA::TypeInfo *_type_info() const;
-	virtual void *_safe_narrow(const CORBA::TypeInfo& ) const;
-	static CORBA::Object *_factory();
-    protected:
-	Cubit(const char *obj_name = NULL) :CORBA_Object(obj_name, 1) {}
-	Cubit(NCistream& strm) :CORBA_Object(strm) {}
-	virtual ~Cubit() {}
-    public:
-	static Cubit_ptr _duplicate(Cubit_ptr obj) {
-		if (obj ) obj->_ref();
-		return obj;
-	}
-	static Cubit_ptr _nil() { return (Cubit_ptr)NULL;}
-	static Cubit_ptr _narrow(CORBA::Object *obj);
-	static Cubit_ptr _clone(Cubit_ptr obj) {
-		CORBA::Object_var obj_var(__clone(obj));
-
-#if defined(_HPCC_BUG)
-		return _narrow(obj_var.operator CORBA::Object_ptr());
-#else
-		return _narrow(obj_var);
-#endif
-	}
-	static Cubit_ptr _bind(const char *object_name = NULL,
-		const char *host_name = NULL,
-		const CORBA::BindOptions* opt = NULL); 
-
-	virtual CORBA::Octet cube_octet(CORBA::Octet o);
-	
-	virtual CORBA::Short cube_short(CORBA::Short s);
-	
-	virtual CORBA::Long cube_long(CORBA::Long l);
-	
-	struct Many {
-		CORBA::Octet	o;
-		CORBA::Long	l;
-		CORBA::Short	s;
-	};
-	friend NCostream& operator<<(NCostream&, const Many& );
-	friend NCistream& operator>>(NCistream&, Many& );
-	
-	friend ostream& operator<<(ostream&, const Many& );
-	inline friend istream& operator>>(istream& _strm, Many& _obj) {
-		NCistream _istrm(_strm);
-		_istrm >> _obj;
-		return _strm;
-	}
-	
-	
-	typedef Many *Many_ptr;
-	class Many_var
-	{
-	    public:
-		Many_var() { _ptr = (Many*)NULL;}
-		Many_var(Many *ptr) {
-			_ptr = ptr;
-		}
-		Many_var(const Many_var& var) {
-			if (var._ptr)
-				_ptr = new Many(*var._ptr);
-			else
-				_ptr = (Many *)NULL;
-		}
-		~Many_var() {
-			if (_ptr != (Many *)NULL) delete _ptr;
-		}
-		Many_var& operator=(Many *ptr) {
-			if (_ptr != (Many *)NULL) delete _ptr;
-			_ptr = ptr;
-			return *this;
-		}
-		Many_var& operator=(const Many_var& var) {
-			if (_ptr != (Many *)NULL) delete _ptr;
-			if (var._ptr)
-				_ptr = new Many(*var._ptr);
-			else
-				_ptr = (Many *)NULL;
-			return *this;
-		}
-		Many *operator->() { return _ptr; }
-		operator Many () const { return *_ptr; }
-		operator Many& () { return *_ptr; }
-		inline friend NCostream& operator<<(NCostream& strm,
-				const Many_var& var) {
-			if (var._ptr == (Many *)NULL) {
-				throw CORBA::BAD_PARAM();
-			}
-			else
-				strm << *var._ptr;
-			return strm;
-		}
-		inline friend NCistream& operator>>(NCistream& strm,
-				Many_var& var) {
-			if ( ! var._ptr)
-				var._ptr = new Many;
-			strm >> *var._ptr;
-			return strm;
-		}
-	    private:
-		Many *_ptr;
-	};
-	
-	
-	virtual Cubit::Many cube_struct(const Cubit::Many& values);
-	
-	enum discrim {
-		e_0th,
-		e_1st,
-		e_2nd,
-		e_3rd,
-		e_4th,
-		e_5th
-	};
-	inline friend NCostream& operator<<(NCostream& _strm, discrim _enum_type) {
-		_strm << (CORBA::ULong)_enum_type;
-		return _strm;
-	}
-	inline friend NCistream& operator>>(NCistream& _strm, discrim& _enum_type) {
-		CORBA::ULong _temp;
-		_strm >> _temp;
-		if (_temp >= 6)
-			throw CORBA::BAD_PARAM();
-		_enum_type = discrim(_temp);
-		return _strm;
-	}
-	inline friend ostream& operator<<(ostream& _strm, discrim _enum_type) {
-		if( &_strm == &cout || &_strm == &cerr || &_strm == &clog) {
-			_strm << "discrim:";
-			switch(_enum_type) {
-				case e_0th:
-					_strm << "e_0th" << endl;
-					break;
-				case e_1st:
-					_strm << "e_1st" << endl;
-					break;
-				case e_2nd:
-					_strm << "e_2nd" << endl;
-					break;
-				case e_3rd:
-					_strm << "e_3rd" << endl;
-					break;
-				case e_4th:
-					_strm << "e_4th" << endl;
-					break;
-				case e_5th:
-					_strm << "e_5th" << endl;
-					break;
-			}
-		}
-		else 
-			_strm << (CORBA::ULong)_enum_type;
-		return _strm;
-	}
-	inline friend istream& operator>>(istream& _strm, discrim& _enum_type) {
-		CORBA::ULong _temp;
-		_strm >> _temp;
-		_enum_type = discrim(_temp);
-		return _strm;
-	}
-	
-	
-	class oneof
-	{
-	    public:
-	    private:
-		discrim	_disc;
-		CORBA::Octet	__o;
-		CORBA::Short	__s;
-		CORBA::Long	__l;
-		Cubit::Many	__cm;
-	    public:
-		oneof() : _disc(discrim(0)) {}
-		~oneof() {}
-		oneof(const oneof& obj);
-		oneof& operator=(const oneof& obj);
-	
-		void _d(discrim val) { _disc = val; }
-		discrim _d() const { return _disc; }
-	
-		void o(CORBA::Octet val) {
-			__o = val;
-			_disc = Cubit::e_0th;
-		}
-		CORBA::Octet o() const { return __o; }
-	
-		void s(CORBA::Short val) {
-			__s = val;
-			_disc = Cubit::e_1st;
-		}
-		CORBA::Short s() const { return __s; }
-	
-		void l(CORBA::Long val) {
-			__l = val;
-			_disc = Cubit::e_2nd;
-		}
-		CORBA::Long l() const { return __l; }
-	
-		void cm(const Cubit::Many& val) {
-			__cm = val;
-			_disc = Cubit::e_3rd;
-		}
-		const Cubit::Many& cm() const { return __cm; }
-		Cubit::Many& cm() { return __cm; }
-	
-		friend NCostream& operator<<(NCostream&, const oneof& );
-		friend NCistream& operator>>(NCistream&, oneof& );
-		friend ostream& operator<<(ostream&, const oneof&);
-		inline friend istream& operator>>(istream& strm, oneof& obj) {
-			NCistream istrm(strm);
-			strm >> obj;
-			return strm;
-		}
-	};
-	
-	typedef oneof *oneof_ptr;
-	class oneof_var
-	{
-	    public:
-		oneof_var() { _ptr = (oneof*)NULL;}
-		oneof_var(oneof *ptr) {
-			_ptr = ptr;
-		}
-		oneof_var(const oneof_var& var) {
-			_ptr = new oneof(*var._ptr);
-		}
-		~oneof_var() {
-			if (_ptr != (oneof *)NULL) delete _ptr;
-		}
-		oneof_var& operator=(oneof *ptr) {
-			if (_ptr != (oneof *)NULL) delete _ptr;
-			_ptr = ptr;
-			return *this;
-		}
-		oneof_var& operator=(const oneof_var& var) {
-			if (_ptr != (oneof *)NULL) delete _ptr;
-			_ptr = new oneof(*var._ptr);
-			return *this;
-		}
-		oneof *operator->() { return _ptr; }
-		operator oneof () const { return *_ptr; }
-		operator oneof& () { return *_ptr; }
-		inline friend NCostream& operator<<(NCostream& strm,
-				const oneof_var& var) {
-			if (var._ptr == (oneof *)NULL) {
-				throw CORBA::BAD_PARAM();
-			}
-			else
-				strm << *var._ptr;
-			return strm;
-		}
-		inline friend NCistream& operator>>(NCistream& strm,
-				oneof_var& var) {
-			if ( ! var._ptr)
-				var._ptr = new oneof;
-			strm >> *var._ptr;
-			return strm;
-		}
-	    private:
-		oneof *_ptr;
-	};
-	
-	
-	virtual Cubit::oneof cube_union(const Cubit::oneof& values);
-	
-	virtual void please_exit();
-	
-	inline friend NCistream& operator>>(NCistream& strm, Cubit_ptr& obj) {
-		CORBA::Object_var _obj(obj);
-		_obj = CORBA::Object::_read(strm, Cubit::_desc());
-		obj = Cubit::_narrow(_obj);
-		return strm;
-	}
-	inline friend ostream& operator<<(ostream& strm, const Cubit_ptr obj) {
-		strm << (CORBA::Object_ptr)obj;
-		return strm;
-	}
-	inline friend istream& operator>>(istream& strm, Cubit_ptr& obj) {
-		NCistream istrm(strm);
-		istrm >> obj;
-		return strm;
-	}
-};
-
-
-#endif
-
diff --git a/TAO/IIOP/tests/Cubit/Orbix/base_server/cubitS.cpp b/TAO/IIOP/tests/Cubit/Orbix/base_server/cubitS.cpp
deleted file mode 100644
index 449a8c23548..00000000000
--- a/TAO/IIOP/tests/Cubit/Orbix/base_server/cubitS.cpp
+++ /dev/null
@@ -1,226 +0,0 @@
-#include "cubit.h"
-
-
-#define Cubit_dispatch_impl
-
-unsigned char Cubit_dispatch::dispatch (CORBA::Request &IT_r, 
- unsigned char IT_isTarget, void *IT_pp) {
-    if (!IT_pp)
-       IT_pp = m_obj;
-    const char *IT_s = IT_r.getOperation ();
-    if (!strcmp(IT_s,"cube_octet")) {
-        CORBA::Octet IT_result;
-        CORBA::Environment IT_env (IT_r);
-        CORBA::Filter* IT_f = CORBA::Orbix.getFilter ();
-        if (!IT_r.tcAssert ("\
-Ro~cube_octet~+o{o},>{o},N{}\
-"))
-            return 1;
-        CORBA::Octet o;
-
-        IT_r.extractOctet (o);
-
-        if (IT_f && !IT_r.isException (IT_env))
-        	IT_f->inRequestPostM (IT_r, IT_env);
-        if (!IT_r.isException (IT_env)) {
-            try {
-                	IT_result = ((Cubit*)IT_pp)->cube_octet (  o, IT_env);
-
-            } catch (CORBA::SystemException &IT_exSys) {
-            IT_env.propagate (&IT_exSys);
-            } catch (CORBA::UserException &IT_exUsr) {
-            IT_env.propagate (&IT_exUsr);
-            }
-        }
-
-        if (!IT_r.isException (IT_env)) {
-            if (!IT_r.convertToReply ("\
-o\
-", IT_env)) return 1;
-            IT_r.insertOctet (IT_result);
-            }
-
-        else IT_r.makeSystemException (IT_env);
-        return 1;
-    }
-
-    if (!strcmp(IT_s,"cube_short")) {
-        CORBA::Short IT_result;
-        CORBA::Environment IT_env (IT_r);
-        CORBA::Filter* IT_f = CORBA::Orbix.getFilter ();
-        if (!IT_r.tcAssert ("\
-Ro~cube_short~+s{s},>{s},N{}\
-"))
-            return 1;
-        CORBA::Short s;
-
-        IT_r >> s;
-
-        if (IT_f && !IT_r.isException (IT_env))
-        	IT_f->inRequestPostM (IT_r, IT_env);
-        if (!IT_r.isException (IT_env)) {
-            try {
-                	IT_result = ((Cubit*)IT_pp)->cube_short (  s, IT_env);
-
-            } catch (CORBA::SystemException &IT_exSys) {
-            IT_env.propagate (&IT_exSys);
-            } catch (CORBA::UserException &IT_exUsr) {
-            IT_env.propagate (&IT_exUsr);
-            }
-        }
-
-        if (!IT_r.isException (IT_env)) {
-            if (!IT_r.convertToReply ("\
-s\
-", IT_env)) return 1;
-            IT_r << IT_result;
-            }
-
-        else IT_r.makeSystemException (IT_env);
-        return 1;
-    }
-
-    if (!strcmp(IT_s,"cube_long")) {
-        CORBA::Long IT_result;
-        CORBA::Environment IT_env (IT_r);
-        CORBA::Filter* IT_f = CORBA::Orbix.getFilter ();
-        if (!IT_r.tcAssert ("\
-Ro~cube_long~+l{l},>{l},N{}\
-"))
-            return 1;
-        CORBA::Long l;
-
-        IT_r >> l;
-
-        if (IT_f && !IT_r.isException (IT_env))
-        	IT_f->inRequestPostM (IT_r, IT_env);
-        if (!IT_r.isException (IT_env)) {
-            try {
-                	IT_result = ((Cubit*)IT_pp)->cube_long (  l, IT_env);
-
-            } catch (CORBA::SystemException &IT_exSys) {
-            IT_env.propagate (&IT_exSys);
-            } catch (CORBA::UserException &IT_exUsr) {
-            IT_env.propagate (&IT_exUsr);
-            }
-        }
-
-        if (!IT_r.isException (IT_env)) {
-            if (!IT_r.convertToReply ("\
-l\
-", IT_env)) return 1;
-            IT_r << IT_result;
-            }
-
-        else IT_r.makeSystemException (IT_env);
-        return 1;
-    }
-
-    if (!strcmp(IT_s,"cube_struct")) {
-        Cubit::Many IT_result;
-        CORBA::Environment IT_env (IT_r);
-        CORBA::Filter* IT_f = CORBA::Orbix.getFilter ();
-        if (!IT_r.tcAssert ("\
-Ro~cube_struct~+values{R~Cubit::Many~o{o},l{l},s{s}},>{R~Cubit::Many~o{o},l{l},s{s}},N{}\
-"))
-            return 1;
-        Cubit::Many values;
-
-        values.decodeOp (IT_r);
-
-        if (IT_f && !IT_r.isException (IT_env))
-        	IT_f->inRequestPostM (IT_r, IT_env);
-        if (!IT_r.isException (IT_env)) {
-            try {
-                	IT_result = ((Cubit*)IT_pp)->cube_struct (  values, IT_env);
-
-            } catch (CORBA::SystemException &IT_exSys) {
-            IT_env.propagate (&IT_exSys);
-            } catch (CORBA::UserException &IT_exUsr) {
-            IT_env.propagate (&IT_exUsr);
-            }
-        }
-
-        if (!IT_r.isException (IT_env)) {
-            if (!IT_r.convertToReply ("\
-R~Cubit::Many~o{o},l{l},s{s}\
-", IT_env)) return 1;
-            IT_result.encodeOp (IT_r);
-            }
-
-        else IT_r.makeSystemException (IT_env);
-        return 1;
-    }
-
-    if (!strcmp(IT_s,"cube_union")) {
-        Cubit::oneof IT_result;
-        CORBA::Environment IT_env (IT_r);
-        CORBA::Filter* IT_f = CORBA::Orbix.getFilter ();
-        IT_r.tcPreAssert (
-"\
-Ro~cube_union~+values{U~Cubit::oneof~{E~Cubit::discrim~e_0th,e_1st,e_2nd,e_3rd,e_4th,e_5th}~Cubit::e_0th o{o};Cubit::e_1st s{s};Cubit::e_2nd l{l};Cubit::e_3rd,$ cm{R~Cubit::Many~o{o},l{l},s{s}}},>{U~Cubit::oneof~{E~Cubit::discrim~e_0th,e_1st,e_2nd,e_3rd,\
-");
-        if (!IT_r.tcAssert ("\
-e_4th,e_5th}~Cubit::e_0th o{o};Cubit::e_1st s{s};Cubit::e_2nd l{l};Cubit::e_3rd,$ cm{R~Cubit::Many~o{o},l{l},s{s}}},N{}\
-"))
-            return 1;
-        Cubit::oneof values;
-
-        values.decodeOp (IT_r);
-
-        if (IT_f && !IT_r.isException (IT_env))
-        	IT_f->inRequestPostM (IT_r, IT_env);
-        if (!IT_r.isException (IT_env)) {
-            try {
-                	IT_result = ((Cubit*)IT_pp)->cube_union (  values, IT_env);
-
-            } catch (CORBA::SystemException &IT_exSys) {
-            IT_env.propagate (&IT_exSys);
-            } catch (CORBA::UserException &IT_exUsr) {
-            IT_env.propagate (&IT_exUsr);
-            }
-        }
-
-        if (!IT_r.isException (IT_env)) {
-            if (!IT_r.convertToReply ("\
-U~Cubit::oneof~{E~Cubit::discrim~e_0th,e_1st,e_2nd,e_3rd,e_4th,e_5th}~Cubit::e_0th o{o};Cubit::e_1st s{s};Cubit::e_2nd l{l};Cubit::e_3rd,$ cm{R~Cubit::Many~o{o},l{l},s{s}}\
-", IT_env)) return 1;
-            IT_result.encodeOp (IT_r);
-            }
-
-        else IT_r.makeSystemException (IT_env);
-        return 1;
-    }
-
-    if (!strcmp(IT_s,"please_exit")) {
-        CORBA::Environment IT_env (IT_r);
-        CORBA::Filter* IT_f = CORBA::Orbix.getFilter ();
-        if (!IT_r.tcAssert ("\
-Ro~please_exit~>{v},O{}\
-"))
-            return 1;
-
-        if (IT_f && !IT_r.isException (IT_env))
-        	IT_f->inRequestPostM (IT_r, IT_env);
-        if (!IT_r.isException (IT_env)) {
-            try {
-                ((Cubit*)IT_pp)->please_exit (IT_env);
-
-            } catch (CORBA::SystemException &IT_exSys) {
-            IT_env.propagate (&IT_exSys);
-            } catch (CORBA::UserException &IT_exUsr) {
-            IT_env.propagate (&IT_exUsr);
-            }
-        }
-        IT_r.replyNoResults (CORBA::Flags(CORBA::INV_NO_RESPONSE),IT_env);
-        return 1;
-    }
-
-    if (IT_isTarget)
-        IT_r.makeRuntimeException2 ();
-
-    return 0;
-}
-
-#include "cubitC.cpp"
-
diff --git a/TAO/IIOP/tests/Cubit/Orbix/base_server/cubitS.h b/TAO/IIOP/tests/Cubit/Orbix/base_server/cubitS.h
deleted file mode 100644
index 757af4664ad..00000000000
--- a/TAO/IIOP/tests/Cubit/Orbix/base_server/cubitS.h
+++ /dev/null
@@ -1,118 +0,0 @@
-#ifndef _cubitS_h
-#define _cubitS_h
-
-#include "cubitC.h"
-
-/************************************************************************/
-/*                                                                      */
-/* This file is automatically generated by ORBeline IDL compiler        */
-/* Do not modify this file.                                             */
-/*                                                                      */
-/* ORBeline (c) is copyrighted by PostModern Computing, Inc.            */
-/*                                                                      */
-/* The generated code conforms to OMG's IDL C++ mapping as              */
-/* specified in OMG Document Number: 94-9-14.                           */
-/*                                                                      */
-/************************************************************************/
-
-class _sk_Cubit : public Cubit
-{
-    protected:
-	_sk_Cubit(const char *object_name = (const char *)NULL);
-	_sk_Cubit(const char *service_name, const CORBA::ReferenceData& data);
-	virtual ~_sk_Cubit() {}
-    public:
-	static const CORBA::TypeInfo _skel_info;
-
-	// The following operations need to be implemented by the server.
-	virtual CORBA::Octet cube_octet(CORBA::Octet o) = 0;
-	virtual CORBA::Short cube_short(CORBA::Short s) = 0;
-	virtual CORBA::Long cube_long(CORBA::Long l) = 0;
-	virtual Cubit::Many cube_struct(const Cubit::Many& values) = 0;
-	virtual Cubit::oneof cube_union(const Cubit::oneof& values) = 0;
-	virtual void please_exit() = 0;
-	
-	// Skeleton Operations implemented automatically
-	
-	static void _cube_octet(void *obj,
-			CORBA::MarshalStream &strm,
-			CORBA::Principal_ptr principal,
-			const char *oper,
-			void *priv_data);
-	
-	static void _cube_short(void *obj,
-			CORBA::MarshalStream &strm,
-			CORBA::Principal_ptr principal,
-			const char *oper,
-			void *priv_data);
-	
-	static void _cube_long(void *obj,
-			CORBA::MarshalStream &strm,
-			CORBA::Principal_ptr principal,
-			const char *oper,
-			void *priv_data);
-	
-	static void _cube_struct(void *obj,
-			CORBA::MarshalStream &strm,
-			CORBA::Principal_ptr principal,
-			const char *oper,
-			void *priv_data);
-	
-	static void _cube_union(void *obj,
-			CORBA::MarshalStream &strm,
-			CORBA::Principal_ptr principal,
-			const char *oper,
-			void *priv_data);
-	
-	static void _please_exit(void *obj,
-			CORBA::MarshalStream &strm,
-			CORBA::Principal_ptr principal,
-			const char *oper,
-			void *priv_data);
-	
-};
-template <class T>
-class _tie_Cubit : public Cubit
-{
-    public:
-	_tie_Cubit(T& t, const char *obj_name=(char*)NULL) : 
-			Cubit(obj_name), 
-			_ref(t) {
-		_object_name(obj_name);
-	}
-	_tie_Cubit(T& t, const char *service_name,
-			const CORBA::ReferenceData& id)
-			:_ref(t) {
-		_service(service_name, id);
-	}
-	~_tie_Cubit() {}
-	CORBA::Octet cube_octet(CORBA::Octet o) {
-		return _ref.cube_octet(
-		o);
-	}
-	CORBA::Short cube_short(CORBA::Short s) {
-		return _ref.cube_short(
-		s);
-	}
-	CORBA::Long cube_long(CORBA::Long l) {
-		return _ref.cube_long(
-		l);
-	}
-	Cubit::Many cube_struct(const Cubit::Many& values) {
-		return _ref.cube_struct(
-		values);
-	}
-	Cubit::oneof cube_union(const Cubit::oneof& values) {
-		return _ref.cube_union(
-		values);
-	}
-	void please_exit() {
-		_ref.please_exit();
-	}
-
-    private:
-	T& _ref;
-};
-
-#endif
-
diff --git a/TAO/IIOP/tests/Cubit/Orbix/base_server/cubit_impl.cpp b/TAO/IIOP/tests/Cubit/Orbix/base_server/cubit_impl.cpp
deleted file mode 100644
index e35f1084118..00000000000
--- a/TAO/IIOP/tests/Cubit/Orbix/base_server/cubit_impl.cpp
+++ /dev/null
@@ -1,46 +0,0 @@
-#include "cubit_impl.h"
-
-CORBA::Octet Cubit_Impl:: cube_octet (CORBA::Octet o, CORBA::Environment &IT_env) throw (CORBA::SystemException) {
-  return (CORBA::Octet) (o * o * o); 
-}
-
-CORBA::Short Cubit_Impl:: cube_short (CORBA::Short s, CORBA::Environment &IT_env) throw (CORBA::SystemException) {
-  return (CORBA::Short) (s * s * s);
-}
-
-CORBA::Long Cubit_Impl:: cube_long (CORBA::Long l, CORBA::Environment &IT_env) throw (CORBA::SystemException) {
-   return (CORBA::Long) (l * l * l);
-}
-
-Cubit::Many Cubit_Impl:: cube_struct (const Cubit::Many& values, CORBA::Environment &IT_env) throw (CORBA::SystemException) {
-  Cubit::Many out_values;
-  out_values.o = values.o * values.o * values.o;
-  out_values.s = values.s * values.s * values.s;
-  out_values.l = values.l * values.l * values.l;
-  return out_values; 
-}
-
-Cubit::oneof Cubit_Impl:: cube_union (const Cubit::oneof& values, CORBA::Environment &IT_env) throw (CORBA::SystemException) {
-  Cubit::oneof out_values;
-   switch (values._d ()) {
-   case Cubit::e_0th:
-     out_values.o (values.o () * values.o ()  * values.o ());
-     break;
-   case Cubit::e_1st:
-     out_values.s (values.s () * values.s () * values.s ());
-     break;
-   case Cubit::e_2nd:
-     out_values.l (values.l () * values.l () * values.l ());
-     break;
-   case Cubit::e_3rd:
-   default:
-     out_values.cm ().o = values.cm ().o * values.cm ().o * values.cm ().o ;
-     out_values.cm ().s = values.cm ().s * values.cm ().s * values.cm ().s ;
-     out_values.cm ().l = values.cm ().l * values.cm ().l * values.cm ().l ;
-     break;
-   }
-   return out_values;  
-}
-
-void Cubit_Impl:: please_exit (CORBA::Environment &IT_env) throw (CORBA::SystemException) {
-}
diff --git a/TAO/IIOP/tests/Cubit/Orbix/base_server/cubit_impl.h b/TAO/IIOP/tests/Cubit/Orbix/base_server/cubit_impl.h
deleted file mode 100644
index 1e710bb15d1..00000000000
--- a/TAO/IIOP/tests/Cubit/Orbix/base_server/cubit_impl.h
+++ /dev/null
@@ -1,27 +0,0 @@
-
-#ifndef cubit_ih
-#define cubit_ih
-
-#include "cubit.h"
-
-
-#ifdef Cubit_USE_BOA
-class Cubit_Impl : public virtual CubitBOAImpl {
-#else
-class Cubit_Impl {
-#endif /* Cubit_USE_BOA */
-
-public:
-        virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env=CORBA::default_environment) throw (CORBA::SystemException);
-        virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env=CORBA::default_environment) throw (CORBA::SystemException);
-        virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env=CORBA::default_environment) throw (CORBA::SystemException);
-        virtual Cubit::Many cube_struct (const Cubit::Many& values, CORBA::Environment &IT_env=CORBA::default_environment) throw (CORBA::SystemException);
-        virtual Cubit::oneof cube_union (const Cubit::oneof& values, CORBA::Environment &IT_env=CORBA::default_environment) throw (CORBA::SystemException);
-        virtual void please_exit (CORBA::Environment &IT_env=CORBA::default_environment) throw (CORBA::SystemException);
-};
-
-#ifndef Cubit_USE_BOA
-DEF_TIE_Cubit (Cubit_Impl)
-#endif /* Cubit_USE_BOA */
-
-#endif
diff --git a/TAO/IIOP/tests/Cubit/Orbix/base_server/server.cpp b/TAO/IIOP/tests/Cubit/Orbix/base_server/server.cpp
deleted file mode 100644
index 96117fe3e0d..00000000000
--- a/TAO/IIOP/tests/Cubit/Orbix/base_server/server.cpp
+++ /dev/null
@@ -1,40 +0,0 @@
-//**************************************************************************
-//
-// NAME :   tpr_server.cpp 
-// DESCRIPTION:  
-//
-// Server mainline
-//
-//****************************************************************************
-#define IT_EX_MACROS
-
-#include "cubit_impl.h"		// server header file
-
-int 
-main (int , char**)
-{
-
-#ifdef Cubit_USE_BOA
-  Cubit_var cb = new Cubit_Impl;
-  cout << "Using BOA approach" << endl;
-#else
-  Cubit_var cb = new TIE_Cubit (Cubit_Impl) (new Cubit_Impl);
-  cout << "Using TIE approach" << endl;
-#endif /* Cubit_USE_BOA */
-  
-  //
-  // Go get some work to do....
-  //
-  IT_TRY {
-      CORBA::Orbix.impl_is_ready("Cubit", IT_X);
-  }
-  IT_CATCHANY {
-     cout << IT_X << endl;
-  }
-  IT_ENDTRY;
-
-  cout << "Cubit server is exiting." << endl;
-
-
-  return 0;
-}
diff --git a/TAO/IIOP/tests/Cubit/Orbix/base_server/tpr.cpp b/TAO/IIOP/tests/Cubit/Orbix/base_server/tpr.cpp
deleted file mode 100644
index 415410aea9f..00000000000
--- a/TAO/IIOP/tests/Cubit/Orbix/base_server/tpr.cpp
+++ /dev/null
@@ -1,26 +0,0 @@
-#include "tpr.h"
-
-void *
-worker(void *vp)
-{
-  ACE_Thread_Control tc (ACE_Thread_Manager::instance ());
-  CORBA::Orbix.continueThreadDispatch (*(CORBA::Request *)vp);
-  return NULL;
-}
-
-
-int
-tpr_filter::inRequestPreMarshal(CORBA::Request &r,  CORBA::Environment&)
-{
-//   thread_t	tid;
-//   thr_create(NULL, 0, worker, (void *)&r, THR_DETACHED, &tid);
-
-  ACE_Thread_Manager *thr_mgr = ACE_Thread_Manager::instance ();
-  thr_mgr->spawn (ACE_THR_FUNC (worker),
-                  (void *) &r, 
-                  THR_DETACHED);
-
-  return -1;
-}
-
-tpr_filter tpr_dispatcher;
diff --git a/TAO/IIOP/tests/Cubit/Orbix/base_server/tpr.h b/TAO/IIOP/tests/Cubit/Orbix/base_server/tpr.h
deleted file mode 100644
index 38c2ccc7069..00000000000
--- a/TAO/IIOP/tests/Cubit/Orbix/base_server/tpr.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#include "cubit.h"
-#include "ace/Service_Config.h"
-#include "ace/Thread_Manager.h"
-
-//
-// Create a thread filter to dispatch incoming calls
-//
-class tpr_filter : public CORBA::ThreadFilter {
-	virtual int inRequestPreMarshal(CORBA::Request &, CORBA::Environment&);
-};
diff --git a/TAO/IIOP/tests/Cubit/Orbix/client/Makefile b/TAO/IIOP/tests/Cubit/Orbix/client/Makefile
deleted file mode 100644
index 70b3257447d..00000000000
--- a/TAO/IIOP/tests/Cubit/Orbix/client/Makefile
+++ /dev/null
@@ -1,89 +0,0 @@
-#----------------------------------------------------------------------------
-#	@(#)Makefile	1.1	10/18/96
-#
-#	Makefile for the ACE_MT_CORBA_Handler tests
-#----------------------------------------------------------------------------
-
-#----------------------------------------------------------------------------
-#	Local macros
-#----------------------------------------------------------------------------
-
-SRC = cubitC.cpp client.cpp
-
-CLT_OBJS = cubitC.o client.o
-
-LDLIBS	 = 
-
-VLDLIBS	 = $(LDLIBS:%=%$(VAR))
-
-#----------------------------------------------------------------------------
-#	Include macros and targets
-#----------------------------------------------------------------------------
-
-include		$(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-include		$(ACE_ROOT)/include/makeinclude/macros.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.common.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.lib.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.bin.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
-
-#----------------------------------------------------------------------------
-#	Orbix related macros and target settings.
-#----------------------------------------------------------------------------
-
-
-ORBIX_BINDIR    = $(ORBIX_ROOT)/bin
-ORBIX_LIBDIR    = $(ORBIX_ROOT)/corba2/lib
-ORBIX_INCDIR    = $(ORBIX_ROOT)/corba2/include
-
-CPPFLAGS += -DEXCEPTIONS -I$(ORBIX_INCDIR) -DWANT_ORBIX_FDS
-LDFLAGS  += -L$(ORBIX_LIBDIR) -R $(ORBIX_LIBDIR) -L$(ACE)/ace
-
-IDLFLAGS = -s S.cpp -c C.cpp -B
-
-#----------------------------------------------------------------------------
-#	Local targets
-#----------------------------------------------------------------------------
-
-all: client 
-
-client: $(addprefix $(VDIR),$(CLT_OBJS))
-	$(LINK.cc) -o client $(addprefix $(VDIR),$(CLT_OBJS)) $(LDFLAGS) $(ITIIOP) $(ITCLT) $(VLDLIBS)
-
-
-#----------------------------------------------------------------------------
-#	Dependencies
-#----------------------------------------------------------------------------
-# DO NOT DELETE THIS LINE -- g++dep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-
-.obj/cubitC.o .shobj/cubitC.so: cubitC.cpp cubit.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/config-sunos5.5-sunc++-4.x.h \
- $(ACE_ROOT)/ace/stdcpp.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i
-.obj/client.o .shobj/client.so: client.cpp $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/config-sunos5.5-sunc++-4.x.h \
- $(ACE_ROOT)/ace/stdcpp.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i cubit.h
-
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/IIOP/tests/Cubit/Orbix/client/client.cpp b/TAO/IIOP/tests/Cubit/Orbix/client/client.cpp
deleted file mode 100644
index fcf45bdf706..00000000000
--- a/TAO/IIOP/tests/Cubit/Orbix/client/client.cpp
+++ /dev/null
@@ -1,232 +0,0 @@
-//**************************************************************************
-//
-// NAME :   client.C 
-// DESCRIPTION:  
-//
-// Client for the Cubit example
-//
-//****************************************************************************
-
-#include "ace/OS.h"
-#include "ace/Get_Opt.h"
-#include "cubit.h"
-
-int LOOP_COUNT;
-char SERVER_HOST [1024];
-
-inline int func (unsigned i) { return i - 117; }
-void run_tests (Cubit_var, int);
-
-// = TITLE
-//     Parses the command line arguments and returns an error status
-//
-// = DESCRIPTION
-//     This method parses the command line arguments
-int parse_args(int argc, char *argv[])
-{
-  ACE_OS::strcpy (SERVER_HOST, "localhost");
-  ACE_Get_Opt opts (argc, argv, "dh:n:O:x");
-  int			c;
-  
-  while ((c = opts ()) != -1)
-    switch (c) {
-    case 'h':
-      ACE_OS::strcpy (SERVER_HOST, opts.optarg);
-      continue;
-    case 'd':  // debug flag
-      continue;
-      
-    case 'n':			// loop count
-      LOOP_COUNT = (unsigned) ACE_OS::atoi (opts.optarg);
-      continue;
-      
-    case 'O':			// stringified objref
-      continue;
-      
-    case 'x':
-      continue;
-      
-    case '?':
-    default:
-      ACE_OS::fprintf (stderr, "usage:  %s"
-                       " [-d]"
-                       " [-n loopcount]"
-                       " [-h SERVER_HOST]"
-                       " [-x]"
-                       "\n", argv [0]
-                       );
-      return 1;
-    }
-  
-  return 0;  // Indicates successful parsing of command line
-}
-
-
-//
-// Mainline
-//
-int
-main (int argc, char *argv[])
-{
-  if (parse_args (argc, argv) != 0)
-    return -1;
-
-  Cubit_var cb;
-  // cout << "attempting to contact server at host " << SERVER_HOST << '\n' ;
- 
-  //
-  // Initialise client's binding to an
-  // arbitrary cubit server (at some host)
-  // 
-  TRY {
-    cb = Cubit::_bind ("", SERVER_HOST, IT_X);
-  }
-  CATCHANY {
-    cerr << "Binding failed: " << IT_X;
-  }
-  ENDTRY;
-  
-  run_tests (cb, LOOP_COUNT);
-  return 0;
-}
-
-
-void
-run_tests (Cubit_var cb, int loop_count) 
-{
-    //
-  // Make the calls in a loop.
-  //
-  unsigned i;
-  unsigned call_count, error_count;
-
-  call_count = 0;
-  error_count = 0;
-
-  ACE_Time_Value before, after;
-
-  before = ACE_OS::gettimeofday();
-  
-  //
-  // Cube an octet.
-  //
-  
-  for (i = 0; i < loop_count; i++)
-    {
-
-      call_count++;
-
-      CORBA::Octet arg_octet = func (i), ret_octet;
-
-      TRY {
-      ret_octet = cb->cube_octet (arg_octet);
-      } 
-      CATCHANY {
-        cerr << "Call failed: " << IT_X;
-        error_count++;
-      } 
-      ENDTRY;
-      arg_octet = arg_octet * arg_octet * arg_octet;
-      if (arg_octet != ret_octet) {
-        ACE_OS::printf ("** cube_octet(%d)  (--> %d)\n", arg_octet , ret_octet);
-        error_count++;
-      }
-    
-  
-  //
-  // Cube a short.
-  //
-      call_count++;
-
-      CORBA::Short arg_short = func (i), ret_short;
-
-      TRY {
-      ret_short = cb->cube_short (arg_short);
-      } 
-      CATCHANY {
-        cerr << "Call failed: " << IT_X;
-        error_count++;
-      } 
-      ENDTRY;
-      arg_short = arg_short * arg_short * arg_short;
-      if (arg_short != ret_short) {
-        ACE_OS::printf ("** cube_short(%d)  (--> %d)\n", arg_short , ret_short);
-        error_count++;
-      }
-
-  //
-  // Cube a long.
-  //
-  
-      call_count++;
-
-      CORBA::Long arg_long = func (i), ret_long;
-
-      TRY {
-      ret_long = cb->cube_long (arg_long);
-      } 
-      CATCHANY {
-        cerr << "Call failed: " << IT_X;
-      } 
-      ENDTRY;
-      arg_long = arg_long * arg_long * arg_long;
-      if (arg_long != ret_long) {
-        ACE_OS::printf ("** cube_long(%d)  (--> %d)\n", arg_long , ret_long);
-        error_count++;
-      }
-
-
-      //
-      // Cube a "struct" ...
-      //
-      Cubit::Many	arg_struct, ret_struct;
-      
-       call_count++;
-       
-       arg_struct.l = func (i);
-       arg_struct.s = func (i);
-       arg_struct.o = func (i);
-       
-       TRY {
-         ret_struct = cb->cube_struct (arg_struct);
-       }
-       CATCHANY {
-         cerr << "Call failed: " << IT_X;
-         error_count++;
-       } 
-       ENDTRY;
-       arg_struct.l = arg_struct.l  * arg_struct.l  * arg_struct.l ;
-       arg_struct.s = arg_struct.s  * arg_struct.s  * arg_struct.s ;
-       arg_struct.o = arg_struct.o  * arg_struct.o  * arg_struct.o ;
-       
-       if (arg_struct.l  != ret_struct.l 
-           || arg_struct.s  != ret_struct.s 
-           || arg_struct.o  != ret_struct.o )
-         {
-           cerr << "** cube_struct ERROR\n";
-           error_count++;
-         }
-    }
-    
-  
-  after = ACE_OS::gettimeofday();
-  
-  if (call_count > 0) 
-    {
-      if (error_count == 0)
-        {
-          ACE_Time_Value diff = after - before;
-          unsigned long	us = diff.sec() * 1000 * 1000 + diff.usec();
-          
-          us /= call_count;
-          
-          if (us > 0)
-            ACE_OS::printf ("cube average call ACE_OS::time\t= %ld.%.03ldms, \t"
-                            "%ld calls/second\n",
-                            us / 1000, us % 1000,
-                            1000000L / us);
-        }
-      
-      ACE_OS::printf ("%d calls, %d errors\n", call_count, error_count);
-    }
-}
diff --git a/TAO/IIOP/tests/Cubit/Orbix/client/cubit.h b/TAO/IIOP/tests/Cubit/Orbix/client/cubit.h
deleted file mode 100644
index 1c868a6597d..00000000000
--- a/TAO/IIOP/tests/Cubit/Orbix/client/cubit.h
+++ /dev/null
@@ -1,727 +0,0 @@
-
-#ifndef cubit_hh
-#define cubit_hh
-
-#include "ace/OS.h"
-#include <CORBA.h>
-
-
-#ifndef _Cubit_defined
-#define _Cubit_defined
-class Cubit_dispatch : public virtual CORBA::PPTR {
-public:
-
-      Cubit_dispatch (void *IT_p, CORBA::Object* IT_o, const char *IT_m, 
-        CORBA::LoaderClass *IT_l, char *IT_i, void* IT_im)
-       : PPTR (IT_p,IT_o,IT_m,IT_l,IT_i,IT_im) {}
-
-
-   Cubit_dispatch (char *IT_OR, void *IT_p, CORBA::Object *IT_o)
-       : PPTR (IT_OR,IT_p,IT_o) {}
-
-
-   Cubit_dispatch () {}
-
-   Cubit_dispatch (ObjectReference *IT_OR, void *IT_p, CORBA::Object *IT_o)
-       : PPTR (IT_OR,IT_p,IT_o) {}
-
-
-   Cubit_dispatch (void *IT_p, CORBA::Object *IT_o, const char *IT_m, 
-        char *IT_i, CORBA::Object* IT_ob, void* IT_im)
-       : PPTR (IT_p,IT_o,IT_m,IT_i,IT_ob,IT_im) {}
-
-
-   virtual unsigned char dispatch (CORBA::Request &IT_r, 
-        unsigned char IT_isTarget, void* IT_pp=NULL);
-
-
-};
-
-class Cubit;
-
-#ifndef CubitPtr
-#define CubitPtr
-
-typedef Cubit* Cubit_ptr;
-
-typedef Cubit* CubitRef;
-
-#endif
-
-
-#ifndef CubitForwH
-#define CubitForwH
-CORBA::ObjectRef Cubit_getBase (void *);
-void Cubit_release (Cubit *, CORBA::Environment &IT_env);
-void Cubit_release (Cubit_ptr);
-Cubit* Cubit_duplicate (Cubit_ptr, CORBA::Environment &IT_env);
-Cubit* Cubit_duplicate (Cubit_ptr );
-Cubit_ptr Cubit_nil (CORBA::Environment &IT_env);
-Cubit_ptr Cubit_nil ();
-#endif
-#define Cubit_IMPL "Cubit"
-
-
-class Cubit;
-
-typedef Cubit CubitProxy;
-#define Cubit_IR "Cubit$v1.1"
-#define Cubit_IMPL "Cubit"
-
-#ifndef CubitPtr
-#define CubitPtr
-
-typedef Cubit* Cubit_ptr;
-
-typedef Cubit* CubitRef;
-
-#endif
-
-class Cubit: public virtual CORBA::Object  {
-public:
-        Cubit (char *IT_OR);
-    Cubit (ObjectReference *IT_OR);
-    Cubit () : CORBA::Object  (1) {}
-protected:
-    Cubit_ptr __duplicate(
-            CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) {
-       CORBA::Object::__duplicate (IT_env);
-       return this;
-    }
-public:
-    static Cubit_ptr _duplicate(
-            Cubit_ptr, 
-            CORBA::Environment &IT_pEnv=CORBA::IT_chooseDefaultEnv ());
-public:
-   static Cubit* _bind (const char* IT_markerServer, const char* host,
-		const CORBA::Context &IT_c, 
-		CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-   static Cubit* _bind (CORBA::Environment &IT_env);
-   static Cubit* _bind (const char* IT_markerServer=NULL, const char* host=NULL,
-                 CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-    static Cubit* _narrow (CORBA::Object* , CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-    static Cubit_ptr _nil (CORBA::Environment &IT_pEnv=CORBA::IT_chooseDefaultEnv ()) {
-        CORBA::EnvExcRaiser IT_raise;
-        CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-        return (Cubit_ptr) CORBA::OBJECT_NIL;}
-
-#ifndef Cubit_Many_defined
-#define Cubit_Many_defined
-
-struct Many {
-    CORBA::Octet o;
-    CORBA::Long l;
-    CORBA::Short s;
-
-    void encodeOp (CORBA::Request &IT_r) const;
-    void decodeOp (CORBA::Request &IT_r);
-    void decodeInOutOp (CORBA::Request &IT_r);
-    Many(const Many &);
-    Many();
-    ~Many();
-    Many& operator= (const Many&);
-};
-
-#ifndef Cubit_ManyVarH
-#define Cubit_ManyVarH
-
-#ifndef Cubit_ManyvPtr
-#define Cubit_ManyvPtr
-typedef Many* Many_vPtr;
-typedef const Many* Many_cvPtr;
-#endif
-
-class Many_var : public CORBA::_var
-{
-    private:
-
-    unsigned char copyHelper (const Many_var &IT_s) {
-        if (!IT_s._ptr) {
-            _ptr = IT_s._ptr;
-        } else
-        {
-            _ptr = new Many;
-            *(_ptr) =  *(IT_s._ptr);
-        }
-        return 1;
-    }
-
-    public:
-
-    Many_var (const Many_var &IT_s) {
-        (void) copyHelper (IT_s);
-    }
-
-    Many_var () {
-        _ptr =  new Many;
-;
-    }
-
-    Many_var (Many *IT_p) {
-        _ptr = IT_p;
-    }
-
-    Many_var &operator= (Many *IT_p) {
-        if (_ptr != IT_p) {
-            delete _ptr;
-        }
-        _ptr = IT_p;
-        return (*this);
-    }
-
-    Many_var &operator= (const Many_var &IT_s) {
-        if (_ptr != IT_s._ptr) {
-            delete _ptr;
-        }
-        _ptr = new Many;
-        *(_ptr) =  *(IT_s._ptr);
-        return (*this);
-    }
-
-    ~Many_var () {
-        delete _ptr;
-    }
-
-    Many* operator-> () {
-        return _ptr;
-    }
-
-    operator Many_cvPtr () const { return _ptr;}
-    operator Many_vPtr& () { return _ptr;}
-    operator Many& () const { return * _ptr;}
-
-    protected:
-    Many *_ptr;
-    private:
-    Many_var &operator= (const CORBA::_var &IT_s);
-    Many_var (const CORBA::_var &IT_s);
-};
-
-#endif
-
-
-#endif
-
-enum discrim {e_0th,e_1st,e_2nd,e_3rd,e_4th,e_5th, IT__ENUM_Cubit_discrim=CORBA_ULONG_MAX};
-
-#ifndef Cubit_oneof_defined
-#define Cubit_oneof_defined
-
-struct oneof {
-    private:
-
-    discrim __d;
-    union {
-        CORBA::Octet _o_;
-        CORBA::Short _s_;
-        CORBA::Long _l_;
-        Many * _cm_;
-    };
-
-    public:
-
-    void encodeOp (CORBA::Request &IT_r) const;
-    void decodeOp (CORBA::Request &IT_r);
-    void decodeInOutOp (CORBA::Request &IT_r);
-
-    private:
-
-    unsigned char isSet;
-
-    public:
-
-    discrim _d () const { return __d; }
-
-    CORBA::Octet o () const {
-      return _o_;
-    }
-
-    void o (CORBA::Octet IT_member) {
-        if (isSet && (__d != Cubit::e_0th))
-        {
-            this-> oneof::~oneof();
-            memset(this, 0, sizeof(*this));
-        }
-
-        __d = Cubit::e_0th;
-        isSet = 1;
-        _o_ = IT_member;
-    }
-
-    CORBA::Short s () const {
-        return _s_;
-    }
-
-    void s (CORBA::Short IT_member) {
-        if (isSet && (__d != Cubit::e_1st))
-        {
-            this-> oneof::~oneof();
-            memset(this, 0, sizeof(*this));
-        }
-
-        __d = Cubit::e_1st;
-        isSet = 1;
-        _s_ = IT_member;
-    }
-
-    CORBA::Long l () const {
-        return _l_;
-    }
-
-    void l (CORBA::Long IT_member) {
-        if (isSet && (__d != Cubit::e_2nd))
-        {
-            this-> oneof::~oneof();
-            memset(this, 0, sizeof(*this));
-        }
-
-        __d = Cubit::e_2nd;
-        isSet = 1;
-        _l_ = IT_member;
-    }
-
-    Many& cm () {
-        return (*_cm_);
-    }
-
-    const Many& cm () const {
-        return (*_cm_);
-    }
-
-    void cm (const Many& IT_member) {
-        if (isSet && (__d != Cubit::e_3rd))
-        {
-            this-> oneof::~oneof();
-            memset(this, 0, sizeof(*this));
-        }
-
-        __d = Cubit::e_3rd;
-
-        if (!isSet) {
-            _cm_ = new Many;
-            isSet = 1;
-        }
-        *(_cm_) = IT_member;
-    }
-
-
-    oneof();
-    oneof(const oneof &);
-    ~oneof();
-    oneof& operator= (const oneof&);
-};
-
-#ifndef Cubit_oneofVarH
-#define Cubit_oneofVarH
-
-#ifndef Cubit_oneofvPtr
-#define Cubit_oneofvPtr
-typedef oneof* oneof_vPtr;
-typedef const oneof* oneof_cvPtr;
-#endif
-
-class oneof_var : public CORBA::_var
-{
-    private:
-
-    unsigned char copyHelper (const oneof_var &IT_s) {
-        if (!IT_s._ptr) {
-            _ptr = IT_s._ptr;
-        } else
-        {
-            _ptr = new oneof;
-            *(_ptr) =  *(IT_s._ptr);
-        }
-        return 1;
-    }
-
-    public:
-
-    oneof_var (const oneof_var &IT_s) {
-        (void) copyHelper (IT_s);
-    }
-
-    oneof_var () {
-        _ptr = NULL;
-    }
-
-    oneof_var (oneof *IT_p) {
-        _ptr = IT_p;
-    }
-
-    oneof_var &operator= (oneof *IT_p) {
-        if (_ptr != IT_p) {
-            delete _ptr;
-        }
-        _ptr = IT_p;
-        return (*this);
-    }
-
-    oneof_var &operator= (const oneof_var &IT_s) {
-        if (_ptr != IT_s._ptr) {
-            delete _ptr;
-        }
-        _ptr = new oneof;
-        *(_ptr) =  *(IT_s._ptr);
-        return (*this);
-    }
-
-    ~oneof_var () {
-        delete _ptr;
-    }
-
-    oneof* operator-> () {
-        return _ptr;
-    }
-
-    operator oneof_cvPtr () const { return _ptr;}
-    operator oneof_vPtr& () { return _ptr;}
-    operator oneof& () const { return * _ptr;}
-
-    protected:
-    oneof *_ptr;
-    private:
-    oneof_var &operator= (const CORBA::_var &IT_s);
-    oneof_var (const CORBA::_var &IT_s);
-};
-
-#endif
-
-
-#endif
-        virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual Many cube_struct (const Many& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual oneof cube_union (const oneof& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual void please_exit (CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-};
-
-#ifndef CubitVarH
-#define CubitVarH
-
-#ifndef CubitvPtr
-#define CubitvPtr
-typedef Cubit* Cubit_vPtr;
-typedef const Cubit* Cubit_cvPtr;
-#endif
-
-class Cubit_var : public CORBA::_var
-{
-    private:
-
-    unsigned char copyHelper (const Cubit_var &IT_s) {
-        {
-            _ptr = Cubit_duplicate (IT_s._ptr);
-        }
-        return 1;
-    }
-
-    public:
-
-    Cubit_var (const Cubit_var &IT_s) {
-        (void) copyHelper (IT_s);
-    }
-
-    Cubit_var () {
-        _ptr = Cubit_nil ();
-    }
-
-    Cubit_var (Cubit *IT_p) {
-        _ptr = IT_p;
-    }
-
-    Cubit_var &operator= (Cubit *IT_p) {
-        Cubit_release (_ptr);
-        _ptr = IT_p;
-        return (*this);
-    }
-
-    Cubit_var &operator= (const Cubit_var &IT_s) {
-        Cubit_release (_ptr);
-        _ptr = Cubit_duplicate (IT_s._ptr);
-        return (*this);
-    }
-
-    ~Cubit_var () {
-        Cubit_release (_ptr);
-    }
-
-    Cubit* operator-> () {
-        return _ptr;
-    }
-
-    operator Cubit_cvPtr () const { return _ptr;}
-    operator Cubit_vPtr& () { return _ptr;}
-
-    protected:
-    Cubit *_ptr;
-    private:
-    Cubit_var &operator= (const CORBA::_var &IT_s);
-    Cubit_var (const CORBA::_var &IT_s);
-    Cubit_var &operator= (const CORBA::_mgr &IT_s);
-    Cubit_var &operator= (const CORBA::_SeqElem &IT_s);
-    Cubit_var (const CORBA::_mgr &IT_s);
-    Cubit_var (const CORBA::_SeqElem &IT_s);
-};
-
-#endif
-
-
-#ifndef CubitMgrH
-#define CubitMgrH
-
-class Cubit_mgr : public CORBA::_mgr
-{
-    public:
-
-    Cubit_mgr () {
-        _ptr = Cubit_nil ();
-        _release = 1;
-    }
-
-    Cubit_mgr (const Cubit_mgr &IT_s) {
-        _ptr = Cubit_duplicate (IT_s._ptr);
-        _release = 1;
-    }
-
-    Cubit_mgr &operator= (Cubit *IT_p) {
-        if (_ptr && _release)
-            Cubit_release (_ptr);
-        _ptr = IT_p;
-        _release = 1;
-        return (*this);
-    }
-
-    Cubit_mgr &operator= (const Cubit_mgr &IT_s) {
-        if (_ptr && _release)
-            Cubit_release (_ptr);
-        _ptr = Cubit_duplicate(IT_s._ptr);
-        _release = 1;
-        return (*this);
-    }
-
-    Cubit_mgr &operator= (Cubit_var &IT_s) {
-        if (_ptr && _release)
-            Cubit_release (_ptr);
-        _ptr = Cubit_duplicate(IT_s);
-        _release = 1;
-        return (*this);
-    }
-
-    ~Cubit_mgr () {
-        if (_release)
-            Cubit_release (_ptr);
-    }
-
-    unsigned char release () {
-        return _release;
-    }
-
-    void release (unsigned char rel) {
-        _release = rel;
-    }
-
-    operator int () const {
-        return (((CORBA::Object_ptr) _ptr) ? 1 : 0);
-    }
-
-    operator void* () const {
-        return _ptr;
-    }
-
-    operator CORBA::Object * () const {
-        return (CORBA::Object *) _ptr;
-    }
-
-    operator Cubit* () const {
-        return (Cubit*) _ptr;
-    }
-
-    Cubit_ptr operator-> () const {
-        return _ptr;
-    }
-
-    Cubit *_ptr;
-
-    protected:
-
-    unsigned char _release;
-};
-
-typedef Cubit_mgr Cubit_mgr_IT_const;
-#endif
-
-#ifndef CubitSeqElemH
-#define CubitSeqElemH
-
-class Cubit_SeqElem : public CORBA::_SeqElem
-{
-    public:
-
-    Cubit_SeqElem (Cubit_ptr* IT_p, unsigned char rel) {
-        _ptr = IT_p;
-        _release = rel;
-    }
-
-    Cubit_SeqElem &operator= (Cubit_ptr IT_p) {
-        if (_ptr) {
-            if (*(_ptr) && _release)
-                Cubit_release (*(_ptr));
-            *(_ptr) = IT_p;
-        }
-        return (*this);
-    }
-
-    Cubit_SeqElem &operator= (const Cubit_SeqElem &IT_s) {
-        if (_ptr && IT_s._ptr) {
-            if (*(_ptr) && _release)
-                Cubit_release (*(_ptr));
-            *(_ptr) = Cubit_duplicate(*(IT_s._ptr));
-        }
-        return (*this);
-    }
-
-    operator Cubit_ptr () const {
-        return _ptr ? (Cubit_ptr) (*_ptr) : Cubit_nil(); 
-    }
-
-    Cubit_ptr operator->() const { return *_ptr;}
-
-    protected:
-    Cubit_ptr *_ptr;
-    unsigned char _release;
-};
-
-#endif
-
-
-#define TIE_Cubit(X) Cubit##X
-
-#define DEF_TIE_Cubit(X) \
-	class Cubit##X : public virtual Cubit {		\
-	  X* m_obj;						\
-	public:							\
-								\
-								\
-	   Cubit##X  (X *objp, const char* m="", CORBA::LoaderClass *l=0)\
-		: Cubit(), m_obj(objp) {	\
-		m_pptr = new Cubit_dispatch		\
-			(( Cubit*)this,(CORBA::Object*)this,m,l,Cubit_IR,m_obj);	\
-	   }								\
-	   Cubit##X  (CORBA::Object *IT_p, const char* IT_m="", void *IT_q=0)\
-		: Cubit() {	\
-		m_pptr = new Cubit_dispatch		\
-			(( Cubit*)this,(CORBA::Object*)this,IT_m,Cubit_IR,IT_p,IT_q);	\
-		m_obj = (X*)(m_pptr->getImplObj ());			\
-	   }								\
-								\
-	   virtual ~Cubit##X  () {				\
-		if (_okToDeleteImpl ()) delete m_obj; }					\
-	   virtual void* _deref () {					\
-		return m_obj; }					\
-								\
-virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_octet (  o,IT_env);\
-}\
-	\
-virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_short (  s,IT_env);\
-}\
-	\
-virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_long (  l,IT_env);\
-}\
-	\
-virtual Cubit::Many cube_struct (const Cubit::Many& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_struct (  values,IT_env);\
-}\
-	\
-virtual Cubit::oneof cube_union (const Cubit::oneof& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_union (  values,IT_env);\
-}\
-	\
-virtual void please_exit (CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-m_obj->please_exit (IT_env);\
-}\
-								\
-	};						\
-
-
-#define QUALS_Cubit	\
-virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_octet (  o,IT_env);\
-}\
-	\
-virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_short (  s,IT_env);\
-}\
-	\
-virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_long (  l,IT_env);\
-}\
-	\
-virtual Many cube_struct (const Many& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_struct (  values,IT_env);\
-}\
-	\
-virtual oneof cube_union (const oneof& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_union (  values,IT_env);\
-}\
-	\
-virtual void please_exit (CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-m_obj->please_exit (IT_env);\
-}\
-
-
-
-
-class CubitProxyFactoryClass : public virtual CORBA::ObjectFactoryClass {
-public:
-   CubitProxyFactoryClass (unsigned char IT_p=0)
-		: CORBA::ProxyFactory (Cubit_IR, IT_p) {}
-
-    virtual void* New (char *IT_OR, CORBA::Environment&);
-
-    virtual void* New (ObjectReference *IT_OR, CORBA::Environment&);
-
-    virtual void* New2 (); 
-
-    virtual CORBA::Object* NewObject (char *IT_OR, CORBA::Environment&);
-
-    virtual CORBA::Object* NewObject (ObjectReference *IT_OR, CORBA::Environment&);
-
-    virtual CORBA::Object* New2Object (); 
-
-    virtual void* IT_castUp (void *IT_p, char* IT_s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-
-    virtual CORBA::PPTR* pptr (void *IT_p);
-
-    virtual void baseInterfaces (_IDL_SEQUENCE_string&);
-
-
-};
-
-extern CubitProxyFactoryClass CubitProxyFactory;
-
-class CubitBOAImpl : public virtual Cubit  {
-public:
-    CubitBOAImpl (const char *m="", CORBA::LoaderClass *l=NULL) {
-  if (CORBA::PPTR::isOK (m_pptr, Cubit_IR))
-    m_pptr = new Cubit_dispatch ( (Cubit*)this,
-   	 (CORBA::Object*)this, m, l, Cubit_IR, this);
-}
-
-        virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual Many cube_struct (const Many& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual oneof cube_union (const oneof& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual void please_exit (CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-};
-
-
-#endif
-
-
-#endif
diff --git a/TAO/IIOP/tests/Cubit/Orbix/client/cubit.idl b/TAO/IIOP/tests/Cubit/Orbix/client/cubit.idl
deleted file mode 100644
index d9b38c34a2a..00000000000
--- a/TAO/IIOP/tests/Cubit/Orbix/client/cubit.idl
+++ /dev/null
@@ -1,40 +0,0 @@
-// @(#)cubit.idl	1.1 95/09/10
-// Copyright 1994-1995 by Sun Microsystems, Inc.
-
-#pragma prefix	"Eng.SUN.COM"
-#pragma version Cubit 1.1
-
-interface Cubit {
-    octet	cube_octet (in octet o);
-    short	cube_short (in short s);
-    long	cube_long (in long l);
-
-    struct Many {
-	octet	o;		// + 3 bytes padding (normally) ...
-	long	l;
-	short	s;		// + 2 bytes padding (normally) ...
-    };
-
-    Many	cube_struct (in Many values);
-
-    enum discrim {e_0th, e_1st, e_2nd, e_3rd, e_4th, e_5th};
-
-    union oneof
-    switch (discrim) {
-	// this is an easy union to interpret; no padding
-	// is needed between discriminant and value.
-      case e_0th:
-        octet		o;
-      case e_1st:
-        short		s;
-      case e_2nd:
-        long		l;
-      case e_3rd:
-      default:
-        Many		cm;
-    };
-
-    oneof	cube_union (in oneof values);
-
-    oneway void	please_exit ();
-};
diff --git a/TAO/IIOP/tests/Cubit/Orbix/client/cubitC.cpp b/TAO/IIOP/tests/Cubit/Orbix/client/cubitC.cpp
deleted file mode 100644
index c47e38f26ee..00000000000
--- a/TAO/IIOP/tests/Cubit/Orbix/client/cubitC.cpp
+++ /dev/null
@@ -1,557 +0,0 @@
-#include "cubit.h"
-
-Cubit::Cubit (char *IT_OR) {
-      m_pptr = new Cubit_dispatch (IT_OR, this,(CORBA::Object*)this);
-} 
-Cubit::Cubit (ObjectReference *IT_OR) {
-      m_pptr = new Cubit_dispatch (IT_OR, this,(CORBA::Object*)this);
-} 
-
-#ifndef CubitForwC
-#define CubitForwC
-CORBA::ObjectRef Cubit_getBase(void *IT_p){
-    return (Cubit*) IT_p;}
-
-void Cubit_release (Cubit_ptr IT_p, CORBA::Environment &IT_env) {
-    CORBA::release(IT_p, IT_env);}
-
-void Cubit_release (Cubit_ptr IT_p) {
-    Cubit_release (IT_p, CORBA::IT_chooseDefaultEnv ()); }
-
-Cubit_ptr Cubit_nil (CORBA::Environment &) {
-    return Cubit:: _nil ();}
-
-Cubit_ptr Cubit_nil () {
-    return Cubit_nil (CORBA::IT_chooseDefaultEnv ());}
-
-Cubit_ptr Cubit_duplicate (Cubit_ptr IT_p, CORBA::Environment &IT_env) {
-    return (Cubit::_duplicate(IT_p, IT_env)); }
-Cubit_ptr Cubit_duplicate (Cubit_ptr IT_p) {
-    return Cubit_duplicate (IT_p, CORBA::IT_chooseDefaultEnv ()); }
-#endif
-
-Cubit_ptr Cubit::_duplicate(Cubit_ptr obj, CORBA::Environment& IT_pEnv) {
-        CORBA::EnvExcRaiser IT_raise;
-        CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-       if (!obj) {
-          return (obj);
-       }
-       Cubit_ptr IT_obj = obj->__duplicate (IT_env);
-       return IT_obj;
-}
-
-
-
-Cubit* Cubit:: _bind (const char* IT_markerServer, const char* host,
-		const CORBA::Context &IT_c, 
-		CORBA::Environment &IT_env) {
-       return (Cubit*)CORBA::Factory.New (IT_markerServer, IT_env, IT_c, host, 
-		Cubit_IMPL, Cubit_IR);
-}
-
-
-
-Cubit* Cubit:: _bind (CORBA::Environment &IT_env) {
-       return _bind (NULL,NULL,CORBA::Context(), IT_env); }
-
-
-Cubit* Cubit:: _bind (const char* IT_markerServer, const char* host,
-                CORBA::Environment &IT_env) {
-       return _bind (IT_markerServer, host, CORBA::Context (), IT_env); }
-Cubit* Cubit::_narrow (CORBA::Object* IT_obj, CORBA::Environment &IT_pEnv) {
-        CORBA::EnvExcRaiser IT_raise;
-        CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-        if (CORBA::is_nil (IT_obj)) {
-                return Cubit:: _nil();
-        }
-
-       Cubit* IT_p = (Cubit*)CORBA::Object::_castDown (IT_obj, Cubit_IR, IT_env);
-        IT_p = IT_p ? IT_p->__duplicate(IT_env) : NULL;
-        if ((IT_env) &&(!strcmp(IT_env.exception()->id(), "CORBA::StExcep::BAD_PARAM")) && (((CORBA::BAD_PARAM*)IT_env.exception())-> minor() == NARROW_FAILED)) {
-                IT_env.exception_free();
-        }
-        return IT_p;
-   }
-
-
-#ifndef Cubit_Many_Ops
-#define Cubit_Many_Ops
-
-void Cubit::Many:: encodeOp (CORBA::Request &IT_r) const {
-
-    IT_r.insertOctet (o);
-
-    IT_r << l;
-
-    IT_r << s;
-}
-
-void Cubit::Many:: decodeOp (CORBA::Request &IT_r) {
-
-    IT_r.extractOctet (o);
-
-    IT_r >> l;
-
-    IT_r >> s;
-}
-
-void Cubit::Many:: decodeInOutOp (CORBA::Request &IT_r) {
-
-    IT_r.extractOctet (o);
-
-    IT_r >> l;
-
-    IT_r >> s;
-}
-
-Cubit::Many ::~Many () {
-}
-
-Cubit::Many:: Many (const Cubit::Many &IT_s) 
-	 {
-    o = IT_s.o;
-    l = IT_s.l;
-    s = IT_s.s;
-}
-
-Cubit::Many:: Many () {
-}
-
-Cubit::Many &Cubit::Many:: operator= (const Cubit::Many& IT_s) {
-    if (this == &IT_s) return *this;
-    o = IT_s.o;
-    l = IT_s.l;
-    s = IT_s.s;
-    return *this;
-}
-
-
-#endif
-
-
-#ifndef Cubit_oneof_Ops
-#define Cubit_oneof_Ops
-void Cubit::oneof:: encodeOp (CORBA::Request &IT_r) const {
-    if (!isSet) return;
-    {
-    CORBA::ULong IT_0 = (CORBA::ULong) __d;
-    IT_r << IT_0;
-    }
-    switch (__d) {
-        case Cubit::e_0th: 
-        IT_r.insertOctet (_o_);
-        break;
-        case Cubit::e_1st: 
-        IT_r << _s_;
-        break;
-        case Cubit::e_2nd: 
-        IT_r << _l_;
-        break;
-        case Cubit::e_3rd: 
-        default: 
-        (*_cm_).encodeOp (IT_r);
-        break;
-    }
-
-}
-
-void Cubit::oneof:: decodeOp (CORBA::Request &IT_r) {
-    isSet = 0;
-    {
-    CORBA::ULong IT_1;
-    IT_r >> IT_1;
-    __d = Cubit::discrim(IT_1);
-    }
-    switch (__d) {
-        case Cubit::e_0th: 
-        if (!isSet) {
-            isSet = 1;
-        }
-        IT_r.extractOctet (_o_);
-        break;
-        case Cubit::e_1st: 
-        if (!isSet) {
-            isSet = 1;
-        }
-        IT_r >> _s_;
-        break;
-        case Cubit::e_2nd: 
-        if (!isSet) {
-            isSet = 1;
-        }
-        IT_r >> _l_;
-        break;
-        case Cubit::e_3rd: 
-        default: 
-        if (!isSet) {
-            _cm_ = new Cubit::Many;
-            isSet = 1;
-        }
-        (*_cm_).decodeOp (IT_r);
-        break;
-    }
-
-}
-void Cubit::oneof:: decodeInOutOp (CORBA::Request &IT_r) {
-    Cubit::discrim IT_d;
-    {
-    CORBA::ULong IT_2;
-    IT_r >> IT_2;
-    IT_d = Cubit::discrim(IT_2);
-    }
-    if (IT_d == __d)
-        switch (__d) {
-            case Cubit::e_0th: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r.extractOctet (_o_);
-            break;
-            case Cubit::e_1st: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r >> _s_;
-            break;
-            case Cubit::e_2nd: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r >> _l_;
-            break;
-            case Cubit::e_3rd: 
-            default: 
-            if (!isSet) {
-                _cm_ = new Cubit::Many;
-                isSet = 1;
-            }
-            (*_cm_).decodeInOutOp (IT_r);
-            break;
-        }
-
-    else {
-        this->oneof:: ~oneof();
-        memset(this, 0, sizeof(*this));
-        __d = IT_d;
-        switch (__d) {
-            case Cubit::e_0th: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r.extractOctet (_o_);
-            break;
-            case Cubit::e_1st: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r >> _s_;
-            break;
-            case Cubit::e_2nd: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r >> _l_;
-            break;
-            case Cubit::e_3rd: 
-            default: 
-            if (!isSet) {
-                _cm_ = new Cubit::Many;
-                isSet = 1;
-            }
-            (*_cm_).decodeOp (IT_r);
-            break;
-        }
-        isSet = 1;
-    }
-
-}
-
-Cubit::oneof:: oneof() { 
-    memset(this, 0, sizeof(*this));
-    isSet = 0;
-}
-
-Cubit::oneof ::~oneof() {
-    if (!isSet) return;
-    switch (__d) { 
-        case Cubit::e_0th:         break;
-        case Cubit::e_1st:         break;
-        case Cubit::e_2nd:         break;
-        case Cubit::e_3rd: 
-        default:         if (_cm_) delete _cm_;
-        break;
-    }
-
-    isSet = 0;
-}
-
-Cubit::oneof:: oneof (const Cubit::oneof &IT_s) {
-    isSet = 0;
-    memset(this, 0, sizeof(*this));
-    __d = IT_s.__d;
-    switch (__d) {
-        case Cubit::e_0th:         isSet = 1;
-        _o_ = IT_s._o_;
-        break;
-        case Cubit::e_1st:         isSet = 1;
-        _s_ = IT_s._s_;
-        break;
-        case Cubit::e_2nd:         isSet = 1;
-        _l_ = IT_s._l_;
-        break;
-        case Cubit::e_3rd: 
-        default: 
-        if (!isSet) {
-            _cm_ = new Cubit::Many;
-            isSet = 1;
-        }
-        *(_cm_) = *(IT_s._cm_);
-        break;
-    }
-    isSet = 1;
-}
-
-Cubit::oneof& Cubit::oneof:: operator= (const Cubit::oneof & IT_s) {
-    if (this == &IT_s) return *this;
-    if (isSet && (__d != IT_s.__d))
-    {
-        this-> oneof::~oneof();
-        memset(this, 0, sizeof(*this));
-    }
-
-    __d = IT_s.__d;
-    switch (__d) {
-        case Cubit::e_0th:         isSet = 1;
-        _o_ = IT_s._o_;
-        break;
-        case Cubit::e_1st:         isSet = 1;
-        _s_ = IT_s._s_;
-        break;
-        case Cubit::e_2nd:         isSet = 1;
-        _l_ = IT_s._l_;
-        break;
-        case Cubit::e_3rd: 
-        default: 
-        if (!isSet) {
-            _cm_ = new Cubit::Many;
-            isSet = 1;
-        }
-        *(_cm_) = *(IT_s._cm_);
-        break;
-    }
-    isSet = 1;
-    return *this;
-}
-
-
-#endif
-
-void* CubitProxyFactoryClass::New (char *IT_OR, CORBA::Environment&) {
-        return  new class Cubit(IT_OR);}
-
-void* CubitProxyFactoryClass::New (ObjectReference *IT_OR, CORBA::Environment&) {
-        return  new class Cubit(IT_OR);}
-
-void* CubitProxyFactoryClass::New2 () {
-        return  new class Cubit((char*)0);}
-
-CORBA::Object* CubitProxyFactoryClass::NewObject (char *IT_OR, CORBA::Environment&) {
-        return  new class Cubit(IT_OR);}
-
-CORBA::Object* CubitProxyFactoryClass::NewObject (ObjectReference *IT_OR, CORBA::Environment&) {
-        return  new class Cubit(IT_OR);}
-
-CORBA::Object* CubitProxyFactoryClass::New2Object () {
-        return  new class Cubit((char*)0);}
-
-void* CubitProxyFactoryClass::IT_castUp (void *IT_p, char* IT_s, CORBA::Environment &IT_env) {
-      void *IT_l;
-      if (!CORBA::_interfaceCmp (IT_s,Cubit_IR, IT_env))
-         return IT_p;
-      else if (IT_l=CORBA::ObjectFactoryClass::IT_castUp((CORBA::Object*)((class Cubit*)IT_p),IT_s, IT_env))
-         return IT_l;
-      else return NULL;
-    }
-
-
-CORBA::PPTR* CubitProxyFactoryClass::pptr (void *IT_p) {
-       return ((class Cubit*)IT_p)->_pptr ();}
-
-void CubitProxyFactoryClass::baseInterfaces (_IDL_SEQUENCE_string& seq) {
-      add (seq, Cubit_IR);
-      CORBA::ObjectFactoryClass::baseInterfaces (seq);
-}
-
-CubitProxyFactoryClass CubitProxyFactory(1);
-
-CORBA::Octet Cubit:: cube_octet (CORBA::Octet o, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        return 0;
-    }
-    CORBA::Request IT_r (this, "cube_octet",IT_env,1,0);
-    if (!IT_r.isException (IT_env)) {
-
-        IT_r.insertOctet (o);
-    }
-
-    IT_r.invoke (CORBA::Flags(0),IT_env);
-    if (!IT_r.isException (IT_env)) {
-        CORBA::Octet IT_result;
-        IT_r.extractOctet (IT_result);
-        IT_r.checkEnv (IT_env);
-        return IT_result;
-    }
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-    return 0;
-}
-
-CORBA::Short Cubit:: cube_short (CORBA::Short s, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        return 0;
-    }
-    CORBA::Request IT_r (this, "cube_short",IT_env,1,0);
-    if (!IT_r.isException (IT_env)) {
-
-        IT_r << s;
-    }
-
-    IT_r.invoke (CORBA::Flags(0),IT_env);
-    if (!IT_r.isException (IT_env)) {
-        CORBA::Short IT_result;
-        IT_r >> IT_result;
-        IT_r.checkEnv (IT_env);
-        return IT_result;
-    }
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-    return 0;
-}
-
-CORBA::Long Cubit:: cube_long (CORBA::Long l, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        return 0;
-    }
-    CORBA::Request IT_r (this, "cube_long",IT_env,1,0);
-    if (!IT_r.isException (IT_env)) {
-
-        IT_r << l;
-    }
-
-    IT_r.invoke (CORBA::Flags(0),IT_env);
-    if (!IT_r.isException (IT_env)) {
-        CORBA::Long IT_result;
-        IT_r >> IT_result;
-        IT_r.checkEnv (IT_env);
-        return IT_result;
-    }
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-    return 0;
-}
-
-Cubit::Many Cubit:: cube_struct (const Cubit::Many& values, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        { 
-            Cubit::Many IT_l0;
-            return IT_l0;
-        }
-    }
-    CORBA::Request IT_r (this, "cube_struct",IT_env,1,0);
-    if (!IT_r.isException (IT_env)) {
-
-        values.encodeOp (IT_r);
-    }
-
-    IT_r.invoke (CORBA::Flags(0),IT_env);
-    if (!IT_r.isException (IT_env)) {
-        Cubit::Many IT_result;
-        IT_result.decodeOp (IT_r);
-        IT_r.checkEnv (IT_env);
-        return IT_result;
-    }
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-    { 
-        Cubit::Many IT_l1;
-        return IT_l1;
-    }
-}
-
-Cubit::oneof Cubit:: cube_union (const Cubit::oneof& values, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        { 
-            Cubit::oneof IT_l0;
-            return IT_l0;
-        }
-    }
-    CORBA::Request IT_r (this, "cube_union",IT_env,1,0);
-    if (!IT_r.isException (IT_env)) {
-
-        values.encodeOp (IT_r);
-    }
-
-    IT_r.invoke (CORBA::Flags(0),IT_env);
-    if (!IT_r.isException (IT_env)) {
-        Cubit::oneof IT_result;
-        IT_result.decodeOp (IT_r);
-        IT_r.checkEnv (IT_env);
-        return IT_result;
-    }
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-    { 
-        Cubit::oneof IT_l1;
-        return IT_l1;
-    }
-}
-
-void Cubit:: please_exit (CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        return ;
-    }
-    CORBA::Request IT_r (this, "please_exit",IT_env,1,1);
-
-    IT_r.invoke (CORBA::Flags(CORBA::INV_NO_RESPONSE), IT_env);
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-}
-
-
-
-
-
-#ifndef Cubit_dispatch_impl
-
-unsigned char Cubit_dispatch::dispatch (CORBA::Request &IT_r, 
-    unsigned char, void *) {
-      IT_r.makeRuntimeException1 ("Cubit");
-      return 0;
-}
- 
-#endif
-
diff --git a/TAO/IIOP/tests/Cubit/Orbix/factory_client/Makefile b/TAO/IIOP/tests/Cubit/Orbix/factory_client/Makefile
deleted file mode 100644
index de2877537b6..00000000000
--- a/TAO/IIOP/tests/Cubit/Orbix/factory_client/Makefile
+++ /dev/null
@@ -1,77 +0,0 @@
-#----------------------------------------------------------------------------
-#	@(#)Makefile	1.1	10/18/96
-#
-#	Makefile for the ACE_MT_CORBA_Handler tests
-#----------------------------------------------------------------------------
-
-#----------------------------------------------------------------------------
-#	Local macros
-#----------------------------------------------------------------------------
-
-SRC = cubitC.cpp client.cpp
-
-CLT_OBJS = cubitC.o client.o
-
-LDLIBS	 = 
-
-VLDLIBS	 = $(LDLIBS:%=%$(VAR))
-
-#----------------------------------------------------------------------------
-#	Include macros and targets
-#----------------------------------------------------------------------------
-
-include		$(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-include		$(ACE_ROOT)/include/makeinclude/macros.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.common.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.lib.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.bin.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
-
-#----------------------------------------------------------------------------
-#	Orbix related macros and target settings.
-#----------------------------------------------------------------------------
-
-
-ORBIX_BINDIR    = $(ORBIX_ROOT)/bin
-ORBIX_LIBDIR    = $(ORBIX_ROOT)/corba2/lib
-ORBIX_INCDIR    = $(ORBIX_ROOT)/corba2/include
-
-CPPFLAGS += -DEXCEPTIONS -I$(ORBIX_INCDIR) -DWANT_ORBIX_FDS
-LDFLAGS  += -L$(ORBIX_LIBDIR) -R $(ORBIX_LIBDIR) -L$(ACE)/ace
-
-IDLFLAGS = -s S.cpp -c C.cpp -B
-
-#----------------------------------------------------------------------------
-#	Local targets
-#----------------------------------------------------------------------------
-
-all: client 
-
-client: $(addprefix $(VDIR),$(CLT_OBJS))
-	$(LINK.cc) -o client $(addprefix $(VDIR),$(CLT_OBJS)) $(LDFLAGS) $(ITIIOP) $(ITCLT) $(VLDLIBS)
-
-
-#----------------------------------------------------------------------------
-#	Dependencies
-#----------------------------------------------------------------------------
-# DO NOT DELETE THIS LINE -- g++dep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-
-.obj/cubitC.o .shobj/cubitC.so: cubitC.cpp cubit.h
-.obj/client.o .shobj/client.so: client.cpp $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/config-sunos5.5-sunc++-4.x.h \
- $(ACE_ROOT)/ace/stdcpp.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i cubit.h
-
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/IIOP/tests/Cubit/Orbix/factory_client/client.cpp b/TAO/IIOP/tests/Cubit/Orbix/factory_client/client.cpp
deleted file mode 100644
index c61cfbc85a5..00000000000
--- a/TAO/IIOP/tests/Cubit/Orbix/factory_client/client.cpp
+++ /dev/null
@@ -1,235 +0,0 @@
-//**************************************************************************
-//
-// NAME :   client.C 
-// DESCRIPTION:  
-//
-// Client for the Cubit example
-//
-//****************************************************************************
-
-#include "ace/OS.h"
-#include "ace/Get_Opt.h"
-#include "cubit.h"
-
-int LOOP_COUNT;
-char SERVER_HOST [1024];
-
-inline int func (unsigned i) { return i - 117; }
-void run_tests (Cubit_var, int);
-
-// = TITLE
-//     Parses the command line arguments and returns an error status
-//
-// = DESCRIPTION
-//     This method parses the command line arguments
-int parse_args(int argc, char *argv[])
-{
-  ACE_OS::strcpy (SERVER_HOST, "localhost");
-  ACE_Get_Opt opts (argc, argv, "dh:n:O:x");
-  int			c;
-  
-  while ((c = opts ()) != -1)
-    switch (c) {
-    case 'h':
-      ACE_OS::strcpy (SERVER_HOST, opts.optarg);
-      continue;
-    case 'd':  // debug flag
-      continue;
-      
-    case 'n':			// loop count
-      LOOP_COUNT = (unsigned) ACE_OS::atoi (opts.optarg);
-      continue;
-      
-    case 'O':			// stringified objref
-      continue;
-      
-    case 'x':
-      continue;
-      
-    case '?':
-    default:
-      ACE_OS::fprintf (stderr, "usage:  %s"
-                       " [-d]"
-                       " [-n loopcount]"
-                       " [-h SERVER_HOST]"
-                       " [-x]"
-                       "\n", argv [0]
-                       );
-      return 1;
-    }
-  
-  return 0;  // Indicates successful parsing of command line
-}
-
-
-//
-// Mainline
-//
-int
-main (int argc, char *argv[])
-{
-  if (parse_args (argc, argv) != 0)
-    return -1;
-
-  Cubit_var cb;
-  Cubit_Factory_var cf;
-  
-  // cout << "attempting to contact server at host " << SERVER_HOST << '\n' ;
- 
-  //
-  // Initialise client's binding to an
-  // arbitrary cubit server (at some host)
-  // 
-  TRY {
-    cf = Cubit_Factory::_bind ("", SERVER_HOST, IT_X);
-  }
-  CATCHANY {
-    cerr << "Binding failed: " << IT_X;
-  }
-  ENDTRY;
-  cb = cf->create_cubit ("My_Cubit");
-  
-  run_tests (cb, LOOP_COUNT);
-  return 0;
-}
-
-
-void
-run_tests (Cubit_var cb, int loop_count) 
-{
-    //
-  // Make the calls in a loop.
-  //
-  unsigned i;
-  unsigned call_count, error_count;
-
-  call_count = 0;
-  error_count = 0;
-
-  ACE_Time_Value before, after;
-
-  before = ACE_OS::gettimeofday();
-  
-  //
-  // Cube an octet.
-  //
-  
-  for (i = 0; i < loop_count; i++)
-    {
-
-      call_count++;
-
-      CORBA::Octet arg_octet = func (i), ret_octet;
-
-      TRY {
-      ret_octet = cb->cube_octet (arg_octet);
-      } 
-      CATCHANY {
-        cerr << "Call failed: " << IT_X;
-        error_count++;
-      } 
-      ENDTRY;
-      arg_octet = arg_octet * arg_octet * arg_octet;
-      if (arg_octet != ret_octet) {
-        ACE_OS::printf ("** cube_octet(%d)  (--> %d)\n", arg_octet , ret_octet);
-        error_count++;
-      }
-    
-  
-  //
-  // Cube a short.
-  //
-      call_count++;
-
-      CORBA::Short arg_short = func (i), ret_short;
-
-      TRY {
-      ret_short = cb->cube_short (arg_short);
-      } 
-      CATCHANY {
-        cerr << "Call failed: " << IT_X;
-        error_count++;
-      } 
-      ENDTRY;
-      arg_short = arg_short * arg_short * arg_short;
-      if (arg_short != ret_short) {
-        ACE_OS::printf ("** cube_short(%d)  (--> %d)\n", arg_short , ret_short);
-        error_count++;
-      }
-
-  //
-  // Cube a long.
-  //
-  
-      call_count++;
-
-      CORBA::Long arg_long = func (i), ret_long;
-
-      TRY {
-      ret_long = cb->cube_long (arg_long);
-      } 
-      CATCHANY {
-        cerr << "Call failed: " << IT_X;
-      } 
-      ENDTRY;
-      arg_long = arg_long * arg_long * arg_long;
-      if (arg_long != ret_long) {
-        ACE_OS::printf ("** cube_long(%d)  (--> %d)\n", arg_long , ret_long);
-        error_count++;
-      }
-
-
-      //
-      // Cube a "struct" ...
-      //
-      Cubit::Many	arg_struct, ret_struct;
-      
-       call_count++;
-       
-       arg_struct.l = func (i);
-       arg_struct.s = func (i);
-       arg_struct.o = func (i);
-       
-       TRY {
-         ret_struct = cb->cube_struct (arg_struct);
-       }
-       CATCHANY {
-         cerr << "Call failed: " << IT_X;
-         error_count++;
-       } 
-       ENDTRY;
-       arg_struct.l = arg_struct.l  * arg_struct.l  * arg_struct.l ;
-       arg_struct.s = arg_struct.s  * arg_struct.s  * arg_struct.s ;
-       arg_struct.o = arg_struct.o  * arg_struct.o  * arg_struct.o ;
-       
-       if (arg_struct.l  != ret_struct.l 
-           || arg_struct.s  != ret_struct.s 
-           || arg_struct.o  != ret_struct.o )
-         {
-           cerr << "** cube_struct ERROR\n";
-           error_count++;
-         }
-    }
-    
-  
-  after = ACE_OS::gettimeofday();
-  
-  if (call_count > 0) 
-    {
-      if (error_count == 0)
-        {
-          ACE_Time_Value diff = after - before;
-          unsigned long	us = diff.sec() * 1000 * 1000 + diff.usec();
-          
-          us /= call_count;
-          
-          if (us > 0)
-            ACE_OS::printf ("cube average call ACE_OS::time\t= %ld.%.03ldms, \t"
-                            "%ld calls/second\n",
-                            us / 1000, us % 1000,
-                            1000000L / us);
-        }
-      
-      ACE_OS::printf ("%d calls, %d errors\n", call_count, error_count);
-    }
-}
diff --git a/TAO/IIOP/tests/Cubit/Orbix/factory_client/cubit.h b/TAO/IIOP/tests/Cubit/Orbix/factory_client/cubit.h
deleted file mode 100644
index 72e2fb81395..00000000000
--- a/TAO/IIOP/tests/Cubit/Orbix/factory_client/cubit.h
+++ /dev/null
@@ -1,1111 +0,0 @@
-
-#ifndef cubit_hh
-#define cubit_hh
-
-#include <CORBA.h>
-
-#include <string.h>
-
-
-#ifndef _Cubit_defined
-#define _Cubit_defined
-class Cubit_dispatch : public virtual CORBA::PPTR {
-public:
-
-      Cubit_dispatch (void *IT_p, CORBA::Object* IT_o, const char *IT_m, 
-        CORBA::LoaderClass *IT_l, char *IT_i, void* IT_im)
-       : PPTR (IT_p,IT_o,IT_m,IT_l,IT_i,IT_im) {}
-
-
-   Cubit_dispatch (char *IT_OR, void *IT_p, CORBA::Object *IT_o)
-       : PPTR (IT_OR,IT_p,IT_o) {}
-
-
-   Cubit_dispatch () {}
-
-   Cubit_dispatch (ObjectReference *IT_OR, void *IT_p, CORBA::Object *IT_o)
-       : PPTR (IT_OR,IT_p,IT_o) {}
-
-
-   Cubit_dispatch (void *IT_p, CORBA::Object *IT_o, const char *IT_m, 
-        char *IT_i, CORBA::Object* IT_ob, void* IT_im)
-       : PPTR (IT_p,IT_o,IT_m,IT_i,IT_ob,IT_im) {}
-
-
-   virtual unsigned char dispatch (CORBA::Request &IT_r, 
-        unsigned char IT_isTarget, void* IT_pp=NULL);
-
-
-};
-
-class Cubit;
-
-#ifndef CubitPtr
-#define CubitPtr
-
-typedef Cubit* Cubit_ptr;
-
-typedef Cubit* CubitRef;
-
-#endif
-
-
-#ifndef CubitForwH
-#define CubitForwH
-CORBA::ObjectRef Cubit_getBase (void *);
-void Cubit_release (Cubit *, CORBA::Environment &IT_env);
-void Cubit_release (Cubit_ptr);
-Cubit* Cubit_duplicate (Cubit_ptr, CORBA::Environment &IT_env);
-Cubit* Cubit_duplicate (Cubit_ptr );
-Cubit_ptr Cubit_nil (CORBA::Environment &IT_env);
-Cubit_ptr Cubit_nil ();
-#endif
-#define Cubit_IMPL "Cubit"
-
-
-class Cubit;
-
-typedef Cubit CubitProxy;
-#define Cubit_IR "Cubit$v1.1"
-#define Cubit_IMPL "Cubit"
-
-#ifndef CubitPtr
-#define CubitPtr
-
-typedef Cubit* Cubit_ptr;
-
-typedef Cubit* CubitRef;
-
-#endif
-
-class Cubit: public virtual CORBA::Object  {
-public:
-        Cubit (char *IT_OR);
-    Cubit (ObjectReference *IT_OR);
-    Cubit () : CORBA::Object  (1) {}
-protected:
-    Cubit_ptr __duplicate(
-            CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) {
-       CORBA::Object::__duplicate (IT_env);
-       return this;
-    }
-public:
-    static Cubit_ptr _duplicate(
-            Cubit_ptr, 
-            CORBA::Environment &IT_pEnv=CORBA::IT_chooseDefaultEnv ());
-public:
-   static Cubit* _bind (const char* IT_markerServer, const char* host,
-		const CORBA::Context &IT_c, 
-		CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-   static Cubit* _bind (CORBA::Environment &IT_env);
-   static Cubit* _bind (const char* IT_markerServer=NULL, const char* host=NULL,
-                 CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-    static Cubit* _narrow (CORBA::Object* , CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-    static Cubit_ptr _nil (CORBA::Environment &IT_pEnv=CORBA::IT_chooseDefaultEnv ()) {
-        CORBA::EnvExcRaiser IT_raise;
-        CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-        return (Cubit_ptr) CORBA::OBJECT_NIL;}
-
-#ifndef Cubit_Many_defined
-#define Cubit_Many_defined
-
-struct Many {
-    CORBA::Octet o;
-    CORBA::Long l;
-    CORBA::Short s;
-
-    void encodeOp (CORBA::Request &IT_r) const;
-    void decodeOp (CORBA::Request &IT_r);
-    void decodeInOutOp (CORBA::Request &IT_r);
-    Many(const Many &);
-    Many();
-    ~Many();
-    Many& operator= (const Many&);
-};
-
-#ifndef Cubit_ManyVarH
-#define Cubit_ManyVarH
-
-#ifndef Cubit_ManyvPtr
-#define Cubit_ManyvPtr
-typedef Many* Many_vPtr;
-typedef const Many* Many_cvPtr;
-#endif
-
-class Many_var : public CORBA::_var
-{
-    private:
-
-    unsigned char copyHelper (const Many_var &IT_s) {
-        if (!IT_s._ptr) {
-            _ptr = IT_s._ptr;
-        } else
-        {
-            _ptr = new Many;
-            *(_ptr) =  *(IT_s._ptr);
-        }
-        return 1;
-    }
-
-    public:
-
-    Many_var (const Many_var &IT_s) {
-        (void) copyHelper (IT_s);
-    }
-
-    Many_var () {
-        _ptr =  new Many;
-;
-    }
-
-    Many_var (Many *IT_p) {
-        _ptr = IT_p;
-    }
-
-    Many_var &operator= (Many *IT_p) {
-        if (_ptr != IT_p) {
-            delete _ptr;
-        }
-        _ptr = IT_p;
-        return (*this);
-    }
-
-    Many_var &operator= (const Many_var &IT_s) {
-        if (_ptr != IT_s._ptr) {
-            delete _ptr;
-        }
-        _ptr = new Many;
-        *(_ptr) =  *(IT_s._ptr);
-        return (*this);
-    }
-
-    ~Many_var () {
-        delete _ptr;
-    }
-
-    Many* operator-> () {
-        return _ptr;
-    }
-
-    operator Many_cvPtr () const { return _ptr;}
-    operator Many_vPtr& () { return _ptr;}
-    operator Many& () const { return * _ptr;}
-
-    protected:
-    Many *_ptr;
-    private:
-    Many_var &operator= (const CORBA::_var &IT_s);
-    Many_var (const CORBA::_var &IT_s);
-};
-
-#endif
-
-
-#endif
-
-enum discrim {e_0th,e_1st,e_2nd,e_3rd,e_4th,e_5th, IT__ENUM_Cubit_discrim=CORBA_ULONG_MAX};
-
-#ifndef Cubit_oneof_defined
-#define Cubit_oneof_defined
-
-struct oneof {
-    private:
-
-    discrim __d;
-    union {
-        CORBA::Octet _o_;
-        CORBA::Short _s_;
-        CORBA::Long _l_;
-        Many * _cm_;
-    };
-
-    public:
-
-    void encodeOp (CORBA::Request &IT_r) const;
-    void decodeOp (CORBA::Request &IT_r);
-    void decodeInOutOp (CORBA::Request &IT_r);
-
-    private:
-
-    unsigned char isSet;
-
-    public:
-
-    discrim _d () const { return __d; }
-
-    CORBA::Octet o () const {
-        return _o_;
-    }
-
-    void o (CORBA::Octet IT_member) {
-        if (isSet && (__d != Cubit::e_0th))
-        {
-            this-> oneof::~oneof();
-            memset(this, 0, sizeof(*this));
-        }
-
-        __d = Cubit::e_0th;
-        isSet = 1;
-        _o_ = IT_member;
-    }
-
-    CORBA::Short s () const {
-        return _s_;
-    }
-
-    void s (CORBA::Short IT_member) {
-        if (isSet && (__d != Cubit::e_1st))
-        {
-            this-> oneof::~oneof();
-            memset(this, 0, sizeof(*this));
-        }
-
-        __d = Cubit::e_1st;
-        isSet = 1;
-        _s_ = IT_member;
-    }
-
-    CORBA::Long l () const {
-        return _l_;
-    }
-
-    void l (CORBA::Long IT_member) {
-        if (isSet && (__d != Cubit::e_2nd))
-        {
-            this-> oneof::~oneof();
-            memset(this, 0, sizeof(*this));
-        }
-
-        __d = Cubit::e_2nd;
-        isSet = 1;
-        _l_ = IT_member;
-    }
-
-    Many& cm () {
-        return (*_cm_);
-    }
-
-    const Many& cm () const {
-        return (*_cm_);
-    }
-
-    void cm (const Many& IT_member) {
-        if (isSet && (__d != Cubit::e_3rd))
-        {
-            this-> oneof::~oneof();
-            memset(this, 0, sizeof(*this));
-        }
-
-        __d = Cubit::e_3rd;
-
-        if (!isSet) {
-            _cm_ = new Many;
-            isSet = 1;
-        }
-        *(_cm_) = IT_member;
-    }
-
-
-    oneof();
-    oneof(const oneof &);
-    ~oneof();
-    oneof& operator= (const oneof&);
-};
-
-#ifndef Cubit_oneofVarH
-#define Cubit_oneofVarH
-
-#ifndef Cubit_oneofvPtr
-#define Cubit_oneofvPtr
-typedef oneof* oneof_vPtr;
-typedef const oneof* oneof_cvPtr;
-#endif
-
-class oneof_var : public CORBA::_var
-{
-    private:
-
-    unsigned char copyHelper (const oneof_var &IT_s) {
-        if (!IT_s._ptr) {
-            _ptr = IT_s._ptr;
-        } else
-        {
-            _ptr = new oneof;
-            *(_ptr) =  *(IT_s._ptr);
-        }
-        return 1;
-    }
-
-    public:
-
-    oneof_var (const oneof_var &IT_s) {
-        (void) copyHelper (IT_s);
-    }
-
-    oneof_var () {
-        _ptr = NULL;
-    }
-
-    oneof_var (oneof *IT_p) {
-        _ptr = IT_p;
-    }
-
-    oneof_var &operator= (oneof *IT_p) {
-        if (_ptr != IT_p) {
-            delete _ptr;
-        }
-        _ptr = IT_p;
-        return (*this);
-    }
-
-    oneof_var &operator= (const oneof_var &IT_s) {
-        if (_ptr != IT_s._ptr) {
-            delete _ptr;
-        }
-        _ptr = new oneof;
-        *(_ptr) =  *(IT_s._ptr);
-        return (*this);
-    }
-
-    ~oneof_var () {
-        delete _ptr;
-    }
-
-    oneof* operator-> () {
-        return _ptr;
-    }
-
-    operator oneof_cvPtr () const { return _ptr;}
-    operator oneof_vPtr& () { return _ptr;}
-    operator oneof& () const { return * _ptr;}
-
-    protected:
-    oneof *_ptr;
-    private:
-    oneof_var &operator= (const CORBA::_var &IT_s);
-    oneof_var (const CORBA::_var &IT_s);
-};
-
-#endif
-
-
-#endif
-        virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual Many cube_struct (const Many& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual oneof cube_union (const oneof& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual void please_exit (CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-};
-
-#ifndef CubitVarH
-#define CubitVarH
-
-#ifndef CubitvPtr
-#define CubitvPtr
-typedef Cubit* Cubit_vPtr;
-typedef const Cubit* Cubit_cvPtr;
-#endif
-
-class Cubit_var : public CORBA::_var
-{
-    private:
-
-    unsigned char copyHelper (const Cubit_var &IT_s) {
-        {
-            _ptr = Cubit_duplicate (IT_s._ptr);
-        }
-        return 1;
-    }
-
-    public:
-
-    Cubit_var (const Cubit_var &IT_s) {
-        (void) copyHelper (IT_s);
-    }
-
-    Cubit_var () {
-        _ptr = Cubit_nil ();
-    }
-
-    Cubit_var (Cubit *IT_p) {
-        _ptr = IT_p;
-    }
-
-    Cubit_var &operator= (Cubit *IT_p) {
-        Cubit_release (_ptr);
-        _ptr = IT_p;
-        return (*this);
-    }
-
-    Cubit_var &operator= (const Cubit_var &IT_s) {
-        Cubit_release (_ptr);
-        _ptr = Cubit_duplicate (IT_s._ptr);
-        return (*this);
-    }
-
-    ~Cubit_var () {
-        Cubit_release (_ptr);
-    }
-
-    Cubit* operator-> () {
-        return _ptr;
-    }
-
-    operator Cubit_cvPtr () const { return _ptr;}
-    operator Cubit_vPtr& () { return _ptr;}
-
-    protected:
-    Cubit *_ptr;
-    private:
-    Cubit_var &operator= (const CORBA::_var &IT_s);
-    Cubit_var (const CORBA::_var &IT_s);
-    Cubit_var &operator= (const CORBA::_mgr &IT_s);
-    Cubit_var &operator= (const CORBA::_SeqElem &IT_s);
-    Cubit_var (const CORBA::_mgr &IT_s);
-    Cubit_var (const CORBA::_SeqElem &IT_s);
-};
-
-#endif
-
-
-#ifndef CubitMgrH
-#define CubitMgrH
-
-class Cubit_mgr : public CORBA::_mgr
-{
-    public:
-
-    Cubit_mgr () {
-        _ptr = Cubit_nil ();
-        _release = 1;
-    }
-
-    Cubit_mgr (const Cubit_mgr &IT_s) {
-        _ptr = Cubit_duplicate (IT_s._ptr);
-        _release = 1;
-    }
-
-    Cubit_mgr &operator= (Cubit *IT_p) {
-        if (_ptr && _release)
-            Cubit_release (_ptr);
-        _ptr = IT_p;
-        _release = 1;
-        return (*this);
-    }
-
-    Cubit_mgr &operator= (const Cubit_mgr &IT_s) {
-        if (_ptr && _release)
-            Cubit_release (_ptr);
-        _ptr = Cubit_duplicate(IT_s._ptr);
-        _release = 1;
-        return (*this);
-    }
-
-    Cubit_mgr &operator= (Cubit_var &IT_s) {
-        if (_ptr && _release)
-            Cubit_release (_ptr);
-        _ptr = Cubit_duplicate(IT_s);
-        _release = 1;
-        return (*this);
-    }
-
-    ~Cubit_mgr () {
-        if (_release)
-            Cubit_release (_ptr);
-    }
-
-    unsigned char release () {
-        return _release;
-    }
-
-    void release (unsigned char rel) {
-        _release = rel;
-    }
-
-    operator int () const {
-        return (((CORBA::Object_ptr) _ptr) ? 1 : 0);
-    }
-
-    operator void* () const {
-        return _ptr;
-    }
-
-    operator CORBA::Object * () const {
-        return (CORBA::Object *) _ptr;
-    }
-
-    operator Cubit* () const {
-        return (Cubit*) _ptr;
-    }
-
-    Cubit_ptr operator-> () const {
-        return _ptr;
-    }
-
-    Cubit *_ptr;
-
-    protected:
-
-    unsigned char _release;
-};
-
-typedef Cubit_mgr Cubit_mgr_IT_const;
-#endif
-
-#ifndef CubitSeqElemH
-#define CubitSeqElemH
-
-class Cubit_SeqElem : public CORBA::_SeqElem
-{
-    public:
-
-    Cubit_SeqElem (Cubit_ptr* IT_p, unsigned char rel) {
-        _ptr = IT_p;
-        _release = rel;
-    }
-
-    Cubit_SeqElem &operator= (Cubit_ptr IT_p) {
-        if (_ptr) {
-            if (*(_ptr) && _release)
-                Cubit_release (*(_ptr));
-            *(_ptr) = IT_p;
-        }
-        return (*this);
-    }
-
-    Cubit_SeqElem &operator= (const Cubit_SeqElem &IT_s) {
-        if (_ptr && IT_s._ptr) {
-            if (*(_ptr) && _release)
-                Cubit_release (*(_ptr));
-            *(_ptr) = Cubit_duplicate(*(IT_s._ptr));
-        }
-        return (*this);
-    }
-
-    operator Cubit_ptr () const {
-        return _ptr ? (Cubit_ptr) (*_ptr) : Cubit_nil(); 
-    }
-
-    Cubit_ptr operator->() const { return *_ptr;}
-
-    protected:
-    Cubit_ptr *_ptr;
-    unsigned char _release;
-};
-
-#endif
-
-
-#define TIE_Cubit(X) Cubit##X
-
-#define DEF_TIE_Cubit(X) \
-	class Cubit##X : public virtual Cubit {		\
-	  X* m_obj;						\
-	public:							\
-								\
-								\
-	   Cubit##X  (X *objp, const char* m="", CORBA::LoaderClass *l=0)\
-		: Cubit(), m_obj(objp) {	\
-		m_pptr = new Cubit_dispatch		\
-			(( Cubit*)this,(CORBA::Object*)this,m,l,Cubit_IR,m_obj);	\
-	   }								\
-	   Cubit##X  (CORBA::Object *IT_p, const char* IT_m="", void *IT_q=0)\
-		: Cubit() {	\
-		m_pptr = new Cubit_dispatch		\
-			(( Cubit*)this,(CORBA::Object*)this,IT_m,Cubit_IR,IT_p,IT_q);	\
-		m_obj = (X*)(m_pptr->getImplObj ());			\
-	   }								\
-								\
-	   virtual ~Cubit##X  () {				\
-		if (_okToDeleteImpl ()) delete m_obj; }					\
-	   virtual void* _deref () {					\
-		return m_obj; }					\
-								\
-virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_octet (  o,IT_env);\
-}\
-	\
-virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_short (  s,IT_env);\
-}\
-	\
-virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_long (  l,IT_env);\
-}\
-	\
-virtual Cubit::Many cube_struct (const Cubit::Many& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_struct (  values,IT_env);\
-}\
-	\
-virtual Cubit::oneof cube_union (const Cubit::oneof& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_union (  values,IT_env);\
-}\
-	\
-virtual void please_exit (CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-m_obj->please_exit (IT_env);\
-}\
-								\
-	};						\
-
-
-#define QUALS_Cubit	\
-virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_octet (  o,IT_env);\
-}\
-	\
-virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_short (  s,IT_env);\
-}\
-	\
-virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_long (  l,IT_env);\
-}\
-	\
-virtual Many cube_struct (const Many& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_struct (  values,IT_env);\
-}\
-	\
-virtual oneof cube_union (const oneof& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_union (  values,IT_env);\
-}\
-	\
-virtual void please_exit (CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-m_obj->please_exit (IT_env);\
-}\
-
-
-
-
-class CubitProxyFactoryClass : public virtual CORBA::ObjectFactoryClass {
-public:
-   CubitProxyFactoryClass (unsigned char IT_p=0)
-		: CORBA::ProxyFactory (Cubit_IR, IT_p) {}
-
-    virtual void* New (char *IT_OR, CORBA::Environment&);
-
-    virtual void* New (ObjectReference *IT_OR, CORBA::Environment&);
-
-    virtual void* New2 (); 
-
-    virtual CORBA::Object* NewObject (char *IT_OR, CORBA::Environment&);
-
-    virtual CORBA::Object* NewObject (ObjectReference *IT_OR, CORBA::Environment&);
-
-    virtual CORBA::Object* New2Object (); 
-
-    virtual void* IT_castUp (void *IT_p, char* IT_s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-
-    virtual CORBA::PPTR* pptr (void *IT_p);
-
-    virtual void baseInterfaces (_IDL_SEQUENCE_string&);
-
-
-};
-
-extern CubitProxyFactoryClass CubitProxyFactory;
-
-class CubitBOAImpl : public virtual Cubit  {
-public:
-    CubitBOAImpl (const char *m="", CORBA::LoaderClass *l=NULL) {
-  if (CORBA::PPTR::isOK (m_pptr, Cubit_IR))
-    m_pptr = new Cubit_dispatch ( (Cubit*)this,
-   	 (CORBA::Object*)this, m, l, Cubit_IR, this);
-}
-
-        virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual Many cube_struct (const Many& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual oneof cube_union (const oneof& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual void please_exit (CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-};
-
-
-#endif
-
-
-#ifndef _Cubit_Factory_defined
-#define _Cubit_Factory_defined
-class Cubit_Factory_dispatch : public virtual CORBA::PPTR {
-public:
-
-      Cubit_Factory_dispatch (void *IT_p, CORBA::Object* IT_o, const char *IT_m, 
-        CORBA::LoaderClass *IT_l, char *IT_i, void* IT_im)
-       : PPTR (IT_p,IT_o,IT_m,IT_l,IT_i,IT_im) {}
-
-
-   Cubit_Factory_dispatch (char *IT_OR, void *IT_p, CORBA::Object *IT_o)
-       : PPTR (IT_OR,IT_p,IT_o) {}
-
-
-   Cubit_Factory_dispatch () {}
-
-   Cubit_Factory_dispatch (ObjectReference *IT_OR, void *IT_p, CORBA::Object *IT_o)
-       : PPTR (IT_OR,IT_p,IT_o) {}
-
-
-   Cubit_Factory_dispatch (void *IT_p, CORBA::Object *IT_o, const char *IT_m, 
-        char *IT_i, CORBA::Object* IT_ob, void* IT_im)
-       : PPTR (IT_p,IT_o,IT_m,IT_i,IT_ob,IT_im) {}
-
-
-   virtual unsigned char dispatch (CORBA::Request &IT_r, 
-        unsigned char IT_isTarget, void* IT_pp=NULL);
-
-
-};
-
-class Cubit_Factory;
-
-#ifndef Cubit_FactoryPtr
-#define Cubit_FactoryPtr
-
-typedef Cubit_Factory* Cubit_Factory_ptr;
-
-typedef Cubit_Factory* Cubit_FactoryRef;
-
-#endif
-
-
-#ifndef Cubit_FactoryForwH
-#define Cubit_FactoryForwH
-CORBA::ObjectRef Cubit_Factory_getBase (void *);
-void Cubit_Factory_release (Cubit_Factory *, CORBA::Environment &IT_env);
-void Cubit_Factory_release (Cubit_Factory_ptr);
-Cubit_Factory* Cubit_Factory_duplicate (Cubit_Factory_ptr, CORBA::Environment &IT_env);
-Cubit_Factory* Cubit_Factory_duplicate (Cubit_Factory_ptr );
-Cubit_Factory_ptr Cubit_Factory_nil (CORBA::Environment &IT_env);
-Cubit_Factory_ptr Cubit_Factory_nil ();
-#endif
-#define Cubit_Factory_IMPL "Cubit_Factory"
-
-
-class Cubit_Factory;
-
-typedef Cubit_Factory Cubit_FactoryProxy;
-#define Cubit_Factory_IR "Cubit_Factory"
-#define Cubit_Factory_IMPL "Cubit_Factory"
-
-#ifndef Cubit_FactoryPtr
-#define Cubit_FactoryPtr
-
-typedef Cubit_Factory* Cubit_Factory_ptr;
-
-typedef Cubit_Factory* Cubit_FactoryRef;
-
-#endif
-
-class Cubit_Factory: public virtual CORBA::Object  {
-public:
-        Cubit_Factory (char *IT_OR);
-    Cubit_Factory (ObjectReference *IT_OR);
-    Cubit_Factory () : CORBA::Object  (1) {}
-protected:
-    Cubit_Factory_ptr __duplicate(
-            CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) {
-       CORBA::Object::__duplicate (IT_env);
-       return this;
-    }
-public:
-    static Cubit_Factory_ptr _duplicate(
-            Cubit_Factory_ptr, 
-            CORBA::Environment &IT_pEnv=CORBA::IT_chooseDefaultEnv ());
-public:
-   static Cubit_Factory* _bind (const char* IT_markerServer, const char* host,
-		const CORBA::Context &IT_c, 
-		CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-   static Cubit_Factory* _bind (CORBA::Environment &IT_env);
-   static Cubit_Factory* _bind (const char* IT_markerServer=NULL, const char* host=NULL,
-                 CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-    static Cubit_Factory* _narrow (CORBA::Object* , CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-    static Cubit_Factory_ptr _nil (CORBA::Environment &IT_pEnv=CORBA::IT_chooseDefaultEnv ()) {
-        CORBA::EnvExcRaiser IT_raise;
-        CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-        return (Cubit_Factory_ptr) CORBA::OBJECT_NIL;}
-        virtual Cubit_ptr create_cubit (const char * name, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-};
-
-#ifndef Cubit_FactoryVarH
-#define Cubit_FactoryVarH
-
-#ifndef Cubit_FactoryvPtr
-#define Cubit_FactoryvPtr
-typedef Cubit_Factory* Cubit_Factory_vPtr;
-typedef const Cubit_Factory* Cubit_Factory_cvPtr;
-#endif
-
-class Cubit_Factory_var : public CORBA::_var
-{
-    private:
-
-    unsigned char copyHelper (const Cubit_Factory_var &IT_s) {
-        {
-            _ptr = Cubit_Factory_duplicate (IT_s._ptr);
-        }
-        return 1;
-    }
-
-    public:
-
-    Cubit_Factory_var (const Cubit_Factory_var &IT_s) {
-        (void) copyHelper (IT_s);
-    }
-
-    Cubit_Factory_var () {
-        _ptr = Cubit_Factory_nil ();
-    }
-
-    Cubit_Factory_var (Cubit_Factory *IT_p) {
-        _ptr = IT_p;
-    }
-
-    Cubit_Factory_var &operator= (Cubit_Factory *IT_p) {
-        Cubit_Factory_release (_ptr);
-        _ptr = IT_p;
-        return (*this);
-    }
-
-    Cubit_Factory_var &operator= (const Cubit_Factory_var &IT_s) {
-        Cubit_Factory_release (_ptr);
-        _ptr = Cubit_Factory_duplicate (IT_s._ptr);
-        return (*this);
-    }
-
-    ~Cubit_Factory_var () {
-        Cubit_Factory_release (_ptr);
-    }
-
-    Cubit_Factory* operator-> () {
-        return _ptr;
-    }
-
-    operator Cubit_Factory_cvPtr () const { return _ptr;}
-    operator Cubit_Factory_vPtr& () { return _ptr;}
-
-    protected:
-    Cubit_Factory *_ptr;
-    private:
-    Cubit_Factory_var &operator= (const CORBA::_var &IT_s);
-    Cubit_Factory_var (const CORBA::_var &IT_s);
-    Cubit_Factory_var &operator= (const CORBA::_mgr &IT_s);
-    Cubit_Factory_var &operator= (const CORBA::_SeqElem &IT_s);
-    Cubit_Factory_var (const CORBA::_mgr &IT_s);
-    Cubit_Factory_var (const CORBA::_SeqElem &IT_s);
-};
-
-#endif
-
-
-#ifndef Cubit_FactoryMgrH
-#define Cubit_FactoryMgrH
-
-class Cubit_Factory_mgr : public CORBA::_mgr
-{
-    public:
-
-    Cubit_Factory_mgr () {
-        _ptr = Cubit_Factory_nil ();
-        _release = 1;
-    }
-
-    Cubit_Factory_mgr (const Cubit_Factory_mgr &IT_s) {
-        _ptr = Cubit_Factory_duplicate (IT_s._ptr);
-        _release = 1;
-    }
-
-    Cubit_Factory_mgr &operator= (Cubit_Factory *IT_p) {
-        if (_ptr && _release)
-            Cubit_Factory_release (_ptr);
-        _ptr = IT_p;
-        _release = 1;
-        return (*this);
-    }
-
-    Cubit_Factory_mgr &operator= (const Cubit_Factory_mgr &IT_s) {
-        if (_ptr && _release)
-            Cubit_Factory_release (_ptr);
-        _ptr = Cubit_Factory_duplicate(IT_s._ptr);
-        _release = 1;
-        return (*this);
-    }
-
-    Cubit_Factory_mgr &operator= (Cubit_Factory_var &IT_s) {
-        if (_ptr && _release)
-            Cubit_Factory_release (_ptr);
-        _ptr = Cubit_Factory_duplicate(IT_s);
-        _release = 1;
-        return (*this);
-    }
-
-    ~Cubit_Factory_mgr () {
-        if (_release)
-            Cubit_Factory_release (_ptr);
-    }
-
-    unsigned char release () {
-        return _release;
-    }
-
-    void release (unsigned char rel) {
-        _release = rel;
-    }
-
-    operator int () const {
-        return (((CORBA::Object_ptr) _ptr) ? 1 : 0);
-    }
-
-    operator void* () const {
-        return _ptr;
-    }
-
-    operator CORBA::Object * () const {
-        return (CORBA::Object *) _ptr;
-    }
-
-    operator Cubit_Factory* () const {
-        return (Cubit_Factory*) _ptr;
-    }
-
-    Cubit_Factory_ptr operator-> () const {
-        return _ptr;
-    }
-
-    Cubit_Factory *_ptr;
-
-    protected:
-
-    unsigned char _release;
-};
-
-typedef Cubit_Factory_mgr Cubit_Factory_mgr_IT_const;
-#endif
-
-#ifndef Cubit_FactorySeqElemH
-#define Cubit_FactorySeqElemH
-
-class Cubit_Factory_SeqElem : public CORBA::_SeqElem
-{
-    public:
-
-    Cubit_Factory_SeqElem (Cubit_Factory_ptr* IT_p, unsigned char rel) {
-        _ptr = IT_p;
-        _release = rel;
-    }
-
-    Cubit_Factory_SeqElem &operator= (Cubit_Factory_ptr IT_p) {
-        if (_ptr) {
-            if (*(_ptr) && _release)
-                Cubit_Factory_release (*(_ptr));
-            *(_ptr) = IT_p;
-        }
-        return (*this);
-    }
-
-    Cubit_Factory_SeqElem &operator= (const Cubit_Factory_SeqElem &IT_s) {
-        if (_ptr && IT_s._ptr) {
-            if (*(_ptr) && _release)
-                Cubit_Factory_release (*(_ptr));
-            *(_ptr) = Cubit_Factory_duplicate(*(IT_s._ptr));
-        }
-        return (*this);
-    }
-
-    operator Cubit_Factory_ptr () const {
-        return _ptr ? (Cubit_Factory_ptr) (*_ptr) : Cubit_Factory_nil(); 
-    }
-
-    Cubit_Factory_ptr operator->() const { return *_ptr;}
-
-    protected:
-    Cubit_Factory_ptr *_ptr;
-    unsigned char _release;
-};
-
-#endif
-
-
-#define TIE_Cubit_Factory(X) Cubit_Factory##X
-
-#define DEF_TIE_Cubit_Factory(X) \
-	class Cubit_Factory##X : public virtual Cubit_Factory {		\
-	  X* m_obj;						\
-	public:							\
-								\
-								\
-	   Cubit_Factory##X  (X *objp, const char* m="", CORBA::LoaderClass *l=0)\
-		: Cubit_Factory(), m_obj(objp) {	\
-		m_pptr = new Cubit_Factory_dispatch		\
-			(( Cubit_Factory*)this,(CORBA::Object*)this,m,l,Cubit_Factory_IR,m_obj);	\
-	   }								\
-	   Cubit_Factory##X  (CORBA::Object *IT_p, const char* IT_m="", void *IT_q=0)\
-		: Cubit_Factory() {	\
-		m_pptr = new Cubit_Factory_dispatch		\
-			(( Cubit_Factory*)this,(CORBA::Object*)this,IT_m,Cubit_Factory_IR,IT_p,IT_q);	\
-		m_obj = (X*)(m_pptr->getImplObj ());			\
-	   }								\
-								\
-	   virtual ~Cubit_Factory##X  () {				\
-		if (_okToDeleteImpl ()) delete m_obj; }					\
-	   virtual void* _deref () {					\
-		return m_obj; }					\
-								\
-virtual Cubit_ptr create_cubit (const char * name, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->create_cubit (  name,IT_env);\
-}\
-								\
-	};						\
-
-
-#define QUALS_Cubit_Factory	\
-virtual Cubit_ptr create_cubit (const char * name, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->create_cubit (  name,IT_env);\
-}\
-
-
-
-
-class Cubit_FactoryProxyFactoryClass : public virtual CORBA::ObjectFactoryClass {
-public:
-   Cubit_FactoryProxyFactoryClass (unsigned char IT_p=0)
-		: CORBA::ProxyFactory (Cubit_Factory_IR, IT_p) {}
-
-    virtual void* New (char *IT_OR, CORBA::Environment&);
-
-    virtual void* New (ObjectReference *IT_OR, CORBA::Environment&);
-
-    virtual void* New2 (); 
-
-    virtual CORBA::Object* NewObject (char *IT_OR, CORBA::Environment&);
-
-    virtual CORBA::Object* NewObject (ObjectReference *IT_OR, CORBA::Environment&);
-
-    virtual CORBA::Object* New2Object (); 
-
-    virtual void* IT_castUp (void *IT_p, char* IT_s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-
-    virtual CORBA::PPTR* pptr (void *IT_p);
-
-    virtual void baseInterfaces (_IDL_SEQUENCE_string&);
-
-
-};
-
-extern Cubit_FactoryProxyFactoryClass Cubit_FactoryProxyFactory;
-
-class Cubit_FactoryBOAImpl : public virtual Cubit_Factory  {
-public:
-    Cubit_FactoryBOAImpl (const char *m="", CORBA::LoaderClass *l=NULL) {
-  if (CORBA::PPTR::isOK (m_pptr, Cubit_Factory_IR))
-    m_pptr = new Cubit_Factory_dispatch ( (Cubit_Factory*)this,
-   	 (CORBA::Object*)this, m, l, Cubit_Factory_IR, this);
-}
-
-        virtual Cubit_ptr create_cubit (const char * name, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-};
-
-
-#endif
-
-
-#endif
diff --git a/TAO/IIOP/tests/Cubit/Orbix/factory_client/cubit.hh b/TAO/IIOP/tests/Cubit/Orbix/factory_client/cubit.hh
deleted file mode 100644
index 72e2fb81395..00000000000
--- a/TAO/IIOP/tests/Cubit/Orbix/factory_client/cubit.hh
+++ /dev/null
@@ -1,1111 +0,0 @@
-
-#ifndef cubit_hh
-#define cubit_hh
-
-#include <CORBA.h>
-
-#include <string.h>
-
-
-#ifndef _Cubit_defined
-#define _Cubit_defined
-class Cubit_dispatch : public virtual CORBA::PPTR {
-public:
-
-      Cubit_dispatch (void *IT_p, CORBA::Object* IT_o, const char *IT_m, 
-        CORBA::LoaderClass *IT_l, char *IT_i, void* IT_im)
-       : PPTR (IT_p,IT_o,IT_m,IT_l,IT_i,IT_im) {}
-
-
-   Cubit_dispatch (char *IT_OR, void *IT_p, CORBA::Object *IT_o)
-       : PPTR (IT_OR,IT_p,IT_o) {}
-
-
-   Cubit_dispatch () {}
-
-   Cubit_dispatch (ObjectReference *IT_OR, void *IT_p, CORBA::Object *IT_o)
-       : PPTR (IT_OR,IT_p,IT_o) {}
-
-
-   Cubit_dispatch (void *IT_p, CORBA::Object *IT_o, const char *IT_m, 
-        char *IT_i, CORBA::Object* IT_ob, void* IT_im)
-       : PPTR (IT_p,IT_o,IT_m,IT_i,IT_ob,IT_im) {}
-
-
-   virtual unsigned char dispatch (CORBA::Request &IT_r, 
-        unsigned char IT_isTarget, void* IT_pp=NULL);
-
-
-};
-
-class Cubit;
-
-#ifndef CubitPtr
-#define CubitPtr
-
-typedef Cubit* Cubit_ptr;
-
-typedef Cubit* CubitRef;
-
-#endif
-
-
-#ifndef CubitForwH
-#define CubitForwH
-CORBA::ObjectRef Cubit_getBase (void *);
-void Cubit_release (Cubit *, CORBA::Environment &IT_env);
-void Cubit_release (Cubit_ptr);
-Cubit* Cubit_duplicate (Cubit_ptr, CORBA::Environment &IT_env);
-Cubit* Cubit_duplicate (Cubit_ptr );
-Cubit_ptr Cubit_nil (CORBA::Environment &IT_env);
-Cubit_ptr Cubit_nil ();
-#endif
-#define Cubit_IMPL "Cubit"
-
-
-class Cubit;
-
-typedef Cubit CubitProxy;
-#define Cubit_IR "Cubit$v1.1"
-#define Cubit_IMPL "Cubit"
-
-#ifndef CubitPtr
-#define CubitPtr
-
-typedef Cubit* Cubit_ptr;
-
-typedef Cubit* CubitRef;
-
-#endif
-
-class Cubit: public virtual CORBA::Object  {
-public:
-        Cubit (char *IT_OR);
-    Cubit (ObjectReference *IT_OR);
-    Cubit () : CORBA::Object  (1) {}
-protected:
-    Cubit_ptr __duplicate(
-            CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) {
-       CORBA::Object::__duplicate (IT_env);
-       return this;
-    }
-public:
-    static Cubit_ptr _duplicate(
-            Cubit_ptr, 
-            CORBA::Environment &IT_pEnv=CORBA::IT_chooseDefaultEnv ());
-public:
-   static Cubit* _bind (const char* IT_markerServer, const char* host,
-		const CORBA::Context &IT_c, 
-		CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-   static Cubit* _bind (CORBA::Environment &IT_env);
-   static Cubit* _bind (const char* IT_markerServer=NULL, const char* host=NULL,
-                 CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-    static Cubit* _narrow (CORBA::Object* , CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-    static Cubit_ptr _nil (CORBA::Environment &IT_pEnv=CORBA::IT_chooseDefaultEnv ()) {
-        CORBA::EnvExcRaiser IT_raise;
-        CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-        return (Cubit_ptr) CORBA::OBJECT_NIL;}
-
-#ifndef Cubit_Many_defined
-#define Cubit_Many_defined
-
-struct Many {
-    CORBA::Octet o;
-    CORBA::Long l;
-    CORBA::Short s;
-
-    void encodeOp (CORBA::Request &IT_r) const;
-    void decodeOp (CORBA::Request &IT_r);
-    void decodeInOutOp (CORBA::Request &IT_r);
-    Many(const Many &);
-    Many();
-    ~Many();
-    Many& operator= (const Many&);
-};
-
-#ifndef Cubit_ManyVarH
-#define Cubit_ManyVarH
-
-#ifndef Cubit_ManyvPtr
-#define Cubit_ManyvPtr
-typedef Many* Many_vPtr;
-typedef const Many* Many_cvPtr;
-#endif
-
-class Many_var : public CORBA::_var
-{
-    private:
-
-    unsigned char copyHelper (const Many_var &IT_s) {
-        if (!IT_s._ptr) {
-            _ptr = IT_s._ptr;
-        } else
-        {
-            _ptr = new Many;
-            *(_ptr) =  *(IT_s._ptr);
-        }
-        return 1;
-    }
-
-    public:
-
-    Many_var (const Many_var &IT_s) {
-        (void) copyHelper (IT_s);
-    }
-
-    Many_var () {
-        _ptr =  new Many;
-;
-    }
-
-    Many_var (Many *IT_p) {
-        _ptr = IT_p;
-    }
-
-    Many_var &operator= (Many *IT_p) {
-        if (_ptr != IT_p) {
-            delete _ptr;
-        }
-        _ptr = IT_p;
-        return (*this);
-    }
-
-    Many_var &operator= (const Many_var &IT_s) {
-        if (_ptr != IT_s._ptr) {
-            delete _ptr;
-        }
-        _ptr = new Many;
-        *(_ptr) =  *(IT_s._ptr);
-        return (*this);
-    }
-
-    ~Many_var () {
-        delete _ptr;
-    }
-
-    Many* operator-> () {
-        return _ptr;
-    }
-
-    operator Many_cvPtr () const { return _ptr;}
-    operator Many_vPtr& () { return _ptr;}
-    operator Many& () const { return * _ptr;}
-
-    protected:
-    Many *_ptr;
-    private:
-    Many_var &operator= (const CORBA::_var &IT_s);
-    Many_var (const CORBA::_var &IT_s);
-};
-
-#endif
-
-
-#endif
-
-enum discrim {e_0th,e_1st,e_2nd,e_3rd,e_4th,e_5th, IT__ENUM_Cubit_discrim=CORBA_ULONG_MAX};
-
-#ifndef Cubit_oneof_defined
-#define Cubit_oneof_defined
-
-struct oneof {
-    private:
-
-    discrim __d;
-    union {
-        CORBA::Octet _o_;
-        CORBA::Short _s_;
-        CORBA::Long _l_;
-        Many * _cm_;
-    };
-
-    public:
-
-    void encodeOp (CORBA::Request &IT_r) const;
-    void decodeOp (CORBA::Request &IT_r);
-    void decodeInOutOp (CORBA::Request &IT_r);
-
-    private:
-
-    unsigned char isSet;
-
-    public:
-
-    discrim _d () const { return __d; }
-
-    CORBA::Octet o () const {
-        return _o_;
-    }
-
-    void o (CORBA::Octet IT_member) {
-        if (isSet && (__d != Cubit::e_0th))
-        {
-            this-> oneof::~oneof();
-            memset(this, 0, sizeof(*this));
-        }
-
-        __d = Cubit::e_0th;
-        isSet = 1;
-        _o_ = IT_member;
-    }
-
-    CORBA::Short s () const {
-        return _s_;
-    }
-
-    void s (CORBA::Short IT_member) {
-        if (isSet && (__d != Cubit::e_1st))
-        {
-            this-> oneof::~oneof();
-            memset(this, 0, sizeof(*this));
-        }
-
-        __d = Cubit::e_1st;
-        isSet = 1;
-        _s_ = IT_member;
-    }
-
-    CORBA::Long l () const {
-        return _l_;
-    }
-
-    void l (CORBA::Long IT_member) {
-        if (isSet && (__d != Cubit::e_2nd))
-        {
-            this-> oneof::~oneof();
-            memset(this, 0, sizeof(*this));
-        }
-
-        __d = Cubit::e_2nd;
-        isSet = 1;
-        _l_ = IT_member;
-    }
-
-    Many& cm () {
-        return (*_cm_);
-    }
-
-    const Many& cm () const {
-        return (*_cm_);
-    }
-
-    void cm (const Many& IT_member) {
-        if (isSet && (__d != Cubit::e_3rd))
-        {
-            this-> oneof::~oneof();
-            memset(this, 0, sizeof(*this));
-        }
-
-        __d = Cubit::e_3rd;
-
-        if (!isSet) {
-            _cm_ = new Many;
-            isSet = 1;
-        }
-        *(_cm_) = IT_member;
-    }
-
-
-    oneof();
-    oneof(const oneof &);
-    ~oneof();
-    oneof& operator= (const oneof&);
-};
-
-#ifndef Cubit_oneofVarH
-#define Cubit_oneofVarH
-
-#ifndef Cubit_oneofvPtr
-#define Cubit_oneofvPtr
-typedef oneof* oneof_vPtr;
-typedef const oneof* oneof_cvPtr;
-#endif
-
-class oneof_var : public CORBA::_var
-{
-    private:
-
-    unsigned char copyHelper (const oneof_var &IT_s) {
-        if (!IT_s._ptr) {
-            _ptr = IT_s._ptr;
-        } else
-        {
-            _ptr = new oneof;
-            *(_ptr) =  *(IT_s._ptr);
-        }
-        return 1;
-    }
-
-    public:
-
-    oneof_var (const oneof_var &IT_s) {
-        (void) copyHelper (IT_s);
-    }
-
-    oneof_var () {
-        _ptr = NULL;
-    }
-
-    oneof_var (oneof *IT_p) {
-        _ptr = IT_p;
-    }
-
-    oneof_var &operator= (oneof *IT_p) {
-        if (_ptr != IT_p) {
-            delete _ptr;
-        }
-        _ptr = IT_p;
-        return (*this);
-    }
-
-    oneof_var &operator= (const oneof_var &IT_s) {
-        if (_ptr != IT_s._ptr) {
-            delete _ptr;
-        }
-        _ptr = new oneof;
-        *(_ptr) =  *(IT_s._ptr);
-        return (*this);
-    }
-
-    ~oneof_var () {
-        delete _ptr;
-    }
-
-    oneof* operator-> () {
-        return _ptr;
-    }
-
-    operator oneof_cvPtr () const { return _ptr;}
-    operator oneof_vPtr& () { return _ptr;}
-    operator oneof& () const { return * _ptr;}
-
-    protected:
-    oneof *_ptr;
-    private:
-    oneof_var &operator= (const CORBA::_var &IT_s);
-    oneof_var (const CORBA::_var &IT_s);
-};
-
-#endif
-
-
-#endif
-        virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual Many cube_struct (const Many& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual oneof cube_union (const oneof& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual void please_exit (CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-};
-
-#ifndef CubitVarH
-#define CubitVarH
-
-#ifndef CubitvPtr
-#define CubitvPtr
-typedef Cubit* Cubit_vPtr;
-typedef const Cubit* Cubit_cvPtr;
-#endif
-
-class Cubit_var : public CORBA::_var
-{
-    private:
-
-    unsigned char copyHelper (const Cubit_var &IT_s) {
-        {
-            _ptr = Cubit_duplicate (IT_s._ptr);
-        }
-        return 1;
-    }
-
-    public:
-
-    Cubit_var (const Cubit_var &IT_s) {
-        (void) copyHelper (IT_s);
-    }
-
-    Cubit_var () {
-        _ptr = Cubit_nil ();
-    }
-
-    Cubit_var (Cubit *IT_p) {
-        _ptr = IT_p;
-    }
-
-    Cubit_var &operator= (Cubit *IT_p) {
-        Cubit_release (_ptr);
-        _ptr = IT_p;
-        return (*this);
-    }
-
-    Cubit_var &operator= (const Cubit_var &IT_s) {
-        Cubit_release (_ptr);
-        _ptr = Cubit_duplicate (IT_s._ptr);
-        return (*this);
-    }
-
-    ~Cubit_var () {
-        Cubit_release (_ptr);
-    }
-
-    Cubit* operator-> () {
-        return _ptr;
-    }
-
-    operator Cubit_cvPtr () const { return _ptr;}
-    operator Cubit_vPtr& () { return _ptr;}
-
-    protected:
-    Cubit *_ptr;
-    private:
-    Cubit_var &operator= (const CORBA::_var &IT_s);
-    Cubit_var (const CORBA::_var &IT_s);
-    Cubit_var &operator= (const CORBA::_mgr &IT_s);
-    Cubit_var &operator= (const CORBA::_SeqElem &IT_s);
-    Cubit_var (const CORBA::_mgr &IT_s);
-    Cubit_var (const CORBA::_SeqElem &IT_s);
-};
-
-#endif
-
-
-#ifndef CubitMgrH
-#define CubitMgrH
-
-class Cubit_mgr : public CORBA::_mgr
-{
-    public:
-
-    Cubit_mgr () {
-        _ptr = Cubit_nil ();
-        _release = 1;
-    }
-
-    Cubit_mgr (const Cubit_mgr &IT_s) {
-        _ptr = Cubit_duplicate (IT_s._ptr);
-        _release = 1;
-    }
-
-    Cubit_mgr &operator= (Cubit *IT_p) {
-        if (_ptr && _release)
-            Cubit_release (_ptr);
-        _ptr = IT_p;
-        _release = 1;
-        return (*this);
-    }
-
-    Cubit_mgr &operator= (const Cubit_mgr &IT_s) {
-        if (_ptr && _release)
-            Cubit_release (_ptr);
-        _ptr = Cubit_duplicate(IT_s._ptr);
-        _release = 1;
-        return (*this);
-    }
-
-    Cubit_mgr &operator= (Cubit_var &IT_s) {
-        if (_ptr && _release)
-            Cubit_release (_ptr);
-        _ptr = Cubit_duplicate(IT_s);
-        _release = 1;
-        return (*this);
-    }
-
-    ~Cubit_mgr () {
-        if (_release)
-            Cubit_release (_ptr);
-    }
-
-    unsigned char release () {
-        return _release;
-    }
-
-    void release (unsigned char rel) {
-        _release = rel;
-    }
-
-    operator int () const {
-        return (((CORBA::Object_ptr) _ptr) ? 1 : 0);
-    }
-
-    operator void* () const {
-        return _ptr;
-    }
-
-    operator CORBA::Object * () const {
-        return (CORBA::Object *) _ptr;
-    }
-
-    operator Cubit* () const {
-        return (Cubit*) _ptr;
-    }
-
-    Cubit_ptr operator-> () const {
-        return _ptr;
-    }
-
-    Cubit *_ptr;
-
-    protected:
-
-    unsigned char _release;
-};
-
-typedef Cubit_mgr Cubit_mgr_IT_const;
-#endif
-
-#ifndef CubitSeqElemH
-#define CubitSeqElemH
-
-class Cubit_SeqElem : public CORBA::_SeqElem
-{
-    public:
-
-    Cubit_SeqElem (Cubit_ptr* IT_p, unsigned char rel) {
-        _ptr = IT_p;
-        _release = rel;
-    }
-
-    Cubit_SeqElem &operator= (Cubit_ptr IT_p) {
-        if (_ptr) {
-            if (*(_ptr) && _release)
-                Cubit_release (*(_ptr));
-            *(_ptr) = IT_p;
-        }
-        return (*this);
-    }
-
-    Cubit_SeqElem &operator= (const Cubit_SeqElem &IT_s) {
-        if (_ptr && IT_s._ptr) {
-            if (*(_ptr) && _release)
-                Cubit_release (*(_ptr));
-            *(_ptr) = Cubit_duplicate(*(IT_s._ptr));
-        }
-        return (*this);
-    }
-
-    operator Cubit_ptr () const {
-        return _ptr ? (Cubit_ptr) (*_ptr) : Cubit_nil(); 
-    }
-
-    Cubit_ptr operator->() const { return *_ptr;}
-
-    protected:
-    Cubit_ptr *_ptr;
-    unsigned char _release;
-};
-
-#endif
-
-
-#define TIE_Cubit(X) Cubit##X
-
-#define DEF_TIE_Cubit(X) \
-	class Cubit##X : public virtual Cubit {		\
-	  X* m_obj;						\
-	public:							\
-								\
-								\
-	   Cubit##X  (X *objp, const char* m="", CORBA::LoaderClass *l=0)\
-		: Cubit(), m_obj(objp) {	\
-		m_pptr = new Cubit_dispatch		\
-			(( Cubit*)this,(CORBA::Object*)this,m,l,Cubit_IR,m_obj);	\
-	   }								\
-	   Cubit##X  (CORBA::Object *IT_p, const char* IT_m="", void *IT_q=0)\
-		: Cubit() {	\
-		m_pptr = new Cubit_dispatch		\
-			(( Cubit*)this,(CORBA::Object*)this,IT_m,Cubit_IR,IT_p,IT_q);	\
-		m_obj = (X*)(m_pptr->getImplObj ());			\
-	   }								\
-								\
-	   virtual ~Cubit##X  () {				\
-		if (_okToDeleteImpl ()) delete m_obj; }					\
-	   virtual void* _deref () {					\
-		return m_obj; }					\
-								\
-virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_octet (  o,IT_env);\
-}\
-	\
-virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_short (  s,IT_env);\
-}\
-	\
-virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_long (  l,IT_env);\
-}\
-	\
-virtual Cubit::Many cube_struct (const Cubit::Many& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_struct (  values,IT_env);\
-}\
-	\
-virtual Cubit::oneof cube_union (const Cubit::oneof& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_union (  values,IT_env);\
-}\
-	\
-virtual void please_exit (CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-m_obj->please_exit (IT_env);\
-}\
-								\
-	};						\
-
-
-#define QUALS_Cubit	\
-virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_octet (  o,IT_env);\
-}\
-	\
-virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_short (  s,IT_env);\
-}\
-	\
-virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_long (  l,IT_env);\
-}\
-	\
-virtual Many cube_struct (const Many& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_struct (  values,IT_env);\
-}\
-	\
-virtual oneof cube_union (const oneof& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_union (  values,IT_env);\
-}\
-	\
-virtual void please_exit (CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-m_obj->please_exit (IT_env);\
-}\
-
-
-
-
-class CubitProxyFactoryClass : public virtual CORBA::ObjectFactoryClass {
-public:
-   CubitProxyFactoryClass (unsigned char IT_p=0)
-		: CORBA::ProxyFactory (Cubit_IR, IT_p) {}
-
-    virtual void* New (char *IT_OR, CORBA::Environment&);
-
-    virtual void* New (ObjectReference *IT_OR, CORBA::Environment&);
-
-    virtual void* New2 (); 
-
-    virtual CORBA::Object* NewObject (char *IT_OR, CORBA::Environment&);
-
-    virtual CORBA::Object* NewObject (ObjectReference *IT_OR, CORBA::Environment&);
-
-    virtual CORBA::Object* New2Object (); 
-
-    virtual void* IT_castUp (void *IT_p, char* IT_s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-
-    virtual CORBA::PPTR* pptr (void *IT_p);
-
-    virtual void baseInterfaces (_IDL_SEQUENCE_string&);
-
-
-};
-
-extern CubitProxyFactoryClass CubitProxyFactory;
-
-class CubitBOAImpl : public virtual Cubit  {
-public:
-    CubitBOAImpl (const char *m="", CORBA::LoaderClass *l=NULL) {
-  if (CORBA::PPTR::isOK (m_pptr, Cubit_IR))
-    m_pptr = new Cubit_dispatch ( (Cubit*)this,
-   	 (CORBA::Object*)this, m, l, Cubit_IR, this);
-}
-
-        virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual Many cube_struct (const Many& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual oneof cube_union (const oneof& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual void please_exit (CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-};
-
-
-#endif
-
-
-#ifndef _Cubit_Factory_defined
-#define _Cubit_Factory_defined
-class Cubit_Factory_dispatch : public virtual CORBA::PPTR {
-public:
-
-      Cubit_Factory_dispatch (void *IT_p, CORBA::Object* IT_o, const char *IT_m, 
-        CORBA::LoaderClass *IT_l, char *IT_i, void* IT_im)
-       : PPTR (IT_p,IT_o,IT_m,IT_l,IT_i,IT_im) {}
-
-
-   Cubit_Factory_dispatch (char *IT_OR, void *IT_p, CORBA::Object *IT_o)
-       : PPTR (IT_OR,IT_p,IT_o) {}
-
-
-   Cubit_Factory_dispatch () {}
-
-   Cubit_Factory_dispatch (ObjectReference *IT_OR, void *IT_p, CORBA::Object *IT_o)
-       : PPTR (IT_OR,IT_p,IT_o) {}
-
-
-   Cubit_Factory_dispatch (void *IT_p, CORBA::Object *IT_o, const char *IT_m, 
-        char *IT_i, CORBA::Object* IT_ob, void* IT_im)
-       : PPTR (IT_p,IT_o,IT_m,IT_i,IT_ob,IT_im) {}
-
-
-   virtual unsigned char dispatch (CORBA::Request &IT_r, 
-        unsigned char IT_isTarget, void* IT_pp=NULL);
-
-
-};
-
-class Cubit_Factory;
-
-#ifndef Cubit_FactoryPtr
-#define Cubit_FactoryPtr
-
-typedef Cubit_Factory* Cubit_Factory_ptr;
-
-typedef Cubit_Factory* Cubit_FactoryRef;
-
-#endif
-
-
-#ifndef Cubit_FactoryForwH
-#define Cubit_FactoryForwH
-CORBA::ObjectRef Cubit_Factory_getBase (void *);
-void Cubit_Factory_release (Cubit_Factory *, CORBA::Environment &IT_env);
-void Cubit_Factory_release (Cubit_Factory_ptr);
-Cubit_Factory* Cubit_Factory_duplicate (Cubit_Factory_ptr, CORBA::Environment &IT_env);
-Cubit_Factory* Cubit_Factory_duplicate (Cubit_Factory_ptr );
-Cubit_Factory_ptr Cubit_Factory_nil (CORBA::Environment &IT_env);
-Cubit_Factory_ptr Cubit_Factory_nil ();
-#endif
-#define Cubit_Factory_IMPL "Cubit_Factory"
-
-
-class Cubit_Factory;
-
-typedef Cubit_Factory Cubit_FactoryProxy;
-#define Cubit_Factory_IR "Cubit_Factory"
-#define Cubit_Factory_IMPL "Cubit_Factory"
-
-#ifndef Cubit_FactoryPtr
-#define Cubit_FactoryPtr
-
-typedef Cubit_Factory* Cubit_Factory_ptr;
-
-typedef Cubit_Factory* Cubit_FactoryRef;
-
-#endif
-
-class Cubit_Factory: public virtual CORBA::Object  {
-public:
-        Cubit_Factory (char *IT_OR);
-    Cubit_Factory (ObjectReference *IT_OR);
-    Cubit_Factory () : CORBA::Object  (1) {}
-protected:
-    Cubit_Factory_ptr __duplicate(
-            CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) {
-       CORBA::Object::__duplicate (IT_env);
-       return this;
-    }
-public:
-    static Cubit_Factory_ptr _duplicate(
-            Cubit_Factory_ptr, 
-            CORBA::Environment &IT_pEnv=CORBA::IT_chooseDefaultEnv ());
-public:
-   static Cubit_Factory* _bind (const char* IT_markerServer, const char* host,
-		const CORBA::Context &IT_c, 
-		CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-   static Cubit_Factory* _bind (CORBA::Environment &IT_env);
-   static Cubit_Factory* _bind (const char* IT_markerServer=NULL, const char* host=NULL,
-                 CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-    static Cubit_Factory* _narrow (CORBA::Object* , CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-    static Cubit_Factory_ptr _nil (CORBA::Environment &IT_pEnv=CORBA::IT_chooseDefaultEnv ()) {
-        CORBA::EnvExcRaiser IT_raise;
-        CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-        return (Cubit_Factory_ptr) CORBA::OBJECT_NIL;}
-        virtual Cubit_ptr create_cubit (const char * name, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-};
-
-#ifndef Cubit_FactoryVarH
-#define Cubit_FactoryVarH
-
-#ifndef Cubit_FactoryvPtr
-#define Cubit_FactoryvPtr
-typedef Cubit_Factory* Cubit_Factory_vPtr;
-typedef const Cubit_Factory* Cubit_Factory_cvPtr;
-#endif
-
-class Cubit_Factory_var : public CORBA::_var
-{
-    private:
-
-    unsigned char copyHelper (const Cubit_Factory_var &IT_s) {
-        {
-            _ptr = Cubit_Factory_duplicate (IT_s._ptr);
-        }
-        return 1;
-    }
-
-    public:
-
-    Cubit_Factory_var (const Cubit_Factory_var &IT_s) {
-        (void) copyHelper (IT_s);
-    }
-
-    Cubit_Factory_var () {
-        _ptr = Cubit_Factory_nil ();
-    }
-
-    Cubit_Factory_var (Cubit_Factory *IT_p) {
-        _ptr = IT_p;
-    }
-
-    Cubit_Factory_var &operator= (Cubit_Factory *IT_p) {
-        Cubit_Factory_release (_ptr);
-        _ptr = IT_p;
-        return (*this);
-    }
-
-    Cubit_Factory_var &operator= (const Cubit_Factory_var &IT_s) {
-        Cubit_Factory_release (_ptr);
-        _ptr = Cubit_Factory_duplicate (IT_s._ptr);
-        return (*this);
-    }
-
-    ~Cubit_Factory_var () {
-        Cubit_Factory_release (_ptr);
-    }
-
-    Cubit_Factory* operator-> () {
-        return _ptr;
-    }
-
-    operator Cubit_Factory_cvPtr () const { return _ptr;}
-    operator Cubit_Factory_vPtr& () { return _ptr;}
-
-    protected:
-    Cubit_Factory *_ptr;
-    private:
-    Cubit_Factory_var &operator= (const CORBA::_var &IT_s);
-    Cubit_Factory_var (const CORBA::_var &IT_s);
-    Cubit_Factory_var &operator= (const CORBA::_mgr &IT_s);
-    Cubit_Factory_var &operator= (const CORBA::_SeqElem &IT_s);
-    Cubit_Factory_var (const CORBA::_mgr &IT_s);
-    Cubit_Factory_var (const CORBA::_SeqElem &IT_s);
-};
-
-#endif
-
-
-#ifndef Cubit_FactoryMgrH
-#define Cubit_FactoryMgrH
-
-class Cubit_Factory_mgr : public CORBA::_mgr
-{
-    public:
-
-    Cubit_Factory_mgr () {
-        _ptr = Cubit_Factory_nil ();
-        _release = 1;
-    }
-
-    Cubit_Factory_mgr (const Cubit_Factory_mgr &IT_s) {
-        _ptr = Cubit_Factory_duplicate (IT_s._ptr);
-        _release = 1;
-    }
-
-    Cubit_Factory_mgr &operator= (Cubit_Factory *IT_p) {
-        if (_ptr && _release)
-            Cubit_Factory_release (_ptr);
-        _ptr = IT_p;
-        _release = 1;
-        return (*this);
-    }
-
-    Cubit_Factory_mgr &operator= (const Cubit_Factory_mgr &IT_s) {
-        if (_ptr && _release)
-            Cubit_Factory_release (_ptr);
-        _ptr = Cubit_Factory_duplicate(IT_s._ptr);
-        _release = 1;
-        return (*this);
-    }
-
-    Cubit_Factory_mgr &operator= (Cubit_Factory_var &IT_s) {
-        if (_ptr && _release)
-            Cubit_Factory_release (_ptr);
-        _ptr = Cubit_Factory_duplicate(IT_s);
-        _release = 1;
-        return (*this);
-    }
-
-    ~Cubit_Factory_mgr () {
-        if (_release)
-            Cubit_Factory_release (_ptr);
-    }
-
-    unsigned char release () {
-        return _release;
-    }
-
-    void release (unsigned char rel) {
-        _release = rel;
-    }
-
-    operator int () const {
-        return (((CORBA::Object_ptr) _ptr) ? 1 : 0);
-    }
-
-    operator void* () const {
-        return _ptr;
-    }
-
-    operator CORBA::Object * () const {
-        return (CORBA::Object *) _ptr;
-    }
-
-    operator Cubit_Factory* () const {
-        return (Cubit_Factory*) _ptr;
-    }
-
-    Cubit_Factory_ptr operator-> () const {
-        return _ptr;
-    }
-
-    Cubit_Factory *_ptr;
-
-    protected:
-
-    unsigned char _release;
-};
-
-typedef Cubit_Factory_mgr Cubit_Factory_mgr_IT_const;
-#endif
-
-#ifndef Cubit_FactorySeqElemH
-#define Cubit_FactorySeqElemH
-
-class Cubit_Factory_SeqElem : public CORBA::_SeqElem
-{
-    public:
-
-    Cubit_Factory_SeqElem (Cubit_Factory_ptr* IT_p, unsigned char rel) {
-        _ptr = IT_p;
-        _release = rel;
-    }
-
-    Cubit_Factory_SeqElem &operator= (Cubit_Factory_ptr IT_p) {
-        if (_ptr) {
-            if (*(_ptr) && _release)
-                Cubit_Factory_release (*(_ptr));
-            *(_ptr) = IT_p;
-        }
-        return (*this);
-    }
-
-    Cubit_Factory_SeqElem &operator= (const Cubit_Factory_SeqElem &IT_s) {
-        if (_ptr && IT_s._ptr) {
-            if (*(_ptr) && _release)
-                Cubit_Factory_release (*(_ptr));
-            *(_ptr) = Cubit_Factory_duplicate(*(IT_s._ptr));
-        }
-        return (*this);
-    }
-
-    operator Cubit_Factory_ptr () const {
-        return _ptr ? (Cubit_Factory_ptr) (*_ptr) : Cubit_Factory_nil(); 
-    }
-
-    Cubit_Factory_ptr operator->() const { return *_ptr;}
-
-    protected:
-    Cubit_Factory_ptr *_ptr;
-    unsigned char _release;
-};
-
-#endif
-
-
-#define TIE_Cubit_Factory(X) Cubit_Factory##X
-
-#define DEF_TIE_Cubit_Factory(X) \
-	class Cubit_Factory##X : public virtual Cubit_Factory {		\
-	  X* m_obj;						\
-	public:							\
-								\
-								\
-	   Cubit_Factory##X  (X *objp, const char* m="", CORBA::LoaderClass *l=0)\
-		: Cubit_Factory(), m_obj(objp) {	\
-		m_pptr = new Cubit_Factory_dispatch		\
-			(( Cubit_Factory*)this,(CORBA::Object*)this,m,l,Cubit_Factory_IR,m_obj);	\
-	   }								\
-	   Cubit_Factory##X  (CORBA::Object *IT_p, const char* IT_m="", void *IT_q=0)\
-		: Cubit_Factory() {	\
-		m_pptr = new Cubit_Factory_dispatch		\
-			(( Cubit_Factory*)this,(CORBA::Object*)this,IT_m,Cubit_Factory_IR,IT_p,IT_q);	\
-		m_obj = (X*)(m_pptr->getImplObj ());			\
-	   }								\
-								\
-	   virtual ~Cubit_Factory##X  () {				\
-		if (_okToDeleteImpl ()) delete m_obj; }					\
-	   virtual void* _deref () {					\
-		return m_obj; }					\
-								\
-virtual Cubit_ptr create_cubit (const char * name, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->create_cubit (  name,IT_env);\
-}\
-								\
-	};						\
-
-
-#define QUALS_Cubit_Factory	\
-virtual Cubit_ptr create_cubit (const char * name, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->create_cubit (  name,IT_env);\
-}\
-
-
-
-
-class Cubit_FactoryProxyFactoryClass : public virtual CORBA::ObjectFactoryClass {
-public:
-   Cubit_FactoryProxyFactoryClass (unsigned char IT_p=0)
-		: CORBA::ProxyFactory (Cubit_Factory_IR, IT_p) {}
-
-    virtual void* New (char *IT_OR, CORBA::Environment&);
-
-    virtual void* New (ObjectReference *IT_OR, CORBA::Environment&);
-
-    virtual void* New2 (); 
-
-    virtual CORBA::Object* NewObject (char *IT_OR, CORBA::Environment&);
-
-    virtual CORBA::Object* NewObject (ObjectReference *IT_OR, CORBA::Environment&);
-
-    virtual CORBA::Object* New2Object (); 
-
-    virtual void* IT_castUp (void *IT_p, char* IT_s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-
-    virtual CORBA::PPTR* pptr (void *IT_p);
-
-    virtual void baseInterfaces (_IDL_SEQUENCE_string&);
-
-
-};
-
-extern Cubit_FactoryProxyFactoryClass Cubit_FactoryProxyFactory;
-
-class Cubit_FactoryBOAImpl : public virtual Cubit_Factory  {
-public:
-    Cubit_FactoryBOAImpl (const char *m="", CORBA::LoaderClass *l=NULL) {
-  if (CORBA::PPTR::isOK (m_pptr, Cubit_Factory_IR))
-    m_pptr = new Cubit_Factory_dispatch ( (Cubit_Factory*)this,
-   	 (CORBA::Object*)this, m, l, Cubit_Factory_IR, this);
-}
-
-        virtual Cubit_ptr create_cubit (const char * name, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-};
-
-
-#endif
-
-
-#endif
diff --git a/TAO/IIOP/tests/Cubit/Orbix/factory_client/cubit.idl b/TAO/IIOP/tests/Cubit/Orbix/factory_client/cubit.idl
deleted file mode 100644
index 7dba408d0db..00000000000
--- a/TAO/IIOP/tests/Cubit/Orbix/factory_client/cubit.idl
+++ /dev/null
@@ -1,46 +0,0 @@
-// @(#)cubit.idl	1.1 95/09/10
-// Copyright 1994-1995 by Sun Microsystems, Inc.
-
-#pragma prefix	"Eng.SUN.COM"
-#pragma version Cubit 1.1
-
-  interface Cubit {
-    octet	cube_octet (in octet o);
-    short	cube_short (in short s);
-    long	cube_long (in long l);
-    
-    struct Many {
-      octet	o;		// + 3 bytes padding (normally) ...
-      long	l;
-      short	s;		// + 2 bytes padding (normally) ...
-    };
-    
-    Many	cube_struct (in Many values);
-    
-    enum discrim {e_0th, e_1st, e_2nd, e_3rd, e_4th, e_5th};
-    
-    union oneof
-      switch (discrim) {
-	// this is an easy union to interpret; no padding
-	// is needed between discriminant and value.
-      case e_0th:
-        octet		o;
-      case e_1st:
-        short		s;
-      case e_2nd:
-        long		l;
-      case e_3rd:
-      default:
-        Many		cm;
-      };
-    
-    oneof	cube_union (in oneof values);
-    
-    oneway void	please_exit ();
-  };
-
-
-  interface Cubit_Factory {
-    Cubit create_cubit (in string name);
-  };
-
diff --git a/TAO/IIOP/tests/Cubit/Orbix/factory_client/cubitC.cpp b/TAO/IIOP/tests/Cubit/Orbix/factory_client/cubitC.cpp
deleted file mode 100644
index c439fc4c800..00000000000
--- a/TAO/IIOP/tests/Cubit/Orbix/factory_client/cubitC.cpp
+++ /dev/null
@@ -1,710 +0,0 @@
-
-
-#include "cubit.h"
-
-Cubit::Cubit (char *IT_OR) {
-      m_pptr = new Cubit_dispatch (IT_OR, this,(CORBA::Object*)this);
-} 
-Cubit::Cubit (ObjectReference *IT_OR) {
-      m_pptr = new Cubit_dispatch (IT_OR, this,(CORBA::Object*)this);
-} 
-
-#ifndef CubitForwC
-#define CubitForwC
-CORBA::ObjectRef Cubit_getBase(void *IT_p){
-    return (Cubit*) IT_p;}
-
-void Cubit_release (Cubit_ptr IT_p, CORBA::Environment &IT_env) {
-    CORBA::release(IT_p, IT_env);}
-
-void Cubit_release (Cubit_ptr IT_p) {
-    Cubit_release (IT_p, CORBA::IT_chooseDefaultEnv ()); }
-
-Cubit_ptr Cubit_nil (CORBA::Environment &) {
-    return Cubit:: _nil ();}
-
-Cubit_ptr Cubit_nil () {
-    return Cubit_nil (CORBA::IT_chooseDefaultEnv ());}
-
-Cubit_ptr Cubit_duplicate (Cubit_ptr IT_p, CORBA::Environment &IT_env) {
-    return (Cubit::_duplicate(IT_p, IT_env)); }
-Cubit_ptr Cubit_duplicate (Cubit_ptr IT_p) {
-    return Cubit_duplicate (IT_p, CORBA::IT_chooseDefaultEnv ()); }
-#endif
-
-Cubit_ptr Cubit::_duplicate(Cubit_ptr obj, CORBA::Environment& IT_pEnv) {
-        CORBA::EnvExcRaiser IT_raise;
-        CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-       if (!obj) {
-          return (obj);
-       }
-       Cubit_ptr IT_obj = obj->__duplicate (IT_env);
-       return IT_obj;
-}
-
-
-
-Cubit* Cubit:: _bind (const char* IT_markerServer, const char* host,
-		const CORBA::Context &IT_c, 
-		CORBA::Environment &IT_env) {
-       return (Cubit*)CORBA::Factory.New (IT_markerServer, IT_env, IT_c, host, 
-		Cubit_IMPL, Cubit_IR);
-}
-
-
-
-Cubit* Cubit:: _bind (CORBA::Environment &IT_env) {
-       return _bind (NULL,NULL,CORBA::Context(), IT_env); }
-
-
-Cubit* Cubit:: _bind (const char* IT_markerServer, const char* host,
-                CORBA::Environment &IT_env) {
-       return _bind (IT_markerServer, host, CORBA::Context (), IT_env); }
-Cubit* Cubit::_narrow (CORBA::Object* IT_obj, CORBA::Environment &IT_pEnv) {
-        CORBA::EnvExcRaiser IT_raise;
-        CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-        if (CORBA::is_nil (IT_obj)) {
-                return Cubit:: _nil();
-        }
-
-       Cubit* IT_p = (Cubit*)CORBA::Object::_castDown (IT_obj, Cubit_IR, IT_env);
-        IT_p = IT_p ? IT_p->__duplicate(IT_env) : NULL;
-        if ((IT_env) &&(!strcmp(IT_env.exception()->id(), "CORBA::StExcep::BAD_PARAM")) && (((CORBA::BAD_PARAM*)IT_env.exception())-> minor() == NARROW_FAILED)) {
-                IT_env.exception_free();
-        }
-        return IT_p;
-   }
-
-
-#ifndef Cubit_Many_Ops
-#define Cubit_Many_Ops
-
-void Cubit::Many:: encodeOp (CORBA::Request &IT_r) const {
-
-    IT_r.insertOctet (o);
-
-    IT_r << l;
-
-    IT_r << s;
-}
-
-void Cubit::Many:: decodeOp (CORBA::Request &IT_r) {
-
-    IT_r.extractOctet (o);
-
-    IT_r >> l;
-
-    IT_r >> s;
-}
-
-void Cubit::Many:: decodeInOutOp (CORBA::Request &IT_r) {
-
-    IT_r.extractOctet (o);
-
-    IT_r >> l;
-
-    IT_r >> s;
-}
-
-Cubit::Many ::~Many () {
-}
-
-Cubit::Many:: Many (const Cubit::Many &IT_s) 
-	 {
-    o = IT_s.o;
-    l = IT_s.l;
-    s = IT_s.s;
-}
-
-Cubit::Many:: Many () {
-}
-
-Cubit::Many &Cubit::Many:: operator= (const Cubit::Many& IT_s) {
-    if (this == &IT_s) return *this;
-    o = IT_s.o;
-    l = IT_s.l;
-    s = IT_s.s;
-    return *this;
-}
-
-
-#endif
-
-
-#ifndef Cubit_oneof_Ops
-#define Cubit_oneof_Ops
-void Cubit::oneof:: encodeOp (CORBA::Request &IT_r) const {
-    if (!isSet) return;
-    {
-    CORBA::ULong IT_0 = (CORBA::ULong) __d;
-    IT_r << IT_0;
-    }
-    switch (__d) {
-        case Cubit::e_0th: 
-        IT_r.insertOctet (_o_);
-        break;
-        case Cubit::e_1st: 
-        IT_r << _s_;
-        break;
-        case Cubit::e_2nd: 
-        IT_r << _l_;
-        break;
-        case Cubit::e_3rd: 
-        default: 
-        (*_cm_).encodeOp (IT_r);
-        break;
-    }
-
-}
-
-void Cubit::oneof:: decodeOp (CORBA::Request &IT_r) {
-    isSet = 0;
-    {
-    CORBA::ULong IT_1;
-    IT_r >> IT_1;
-    __d = Cubit::discrim(IT_1);
-    }
-    switch (__d) {
-        case Cubit::e_0th: 
-        if (!isSet) {
-            isSet = 1;
-        }
-        IT_r.extractOctet (_o_);
-        break;
-        case Cubit::e_1st: 
-        if (!isSet) {
-            isSet = 1;
-        }
-        IT_r >> _s_;
-        break;
-        case Cubit::e_2nd: 
-        if (!isSet) {
-            isSet = 1;
-        }
-        IT_r >> _l_;
-        break;
-        case Cubit::e_3rd: 
-        default: 
-        if (!isSet) {
-            _cm_ = new Cubit::Many;
-            isSet = 1;
-        }
-        (*_cm_).decodeOp (IT_r);
-        break;
-    }
-
-}
-void Cubit::oneof:: decodeInOutOp (CORBA::Request &IT_r) {
-    Cubit::discrim IT_d;
-    {
-    CORBA::ULong IT_2;
-    IT_r >> IT_2;
-    IT_d = Cubit::discrim(IT_2);
-    }
-    if (IT_d == __d)
-        switch (__d) {
-            case Cubit::e_0th: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r.extractOctet (_o_);
-            break;
-            case Cubit::e_1st: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r >> _s_;
-            break;
-            case Cubit::e_2nd: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r >> _l_;
-            break;
-            case Cubit::e_3rd: 
-            default: 
-            if (!isSet) {
-                _cm_ = new Cubit::Many;
-                isSet = 1;
-            }
-            (*_cm_).decodeInOutOp (IT_r);
-            break;
-        }
-
-    else {
-        this->oneof:: ~oneof();
-        memset(this, 0, sizeof(*this));
-        __d = IT_d;
-        switch (__d) {
-            case Cubit::e_0th: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r.extractOctet (_o_);
-            break;
-            case Cubit::e_1st: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r >> _s_;
-            break;
-            case Cubit::e_2nd: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r >> _l_;
-            break;
-            case Cubit::e_3rd: 
-            default: 
-            if (!isSet) {
-                _cm_ = new Cubit::Many;
-                isSet = 1;
-            }
-            (*_cm_).decodeOp (IT_r);
-            break;
-        }
-        isSet = 1;
-    }
-
-}
-
-Cubit::oneof:: oneof() { 
-    memset(this, 0, sizeof(*this));
-    isSet = 0;
-}
-
-Cubit::oneof ::~oneof() {
-    if (!isSet) return;
-    switch (__d) { 
-        case Cubit::e_0th:         break;
-        case Cubit::e_1st:         break;
-        case Cubit::e_2nd:         break;
-        case Cubit::e_3rd: 
-        default:         if (_cm_) delete _cm_;
-        break;
-    }
-
-    isSet = 0;
-}
-
-Cubit::oneof:: oneof (const Cubit::oneof &IT_s) {
-    isSet = 0;
-    memset(this, 0, sizeof(*this));
-    __d = IT_s.__d;
-    switch (__d) {
-        case Cubit::e_0th:         isSet = 1;
-        _o_ = IT_s._o_;
-        break;
-        case Cubit::e_1st:         isSet = 1;
-        _s_ = IT_s._s_;
-        break;
-        case Cubit::e_2nd:         isSet = 1;
-        _l_ = IT_s._l_;
-        break;
-        case Cubit::e_3rd: 
-        default: 
-        if (!isSet) {
-            _cm_ = new Cubit::Many;
-            isSet = 1;
-        }
-        *(_cm_) = *(IT_s._cm_);
-        break;
-    }
-    isSet = 1;
-}
-
-Cubit::oneof& Cubit::oneof:: operator= (const Cubit::oneof & IT_s) {
-    if (this == &IT_s) return *this;
-    if (isSet && (__d != IT_s.__d))
-    {
-        this-> oneof::~oneof();
-        memset(this, 0, sizeof(*this));
-    }
-
-    __d = IT_s.__d;
-    switch (__d) {
-        case Cubit::e_0th:         isSet = 1;
-        _o_ = IT_s._o_;
-        break;
-        case Cubit::e_1st:         isSet = 1;
-        _s_ = IT_s._s_;
-        break;
-        case Cubit::e_2nd:         isSet = 1;
-        _l_ = IT_s._l_;
-        break;
-        case Cubit::e_3rd: 
-        default: 
-        if (!isSet) {
-            _cm_ = new Cubit::Many;
-            isSet = 1;
-        }
-        *(_cm_) = *(IT_s._cm_);
-        break;
-    }
-    isSet = 1;
-    return *this;
-}
-
-
-#endif
-
-void* CubitProxyFactoryClass::New (char *IT_OR, CORBA::Environment&) {
-        return  new class Cubit(IT_OR);}
-
-void* CubitProxyFactoryClass::New (ObjectReference *IT_OR, CORBA::Environment&) {
-        return  new class Cubit(IT_OR);}
-
-void* CubitProxyFactoryClass::New2 () {
-        return  new class Cubit((char*)0);}
-
-CORBA::Object* CubitProxyFactoryClass::NewObject (char *IT_OR, CORBA::Environment&) {
-        return  new class Cubit(IT_OR);}
-
-CORBA::Object* CubitProxyFactoryClass::NewObject (ObjectReference *IT_OR, CORBA::Environment&) {
-        return  new class Cubit(IT_OR);}
-
-CORBA::Object* CubitProxyFactoryClass::New2Object () {
-        return  new class Cubit((char*)0);}
-
-void* CubitProxyFactoryClass::IT_castUp (void *IT_p, char* IT_s, CORBA::Environment &IT_env) {
-      void *IT_l;
-      if (!CORBA::_interfaceCmp (IT_s,Cubit_IR, IT_env))
-         return IT_p;
-      else if (IT_l=CORBA::ObjectFactoryClass::IT_castUp((CORBA::Object*)((class Cubit*)IT_p),IT_s, IT_env))
-         return IT_l;
-      else return NULL;
-    }
-
-
-CORBA::PPTR* CubitProxyFactoryClass::pptr (void *IT_p) {
-       return ((class Cubit*)IT_p)->_pptr ();}
-
-void CubitProxyFactoryClass::baseInterfaces (_IDL_SEQUENCE_string& seq) {
-      add (seq, Cubit_IR);
-      CORBA::ObjectFactoryClass::baseInterfaces (seq);
-}
-
-CubitProxyFactoryClass CubitProxyFactory(1);
-
-CORBA::Octet Cubit:: cube_octet (CORBA::Octet o, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        return 0;
-    }
-    CORBA::Request IT_r (this, "cube_octet",IT_env,1,0);
-    if (!IT_r.isException (IT_env)) {
-
-        IT_r.insertOctet (o);
-    }
-
-    IT_r.invoke (CORBA::Flags(0),IT_env);
-    if (!IT_r.isException (IT_env)) {
-        CORBA::Octet IT_result;
-        IT_r.extractOctet (IT_result);
-        IT_r.checkEnv (IT_env);
-        return IT_result;
-    }
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-    return 0;
-}
-
-CORBA::Short Cubit:: cube_short (CORBA::Short s, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        return 0;
-    }
-    CORBA::Request IT_r (this, "cube_short",IT_env,1,0);
-    if (!IT_r.isException (IT_env)) {
-
-        IT_r << s;
-    }
-
-    IT_r.invoke (CORBA::Flags(0),IT_env);
-    if (!IT_r.isException (IT_env)) {
-        CORBA::Short IT_result;
-        IT_r >> IT_result;
-        IT_r.checkEnv (IT_env);
-        return IT_result;
-    }
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-    return 0;
-}
-
-CORBA::Long Cubit:: cube_long (CORBA::Long l, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        return 0;
-    }
-    CORBA::Request IT_r (this, "cube_long",IT_env,1,0);
-    if (!IT_r.isException (IT_env)) {
-
-        IT_r << l;
-    }
-
-    IT_r.invoke (CORBA::Flags(0),IT_env);
-    if (!IT_r.isException (IT_env)) {
-        CORBA::Long IT_result;
-        IT_r >> IT_result;
-        IT_r.checkEnv (IT_env);
-        return IT_result;
-    }
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-    return 0;
-}
-
-Cubit::Many Cubit:: cube_struct (const Cubit::Many& values, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        { 
-            Cubit::Many IT_l0;
-            return IT_l0;
-        }
-    }
-    CORBA::Request IT_r (this, "cube_struct",IT_env,1,0);
-    if (!IT_r.isException (IT_env)) {
-
-        values.encodeOp (IT_r);
-    }
-
-    IT_r.invoke (CORBA::Flags(0),IT_env);
-    if (!IT_r.isException (IT_env)) {
-        Cubit::Many IT_result;
-        IT_result.decodeOp (IT_r);
-        IT_r.checkEnv (IT_env);
-        return IT_result;
-    }
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-    { 
-        Cubit::Many IT_l1;
-        return IT_l1;
-    }
-}
-
-Cubit::oneof Cubit:: cube_union (const Cubit::oneof& values, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        { 
-            Cubit::oneof IT_l0;
-            return IT_l0;
-        }
-    }
-    CORBA::Request IT_r (this, "cube_union",IT_env,1,0);
-    if (!IT_r.isException (IT_env)) {
-
-        values.encodeOp (IT_r);
-    }
-
-    IT_r.invoke (CORBA::Flags(0),IT_env);
-    if (!IT_r.isException (IT_env)) {
-        Cubit::oneof IT_result;
-        IT_result.decodeOp (IT_r);
-        IT_r.checkEnv (IT_env);
-        return IT_result;
-    }
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-    { 
-        Cubit::oneof IT_l1;
-        return IT_l1;
-    }
-}
-
-void Cubit:: please_exit (CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        return ;
-    }
-    CORBA::Request IT_r (this, "please_exit",IT_env,1,1);
-
-    IT_r.invoke (CORBA::Flags(CORBA::INV_NO_RESPONSE), IT_env);
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-}
-
-
-
-
-
-#ifndef Cubit_dispatch_impl
-
-unsigned char Cubit_dispatch::dispatch (CORBA::Request &IT_r, 
-    unsigned char, void *) {
-      IT_r.makeRuntimeException1 ("Cubit");
-      return 0;
-}
- 
-#endif
-
-Cubit_Factory::Cubit_Factory (char *IT_OR) {
-      m_pptr = new Cubit_Factory_dispatch (IT_OR, this,(CORBA::Object*)this);
-} 
-Cubit_Factory::Cubit_Factory (ObjectReference *IT_OR) {
-      m_pptr = new Cubit_Factory_dispatch (IT_OR, this,(CORBA::Object*)this);
-} 
-
-#ifndef Cubit_FactoryForwC
-#define Cubit_FactoryForwC
-CORBA::ObjectRef Cubit_Factory_getBase(void *IT_p){
-    return (Cubit_Factory*) IT_p;}
-
-void Cubit_Factory_release (Cubit_Factory_ptr IT_p, CORBA::Environment &IT_env) {
-    CORBA::release(IT_p, IT_env);}
-
-void Cubit_Factory_release (Cubit_Factory_ptr IT_p) {
-    Cubit_Factory_release (IT_p, CORBA::IT_chooseDefaultEnv ()); }
-
-Cubit_Factory_ptr Cubit_Factory_nil (CORBA::Environment &) {
-    return Cubit_Factory:: _nil ();}
-
-Cubit_Factory_ptr Cubit_Factory_nil () {
-    return Cubit_Factory_nil (CORBA::IT_chooseDefaultEnv ());}
-
-Cubit_Factory_ptr Cubit_Factory_duplicate (Cubit_Factory_ptr IT_p, CORBA::Environment &IT_env) {
-    return (Cubit_Factory::_duplicate(IT_p, IT_env)); }
-Cubit_Factory_ptr Cubit_Factory_duplicate (Cubit_Factory_ptr IT_p) {
-    return Cubit_Factory_duplicate (IT_p, CORBA::IT_chooseDefaultEnv ()); }
-#endif
-
-Cubit_Factory_ptr Cubit_Factory::_duplicate(Cubit_Factory_ptr obj, CORBA::Environment& IT_pEnv) {
-        CORBA::EnvExcRaiser IT_raise;
-        CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-       if (!obj) {
-          return (obj);
-       }
-       Cubit_Factory_ptr IT_obj = obj->__duplicate (IT_env);
-       return IT_obj;
-}
-
-
-
-Cubit_Factory* Cubit_Factory:: _bind (const char* IT_markerServer, const char* host,
-		const CORBA::Context &IT_c, 
-		CORBA::Environment &IT_env) {
-       return (Cubit_Factory*)CORBA::Factory.New (IT_markerServer, IT_env, IT_c, host, 
-		Cubit_Factory_IMPL, Cubit_Factory_IR);
-}
-
-
-
-Cubit_Factory* Cubit_Factory:: _bind (CORBA::Environment &IT_env) {
-       return _bind (NULL,NULL,CORBA::Context(), IT_env); }
-
-
-Cubit_Factory* Cubit_Factory:: _bind (const char* IT_markerServer, const char* host,
-                CORBA::Environment &IT_env) {
-       return _bind (IT_markerServer, host, CORBA::Context (), IT_env); }
-Cubit_Factory* Cubit_Factory::_narrow (CORBA::Object* IT_obj, CORBA::Environment &IT_pEnv) {
-        CORBA::EnvExcRaiser IT_raise;
-        CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-        if (CORBA::is_nil (IT_obj)) {
-                return Cubit_Factory:: _nil();
-        }
-
-       Cubit_Factory* IT_p = (Cubit_Factory*)CORBA::Object::_castDown (IT_obj, Cubit_Factory_IR, IT_env);
-        IT_p = IT_p ? IT_p->__duplicate(IT_env) : NULL;
-        if ((IT_env) &&(!strcmp(IT_env.exception()->id(), "CORBA::StExcep::BAD_PARAM")) && (((CORBA::BAD_PARAM*)IT_env.exception())-> minor() == NARROW_FAILED)) {
-                IT_env.exception_free();
-        }
-        return IT_p;
-   }
-
-void* Cubit_FactoryProxyFactoryClass::New (char *IT_OR, CORBA::Environment&) {
-        return  new class Cubit_Factory(IT_OR);}
-
-void* Cubit_FactoryProxyFactoryClass::New (ObjectReference *IT_OR, CORBA::Environment&) {
-        return  new class Cubit_Factory(IT_OR);}
-
-void* Cubit_FactoryProxyFactoryClass::New2 () {
-        return  new class Cubit_Factory((char*)0);}
-
-CORBA::Object* Cubit_FactoryProxyFactoryClass::NewObject (char *IT_OR, CORBA::Environment&) {
-        return  new class Cubit_Factory(IT_OR);}
-
-CORBA::Object* Cubit_FactoryProxyFactoryClass::NewObject (ObjectReference *IT_OR, CORBA::Environment&) {
-        return  new class Cubit_Factory(IT_OR);}
-
-CORBA::Object* Cubit_FactoryProxyFactoryClass::New2Object () {
-        return  new class Cubit_Factory((char*)0);}
-
-void* Cubit_FactoryProxyFactoryClass::IT_castUp (void *IT_p, char* IT_s, CORBA::Environment &IT_env) {
-      void *IT_l;
-      if (!CORBA::_interfaceCmp (IT_s,Cubit_Factory_IR, IT_env))
-         return IT_p;
-      else if (IT_l=CORBA::ObjectFactoryClass::IT_castUp((CORBA::Object*)((class Cubit_Factory*)IT_p),IT_s, IT_env))
-         return IT_l;
-      else return NULL;
-    }
-
-
-CORBA::PPTR* Cubit_FactoryProxyFactoryClass::pptr (void *IT_p) {
-       return ((class Cubit_Factory*)IT_p)->_pptr ();}
-
-void Cubit_FactoryProxyFactoryClass::baseInterfaces (_IDL_SEQUENCE_string& seq) {
-      add (seq, Cubit_Factory_IR);
-      CORBA::ObjectFactoryClass::baseInterfaces (seq);
-}
-
-Cubit_FactoryProxyFactoryClass Cubit_FactoryProxyFactory(1);
-
-Cubit_ptr Cubit_Factory:: create_cubit (const char * name, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        return new Cubit;
-    }
-    CORBA::Request IT_r (this, "create_cubit",IT_env,1,0);
-    if (!IT_r.isException (IT_env)) {
-
-        IT_r.encodeStringOp (name);
-    }
-
-    IT_r.invoke (CORBA::Flags(0),IT_env);
-    if (!IT_r.isException (IT_env)) {
-        Cubit_ptr IT_result;
-        IT_result = (Cubit*) IT_r.decodeObjRef (Cubit_IR);
-        IT_r.checkEnv (IT_env);
-        return IT_result;
-    }
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-    return new Cubit;
-}
-
-
-
-
-
-#ifndef Cubit_Factory_dispatch_impl
-
-unsigned char Cubit_Factory_dispatch::dispatch (CORBA::Request &IT_r, 
-    unsigned char, void *) {
-      IT_r.makeRuntimeException1 ("Cubit_Factory");
-      return 0;
-}
- 
-#endif
-
diff --git a/TAO/IIOP/tests/Cubit/Orbix/factory_client/cubitS.cpp b/TAO/IIOP/tests/Cubit/Orbix/factory_client/cubitS.cpp
deleted file mode 100644
index 2f0459962b8..00000000000
--- a/TAO/IIOP/tests/Cubit/Orbix/factory_client/cubitS.cpp
+++ /dev/null
@@ -1,282 +0,0 @@
-
-
-#include "cubit.hh"
-
-
-#define Cubit_dispatch_impl
-
-unsigned char Cubit_dispatch::dispatch (CORBA::Request &IT_r, 
- unsigned char IT_isTarget, void *IT_pp) {
-    if (!IT_pp)
-       IT_pp = m_obj;
-    const char *IT_s = IT_r.getOperation ();
-    if (!strcmp(IT_s,"cube_octet")) {
-        CORBA::Octet IT_result;
-        CORBA::Environment IT_env (IT_r);
-        CORBA::Filter* IT_f = CORBA::Orbix.getFilter ();
-        if (!IT_r.tcAssert ("\
-Ro~cube_octet~+o{o},>{o},N{}\
-"))
-            return 1;
-        CORBA::Octet o;
-
-        IT_r.extractOctet (o);
-
-        if (IT_f && !IT_r.isException (IT_env))
-        	IT_f->inRequestPostM (IT_r, IT_env);
-        if (!IT_r.isException (IT_env)) {
-            try {
-                	IT_result = ((Cubit*)IT_pp)->cube_octet (  o, IT_env);
-
-            } catch (CORBA::SystemException &IT_exSys) {
-            IT_env.propagate (&IT_exSys);
-            } catch (CORBA::UserException &IT_exUsr) {
-            IT_env.propagate (&IT_exUsr);
-            }
-        }
-
-        if (!IT_r.isException (IT_env)) {
-            if (!IT_r.convertToReply ("\
-o\
-", IT_env)) return 1;
-            IT_r.insertOctet (IT_result);
-            }
-
-        else IT_r.makeSystemException (IT_env);
-        return 1;
-    }
-
-    if (!strcmp(IT_s,"cube_short")) {
-        CORBA::Short IT_result;
-        CORBA::Environment IT_env (IT_r);
-        CORBA::Filter* IT_f = CORBA::Orbix.getFilter ();
-        if (!IT_r.tcAssert ("\
-Ro~cube_short~+s{s},>{s},N{}\
-"))
-            return 1;
-        CORBA::Short s;
-
-        IT_r >> s;
-
-        if (IT_f && !IT_r.isException (IT_env))
-        	IT_f->inRequestPostM (IT_r, IT_env);
-        if (!IT_r.isException (IT_env)) {
-            try {
-                	IT_result = ((Cubit*)IT_pp)->cube_short (  s, IT_env);
-
-            } catch (CORBA::SystemException &IT_exSys) {
-            IT_env.propagate (&IT_exSys);
-            } catch (CORBA::UserException &IT_exUsr) {
-            IT_env.propagate (&IT_exUsr);
-            }
-        }
-
-        if (!IT_r.isException (IT_env)) {
-            if (!IT_r.convertToReply ("\
-s\
-", IT_env)) return 1;
-            IT_r << IT_result;
-            }
-
-        else IT_r.makeSystemException (IT_env);
-        return 1;
-    }
-
-    if (!strcmp(IT_s,"cube_long")) {
-        CORBA::Long IT_result;
-        CORBA::Environment IT_env (IT_r);
-        CORBA::Filter* IT_f = CORBA::Orbix.getFilter ();
-        if (!IT_r.tcAssert ("\
-Ro~cube_long~+l{l},>{l},N{}\
-"))
-            return 1;
-        CORBA::Long l;
-
-        IT_r >> l;
-
-        if (IT_f && !IT_r.isException (IT_env))
-        	IT_f->inRequestPostM (IT_r, IT_env);
-        if (!IT_r.isException (IT_env)) {
-            try {
-                	IT_result = ((Cubit*)IT_pp)->cube_long (  l, IT_env);
-
-            } catch (CORBA::SystemException &IT_exSys) {
-            IT_env.propagate (&IT_exSys);
-            } catch (CORBA::UserException &IT_exUsr) {
-            IT_env.propagate (&IT_exUsr);
-            }
-        }
-
-        if (!IT_r.isException (IT_env)) {
-            if (!IT_r.convertToReply ("\
-l\
-", IT_env)) return 1;
-            IT_r << IT_result;
-            }
-
-        else IT_r.makeSystemException (IT_env);
-        return 1;
-    }
-
-    if (!strcmp(IT_s,"cube_struct")) {
-        Cubit::Many IT_result;
-        CORBA::Environment IT_env (IT_r);
-        CORBA::Filter* IT_f = CORBA::Orbix.getFilter ();
-        if (!IT_r.tcAssert ("\
-Ro~cube_struct~+values{R~Cubit::Many~o{o},l{l},s{s}},>{R~Cubit::Many~o{o},l{l},s{s}},N{}\
-"))
-            return 1;
-        Cubit::Many values;
-
-        values.decodeOp (IT_r);
-
-        if (IT_f && !IT_r.isException (IT_env))
-        	IT_f->inRequestPostM (IT_r, IT_env);
-        if (!IT_r.isException (IT_env)) {
-            try {
-                	IT_result = ((Cubit*)IT_pp)->cube_struct (  values, IT_env);
-
-            } catch (CORBA::SystemException &IT_exSys) {
-            IT_env.propagate (&IT_exSys);
-            } catch (CORBA::UserException &IT_exUsr) {
-            IT_env.propagate (&IT_exUsr);
-            }
-        }
-
-        if (!IT_r.isException (IT_env)) {
-            if (!IT_r.convertToReply ("\
-R~Cubit::Many~o{o},l{l},s{s}\
-", IT_env)) return 1;
-            IT_result.encodeOp (IT_r);
-            }
-
-        else IT_r.makeSystemException (IT_env);
-        return 1;
-    }
-
-    if (!strcmp(IT_s,"cube_union")) {
-        Cubit::oneof IT_result;
-        CORBA::Environment IT_env (IT_r);
-        CORBA::Filter* IT_f = CORBA::Orbix.getFilter ();
-        IT_r.tcPreAssert (
-"\
-Ro~cube_union~+values{U~Cubit::oneof~{E~Cubit::discrim~e_0th,e_1st,e_2nd,e_3rd,e_4th,e_5th}~Cubit::e_0th o{o};Cubit::e_1st s{s};Cubit::e_2nd l{l};Cubit::e_3rd,$ cm{R~Cubit::Many~o{o},l{l},s{s}}},>{U~Cubit::oneof~{E~Cubit::discrim~e_0th,e_1st,e_2nd,e_3rd,\
-");
-        if (!IT_r.tcAssert ("\
-e_4th,e_5th}~Cubit::e_0th o{o};Cubit::e_1st s{s};Cubit::e_2nd l{l};Cubit::e_3rd,$ cm{R~Cubit::Many~o{o},l{l},s{s}}},N{}\
-"))
-            return 1;
-        Cubit::oneof values;
-
-        values.decodeOp (IT_r);
-
-        if (IT_f && !IT_r.isException (IT_env))
-        	IT_f->inRequestPostM (IT_r, IT_env);
-        if (!IT_r.isException (IT_env)) {
-            try {
-                	IT_result = ((Cubit*)IT_pp)->cube_union (  values, IT_env);
-
-            } catch (CORBA::SystemException &IT_exSys) {
-            IT_env.propagate (&IT_exSys);
-            } catch (CORBA::UserException &IT_exUsr) {
-            IT_env.propagate (&IT_exUsr);
-            }
-        }
-
-        if (!IT_r.isException (IT_env)) {
-            if (!IT_r.convertToReply ("\
-U~Cubit::oneof~{E~Cubit::discrim~e_0th,e_1st,e_2nd,e_3rd,e_4th,e_5th}~Cubit::e_0th o{o};Cubit::e_1st s{s};Cubit::e_2nd l{l};Cubit::e_3rd,$ cm{R~Cubit::Many~o{o},l{l},s{s}}\
-", IT_env)) return 1;
-            IT_result.encodeOp (IT_r);
-            }
-
-        else IT_r.makeSystemException (IT_env);
-        return 1;
-    }
-
-    if (!strcmp(IT_s,"please_exit")) {
-        CORBA::Environment IT_env (IT_r);
-        CORBA::Filter* IT_f = CORBA::Orbix.getFilter ();
-        if (!IT_r.tcAssert ("\
-Ro~please_exit~>{v},O{}\
-"))
-            return 1;
-
-        if (IT_f && !IT_r.isException (IT_env))
-        	IT_f->inRequestPostM (IT_r, IT_env);
-        if (!IT_r.isException (IT_env)) {
-            try {
-                ((Cubit*)IT_pp)->please_exit (IT_env);
-
-            } catch (CORBA::SystemException &IT_exSys) {
-            IT_env.propagate (&IT_exSys);
-            } catch (CORBA::UserException &IT_exUsr) {
-            IT_env.propagate (&IT_exUsr);
-            }
-        }
-        IT_r.replyNoResults (CORBA::Flags(CORBA::INV_NO_RESPONSE),IT_env);
-        return 1;
-    }
-
-    if (IT_isTarget)
-        IT_r.makeRuntimeException2 ();
-
-    return 0;
-}
-
-#define Cubit_Factory_dispatch_impl
-
-unsigned char Cubit_Factory_dispatch::dispatch (CORBA::Request &IT_r, 
- unsigned char IT_isTarget, void *IT_pp) {
-    if (!IT_pp)
-       IT_pp = m_obj;
-    const char *IT_s = IT_r.getOperation ();
-    if (!strcmp(IT_s,"create_cubit")) {
-        Cubit_ptr IT_result;
-        CORBA::Environment IT_env (IT_r);
-        CORBA::Filter* IT_f = CORBA::Orbix.getFilter ();
-        if (!IT_r.tcAssert ("\
-Ro~create_cubit~+name{0},>{O~Cubit},N{}\
-"))
-            return 1;
-        char * name;
-
-        IT_r.decodeStringOp(name);
-
-        if (IT_f && !IT_r.isException (IT_env))
-        	IT_f->inRequestPostM (IT_r, IT_env);
-        if (!IT_r.isException (IT_env)) {
-            try {
-                	IT_result = ((Cubit_Factory*)IT_pp)->create_cubit (  name, IT_env);
-
-            } catch (CORBA::SystemException &IT_exSys) {
-            IT_env.propagate (&IT_exSys);
-            } catch (CORBA::UserException &IT_exUsr) {
-            IT_env.propagate (&IT_exUsr);
-            }
-        }
-        CORBA::string_free (name);
-
-        if (!IT_r.isException (IT_env)) {
-            if (!IT_r.convertToReply ("\
-O~Cubit\
-", IT_env)) return 1;
-            {
-                CORBA::Object* IT_l1 = (CORBA::Object*) IT_result;
-                IT_r << IT_l1;
-            }
-            if (IT_result) Cubit_release (IT_result);
-            }
-
-        else IT_r.makeSystemException (IT_env);
-        return 1;
-    }
-
-    if (IT_isTarget)
-        IT_r.makeRuntimeException2 ();
-
-    return 0;
-}
-
-#include "cubitC.cpp"
-
diff --git a/TAO/IIOP/tests/Cubit/Orbix/orb.mk b/TAO/IIOP/tests/Cubit/Orbix/orb.mk
deleted file mode 100644
index cf7b12d3b1b..00000000000
--- a/TAO/IIOP/tests/Cubit/Orbix/orb.mk
+++ /dev/null
@@ -1,146 +0,0 @@
-# ------------------------------------------------------------
-# Orbix 2.2 implicit rules for SunOS/GNU Make
-# ------------------------------------------------------------
-#
-# If you cut'n'paste this into your /usr/include/make/default.mk
-# file, beware! This is not officially supported by Iona
-# Technologies, and you may want to be a bit of a Makefile hacker
-# to make it integrate well with your site's setup.
-
-# The best thing to do would be put it in a standard place and
-# anyone who wants the Orbix implicit rule set can include
-# it with an "include <pathname>/orbix.mk" line in their
-# Makefile. A good place to put it might be /usr/include/make.
-
-# These rules define default C++, C++FLAGS and C++SUFFIX.
-# C++ is the C++ compiler to use; C++FLAGS are command-line
-# flags to the C++ compiler for use in compiling C++ source
-# files into objects; C++SUFFIX is the filename suffix
-# indicating C++ source. By default, it's set to "C" for AT&T C++,
-# and "cc" for GNU g++.
-
-# Feel free to override these in your Makefiles *after*
-# including this file.
-
-# IMPORTANT: If the -M switch is specified in IDLFLAGS, the IDL
-# compiler appends to the user-specified file. The dependency for
-# specified_file.o in the linking target should appear _after_ any use
-# of the IDL compiler which takes the -M flag.  Putting it _last_
-# is normally the best approach.
-
-# Note that these rule definitions use pattern matching,
-# and therefore only work with SunOS make and GNU make.
-
-# They may not work with other vendor's versions of make.
-# If they do not, you may wish to try using GNU make, which
-# is free software produced by the Free Software Foundation.
-
-# If the version of make you wish to use does not support
-# pattern matching, use the sample explicit rule set in
-# the comments at the end of this file.
-
-# ------------------------------------------------------------
-# Essential: set these to the locations into which you
-#		have installed Orbix' components:
-
-ORBIX_BINDIR    = /opt/Orbix_2.2MT/corba2/bin
-ORBIX_LIBDIR    = /opt/Orbix_2.2MT/corba2/lib
-ORBIX_INCDIR    = /opt/Orbix_2.2MT/corba2/include
-
-#-------------------------------------------------------------
-# To compile the demos, you should change these values as
-# appropriate for your particular system installation
-#-------------------------------------------------------------
-
-X11BASE         = /usr/openwin
-X11INCDIR       = $(X11BASE)/include
-X11LIBDIR       = $(X11BASE)/lib
-
-# C++             = CC
-# C++FLAGS        = -I$(ORBIX_INCDIR) -I. -mt -D_REENTRANT
-# C++SUFFIX       = cpp
-
-# ------------------------------------------------------------
-# ITCLT, IRCLT and ITSRV can be either statically or dynamically linked
-# Use -Bdynamic or -Bstatic as appropriate.
-# ------------------------------------------------------------
-
-ITCLT 		= -Bstatic -lorbixmt
-IRCLT 		= -Bstatic -lIRcltmt
-ITSRV 		= -Bstatic -lorbixmt
-ITIIOP          = -Bstatic -liiopmt
-ITDSI           = -Bstatic -lDSImt
-ITIFR		= -Bstatic -lifrmt
-
-# ------------------------------------------------------------
-# SYSLIBS must be dynamically linked; otherwise you can expect to
-# get linkage errors for symbols in the nsl library
-# ------------------------------------------------------------
-
-LDFLAGS         += -L$(ORBIX_LIBDIR)
-SYSLIBS         = -Bdynamic -lnsl -lsocket
-
-IDL             = $(ORBIX_BINDIR)/idl 
-IDLFLAGS        =
-
-# ------------------------------------------------------------
-# The following section defines implicit rules for creating
-# *.{C,S}.C files, rules for compiling those
-# into objects, and even a rule for compiling C++ source into
-# objects (in case one isn't already defined).
-
-# ------------------------------------------------------------
-# first, put the new suffixes at the *head* of the suffix list,
-# overriding any existing .C compilation method.
-.SUFFIXES:
-.SUFFIXES: .$(C++SUFFIX) .idl $(SUFFIXES)
-
-# .SUFFIXES: .$(C++SUFFIX) .idl .hh $(SUFFIXES)
-# ------------------------------------------------------------
-# *[CS].o must be compiled here, and depends
-# mostly on the C++ files produced from the IDL file.
-
-%C.o: %C.$(C++SUFFIX)
-	$(C++) -c $(C++FLAGS) $<
-
-%S.o: %S.$(C++SUFFIX)
-	$(C++) -c $(C++FLAGS) $<
-
-%.o: %.$(C++SUFFIX)
-	$(C++) -c $(C++FLAGS) $<
-
-# and here's how to compile C++ files from the IDL file.
-# only ONE of these rules will be run at make-time,
-
-%S.$(C++SUFFIX): %.idl
-	$(IDL) $(IDLFLAGS) $<
-
-%C.$(C++SUFFIX): %.idl
-	$(IDL) $(IDLFLAGS) $<
-
-%.hh: %.idl
-	$(IDL) $(IDLFLAGS) $<
-
-# ------------------------------------------------------------
-# If the version of make you wish to use does not support
-# pattern matching, here's a sample of an explicit rule set.
-
-# We assume the IDL file is called "foobar.idl", we wish
-# to compile "foobarC.o", "foobarS.o", and
-# "foobar.hh", and the C++ file suffix.
-# ------------------------------------------------------------
-
-# foobarC.o: foobar.hh foobarC.C
-#	$(C++) -c ($C++FLAGS) foobarC.C
-#
-# foobarS.o: foobar.hh foobarS.C
-#	$(C++) -c ($C++FLAGS) foobarS.C
-#
-# foobarC.C: foobar.idl
-#	$(IDL) -c ($IDLFLAGS) foobar.idl
-#
-# foobarS.C: foobar.idl
-#	$(IDL) -c ($IDLFLAGS) foobar.idl
-#
-# foobar.hh: foobar.idl
-#	$(IDL) -c ($IDLFLAGS) foobar.idl
diff --git a/TAO/IIOP/tests/Cubit/Orbix/tpool/Makefile b/TAO/IIOP/tests/Cubit/Orbix/tpool/Makefile
deleted file mode 100644
index d4cbaacb6bd..00000000000
--- a/TAO/IIOP/tests/Cubit/Orbix/tpool/Makefile
+++ /dev/null
@@ -1,89 +0,0 @@
-#----------------------------------------------------------------------------
-#	@(#)Makefile	1.1	10/18/96
-#
-#	Makefile for the ACE_MT_CORBA_Handler tests
-#----------------------------------------------------------------------------
-
-#----------------------------------------------------------------------------
-#	Local macros
-#----------------------------------------------------------------------------
-
-SRC = cubitS.cpp cubit_impl.cpp server.cpp tpool.cpp
-
-SVR_OBJS = cubitS.o cubit_impl.o server.o tpool.o
-
-LDLIBS	 = 
-
-VLDLIBS	 = $(LDLIBS:%=%$(VAR))
-
-#----------------------------------------------------------------------------
-#	Include macros and targets
-#----------------------------------------------------------------------------
-
-include		$(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-include		$(ACE_ROOT)/include/makeinclude/macros.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.common.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.lib.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.bin.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
-
-#----------------------------------------------------------------------------
-#	Orbix related macros and target settings.
-#----------------------------------------------------------------------------
-
-
-ORBIX_BINDIR    = $(ORBIX_ROOT)/bin
-ORBIX_LIBDIR    = $(ORBIX_ROOT)/corba2/lib
-ORBIX_INCDIR    = $(ORBIX_ROOT)/corba2/include
-
-# Remove -DCubit_USE_BOA from below to use the TIE approach
-
-CPPFLAGS += -DEXCEPTIONS -I$(ORBIX_INCDIR) -DWANT_ORBIX_FDS -DCubit_USE_BOA
-LDFLAGS  += -L$(ORBIX_LIBDIR) -R $(ORBIX_LIBDIR) -L$(ACE)/ace
-
-IDLFLAGS = -s S.cpp -c C.cpp -B
-
-#----------------------------------------------------------------------------
-#	Local targets
-#----------------------------------------------------------------------------
-
-all: server
-
-server: $(addprefix $(VDIR),$(SVR_OBJS))
-	$(LINK.cc) -o server $(addprefix $(VDIR),$(SVR_OBJS)) $(LDFLAGS) $(ITIIOP) $(ITSRV) $(VLDLIBS)
-
-#----------------------------------------------------------------------------
-#	Dependencies
-#----------------------------------------------------------------------------
-# DO NOT DELETE THIS LINE -- g++dep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-
-.obj/cubit_impl.o .shobj/cubit_impl.so: cubit_impl.cpp cubit_impl.h cubit.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/config-sunos5.5-sunc++-4.x.h \
- $(ACE_ROOT)/ace/stdcpp.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i
-.obj/server.o .shobj/server.so: server.cpp cubit_impl.h cubit.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/config-sunos5.5-sunc++-4.x.h \
- $(ACE_ROOT)/ace/stdcpp.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i
-
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/IIOP/tests/Cubit/Orbix/tpool/cubit.h b/TAO/IIOP/tests/Cubit/Orbix/tpool/cubit.h
deleted file mode 100644
index 1c868a6597d..00000000000
--- a/TAO/IIOP/tests/Cubit/Orbix/tpool/cubit.h
+++ /dev/null
@@ -1,727 +0,0 @@
-
-#ifndef cubit_hh
-#define cubit_hh
-
-#include "ace/OS.h"
-#include <CORBA.h>
-
-
-#ifndef _Cubit_defined
-#define _Cubit_defined
-class Cubit_dispatch : public virtual CORBA::PPTR {
-public:
-
-      Cubit_dispatch (void *IT_p, CORBA::Object* IT_o, const char *IT_m, 
-        CORBA::LoaderClass *IT_l, char *IT_i, void* IT_im)
-       : PPTR (IT_p,IT_o,IT_m,IT_l,IT_i,IT_im) {}
-
-
-   Cubit_dispatch (char *IT_OR, void *IT_p, CORBA::Object *IT_o)
-       : PPTR (IT_OR,IT_p,IT_o) {}
-
-
-   Cubit_dispatch () {}
-
-   Cubit_dispatch (ObjectReference *IT_OR, void *IT_p, CORBA::Object *IT_o)
-       : PPTR (IT_OR,IT_p,IT_o) {}
-
-
-   Cubit_dispatch (void *IT_p, CORBA::Object *IT_o, const char *IT_m, 
-        char *IT_i, CORBA::Object* IT_ob, void* IT_im)
-       : PPTR (IT_p,IT_o,IT_m,IT_i,IT_ob,IT_im) {}
-
-
-   virtual unsigned char dispatch (CORBA::Request &IT_r, 
-        unsigned char IT_isTarget, void* IT_pp=NULL);
-
-
-};
-
-class Cubit;
-
-#ifndef CubitPtr
-#define CubitPtr
-
-typedef Cubit* Cubit_ptr;
-
-typedef Cubit* CubitRef;
-
-#endif
-
-
-#ifndef CubitForwH
-#define CubitForwH
-CORBA::ObjectRef Cubit_getBase (void *);
-void Cubit_release (Cubit *, CORBA::Environment &IT_env);
-void Cubit_release (Cubit_ptr);
-Cubit* Cubit_duplicate (Cubit_ptr, CORBA::Environment &IT_env);
-Cubit* Cubit_duplicate (Cubit_ptr );
-Cubit_ptr Cubit_nil (CORBA::Environment &IT_env);
-Cubit_ptr Cubit_nil ();
-#endif
-#define Cubit_IMPL "Cubit"
-
-
-class Cubit;
-
-typedef Cubit CubitProxy;
-#define Cubit_IR "Cubit$v1.1"
-#define Cubit_IMPL "Cubit"
-
-#ifndef CubitPtr
-#define CubitPtr
-
-typedef Cubit* Cubit_ptr;
-
-typedef Cubit* CubitRef;
-
-#endif
-
-class Cubit: public virtual CORBA::Object  {
-public:
-        Cubit (char *IT_OR);
-    Cubit (ObjectReference *IT_OR);
-    Cubit () : CORBA::Object  (1) {}
-protected:
-    Cubit_ptr __duplicate(
-            CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) {
-       CORBA::Object::__duplicate (IT_env);
-       return this;
-    }
-public:
-    static Cubit_ptr _duplicate(
-            Cubit_ptr, 
-            CORBA::Environment &IT_pEnv=CORBA::IT_chooseDefaultEnv ());
-public:
-   static Cubit* _bind (const char* IT_markerServer, const char* host,
-		const CORBA::Context &IT_c, 
-		CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-   static Cubit* _bind (CORBA::Environment &IT_env);
-   static Cubit* _bind (const char* IT_markerServer=NULL, const char* host=NULL,
-                 CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-    static Cubit* _narrow (CORBA::Object* , CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-    static Cubit_ptr _nil (CORBA::Environment &IT_pEnv=CORBA::IT_chooseDefaultEnv ()) {
-        CORBA::EnvExcRaiser IT_raise;
-        CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-        return (Cubit_ptr) CORBA::OBJECT_NIL;}
-
-#ifndef Cubit_Many_defined
-#define Cubit_Many_defined
-
-struct Many {
-    CORBA::Octet o;
-    CORBA::Long l;
-    CORBA::Short s;
-
-    void encodeOp (CORBA::Request &IT_r) const;
-    void decodeOp (CORBA::Request &IT_r);
-    void decodeInOutOp (CORBA::Request &IT_r);
-    Many(const Many &);
-    Many();
-    ~Many();
-    Many& operator= (const Many&);
-};
-
-#ifndef Cubit_ManyVarH
-#define Cubit_ManyVarH
-
-#ifndef Cubit_ManyvPtr
-#define Cubit_ManyvPtr
-typedef Many* Many_vPtr;
-typedef const Many* Many_cvPtr;
-#endif
-
-class Many_var : public CORBA::_var
-{
-    private:
-
-    unsigned char copyHelper (const Many_var &IT_s) {
-        if (!IT_s._ptr) {
-            _ptr = IT_s._ptr;
-        } else
-        {
-            _ptr = new Many;
-            *(_ptr) =  *(IT_s._ptr);
-        }
-        return 1;
-    }
-
-    public:
-
-    Many_var (const Many_var &IT_s) {
-        (void) copyHelper (IT_s);
-    }
-
-    Many_var () {
-        _ptr =  new Many;
-;
-    }
-
-    Many_var (Many *IT_p) {
-        _ptr = IT_p;
-    }
-
-    Many_var &operator= (Many *IT_p) {
-        if (_ptr != IT_p) {
-            delete _ptr;
-        }
-        _ptr = IT_p;
-        return (*this);
-    }
-
-    Many_var &operator= (const Many_var &IT_s) {
-        if (_ptr != IT_s._ptr) {
-            delete _ptr;
-        }
-        _ptr = new Many;
-        *(_ptr) =  *(IT_s._ptr);
-        return (*this);
-    }
-
-    ~Many_var () {
-        delete _ptr;
-    }
-
-    Many* operator-> () {
-        return _ptr;
-    }
-
-    operator Many_cvPtr () const { return _ptr;}
-    operator Many_vPtr& () { return _ptr;}
-    operator Many& () const { return * _ptr;}
-
-    protected:
-    Many *_ptr;
-    private:
-    Many_var &operator= (const CORBA::_var &IT_s);
-    Many_var (const CORBA::_var &IT_s);
-};
-
-#endif
-
-
-#endif
-
-enum discrim {e_0th,e_1st,e_2nd,e_3rd,e_4th,e_5th, IT__ENUM_Cubit_discrim=CORBA_ULONG_MAX};
-
-#ifndef Cubit_oneof_defined
-#define Cubit_oneof_defined
-
-struct oneof {
-    private:
-
-    discrim __d;
-    union {
-        CORBA::Octet _o_;
-        CORBA::Short _s_;
-        CORBA::Long _l_;
-        Many * _cm_;
-    };
-
-    public:
-
-    void encodeOp (CORBA::Request &IT_r) const;
-    void decodeOp (CORBA::Request &IT_r);
-    void decodeInOutOp (CORBA::Request &IT_r);
-
-    private:
-
-    unsigned char isSet;
-
-    public:
-
-    discrim _d () const { return __d; }
-
-    CORBA::Octet o () const {
-      return _o_;
-    }
-
-    void o (CORBA::Octet IT_member) {
-        if (isSet && (__d != Cubit::e_0th))
-        {
-            this-> oneof::~oneof();
-            memset(this, 0, sizeof(*this));
-        }
-
-        __d = Cubit::e_0th;
-        isSet = 1;
-        _o_ = IT_member;
-    }
-
-    CORBA::Short s () const {
-        return _s_;
-    }
-
-    void s (CORBA::Short IT_member) {
-        if (isSet && (__d != Cubit::e_1st))
-        {
-            this-> oneof::~oneof();
-            memset(this, 0, sizeof(*this));
-        }
-
-        __d = Cubit::e_1st;
-        isSet = 1;
-        _s_ = IT_member;
-    }
-
-    CORBA::Long l () const {
-        return _l_;
-    }
-
-    void l (CORBA::Long IT_member) {
-        if (isSet && (__d != Cubit::e_2nd))
-        {
-            this-> oneof::~oneof();
-            memset(this, 0, sizeof(*this));
-        }
-
-        __d = Cubit::e_2nd;
-        isSet = 1;
-        _l_ = IT_member;
-    }
-
-    Many& cm () {
-        return (*_cm_);
-    }
-
-    const Many& cm () const {
-        return (*_cm_);
-    }
-
-    void cm (const Many& IT_member) {
-        if (isSet && (__d != Cubit::e_3rd))
-        {
-            this-> oneof::~oneof();
-            memset(this, 0, sizeof(*this));
-        }
-
-        __d = Cubit::e_3rd;
-
-        if (!isSet) {
-            _cm_ = new Many;
-            isSet = 1;
-        }
-        *(_cm_) = IT_member;
-    }
-
-
-    oneof();
-    oneof(const oneof &);
-    ~oneof();
-    oneof& operator= (const oneof&);
-};
-
-#ifndef Cubit_oneofVarH
-#define Cubit_oneofVarH
-
-#ifndef Cubit_oneofvPtr
-#define Cubit_oneofvPtr
-typedef oneof* oneof_vPtr;
-typedef const oneof* oneof_cvPtr;
-#endif
-
-class oneof_var : public CORBA::_var
-{
-    private:
-
-    unsigned char copyHelper (const oneof_var &IT_s) {
-        if (!IT_s._ptr) {
-            _ptr = IT_s._ptr;
-        } else
-        {
-            _ptr = new oneof;
-            *(_ptr) =  *(IT_s._ptr);
-        }
-        return 1;
-    }
-
-    public:
-
-    oneof_var (const oneof_var &IT_s) {
-        (void) copyHelper (IT_s);
-    }
-
-    oneof_var () {
-        _ptr = NULL;
-    }
-
-    oneof_var (oneof *IT_p) {
-        _ptr = IT_p;
-    }
-
-    oneof_var &operator= (oneof *IT_p) {
-        if (_ptr != IT_p) {
-            delete _ptr;
-        }
-        _ptr = IT_p;
-        return (*this);
-    }
-
-    oneof_var &operator= (const oneof_var &IT_s) {
-        if (_ptr != IT_s._ptr) {
-            delete _ptr;
-        }
-        _ptr = new oneof;
-        *(_ptr) =  *(IT_s._ptr);
-        return (*this);
-    }
-
-    ~oneof_var () {
-        delete _ptr;
-    }
-
-    oneof* operator-> () {
-        return _ptr;
-    }
-
-    operator oneof_cvPtr () const { return _ptr;}
-    operator oneof_vPtr& () { return _ptr;}
-    operator oneof& () const { return * _ptr;}
-
-    protected:
-    oneof *_ptr;
-    private:
-    oneof_var &operator= (const CORBA::_var &IT_s);
-    oneof_var (const CORBA::_var &IT_s);
-};
-
-#endif
-
-
-#endif
-        virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual Many cube_struct (const Many& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual oneof cube_union (const oneof& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual void please_exit (CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-};
-
-#ifndef CubitVarH
-#define CubitVarH
-
-#ifndef CubitvPtr
-#define CubitvPtr
-typedef Cubit* Cubit_vPtr;
-typedef const Cubit* Cubit_cvPtr;
-#endif
-
-class Cubit_var : public CORBA::_var
-{
-    private:
-
-    unsigned char copyHelper (const Cubit_var &IT_s) {
-        {
-            _ptr = Cubit_duplicate (IT_s._ptr);
-        }
-        return 1;
-    }
-
-    public:
-
-    Cubit_var (const Cubit_var &IT_s) {
-        (void) copyHelper (IT_s);
-    }
-
-    Cubit_var () {
-        _ptr = Cubit_nil ();
-    }
-
-    Cubit_var (Cubit *IT_p) {
-        _ptr = IT_p;
-    }
-
-    Cubit_var &operator= (Cubit *IT_p) {
-        Cubit_release (_ptr);
-        _ptr = IT_p;
-        return (*this);
-    }
-
-    Cubit_var &operator= (const Cubit_var &IT_s) {
-        Cubit_release (_ptr);
-        _ptr = Cubit_duplicate (IT_s._ptr);
-        return (*this);
-    }
-
-    ~Cubit_var () {
-        Cubit_release (_ptr);
-    }
-
-    Cubit* operator-> () {
-        return _ptr;
-    }
-
-    operator Cubit_cvPtr () const { return _ptr;}
-    operator Cubit_vPtr& () { return _ptr;}
-
-    protected:
-    Cubit *_ptr;
-    private:
-    Cubit_var &operator= (const CORBA::_var &IT_s);
-    Cubit_var (const CORBA::_var &IT_s);
-    Cubit_var &operator= (const CORBA::_mgr &IT_s);
-    Cubit_var &operator= (const CORBA::_SeqElem &IT_s);
-    Cubit_var (const CORBA::_mgr &IT_s);
-    Cubit_var (const CORBA::_SeqElem &IT_s);
-};
-
-#endif
-
-
-#ifndef CubitMgrH
-#define CubitMgrH
-
-class Cubit_mgr : public CORBA::_mgr
-{
-    public:
-
-    Cubit_mgr () {
-        _ptr = Cubit_nil ();
-        _release = 1;
-    }
-
-    Cubit_mgr (const Cubit_mgr &IT_s) {
-        _ptr = Cubit_duplicate (IT_s._ptr);
-        _release = 1;
-    }
-
-    Cubit_mgr &operator= (Cubit *IT_p) {
-        if (_ptr && _release)
-            Cubit_release (_ptr);
-        _ptr = IT_p;
-        _release = 1;
-        return (*this);
-    }
-
-    Cubit_mgr &operator= (const Cubit_mgr &IT_s) {
-        if (_ptr && _release)
-            Cubit_release (_ptr);
-        _ptr = Cubit_duplicate(IT_s._ptr);
-        _release = 1;
-        return (*this);
-    }
-
-    Cubit_mgr &operator= (Cubit_var &IT_s) {
-        if (_ptr && _release)
-            Cubit_release (_ptr);
-        _ptr = Cubit_duplicate(IT_s);
-        _release = 1;
-        return (*this);
-    }
-
-    ~Cubit_mgr () {
-        if (_release)
-            Cubit_release (_ptr);
-    }
-
-    unsigned char release () {
-        return _release;
-    }
-
-    void release (unsigned char rel) {
-        _release = rel;
-    }
-
-    operator int () const {
-        return (((CORBA::Object_ptr) _ptr) ? 1 : 0);
-    }
-
-    operator void* () const {
-        return _ptr;
-    }
-
-    operator CORBA::Object * () const {
-        return (CORBA::Object *) _ptr;
-    }
-
-    operator Cubit* () const {
-        return (Cubit*) _ptr;
-    }
-
-    Cubit_ptr operator-> () const {
-        return _ptr;
-    }
-
-    Cubit *_ptr;
-
-    protected:
-
-    unsigned char _release;
-};
-
-typedef Cubit_mgr Cubit_mgr_IT_const;
-#endif
-
-#ifndef CubitSeqElemH
-#define CubitSeqElemH
-
-class Cubit_SeqElem : public CORBA::_SeqElem
-{
-    public:
-
-    Cubit_SeqElem (Cubit_ptr* IT_p, unsigned char rel) {
-        _ptr = IT_p;
-        _release = rel;
-    }
-
-    Cubit_SeqElem &operator= (Cubit_ptr IT_p) {
-        if (_ptr) {
-            if (*(_ptr) && _release)
-                Cubit_release (*(_ptr));
-            *(_ptr) = IT_p;
-        }
-        return (*this);
-    }
-
-    Cubit_SeqElem &operator= (const Cubit_SeqElem &IT_s) {
-        if (_ptr && IT_s._ptr) {
-            if (*(_ptr) && _release)
-                Cubit_release (*(_ptr));
-            *(_ptr) = Cubit_duplicate(*(IT_s._ptr));
-        }
-        return (*this);
-    }
-
-    operator Cubit_ptr () const {
-        return _ptr ? (Cubit_ptr) (*_ptr) : Cubit_nil(); 
-    }
-
-    Cubit_ptr operator->() const { return *_ptr;}
-
-    protected:
-    Cubit_ptr *_ptr;
-    unsigned char _release;
-};
-
-#endif
-
-
-#define TIE_Cubit(X) Cubit##X
-
-#define DEF_TIE_Cubit(X) \
-	class Cubit##X : public virtual Cubit {		\
-	  X* m_obj;						\
-	public:							\
-								\
-								\
-	   Cubit##X  (X *objp, const char* m="", CORBA::LoaderClass *l=0)\
-		: Cubit(), m_obj(objp) {	\
-		m_pptr = new Cubit_dispatch		\
-			(( Cubit*)this,(CORBA::Object*)this,m,l,Cubit_IR,m_obj);	\
-	   }								\
-	   Cubit##X  (CORBA::Object *IT_p, const char* IT_m="", void *IT_q=0)\
-		: Cubit() {	\
-		m_pptr = new Cubit_dispatch		\
-			(( Cubit*)this,(CORBA::Object*)this,IT_m,Cubit_IR,IT_p,IT_q);	\
-		m_obj = (X*)(m_pptr->getImplObj ());			\
-	   }								\
-								\
-	   virtual ~Cubit##X  () {				\
-		if (_okToDeleteImpl ()) delete m_obj; }					\
-	   virtual void* _deref () {					\
-		return m_obj; }					\
-								\
-virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_octet (  o,IT_env);\
-}\
-	\
-virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_short (  s,IT_env);\
-}\
-	\
-virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_long (  l,IT_env);\
-}\
-	\
-virtual Cubit::Many cube_struct (const Cubit::Many& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_struct (  values,IT_env);\
-}\
-	\
-virtual Cubit::oneof cube_union (const Cubit::oneof& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_union (  values,IT_env);\
-}\
-	\
-virtual void please_exit (CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-m_obj->please_exit (IT_env);\
-}\
-								\
-	};						\
-
-
-#define QUALS_Cubit	\
-virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_octet (  o,IT_env);\
-}\
-	\
-virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_short (  s,IT_env);\
-}\
-	\
-virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_long (  l,IT_env);\
-}\
-	\
-virtual Many cube_struct (const Many& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_struct (  values,IT_env);\
-}\
-	\
-virtual oneof cube_union (const oneof& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_union (  values,IT_env);\
-}\
-	\
-virtual void please_exit (CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-m_obj->please_exit (IT_env);\
-}\
-
-
-
-
-class CubitProxyFactoryClass : public virtual CORBA::ObjectFactoryClass {
-public:
-   CubitProxyFactoryClass (unsigned char IT_p=0)
-		: CORBA::ProxyFactory (Cubit_IR, IT_p) {}
-
-    virtual void* New (char *IT_OR, CORBA::Environment&);
-
-    virtual void* New (ObjectReference *IT_OR, CORBA::Environment&);
-
-    virtual void* New2 (); 
-
-    virtual CORBA::Object* NewObject (char *IT_OR, CORBA::Environment&);
-
-    virtual CORBA::Object* NewObject (ObjectReference *IT_OR, CORBA::Environment&);
-
-    virtual CORBA::Object* New2Object (); 
-
-    virtual void* IT_castUp (void *IT_p, char* IT_s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-
-    virtual CORBA::PPTR* pptr (void *IT_p);
-
-    virtual void baseInterfaces (_IDL_SEQUENCE_string&);
-
-
-};
-
-extern CubitProxyFactoryClass CubitProxyFactory;
-
-class CubitBOAImpl : public virtual Cubit  {
-public:
-    CubitBOAImpl (const char *m="", CORBA::LoaderClass *l=NULL) {
-  if (CORBA::PPTR::isOK (m_pptr, Cubit_IR))
-    m_pptr = new Cubit_dispatch ( (Cubit*)this,
-   	 (CORBA::Object*)this, m, l, Cubit_IR, this);
-}
-
-        virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual Many cube_struct (const Many& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual oneof cube_union (const oneof& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual void please_exit (CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-};
-
-
-#endif
-
-
-#endif
diff --git a/TAO/IIOP/tests/Cubit/Orbix/tpool/cubit.idl b/TAO/IIOP/tests/Cubit/Orbix/tpool/cubit.idl
deleted file mode 100644
index d9b38c34a2a..00000000000
--- a/TAO/IIOP/tests/Cubit/Orbix/tpool/cubit.idl
+++ /dev/null
@@ -1,40 +0,0 @@
-// @(#)cubit.idl	1.1 95/09/10
-// Copyright 1994-1995 by Sun Microsystems, Inc.
-
-#pragma prefix	"Eng.SUN.COM"
-#pragma version Cubit 1.1
-
-interface Cubit {
-    octet	cube_octet (in octet o);
-    short	cube_short (in short s);
-    long	cube_long (in long l);
-
-    struct Many {
-	octet	o;		// + 3 bytes padding (normally) ...
-	long	l;
-	short	s;		// + 2 bytes padding (normally) ...
-    };
-
-    Many	cube_struct (in Many values);
-
-    enum discrim {e_0th, e_1st, e_2nd, e_3rd, e_4th, e_5th};
-
-    union oneof
-    switch (discrim) {
-	// this is an easy union to interpret; no padding
-	// is needed between discriminant and value.
-      case e_0th:
-        octet		o;
-      case e_1st:
-        short		s;
-      case e_2nd:
-        long		l;
-      case e_3rd:
-      default:
-        Many		cm;
-    };
-
-    oneof	cube_union (in oneof values);
-
-    oneway void	please_exit ();
-};
diff --git a/TAO/IIOP/tests/Cubit/Orbix/tpool/cubitC.cpp b/TAO/IIOP/tests/Cubit/Orbix/tpool/cubitC.cpp
deleted file mode 100644
index c47e38f26ee..00000000000
--- a/TAO/IIOP/tests/Cubit/Orbix/tpool/cubitC.cpp
+++ /dev/null
@@ -1,557 +0,0 @@
-#include "cubit.h"
-
-Cubit::Cubit (char *IT_OR) {
-      m_pptr = new Cubit_dispatch (IT_OR, this,(CORBA::Object*)this);
-} 
-Cubit::Cubit (ObjectReference *IT_OR) {
-      m_pptr = new Cubit_dispatch (IT_OR, this,(CORBA::Object*)this);
-} 
-
-#ifndef CubitForwC
-#define CubitForwC
-CORBA::ObjectRef Cubit_getBase(void *IT_p){
-    return (Cubit*) IT_p;}
-
-void Cubit_release (Cubit_ptr IT_p, CORBA::Environment &IT_env) {
-    CORBA::release(IT_p, IT_env);}
-
-void Cubit_release (Cubit_ptr IT_p) {
-    Cubit_release (IT_p, CORBA::IT_chooseDefaultEnv ()); }
-
-Cubit_ptr Cubit_nil (CORBA::Environment &) {
-    return Cubit:: _nil ();}
-
-Cubit_ptr Cubit_nil () {
-    return Cubit_nil (CORBA::IT_chooseDefaultEnv ());}
-
-Cubit_ptr Cubit_duplicate (Cubit_ptr IT_p, CORBA::Environment &IT_env) {
-    return (Cubit::_duplicate(IT_p, IT_env)); }
-Cubit_ptr Cubit_duplicate (Cubit_ptr IT_p) {
-    return Cubit_duplicate (IT_p, CORBA::IT_chooseDefaultEnv ()); }
-#endif
-
-Cubit_ptr Cubit::_duplicate(Cubit_ptr obj, CORBA::Environment& IT_pEnv) {
-        CORBA::EnvExcRaiser IT_raise;
-        CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-       if (!obj) {
-          return (obj);
-       }
-       Cubit_ptr IT_obj = obj->__duplicate (IT_env);
-       return IT_obj;
-}
-
-
-
-Cubit* Cubit:: _bind (const char* IT_markerServer, const char* host,
-		const CORBA::Context &IT_c, 
-		CORBA::Environment &IT_env) {
-       return (Cubit*)CORBA::Factory.New (IT_markerServer, IT_env, IT_c, host, 
-		Cubit_IMPL, Cubit_IR);
-}
-
-
-
-Cubit* Cubit:: _bind (CORBA::Environment &IT_env) {
-       return _bind (NULL,NULL,CORBA::Context(), IT_env); }
-
-
-Cubit* Cubit:: _bind (const char* IT_markerServer, const char* host,
-                CORBA::Environment &IT_env) {
-       return _bind (IT_markerServer, host, CORBA::Context (), IT_env); }
-Cubit* Cubit::_narrow (CORBA::Object* IT_obj, CORBA::Environment &IT_pEnv) {
-        CORBA::EnvExcRaiser IT_raise;
-        CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-        if (CORBA::is_nil (IT_obj)) {
-                return Cubit:: _nil();
-        }
-
-       Cubit* IT_p = (Cubit*)CORBA::Object::_castDown (IT_obj, Cubit_IR, IT_env);
-        IT_p = IT_p ? IT_p->__duplicate(IT_env) : NULL;
-        if ((IT_env) &&(!strcmp(IT_env.exception()->id(), "CORBA::StExcep::BAD_PARAM")) && (((CORBA::BAD_PARAM*)IT_env.exception())-> minor() == NARROW_FAILED)) {
-                IT_env.exception_free();
-        }
-        return IT_p;
-   }
-
-
-#ifndef Cubit_Many_Ops
-#define Cubit_Many_Ops
-
-void Cubit::Many:: encodeOp (CORBA::Request &IT_r) const {
-
-    IT_r.insertOctet (o);
-
-    IT_r << l;
-
-    IT_r << s;
-}
-
-void Cubit::Many:: decodeOp (CORBA::Request &IT_r) {
-
-    IT_r.extractOctet (o);
-
-    IT_r >> l;
-
-    IT_r >> s;
-}
-
-void Cubit::Many:: decodeInOutOp (CORBA::Request &IT_r) {
-
-    IT_r.extractOctet (o);
-
-    IT_r >> l;
-
-    IT_r >> s;
-}
-
-Cubit::Many ::~Many () {
-}
-
-Cubit::Many:: Many (const Cubit::Many &IT_s) 
-	 {
-    o = IT_s.o;
-    l = IT_s.l;
-    s = IT_s.s;
-}
-
-Cubit::Many:: Many () {
-}
-
-Cubit::Many &Cubit::Many:: operator= (const Cubit::Many& IT_s) {
-    if (this == &IT_s) return *this;
-    o = IT_s.o;
-    l = IT_s.l;
-    s = IT_s.s;
-    return *this;
-}
-
-
-#endif
-
-
-#ifndef Cubit_oneof_Ops
-#define Cubit_oneof_Ops
-void Cubit::oneof:: encodeOp (CORBA::Request &IT_r) const {
-    if (!isSet) return;
-    {
-    CORBA::ULong IT_0 = (CORBA::ULong) __d;
-    IT_r << IT_0;
-    }
-    switch (__d) {
-        case Cubit::e_0th: 
-        IT_r.insertOctet (_o_);
-        break;
-        case Cubit::e_1st: 
-        IT_r << _s_;
-        break;
-        case Cubit::e_2nd: 
-        IT_r << _l_;
-        break;
-        case Cubit::e_3rd: 
-        default: 
-        (*_cm_).encodeOp (IT_r);
-        break;
-    }
-
-}
-
-void Cubit::oneof:: decodeOp (CORBA::Request &IT_r) {
-    isSet = 0;
-    {
-    CORBA::ULong IT_1;
-    IT_r >> IT_1;
-    __d = Cubit::discrim(IT_1);
-    }
-    switch (__d) {
-        case Cubit::e_0th: 
-        if (!isSet) {
-            isSet = 1;
-        }
-        IT_r.extractOctet (_o_);
-        break;
-        case Cubit::e_1st: 
-        if (!isSet) {
-            isSet = 1;
-        }
-        IT_r >> _s_;
-        break;
-        case Cubit::e_2nd: 
-        if (!isSet) {
-            isSet = 1;
-        }
-        IT_r >> _l_;
-        break;
-        case Cubit::e_3rd: 
-        default: 
-        if (!isSet) {
-            _cm_ = new Cubit::Many;
-            isSet = 1;
-        }
-        (*_cm_).decodeOp (IT_r);
-        break;
-    }
-
-}
-void Cubit::oneof:: decodeInOutOp (CORBA::Request &IT_r) {
-    Cubit::discrim IT_d;
-    {
-    CORBA::ULong IT_2;
-    IT_r >> IT_2;
-    IT_d = Cubit::discrim(IT_2);
-    }
-    if (IT_d == __d)
-        switch (__d) {
-            case Cubit::e_0th: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r.extractOctet (_o_);
-            break;
-            case Cubit::e_1st: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r >> _s_;
-            break;
-            case Cubit::e_2nd: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r >> _l_;
-            break;
-            case Cubit::e_3rd: 
-            default: 
-            if (!isSet) {
-                _cm_ = new Cubit::Many;
-                isSet = 1;
-            }
-            (*_cm_).decodeInOutOp (IT_r);
-            break;
-        }
-
-    else {
-        this->oneof:: ~oneof();
-        memset(this, 0, sizeof(*this));
-        __d = IT_d;
-        switch (__d) {
-            case Cubit::e_0th: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r.extractOctet (_o_);
-            break;
-            case Cubit::e_1st: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r >> _s_;
-            break;
-            case Cubit::e_2nd: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r >> _l_;
-            break;
-            case Cubit::e_3rd: 
-            default: 
-            if (!isSet) {
-                _cm_ = new Cubit::Many;
-                isSet = 1;
-            }
-            (*_cm_).decodeOp (IT_r);
-            break;
-        }
-        isSet = 1;
-    }
-
-}
-
-Cubit::oneof:: oneof() { 
-    memset(this, 0, sizeof(*this));
-    isSet = 0;
-}
-
-Cubit::oneof ::~oneof() {
-    if (!isSet) return;
-    switch (__d) { 
-        case Cubit::e_0th:         break;
-        case Cubit::e_1st:         break;
-        case Cubit::e_2nd:         break;
-        case Cubit::e_3rd: 
-        default:         if (_cm_) delete _cm_;
-        break;
-    }
-
-    isSet = 0;
-}
-
-Cubit::oneof:: oneof (const Cubit::oneof &IT_s) {
-    isSet = 0;
-    memset(this, 0, sizeof(*this));
-    __d = IT_s.__d;
-    switch (__d) {
-        case Cubit::e_0th:         isSet = 1;
-        _o_ = IT_s._o_;
-        break;
-        case Cubit::e_1st:         isSet = 1;
-        _s_ = IT_s._s_;
-        break;
-        case Cubit::e_2nd:         isSet = 1;
-        _l_ = IT_s._l_;
-        break;
-        case Cubit::e_3rd: 
-        default: 
-        if (!isSet) {
-            _cm_ = new Cubit::Many;
-            isSet = 1;
-        }
-        *(_cm_) = *(IT_s._cm_);
-        break;
-    }
-    isSet = 1;
-}
-
-Cubit::oneof& Cubit::oneof:: operator= (const Cubit::oneof & IT_s) {
-    if (this == &IT_s) return *this;
-    if (isSet && (__d != IT_s.__d))
-    {
-        this-> oneof::~oneof();
-        memset(this, 0, sizeof(*this));
-    }
-
-    __d = IT_s.__d;
-    switch (__d) {
-        case Cubit::e_0th:         isSet = 1;
-        _o_ = IT_s._o_;
-        break;
-        case Cubit::e_1st:         isSet = 1;
-        _s_ = IT_s._s_;
-        break;
-        case Cubit::e_2nd:         isSet = 1;
-        _l_ = IT_s._l_;
-        break;
-        case Cubit::e_3rd: 
-        default: 
-        if (!isSet) {
-            _cm_ = new Cubit::Many;
-            isSet = 1;
-        }
-        *(_cm_) = *(IT_s._cm_);
-        break;
-    }
-    isSet = 1;
-    return *this;
-}
-
-
-#endif
-
-void* CubitProxyFactoryClass::New (char *IT_OR, CORBA::Environment&) {
-        return  new class Cubit(IT_OR);}
-
-void* CubitProxyFactoryClass::New (ObjectReference *IT_OR, CORBA::Environment&) {
-        return  new class Cubit(IT_OR);}
-
-void* CubitProxyFactoryClass::New2 () {
-        return  new class Cubit((char*)0);}
-
-CORBA::Object* CubitProxyFactoryClass::NewObject (char *IT_OR, CORBA::Environment&) {
-        return  new class Cubit(IT_OR);}
-
-CORBA::Object* CubitProxyFactoryClass::NewObject (ObjectReference *IT_OR, CORBA::Environment&) {
-        return  new class Cubit(IT_OR);}
-
-CORBA::Object* CubitProxyFactoryClass::New2Object () {
-        return  new class Cubit((char*)0);}
-
-void* CubitProxyFactoryClass::IT_castUp (void *IT_p, char* IT_s, CORBA::Environment &IT_env) {
-      void *IT_l;
-      if (!CORBA::_interfaceCmp (IT_s,Cubit_IR, IT_env))
-         return IT_p;
-      else if (IT_l=CORBA::ObjectFactoryClass::IT_castUp((CORBA::Object*)((class Cubit*)IT_p),IT_s, IT_env))
-         return IT_l;
-      else return NULL;
-    }
-
-
-CORBA::PPTR* CubitProxyFactoryClass::pptr (void *IT_p) {
-       return ((class Cubit*)IT_p)->_pptr ();}
-
-void CubitProxyFactoryClass::baseInterfaces (_IDL_SEQUENCE_string& seq) {
-      add (seq, Cubit_IR);
-      CORBA::ObjectFactoryClass::baseInterfaces (seq);
-}
-
-CubitProxyFactoryClass CubitProxyFactory(1);
-
-CORBA::Octet Cubit:: cube_octet (CORBA::Octet o, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        return 0;
-    }
-    CORBA::Request IT_r (this, "cube_octet",IT_env,1,0);
-    if (!IT_r.isException (IT_env)) {
-
-        IT_r.insertOctet (o);
-    }
-
-    IT_r.invoke (CORBA::Flags(0),IT_env);
-    if (!IT_r.isException (IT_env)) {
-        CORBA::Octet IT_result;
-        IT_r.extractOctet (IT_result);
-        IT_r.checkEnv (IT_env);
-        return IT_result;
-    }
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-    return 0;
-}
-
-CORBA::Short Cubit:: cube_short (CORBA::Short s, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        return 0;
-    }
-    CORBA::Request IT_r (this, "cube_short",IT_env,1,0);
-    if (!IT_r.isException (IT_env)) {
-
-        IT_r << s;
-    }
-
-    IT_r.invoke (CORBA::Flags(0),IT_env);
-    if (!IT_r.isException (IT_env)) {
-        CORBA::Short IT_result;
-        IT_r >> IT_result;
-        IT_r.checkEnv (IT_env);
-        return IT_result;
-    }
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-    return 0;
-}
-
-CORBA::Long Cubit:: cube_long (CORBA::Long l, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        return 0;
-    }
-    CORBA::Request IT_r (this, "cube_long",IT_env,1,0);
-    if (!IT_r.isException (IT_env)) {
-
-        IT_r << l;
-    }
-
-    IT_r.invoke (CORBA::Flags(0),IT_env);
-    if (!IT_r.isException (IT_env)) {
-        CORBA::Long IT_result;
-        IT_r >> IT_result;
-        IT_r.checkEnv (IT_env);
-        return IT_result;
-    }
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-    return 0;
-}
-
-Cubit::Many Cubit:: cube_struct (const Cubit::Many& values, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        { 
-            Cubit::Many IT_l0;
-            return IT_l0;
-        }
-    }
-    CORBA::Request IT_r (this, "cube_struct",IT_env,1,0);
-    if (!IT_r.isException (IT_env)) {
-
-        values.encodeOp (IT_r);
-    }
-
-    IT_r.invoke (CORBA::Flags(0),IT_env);
-    if (!IT_r.isException (IT_env)) {
-        Cubit::Many IT_result;
-        IT_result.decodeOp (IT_r);
-        IT_r.checkEnv (IT_env);
-        return IT_result;
-    }
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-    { 
-        Cubit::Many IT_l1;
-        return IT_l1;
-    }
-}
-
-Cubit::oneof Cubit:: cube_union (const Cubit::oneof& values, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        { 
-            Cubit::oneof IT_l0;
-            return IT_l0;
-        }
-    }
-    CORBA::Request IT_r (this, "cube_union",IT_env,1,0);
-    if (!IT_r.isException (IT_env)) {
-
-        values.encodeOp (IT_r);
-    }
-
-    IT_r.invoke (CORBA::Flags(0),IT_env);
-    if (!IT_r.isException (IT_env)) {
-        Cubit::oneof IT_result;
-        IT_result.decodeOp (IT_r);
-        IT_r.checkEnv (IT_env);
-        return IT_result;
-    }
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-    { 
-        Cubit::oneof IT_l1;
-        return IT_l1;
-    }
-}
-
-void Cubit:: please_exit (CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        return ;
-    }
-    CORBA::Request IT_r (this, "please_exit",IT_env,1,1);
-
-    IT_r.invoke (CORBA::Flags(CORBA::INV_NO_RESPONSE), IT_env);
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-}
-
-
-
-
-
-#ifndef Cubit_dispatch_impl
-
-unsigned char Cubit_dispatch::dispatch (CORBA::Request &IT_r, 
-    unsigned char, void *) {
-      IT_r.makeRuntimeException1 ("Cubit");
-      return 0;
-}
- 
-#endif
-
diff --git a/TAO/IIOP/tests/Cubit/Orbix/tpool/cubitS.cpp b/TAO/IIOP/tests/Cubit/Orbix/tpool/cubitS.cpp
deleted file mode 100644
index 449a8c23548..00000000000
--- a/TAO/IIOP/tests/Cubit/Orbix/tpool/cubitS.cpp
+++ /dev/null
@@ -1,226 +0,0 @@
-#include "cubit.h"
-
-
-#define Cubit_dispatch_impl
-
-unsigned char Cubit_dispatch::dispatch (CORBA::Request &IT_r, 
- unsigned char IT_isTarget, void *IT_pp) {
-    if (!IT_pp)
-       IT_pp = m_obj;
-    const char *IT_s = IT_r.getOperation ();
-    if (!strcmp(IT_s,"cube_octet")) {
-        CORBA::Octet IT_result;
-        CORBA::Environment IT_env (IT_r);
-        CORBA::Filter* IT_f = CORBA::Orbix.getFilter ();
-        if (!IT_r.tcAssert ("\
-Ro~cube_octet~+o{o},>{o},N{}\
-"))
-            return 1;
-        CORBA::Octet o;
-
-        IT_r.extractOctet (o);
-
-        if (IT_f && !IT_r.isException (IT_env))
-        	IT_f->inRequestPostM (IT_r, IT_env);
-        if (!IT_r.isException (IT_env)) {
-            try {
-                	IT_result = ((Cubit*)IT_pp)->cube_octet (  o, IT_env);
-
-            } catch (CORBA::SystemException &IT_exSys) {
-            IT_env.propagate (&IT_exSys);
-            } catch (CORBA::UserException &IT_exUsr) {
-            IT_env.propagate (&IT_exUsr);
-            }
-        }
-
-        if (!IT_r.isException (IT_env)) {
-            if (!IT_r.convertToReply ("\
-o\
-", IT_env)) return 1;
-            IT_r.insertOctet (IT_result);
-            }
-
-        else IT_r.makeSystemException (IT_env);
-        return 1;
-    }
-
-    if (!strcmp(IT_s,"cube_short")) {
-        CORBA::Short IT_result;
-        CORBA::Environment IT_env (IT_r);
-        CORBA::Filter* IT_f = CORBA::Orbix.getFilter ();
-        if (!IT_r.tcAssert ("\
-Ro~cube_short~+s{s},>{s},N{}\
-"))
-            return 1;
-        CORBA::Short s;
-
-        IT_r >> s;
-
-        if (IT_f && !IT_r.isException (IT_env))
-        	IT_f->inRequestPostM (IT_r, IT_env);
-        if (!IT_r.isException (IT_env)) {
-            try {
-                	IT_result = ((Cubit*)IT_pp)->cube_short (  s, IT_env);
-
-            } catch (CORBA::SystemException &IT_exSys) {
-            IT_env.propagate (&IT_exSys);
-            } catch (CORBA::UserException &IT_exUsr) {
-            IT_env.propagate (&IT_exUsr);
-            }
-        }
-
-        if (!IT_r.isException (IT_env)) {
-            if (!IT_r.convertToReply ("\
-s\
-", IT_env)) return 1;
-            IT_r << IT_result;
-            }
-
-        else IT_r.makeSystemException (IT_env);
-        return 1;
-    }
-
-    if (!strcmp(IT_s,"cube_long")) {
-        CORBA::Long IT_result;
-        CORBA::Environment IT_env (IT_r);
-        CORBA::Filter* IT_f = CORBA::Orbix.getFilter ();
-        if (!IT_r.tcAssert ("\
-Ro~cube_long~+l{l},>{l},N{}\
-"))
-            return 1;
-        CORBA::Long l;
-
-        IT_r >> l;
-
-        if (IT_f && !IT_r.isException (IT_env))
-        	IT_f->inRequestPostM (IT_r, IT_env);
-        if (!IT_r.isException (IT_env)) {
-            try {
-                	IT_result = ((Cubit*)IT_pp)->cube_long (  l, IT_env);
-
-            } catch (CORBA::SystemException &IT_exSys) {
-            IT_env.propagate (&IT_exSys);
-            } catch (CORBA::UserException &IT_exUsr) {
-            IT_env.propagate (&IT_exUsr);
-            }
-        }
-
-        if (!IT_r.isException (IT_env)) {
-            if (!IT_r.convertToReply ("\
-l\
-", IT_env)) return 1;
-            IT_r << IT_result;
-            }
-
-        else IT_r.makeSystemException (IT_env);
-        return 1;
-    }
-
-    if (!strcmp(IT_s,"cube_struct")) {
-        Cubit::Many IT_result;
-        CORBA::Environment IT_env (IT_r);
-        CORBA::Filter* IT_f = CORBA::Orbix.getFilter ();
-        if (!IT_r.tcAssert ("\
-Ro~cube_struct~+values{R~Cubit::Many~o{o},l{l},s{s}},>{R~Cubit::Many~o{o},l{l},s{s}},N{}\
-"))
-            return 1;
-        Cubit::Many values;
-
-        values.decodeOp (IT_r);
-
-        if (IT_f && !IT_r.isException (IT_env))
-        	IT_f->inRequestPostM (IT_r, IT_env);
-        if (!IT_r.isException (IT_env)) {
-            try {
-                	IT_result = ((Cubit*)IT_pp)->cube_struct (  values, IT_env);
-
-            } catch (CORBA::SystemException &IT_exSys) {
-            IT_env.propagate (&IT_exSys);
-            } catch (CORBA::UserException &IT_exUsr) {
-            IT_env.propagate (&IT_exUsr);
-            }
-        }
-
-        if (!IT_r.isException (IT_env)) {
-            if (!IT_r.convertToReply ("\
-R~Cubit::Many~o{o},l{l},s{s}\
-", IT_env)) return 1;
-            IT_result.encodeOp (IT_r);
-            }
-
-        else IT_r.makeSystemException (IT_env);
-        return 1;
-    }
-
-    if (!strcmp(IT_s,"cube_union")) {
-        Cubit::oneof IT_result;
-        CORBA::Environment IT_env (IT_r);
-        CORBA::Filter* IT_f = CORBA::Orbix.getFilter ();
-        IT_r.tcPreAssert (
-"\
-Ro~cube_union~+values{U~Cubit::oneof~{E~Cubit::discrim~e_0th,e_1st,e_2nd,e_3rd,e_4th,e_5th}~Cubit::e_0th o{o};Cubit::e_1st s{s};Cubit::e_2nd l{l};Cubit::e_3rd,$ cm{R~Cubit::Many~o{o},l{l},s{s}}},>{U~Cubit::oneof~{E~Cubit::discrim~e_0th,e_1st,e_2nd,e_3rd,\
-");
-        if (!IT_r.tcAssert ("\
-e_4th,e_5th}~Cubit::e_0th o{o};Cubit::e_1st s{s};Cubit::e_2nd l{l};Cubit::e_3rd,$ cm{R~Cubit::Many~o{o},l{l},s{s}}},N{}\
-"))
-            return 1;
-        Cubit::oneof values;
-
-        values.decodeOp (IT_r);
-
-        if (IT_f && !IT_r.isException (IT_env))
-        	IT_f->inRequestPostM (IT_r, IT_env);
-        if (!IT_r.isException (IT_env)) {
-            try {
-                	IT_result = ((Cubit*)IT_pp)->cube_union (  values, IT_env);
-
-            } catch (CORBA::SystemException &IT_exSys) {
-            IT_env.propagate (&IT_exSys);
-            } catch (CORBA::UserException &IT_exUsr) {
-            IT_env.propagate (&IT_exUsr);
-            }
-        }
-
-        if (!IT_r.isException (IT_env)) {
-            if (!IT_r.convertToReply ("\
-U~Cubit::oneof~{E~Cubit::discrim~e_0th,e_1st,e_2nd,e_3rd,e_4th,e_5th}~Cubit::e_0th o{o};Cubit::e_1st s{s};Cubit::e_2nd l{l};Cubit::e_3rd,$ cm{R~Cubit::Many~o{o},l{l},s{s}}\
-", IT_env)) return 1;
-            IT_result.encodeOp (IT_r);
-            }
-
-        else IT_r.makeSystemException (IT_env);
-        return 1;
-    }
-
-    if (!strcmp(IT_s,"please_exit")) {
-        CORBA::Environment IT_env (IT_r);
-        CORBA::Filter* IT_f = CORBA::Orbix.getFilter ();
-        if (!IT_r.tcAssert ("\
-Ro~please_exit~>{v},O{}\
-"))
-            return 1;
-
-        if (IT_f && !IT_r.isException (IT_env))
-        	IT_f->inRequestPostM (IT_r, IT_env);
-        if (!IT_r.isException (IT_env)) {
-            try {
-                ((Cubit*)IT_pp)->please_exit (IT_env);
-
-            } catch (CORBA::SystemException &IT_exSys) {
-            IT_env.propagate (&IT_exSys);
-            } catch (CORBA::UserException &IT_exUsr) {
-            IT_env.propagate (&IT_exUsr);
-            }
-        }
-        IT_r.replyNoResults (CORBA::Flags(CORBA::INV_NO_RESPONSE),IT_env);
-        return 1;
-    }
-
-    if (IT_isTarget)
-        IT_r.makeRuntimeException2 ();
-
-    return 0;
-}
-
-#include "cubitC.cpp"
-
diff --git a/TAO/IIOP/tests/Cubit/Orbix/tpool/cubit_impl.cpp b/TAO/IIOP/tests/Cubit/Orbix/tpool/cubit_impl.cpp
deleted file mode 100644
index e35f1084118..00000000000
--- a/TAO/IIOP/tests/Cubit/Orbix/tpool/cubit_impl.cpp
+++ /dev/null
@@ -1,46 +0,0 @@
-#include "cubit_impl.h"
-
-CORBA::Octet Cubit_Impl:: cube_octet (CORBA::Octet o, CORBA::Environment &IT_env) throw (CORBA::SystemException) {
-  return (CORBA::Octet) (o * o * o); 
-}
-
-CORBA::Short Cubit_Impl:: cube_short (CORBA::Short s, CORBA::Environment &IT_env) throw (CORBA::SystemException) {
-  return (CORBA::Short) (s * s * s);
-}
-
-CORBA::Long Cubit_Impl:: cube_long (CORBA::Long l, CORBA::Environment &IT_env) throw (CORBA::SystemException) {
-   return (CORBA::Long) (l * l * l);
-}
-
-Cubit::Many Cubit_Impl:: cube_struct (const Cubit::Many& values, CORBA::Environment &IT_env) throw (CORBA::SystemException) {
-  Cubit::Many out_values;
-  out_values.o = values.o * values.o * values.o;
-  out_values.s = values.s * values.s * values.s;
-  out_values.l = values.l * values.l * values.l;
-  return out_values; 
-}
-
-Cubit::oneof Cubit_Impl:: cube_union (const Cubit::oneof& values, CORBA::Environment &IT_env) throw (CORBA::SystemException) {
-  Cubit::oneof out_values;
-   switch (values._d ()) {
-   case Cubit::e_0th:
-     out_values.o (values.o () * values.o ()  * values.o ());
-     break;
-   case Cubit::e_1st:
-     out_values.s (values.s () * values.s () * values.s ());
-     break;
-   case Cubit::e_2nd:
-     out_values.l (values.l () * values.l () * values.l ());
-     break;
-   case Cubit::e_3rd:
-   default:
-     out_values.cm ().o = values.cm ().o * values.cm ().o * values.cm ().o ;
-     out_values.cm ().s = values.cm ().s * values.cm ().s * values.cm ().s ;
-     out_values.cm ().l = values.cm ().l * values.cm ().l * values.cm ().l ;
-     break;
-   }
-   return out_values;  
-}
-
-void Cubit_Impl:: please_exit (CORBA::Environment &IT_env) throw (CORBA::SystemException) {
-}
diff --git a/TAO/IIOP/tests/Cubit/Orbix/tpool/cubit_impl.h b/TAO/IIOP/tests/Cubit/Orbix/tpool/cubit_impl.h
deleted file mode 100644
index 1e710bb15d1..00000000000
--- a/TAO/IIOP/tests/Cubit/Orbix/tpool/cubit_impl.h
+++ /dev/null
@@ -1,27 +0,0 @@
-
-#ifndef cubit_ih
-#define cubit_ih
-
-#include "cubit.h"
-
-
-#ifdef Cubit_USE_BOA
-class Cubit_Impl : public virtual CubitBOAImpl {
-#else
-class Cubit_Impl {
-#endif /* Cubit_USE_BOA */
-
-public:
-        virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env=CORBA::default_environment) throw (CORBA::SystemException);
-        virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env=CORBA::default_environment) throw (CORBA::SystemException);
-        virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env=CORBA::default_environment) throw (CORBA::SystemException);
-        virtual Cubit::Many cube_struct (const Cubit::Many& values, CORBA::Environment &IT_env=CORBA::default_environment) throw (CORBA::SystemException);
-        virtual Cubit::oneof cube_union (const Cubit::oneof& values, CORBA::Environment &IT_env=CORBA::default_environment) throw (CORBA::SystemException);
-        virtual void please_exit (CORBA::Environment &IT_env=CORBA::default_environment) throw (CORBA::SystemException);
-};
-
-#ifndef Cubit_USE_BOA
-DEF_TIE_Cubit (Cubit_Impl)
-#endif /* Cubit_USE_BOA */
-
-#endif
diff --git a/TAO/IIOP/tests/Cubit/Orbix/tpool/server.cpp b/TAO/IIOP/tests/Cubit/Orbix/tpool/server.cpp
deleted file mode 100644
index 8cae4135876..00000000000
--- a/TAO/IIOP/tests/Cubit/Orbix/tpool/server.cpp
+++ /dev/null
@@ -1,46 +0,0 @@
-//**************************************************************************
-//
-// NAME :   tpr_server.cpp 
-// DESCRIPTION:  
-//
-// Server mainline
-//
-//****************************************************************************
-#define IT_EX_MACROS
-
-#include "cubit_impl.h"		// server header file
-#include "tpool.h"
-
-int 
-main (int argc, char** argv)
-{
-
-
-#ifdef Cubit_USE_BOA
-  Cubit_var cb = new Cubit_Impl;
-  cout << "Using BOA approach" << endl;
-#else
-  Cubit_var cb = new TIE_Cubit (Cubit_Impl) (new Cubit_Impl);
-  cout << "Using TIE approach" << endl;
-#endif /* Cubit_USE_BOA */
-
-  // Register our thread-pool dispatcher
-  int n_threads = argc > 1 ? ACE_OS::atoi (argv[1]) : ACE_DEFAULT_THREADS;
-  Thread_Pool tpool_dispatcher (n_threads);
- 
-  //
-  // Go get some work to do....
-  //
-  IT_TRY {
-      CORBA::Orbix.impl_is_ready("Cubit", IT_X);
-  }
-  IT_CATCHANY {
-     cout << IT_X << endl;
-  }
-  IT_ENDTRY;
-
-  cout << "Cubit server is exiting." << endl;
-
-
-  return 0;
-}
diff --git a/TAO/IIOP/tests/Cubit/Orbix/tpool/tpool.cpp b/TAO/IIOP/tests/Cubit/Orbix/tpool/tpool.cpp
deleted file mode 100644
index 5d1fbd1a638..00000000000
--- a/TAO/IIOP/tests/Cubit/Orbix/tpool/tpool.cpp
+++ /dev/null
@@ -1,42 +0,0 @@
-#include "tpool.h"
-
-Thread_Pool::Thread_Pool (int n_threads)
-  : ACE_Task<ACE_MT_SYNCH> (ACE_Thread_Manager::instance ())
-{
-  if (this->activate (THR_DETACHED | THR_NEW_LWP, n_threads) == -1)
-    ACE_ERROR ((LM_ERROR, "%p\n", "activate failed"));
-}    
-
-int
-Thread_Pool::svc (void)
-{
-  cout << "Pool thread activated" << endl;
-  while (1) 
-    {
-      // Dequeue message
-      ACE_Message_Block *mb;
-      this->msg_queue ()->dequeue_head (mb);
-      CORBA::Request *vp = (CORBA::Request *) mb->base ();
-      mb->release ();
-      // Hand it off to Orbix
-      CORBA::Orbix.continueThreadDispatch (*vp);
-    }
-  return -1;
-}
-
-
-int
-Thread_Pool::inRequestPreMarshal(CORBA::Request &r,  CORBA::Environment&)
-{
-//   thread_t	tid;
-//   thr_create(NULL, 0, worker, (void *)&r, THR_DETACHED, &tid);
-
-  // Enqueue the request
-  ACE_Message_Block *mb = new ACE_Message_Block ( (char *) (&r));
-  this->msg_queue ()->enqueue (mb);
-  // Done
-  return -1;
-}
-
-
-                             
diff --git a/TAO/IIOP/tests/Cubit/Orbix/tpool/tpool.h b/TAO/IIOP/tests/Cubit/Orbix/tpool/tpool.h
deleted file mode 100644
index 3087ce42052..00000000000
--- a/TAO/IIOP/tests/Cubit/Orbix/tpool/tpool.h
+++ /dev/null
@@ -1,15 +0,0 @@
-#include "cubit.h"
-#include "ace/Service_Config.h"
-#include "ace/Thread_Manager.h"
-#include "ace/Task.h"
-
-class Thread_Pool : public ACE_Task<ACE_MT_SYNCH>, public CORBA::ThreadFilter
-{
-public:
-  Thread_Pool (int n_threads);
-  virtual int inRequestPreMarshal(CORBA::Request &, CORBA::Environment&);
-  virtual int svc (void);
-
-};
-
-
diff --git a/TAO/IIOP/tests/Cubit/Orbix/tpr/Makefile b/TAO/IIOP/tests/Cubit/Orbix/tpr/Makefile
deleted file mode 100644
index cf6149643d3..00000000000
--- a/TAO/IIOP/tests/Cubit/Orbix/tpr/Makefile
+++ /dev/null
@@ -1,89 +0,0 @@
-#----------------------------------------------------------------------------
-#	@(#)Makefile	1.1	10/18/96
-#
-#	Makefile for the ACE_MT_CORBA_Handler tests
-#----------------------------------------------------------------------------
-
-#----------------------------------------------------------------------------
-#	Local macros
-#----------------------------------------------------------------------------
-
-SRC = cubitS.cpp cubit_impl.cpp server.cpp tpr.cpp
-
-SVR_OBJS = cubitS.o cubit_impl.o server.o tpr.o
-
-LDLIBS	 = 
-
-VLDLIBS	 = $(LDLIBS:%=%$(VAR))
-
-#----------------------------------------------------------------------------
-#	Include macros and targets
-#----------------------------------------------------------------------------
-
-include		$(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-include		$(ACE_ROOT)/include/makeinclude/macros.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.common.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.lib.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.bin.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
-
-#----------------------------------------------------------------------------
-#	Orbix related macros and target settings.
-#----------------------------------------------------------------------------
-
-
-ORBIX_BINDIR    = $(ORBIX_ROOT)/bin
-ORBIX_LIBDIR    = $(ORBIX_ROOT)/corba2/lib
-ORBIX_INCDIR    = $(ORBIX_ROOT)/corba2/include
-
-# Remove -DCubit_USE_BOA from below to use the TIE approach
-
-CPPFLAGS += -DEXCEPTIONS -I$(ORBIX_INCDIR) -DWANT_ORBIX_FDS -DCubit_USE_BOA
-LDFLAGS  += -L$(ORBIX_LIBDIR) -R $(ORBIX_LIBDIR) -L$(ACE)/ace
-
-IDLFLAGS = -s S.cpp -c C.cpp -B
-
-#----------------------------------------------------------------------------
-#	Local targets
-#----------------------------------------------------------------------------
-
-all: server
-
-server: $(addprefix $(VDIR),$(SVR_OBJS))
-	$(LINK.cc) -o server $(addprefix $(VDIR),$(SVR_OBJS)) $(LDFLAGS) $(ITIIOP) $(ITSRV) $(VLDLIBS)
-
-#----------------------------------------------------------------------------
-#	Dependencies
-#----------------------------------------------------------------------------
-# DO NOT DELETE THIS LINE -- g++dep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-
-.obj/cubit_impl.o .shobj/cubit_impl.so: cubit_impl.cpp cubit_impl.h cubit.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/config-sunos5.5-sunc++-4.x.h \
- $(ACE_ROOT)/ace/stdcpp.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i
-.obj/server.o .shobj/server.so: server.cpp cubit_impl.h cubit.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/config-sunos5.5-sunc++-4.x.h \
- $(ACE_ROOT)/ace/stdcpp.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i
-
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/IIOP/tests/Cubit/Orbix/tpr/cubit.h b/TAO/IIOP/tests/Cubit/Orbix/tpr/cubit.h
deleted file mode 100644
index 1c868a6597d..00000000000
--- a/TAO/IIOP/tests/Cubit/Orbix/tpr/cubit.h
+++ /dev/null
@@ -1,727 +0,0 @@
-
-#ifndef cubit_hh
-#define cubit_hh
-
-#include "ace/OS.h"
-#include <CORBA.h>
-
-
-#ifndef _Cubit_defined
-#define _Cubit_defined
-class Cubit_dispatch : public virtual CORBA::PPTR {
-public:
-
-      Cubit_dispatch (void *IT_p, CORBA::Object* IT_o, const char *IT_m, 
-        CORBA::LoaderClass *IT_l, char *IT_i, void* IT_im)
-       : PPTR (IT_p,IT_o,IT_m,IT_l,IT_i,IT_im) {}
-
-
-   Cubit_dispatch (char *IT_OR, void *IT_p, CORBA::Object *IT_o)
-       : PPTR (IT_OR,IT_p,IT_o) {}
-
-
-   Cubit_dispatch () {}
-
-   Cubit_dispatch (ObjectReference *IT_OR, void *IT_p, CORBA::Object *IT_o)
-       : PPTR (IT_OR,IT_p,IT_o) {}
-
-
-   Cubit_dispatch (void *IT_p, CORBA::Object *IT_o, const char *IT_m, 
-        char *IT_i, CORBA::Object* IT_ob, void* IT_im)
-       : PPTR (IT_p,IT_o,IT_m,IT_i,IT_ob,IT_im) {}
-
-
-   virtual unsigned char dispatch (CORBA::Request &IT_r, 
-        unsigned char IT_isTarget, void* IT_pp=NULL);
-
-
-};
-
-class Cubit;
-
-#ifndef CubitPtr
-#define CubitPtr
-
-typedef Cubit* Cubit_ptr;
-
-typedef Cubit* CubitRef;
-
-#endif
-
-
-#ifndef CubitForwH
-#define CubitForwH
-CORBA::ObjectRef Cubit_getBase (void *);
-void Cubit_release (Cubit *, CORBA::Environment &IT_env);
-void Cubit_release (Cubit_ptr);
-Cubit* Cubit_duplicate (Cubit_ptr, CORBA::Environment &IT_env);
-Cubit* Cubit_duplicate (Cubit_ptr );
-Cubit_ptr Cubit_nil (CORBA::Environment &IT_env);
-Cubit_ptr Cubit_nil ();
-#endif
-#define Cubit_IMPL "Cubit"
-
-
-class Cubit;
-
-typedef Cubit CubitProxy;
-#define Cubit_IR "Cubit$v1.1"
-#define Cubit_IMPL "Cubit"
-
-#ifndef CubitPtr
-#define CubitPtr
-
-typedef Cubit* Cubit_ptr;
-
-typedef Cubit* CubitRef;
-
-#endif
-
-class Cubit: public virtual CORBA::Object  {
-public:
-        Cubit (char *IT_OR);
-    Cubit (ObjectReference *IT_OR);
-    Cubit () : CORBA::Object  (1) {}
-protected:
-    Cubit_ptr __duplicate(
-            CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) {
-       CORBA::Object::__duplicate (IT_env);
-       return this;
-    }
-public:
-    static Cubit_ptr _duplicate(
-            Cubit_ptr, 
-            CORBA::Environment &IT_pEnv=CORBA::IT_chooseDefaultEnv ());
-public:
-   static Cubit* _bind (const char* IT_markerServer, const char* host,
-		const CORBA::Context &IT_c, 
-		CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-   static Cubit* _bind (CORBA::Environment &IT_env);
-   static Cubit* _bind (const char* IT_markerServer=NULL, const char* host=NULL,
-                 CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-    static Cubit* _narrow (CORBA::Object* , CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-    static Cubit_ptr _nil (CORBA::Environment &IT_pEnv=CORBA::IT_chooseDefaultEnv ()) {
-        CORBA::EnvExcRaiser IT_raise;
-        CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-        return (Cubit_ptr) CORBA::OBJECT_NIL;}
-
-#ifndef Cubit_Many_defined
-#define Cubit_Many_defined
-
-struct Many {
-    CORBA::Octet o;
-    CORBA::Long l;
-    CORBA::Short s;
-
-    void encodeOp (CORBA::Request &IT_r) const;
-    void decodeOp (CORBA::Request &IT_r);
-    void decodeInOutOp (CORBA::Request &IT_r);
-    Many(const Many &);
-    Many();
-    ~Many();
-    Many& operator= (const Many&);
-};
-
-#ifndef Cubit_ManyVarH
-#define Cubit_ManyVarH
-
-#ifndef Cubit_ManyvPtr
-#define Cubit_ManyvPtr
-typedef Many* Many_vPtr;
-typedef const Many* Many_cvPtr;
-#endif
-
-class Many_var : public CORBA::_var
-{
-    private:
-
-    unsigned char copyHelper (const Many_var &IT_s) {
-        if (!IT_s._ptr) {
-            _ptr = IT_s._ptr;
-        } else
-        {
-            _ptr = new Many;
-            *(_ptr) =  *(IT_s._ptr);
-        }
-        return 1;
-    }
-
-    public:
-
-    Many_var (const Many_var &IT_s) {
-        (void) copyHelper (IT_s);
-    }
-
-    Many_var () {
-        _ptr =  new Many;
-;
-    }
-
-    Many_var (Many *IT_p) {
-        _ptr = IT_p;
-    }
-
-    Many_var &operator= (Many *IT_p) {
-        if (_ptr != IT_p) {
-            delete _ptr;
-        }
-        _ptr = IT_p;
-        return (*this);
-    }
-
-    Many_var &operator= (const Many_var &IT_s) {
-        if (_ptr != IT_s._ptr) {
-            delete _ptr;
-        }
-        _ptr = new Many;
-        *(_ptr) =  *(IT_s._ptr);
-        return (*this);
-    }
-
-    ~Many_var () {
-        delete _ptr;
-    }
-
-    Many* operator-> () {
-        return _ptr;
-    }
-
-    operator Many_cvPtr () const { return _ptr;}
-    operator Many_vPtr& () { return _ptr;}
-    operator Many& () const { return * _ptr;}
-
-    protected:
-    Many *_ptr;
-    private:
-    Many_var &operator= (const CORBA::_var &IT_s);
-    Many_var (const CORBA::_var &IT_s);
-};
-
-#endif
-
-
-#endif
-
-enum discrim {e_0th,e_1st,e_2nd,e_3rd,e_4th,e_5th, IT__ENUM_Cubit_discrim=CORBA_ULONG_MAX};
-
-#ifndef Cubit_oneof_defined
-#define Cubit_oneof_defined
-
-struct oneof {
-    private:
-
-    discrim __d;
-    union {
-        CORBA::Octet _o_;
-        CORBA::Short _s_;
-        CORBA::Long _l_;
-        Many * _cm_;
-    };
-
-    public:
-
-    void encodeOp (CORBA::Request &IT_r) const;
-    void decodeOp (CORBA::Request &IT_r);
-    void decodeInOutOp (CORBA::Request &IT_r);
-
-    private:
-
-    unsigned char isSet;
-
-    public:
-
-    discrim _d () const { return __d; }
-
-    CORBA::Octet o () const {
-      return _o_;
-    }
-
-    void o (CORBA::Octet IT_member) {
-        if (isSet && (__d != Cubit::e_0th))
-        {
-            this-> oneof::~oneof();
-            memset(this, 0, sizeof(*this));
-        }
-
-        __d = Cubit::e_0th;
-        isSet = 1;
-        _o_ = IT_member;
-    }
-
-    CORBA::Short s () const {
-        return _s_;
-    }
-
-    void s (CORBA::Short IT_member) {
-        if (isSet && (__d != Cubit::e_1st))
-        {
-            this-> oneof::~oneof();
-            memset(this, 0, sizeof(*this));
-        }
-
-        __d = Cubit::e_1st;
-        isSet = 1;
-        _s_ = IT_member;
-    }
-
-    CORBA::Long l () const {
-        return _l_;
-    }
-
-    void l (CORBA::Long IT_member) {
-        if (isSet && (__d != Cubit::e_2nd))
-        {
-            this-> oneof::~oneof();
-            memset(this, 0, sizeof(*this));
-        }
-
-        __d = Cubit::e_2nd;
-        isSet = 1;
-        _l_ = IT_member;
-    }
-
-    Many& cm () {
-        return (*_cm_);
-    }
-
-    const Many& cm () const {
-        return (*_cm_);
-    }
-
-    void cm (const Many& IT_member) {
-        if (isSet && (__d != Cubit::e_3rd))
-        {
-            this-> oneof::~oneof();
-            memset(this, 0, sizeof(*this));
-        }
-
-        __d = Cubit::e_3rd;
-
-        if (!isSet) {
-            _cm_ = new Many;
-            isSet = 1;
-        }
-        *(_cm_) = IT_member;
-    }
-
-
-    oneof();
-    oneof(const oneof &);
-    ~oneof();
-    oneof& operator= (const oneof&);
-};
-
-#ifndef Cubit_oneofVarH
-#define Cubit_oneofVarH
-
-#ifndef Cubit_oneofvPtr
-#define Cubit_oneofvPtr
-typedef oneof* oneof_vPtr;
-typedef const oneof* oneof_cvPtr;
-#endif
-
-class oneof_var : public CORBA::_var
-{
-    private:
-
-    unsigned char copyHelper (const oneof_var &IT_s) {
-        if (!IT_s._ptr) {
-            _ptr = IT_s._ptr;
-        } else
-        {
-            _ptr = new oneof;
-            *(_ptr) =  *(IT_s._ptr);
-        }
-        return 1;
-    }
-
-    public:
-
-    oneof_var (const oneof_var &IT_s) {
-        (void) copyHelper (IT_s);
-    }
-
-    oneof_var () {
-        _ptr = NULL;
-    }
-
-    oneof_var (oneof *IT_p) {
-        _ptr = IT_p;
-    }
-
-    oneof_var &operator= (oneof *IT_p) {
-        if (_ptr != IT_p) {
-            delete _ptr;
-        }
-        _ptr = IT_p;
-        return (*this);
-    }
-
-    oneof_var &operator= (const oneof_var &IT_s) {
-        if (_ptr != IT_s._ptr) {
-            delete _ptr;
-        }
-        _ptr = new oneof;
-        *(_ptr) =  *(IT_s._ptr);
-        return (*this);
-    }
-
-    ~oneof_var () {
-        delete _ptr;
-    }
-
-    oneof* operator-> () {
-        return _ptr;
-    }
-
-    operator oneof_cvPtr () const { return _ptr;}
-    operator oneof_vPtr& () { return _ptr;}
-    operator oneof& () const { return * _ptr;}
-
-    protected:
-    oneof *_ptr;
-    private:
-    oneof_var &operator= (const CORBA::_var &IT_s);
-    oneof_var (const CORBA::_var &IT_s);
-};
-
-#endif
-
-
-#endif
-        virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual Many cube_struct (const Many& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual oneof cube_union (const oneof& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual void please_exit (CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-};
-
-#ifndef CubitVarH
-#define CubitVarH
-
-#ifndef CubitvPtr
-#define CubitvPtr
-typedef Cubit* Cubit_vPtr;
-typedef const Cubit* Cubit_cvPtr;
-#endif
-
-class Cubit_var : public CORBA::_var
-{
-    private:
-
-    unsigned char copyHelper (const Cubit_var &IT_s) {
-        {
-            _ptr = Cubit_duplicate (IT_s._ptr);
-        }
-        return 1;
-    }
-
-    public:
-
-    Cubit_var (const Cubit_var &IT_s) {
-        (void) copyHelper (IT_s);
-    }
-
-    Cubit_var () {
-        _ptr = Cubit_nil ();
-    }
-
-    Cubit_var (Cubit *IT_p) {
-        _ptr = IT_p;
-    }
-
-    Cubit_var &operator= (Cubit *IT_p) {
-        Cubit_release (_ptr);
-        _ptr = IT_p;
-        return (*this);
-    }
-
-    Cubit_var &operator= (const Cubit_var &IT_s) {
-        Cubit_release (_ptr);
-        _ptr = Cubit_duplicate (IT_s._ptr);
-        return (*this);
-    }
-
-    ~Cubit_var () {
-        Cubit_release (_ptr);
-    }
-
-    Cubit* operator-> () {
-        return _ptr;
-    }
-
-    operator Cubit_cvPtr () const { return _ptr;}
-    operator Cubit_vPtr& () { return _ptr;}
-
-    protected:
-    Cubit *_ptr;
-    private:
-    Cubit_var &operator= (const CORBA::_var &IT_s);
-    Cubit_var (const CORBA::_var &IT_s);
-    Cubit_var &operator= (const CORBA::_mgr &IT_s);
-    Cubit_var &operator= (const CORBA::_SeqElem &IT_s);
-    Cubit_var (const CORBA::_mgr &IT_s);
-    Cubit_var (const CORBA::_SeqElem &IT_s);
-};
-
-#endif
-
-
-#ifndef CubitMgrH
-#define CubitMgrH
-
-class Cubit_mgr : public CORBA::_mgr
-{
-    public:
-
-    Cubit_mgr () {
-        _ptr = Cubit_nil ();
-        _release = 1;
-    }
-
-    Cubit_mgr (const Cubit_mgr &IT_s) {
-        _ptr = Cubit_duplicate (IT_s._ptr);
-        _release = 1;
-    }
-
-    Cubit_mgr &operator= (Cubit *IT_p) {
-        if (_ptr && _release)
-            Cubit_release (_ptr);
-        _ptr = IT_p;
-        _release = 1;
-        return (*this);
-    }
-
-    Cubit_mgr &operator= (const Cubit_mgr &IT_s) {
-        if (_ptr && _release)
-            Cubit_release (_ptr);
-        _ptr = Cubit_duplicate(IT_s._ptr);
-        _release = 1;
-        return (*this);
-    }
-
-    Cubit_mgr &operator= (Cubit_var &IT_s) {
-        if (_ptr && _release)
-            Cubit_release (_ptr);
-        _ptr = Cubit_duplicate(IT_s);
-        _release = 1;
-        return (*this);
-    }
-
-    ~Cubit_mgr () {
-        if (_release)
-            Cubit_release (_ptr);
-    }
-
-    unsigned char release () {
-        return _release;
-    }
-
-    void release (unsigned char rel) {
-        _release = rel;
-    }
-
-    operator int () const {
-        return (((CORBA::Object_ptr) _ptr) ? 1 : 0);
-    }
-
-    operator void* () const {
-        return _ptr;
-    }
-
-    operator CORBA::Object * () const {
-        return (CORBA::Object *) _ptr;
-    }
-
-    operator Cubit* () const {
-        return (Cubit*) _ptr;
-    }
-
-    Cubit_ptr operator-> () const {
-        return _ptr;
-    }
-
-    Cubit *_ptr;
-
-    protected:
-
-    unsigned char _release;
-};
-
-typedef Cubit_mgr Cubit_mgr_IT_const;
-#endif
-
-#ifndef CubitSeqElemH
-#define CubitSeqElemH
-
-class Cubit_SeqElem : public CORBA::_SeqElem
-{
-    public:
-
-    Cubit_SeqElem (Cubit_ptr* IT_p, unsigned char rel) {
-        _ptr = IT_p;
-        _release = rel;
-    }
-
-    Cubit_SeqElem &operator= (Cubit_ptr IT_p) {
-        if (_ptr) {
-            if (*(_ptr) && _release)
-                Cubit_release (*(_ptr));
-            *(_ptr) = IT_p;
-        }
-        return (*this);
-    }
-
-    Cubit_SeqElem &operator= (const Cubit_SeqElem &IT_s) {
-        if (_ptr && IT_s._ptr) {
-            if (*(_ptr) && _release)
-                Cubit_release (*(_ptr));
-            *(_ptr) = Cubit_duplicate(*(IT_s._ptr));
-        }
-        return (*this);
-    }
-
-    operator Cubit_ptr () const {
-        return _ptr ? (Cubit_ptr) (*_ptr) : Cubit_nil(); 
-    }
-
-    Cubit_ptr operator->() const { return *_ptr;}
-
-    protected:
-    Cubit_ptr *_ptr;
-    unsigned char _release;
-};
-
-#endif
-
-
-#define TIE_Cubit(X) Cubit##X
-
-#define DEF_TIE_Cubit(X) \
-	class Cubit##X : public virtual Cubit {		\
-	  X* m_obj;						\
-	public:							\
-								\
-								\
-	   Cubit##X  (X *objp, const char* m="", CORBA::LoaderClass *l=0)\
-		: Cubit(), m_obj(objp) {	\
-		m_pptr = new Cubit_dispatch		\
-			(( Cubit*)this,(CORBA::Object*)this,m,l,Cubit_IR,m_obj);	\
-	   }								\
-	   Cubit##X  (CORBA::Object *IT_p, const char* IT_m="", void *IT_q=0)\
-		: Cubit() {	\
-		m_pptr = new Cubit_dispatch		\
-			(( Cubit*)this,(CORBA::Object*)this,IT_m,Cubit_IR,IT_p,IT_q);	\
-		m_obj = (X*)(m_pptr->getImplObj ());			\
-	   }								\
-								\
-	   virtual ~Cubit##X  () {				\
-		if (_okToDeleteImpl ()) delete m_obj; }					\
-	   virtual void* _deref () {					\
-		return m_obj; }					\
-								\
-virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_octet (  o,IT_env);\
-}\
-	\
-virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_short (  s,IT_env);\
-}\
-	\
-virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_long (  l,IT_env);\
-}\
-	\
-virtual Cubit::Many cube_struct (const Cubit::Many& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_struct (  values,IT_env);\
-}\
-	\
-virtual Cubit::oneof cube_union (const Cubit::oneof& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_union (  values,IT_env);\
-}\
-	\
-virtual void please_exit (CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-m_obj->please_exit (IT_env);\
-}\
-								\
-	};						\
-
-
-#define QUALS_Cubit	\
-virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_octet (  o,IT_env);\
-}\
-	\
-virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_short (  s,IT_env);\
-}\
-	\
-virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_long (  l,IT_env);\
-}\
-	\
-virtual Many cube_struct (const Many& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_struct (  values,IT_env);\
-}\
-	\
-virtual oneof cube_union (const oneof& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_union (  values,IT_env);\
-}\
-	\
-virtual void please_exit (CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-m_obj->please_exit (IT_env);\
-}\
-
-
-
-
-class CubitProxyFactoryClass : public virtual CORBA::ObjectFactoryClass {
-public:
-   CubitProxyFactoryClass (unsigned char IT_p=0)
-		: CORBA::ProxyFactory (Cubit_IR, IT_p) {}
-
-    virtual void* New (char *IT_OR, CORBA::Environment&);
-
-    virtual void* New (ObjectReference *IT_OR, CORBA::Environment&);
-
-    virtual void* New2 (); 
-
-    virtual CORBA::Object* NewObject (char *IT_OR, CORBA::Environment&);
-
-    virtual CORBA::Object* NewObject (ObjectReference *IT_OR, CORBA::Environment&);
-
-    virtual CORBA::Object* New2Object (); 
-
-    virtual void* IT_castUp (void *IT_p, char* IT_s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-
-    virtual CORBA::PPTR* pptr (void *IT_p);
-
-    virtual void baseInterfaces (_IDL_SEQUENCE_string&);
-
-
-};
-
-extern CubitProxyFactoryClass CubitProxyFactory;
-
-class CubitBOAImpl : public virtual Cubit  {
-public:
-    CubitBOAImpl (const char *m="", CORBA::LoaderClass *l=NULL) {
-  if (CORBA::PPTR::isOK (m_pptr, Cubit_IR))
-    m_pptr = new Cubit_dispatch ( (Cubit*)this,
-   	 (CORBA::Object*)this, m, l, Cubit_IR, this);
-}
-
-        virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual Many cube_struct (const Many& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual oneof cube_union (const oneof& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual void please_exit (CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-};
-
-
-#endif
-
-
-#endif
diff --git a/TAO/IIOP/tests/Cubit/Orbix/tpr/cubit.idl b/TAO/IIOP/tests/Cubit/Orbix/tpr/cubit.idl
deleted file mode 100644
index d9b38c34a2a..00000000000
--- a/TAO/IIOP/tests/Cubit/Orbix/tpr/cubit.idl
+++ /dev/null
@@ -1,40 +0,0 @@
-// @(#)cubit.idl	1.1 95/09/10
-// Copyright 1994-1995 by Sun Microsystems, Inc.
-
-#pragma prefix	"Eng.SUN.COM"
-#pragma version Cubit 1.1
-
-interface Cubit {
-    octet	cube_octet (in octet o);
-    short	cube_short (in short s);
-    long	cube_long (in long l);
-
-    struct Many {
-	octet	o;		// + 3 bytes padding (normally) ...
-	long	l;
-	short	s;		// + 2 bytes padding (normally) ...
-    };
-
-    Many	cube_struct (in Many values);
-
-    enum discrim {e_0th, e_1st, e_2nd, e_3rd, e_4th, e_5th};
-
-    union oneof
-    switch (discrim) {
-	// this is an easy union to interpret; no padding
-	// is needed between discriminant and value.
-      case e_0th:
-        octet		o;
-      case e_1st:
-        short		s;
-      case e_2nd:
-        long		l;
-      case e_3rd:
-      default:
-        Many		cm;
-    };
-
-    oneof	cube_union (in oneof values);
-
-    oneway void	please_exit ();
-};
diff --git a/TAO/IIOP/tests/Cubit/Orbix/tpr/cubitC.cpp b/TAO/IIOP/tests/Cubit/Orbix/tpr/cubitC.cpp
deleted file mode 100644
index c47e38f26ee..00000000000
--- a/TAO/IIOP/tests/Cubit/Orbix/tpr/cubitC.cpp
+++ /dev/null
@@ -1,557 +0,0 @@
-#include "cubit.h"
-
-Cubit::Cubit (char *IT_OR) {
-      m_pptr = new Cubit_dispatch (IT_OR, this,(CORBA::Object*)this);
-} 
-Cubit::Cubit (ObjectReference *IT_OR) {
-      m_pptr = new Cubit_dispatch (IT_OR, this,(CORBA::Object*)this);
-} 
-
-#ifndef CubitForwC
-#define CubitForwC
-CORBA::ObjectRef Cubit_getBase(void *IT_p){
-    return (Cubit*) IT_p;}
-
-void Cubit_release (Cubit_ptr IT_p, CORBA::Environment &IT_env) {
-    CORBA::release(IT_p, IT_env);}
-
-void Cubit_release (Cubit_ptr IT_p) {
-    Cubit_release (IT_p, CORBA::IT_chooseDefaultEnv ()); }
-
-Cubit_ptr Cubit_nil (CORBA::Environment &) {
-    return Cubit:: _nil ();}
-
-Cubit_ptr Cubit_nil () {
-    return Cubit_nil (CORBA::IT_chooseDefaultEnv ());}
-
-Cubit_ptr Cubit_duplicate (Cubit_ptr IT_p, CORBA::Environment &IT_env) {
-    return (Cubit::_duplicate(IT_p, IT_env)); }
-Cubit_ptr Cubit_duplicate (Cubit_ptr IT_p) {
-    return Cubit_duplicate (IT_p, CORBA::IT_chooseDefaultEnv ()); }
-#endif
-
-Cubit_ptr Cubit::_duplicate(Cubit_ptr obj, CORBA::Environment& IT_pEnv) {
-        CORBA::EnvExcRaiser IT_raise;
-        CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-       if (!obj) {
-          return (obj);
-       }
-       Cubit_ptr IT_obj = obj->__duplicate (IT_env);
-       return IT_obj;
-}
-
-
-
-Cubit* Cubit:: _bind (const char* IT_markerServer, const char* host,
-		const CORBA::Context &IT_c, 
-		CORBA::Environment &IT_env) {
-       return (Cubit*)CORBA::Factory.New (IT_markerServer, IT_env, IT_c, host, 
-		Cubit_IMPL, Cubit_IR);
-}
-
-
-
-Cubit* Cubit:: _bind (CORBA::Environment &IT_env) {
-       return _bind (NULL,NULL,CORBA::Context(), IT_env); }
-
-
-Cubit* Cubit:: _bind (const char* IT_markerServer, const char* host,
-                CORBA::Environment &IT_env) {
-       return _bind (IT_markerServer, host, CORBA::Context (), IT_env); }
-Cubit* Cubit::_narrow (CORBA::Object* IT_obj, CORBA::Environment &IT_pEnv) {
-        CORBA::EnvExcRaiser IT_raise;
-        CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-        if (CORBA::is_nil (IT_obj)) {
-                return Cubit:: _nil();
-        }
-
-       Cubit* IT_p = (Cubit*)CORBA::Object::_castDown (IT_obj, Cubit_IR, IT_env);
-        IT_p = IT_p ? IT_p->__duplicate(IT_env) : NULL;
-        if ((IT_env) &&(!strcmp(IT_env.exception()->id(), "CORBA::StExcep::BAD_PARAM")) && (((CORBA::BAD_PARAM*)IT_env.exception())-> minor() == NARROW_FAILED)) {
-                IT_env.exception_free();
-        }
-        return IT_p;
-   }
-
-
-#ifndef Cubit_Many_Ops
-#define Cubit_Many_Ops
-
-void Cubit::Many:: encodeOp (CORBA::Request &IT_r) const {
-
-    IT_r.insertOctet (o);
-
-    IT_r << l;
-
-    IT_r << s;
-}
-
-void Cubit::Many:: decodeOp (CORBA::Request &IT_r) {
-
-    IT_r.extractOctet (o);
-
-    IT_r >> l;
-
-    IT_r >> s;
-}
-
-void Cubit::Many:: decodeInOutOp (CORBA::Request &IT_r) {
-
-    IT_r.extractOctet (o);
-
-    IT_r >> l;
-
-    IT_r >> s;
-}
-
-Cubit::Many ::~Many () {
-}
-
-Cubit::Many:: Many (const Cubit::Many &IT_s) 
-	 {
-    o = IT_s.o;
-    l = IT_s.l;
-    s = IT_s.s;
-}
-
-Cubit::Many:: Many () {
-}
-
-Cubit::Many &Cubit::Many:: operator= (const Cubit::Many& IT_s) {
-    if (this == &IT_s) return *this;
-    o = IT_s.o;
-    l = IT_s.l;
-    s = IT_s.s;
-    return *this;
-}
-
-
-#endif
-
-
-#ifndef Cubit_oneof_Ops
-#define Cubit_oneof_Ops
-void Cubit::oneof:: encodeOp (CORBA::Request &IT_r) const {
-    if (!isSet) return;
-    {
-    CORBA::ULong IT_0 = (CORBA::ULong) __d;
-    IT_r << IT_0;
-    }
-    switch (__d) {
-        case Cubit::e_0th: 
-        IT_r.insertOctet (_o_);
-        break;
-        case Cubit::e_1st: 
-        IT_r << _s_;
-        break;
-        case Cubit::e_2nd: 
-        IT_r << _l_;
-        break;
-        case Cubit::e_3rd: 
-        default: 
-        (*_cm_).encodeOp (IT_r);
-        break;
-    }
-
-}
-
-void Cubit::oneof:: decodeOp (CORBA::Request &IT_r) {
-    isSet = 0;
-    {
-    CORBA::ULong IT_1;
-    IT_r >> IT_1;
-    __d = Cubit::discrim(IT_1);
-    }
-    switch (__d) {
-        case Cubit::e_0th: 
-        if (!isSet) {
-            isSet = 1;
-        }
-        IT_r.extractOctet (_o_);
-        break;
-        case Cubit::e_1st: 
-        if (!isSet) {
-            isSet = 1;
-        }
-        IT_r >> _s_;
-        break;
-        case Cubit::e_2nd: 
-        if (!isSet) {
-            isSet = 1;
-        }
-        IT_r >> _l_;
-        break;
-        case Cubit::e_3rd: 
-        default: 
-        if (!isSet) {
-            _cm_ = new Cubit::Many;
-            isSet = 1;
-        }
-        (*_cm_).decodeOp (IT_r);
-        break;
-    }
-
-}
-void Cubit::oneof:: decodeInOutOp (CORBA::Request &IT_r) {
-    Cubit::discrim IT_d;
-    {
-    CORBA::ULong IT_2;
-    IT_r >> IT_2;
-    IT_d = Cubit::discrim(IT_2);
-    }
-    if (IT_d == __d)
-        switch (__d) {
-            case Cubit::e_0th: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r.extractOctet (_o_);
-            break;
-            case Cubit::e_1st: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r >> _s_;
-            break;
-            case Cubit::e_2nd: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r >> _l_;
-            break;
-            case Cubit::e_3rd: 
-            default: 
-            if (!isSet) {
-                _cm_ = new Cubit::Many;
-                isSet = 1;
-            }
-            (*_cm_).decodeInOutOp (IT_r);
-            break;
-        }
-
-    else {
-        this->oneof:: ~oneof();
-        memset(this, 0, sizeof(*this));
-        __d = IT_d;
-        switch (__d) {
-            case Cubit::e_0th: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r.extractOctet (_o_);
-            break;
-            case Cubit::e_1st: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r >> _s_;
-            break;
-            case Cubit::e_2nd: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r >> _l_;
-            break;
-            case Cubit::e_3rd: 
-            default: 
-            if (!isSet) {
-                _cm_ = new Cubit::Many;
-                isSet = 1;
-            }
-            (*_cm_).decodeOp (IT_r);
-            break;
-        }
-        isSet = 1;
-    }
-
-}
-
-Cubit::oneof:: oneof() { 
-    memset(this, 0, sizeof(*this));
-    isSet = 0;
-}
-
-Cubit::oneof ::~oneof() {
-    if (!isSet) return;
-    switch (__d) { 
-        case Cubit::e_0th:         break;
-        case Cubit::e_1st:         break;
-        case Cubit::e_2nd:         break;
-        case Cubit::e_3rd: 
-        default:         if (_cm_) delete _cm_;
-        break;
-    }
-
-    isSet = 0;
-}
-
-Cubit::oneof:: oneof (const Cubit::oneof &IT_s) {
-    isSet = 0;
-    memset(this, 0, sizeof(*this));
-    __d = IT_s.__d;
-    switch (__d) {
-        case Cubit::e_0th:         isSet = 1;
-        _o_ = IT_s._o_;
-        break;
-        case Cubit::e_1st:         isSet = 1;
-        _s_ = IT_s._s_;
-        break;
-        case Cubit::e_2nd:         isSet = 1;
-        _l_ = IT_s._l_;
-        break;
-        case Cubit::e_3rd: 
-        default: 
-        if (!isSet) {
-            _cm_ = new Cubit::Many;
-            isSet = 1;
-        }
-        *(_cm_) = *(IT_s._cm_);
-        break;
-    }
-    isSet = 1;
-}
-
-Cubit::oneof& Cubit::oneof:: operator= (const Cubit::oneof & IT_s) {
-    if (this == &IT_s) return *this;
-    if (isSet && (__d != IT_s.__d))
-    {
-        this-> oneof::~oneof();
-        memset(this, 0, sizeof(*this));
-    }
-
-    __d = IT_s.__d;
-    switch (__d) {
-        case Cubit::e_0th:         isSet = 1;
-        _o_ = IT_s._o_;
-        break;
-        case Cubit::e_1st:         isSet = 1;
-        _s_ = IT_s._s_;
-        break;
-        case Cubit::e_2nd:         isSet = 1;
-        _l_ = IT_s._l_;
-        break;
-        case Cubit::e_3rd: 
-        default: 
-        if (!isSet) {
-            _cm_ = new Cubit::Many;
-            isSet = 1;
-        }
-        *(_cm_) = *(IT_s._cm_);
-        break;
-    }
-    isSet = 1;
-    return *this;
-}
-
-
-#endif
-
-void* CubitProxyFactoryClass::New (char *IT_OR, CORBA::Environment&) {
-        return  new class Cubit(IT_OR);}
-
-void* CubitProxyFactoryClass::New (ObjectReference *IT_OR, CORBA::Environment&) {
-        return  new class Cubit(IT_OR);}
-
-void* CubitProxyFactoryClass::New2 () {
-        return  new class Cubit((char*)0);}
-
-CORBA::Object* CubitProxyFactoryClass::NewObject (char *IT_OR, CORBA::Environment&) {
-        return  new class Cubit(IT_OR);}
-
-CORBA::Object* CubitProxyFactoryClass::NewObject (ObjectReference *IT_OR, CORBA::Environment&) {
-        return  new class Cubit(IT_OR);}
-
-CORBA::Object* CubitProxyFactoryClass::New2Object () {
-        return  new class Cubit((char*)0);}
-
-void* CubitProxyFactoryClass::IT_castUp (void *IT_p, char* IT_s, CORBA::Environment &IT_env) {
-      void *IT_l;
-      if (!CORBA::_interfaceCmp (IT_s,Cubit_IR, IT_env))
-         return IT_p;
-      else if (IT_l=CORBA::ObjectFactoryClass::IT_castUp((CORBA::Object*)((class Cubit*)IT_p),IT_s, IT_env))
-         return IT_l;
-      else return NULL;
-    }
-
-
-CORBA::PPTR* CubitProxyFactoryClass::pptr (void *IT_p) {
-       return ((class Cubit*)IT_p)->_pptr ();}
-
-void CubitProxyFactoryClass::baseInterfaces (_IDL_SEQUENCE_string& seq) {
-      add (seq, Cubit_IR);
-      CORBA::ObjectFactoryClass::baseInterfaces (seq);
-}
-
-CubitProxyFactoryClass CubitProxyFactory(1);
-
-CORBA::Octet Cubit:: cube_octet (CORBA::Octet o, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        return 0;
-    }
-    CORBA::Request IT_r (this, "cube_octet",IT_env,1,0);
-    if (!IT_r.isException (IT_env)) {
-
-        IT_r.insertOctet (o);
-    }
-
-    IT_r.invoke (CORBA::Flags(0),IT_env);
-    if (!IT_r.isException (IT_env)) {
-        CORBA::Octet IT_result;
-        IT_r.extractOctet (IT_result);
-        IT_r.checkEnv (IT_env);
-        return IT_result;
-    }
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-    return 0;
-}
-
-CORBA::Short Cubit:: cube_short (CORBA::Short s, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        return 0;
-    }
-    CORBA::Request IT_r (this, "cube_short",IT_env,1,0);
-    if (!IT_r.isException (IT_env)) {
-
-        IT_r << s;
-    }
-
-    IT_r.invoke (CORBA::Flags(0),IT_env);
-    if (!IT_r.isException (IT_env)) {
-        CORBA::Short IT_result;
-        IT_r >> IT_result;
-        IT_r.checkEnv (IT_env);
-        return IT_result;
-    }
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-    return 0;
-}
-
-CORBA::Long Cubit:: cube_long (CORBA::Long l, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        return 0;
-    }
-    CORBA::Request IT_r (this, "cube_long",IT_env,1,0);
-    if (!IT_r.isException (IT_env)) {
-
-        IT_r << l;
-    }
-
-    IT_r.invoke (CORBA::Flags(0),IT_env);
-    if (!IT_r.isException (IT_env)) {
-        CORBA::Long IT_result;
-        IT_r >> IT_result;
-        IT_r.checkEnv (IT_env);
-        return IT_result;
-    }
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-    return 0;
-}
-
-Cubit::Many Cubit:: cube_struct (const Cubit::Many& values, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        { 
-            Cubit::Many IT_l0;
-            return IT_l0;
-        }
-    }
-    CORBA::Request IT_r (this, "cube_struct",IT_env,1,0);
-    if (!IT_r.isException (IT_env)) {
-
-        values.encodeOp (IT_r);
-    }
-
-    IT_r.invoke (CORBA::Flags(0),IT_env);
-    if (!IT_r.isException (IT_env)) {
-        Cubit::Many IT_result;
-        IT_result.decodeOp (IT_r);
-        IT_r.checkEnv (IT_env);
-        return IT_result;
-    }
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-    { 
-        Cubit::Many IT_l1;
-        return IT_l1;
-    }
-}
-
-Cubit::oneof Cubit:: cube_union (const Cubit::oneof& values, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        { 
-            Cubit::oneof IT_l0;
-            return IT_l0;
-        }
-    }
-    CORBA::Request IT_r (this, "cube_union",IT_env,1,0);
-    if (!IT_r.isException (IT_env)) {
-
-        values.encodeOp (IT_r);
-    }
-
-    IT_r.invoke (CORBA::Flags(0),IT_env);
-    if (!IT_r.isException (IT_env)) {
-        Cubit::oneof IT_result;
-        IT_result.decodeOp (IT_r);
-        IT_r.checkEnv (IT_env);
-        return IT_result;
-    }
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-    { 
-        Cubit::oneof IT_l1;
-        return IT_l1;
-    }
-}
-
-void Cubit:: please_exit (CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        return ;
-    }
-    CORBA::Request IT_r (this, "please_exit",IT_env,1,1);
-
-    IT_r.invoke (CORBA::Flags(CORBA::INV_NO_RESPONSE), IT_env);
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-}
-
-
-
-
-
-#ifndef Cubit_dispatch_impl
-
-unsigned char Cubit_dispatch::dispatch (CORBA::Request &IT_r, 
-    unsigned char, void *) {
-      IT_r.makeRuntimeException1 ("Cubit");
-      return 0;
-}
- 
-#endif
-
diff --git a/TAO/IIOP/tests/Cubit/Orbix/tpr/cubitC.h b/TAO/IIOP/tests/Cubit/Orbix/tpr/cubitC.h
deleted file mode 100644
index 15247168d3c..00000000000
--- a/TAO/IIOP/tests/Cubit/Orbix/tpr/cubitC.h
+++ /dev/null
@@ -1,343 +0,0 @@
-#ifndef _cubitC_h
-#define _cubitC_h
-
-/************************************************************************/
-/*                                                                      */
-/* This file is automatically generated by ORBeline IDL compiler        */
-/* Do not modify this file.                                             */
-/*                                                                      */
-/* ORBeline (c) is copyrighted by PostModern Computing, Inc.            */
-/*                                                                      */
-/* The generated code conforms to OMG's IDL C++ mapping as              */
-/* specified in OMG Document Number: 94-9-14.                           */
-/*                                                                      */
-/************************************************************************/
-
-#include "corba.h"
-
-
-
-class Cubit;
-typedef Cubit *Cubit_ptr;
-typedef Cubit_ptr CubitRef;
-
-#ifndef _Cubit_var_
-#define _Cubit_var_
-class Cubit_var
-{
-    public:
-	Cubit_var();
-	Cubit_var(Cubit_ptr);
-	Cubit_var(const Cubit_var&);
-	~Cubit_var();
-	Cubit_var& operator=(Cubit_ptr);
-	operator Cubit_ptr() const { return _ptr; }
-#if defined(_HPCC_BUG)
-	operator Cubit *&() { return _ptr; }
-#else
-	operator Cubit_ptr&() { return _ptr; }
-#endif
-	Cubit_ptr operator->() const { return _ptr;}
-	friend NCistream& operator>>(NCistream&, Cubit_var&);
-	friend NCostream& operator<<(NCostream&, const Cubit_var&);
-	friend istream& operator>>(istream&, Cubit_var&);
-	friend ostream& operator<<(ostream&, const Cubit_var&);
-    private:
-	Cubit_ptr	_ptr;
-	void operator=(const Cubit_var&) {}
-};
-#endif
-class Cubit: public virtual CORBA_Object
-{
-    private:
-	static const CORBA::TypeInfo _class_info;
-	Cubit(const Cubit&) {}
-	void operator=(const Cubit&){}
-    public:
-	static const CORBA::TypeInfo *_desc();
-	virtual const CORBA::TypeInfo *_type_info() const;
-	virtual void *_safe_narrow(const CORBA::TypeInfo& ) const;
-	static CORBA::Object *_factory();
-    protected:
-	Cubit(const char *obj_name = NULL) :CORBA_Object(obj_name, 1) {}
-	Cubit(NCistream& strm) :CORBA_Object(strm) {}
-	virtual ~Cubit() {}
-    public:
-	static Cubit_ptr _duplicate(Cubit_ptr obj) {
-		if (obj ) obj->_ref();
-		return obj;
-	}
-	static Cubit_ptr _nil() { return (Cubit_ptr)NULL;}
-	static Cubit_ptr _narrow(CORBA::Object *obj);
-	static Cubit_ptr _clone(Cubit_ptr obj) {
-		CORBA::Object_var obj_var(__clone(obj));
-
-#if defined(_HPCC_BUG)
-		return _narrow(obj_var.operator CORBA::Object_ptr());
-#else
-		return _narrow(obj_var);
-#endif
-	}
-	static Cubit_ptr _bind(const char *object_name = NULL,
-		const char *host_name = NULL,
-		const CORBA::BindOptions* opt = NULL); 
-
-	virtual CORBA::Octet cube_octet(CORBA::Octet o);
-	
-	virtual CORBA::Short cube_short(CORBA::Short s);
-	
-	virtual CORBA::Long cube_long(CORBA::Long l);
-	
-	struct Many {
-		CORBA::Octet	o;
-		CORBA::Long	l;
-		CORBA::Short	s;
-	};
-	friend NCostream& operator<<(NCostream&, const Many& );
-	friend NCistream& operator>>(NCistream&, Many& );
-	
-	friend ostream& operator<<(ostream&, const Many& );
-	inline friend istream& operator>>(istream& _strm, Many& _obj) {
-		NCistream _istrm(_strm);
-		_istrm >> _obj;
-		return _strm;
-	}
-	
-	
-	typedef Many *Many_ptr;
-	class Many_var
-	{
-	    public:
-		Many_var() { _ptr = (Many*)NULL;}
-		Many_var(Many *ptr) {
-			_ptr = ptr;
-		}
-		Many_var(const Many_var& var) {
-			if (var._ptr)
-				_ptr = new Many(*var._ptr);
-			else
-				_ptr = (Many *)NULL;
-		}
-		~Many_var() {
-			if (_ptr != (Many *)NULL) delete _ptr;
-		}
-		Many_var& operator=(Many *ptr) {
-			if (_ptr != (Many *)NULL) delete _ptr;
-			_ptr = ptr;
-			return *this;
-		}
-		Many_var& operator=(const Many_var& var) {
-			if (_ptr != (Many *)NULL) delete _ptr;
-			if (var._ptr)
-				_ptr = new Many(*var._ptr);
-			else
-				_ptr = (Many *)NULL;
-			return *this;
-		}
-		Many *operator->() { return _ptr; }
-		operator Many () const { return *_ptr; }
-		operator Many& () { return *_ptr; }
-		inline friend NCostream& operator<<(NCostream& strm,
-				const Many_var& var) {
-			if (var._ptr == (Many *)NULL) {
-				throw CORBA::BAD_PARAM();
-			}
-			else
-				strm << *var._ptr;
-			return strm;
-		}
-		inline friend NCistream& operator>>(NCistream& strm,
-				Many_var& var) {
-			if ( ! var._ptr)
-				var._ptr = new Many;
-			strm >> *var._ptr;
-			return strm;
-		}
-	    private:
-		Many *_ptr;
-	};
-	
-	
-	virtual Cubit::Many cube_struct(const Cubit::Many& values);
-	
-	enum discrim {
-		e_0th,
-		e_1st,
-		e_2nd,
-		e_3rd,
-		e_4th,
-		e_5th
-	};
-	inline friend NCostream& operator<<(NCostream& _strm, discrim _enum_type) {
-		_strm << (CORBA::ULong)_enum_type;
-		return _strm;
-	}
-	inline friend NCistream& operator>>(NCistream& _strm, discrim& _enum_type) {
-		CORBA::ULong _temp;
-		_strm >> _temp;
-		if (_temp >= 6)
-			throw CORBA::BAD_PARAM();
-		_enum_type = discrim(_temp);
-		return _strm;
-	}
-	inline friend ostream& operator<<(ostream& _strm, discrim _enum_type) {
-		if( &_strm == &cout || &_strm == &cerr || &_strm == &clog) {
-			_strm << "discrim:";
-			switch(_enum_type) {
-				case e_0th:
-					_strm << "e_0th" << endl;
-					break;
-				case e_1st:
-					_strm << "e_1st" << endl;
-					break;
-				case e_2nd:
-					_strm << "e_2nd" << endl;
-					break;
-				case e_3rd:
-					_strm << "e_3rd" << endl;
-					break;
-				case e_4th:
-					_strm << "e_4th" << endl;
-					break;
-				case e_5th:
-					_strm << "e_5th" << endl;
-					break;
-			}
-		}
-		else 
-			_strm << (CORBA::ULong)_enum_type;
-		return _strm;
-	}
-	inline friend istream& operator>>(istream& _strm, discrim& _enum_type) {
-		CORBA::ULong _temp;
-		_strm >> _temp;
-		_enum_type = discrim(_temp);
-		return _strm;
-	}
-	
-	
-	class oneof
-	{
-	    public:
-	    private:
-		discrim	_disc;
-		CORBA::Octet	__o;
-		CORBA::Short	__s;
-		CORBA::Long	__l;
-		Cubit::Many	__cm;
-	    public:
-		oneof() : _disc(discrim(0)) {}
-		~oneof() {}
-		oneof(const oneof& obj);
-		oneof& operator=(const oneof& obj);
-	
-		void _d(discrim val) { _disc = val; }
-		discrim _d() const { return _disc; }
-	
-		void o(CORBA::Octet val) {
-			__o = val;
-			_disc = Cubit::e_0th;
-		}
-		CORBA::Octet o() const { return __o; }
-	
-		void s(CORBA::Short val) {
-			__s = val;
-			_disc = Cubit::e_1st;
-		}
-		CORBA::Short s() const { return __s; }
-	
-		void l(CORBA::Long val) {
-			__l = val;
-			_disc = Cubit::e_2nd;
-		}
-		CORBA::Long l() const { return __l; }
-	
-		void cm(const Cubit::Many& val) {
-			__cm = val;
-			_disc = Cubit::e_3rd;
-		}
-		const Cubit::Many& cm() const { return __cm; }
-		Cubit::Many& cm() { return __cm; }
-	
-		friend NCostream& operator<<(NCostream&, const oneof& );
-		friend NCistream& operator>>(NCistream&, oneof& );
-		friend ostream& operator<<(ostream&, const oneof&);
-		inline friend istream& operator>>(istream& strm, oneof& obj) {
-			NCistream istrm(strm);
-			strm >> obj;
-			return strm;
-		}
-	};
-	
-	typedef oneof *oneof_ptr;
-	class oneof_var
-	{
-	    public:
-		oneof_var() { _ptr = (oneof*)NULL;}
-		oneof_var(oneof *ptr) {
-			_ptr = ptr;
-		}
-		oneof_var(const oneof_var& var) {
-			_ptr = new oneof(*var._ptr);
-		}
-		~oneof_var() {
-			if (_ptr != (oneof *)NULL) delete _ptr;
-		}
-		oneof_var& operator=(oneof *ptr) {
-			if (_ptr != (oneof *)NULL) delete _ptr;
-			_ptr = ptr;
-			return *this;
-		}
-		oneof_var& operator=(const oneof_var& var) {
-			if (_ptr != (oneof *)NULL) delete _ptr;
-			_ptr = new oneof(*var._ptr);
-			return *this;
-		}
-		oneof *operator->() { return _ptr; }
-		operator oneof () const { return *_ptr; }
-		operator oneof& () { return *_ptr; }
-		inline friend NCostream& operator<<(NCostream& strm,
-				const oneof_var& var) {
-			if (var._ptr == (oneof *)NULL) {
-				throw CORBA::BAD_PARAM();
-			}
-			else
-				strm << *var._ptr;
-			return strm;
-		}
-		inline friend NCistream& operator>>(NCistream& strm,
-				oneof_var& var) {
-			if ( ! var._ptr)
-				var._ptr = new oneof;
-			strm >> *var._ptr;
-			return strm;
-		}
-	    private:
-		oneof *_ptr;
-	};
-	
-	
-	virtual Cubit::oneof cube_union(const Cubit::oneof& values);
-	
-	virtual void please_exit();
-	
-	inline friend NCistream& operator>>(NCistream& strm, Cubit_ptr& obj) {
-		CORBA::Object_var _obj(obj);
-		_obj = CORBA::Object::_read(strm, Cubit::_desc());
-		obj = Cubit::_narrow(_obj);
-		return strm;
-	}
-	inline friend ostream& operator<<(ostream& strm, const Cubit_ptr obj) {
-		strm << (CORBA::Object_ptr)obj;
-		return strm;
-	}
-	inline friend istream& operator>>(istream& strm, Cubit_ptr& obj) {
-		NCistream istrm(strm);
-		istrm >> obj;
-		return strm;
-	}
-};
-
-
-#endif
-
diff --git a/TAO/IIOP/tests/Cubit/Orbix/tpr/cubitS.cpp b/TAO/IIOP/tests/Cubit/Orbix/tpr/cubitS.cpp
deleted file mode 100644
index 449a8c23548..00000000000
--- a/TAO/IIOP/tests/Cubit/Orbix/tpr/cubitS.cpp
+++ /dev/null
@@ -1,226 +0,0 @@
-#include "cubit.h"
-
-
-#define Cubit_dispatch_impl
-
-unsigned char Cubit_dispatch::dispatch (CORBA::Request &IT_r, 
- unsigned char IT_isTarget, void *IT_pp) {
-    if (!IT_pp)
-       IT_pp = m_obj;
-    const char *IT_s = IT_r.getOperation ();
-    if (!strcmp(IT_s,"cube_octet")) {
-        CORBA::Octet IT_result;
-        CORBA::Environment IT_env (IT_r);
-        CORBA::Filter* IT_f = CORBA::Orbix.getFilter ();
-        if (!IT_r.tcAssert ("\
-Ro~cube_octet~+o{o},>{o},N{}\
-"))
-            return 1;
-        CORBA::Octet o;
-
-        IT_r.extractOctet (o);
-
-        if (IT_f && !IT_r.isException (IT_env))
-        	IT_f->inRequestPostM (IT_r, IT_env);
-        if (!IT_r.isException (IT_env)) {
-            try {
-                	IT_result = ((Cubit*)IT_pp)->cube_octet (  o, IT_env);
-
-            } catch (CORBA::SystemException &IT_exSys) {
-            IT_env.propagate (&IT_exSys);
-            } catch (CORBA::UserException &IT_exUsr) {
-            IT_env.propagate (&IT_exUsr);
-            }
-        }
-
-        if (!IT_r.isException (IT_env)) {
-            if (!IT_r.convertToReply ("\
-o\
-", IT_env)) return 1;
-            IT_r.insertOctet (IT_result);
-            }
-
-        else IT_r.makeSystemException (IT_env);
-        return 1;
-    }
-
-    if (!strcmp(IT_s,"cube_short")) {
-        CORBA::Short IT_result;
-        CORBA::Environment IT_env (IT_r);
-        CORBA::Filter* IT_f = CORBA::Orbix.getFilter ();
-        if (!IT_r.tcAssert ("\
-Ro~cube_short~+s{s},>{s},N{}\
-"))
-            return 1;
-        CORBA::Short s;
-
-        IT_r >> s;
-
-        if (IT_f && !IT_r.isException (IT_env))
-        	IT_f->inRequestPostM (IT_r, IT_env);
-        if (!IT_r.isException (IT_env)) {
-            try {
-                	IT_result = ((Cubit*)IT_pp)->cube_short (  s, IT_env);
-
-            } catch (CORBA::SystemException &IT_exSys) {
-            IT_env.propagate (&IT_exSys);
-            } catch (CORBA::UserException &IT_exUsr) {
-            IT_env.propagate (&IT_exUsr);
-            }
-        }
-
-        if (!IT_r.isException (IT_env)) {
-            if (!IT_r.convertToReply ("\
-s\
-", IT_env)) return 1;
-            IT_r << IT_result;
-            }
-
-        else IT_r.makeSystemException (IT_env);
-        return 1;
-    }
-
-    if (!strcmp(IT_s,"cube_long")) {
-        CORBA::Long IT_result;
-        CORBA::Environment IT_env (IT_r);
-        CORBA::Filter* IT_f = CORBA::Orbix.getFilter ();
-        if (!IT_r.tcAssert ("\
-Ro~cube_long~+l{l},>{l},N{}\
-"))
-            return 1;
-        CORBA::Long l;
-
-        IT_r >> l;
-
-        if (IT_f && !IT_r.isException (IT_env))
-        	IT_f->inRequestPostM (IT_r, IT_env);
-        if (!IT_r.isException (IT_env)) {
-            try {
-                	IT_result = ((Cubit*)IT_pp)->cube_long (  l, IT_env);
-
-            } catch (CORBA::SystemException &IT_exSys) {
-            IT_env.propagate (&IT_exSys);
-            } catch (CORBA::UserException &IT_exUsr) {
-            IT_env.propagate (&IT_exUsr);
-            }
-        }
-
-        if (!IT_r.isException (IT_env)) {
-            if (!IT_r.convertToReply ("\
-l\
-", IT_env)) return 1;
-            IT_r << IT_result;
-            }
-
-        else IT_r.makeSystemException (IT_env);
-        return 1;
-    }
-
-    if (!strcmp(IT_s,"cube_struct")) {
-        Cubit::Many IT_result;
-        CORBA::Environment IT_env (IT_r);
-        CORBA::Filter* IT_f = CORBA::Orbix.getFilter ();
-        if (!IT_r.tcAssert ("\
-Ro~cube_struct~+values{R~Cubit::Many~o{o},l{l},s{s}},>{R~Cubit::Many~o{o},l{l},s{s}},N{}\
-"))
-            return 1;
-        Cubit::Many values;
-
-        values.decodeOp (IT_r);
-
-        if (IT_f && !IT_r.isException (IT_env))
-        	IT_f->inRequestPostM (IT_r, IT_env);
-        if (!IT_r.isException (IT_env)) {
-            try {
-                	IT_result = ((Cubit*)IT_pp)->cube_struct (  values, IT_env);
-
-            } catch (CORBA::SystemException &IT_exSys) {
-            IT_env.propagate (&IT_exSys);
-            } catch (CORBA::UserException &IT_exUsr) {
-            IT_env.propagate (&IT_exUsr);
-            }
-        }
-
-        if (!IT_r.isException (IT_env)) {
-            if (!IT_r.convertToReply ("\
-R~Cubit::Many~o{o},l{l},s{s}\
-", IT_env)) return 1;
-            IT_result.encodeOp (IT_r);
-            }
-
-        else IT_r.makeSystemException (IT_env);
-        return 1;
-    }
-
-    if (!strcmp(IT_s,"cube_union")) {
-        Cubit::oneof IT_result;
-        CORBA::Environment IT_env (IT_r);
-        CORBA::Filter* IT_f = CORBA::Orbix.getFilter ();
-        IT_r.tcPreAssert (
-"\
-Ro~cube_union~+values{U~Cubit::oneof~{E~Cubit::discrim~e_0th,e_1st,e_2nd,e_3rd,e_4th,e_5th}~Cubit::e_0th o{o};Cubit::e_1st s{s};Cubit::e_2nd l{l};Cubit::e_3rd,$ cm{R~Cubit::Many~o{o},l{l},s{s}}},>{U~Cubit::oneof~{E~Cubit::discrim~e_0th,e_1st,e_2nd,e_3rd,\
-");
-        if (!IT_r.tcAssert ("\
-e_4th,e_5th}~Cubit::e_0th o{o};Cubit::e_1st s{s};Cubit::e_2nd l{l};Cubit::e_3rd,$ cm{R~Cubit::Many~o{o},l{l},s{s}}},N{}\
-"))
-            return 1;
-        Cubit::oneof values;
-
-        values.decodeOp (IT_r);
-
-        if (IT_f && !IT_r.isException (IT_env))
-        	IT_f->inRequestPostM (IT_r, IT_env);
-        if (!IT_r.isException (IT_env)) {
-            try {
-                	IT_result = ((Cubit*)IT_pp)->cube_union (  values, IT_env);
-
-            } catch (CORBA::SystemException &IT_exSys) {
-            IT_env.propagate (&IT_exSys);
-            } catch (CORBA::UserException &IT_exUsr) {
-            IT_env.propagate (&IT_exUsr);
-            }
-        }
-
-        if (!IT_r.isException (IT_env)) {
-            if (!IT_r.convertToReply ("\
-U~Cubit::oneof~{E~Cubit::discrim~e_0th,e_1st,e_2nd,e_3rd,e_4th,e_5th}~Cubit::e_0th o{o};Cubit::e_1st s{s};Cubit::e_2nd l{l};Cubit::e_3rd,$ cm{R~Cubit::Many~o{o},l{l},s{s}}\
-", IT_env)) return 1;
-            IT_result.encodeOp (IT_r);
-            }
-
-        else IT_r.makeSystemException (IT_env);
-        return 1;
-    }
-
-    if (!strcmp(IT_s,"please_exit")) {
-        CORBA::Environment IT_env (IT_r);
-        CORBA::Filter* IT_f = CORBA::Orbix.getFilter ();
-        if (!IT_r.tcAssert ("\
-Ro~please_exit~>{v},O{}\
-"))
-            return 1;
-
-        if (IT_f && !IT_r.isException (IT_env))
-        	IT_f->inRequestPostM (IT_r, IT_env);
-        if (!IT_r.isException (IT_env)) {
-            try {
-                ((Cubit*)IT_pp)->please_exit (IT_env);
-
-            } catch (CORBA::SystemException &IT_exSys) {
-            IT_env.propagate (&IT_exSys);
-            } catch (CORBA::UserException &IT_exUsr) {
-            IT_env.propagate (&IT_exUsr);
-            }
-        }
-        IT_r.replyNoResults (CORBA::Flags(CORBA::INV_NO_RESPONSE),IT_env);
-        return 1;
-    }
-
-    if (IT_isTarget)
-        IT_r.makeRuntimeException2 ();
-
-    return 0;
-}
-
-#include "cubitC.cpp"
-
diff --git a/TAO/IIOP/tests/Cubit/Orbix/tpr/cubitS.h b/TAO/IIOP/tests/Cubit/Orbix/tpr/cubitS.h
deleted file mode 100644
index 757af4664ad..00000000000
--- a/TAO/IIOP/tests/Cubit/Orbix/tpr/cubitS.h
+++ /dev/null
@@ -1,118 +0,0 @@
-#ifndef _cubitS_h
-#define _cubitS_h
-
-#include "cubitC.h"
-
-/************************************************************************/
-/*                                                                      */
-/* This file is automatically generated by ORBeline IDL compiler        */
-/* Do not modify this file.                                             */
-/*                                                                      */
-/* ORBeline (c) is copyrighted by PostModern Computing, Inc.            */
-/*                                                                      */
-/* The generated code conforms to OMG's IDL C++ mapping as              */
-/* specified in OMG Document Number: 94-9-14.                           */
-/*                                                                      */
-/************************************************************************/
-
-class _sk_Cubit : public Cubit
-{
-    protected:
-	_sk_Cubit(const char *object_name = (const char *)NULL);
-	_sk_Cubit(const char *service_name, const CORBA::ReferenceData& data);
-	virtual ~_sk_Cubit() {}
-    public:
-	static const CORBA::TypeInfo _skel_info;
-
-	// The following operations need to be implemented by the server.
-	virtual CORBA::Octet cube_octet(CORBA::Octet o) = 0;
-	virtual CORBA::Short cube_short(CORBA::Short s) = 0;
-	virtual CORBA::Long cube_long(CORBA::Long l) = 0;
-	virtual Cubit::Many cube_struct(const Cubit::Many& values) = 0;
-	virtual Cubit::oneof cube_union(const Cubit::oneof& values) = 0;
-	virtual void please_exit() = 0;
-	
-	// Skeleton Operations implemented automatically
-	
-	static void _cube_octet(void *obj,
-			CORBA::MarshalStream &strm,
-			CORBA::Principal_ptr principal,
-			const char *oper,
-			void *priv_data);
-	
-	static void _cube_short(void *obj,
-			CORBA::MarshalStream &strm,
-			CORBA::Principal_ptr principal,
-			const char *oper,
-			void *priv_data);
-	
-	static void _cube_long(void *obj,
-			CORBA::MarshalStream &strm,
-			CORBA::Principal_ptr principal,
-			const char *oper,
-			void *priv_data);
-	
-	static void _cube_struct(void *obj,
-			CORBA::MarshalStream &strm,
-			CORBA::Principal_ptr principal,
-			const char *oper,
-			void *priv_data);
-	
-	static void _cube_union(void *obj,
-			CORBA::MarshalStream &strm,
-			CORBA::Principal_ptr principal,
-			const char *oper,
-			void *priv_data);
-	
-	static void _please_exit(void *obj,
-			CORBA::MarshalStream &strm,
-			CORBA::Principal_ptr principal,
-			const char *oper,
-			void *priv_data);
-	
-};
-template <class T>
-class _tie_Cubit : public Cubit
-{
-    public:
-	_tie_Cubit(T& t, const char *obj_name=(char*)NULL) : 
-			Cubit(obj_name), 
-			_ref(t) {
-		_object_name(obj_name);
-	}
-	_tie_Cubit(T& t, const char *service_name,
-			const CORBA::ReferenceData& id)
-			:_ref(t) {
-		_service(service_name, id);
-	}
-	~_tie_Cubit() {}
-	CORBA::Octet cube_octet(CORBA::Octet o) {
-		return _ref.cube_octet(
-		o);
-	}
-	CORBA::Short cube_short(CORBA::Short s) {
-		return _ref.cube_short(
-		s);
-	}
-	CORBA::Long cube_long(CORBA::Long l) {
-		return _ref.cube_long(
-		l);
-	}
-	Cubit::Many cube_struct(const Cubit::Many& values) {
-		return _ref.cube_struct(
-		values);
-	}
-	Cubit::oneof cube_union(const Cubit::oneof& values) {
-		return _ref.cube_union(
-		values);
-	}
-	void please_exit() {
-		_ref.please_exit();
-	}
-
-    private:
-	T& _ref;
-};
-
-#endif
-
diff --git a/TAO/IIOP/tests/Cubit/Orbix/tpr/cubit_impl.cpp b/TAO/IIOP/tests/Cubit/Orbix/tpr/cubit_impl.cpp
deleted file mode 100644
index e35f1084118..00000000000
--- a/TAO/IIOP/tests/Cubit/Orbix/tpr/cubit_impl.cpp
+++ /dev/null
@@ -1,46 +0,0 @@
-#include "cubit_impl.h"
-
-CORBA::Octet Cubit_Impl:: cube_octet (CORBA::Octet o, CORBA::Environment &IT_env) throw (CORBA::SystemException) {
-  return (CORBA::Octet) (o * o * o); 
-}
-
-CORBA::Short Cubit_Impl:: cube_short (CORBA::Short s, CORBA::Environment &IT_env) throw (CORBA::SystemException) {
-  return (CORBA::Short) (s * s * s);
-}
-
-CORBA::Long Cubit_Impl:: cube_long (CORBA::Long l, CORBA::Environment &IT_env) throw (CORBA::SystemException) {
-   return (CORBA::Long) (l * l * l);
-}
-
-Cubit::Many Cubit_Impl:: cube_struct (const Cubit::Many& values, CORBA::Environment &IT_env) throw (CORBA::SystemException) {
-  Cubit::Many out_values;
-  out_values.o = values.o * values.o * values.o;
-  out_values.s = values.s * values.s * values.s;
-  out_values.l = values.l * values.l * values.l;
-  return out_values; 
-}
-
-Cubit::oneof Cubit_Impl:: cube_union (const Cubit::oneof& values, CORBA::Environment &IT_env) throw (CORBA::SystemException) {
-  Cubit::oneof out_values;
-   switch (values._d ()) {
-   case Cubit::e_0th:
-     out_values.o (values.o () * values.o ()  * values.o ());
-     break;
-   case Cubit::e_1st:
-     out_values.s (values.s () * values.s () * values.s ());
-     break;
-   case Cubit::e_2nd:
-     out_values.l (values.l () * values.l () * values.l ());
-     break;
-   case Cubit::e_3rd:
-   default:
-     out_values.cm ().o = values.cm ().o * values.cm ().o * values.cm ().o ;
-     out_values.cm ().s = values.cm ().s * values.cm ().s * values.cm ().s ;
-     out_values.cm ().l = values.cm ().l * values.cm ().l * values.cm ().l ;
-     break;
-   }
-   return out_values;  
-}
-
-void Cubit_Impl:: please_exit (CORBA::Environment &IT_env) throw (CORBA::SystemException) {
-}
diff --git a/TAO/IIOP/tests/Cubit/Orbix/tpr/cubit_impl.h b/TAO/IIOP/tests/Cubit/Orbix/tpr/cubit_impl.h
deleted file mode 100644
index 1e710bb15d1..00000000000
--- a/TAO/IIOP/tests/Cubit/Orbix/tpr/cubit_impl.h
+++ /dev/null
@@ -1,27 +0,0 @@
-
-#ifndef cubit_ih
-#define cubit_ih
-
-#include "cubit.h"
-
-
-#ifdef Cubit_USE_BOA
-class Cubit_Impl : public virtual CubitBOAImpl {
-#else
-class Cubit_Impl {
-#endif /* Cubit_USE_BOA */
-
-public:
-        virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env=CORBA::default_environment) throw (CORBA::SystemException);
-        virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env=CORBA::default_environment) throw (CORBA::SystemException);
-        virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env=CORBA::default_environment) throw (CORBA::SystemException);
-        virtual Cubit::Many cube_struct (const Cubit::Many& values, CORBA::Environment &IT_env=CORBA::default_environment) throw (CORBA::SystemException);
-        virtual Cubit::oneof cube_union (const Cubit::oneof& values, CORBA::Environment &IT_env=CORBA::default_environment) throw (CORBA::SystemException);
-        virtual void please_exit (CORBA::Environment &IT_env=CORBA::default_environment) throw (CORBA::SystemException);
-};
-
-#ifndef Cubit_USE_BOA
-DEF_TIE_Cubit (Cubit_Impl)
-#endif /* Cubit_USE_BOA */
-
-#endif
diff --git a/TAO/IIOP/tests/Cubit/Orbix/tpr/server.cpp b/TAO/IIOP/tests/Cubit/Orbix/tpr/server.cpp
deleted file mode 100644
index 96117fe3e0d..00000000000
--- a/TAO/IIOP/tests/Cubit/Orbix/tpr/server.cpp
+++ /dev/null
@@ -1,40 +0,0 @@
-//**************************************************************************
-//
-// NAME :   tpr_server.cpp 
-// DESCRIPTION:  
-//
-// Server mainline
-//
-//****************************************************************************
-#define IT_EX_MACROS
-
-#include "cubit_impl.h"		// server header file
-
-int 
-main (int , char**)
-{
-
-#ifdef Cubit_USE_BOA
-  Cubit_var cb = new Cubit_Impl;
-  cout << "Using BOA approach" << endl;
-#else
-  Cubit_var cb = new TIE_Cubit (Cubit_Impl) (new Cubit_Impl);
-  cout << "Using TIE approach" << endl;
-#endif /* Cubit_USE_BOA */
-  
-  //
-  // Go get some work to do....
-  //
-  IT_TRY {
-      CORBA::Orbix.impl_is_ready("Cubit", IT_X);
-  }
-  IT_CATCHANY {
-     cout << IT_X << endl;
-  }
-  IT_ENDTRY;
-
-  cout << "Cubit server is exiting." << endl;
-
-
-  return 0;
-}
diff --git a/TAO/IIOP/tests/Cubit/Orbix/tpr/tpr.cpp b/TAO/IIOP/tests/Cubit/Orbix/tpr/tpr.cpp
deleted file mode 100644
index 415410aea9f..00000000000
--- a/TAO/IIOP/tests/Cubit/Orbix/tpr/tpr.cpp
+++ /dev/null
@@ -1,26 +0,0 @@
-#include "tpr.h"
-
-void *
-worker(void *vp)
-{
-  ACE_Thread_Control tc (ACE_Thread_Manager::instance ());
-  CORBA::Orbix.continueThreadDispatch (*(CORBA::Request *)vp);
-  return NULL;
-}
-
-
-int
-tpr_filter::inRequestPreMarshal(CORBA::Request &r,  CORBA::Environment&)
-{
-//   thread_t	tid;
-//   thr_create(NULL, 0, worker, (void *)&r, THR_DETACHED, &tid);
-
-  ACE_Thread_Manager *thr_mgr = ACE_Thread_Manager::instance ();
-  thr_mgr->spawn (ACE_THR_FUNC (worker),
-                  (void *) &r, 
-                  THR_DETACHED);
-
-  return -1;
-}
-
-tpr_filter tpr_dispatcher;
diff --git a/TAO/IIOP/tests/Cubit/Orbix/tpr/tpr.h b/TAO/IIOP/tests/Cubit/Orbix/tpr/tpr.h
deleted file mode 100644
index 38c2ccc7069..00000000000
--- a/TAO/IIOP/tests/Cubit/Orbix/tpr/tpr.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#include "cubit.h"
-#include "ace/Service_Config.h"
-#include "ace/Thread_Manager.h"
-
-//
-// Create a thread filter to dispatch incoming calls
-//
-class tpr_filter : public CORBA::ThreadFilter {
-	virtual int inRequestPreMarshal(CORBA::Request &, CORBA::Environment&);
-};
diff --git a/TAO/IIOP/tests/Cubit/Orbix/tps/Makefile b/TAO/IIOP/tests/Cubit/Orbix/tps/Makefile
deleted file mode 100644
index f7e949578c2..00000000000
--- a/TAO/IIOP/tests/Cubit/Orbix/tps/Makefile
+++ /dev/null
@@ -1,349 +0,0 @@
-#----------------------------------------------------------------------------
-#	@(#)Makefile	1.1	10/18/96
-#
-#	Makefile for the ACE_MT_CORBA_Handler tests
-#----------------------------------------------------------------------------
-
-#----------------------------------------------------------------------------
-#	Local macros
-#----------------------------------------------------------------------------
-
-SRC = cubitS.cpp cubit_impl.cpp server.cpp tps.cpp
-
-SVR_OBJS = cubitS.o cubit_impl.o server.o tps.o
-
-LDLIBS	 = 
-
-VLDLIBS	 = $(LDLIBS:%=%$(VAR))
-
-#----------------------------------------------------------------------------
-#	Include macros and targets
-#----------------------------------------------------------------------------
-
-include		$(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-include		$(ACE_ROOT)/include/makeinclude/macros.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.common.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.lib.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.bin.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
-
-#----------------------------------------------------------------------------
-#	Orbix related macros and target settings.
-#----------------------------------------------------------------------------
-
-
-ORBIX_BINDIR    = $(ORBIX_ROOT)/bin
-ORBIX_LIBDIR    = $(ORBIX_ROOT)/corba2/lib
-ORBIX_INCDIR    = $(ORBIX_ROOT)/corba2/include
-
-# Remove -DCubit_USE_BOA from below to use the TIE approach
-
-CPPFLAGS += -DEXCEPTIONS -I$(ORBIX_INCDIR) -DWANT_ORBIX_FDS -DCubit_USE_BOA
-LDFLAGS  += -L$(ORBIX_LIBDIR) -R $(ORBIX_LIBDIR) -L$(ACE)/ace
-
-IDLFLAGS = -s S.cpp -c C.cpp -B
-
-#----------------------------------------------------------------------------
-#	Local targets
-#----------------------------------------------------------------------------
-
-all: server
-
-server: $(addprefix $(VDIR),$(SVR_OBJS))
-	$(LINK.cc) -o server $(addprefix $(VDIR),$(SVR_OBJS)) $(LDFLAGS) $(ITIIOP) $(ITSRV) $(VLDLIBS)
-
-#----------------------------------------------------------------------------
-#	Dependencies
-#----------------------------------------------------------------------------
-# DO NOT DELETE THIS LINE -- g++dep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-
-.obj/cubitS.o .shobj/cubitS.so: cubitS.cpp cubit.h cubitC.cpp
-.obj/cubit_impl.o .shobj/cubit_impl.so: cubit_impl.cpp cubit_impl.h cubit.h \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/config-sunos5.5-sunc++-4.x.h \
- $(ACE_ROOT)/ace/stdcpp.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Token.h \
- $(ACE_ROOT)/ace/Token.i \
- $(ACE_ROOT)/ace/Pipe.h \
- $(ACE_ROOT)/ace/Pipe.i \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Proactor.h \
- $(ACE_ROOT)/ace/Asynch_IO.h \
- $(ACE_ROOT)/ace/Timer_List.h \
- $(ACE_ROOT)/ace/Timer_List_T.h \
- $(ACE_ROOT)/ace/Timer_Heap.h \
- $(ACE_ROOT)/ace/Timer_Heap_T.h \
- $(ACE_ROOT)/ace/Timer_Wheel.h \
- $(ACE_ROOT)/ace/Timer_Wheel_T.h \
- $(ACE_ROOT)/ace/ReactorEx.h \
- $(ACE_ROOT)/ace/ReactorEx.i \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/Task_T.i
-.obj/server.o .shobj/server.so: server.cpp cubit_impl.h cubit.h \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/config-sunos5.5-sunc++-4.x.h \
- $(ACE_ROOT)/ace/stdcpp.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Token.h \
- $(ACE_ROOT)/ace/Token.i \
- $(ACE_ROOT)/ace/Pipe.h \
- $(ACE_ROOT)/ace/Pipe.i \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Proactor.h \
- $(ACE_ROOT)/ace/Asynch_IO.h \
- $(ACE_ROOT)/ace/Timer_List.h \
- $(ACE_ROOT)/ace/Timer_List_T.h \
- $(ACE_ROOT)/ace/Timer_Heap.h \
- $(ACE_ROOT)/ace/Timer_Heap_T.h \
- $(ACE_ROOT)/ace/Timer_Wheel.h \
- $(ACE_ROOT)/ace/Timer_Wheel_T.h \
- $(ACE_ROOT)/ace/ReactorEx.h \
- $(ACE_ROOT)/ace/ReactorEx.i \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/Task_T.i
-.obj/tps.o .shobj/tps.so: tps.cpp tps.h cubit.h cubit_impl.h \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/config-sunos5.5-sunc++-4.x.h \
- $(ACE_ROOT)/ace/stdcpp.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Token.h \
- $(ACE_ROOT)/ace/Token.i \
- $(ACE_ROOT)/ace/Pipe.h \
- $(ACE_ROOT)/ace/Pipe.i \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Proactor.h \
- $(ACE_ROOT)/ace/Asynch_IO.h \
- $(ACE_ROOT)/ace/Timer_List.h \
- $(ACE_ROOT)/ace/Timer_List_T.h \
- $(ACE_ROOT)/ace/Timer_Heap.h \
- $(ACE_ROOT)/ace/Timer_Heap_T.h \
- $(ACE_ROOT)/ace/Timer_Wheel.h \
- $(ACE_ROOT)/ace/Timer_Wheel_T.h \
- $(ACE_ROOT)/ace/ReactorEx.h \
- $(ACE_ROOT)/ace/ReactorEx.i \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/Task_T.i
-
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/IIOP/tests/Cubit/Orbix/tps/cubit.h b/TAO/IIOP/tests/Cubit/Orbix/tps/cubit.h
deleted file mode 100644
index 72e2fb81395..00000000000
--- a/TAO/IIOP/tests/Cubit/Orbix/tps/cubit.h
+++ /dev/null
@@ -1,1111 +0,0 @@
-
-#ifndef cubit_hh
-#define cubit_hh
-
-#include <CORBA.h>
-
-#include <string.h>
-
-
-#ifndef _Cubit_defined
-#define _Cubit_defined
-class Cubit_dispatch : public virtual CORBA::PPTR {
-public:
-
-      Cubit_dispatch (void *IT_p, CORBA::Object* IT_o, const char *IT_m, 
-        CORBA::LoaderClass *IT_l, char *IT_i, void* IT_im)
-       : PPTR (IT_p,IT_o,IT_m,IT_l,IT_i,IT_im) {}
-
-
-   Cubit_dispatch (char *IT_OR, void *IT_p, CORBA::Object *IT_o)
-       : PPTR (IT_OR,IT_p,IT_o) {}
-
-
-   Cubit_dispatch () {}
-
-   Cubit_dispatch (ObjectReference *IT_OR, void *IT_p, CORBA::Object *IT_o)
-       : PPTR (IT_OR,IT_p,IT_o) {}
-
-
-   Cubit_dispatch (void *IT_p, CORBA::Object *IT_o, const char *IT_m, 
-        char *IT_i, CORBA::Object* IT_ob, void* IT_im)
-       : PPTR (IT_p,IT_o,IT_m,IT_i,IT_ob,IT_im) {}
-
-
-   virtual unsigned char dispatch (CORBA::Request &IT_r, 
-        unsigned char IT_isTarget, void* IT_pp=NULL);
-
-
-};
-
-class Cubit;
-
-#ifndef CubitPtr
-#define CubitPtr
-
-typedef Cubit* Cubit_ptr;
-
-typedef Cubit* CubitRef;
-
-#endif
-
-
-#ifndef CubitForwH
-#define CubitForwH
-CORBA::ObjectRef Cubit_getBase (void *);
-void Cubit_release (Cubit *, CORBA::Environment &IT_env);
-void Cubit_release (Cubit_ptr);
-Cubit* Cubit_duplicate (Cubit_ptr, CORBA::Environment &IT_env);
-Cubit* Cubit_duplicate (Cubit_ptr );
-Cubit_ptr Cubit_nil (CORBA::Environment &IT_env);
-Cubit_ptr Cubit_nil ();
-#endif
-#define Cubit_IMPL "Cubit"
-
-
-class Cubit;
-
-typedef Cubit CubitProxy;
-#define Cubit_IR "Cubit$v1.1"
-#define Cubit_IMPL "Cubit"
-
-#ifndef CubitPtr
-#define CubitPtr
-
-typedef Cubit* Cubit_ptr;
-
-typedef Cubit* CubitRef;
-
-#endif
-
-class Cubit: public virtual CORBA::Object  {
-public:
-        Cubit (char *IT_OR);
-    Cubit (ObjectReference *IT_OR);
-    Cubit () : CORBA::Object  (1) {}
-protected:
-    Cubit_ptr __duplicate(
-            CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) {
-       CORBA::Object::__duplicate (IT_env);
-       return this;
-    }
-public:
-    static Cubit_ptr _duplicate(
-            Cubit_ptr, 
-            CORBA::Environment &IT_pEnv=CORBA::IT_chooseDefaultEnv ());
-public:
-   static Cubit* _bind (const char* IT_markerServer, const char* host,
-		const CORBA::Context &IT_c, 
-		CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-   static Cubit* _bind (CORBA::Environment &IT_env);
-   static Cubit* _bind (const char* IT_markerServer=NULL, const char* host=NULL,
-                 CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-    static Cubit* _narrow (CORBA::Object* , CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-    static Cubit_ptr _nil (CORBA::Environment &IT_pEnv=CORBA::IT_chooseDefaultEnv ()) {
-        CORBA::EnvExcRaiser IT_raise;
-        CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-        return (Cubit_ptr) CORBA::OBJECT_NIL;}
-
-#ifndef Cubit_Many_defined
-#define Cubit_Many_defined
-
-struct Many {
-    CORBA::Octet o;
-    CORBA::Long l;
-    CORBA::Short s;
-
-    void encodeOp (CORBA::Request &IT_r) const;
-    void decodeOp (CORBA::Request &IT_r);
-    void decodeInOutOp (CORBA::Request &IT_r);
-    Many(const Many &);
-    Many();
-    ~Many();
-    Many& operator= (const Many&);
-};
-
-#ifndef Cubit_ManyVarH
-#define Cubit_ManyVarH
-
-#ifndef Cubit_ManyvPtr
-#define Cubit_ManyvPtr
-typedef Many* Many_vPtr;
-typedef const Many* Many_cvPtr;
-#endif
-
-class Many_var : public CORBA::_var
-{
-    private:
-
-    unsigned char copyHelper (const Many_var &IT_s) {
-        if (!IT_s._ptr) {
-            _ptr = IT_s._ptr;
-        } else
-        {
-            _ptr = new Many;
-            *(_ptr) =  *(IT_s._ptr);
-        }
-        return 1;
-    }
-
-    public:
-
-    Many_var (const Many_var &IT_s) {
-        (void) copyHelper (IT_s);
-    }
-
-    Many_var () {
-        _ptr =  new Many;
-;
-    }
-
-    Many_var (Many *IT_p) {
-        _ptr = IT_p;
-    }
-
-    Many_var &operator= (Many *IT_p) {
-        if (_ptr != IT_p) {
-            delete _ptr;
-        }
-        _ptr = IT_p;
-        return (*this);
-    }
-
-    Many_var &operator= (const Many_var &IT_s) {
-        if (_ptr != IT_s._ptr) {
-            delete _ptr;
-        }
-        _ptr = new Many;
-        *(_ptr) =  *(IT_s._ptr);
-        return (*this);
-    }
-
-    ~Many_var () {
-        delete _ptr;
-    }
-
-    Many* operator-> () {
-        return _ptr;
-    }
-
-    operator Many_cvPtr () const { return _ptr;}
-    operator Many_vPtr& () { return _ptr;}
-    operator Many& () const { return * _ptr;}
-
-    protected:
-    Many *_ptr;
-    private:
-    Many_var &operator= (const CORBA::_var &IT_s);
-    Many_var (const CORBA::_var &IT_s);
-};
-
-#endif
-
-
-#endif
-
-enum discrim {e_0th,e_1st,e_2nd,e_3rd,e_4th,e_5th, IT__ENUM_Cubit_discrim=CORBA_ULONG_MAX};
-
-#ifndef Cubit_oneof_defined
-#define Cubit_oneof_defined
-
-struct oneof {
-    private:
-
-    discrim __d;
-    union {
-        CORBA::Octet _o_;
-        CORBA::Short _s_;
-        CORBA::Long _l_;
-        Many * _cm_;
-    };
-
-    public:
-
-    void encodeOp (CORBA::Request &IT_r) const;
-    void decodeOp (CORBA::Request &IT_r);
-    void decodeInOutOp (CORBA::Request &IT_r);
-
-    private:
-
-    unsigned char isSet;
-
-    public:
-
-    discrim _d () const { return __d; }
-
-    CORBA::Octet o () const {
-        return _o_;
-    }
-
-    void o (CORBA::Octet IT_member) {
-        if (isSet && (__d != Cubit::e_0th))
-        {
-            this-> oneof::~oneof();
-            memset(this, 0, sizeof(*this));
-        }
-
-        __d = Cubit::e_0th;
-        isSet = 1;
-        _o_ = IT_member;
-    }
-
-    CORBA::Short s () const {
-        return _s_;
-    }
-
-    void s (CORBA::Short IT_member) {
-        if (isSet && (__d != Cubit::e_1st))
-        {
-            this-> oneof::~oneof();
-            memset(this, 0, sizeof(*this));
-        }
-
-        __d = Cubit::e_1st;
-        isSet = 1;
-        _s_ = IT_member;
-    }
-
-    CORBA::Long l () const {
-        return _l_;
-    }
-
-    void l (CORBA::Long IT_member) {
-        if (isSet && (__d != Cubit::e_2nd))
-        {
-            this-> oneof::~oneof();
-            memset(this, 0, sizeof(*this));
-        }
-
-        __d = Cubit::e_2nd;
-        isSet = 1;
-        _l_ = IT_member;
-    }
-
-    Many& cm () {
-        return (*_cm_);
-    }
-
-    const Many& cm () const {
-        return (*_cm_);
-    }
-
-    void cm (const Many& IT_member) {
-        if (isSet && (__d != Cubit::e_3rd))
-        {
-            this-> oneof::~oneof();
-            memset(this, 0, sizeof(*this));
-        }
-
-        __d = Cubit::e_3rd;
-
-        if (!isSet) {
-            _cm_ = new Many;
-            isSet = 1;
-        }
-        *(_cm_) = IT_member;
-    }
-
-
-    oneof();
-    oneof(const oneof &);
-    ~oneof();
-    oneof& operator= (const oneof&);
-};
-
-#ifndef Cubit_oneofVarH
-#define Cubit_oneofVarH
-
-#ifndef Cubit_oneofvPtr
-#define Cubit_oneofvPtr
-typedef oneof* oneof_vPtr;
-typedef const oneof* oneof_cvPtr;
-#endif
-
-class oneof_var : public CORBA::_var
-{
-    private:
-
-    unsigned char copyHelper (const oneof_var &IT_s) {
-        if (!IT_s._ptr) {
-            _ptr = IT_s._ptr;
-        } else
-        {
-            _ptr = new oneof;
-            *(_ptr) =  *(IT_s._ptr);
-        }
-        return 1;
-    }
-
-    public:
-
-    oneof_var (const oneof_var &IT_s) {
-        (void) copyHelper (IT_s);
-    }
-
-    oneof_var () {
-        _ptr = NULL;
-    }
-
-    oneof_var (oneof *IT_p) {
-        _ptr = IT_p;
-    }
-
-    oneof_var &operator= (oneof *IT_p) {
-        if (_ptr != IT_p) {
-            delete _ptr;
-        }
-        _ptr = IT_p;
-        return (*this);
-    }
-
-    oneof_var &operator= (const oneof_var &IT_s) {
-        if (_ptr != IT_s._ptr) {
-            delete _ptr;
-        }
-        _ptr = new oneof;
-        *(_ptr) =  *(IT_s._ptr);
-        return (*this);
-    }
-
-    ~oneof_var () {
-        delete _ptr;
-    }
-
-    oneof* operator-> () {
-        return _ptr;
-    }
-
-    operator oneof_cvPtr () const { return _ptr;}
-    operator oneof_vPtr& () { return _ptr;}
-    operator oneof& () const { return * _ptr;}
-
-    protected:
-    oneof *_ptr;
-    private:
-    oneof_var &operator= (const CORBA::_var &IT_s);
-    oneof_var (const CORBA::_var &IT_s);
-};
-
-#endif
-
-
-#endif
-        virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual Many cube_struct (const Many& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual oneof cube_union (const oneof& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual void please_exit (CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-};
-
-#ifndef CubitVarH
-#define CubitVarH
-
-#ifndef CubitvPtr
-#define CubitvPtr
-typedef Cubit* Cubit_vPtr;
-typedef const Cubit* Cubit_cvPtr;
-#endif
-
-class Cubit_var : public CORBA::_var
-{
-    private:
-
-    unsigned char copyHelper (const Cubit_var &IT_s) {
-        {
-            _ptr = Cubit_duplicate (IT_s._ptr);
-        }
-        return 1;
-    }
-
-    public:
-
-    Cubit_var (const Cubit_var &IT_s) {
-        (void) copyHelper (IT_s);
-    }
-
-    Cubit_var () {
-        _ptr = Cubit_nil ();
-    }
-
-    Cubit_var (Cubit *IT_p) {
-        _ptr = IT_p;
-    }
-
-    Cubit_var &operator= (Cubit *IT_p) {
-        Cubit_release (_ptr);
-        _ptr = IT_p;
-        return (*this);
-    }
-
-    Cubit_var &operator= (const Cubit_var &IT_s) {
-        Cubit_release (_ptr);
-        _ptr = Cubit_duplicate (IT_s._ptr);
-        return (*this);
-    }
-
-    ~Cubit_var () {
-        Cubit_release (_ptr);
-    }
-
-    Cubit* operator-> () {
-        return _ptr;
-    }
-
-    operator Cubit_cvPtr () const { return _ptr;}
-    operator Cubit_vPtr& () { return _ptr;}
-
-    protected:
-    Cubit *_ptr;
-    private:
-    Cubit_var &operator= (const CORBA::_var &IT_s);
-    Cubit_var (const CORBA::_var &IT_s);
-    Cubit_var &operator= (const CORBA::_mgr &IT_s);
-    Cubit_var &operator= (const CORBA::_SeqElem &IT_s);
-    Cubit_var (const CORBA::_mgr &IT_s);
-    Cubit_var (const CORBA::_SeqElem &IT_s);
-};
-
-#endif
-
-
-#ifndef CubitMgrH
-#define CubitMgrH
-
-class Cubit_mgr : public CORBA::_mgr
-{
-    public:
-
-    Cubit_mgr () {
-        _ptr = Cubit_nil ();
-        _release = 1;
-    }
-
-    Cubit_mgr (const Cubit_mgr &IT_s) {
-        _ptr = Cubit_duplicate (IT_s._ptr);
-        _release = 1;
-    }
-
-    Cubit_mgr &operator= (Cubit *IT_p) {
-        if (_ptr && _release)
-            Cubit_release (_ptr);
-        _ptr = IT_p;
-        _release = 1;
-        return (*this);
-    }
-
-    Cubit_mgr &operator= (const Cubit_mgr &IT_s) {
-        if (_ptr && _release)
-            Cubit_release (_ptr);
-        _ptr = Cubit_duplicate(IT_s._ptr);
-        _release = 1;
-        return (*this);
-    }
-
-    Cubit_mgr &operator= (Cubit_var &IT_s) {
-        if (_ptr && _release)
-            Cubit_release (_ptr);
-        _ptr = Cubit_duplicate(IT_s);
-        _release = 1;
-        return (*this);
-    }
-
-    ~Cubit_mgr () {
-        if (_release)
-            Cubit_release (_ptr);
-    }
-
-    unsigned char release () {
-        return _release;
-    }
-
-    void release (unsigned char rel) {
-        _release = rel;
-    }
-
-    operator int () const {
-        return (((CORBA::Object_ptr) _ptr) ? 1 : 0);
-    }
-
-    operator void* () const {
-        return _ptr;
-    }
-
-    operator CORBA::Object * () const {
-        return (CORBA::Object *) _ptr;
-    }
-
-    operator Cubit* () const {
-        return (Cubit*) _ptr;
-    }
-
-    Cubit_ptr operator-> () const {
-        return _ptr;
-    }
-
-    Cubit *_ptr;
-
-    protected:
-
-    unsigned char _release;
-};
-
-typedef Cubit_mgr Cubit_mgr_IT_const;
-#endif
-
-#ifndef CubitSeqElemH
-#define CubitSeqElemH
-
-class Cubit_SeqElem : public CORBA::_SeqElem
-{
-    public:
-
-    Cubit_SeqElem (Cubit_ptr* IT_p, unsigned char rel) {
-        _ptr = IT_p;
-        _release = rel;
-    }
-
-    Cubit_SeqElem &operator= (Cubit_ptr IT_p) {
-        if (_ptr) {
-            if (*(_ptr) && _release)
-                Cubit_release (*(_ptr));
-            *(_ptr) = IT_p;
-        }
-        return (*this);
-    }
-
-    Cubit_SeqElem &operator= (const Cubit_SeqElem &IT_s) {
-        if (_ptr && IT_s._ptr) {
-            if (*(_ptr) && _release)
-                Cubit_release (*(_ptr));
-            *(_ptr) = Cubit_duplicate(*(IT_s._ptr));
-        }
-        return (*this);
-    }
-
-    operator Cubit_ptr () const {
-        return _ptr ? (Cubit_ptr) (*_ptr) : Cubit_nil(); 
-    }
-
-    Cubit_ptr operator->() const { return *_ptr;}
-
-    protected:
-    Cubit_ptr *_ptr;
-    unsigned char _release;
-};
-
-#endif
-
-
-#define TIE_Cubit(X) Cubit##X
-
-#define DEF_TIE_Cubit(X) \
-	class Cubit##X : public virtual Cubit {		\
-	  X* m_obj;						\
-	public:							\
-								\
-								\
-	   Cubit##X  (X *objp, const char* m="", CORBA::LoaderClass *l=0)\
-		: Cubit(), m_obj(objp) {	\
-		m_pptr = new Cubit_dispatch		\
-			(( Cubit*)this,(CORBA::Object*)this,m,l,Cubit_IR,m_obj);	\
-	   }								\
-	   Cubit##X  (CORBA::Object *IT_p, const char* IT_m="", void *IT_q=0)\
-		: Cubit() {	\
-		m_pptr = new Cubit_dispatch		\
-			(( Cubit*)this,(CORBA::Object*)this,IT_m,Cubit_IR,IT_p,IT_q);	\
-		m_obj = (X*)(m_pptr->getImplObj ());			\
-	   }								\
-								\
-	   virtual ~Cubit##X  () {				\
-		if (_okToDeleteImpl ()) delete m_obj; }					\
-	   virtual void* _deref () {					\
-		return m_obj; }					\
-								\
-virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_octet (  o,IT_env);\
-}\
-	\
-virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_short (  s,IT_env);\
-}\
-	\
-virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_long (  l,IT_env);\
-}\
-	\
-virtual Cubit::Many cube_struct (const Cubit::Many& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_struct (  values,IT_env);\
-}\
-	\
-virtual Cubit::oneof cube_union (const Cubit::oneof& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_union (  values,IT_env);\
-}\
-	\
-virtual void please_exit (CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-m_obj->please_exit (IT_env);\
-}\
-								\
-	};						\
-
-
-#define QUALS_Cubit	\
-virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_octet (  o,IT_env);\
-}\
-	\
-virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_short (  s,IT_env);\
-}\
-	\
-virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_long (  l,IT_env);\
-}\
-	\
-virtual Many cube_struct (const Many& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_struct (  values,IT_env);\
-}\
-	\
-virtual oneof cube_union (const oneof& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_union (  values,IT_env);\
-}\
-	\
-virtual void please_exit (CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-m_obj->please_exit (IT_env);\
-}\
-
-
-
-
-class CubitProxyFactoryClass : public virtual CORBA::ObjectFactoryClass {
-public:
-   CubitProxyFactoryClass (unsigned char IT_p=0)
-		: CORBA::ProxyFactory (Cubit_IR, IT_p) {}
-
-    virtual void* New (char *IT_OR, CORBA::Environment&);
-
-    virtual void* New (ObjectReference *IT_OR, CORBA::Environment&);
-
-    virtual void* New2 (); 
-
-    virtual CORBA::Object* NewObject (char *IT_OR, CORBA::Environment&);
-
-    virtual CORBA::Object* NewObject (ObjectReference *IT_OR, CORBA::Environment&);
-
-    virtual CORBA::Object* New2Object (); 
-
-    virtual void* IT_castUp (void *IT_p, char* IT_s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-
-    virtual CORBA::PPTR* pptr (void *IT_p);
-
-    virtual void baseInterfaces (_IDL_SEQUENCE_string&);
-
-
-};
-
-extern CubitProxyFactoryClass CubitProxyFactory;
-
-class CubitBOAImpl : public virtual Cubit  {
-public:
-    CubitBOAImpl (const char *m="", CORBA::LoaderClass *l=NULL) {
-  if (CORBA::PPTR::isOK (m_pptr, Cubit_IR))
-    m_pptr = new Cubit_dispatch ( (Cubit*)this,
-   	 (CORBA::Object*)this, m, l, Cubit_IR, this);
-}
-
-        virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual Many cube_struct (const Many& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual oneof cube_union (const oneof& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual void please_exit (CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-};
-
-
-#endif
-
-
-#ifndef _Cubit_Factory_defined
-#define _Cubit_Factory_defined
-class Cubit_Factory_dispatch : public virtual CORBA::PPTR {
-public:
-
-      Cubit_Factory_dispatch (void *IT_p, CORBA::Object* IT_o, const char *IT_m, 
-        CORBA::LoaderClass *IT_l, char *IT_i, void* IT_im)
-       : PPTR (IT_p,IT_o,IT_m,IT_l,IT_i,IT_im) {}
-
-
-   Cubit_Factory_dispatch (char *IT_OR, void *IT_p, CORBA::Object *IT_o)
-       : PPTR (IT_OR,IT_p,IT_o) {}
-
-
-   Cubit_Factory_dispatch () {}
-
-   Cubit_Factory_dispatch (ObjectReference *IT_OR, void *IT_p, CORBA::Object *IT_o)
-       : PPTR (IT_OR,IT_p,IT_o) {}
-
-
-   Cubit_Factory_dispatch (void *IT_p, CORBA::Object *IT_o, const char *IT_m, 
-        char *IT_i, CORBA::Object* IT_ob, void* IT_im)
-       : PPTR (IT_p,IT_o,IT_m,IT_i,IT_ob,IT_im) {}
-
-
-   virtual unsigned char dispatch (CORBA::Request &IT_r, 
-        unsigned char IT_isTarget, void* IT_pp=NULL);
-
-
-};
-
-class Cubit_Factory;
-
-#ifndef Cubit_FactoryPtr
-#define Cubit_FactoryPtr
-
-typedef Cubit_Factory* Cubit_Factory_ptr;
-
-typedef Cubit_Factory* Cubit_FactoryRef;
-
-#endif
-
-
-#ifndef Cubit_FactoryForwH
-#define Cubit_FactoryForwH
-CORBA::ObjectRef Cubit_Factory_getBase (void *);
-void Cubit_Factory_release (Cubit_Factory *, CORBA::Environment &IT_env);
-void Cubit_Factory_release (Cubit_Factory_ptr);
-Cubit_Factory* Cubit_Factory_duplicate (Cubit_Factory_ptr, CORBA::Environment &IT_env);
-Cubit_Factory* Cubit_Factory_duplicate (Cubit_Factory_ptr );
-Cubit_Factory_ptr Cubit_Factory_nil (CORBA::Environment &IT_env);
-Cubit_Factory_ptr Cubit_Factory_nil ();
-#endif
-#define Cubit_Factory_IMPL "Cubit_Factory"
-
-
-class Cubit_Factory;
-
-typedef Cubit_Factory Cubit_FactoryProxy;
-#define Cubit_Factory_IR "Cubit_Factory"
-#define Cubit_Factory_IMPL "Cubit_Factory"
-
-#ifndef Cubit_FactoryPtr
-#define Cubit_FactoryPtr
-
-typedef Cubit_Factory* Cubit_Factory_ptr;
-
-typedef Cubit_Factory* Cubit_FactoryRef;
-
-#endif
-
-class Cubit_Factory: public virtual CORBA::Object  {
-public:
-        Cubit_Factory (char *IT_OR);
-    Cubit_Factory (ObjectReference *IT_OR);
-    Cubit_Factory () : CORBA::Object  (1) {}
-protected:
-    Cubit_Factory_ptr __duplicate(
-            CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) {
-       CORBA::Object::__duplicate (IT_env);
-       return this;
-    }
-public:
-    static Cubit_Factory_ptr _duplicate(
-            Cubit_Factory_ptr, 
-            CORBA::Environment &IT_pEnv=CORBA::IT_chooseDefaultEnv ());
-public:
-   static Cubit_Factory* _bind (const char* IT_markerServer, const char* host,
-		const CORBA::Context &IT_c, 
-		CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-   static Cubit_Factory* _bind (CORBA::Environment &IT_env);
-   static Cubit_Factory* _bind (const char* IT_markerServer=NULL, const char* host=NULL,
-                 CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-    static Cubit_Factory* _narrow (CORBA::Object* , CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-    static Cubit_Factory_ptr _nil (CORBA::Environment &IT_pEnv=CORBA::IT_chooseDefaultEnv ()) {
-        CORBA::EnvExcRaiser IT_raise;
-        CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-        return (Cubit_Factory_ptr) CORBA::OBJECT_NIL;}
-        virtual Cubit_ptr create_cubit (const char * name, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-};
-
-#ifndef Cubit_FactoryVarH
-#define Cubit_FactoryVarH
-
-#ifndef Cubit_FactoryvPtr
-#define Cubit_FactoryvPtr
-typedef Cubit_Factory* Cubit_Factory_vPtr;
-typedef const Cubit_Factory* Cubit_Factory_cvPtr;
-#endif
-
-class Cubit_Factory_var : public CORBA::_var
-{
-    private:
-
-    unsigned char copyHelper (const Cubit_Factory_var &IT_s) {
-        {
-            _ptr = Cubit_Factory_duplicate (IT_s._ptr);
-        }
-        return 1;
-    }
-
-    public:
-
-    Cubit_Factory_var (const Cubit_Factory_var &IT_s) {
-        (void) copyHelper (IT_s);
-    }
-
-    Cubit_Factory_var () {
-        _ptr = Cubit_Factory_nil ();
-    }
-
-    Cubit_Factory_var (Cubit_Factory *IT_p) {
-        _ptr = IT_p;
-    }
-
-    Cubit_Factory_var &operator= (Cubit_Factory *IT_p) {
-        Cubit_Factory_release (_ptr);
-        _ptr = IT_p;
-        return (*this);
-    }
-
-    Cubit_Factory_var &operator= (const Cubit_Factory_var &IT_s) {
-        Cubit_Factory_release (_ptr);
-        _ptr = Cubit_Factory_duplicate (IT_s._ptr);
-        return (*this);
-    }
-
-    ~Cubit_Factory_var () {
-        Cubit_Factory_release (_ptr);
-    }
-
-    Cubit_Factory* operator-> () {
-        return _ptr;
-    }
-
-    operator Cubit_Factory_cvPtr () const { return _ptr;}
-    operator Cubit_Factory_vPtr& () { return _ptr;}
-
-    protected:
-    Cubit_Factory *_ptr;
-    private:
-    Cubit_Factory_var &operator= (const CORBA::_var &IT_s);
-    Cubit_Factory_var (const CORBA::_var &IT_s);
-    Cubit_Factory_var &operator= (const CORBA::_mgr &IT_s);
-    Cubit_Factory_var &operator= (const CORBA::_SeqElem &IT_s);
-    Cubit_Factory_var (const CORBA::_mgr &IT_s);
-    Cubit_Factory_var (const CORBA::_SeqElem &IT_s);
-};
-
-#endif
-
-
-#ifndef Cubit_FactoryMgrH
-#define Cubit_FactoryMgrH
-
-class Cubit_Factory_mgr : public CORBA::_mgr
-{
-    public:
-
-    Cubit_Factory_mgr () {
-        _ptr = Cubit_Factory_nil ();
-        _release = 1;
-    }
-
-    Cubit_Factory_mgr (const Cubit_Factory_mgr &IT_s) {
-        _ptr = Cubit_Factory_duplicate (IT_s._ptr);
-        _release = 1;
-    }
-
-    Cubit_Factory_mgr &operator= (Cubit_Factory *IT_p) {
-        if (_ptr && _release)
-            Cubit_Factory_release (_ptr);
-        _ptr = IT_p;
-        _release = 1;
-        return (*this);
-    }
-
-    Cubit_Factory_mgr &operator= (const Cubit_Factory_mgr &IT_s) {
-        if (_ptr && _release)
-            Cubit_Factory_release (_ptr);
-        _ptr = Cubit_Factory_duplicate(IT_s._ptr);
-        _release = 1;
-        return (*this);
-    }
-
-    Cubit_Factory_mgr &operator= (Cubit_Factory_var &IT_s) {
-        if (_ptr && _release)
-            Cubit_Factory_release (_ptr);
-        _ptr = Cubit_Factory_duplicate(IT_s);
-        _release = 1;
-        return (*this);
-    }
-
-    ~Cubit_Factory_mgr () {
-        if (_release)
-            Cubit_Factory_release (_ptr);
-    }
-
-    unsigned char release () {
-        return _release;
-    }
-
-    void release (unsigned char rel) {
-        _release = rel;
-    }
-
-    operator int () const {
-        return (((CORBA::Object_ptr) _ptr) ? 1 : 0);
-    }
-
-    operator void* () const {
-        return _ptr;
-    }
-
-    operator CORBA::Object * () const {
-        return (CORBA::Object *) _ptr;
-    }
-
-    operator Cubit_Factory* () const {
-        return (Cubit_Factory*) _ptr;
-    }
-
-    Cubit_Factory_ptr operator-> () const {
-        return _ptr;
-    }
-
-    Cubit_Factory *_ptr;
-
-    protected:
-
-    unsigned char _release;
-};
-
-typedef Cubit_Factory_mgr Cubit_Factory_mgr_IT_const;
-#endif
-
-#ifndef Cubit_FactorySeqElemH
-#define Cubit_FactorySeqElemH
-
-class Cubit_Factory_SeqElem : public CORBA::_SeqElem
-{
-    public:
-
-    Cubit_Factory_SeqElem (Cubit_Factory_ptr* IT_p, unsigned char rel) {
-        _ptr = IT_p;
-        _release = rel;
-    }
-
-    Cubit_Factory_SeqElem &operator= (Cubit_Factory_ptr IT_p) {
-        if (_ptr) {
-            if (*(_ptr) && _release)
-                Cubit_Factory_release (*(_ptr));
-            *(_ptr) = IT_p;
-        }
-        return (*this);
-    }
-
-    Cubit_Factory_SeqElem &operator= (const Cubit_Factory_SeqElem &IT_s) {
-        if (_ptr && IT_s._ptr) {
-            if (*(_ptr) && _release)
-                Cubit_Factory_release (*(_ptr));
-            *(_ptr) = Cubit_Factory_duplicate(*(IT_s._ptr));
-        }
-        return (*this);
-    }
-
-    operator Cubit_Factory_ptr () const {
-        return _ptr ? (Cubit_Factory_ptr) (*_ptr) : Cubit_Factory_nil(); 
-    }
-
-    Cubit_Factory_ptr operator->() const { return *_ptr;}
-
-    protected:
-    Cubit_Factory_ptr *_ptr;
-    unsigned char _release;
-};
-
-#endif
-
-
-#define TIE_Cubit_Factory(X) Cubit_Factory##X
-
-#define DEF_TIE_Cubit_Factory(X) \
-	class Cubit_Factory##X : public virtual Cubit_Factory {		\
-	  X* m_obj;						\
-	public:							\
-								\
-								\
-	   Cubit_Factory##X  (X *objp, const char* m="", CORBA::LoaderClass *l=0)\
-		: Cubit_Factory(), m_obj(objp) {	\
-		m_pptr = new Cubit_Factory_dispatch		\
-			(( Cubit_Factory*)this,(CORBA::Object*)this,m,l,Cubit_Factory_IR,m_obj);	\
-	   }								\
-	   Cubit_Factory##X  (CORBA::Object *IT_p, const char* IT_m="", void *IT_q=0)\
-		: Cubit_Factory() {	\
-		m_pptr = new Cubit_Factory_dispatch		\
-			(( Cubit_Factory*)this,(CORBA::Object*)this,IT_m,Cubit_Factory_IR,IT_p,IT_q);	\
-		m_obj = (X*)(m_pptr->getImplObj ());			\
-	   }								\
-								\
-	   virtual ~Cubit_Factory##X  () {				\
-		if (_okToDeleteImpl ()) delete m_obj; }					\
-	   virtual void* _deref () {					\
-		return m_obj; }					\
-								\
-virtual Cubit_ptr create_cubit (const char * name, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->create_cubit (  name,IT_env);\
-}\
-								\
-	};						\
-
-
-#define QUALS_Cubit_Factory	\
-virtual Cubit_ptr create_cubit (const char * name, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->create_cubit (  name,IT_env);\
-}\
-
-
-
-
-class Cubit_FactoryProxyFactoryClass : public virtual CORBA::ObjectFactoryClass {
-public:
-   Cubit_FactoryProxyFactoryClass (unsigned char IT_p=0)
-		: CORBA::ProxyFactory (Cubit_Factory_IR, IT_p) {}
-
-    virtual void* New (char *IT_OR, CORBA::Environment&);
-
-    virtual void* New (ObjectReference *IT_OR, CORBA::Environment&);
-
-    virtual void* New2 (); 
-
-    virtual CORBA::Object* NewObject (char *IT_OR, CORBA::Environment&);
-
-    virtual CORBA::Object* NewObject (ObjectReference *IT_OR, CORBA::Environment&);
-
-    virtual CORBA::Object* New2Object (); 
-
-    virtual void* IT_castUp (void *IT_p, char* IT_s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-
-    virtual CORBA::PPTR* pptr (void *IT_p);
-
-    virtual void baseInterfaces (_IDL_SEQUENCE_string&);
-
-
-};
-
-extern Cubit_FactoryProxyFactoryClass Cubit_FactoryProxyFactory;
-
-class Cubit_FactoryBOAImpl : public virtual Cubit_Factory  {
-public:
-    Cubit_FactoryBOAImpl (const char *m="", CORBA::LoaderClass *l=NULL) {
-  if (CORBA::PPTR::isOK (m_pptr, Cubit_Factory_IR))
-    m_pptr = new Cubit_Factory_dispatch ( (Cubit_Factory*)this,
-   	 (CORBA::Object*)this, m, l, Cubit_Factory_IR, this);
-}
-
-        virtual Cubit_ptr create_cubit (const char * name, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-};
-
-
-#endif
-
-
-#endif
diff --git a/TAO/IIOP/tests/Cubit/Orbix/tps/cubit.idl b/TAO/IIOP/tests/Cubit/Orbix/tps/cubit.idl
deleted file mode 100644
index 7dba408d0db..00000000000
--- a/TAO/IIOP/tests/Cubit/Orbix/tps/cubit.idl
+++ /dev/null
@@ -1,46 +0,0 @@
-// @(#)cubit.idl	1.1 95/09/10
-// Copyright 1994-1995 by Sun Microsystems, Inc.
-
-#pragma prefix	"Eng.SUN.COM"
-#pragma version Cubit 1.1
-
-  interface Cubit {
-    octet	cube_octet (in octet o);
-    short	cube_short (in short s);
-    long	cube_long (in long l);
-    
-    struct Many {
-      octet	o;		// + 3 bytes padding (normally) ...
-      long	l;
-      short	s;		// + 2 bytes padding (normally) ...
-    };
-    
-    Many	cube_struct (in Many values);
-    
-    enum discrim {e_0th, e_1st, e_2nd, e_3rd, e_4th, e_5th};
-    
-    union oneof
-      switch (discrim) {
-	// this is an easy union to interpret; no padding
-	// is needed between discriminant and value.
-      case e_0th:
-        octet		o;
-      case e_1st:
-        short		s;
-      case e_2nd:
-        long		l;
-      case e_3rd:
-      default:
-        Many		cm;
-      };
-    
-    oneof	cube_union (in oneof values);
-    
-    oneway void	please_exit ();
-  };
-
-
-  interface Cubit_Factory {
-    Cubit create_cubit (in string name);
-  };
-
diff --git a/TAO/IIOP/tests/Cubit/Orbix/tps/cubitC.cpp b/TAO/IIOP/tests/Cubit/Orbix/tps/cubitC.cpp
deleted file mode 100644
index c439fc4c800..00000000000
--- a/TAO/IIOP/tests/Cubit/Orbix/tps/cubitC.cpp
+++ /dev/null
@@ -1,710 +0,0 @@
-
-
-#include "cubit.h"
-
-Cubit::Cubit (char *IT_OR) {
-      m_pptr = new Cubit_dispatch (IT_OR, this,(CORBA::Object*)this);
-} 
-Cubit::Cubit (ObjectReference *IT_OR) {
-      m_pptr = new Cubit_dispatch (IT_OR, this,(CORBA::Object*)this);
-} 
-
-#ifndef CubitForwC
-#define CubitForwC
-CORBA::ObjectRef Cubit_getBase(void *IT_p){
-    return (Cubit*) IT_p;}
-
-void Cubit_release (Cubit_ptr IT_p, CORBA::Environment &IT_env) {
-    CORBA::release(IT_p, IT_env);}
-
-void Cubit_release (Cubit_ptr IT_p) {
-    Cubit_release (IT_p, CORBA::IT_chooseDefaultEnv ()); }
-
-Cubit_ptr Cubit_nil (CORBA::Environment &) {
-    return Cubit:: _nil ();}
-
-Cubit_ptr Cubit_nil () {
-    return Cubit_nil (CORBA::IT_chooseDefaultEnv ());}
-
-Cubit_ptr Cubit_duplicate (Cubit_ptr IT_p, CORBA::Environment &IT_env) {
-    return (Cubit::_duplicate(IT_p, IT_env)); }
-Cubit_ptr Cubit_duplicate (Cubit_ptr IT_p) {
-    return Cubit_duplicate (IT_p, CORBA::IT_chooseDefaultEnv ()); }
-#endif
-
-Cubit_ptr Cubit::_duplicate(Cubit_ptr obj, CORBA::Environment& IT_pEnv) {
-        CORBA::EnvExcRaiser IT_raise;
-        CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-       if (!obj) {
-          return (obj);
-       }
-       Cubit_ptr IT_obj = obj->__duplicate (IT_env);
-       return IT_obj;
-}
-
-
-
-Cubit* Cubit:: _bind (const char* IT_markerServer, const char* host,
-		const CORBA::Context &IT_c, 
-		CORBA::Environment &IT_env) {
-       return (Cubit*)CORBA::Factory.New (IT_markerServer, IT_env, IT_c, host, 
-		Cubit_IMPL, Cubit_IR);
-}
-
-
-
-Cubit* Cubit:: _bind (CORBA::Environment &IT_env) {
-       return _bind (NULL,NULL,CORBA::Context(), IT_env); }
-
-
-Cubit* Cubit:: _bind (const char* IT_markerServer, const char* host,
-                CORBA::Environment &IT_env) {
-       return _bind (IT_markerServer, host, CORBA::Context (), IT_env); }
-Cubit* Cubit::_narrow (CORBA::Object* IT_obj, CORBA::Environment &IT_pEnv) {
-        CORBA::EnvExcRaiser IT_raise;
-        CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-        if (CORBA::is_nil (IT_obj)) {
-                return Cubit:: _nil();
-        }
-
-       Cubit* IT_p = (Cubit*)CORBA::Object::_castDown (IT_obj, Cubit_IR, IT_env);
-        IT_p = IT_p ? IT_p->__duplicate(IT_env) : NULL;
-        if ((IT_env) &&(!strcmp(IT_env.exception()->id(), "CORBA::StExcep::BAD_PARAM")) && (((CORBA::BAD_PARAM*)IT_env.exception())-> minor() == NARROW_FAILED)) {
-                IT_env.exception_free();
-        }
-        return IT_p;
-   }
-
-
-#ifndef Cubit_Many_Ops
-#define Cubit_Many_Ops
-
-void Cubit::Many:: encodeOp (CORBA::Request &IT_r) const {
-
-    IT_r.insertOctet (o);
-
-    IT_r << l;
-
-    IT_r << s;
-}
-
-void Cubit::Many:: decodeOp (CORBA::Request &IT_r) {
-
-    IT_r.extractOctet (o);
-
-    IT_r >> l;
-
-    IT_r >> s;
-}
-
-void Cubit::Many:: decodeInOutOp (CORBA::Request &IT_r) {
-
-    IT_r.extractOctet (o);
-
-    IT_r >> l;
-
-    IT_r >> s;
-}
-
-Cubit::Many ::~Many () {
-}
-
-Cubit::Many:: Many (const Cubit::Many &IT_s) 
-	 {
-    o = IT_s.o;
-    l = IT_s.l;
-    s = IT_s.s;
-}
-
-Cubit::Many:: Many () {
-}
-
-Cubit::Many &Cubit::Many:: operator= (const Cubit::Many& IT_s) {
-    if (this == &IT_s) return *this;
-    o = IT_s.o;
-    l = IT_s.l;
-    s = IT_s.s;
-    return *this;
-}
-
-
-#endif
-
-
-#ifndef Cubit_oneof_Ops
-#define Cubit_oneof_Ops
-void Cubit::oneof:: encodeOp (CORBA::Request &IT_r) const {
-    if (!isSet) return;
-    {
-    CORBA::ULong IT_0 = (CORBA::ULong) __d;
-    IT_r << IT_0;
-    }
-    switch (__d) {
-        case Cubit::e_0th: 
-        IT_r.insertOctet (_o_);
-        break;
-        case Cubit::e_1st: 
-        IT_r << _s_;
-        break;
-        case Cubit::e_2nd: 
-        IT_r << _l_;
-        break;
-        case Cubit::e_3rd: 
-        default: 
-        (*_cm_).encodeOp (IT_r);
-        break;
-    }
-
-}
-
-void Cubit::oneof:: decodeOp (CORBA::Request &IT_r) {
-    isSet = 0;
-    {
-    CORBA::ULong IT_1;
-    IT_r >> IT_1;
-    __d = Cubit::discrim(IT_1);
-    }
-    switch (__d) {
-        case Cubit::e_0th: 
-        if (!isSet) {
-            isSet = 1;
-        }
-        IT_r.extractOctet (_o_);
-        break;
-        case Cubit::e_1st: 
-        if (!isSet) {
-            isSet = 1;
-        }
-        IT_r >> _s_;
-        break;
-        case Cubit::e_2nd: 
-        if (!isSet) {
-            isSet = 1;
-        }
-        IT_r >> _l_;
-        break;
-        case Cubit::e_3rd: 
-        default: 
-        if (!isSet) {
-            _cm_ = new Cubit::Many;
-            isSet = 1;
-        }
-        (*_cm_).decodeOp (IT_r);
-        break;
-    }
-
-}
-void Cubit::oneof:: decodeInOutOp (CORBA::Request &IT_r) {
-    Cubit::discrim IT_d;
-    {
-    CORBA::ULong IT_2;
-    IT_r >> IT_2;
-    IT_d = Cubit::discrim(IT_2);
-    }
-    if (IT_d == __d)
-        switch (__d) {
-            case Cubit::e_0th: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r.extractOctet (_o_);
-            break;
-            case Cubit::e_1st: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r >> _s_;
-            break;
-            case Cubit::e_2nd: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r >> _l_;
-            break;
-            case Cubit::e_3rd: 
-            default: 
-            if (!isSet) {
-                _cm_ = new Cubit::Many;
-                isSet = 1;
-            }
-            (*_cm_).decodeInOutOp (IT_r);
-            break;
-        }
-
-    else {
-        this->oneof:: ~oneof();
-        memset(this, 0, sizeof(*this));
-        __d = IT_d;
-        switch (__d) {
-            case Cubit::e_0th: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r.extractOctet (_o_);
-            break;
-            case Cubit::e_1st: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r >> _s_;
-            break;
-            case Cubit::e_2nd: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r >> _l_;
-            break;
-            case Cubit::e_3rd: 
-            default: 
-            if (!isSet) {
-                _cm_ = new Cubit::Many;
-                isSet = 1;
-            }
-            (*_cm_).decodeOp (IT_r);
-            break;
-        }
-        isSet = 1;
-    }
-
-}
-
-Cubit::oneof:: oneof() { 
-    memset(this, 0, sizeof(*this));
-    isSet = 0;
-}
-
-Cubit::oneof ::~oneof() {
-    if (!isSet) return;
-    switch (__d) { 
-        case Cubit::e_0th:         break;
-        case Cubit::e_1st:         break;
-        case Cubit::e_2nd:         break;
-        case Cubit::e_3rd: 
-        default:         if (_cm_) delete _cm_;
-        break;
-    }
-
-    isSet = 0;
-}
-
-Cubit::oneof:: oneof (const Cubit::oneof &IT_s) {
-    isSet = 0;
-    memset(this, 0, sizeof(*this));
-    __d = IT_s.__d;
-    switch (__d) {
-        case Cubit::e_0th:         isSet = 1;
-        _o_ = IT_s._o_;
-        break;
-        case Cubit::e_1st:         isSet = 1;
-        _s_ = IT_s._s_;
-        break;
-        case Cubit::e_2nd:         isSet = 1;
-        _l_ = IT_s._l_;
-        break;
-        case Cubit::e_3rd: 
-        default: 
-        if (!isSet) {
-            _cm_ = new Cubit::Many;
-            isSet = 1;
-        }
-        *(_cm_) = *(IT_s._cm_);
-        break;
-    }
-    isSet = 1;
-}
-
-Cubit::oneof& Cubit::oneof:: operator= (const Cubit::oneof & IT_s) {
-    if (this == &IT_s) return *this;
-    if (isSet && (__d != IT_s.__d))
-    {
-        this-> oneof::~oneof();
-        memset(this, 0, sizeof(*this));
-    }
-
-    __d = IT_s.__d;
-    switch (__d) {
-        case Cubit::e_0th:         isSet = 1;
-        _o_ = IT_s._o_;
-        break;
-        case Cubit::e_1st:         isSet = 1;
-        _s_ = IT_s._s_;
-        break;
-        case Cubit::e_2nd:         isSet = 1;
-        _l_ = IT_s._l_;
-        break;
-        case Cubit::e_3rd: 
-        default: 
-        if (!isSet) {
-            _cm_ = new Cubit::Many;
-            isSet = 1;
-        }
-        *(_cm_) = *(IT_s._cm_);
-        break;
-    }
-    isSet = 1;
-    return *this;
-}
-
-
-#endif
-
-void* CubitProxyFactoryClass::New (char *IT_OR, CORBA::Environment&) {
-        return  new class Cubit(IT_OR);}
-
-void* CubitProxyFactoryClass::New (ObjectReference *IT_OR, CORBA::Environment&) {
-        return  new class Cubit(IT_OR);}
-
-void* CubitProxyFactoryClass::New2 () {
-        return  new class Cubit((char*)0);}
-
-CORBA::Object* CubitProxyFactoryClass::NewObject (char *IT_OR, CORBA::Environment&) {
-        return  new class Cubit(IT_OR);}
-
-CORBA::Object* CubitProxyFactoryClass::NewObject (ObjectReference *IT_OR, CORBA::Environment&) {
-        return  new class Cubit(IT_OR);}
-
-CORBA::Object* CubitProxyFactoryClass::New2Object () {
-        return  new class Cubit((char*)0);}
-
-void* CubitProxyFactoryClass::IT_castUp (void *IT_p, char* IT_s, CORBA::Environment &IT_env) {
-      void *IT_l;
-      if (!CORBA::_interfaceCmp (IT_s,Cubit_IR, IT_env))
-         return IT_p;
-      else if (IT_l=CORBA::ObjectFactoryClass::IT_castUp((CORBA::Object*)((class Cubit*)IT_p),IT_s, IT_env))
-         return IT_l;
-      else return NULL;
-    }
-
-
-CORBA::PPTR* CubitProxyFactoryClass::pptr (void *IT_p) {
-       return ((class Cubit*)IT_p)->_pptr ();}
-
-void CubitProxyFactoryClass::baseInterfaces (_IDL_SEQUENCE_string& seq) {
-      add (seq, Cubit_IR);
-      CORBA::ObjectFactoryClass::baseInterfaces (seq);
-}
-
-CubitProxyFactoryClass CubitProxyFactory(1);
-
-CORBA::Octet Cubit:: cube_octet (CORBA::Octet o, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        return 0;
-    }
-    CORBA::Request IT_r (this, "cube_octet",IT_env,1,0);
-    if (!IT_r.isException (IT_env)) {
-
-        IT_r.insertOctet (o);
-    }
-
-    IT_r.invoke (CORBA::Flags(0),IT_env);
-    if (!IT_r.isException (IT_env)) {
-        CORBA::Octet IT_result;
-        IT_r.extractOctet (IT_result);
-        IT_r.checkEnv (IT_env);
-        return IT_result;
-    }
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-    return 0;
-}
-
-CORBA::Short Cubit:: cube_short (CORBA::Short s, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        return 0;
-    }
-    CORBA::Request IT_r (this, "cube_short",IT_env,1,0);
-    if (!IT_r.isException (IT_env)) {
-
-        IT_r << s;
-    }
-
-    IT_r.invoke (CORBA::Flags(0),IT_env);
-    if (!IT_r.isException (IT_env)) {
-        CORBA::Short IT_result;
-        IT_r >> IT_result;
-        IT_r.checkEnv (IT_env);
-        return IT_result;
-    }
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-    return 0;
-}
-
-CORBA::Long Cubit:: cube_long (CORBA::Long l, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        return 0;
-    }
-    CORBA::Request IT_r (this, "cube_long",IT_env,1,0);
-    if (!IT_r.isException (IT_env)) {
-
-        IT_r << l;
-    }
-
-    IT_r.invoke (CORBA::Flags(0),IT_env);
-    if (!IT_r.isException (IT_env)) {
-        CORBA::Long IT_result;
-        IT_r >> IT_result;
-        IT_r.checkEnv (IT_env);
-        return IT_result;
-    }
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-    return 0;
-}
-
-Cubit::Many Cubit:: cube_struct (const Cubit::Many& values, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        { 
-            Cubit::Many IT_l0;
-            return IT_l0;
-        }
-    }
-    CORBA::Request IT_r (this, "cube_struct",IT_env,1,0);
-    if (!IT_r.isException (IT_env)) {
-
-        values.encodeOp (IT_r);
-    }
-
-    IT_r.invoke (CORBA::Flags(0),IT_env);
-    if (!IT_r.isException (IT_env)) {
-        Cubit::Many IT_result;
-        IT_result.decodeOp (IT_r);
-        IT_r.checkEnv (IT_env);
-        return IT_result;
-    }
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-    { 
-        Cubit::Many IT_l1;
-        return IT_l1;
-    }
-}
-
-Cubit::oneof Cubit:: cube_union (const Cubit::oneof& values, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        { 
-            Cubit::oneof IT_l0;
-            return IT_l0;
-        }
-    }
-    CORBA::Request IT_r (this, "cube_union",IT_env,1,0);
-    if (!IT_r.isException (IT_env)) {
-
-        values.encodeOp (IT_r);
-    }
-
-    IT_r.invoke (CORBA::Flags(0),IT_env);
-    if (!IT_r.isException (IT_env)) {
-        Cubit::oneof IT_result;
-        IT_result.decodeOp (IT_r);
-        IT_r.checkEnv (IT_env);
-        return IT_result;
-    }
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-    { 
-        Cubit::oneof IT_l1;
-        return IT_l1;
-    }
-}
-
-void Cubit:: please_exit (CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        return ;
-    }
-    CORBA::Request IT_r (this, "please_exit",IT_env,1,1);
-
-    IT_r.invoke (CORBA::Flags(CORBA::INV_NO_RESPONSE), IT_env);
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-}
-
-
-
-
-
-#ifndef Cubit_dispatch_impl
-
-unsigned char Cubit_dispatch::dispatch (CORBA::Request &IT_r, 
-    unsigned char, void *) {
-      IT_r.makeRuntimeException1 ("Cubit");
-      return 0;
-}
- 
-#endif
-
-Cubit_Factory::Cubit_Factory (char *IT_OR) {
-      m_pptr = new Cubit_Factory_dispatch (IT_OR, this,(CORBA::Object*)this);
-} 
-Cubit_Factory::Cubit_Factory (ObjectReference *IT_OR) {
-      m_pptr = new Cubit_Factory_dispatch (IT_OR, this,(CORBA::Object*)this);
-} 
-
-#ifndef Cubit_FactoryForwC
-#define Cubit_FactoryForwC
-CORBA::ObjectRef Cubit_Factory_getBase(void *IT_p){
-    return (Cubit_Factory*) IT_p;}
-
-void Cubit_Factory_release (Cubit_Factory_ptr IT_p, CORBA::Environment &IT_env) {
-    CORBA::release(IT_p, IT_env);}
-
-void Cubit_Factory_release (Cubit_Factory_ptr IT_p) {
-    Cubit_Factory_release (IT_p, CORBA::IT_chooseDefaultEnv ()); }
-
-Cubit_Factory_ptr Cubit_Factory_nil (CORBA::Environment &) {
-    return Cubit_Factory:: _nil ();}
-
-Cubit_Factory_ptr Cubit_Factory_nil () {
-    return Cubit_Factory_nil (CORBA::IT_chooseDefaultEnv ());}
-
-Cubit_Factory_ptr Cubit_Factory_duplicate (Cubit_Factory_ptr IT_p, CORBA::Environment &IT_env) {
-    return (Cubit_Factory::_duplicate(IT_p, IT_env)); }
-Cubit_Factory_ptr Cubit_Factory_duplicate (Cubit_Factory_ptr IT_p) {
-    return Cubit_Factory_duplicate (IT_p, CORBA::IT_chooseDefaultEnv ()); }
-#endif
-
-Cubit_Factory_ptr Cubit_Factory::_duplicate(Cubit_Factory_ptr obj, CORBA::Environment& IT_pEnv) {
-        CORBA::EnvExcRaiser IT_raise;
-        CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-       if (!obj) {
-          return (obj);
-       }
-       Cubit_Factory_ptr IT_obj = obj->__duplicate (IT_env);
-       return IT_obj;
-}
-
-
-
-Cubit_Factory* Cubit_Factory:: _bind (const char* IT_markerServer, const char* host,
-		const CORBA::Context &IT_c, 
-		CORBA::Environment &IT_env) {
-       return (Cubit_Factory*)CORBA::Factory.New (IT_markerServer, IT_env, IT_c, host, 
-		Cubit_Factory_IMPL, Cubit_Factory_IR);
-}
-
-
-
-Cubit_Factory* Cubit_Factory:: _bind (CORBA::Environment &IT_env) {
-       return _bind (NULL,NULL,CORBA::Context(), IT_env); }
-
-
-Cubit_Factory* Cubit_Factory:: _bind (const char* IT_markerServer, const char* host,
-                CORBA::Environment &IT_env) {
-       return _bind (IT_markerServer, host, CORBA::Context (), IT_env); }
-Cubit_Factory* Cubit_Factory::_narrow (CORBA::Object* IT_obj, CORBA::Environment &IT_pEnv) {
-        CORBA::EnvExcRaiser IT_raise;
-        CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-        if (CORBA::is_nil (IT_obj)) {
-                return Cubit_Factory:: _nil();
-        }
-
-       Cubit_Factory* IT_p = (Cubit_Factory*)CORBA::Object::_castDown (IT_obj, Cubit_Factory_IR, IT_env);
-        IT_p = IT_p ? IT_p->__duplicate(IT_env) : NULL;
-        if ((IT_env) &&(!strcmp(IT_env.exception()->id(), "CORBA::StExcep::BAD_PARAM")) && (((CORBA::BAD_PARAM*)IT_env.exception())-> minor() == NARROW_FAILED)) {
-                IT_env.exception_free();
-        }
-        return IT_p;
-   }
-
-void* Cubit_FactoryProxyFactoryClass::New (char *IT_OR, CORBA::Environment&) {
-        return  new class Cubit_Factory(IT_OR);}
-
-void* Cubit_FactoryProxyFactoryClass::New (ObjectReference *IT_OR, CORBA::Environment&) {
-        return  new class Cubit_Factory(IT_OR);}
-
-void* Cubit_FactoryProxyFactoryClass::New2 () {
-        return  new class Cubit_Factory((char*)0);}
-
-CORBA::Object* Cubit_FactoryProxyFactoryClass::NewObject (char *IT_OR, CORBA::Environment&) {
-        return  new class Cubit_Factory(IT_OR);}
-
-CORBA::Object* Cubit_FactoryProxyFactoryClass::NewObject (ObjectReference *IT_OR, CORBA::Environment&) {
-        return  new class Cubit_Factory(IT_OR);}
-
-CORBA::Object* Cubit_FactoryProxyFactoryClass::New2Object () {
-        return  new class Cubit_Factory((char*)0);}
-
-void* Cubit_FactoryProxyFactoryClass::IT_castUp (void *IT_p, char* IT_s, CORBA::Environment &IT_env) {
-      void *IT_l;
-      if (!CORBA::_interfaceCmp (IT_s,Cubit_Factory_IR, IT_env))
-         return IT_p;
-      else if (IT_l=CORBA::ObjectFactoryClass::IT_castUp((CORBA::Object*)((class Cubit_Factory*)IT_p),IT_s, IT_env))
-         return IT_l;
-      else return NULL;
-    }
-
-
-CORBA::PPTR* Cubit_FactoryProxyFactoryClass::pptr (void *IT_p) {
-       return ((class Cubit_Factory*)IT_p)->_pptr ();}
-
-void Cubit_FactoryProxyFactoryClass::baseInterfaces (_IDL_SEQUENCE_string& seq) {
-      add (seq, Cubit_Factory_IR);
-      CORBA::ObjectFactoryClass::baseInterfaces (seq);
-}
-
-Cubit_FactoryProxyFactoryClass Cubit_FactoryProxyFactory(1);
-
-Cubit_ptr Cubit_Factory:: create_cubit (const char * name, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        return new Cubit;
-    }
-    CORBA::Request IT_r (this, "create_cubit",IT_env,1,0);
-    if (!IT_r.isException (IT_env)) {
-
-        IT_r.encodeStringOp (name);
-    }
-
-    IT_r.invoke (CORBA::Flags(0),IT_env);
-    if (!IT_r.isException (IT_env)) {
-        Cubit_ptr IT_result;
-        IT_result = (Cubit*) IT_r.decodeObjRef (Cubit_IR);
-        IT_r.checkEnv (IT_env);
-        return IT_result;
-    }
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-    return new Cubit;
-}
-
-
-
-
-
-#ifndef Cubit_Factory_dispatch_impl
-
-unsigned char Cubit_Factory_dispatch::dispatch (CORBA::Request &IT_r, 
-    unsigned char, void *) {
-      IT_r.makeRuntimeException1 ("Cubit_Factory");
-      return 0;
-}
- 
-#endif
-
diff --git a/TAO/IIOP/tests/Cubit/Orbix/tps/cubitS.cpp b/TAO/IIOP/tests/Cubit/Orbix/tps/cubitS.cpp
deleted file mode 100644
index a2898e12914..00000000000
--- a/TAO/IIOP/tests/Cubit/Orbix/tps/cubitS.cpp
+++ /dev/null
@@ -1,282 +0,0 @@
-
-
-#include "cubit.h"
-
-
-#define Cubit_dispatch_impl
-
-unsigned char Cubit_dispatch::dispatch (CORBA::Request &IT_r, 
- unsigned char IT_isTarget, void *IT_pp) {
-    if (!IT_pp)
-       IT_pp = m_obj;
-    const char *IT_s = IT_r.getOperation ();
-    if (!strcmp(IT_s,"cube_octet")) {
-        CORBA::Octet IT_result;
-        CORBA::Environment IT_env (IT_r);
-        CORBA::Filter* IT_f = CORBA::Orbix.getFilter ();
-        if (!IT_r.tcAssert ("\
-Ro~cube_octet~+o{o},>{o},N{}\
-"))
-            return 1;
-        CORBA::Octet o;
-
-        IT_r.extractOctet (o);
-
-        if (IT_f && !IT_r.isException (IT_env))
-        	IT_f->inRequestPostM (IT_r, IT_env);
-        if (!IT_r.isException (IT_env)) {
-            try {
-                	IT_result = ((Cubit*)IT_pp)->cube_octet (  o, IT_env);
-
-            } catch (CORBA::SystemException &IT_exSys) {
-            IT_env.propagate (&IT_exSys);
-            } catch (CORBA::UserException &IT_exUsr) {
-            IT_env.propagate (&IT_exUsr);
-            }
-        }
-
-        if (!IT_r.isException (IT_env)) {
-            if (!IT_r.convertToReply ("\
-o\
-", IT_env)) return 1;
-            IT_r.insertOctet (IT_result);
-            }
-
-        else IT_r.makeSystemException (IT_env);
-        return 1;
-    }
-
-    if (!strcmp(IT_s,"cube_short")) {
-        CORBA::Short IT_result;
-        CORBA::Environment IT_env (IT_r);
-        CORBA::Filter* IT_f = CORBA::Orbix.getFilter ();
-        if (!IT_r.tcAssert ("\
-Ro~cube_short~+s{s},>{s},N{}\
-"))
-            return 1;
-        CORBA::Short s;
-
-        IT_r >> s;
-
-        if (IT_f && !IT_r.isException (IT_env))
-        	IT_f->inRequestPostM (IT_r, IT_env);
-        if (!IT_r.isException (IT_env)) {
-            try {
-                	IT_result = ((Cubit*)IT_pp)->cube_short (  s, IT_env);
-
-            } catch (CORBA::SystemException &IT_exSys) {
-            IT_env.propagate (&IT_exSys);
-            } catch (CORBA::UserException &IT_exUsr) {
-            IT_env.propagate (&IT_exUsr);
-            }
-        }
-
-        if (!IT_r.isException (IT_env)) {
-            if (!IT_r.convertToReply ("\
-s\
-", IT_env)) return 1;
-            IT_r << IT_result;
-            }
-
-        else IT_r.makeSystemException (IT_env);
-        return 1;
-    }
-
-    if (!strcmp(IT_s,"cube_long")) {
-        CORBA::Long IT_result;
-        CORBA::Environment IT_env (IT_r);
-        CORBA::Filter* IT_f = CORBA::Orbix.getFilter ();
-        if (!IT_r.tcAssert ("\
-Ro~cube_long~+l{l},>{l},N{}\
-"))
-            return 1;
-        CORBA::Long l;
-
-        IT_r >> l;
-
-        if (IT_f && !IT_r.isException (IT_env))
-        	IT_f->inRequestPostM (IT_r, IT_env);
-        if (!IT_r.isException (IT_env)) {
-            try {
-                	IT_result = ((Cubit*)IT_pp)->cube_long (  l, IT_env);
-
-            } catch (CORBA::SystemException &IT_exSys) {
-            IT_env.propagate (&IT_exSys);
-            } catch (CORBA::UserException &IT_exUsr) {
-            IT_env.propagate (&IT_exUsr);
-            }
-        }
-
-        if (!IT_r.isException (IT_env)) {
-            if (!IT_r.convertToReply ("\
-l\
-", IT_env)) return 1;
-            IT_r << IT_result;
-            }
-
-        else IT_r.makeSystemException (IT_env);
-        return 1;
-    }
-
-    if (!strcmp(IT_s,"cube_struct")) {
-        Cubit::Many IT_result;
-        CORBA::Environment IT_env (IT_r);
-        CORBA::Filter* IT_f = CORBA::Orbix.getFilter ();
-        if (!IT_r.tcAssert ("\
-Ro~cube_struct~+values{R~Cubit::Many~o{o},l{l},s{s}},>{R~Cubit::Many~o{o},l{l},s{s}},N{}\
-"))
-            return 1;
-        Cubit::Many values;
-
-        values.decodeOp (IT_r);
-
-        if (IT_f && !IT_r.isException (IT_env))
-        	IT_f->inRequestPostM (IT_r, IT_env);
-        if (!IT_r.isException (IT_env)) {
-            try {
-                	IT_result = ((Cubit*)IT_pp)->cube_struct (  values, IT_env);
-
-            } catch (CORBA::SystemException &IT_exSys) {
-            IT_env.propagate (&IT_exSys);
-            } catch (CORBA::UserException &IT_exUsr) {
-            IT_env.propagate (&IT_exUsr);
-            }
-        }
-
-        if (!IT_r.isException (IT_env)) {
-            if (!IT_r.convertToReply ("\
-R~Cubit::Many~o{o},l{l},s{s}\
-", IT_env)) return 1;
-            IT_result.encodeOp (IT_r);
-            }
-
-        else IT_r.makeSystemException (IT_env);
-        return 1;
-    }
-
-    if (!strcmp(IT_s,"cube_union")) {
-        Cubit::oneof IT_result;
-        CORBA::Environment IT_env (IT_r);
-        CORBA::Filter* IT_f = CORBA::Orbix.getFilter ();
-        IT_r.tcPreAssert (
-"\
-Ro~cube_union~+values{U~Cubit::oneof~{E~Cubit::discrim~e_0th,e_1st,e_2nd,e_3rd,e_4th,e_5th}~Cubit::e_0th o{o};Cubit::e_1st s{s};Cubit::e_2nd l{l};Cubit::e_3rd,$ cm{R~Cubit::Many~o{o},l{l},s{s}}},>{U~Cubit::oneof~{E~Cubit::discrim~e_0th,e_1st,e_2nd,e_3rd,\
-");
-        if (!IT_r.tcAssert ("\
-e_4th,e_5th}~Cubit::e_0th o{o};Cubit::e_1st s{s};Cubit::e_2nd l{l};Cubit::e_3rd,$ cm{R~Cubit::Many~o{o},l{l},s{s}}},N{}\
-"))
-            return 1;
-        Cubit::oneof values;
-
-        values.decodeOp (IT_r);
-
-        if (IT_f && !IT_r.isException (IT_env))
-        	IT_f->inRequestPostM (IT_r, IT_env);
-        if (!IT_r.isException (IT_env)) {
-            try {
-                	IT_result = ((Cubit*)IT_pp)->cube_union (  values, IT_env);
-
-            } catch (CORBA::SystemException &IT_exSys) {
-            IT_env.propagate (&IT_exSys);
-            } catch (CORBA::UserException &IT_exUsr) {
-            IT_env.propagate (&IT_exUsr);
-            }
-        }
-
-        if (!IT_r.isException (IT_env)) {
-            if (!IT_r.convertToReply ("\
-U~Cubit::oneof~{E~Cubit::discrim~e_0th,e_1st,e_2nd,e_3rd,e_4th,e_5th}~Cubit::e_0th o{o};Cubit::e_1st s{s};Cubit::e_2nd l{l};Cubit::e_3rd,$ cm{R~Cubit::Many~o{o},l{l},s{s}}\
-", IT_env)) return 1;
-            IT_result.encodeOp (IT_r);
-            }
-
-        else IT_r.makeSystemException (IT_env);
-        return 1;
-    }
-
-    if (!strcmp(IT_s,"please_exit")) {
-        CORBA::Environment IT_env (IT_r);
-        CORBA::Filter* IT_f = CORBA::Orbix.getFilter ();
-        if (!IT_r.tcAssert ("\
-Ro~please_exit~>{v},O{}\
-"))
-            return 1;
-
-        if (IT_f && !IT_r.isException (IT_env))
-        	IT_f->inRequestPostM (IT_r, IT_env);
-        if (!IT_r.isException (IT_env)) {
-            try {
-                ((Cubit*)IT_pp)->please_exit (IT_env);
-
-            } catch (CORBA::SystemException &IT_exSys) {
-            IT_env.propagate (&IT_exSys);
-            } catch (CORBA::UserException &IT_exUsr) {
-            IT_env.propagate (&IT_exUsr);
-            }
-        }
-        IT_r.replyNoResults (CORBA::Flags(CORBA::INV_NO_RESPONSE),IT_env);
-        return 1;
-    }
-
-    if (IT_isTarget)
-        IT_r.makeRuntimeException2 ();
-
-    return 0;
-}
-
-#define Cubit_Factory_dispatch_impl
-
-unsigned char Cubit_Factory_dispatch::dispatch (CORBA::Request &IT_r, 
- unsigned char IT_isTarget, void *IT_pp) {
-    if (!IT_pp)
-       IT_pp = m_obj;
-    const char *IT_s = IT_r.getOperation ();
-    if (!strcmp(IT_s,"create_cubit")) {
-        Cubit_ptr IT_result;
-        CORBA::Environment IT_env (IT_r);
-        CORBA::Filter* IT_f = CORBA::Orbix.getFilter ();
-        if (!IT_r.tcAssert ("\
-Ro~create_cubit~+name{0},>{O~Cubit},N{}\
-"))
-            return 1;
-        char * name;
-
-        IT_r.decodeStringOp(name);
-
-        if (IT_f && !IT_r.isException (IT_env))
-        	IT_f->inRequestPostM (IT_r, IT_env);
-        if (!IT_r.isException (IT_env)) {
-            try {
-                	IT_result = ((Cubit_Factory*)IT_pp)->create_cubit (  name, IT_env);
-
-            } catch (CORBA::SystemException &IT_exSys) {
-            IT_env.propagate (&IT_exSys);
-            } catch (CORBA::UserException &IT_exUsr) {
-            IT_env.propagate (&IT_exUsr);
-            }
-        }
-        CORBA::string_free (name);
-
-        if (!IT_r.isException (IT_env)) {
-            if (!IT_r.convertToReply ("\
-O~Cubit\
-", IT_env)) return 1;
-            {
-                CORBA::Object* IT_l1 = (CORBA::Object*) IT_result;
-                IT_r << IT_l1;
-            }
-            if (IT_result) Cubit_release (IT_result);
-            }
-
-        else IT_r.makeSystemException (IT_env);
-        return 1;
-    }
-
-    if (IT_isTarget)
-        IT_r.makeRuntimeException2 ();
-
-    return 0;
-}
-
-#include "cubitC.cpp"
-
diff --git a/TAO/IIOP/tests/Cubit/Orbix/tps/cubit_impl.cpp b/TAO/IIOP/tests/Cubit/Orbix/tps/cubit_impl.cpp
deleted file mode 100644
index 27ee125e4df..00000000000
--- a/TAO/IIOP/tests/Cubit/Orbix/tps/cubit_impl.cpp
+++ /dev/null
@@ -1,81 +0,0 @@
-#include "cubit_impl.h"
-
-CORBA::Octet Cubit_Impl:: cube_octet (CORBA::Octet o, CORBA::Environment &) throw (CORBA::SystemException) {
-  return (CORBA::Octet) (o * o * o); 
-}
-
-CORBA::Short Cubit_Impl:: cube_short (CORBA::Short s, CORBA::Environment &) throw (CORBA::SystemException) {
-  return (CORBA::Short) (s * s * s);
-}
-
-CORBA::Long Cubit_Impl:: cube_long (CORBA::Long l, CORBA::Environment &) throw (CORBA::SystemException) {
-   return (CORBA::Long) (l * l * l);
-}
-
-Cubit::Many Cubit_Impl:: cube_struct (const Cubit::Many& values, CORBA::Environment &) throw (CORBA::SystemException) {
-  Cubit::Many out_values;
-  out_values.o = values.o * values.o * values.o;
-  out_values.s = values.s * values.s * values.s;
-  out_values.l = values.l * values.l * values.l;
-  return out_values; 
-}
-
-Cubit::oneof Cubit_Impl:: cube_union (const Cubit::oneof& values, CORBA::Environment &) throw (CORBA::SystemException) {
-  Cubit::oneof out_values;
-   switch (values._d ()) {
-   case Cubit::e_0th:
-     out_values.o (values.o () * values.o ()  * values.o ());
-     break;
-   case Cubit::e_1st:
-     out_values.s (values.s () * values.s () * values.s ());
-     break;
-   case Cubit::e_2nd:
-     out_values.l (values.l () * values.l () * values.l ());
-     break;
-   case Cubit::e_3rd:
-   default:
-     out_values.cm ().o = values.cm ().o * values.cm ().o * values.cm ().o ;
-     out_values.cm ().s = values.cm ().s * values.cm ().s * values.cm ().s ;
-     out_values.cm ().l = values.cm ().l * values.cm ().l * values.cm ().l ;
-     break;
-   }
-   return out_values;  
-}
-
-void Cubit_Impl:: please_exit (CORBA::Environment &) throw (CORBA::SystemException) {
-}
-
-Cubit_ptr Cubit_Factory_Impl:: create_cubit (const char * name, CORBA::Environment &) throw (CORBA::SystemException) {
-  cerr << "Creating Cubit for " << name << endl;
-
-#ifdef Cubit_USE_BOA
-  Cubit_Impl_Task *cubit = new Cubit_Impl_Task ();
-#else
-  Cubit_Impl_Task *cubit = new TIE_Cubit (Cubit_Impl) (new Cubit_Impl_Task);
-#endif
-  Cubit::_duplicate ((Cubit *)cubit);
-  cubit->activate (1);
-  return (Cubit *) cubit;
-}
-
-int
-Cubit_Impl_Task::svc (void) 
-{
-  while (1) 
-    {
-      // Dequeue message
-      ACE_Message_Block *mb;
-      this->msg_queue ()->dequeue_head (mb);
-      CORBA::Request *vp = (CORBA::Request *) mb->base ();
-      mb->release ();
-      // Hand it off to Orbix
-      CORBA::Orbix.continueThreadDispatch (*vp);
-    }
-  return 0;
-}
-
-void *
-Cubit_Impl_Task::_deref (void) 
-{
-  return this;
-}
diff --git a/TAO/IIOP/tests/Cubit/Orbix/tps/cubit_impl.h b/TAO/IIOP/tests/Cubit/Orbix/tps/cubit_impl.h
deleted file mode 100644
index 31a8874f07b..00000000000
--- a/TAO/IIOP/tests/Cubit/Orbix/tps/cubit_impl.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-#ifndef cubit_ih
-#define cubit_ih
-
-#include "cubit.h"
-#include "ace/Task.h"
-
-#ifdef Cubit_USE_BOA
-class Cubit_Impl : public virtual CubitBOAImpl {
-#else
-class Cubit_Impl {
-#endif /* Cubit_USE_BOA */
-public:
-  virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env=CORBA::default_environment) throw (CORBA::SystemException);
-  virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env=CORBA::default_environment) throw (CORBA::SystemException);
-  virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env=CORBA::default_environment) throw (CORBA::SystemException);
-  virtual Cubit::Many cube_struct (const Cubit::Many& values, CORBA::Environment &IT_env=CORBA::default_environment) throw (CORBA::SystemException);
-  virtual Cubit::oneof cube_union (const Cubit::oneof& values, CORBA::Environment &IT_env=CORBA::default_environment) throw (CORBA::SystemException);
-  virtual void please_exit (CORBA::Environment &IT_env=CORBA::default_environment) throw (CORBA::SystemException);
-
-};
-
-#ifdef Cubit_USE_BOA
-class Cubit_Factory_Impl : public virtual Cubit_FactoryBOAImpl {
-#else
-class Cubit_Factory_Impl {
-#endif
-
-public:
-        virtual Cubit_ptr create_cubit (const char * name, CORBA::Environment &IT_env=CORBA::default_environment) throw (CORBA::SystemException);
-};
-
-class Cubit_Impl_Task : public virtual Cubit_Impl, public virtual ACE_Task<ACE_MT_SYNCH> {
-public:
-  // For ACE_Task
-  int svc (void);
-  // for narrowing
-  virtual void *_deref ();
-};
-
-#ifndef Cubit_USE_BOA
-DEF_TIE_Cubit (Cubit_Impl)
-DEF_TIE_Cubit_Factory (Cubit_Factory_Impl)
-#endif /* Cubit_USE_BOA */
-
-#endif
diff --git a/TAO/IIOP/tests/Cubit/Orbix/tps/tps.cpp b/TAO/IIOP/tests/Cubit/Orbix/tps/tps.cpp
deleted file mode 100644
index 1035f1e503f..00000000000
--- a/TAO/IIOP/tests/Cubit/Orbix/tps/tps.cpp
+++ /dev/null
@@ -1,26 +0,0 @@
-#include "tps.h"
-
-int
-TPS_Filter::inRequestPreMarshal(CORBA::Request &r,  CORBA::Environment& env)
-{
-  // Get target
-  CORBA::Object_ptr obj = r.target ();
-  Cubit * cb = Cubit::_narrow (obj, env);
-
-  if (env) // Not for our object!!
-    return 1; // continue in the same thread
-  
-  // Enqueue the request
-  Cubit_Impl_Task *ct;
-  if (CORBA::is_nil (cb))
-      return 1;
-  ct = (Cubit_Impl_Task *) DEREF(cb);
-  if (ct) {
-    ACE_Message_Block *mb = new ACE_Message_Block ( (char *) (&r));
-    ct->msg_queue ()->enqueue (mb);
-  }
-  // Done
-  return -1;
-}
-
-TPS_Filter tps_filter;
diff --git a/TAO/IIOP/tests/Cubit/Orbix/tps/tps.h b/TAO/IIOP/tests/Cubit/Orbix/tps/tps.h
deleted file mode 100644
index 272bc90f20d..00000000000
--- a/TAO/IIOP/tests/Cubit/Orbix/tps/tps.h
+++ /dev/null
@@ -1,11 +0,0 @@
-#include "cubit.h"
-#include "cubit_impl.h"
-#include "ace/Service_Config.h"
-#include "ace/Thread_Manager.h"
-#include "ace/Task.h"
-
-class TPS_Filter : public ACE_Task<ACE_MT_SYNCH>, public CORBA::ThreadFilter
-{
-public:
-  virtual int inRequestPreMarshal(CORBA::Request &, CORBA::Environment&);
-};
diff --git a/TAO/IIOP/tests/Cubit/README b/TAO/IIOP/tests/Cubit/README
deleted file mode 100644
index 5eaf42ec2e3..00000000000
--- a/TAO/IIOP/tests/Cubit/README
+++ /dev/null
@@ -1,7 +0,0 @@
-		Cubit 
-
-This is the example from the SunSoft's IIOP 1.4 distribution modified
-to work with TAO. There is a Cubit example for Orbix and
-VisiBroker.
-
-Benchmarking results are under results and tnf directories.
diff --git a/TAO/IIOP/tests/Cubit/TAO/Makefile b/TAO/IIOP/tests/Cubit/TAO/Makefile
deleted file mode 100644
index ff7bf5920d3..00000000000
--- a/TAO/IIOP/tests/Cubit/TAO/Makefile
+++ /dev/null
@@ -1,121 +0,0 @@
-#----------------------------------------------------------------------------
-#	$Id$
-#
-#	Top-level Makefile for the ACE-ified Sun Ref. implementation
-#	of IIOP ORB
-#----------------------------------------------------------------------------
-
-#----------------------------------------------------------------------------
-#	Local macros
-#----------------------------------------------------------------------------
-
-LDLIBS     =  -lcorba
-
-PROG_SRCS =	svr.cpp clnt.cpp cubit.cpp \
-		test1.cpp test1_clnt.cpp test1_svr.cpp \
-		echo_clnt.cpp echo_svr.cpp
-
-LSRC = $(PROG_SRCS)
-
-CUBIT_SVR_OBJS = svr.o cubit_i.o cubitS.o
-CUBIT_CLT_OBJS = clnt.o cubitC.o
-
-BASIC_SVR_OBJS = test1.o test1_svr.o
-BASIC_CLT_OBJS = test1.o test1_clnt.o
-
-ECHO_SVR_OBJS = test1.o echo_svr.o
-ECHO_CLT_OBJS = test1.o echo_clnt.o
-
-BIN = svr clnt test1_svr test1_clnt
-BUILD = $(BIN)
-VLDLIBS = $(LDLIBS:%=%$(VAR))
-
-#----------------------------------------------------------------------------
-#	Include macros and targets
-#----------------------------------------------------------------------------
-
-include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-include $(ACE_ROOT)/include/makeinclude/macros.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
-#include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
-
-# Local modifications to variables imported by includes above.
-LDFLAGS    += -L../../../proto/lib
-CPPFLAGS   += -I../../../proto/include -DUSE_ACE_EVENT_HANDLING -DDEBUG
-
-svr:	$(addprefix $(VDIR),$(CUBIT_SVR_OBJS))
-	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS)
-
-clnt:	$(addprefix $(VDIR),$(CUBIT_CLT_OBJS))
-	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS)
-
-test1_svr:	$(addprefix $(VDIR),$(BASIC_SVR_OBJS))
-	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS)
-
-test1_clnt:	$(addprefix $(VDIR),$(BASIC_CLT_OBJS))
-	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS)
-
-########
-# Sanity check builds by running basic functionality tests.
-#
-# "sleep 5" in the server startup is usually enough to get the
-# objref into the file so the client can read it.
-#
-check:	$(TESTS)
-	@echo "testing with 'cube' calls, stub + DII, IOR strings"
-	@./svr -i30 -o non-internet > obj.1 & sleep 5
-	@./clnt -n250 -O `cat obj.1` -x
-	@echo ''
-	@echo "testing request forwarding with 'cube' calls, stub + DII"
-	@./svr -f -i30 > obj.2 & sleep 5
-	@./clnt -n250 -O `cat obj.2` -x
-	@echo ''
-	@echo "testing transmission of primitive data types"
-	@./test1_svr -i30 > obj.3 & sleep 5
-	@./test1_clnt -n50 -O `cat obj.3` -x
-	@echo ''
-#	@echo "testing echo of primitive data values"
-#	@./echo_svr -i30 > obj.4 & sleep 5
-#	@./echo_clnt -O `cat obj.4` -x
-#	@echo ''
-	@echo "testing with 'cube' calls, MT-ized (no forwarding)"
-	@./svr -t -i30 -o non-internet > obj.5 & sleep 5
-	@./clnt -n250 -O `cat obj.5` -x
-	@echo ''
-
-ifdef LOCALRULES
-########
-# CUBIT test
-svr:		svr.o cubit.o
-	$(LINK.cc) -o svr svr.o cubit.o $(LDLIBS)
-clnt:		cubit.o clnt.o
-	$(LINK.cc) -o clnt clnt.o cubit.o $(LDLIBS)
-
-########
-# BASIC DATATYPES test
-test1_clnt:	test1.o test1_clnt.o
-	$(LINK.cc) -o test1_clnt test1_clnt.o test1.o $(LDLIBS)
-test1_svr:	test1.o test1_svr.o
-	$(LINK.cc) -o test1_svr test1_svr.o test1.o $(LDLIBS)
-
-########
-# ECHO test ... "test1" where the operation semantics are violated;
-# this aids some porting work, but is a less rigorous test
-echo_clnt:	test1.o echo_clnt.o
-	$(LINK.cc) -o echo_clnt echo_clnt.o test1.o $(LDLIBS)
-echo_svr:	test1.o echo_svr.o
-	$(LINK.cc) -o echo_svr echo_svr.o test1.o $(LDLIBS)
-endif
-
-clean:
-	-rm -rf *.o Log $(BIN) obj.* core Templates.DB .make.state
-
-install:
-	-@echo "Nothing to install, these are tests!"
-
-
-
-
-
diff --git a/TAO/IIOP/tests/Cubit/TAO/clnt.cpp b/TAO/IIOP/tests/Cubit/TAO/clnt.cpp
deleted file mode 100644
index f0249489889..00000000000
--- a/TAO/IIOP/tests/Cubit/TAO/clnt.cpp
+++ /dev/null
@@ -1,508 +0,0 @@
-// @(#)clnt.cpp	1.2 05/14/97
-// Copyright 1994-1995 by Sun Microsystems Inc.
-// All Rights Reserved
-//
-// TEST:	Simple "cube" client, calling hand-crafted stubs.
-//
-// Modified version of Cubit Example written by Sun Microsystems Inc.
-// Modified by: Brian Mendel
-
-#include <ace/Get_Opt.h>
-//#include <crtdbg.h>
-
-#if	unix
-#	include	<unistd.h>
-#	include	<sys/time.h>
-
-#elif defined (VXWORKS)
-#	include	<unistd.h>
-#	include	<time.h>
-
-#else	// windows
-
-#endif	// unix
-
-#include	"cubitC.h"
-
-#include	<corba/debug.h>
-
-
-#if !defined (_WIN32)
-extern char 	*optarg;	// missing on some platforms
-#endif
-
-inline int func (unsigned i) { return i - 117; }
-
-extern void
-print_exception (const CORBA_Exception *, const char *, FILE *f=stdout);
-
-
-//
-// forward declarations
-//
-static void cube_union_stub(unsigned, unsigned&, unsigned&,
-                            CORBA_Object_ptr, CORBA_Environment &);
-
-static void cube_union_dii(unsigned &, unsigned &,
-                           CORBA_Object_ptr, CORBA_Environment &);
-
-// Global variables
-const char* TAO_arg_ior = 0;
-unsigned           loop_count = 1;
-int                exit_later = 0;
-
-// = TITLE
-//     Parses the command line arguments and returns an error status
-//
-// = DESCRIPTION
-//     This method parses the command line arguments
-int parse_args(int argc, char *argv[])
-{
-   ACE_Get_Opt opts (argc, argv, "dn:O:x");
-   int			c;
-   
-   while ((c = opts ()) != -1)
-      switch (c) {
- 
-      case 'd':  // debug flag
-         TAO_debug_level++;
-         continue;
-   
-      case 'n':			// loop count
-         loop_count = (unsigned) ACE_OS::atoi (opts.optarg);
-         continue;
-   
-      case 'O':			// stringified objref
-         {
-           TAO_arg_ior = ACE_OS::strdup(opts.optarg);
-         }
-         continue;
-   
-      case 'x':
-         exit_later++;
-         continue;
-   
-      case '?':
-      default:
-         ACE_OS::fprintf (stderr, "usage:  %s"
-            " [-d]"
-            " [-n loopcount]"
-            " [-O objref]"
-            " [-x]"
-            "\n", argv [0]
-            );
-         return 1;
-      }
-   
-   return 0;  // Indicates successful parsing of command line
-}
-
-int
-main (int    argc, char   *argv[])
-{
-  CORBA_ORB_ptr orb_ptr;
-  CORBA_Object_ptr objref = CORBA_Object::_nil();
-  CORBA_Environment env;
-
-  orb_ptr = CORBA_ORB_init(argc, argv, "internet", env);
-  if (env.exception() != 0)
-    {
-      print_exception(env.exception(), "ORB initialization");
-      return 1;
-    }
-
-  //
-  // Parse command line and verify parameters.
-  //
-  parse_args(argc, argv);
-
-  if (TAO_arg_ior == 0)
-    ACE_ERROR_RETURN((LM_ERROR, "%s: must specify an object reference using -O <ior>\n", argv[0]), 1);
-
-  objref = orb_ptr->string_to_object ((CORBA_String)TAO_arg_ior, env);
-
-  ACE_OS::free((void*)TAO_arg_ior);
-  TAO_arg_ior = 0;
-
-  if (env.exception () != 0)
-    {
-      print_exception (env.exception (), "string2object");
-      return 1;
-    }
-
-  if (CORBA_is_nil (objref) == CORBA_B_TRUE)
-    ACE_ERROR_RETURN((LM_ERROR, "%s:  must identify non-null target objref\n", argv [0]), 1);
-
-  // Narrow the CORBA_Object reference to the stub object, checking
-  // the type along the way using _is_a
-  Cubit_ptr aCubit = Cubit::_narrow(objref);
-  if (aCubit == 0)
-    ACE_ERROR_RETURN((LM_ERROR, "(%P|%t) Unable to narrow object reference to a Cubit_ptr.\n"), 1);
-
-  //
-  // Make the calls in a loop.
-  //
-  unsigned i;
-  unsigned call_count, error_count;
-
-  call_count = 0;
-  error_count = 0;
-
-  ACE_Time_Value before, after;
-
-  before = ACE_OS::gettimeofday();
-
-  for (i = 0; i < loop_count; i++)
-    {
-      //
-      // Cube an octet.
-      //
-      CORBA_Octet	arg_octet, ret_octet;
-       
-      call_count++;
-      ret_octet = aCubit->Cubit_cube_octet (arg_octet = func (i), env);
-      if (env.exception () != 0)
-        {
-          print_exception (env.exception (), "from cube_octet");
-          error_count++;
-        }
-      else
-        {
-          dmsg2 ("cube octet:  %d --> %d\n", arg_octet, ret_octet);
-          arg_octet = arg_octet * arg_octet * arg_octet;
-          if (arg_octet != ret_octet) {
-            ACE_OS::printf ("** cube_octet(%d) ERROR (--> %d)\n",
-                            (CORBA_Octet) func (i), ret_octet);
-            error_count++;
-          }
-        }
-
-      //
-      // Cube a short.
-      //
-      CORBA_Short	arg_short, ret_short;
-       
-      call_count++;
-      ret_short = aCubit->Cubit_cube_short (arg_short = func (i), env);
-      if (env.exception () != 0)
-        {
-          print_exception (env.exception (), "from cube_short");
-          error_count++;
-        }
-      else
-        {
-          dmsg2 ("cube short:  %d --> %d\n", arg_short, ret_short);
-          arg_short = arg_short * arg_short * arg_short;
-          if (arg_short != ret_short)
-            {
-              ACE_OS::printf ("** cube_short(%d) ERROR (--> %d)\n",
-                              (CORBA_Short) func (i), ret_short);
-              error_count++;
-            }
-        }
-
-      //
-      // Cube a long.
-      //
-      CORBA_Long	arg_long, ret_long;
-       
-      call_count++;
-      ret_long = aCubit->Cubit_cube_long (arg_long = func (i), env);
-      if (env.exception () != 0)
-        {
-          print_exception (env.exception (), "from cube_long");
-          error_count++;
-        }
-      else
-        {
-          dmsg2 ("cube long:  %d --> %d\n", arg_long, ret_long);
-          arg_long = arg_long * arg_long * arg_long;
-          if (arg_long != ret_long) {
-            ACE_OS::printf ("** cube_long(%ld) ERROR (--> %ld)\n",
-                            (CORBA_Long) func (i), ret_long);
-            error_count++;
-          }
-        }
-
-      //
-      // Cube a "struct" ...
-      //
-      Cubit_Many	arg_struct, *ret_struct;
-       
-      call_count++;
-       
-      arg_struct.l = func (i);
-      arg_struct.s = func (i);
-      arg_struct.o = func (i);
-       
-      ret_struct = aCubit->Cubit_cube_struct (arg_struct, env);
-      if (env.exception () != 0)
-        {
-          print_exception (env.exception (), "from cube_struct");
-          error_count++;
-        }
-      else
-        {
-          dmsg ("cube struct ...");
-          arg_struct.l = arg_struct.l * arg_struct.l * arg_struct.l;
-          arg_struct.s = arg_struct.s * arg_struct.s * arg_struct.s;
-          arg_struct.o = arg_struct.o * arg_struct.o * arg_struct.o;
-          
-          if (arg_struct.l != ret_struct->l
-              || arg_struct.s != ret_struct->s
-              || arg_struct.o != ret_struct->o)
-            {
-              ACE_OS::printf ("** cube_struct ERROR\n");
-              error_count++;
-            }
-          delete ret_struct;
-        }
-       
-    }
-    
-  after = ACE_OS::gettimeofday();
-    
-  if (call_count > 0) 
-    {
-      if (error_count == 0)
-        {
-          ACE_Time_Value diff = after - before;
-          unsigned long	us = diff.sec() * 1000 * 1000 + diff.usec();
-          
-          us /= call_count;
-          
-          if (us > 0)
-            ACE_OS::printf ("cube average call ACE_OS::time\t= %ld.%.03ldms, \t"
-                            "%ld calls/second\n",
-                            us / 1000, us % 1000,
-                            1000000L / us);
-        }
-
-      ACE_OS::printf ("%d calls, %d errors\n", call_count, error_count);
-    }
-
-  //
-  // Simple test for DII:  call "cube_struct".  (It's not timed
-  // since the copious mallocation of DII would bias numbers against
-  // typical stub-based calls.)
-  //
-  do {
-    //
-    // Create the request ...
-    //
-    CORBA_Request_ptr	req;
-       
-    req = objref->_request ((const CORBA_String) "cube_struct", env);
-    if (env.exception () != 0) {
-      print_exception (env.exception (), "DII request create");
-      break;
-    }
-
-    //
-    // ... initialise the argument list and result ...
-    //
-    Cubit_Many	arg, *result;
-       
-    arg.o = 3; arg.l = 5; arg.s = -7;
-       
-    CORBA_Any	tmp_arg (TC_Cubit_Many, &arg, CORBA_B_FALSE);
-       
-    req->arguments ()->add_value (0, tmp_arg, CORBA_ARG_IN, env);
-    if (env.exception () != 0) {
-      print_exception (env.exception (), "DII request arg add");
-      CORBA_release (req);
-      break;
-    }
-       
-    req->result ()->value ()
-      ->replace (TC_Cubit_Many, 0, CORBA_B_TRUE, env);
-    if (env.exception () != 0) {
-      print_exception (env.exception (), "DII request result type");
-      CORBA_release (req);
-      break;
-    }
-
-    //
-    // Make the invocation, verify the result
-    //
-    req->invoke ();
-    if (req->env ()->exception () != 0) {
-      print_exception (req->env ()->exception (), "DII invoke");
-      CORBA_release (req);
-      break;
-    }
-       
-    result = (Cubit_Many *) req->result ()->value ()->value ();
-       
-    if (result->o != 27 || result->l != 125 || result->s != -343)
-      ACE_OS::fprintf (stderr, "DII cube_struct -- bad results\n");
-    else
-      dmsg ("DII cube_struct ... success!!");
-       
-    CORBA_release (req);
-       
-  } while (0);
-
-  //
-  // Two more tests, using the "cube_union" function
-  //
-  cube_union_dii(call_count, error_count, objref, env);
-  if (env.exception () != 0)
-    error_count++;
-    
-  cube_union_stub(i, call_count, error_count, objref, env);
-  if (env.exception () != 0)
-    error_count++;
-    
-  if (exit_later) {
-    aCubit->Cubit_please_exit (env);
-    dexc (env, "server, please ACE_OS::exit");
-  }
-    
-  CORBA_release (objref);
-    
-  return (error_count == 0) ? 0 : 1;
-}
-
-
-static void
-cube_union_stub(unsigned          i,
-                unsigned          &call_count,
-                unsigned          &error_count,
-                CORBA_Object_ptr  objref,
-                CORBA_Environment &env)
-{
-   Cubit_ptr aCubit = Cubit::_narrow(objref);
-   //
-   // Cube a "union" ...
-   //
-   Cubit_oneof    u, *r;
-   
-   call_count++;
-   
-   u._disc = e_2nd;
-   u.l = 3;
-   
-   r = aCubit->Cubit_cube_union (u, env);
-   if (env.exception () != 0) {
-      print_exception (env.exception (), "from cube_union");
-      error_count++;
-   } else {
-      dmsg ("cube union ...");
-      u.l = u.l  * u.l * u.l ;
-      
-      if (u.l != r->l) {
-         ACE_OS::printf ("** cube_union ERROR\n");
-         error_count++;
-      }
-      
-      delete r;
-   }
-   
-   //
-   // Cube another "union" which uses the default arm ...
-   //
-   call_count++;
-   
-   u._disc = e_5th;
-   u.cm.l = func (i);
-   u.cm.s = func (i);
-   u.cm.o = func (i);
-   
-   u.cm.l = 7;
-   u.cm.s = 5;
-   u.cm.o = 3;
-   
-   r = aCubit->Cubit_cube_union (u, env);
-   if (env.exception () != 0) {
-      print_exception (env.exception (), "from cube_union");
-      error_count++;
-   } else {
-      dmsg ("cube union ...");
-      u.cm.l = u.cm.l * u.cm.l * u.cm.l;
-      u.cm.s = u.cm.s * u.cm.s * u.cm.s;
-      u.cm.o = u.cm.o * u.cm.o * u.cm.o;
-      
-      if (u.cm.l != r->cm.l
-         || u.cm.s != r->cm.s
-         || u.cm.o != r->cm.o) {
-         ACE_OS::printf ("** cube_union ERROR\n");
-         error_count++;
-      }
-      
-      delete r;
-   }
-}
-
-
-static void
-cube_union_dii (unsigned          &call_count,
-                unsigned          &error_count,
-                CORBA_Object_ptr  objref,
-                CORBA_Environment &env)
-{
-   //
-   // Create the request ...
-   //
-   CORBA_Request_ptr	req;
-   
-   call_count++;
-
-   req = objref->_request ((const CORBA_String) "cube_union", env);
-   if (env.exception () != 0) {
-      error_count++;
-      
-      print_exception (env.exception (), "cube_union_dii request create");
-      return;
-   }
-
-   //
-   // ... initialise the argument list and result ...
-   //
-   Cubit_oneof	u, *r;
-   
-   u._disc = e_3rd;
-   u.cm.l = 5;
-   u.cm.s = -7;
-   u.cm.o = 3;
-
-   CORBA_Any	tmp_arg (TC_Cubit_oneof, &u, CORBA_B_FALSE);
-   
-   req->arguments ()->add_value (0, tmp_arg, CORBA_ARG_IN, env);
-   if (env.exception () != 0) {
-      error_count++;
-      print_exception (env.exception (), "cube_union_dii request arg add");
-      CORBA_release (req);
-      return;
-   }
-	
-   req->result ()->value ()->replace (TC_Cubit_oneof, 0, CORBA_B_TRUE, env);
-   if (env.exception () != 0) {
-      error_count++;
-      print_exception (env.exception (), "cube_union_dii result type");
-      CORBA_release (req);
-      return;
-   }
-
-   //
-   // Make the invocation, verify the result
-   //
-   req->invoke ();
-   if (req->env ()->exception () != 0) {
-      error_count++;
-      print_exception (req->env ()->exception (),"cube_union_dii invoke");
-      CORBA_release (req);
-      return;
-   }
-
-   r = (Cubit_oneof *) req->result ()->value ()->value ();
-   
-   if (r->cm.o != 27 || r->cm.l != 125 || r->cm.s != -343) {
-      error_count++;
-      ACE_OS::fprintf (stderr, "cube_union_dii -- bad results\n");
-   }
-   else
-      dmsg ("cube_union_dii ... success!!");
-   
-   CORBA_release (req);
-}
diff --git a/TAO/IIOP/tests/Cubit/TAO/cubit.cpp b/TAO/IIOP/tests/Cubit/TAO/cubit.cpp
deleted file mode 100644
index d232de8eee8..00000000000
--- a/TAO/IIOP/tests/Cubit/TAO/cubit.cpp
+++ /dev/null
@@ -1,576 +0,0 @@
-// @(#)cubit.cpp	1.2 95/09/29
-// Copyright 1994-1995 by Sun Microsystems Inc.
-// All Rights Reserved
-//
-// TEST:	hand-written C-style "Cubit" stubs and "skeletons"
-//
-// NOTE:  these "skeletons" are really the methods, using DSI.  No real
-// ORB would be implemented in this particular way.  Several things would
-// be more typical of real (static) skeletons:
-//
-//	* Most of the "in" (and much of the "out") parameter data would
-//	  be preallocated on the stack, not heap allocated.  (Static
-//	  preallocation doesnt' really work in a multithreaded system,
-//	  and moreover can waste a lot of space.)
-//
-//	* The ORB core wouldn't be told about parameters using heap
-//	  allocated data structures (e.g. NVList).
-//
-//	* Skeletons would need to some kind of "marshal the response NOW"
-//	  API so that stack-allocated "out" values wouldn't become invalid
-//	  up until they were safely marshaled.
-//
-//	* They'd handle exceptions rather than just generating debugging
-//	  messages when they happen.
-//
-//	* Method code would be called by the skeletons, not written as
-//	  part of the "skeleton" itself!
-//
-// A key part of turning this code into a complete ORB would be to ensure
-// that skeletons were always efficient and correct.  They might not need
-// to be sharable between different implementations of the same OMG-IDL
-// object interface, but many ORBs choose to be structured that way.
-//
-
-#include	"cubit.h"		// for stubs ...
-#include	<corba/boa.h>		// ... and skeletons
-
-#include	<corba/debug.h>		// ... and debugging
-
-
-//
-// CUBE OCTET
-//
-
-static const TAO_Param_Data Cubit_cube_octet_params [] = {
-    { _tc_CORBA_Octet, PARAM_RETURN, 0 },
-    { _tc_CORBA_Octet, PARAM_IN, 0 }
-};
-
-static const TAO_Call_Data Cubit_cube_octet_calldata = {
-    "cube_octet", CORBA_B_TRUE,
-    2, &Cubit_cube_octet_params [0],
-    0, 0
-};
-
-
-CORBA_Octet
-Cubit_cube_octet (
-    Cubit_ptr		target,
-    CORBA_Octet		o,
-    CORBA_Environment	&env
-)
-{
-    CORBA_Octet		retval = 0;
-    STUB_Object		*data;
-
-    if (target->QueryInterface (IID_STUB_Object, (void **)&data)
-	    != NOERROR)
-	env.exception (new CORBA_INV_OBJREF (COMPLETED_NO));
-    else {
-	data->do_call (env, &Cubit_cube_octet_calldata,
-	    &retval, &o);
-	data->Release ();
-    }
-    return retval;
-}
-
-static void
-_cube_octet_skel (CORBA_ServerRequest &req,    
-		  CORBA_Object_ptr obj,
-		  CORBA_Environment &env)
-{
-  CORBA_NVList_ptr		nvlist;
-  CORBA_NamedValue_ptr	nv;
-  CORBA_Any			temp_value (_tc_CORBA_Octet);
-
-  req.orb()->create_list (0, nvlist);
-  nv = nvlist->add_value (0, temp_value, CORBA_ARG_IN, env);
-  dexc (env, "cube_octet, add value");
-
-  req.params (nvlist, env);
-  dexc (env, "cube_octet, get params");
-
-  CORBA_Octet* value = new CORBA_Octet;
-
-  *value = *(CORBA_Octet *)nv->value ()->value ();
-  // dmsg1 ("cube octet, parameter '%d'", *value);
-  *value = (CORBA_Octet) ((*value) * (*value) * (*value));
-  // dmsg1 ("cube octet, result '%d'", *value);
-
-  CORBA_Any* any =
-    new CORBA_Any (_tc_CORBA_Octet, value, CORBA_B_TRUE);
-
-  req.result (any, env);
-  dexc (env, "cube_octet, result");
-}
-
-
-//
-// CUBE SHORT
-//
-
-static const TAO_Param_Data Cubit_cube_short_params [] = {
-    { _tc_CORBA_Short, PARAM_RETURN, 0 },
-    { _tc_CORBA_Short, PARAM_IN, 0 }
-};
-
-static const TAO_Call_Data Cubit_cube_short_calldata = {
-    "cube_short", CORBA_B_TRUE,
-    2, &Cubit_cube_short_params [0],
-    0, 0
-};
-
-
-CORBA_Short
-Cubit_cube_short (Cubit_ptr target,
-		  CORBA_Short s,
-		  CORBA_Environment &env)
-{
-    CORBA_Short		retval;
-    STUB_Object		*data;
-
-    if (target->QueryInterface (IID_STUB_Object, (void **)&data)
-	    != NOERROR)
-	env.exception (new CORBA_INV_OBJREF (COMPLETED_NO));
-    else {
-	data->do_call (env, &Cubit_cube_short_calldata,
-		&retval, &s);
-	data->Release ();
-    }
-    return retval;
-}
-
-static void
-_cube_short_skel (CORBA_ServerRequest &req,
-		  CORBA_Object_ptr obj,
-		  CORBA_Environment &env)
-{
-  CORBA_NVList_ptr		nvlist;
-  CORBA_NamedValue_ptr	nv;
-  CORBA_Any			temp_value (_tc_CORBA_Short);
-
-  req.orb()->create_list (0, nvlist);
-  nv = nvlist->add_value (0, temp_value, CORBA_ARG_IN, env);
-  dexc (env, "cube_short, add_value");
-
-  req.params (nvlist, env);
-  dexc (env, "cube_short, get params");
-
-  CORBA_Short* value = new CORBA_Short;
-
-  *value = *(CORBA_Short *)nv->value ()->value ();
-  // dmsg1 ("cube short, parameter '%d'", *value);
-  *value =(CORBA_Short) ((*value) * (*value) * (*value));
-  // dmsg1 ("cube short, result '%d'", *value);
-
-  CORBA_Any* any =
-    new CORBA_Any (_tc_CORBA_Short, value, CORBA_B_TRUE);
-
-  req.result (any, env);
-  dexc (env, "cube_short, result");
-}
-
-
-//
-// CUBE LONG
-//
-
-static const TAO_Param_Data Cubit_cube_long_params [] = {
-    { _tc_CORBA_Long, PARAM_RETURN, 0 },
-    { _tc_CORBA_Long, PARAM_IN, 0 }
-};
-
-static const TAO_Call_Data Cubit_cube_long_calldata = {
-    "cube_long", CORBA_B_TRUE,
-    2, &Cubit_cube_long_params [0],
-    0, 0
-};
-
-
-CORBA_Long
-Cubit_cube_long (Cubit_ptr target,
-		 CORBA_Long l,
-		 CORBA_Environment &env)
-{
-  CORBA_Long		retval;
-  STUB_Object		*data;
-
-  if (target->QueryInterface (IID_STUB_Object, (void **)&data) != NOERROR)
-    env.exception (new CORBA_INV_OBJREF (COMPLETED_NO));
-  else
-    {
-      data->do_call (env, &Cubit_cube_long_calldata,
-		     &retval, &l);
-      data->Release ();
-    }
-  return retval;
-}
-
-
-static void
-_cube_long_skel (CORBA_ServerRequest &req,
-		 CORBA_Object_ptr obj,
-		 CORBA_Environment &env)
-{
-  CORBA_NVList_ptr		nvlist;
-  CORBA_NamedValue_ptr	nv;
-  CORBA_Any			temp_value (_tc_CORBA_Long);
-
-  req.orb()->create_list (0, nvlist);
-  nv = nvlist->add_value (0, temp_value, CORBA_ARG_IN, env);
-  dexc (env, "cube_long, add_value");
-
-  req.params (nvlist, env);
-  dexc (env, "cube_long, get params");
-
-  CORBA_Long* value = new CORBA_Long;
-
-  *value = *(CORBA_Long *)nv->value ()->value ();
-  // dmsg1 ("cube long, parameter '%d'", *value);
-  *value = (*value) * (*value) * (*value);
-  // dmsg1 ("cube long, result '%d'", *value);
-
-  CORBA_Any* any =
-    new CORBA_Any (_tc_CORBA_Long, value, CORBA_B_TRUE);
-
-  req.result (any, env);
-  dexc (env, "cube_long, result");
-}
-
-//
-// Encapsulated parameters for struct "Cubit_Many" typecode.
-// None of these parameters is complicated, so this is just
-// a linear sequence of element encodings
-//
-// NOTE:  it's important that this be longword aligned!!
-//
-static const CORBA_Long _oc_Cubit_Many [] = {
-    1,				// byte order flag (TRICKY!)
-
-    1, 0,			// empty string:  repository/type ID
-    1, 0,			// empty string:  struct name
-
-    3,				// three struct elements
-
-    // First structure element:  name, typecode for Octet
-    1, 0,			// empty string:  name "o"
-    tk_octet,
-
-    // Second structure element:  name, typecode for Long
-    1, 0,			// empty string:  name "l"
-    tk_long,
-
-    // Third structure element:  name, typecode for Short
-    1, 0,			// empty string:  name "s"
-    tk_short,
-};
-
-static CORBA_TypeCode _tc_Cubit_Many (tk_struct,
-    sizeof _oc_Cubit_Many, (unsigned char *) &_oc_Cubit_Many,
-    CORBA_B_FALSE);
-CORBA_TypeCode_ptr TC_Cubit_Many = &_tc_Cubit_Many;
-
-
-//
-// CUBE STRUCT
-//
-
-static const TAO_Param_Data Cubit_cube_struct_params [] = {
-    { &_tc_Cubit_Many, PARAM_RETURN, sizeof (Cubit_Many) },
-    { &_tc_Cubit_Many, PARAM_IN, 0 }
-};
-
-static const TAO_Call_Data Cubit_cube_struct_calldata = {
-    "cube_struct", CORBA_B_TRUE,
-    2, &Cubit_cube_struct_params [0],
-    0, 0
-};
-
-Cubit_Many *
-Cubit_cube_struct (Cubit_ptr target,
-		   Cubit_Many &values,
-		   CORBA_Environment &env)
-{
-  Cubit_Many		*retval;
-  STUB_Object		*data;
-
-  if (target->QueryInterface (IID_STUB_Object, (void **)&data) != NOERROR)
-    env.exception (new CORBA_INV_OBJREF (COMPLETED_NO));
-  else
-    {
-      data->do_call (env, &Cubit_cube_struct_calldata,
-		     &retval, &values);
-      data->Release ();
-    }
-  return retval;
-}
-
-
-static void
-_cube_struct_skel (CORBA_ServerRequest &req,
-		   CORBA_Object_ptr obj,
-		   CORBA_Environment &env)
-{
-  CORBA_NVList_ptr		nvlist;
-  CORBA_NamedValue_ptr	nv;
-  CORBA_Any			temp_value (TC_Cubit_Many);
-
-  req.orb()->create_list (0, nvlist);
-  nv = nvlist->add_value (0, temp_value, CORBA_ARG_IN, env);
-  dexc (env, "cube_struct, add_value");
-
-  req.params (nvlist, env);
-  dexc (env, "cube_struct, get params");
-
-  Cubit_Many *value;
-  Cubit_Many *retval = new Cubit_Many;
-
-  value = (Cubit_Many *)nv->value ()->value ();
-
-  retval->o = (CORBA_Octet) (value->o * value->o * value->o);
-  retval->s = (CORBA_Short) (value->s * value->s * value->s);
-  retval->l = value->l * value->l * value->l;
-
-  // dmsg2 ("cube struct.o, %d -> %d", value->o, retval->o);
-  // dmsg2 ("cube struct.s, %d -> %d", value->s, retval->s);
-  // dmsg2 ("cube struct.l, %d -> %d", value->l, retval->l);
-
-  CORBA_Any *any =
-    new CORBA_Any (TC_Cubit_Many, retval, CORBA_B_TRUE);
-
-  req.result (any, env);
-  dexc (env, "cube_struct, result");
-}
-
-//
-// CUBE UNION
-//
-
-//
-// NOTE:  not all union typecodes can be encoded as an array
-// of "long "values, but this one can.  Ones with discriminants
-// that are one or two bytes long can't easily be coded portably. 
-//
-// The benefit of doing it as an array of "long" values is
-// twofold:  (a) easier to read; (b) on most systems it's then
-// adequately aligned for the typecode interpreter to use, so
-// no additional runtime copy needs to be made.
-//
-static const CORBA_Long _oc_Cubit_oneof [] = {
-    1,				// byte order flag (TRICKY)
-    1, 0,			// omitted repository/type ID
-    1, 0,			// omitted struct name, "oneof"
-
-    //
-    // discriminant typecode:
-    //
-    tk_enum,		// tk_enum
-	72,			// encapsulation length
-
-        1,			// byte order flag (TRICKY)
-        1, 0,			// omitted repository/type ID
-        1, 0,			// omitted enum name, "discrim"
-        6,			// 5 elements in the enum
-
-        1, 0,			// omitted member name, "e_0th"
-        1, 0,			// omitted member name, "e_1st"
-        1, 0,			// omitted member name, "e_2nd"
-        1, 0,			// omitted member name, "e_3rd" 
-        1, 0,			// omitted member name, "e_4th" 
-        1, 0,			// omitted member name, "e_5th" 
-
-    4,				// default member index (zero based)
-    5,				// number of union members
-
-    // the 1st union branch arm
-    e_0th,			// member label value
-    1, 0,			// omitted member name, "o"
-    tk_octet,		// member typecode
-
-    // the 2nd union branch arm
-    e_1st,			// member label value
-    1, 0,			// omitted member name, "s"
-    tk_short,		// member typecode
-
-    // the 3rd union branch arm
-    e_2nd,			// member label value
-    1, 0,			// omitted member name, "l"
-    tk_long,		// member typecode
-
-    // the 4th union branch arm
-    e_3rd,			// member label value
-    1, 0,			// omitted member name, "cm"
-
-    // the 4th union member typecode
-    tk_struct,		// tk_struct
-	60,			// encap length
-
-        1,			// byte order flag (TRICKY)
-        1, 0,			// omitted repository/type ID
-        1, 0,			// omitted struct name, "Many"
-        3,			// three struct members
-
-        // First structure element
-        1, 0,			// omitted member name, "o"
-        tk_octet,	// member type, tk_octet
-
-        // Second structure element
-        1, 0,			// omitted member name, "l"
-        tk_long,	// member type, tk_long
-
-        // Third structure element
-        1, 0,			// omitted member name, "s"
-        tk_short,	// member type, tk_short
-
-    // the 5th union branch arm
-    4,				// the 5th member label value
-    1, 0,			// omitted member name, "cm"
-    ~0,				// indirected typecode (~0)
-	-84			// offset to struct "Many" typecode
-};
-
-static CORBA_TypeCode _tc_Cubit_oneof (tk_union,
-    (sizeof _oc_Cubit_oneof), (unsigned char *) &_oc_Cubit_oneof,
-    CORBA_B_FALSE);
-CORBA_TypeCode_ptr TC_Cubit_oneof = &_tc_Cubit_oneof;
-
-static const TAO_Param_Data Cubit_cube_union_params [] = {
-    { &_tc_Cubit_oneof, PARAM_RETURN, sizeof (Cubit_oneof) },
-    { &_tc_Cubit_oneof, PARAM_IN, 0 }
-};
-
-static const TAO_Call_Data Cubit_cube_union_calldata = {
-    "cube_union", CORBA_B_TRUE,
-    2, &Cubit_cube_union_params [0],
-    0, 0
-};
-
-Cubit_oneof *
-Cubit_cube_union (Cubit_ptr target,
-		  Cubit_oneof &values,
-		  CORBA_Environment &env)
-{
-  Cubit_oneof		*retval;
-  STUB_Object		*data;
-
-  if (target->QueryInterface (IID_STUB_Object, (void **)&data) != NOERROR)
-    env.exception (new CORBA_INV_OBJREF (COMPLETED_NO));
-  else
-    {
-      data->do_call (env, &Cubit_cube_union_calldata,
-		     &retval, &values);
-      data->Release ();
-    }
-  return retval;
-}
-
-
-static void
-_cube_union_skel (CORBA_ServerRequest &req,
-		  CORBA_Object_ptr obj,
-		  CORBA_Environment &env)
-{
-  CORBA_NVList_ptr nvlist;
-  CORBA_NamedValue_ptr nv;
-  CORBA_Any temp_value (TC_Cubit_oneof);
-
-  req.orb()->create_list (0, nvlist);
-  nv = nvlist->add_value (0, temp_value, CORBA_ARG_IN, env);
-  dexc (env, "cube_union_3rd, add_value");
-
-  req.params (nvlist, env);
-  dexc (env, "cube_union_3rd, get params");
-
-  Cubit_oneof *v;
-  Cubit_oneof *r = new Cubit_oneof;
-
-  v = (Cubit_oneof *)nv->value ()->value ();
-  r->_disc = v->_disc;
-
-  switch (v->_disc) {
-  case e_0th:
-    r->o = (CORBA_Octet) (v->o * v->o * v->o);
-    break;
-
-  case e_1st:
-    r->s = (CORBA_Short) (v->s * v->s * v->s);
-    break;
-
-  case e_2nd:
-    r->l = v->l * v->l * v->l;
-    break;
-
-  case e_3rd:
-  default:
-    r->cm.o = (CORBA_Octet) (v->cm.o * v->cm.o * v->cm.o);
-    r->cm.s = (CORBA_Short) (v->cm.s * v->cm.s * v->cm.s);
-    r->cm.l = v->cm.l * v->cm.l * v->cm.l;
-    break;
-  }
-
-  CORBA_Any *any = new CORBA_Any (TC_Cubit_oneof, r, CORBA_B_TRUE);
-
-  req.result (any, env);
-  dexc (env, "cube_struct, result");
-}
-
-
-//
-// PLEASE EXIT
-//
-
-static const TAO_Call_Data Cubit_please_exit_calldata = {
-    "please_exit", CORBA_B_FALSE,
-    0, 0,
-    0, 0
-};
-
-void
-Cubit_please_exit (
-    Cubit_ptr		target,
-    CORBA_Environment	&env
-)
-{
-    STUB_Object		*data;
-
-    if (target->QueryInterface (IID_STUB_Object, (void **)&data)
-	    != NOERROR)
-	env.exception (new CORBA_INV_OBJREF (COMPLETED_NO));
-    else {
-	data->do_call (env, &Cubit_please_exit_calldata
-	    );
-	data->Release ();
-    }
-}
-
-static void
-_please_exit_skel (CORBA_ServerRequest &req,
-		   CORBA_Object_ptr obj,
-		   CORBA_Environment &env)
-{
-    dmsg ("I've been asked to shut down...");
-    req.oa ()->please_shutdown (env);
-    dexc (env, "please_exit, please_shutdown");
-}
-
-
-const CORBA_Char	*Cubit__id = (CORBA_Char *)
-    "IDL:Eng.SUN.COM/Cubit:1.1";
-
-
-//
-// table of all operations, used by operation dispatch to get to the
-// right skeleton ... could be sorted by the IDL compiler so bsearch
-// is effective, perhaps with help from opname hashes and a small cache
-// (e.g. like Obj-C?).  for now, just lsearch.
-//
-const TAO_Skel_Entry Cubit_operations [] = {
-    { &Cubit_cube_octet_calldata, _cube_octet_skel },
-    { &Cubit_cube_short_calldata, _cube_short_skel },
-    { &Cubit_cube_long_calldata, _cube_long_skel },
-    { &Cubit_cube_struct_calldata, _cube_struct_skel },
-    { &Cubit_cube_union_calldata, _cube_union_skel },
-    { &Cubit_please_exit_calldata, _please_exit_skel },
-    { 0, 0 }					// last entry
-};
diff --git a/TAO/IIOP/tests/Cubit/TAO/cubit.h b/TAO/IIOP/tests/Cubit/TAO/cubit.h
deleted file mode 100644
index 92dd6b381bd..00000000000
--- a/TAO/IIOP/tests/Cubit/TAO/cubit.h
+++ /dev/null
@@ -1,106 +0,0 @@
-// @(#)cubit.hh	1.1 95/09/10
-// Copyright 1994-1995 by Sun Microsystems Inc.
-// All Rights Reserved
-//
-// Hand-crafted C language binding glue ...
-//
-// This doesn't use C++ since doing the obvious derivation
-// (all parent interfaces are virtual public parents) makes
-// object references have different "views".  That is, a
-// pointer to a Cubit (i.e. a Cubit_ptr) would not have
-// the same binary value as a pointer to a CORBA_Object
-// (i.e. a CORBA_Object_ptr, generic objref).  That'd
-// mean lots of narrowing/widening/RTTI infrastructure.
-//
-
-#ifndef	_CUBIT_HH
-#define	_CUBIT_HH
-
-#ifdef	_MSC_VER
-#pragma	pack (push, 1)			// VC++, known padding rules
-#endif	// VC++
-
-#include <corba/orb.h>
-#include <corba/stub.h>
-
-
-//
-// C style binding
-//
-
-typedef CORBA_Object	Cubit;
-typedef Cubit *Cubit_ptr, *CubitRef;
-
-extern CORBA_TypeCode_ptr	TC_Cubit_Many;
-extern CORBA_TypeCode_ptr	TC_Cubit_oneof;
-
-struct Cubit_Many {
-    CORBA_Octet	o;
-    CORBA_Long	l;
-    CORBA_Short	s;
-};
-
-enum Cubit_discrim {e_0th = 0, e_1st = 1, e_2nd = 2,
-                    e_3rd = 3, e_4th = 4, e_5th = 5};
-
-struct Cubit_oneof {
-    Cubit_discrim          _disc;
-
-    union {    
-        CORBA_Octet	o;
-        CORBA_Short	s;
-        CORBA_Long	l;
-        Cubit_Many      cm;
-    };
-};
-
-CORBA_Octet
-Cubit_cube_octet (
-    Cubit_ptr		target,
-    CORBA_Octet	o,
-    CORBA_Environment	&env
-);
-
-CORBA_Short
-Cubit_cube_short (
-    Cubit_ptr		target,
-    CORBA_Short	s,
-    CORBA_Environment	&env
-);
-
-CORBA_Long
-Cubit_cube_long (
-    Cubit_ptr		target,
-    CORBA_Long		l,
-    CORBA_Environment	&env
-);
-
-Cubit_Many *
-Cubit_cube_struct (
-    Cubit_ptr		target,
-    Cubit_Many		&values,
-    CORBA_Environment	&env
-);
-
-Cubit_oneof *
-Cubit_cube_union (
-    Cubit_ptr		target,
-    Cubit_oneof         &values,
-    CORBA_Environment	&env
-);
-
-void
-Cubit_please_exit (
-    Cubit_ptr		target,
-    CORBA_Environment	&env
-);
-
-extern const CORBA_Char *Cubit__id;		// type ID
-
-extern const TAO_Skel_Entry Cubit_operations [];
-
-#ifdef	_MSC_VER
-#pragma	pack (pop)			// VC++, go back to other padding rules
-#endif	// VC++
-
-#endif	// _CUBIT_HH
diff --git a/TAO/IIOP/tests/Cubit/TAO/cubit.idl b/TAO/IIOP/tests/Cubit/TAO/cubit.idl
deleted file mode 100644
index d9b38c34a2a..00000000000
--- a/TAO/IIOP/tests/Cubit/TAO/cubit.idl
+++ /dev/null
@@ -1,40 +0,0 @@
-// @(#)cubit.idl	1.1 95/09/10
-// Copyright 1994-1995 by Sun Microsystems, Inc.
-
-#pragma prefix	"Eng.SUN.COM"
-#pragma version Cubit 1.1
-
-interface Cubit {
-    octet	cube_octet (in octet o);
-    short	cube_short (in short s);
-    long	cube_long (in long l);
-
-    struct Many {
-	octet	o;		// + 3 bytes padding (normally) ...
-	long	l;
-	short	s;		// + 2 bytes padding (normally) ...
-    };
-
-    Many	cube_struct (in Many values);
-
-    enum discrim {e_0th, e_1st, e_2nd, e_3rd, e_4th, e_5th};
-
-    union oneof
-    switch (discrim) {
-	// this is an easy union to interpret; no padding
-	// is needed between discriminant and value.
-      case e_0th:
-        octet		o;
-      case e_1st:
-        short		s;
-      case e_2nd:
-        long		l;
-      case e_3rd:
-      default:
-        Many		cm;
-    };
-
-    oneof	cube_union (in oneof values);
-
-    oneway void	please_exit ();
-};
diff --git a/TAO/IIOP/tests/Cubit/TAO/cubitC.cpp b/TAO/IIOP/tests/Cubit/TAO/cubitC.cpp
deleted file mode 100644
index 99416520c15..00000000000
--- a/TAO/IIOP/tests/Cubit/TAO/cubitC.cpp
+++ /dev/null
@@ -1,381 +0,0 @@
-// @(#)cubitC.cpp	05/14/97
-// Copyright 1994-1995 by Sun Microsystems Inc.
-// All Rights Reserved
-//
-// Modified version of Cubit Example written by Sun Microsystems Inc.
-// Modified by: Brian Mendel
-
-#include	"cubitC.h"		// for stubs ...
-
-Cubit_ptr Cubit::_duplicate(Cubit_ptr obj)
-{
-   if (obj)
-      obj->AddRef();
-
-   return obj;
-}
-
-Cubit_ptr Cubit::_narrow(CORBA_Object_ptr obj)
-{
-   CORBA_Environment env;
-   if (obj->_is_a("IDL:Cubit:1.0", env))
-   {
-      STUB_Object *istub;
-      if (obj->QueryInterface(IID_STUB_Object, (void **)&istub) != NOERROR)
-      {
-         return Cubit::_nil();
-      }
-      Cubit_ptr new_obj = new Cubit(istub);
-      return Cubit::_duplicate(new_obj);
-   }
-   return Cubit::_nil();
-}
-
-Cubit_ptr Cubit::_nil()
-{
-   return (Cubit_ptr)NULL;
-}
-
-//
-// CUBE OCTET
-//
-
-static const TAO_Param_Data Cubit_cube_octet_params [] = 
-{
-   { _tc_CORBA_Octet, PARAM_RETURN, 0 },
-   { _tc_CORBA_Octet, PARAM_IN, 0 }
-};
-    
-
-static const TAO_Call_Data Cubit_cube_octet_calldata = 
-{
-   "cube_octet", CORBA_B_TRUE,
-      2, &Cubit_cube_octet_params [0],
-      0, 0
-};
-
-
-CORBA_Octet
-Cubit::Cubit_cube_octet (CORBA_Octet       o, 
-                  CORBA_Environment &env)
-{
-   CORBA_Octet		retval;
-
-   STUB_Object *istub;
-   if (this->QueryInterface(IID_STUB_Object, (void **)&istub) != NOERROR)
-   {
-      env.exception(new CORBA_DATA_CONVERSION (COMPLETED_NO));
-      return 0;
-   }
-
-   istub->do_call (env, &Cubit_cube_octet_calldata,
-                        &retval, &o);
-   istub->Release ();
-
-   return retval;
-}
-
-
-//
-// CUBE SHORT
-//
-
-static const TAO_Param_Data Cubit_cube_short_params [] = 
-{
-   { _tc_CORBA_Short, PARAM_RETURN, 0 },
-   { _tc_CORBA_Short, PARAM_IN, 0 }
-};
-
-static const TAO_Call_Data Cubit_cube_short_calldata = 
-{
-   "cube_short", CORBA_B_TRUE,
-      2, &Cubit_cube_short_params [0],
-      0, 0
-};
-
-
-CORBA_Short
-Cubit::Cubit_cube_short (CORBA_Short       s,
-                  CORBA_Environment &env)
-{
-   CORBA_Short		retval;
-
-   STUB_Object *istub;
-   if (this->QueryInterface(IID_STUB_Object, (void **)&istub) != NOERROR)
-   {
-      env.exception(new CORBA_DATA_CONVERSION (COMPLETED_NO));
-      return 0;
-   }
-
-   istub->do_call(env, &Cubit_cube_short_calldata,
-                  &retval, &s);
-   
-   istub->Release ();
-   
-   return retval;
-}
-
-//
-// CUBE LONG
-//
-
-static const TAO_Param_Data Cubit_cube_long_params [] = 
-{
-   { _tc_CORBA_Long, PARAM_RETURN, 0 },
-   { _tc_CORBA_Long, PARAM_IN, 0 }
-};
-
-static const TAO_Call_Data Cubit_cube_long_calldata = 
-{
-   "cube_long", CORBA_B_TRUE,
-      2, &Cubit_cube_long_params [0],
-      0, 0
-};
-
-
-CORBA_Long
-Cubit::Cubit_cube_long (CORBA_Long        l,
-                 CORBA_Environment &env)
-{
-   CORBA_Long		retval;
-   
-   STUB_Object *istub;
-   if (this->QueryInterface(IID_STUB_Object, (void **)&istub) != NOERROR)
-   {
-      env.exception(new CORBA_DATA_CONVERSION (COMPLETED_NO));
-      return 0;
-   }
-   
-   istub->do_call (env, &Cubit_cube_long_calldata,
-                  &retval, &l);
-   istub->Release ();
-   
-   return retval;
-}
-
-
-//
-// Encapsulated parameters for struct "Cubit_Many" typecode.
-// None of these parameters is complicated, so this is just
-// a linear sequence of element encodings
-//
-// NOTE:  it's important that this be longword aligned!!
-//
-static const CORBA_Long _oc_Cubit_Many [] = 
-{
-   1,          // byte order flag (TRICKY!)
-      
-   1, 0,       // empty string:  repository/type ID
-   1, 0,       // empty string:  struct name
-      
-   3,          // three struct elements
-      
-   // First structure element:  name, typecode for Octet
-   1, 0,       // empty string:  name "o"
-   tk_octet,
-      
-   // Second structure element:  name, typecode for Long
-   1, 0,       // empty string:  name "l"
-   tk_long,
-      
-   // Third structure element:  name, typecode for Short
-   1, 0,       // empty string:  name "s"
-   tk_short,
-};
-
-static CORBA_TypeCode _tc_Cubit_Many (tk_struct,
-                                      sizeof _oc_Cubit_Many, (unsigned char *) &_oc_Cubit_Many,
-                                      CORBA_B_FALSE);
-CORBA_TypeCode_ptr TC_Cubit_Many = &_tc_Cubit_Many;
-
-
-//
-// CUBE STRUCT
-//
-
-static const TAO_Param_Data Cubit_cube_struct_params [] = 
-{
-   { &_tc_Cubit_Many, PARAM_RETURN, sizeof (Cubit_Many) },
-   { &_tc_Cubit_Many, PARAM_IN, 0 }
-};
-
-static const TAO_Call_Data Cubit_cube_struct_calldata = 
-{
-   "cube_struct", CORBA_B_TRUE,
-      2, &Cubit_cube_struct_params [0],
-      0, 0
-};
-
-Cubit_Many*
-Cubit::Cubit_cube_struct (Cubit_Many &values,
-                          CORBA_Environment &env)
-{
-   Cubit_Many		*retval;
-
-   STUB_Object *istub;
-   if (this->QueryInterface(IID_STUB_Object, (void **)&istub) != NOERROR)
-   {
-      env.exception(new CORBA_DATA_CONVERSION (COMPLETED_NO));
-      return 0;
-   }
-  
-   istub->do_call (env, &Cubit_cube_struct_calldata,
-                        &retval, &values);
-   istub->Release ();
-   
-   return retval;
-}
-
-
-//
-// CUBE UNION
-//
-
-//
-// NOTE:  not all union typecodes can be encoded as an array
-// of "long "values, but this one can.  Ones with discriminants
-// that are one or two bytes long can't easily be coded portably. 
-//
-// The benefit of doing it as an array of "long" values is
-// twofold:  (a) easier to read; (b) on most systems it's then
-// adequately aligned for the typecode interpreter to use, so
-// no additional runtime copy needs to be made.
-//
-static const CORBA_Long _oc_Cubit_oneof [] = 
-{
-   1,          // byte order flag (TRICKY)
-   1, 0,       // omitted repository/type ID
-   1, 0,       // omitted struct name, "oneof"
-   
-   //
-   // discriminant typecode:
-   //
-   tk_enum,    // tk_enum
-   72,         // encapsulation length
-   
-   1,          // byte order flag (TRICKY)
-   1, 0,       // omitted repository/type ID
-   1, 0,       // omitted enum name, "discrim"
-   6,          // 5 elements in the enum
-   
-   1, 0,       // omitted member name, "e_0th"
-   1, 0,       // omitted member name, "e_1st"
-   1, 0,       // omitted member name, "e_2nd"
-   1, 0,       // omitted member name, "e_3rd" 
-   1, 0,       // omitted member name, "e_4th" 
-   1, 0,       // omitted member name, "e_5th" 
-   
-   4,       	// default member index (zero based)
-   5,       	// number of union members
-   
-   // the 1st union branch arm
-   e_0th,       // member label value
-   1, 0,        // omitted member name, "o"
-   tk_octet,    // member typecode
-   
-   // the 2nd union branch arm
-   e_1st,      // member label value
-   1, 0,       // omitted member name, "s"
-   tk_short,   // member typecode
-   
-   // the 3rd union branch arm
-   e_2nd,      // member label value
-   1, 0,       // omitted member name, "l"
-   tk_long,    // member typecode
-   
-   // the 4th union branch arm
-   e_3rd,      // member label value
-   1, 0,       // omitted member name, "cm"
-   
-   // the 4th union member typecode
-   tk_struct,  // tk_struct
-   60,         // encap length
-   
-   1,          // byte order flag (TRICKY)
-   1, 0,       // omitted repository/type ID
-   1, 0,       // omitted struct name, "Many"
-   3,          // three struct members
-   
-   // First structure element
-   1, 0,       // omitted member name, "o"
-   tk_octet,   // member type, tk_octet
-   
-   // Second structure element
-   1, 0,       // omitted member name, "l"
-   tk_long,    // member type, tk_long
-   
-   // Third structure element
-   1, 0,       // omitted member name, "s"
-   tk_short,   // member type, tk_short
-   
-   // the 5th union branch arm
-   4,          // the 5th member label value
-   1, 0,       // omitted member name, "cm"
-   ~0,         // indirected typecode (~0)
-   -84         // offset to struct "Many" typecode
-};
-
-static CORBA_TypeCode _tc_Cubit_oneof (tk_union,
-                                       (sizeof _oc_Cubit_oneof), (unsigned char *) &_oc_Cubit_oneof,
-                                       CORBA_B_FALSE);
-CORBA_TypeCode_ptr TC_Cubit_oneof = &_tc_Cubit_oneof;
-
-static const TAO_Param_Data Cubit_cube_union_params [] = 
-{
-   { &_tc_Cubit_oneof, PARAM_RETURN, sizeof (Cubit_oneof) },
-   { &_tc_Cubit_oneof, PARAM_IN, 0 }
-};
-
-static const TAO_Call_Data Cubit_cube_union_calldata = 
-{
-   "cube_union", CORBA_B_TRUE,
-      2, &Cubit_cube_union_params [0],
-      0, 0
-};
-
-Cubit_oneof*
-Cubit::Cubit_cube_union (Cubit_oneof		&values,
-                  CORBA_Environment	&env)
-{
-   Cubit_oneof		*retval;
-
-   STUB_Object *istub;
-   if (this->QueryInterface(IID_STUB_Object, (void **)&istub) != NOERROR)
-   {
-      env.exception(new CORBA_DATA_CONVERSION (COMPLETED_NO));
-      return 0;
-   }
-
-   istub->do_call (env, &Cubit_cube_union_calldata,
-                  &retval, &values);
-   istub->Release ();
-   
-   return retval;
-}
-
-
-
-//
-// PLEASE EXIT
-//
-
-static const TAO_Call_Data Cubit_please_exit_calldata = 
-{
-   "please_exit", CORBA_B_FALSE,
-      0, 0,
-      0, 0
-};
-
-void
-Cubit::Cubit_please_exit (CORBA_Environment	&env)
-{
-   STUB_Object *istub;
-   if (this->QueryInterface(IID_STUB_Object, (void **)&istub) != NOERROR)
-   {
-      env.exception(new CORBA_DATA_CONVERSION (COMPLETED_NO));
-      return;
-   }
-
-   istub->do_call (env, &Cubit_please_exit_calldata);
-   istub->Release ();
-}
diff --git a/TAO/IIOP/tests/Cubit/TAO/cubitC.h b/TAO/IIOP/tests/Cubit/TAO/cubitC.h
deleted file mode 100644
index 8f9dfe53841..00000000000
--- a/TAO/IIOP/tests/Cubit/TAO/cubitC.h
+++ /dev/null
@@ -1,102 +0,0 @@
-// @(#)cubitC.h 05/14/97
-// Copyright 1994-1995 by Sun Microsystems Inc.
-// All Rights Reserved
-//
-// Modified version of Cubit Example written by Sun Microsystems Inc.
-// Modified by: Brian Mendel
-
-/**************************************************************************
-This file has been hand-crafted to work with the ORB API of the SUN's IIOP
-implementation 
-***************************************************************************/
-
-#ifndef	_CUBIT_HH
-#define	_CUBIT_HH
-
-#ifdef	_MSC_VER
-#pragma	pack (push, 1)			// VC++, known padding rules
-#endif	// VC++
-
-#include "corba/orb.h"
-#include "corba/stub.h"
-
-#include <iostream.h>
-
-extern CORBA_TypeCode_ptr	TC_Cubit_Many;
-extern CORBA_TypeCode_ptr	TC_Cubit_oneof;
-
-struct Cubit_Many 
-{
-   CORBA_Octet o;
-   CORBA_Long  l;
-   CORBA_Short s;
-};
-
-enum Cubit_discrim
-  { e_0th = 0, e_1st = 1, e_2nd = 2,
-    e_3rd = 3, e_4th = 4, e_5th = 5 };
-
-struct Cubit_oneof 
-{
-   Cubit_discrim  _disc;
-   
-   union 
-   {    
-      CORBA_Octet o;
-      CORBA_Short s;
-      CORBA_Long  l;
-      Cubit_Many  cm;
-   };
-};
-
-class Cubit;
-typedef Cubit *Cubit_ptr;
-typedef Cubit_ptr Cubit_ref;
-
-class Cubit : public virtual CORBA_Object
-{
-public:
- 
-   static Cubit_ptr _duplicate(Cubit_ptr obj);
-   static Cubit_ptr _narrow(CORBA_Object_ptr obj);
-   static Cubit_ptr _nil();
-
-   virtual 
-   CORBA_Octet Cubit_cube_octet (CORBA_Octet       o,
-                                 CORBA_Environment &env);
-
-   virtual 
-   CORBA_Short Cubit_cube_short (CORBA_Short       s,
-                                 CORBA_Environment &env);
-  
-   virtual 
-   CORBA_Long Cubit_cube_long (CORBA_Long        l,
-                               CORBA_Environment &env);
-  
-   virtual 
-   Cubit_Many* Cubit_cube_struct (Cubit_Many        &values,
-                                  CORBA_Environment &env);
-  
-   virtual 
-   Cubit_oneof* Cubit_cube_union (Cubit_oneof       &values,
-                                  CORBA_Environment &env);
-  
-   virtual 
-   void Cubit_please_exit (CORBA_Environment &env);
-
-protected:
-   Cubit() { }
-   Cubit(STUB_Object *objref)
-      : CORBA_Object(objref) { }
-   virtual ~Cubit() { }
-
-   
-};
-
-extern const CORBA_Char *Cubit__id;		// type ID
-
-#ifdef	_MSC_VER
-#pragma	pack (pop)			// VC++, go back to other padding rules
-#endif	// VC++
-
-#endif	// _CUBIT_HH
diff --git a/TAO/IIOP/tests/Cubit/TAO/cubitS.cpp b/TAO/IIOP/tests/Cubit/TAO/cubitS.cpp
deleted file mode 100644
index b153b71db1b..00000000000
--- a/TAO/IIOP/tests/Cubit/TAO/cubitS.cpp
+++ /dev/null
@@ -1,232 +0,0 @@
-// @(#)cubitS.cpp	05/14/97
-// Copyright 1994-1995 by Sun Microsystems Inc.
-// All Rights Reserved
-//
-// TEST:	hand-written C-style "Cubit" stubs and "skeletons"
-//
-
-#include	"cubitS.h"
-#include	"cubitC.cpp"
-
-#include "connect.h"
-#include "params.h"
-
-#include "corba/debug.h"    // ... and debugging
-#include "corba/optable.h"  // TAO Dynamic Operation Table
-#include "method_db.i"
-#include "iiopobj.h"
-
-#if defined(CUBIT_USE_DYNAMIC_HASH)
-TAO_Dynamic_Hash_OpTable tao_cubit_optable(7);  // Dynamic Operation Table
-#else
-TAO_Linear_OpTable tao_cubit_optable(7);
-#endif
-
-_skel_Cubit::_skel_Cubit(const char* obj_name)
-{
-  const char* mn = "_skel_Cubit::_skel_Cubit()";
-  
-   //  Initialize Method Database
-   initialize_method_db (&tao_cubit_optable);
-
-   char *type_id = "IDL:Cubit:1.0";
-   // CORBA_String type_id = "IDL:Cubit:1.0";
-   IIOP_Object *data;
-
-   CORBA_BOA_ptr oa = TAO_OA_PARAMS::instance()->oa();
-   if (oa == 0)
-     {
-       // We just have to assume that oa will be good, or we have to
-       // throw an exception.  For now we "assume", but we'll
-       ACE_ERROR((LM_ERROR, "(%P|%t) %s Unable to locate a valid object adapter\n", mn));
-       return;
-     }
-   
-   this->optable_ = &tao_cubit_optable;
-   data = new IIOP_Object(type_id);
-
-   data->profile.iiop_version.major = IIOP::MY_MAJOR;
-   data->profile.iiop_version.minor = IIOP::MY_MINOR;
-   data->profile.host = ACE_OS::strdup(oa->get_addr().get_host_name());
-   data->profile.port = oa->get_addr().get_port_number();
-   data->profile.object_key.length =  ACE_OS::strlen(obj_name);
-   data->profile.object_key.maximum = data->profile.object_key.length;
-   data->profile.object_key.buffer = new CORBA_Octet [(size_t)data->profile.object_key.length+1];
-   
-   ACE_OS::memcpy (data->profile.object_key.buffer,
-                   obj_name,
-                   data->profile.object_key.length+1);
-
-   this->set_parent(data);
-   this->sub_ = this;
-
-   if (oa->bind(data->profile.object_key, this) == -1)
-     {
-       ACE_ERROR((LM_ERROR, "(%P|%t) %s Unable to bind object to key '%s': %p\n", mn, data->profile.object_key.buffer));
-       return;
-     }
-}
-
-void
-_skel_Cubit::_cube_octet_skel(CORBA_ServerRequest &req,
-                              CORBA_Object_ptr    obj,
-                              CORBA_Environment   &env)
-{
-   CORBA_NVList_ptr		nvlist;
-   CORBA_NamedValue_ptr	nv;
-   CORBA_Any			temp_value (_tc_CORBA_Octet);
-   
-   req.orb()->create_list (0, nvlist);
-   nv = nvlist->add_value (0, temp_value, CORBA_ARG_IN, env);
-   dexc (env, "cube_octet, add value");
-   
-   req.params (nvlist, env);
-   dexc (env, "cube_octet, get params");
-   
-   // Call Implementation
-   CORBA_Octet		*value = new CORBA_Octet;
-   Cubit *the_cubit = (Cubit*)obj->get_subclass();
-
-   *value = the_cubit->Cubit_cube_octet(*(CORBA_Octet *)nv->value()->value(), env);
-
-   CORBA_Any *any = new CORBA_Any (_tc_CORBA_Octet, value, CORBA_B_TRUE);
-   
-   req.result (any, env);
-   dexc (env, "cube_octet, result");
-}
-
-void
-_skel_Cubit::_cube_short_skel (CORBA_ServerRequest &req,
-                               CORBA_Object_ptr    obj,
-                               CORBA_Environment   &env)
-{
-   CORBA_NVList_ptr		nvlist;
-   CORBA_NamedValue_ptr	nv;
-   CORBA_Any			temp_value (_tc_CORBA_Short);
-   
-   req.orb()->create_list (0, nvlist);
-   nv = nvlist->add_value (0, temp_value, CORBA_ARG_IN, env);
-   dexc (env, "cube_short, add_value");
-   
-   req.params (nvlist, env);
-   dexc (env, "cube_short, get params");
-   
-   // Call Implementation
-   CORBA_Short *value = new CORBA_Short;
-   Cubit *the_cubit = (Cubit*)obj->get_subclass();
-   *value = the_cubit->Cubit_cube_short(*(CORBA_Short *)nv->value ()->value (), env);
-   
-   CORBA_Any *any = new CORBA_Any (_tc_CORBA_Short, value, CORBA_B_TRUE);
-   
-   req.result (any, env);
-   dexc (env, "cube_short, result");
-}
-
-void
-_skel_Cubit::_cube_long_skel (CORBA_ServerRequest &req,
-                              CORBA_Object_ptr    obj,
-                              CORBA_Environment   &env)
-{
-   CORBA_NVList_ptr		nvlist;
-   CORBA_NamedValue_ptr	nv;
-   CORBA_Any			temp_value (_tc_CORBA_Long);
-   
-   req.orb()->create_list (0, nvlist);
-   nv = nvlist->add_value (0, temp_value, CORBA_ARG_IN, env);
-   dexc (env, "cube_long, add_value");
-   
-   req.params (nvlist, env);
-   dexc (env, "cube_long, get params");
-   
-   // Call Implementation
-   CORBA_Long		*value = new CORBA_Long;
-   Cubit *the_cubit = (Cubit*)obj->get_subclass();
-   *value = the_cubit->Cubit_cube_long(*(CORBA_Long *)nv->value ()->value (), env);
-   
-   CORBA_Any  		*any =
-      new CORBA_Any (_tc_CORBA_Long, value, CORBA_B_TRUE);
-   
-   req.result (any, env);
-   dexc (env, "cube_long, result");
-}
-
-void
-_skel_Cubit::_cube_struct_skel (CORBA_ServerRequest &req,
-                                CORBA_Object_ptr    obj,
-                                CORBA_Environment   &env)
-{
-   CORBA_NVList_ptr		nvlist;
-   CORBA_NamedValue_ptr	nv;
-   CORBA_Any			temp_value (TC_Cubit_Many);
-   
-   req.orb()->create_list (0, nvlist);
-   nv = nvlist->add_value (0, temp_value, CORBA_ARG_IN, env);
-   dexc (env, "cube_struct, add_value");
-   
-   req.params (nvlist, env);
-   dexc (env, "cube_struct, get params");
-   
-   // Call Implementation
-   Cubit_Many  *value;
-   Cubit *the_cubit = (Cubit*)obj->get_subclass();
-   value = the_cubit->Cubit_cube_struct(*(Cubit_Many*)nv->value()->value(), env);
-   
-   Cubit_Many  *retval = new Cubit_Many;
-   retval->o = (CORBA_Octet)value->o;
-   retval->s = (CORBA_Short)value->s;
-   retval->l = value->l;
-   
-   // dmsg2 ("cube struct.o, %d -> %d", value->o, retval->o);
-   // dmsg2 ("cube struct.s, %d -> %d", value->s, retval->s);
-   // dmsg2 ("cube struct.l, %d -> %d", value->l, retval->l);
-   
-   CORBA_Any *any = new CORBA_Any (TC_Cubit_Many, retval, CORBA_B_TRUE);
-   
-   req.result (any, env);
-   dexc (env, "cube_struct, result");
-}
-
-void
-_skel_Cubit::_cube_union_skel (CORBA_ServerRequest	&req,
-                               CORBA_Object_ptr    obj,
-                               CORBA_Environment   &env)
-{
-   CORBA_NVList_ptr		nvlist;
-   CORBA_NamedValue_ptr	nv;
-   CORBA_Any			temp_value (TC_Cubit_oneof);
-   
-   req.orb()->create_list (0, nvlist);
-   nv = nvlist->add_value (0, temp_value, CORBA_ARG_IN, env);
-   dexc (env, "cube_union_3rd, add_value");
-   
-   req.params (nvlist, env);
-   dexc (env, "cube_union_3rd, get params");
-   
-   // Call Implementation
-   Cubit_oneof    *v;
-   Cubit *the_cubit = (Cubit*)obj->get_subclass();
-   v = the_cubit->Cubit_cube_union(*(Cubit_oneof *)nv->value ()->value (), env);
-
-   Cubit_oneof    *r = new Cubit_oneof;
-   r->_disc = v->_disc;
-   r->o =    (CORBA_Octet) (v->o);
-   r->s =    (CORBA_Short) (v->s);
-   r->l =     v->l;
-   r->cm.o = (CORBA_Octet) (v->cm.o);
-   r->cm.s = (CORBA_Short) (v->cm.s);
-   r->cm.l =  v->cm.l;
-   
-   CORBA_Any *any = new CORBA_Any (TC_Cubit_oneof, r, CORBA_B_TRUE);
-   
-   req.result (any, env);
-   dexc (env, "cube_struct, result");
-}
-
-void
-_skel_Cubit::_please_exit_skel (CORBA_ServerRequest &req,
-                                CORBA_Object_ptr    obj,
-                                CORBA_Environment   &env)
-{
-   Cubit *the_cubit = (Cubit*)obj->get_subclass();
-   the_cubit->Cubit_please_exit(env);
-}
diff --git a/TAO/IIOP/tests/Cubit/TAO/cubitS.h b/TAO/IIOP/tests/Cubit/TAO/cubitS.h
deleted file mode 100644
index 84c07b741b0..00000000000
--- a/TAO/IIOP/tests/Cubit/TAO/cubitS.h
+++ /dev/null
@@ -1,82 +0,0 @@
-// @(#)cubitS.h 05/14/97
-// Copyright 1994-1995 by Sun Microsystems Inc.
-// All Rights Reserved
-//
-// Modified version of Cubit Example written by Sun Microsystems Inc.
-// Modified by: Brian Mendel
-
-/**************************************************************************
-This file has been hand-crafted to work with the ORB API of the SUN's IIOP
-implementation 
-***************************************************************************/
-
-#ifndef	_SKEL_CUBIT_HH
-#define	_SKEL_CUBIT_HH
-
-#include "cubitC.h"
-
-class _skel_Cubit;
-typedef _skel_Cubit *_skel_Cubit_ptr;
-typedef _skel_Cubit_ptr _skel_Cubit_ref;
-
-class _skel_Cubit : public Cubit
-{
-public:
-   virtual
-   CORBA_Octet Cubit_cube_octet (CORBA_Octet       o,
-                                 CORBA_Environment &env) = 0;
-   static 
-   void _cube_octet_skel(CORBA_ServerRequest &req,
-                         CORBA_Object_ptr    obj,
-                         CORBA_Environment   &env);
-
-   virtual
-   CORBA_Short Cubit_cube_short (CORBA_Short       s,
-                                 CORBA_Environment &env) = 0;
-  
-   static
-   void _cube_short_skel (CORBA_ServerRequest &req,
-                          CORBA_Object_ptr    obj,
-                          CORBA_Environment   &env);
-
-   virtual
-   CORBA_Long Cubit_cube_long (CORBA_Long        l,
-                               CORBA_Environment &env) = 0;
-  
-   static 
-   void _cube_long_skel (CORBA_ServerRequest &req,
-                         CORBA_Object_ptr    obj,
-                         CORBA_Environment   &env);
-
-   virtual
-   Cubit_Many* Cubit_cube_struct (Cubit_Many        &values,
-                                  CORBA_Environment &env) = 0;
-  
-   static 
-   void _cube_struct_skel (CORBA_ServerRequest &req,
-                           CORBA_Object_ptr    obj,
-                           CORBA_Environment   &env);
-
-   virtual 
-   Cubit_oneof* Cubit_cube_union (Cubit_oneof       &values,
-                                  CORBA_Environment &env) = 0;
-  
-   static 
-   void _cube_union_skel (CORBA_ServerRequest &req,
-                          CORBA_Object_ptr    obj,
-                          CORBA_Environment   &env);
-
-   virtual 
-   void Cubit_please_exit (CORBA_Environment &env) = 0;
-
-   static 
-   void _please_exit_skel (CORBA_ServerRequest  &req,
-                           CORBA_Object_ptr     obj,
-                           CORBA_Environment    &env);
-protected:
-   _skel_Cubit(const char* obj_name = 0);
-   virtual ~_skel_Cubit() { }
-
-};
-
-#endif	// _SKEL_CUBIT_HH
diff --git a/TAO/IIOP/tests/Cubit/TAO/cubit_i.cpp b/TAO/IIOP/tests/Cubit/TAO/cubit_i.cpp
deleted file mode 100644
index ae22b7cd12c..00000000000
--- a/TAO/IIOP/tests/Cubit/TAO/cubit_i.cpp
+++ /dev/null
@@ -1,91 +0,0 @@
-// @(#)cubit_i.cpp 05/14/97
-// Copyright 1994-1995 by Sun Microsystems Inc.
-// All Rights Reserved
-//
-// TEST:	hand-written Cubit Implementation
-//
-// Modified version of Cubit Example written by Sun Microsystems Inc.
-// Modified by: Brian Mendel
-
-#include	"cubit_i.h"
-
-#include	<corba/boa.h>    // ... and skeletons
-#include	<corba/debug.h>  // ... and debugging
-
-#include "connect.h"
-#include "params.h"
-
-Cubit_i::Cubit_i(const char* obj_name)
-: _skel_Cubit(obj_name)
-{
-}
-
-Cubit_i::~Cubit_i()
-{
-}
-
-CORBA_Octet
-Cubit_i::Cubit_cube_octet (CORBA_Octet       o,
-                           CORBA_Environment &env)
-{
-
-   return (CORBA_Octet) (o * o * o);
-}
-
-CORBA_Short
-Cubit_i::Cubit_cube_short (CORBA_Short       s, 
-                           CORBA_Environment &env)
-{
-   return (CORBA_Short) (s * s * s);
-}
-
-
-CORBA_Long
-Cubit_i::Cubit_cube_long (CORBA_Long        l,
-                          CORBA_Environment &env)
-{
-   return (CORBA_Long) (l * l * l);
-}
-
-Cubit_Many*
-Cubit_i::Cubit_cube_struct (Cubit_Many        &values,
-                            CORBA_Environment &env)
-{
-   values.o = values.o * values.o * values.o;
-   values.s = values.s * values.s * values.s;
-   values.l = values.l * values.l * values.l;
-   
-   return &values;
-}
-
-Cubit_oneof*
-Cubit_i::Cubit_cube_union (Cubit_oneof       &values,
-                           CORBA_Environment &env)
-{
-   switch (values._disc) {
-   case e_0th:
-      values.o = (CORBA_Octet) (values.o * values.o * values.o);
-      break;
-   case e_1st:
-      values.s = (CORBA_Short) (values.s * values.s * values.s);
-      break;
-   case e_2nd:
-      values.l = values.l * values.l * values.l;
-      break;
-   case e_3rd:
-   default:
-      values.cm.o = (CORBA_Octet) (values.cm.o * values.cm.o * values.cm.o);
-      values.cm.s = (CORBA_Short) (values.cm.s * values.cm.s * values.cm.s);
-      values.cm.l = values.cm.l * values.cm.l * values.cm.l;
-   }
-   return &values;
-}
-
-void Cubit_i::Cubit_please_exit (CORBA_Environment &env)
-{
-   TAO_OA_Parameters* params = TAO_OA_PARAMS::instance();
-   
-   dmsg ("I've been asked to shut down...");
-   params->oa()->please_shutdown(env);
-   dexc (env, "please_exit, please_shutdown");
-}
diff --git a/TAO/IIOP/tests/Cubit/TAO/cubit_i.h b/TAO/IIOP/tests/Cubit/TAO/cubit_i.h
deleted file mode 100644
index 6f4bee0d486..00000000000
--- a/TAO/IIOP/tests/Cubit/TAO/cubit_i.h
+++ /dev/null
@@ -1,54 +0,0 @@
-// @(#)cubit_i.cpp 05/14/97
-// Copyright 1994-1995 by Sun Microsystems Inc.
-// All Rights Reserved
-//
-// TEST:	hand-written Cubit Implementation
-//
-// Modified version of Cubit Example written by Sun Microsystems Inc.
-// Modified by: Brian Mendel
-
-/**************************************************************************
-This file has been hand-crafted to work with the ORB API of the SUN's IIOP
-implementation 
-***************************************************************************/
-
-#ifndef	_CUBIT_I_HH
-#define	_CUBIT_I_HH
-
-#include "cubitS.h"
-
-class Cubit_i;
-typedef Cubit_i *Cubit_i_ptr;
-typedef Cubit_i_ptr Cubit_i_ref;
-
-class Cubit_i : public _skel_Cubit
-{
-public:
-   Cubit_i(const char* obj_name = 0);
-   ~Cubit_i();
-   
-   virtual
-   CORBA_Octet Cubit_cube_octet (CORBA_Octet       o,
-                                 CORBA_Environment &env);
-
-   virtual
-   CORBA_Short Cubit_cube_short (CORBA_Short       s,
-                                 CORBA_Environment &env);
-  
-   virtual
-   CORBA_Long Cubit_cube_long (CORBA_Long        l,
-                               CORBA_Environment &env);
-  
-   virtual
-   Cubit_Many* Cubit_cube_struct (Cubit_Many        &values,
-                                  CORBA_Environment &env);
-  
-   virtual
-   Cubit_oneof* Cubit_cube_union (Cubit_oneof       &values,
-                                  CORBA_Environment &env);
-  
-   virtual
-   void Cubit_please_exit (CORBA_Environment &env);
-};
-
-#endif	// _CUBIT_I_HH
diff --git a/TAO/IIOP/tests/Cubit/TAO/method_db.i b/TAO/IIOP/tests/Cubit/TAO/method_db.i
deleted file mode 100644
index 6b77cdf040a..00000000000
--- a/TAO/IIOP/tests/Cubit/TAO/method_db.i
+++ /dev/null
@@ -1,67 +0,0 @@
-// @(#)method_db.i 05/14/97
-
-// This file provides a way of initializing the method database
-// Written by: Brian Mendel
-
-#include	"cubitS.h"
-
-static void
-is_a_skel (CORBA_ServerRequest &req,
-           CORBA_Object_ptr    obj,
-           CORBA_Environment   &env)
-{
-    CORBA_NVList_ptr		nvlist;
-    CORBA_NamedValue_ptr	nv;
-    CORBA_Any			temp_value (_tc_CORBA_String);
-
-    req.orb()->create_list (0, nvlist);
-    nv = nvlist->add_value (0, temp_value, CORBA_ARG_IN, env);
-
-    req.params (nvlist, env);
-    if (env.exception () != 0) 
-    {
-      dexc (env, "is_a_skel, get params");
-	   return;
-    }
-
-    CORBA_Boolean *retval;
-    CORBA_String value = *(CORBA_String *) nv->value()->value();
-
-    if (ACE_OS::strcmp ((char*)value, "IDL:Cubit:1.0") == 0
-    || ACE_OS::strcmp ((char *)value, _tc_CORBA_Object->id (env)) == 0)
-	   retval = new CORBA_Boolean (CORBA_B_TRUE);
-    else
-	   retval = new CORBA_Boolean (CORBA_B_FALSE);
-
-    CORBA_Any *any = new CORBA_Any (_tc_CORBA_Boolean, retval, CORBA_B_TRUE);
-
-    req.result (any, env);
-    dexc (env, "_is_a, result");
-}
-
-
-struct method_db
-{
-   CORBA_String opname;
-   TAO_Skeleton skel_ptr;
-};
-
-static const method_db cubit_operations[] = {
-   { "_is_a", &is_a_skel },
-   { "cube_octet", &_skel_Cubit::_cube_octet_skel },
-   { "cube_short", &_skel_Cubit::_cube_short_skel },
-   { "cube_long", &_skel_Cubit::_cube_long_skel },
-   { "cube_struct", &_skel_Cubit::_cube_struct_skel },
-   { "cube_union", &_skel_Cubit::_cube_union_skel },
-   { "please_exit", &_skel_Cubit::_please_exit_skel },
-   { 0, 0 }
-};
-   
-
-void initialize_method_db (TAO_Operation_Table *the_optable)
-{
-   for (int ndx = 0; ndx < 7; ndx++)
-      the_optable->bind(cubit_operations[ndx].opname, 
-                        cubit_operations[ndx].skel_ptr);
-   
-}
diff --git a/TAO/IIOP/tests/Cubit/TAO/svr.cpp b/TAO/IIOP/tests/Cubit/TAO/svr.cpp
deleted file mode 100644
index 53fac60bf6d..00000000000
--- a/TAO/IIOP/tests/Cubit/TAO/svr.cpp
+++ /dev/null
@@ -1,212 +0,0 @@
-// @(#)svr.cpp	05/14/97
-// Copyright 1994-1995 by Sun Microsystems Inc.
-// All Rights Reserved
-//
-// TEST:	simple IIOP server for "cubit.idl" interface.
-//
-// Starts up, builds an objref, prints its string in debug mode, 
-// listens for messages, responds to them.
-//
-// Modified version of Cubit Example written by Sun Microsystems Inc.
-// Modified by: Brian Mendel
-
-#include "ace/Get_Opt.h"
-#include "ace/Log_Msg.h"
-
-#include "corba/orb.h"
-#include "corba/debug.h"
-#include "connect.h"
-
-#include "cubit_i.h"
-
-extern void
-print_exception (const CORBA_Exception *, const char *, FILE *f=stdout);
-
-// Global Variables
-CORBA_String key = (CORBA_String)"key0";
-int num_of_objs = 1;
-
-// = TITLE
-//     Parses the command line arguments and returns an error status
-//
-// = DESCRIPTION
-//     This method parses the command line arguments
-int parse_args(int argc, char *argv[])
-{
-   ACE_Get_Opt opts (argc, argv, "dk:n:");
-   int			c;
-   
-   while ((c = opts ()) != -1)
-      switch (c) {
- 
-      case 'd':  // debug flag
-         TAO_debug_level++;
-         continue;
-   
-      case 'k':			// key (str)
-         key = (CORBA_String) opts.optarg;
-         continue;
-   
-      case 'n':			// idle seconds b4 exit
-         num_of_objs = ACE_OS::atoi(opts.optarg);
-         continue;
-
-      case '?':
-      default:
-         ACE_OS::fprintf (stderr, "usage:  %s"
-            " [-d]"
-            " [-k {object_key}]"
-            "\n", argv [0]
-            );
-         return 1;
-      }
-   
-   return 0;  // Indicates successful parsing of command line
-}
-
-
-//
-// Standard command line parsing utilities used.
-//
-int
-main (int    argc, char   *argv[])
-{
-  CORBA_Environment	env;
-  CORBA_Object_ptr obj = 0;
-  CORBA_ORB_ptr	orb_ptr;
-  CORBA_BOA_ptr   oa_ptr;
-  char		*orb_name = "internet";
-  int			idle = -1;
-
-  orb_ptr = CORBA_ORB_init (argc, argv, orb_name, env);
-  if (env.exception () != 0) {
-    print_exception (env.exception (), "ORB init");
-    return 1;
-  }
-
-  // Initialize the Basic Object Adapter
-  oa_ptr = orb_ptr->BOA_init(argc, argv, "ROA");
-  if (oa_ptr == 0)
-    ACE_ERROR_RETURN((LM_ERROR, "(%P|%t) Unable to initialize the BOA.\n"), 1);
-  
-
-  //
-  // Parse remaining command line and verify parameters.
-  //
-  parse_args(argc, argv);
-  
-  // Create implementation object with user specified key
-  Cubit_i_ptr  *my_cubit = new Cubit_i_ptr[num_of_objs];
-  for (int ndx = 0; ndx < num_of_objs; ndx++)
-  {
-     CORBA_String obj_str = CORBA_string_alloc(ACE_OS::strlen ((char *)key)+2);
-     sprintf(obj_str, "%s%d", (char*)key, ndx);
-     my_cubit[ndx] = new Cubit_i(obj_str);
-     if (my_cubit[ndx] == 0)
-        ACE_ERROR_RETURN((LM_ERROR, "(%P|%t) Unable to create implementation object&d\n", ndx), 2);
-
-     if (TAO_debug_level >= 1)
-     {
-         // Why are we getting the BOA_ptr from here when we've already
-         // got it above?
-         CORBA_OctetSeq	obj_key;
-         obj_key.buffer = (CORBA_Octet *) obj_str;
-         obj_key.length = obj_key.maximum = ACE_OS::strlen (obj_str);
-     
-         if (oa_ptr->find(obj_key, obj) == -1)
-           ACE_ERROR_RETURN((LM_ERROR, "(%P|%t) Unable to locate object with key '%s', %p\n", key), 3);
-     
-         //
-         // Stringify the objref we'll be implementing, and
-         // print it to stdout.  Someone will take that string
-         // and give it to some client.  Then release the object.
-         //
-         CORBA_String	str;
-         
-         str = orb_ptr->object_to_string (obj, env);
-         if (env.exception () != 0) {
-            print_exception (env.exception (), "object2string");
-            return 1;
-         }
-         ACE_OS::puts ((char *)str);
-         ACE_OS::fflush (stdout);
-         dmsg1 ("Object Created at: '%ul'", obj);
-         dmsg1 ("listening as object '%s'", str);
-         
-     }
-     CORBA_string_free(obj_str);  
-  }
-//  Cubit_i_ptr  my_cubit = new Cubit_i(key);
-//  if (my_cubit1 == 0)
-//    ACE_ERROR_RETURN((LM_ERROR, "(%P|%t) Unable to create implementation object\n"), 2);
-
-/*  if (TAO_debug_level >= 1)
-    {
-      // Why are we getting the BOA_ptr from here when we've already
-      // got it above?
-      CORBA_OctetSeq	obj_key;
-      obj_key.buffer = (CORBA_Octet *) key;
-      obj_key.length = obj_key.maximum = ACE_OS::strlen ((char *)key);
-     
-      if (oa_ptr->find(obj_key, obj) == -1)
-        ACE_ERROR_RETURN((LM_ERROR, "(%P|%t) Unable to locate object with key '%s', %p\n", key), 3);
-     
-      //
-      // Stringify the objref we'll be implementing, and
-      // print it to stdout.  Someone will take that string
-      // and give it to some client.  Then release the object.
-      //
-      CORBA_String	str;
-     
-      str = orb_ptr->object_to_string (obj, env);
-      if (env.exception () != 0) {
-        print_exception (env.exception (), "object2string");
-        return 1;
-      }
-      ACE_OS::puts ((char *)str);
-      ACE_OS::fflush (stdout);
-      dmsg1 ("listening as object '%s'", str);
-
-      obj_key.buffer = (CORBA_Octet *)"key1";
-      obj_key.length = obj_key.maximum = 4;
-      if (oa_ptr->find(obj_key, obj) == -1)
-        ACE_ERROR_RETURN((LM_ERROR, "(%P|%t) Unable to locate object with key '%s', %p\n", key), 3);
-
-      str = orb_ptr->object_to_string (obj, env);
-      if (env.exception () != 0) {
-        print_exception (env.exception (), "object2string");
-        return 1;
-      }
-      ACE_OS::puts ((char *)str);
-      ACE_OS::fflush (stdout);
-      dmsg1 ("listening as object '%s'", str);
-    }
-*/
-  // Handle requests for this object until we're killed, or one of
-  // the methods asks us to exit.
-  //
-  int terminationStatus = 0;
-
-
-#if !defined(USE_HOMEBREW_EVENT_LOOP)
-  ACE_Reactor::run_event_loop();
-#else
-  while (1)
-    {
-      int result = params->reactor()->handle_events ();
-
-      if (result == -1)
-	{
-	  terminationStatus = -1;
-	  break;
-	}
-    }
-#endif
-
-  //
-  // Shut down the OA -- recycles all underlying resources (e.g. file
-  // descriptors, etc).
-  //
-  oa_ptr->clean_shutdown (env);
-  return 0;
-}
diff --git a/TAO/IIOP/tests/Cubit/TAO/test.mak b/TAO/IIOP/tests/Cubit/TAO/test.mak
deleted file mode 100644
index 58b77c28283..00000000000
--- a/TAO/IIOP/tests/Cubit/TAO/test.mak
+++ /dev/null
@@ -1,463 +0,0 @@
-# Microsoft Developer Studio Generated NMAKE File, Format Version 4.20

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Console Application" 0x0103

-

-!IF "$(CFG)" == ""

-CFG=server - Win32 Debug

-!MESSAGE No configuration specified.  Defaulting to server - Win32 Debug.

-!ENDIF 

-

-!IF "$(CFG)" != "client - Win32 Release" && "$(CFG)" != "client - Win32 Debug"\

- && "$(CFG)" != "server - Win32 Release" && "$(CFG)" != "server - Win32 Debug"

-!MESSAGE Invalid configuration "$(CFG)" specified.

-!MESSAGE You can specify a configuration when running NMAKE on this makefile

-!MESSAGE by defining the macro CFG on the command line.  For example:

-!MESSAGE 

-!MESSAGE NMAKE /f "test.mak" CFG="server - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "client - Win32 Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "client - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE "server - Win32 Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "server - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE 

-!ERROR An invalid configuration is specified.

-!ENDIF 

-

-!IF "$(OS)" == "Windows_NT"

-NULL=

-!ELSE 

-NULL=nul

-!ENDIF 

-################################################################################

-# Begin Project

-# PROP Target_Last_Scanned "server - Win32 Debug"

-RSC=rc.exe

-CPP=cl.exe

-

-!IF  "$(CFG)" == "client - Win32 Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "client\Release"

-# PROP BASE Intermediate_Dir "client\Release"

-# PROP BASE Target_Dir "client"

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir ""

-# PROP Intermediate_Dir "Release"

-# PROP Target_Dir "client"

-OUTDIR=.

-INTDIR=.\Release

-

-ALL : "$(OUTDIR)\client.exe"

-

-CLEAN : 

-	-@erase "$(INTDIR)\clnt.obj"

-	-@erase "$(INTDIR)\cubitC.obj"

-	-@erase "$(OUTDIR)\client.exe"

-

-"$(INTDIR)" :

-    if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"

-

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\proto\include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "..\proto\include" /D "WIN32" /D "NDEBUG"\

- /D "_CONSOLE" /Fp"$(INTDIR)/client.pch" /YX /Fo"$(INTDIR)/" /c 

-CPP_OBJS=.\Release/

-CPP_SBRS=.\.

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-BSC32_FLAGS=/nologo /o"$(OUTDIR)/client.bsc" 

-BSC32_SBRS= \

-	

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 ace.lib ..\lib\TAO.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-LINK32_FLAGS=ace.lib ..\lib\TAO.lib kernel32.lib user32.lib gdi32.lib\

- winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib\

- uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /incremental:no\

- /pdb:"$(OUTDIR)/client.pdb" /machine:I386 /out:"$(OUTDIR)/client.exe" 

-LINK32_OBJS= \

-	"$(INTDIR)\clnt.obj" \

-	"$(INTDIR)\cubitC.obj"

-

-"$(OUTDIR)\client.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)

-    $(LINK32) @<<

-  $(LINK32_FLAGS) $(LINK32_OBJS)

-<<

-

-!ELSEIF  "$(CFG)" == "client - Win32 Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "client\Debug"

-# PROP BASE Intermediate_Dir "client\Debug"

-# PROP BASE Target_Dir "client"

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir ""

-# PROP Intermediate_Dir "Debug"

-# PROP Target_Dir "client"

-OUTDIR=.

-INTDIR=.\Debug

-

-ALL : "$(OUTDIR)\client.exe"

-

-CLEAN : 

-	-@erase "$(INTDIR)\clnt.obj"

-	-@erase "$(INTDIR)\cubitC.obj"

-	-@erase "$(INTDIR)\vc40.idb"

-	-@erase "$(INTDIR)\vc40.pdb"

-	-@erase "$(OUTDIR)\client.exe"

-	-@erase "$(OUTDIR)\client.ilk"

-	-@erase "$(OUTDIR)\client.pdb"

-

-"$(INTDIR)" :

-    if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"

-

-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\proto\include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c

-CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\proto\include" /D "WIN32" /D\

- "_DEBUG" /D "_CONSOLE" /Fp"$(INTDIR)/client.pch" /YX /Fo"$(INTDIR)/"\

- /Fd"$(INTDIR)/" /c 

-CPP_OBJS=.\Debug/

-CPP_SBRS=.\.

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-BSC32_FLAGS=/nologo /o"$(OUTDIR)/client.bsc" 

-BSC32_SBRS= \

-	

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386

-# ADD LINK32 aced.lib ..\lib\TAO.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386

-LINK32_FLAGS=aced.lib ..\lib\TAO.lib kernel32.lib user32.lib gdi32.lib\

- winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib\

- uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /incremental:yes\

- /pdb:"$(OUTDIR)/client.pdb" /debug /machine:I386 /out:"$(OUTDIR)/client.exe" 

-LINK32_OBJS= \

-	"$(INTDIR)\clnt.obj" \

-	"$(INTDIR)\cubitC.obj"

-

-"$(OUTDIR)\client.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)

-    $(LINK32) @<<

-  $(LINK32_FLAGS) $(LINK32_OBJS)

-<<

-

-!ELSEIF  "$(CFG)" == "server - Win32 Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "server\Release"

-# PROP BASE Intermediate_Dir "server\Release"

-# PROP BASE Target_Dir "server"

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir ""

-# PROP Intermediate_Dir "Release"

-# PROP Target_Dir "server"

-OUTDIR=.

-INTDIR=.\Release

-

-ALL : "$(OUTDIR)\server.exe"

-

-CLEAN : 

-	-@erase "$(INTDIR)\cubit_i.obj"

-	-@erase "$(INTDIR)\cubitS.obj"

-	-@erase "$(INTDIR)\svr.obj"

-	-@erase "$(OUTDIR)\server.exe"

-

-"$(INTDIR)" :

-    if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"

-

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\proto\include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "..\proto\include" /D "WIN32" /D "NDEBUG"\

- /D "_CONSOLE" /Fp"$(INTDIR)/server.pch" /YX /Fo"$(INTDIR)/" /c 

-CPP_OBJS=.\Release/

-CPP_SBRS=.\.

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-BSC32_FLAGS=/nologo /o"$(OUTDIR)/server.bsc" 

-BSC32_SBRS= \

-	

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 ace.lib ..\lib\TAO.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-LINK32_FLAGS=ace.lib ..\lib\TAO.lib kernel32.lib user32.lib gdi32.lib\

- winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib\

- uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /incremental:no\

- /pdb:"$(OUTDIR)/server.pdb" /machine:I386 /out:"$(OUTDIR)/server.exe" 

-LINK32_OBJS= \

-	"$(INTDIR)\cubit_i.obj" \

-	"$(INTDIR)\cubitS.obj" \

-	"$(INTDIR)\svr.obj"

-

-"$(OUTDIR)\server.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)

-    $(LINK32) @<<

-  $(LINK32_FLAGS) $(LINK32_OBJS)

-<<

-

-!ELSEIF  "$(CFG)" == "server - Win32 Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "server\Debug"

-# PROP BASE Intermediate_Dir "server\Debug"

-# PROP BASE Target_Dir "server"

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir ""

-# PROP Intermediate_Dir "Debug"

-# PROP Target_Dir "server"

-OUTDIR=.

-INTDIR=.\Debug

-

-ALL : "$(OUTDIR)\server.exe"

-

-CLEAN : 

-	-@erase "$(INTDIR)\cubit_i.obj"

-	-@erase "$(INTDIR)\cubitS.obj"

-	-@erase "$(INTDIR)\svr.obj"

-	-@erase "$(INTDIR)\vc40.idb"

-	-@erase "$(INTDIR)\vc40.pdb"

-	-@erase "$(OUTDIR)\server.exe"

-	-@erase "$(OUTDIR)\server.ilk"

-	-@erase "$(OUTDIR)\server.pdb"

-

-"$(INTDIR)" :

-    if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"

-

-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\proto\include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c

-CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\proto\include" /D "WIN32" /D\

- "_DEBUG" /D "_CONSOLE" /Fp"$(INTDIR)/server.pch" /YX /Fo"$(INTDIR)/"\

- /Fd"$(INTDIR)/" /c 

-CPP_OBJS=.\Debug/

-CPP_SBRS=.\.

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-BSC32_FLAGS=/nologo /o"$(OUTDIR)/server.bsc" 

-BSC32_SBRS= \

-	

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386

-# ADD LINK32 aced.lib ..\lib\TAO.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386

-LINK32_FLAGS=aced.lib ..\lib\TAO.lib kernel32.lib user32.lib gdi32.lib\

- winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib\

- uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /incremental:yes\

- /pdb:"$(OUTDIR)/server.pdb" /debug /machine:I386 /out:"$(OUTDIR)/server.exe" 

-LINK32_OBJS= \

-	"$(INTDIR)\cubit_i.obj" \

-	"$(INTDIR)\cubitS.obj" \

-	"$(INTDIR)\svr.obj"

-

-"$(OUTDIR)\server.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)

-    $(LINK32) @<<

-  $(LINK32_FLAGS) $(LINK32_OBJS)

-<<

-

-!ENDIF 

-

-.c{$(CPP_OBJS)}.obj:

-   $(CPP) $(CPP_PROJ) $<  

-

-.cpp{$(CPP_OBJS)}.obj:

-   $(CPP) $(CPP_PROJ) $<  

-

-.cxx{$(CPP_OBJS)}.obj:

-   $(CPP) $(CPP_PROJ) $<  

-

-.c{$(CPP_SBRS)}.sbr:

-   $(CPP) $(CPP_PROJ) $<  

-

-.cpp{$(CPP_SBRS)}.sbr:

-   $(CPP) $(CPP_PROJ) $<  

-

-.cxx{$(CPP_SBRS)}.sbr:

-   $(CPP) $(CPP_PROJ) $<  

-

-################################################################################

-# Begin Target

-

-# Name "client - Win32 Release"

-# Name "client - Win32 Debug"

-

-!IF  "$(CFG)" == "client - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "client - Win32 Debug"

-

-!ENDIF 

-

-################################################################################

-# Begin Source File

-

-SOURCE=.\clnt.cpp

-DEP_CPP_CLNT_=\

-	"..\..\..\..\..\ace\config-win32.h"\

-	".\cubitC.h"\

-	{$(INCLUDE)}"\ace\ACE.h"\

-	{$(INCLUDE)}"\ace\ACE.i"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.cpp"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.h"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.i"\

-	{$(INCLUDE)}"\ace\config-win32-common.h"\

-	{$(INCLUDE)}"\ace\config.h"\

-	{$(INCLUDE)}"\ace\Get_Opt.h"\

-	{$(INCLUDE)}"\ace\Get_Opt.i"\

-	{$(INCLUDE)}"\ace\Log_Msg.h"\

-	{$(INCLUDE)}"\ace\Log_Priority.h"\

-	{$(INCLUDE)}"\ace\Log_Record.h"\

-	{$(INCLUDE)}"\ace\Log_Record.i"\

-	{$(INCLUDE)}"\ace\Object_Manager.h"\

-	{$(INCLUDE)}"\ace\Object_Manager.i"\

-	{$(INCLUDE)}"\ace\OS.h"\

-	{$(INCLUDE)}"\ace\OS.i"\

-	{$(INCLUDE)}"\ace\SString.h"\

-	{$(INCLUDE)}"\ace\SString.i"\

-	{$(INCLUDE)}"\ace\stdcpp.h"\

-	{$(INCLUDE)}"\ace\Trace.h"\

-	{$(INCLUDE)}"\ace\ws2tcpip.h"\

-	

-NODEP_CPP_CLNT_=\

-	".\corba\orb.h"\

-	".\corba\stub.h"\

-	

-

-"$(INTDIR)\clnt.obj" : $(SOURCE) $(DEP_CPP_CLNT_) "$(INTDIR)"

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\cubitC.cpp

-DEP_CPP_CUBIT=\

-	".\cubitC.h"\

-	

-NODEP_CPP_CUBIT=\

-	".\corba\orb.h"\

-	".\corba\stub.h"\

-	

-

-"$(INTDIR)\cubitC.obj" : $(SOURCE) $(DEP_CPP_CUBIT) "$(INTDIR)"

-

-

-# End Source File

-# End Target

-################################################################################

-# Begin Target

-

-# Name "server - Win32 Release"

-# Name "server - Win32 Debug"

-

-!IF  "$(CFG)" == "server - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "server - Win32 Debug"

-

-!ENDIF 

-

-################################################################################

-# Begin Source File

-

-SOURCE=.\cubitS.cpp

-DEP_CPP_CUBITS=\

-	".\cubitC.cpp"\

-	".\cubitC.h"\

-	".\cubitS.h"\

-	".\method_db.i"\

-	

-NODEP_CPP_CUBITS=\

-	".\connect.h"\

-	".\corba\debug.h"\

-	".\corba\optable.h"\

-	".\corba\orb.h"\

-	".\corba\stub.h"\

-	".\iiopobj.h"\

-	".\params.h"\

-	

-

-"$(INTDIR)\cubitS.obj" : $(SOURCE) $(DEP_CPP_CUBITS) "$(INTDIR)"

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\cubit_i.cpp

-DEP_CPP_CUBIT_=\

-	".\cubit_i.h"\

-	".\cubitC.h"\

-	".\cubitS.h"\

-	

-NODEP_CPP_CUBIT_=\

-	".\connect.h"\

-	".\corba\orb.h"\

-	".\corba\stub.h"\

-	".\params.h"\

-	

-

-"$(INTDIR)\cubit_i.obj" : $(SOURCE) $(DEP_CPP_CUBIT_) "$(INTDIR)"

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\svr.cpp

-DEP_CPP_SVR_C=\

-	"..\..\..\..\..\ace\config-win32.h"\

-	".\cubit_i.h"\

-	".\cubitC.h"\

-	".\cubitS.h"\

-	{$(INCLUDE)}"\ace\ACE.h"\

-	{$(INCLUDE)}"\ace\ACE.i"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.cpp"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.h"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.i"\

-	{$(INCLUDE)}"\ace\config-win32-common.h"\

-	{$(INCLUDE)}"\ace\config.h"\

-	{$(INCLUDE)}"\ace\Get_Opt.h"\

-	{$(INCLUDE)}"\ace\Get_Opt.i"\

-	{$(INCLUDE)}"\ace\Log_Msg.h"\

-	{$(INCLUDE)}"\ace\Log_Priority.h"\

-	{$(INCLUDE)}"\ace\Log_Record.h"\

-	{$(INCLUDE)}"\ace\Log_Record.i"\

-	{$(INCLUDE)}"\ace\Object_Manager.h"\

-	{$(INCLUDE)}"\ace\Object_Manager.i"\

-	{$(INCLUDE)}"\ace\OS.h"\

-	{$(INCLUDE)}"\ace\OS.i"\

-	{$(INCLUDE)}"\ace\SString.h"\

-	{$(INCLUDE)}"\ace\SString.i"\

-	{$(INCLUDE)}"\ace\stdcpp.h"\

-	{$(INCLUDE)}"\ace\Trace.h"\

-	{$(INCLUDE)}"\ace\ws2tcpip.h"\

-	

-NODEP_CPP_SVR_C=\

-	".\connect.h"\

-	".\corba\debug.h"\

-	".\corba\orb.h"\

-	".\corba\stub.h"\

-	

-

-"$(INTDIR)\svr.obj" : $(SOURCE) $(DEP_CPP_SVR_C) "$(INTDIR)"

-

-

-# End Source File

-# End Target

-# End Project

-################################################################################

diff --git a/TAO/IIOP/tests/Cubit/TAO/test.mdp b/TAO/IIOP/tests/Cubit/TAO/test.mdp
deleted file mode 100644
index eccc5e94b69..00000000000
--- a/TAO/IIOP/tests/Cubit/TAO/test.mdp
+++ /dev/null
diff --git a/TAO/IIOP/tests/Cubit/TAO/test1.cpp b/TAO/IIOP/tests/Cubit/TAO/test1.cpp
deleted file mode 100644
index a27c29ee378..00000000000
--- a/TAO/IIOP/tests/Cubit/TAO/test1.cpp
+++ /dev/null
@@ -1,390 +0,0 @@
-// @(#)test1.cpp	1.4 95/09/28
-// Copyright 1995 by Sun Microsystems, Inc.
-// All Rights Reserved
-//
-// TEST		stubs for "test1"
-//
-
-#include <stdio.h>
-
-#include "test1.h"
-
-
-//
-// Define all the stubs ... it's a lot less error prone to do it with
-// macros than by hand!
-//
-// NOTE:  the "calldata" is exported for use by the skeletons.  At some
-// point skeletons will probably be fully abstracted; for now they aren't.
-//
-// Also, for some reason, name mangling is changed by the explicit
-// declaration as "extern" -- if it's not done, linking fails.
-//
-#define	DEFINE_TEST3(typename, truetype, truetypename) \
-    static const TAO_Param_Data test1_ ## typename ## _paramdata [4] = { \
-    { _tc_CORBA_ ## truetypename, PARAM_RETURN, 0 }, \
-    { _tc_CORBA_ ## truetypename, PARAM_IN, 0 }, \
-    { _tc_CORBA_ ## truetypename, PARAM_OUT, 0 }, \
-    { _tc_CORBA_ ## truetypename, PARAM_INOUT, 0 }, \
-    }; \
-    \
-    extern const TAO_Call_Data test1_ ## typename ## _calldata; \
-    \
-    const TAO_Call_Data test1_ ## typename ## _calldata = { \
-	"test_" #typename, CORBA_B_TRUE, \
-	4, &test1_ ## typename ## _paramdata [0], \
-	0, 0, \
-    }; \
-    \
-    CORBA_ ## truetype \
-    test1_test_ ## typename (test1_ptr target, \
-		CORBA_ ## truetype in_a1, \
-		CORBA_ ## truetype &out_a2, \
-		CORBA_ ## truetype &inout_a3, \
-		CORBA_Environment &env) { \
-	CORBA_ ## truetype _retval; \
-	STUB_Object	*_obj; \
-	if (target->QueryInterface (IID_STUB_Object, (void **)&_obj) \
-		!= NOERROR) \
-	    env.exception (new CORBA_INV_OBJREF (COMPLETED_NO)); \
-	else { \
-	    _obj->do_call (env, &test1_ ## typename ## _calldata, \
-		&_retval, &in_a1, &out_a2, &inout_a3); \
-	    _obj->Release (); \
-	} \
-	return _retval; \
-    }
-
-//  changed extern const calldata test1_ ## typename ## _calldata;
-//  to     const calldata test1_ ## typename ## _calldata; \
-
-//	changed CORBA_ ## truetype _retval = 0; to changed CORBA_ ## truetype _retval;
-
-#define	DEFINE_TEST(typename, truetype) \
-	DEFINE_TEST3(typename, truetype, truetype)
-
-
-//
-// Generate a system exception, passing an operation ID that's
-// not allowed by IIOP (much less this interface) and verifying
-// that the server returns some kind of system exception.
-//
-static const TAO_Call_Data illegal_calldata = {
-    "+_illegal", CORBA_B_TRUE,
-    0, 0,
-    0, 0
-};
-
-void
-test_illegal (test1_ptr target, CORBA_Environment &env)
-{
-    STUB_Object		*data;
-
-    if (target->QueryInterface (IID_STUB_Object, (void **)&data)
-	    != NOERROR)
-	env.exception (new CORBA_INV_OBJREF (COMPLETED_NO));
-    else {
-	data->do_call (env, &illegal_calldata
-	    );
-	data->Release ();
-    }
-}
-
-
-extern const TAO_Call_Data test1_void_calldata;
-const TAO_Call_Data test1_void_calldata = {
-    "test_void", CORBA_B_TRUE,
-    0, 0,
-    0, 0
-};
-
-void
-test1_test_void (test1_ptr target, CORBA_Environment &env)
-{
-    STUB_Object		*data;
-
-    if (target->QueryInterface (IID_STUB_Object, (void **)&data)
-	    != NOERROR)
-	env.exception (new CORBA_INV_OBJREF (COMPLETED_NO));
-    else {
-	data->do_call (env, &test1_void_calldata
-	    );
-	data->Release ();
-    }
-}
-
-DEFINE_TEST (short, Short);
-DEFINE_TEST (long, Long);
-DEFINE_TEST (ushort, UShort);
-DEFINE_TEST (ulong, ULong);
-
-#if	defined(MIPS)
-//
-// NOTE:  C/C++ compilers as a rule pass a "float" in the space that
-// a "double" takes up.  Conversions are evidently optional; portability
-// forces the following "explicit temporary" hack to work on at least
-// one MIPS platform, which converts the parameter to "double" and
-// hence changes the binary representation.  (Even if that is a compiler
-// bug, it's probably required by now for binary compatibility!)
-//
-// A "-k ansi" compiler flag may be needed to get correct behaviour;
-// passing the "in" parameters by reference apparently works too.  At
-// this time, none of these solutions is used by default.
-//
-// This stub-level hackery seems like it could be replaced inside of the
-// stub interpreter, which could just manually convert "float" parameters
-// (all of them) as special cases.  But of course, that would slow the
-// interpreter down on _every_ call, not just the ones that require it
-// (such as this one).  Tradeoffs!
-//
-static const TAO_Param_Data test1_float_paramdata [4] = {
-    { _tc_CORBA_Float , PARAM_RETURN , 0 },
-    { _tc_CORBA_Float , PARAM_IN , 0 },
-    { _tc_CORBA_Float , PARAM_OUT , 0 },
-    { _tc_CORBA_Float , PARAM_INOUT , 0 }
-};
-
-extern const TAO_Call_Data test1_float_calldata;
-
-const TAO_Call_Data test1_float_calldata = {
-    "test_float", CORBA_B_TRUE,
-    4 , &test1_float_paramdata [0],
-    0 , 0
-};
-
-CORBA_Float
-test1_test_float (
-    test1_ptr		target,
-    CORBA_Float	in_a1,
-    CORBA_Float	&out_a2,
-    CORBA_Float	&inout_a3,
-    CORBA_Environment	&env
-)
-{
-    CORBA_Float	_retval;
-
-    // These three temporaries required due to MIPS compiler bug
-    CORBA_Float	_in_a1 = in_a1;
-    CORBA_Float	_out_a2 = out_a2;
-    CORBA_Float	_inout_a3 = inout_a3;
-
-    target -> data -> do_call (env,
-	&test1_float_calldata,
-	&_retval,
-	&_in_a1,
-	&_out_a2,
-	&_inout_a3);
-    return _retval;
-}
-
-#else
-DEFINE_TEST (float, Float);
-#endif	// MIPS
-
-
-DEFINE_TEST (double, Double);
-DEFINE_TEST (boolean, Boolean);
-DEFINE_TEST (char, Char);
-DEFINE_TEST (octet, Octet);
-
-/*
-CORBA_Any *
-test1_test_any (test1_ptr target,
-	const CORBA_Any &in_a1,
-	CORBA_Any *&out_a2,
-	CORBA_Any &inout_a3,
-	CORBA_Environment &env)
-{
-    // XXX implement this stub! ... annoying that C++ mapping
-    // calls for so much special casing
-}
-*/
-
-
-DEFINE_TEST3 (TypeCode, TypeCode_ptr, TypeCode);
-DEFINE_TEST3 (Principal, Principal_ptr, Principal);
-DEFINE_TEST3 (Object, Object_ptr, Object);
-
-// NOTE:  C++ mapping has "in" strings as "const", which doesn't
-// show up in this macro ...
-DEFINE_TEST3 (string, Char *, String);
-
-DEFINE_TEST (longlong, LongLong);
-DEFINE_TEST (ulonglong, ULongLong);
-DEFINE_TEST (wchar, WChar);
-
-// NOTE:  C++ mapping has "in" strings as "const", which doesn't
-// show up in this macro ...
-DEFINE_TEST3 (wstring, WChar *, WString);
-
-#if !defined(NONNATIVE_LONGDOUBLE)
-DEFINE_TEST (longdouble, LongDouble);
-#endif
-
-#undef	DEFINE_TEST
-
-
-//
-// Utility macros used to construct octet codes that are aligned
-// on longword boundaries, and with a known byte order.  This
-// happens to use big endian encoding since it was convenient.
-// (Longword alignment is a happy accident of the specification
-// of OMG-IDL ... it could have been much worse!)
-//
-// It'd be much simpler to lay out such data in assembler!
-//
-
-#if	defined (WORDS_BIGENDIAN)
-#	define	MAKE_BIG_LONG(a,b,c,d) \
-	    ((((a) & 0xff) << 24) | (((b) & 0xff) << 16) \
-	     | (((c) & 0xff) <<  8) | ((d) & 0xff))
-#	define	BIG_ENDIAN_LONG(x)	(x)
-
-#else	// LITTLE_ENDIAN
-#	define	MAKE_BIG_LONG(a,b,c,d) \
-	    ((((d) & 0xff) << 24) | (((c) & 0xff) << 16) \
-	     | (((b) & 0xff) <<  8) | ((a) & 0xff))
-#	define BYTE_FROM(n,integer)    (((integer)>>(8*(n)))&0xff)
-#	define BIG_ENDIAN_LONG(integer) \
-	    MAKE_BIG_LONG (BYTE_FROM(3,integer), BYTE_FROM(2,integer),\
-		BYTE_FROM(1,integer), BYTE_FROM(0,integer))
-#endif
-
-
-
-//
-// "x1" exception typecode ... must be longword aligned
-//
-static CORBA_Long oc_x1 [] = {
-    0,					// big endian flag + padding
-    BIG_ENDIAN_LONG (29),		// length of ID string + NUL
-    MAKE_BIG_LONG ('I', 'D', 'L', ':'),	// bytes of ID string
-    MAKE_BIG_LONG ('E', 'n', 'g', '.'),
-    MAKE_BIG_LONG ('S', 'U', 'N', '.'),
-    MAKE_BIG_LONG ('C', 'O', 'M', '/'),
-    MAKE_BIG_LONG ('t', 'e', 's', 't'),
-    MAKE_BIG_LONG ('1', '/', 'x', '1'),
-    MAKE_BIG_LONG (':', '1', '.', '0'),
-    0,
-    BIG_ENDIAN_LONG (1),		// (empty) namelen + NUL
-    0,
-    BIG_ENDIAN_LONG (1),		// only one struct member
-    BIG_ENDIAN_LONG (1),		// (empty) member name + NUL
-    0,
-    BIG_ENDIAN_LONG (tk_long)
-};
-static CORBA_TypeCode tc_x1 (tk_except, sizeof oc_x1,
-	    (unsigned char *)&oc_x1, CORBA_B_FALSE);
-CORBA_TypeCode_ptr	_tc_test1_x1 = &tc_x1;
-
-
-
-//
-// "x2" exception typecode ... must be longword aligned
-//
-static CORBA_Long oc_x2 [] = {
-    0,					// big endian flag + padding
-    BIG_ENDIAN_LONG (29),		// length of ID string + NUL
-    MAKE_BIG_LONG ('I', 'D', 'L', ':'),	// bytes of ID string
-    MAKE_BIG_LONG ('E', 'n', 'g', '.'),
-    MAKE_BIG_LONG ('S', 'U', 'N', '.'),
-    MAKE_BIG_LONG ('C', 'O', 'M', '/'),
-    MAKE_BIG_LONG ('t', 'e', 's', 't'),
-    MAKE_BIG_LONG ('1', '/', 'x', '2'),
-    MAKE_BIG_LONG (':', '1', '.', '0'),
-    0,
-    BIG_ENDIAN_LONG (1),		// (empty) namelen + NUL
-    0,
-    BIG_ENDIAN_LONG (2),		// two struct members
-
-    BIG_ENDIAN_LONG (1),		// (empty) member name + NUL
-    0,
-    BIG_ENDIAN_LONG (tk_objref),
-    BIG_ENDIAN_LONG (29),		// type ID + NUL
-    MAKE_BIG_LONG ('I', 'D', 'L', ':'),	// bytes of ID string
-    MAKE_BIG_LONG ('o', 'm', 'g', '.'),
-    MAKE_BIG_LONG ('o', 'r', 'g', '/'),
-    MAKE_BIG_LONG ('C', 'O', 'R', 'B'),
-    MAKE_BIG_LONG ('A', '/', 'O', 'b'),
-    MAKE_BIG_LONG ('j', 'e', 'c', 't'),
-    MAKE_BIG_LONG (':', '1', '.', '0'),
-    0,
-
-    BIG_ENDIAN_LONG (1),		// (empty) member name + NUL
-    0,
-    BIG_ENDIAN_LONG (tk_long)
-};
-static CORBA_TypeCode tc_x2 (tk_except, sizeof oc_x2,
-	    (unsigned char *)&oc_x2, CORBA_B_FALSE);
-CORBA_TypeCode_ptr	_tc_test1_x2 = &tc_x2;
-
-
-//
-// parameter, exception, and call descriptions for "test_throw"
-//
-static const TAO_Param_Data test1_test_throw_paramdata [1] = {
-    { _tc_CORBA_Long, PARAM_IN, 0 }
-};
-
-static CORBA_TypeCode_ptr test1_test_throw_excepts [2] = {
-    &tc_x1, &tc_x2
-};
-
-extern const TAO_Call_Data test1_test_throw_calldata;
-
-const TAO_Call_Data test1_test_throw_calldata = {
-    "test_throw", CORBA_B_TRUE,
-    1, &test1_test_throw_paramdata [0],
-    2, &test1_test_throw_excepts [0]
-};
-
-//
-// "test_throw" stub
-//
-void
-test1_test_throw (
-    test1_ptr		target,
-    CORBA_Long	case_num,
-    CORBA_Environment	&env		// throw (x1, x2)
-)
-{
-    STUB_Object		*data;
-
-    if (target->QueryInterface (IID_STUB_Object, (void **)&data)
-	    != NOERROR)
-	env.exception (new CORBA_INV_OBJREF (COMPLETED_NO));
-    else {
-	data->do_call (env, &test1_test_throw_calldata,
-	    &case_num);
-	data->Release ();
-    }
-}
-
-//
-// PLEASE EXIT
-//
-
-static const TAO_Call_Data test1_please_exit_calldata = {
-    "please_exit", CORBA_B_FALSE,
-    0, 0,
-    0, 0
-};
-
-void
-test1_please_exit (
-    test1_ptr		target,
-    CORBA_Environment	&env
-)
-{
-    STUB_Object		*data;
-
-    if (target->QueryInterface (IID_STUB_Object, (void **)&data)
-	    != NOERROR)
-	env.exception (new CORBA_INV_OBJREF (COMPLETED_NO));
-    else {
-	data->do_call (env, &test1_please_exit_calldata
-	    );
-	data->Release ();
-    }
-}
-
diff --git a/TAO/IIOP/tests/Cubit/TAO/test1.h b/TAO/IIOP/tests/Cubit/TAO/test1.h
deleted file mode 100644
index 7d3bd0e08a5..00000000000
--- a/TAO/IIOP/tests/Cubit/TAO/test1.h
+++ /dev/null
@@ -1,124 +0,0 @@
-// @(#)test1.hh	1.2 95/09/12
-// Copyright 1995 by Sun Microsystems, Inc.
-// All Rights Reserved
-//
-// TEST		interface for "test1"
-//
-
-#ifndef	_TEST1_HH
-#define	_TEST1_HH
-
-#include <corba/orb.h>
-#include <corba/stub.h>
-
-
-#ifdef	_MSC_VER
-#pragma	pack (push, 1)			// VC++, known padding rules
-#endif	// VC++
-
-typedef CORBA_UShort		test1_ushort;
-typedef CORBA_ULong		test1_ulong;
-
-typedef CORBA_LongLong	test1_longlong;
-typedef CORBA_ULongLong 	test1_ulonglong;
-typedef CORBA_LongDouble	test1_longdouble;
-
-typedef CORBA_Object		test1;
-typedef test1			*test1_ptr;
-
-#define	DECL_TEST(typename, truetype) \
-    truetype \
-    test1_test_ ## typename ( \
-	test1_ptr		target, \
-	truetype		in_a1, \
-	truetype		&out_a2, \
-	truetype		&inout_a3, \
-	CORBA_Environment	&env \
-    )
-
-void test_illegal (test1_ptr target, CORBA_Environment &env);
-void test1_test_void (test1_ptr target, CORBA_Environment &env);
-
-DECL_TEST (short, CORBA_Short);
-DECL_TEST (long, CORBA_Long);
-DECL_TEST (ushort, CORBA_UShort);
-DECL_TEST (ulong, CORBA_ULong);
-DECL_TEST (float, CORBA_Float);
-DECL_TEST (double, CORBA_Double);
-DECL_TEST (boolean, CORBA_Boolean);
-DECL_TEST (char, CORBA_Char);
-DECL_TEST (octet, CORBA_Octet);
-
-CORBA_Any *
-test1_test_any (
-    test1_ptr		target,
-    const CORBA_Any	&in_a1,
-    CORBA_Any		*&out_a2,
-    CORBA_Any		&inout_a3,
-    CORBA_Environment	&env
-);
-
-DECL_TEST (TypeCode, CORBA_TypeCode_ptr);
-DECL_TEST (Principal, CORBA_Principal_ptr);
-DECL_TEST (Object, CORBA_Object_ptr);
-
-// NOTE:  CORBA C++ mapping says the "in" string is const
-DECL_TEST (string, CORBA_String);
-
-DECL_TEST (longlong, CORBA_LongLong);
-DECL_TEST (ulonglong, CORBA_ULongLong);
-DECL_TEST (wchar, CORBA_WChar);
-
-// NOTE:  CORBA C++ mapping says the "in" string is const
-DECL_TEST (wstring, CORBA_WString);
-
-DECL_TEST (longdouble, CORBA_LongDouble);
-
-#undef	DECL_TEST
-
-extern CORBA_TypeCode_ptr	_tc_test1_x1;
-
-class test1_x1 : public CORBA_UserException {
-  public:
-    CORBA_Long	case_num;
-			
-			test1_x1 (CORBA_Long n)
-			: CORBA_UserException (_tc_test1_x1), case_num (n)
-			{ }
-};
-
-extern CORBA_TypeCode_ptr	_tc_test1_x2;
-
-class test1_x2 : public CORBA_UserException {
-  public:
-    CORBA_Object_ptr	obj;
-    CORBA_Long	case_num;
-
-			test1_x2 (CORBA_Object_ptr obj1,
-				CORBA_Long n)
-			: CORBA_UserException (_tc_test1_x2),
-			    obj (obj1), case_num (n) { }
-
-			~test1_x2 ()
-			{ CORBA_release (obj); }
-};
-
-void
-test1_test_throw (
-    test1_ptr		target,
-    CORBA_Long	case_num,
-    CORBA_Environment	&env		// throw (x1, x2)
-);
-
-void
-test1_please_exit (
-    test1_ptr		target,
-    CORBA_Environment	&env
-);
-
-#ifdef	_MSC_VER
-#pragma	pack (pop)			// VC++, go back to other padding rules
-#endif	// VC++
-
-#endif	// _TEST1_HH
-
diff --git a/TAO/IIOP/tests/Cubit/TAO/test1.idl b/TAO/IIOP/tests/Cubit/TAO/test1.idl
deleted file mode 100644
index e6cf20cd2de..00000000000
--- a/TAO/IIOP/tests/Cubit/TAO/test1.idl
+++ /dev/null
@@ -1,78 +0,0 @@
-// @(#)test1.idl	1.1 95/09/11
-// Copyright 1994-1995 by Sun Microsystems, Inc.
-//
-// TEST		basic marshaling tests for all IDL primitive types, modes
-//
-// This test omits constructed types (struct, union, enum, sequence, and
-// array types), and only tests very simple user defined exceptions.
-//
-// Values returned are well defined functions of the input values:
-//
-//	* For numeric types (octet, short, long, longlong, float, double,
-//	  longdouble, and unsigned variants) the value is cubed.
-//	* For Boolean, it's the negation.
-//	* For Any, TypeCode, Principal, Object, char and wchar,
-//	  string and wstring, it's the input value.
-//
-// The "return" and "out" parameter is the function of the "in" parameter;
-// the "inout" parameter is the function of its original value.
-//
-// The "echo" test has all output values be the input values, with no
-// changes to the bit patterns originally transmitted.  While easier to
-// use to identify some kinds of problem, it is not as complete a test.
-//
-
-#define	DECL_TEST(type) \
-    type test_ ## type ( in type a1, out type a2, inout type a3)
-
-#pragma	prefix	"Eng.SUN.COM"	// only for Sun-defined interfaces
-
-interface test1 {
-    void	test_void ();
-
-    typedef unsigned short ushort;
-    typedef unsigned long ulong;
-
-    typedef long long longlong;
-    typedef unsigned long long ulonglong;
-    typedef long double longdouble;
-
-    DECL_TEST (short);
-    DECL_TEST (long);
-    DECL_TEST (ushort);
-    DECL_TEST (ulong);
-    DECL_TEST (float);
-    DECL_TEST (double);
-    DECL_TEST (boolean);
-    DECL_TEST (char);
-    DECL_TEST (octet);
-    DECL_TEST (any);
-    DECL_TEST (TypeCode);
-    DECL_TEST (Principal);
-    DECL_TEST (Object);		// CORBA::Object
-    DECL_TEST (string);		// unbounded string
-
-    DECL_TEST (longlong);
-    DECL_TEST (ulonglong);
-    DECL_TEST (wchar);
-    DECL_TEST (wstring);	// unbounded wstring
-    DECL_TEST (longdouble);
-
-    //
-    // All cases, "case_num" in the exception is the same as the 'in' param
-    //	* negative or zero, throws x1
-    //	* positive even cases, throws x2 with obj = null objref
-    //	* positive odd cases, throws x2 with obj = target objref
-    //
-    exception x1 { long case_num; };
-    exception x2 { Object obj; long case_num; };
-
-    void test_throw (in long case_num) raises (x1, x2);
-
-    //
-    // Aid for test cleanup in case server's not told to quit after
-    // being idle for some time period
-    //
-    oneway void please_exit ();
-};
-
diff --git a/TAO/IIOP/tests/Cubit/TAO/test1_clnt.cpp b/TAO/IIOP/tests/Cubit/TAO/test1_clnt.cpp
deleted file mode 100644
index 52169789ded..00000000000
--- a/TAO/IIOP/tests/Cubit/TAO/test1_clnt.cpp
+++ /dev/null
@@ -1,678 +0,0 @@
-// @(#)test1_clnt.cpp   1.5 95/09/24
-// Copyright 1995 by Sun Microsystems, Inc.
-// All Rights Reserved
-//
-// TEST         client driver for "test1"
-//
-
-#ifdef  USE_IOSTREAM
-#include <iostream.h>
-#endif
-
-#include <stdio.h>
-#include <string.h>
-#include <ace/Get_Opt.h>
-
-#if     unix
-#       include <unistd.h>
-
-#else   // windows
-
-#endif  // unix
-
-#include "test1.h"
-#include <corba/debug.h>
-
-
-#if !defined (_WIN32)
-extern char     *optarg;        // missing on some platforms
-#endif
-
-extern void
-print_exception (const CORBA_Exception *, const char *, FILE *f=stdout);
-
-// All tests are specified so that the return value and "out" (second)
-// parameters are easily tested functions of the "in" (first)
-// parameter, and the "inout" (third) parameter is the same function
-// the its initial value.  Caller is expected to specify two different
-// "in" values.  This helps make the marshaled bits vary, and turn up
-// a class of potential problems that'd be hidden if parameter order
-// had no effect on the test.
-//
-// PERFORM_TEST calls a test for a given type, reporting in cases
-// where the ORB or operation failed.  The COMPARE symbol can be
-// redefined to achieve different functions -- e.g. cubing numbers,
-// identity, negation, etc.  It should return true iff the correct
-// result was returned.
-//
-// BAD_COMPARE_VALUES is to produce diagnostics when a test fails,
-// showing the actual and expected values of returned parameters.
-// This helps diagnose specific porting problems.
-//
-// The RELEASE symbol may be defined to free memory, eliminating
-// client side memory leaks in the test.
-//
-#define RELEASE(X)              // NOP by default
-#define PERFORM_TEST(name,type,value1,value2) \
-    { \
-        CORBA_ ## type  v1, v2, v3; \
-        \
-        v1 = (CORBA_ ## type)(value1); \
-        v2 = 0; \
-        v3 = (CORBA_ ## type)(value2); \
-        \
-        test_count++; \
-        v1 = test1_test_ ## name (target, v1, v2, v3, env); \
-        if (env.exception () != 0) { \
-            print_exception (env.exception (), "perform test_" #name); \
-            error_count++; \
-        } else if (!COMPARE (CORBA_ ## type, v1, value1) \
-                || !COMPARE (CORBA_ ## type, v2, value1) \
-                || !COMPARE (CORBA_ ## type, v3, value2) ) { \
-            ACE_OS::fprintf (stderr, "bad comparison, test_" #name "\n"); \
-            BAD_COMPARE_VALUES(type,v1,v2,v3,value1,value2) \
-            error_count++; \
-        } \
-        RELEASE (v1); RELEASE (v2); RELEASE (v3); \
-    }
-
-//
-// This messing about is because the ostream op << cannot always
-// be used with all kinds of data ... e.g. LongDouble, TypeCode.
-//
-#ifdef  USE_IOSTREAM
-#       define  DO_IO(x) x
-#else
-#       define  DO_IO(x)
-#endif
-#define BAD_COMPARE_VALUE_OUT(type,v1,v2,v3,value1,value2) \
-            DO_IO( cerr << " v1=" << v1; \
-            cerr << " expecting " << EXPVAL(CORBA_ ## type, value1) << "\n"; \
-            cerr << " v2=" << v2; \
-            cerr << " expecting " << EXPVAL(CORBA_ ## type, value1) << "\n"; \
-            cerr << " v3=" << v3; \
-            cerr << " expecting " << EXPVAL(CORBA_ ## type, value2) << "\n");
-#define BAD_COMPARE_VALUES(type,v1,v2,v3,value1,value2) \
-    BAD_COMPARE_VALUE_OUT(type,v1,v2,v3,value1,value2)
-
-// test utility -- should be able to just use is_equivalent() directly
-// but this implementation uses null pointers for nil, so this must
-// check for nulls first.  (May be noncompliant with C++ mapping!)
-
-static CORBA_Boolean
-compare_objrefs (CORBA_Object_ptr v1,
-		 CORBA_Object_ptr v2)
-{
-  CORBA_Boolean       temp;
-  CORBA_Environment   env;
-
-  if (v1 == v2)
-    return CORBA_B_TRUE;
-
-  if (CORBA_is_nil (v1))
-    return CORBA_is_nil (v2);
-
-  temp = v1->_is_equivalent (v2, env);
-
-  if (env.exception () != 0) 
-    {
-      print_exception (env.exception (), "compare objref");
-      return CORBA_B_FALSE;
-    }
-  return temp;
-}
-
-
-//
-// Helper routine to help sure math (especially for floating point)
-// gets done correctly.
-//
-template <class Type>
-Type cube (Type arg)
-{
-  Type temp = arg;
-
-  temp = temp * arg;
-  temp = temp * arg;
-  return temp;
-}
-
-static int      skip_longdouble = 0;
-
-// This just performs the tests ...
-
-void
-do_tests (test1_ptr   target,
-	  unsigned    loop_count,
-	  unsigned    &test_count,
-	  unsigned    &error_count)
-{
-  int         count;
-
-  for (count = 0; count < loop_count; count++) 
-    {
-      CORBA_Environment       env;
-      CORBA_Environment       env2;   // XXX
-
-      //
-      // test_void
-      //
-      test_count++;
-      test1_test_void (target, env);
-      if (env.exception () != 0) 
-	{
-	  print_exception (env.exception (), "perform test_void");
-	  error_count++;
-	}
-
-      //
-      // Numeric tests ... try some variety in computation, no real
-      // rationale in the choice of initial parameter values except
-      // not to use the same values all the time.
-      //
-#define EXPVAL(type,original_value) ((type) cube((type)(original_value)))
-#define COMPARE(type,retval,original_value) \
-      ((retval) == EXPVAL(type, original_value))
-
-	PERFORM_TEST (octet, Octet, count + 29, count - 22);
-
-      PERFORM_TEST (short, Short, count - 23, count + 19);
-      PERFORM_TEST (ushort, UShort, count + 23, count - 19);
-
-      PERFORM_TEST (long, Long, count - 17, count + 20);
-      PERFORM_TEST (ulong, ULong, count + 17, count - 20);
-
-#if     !defined (NONNATIVE_LONGLONG)
-      // don't try this on platforms that don't support
-      // math on longlongs ...
-      PERFORM_TEST (longlong, LongLong, count - 177, count + 3);
-      PERFORM_TEST (ulonglong, ULongLong, count + 177, count - 3);
-#endif  // !NONNATIVE_LONGLONG
-
-#if     !defined (i386)
-      //
-      // XXX not sure what's wrong with the COMPARE macro with respect to
-      // floating point on x86, since fprintf shows the values basically
-      // look correct ... but these float/double tests fail.
-      //
-      PERFORM_TEST (float, Float, count - 0.29, count + 3.14159);
-      PERFORM_TEST (double, Double, count * 1.77, count * 2.71);
-#endif  // !defined (i386)
-
-
-#ifndef NONNATIVE_LONGDOUBLE
-#undef  BAD_COMPARE_VALUES
-#define BAD_COMPARE_VALUES(type,v1,v2,v3,value1,value2) // NOP
-
-      //
-      // don't try this between two platforms that don't provide
-      // arithmetic support for LongDouble values ...
-      //
-      if (!skip_longdouble) 
-	PERFORM_TEST (longdouble, LongDouble,
-		      count - 2.33, count * 3.14159);
-
-#  undef BAD_COMPARE_VALUES
-#  define BAD_COMPARE_VALUES(type,v1,v2,v3,value1,value2) \
-      BAD_COMPARE_VALUE_OUT(type,v1,v2,v3,value1,value2)
-#endif  // !NONNATIVE_LONGDOUBLE
-
-#undef  COMPARE
-#undef  EXPVAL
-
-
-	//
-	// Boolean -- negation
-	//
-#define EXPVAL(type,original_value) (!(type)(original_value))
-#define COMPARE(type,retval,original_value) \
-	(((type)(retval)) == EXPVAL(type,original_value))
-
-	PERFORM_TEST (boolean, Boolean,
-		      (count & 0x01) != 0, (count & 0x01) == 0);
-#undef  COMPARE
-#undef  EXPVAL
-
-      //
-      // Char, WChar -- identity
-      //
-#define EXPVAL(type,original_value) ((type)(original_value))
-#define COMPARE(type,retval,original_value) \
-      (((type)(retval)) == EXPVAL(type,original_value))
-
-	PERFORM_TEST (char, Char, count + 26, count - 5);
-      PERFORM_TEST (wchar, WChar, count, count + 25);
-#undef  COMPARE
-#undef  EXPVAL
-
-      //
-      // Object_ptr -- identity (special comparision)
-      //
-#define EXPVAL(type,original_value) ((type)(original_value))
-#define COMPARE(type,retval,original_value) \
-      (compare_objrefs (retval, original_value) == CORBA_B_TRUE)
-#undef  RELEASE
-#define RELEASE(obj) \
-	{ CORBA_release (obj); }
-
-      PERFORM_TEST (Object, Object_ptr, target, CORBA_Object::_nil ());
-#undef  COMPARE
-#undef  EXPVAL
-
-      //
-      // TypeCode_ptr -- identity (special comparision), and verifies
-      // that most of the built-in typecode constants exist.
-      //
-      // XXX should try this on all standard and system exceptions!
-      //
-      // XXX  this currently tests only marshaling/unmarshaling of
-      // "no parameter" TypeCodes ... complex ones (objref, struct,
-      // union, enum, sequence, array, alias, exception) are _NOT_
-      // currently attempted.
-      //
-      // XXX  for the simple typecodes (string, wstring), the single
-      // "bound" parameter isn't exercised/verified as it should be.
-      //
-#define EXPVAL(type,original_value) ((type)(original_value))
-#define COMPARE(type,retval,original) \
-      (((retval) == (original)) || \
-       ((retval)->_kind == (original)->_kind))
-
-#undef  RELEASE
-#define RELEASE(tc) \
-	{ CORBA_release (tc); }
-
-#undef  BAD_COMPARE_VALUES
-#define BAD_COMPARE_VALUES(type,v1,v2,v3,value1,value2) // NOP
-
-      {
-	PERFORM_TEST (TypeCode, TypeCode_ptr,
-		      _tc_CORBA_Null, _tc_CORBA_Void);
-
-	PERFORM_TEST (TypeCode, TypeCode_ptr,
-		      _tc_CORBA_Short, _tc_CORBA_UShort);
-	PERFORM_TEST (TypeCode, TypeCode_ptr,
-		      _tc_CORBA_Long, _tc_CORBA_ULong);
-	PERFORM_TEST (TypeCode, TypeCode_ptr,
-		      _tc_CORBA_LongLong, _tc_CORBA_ULongLong);
-
-	PERFORM_TEST (TypeCode, TypeCode_ptr,
-		      _tc_CORBA_Float, _tc_CORBA_Double);
-
-	PERFORM_TEST (TypeCode, TypeCode_ptr,
-		      _tc_CORBA_Boolean, _tc_CORBA_Octet);
-
-	PERFORM_TEST (TypeCode, TypeCode_ptr,
-		      _tc_CORBA_Any, _tc_CORBA_TypeCode);
-
-	PERFORM_TEST (TypeCode, TypeCode_ptr,
-		      _tc_CORBA_LongDouble, _tc_CORBA_Principal);
-
-	PERFORM_TEST (TypeCode, TypeCode_ptr,
-		      _tc_CORBA_Char, _tc_CORBA_String);
-	PERFORM_TEST (TypeCode, TypeCode_ptr,
-		      _tc_CORBA_WChar, _tc_CORBA_WString);
-
-	PERFORM_TEST (TypeCode, TypeCode_ptr,
-		      _tc_CORBA_LongDouble, _tc_CORBA_Octet);
-
-	//
-	// Try all of the standard exception typecodes.
-	//
-	PERFORM_TEST (TypeCode, TypeCode_ptr,
-		      _tc_CORBA_UNKNOWN, _tc_CORBA_BAD_PARAM);
-	PERFORM_TEST (TypeCode, TypeCode_ptr,
-		      _tc_CORBA_NO_MEMORY, _tc_CORBA_IMP_LIMIT);
-	PERFORM_TEST (TypeCode, TypeCode_ptr,
-		      _tc_CORBA_COMM_FAILURE, _tc_CORBA_INV_OBJREF);
-	PERFORM_TEST (TypeCode, TypeCode_ptr,
-		      _tc_CORBA_OBJECT_NOT_EXIST, _tc_CORBA_NO_PERMISSION);
-	PERFORM_TEST (TypeCode, TypeCode_ptr,
-		      _tc_CORBA_INTERNAL, _tc_CORBA_MARSHAL);
-	PERFORM_TEST (TypeCode, TypeCode_ptr,
-		      _tc_CORBA_INITIALIZE, _tc_CORBA_NO_IMPLEMENT);
-	PERFORM_TEST (TypeCode, TypeCode_ptr,
-		      _tc_CORBA_BAD_TYPECODE, _tc_CORBA_BAD_OPERATION);
-	PERFORM_TEST (TypeCode, TypeCode_ptr,
-		      _tc_CORBA_NO_RESOURCES, _tc_CORBA_NO_RESPONSE);
-	PERFORM_TEST (TypeCode, TypeCode_ptr,
-		      _tc_CORBA_PERSIST_STORE, _tc_CORBA_BAD_INV_ORDER);
-	PERFORM_TEST (TypeCode, TypeCode_ptr,
-		      _tc_CORBA_TRANSIENT, _tc_CORBA_FREE_MEM);
-	PERFORM_TEST (TypeCode, TypeCode_ptr,
-		      _tc_CORBA_INV_IDENT, _tc_CORBA_INV_FLAG);
-	PERFORM_TEST (TypeCode, TypeCode_ptr,
-		      _tc_CORBA_INTF_REPOS, _tc_CORBA_BAD_CONTEXT);
-	PERFORM_TEST (TypeCode, TypeCode_ptr,
-		      _tc_CORBA_OBJ_ADAPTER, _tc_CORBA_DATA_CONVERSION);
-
-	//
-	// All the built-in "user defined" system exceptions.
-	//
-	PERFORM_TEST (TypeCode, TypeCode_ptr,
-		      _tc_CORBA_BadKind, _tc_CORBA_Bounds);
-      }
-#undef  COMPARE
-#undef  RELEASE
-
-	//
-	// string (unbounded)-- identity (special comparision)
-	//
-#define COMPARE(type,retval,original_value) \
-	(strcmp ((char *)(retval), (char*)(original_value)) == 0)
-#undef  RELEASE
-#define RELEASE(obj) CORBA_string_free(obj)
-	  static const CORBA_Char str1 [] = "small";
-	static const CORBA_Char str2 [] =
-	  "relatively long string, constructed"
-	  " with the aid of C++ implicit string"
-	  " catenation, which simplifies much stuff";
-	PERFORM_TEST (string, String, str1, str2);
-#undef  COMPARE
-#undef  RELEASE
-
-
-	// XXX any, principal, wstring ... output _is_ input
-
-
-	//
-	// Three test cases involve throwing user-defined exceptions.
-	//
-	{
-	  CORBA_Exception     *xp;
-
-	  //
-	  // Case one:  with parameter <= zero, must throw
-	  // an "x1" exception whose "case_num" is that parameter
-	  //
-	  test_count++;
-
-	  test1_test_throw (target, -5, env);
-	  if (env.exception () != 0) {
-	    xp = env.exception ();
-
-	    if (strcmp ((char *)xp->id (),
-			(char *) _tc_test1_x1->id (env2)) != 0) 
-	      {
-		error_count++;
-		ACE_OS::fprintf (stderr, "test_throw case 1, "
-				 "wrong exception thrown (id = '%s')\n",
-				 xp->id ());
-	      } 
-	    else 
-	      {
-		test1_x1    *xp2 = (test1_x1 *) xp;
-
-		if (xp2->case_num != -5) 
-		  {
-		    error_count++;
-		    ACE_OS::fprintf (stderr, "test_throw case 1, "
-				     "wrong value (case_num = '%ld')\n",
-				     xp2->case_num);
-		  }
-                    
-		// else, right exception was thrown
-	      }
-	    } 
-	  else
-	    {
-	      error_count++;
-	      ACE_OS::fprintf (stderr, "test_throw case 1, "
-			       "no exception thrown !!\n");
-	    }
-
-
-	  //
-	  // Case two:  with positive odd parameter, must throw
-	  // an "x2" exception whose obj is null, and whose case_num
-	  // is that parameter
-	  //
-	  test_count++;
-
-	  test1_test_throw (target, 101, env);
-	  if (env.exception () != 0) 
-	    {
-	      xp = env.exception ();
-
-	      if (strcmp ((char *)xp->id (),
-			  (char *) _tc_test1_x2->id (env2)) != 0) 
-		{
-		  error_count++;
-		  ACE_OS::fprintf (stderr, "test_throw case 2, "
-				   "wrong exception thrown (id = '%s')\n",
-				   xp->id ());
-		} 
-	      else
-		{
-		  test1_x2    *xp2 = (test1_x2 *) xp;
-
-		  if (xp2->case_num != 101) 
-		    {
-		      error_count++;
-		      ACE_OS::fprintf (stderr, "test_throw case 2, "
-				       "wrong value (case_num = '%ld')\n",
-				       xp2->case_num);
-		    }
-
-		  if (!CORBA_is_nil (xp2->obj)) 
-		    {
-		      error_count++;
-		      ACE_OS::fprintf (stderr, "test_throw case 2, "
-				       "non-null objref thrown\n");
-		    }
-                    
-		  // else, right exception was thrown
-		}
-	    } 
-	  else 
-	    {
-	      error_count++;
-	      ACE_OS::fprintf (stderr, "test_throw case 2, "
-			       "no exception thrown !!\n");
-	    }
-
-
-#if     0
-	  // 18-sept-95:  commented this out.  Work remains to be done in
-	  // this area:  (a) ServerRequest::target operation unimplemented,
-	  // so for the servers of current interest this test is no help;
-	  // (b) probable pointer leak in exceptions holding data.
-
-	  //
-	  // Case three:  with positive even parameter, must throw
-	  // an "x2" exception whose obj is the target, and whose
-	  // case_num is that parameter
-	  //
-	  test_count++;
-
-	  test1_test_throw (target, 42, env);
-	  if (env.exception () != 0) 
-	    {
-	      xp = env.exception ();
-
-	      if (strcmp ((char *)xp->id (),
-			  (char *) _tc_test1_x2->id (env2)) != 0) 
-		{
-		  error_count++;
-		  ACE_OS::fprintf (stderr, "test_throw case 3, "
-				   "wrong exception thrown (id = '%s')\n",
-				   xp->id ());
-		} 
-	      else
-		{
-		  test1_x2    *xp2 = (test1_x2 *) xp;
-
-		  if (xp2->case_num != 42) {
-		    error_count++;
-		    ACE_OS::fprintf (stderr, "test_throw case 3, "
-				     "wrong value (case_num = '%ld')\n",
-				     xp2->case_num);
-		  }
-
-		  CORBA_Boolean       status;
-
-		  status = target->_is_equivalent (xp2->obj, env);
-
-		  if (env.exception () != 0) 
-		    {
-		      error_count++;
-		      print_exception (env.exception (),
-				       "test_throw/3 call to is_equivalent");
-		    } 
-		  else if (status != CORBA_B_TRUE) 
-		    {
-		      error_count++;
-		      ACE_OS::fprintf (stderr, "test_throw case 3, "
-				       "non-equivalent objref thrown\n");
-		    }
-                    
-		  // else, right exception was thrown
-		}
-	    } 
-	  else
-	    {
-	      error_count++;
-	      ACE_OS::fprintf (stderr, "test_throw case 3, "
-			       "no exception thrown !!\n");
-	    }
-
-	  env.clear ();
-#endif  // 0
-
-	}
-
-	//
-	// test_illegal -- generate a BAD_OPERATION system exception
-	// from the remote process
-	//
-	test_count++;
-	test_illegal (target, env);
-	if (env.exception () == 0
-	    || ACE_OS::strcmp ((char *) env.exception()->id(),
-			       (char *) _tc_CORBA_BAD_OPERATION->id (env2)) != 0) 
-	  {
-	    ACE_OS::fprintf (stderr, "couldn't generate BAD_OPERATION exception\n");
-	    error_count++;
-	  }
-    }
-}
-
-int
-main (int    argc, char   *argv[])
-{
-  CORBA_ORB_ptr       orb_ptr;
-  CORBA_Environment   env;
-  CORBA_Object_ptr    objref = CORBA_Object::_nil();
-  unsigned            loop_count = 1;
-  unsigned            tests = 0, errors = 0;
-  int                 exit_later = 0;
-
-  orb_ptr = CORBA_ORB_init (argc, argv, "internet", env);
-
-  if (env.exception () != 0) 
-    {
-      dexc (env, "ORB initialisation");
-      return 1;
-    }
-
-  //
-  // Parse and verify parameters.
-  //
-  ACE_Get_Opt get_opt (argc, argv, "dln:O:x");
-  int                 c;
-
-  while ((c = get_opt ()) != -1)
-    switch (c) 
-      {
-      case 'd':                     // debug flag
-	TAO_debug_level++;
-	continue;
-
-      case 'l':                     // skip "long double" test
-	skip_longdouble++;
-	continue;
-
-      case 'n':                     // loop count
-	loop_count = (unsigned) ACE_OS::atoi (get_opt.optarg);
-	continue;
-
-      case 'O':                     // stringified objref
-	{
-	  objref = orb_ptr->string_to_object (
-					      (CORBA_String)get_opt.optarg, env);
-	  if (env.exception () != 0) 
-	    {
-	      dexc (env, "string2object");
-	      return 1;
-	    }
-	}
-      continue;
-
-      case 'x':
-	exit_later++;
-	continue;
-
-      case '?':
-      default:
-	ACE_OS::fprintf (stderr, "usage:  %s"
-			 " [-d]"
-			 " [-l]"
-			 " [-n loopcount]"
-			 " [-O objref]"
-			 " [-x]"
-			 "\n", argv [0]
-			 );
-	return 1;
-      }
-    
-  if (CORBA_is_nil (objref) == CORBA_B_TRUE) {
-    ACE_OS::fprintf (stderr, "%s:  must identify non-null target objref\n",
-		     argv [0]);
-    return 1;
-  }
-
-
-  do_tests (objref, loop_count, tests, errors);
-
-  char                *progname = ACE_OS::strrchr (argv [0], '/');
-
-  if (progname != 0)
-    progname += 1;
-  else
-    progname = argv [0];
-
-  ACE_OS::fprintf (stderr, "%s:  %d loops, %d tests (%d errors)\n",
-		   progname, loop_count, tests, errors);
-
-  if (exit_later) 
-    {
-      test1_please_exit (objref, env);
-      if (env.exception () != 0)
-	print_exception (env.exception (), "test1_please_exit");
-    }
-
-  CORBA_release (objref);
-
-  return errors != 0;
-}
-
-#if defined (ACE_TEMPLATES_REQUIRE_SPECIALIZATION)
-template CORBA_Octet cube(CORBA_Octet);
-template CORBA_Short cube(CORBA_Short);
-template CORBA_UShort cube(CORBA_UShort);
-template CORBA_Long cube(CORBA_Long);
-template CORBA_ULong cube(CORBA_ULong);
-#if     !defined (NONNATIVE_LONGLONG)
-        // don't try this on platforms that don't support
-        // math on longlongs ...
-template CORBA_LongLong cube(CORBA_LongLong);
-template CORBA_ULongLong cube(CORBA_ULongLong);
-#endif  // !NONNATIVE_LONGLONG
-template CORBA_Float cube(CORBA_Float);
-template CORBA_Double cube(CORBA_Double);
-#if     !defined (NONNATIVE_LONGDOUBLE)
-        // don't try this on platforms that don't support
-        // math on long doubles ...
-template CORBA_LongDouble cube(CORBA_LongDouble);
-#endif  // !NONNATIVE_LONGDOUBLE
-#endif /* ACE_TEMPLATES_REQUIRE_SPECIALIZATION */
diff --git a/TAO/IIOP/tests/Cubit/TAO/test1_svr.cpp b/TAO/IIOP/tests/Cubit/TAO/test1_svr.cpp
deleted file mode 100644
index 083b119fcaa..00000000000
--- a/TAO/IIOP/tests/Cubit/TAO/test1_svr.cpp
+++ /dev/null
@@ -1,691 +0,0 @@
-// @(#)test1_svr.cpp	1.7 95/09/25
-// Copyright 1995 by Sun Microsystems Inc.
-// All Rights Reserved
-//
-// TEST:	simple IIOP server for "test1.idl" interface.
-//
-// Starts up, builds an objref, prints its string, listens for
-// messages, responds to them.
-//
-
-#include	<stdio.h>
-#include	<string.h>
-#include <ace/Get_Opt.h>
-
-#if	unix
-#	include	<unistd.h>		// for getopt on some systems
-
-#else	// windows
-
-#endif
-
-#include	"test1.h"
-#include	<corba/boa.h>
-#include <roa.h>
-
-#include	<corba/debug.h>
-
-
-
-#if !defined (_WIN32)
-extern char 	*optarg;	// missing on some platforms
-#endif
-
-//
-// Skeleton code ... just a macro for a bunch of DSI-based method
-// code, in lieu of having an IDL compmiler generate static skeletons.
-// Static skeletons would be more efficient; most mallocation could go
-// away.
-//
-// Use by: defining OPERATION macro, call DEFINE_SKEL3 as needed, then
-// undef OPERATION.
-//
-// NOTE: "v1_copy" below is needed to work around a bug with the
-// HP9000 G++ 2.6.3 compiler, with "LongLong".
-//
-// XXX this could probably be a template ... or could even be merged
-// directly into the Dynamic Implementation Routine below.
-//
-// XXX we must currently use IN_COPY_VALUE since the memory consumed
-// by the parameters must be deallocated by the ORB.  When we get an
-// updated version of DSI which provides "send it now" semantics,
-// these should preallocate the values and not use IN_COPY_VALUE.  A
-// net decrease in malloc overhead can be had that way.  (NVList
-// should also get a public constructor, and a way to provide the
-// buffer.)
-//
-#define	DEFINE_SKEL3(name,truetype,truetypename) \
-    static void \
-    _test1_test_ ## name ( \
-	CORBA_ServerRequest	&req, \
-        CORBA_Object_ptr        obj, \
-	CORBA_Environment	&env \
-    ) \
-    { \
-	CORBA_NVList_ptr	nvlist; \
-	CORBA_ ## truetype	scratch = 0; \
-	CORBA_Any		temp_value (_tc_CORBA_ ## truetypename, \
-				    &scratch, CORBA_B_FALSE); \
- 	\
-	req.orb ()->create_list (3, nvlist); \
-	(void) nvlist->add_value (0, temp_value, \
-		CORBA_IN_COPY_VALUE|CORBA_ARG_IN, env); \
-	(void) nvlist->add_value (0, temp_value, \
-		CORBA_IN_COPY_VALUE|CORBA_ARG_OUT, env); \
-	(void) nvlist->add_value (0, temp_value, \
-		CORBA_IN_COPY_VALUE|CORBA_ARG_INOUT, env); \
-	 \
-	req.params (nvlist, env); \
-	if (env.exception () != 0) { \
-	    dexc (env, "test1_test_" # name "skeleton, req.params"); \
-	    return; \
-	} \
- 	\
-	CORBA_ ## truetype 	*v1, *v2, *retval; \
- 	\
-	v1 = (CORBA_ ## truetype *) nvlist->item (0)->value ()->value (); \
-	v2 = new CORBA_ ## truetype; \
-	*v2 = (CORBA_ ## truetype) OPERATION (*v1); \
-	retval = new CORBA_ ## truetype; \
-	*retval = (CORBA_ ## truetype) OPERATION (*v1); \
- 	\
-	CORBA_Any_ptr		any_val; \
- 	\
-	any_val = nvlist->item (1)->value (); \
-	any_val->replace (any_val->type (), v2, CORBA_B_TRUE, env); \
-	if (env.exception () != 0) { \
-	    dexc (env, "test1_test_" # name "skeleton, val2 replace"); \
-	    return; \
-	} \
- 	\
-	v1 = (CORBA_ ## truetype *) nvlist->item (2)->value ()->value (); \
-    	CORBA_ ## truetype v1copy = *v1; \
-	*v1 = (CORBA_ ## truetype) OPERATION (v1copy); \
- 	\
-	any_val = new CORBA_Any (_tc_CORBA_ ## truetypename, \
-		retval, CORBA_B_TRUE); \
-	req.result (any_val, env); \
-	if (env.exception () != 0) { \
-	    dexc (env, "test1_test_" # name "skeleton, result"); \
-	    return; \
-	} \
-    } \
-    extern TAO_Call_Data test1_ ## name ## _calldata;
-
-
-extern const TAO_Call_Data test1_void_calldata;
-
-static void
-_test1_test_void (CORBA_ServerRequest &req,
-		  CORBA_Object_ptr obj,
-		  CORBA_Environment &env)
-{
-  CORBA_NVList_ptr nvlist;
-
-  req.orb ()->create_list (0, nvlist);
-  req.params (nvlist, env);
-
-  if (env.exception () != 0)
-    dexc (env, "test_throw, get params");
-}
-
-
-//
-// Dynamic Skeleton methods for numeric types ... these all just
-// cube their parameters in various permutations
-//
-template <class Type>
-Type cube (Type arg)
-{
-  Type temp = arg;
-
-  temp = temp * arg;
-  temp = temp * arg;
-  return temp;
-}
-
-#define	OPERATION(n)	cube(n)
-
-DEFINE_SKEL3 (octet, Octet, Octet)
-
-DEFINE_SKEL3 (short, Short, Short)
-DEFINE_SKEL3 (ushort, UShort, UShort)
-
-DEFINE_SKEL3 (long, Long, Long)
-DEFINE_SKEL3 (ulong, ULong, ULong)
-
-#if	!defined (NONNATIVE_LONGLONG)
-	// don't try this on platforms that don't support
-	// math on longlongs ...
-DEFINE_SKEL3 (longlong, LongLong, LongLong)
-DEFINE_SKEL3 (ulonglong, ULongLong, ULongLong)
-#endif	// !NONNATIVE_LONGLONG
-
-DEFINE_SKEL3 (float, Float, Float)
-DEFINE_SKEL3 (double, Double, Double)
-
-#if	!defined (NONNATIVE_LONGDOUBLE)
-	// don't try this on platforms that don't support
-	// math on long doubles ...
-DEFINE_SKEL3 (longdouble, LongDouble, LongDouble)
-#endif	// !NONNATIVE_LONGDOUBLE
-
-#undef	OPERATION
-
-//
-// Dynamic Skeleton methods for Boolean type ... just negates its
-// parameters 
-//
-#define	OPERATION(x)	(!(x))
-DEFINE_SKEL3 (boolean, Boolean, Boolean)
-#undef	OPERATION
-
-//
-// For character types, output is same as input, no magic needed.
-//
-#define	OPERATION(x)	(x)
-DEFINE_SKEL3 (char, Char, Char)
-DEFINE_SKEL3 (wchar, WChar, WChar)
-#undef	OPERATION
-
-//
-// For objref, typecode, output is same as input but duplication
-// is needed
-//
-#define	OPERATION(x)	((x) ? (x)->AddRef() : 0, x)
-DEFINE_SKEL3 (Object, Object_ptr, Object)
-DEFINE_SKEL3 (TypeCode, TypeCode_ptr, TypeCode)
-#undef	OPERATION
-
-//
-// For string, output is copy of input
-//
-#define	OPERATION(x)	(CORBA_string_copy(x))
-DEFINE_SKEL3 (string, String, String)
-#undef	OPERATION
-
-//
-// For wstring, output is copy of input
-//
-#define	OPERATION(x)	(CORBA_wstring_copy(x))
-DEFINE_SKEL3 (wstring, WString, WString)
-#undef	OPERATION
-
-//
-// XXX IMPLEMENT THE REST OF THE DATA TYPES
-//
-// any, principal -- out is in
-//
-
-
-//
-// All cases, "case_num" in the exception is the same as the 'in' param
-//	* negative or zero, throws x1
-//	* positive even cases, throws x2 with obj = null objref
-//	* positive odd cases, throws x2 with obj = target objref
-//
-// exception x1 { long case_num; };
-// exception x2 { Object obj; long case_num; };
-// 
-// void test_throw (in long case_num) raises (x1, x2);
-//
-
-extern const TAO_Call_Data test1_test_throw_calldata;
-
-static void
-_test1_test_throw (CORBA_ServerRequest &req,
-		   CORBA_Object_ptr obj,
-		   CORBA_Environment &env)
-{
-  CORBA_NVList_ptr nvlist;
-  CORBA_NamedValue_ptr nv;
-  CORBA_Any temp_value (_tc_CORBA_Long);
-  CORBA_Long value;
-
-  req.orb ()->create_list (0, nvlist);
-  nv = nvlist->add_value (0, temp_value, CORBA_ARG_IN, env);
-
-  req.params (nvlist, env);
-  if (env.exception () != 0)
-    {
-      dexc (env, "test_throw, get params");
-      return;
-    }
-
-  value = *(CORBA_Long *)nv->value ()->value ();
-  if (env.exception () != 0)
-    {
-      dexc (env, "test_throw, param value");
-      return;
-    }
-
-  CORBA_Any_ptr any;
-
-  if (value <= 0) 
-    {
-      test1_x1		*x;
-
-      x = new test1_x1 (value);
-      any = new CORBA_Any (_tc_test1_x1, x, CORBA_B_TRUE);
-
-    }
-  else if (value & 0x01)
-    {
-      test1_x2		*x;
-
-      x = new test1_x2 (CORBA_Object::_nil (), value);
-      any = new CORBA_Any (_tc_test1_x2, x, CORBA_B_TRUE);
-
-    } 
-  else
-    {
-#if	0
-      test1_x2		*x;
-
-      x = new test1_x2 (req.oa()->target (), value);
-      any = new CORBA_Any (_tc_test1_x2, x, CORBA_B_TRUE);
-#else
-      //
-      // XXX right now, we don't have a target() operation on the
-      // BOA ... needs to be added.  Verify the client side memory
-      // leak of pointers embedded in user exceptions is fixed, too.
-      //
-      env.exception (new CORBA_IMP_LIMIT (COMPLETED_NO));
-      return;
-#endif
-    }
-
-  req.exception (USER_EXCEPTION, any, env);
-}
-
-
-//
-// This table is used to associate operation names with the Dynamic
-// Skeleton method ... someday it could return static skeletons.
-//
-#define	DECL_SKEL(name) \
-	{ & test1_ ## name ## _calldata, _test1_test_ ## name }
-
-static const TAO_Skel_Entry test1_operations [] = {
-    DECL_SKEL (void),
-
-    DECL_SKEL (octet),
-    DECL_SKEL (char),
-
-    DECL_SKEL (wchar),
-
-    DECL_SKEL (short),
-    DECL_SKEL (ushort),
-    DECL_SKEL (long),
-    DECL_SKEL (ulong),
-
-#if	!defined (NONNATIVE_LONGLONG)
-    // don't try this on platforms that don't support
-    // math on longlongs ...
-    DECL_SKEL (longlong),
-    DECL_SKEL (ulonglong),
-#endif
-
-    DECL_SKEL (float),
-    DECL_SKEL (double),
-
-#if	!defined (NONNATIVE_LONGDOUBLE)
-	// don't try this on platforms that don't support
-	// math on long doubles ...
-    DECL_SKEL (longdouble),
-#endif	// !NONNATIVE_LONGDOUBLE
-
-    DECL_SKEL (boolean),
-
-    DECL_SKEL (Object),
-    DECL_SKEL (TypeCode),
-
-    DECL_SKEL (string),
-    DECL_SKEL (wstring),
-
-    { & test1_test_throw_calldata, _test1_test_throw },
-
-    { 0, 0 }
-};
-
-
-//
-// Dispatch to method code ...
-//
-// Knows how to interpret "context" to get target objref, and where to
-// get second level skeletons for that target.  Both of those operations
-// will generally be abstracted (into library and stub code) so the main
-// body of this routine would be invisible to most applications.
-//
-// However, there are applications that need to do this stuff themselves
-// (like bridging between environments, e.g. different ORBs, languages, or
-// other object systems).  Everything needed to work without using an IDL
-// compiler is a public, supported API.
-//
-static void
-level1_skeleton (CORBA_OctetSeq &key,
-		 CORBA_ServerRequest &req,
-		 void *context,
-		 CORBA_Environment &env)
-{
-  //
-  // Verify that the target object and "this" object have the
-  // same key.  Normally, this would be used to figure out
-  // which object was the target, and hence which operations
-  // vector to dispatch the request.
-  //
-  CORBA_OctetSeq		*obj_key;
-
-  obj_key = (CORBA_OctetSeq *) context;
-  if (obj_key->length != key.length
-      || ACE_OS::memcmp (obj_key->buffer, key.buffer,
-			 obj_key->length) != 0)
-    {
-    env.exception (new CORBA_OBJECT_NOT_EXIST (COMPLETED_NO));
-#ifdef	DEBUG
-    if (TAO_debug_level)
-      dmsg_opaque ("request to nonexistent object, key = ",
-		   key.buffer, key.length);
-#endif
-    return;
-  }
-
-  //
-  // Find a "level 2 skeleton" for this operation, then
-  // call it with the right per-object state.
-  //
-  const TAO_Skel_Entry	*entry;
-  CORBA_String		opname;
-
-  opname = req.op_name ();
-  for (entry = &test1_operations [0]; entry->op_descriptor; entry++)
-    {
-    if (strcmp ((char *)opname, entry->op_descriptor->opname) == 0)
-      {
-      // We pass a bogus object because this version of the cubit example is
-      // so tightly coupled that it doesn't use it.  Future modifications will,
-      // hopefully!
-      CORBA_Object_ptr bogus_object = 0;
-      entry->impl_skeleton (req, bogus_object, env);
-      return;
-    }
-  }
-
-  //
-  // XXX True top-level skeleton code would also have to understand
-  // the built-in operations:
-  //
-  // * _is_a (for narrowing tests) ... can be derived by searching an
-  //	 appropriately structured graph of level2 skeletons.
-  //
-  // * _non_existent ... if the level1 skeleton consults a module
-  //	 which understands object lifespans, this should be simple.
-  // 
-  // * _get_interface ... could either (a) fail; (b) return the ref
-  //   from some IFR; or most interestingly (c) return a ref to some
-  //	 code in this process that can answer all IFR queries from the
-  //	 skeleton data structures.
-  //
-  // * _get_implementation  ... return some administrative hook to
-  //   the object implementation:
-  //
-  // No other legal operations start with a character that's not an
-  // ASCII alphanumeric, for what it's worth.
-  //
-  // The skeleton might want to use data in the object key to find
-  // the objref's type; if it's integrated with object creation, and
-  // an per-process implementation repository, this should be easy.
-  //
-
-  //
-  // bypass level 2 skeletons for this one ...
-  //
-  if (strcmp ((char *) opname, "please_exit") == 0)
-    {
-      dmsg ("I've been asked to shut down...");
-      req.oa ()->please_shutdown (env);
-      dexc (env, "please_exit, please_shutdown");
-      return;
-    }
-
-  //
-  // No match.  Operation not implemented; say so.
-  //
-  dmsg1 ("unknown operation, %s", opname);
-  env.exception (new CORBA_BAD_OPERATION (COMPLETED_NO));
-}
-
-
-//
-// Create and print the objref, listen for calls on it until done.
-//
-extern void
-print_exception (const CORBA_Exception *, const char *, FILE *f=stdout);
-
-int
-OA_listen (CORBA_ORB_ptr orb_ptr,
-	   CORBA_BOA_ptr oa_ptr,
-	   CORBA_String key,
-	   int idle)
-{
-  //
-  // Create the object we'll be implementing.
-  //
-  CORBA_OctetSeq	obj_key;
-  CORBA_Object_ptr	obj;
-  CORBA_Environment	env;
-
-  obj_key.buffer = (CORBA_Octet *) key;
-  obj_key.length = obj_key.maximum = ACE_OS::strlen (key);
-
-  obj = oa_ptr->create (obj_key, (CORBA_String) "", env);
-  if (env.exception () != 0)
-    {
-      print_exception (env.exception (), "BOA::create");
-      return 1;
-    }
-
-  //
-  // Stringify the objref we'll be implementing, and
-  // print it to stdout.  Someone will take that string
-  // and give it to some client.
-  //
-  CORBA_String	str;
-
-  str = orb_ptr->object_to_string (obj, env);
-  if (env.exception () != 0)
-    {
-      print_exception (env.exception (), "object2string");
-      return 1;
-    }
-  ACE_OS::puts ((char *)str);
-  ACE_OS::fflush (stdout);
-  dmsg1 ("listening as object '%s'", str);
-
-  //
-  // Clean up -- "key" is sufficient to dispatch all requests.
-  //
-  CORBA_release (obj);
-  CORBA_string_free (str);
-  env.clear ();
-
-  //
-  // Handle requests for this object until we're killed, or one of
-  // the methods makes us exit.
-  //
-  // NOTE:  apart from registering the top level skeleton, the rest
-  // of this loop is exactly what BOA::run() does.  It's here to
-  // show there's no magic.
-  //
-#if 0
-  oa_ptr->register_dir (level1_skeleton, &obj_key, env);
-#else
-  oa_ptr->register_dir (oa_ptr->dispatch, &obj_key, env);
-#endif
-  if (env.exception () != 0)
-    {
-      print_exception (env.exception (), "register_dir");
-      return 1;
-    }
-
-  for (;;) {
-    if (idle == -1)
-      oa_ptr->get_request (CORBA_B_FALSE, 0, env);
-    else
-      {
-	timeval		tv;
-
-	tv.tv_sec = idle;
-	tv.tv_usec = 0;
-	oa_ptr->get_request (CORBA_B_FALSE, &tv, env);
-      }
-
-    CORBA_Exception_ptr	xp;
-
-    if ((xp = env.exception ()) != 0)
-      {
-	CORBA_Environment env2;	// XXX
-	char *id;
-
-	id = env.exception ()->id ();
-
-	//
-	// We get BAD_INV_ORDER if we call get_request() after
-	// shutdown was initiated.  Simpler to rely on that
-	// than to arrange any handshaking in this simple app.
-	//
-	if (strcmp (id, _tc_CORBA_BAD_INV_ORDER->id (env2)) == 0)
-	  {
-	    break;
-
-	    //
-	    // Other exceptions are errors.
-	    //
-	  }
-	else
-	  {
-	    print_exception (env.exception (), "BOA::get_request");
-	    return 1;
-	  }
-      }
-    env.clear ();
-  }
-
-  //
-  // Shut down the OA -- recycles all underlying resources (e.g. file
-  // descriptors, etc).
-  //
-  // XXX shutdown is not quite the same as release, unless we want mem
-  // leaks to cause some rude failure modes.  BOA just hasn't been
-  // updated yet to have any handshake about this though.
-  //
-  oa_ptr->Release ();
-  return 0;
-}
-
-
-//
-// Standard command line parsing utilities used.
-//
-int
-main (int    argc, char   *argv[])
-{
-  CORBA_Environment	env;
-  CORBA_ORB_ptr	orb_ptr;
-  CORBA_BOA_ptr		oa_ptr;
-  CORBA_String	key = (CORBA_String) "elvis";
-  char		*oa_name = 0;
-  char		*orb_name = "internet";
-  int			idle = -1;
-
-  //
-  // Parse the command line, get options
-  //
-  ACE_Get_Opt get_opt (argc, argv, "di:ln:O:x");
-  int			c;
-
-  while ((c = get_opt ()) != -1)
-    switch (c)
-      {
-      case 'd':			// more debug noise
-	TAO_debug_level++;
-	continue;
-
-      case 'i':			// idle seconds b4 exit
-	idle = ACE_OS::atoi (get_opt.optarg);
-	continue;
-
-      case 'k':			// key (str)
-	key = (CORBA_String) get_opt.optarg;
-	continue;
-
-      case 'o':			// orb name
-	orb_name = get_opt.optarg;
-	continue;
-
-      case 'p':			// portnum
-	oa_name = get_opt.optarg;
-	continue;
-
-	// XXX set debug filters ...
-
-	//
-	// XXX ignore OMG-specified options ... hope nobody ever tries
-	// to use that "-ORB* param" and "-OA* param" syntax, it flies
-	// in the face of standard command parsing algorithms which
-	// require single-character option specifiers.
-	//
-
-
-      case '?':
-      default:
-	ACE_OS::fprintf (stderr, "usage:  %s"
-			 " [-d]"
-			 " [-i idle_seconds]"
-			 " [-k object_key=elvis]"
-			 " [-o orbname=internet]"
-			 " [-p oa_name]"
-			 "\n", argv [0]
-			 );
-	return 1;
-      }
-
-  orb_ptr = CORBA_ORB_init (argc, argv, orb_name, env);
-  if (env.exception () != 0) {
-    print_exception (env.exception (), "ORB init");
-    return 1;
-  }
-
-  //
-  // The BOA may or may not actually be named ...
-  //
-  oa_ptr = CORBA_BOA::get_named_boa (orb_ptr, oa_name, env);
-  if (env.exception () != 0) 
-    {
-      print_exception (env.exception (), "OA init");
-      return 1;
-    }
-
-  return OA_listen (orb_ptr, oa_ptr, key, idle);
-}
-
-#if defined (ACE_TEMPLATES_REQUIRE_SPECIALIZATION)
-template CORBA_Octet cube(CORBA_Octet);
-template CORBA_Short cube(CORBA_Short);
-template CORBA_UShort cube(CORBA_UShort);
-template CORBA_Long cube(CORBA_Long);
-template CORBA_ULong cube(CORBA_ULong);
-#if	!defined (NONNATIVE_LONGLONG)
-	// don't try this on platforms that don't support
-	// math on longlongs ...
-template CORBA_LongLong cube(CORBA_LongLong);
-template CORBA_ULongLong cube(CORBA_ULongLong);
-#endif	// !NONNATIVE_LONGLONG
-template CORBA_Float cube(CORBA_Float);
-template CORBA_Double cube(CORBA_Double);
-#if	!defined (NONNATIVE_LONGDOUBLE)
-	// don't try this on platforms that don't support
-	// math on long doubles ...
-template CORBA_LongDouble cube(CORBA_LongDouble);
-#endif	// !NONNATIVE_LONGDOUBLE
-#endif /* ACE_TEMPLATES_REQUIRE_SPECIALIZATION */
diff --git a/TAO/IIOP/tests/Cubit/VisiBroker/base_server/Makefile b/TAO/IIOP/tests/Cubit/VisiBroker/base_server/Makefile
deleted file mode 100644
index 9fdad280ffc..00000000000
--- a/TAO/IIOP/tests/Cubit/VisiBroker/base_server/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-include stdmk
-
-EXE = server 	
-
-all: $(EXE)
-
-clean:
-	-rm -f core *.o cubitC.* cubitS.* $(EXE) 
-	-rm -rf Templates.DB
-
-cubitS.cpp: cubit.idl
-	$(ORBCC) cubit.idl
-
-cubitC.cpp: cubit.idl
-	$(ORBCC) cubit.idl
-
-server: cubitS.o cubitC.o server.o Profile_Timer.o cubit_impl.o
-	$(CC) -o server cubitS.o cubitC.o cubit_impl.o server.o Profile_Timer.o \
-	$(LIBPATH) $(LIBORB) $(STDCC_LIBS)
diff --git a/TAO/IIOP/tests/Cubit/VisiBroker/base_server/Profile_Timer.cpp b/TAO/IIOP/tests/Cubit/VisiBroker/base_server/Profile_Timer.cpp
deleted file mode 100644
index a871b9cf179..00000000000
--- a/TAO/IIOP/tests/Cubit/VisiBroker/base_server/Profile_Timer.cpp
+++ /dev/null
@@ -1,127 +0,0 @@
-#include "Profile_Timer.h"
-
-/* Initialize interval timer. */
-
-Profile_Timer::Profile_Timer (void)
-{
-  char buf[20];
-  ::sprintf(buf, "/proc/%d", ::getpid ());
-
-  ::memset (&this->end_usage_, 0, sizeof this->end_usage_);
-  ::memset (&this->begin_usage_, 0, sizeof this->begin_usage_);
-  ::memset (&this->last_usage_, 0, sizeof this->last_usage_);
-  if ((this->proc_fd_ = ::open (buf, O_RDONLY, 0)) == -1)
-    ::perror (buf);
-}
-
-/* Terminate the interval timer. */
-Profile_Timer::~Profile_Timer (void)
-{
-  if (::close (this->proc_fd_) == -1)
-    ::perror ("Profile_Timer::~Profile_Timer");
-}
-
-/* Return the resource utilization. */
-
-void
-Profile_Timer::get_rusage (prusage_t &rusage)
-{
-  rusage = this->end_usage_;
-}
-
-/* Compute the amount of resource utilization since the start time. */
-
-void
-Profile_Timer::elapsed_rusage (prusage_t &rusage)
-{
-  rusage.pr_lwpid = this->end_usage_.pr_lwpid - this->last_usage_.pr_lwpid;
-  rusage.pr_count = this->end_usage_.pr_count - this->last_usage_.pr_count;
-  rusage.pr_minf  = this->end_usage_.pr_minf - this->last_usage_.pr_minf;
-  rusage.pr_majf  = this->end_usage_.pr_majf - this->last_usage_.pr_majf;
-  rusage.pr_inblk = this->end_usage_.pr_inblk - this->last_usage_.pr_inblk;
-  rusage.pr_oublk = this->end_usage_.pr_oublk - this->last_usage_.pr_oublk;
-  rusage.pr_msnd  = this->end_usage_.pr_msnd - this->last_usage_.pr_msnd;
-  rusage.pr_mrcv  = this->end_usage_.pr_mrcv - this->last_usage_.pr_mrcv;
-  rusage.pr_sigs  = this->end_usage_.pr_sigs - this->last_usage_.pr_sigs;
-  this->subtract (rusage.pr_wtime, this->end_usage_.pr_wtime, this->last_usage_.pr_wtime);
-  this->subtract (rusage.pr_ltime, this->end_usage_.pr_ltime, this->last_usage_.pr_ltime);
-  this->subtract (rusage.pr_slptime, this->end_usage_.pr_slptime, this->last_usage_.pr_slptime);
-  rusage.pr_vctx  = this->end_usage_.pr_vctx - this->last_usage_.pr_vctx;
-  rusage.pr_ictx  = this->end_usage_.pr_ictx - this->last_usage_.pr_ictx;
-  rusage.pr_sysc  = this->end_usage_.pr_sysc - this->last_usage_.pr_sysc;
-  rusage.pr_ioch  = this->end_usage_.pr_ioch - this->last_usage_.pr_ioch;
-}
-
-/* Compute the elapsed time. */
-
-void
-Profile_Timer::compute_times (Elapsed_Time &et, prusage_t &end, prusage_t &begin)
-{
-  timespec_t td;
-
-  this->subtract (td, end.pr_tstamp, begin.pr_tstamp);
-  et.real_time = td.tv_sec + ((double) td.tv_nsec) / (1000 * 1000 * 1000);
-  this->subtract (td, end.pr_utime, begin.pr_utime);
-  et.user_time = td.tv_sec + ((double) td.tv_nsec) / (1000 * 1000 * 1000);
-  this->subtract (td, end.pr_stime,  begin.pr_stime);
-  et.system_time = td.tv_sec + ((double) td.tv_nsec) / (1000 * 1000 * 1000);
-}
-
-/* Compute the amount of time that has elapsed between start and stop. */
-
-int
-Profile_Timer::elapsed_time (Elapsed_Time &et)
-{
-  this->compute_times (et, this->end_usage_, this->begin_usage_);
-  return 0;
-}
-
-/* Determine the difference between T1 and T2. */
-
-void
-Profile_Timer::subtract (timespec_t &tdiff, timespec_t &t1, timespec_t &t0)
-{
-  tdiff.tv_sec  = t1.tv_sec - t0.tv_sec;
-  tdiff.tv_nsec = t1.tv_nsec - t0.tv_nsec;
-
-  /* Normalize the time. */
-
-  while (tdiff.tv_nsec < 0)
-    {
-      tdiff.tv_sec--;
-      tdiff.tv_nsec += (1000 * 1000 * 1000);
-    }
-}
-
-#if defined (DEBUG)
-#include <stdlib.h>
-extern "C" int gettimeofday (timeval *tp);
-
-const int DEFAULT_ITERATIONS = 1000000;
-
-int
-main (int argc, char *argv[])
-{
-  Profile_Timer timer;
-  int           iterations = argc > 1 ? atoi (argv[1]) : DEFAULT_ITERATIONS;
-  timeval	tv;
-
-  timer.start ();
-
-  for (int i = 0; i < iterations; i++)
-    gettimeofday (&tv);
-
-  timer.stop ();
-
-  Profile_Timer::Elapsed_Time et;
-
-  timer.elapsed_time (et);
-
-  printf ("iterations = %d\n", iterations);
-  printf ("real time = %f secs, user time = %f secs, system time = %f secs\n",
-	  et.real_time, et.user_time, et.system_time);
-
-  printf ("time per call = %f usecs\n", (et.real_time / double (iterations)) * 1000000);
-  return 0;
-}
-#endif /* DEBUG */
diff --git a/TAO/IIOP/tests/Cubit/VisiBroker/base_server/Profile_Timer.h b/TAO/IIOP/tests/Cubit/VisiBroker/base_server/Profile_Timer.h
deleted file mode 100644
index f001f59be9a..00000000000
--- a/TAO/IIOP/tests/Cubit/VisiBroker/base_server/Profile_Timer.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/* -*- C++ -*- */
-/* An interval timer class using C++. */
-
-#if !defined (ACE_PROFILE_TIMER_H)
-#define ACE_PROFILE_TIMER_H
-
-#include <sys/types.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <sys/procfs.h>
-#include <stdio.h>
-#include <memory.h>
-
-class Profile_Timer
-{
-public:
-  struct Elapsed_Time
-    {
-      double real_time;
-      double user_time;
-      double system_time;
-    };
-
-  Profile_Timer (void);
-  ~Profile_Timer (void);
-  int  start (void);
-  int  stop (void);
-  int  elapsed_time (Elapsed_Time &et);
-  void elapsed_rusage (prusage_t &rusage);
-  void get_rusage (prusage_t &rusage);
-
-private:
-  void subtract (timespec_t &tdiff, timespec_t &t0, timespec_t &t1);
-  void compute_times (Elapsed_Time &et, prusage_t &, prusage_t &);
-
-  prusage_t begin_usage_;
-  prusage_t end_usage_;
-  prusage_t last_usage_;
-  int	    proc_fd_;
-};
-
-/* Start timing */
-
-inline int 
-Profile_Timer::start (void) 
-{
-  return ::ioctl (this->proc_fd_, PIOCUSAGE, &this->begin_usage_);
-}
-
-/* Stop timing */
-
-inline int 
-Profile_Timer::stop (void) 
-{
-  this->last_usage_ = this->end_usage_;
-  return ::ioctl (this->proc_fd_, PIOCUSAGE, &this->end_usage_);
-}
-
-#endif /* ACE_PROFILE_TIMER_H */
-
diff --git a/TAO/IIOP/tests/Cubit/VisiBroker/base_server/cubit.idl b/TAO/IIOP/tests/Cubit/VisiBroker/base_server/cubit.idl
deleted file mode 100644
index 3e2ea392619..00000000000
--- a/TAO/IIOP/tests/Cubit/VisiBroker/base_server/cubit.idl
+++ /dev/null
@@ -1,40 +0,0 @@
-// @(#)cubit.idl	1.1 95/09/10
-// Copyright 1994-1995 by Sun Microsystems, Inc.
-//
-//#pragma prefix	"Eng.SUN.COM"
-//#pragma version Cubit 1.1
-
-interface Cubit {
-    octet	cube_octet (in octet o);
-    short	cube_short (in short s);
-    long	cube_long (in long l);
-
-    struct Many {
-	octet	o;		// + 3 bytes padding (normally) ...
-	long	l;
-	short	s;		// + 2 bytes padding (normally) ...
-    };
-
-    Many	cube_struct (in Many values);
-
-    enum discrim {e_0th, e_1st, e_2nd, e_3rd, e_4th, e_5th};
-
-    union oneof
-    switch (discrim) {
-	// this is an easy union to interpret; no padding
-	// is needed between discriminant and value.
-      case e_0th:
-        octet		o;
-      case e_1st:
-        short		s;
-      case e_2nd:
-        long		l;
-      case e_3rd:
-      default:
-        Many		cm;
-    };
-
-    oneof	cube_union (in oneof values);
-
-    oneway void	please_exit ();
-};
diff --git a/TAO/IIOP/tests/Cubit/VisiBroker/base_server/cubit_impl.cpp b/TAO/IIOP/tests/Cubit/VisiBroker/base_server/cubit_impl.cpp
deleted file mode 100644
index 63c0bb3105f..00000000000
--- a/TAO/IIOP/tests/Cubit/VisiBroker/base_server/cubit_impl.cpp
+++ /dev/null
@@ -1,46 +0,0 @@
-#include "cubit_impl.h"
-
-CORBA::Octet Cubit_Impl:: cube_octet (CORBA::Octet o) {
-  return (CORBA::Octet) (o * o * o); 
-}
-
-CORBA::Short Cubit_Impl:: cube_short (CORBA::Short s) {
-  return (CORBA::Short) (s * s * s);
-}
-
-CORBA::Long Cubit_Impl:: cube_long (CORBA::Long l) {
-   return (CORBA::Long) (l * l * l);
-}
-
-Cubit::Many Cubit_Impl:: cube_struct (const Cubit::Many& values) {
-  Cubit::Many out_values;
-  out_values.o = values.o * values.o * values.o;
-  out_values.s = values.s * values.s * values.s;
-  out_values.l = values.l * values.l * values.l;
-  return out_values; 
-}
-
-Cubit::oneof Cubit_Impl:: cube_union (const Cubit::oneof& values) {
-  Cubit::oneof out_values;
-   switch (values._d ()) {
-   case Cubit::e_0th:
-     out_values.o (values.o () * values.o ()  * values.o ());
-     break;
-   case Cubit::e_1st:
-     out_values.s (values.s () * values.s () * values.s ());
-     break;
-   case Cubit::e_2nd:
-     out_values.l (values.l () * values.l () * values.l ());
-     break;
-   case Cubit::e_3rd:
-   default:
-     out_values.cm ().o = values.cm ().o * values.cm ().o * values.cm ().o ;
-     out_values.cm ().s = values.cm ().s * values.cm ().s * values.cm ().s ;
-     out_values.cm ().l = values.cm ().l * values.cm ().l * values.cm ().l ;
-     break;
-   }
-   return out_values;  
-}
-
-void Cubit_Impl:: please_exit () 
-  {}
diff --git a/TAO/IIOP/tests/Cubit/VisiBroker/base_server/cubit_impl.h b/TAO/IIOP/tests/Cubit/VisiBroker/base_server/cubit_impl.h
deleted file mode 100644
index 0f6fd7dd6db..00000000000
--- a/TAO/IIOP/tests/Cubit/VisiBroker/base_server/cubit_impl.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-#ifndef cubit_ih
-#define cubit_ih
-
-#include "cubitS.h"
-
-
-#ifdef Cubit_USE_BOA
-class Cubit_Impl : public virtual _sk_Cubit {
-#else
-class Cubit_Impl {
-#endif /* Cubit_USE_BOA */
-
-public:
-
-#ifdef Cubit_USE_BOA
-  Cubit_Impl (const char *obj_name = NULL) :
-             _sk_Cubit(obj_name)
-    {}
-#else
-  Cubit_Impl (const char *obj_name = NULL)
-    {}
-#endif /* Cubit_USE_BOA */
-
-   virtual CORBA::Octet cube_octet(CORBA::Octet o);
-   virtual CORBA::Short cube_short(CORBA::Short s);
-   virtual CORBA::Long cube_long(CORBA::Long l);
-   virtual Cubit::Many cube_struct(const Cubit::Many& values);
-   virtual Cubit::oneof cube_union(const Cubit::oneof& values);
-   virtual void please_exit();
-};
-
-#endif
diff --git a/TAO/IIOP/tests/Cubit/VisiBroker/base_server/server.cpp b/TAO/IIOP/tests/Cubit/VisiBroker/base_server/server.cpp
deleted file mode 100644
index a4a1c85ed47..00000000000
--- a/TAO/IIOP/tests/Cubit/VisiBroker/base_server/server.cpp
+++ /dev/null
@@ -1,49 +0,0 @@
-//**************************************************************************
-//
-// NAME :   tpr_server.cpp 
-// DESCRIPTION:  
-//
-// Server mainline
-//
-//****************************************************************************
-#include "cubit_impl.h"		// server header file
-
-int 
-main (int argc, char** argv)
-{
-
-  CORBA::ORB_var orb = CORBA::ORB_init(argc, argv);
-  CORBA::BOA_var boa = orb->BOA_init(argc, argv);
-
-#ifdef Cubit_USE_BOA
-  Cubit_Impl cb("Cubit");
-  cout << "Using BOA approach" << endl;
-#else
-  Cubit_Impl tied("Cubit");
-  _tie_Cubit<Cubit_Impl> cb(tied, "Cubit");
-
-  cout << "Using TIE approach" << endl;
-#endif /* Cubit_USE_BOA */
-  
-  //
-  // Go get some work to do....
-  //
-  try {
-
-    boa->obj_is_ready(&cb);
-
-    boa->impl_is_ready();
-
-  } catch (const CORBA::Exception &excep) {
-    cerr << "Server error: " << excep << endl;
-    return -1;
-  } catch (...) {
-    cerr << "Unknown exception" << endl;
-    return -1;
-  }
-
-  cout << "Cubit server is exiting." << endl;
-
-
-  return 0;
-}
diff --git a/TAO/IIOP/tests/Cubit/VisiBroker/base_server/stdmk b/TAO/IIOP/tests/Cubit/VisiBroker/base_server/stdmk
deleted file mode 100644
index df4125a38d8..00000000000
--- a/TAO/IIOP/tests/Cubit/VisiBroker/base_server/stdmk
+++ /dev/null
@@ -1,36 +0,0 @@
-CC = CC
-DEBUG = 
-
-ORBELINEDIR = /project/waltz/Orbeline2.0
-
-ORBCC = $(ORBELINEDIR)/bin/orbeline -v C -m S -c cpp -h h
-
-CCINCLUDES = -I. -I$(ORBELINEDIR)/include -I$(STL_DIR) -I$(ACE_DIR)
-
-CCFLAGS = -g $(CCINCLUDES) $(DEBUG) -DCubit_USE_BOA
-
-LIBPATH = -L$(ORBELINEDIR)/lib -L$(ACE_DIR)/ace
-
-STDCC_LIBS = -lsocket -lnsl -ldl -mt 
-
-LIBORB = -lorb
-
-LIBACE = -lACE
-
-.SUFFIXES: .C .o .h .hh .cc .cpp
-
-.C.o:
-	$(CC) $(CCFLAGS) -c -o $@ $<
- 
-.cc.o:
-	$(CC) $(CCFLAGS) -c -o $@ $<
-.cpp.o:
-	$(CC) $(CCFLAGS) -c -o $@ $<
- 
-.C.cpp:
-	$(CC) -E $(CCFLAGS) $< > $@
- 
-.cc.cpp:
-	$(CC) -E $(CCFLAGS) $< > $@
-
-
diff --git a/TAO/IIOP/tests/Cubit/VisiBroker/client/Makefile b/TAO/IIOP/tests/Cubit/VisiBroker/client/Makefile
deleted file mode 100644
index d9c26fe56f0..00000000000
--- a/TAO/IIOP/tests/Cubit/VisiBroker/client/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-include stdmk
-
-EXE = client 	
-
-all: $(EXE)
-
-clean:
-	-rm -f core *.o cubitC.* cubitS.* $(EXE) 
-	-rm -rf Templates.DB
-
-cubitS.cpp: cubit.idl
-	$(ORBCC) cubit.idl
-
-cubitC.cpp: cubit.idl
-	$(ORBCC) cubit.idl
-
-client: cubitC.o Profile_Timer.o client.o
-	$(CC) -o client cubitC.o Profile_Timer.o client.o \
-	$(LIBPATH) $(LIBORB) $(STDCC_LIBS)
diff --git a/TAO/IIOP/tests/Cubit/VisiBroker/client/Profile_Timer.cpp b/TAO/IIOP/tests/Cubit/VisiBroker/client/Profile_Timer.cpp
deleted file mode 100644
index a871b9cf179..00000000000
--- a/TAO/IIOP/tests/Cubit/VisiBroker/client/Profile_Timer.cpp
+++ /dev/null
@@ -1,127 +0,0 @@
-#include "Profile_Timer.h"
-
-/* Initialize interval timer. */
-
-Profile_Timer::Profile_Timer (void)
-{
-  char buf[20];
-  ::sprintf(buf, "/proc/%d", ::getpid ());
-
-  ::memset (&this->end_usage_, 0, sizeof this->end_usage_);
-  ::memset (&this->begin_usage_, 0, sizeof this->begin_usage_);
-  ::memset (&this->last_usage_, 0, sizeof this->last_usage_);
-  if ((this->proc_fd_ = ::open (buf, O_RDONLY, 0)) == -1)
-    ::perror (buf);
-}
-
-/* Terminate the interval timer. */
-Profile_Timer::~Profile_Timer (void)
-{
-  if (::close (this->proc_fd_) == -1)
-    ::perror ("Profile_Timer::~Profile_Timer");
-}
-
-/* Return the resource utilization. */
-
-void
-Profile_Timer::get_rusage (prusage_t &rusage)
-{
-  rusage = this->end_usage_;
-}
-
-/* Compute the amount of resource utilization since the start time. */
-
-void
-Profile_Timer::elapsed_rusage (prusage_t &rusage)
-{
-  rusage.pr_lwpid = this->end_usage_.pr_lwpid - this->last_usage_.pr_lwpid;
-  rusage.pr_count = this->end_usage_.pr_count - this->last_usage_.pr_count;
-  rusage.pr_minf  = this->end_usage_.pr_minf - this->last_usage_.pr_minf;
-  rusage.pr_majf  = this->end_usage_.pr_majf - this->last_usage_.pr_majf;
-  rusage.pr_inblk = this->end_usage_.pr_inblk - this->last_usage_.pr_inblk;
-  rusage.pr_oublk = this->end_usage_.pr_oublk - this->last_usage_.pr_oublk;
-  rusage.pr_msnd  = this->end_usage_.pr_msnd - this->last_usage_.pr_msnd;
-  rusage.pr_mrcv  = this->end_usage_.pr_mrcv - this->last_usage_.pr_mrcv;
-  rusage.pr_sigs  = this->end_usage_.pr_sigs - this->last_usage_.pr_sigs;
-  this->subtract (rusage.pr_wtime, this->end_usage_.pr_wtime, this->last_usage_.pr_wtime);
-  this->subtract (rusage.pr_ltime, this->end_usage_.pr_ltime, this->last_usage_.pr_ltime);
-  this->subtract (rusage.pr_slptime, this->end_usage_.pr_slptime, this->last_usage_.pr_slptime);
-  rusage.pr_vctx  = this->end_usage_.pr_vctx - this->last_usage_.pr_vctx;
-  rusage.pr_ictx  = this->end_usage_.pr_ictx - this->last_usage_.pr_ictx;
-  rusage.pr_sysc  = this->end_usage_.pr_sysc - this->last_usage_.pr_sysc;
-  rusage.pr_ioch  = this->end_usage_.pr_ioch - this->last_usage_.pr_ioch;
-}
-
-/* Compute the elapsed time. */
-
-void
-Profile_Timer::compute_times (Elapsed_Time &et, prusage_t &end, prusage_t &begin)
-{
-  timespec_t td;
-
-  this->subtract (td, end.pr_tstamp, begin.pr_tstamp);
-  et.real_time = td.tv_sec + ((double) td.tv_nsec) / (1000 * 1000 * 1000);
-  this->subtract (td, end.pr_utime, begin.pr_utime);
-  et.user_time = td.tv_sec + ((double) td.tv_nsec) / (1000 * 1000 * 1000);
-  this->subtract (td, end.pr_stime,  begin.pr_stime);
-  et.system_time = td.tv_sec + ((double) td.tv_nsec) / (1000 * 1000 * 1000);
-}
-
-/* Compute the amount of time that has elapsed between start and stop. */
-
-int
-Profile_Timer::elapsed_time (Elapsed_Time &et)
-{
-  this->compute_times (et, this->end_usage_, this->begin_usage_);
-  return 0;
-}
-
-/* Determine the difference between T1 and T2. */
-
-void
-Profile_Timer::subtract (timespec_t &tdiff, timespec_t &t1, timespec_t &t0)
-{
-  tdiff.tv_sec  = t1.tv_sec - t0.tv_sec;
-  tdiff.tv_nsec = t1.tv_nsec - t0.tv_nsec;
-
-  /* Normalize the time. */
-
-  while (tdiff.tv_nsec < 0)
-    {
-      tdiff.tv_sec--;
-      tdiff.tv_nsec += (1000 * 1000 * 1000);
-    }
-}
-
-#if defined (DEBUG)
-#include <stdlib.h>
-extern "C" int gettimeofday (timeval *tp);
-
-const int DEFAULT_ITERATIONS = 1000000;
-
-int
-main (int argc, char *argv[])
-{
-  Profile_Timer timer;
-  int           iterations = argc > 1 ? atoi (argv[1]) : DEFAULT_ITERATIONS;
-  timeval	tv;
-
-  timer.start ();
-
-  for (int i = 0; i < iterations; i++)
-    gettimeofday (&tv);
-
-  timer.stop ();
-
-  Profile_Timer::Elapsed_Time et;
-
-  timer.elapsed_time (et);
-
-  printf ("iterations = %d\n", iterations);
-  printf ("real time = %f secs, user time = %f secs, system time = %f secs\n",
-	  et.real_time, et.user_time, et.system_time);
-
-  printf ("time per call = %f usecs\n", (et.real_time / double (iterations)) * 1000000);
-  return 0;
-}
-#endif /* DEBUG */
diff --git a/TAO/IIOP/tests/Cubit/VisiBroker/client/Profile_Timer.h b/TAO/IIOP/tests/Cubit/VisiBroker/client/Profile_Timer.h
deleted file mode 100644
index f001f59be9a..00000000000
--- a/TAO/IIOP/tests/Cubit/VisiBroker/client/Profile_Timer.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/* -*- C++ -*- */
-/* An interval timer class using C++. */
-
-#if !defined (ACE_PROFILE_TIMER_H)
-#define ACE_PROFILE_TIMER_H
-
-#include <sys/types.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <sys/procfs.h>
-#include <stdio.h>
-#include <memory.h>
-
-class Profile_Timer
-{
-public:
-  struct Elapsed_Time
-    {
-      double real_time;
-      double user_time;
-      double system_time;
-    };
-
-  Profile_Timer (void);
-  ~Profile_Timer (void);
-  int  start (void);
-  int  stop (void);
-  int  elapsed_time (Elapsed_Time &et);
-  void elapsed_rusage (prusage_t &rusage);
-  void get_rusage (prusage_t &rusage);
-
-private:
-  void subtract (timespec_t &tdiff, timespec_t &t0, timespec_t &t1);
-  void compute_times (Elapsed_Time &et, prusage_t &, prusage_t &);
-
-  prusage_t begin_usage_;
-  prusage_t end_usage_;
-  prusage_t last_usage_;
-  int	    proc_fd_;
-};
-
-/* Start timing */
-
-inline int 
-Profile_Timer::start (void) 
-{
-  return ::ioctl (this->proc_fd_, PIOCUSAGE, &this->begin_usage_);
-}
-
-/* Stop timing */
-
-inline int 
-Profile_Timer::stop (void) 
-{
-  this->last_usage_ = this->end_usage_;
-  return ::ioctl (this->proc_fd_, PIOCUSAGE, &this->end_usage_);
-}
-
-#endif /* ACE_PROFILE_TIMER_H */
-
diff --git a/TAO/IIOP/tests/Cubit/VisiBroker/client/client.cpp b/TAO/IIOP/tests/Cubit/VisiBroker/client/client.cpp
deleted file mode 100644
index c2b1d4070ae..00000000000
--- a/TAO/IIOP/tests/Cubit/VisiBroker/client/client.cpp
+++ /dev/null
@@ -1,230 +0,0 @@
-//**************************************************************************
-//
-// NAME :   client.C 
-// DESCRIPTION:  
-//
-// Client for the Cubit example
-//
-//****************************************************************************
-
-#include <iostream.h>
-#include <stdio.h>
-#include <string.h>
-#include <time.h>
-#include <stdlib.h>
-#include "cubitC.h"
-#include "Profile_Timer.h"
-
-int LOOP_COUNT;
-char SERVER_HOST [1024];
-
-inline int func (unsigned i) { return i - 117; }
-void run_tests (Cubit_var, int);
-
-// = TITLE
-//     Parses the command line arguments and returns an error status
-//
-// = DESCRIPTION
-//     This method parses the command line arguments
-int parse_args(int argc, char *argv[])
-{
-  if (argc != 3) {
-    cerr << "Format: client <machine name> <loop count>" << endl;
-    return -1;
-  }
-
-  strcpy(SERVER_HOST, argv[1]);
-
-  LOOP_COUNT = atoi(argv[2]);
-  
-  return 0;  // Indicates successful parsing of command line
-}
-
-
-//
-// Mainline
-//
-int
-main (int argc, char *argv[])
-{
-  if (parse_args (argc, argv) != 0)
-    return -1;
-
-  Cubit_var cb;
-  // cout << "attempting to contact server at host " << SERVER_HOST << '\n' ;
- 
-  //
-  // Initialise client's binding to an
-  // arbitrary cubit server (at some host)
-  // 
-  try {
-    cb = Cubit::_bind ("Cubit", SERVER_HOST);
-
-  } catch (const CORBA::Exception & sysEx) {
-    cerr << "Binding failed: " << endl;
-    cerr << sysEx;
-  } catch (...) {
-    cerr << "Unexpected exception" << endl;
-  }       
-  
-  run_tests (cb, LOOP_COUNT);
-  return 0;
-}
-
-
-void
-run_tests (Cubit_var cb, int loop_count) 
-{
-    //
-  // Make the calls in a loop.
-  //
-  unsigned i;
-  unsigned call_count, error_count;
-
-  call_count = 0;
-  error_count = 0;
-
-  Profile_Timer pt;
-
-  pt.start();
-  //
-  // Cube an octet.
-  //
-  
-  for (i = 0; i < loop_count; i++)
-    {
-
-      call_count++;
-
-      CORBA::Octet arg_octet = func (i), ret_octet;
-
-      try {
-	ret_octet = cb->cube_octet (arg_octet);
-      
-      } catch (const CORBA::Exception &sysEx) {
-	cerr << "Call failed: " << endl;
-	cerr << sysEx;
-	error_count++;
-      } catch (...) {
-	cerr << "Unexpected exception" << endl;
-	error_count++;
-      }       
-
-      arg_octet = arg_octet * arg_octet * arg_octet;
-      if (arg_octet != ret_octet) {
-        printf ("** cube_octet(%d)  (--> %d)\n", arg_octet , ret_octet);
-        error_count++;
-      }
-    
-  
-  //
-  // Cube a short.
-  //
-      call_count++;
-
-      CORBA::Short arg_short = func (i), ret_short;
-
-      try {
-	ret_short = cb->cube_short (arg_short);
-       
-      } catch (const CORBA::Exception &sysEx) {
-	cerr << "Call failed: " << endl;
-	cerr << sysEx;
-	error_count++;
-      } catch (...) {
-	cerr << "Unexpected exception" << endl;
-	error_count++;
-      }       
-
-      arg_short = arg_short * arg_short * arg_short;
-      if (arg_short != ret_short) {
-        printf ("** cube_short(%d)  (--> %d)\n", arg_short , ret_short);
-        error_count++;
-      }
-
-  //
-  // Cube a long.
-  //
-  
-      call_count++;
-
-      CORBA::Long arg_long = func (i), ret_long;
-
-      try {
-	ret_long = cb->cube_long (arg_long);
-      } catch (const CORBA::Exception &sysEx) {
-	cerr << "Call failed: " << endl;
-	cerr << sysEx;
-	error_count++;
-      } catch (...) {
-	cerr << "Unexpected exception" << endl;
-	error_count++;
-      }       
-
-      arg_long = arg_long * arg_long * arg_long;
-      if (arg_long != ret_long) {
-        printf ("** cube_long(%d)  (--> %d)\n", arg_long , ret_long);
-        error_count++;
-      }
-
-
-      //
-      // Cube a "struct" ...
-      //
-      Cubit::Many	arg_struct, ret_struct;
-      
-       call_count++;
-       
-       arg_struct.l = func (i);
-       arg_struct.s = func (i);
-       arg_struct.o = func (i);
-       
-       try {
-         ret_struct = cb->cube_struct (arg_struct);
-
-       } catch (const CORBA::Exception &sysEx) {
-	 cerr << "Call failed: " << endl;
-	 cerr << sysEx;
-	 error_count++;
-       } catch (...) {
-	 cerr << "Unexpected exception" << endl;
-	 error_count++;
-       }       
-
-
-       arg_struct.l = arg_struct.l  * arg_struct.l  * arg_struct.l ;
-       arg_struct.s = arg_struct.s  * arg_struct.s  * arg_struct.s ;
-       arg_struct.o = arg_struct.o  * arg_struct.o  * arg_struct.o ;
-       
-       if (arg_struct.l  != ret_struct.l 
-           || arg_struct.s  != ret_struct.s 
-           || arg_struct.o  != ret_struct.o )
-         {
-           cerr << "** cube_struct ERROR\n";
-           error_count++;
-         }
-    }
-    
-  pt.stop();
-
-  Elapsed_Time et;
-  pt.elapsed_time(et);
-  
-  if (call_count > 0) 
-    {
-      if (error_count == 0)
-        {
-          unsigned long	us = et.real_time * 1000 * 1000;
-          
-          us /= call_count;
-          
-          if (us > 0)
-            printf ("cube average call ACE_OS::time\t= %ld.%.03ldms, \t"
-                            "%ld calls/second\n",
-                            us / 1000, us % 1000,
-                            1000000L / us);
-        }
-      
-      printf ("%d calls, %d errors\n", call_count, error_count);
-    }
-}
diff --git a/TAO/IIOP/tests/Cubit/VisiBroker/client/cubit.idl b/TAO/IIOP/tests/Cubit/VisiBroker/client/cubit.idl
deleted file mode 100644
index 3e2ea392619..00000000000
--- a/TAO/IIOP/tests/Cubit/VisiBroker/client/cubit.idl
+++ /dev/null
@@ -1,40 +0,0 @@
-// @(#)cubit.idl	1.1 95/09/10
-// Copyright 1994-1995 by Sun Microsystems, Inc.
-//
-//#pragma prefix	"Eng.SUN.COM"
-//#pragma version Cubit 1.1
-
-interface Cubit {
-    octet	cube_octet (in octet o);
-    short	cube_short (in short s);
-    long	cube_long (in long l);
-
-    struct Many {
-	octet	o;		// + 3 bytes padding (normally) ...
-	long	l;
-	short	s;		// + 2 bytes padding (normally) ...
-    };
-
-    Many	cube_struct (in Many values);
-
-    enum discrim {e_0th, e_1st, e_2nd, e_3rd, e_4th, e_5th};
-
-    union oneof
-    switch (discrim) {
-	// this is an easy union to interpret; no padding
-	// is needed between discriminant and value.
-      case e_0th:
-        octet		o;
-      case e_1st:
-        short		s;
-      case e_2nd:
-        long		l;
-      case e_3rd:
-      default:
-        Many		cm;
-    };
-
-    oneof	cube_union (in oneof values);
-
-    oneway void	please_exit ();
-};
diff --git a/TAO/IIOP/tests/Cubit/VisiBroker/client/stdmk b/TAO/IIOP/tests/Cubit/VisiBroker/client/stdmk
deleted file mode 100644
index df4125a38d8..00000000000
--- a/TAO/IIOP/tests/Cubit/VisiBroker/client/stdmk
+++ /dev/null
@@ -1,36 +0,0 @@
-CC = CC
-DEBUG = 
-
-ORBELINEDIR = /project/waltz/Orbeline2.0
-
-ORBCC = $(ORBELINEDIR)/bin/orbeline -v C -m S -c cpp -h h
-
-CCINCLUDES = -I. -I$(ORBELINEDIR)/include -I$(STL_DIR) -I$(ACE_DIR)
-
-CCFLAGS = -g $(CCINCLUDES) $(DEBUG) -DCubit_USE_BOA
-
-LIBPATH = -L$(ORBELINEDIR)/lib -L$(ACE_DIR)/ace
-
-STDCC_LIBS = -lsocket -lnsl -ldl -mt 
-
-LIBORB = -lorb
-
-LIBACE = -lACE
-
-.SUFFIXES: .C .o .h .hh .cc .cpp
-
-.C.o:
-	$(CC) $(CCFLAGS) -c -o $@ $<
- 
-.cc.o:
-	$(CC) $(CCFLAGS) -c -o $@ $<
-.cpp.o:
-	$(CC) $(CCFLAGS) -c -o $@ $<
- 
-.C.cpp:
-	$(CC) -E $(CCFLAGS) $< > $@
- 
-.cc.cpp:
-	$(CC) -E $(CCFLAGS) $< > $@
-
-
diff --git a/TAO/IIOP/tests/Cubit/results/Orbix b/TAO/IIOP/tests/Cubit/results/Orbix
deleted file mode 100644
index c3abce78d3f..00000000000
--- a/TAO/IIOP/tests/Cubit/results/Orbix
+++ /dev/null
@@ -1,133 +0,0 @@
-Cubit results over Ethernet with 20,000 calls
----------------------------------------------
-
-                               Clients  Latency (ms)            Calls/Sec
-
-MT-Orbix without filters       1        1.876                   533
-                               2        2.202                   454
-                               3        2.740                   364 
-
-MT-Orbix Thread-Per-Request    1        1.886                   530
-                               2        3.1                     322
-                               3        5.0                     200
-
-MT-Orbix Thread-Pool (25)      1        1.875                   533
-                               2        3.1                     322
-                               3        5.1                     196
-
-MT-Orbix Thread-Per-Session    1        2.002                   499
-                               2        3.306                   302
-                               3        5.15                    194
-        
-
-Cubit results over ATM with 20,000 calls
-----------------------------------------
-
-                               Clients  Latency (ms)            Calls/Sec
-
-MT-Orbix without filters       1        1.818                   550
-                               2        1.968                   508
-                               3        2.803                   356
-
-
-MT-Orbix Thread-Per-Request    1        1.846                   541
-                               2        3.1                     322
-                               3        4.98                    200
-
-MT-Orbix Thread-Pool (25)      1        1.913                   522
-                               2        3.18                    314
-                               3        5.1                     196
-
-MT-Orbix Thread-Per-Session    1        1.959                   510
-                               2        3.29                    303
-                               3        5.15                    194
-
-
-Prime_Factor results over ATM with 20,000 calls
------------------------------------------------
-
-                               Clients  Latency (ms)            Calls/Sec
-
-MT-Orbix without filters       1         7.918                  126
-                               2        14.300                   70                    
-                               3        21.000                   47
-
-
-MT-Orbix Thread-Per-Request    1         8.302                  120
-                               2        10.128                   98
-                               3        13.722                   72
-
-MT-Orbix Thread-Pool (25)      1         8.442                  118
-                               2        15.764                   63  
-                               3        22.595                   44
-
-MT-Orbix Thread-Per-Session    1         8.956                  111
-                               2         9.581                  104
-                               3        16.702                   59
-
-IO-intensive results over ATM with 20,000 calls
------------------------------------------------
-
-                               Clients  Latency (ms)            Calls/Sec
-
-MT-Orbix without filters       1        6.667                   149
-                               2       12.165                    82                    
-                               3       18.634                    54
-                                       
-                                       
-MT-Orbix Thread-Per-Request    1       6.812                    146
-                               2       6.937                    144
-                               3       7.706                    128
-                                       
-MT-Orbix Thread-Pool (25)      1       6.813                    146
-                               2       6.954                    144
-                               3       7.776                    128
-                                       
-MT-Orbix Thread-Per-Session    1       6.85                     145
-                               2       7.253                    137
-                               3       7.645                    130
-
-      TNF client-side profile for MT-Orbix without filters for 20000 calls
-
-Function name         %      self+desc.          mean     max      min     std.
-                     time       ms       calls  ms/call ms/call  ms/call   err
-________________________________________________________________________________
-cond_wait            6.23     4250.242   1824    2.330  106.171    1.205   0.091
-mutex_lock           0.23      159.830  56662    0.003    1.215    0.002   0.000
-mutex_unlock         0.22      146.756  56663    0.003    0.326    0.002   0.000
-cond_signal          0.09       61.030   1825    0.033    0.475    0.009   0.000
-rw_rdlock            0.01        7.179   1826    0.004    0.014    0.003   0.000
-rw_unlock            0.01        6.548   1827    0.004    0.014    0.003   0.000
-rw_wrlock            0.00        0.004      1    0.004    0.004    0.004   0.000
-
-       TNF server-side profile for MT-Orbix without filters for 20000 calls
-
-
-Function name         %      self+desc.          mean     max      min     std.
-                     time       ms       calls  ms/call ms/call  ms/call   err
-________________________________________________________________________________
-cond_timedwait       1.25      923.527    797    1.159   20.219    0.324   0.028
-mutex_lock           0.21      153.839  56435    0.003    4.342    0.002   0.000
-mutex_unlock         0.20      149.208  56433    0.003    3.559    0.002   0.000
-cond_signal          0.03       21.506    809    0.027    1.826    0.003   0.002
-rw_unlock            0.02       16.058   3224    0.005    2.915    0.003   0.001
-rw_rdlock            0.02       11.924   3221    0.004    0.087    0.003   0.000
-rw_wrlock            0.00        0.010      2    0.005    0.005    0.004   0.000
-
-       TNF server-side profile for MT-Orbix with thread-per-request for 20000 calls
-
-
-Function name         %      self+desc.          mean     max      min     std.
-                     time       ms       calls  ms/call ms/call  ms/call   err
-________________________________________________________________________________
-mutex_lock           0.55      797.890  57618    0.014    4.624    0.002   0.000
-cond_timedwait       0.52      748.560    478    1.566    3.918    0.222   0.019
-mutex_unlock         0.36      514.627  57616    0.009    3.975    0.002   0.000
-cond_signal          0.02       24.216   1151    0.021    1.161    0.002   0.001
-rw_rdlock            0.01       13.120   2301    0.006    1.180    0.003   0.001
-rw_unlock            0.01       10.575   2307    0.005    0.316    0.003   0.000
-thr_sigsetmask       0.00        1.949     30    0.065    1.064    0.013   0.035
-rw_wrlock            0.00        0.033      6    0.006    0.008    0.004   0.001
-
-
-
diff --git a/TAO/IIOP/tests/Cubit/results/TAO b/TAO/IIOP/tests/Cubit/results/TAO
deleted file mode 100644
index de4a7bf23ae..00000000000
--- a/TAO/IIOP/tests/Cubit/results/TAO
+++ /dev/null
@@ -1,92 +0,0 @@
-Cubit results over Ethernet with 20,000 calls
----------------------------------------------
-
-                                Clients         Latency (ms)      Calls/Sec
-                
-TAO reactive                    1               1.172             853
-                                2               1.342             745
-                                3               1.902             525
-
-TAO threaded version            1               1.174             851
-                                2               1.219             820
-                                3               1.600             625
-
-
-Cubit results over ATM with 20,000 calls
----------------------------------------------
-
-                                Clients         Latency (ms)      Calls/Sec
-
-TAO reactive                    1               1.161             861
-                                2               1.302             768
-                                3               1.732             577
-
-TAO threaded version            1               1.170             854
-                                2               1.3               769
-                                3               1.600             625
-
-
-Cubit results over ATM after optimizations with 20,000 calls
-------------------------------------------------------------
-
-                                Clients         Latency (ms)      Calls/Sec
-
-TAO reactive                    1               1.127             887
-                                2               1.238             807
-                                3               1.501             666
-
-TAO threaded version            1               1.057             946
-                                2               1.225             816
-                                3               1.471             679
-
-Prime_Factor results over ATM  with 20,000 calls
--------------------------------------------------
-
-                                Clients         Latency (ms)      Calls/Sec
-
-TAO reactive                    1               7.407             135
-                                2              13.7                73
-                                3              19.7                51    
-
-TAO threaded version            1               7.389             135
-                                2               8.080             124
-                                3              10.726              93
-
-IO-bound results over ATM  with 20,000 calls
---------------------------------------------
-
-                                Clients         Latency (ms)      Calls/Sec
-
-TAO reactive                    1               6.404             156
-                                2              11.909              83
-                                3              17.324              57
-                                               
-TAO threaded version            1               6.378             156
-                                2               6.449             155
-                                3               6.500             153
-
-
-
-
-                        Sample client-side profile for TAO for 20000 calls
-
-Function name         %      self+desc.          mean     max      min     std.
-                     time       ms       calls  ms/call ms/call  ms/call   err
-________________________________________________________________________________
-rw_rdlock            0.40      146.579  20006    0.007    1.200    0.005   0.000
-rw_unlock            0.25       91.386  20009    0.005    0.058    0.004   0.000
-mutex_lock           0.06       21.087   5265    0.004    0.178    0.002   0.000
-mutex_unlock         0.04       14.372   5271    0.003    0.075    0.002   0.000
-rw_wrlock            0.00        0.045      3    0.015    0.034    0.005   0.008
-
-
-                       Sample server-side profile for TAO for 20000 calls
-
-Function name         %      self+desc.          mean     max      min     std.
-                     time       ms       calls  ms/call ms/call  ms/call   err
-________________________________________________________________________________
-mutex_lock           1.12      154.491  54507    0.003    0.140    0.002   0.000
-mutex_unlock         1.06      145.638  54508    0.003    0.310    0.002   0.000
-rw_rdlock            0.27       37.265   6813    0.005    0.037    0.004   0.000
-rw_unlock            0.20       27.792   6813    0.004    0.045    0.004   0.000
-
diff --git a/TAO/IIOP/tests/Cubit/results/Visibroker b/TAO/IIOP/tests/Cubit/results/Visibroker
deleted file mode 100644
index 8d6bb2457c7..00000000000
--- a/TAO/IIOP/tests/Cubit/results/Visibroker
+++ /dev/null
@@ -1,79 +0,0 @@
-Cubit results over Ethernet with 20,000 calls
----------------------------------------------
-
-                               Clients  Latency (ms)          Calls/Sec
-
-
-Visibroker reactive            1        1.167                 856
-                               2        1.39                  718
-                               3        1.664                 600
-
-Visibroker thr-per-connection  1        1.077                 928
-                               2        1.228                 814
-                               3        1.789                 558
-        
-
-
-Cubit results over ATM with 20,000 calls
-----------------------------------------
-
-                               Clients  Latency (ms)          Calls/Sec
-
-Visibroker reactive            1        1.195                 836
-                               2        1.241                 805
-                               3        1.56                  641
-
-Visibroker thr-per-connection  1        1.060                 943
-                               2        1.327                 753
-                               3        2.108                 474
-
-
-Prime_Factor results over ATM with 20,000 calls
------------------------------------------------
-
-                               Clients  Latency (ms)            Calls/Sec
-
-Visibroker reactive            1         7.43                   134
-                               2        13.652                   73
-                               3        17.738                   56
-
-Visibroker thr-per-connection  1         7.371                  135
-                               2         8.561                  116
-                               3        11.376                   87
-
-IO-intensive results over ATM with 20,000 calls
------------------------------------------------
-
-                               Clients  Latency (ms)            Calls/Sec
-
-Visibroker reactive            1        6.424                   155
-                               2       11.895                    84
-                               3       17.468                    57
-                                       
-Visibroker thr-per-connection  1       6.41                     156
-                               2       6.496                    154
-                               3       6.524                    153
-
-
-
-
-                        TNF client-side profile for Visibroker for 20000 calls
-
-Function name         %      self+desc.          mean     max      min     std.
-                     time       ms       calls  ms/call ms/call  ms/call   err
-________________________________________________________________________________
-mutex_unlock         1.31      188.930  61797    0.003    1.027    0.002   0.000
-mutex_lock           1.21      175.465  61790    0.003    0.330    0.002   0.000
-
-
-                        TNF server-side profile for Visibroker for 20000 calls
-
-                                     Profile
-
-Function name         %      self+desc.          mean     max      min     std.
-                     time       ms       calls  ms/call ms/call  ms/call   err
-________________________________________________________________________________
-mutex_lock           0.18      165.141  60432    0.003    0.501    0.002   0.000
-mutex_unlock         0.16      153.891  60432    0.003    0.373    0.002   0.000
-
-
diff --git a/TAO/IIOP/tests/Cubit/results/orbs.xls b/TAO/IIOP/tests/Cubit/results/orbs.xls
deleted file mode 100644
index 149078dd383..00000000000
--- a/TAO/IIOP/tests/Cubit/results/orbs.xls
+++ /dev/null
diff --git a/TAO/IIOP/tests/Thruput_test/Makefile b/TAO/IIOP/tests/Thruput_test/Makefile
deleted file mode 100644
index e500179f2ae..00000000000
--- a/TAO/IIOP/tests/Thruput_test/Makefile
+++ /dev/null
@@ -1,53 +0,0 @@
-#----------------------------------------------------------------------------
-#	$Id$
-#
-#	Top-level Makefile for the TAO_TTCP benchmark
-#----------------------------------------------------------------------------
-
-#----------------------------------------------------------------------------
-#	Local macros
-#----------------------------------------------------------------------------
-
-LDLIBS     	= -lcorba
-
-PROG_SRCS 	= client.cpp ttcpC.cpp ttcpS.cpp ttcp_i.cpp server.cpp utils.cpp
-
-LSRC = $(PROG_SRCS)
-
-TTCP_CLIENT_OBJS = client.o ttcpC.o utils.o
-
-TTCP_SERVER_OBJS = server.o ttcpC.o ttcpS.o ttcp_i.o utils.o
-
-BIN = client server
-
-BUILD = $(BIN)
-
-VLDLIBS = $(LDLIBS:%=%$(VAR))
-
-#----------------------------------------------------------------------------
-#	Include macros and targets
-#----------------------------------------------------------------------------
-
-include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-include $(ACE_ROOT)/include/makeinclude/macros.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.lib.GNU
-#include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
-
-#----------------------------------------------------------------------------
-# Local modifications to variables imported by includes above.
-#----------------------------------------------------------------------------
-
-LDFLAGS    += -L../../proto/lib
-CPPFLAGS   += -I../../proto/include -DUSE_ACE_EVENT_HANDLING -DDEBUG #-DONEWAY
-
-server:	$(addprefix $(VDIR),$(TTCP_SERVER_OBJS))
-	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS)
-
-client:	$(addprefix $(VDIR),$(TTCP_CLIENT_OBJS))
-	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS)
-
-
-
diff --git a/TAO/IIOP/tests/Thruput_test/README b/TAO/IIOP/tests/Thruput_test/README
deleted file mode 100644
index 628ef0c50a4..00000000000
--- a/TAO/IIOP/tests/Thruput_test/README
+++ /dev/null
@@ -1,50 +0,0 @@
-		TAO_TTCP Benchmark README file
-
-This directory contains a modified version of the TTCP benchmark that
-uses the TAO ORB. TAO_TTCP is used to measure the throughput of TAO
-for sending different data types. This code tests sequences of short,
-long, octet, char, double, and richly-typed data such as a struct.
-This benchmark uses an interpretive form of marshaling the data by
-using the dynamic invocation interfaces provided by the TAO ORB.
-
-Organization
-------------
-
-client.cpp		Client main program
-server.cpp		Server main program
-ttcpC.cpp		Client side stubs
-ttcpS.cpp		Server side skeletons
-ttcpC.h			Header file for stubs
-ttcpS.h			Header file for the skeletons
-ttcp_i.cpp		Implementaion of the interface
-ttcp_i.h		Header for the implementation
-utils.cpp		Utilities to calculate throughput
-ttcp_decls.h		Common declarations
-
-Results
--------
-Throughput results are stored under the results directory. If testing
-for REMOTE transfers, use the ./results/REMOTE directory.
-
-Running the tests
------------------
-Three scripts are provided
-
-(1) run_server : runs the server. Be sure to change the host name
-(2) run_client : runs tests for various data types
-(3) run_test : called by run_client
-
-Compiling
----------
-
-Type make
-
-To provide for 2way tests (no data is sent in the reverse
-direction. Sender blocks for a minimal ACK), comment out the -DONEWAY
-flag from the CPPFLAGS
-
-TO-DO
------
-
-
--Aniruddha Gokhale
\ No newline at end of file
diff --git a/TAO/IIOP/tests/Thruput_test/client.cpp b/TAO/IIOP/tests/Thruput_test/client.cpp
deleted file mode 100644
index 51b0096d9f0..00000000000
--- a/TAO/IIOP/tests/Thruput_test/client.cpp
+++ /dev/null
@@ -1,336 +0,0 @@
-#include "ttcp_decl.h"
-#include "debug.h"
-
-#include <iostream.h>
-#include <fstream.h>
-
-void print_exception (const CORBA_Exception     *x,
-                      const char                  *info,
-                      FILE                        *stream
-                      );
-
-char Usage[] = "\
-Usage: client [-options] [ORBeline options] host \n\
-Common options:\n\
--l ##   length of bufs read from or written to network (default 8192)\n\
--A      align the start of buffers to this modulus (default 16384)\n\
--o      start buffers at this offset from the modulus (default 0)\n\
--v      verbose: print more statistics\n\
--d      set SO_DEBUG socket option\n\
--b ##   set socket buffer size (if supported)\n\
--f X    format for rate: k,K = kilo{bit,byte}; m,M = mega; g,G = giga\n\
--n ##    number of source bufs written to network (default 2048)\n\
--x	Use new lines after each entry in output file\n\
--h ##	Remote host to send data to\n\
--D      don't buffer TCP writes (sets TCP_NODELAY socket option)\n\
--L ##	Output file name for the data type used\n\
--S      <Total Data Size>\n\
--q      <type> Send Sequence: Enumeration for various data types:\n\
-s = short, l = long,  d = double, c = char\n\
-o = octet, S = struct, C = composite\n\
-";
-
-#if !defined (__cplusplus)
-typedef void (*SIG_TYP)(); 
-#endif 
-
-#ifdef SVR4
-void
-sigpipe (int foo)
-#else
-  void
-sigpipe ()
-#endif
-{
-}
-
-int fromlen;
-int domain = PF_INET;           /* Default is to use Internet domain sockets. */
-char *domainname;		/* Rendezvous address for UNIX domain sockets. */
-int fd;				/* fd of network socket */
-int buflen = 8 * 1024;		/* length of buffer */
-char *buf;			/* ptr to dynamic buffer */
-int nbuf = 2 * 1024;		/* number of buffers to send in sinkmode */
-
-int bufoffset = 0;		/* align buffer to this */
-int bufalign = 16 * 1024;	/* modulo this */
-
-int udp = 0;			/* 0 = tcp, !0 = udp */
-int options = 0;		/* socket options */
-int one = 1;			/* for 4.3 BSD style setsockopt() */
-short port = 5001;		/* TCP port number */
-char *host;                     /* ptr to name of host */
-int trans =1;			/* 0=receive, !0=transmit mode */
-int sinkmode = 1;		/* 0=normal I/O, !0=sink/source mode */
-int verbose = 0;		/* 0=print basic info, 1=print cpu rate, proc
-* resource usage. */
-int nodelay = 0;		/* set TCP_NODELAY socket option */
-int b_flag = 0;			/* use mread() */
-int sockbufsize = 0;		/* socket buffer size to use */
-int new_line=0;                /* This is a special flag */
-int write_to_file=1;            /* indecates writing to file (default)*/
-char fmt = 'K';			/* output format:k=kilobits,K=kilobytes,
-*  m = megabits, M = megabytes, 
-*  g = gigabits, G = gigabytes */
-int touchdata = 0;		/* access data after reading */
-
-struct hostent *addr;
-char *title = 0;
-
-char stats[128];
-unsigned long srcDataSize;	/* Total amount of source data */
-unsigned long nbytes;		/* bytes on net */
-unsigned long numCalls;		/* # of I/O system calls */
-double cput, realt;		/* user, real time (seconds) */
-unsigned long	dt;
-
-/* declare struct variables for various message types */
-ttcp_sequence::ShortSeq		*sseq;	
-ttcp_sequence::LongSeq		*lseq;	
-ttcp_sequence::OctetSeq		*oseq;	
-ttcp_sequence::DoubleSeq	*dseq;	
-ttcp_sequence::CharSeq		*cseq;	
-ttcp_sequence::StructSeq	*Sseq;
-
-static const char ior_prefix [] = "IOR:";
-static const char iiop_prefix [] = "iiop:";
-
-int
-main (int argc, char *argv[])
-{
-    
-  unsigned long addr_tmp;
-  unsigned short done = 0;
-  int c;
-    
-  CORBA_ORB_ptr	orb_ptr;
-  CORBA_Environment	env;
-  CORBA_Object_ptr	objref = CORBA_Object::_nil();
-  ttcp_sequence_ptr ttcp_seq;
-  unsigned		loop_count = 1;
-  int			exit_later = 0;
-  CORBA_String str;
-  fstream iorfile;
-
-  if (argc < 2)
-    goto usage;
-    
-  TAO_debug_level = 0;
-  while (!done && ((c = getopt (argc, argv, "d:vDb:h:f:l:n:A:o:L:xS:q:")) != -1))
-    {
-      switch (c)
-	{
-	case 'h':
-	  host = optarg;
-	  break;
-	case 'x':
-	  new_line = 1;
-	  break;
-	case 'L':
-	  title = optarg;
-	  break;
-	case 'd':
-	  TAO_debug_level = atoi(optarg);
-	  if (TAO_debug_level > 10)
-	    TAO_debug_level = 10;
-	  break;
-	case 'D':
-#ifdef TCP_NODELAY
-	  nodelay = 1;
-#else
-	  fprintf (stderr,
-		   "ttcp: -D option ignored: TCP_NODELAY socket option not supported\n");
-#endif
-	  break;
-	case 'n':
-	  nbuf = atoi (optarg);
-	  break;
-	case 'l':
-	  buflen = atoi (optarg);
-	  break;
-	case 'v':
-	  verbose = 1;
-	  break;
-	case 'A':
-	  bufalign = atoi (optarg);
-	  break;
-	case 'o':
-	  bufoffset = atoi (optarg);
-	  break;
-	case 'b':
-#if defined(SO_SNDBUF) || defined(SO_RCVBUF)
-	  sockbufsize = atoi (optarg);
-#else
-	  fprintf (stderr,
-		   "ttcp: -b option ignored: SO_SNDBUF/SO_RCVBUF socket options not supported\n");
-#endif
-	  break;
-	case 'f':
-	  fmt = *optarg;
-	  break;
-	case 'S':       /* total source data to send. */
-	  /* modify nbuf accordingly */
-	  srcDataSize = atoi(optarg);
-	  break;
-	case 'q':       /* Send sequence of desired data type */
-	  switch(*optarg){
-	  case 's':
-	    dt = SEND_SHORT;
-	    break;
-	  case 'l':
-	    dt = SEND_LONG;
-	    break;
-	  case 'd':
-	    dt = SEND_DOUBLE;
-	    break;
-	  case 'c':
-	    dt = SEND_CHAR;
-	    break;
-	  case 'o':
-	    dt = SEND_OCTET;
-	    break;
-	  case 'S':
-	    dt = SEND_STRUCT;
-	    break;
-	  case 'C':
-	    dt = SEND_COMPOSITE;
-	    break;
-	  }
-	  break;
-	case '?':
-	  done = 1;
-	  break;
-	default:
-	  goto usage;
-	}
-    }
-
-  //
-  // Transmitter
-  //
-  orb_ptr = CORBA_ORB_init(argc, argv, "internet", env);
-  if (env.exception () != 0) {
-    print_exception (env.exception (), "ORB initialization", stdout);
-    return 1;
-  }
-
-  str = CORBA_string_alloc(500);
-
-  // read the IOR from the file ior.txt
-  iorfile.open("ior.txt", ios::in);
-  iorfile >> ((char *)str);
-  iorfile.close();
-
-  cout << "Read IOR string as: " << ((char *)str) << endl;
-
-  objref = orb_ptr->string_to_object(str, env);
-  if (env.exception() != 0){
-    print_exception(env.exception(), "string2object", stdout);
-    return 1;
-  }
-  CORBA_string_free(str);
-
-
-  if (!CORBA_is_nil(objref)){
-    ttcp_seq = ttcp_sequence::_narrow(objref);
-
-    if (!CORBA_is_nil(ttcp_seq)){
-
-      /* modify nbuf according to Total data size */
-      nbuf = srcDataSize/buflen;
-      fprintf(stderr, "data size = %d, buflen = %d, nbuf = %d\n",srcDataSize, buflen, nbuf);
-
-      // 
-      // Prepare the Message to be sent
-      //
-		
-      errno = 0;
-      if ((buf = (char *) malloc (buflen + bufalign)) == (char *) NULL)
-	err ("malloc");
-      if (bufalign != 0)
-	buf += (bufalign - ((int) buf % bufalign) + bufoffset) % bufalign;
-		
-
-      cout << "Sizeof PerfStruct = " << sizeof(PerfStruct) << endl;
-      // fill the appropriate buffers
-      FillPattern (buf, buflen, dt);
-      //
-      // Start the timers on the client and server sides
-      //
-		
-      prep_timer ();
-      ttcp_seq->start_timer (env);
-      if (env.exception () != 0) {
-	print_exception (env.exception (), "start_timer operation", stdout);
-	return 1;
-      }
-#if defined (USE_QUANTIFY)
-      /* start recording quantify data from here */
-      quantify_clear_data();
-      quantify_start_recording_data();
-#endif
-      while (nbuf--)
-	{
-	  switch(dt){
-	  case SEND_SHORT:
-	    ttcp_seq->sendShortSeq(*sseq, env);
-	    nbytes += sseq->length()*sizeof(CORBA_Short);
-	    break;
-	  case SEND_LONG:
-	    ttcp_seq->sendLongSeq(*lseq, env);
-	    nbytes += lseq->length()*sizeof(CORBA_Long);
-	    break;
-	  case SEND_OCTET:
-	    ttcp_seq->sendOctetSeq(*oseq, env);
-	    nbytes += oseq->length()*sizeof(CORBA_Octet);
-	    break;
-	  case SEND_DOUBLE:
-	    ttcp_seq->sendDoubleSeq(*dseq, env);
-	    nbytes += dseq->length()*sizeof(CORBA_Double);
-	    break;
-	  case SEND_CHAR:
-	    ttcp_seq->sendCharSeq(*cseq, env);
-	    nbytes += cseq->length()*sizeof(CORBA_Char);
-	    break;
-	  case SEND_STRUCT:
-	    ttcp_seq->sendStructSeq(*Sseq, env);
-	    nbytes += Sseq->length()*sizeof(PerfStruct);
-	    break;
-	  }
-	  numCalls++;
-	  if (env.exception () != 0) {
-	    print_exception (env.exception (), "send operation", stdout);
-	    return 1;
-	  }
-	}
-#if defined(USE_QUANTIFY)
-      quantify_stop_recording_data();
-#endif
-      //
-      // Stop the timer
-      //
-      ttcp_seq->stop_timer(env);
-      if (env.exception () != 0) {
-	print_exception (env.exception (), "stop_timer operation", stdout);
-	return 1;
-      }
-      (void) read_timer (stats, sizeof (stats));
-		
-      // print results
-      PrintStats(); 
-
-    }
-  }
-
-  CORBA_release(ttcp_seq);
-  return(0);
-usage:
-  fprintf (stderr, Usage);
-  return 1;
-}
-
-
-
-
-
-
diff --git a/TAO/IIOP/tests/Thruput_test/run b/TAO/IIOP/tests/Thruput_test/run
deleted file mode 100755
index b746a09536d..00000000000
--- a/TAO/IIOP/tests/Thruput_test/run
+++ /dev/null
@@ -1 +0,0 @@
-client -S 67108864 -f m -D -l $1 -L temp -q $2 -b 65536 -d $3
diff --git a/TAO/IIOP/tests/Thruput_test/run_client b/TAO/IIOP/tests/Thruput_test/run_client
deleted file mode 100755
index 41f9fd5bc51..00000000000
--- a/TAO/IIOP/tests/Thruput_test/run_client
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/csh -f
-# All ATM tests: 64k socket Queue Size
-#
-# shorts
-run_test 67108864 128 mambo-atm.wustl.edu ./results/REMOTE/$1/sun-iiop.atm.64 s 
-sleep 5
-# longs
-run_test 67108864 128 mambo-atm.wustl.edu ./results/REMOTE/$1/sun-iiop.atm.64 l 
-sleep 5
-# octets
-run_test 67108864 128 mambo-atm.wustl.edu ./results/REMOTE/$1/sun-iiop.atm.64 o
-sleep 5
-# doubles
-run_test 67108864 128 mambo-atm.wustl.edu ./results/REMOTE/$1/sun-iiop.atm.64 d 
-sleep 5
-# chars
-#run_test 67108864 128 mambo-atm.wustl.edu ./results/REMOTE/$1/sun-iiop.atm.64 c 
-#sleep 5
-# structures
-run_test 67108864 128 mambo-atm.wustl.edu ./results/REMOTE/$1/sun-iiop.atm.64 S 
-sleep 5
-# Composite Structs
-#run_test 67108864 128 mambo-atm.wustl.edu ./results/REMOTE/$1/sun-iiop.atm.64 C 
-#sleep 5
-#
diff --git a/TAO/IIOP/tests/Thruput_test/run_server b/TAO/IIOP/tests/Thruput_test/run_server
deleted file mode 100755
index 9ce44a510b1..00000000000
--- a/TAO/IIOP/tests/Thruput_test/run_server
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/csh
-#
-# Usage: server <switches>
-# -u : use IOR 
-# -f m : output results in Mbps
-# -b <sock Q size> ** not implemented **
-# -OAhost <host name>  ************* must provide this for this version
-# -OAthread : use threaded version as opposed to reactive
-#
-server -u -f m -b 65536 -OAhost mambo-cip #-OAthread
diff --git a/TAO/IIOP/tests/Thruput_test/run_test b/TAO/IIOP/tests/Thruput_test/run_test
deleted file mode 100755
index e36938f42b6..00000000000
--- a/TAO/IIOP/tests/Thruput_test/run_test
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/csh -f
-if ($#argv < 3) then
-	echo "Usage: sclt <Total Data Size> <Max msg size> <destination> <TitleOfThisTest> <seq type>"
-	exit 1
-endif
-#
-@ msize=1024
-@ limit= ($argv[2] * 1024)
-#echo $limit
-#echo $msize 
-echo "Iteration#" 1 ": client -S" $1 "-D -f m -s -t -l" $msize "-h" $3 "-x -L" $4 "-q" $5 -b 65536
-client -S $1 -D -f m -l $msize -h $3 -x -L $4 -q $5 -b 65536
-set flag=0
-while ($msize <= $limit)
-  if ($flag == 0) goto label
-	echo "Iteration#" 1 ": client -S" $1 "-D -f m -l" $msize "-h" $3 "-x -L" $4 "-q" $5 -b 65536
-	client -S $1 -D -f m -l $msize -h $3 -x -L $4 -q $5 -b 65536
- label:
-  set flag=1
-  sleep 5
-  foreach i (2)
-	echo "Iteration#" $i ": client -S" $1 "-D -f m -s -t -l" $msize "-h" $3 "-x -L " $4 "-q" $5 -b 65536
-	client -S $1 -D -f m -l $msize -h $3 -x -L $4 -q $5 -b 65536
-  end
-	echo "---------------------------"
-	@ msize = ($msize * 2)
-	sleep 5
-end 
-
-echo " "
-echo "Done at:" 
-date
diff --git a/TAO/IIOP/tests/Thruput_test/server.cpp b/TAO/IIOP/tests/Thruput_test/server.cpp
deleted file mode 100644
index 6f1cf2c4895..00000000000
--- a/TAO/IIOP/tests/Thruput_test/server.cpp
+++ /dev/null
@@ -1,224 +0,0 @@
-#include "ttcp_i.h"
-
-#include <iostream.h>
-#include <fstream.h>
-
-void print_exception (const CORBA_Exception     *x,
-		      const char                  *info,
-		      FILE                        *stream
-		      );
-
-char Usage[] = "\
-Usage: server [options] \n\
-Common options:\n\
--l ##   length of bufs read from or written to network (default 8192)\n\
--A      align the start of buffers to this modulus (default 16384)\n\
--O      start buffers at this offset from the modulus (default 0)\n\
--v      verbose: print more statistics\n\
--d      set SO_DEBUG socket option\n\
--b ##   set socket buffer size (if supported)\n\
--f X    format for rate: k,K = kilo{bit,byte}; m,M = mega; g,G = giga\n\
--L ##	Output file name for the data type used\n\
-Options specific to -r:\n\
--B      for -s, only output full blocks as specified by -l (for TAR)\n\
--T      \"touch\": access each byte as it's read\n\
-";
-
-#if !defined (__cplusplus)
-typedef void (*SIG_TYP)(); 
-#endif 
-
-#ifdef SVR4
-void
-sigpipe (int foo)
-#else
-  void
-sigpipe ()
-#endif
-{
-}
-
-int fromlen;
-int domain = PF_INET;           /* Default is to use Internet domain sockets. */
-char *domainname;		/* Rendezvous address for UNIX domain sockets. */
-int fd;				/* fd of network socket */
-int buflen = 8 * 1024;		/* length of buffer */
-char *buf;			/* ptr to dynamic buffer */
-int nbuf = 2 * 1024;		/* number of buffers to send in sinkmode */
-
-int bufoffset = 0;		/* align buffer to this */
-int bufalign = 16 * 1024;	/* modulo this */
-
-int udp = 0;			/* 0 = tcp, !0 = udp */
-int options = 0;		/* socket options */
-int one = 1;			/* for 4.3 BSD style setsockopt() */
-short port = 5001;		/* TCP port number */
-char *host;                     /* ptr to name of host */
-int trans;			/* 0=receive, !0=transmit mode */
-int sinkmode = 0;		/* 0=normal I/O, !0=sink/source mode */
-int verbose = 0;		/* 0=print basic info, 1=print cpu rate, proc
-				 * resource usage. */
-int nodelay = 0;		/* set TCP_NODELAY socket option */
-int b_flag = 0;			/* use mread() */
-int sockbufsize = 0;		/* socket buffer size to use */
-int new_line=0;                /* This is a special flag */
-int write_to_file=1;            /* indecates writing to file (default)*/
-char fmt = 'K';			/* output format:k=kilobits,K=kilobytes,
-				 *  m = megabits, M = megabytes, 
-				 *  g = gigabits, G = gigabytes */
-int touchdata = 0;		/* access data after reading */
-
-struct hostent *addr;
-char *title = 0;
-
-char stats[128];
-unsigned long srcDataSize;	/* Total amount of source data */
-unsigned long nbytes;		/* bytes on net */
-unsigned long numCalls;		/* # of I/O system calls */
-double cput, realt;		/* user, real time (seconds) */
-unsigned long	dt;
-
-/* declare struct variables for various message types */
-ttcp_sequence::ShortSeq		*sseq;	
-ttcp_sequence::LongSeq		*lseq;	
-ttcp_sequence::OctetSeq		*oseq;	
-ttcp_sequence::DoubleSeq	*dseq;	
-ttcp_sequence::CharSeq		*cseq;	
-ttcp_sequence::StructSeq	*Sseq;
-
-unsigned short isDone = 0;
-ttcp_sequence_i *my_ttcp;
-
-//
-// forwarding support
-//
-static CORBA_Object_ptr       fwd_ref;
-
-int
-main (int argc, char *const *argv)
-{
-    
-  unsigned long addr_tmp;
-  int c;
-  unsigned short done = 0;
-  CORBA_Environment env;
-  CORBA_ORB_ptr     orb_ptr;
-  CORBA_BOA_ptr          oa_ptr;
-  CORBA_Boolean     do_fork = CORBA_B_FALSE;
-  CORBA_Boolean     do_threads = CORBA_B_FALSE;
-  CORBA_String      key = (CORBA_String) "key0";
-  char                *oa_name = "ROA";
-  char                *orb_name = "internet";
-  int                 idle = -1;
-  int use_ior = 0;
-  fstream iorfile;
-  CORBA_String str;
-
-    
-  if (argc < 2)
-    goto usage;
-    
-  orb_ptr = CORBA_ORB_init (argc, argv, orb_name, env);
-  if (env.exception () != 0) {
-    print_exception (env.exception (), "ORB init", stdout);
-    return 1;
-  }
-
-  oa_ptr = orb_ptr->BOA_init(argc, argv, oa_name);
-  if (env.exception () != 0) {
-    print_exception (env.exception (), "OA init", stdout);
-    return 1;
-  }
-
-  TAO_debug_level = 0;
-  // Now process the options other than Orbix specific options
-  while (!done && ((c = getopt (argc, argv, "ui:d:vb:f:l:L:")) != -1))
-    {
-      switch (c)
-	{
-	case 'u':
-	  use_ior = 1;
-	  orb_name = "";
-	  break;
-	case 'L':
-	  title = optarg;
-	  break;
-	case 'd':
-	  TAO_debug_level = atoi(optarg);
-	  if (TAO_debug_level > 10)
-	    TAO_debug_level = 10;
-	  break;
-	case 'l':
-	  buflen = atoi (optarg);
-	  break;
-	case 'i':
-	  idle = atoi (optarg);
-	  break;
-	case 'v':
-	  verbose = 1;
-	  break;
-	case 'b':
-#if defined(SO_SNDBUF) || defined(SO_RCVBUF)
-	  sockbufsize = atoi (optarg);
-#else
-	  fprintf (stderr,
-		   "ttcp: -b option ignored: SO_SNDBUF/SO_RCVBUF socket options not supported\n");
-#endif
-	  break;
-	case 'f':
-	  fmt = *optarg;
-	  break;
-	case 'O':
-	case '?':
-	  done = 1;
-	  break;
-	default:
-	  goto usage;
-	}
-    }
-    
-  //
-  // Receiver
-  //
-
-  iorfile.open("ior.txt", ios::out);
-  my_ttcp = new ttcp_sequence_i("TTCP_IIOP_test");
-  str = orb_ptr->object_to_string(my_ttcp, env);
-  if (env.exception() != 0)
-    {
-      print_exception (env.exception(), "object_to_string", stdout);
-      return 1;
-    }
-  iorfile << ((char *)str) << endl;
-
-#if defined (USE_QUANTIFY)
-  quantify_clear_data();
-  quantify_start_recording_data();
-#endif
-
-  ACE_Reactor::run_event_loop();
-
-#if 0
-  while (1)
-    {
-      int result = params->reactor()->handle_events ();
-
-      if (result == -1)
-	{
-	  terminationStatus = -1;
-	  break;
-	}
-    }
-#endif
-  return 0;
-usage:
-  fprintf (stderr, Usage);
-  return(1);
-}
-
-
-
-
-
-
-
diff --git a/TAO/IIOP/tests/Thruput_test/ttcp.idl b/TAO/IIOP/tests/Thruput_test/ttcp.idl
deleted file mode 100644
index eab3b148658..00000000000
--- a/TAO/IIOP/tests/Thruput_test/ttcp.idl
+++ /dev/null
@@ -1,32 +0,0 @@
-/* -*- C++ -*- */
-struct PerfStruct{
-  short	s;
-  char	c;
-  long	l;
-  octet o;
-  double d;
-  octet pad[8];  // to make it 32 bytes
-};
-
-// Richly typed data
-interface ttcp_sequence 
-{
-  typedef sequence<short> ShortSeq;
-  typedef sequence<long> LongSeq;
-  typedef sequence<double> DoubleSeq;
-  typedef sequence<char> CharSeq;
-  typedef sequence<octet> OctetSeq;
-  typedef sequence<PerfStruct> StructSeq;
-
-
-  // Routines to send sequences of various data types
-  oneway void sendShortSeq (in  ShortSeq ttcp_seq);
-  oneway void sendLongSeq (in  LongSeq ttcp_seq);
-  oneway void sendDoubleSeq (in  DoubleSeq ttcp_seq);
-  oneway void sendCharSeq (in  CharSeq ttcp_seq);
-  oneway void sendOctetSeq (in  OctetSeq ttcp_seq);
-  oneway void sendStructSeq (in  StructSeq ttcp_seq);
-
-  oneway void start_timer ();
-  oneway void stop_timer ();
-};
diff --git a/TAO/IIOP/tests/Thruput_test/ttcpC.cpp b/TAO/IIOP/tests/Thruput_test/ttcpC.cpp
deleted file mode 100644
index c301ec498b5..00000000000
--- a/TAO/IIOP/tests/Thruput_test/ttcpC.cpp
+++ /dev/null
@@ -1,1005 +0,0 @@
-#include <stdio.h>
-#include "ttcpC.h"
-
-// constructor
-ttcp_sequence::ttcp_sequence(STUB_Object *refdata)
-  : CORBA_Object(refdata)
-{
-}
-
-// static duplicate method
-ttcp_sequence_ptr ttcp_sequence::_duplicate(ttcp_sequence_ptr obj)
-{
-  void *dupl;
-
-  if (obj)
-    {
-      obj->AddRef();
-    }
-  return obj;
-}
-
-// static _narrow method
-ttcp_sequence_ptr ttcp_sequence::_narrow(CORBA_Object_ptr obj)
-{
-  CORBA_Environment env;
-  if (obj->_is_a("IDL:ttcp_sequence:1.0", env)){
-    STUB_Object *istub;
-    if (obj->QueryInterface(IID_STUB_Object, (void **)&istub) != NOERROR){
-      return ttcp_sequence::_nil();
-    }
-    ttcp_sequence_ptr new_obj = new ttcp_sequence(istub);
-    return ttcp_sequence::_duplicate(new_obj);
-  }
-  return ttcp_sequence::_nil();
-}
-
-ttcp_sequence_ptr ttcp_sequence::_nil()
-{
-  return (ttcp_sequence_ptr)NULL;
-}
-
-ttcp_sequence::ShortSeq::ShortSeq()
-  : _maximum(0),
-    _length(0),
-    _buffer(0),
-    _release(CORBA_B_FALSE)
-{
-}
-
-ttcp_sequence::ShortSeq::ShortSeq(CORBA_ULong max)
-  : _maximum(max),
-    _length(0),
-    _release(CORBA_B_FALSE)
-{
-  if (this->_maximum > 0){
-    this->_buffer = new CORBA_Short[this->_maximum];
-  } else {
-    this->_buffer = 0;
-  }
-}
-
-ttcp_sequence::ShortSeq::ShortSeq(CORBA_ULong max, CORBA_ULong length,
-				  CORBA_Short *value, CORBA_Boolean release)
-  : _maximum(max),
-    _length(length),
-    _buffer(value),
-    _release(release)
-{
-}
-
-ttcp_sequence::ShortSeq::~ShortSeq()
-{
-  this->_maximum = this->_length = 0;
-  if (this->_release != CORBA_B_FALSE)
-    delete this->_buffer;
-}
-
-void ttcp_sequence::ShortSeq::length(CORBA_ULong newlen)
-{
-  if (newlen > this->_maximum) {
-    CORBA_Short *temp = new CORBA_Short[newlen];
-    ::memcpy(temp, this->_buffer, (size_t(this->_length) * sizeof(CORBA_Short)));
-    if (this->_release)
-      delete this->_buffer;
-    else
-      this->_release = 1;
-
-    this->_maximum = newlen;
-    this->_buffer = temp;
-  }
-  if (newlen > this->_length)
-    memset(&this->_buffer[this->_length], 0, size_t(newlen - this->_length) *
-	   sizeof(CORBA_Short));
-  this->_length = newlen;
-}
-
-CORBA_ULong ttcp_sequence::ShortSeq::length() const
-{
-  return this->_length;
-}
-
-CORBA_Short& ttcp_sequence::ShortSeq::operator[](CORBA_ULong index)
-{
-        if (index >= this->_length)
-	  exit(1);
-        return this->_buffer[index];
-}
-
-const CORBA_Short& ttcp_sequence::ShortSeq::operator[](CORBA_ULong index) const
-{
-        if (index >= this->_length)
-	  exit(1);
-        return this->_buffer[index];
-}
-
-// LongSeq
-ttcp_sequence::LongSeq::LongSeq()
-  : _maximum(0),
-    _length(0),
-    _buffer(0),
-    _release(CORBA_B_FALSE)
-{
-}
-
-ttcp_sequence::LongSeq::LongSeq(CORBA_ULong max)
-  : _maximum(max),
-    _length(0),
-    _release(CORBA_B_FALSE)
-{
-  if (this->_maximum > 0){
-    this->_buffer = new CORBA_Long[this->_maximum];
-  } else {
-    this->_buffer = 0;
-  }
-}
-
-ttcp_sequence::LongSeq::LongSeq(CORBA_ULong max, CORBA_ULong length,
-				  CORBA_Long *value, CORBA_Boolean release)
-  : _maximum(max),
-    _length(length),
-    _buffer(value),
-    _release(release)
-{
-}
-
-ttcp_sequence::LongSeq::~LongSeq()
-{
-  this->_maximum = this->_length = 0;
-  if (this->_release != CORBA_B_FALSE)
-    delete this->_buffer;
-}
-
-void ttcp_sequence::LongSeq::length(CORBA_ULong newlen)
-{
-  if (newlen > this->_maximum) {
-    CORBA_Long *temp = new CORBA_Long[newlen];
-    ::memcpy(temp, this->_buffer, (size_t(this->_length) * sizeof(CORBA_Long)));
-    if (this->_release)
-      delete this->_buffer;
-    else
-      this->_release = 1;
-
-    this->_maximum = newlen;
-    this->_buffer = temp;
-  }
-  if (newlen > this->_length)
-    memset(&this->_buffer[this->_length], 0, size_t(newlen - this->_length) *
-	   sizeof(CORBA_Long));
-  this->_length = newlen;
-}
-
-CORBA_ULong ttcp_sequence::LongSeq::length() const
-{
-  return this->_length;
-}
-
-CORBA_Long& ttcp_sequence::LongSeq::operator[](CORBA_ULong index)
-{
-        if (index >= this->_length)
-	  exit(1);
-        return this->_buffer[index];
-}
-
-const CORBA_Long& ttcp_sequence::LongSeq::operator[](CORBA_ULong index) const
-{
-        if (index >= this->_length)
-	  exit(1);
-        return this->_buffer[index];
-}
-
-// DoubleSeq
-ttcp_sequence::DoubleSeq::DoubleSeq()
-  : _maximum(0),
-    _length(0),
-    _buffer(0),
-    _release(CORBA_B_FALSE)
-{
-}
-
-ttcp_sequence::DoubleSeq::DoubleSeq(CORBA_ULong max)
-  : _maximum(max),
-    _length(0),
-    _release(CORBA_B_FALSE)
-{
-  if (this->_maximum > 0){
-    this->_buffer = new CORBA_Double[this->_maximum];
-  } else {
-    this->_buffer = 0;
-  }
-}
-
-ttcp_sequence::DoubleSeq::DoubleSeq(CORBA_ULong max, CORBA_ULong length,
-				  CORBA_Double *value, CORBA_Boolean release)
-  : _maximum(max),
-    _length(length),
-    _buffer(value),
-    _release(release)
-{
-}
-
-ttcp_sequence::DoubleSeq::~DoubleSeq()
-{
-  this->_maximum = this->_length = 0;
-  if (this->_release != CORBA_B_FALSE)
-    delete this->_buffer;
-}
-
-void ttcp_sequence::DoubleSeq::length(CORBA_ULong newlen)
-{
-  if (newlen > this->_maximum) {
-    CORBA_Double *temp = new CORBA_Double[newlen];
-    ::memcpy(temp, this->_buffer, (size_t(this->_length) * sizeof(CORBA_Double)));
-    if (this->_release)
-      delete this->_buffer;
-    else
-      this->_release = 1;
-
-    this->_maximum = newlen;
-    this->_buffer = temp;
-  }
-  if (newlen > this->_length)
-    memset(&this->_buffer[this->_length], 0, size_t(newlen - this->_length) *
-	   sizeof(CORBA_Double));
-  this->_length = newlen;
-}
-
-CORBA_ULong ttcp_sequence::DoubleSeq::length() const
-{
-  return this->_length;
-}
-
-CORBA_Double& ttcp_sequence::DoubleSeq::operator[](CORBA_ULong index)
-{
-        if (index >= this->_length)
-	  exit(1);
-        return this->_buffer[index];
-}
-
-const CORBA_Double& ttcp_sequence::DoubleSeq::operator[](CORBA_ULong index) const
-{
-        if (index >= this->_length)
-	  exit(1);
-        return this->_buffer[index];
-}
-
-// Char seq
-ttcp_sequence::CharSeq::CharSeq()
-  : _maximum(0),
-    _length(0),
-    _buffer(0),
-    _release(CORBA_B_FALSE)
-{
-}
-
-ttcp_sequence::CharSeq::CharSeq(CORBA_ULong max)
-  : _maximum(max),
-    _length(0),
-    _release(CORBA_B_FALSE)
-{
-  if (this->_maximum > 0){
-    this->_buffer = new CORBA_Char[this->_maximum];
-  } else {
-    this->_buffer = 0;
-  }
-}
-
-ttcp_sequence::CharSeq::CharSeq(CORBA_ULong max, CORBA_ULong length,
-				  CORBA_Char *value, CORBA_Boolean release)
-  : _maximum(max),
-    _length(length),
-    _buffer(value),
-    _release(release)
-{
-}
-
-ttcp_sequence::CharSeq::~CharSeq()
-{
-  this->_maximum = this->_length = 0;
-  if (this->_release != CORBA_B_FALSE)
-    delete this->_buffer;
-}
-
-void ttcp_sequence::CharSeq::length(CORBA_ULong newlen)
-{
-  if (newlen > this->_maximum) {
-    CORBA_Char *temp = new CORBA_Char[newlen];
-    ::memcpy(temp, this->_buffer, (size_t(this->_length) * sizeof(CORBA_Char)));
-    if (this->_release)
-      delete this->_buffer;
-    else
-      this->_release = 1;
-
-    this->_maximum = newlen;
-    this->_buffer = temp;
-  }
-  if (newlen > this->_length)
-    memset(&this->_buffer[this->_length], 0, size_t(newlen - this->_length) *
-	   sizeof(CORBA_Char));
-  this->_length = newlen;
-}
-
-CORBA_ULong ttcp_sequence::CharSeq::length() const
-{
-  return this->_length;
-}
-
-CORBA_Char& ttcp_sequence::CharSeq::operator[](CORBA_ULong index)
-{
-        if (index >= this->_length)
-	  exit(1);
-        return this->_buffer[index];
-}
-
-const CORBA_Char& ttcp_sequence::CharSeq::operator[](CORBA_ULong index) const
-{
-        if (index >= this->_length)
-	  exit(1);
-        return this->_buffer[index];
-}
-
-//Octet Seq
-ttcp_sequence::OctetSeq::OctetSeq()
-  : _maximum(0),
-    _length(0),
-    _buffer(0),
-    _release(CORBA_B_FALSE)
-{
-}
-
-ttcp_sequence::OctetSeq::OctetSeq(CORBA_ULong max)
-  : _maximum(max),
-    _length(0),
-    _release(CORBA_B_FALSE)
-{
-  if (this->_maximum > 0){
-    this->_buffer = new CORBA_Octet[this->_maximum];
-  } else {
-    this->_buffer = 0;
-  }
-}
-
-ttcp_sequence::OctetSeq::OctetSeq(CORBA_ULong max, CORBA_ULong length,
-				  CORBA_Octet *value, CORBA_Boolean release)
-  : _maximum(max),
-    _length(length),
-    _buffer(value),
-    _release(release)
-{
-}
-
-ttcp_sequence::OctetSeq::~OctetSeq()
-{
-  this->_maximum = this->_length = 0;
-  if (this->_release != CORBA_B_FALSE)
-    delete this->_buffer;
-}
-
-void ttcp_sequence::OctetSeq::length(CORBA_ULong newlen)
-{
-  if (newlen > this->_maximum) {
-    CORBA_Octet *temp = new CORBA_Octet[newlen];
-    ::memcpy(temp, this->_buffer, (size_t(this->_length) * sizeof(CORBA_Octet)));
-    if (this->_release)
-      delete this->_buffer;
-    else
-      this->_release = 1;
-
-    this->_maximum = newlen;
-    this->_buffer = temp;
-  }
-  if (newlen > this->_length)
-    memset(&this->_buffer[this->_length], 0, size_t(newlen - this->_length) *
-	   sizeof(CORBA_Octet));
-  this->_length = newlen;
-}
-
-CORBA_ULong ttcp_sequence::OctetSeq::length() const
-{
-  return this->_length;
-}
-
-CORBA_Octet& ttcp_sequence::OctetSeq::operator[](CORBA_ULong index)
-{
-        if (index >= this->_length)
-	  exit(1);
-        return this->_buffer[index];
-}
-
-const CORBA_Octet& ttcp_sequence::OctetSeq::operator[](CORBA_ULong index) const
-{
-        if (index >= this->_length)
-	  exit(1);
-        return this->_buffer[index];
-}
-
-
-//struct seq
-ttcp_sequence::StructSeq::StructSeq()
-  : _maximum(0),
-    _length(0),
-    _buffer(0),
-    _release(CORBA_B_FALSE)
-{
-}
-
-ttcp_sequence::StructSeq::StructSeq(CORBA_ULong max)
-  : _maximum(max),
-    _length(0),
-    _release(CORBA_B_FALSE)
-{
-  if (this->_maximum > 0){
-    this->_buffer = new PerfStruct[this->_maximum];
-  } else {
-    this->_buffer = 0;
-  }
-}
-
-ttcp_sequence::StructSeq::StructSeq(CORBA_ULong max, CORBA_ULong length,
-				  PerfStruct *value, CORBA_Boolean release)
-  : _maximum(max),
-    _length(length),
-    _buffer(value),
-    _release(release)
-{
-}
-
-ttcp_sequence::StructSeq::~StructSeq()
-{
-  this->_maximum = this->_length = 0;
-  if (this->_release != CORBA_B_FALSE)
-    delete this->_buffer;
-}
-
-void ttcp_sequence::StructSeq::length(CORBA_ULong newlen)
-{
-  if (newlen > this->_maximum) {
-    PerfStruct *temp = new PerfStruct[newlen];
-    ::memcpy(temp, this->_buffer, (size_t(this->_length) * sizeof(PerfStruct)));
-    if (this->_release)
-      delete this->_buffer;
-    else
-      this->_release = 1;
-
-    this->_maximum = newlen;
-    this->_buffer = temp;
-  }
-  if (newlen > this->_length)
-    memset(&this->_buffer[this->_length], 0, size_t(newlen - this->_length) *
-	   sizeof(PerfStruct));
-  this->_length = newlen;
-}
-
-CORBA_ULong ttcp_sequence::StructSeq::length() const
-{
-  return this->_length;
-}
-
-PerfStruct& ttcp_sequence::StructSeq::operator[](CORBA_ULong index)
-{
-        if (index >= this->_length)
-	  exit(1);
-        return this->_buffer[index];
-}
-
-const PerfStruct& ttcp_sequence::StructSeq::operator[](CORBA_ULong index) const
-{
-        if (index >= this->_length)
-	  exit(1);
-        return this->_buffer[index];
-}
-
-
-/***************** TypeCodes **************/
-
-// encapsulated parameters for struct PerfStruct typecode
-static const CORBA_Long _oc_PerfStruct [] = {
-  // strings are encoded as length followed by the string. A length of 1 stands
-  // for the NULL character
-  MY_BYTE_SEX,   // byte order
-  1, 0,  // empty string, repoID
-  1, 0,  // empty string, struct name
-  6,     // 6 struct elements
-
-  // short
-  1, 0,  // empty string
-  tk_short,
-
-  // char
-  1, 0,
-  tk_char,
-
-  // long
-  1, 0,
-  tk_long,
-
-  // octet
-  1, 0,
-  tk_octet,
-
-  // double
-  1, 0,
-  tk_double,
-
-  // padding
-  1, 0,
-  tk_array,
-  12, // encapsulation length
-    MY_BYTE_SEX,
-    tk_octet,
-    8
-};
-
-
-static CORBA_TypeCode _tc__tc_PerfStruct(tk_struct, 
-					  sizeof _oc_PerfStruct, 
-					  (unsigned char *) &_oc_PerfStruct,
-					  CORBA_B_FALSE);
-CORBA_TypeCode_ptr _tc_PerfStruct = &_tc__tc_PerfStruct;
-
-// Typecodes for all the sequences
-
-// StructSeq
-static const CORBA_Long _oc_ttcp_sequence_StructSeq [] = {
-  MY_BYTE_SEX,  // byte order
-  tk_struct,  // sequence of struct
-  112,  // encapsulaton length
-    MY_BYTE_SEX,   // byte order
-    1, 0,  // empty string, repoID
-    1, 0,  // empty string, struct name
-    6,     // 6 struct elements
-
-    // short
-    1, 0,  // empty string
-    tk_short,
-
-    // char
-    1, 0,
-    tk_char,
-
-    // long
-    1, 0,
-    tk_long,
-
-    // octet
-    1, 0,
-    tk_octet,
-
-    // double
-    1, 0,
-    tk_double,
-
-    // padding
-    1, 0,
-    tk_array, // array
-    12, //encapsulation length
-      MY_BYTE_SEX,
-      tk_octet,
-      8,
-  0,   // a length of 0 => unbounded sequence
-};
-static CORBA_TypeCode _tc__tc_ttcp_sequence_StructSeq(tk_sequence,
-						      sizeof
-						      _oc_ttcp_sequence_StructSeq, 
-						      (unsigned char *)
-						      &_oc_ttcp_sequence_StructSeq,
-						      CORBA_B_FALSE);
-CORBA_TypeCode_ptr ttcp_sequence::_tc_StructSeq = &_tc__tc_ttcp_sequence_StructSeq; 
-
-// ShortSeq
-static const CORBA_Long _oc_ttcp_sequence_ShortSeq [] = {
-  MY_BYTE_SEX,  // byte order
-  tk_short,  // sequence of short
-  0,   // a length of 0 => unbounded sequence
-};
-static CORBA_TypeCode _tc__tc_ttcp_sequence_ShortSeq(tk_sequence,
-						      sizeof
-						      _oc_ttcp_sequence_ShortSeq, 
-						      (unsigned char *)
-						      &_oc_ttcp_sequence_ShortSeq, 
-						      CORBA_B_FALSE);
-CORBA_TypeCode_ptr ttcp_sequence::_tc_ShortSeq = &_tc__tc_ttcp_sequence_ShortSeq; 
-
-// LongSeq
-static const CORBA_Long _oc_ttcp_sequence_LongSeq [] = {
-  MY_BYTE_SEX,  // byte order
-  tk_long,  // sequence of long
-  0,   // a length of 0 => unbounded sequence
-};
-static CORBA_TypeCode _tc__tc_ttcp_sequence_LongSeq(tk_sequence,
-						      sizeof
-						      _oc_ttcp_sequence_LongSeq, 
-						      (unsigned char *)
-						      &_oc_ttcp_sequence_LongSeq, 
-						      CORBA_B_FALSE);
-CORBA_TypeCode_ptr ttcp_sequence::_tc_LongSeq = &_tc__tc_ttcp_sequence_LongSeq; 
-
-// DoubleSeq
-static const CORBA_Long _oc_ttcp_sequence_DoubleSeq [] = {
-  MY_BYTE_SEX,  // byte order
-  tk_double,  // sequence of doubles
-  0,   // a length of 0 => unbounded sequence
-};
-static CORBA_TypeCode _tc__tc_ttcp_sequence_DoubleSeq(tk_sequence,
-						      sizeof
-						      _oc_ttcp_sequence_DoubleSeq, 
-						      (unsigned char *)
-						      &_oc_ttcp_sequence_DoubleSeq, 
-						      CORBA_B_FALSE);
-CORBA_TypeCode_ptr ttcp_sequence::_tc_DoubleSeq = &_tc__tc_ttcp_sequence_DoubleSeq;
-
-// CharSeq
-static const CORBA_Long _oc_ttcp_sequence_CharSeq [] = {
-  MY_BYTE_SEX,  // byte order
-  tk_char,  // sequence of chars
-  0,   // a length of 0 => unbounded sequence
-};
-static CORBA_TypeCode _tc__tc_ttcp_sequence_CharSeq(tk_sequence,
-						      sizeof
-						      _oc_ttcp_sequence_CharSeq, 
-						      (unsigned char *)
-						      &_oc_ttcp_sequence_CharSeq, 
-						      CORBA_B_FALSE);
-CORBA_TypeCode_ptr ttcp_sequence::_tc_CharSeq = &_tc__tc_ttcp_sequence_CharSeq;
-
-//OctetSeq
-static const CORBA_Long _oc_ttcp_sequence_OctetSeq [] = {
-  MY_BYTE_SEX,  // byte order
-  tk_octet,  // sequence of octets
-  0,   // a length of 0 => unbounded sequence
-};
-static CORBA_TypeCode _tc__tc_ttcp_sequence_OctetSeq(tk_sequence,
-						      sizeof
-						      _oc_ttcp_sequence_OctetSeq, 
-						      (unsigned char *)
-						      &_oc_ttcp_sequence_OctetSeq, 
-						      CORBA_B_FALSE);
-CORBA_TypeCode_ptr ttcp_sequence::_tc_OctetSeq = &_tc__tc_ttcp_sequence_OctetSeq;
-
-
-
-/***************** All the methods ********************/
-
-//sendShortSeq
-static const TAO_Param_Data ttcp_sequence_sendShortSeq_params [] = {
-#ifndef ONEWAY
-  { _tc_CORBA_Void,
-    PARAM_RETURN,
-    0
-  },
-#endif
-  { ttcp_sequence::_tc_ShortSeq,
-    PARAM_IN,
-    0
-  }
-};
-
-static const TAO_Call_Data ttcp_sequence_sendShortSeq_TAO_Call_Data = {
-  "sendShortSeq",  // opname
-#ifndef ONEWAY
-  CORBA_B_TRUE,   // twoway
-  2,               // param count
-#else
-  CORBA_B_FALSE,  // oneway
-  1,
-#endif
-  &ttcp_sequence_sendShortSeq_params [0],
-  0, 0
-};
-
-// stub
-void ttcp_sequence::sendShortSeq(const ttcp_sequence::ShortSeq &ttcp_seq, 
-				 CORBA_Environment &env)
-{
-  STUB_Object *istub;
-  if (this->QueryInterface (IID_STUB_Object, (void **) &istub) != NOERROR){
-    env.exception (new CORBA_DATA_CONVERSION (COMPLETED_NO));
-    return;
-  }
-#ifndef ONEWAY
-  // twoway
-  istub->do_call(env, &ttcp_sequence_sendShortSeq_TAO_Call_Data, 0, &ttcp_seq);
-#else
-  istub->do_call(env, &ttcp_sequence_sendShortSeq_TAO_Call_Data, &ttcp_seq);
-#endif
-}
-
-//sendLongSeq
-static const TAO_Param_Data ttcp_sequence_sendLongSeq_params [] = {
-#ifndef ONEWAY
-  { _tc_CORBA_Void,
-    PARAM_RETURN,
-    0
-  },
-#endif
-  { ttcp_sequence::_tc_LongSeq,
-    PARAM_IN,
-    0
-  }
-};
-
-static const TAO_Call_Data ttcp_sequence_sendLongSeq_TAO_Call_Data = {
-  "sendLongSeq",  // opname
-#ifndef ONEWAY
-  CORBA_B_TRUE,   // twoway
-  2,               // param count
-#else
-  CORBA_B_FALSE,  // oneway
-  1,
-#endif
-  &ttcp_sequence_sendLongSeq_params [0],
-  0, 0
-};
-
-// stub
-void ttcp_sequence::sendLongSeq(const ttcp_sequence::LongSeq &ttcp_seq, 
-				 CORBA_Environment &env)
-{
-  STUB_Object *istub;
-  if (this->QueryInterface (IID_STUB_Object, (void **) &istub) != NOERROR){
-    env.exception (new CORBA_DATA_CONVERSION (COMPLETED_NO));
-    return;
-  }
-#ifndef ONEWAY
-  // twoway
-  istub->do_call(env, &ttcp_sequence_sendLongSeq_TAO_Call_Data, 0, &ttcp_seq);
-#else
-  istub->do_call(env, &ttcp_sequence_sendLongSeq_TAO_Call_Data, &ttcp_seq);
-#endif
-}
-
-//sendDoubleSeq
-static const TAO_Param_Data ttcp_sequence_sendDoubleSeq_params [] = {
-#ifndef ONEWAY
-  { _tc_CORBA_Void,
-    PARAM_RETURN,
-    0
-  },
-#endif
-  { ttcp_sequence::_tc_DoubleSeq,
-    PARAM_IN,
-    0
-  }
-};
-
-static const TAO_Call_Data ttcp_sequence_sendDoubleSeq_TAO_Call_Data = {
-  "sendDoubleSeq",  // opname
-#ifndef ONEWAY
-  CORBA_B_TRUE,   // twoway
-  2,               // param count
-#else
-  CORBA_B_FALSE,  // oneway
-  1,
-#endif
-  &ttcp_sequence_sendDoubleSeq_params [0],
-  0, 0
-};
-
-// stub
-void ttcp_sequence::sendDoubleSeq(const ttcp_sequence::DoubleSeq &ttcp_seq, 
-				 CORBA_Environment &env)
-{
-  STUB_Object *istub;
-  if (this->QueryInterface (IID_STUB_Object, (void **) &istub) != NOERROR){
-    env.exception (new CORBA_DATA_CONVERSION (COMPLETED_NO));
-    return;
-  }
-#ifndef ONEWAY
-  // twoway
-  istub->do_call(env, &ttcp_sequence_sendDoubleSeq_TAO_Call_Data, 0, &ttcp_seq);
-#else
-  istub->do_call(env, &ttcp_sequence_sendDoubleSeq_TAO_Call_Data, &ttcp_seq);
-#endif
-}
-
-//sendCharSeq
-static const TAO_Param_Data ttcp_sequence_sendCharSeq_params [] = {
-#ifndef ONEWAY
-  { _tc_CORBA_Void,
-    PARAM_RETURN,
-    0
-  },
-#endif
-  { ttcp_sequence::_tc_CharSeq,
-    PARAM_IN,
-    0
-  }
-};
-
-static const TAO_Call_Data ttcp_sequence_sendCharSeq_TAO_Call_Data = {
-  "sendCharSeq",  // opname
-#ifndef ONEWAY
-  CORBA_B_TRUE,   // twoway
-  2,               // param count
-#else
-  CORBA_B_FALSE,  // oneway
-  1,
-#endif
-  &ttcp_sequence_sendCharSeq_params [0],
-  0, 0
-};
-
-// stub
-void ttcp_sequence::sendCharSeq(const ttcp_sequence::CharSeq &ttcp_seq, 
-				 CORBA_Environment &env)
-{
-  STUB_Object *istub;
-  if (this->QueryInterface (IID_STUB_Object, (void **) &istub) != NOERROR){
-    env.exception (new CORBA_DATA_CONVERSION (COMPLETED_NO));
-    return;
-  }
-#ifndef ONEWAY
-  // twoway
-  istub->do_call(env, &ttcp_sequence_sendCharSeq_TAO_Call_Data, 0, &ttcp_seq);
-#else
-  istub->do_call(env, &ttcp_sequence_sendCharSeq_TAO_Call_Data, &ttcp_seq);
-#endif
-}
-
-//sendOctetSeq
-static const TAO_Param_Data ttcp_sequence_sendOctetSeq_params [] = {
-#ifndef ONEWAY
-  { _tc_CORBA_Void,
-    PARAM_RETURN,
-    0
-  },
-#endif
-  { ttcp_sequence::_tc_OctetSeq,
-    PARAM_IN,
-    0
-  }
-};
-
-static const TAO_Call_Data ttcp_sequence_sendOctetSeq_TAO_Call_Data = {
-  "sendOctetSeq",  // opname
-#ifndef ONEWAY
-  CORBA_B_TRUE,   // twoway
-  2,               // param count
-#else
-  CORBA_B_FALSE,  // oneway
-  1,
-#endif
-  &ttcp_sequence_sendOctetSeq_params [0],
-  0, 0
-};
-
-// stub
-void ttcp_sequence::sendOctetSeq(const ttcp_sequence::OctetSeq &ttcp_seq, 
-				 CORBA_Environment &env)
-{
-  STUB_Object *istub;
-  if (this->QueryInterface (IID_STUB_Object, (void **) &istub) != NOERROR){
-    env.exception (new CORBA_DATA_CONVERSION (COMPLETED_NO));
-    return;
-  }
-#ifndef ONEWAY
-  // twoway
-  istub->do_call(env, &ttcp_sequence_sendOctetSeq_TAO_Call_Data, 0, &ttcp_seq);
-#else
-  istub->do_call(env, &ttcp_sequence_sendOctetSeq_TAO_Call_Data, &ttcp_seq);
-#endif
-}
-
-//sendStructSeq
-static const TAO_Param_Data ttcp_sequence_sendStructSeq_params [] = {
-#ifndef ONEWAY
-  { _tc_CORBA_Void,
-    PARAM_RETURN,
-    0
-  },
-#endif
-  { ttcp_sequence::_tc_StructSeq,
-    PARAM_IN,
-    0
-  }
-};
-
-static const TAO_Call_Data ttcp_sequence_sendStructSeq_TAO_Call_Data = {
-  "sendStructSeq",  // opname
-#ifndef ONEWAY
-  CORBA_B_TRUE,   // twoway
-  2,               // param count
-#else
-  CORBA_B_FALSE,  // oneway
-  1,
-#endif
-  &ttcp_sequence_sendStructSeq_params [0],
-  0, 0
-};
-
-// stub
-void ttcp_sequence::sendStructSeq(const ttcp_sequence::StructSeq &ttcp_seq, 
-				 CORBA_Environment &env)
-{
-  STUB_Object *istub;
-  if (this->QueryInterface (IID_STUB_Object, (void **) &istub) != NOERROR){
-    env.exception (new CORBA_DATA_CONVERSION (COMPLETED_NO));
-    return;
-  }
-#ifndef ONEWAY
-  // twoway
-  istub->do_call(env, &ttcp_sequence_sendStructSeq_TAO_Call_Data, 0, &ttcp_seq);
-#else
-  istub->do_call(env, &ttcp_sequence_sendStructSeq_TAO_Call_Data, &ttcp_seq);
-#endif
-}
-
-// start timer
-#ifndef ONEWAY
-static const TAO_Param_Data ttcp_sequence_start_timer_params [] = {
-  { _tc_CORBA_Void,
-    PARAM_RETURN,
-    0
-  }
-};
-#endif
-
-static const TAO_Call_Data ttcp_sequence_start_timer_TAO_Call_Data = {
-  "start_timer", 
-#ifndef ONEWAY
-  CORBA_B_TRUE,  // twoway
-  1,
-  &ttcp_sequence_start_timer_params [0],
-#else
-  CORBA_B_FALSE,  // oneway
-  0,
-  0,
-#endif
-  0, 0
-};
-
-//stub
-void ttcp_sequence::start_timer(CORBA_Environment &env)
-{
-  STUB_Object *istub;
-  if (this->QueryInterface (IID_STUB_Object, (void **) &istub) != NOERROR){
-    env.exception (new CORBA_DATA_CONVERSION (COMPLETED_NO));
-    return;
-  }
-#ifndef ONEWAY
-  // twoway
-  istub->do_call(env, &ttcp_sequence_start_timer_TAO_Call_Data);
-#else
-  istub->do_call(env, &ttcp_sequence_start_timer_TAO_Call_Data);
-#endif
-}
-
-// stop timer
-#ifndef ONEWAY
-static const TAO_Param_Data ttcp_sequence_stop_timer_params [] = {
-  { _tc_CORBA_Void,
-    PARAM_RETURN,
-    0
-  }
-};
-#endif
-
-static const TAO_Call_Data ttcp_sequence_stop_timer_TAO_Call_Data = {
-  "stop_timer", 
-#ifndef ONEWAY
-  CORBA_B_TRUE,
-  1,
-  &ttcp_sequence_stop_timer_params[0],
-#else
-  CORBA_B_FALSE,  // oneway
-  0,
-  0,
-#endif
-  0, 0
-};
-
-//stub
-void ttcp_sequence::stop_timer(CORBA_Environment &env)
-{
-  STUB_Object *istub;
-  if (this->QueryInterface (IID_STUB_Object, (void **) &istub) != NOERROR){
-    env.exception (new CORBA_DATA_CONVERSION (COMPLETED_NO));
-    return;
-  }
-#ifndef ONEWAY
-  // twoway
-  istub->do_call(env, &ttcp_sequence_stop_timer_TAO_Call_Data);
-#else
-  istub->do_call(env, &ttcp_sequence_stop_timer_TAO_Call_Data);
-#endif
-}
diff --git a/TAO/IIOP/tests/Thruput_test/ttcpC.h b/TAO/IIOP/tests/Thruput_test/ttcpC.h
deleted file mode 100644
index e163dc7ff75..00000000000
--- a/TAO/IIOP/tests/Thruput_test/ttcpC.h
+++ /dev/null
@@ -1,227 +0,0 @@
-/**************************************************************************
-This file has been hand-crafted to work with the ORB API of TAO
-***************************************************************************/
-
-#ifndef TTCP_SEQUENCE_C_H
-#define TTCP_SEQUENCE_C_H
-
-#include <stdlib.h>
-#include <string.h>
-
-#include "corba/orb.h"
-#include "corba/stub.h"
-#include "debug.h"
-
-// mapping for PerfStruct
-struct PerfStruct{
-  CORBA_Short s;
-  CORBA_Char  c;
-  CORBA_Long  l;
-  CORBA_Octet o;
-  CORBA_Double d;
-  CORBA_Octet pad[8];
-
-
-  typedef CORBA_Octet pad_slice;
-  typedef pad_slice *pad_slice_ptr;
-
-  static inline pad_slice *pad_alloc() {
-    return new CORBA_Octet[8];
-  }
-
-  static inline void pad_free(pad_slice *data) {
-    if (data) delete[] data;
-  }
-
-};
-extern CORBA_TypeCode_ptr _tc_PerfStruct;
-
-class ttcp_sequence;
-typedef ttcp_sequence *ttcp_sequence_ptr;
-typedef ttcp_sequence_ptr ttcp_sequenceRef;
-
-class ttcp_sequence: public virtual CORBA_Object
-{
-public:
-  static ttcp_sequence_ptr _duplicate(ttcp_sequence_ptr obj);
-  static ttcp_sequence_ptr _narrow(CORBA_Object_ptr obj);
-  static ttcp_sequence_ptr _nil();
-
-
-  class ShortSeq
-  {
-  public:
-    ShortSeq();
-    ShortSeq(CORBA_ULong max);
-    ShortSeq(CORBA_ULong max,
-	     CORBA_ULong length,
-	     CORBA_Short *value,
-	     CORBA_Boolean release = CORBA_B_FALSE
-	     );
-    //    ShortSeq(const ShortSeq&);
-    ~ShortSeq();
-    CORBA_ULong maximum() const;
-    void length(CORBA_ULong);
-    CORBA_ULong length() const;
-    CORBA_Short &operator[](CORBA_ULong index);
-    const CORBA_Short &operator[](CORBA_ULong index) const;
-  private:
-    CORBA_ULong _maximum;
-    CORBA_ULong _length;
-    CORBA_Short *_buffer;
-    CORBA_Boolean _release;
-  };
-  static CORBA_TypeCode_ptr _tc_ShortSeq;
-
-  class LongSeq
-  {
-  public:
-    LongSeq();
-    LongSeq(CORBA_ULong max);
-    LongSeq(CORBA_ULong max,
-	    CORBA_ULong length,
-	    CORBA_Long *value,
-	    CORBA_Boolean release = CORBA_B_FALSE
-	    );
-    //    LongSeq(const LongSeq&);
-    ~LongSeq();
-    CORBA_ULong maximum() const;
-    void length(CORBA_ULong);
-    CORBA_ULong length() const;
-    CORBA_Long &operator[](CORBA_ULong index);
-    const CORBA_Long &operator[](CORBA_ULong index) const;
-  private:
-    CORBA_ULong _maximum;
-    CORBA_ULong _length;
-    CORBA_Long *_buffer;
-    CORBA_Boolean _release;
-  };
-  static CORBA_TypeCode_ptr _tc_LongSeq;
-
-  class DoubleSeq
-  {
-  public:
-    DoubleSeq();
-    DoubleSeq(CORBA_ULong max);
-    DoubleSeq(CORBA_ULong max,
-	      CORBA_ULong length,
-	      CORBA_Double *value,
-	      CORBA_Boolean release = CORBA_B_FALSE
-	      );
-    //    DoubleSeq(const DoubleSeq&);
-    ~DoubleSeq();
-    CORBA_ULong maximum() const;
-    void length(CORBA_ULong);
-    CORBA_ULong length() const;
-    CORBA_Double &operator[](CORBA_ULong index);
-    const CORBA_Double &operator[](CORBA_ULong index) const;
-  private:
-    CORBA_ULong _maximum;
-    CORBA_ULong _length;
-    CORBA_Double *_buffer;
-    CORBA_Boolean _release;
-  };
-  static CORBA_TypeCode_ptr _tc_DoubleSeq;
-
-  class CharSeq
-  {
-  public:
-    CharSeq();
-    CharSeq(CORBA_ULong max);
-    CharSeq(CORBA_ULong max,
-	    CORBA_ULong length,
-	    CORBA_Char *value,
-	    CORBA_Boolean release = CORBA_B_FALSE
-	    );
-    //    CharSeq(const CharSeq&);
-    ~CharSeq();
-    CORBA_ULong maximum() const;
-    void length(CORBA_ULong);
-    CORBA_ULong length() const;
-    CORBA_Char &operator[](CORBA_ULong index);
-    const CORBA_Char &operator[](CORBA_ULong index) const;
-  private:
-    CORBA_ULong _maximum;
-    CORBA_ULong _length;
-    CORBA_Char *_buffer;
-    CORBA_Boolean _release;
-  };
-  static CORBA_TypeCode_ptr _tc_CharSeq;
-
-  class OctetSeq
-  {
-  public:
-    OctetSeq();
-    OctetSeq(CORBA_ULong max);
-    OctetSeq(CORBA_ULong max,
-	     CORBA_ULong length,
-	     CORBA_Octet *value,
-	     CORBA_Boolean release = CORBA_B_FALSE
-	     );
-    //    OctetSeq(const OctetSeq&);
-    ~OctetSeq();
-    CORBA_ULong maximum() const;
-    void length(CORBA_ULong);
-    CORBA_ULong length() const;
-    CORBA_Octet &operator[](CORBA_ULong index);
-    const CORBA_Octet &operator[](CORBA_ULong index) const;
-  private:
-    CORBA_ULong _maximum;
-    CORBA_ULong _length;
-    CORBA_Octet *_buffer;
-    CORBA_Boolean _release;
-  };
-  static CORBA_TypeCode_ptr _tc_OctetSeq;
-
-  class StructSeq
-  {
-  public:
-    StructSeq();
-    StructSeq(CORBA_ULong max);
-    StructSeq(CORBA_ULong max,
-	      CORBA_ULong length,
-	      PerfStruct *value,
-	      CORBA_Boolean release = CORBA_B_FALSE
-	      );
-    //    StructSeq(const StructSeq&);
-    ~StructSeq();
-    CORBA_ULong maximum() const;
-    void length(CORBA_ULong);
-    CORBA_ULong length() const;
-    PerfStruct &operator[](CORBA_ULong index);
-    const PerfStruct &operator[](CORBA_ULong index) const;
-  private:
-    CORBA_ULong _maximum;
-    CORBA_ULong _length;
-    PerfStruct *_buffer;
-    CORBA_Boolean _release;
-  };
-  static CORBA_TypeCode_ptr _tc_StructSeq;
-
-
-  // now the methods
-  virtual void sendShortSeq(const ShortSeq& ttcp_seq, CORBA_Environment &);
-  virtual void sendLongSeq(const LongSeq& ttcp_seq, CORBA_Environment &);
-  virtual void sendDoubleSeq(const DoubleSeq& ttcp_seq, CORBA_Environment &);
-  virtual void sendOctetSeq(const OctetSeq& ttcp_seq, CORBA_Environment &);
-  virtual void sendCharSeq(const CharSeq& ttcp_seq, CORBA_Environment &);
-  virtual void sendStructSeq(const StructSeq& ttcp_seq, CORBA_Environment &);
-
-  virtual void start_timer(CORBA_Environment &);
-  virtual void stop_timer(CORBA_Environment &);
-
-protected:
-  ttcp_sequence() {}
-  ttcp_sequence(STUB_Object *refdata);
-  virtual ~ttcp_sequence() {}
-
-private:
-  ttcp_sequence(const ttcp_sequence &) {}
-  void operator=(const ttcp_sequence &) {}
-};
-
-#endif
-
-
-
-
diff --git a/TAO/IIOP/tests/Thruput_test/ttcpS.cpp b/TAO/IIOP/tests/Thruput_test/ttcpS.cpp
deleted file mode 100644
index c124dd60138..00000000000
--- a/TAO/IIOP/tests/Thruput_test/ttcpS.cpp
+++ /dev/null
@@ -1,321 +0,0 @@
-#include <iostream.h>
-#include "ttcpS.h"
-#include "corba/orb.h"
-#include "params.h"
-#include "iiopobj.h"
-#include "corba/optable.h"  // for registering our methods
-#include "corba/corbacom.h"
-
-TAO_Dynamic_Hash_OpTable tao_ttcp_sequence_optable(9); // 8 + 1 operations on our
-						       // interface 
-// operation database
-struct method_db
-{
-   CORBA_String opname;
-   TAO_Skeleton skel_ptr;
-};
-
-static const method_db ttcp_sequence_operations[] = {
-  {"_is_a", &_skel_ttcp_sequence::_ttcp_sequence_is_a_skel},
-   { "sendShortSeq", &_skel_ttcp_sequence::_ttcp_sequence_sendShortSeq_skel},
-   { "sendLongSeq", &_skel_ttcp_sequence::_ttcp_sequence_sendLongSeq_skel},
-   { "sendDoubleSeq", &_skel_ttcp_sequence::_ttcp_sequence_sendDoubleSeq_skel},
-   { "sendOctetSeq", &_skel_ttcp_sequence::_ttcp_sequence_sendOctetSeq_skel},
-   { "sendCharSeq", &_skel_ttcp_sequence::_ttcp_sequence_sendCharSeq_skel},
-   { "sendStructSeq", &_skel_ttcp_sequence::_ttcp_sequence_sendStructSeq_skel},
-   { "start_timer", &_skel_ttcp_sequence::_ttcp_sequence_start_timer_skel},
-   { "stop_timer", &_skel_ttcp_sequence::_ttcp_sequence_stop_timer_skel},
-   { 0, 0 }
-};
-
-// constructor
-_skel_ttcp_sequence::_skel_ttcp_sequence(const char *obj_name)
-{
-  CORBA_String_var  type_id = "IDL:ttcp_sequence:1.0"; // repository ID
-  IIOP_Object *data;  // IIOP object 
-  CORBA_BOA_ptr oa = TAO_OA_PARAMS::instance()->oa(); // underlying BOA
-  this->optable_ = &tao_ttcp_sequence_optable;     // operation database
-  CORBA_Long i;
-
-  // insert operation names into the operation table
-  for (i=0; i < 9; i++)
-    {
-      this->optable_->bind(ttcp_sequence_operations[i].opname,
-			   ttcp_sequence_operations[i].skel_ptr);
-    }
-
-  // setup an IIOP object
-  data = new IIOP_Object(type_id);
-  data->profile.iiop_version.major = IIOP::MY_MAJOR;
-  data->profile.iiop_version.minor = IIOP::MY_MINOR;
-  data->profile.host = ACE_OS::strdup(oa->get_addr().get_host_name());
-  data->profile.port = oa->get_addr().get_port_number();
-  data->profile.object_key.length = ACE_OS::strlen(obj_name);
-  data->profile.object_key.maximum = data->profile.object_key.length;
-  data->profile.object_key.buffer = new CORBA_Octet [(size_t)data->profile.object_key.length+1];
-  ACE_OS::memcpy(data->profile.object_key.buffer, obj_name,
-		 data->profile.object_key.length); // set the object key
-  this->set_parent(data);  // store the IIOP obj reference with ourselves
-  this->sub_ = this;               // set the most derived class to be ourselves
-  if (oa) oa->bind(data->profile.object_key, this);// register ourselves
-}
-
-// skeleton sendShortSeq
-void _skel_ttcp_sequence::_ttcp_sequence_sendShortSeq_skel(CORBA_ServerRequest &req, 
-							   CORBA_Object_ptr obj, 
-							   CORBA_Environment &env)
-{
-  CORBA_NVList_ptr        nvlist;
-  CORBA_NamedValue_ptr    nv;
-  CORBA_Any               temp_value(ttcp_sequence::_tc_ShortSeq);
-  ttcp_sequence_ptr       impl;
-
-  // now create a request and populate it with the typecodes
-  req.orb()->create_list (0, nvlist);
-  nv = nvlist->add_value(0, temp_value, CORBA_ARG_IN, env);
-
-  // retrieve params - call the interpreter to interpret the parameters for us.
-  req.params(nvlist, env);
-
-  ttcp_sequence::ShortSeq *value = (ttcp_sequence::ShortSeq *)nv->value()->value();
-
-  // now invoke the implementation
-  impl = (ttcp_sequence_ptr)(obj->get_subclass());
-  // now the magic of dynamic binding
-  impl->sendShortSeq(*value, env);
-
-  // result - NO result
-  CORBA_Any *any = new CORBA_Any(_tc_CORBA_Void, 0, CORBA_B_TRUE);
-  req.result(any, env);
-}
-
-// skeleton sendLongSeq
-void _skel_ttcp_sequence::_ttcp_sequence_sendLongSeq_skel(CORBA_ServerRequest &req, 
-							   CORBA_Object_ptr obj, 
-							   CORBA_Environment &env)
-{
-  CORBA_NVList_ptr        nvlist;
-  CORBA_NamedValue_ptr    nv;
-  CORBA_Any               temp_value(ttcp_sequence::_tc_LongSeq);
-  ttcp_sequence_ptr       impl;
-
-  // now create a request and populate it with the typecodes
-  req.orb()->create_list (0, nvlist);
-  nv = nvlist->add_value(0, temp_value, CORBA_ARG_IN, env);
-
-  // retrieve params - call the interpreter to interpret the parameters for us.
-  req.params(nvlist, env);
-
-  ttcp_sequence::LongSeq *value = (ttcp_sequence::LongSeq *)nv->value()->value();
-
-  // now invoke the implementation
-  impl = (ttcp_sequence_ptr)(obj->get_subclass());
-  // now the magic of dynamic binding
-  impl->sendLongSeq(*value, env);
-
-  // result - NO result
-  CORBA_Any *any = new CORBA_Any(_tc_CORBA_Void, 0, CORBA_B_TRUE);
-  req.result(any, env);
-}
-
-// skeleton sendDoubleSeq
-void _skel_ttcp_sequence::_ttcp_sequence_sendDoubleSeq_skel(CORBA_ServerRequest &req, 
-							   CORBA_Object_ptr obj, 
-							   CORBA_Environment &env)
-{
-  CORBA_NVList_ptr        nvlist;
-  CORBA_NamedValue_ptr    nv;
-  CORBA_Any               temp_value(ttcp_sequence::_tc_DoubleSeq);
-  ttcp_sequence_ptr       impl;
-
-  // now create a request and populate it with the typecodes
-  req.orb()->create_list (0, nvlist);
-  nv = nvlist->add_value(0, temp_value, CORBA_ARG_IN, env);
-
-  // retrieve params - call the interpreter to interpret the parameters for us.
-  req.params(nvlist, env);
-
-  ttcp_sequence::DoubleSeq *value = (ttcp_sequence::DoubleSeq *)nv->value()->value();
-
-  // now invoke the implementation
-  impl = (ttcp_sequence_ptr)(obj->get_subclass());
-  // now the magic of dynamic binding
-  impl->sendDoubleSeq(*value, env);
-
-  // result - NO result
-  CORBA_Any *any = new CORBA_Any(_tc_CORBA_Void, 0, CORBA_B_TRUE);
-  req.result(any, env);
-}
-
-// skeleton sendOctetSeq
-void _skel_ttcp_sequence::_ttcp_sequence_sendOctetSeq_skel(CORBA_ServerRequest &req, 
-							   CORBA_Object_ptr obj, 
-							   CORBA_Environment &env)
-{
-  CORBA_NVList_ptr        nvlist;
-  CORBA_NamedValue_ptr    nv;
-  CORBA_Any               temp_value(ttcp_sequence::_tc_OctetSeq);
-  ttcp_sequence_ptr       impl;
-
-  // now create a request and populate it with the typecodes
-  req.orb()->create_list (0, nvlist);
-  nv = nvlist->add_value(0, temp_value, CORBA_ARG_IN, env);
-
-  // retrieve params - call the interpreter to interpret the parameters for us.
-  req.params(nvlist, env);
-
-  ttcp_sequence::OctetSeq *value = (ttcp_sequence::OctetSeq *)nv->value()->value();
-
-  // now invoke the implementation
-  impl = (ttcp_sequence_ptr)(obj->get_subclass());
-  // now the magic of dynamic binding
-  impl->sendOctetSeq(*value, env);
-
-  // result - NO result
-  CORBA_Any *any = new CORBA_Any(_tc_CORBA_Void, 0, CORBA_B_TRUE);
-  req.result(any, env);
-}
-
-// skeleton sendCharSeq
-void _skel_ttcp_sequence::_ttcp_sequence_sendCharSeq_skel(CORBA_ServerRequest &req, 
-							   CORBA_Object_ptr obj, 
-							   CORBA_Environment &env)
-{
-  CORBA_NVList_ptr        nvlist;
-  CORBA_NamedValue_ptr    nv;
-  CORBA_Any               temp_value(ttcp_sequence::_tc_CharSeq);
-  ttcp_sequence_ptr       impl;
-
-  // now create a request and populate it with the typecodes
-  req.orb()->create_list (0, nvlist);
-  nv = nvlist->add_value(0, temp_value, CORBA_ARG_IN, env);
-
-  // retrieve params - call the interpreter to interpret the parameters for us.
-  req.params(nvlist, env);
-
-  ttcp_sequence::CharSeq *value = (ttcp_sequence::CharSeq *)nv->value()->value();
-
-  // now invoke the implementation
-  impl = (ttcp_sequence_ptr)(obj->get_subclass());
-  // now the magic of dynamic binding
-  impl->sendCharSeq(*value, env);
-
-  // result - NO result
-  CORBA_Any *any = new CORBA_Any(_tc_CORBA_Void, 0, CORBA_B_TRUE);
-  req.result(any, env);
-}
-
-// skeleton sendStructSeq
-void _skel_ttcp_sequence::_ttcp_sequence_sendStructSeq_skel(CORBA_ServerRequest &req, 
-							   CORBA_Object_ptr obj, 
-							   CORBA_Environment &env)
-{
-  CORBA_NVList_ptr        nvlist;
-  CORBA_NamedValue_ptr    nv;
-  CORBA_Any               temp_value(ttcp_sequence::_tc_StructSeq);
-  ttcp_sequence_ptr       impl;
-
-  // now create a request and populate it with the typecodes
-  req.orb()->create_list (0, nvlist);
-  nv = nvlist->add_value(0, temp_value, CORBA_ARG_IN, env);
-
-  // retrieve params - call the interpreter to interpret the parameters for us.
-  req.params(nvlist, env);
-
-  ttcp_sequence::StructSeq *value = (ttcp_sequence::StructSeq *)nv->value()->value();
-
-  // now invoke the implementation
-  impl = (ttcp_sequence_ptr)(obj->get_subclass());
-  // now the magic of dynamic binding
-  impl->sendStructSeq(*value, env);
-
-  // result - NO result
-  CORBA_Any *any = new CORBA_Any(_tc_CORBA_Void, 0, CORBA_B_TRUE);
-  req.result(any, env);
-}
-
-// skeleton start_timer
-void _skel_ttcp_sequence::_ttcp_sequence_start_timer_skel(CORBA_ServerRequest &req, 
-							   CORBA_Object_ptr obj, 
-							   CORBA_Environment &env)
-{
-  CORBA_NVList_ptr        nvlist;
-  ttcp_sequence_ptr       impl;
-
-  // now create a request and populate it with the typecodes
-  req.orb()->create_list (0, nvlist);
-
-  // retrieve params - call the interpreter to interpret the parameters for us.
-  req.params(nvlist, env);
-
-  // now invoke the implementation
-  impl = (ttcp_sequence_ptr)(obj->get_subclass());
-  // now the magic of dynamic binding
-  impl->start_timer(env);
-
-  // result - NO result
-  CORBA_Any *any = new CORBA_Any(_tc_CORBA_Void, 0, CORBA_B_TRUE);
-  req.result(any, env);
-}
-
-// skeleton stop_timer
-void _skel_ttcp_sequence::_ttcp_sequence_stop_timer_skel(CORBA_ServerRequest &req, 
-							   CORBA_Object_ptr obj, 
-							   CORBA_Environment &env)
-{
-  CORBA_NVList_ptr        nvlist;
-  ttcp_sequence_ptr       impl;
-
-  // now create a request and populate it with the typecodes
-  req.orb()->create_list (0, nvlist);
-
-  // retrieve params - call the interpreter to interpret the parameters for us.
-  req.params(nvlist, env);
-
-  // now invoke the implementation
-  impl = (ttcp_sequence_ptr)(obj->get_subclass());
-  // now the magic of dynamic binding
-  impl->stop_timer(env);
-
-  // result - NO result
-  CORBA_Any *any = new CORBA_Any(_tc_CORBA_Void, 0, CORBA_B_TRUE);
-  req.result(any, env);
-}
-
-void _skel_ttcp_sequence::_ttcp_sequence_is_a_skel (
-						    CORBA_ServerRequest	&req,
-						    CORBA_Object_ptr    obj,
-						    CORBA_Environment		&env
-						    )
-{
-  CORBA_NVList_ptr		nvlist;
-  CORBA_NamedValue_ptr	nv;
-  CORBA_Any			temp_value (_tc_CORBA_String);
-  char *type_id = "IDL:ttcp_sequence:1.0";
-
-  req.orb()->create_list (0, nvlist);
-  nv = nvlist->add_value (0, temp_value, CORBA_ARG_IN, env);
-
-  req.params (nvlist, env);
-  if (env.exception () != 0) {
-    dexc (env, "is_a_skel, get params");
-    return;
-  }
-
-  CORBA_Boolean		*retval;
-  CORBA_String		value = *(CORBA_String *)nv->value ()->value ();
-
-  cout << "object id = " << ((char *)value) << endl;
-  if (strcmp ((char *)value, (char *)type_id) == 0
-      || strcmp ((char *)value, _tc_CORBA_Object->id(env)) == 0)
-    retval = new CORBA_Boolean (CORBA_B_TRUE);
-  else
-    retval = new CORBA_Boolean (CORBA_B_FALSE);
-
-  CORBA_Any  		*any =
-    new CORBA_Any (_tc_CORBA_Boolean, retval, CORBA_B_TRUE);
-
-  req.result (any, env);
-  dexc (env, "_is_a, result");
-}
-
diff --git a/TAO/IIOP/tests/Thruput_test/ttcpS.h b/TAO/IIOP/tests/Thruput_test/ttcpS.h
deleted file mode 100644
index 0ee9412d275..00000000000
--- a/TAO/IIOP/tests/Thruput_test/ttcpS.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/**************************************************************************
-This file has been hand-crafted to work with the ORB API of TAO
-***************************************************************************/
-
-#ifndef TTCP_SEQUENCE_S_H
-#define TTCP_SEQUENCE_S_H
-
-#include <stdlib.h>
-#include <string.h>
-
-#include "ttcpC.h"
-
-
-class _skel_ttcp_sequence;
-typedef _skel_ttcp_sequence *_skel_ttcp_sequence_ptr;
-typedef _skel_ttcp_sequence *_skel_ttcp_sequence_ref;
-
-class _skel_ttcp_sequence: public ttcp_sequence
-{
-public:
-  // pure virtual functions implemented by the implementation class
-  virtual void sendShortSeq(const ShortSeq& ttcp_seq, CORBA_Environment &) = 0;
-  virtual void sendLongSeq(const LongSeq& ttcp_seq, CORBA_Environment &) = 0;
-  virtual void sendDoubleSeq(const DoubleSeq& ttcp_seq, CORBA_Environment &) = 0;
-  virtual void sendOctetSeq(const OctetSeq& ttcp_seq, CORBA_Environment &) = 0;
-  virtual void sendCharSeq(const CharSeq& ttcp_seq, CORBA_Environment &) = 0;
-  virtual void sendStructSeq(const StructSeq& ttcp_seq, CORBA_Environment &) = 0;
-  virtual void start_timer(CORBA_Environment &) = 0;
-  virtual void stop_timer(CORBA_Environment &) = 0;
-
-  // skeletons that do the upcall
-  static void _ttcp_sequence_is_a_skel (CORBA_ServerRequest &req, 
-					CORBA_Object_ptr obj,
-					CORBA_Environment &env);
-  static void _ttcp_sequence_sendShortSeq_skel (CORBA_ServerRequest &req,
-						CORBA_Object_ptr obj,
-						CORBA_Environment &env);
-  static void _ttcp_sequence_sendLongSeq_skel  (CORBA_ServerRequest &req,
-						CORBA_Object_ptr obj,
-						CORBA_Environment &env);
-  static void _ttcp_sequence_sendDoubleSeq_skel (CORBA_ServerRequest &req,
-						 CORBA_Object_ptr obj,
-						 CORBA_Environment &env);
-  static void _ttcp_sequence_sendOctetSeq_skel (CORBA_ServerRequest &req,
-						CORBA_Object_ptr obj,
-						CORBA_Environment &env);
-  static void _ttcp_sequence_sendCharSeq_skel (CORBA_ServerRequest &req,
-					       CORBA_Object_ptr obj,
-					       CORBA_Environment &env);
-  static void _ttcp_sequence_sendStructSeq_skel (CORBA_ServerRequest &req,
-						 CORBA_Object_ptr obj,
-						 CORBA_Environment &env);
-  static void _ttcp_sequence_start_timer_skel (CORBA_ServerRequest &req,
-					       CORBA_Object_ptr obj,
-					       CORBA_Environment &env);
-  static void _ttcp_sequence_stop_timer_skel (CORBA_ServerRequest &req,
-					      CORBA_Object_ptr obj,
-					      CORBA_Environment &env);
-protected:
-  _skel_ttcp_sequence(const char *obj_name = 0);
-  virtual ~_skel_ttcp_sequence() {}
-};
-
-#endif
-
-
-
-
diff --git a/TAO/IIOP/tests/Thruput_test/ttcp_decl.h b/TAO/IIOP/tests/Thruput_test/ttcp_decl.h
deleted file mode 100644
index e478a6f88c2..00000000000
--- a/TAO/IIOP/tests/Thruput_test/ttcp_decl.h
+++ /dev/null
@@ -1,151 +0,0 @@
-
-/*
- *    T T C P Header File
- *
- */
-
-/* This file includes all the declarations and prototypes */
-
-#ifndef _TTCP_DECL_H_
-#define _TTCP_DECL_H_
-
-#include "ttcpC.h"
-
-/* #define BSD43 */
-/* #define BSD42 */
-/* #define BSD41a */
-
-
-#include <stdio.h>
-#include <signal.h>
-#include <ctype.h>
-#include <errno.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <malloc.h>
-#include <string.h>
-#include <stdlib.h>
-#include <memory.h>
-#include <netinet/tcp.h>
-#include <arpa/inet.h>
-#include <netdb.h>
-#include <sys/time.h>		/* struct itimerval */
-#include <limits.h>
-#include <sys/un.h>
-#include <unistd.h>
-#include <iostream.h>
-#include <sys/resource.h>
-
-/* File to be included if Quantify is to be used */
-#if defined (USE_QUANTIFY)
-#include <quantify.h>
-#endif
-
-
-#if defined(SYSV)
-#define bcopy(b1,b2,n)  memcpy(b2,b1,n)
-#define bzero(b1,n)             memset(b1,0,n)
-#include <sys/times.h>
-#include <sys/param.h>
-#endif
-
-#if defined(SUNOS54)
-struct rusage
-  {
-    struct timeval ru_utime, ru_stime;
-  };
-#define RUSAGE_SELF 0
-#else
-#include <sys/resource.h>
-#endif
-
-/* define the data types to be sent */
-#define SEND_SHORT ((unsigned long)(1))
-#define SEND_LONG ((unsigned long)(2))
-#define SEND_CHAR ((unsigned long)(3))
-#define SEND_OCTET ((unsigned long)(4))
-#define SEND_DOUBLE ((unsigned long)(5))
-#define SEND_STRUCT ((unsigned long)(6))
-#define SEND_COMPOSITE ((unsigned long)(7))
- 
-/**************
-// Prototypes
-***************/
-void err (char *s);
-void mes (char *s);
-char *outfmt (double b);
-//static void getrusage (int ignored, register struct rusage *ru);
-static void gettimeofday (struct timeval *tp, struct timezone *zp);
-void prep_timer (void);
-double read_timer (char *str, int len);
-static void prusage (register struct rusage *r0, struct rusage *r1, struct timeval *e, struct timeval *b, char *outp);
-static void tvadd (struct timeval *tsum, struct timeval *t0, struct timeval *t1);
-static void tvsub (struct timeval *tdiff, struct timeval *t1, struct timeval *t0);
-static void psecs (long l, register char *cp);
-void delay (int us);
-int mread (int fd, register char *bufp, unsigned n);
-int Nread (int fd, void *buf, int count);
-int Nwrite (int fd, void *buf, int count);
-void FillPattern(register char *cp, register int bufLen, unsigned long dt);
-void PrintStats();
-int SetSocketBufferSize(int size, unsigned short isTrans);
-int SetNoDelay();
-void ProcessArguments(int argc, char **argv, unsigned short isTrans);
-
-/* Global variables defined here as extern */
-extern int fromlen;
-extern int domain;           	/* Default is to use Internet domain sockets. */
-extern char *domainname;	/* Rendezvous address for UNIX domain sockets. */
-extern int fd;			/* fd of network socket */
-
-extern int buflen;		/* length of buffer */
-extern char *buf;		/* ptr to dynamic buffer */
-extern int nbuf;		/* number of buffers to send in sinkmode */
-
-extern int bufoffset;		/* align buffer to this */
-extern int bufalign;		/* modulo this */
-
-extern int udp;			/* 0 = tcp, !0 = udp */
-extern int options;		/* socket options */
-extern int one;			/* for 4.3 BSD style setsockopt() */
-extern short port;		/* TCP port number */
-extern char *host;              /* ptr to name of host */
-extern int trans;		/* 0=receive, !0=transmit mode */
-extern int sinkmode;		/* 0=normal I/O, !0=sink/source mode */
-extern int verbose;			/* 0=print basic info, 1=print cpu rate, proc
-				 * resource usage. */
-extern int nodelay;		/* set TCP_NODELAY socket option */
-extern int b_flag;		/* use mread() */
-extern int sockbufsize;		/* socket buffer size to use */
-extern int new_line;            /* This is a special flag */
-extern int write_to_file;       /* indecates writing to file (default)*/
-extern char fmt;		/* output format:k=kilobits,K=kilobytes,
-				 *  m = megabits, M = megabytes, 
-				 *  g = gigabits, G = gigabytes */
-extern int touchdata;		/* access data after reading */
-
-extern struct hostent *addr;
-extern int errno;
-extern int optind;
-extern char *optarg;
-extern char *title;
-
-extern char stats[128];
-extern unsigned long srcDataSize;	/* Total amount of source data */
-extern unsigned long nbytes;		/* bytes on net */
-extern unsigned long numCalls;		/* # of I/O system calls */
-extern double cput, realt;		/* user, real time (seconds) */
-extern unsigned long	dt;
-
-extern unsigned short isDone;
-
-/* declare struct variables for various message types */
-extern ttcp_sequence::ShortSeq		*sseq;	
-extern ttcp_sequence::LongSeq		*lseq;	
-extern ttcp_sequence::OctetSeq		*oseq;	
-extern ttcp_sequence::DoubleSeq	        *dseq;	
-extern ttcp_sequence::CharSeq		*cseq;	
-extern ttcp_sequence::StructSeq	        *Sseq;
-
-#endif
diff --git a/TAO/IIOP/tests/Thruput_test/ttcp_i.cpp b/TAO/IIOP/tests/Thruput_test/ttcp_i.cpp
deleted file mode 100644
index daba9fe6139..00000000000
--- a/TAO/IIOP/tests/Thruput_test/ttcp_i.cpp
+++ /dev/null
@@ -1,88 +0,0 @@
-#include "ttcp_i.h"
-#include <iostream.h>
-
-/* the ttcp_i class implementation */
-ttcp_sequence_i::ttcp_sequence_i(const char *obj_name)
-  :_skel_ttcp_sequence(obj_name)
-{
-  this->nbytes_ = 0;
-  numCalls = 0;
-}
-
-
-void
-ttcp_sequence_i::start_timer (CORBA_Environment &IT_env)
-{
-    this->nbytes_ = 0;
-    ::prep_timer ();
-}
-
-void 
-ttcp_sequence_i::stop_timer (CORBA_Environment &IT_env)
-{
-  (void) ::read_timer (stats, sizeof (stats));
-	::nbytes = this->nbytes_;
-	::PrintStats();
-	// reset
-	this->nbytes_ = 0;
-	numCalls = 0;
-#if defined (USE_QUANTIFY)
-    quantify_stop_recording_data();
-    ACE_Reactor::end_event_loop();
-    cerr << "*********** just before exiting " << endl;
-#endif
-}
-
-void
-ttcp_sequence_i::sendShortSeq(const ttcp_sequence::ShortSeq& ttcp_seq, CORBA_Environment &IT_env)
-{
-    numCalls++;
-    this->nbytes_ += ttcp_seq.length()*sizeof(CORBA_Short);
-}
-
-void
-ttcp_sequence_i::sendLongSeq(const ttcp_sequence::LongSeq& ttcp_seq, CORBA_Environment &IT_env)
-{
-    numCalls++;
-    this->nbytes_ += ttcp_seq.length()*sizeof(CORBA_Long) ;
-}
-
-void
-ttcp_sequence_i::sendOctetSeq(const ttcp_sequence::OctetSeq& ttcp_seq, CORBA_Environment &IT_env)
-{
-    numCalls++;
-    this->nbytes_ += ttcp_seq.length()*sizeof(CORBA_Octet) ;
-}
-
-void
-ttcp_sequence_i::sendDoubleSeq(const ttcp_sequence::DoubleSeq& ttcp_seq, CORBA_Environment &IT_env)
-{
-    numCalls++;
-    this->nbytes_ += ttcp_seq.length()*sizeof(CORBA_Double) ;
-}
-
-void
-ttcp_sequence_i::sendCharSeq(const ttcp_sequence::CharSeq& ttcp_seq, CORBA_Environment &IT_env)
-{
-    numCalls++;
-    this->nbytes_ += ttcp_seq.length()*sizeof(CORBA_Char) ;
-}
-
-void
-ttcp_sequence_i::sendStructSeq(const ttcp_sequence::StructSeq& ttcp_seq, CORBA_Environment &IT_env)
-{
-    numCalls++;
-    this->nbytes_ += ttcp_seq.length()*sizeof(PerfStruct) ;
-#ifdef DEBUG
-    //    cout << "Bytes received so far = " << this->nbytes_ << endl;
-#endif
-}
-
-
-
-
-
-
-
-
-
diff --git a/TAO/IIOP/tests/Thruput_test/ttcp_i.h b/TAO/IIOP/tests/Thruput_test/ttcp_i.h
deleted file mode 100644
index dcac4813cdf..00000000000
--- a/TAO/IIOP/tests/Thruput_test/ttcp_i.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/* -*- C++ -*- */
-
-// ttcp_i.h
-// 
-// This header file provides facility to use it either as a BOA approach or as
-// a TIE approach.
-//
-#if !defined (TTCP_I_H)
-#define TTCP_I_H
-
-#include "ttcp_decl.h"
-#include "ttcpS.h"
-
-/* define the data types to be sent */
-#define SEND_SHORT ((unsigned long)(1))
-#define SEND_LONG ((unsigned long)(2))
-#define SEND_CHAR ((unsigned long)(3))
-#define SEND_OCTET ((unsigned long)(4))
-#define SEND_DOUBLE ((unsigned long)(5))
-#define SEND_STRUCT ((unsigned long)(6))
-
-
-class ttcp_sequence_i: public _skel_ttcp_sequence 
-{
-public:
-  ttcp_sequence_i(const char *obj_name = 0);
-
-  virtual void sendShortSeq (const ttcp_sequence::ShortSeq& ttcp_seq, 
-	CORBA_Environment &IT_env);
-  virtual void sendLongSeq (const ttcp_sequence::LongSeq& ttcp_seq, 
-	CORBA_Environment &IT_env);
-  virtual void sendDoubleSeq (const ttcp_sequence::DoubleSeq& ttcp_seq, 
-	CORBA_Environment &IT_env);
-  virtual void sendCharSeq (const ttcp_sequence::CharSeq& ttcp_seq, 
-	CORBA_Environment &IT_env);
-  virtual void sendStructSeq (const ttcp_sequence::StructSeq& ttcp_seq, 
-	CORBA_Environment &IT_env);
-  virtual void sendOctetSeq (const ttcp_sequence::OctetSeq& ttcp_seq, 
-	CORBA_Environment &IT_env);
-
-  /* Routines to calculate the time required to transfer */
-  virtual void start_timer (CORBA_Environment &IT_env);
-  virtual void stop_timer (CORBA_Environment &IT_env);
-
-private:
-  unsigned long nbytes_;
-};
-
-#endif // defined (TTCP_I_H)
-
diff --git a/TAO/IIOP/tests/Thruput_test/utils.cpp b/TAO/IIOP/tests/Thruput_test/utils.cpp
deleted file mode 100644
index d3ba1e195df..00000000000
--- a/TAO/IIOP/tests/Thruput_test/utils.cpp
+++ /dev/null
@@ -1,559 +0,0 @@
-#include "ttcp_decl.h"
-
-int SetSocketBufferSize(int size, unsigned short isTrans)
-{
-   // go thru open file descriptors and check if its is a socket and
-   // if so, set its socket size to "size"
-   struct rlimit rlm;
-   memset(&rlm, 0, sizeof(struct rlimit));
-   (void) getrlimit(RLIMIT_NOFILE, &rlm);
-   cout << "Total file descriptors = " << rlm.rlim_max << endl;
-   for (int i=3; i < rlm.rlim_max; i++){
-      if (isTrans)
-      	(void) setsockopt(i, SOL_SOCKET, SO_SNDBUF,
-		(char *) &size, sizeof(size));
-      else
-      	(void) setsockopt(i, SOL_SOCKET, SO_RCVBUF,
-		(char *) &size, sizeof(size));
-   }
-   return 1;
-}
-
-void
-err (char *s)
-{
-  fprintf (stderr, "ttcp%s: ", trans ? "-t" : "-r");
-  perror (s);
-  fprintf (stderr, "errno=%d\n", errno);
-  exit (1);
-}
-
-void
-mes (char *s)
-{
-  fprintf (stderr, "ttcp%s: %s\n", trans ? "-t" : "-r", s);
-}
-
-char *
-outfmt (double b)
-{
-  static char obuf[50];
-  switch (fmt)
-    {
-    case 'G':
-      sprintf (obuf, "%.2f GB", b / 1024.0 / 1024.0 / 1024.0);
-      break;
-    default:
-    case 'K':
-      sprintf (obuf, "%.2f KB", b / 1024.0);
-      break;
-    case 'M':
-      sprintf (obuf, "%.2f MB", b / 1024.0 / 1024.0);
-      break;
-    case 'g':
-      sprintf (obuf, "%.2f Gbit", b * 8.0 / 1024.0 / 1024.0 / 1024.0);
-      break;
-    case 'k':
-      sprintf (obuf, "%.2f Kbit", b * 8.0 / 1024.0);
-      break;
-    case 'm':
-      sprintf (obuf, "%.2f Mbit", b * 8.0 / 1024.0 / 1024.0);
-      break;
-    }
-  return obuf;
-}
-
-static struct itimerval itime0;	/* Time at which timing started */
-static struct rusage ru0;	/* Resource utilization at the start */
-
-#if defined(SYSV)
-/*ARGSUSED */
-static void
-getrusage (int ignored, register struct rusage *ru)
-{
-  struct tms buf;
-
-  times (&buf);
-
-  /* Assumption: HZ <= 2147 (LONG_MAX/1000000) */
-  ru->ru_stime.tv_sec = buf.tms_stime / HZ;
-  ru->ru_stime.tv_usec = ((buf.tms_stime % HZ) * 1000000) / HZ;
-  ru->ru_utime.tv_sec = buf.tms_utime / HZ;
-  ru->ru_utime.tv_usec = ((buf.tms_utime % HZ) * 1000000) / HZ;
-}
-
-/*ARGSUSED */
-static void
-gettimeofday (struct timeval *tp, struct timezone *zp)
-{
-  tp->tv_sec = time (0);
-  tp->tv_usec = 0;
-}
-#endif /* SYSV */
-/*
- *                    P R E P _ T I M E R
- */
-void
-prep_timer ()
-{
-  itime0.it_interval.tv_sec = 0;
-  itime0.it_interval.tv_usec = 0;
-  itime0.it_value.tv_sec = LONG_MAX / 22;	/* greatest possible value , itimer() count backwards */
-  itime0.it_value.tv_usec = 0;
-
-
-  getrusage (RUSAGE_SELF, &ru0);
-
-  /* Init REAL Timer */
-  if (setitimer (ITIMER_REAL, &itime0, NULL))
-    {
-      perror ("Setting 'itimer' REAL failed");
-      return;
-    }
-
-}
-
-/*
- *                    R E A D _ T I M E R
- * 
- */
-double
-read_timer (char *str, int len)
-{
-  struct itimerval itimedol;
-  struct rusage ru1;
-  struct timeval td;
-  struct timeval tend, tstart;
-  char line[132];
-
-  getrusage (RUSAGE_SELF, &ru1);
-
-  if (getitimer (ITIMER_REAL, &itimedol))
-    {
-      perror ("Getting 'itimer' REAL failed");
-      return (0.0);
-    }
-
-  prusage (&ru0, &ru1, &itime0.it_value, &itimedol.it_value, line);
-  (void) strncpy (str, line, len);
-
-  /* Get real time */
-  tvsub (&td, &itime0.it_value, &itimedol.it_value);
-  realt = td.tv_sec + ((double) td.tv_usec) / 1000000;
-
-  /* Get CPU time (user+sys) */
-  tvadd (&tend, &ru1.ru_utime, &ru1.ru_stime);
-  tvadd (&tstart, &ru0.ru_utime, &ru0.ru_stime);
-  tvsub (&td, &tend, &tstart);
-  cput = td.tv_sec + ((double) td.tv_usec) / 1000000;
-  if (cput < 0.00001)
-    cput = 0.00001;
-  return (cput);
-}
-
-static void
-prusage (register struct rusage *r0, struct rusage *r1, 
-	 struct timeval *e, struct timeval *b, char *outp)
-{
-  struct timeval tdiff;
-  register time_t t;
-  register char *cp;
-  register int i;
-  int ms;
-
-  t = (r1->ru_utime.tv_sec - r0->ru_utime.tv_sec) * 100 +
-    (r1->ru_utime.tv_usec - r0->ru_utime.tv_usec) / 10000 +
-    (r1->ru_stime.tv_sec - r0->ru_stime.tv_sec) * 100 +
-    (r1->ru_stime.tv_usec - r0->ru_stime.tv_usec) / 10000;
-  ms = (e->tv_sec - b->tv_sec) * 100 + (e->tv_usec - b->tv_usec) / 10000;
-
-#define END(x)  {while(*x) x++;}
-#if defined(SYSV)
-  cp = "%Uuser %Ssys %Ereal %P";
-#else
-#if defined(sgi)		/* IRIX 3.3 will show 0 for %M,%F,%R,%C */
-  cp = "%Uuser %Ssys %Ereal %P %Mmaxrss %F+%Rpf %Ccsw";
-#else
-  cp = "%Uuser %Ssys %Ereal %P %Xi+%Dd %Mmaxrss %F+%Rpf %Ccsw";
-#endif
-#endif
-  for (; *cp; cp++)
-    {
-      if (*cp != '%')
-	*outp++ = *cp;
-      else if (cp[1])
-	switch (*++cp)
-	  {
-
-	  case 'U':
-	    tvsub (&tdiff, &r1->ru_utime, &r0->ru_utime);
-	    sprintf (outp, "%d.%01d", tdiff.tv_sec, tdiff.tv_usec / 100000);
-	    END (outp);
-	    break;
-
-	  case 'S':
-	    tvsub (&tdiff, &r1->ru_stime, &r0->ru_stime);
-	    sprintf (outp, "%d.%01d", tdiff.tv_sec, tdiff.tv_usec / 100000);
-	    END (outp);
-	    break;
-
-	  case 'E':
-	    psecs (ms / 100, outp);
-	    END (outp);
-	    break;
-
-	  case 'P':
-	    sprintf (outp, "%d%%", (int) (t * 100 / ((ms ? ms : 1))));
-	    END (outp);
-	    break;
-
-#if !defined(SYSV)
-	  case 'W':
-	    i = r1->ru_nswap - r0->ru_nswap;
-	    sprintf (outp, "%d", i);
-	    END (outp);
-	    break;
-
-	  case 'X':
-	    sprintf (outp, "%d", t == 0 ? 0 : (r1->ru_ixrss - r0->ru_ixrss) / t);
-	    END (outp);
-	    break;
-
-	  case 'D':
-	    sprintf (outp, "%d", t == 0 ? 0 :
-		     (r1->ru_idrss + r1->ru_isrss - (r0->ru_idrss + r0->ru_isrss)) / t);
-	    END (outp);
-	    break;
-
-	  case 'K':
-	    sprintf (outp, "%d", t == 0 ? 0 :
-		     ((r1->ru_ixrss + r1->ru_isrss + r1->ru_idrss) -
-		      (r0->ru_ixrss + r0->ru_idrss + r0->ru_isrss)) / t);
-	    END (outp);
-	    break;
-
-	  case 'M':
-	    sprintf (outp, "%d", r1->ru_maxrss / 2);
-	    END (outp);
-	    break;
-
-	  case 'F':
-	    sprintf (outp, "%d", r1->ru_majflt - r0->ru_majflt);
-	    END (outp);
-	    break;
-
-	  case 'R':
-	    sprintf (outp, "%d", r1->ru_minflt - r0->ru_minflt);
-	    END (outp);
-	    break;
-
-	  case 'I':
-	    sprintf (outp, "%d", r1->ru_inblock - r0->ru_inblock);
-	    END (outp);
-	    break;
-
-	  case 'O':
-	    sprintf (outp, "%d", r1->ru_oublock - r0->ru_oublock);
-	    END (outp);
-	    break;
-	  case 'C':
-	    sprintf (outp, "%d+%d", r1->ru_nvcsw - r0->ru_nvcsw,
-		     r1->ru_nivcsw - r0->ru_nivcsw);
-	    END (outp);
-	    break;
-#endif /* !SYSV */
-	  }
-    }
-  *outp = '\0';
-}
-
-static void
-tvadd (struct timeval *tsum, struct timeval *t0, struct timeval *t1)
-{
-
-  tsum->tv_sec = t0->tv_sec + t1->tv_sec;
-  tsum->tv_usec = t0->tv_usec + t1->tv_usec;
-  if (tsum->tv_usec > 1000000)
-    tsum->tv_sec++, tsum->tv_usec -= 1000000;
-}
-
-static void
-tvsub (struct timeval *tdiff, struct timeval *t1, struct timeval *t0)
-{
-
-  tdiff->tv_sec = t1->tv_sec - t0->tv_sec;
-  tdiff->tv_usec = t1->tv_usec - t0->tv_usec;
-  if (tdiff->tv_usec < 0)
-    tdiff->tv_sec--, tdiff->tv_usec += 1000000;
-}
-
-static void
-psecs (long l, register char *cp)
-{
-  register int i;
-
-  i = l / 3600;
-  if (i)
-    {
-      sprintf (cp, "%d:", i);
-      END (cp);
-      i = l % 3600;
-      sprintf (cp, "%d%d", (i / 60) / 10, (i / 60) % 10);
-      END (cp);
-    }
-  else
-    {
-      i = l;
-      sprintf (cp, "%d", i / 60);
-      END (cp);
-    }
-  i %= 60;
-  *cp++ = ':';
-  sprintf (cp, "%d%d", i / 10, i % 10);
-}
-
-/*
- *                    N R E A D
- */
-int
-Nread (int fd, void *buf, int count)
-{
-  struct sockaddr_in from;
-  int len = sizeof (from);
-  register int cnt;
-  if (udp)
-    {
-      cnt = recvfrom (fd, (char *) buf, count, 0, (struct sockaddr *) &from, &len);
-      numCalls++;
-    }
-  else
-    {
-      if (b_flag)
-	cnt = mread (fd, (char *) buf, count);	/* fill buf */
-      else
-	{
-	  cnt = read (fd, buf, count);
-	  numCalls++;
-	}
-      if (touchdata && cnt > 0)
-	{
-	  register int c = cnt, sum;
-	  register char *b = (char *) buf;
-	  while (c--)
-	    sum += *b++;
-	}
-    }
-  return (cnt);
-}
-
-
-/*
- *                    N W R I T E
- */
-int
-Nwrite (int fd, void *buf, int count)
-{
-  return 0;
-}
-
-void
-delay (int us)
-{
-  struct timeval tv;
-
-  tv.tv_sec = 0;
-  tv.tv_usec = us;
-  (void) select (1, (fd_set *) 0, (fd_set *) 0, (fd_set *) 0, &tv);
-}
-
-/*
- *                    M R E A D
- *
- * This function performs the function of a read(II) but will
- * call read(II) multiple times in order to get the requested
- * number of characters.  This can be necessary because
- * network connections don't deliver data with the same
- * grouping as it is written with.  Written by Robert S. Miles, BRL.
- */
-int
-mread (int fd, register char *bufp, unsigned n)
-{
-  register unsigned count = 0;
-  register int nread;
-
-  do
-    {
-      nread = read (fd, bufp, n - count);
-      numCalls++;
-      if (nread < 0)
-	{
-	  perror ("ttcp_mread");
-	  return (-1);
-	}
-      if (nread == 0)
-	return ((int) count);
-      count += (unsigned) nread;
-      bufp += nread;
-    }
-  while (count < n);
-
-  return ((int) count);
-}
-
-void
-FillPattern (register char *cp, register int bufLen, unsigned long dt)
-{
-  unsigned long
-        num, i;
-
-  switch(dt){
-  case SEND_SHORT:
-    {
-       register short *SeqPtr = (short *)cp;
-       num = bufLen/sizeof(short);
-       for (i=0; i < num; i++)
-		SeqPtr[i] = (short)lrand48(); 
-       sseq = new ttcp_sequence::ShortSeq(num,num, SeqPtr);
-    } 
-    break;
-  case SEND_LONG:
-    {
-       register long *SeqPtr = (long *)cp;
-       num = bufLen/sizeof(long);
-       for (i=0; i < num; i++)
-		SeqPtr[i] = lrand48(); 
-       lseq = new ttcp_sequence::LongSeq(num, num, SeqPtr);
-    } 
-    break;
-  case SEND_DOUBLE:
-    {
-       register double *SeqPtr = (double *)cp;
-       num = bufLen/sizeof(double);
-       for (i=0; i < num; i++)
-		SeqPtr[i] = drand48(); 
-       dseq = new ttcp_sequence::DoubleSeq(num, num, SeqPtr);
-    } 
-    break;
-  case SEND_CHAR:
-    {
-       register CORBA_Char *SeqPtr = (CORBA_Char *)cp;
-       register char c = 0;
-       num = bufLen/sizeof(char);
-       for(i=0; i < num; i++){
-         while (!isprint(c & 0x7f))
-                c++;
-         SeqPtr[i] = (c++ & 0x7f);
-       }
-       cseq = new ttcp_sequence::CharSeq(num, num, SeqPtr);
-    } 
-    break;
-  case SEND_STRUCT:
-    {
-       register PerfStruct *SeqPtr = (PerfStruct *)cp;
-       register char c = 0;
-       num = bufLen/sizeof(PerfStruct);
-       for (i=0; i < num; i++){
-           SeqPtr[i].s = (short)lrand48();
-           SeqPtr[i].l = lrand48();
-           SeqPtr[i].d = drand48();
-           while (!isprint(c & 0x7f))
-                c++;
-           SeqPtr[i].c = (c++ & 0x7f);
-           while (!isprint(c & 0x7f))
-                c++;
-           SeqPtr[i].o = (unsigned char)(c++ & 0x7f);
-       }
-       Sseq = new ttcp_sequence::StructSeq(num, num, SeqPtr);
- 
-    } 
-    break;
-  case SEND_OCTET:
-  default:
-    {
-       register CORBA_Octet *SeqPtr = (CORBA_Octet *)cp;
-       register char c = 0;
-       num = bufLen/sizeof(CORBA_Octet);
-       for(i=0; i < num; i++){
-         while (!isprint(c & 0x7f))
-                c++;
-         SeqPtr[i] = (c++ & 0x7f);
-       }
-       oseq = new ttcp_sequence::OctetSeq(num, num, SeqPtr);
-    }
-    break;
-  }
-}
-void PrintStats()
-{
-  if (cput <= 0.0)
-    cput = 0.001;
-  if (realt <= 0.0)
-    realt = 0.001;
-
-//#if defined (LM_RESULTS)
-  if (trans && (title != 0))
-    {
-      double tmp;
-      FILE *outFile;
-      char filename[BUFSIZ];
- 
-      strcpy(filename, title);
-      switch(dt){
-      case SEND_SHORT:
-        strcat(filename, ".shortSeq.results");
-        break;
-      case SEND_LONG:
-        strcat(filename, ".longSeq.results");
-        break;
-      case SEND_DOUBLE:
-        strcat(filename, ".doubleSeq.results");
-        break;
-      case SEND_CHAR:
-        strcat(filename, ".charSeq.results");
-        break;
-      case SEND_STRUCT:
-        strcat(filename, ".structSeq.results");
-        break;
-      case SEND_COMPOSITE:
-        strcat(filename, ".compositeSeq.results");
-        break;
-      case SEND_OCTET:
-      default:
-        strcat(filename, ".octetSeq.results");
-        break;
-      }
-      outFile = fopen (filename, "a+");
-      if (new_line)
-        fprintf (outFile, "\n  -l %ldk \t", buflen / 1024);
-      tmp = ((double) nbytes) / realt;
-      fprintf (outFile, "%.2f ", tmp * 8.0 / 1024.0 / 1024.0);
-      fclose (outFile);
-    }
-//#endif
-
-  fprintf (stdout,
-           "ttcp%s: %ld bytes in %.2f real seconds = %s/sec +++\n",
-           trans ? "-t" : "-r",
-           nbytes, realt, outfmt (((double) nbytes) / realt));
-  if (verbose)
-    {
-      fprintf (stdout,
-               "ttcp%s: %ld bytes in %.2f CPU seconds = %s/cpu sec\n",
-               trans ? "-t" : "-r",
-               nbytes, cput, outfmt (((double) nbytes) / cput));
-    }
-  fprintf (stdout,
-           "ttcp%s: %d Server Method calls, msec/call = %.2f, calls/sec = %.2f\n",
-           trans ? "-t" : "-r",
-           numCalls,
-           1024.0 * realt / ((double) numCalls),
-           ((double) numCalls) / realt);
-  fprintf (stdout, "ttcp%s: %s\n", trans ? "-t" : "-r", stats);
-  if (verbose)
-    {
-      fprintf (stdout,
-               "ttcp%s: buffer address %#x\n",
-               trans ? "-t" : "-r",
-               buf);
-    }
-}
diff --git a/TAO/LICENSE.sun b/TAO/LICENSE.sun
deleted file mode 100644
index 8bb53b36807..00000000000
--- a/TAO/LICENSE.sun
+++ /dev/null
@@ -1,64 +0,0 @@
-This notice applies to all files in this software distribution that
-were originally derived from SunSoft IIOP code (these files contain
-Sun Microsystems copyright notices).
-
-COPYRIGHT AND LICENSING
------------------------
-
-Copyright 1995 Sun Microsystems, Inc.
-Printed in the United States of America.
-All Rights Reserved.
-
-This software product (LICENSED PRODUCT), implementing the Object Management
-Group's "Internet Inter-ORB Protocol", is protected by copyright and is
-distributed under the following license restricting its use.  Portions of
-LICENSED PRODUCT may be protected by one or more U.S. or foreign patents, or
-pending applications.
-
-LICENSED PRODUCT is made available for your use provided that you include
-this license and copyright notice on all media and documentation and the
-software program in which this product is incorporated in whole or part.
-
-You may copy, modify, distribute, or sublicense the LICENCED PRODUCT without
-charge as part of a product or software program developed by you, so long as
-you preserve the functionality of interoperating with the Object Management
-Group's "Internet Inter-ORB Protocol" version one.  However, any uses other
-than the foregoing uses shall require the express written consent of Sun
-Microsystems, Inc.
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of the LICENSED PRODUCT as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply with
-this license.  Upon termination, you shall destroy or return all code and
-documentation for the LICENSED PRODUCT.
-
-LICENSED PRODUCT IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING
-THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
-PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF DEALING, USAGE OR
-TRADE PRACTICE.
-
-LICENSED PRODUCT IS PROVIDED WITH NO SUPPORT AND WITHOUT ANY OBLIGATION ON
-THE PART OF SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES TO ASSIST IN ITS
-USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-LICENSED PRODUCT OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to restrictions
-as set forth in subparagraph (c)(1)(ii) of the Rights in Technical Data and
-Computer Software clause at DFARS 252.227-7013 and FAR 52.227-19.
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems and the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
diff --git a/TAO/Makefile b/TAO/Makefile
deleted file mode 100644
index b7a48015abd..00000000000
--- a/TAO/Makefile
+++ /dev/null
@@ -1,111 +0,0 @@
-#----------------------------------------------------------------------------
-#	$Id$
-#
-#	Top-level Makefile for the TAO
-#----------------------------------------------------------------------------
-
-#----------------------------------------------------------------------------
-#	Local macros
-#----------------------------------------------------------------------------
-
-INFO	= README \
-	  VERSION
-
-DIRS	= tao \
-	  TAO_IDL \
-	  tests
-
-
-CLONE	= Makefile \
-	  tao \
-	  TAO_IDL \
-	  tests \
-
-#----------------------------------------------------------------------------
-#	Include macros and targets
-#----------------------------------------------------------------------------
-
-include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-include $(ACE_ROOT)/include/makeinclude/macros.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.nested.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.nolocal.GNU
-
-# For the following to work you need to compile the
-# $(ACE_ROOT)/bin/clone.cpp file and install it in your ~/bin
-# directory (or some place similar).
-
-clone:
-	@for dir in $(CLONE) ;\
-	do \
-		(clone -s $(ACE_ROOT)/$$dir $$dir) \
-	done
-
-RELEASE_FILES = TAO/ChangeLog \
-		TAO/COPYING \
-		TAO/COPYING.sun \
-		TAO/docs \
-		TAO/LICENSE.sun \
-		TAO/Makefile \
-		TAO/README \
-		TAO/README.sun \
-		TAO/tao \
-		TAO/TAO_IDL \
-		TAO/tests \
-		TAO/VERSION
-
-#### If creating the "official" TAO release:
-#### 1) Check that the workspace is up-to-date, and bail out if not.
-#### 2) Update the timestamp in the VERSION file.
-#### 3) Add a ChangeLog entry to the ChangeLog plain file.
-#### Detect if we are creating the "official" release by looking at the PWD.
-#### To disable this feature, add "TIMESTAMP=" to the make command line.
-#### NOTE: if the version number in the VERSION file contains three components,
-####       e.g., 4.1.5, then the third one will be incremented.  This assumes
-####       that alpha/beta releases are numbered with three components, and
-####       that final releases are not.  So, if the version number is, e.g.,
-####       4.2, it will not be modified because it is assumed to be for a
-####       final release.
-ifeq ($(shell pwd),/project/adaptive/ACE_wrappers/TAO)
-  TIMESTAMP = (CHANGELOG='ChangeLog'; export CHANGELOG; \
-              if [ -z "$$CHANGELOG" ]; then echo unable to find latest ChangeLog file; exit 1; fi; \
-              DATE=`/usr/bin/date +"%a %b %d %T %Y"`; export DATE; \
-              cd ..; UPTODATE=`cvs -nq update $(RELEASE_FILES) | egrep -v '/tests/log/' | perl -pi -e 's%/TAO%%g; s/$$/\\\n  /g'`; cd TAO; \
-              if [ "$$UPTODATE" ]; then /pkg/gnu/bin/echo -e ERROR: workspace must be updated, and/or non-controlled files must be removed or added/committed: $$UPTODATE; exit 1; fi; \
-              TAO_VERSION=`perl -pi -e \
-                'BEGIN { $$date=$$ENV{"DATE"} } \
-                 s/(TAO version \d+\.\d+\.)(\d+)/sprintf("$$1%d",$$2+1)/e; \
-                 if (s/(, released ).*/$$1$$date./) { \
-                   ($$version = $$_) =~ s/^This is //; } \
-                 END { print $$version  } ' VERSION;` export TAO_VERSION; \
-              perl -i -e \
-                'BEGIN {($$message = \
-                           $$ENV{"DATE"} . "  " . \
-                           $$ENV{"SIGNATURE"} . "  <" . \
-                           $$ENV{"LOGNAME"} . "\@cs.wustl.edu>\n\n\t* " . \
-                           $$ENV{"TAO_VERSION"} . "\n"); \
-                        $$message_printed = 0;} \
-                 while (<>) { \
-                   if ( ! $$message_printed++ ) { print "$$message\n"; } \
-                   print; } ' $$CHANGELOG; \
-              cvs commit -m"$$TAO_VERSION" VERSION $$CHANGELOG; \
-              chmod 644 VERSION $$CHANGELOG) &&
-else
-  TIMESTAMP =
-endif
-
-#### The following tar creation commands assume that cpio supports -H tar.
-#### Old versions of cpio might not, but the version that's shipped with
-#### Solaris 2.5.1, and gnu cpio 2.3, do support that option.
-
-FILTER = -name CVS -prune -o ! -name '.\#*' ! -name '\#*' ! -name '*~' -print
-
-cleanrelease:
-	@$(TIMESTAMP) (make realclean; cd ..; \
-	 find $(RELEASE_FILES) $(FILTER) | cpio -o -H tar | gzip -9 > TAO.tar.gz; \
-	 chmod a+r TAO.tar.gz; )
-
-release:
-	@$(TIMESTAMP) (cd ..; \
-	 find $(RELEASE_FILES) $(FILTER) | cpio -o -H tar | gzip -9 > TAO.tar.gz; \
-	 chmod a+r TAO.tar.gz; )
diff --git a/TAO/ORB_Services/Naming_Service/CosNaming.idl b/TAO/ORB_Services/Naming_Service/CosNaming.idl
deleted file mode 100644
index 80715b3115f..00000000000
--- a/TAO/ORB_Services/Naming_Service/CosNaming.idl
+++ /dev/null
@@ -1,210 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    cos
-// 
-// = FILENAME
-//    CosNaming.idl
-//
-// = AUTHOR
-//    Marina Spivak
-// 
-// ============================================================================
-
-module CosNaming
-  // = TITLE
-  // This module provides interface for using COS Naming Service.   
-{
-  typedef string Istring;
-  struct NameComponent 
-  {
-    Istring id;	
-    // This is the name that is used to identify object references.
-
-    Istring kind;	
-    // Stores any addtional info about the object reference.
-  };
-  // This is a 'simple' name.
-  // NOTE: both id and kind fields are used in resolving names.
-
-  typedef sequence <NameComponent> Name;
-  // This is a compound name: <c1; c2; c3; cn> where c1 to cn-1 are
-  // the names of the nested contexts, and cn is the name of the
-  // object bound in cn-1.
-
-  enum BindingType 
-  {
-    nobject,
-    // object binding.
-
-    ncontext
-    // naming context binding.
-  };
-
-  struct Binding 
-  {
-    Name    	binding_name;
-    BindingType	binding_type;                                  
-  };
-
-  typedef sequence <Binding> BindingList;                                         
-
-  interface BindingIterator;
-  // Forward declaration.
-
-  interface NamingContext 
-    // = TITLE
-    // Interface for managing name bindings and naming contexts.
-    {
-      // = Exceptions.
-
-      enum NotFoundReason 
-      { 
-	missing_node,
-	not_context,
-	not_object
-      };
-        
-      exception NotFound 
-	{
-	  NotFoundReason why;
-	  Name rest_of_name;
-	};
-      // Indicates that the name does not identify a binding.
-
-      exception CannotProceed 
-	{
-	  //Commented out due to the bug in Orbix compiler               
-	  //NamingContext cxt;
-	  Name rest_of_name;
-	};
-      // Implementation has given up for some reason.  The client,
-      // however, may be able to continue operation at the returned
-      // naming context.
-                                 
-      exception InvalidName {};                             
-      // A name of length 0 is invalid. 
-      // Implementations may place further restrictions.            
-                               
-      exception AlreadyBound {};
-      // Indicates that the specified name is already bound to some
-      // object.  Only one object can be bound to a particular name in
-      // a context.  To change the binding, <rebind> and
-      // <rebind_context> can be used.
-
-      exception NotEmpty {};
-      // Indicates that the context is not empty.
-
-      // = Binding operations.
-
-      void bind (in Name n, in Object obj)             
-	raises(NotFound, CannotProceed, InvalidName, AlreadyBound);
-      // create a binding for name <n> and object <obj> in the naming
-      // context.  Compound names are treated as follows: ctx->bind
-      // (<c1; c2; c3; cn>, obj) = (ctx->resolve (<c1; c2;
-      // cn-1>))->bind (<cn>, obj) if the there already exists a
-      // binding for the specified name, <AlreadyBound> exception is
-      // thrown.  Naming contexts should be bound using <bind_context>
-      // and <rebind_context> in order to participate in name
-      // resolution later.
-
-      void rebind (in Name n, in Object obj)   
-	raises(NotFound, CannotProceed, InvalidName);
-      // this is similar to <bind> operation above, except for when
-      // the binding for the specified name already exists in the
-      // specified context.  In that case, the existing binding is
-      // replaced with the new one.
-		
-      void bind_context (in Name n, in NamingContext nc)               
-	raises(NotFound, CannotProceed, InvalidName, AlreadyBound);
-      // This is the version of <bind> specifically for binding naming
-      // contexts, so that they will participate in name resolution
-      // when compound names are passed to be resolved.
-
-      void rebind_context (in Name n, in NamingContext nc)     
-	raises(NotFound, CannotProceed, InvalidName);
-      // This is a version of <rebind> specifically for naming
-      // contexts, so that they can participate in name resolution
-      // when compound names are passed.
-
-      // = Resolving names.
-
-      Object resolve (in Name n)
-	raises(NotFound, CannotProceed, InvalidName);
-      // Return object reference that is bound to the name.  Compound
-      // name resolve is defined as follows: ctx->resolve (<c1; c2;
-      // cn>) = ctx->resolve (<c1; c2 cn-1>)->resolve (<cn>) The
-      // naming service does not return the type of the object.
-      // Clients are responsible for "narrowing" the object to the
-      // appropriate type.
-
-      // = Unbinding names.
-
-      void unbind (in Name n)
-	raises(NotFound, CannotProceed, InvalidName);
-      // Remove the name binding from the context.  When compound
-      // names are used, unbind is defined as follows: ctx->unbind
-      // (<c1; c2; cn>) = (ctx->resolve (<c1; c2; cn-1>))->unbind
-      // (<cn>)
-
-      // = Creating Naming Contexts.
-
-      NamingContext new_context ();
-      // This operation returns a new naming context implemented by
-      // the same naming server in which the operation was invoked.
-      // The context is not bound.
-
-      NamingContext bind_new_context (in Name n)
-	raises(NotFound, AlreadyBound, CannotProceed, InvalidName);
-      // This operation creates a new context and binds it to the name
-      // supplied as an argument.  The newly-created context is
-      // implemented by the same server as the context in which it was
-      // bound (the name argument excluding the last component).
-
-      // = Deleting contexts.
-
-      void destroy ()
-	raises (NotEmpty);
-      // Delete the naming context.  NOTE: the user should <unbind>
-      // any bindings in which the given context is bound to some
-      // names before invoking <destroy> operation on it.  Ignoring
-      // this rule may cause unexpected behaviour.  <destroy> deletes
-      // the context object if it is not bound to any names in the
-      // given address space.  <destroys> decrements the reference
-      // count of the context if bindings to it exist.
-		
-      // = Listing the naming context.
-		
-      void list (in unsigned long how_many, 
-		 out BindingList bl, out BindingIterator bi);
-      // Returns at most the requested number of bindings <how_many>
-      // in <bl>.  If the naming context contains additional bindings,
-      // they are returned with a BindingIterator.  In the naming
-      // context does not contain any additional bindings <bi>
-      // returned as null.
-
-      void ref (in Object obj);
-      // temporary for debugging purposes.
-    };
-
-  interface BindingIterator 
-    // = TITLE
-    // Interface for iterating over Bindings returned with the <list>
-    // operation.
-    {
-      boolean next_one (out Binding b);
-      // This operation returns the next binding.  If there are no
-      // more bindings false is returned.
-
-      boolean next_n (in unsigned long how_many, 
-		      out BindingList bl);
-      // This operation returns at most the requested number of
-      // bindings.
-
-      void destroy ();
-      // This operation destroys the iterator.
-    };
-};
diff --git a/TAO/ORB_Services/Naming_Service/NS_CosNaming.C b/TAO/ORB_Services/Naming_Service/NS_CosNaming.C
deleted file mode 100644
index bdcf2032150..00000000000
--- a/TAO/ORB_Services/Naming_Service/NS_CosNaming.C
+++ /dev/null
@@ -1,678 +0,0 @@
-// ============================================================================
-//
-// = LIBRARY
-//    cos
-// 
-// = FILENAME
-//    NS_CosNaming.C
-//
-// = AUTHOR
-//    Marina Spivak <marina@cs.wustl.edu>
-// 
-// ============================================================================
-
-#include "NS_CosNaming.h"
-
-NS_IntId::NS_IntId (void)
-  : type_ (CosNaming::nobject)
-{
-  ref_ = CORBA::Object::_nil ();
-}
-
-NS_IntId::NS_IntId (CORBA::Object_ptr obj,
-		    CosNaming::BindingType type)
-  : type_ (type)
-{
-  ref_ = obj->_duplicate (obj);
-}
-
-NS_IntId::NS_IntId (const NS_IntId &rhs)
-{
-  type_ = rhs.type_;
-  ref_ =  rhs.ref_->_duplicate (rhs.ref_);
-}
-
-NS_IntId::~NS_IntId (void)
-{
-  CORBA::release (ref_);
-}
-
-void 
-NS_IntId::operator= (const NS_IntId &rhs)
-{
-  // check for self assignment.
-  if (&rhs == this)
-    return;
-
-  type_ = rhs.type_;
-  
-  CORBA::release (ref_);
-  ref_ =  rhs.ref_->_duplicate (rhs.ref_);
-}
-
-NS_ExtId::NS_ExtId (void)
-  : kind_ (),
-    id_ ()
-{
-}
-
-NS_ExtId::NS_ExtId (const char *id, 
-		    const char *kind)
-  : id_ (id),
-    kind_ (kind)
-{
-}
-
-NS_ExtId::NS_ExtId (const NS_ExtId &rhs)
-{
-  id_ = rhs.id_;
-  kind_ = rhs.kind_; 
-}
-
-NS_ExtId::~NS_ExtId (void)
-{
-}
-
-void 
-NS_ExtId::operator= (const NS_ExtId &rhs)
-{
-  // Check for self assignment.
-  if (&rhs == this)
-    return;
-
-  id_ = rhs.id_;
-  kind_ = rhs.kind_; 
-}
- 
-int 
-NS_ExtId::operator== (const NS_ExtId &rhs) const
-{
-  return id_ == rhs.id_ && kind_ == rhs.kind_;
-}
-
-int 
-NS_ExtId::operator!= (const NS_ExtId &rhs) const
-{
-  return id_ != rhs.id_ || kind_ != rhs.kind_;
-}
-
-u_long
-NS_ExtId::hash (void) const
-{
-  ACE_CString temp (id_);
-  temp += kind_;
-
-  return temp.hash ();
-}
-
-NS_NamingContext::NS_NamingContext (void)
-{
-  if (context_.open (NS_MAP_SIZE) == -1)
-    ACE_ERROR ((LM_ERROR, "%p\n", "NS_NamingContext"));
-  // deal with fault
-}
-
-void
-NS_NamingContext::initialize (CosNaming::NamingContext_ptr tie_ref)
-{
-  tie_ref_ = tie_ref;
-}
-
-NS_NamingContext::~NS_NamingContext (void)
-{
-}
-
-CosNaming::NamingContext_ptr 
-NS_NamingContext::get_context (const CosNaming::Name &name)
-  throw (CORBA::SystemException, 
-	 CosNaming::NamingContext::NotFound, 
-	 CosNaming::NamingContext::CannotProceed, 
-	 CosNaming::NamingContext::AlreadyBound)
-{
-  // create compound name to be resolved
-  // (<name> - last component)
-  CORBA::ULong len = name.length ();
-  CosNaming::Name comp_name (name);
-  comp_name.length (len - 1);
-  
-  // resolve
-  CORBA::Object_var cont_ref;
-
-  try 
-    {
-      cont_ref = resolve (comp_name);
-    }
-  // Deal with exceptions in resolve: basicly, add the last component
-  // of the name to <rest_of_name> and rethrow.
-  catch (CosNaming::NamingContext::NotFound &nf)
-    {      
-      CORBA::ULong l = nf.rest_of_name.length ();
-      nf.rest_of_name.length (l + 1);
-      nf.rest_of_name[l] = name[len - 1]; 
-      throw CosNaming::NamingContext::NotFound (nf);
-    }
-  catch (CosNaming::NamingContext::CannotProceed &cp)
-    {
-      CORBA::ULong l = cp.rest_of_name.length ();
-      cp.rest_of_name.length (l + 1);
-      cp.rest_of_name[l] = name[len - 1];
-      throw CosNaming::NamingContext::CannotProceed (cp);
-    }
-  
-  // Reference to a context from <resolve> cannot be nil because
-  // cannot <bind> to a nil object.
-   
-  // Try narrowing object reference to a context type.
-  CosNaming::NamingContext_ptr c;
-  try
-    {
-      c = CosNaming::NamingContext::_narrow (cont_ref);
-    }
-  catch (CORBA::SystemException)
-    {
-      CosNaming::Name rest;
-      rest.length (2);
-      rest[0] = name[len - 2];
-      rest[1] = name[len - 1];
-      throw CosNaming::NamingContext::NotFound (CosNaming::NamingContext::not_context, rest);
-    }
-
-  if (CORBA::is_nil (c))
-    {
-      CosNaming::Name rest;
-      rest.length (2);
-      rest[0] = name[len - 2];
-      rest[1] = name[len - 1];
-      throw CosNaming::NamingContext::NotFound (CosNaming::NamingContext::not_context, rest);
-    }
-  return c;
-}
-
-void 
-NS_NamingContext::bind (const CosNaming::Name& n, 
-			CORBA::Object_ptr obj, 
-			CORBA::Environment &IT_env) 
-  throw (CORBA::SystemException, 
-	 CosNaming::NamingContext::NotFound, 
-	 CosNaming::NamingContext::CannotProceed, 
-	 CosNaming::NamingContext::InvalidName, 
-	 CosNaming::NamingContext::AlreadyBound)
-{
-  // get the length of the name
-  CORBA::ULong len = n.length ();
-
-  // Check for invalid name.
-  if (len == 0)
-    throw CosNaming::NamingContext::InvalidName ();
-
-  // If we received compound name, resolve it to get the context in
-  // which the binding should take place, then perform the binding on
-  // target context.
-  if (len > 1) 
-    {
-      CosNaming::NamingContext_var cont = get_context (n);
-      CosNaming::Name simple_name;
-      simple_name.length (1);
-      simple_name[0] = n[len - 1];
-      cont->bind (simple_name, obj);
-    }
-
-  // If we received a simple name, we need to bind it in this context.
-  else 
-    {
-      NS_IntId entry (obj);
-      NS_ExtId name (n[0].id, n[0].kind);
-
-      // Try binding the name.
-      if (context_.bind (name, entry) == -1)
-	throw CosNaming::NamingContext::AlreadyBound ();
-      // May need to add case dealing with -1. (Maybe throw cannot
-      // proceed).
-    }
-}
-
-void 
-NS_NamingContext::rebind (const CosNaming::Name& n, 
-			  CORBA::Object_ptr obj, 
-			  CORBA::Environment &IT_env)    
-  throw (CORBA::SystemException, 
-	 CosNaming::NamingContext::NotFound, 
-	 CosNaming::NamingContext::CannotProceed, 
-	 CosNaming::NamingContext::InvalidName) 
-{ 
-  // get the length of the name
-  CORBA::ULong len = n.length ();
-
-  // check for invalid name.
-  if (len == 0)
-    throw CosNaming::NamingContext::InvalidName ();
-
-  // If we received compound name, resolve it to get the context in
-  // which the rebinding should take place, then perform the rebinding
-  // on target context.
-  if (len > 1) 
-    {
-      CosNaming::NamingContext_var cont = get_context (n);
-      CosNaming::Name simple_name;
-      simple_name.length (1);
-      simple_name[0] = n[len - 1];
-      cont->rebind (simple_name, obj);
-    }
-
-  // If we received a simple name, we need to rebind it in this context.
-  else 
-    {
-      NS_IntId entry (obj);
-      NS_ExtId name (n[0].id, n[0].kind);
-      NS_IntId oldentry;
-      NS_ExtId oldname;
-
-      // Try rebinding the name.
-      if (context_.rebind (name, entry, oldname, oldentry) == -1)
-	;
-	// Deal with consequences.
-    }
-}
-
-void
-NS_NamingContext::bind_context (const CosNaming::Name &n, 
-				CosNaming::NamingContext_ptr nc, 
-				CORBA::Environment &IT_env) 
-  throw (CORBA::SystemException, 
-	 CosNaming::NamingContext::NotFound, 
-	 CosNaming::NamingContext::CannotProceed, 
-	 CosNaming::NamingContext::InvalidName, 
-	 CosNaming::NamingContext::AlreadyBound)
-{
-  // Get the length of the name.
-  CORBA::ULong len = n.length ();
-
-  // Check for invalid name.
-  if (len == 0)
-    throw CosNaming::NamingContext::InvalidName ();
-
-  // If we received compound name, resolve it to get the context in
-  // which the binding should take place, then perform the binding on
-  // target context.
-  if (len > 1) 
-    {
-      CosNaming::NamingContext_var cont = get_context (n);
-      CosNaming::Name simple_name;
-      simple_name.length (1);
-      simple_name[0] = n[len - 1];
-      cont->bind_context (simple_name, nc);
-    }
-
-  // If we received a simple name, we need to bind it in this context.
-  else 
-    {
-      CosNaming::NameComponent comp = n[0];
-      NS_IntId entry (nc, CosNaming::ncontext);
-      NS_ExtId name (n[0].id, n[0].kind);
-
-      // Try binding the name.
-      if (context_.bind (name, entry) == 1)
-	throw CosNaming::NamingContext::AlreadyBound ();
-      // May need to add case dealing with -1.
-    }
-}
-
-void 
-NS_NamingContext::rebind_context (const CosNaming::Name &n, 
-				  CosNaming::NamingContext_ptr nc, 
-				  CORBA::Environment &IT_env) 
-  throw (CORBA::SystemException, 
-	 CosNaming::NamingContext::NotFound, 
-	 CosNaming::NamingContext::CannotProceed, 
-	 CosNaming::NamingContext::InvalidName)
-{
-  // Get the length of the name.
-  CORBA::ULong len = n.length ();
-
-  // Check for invalid name.
-  if (len == 0)
-    throw CosNaming::NamingContext::InvalidName ();
-
-  // If we received compound name, resolve it to get the context in
-  // which the rebinding should take place, then perform the rebinding
-  // on target context.
-  if (len > 1) 
-    {
-      CosNaming::NamingContext_var cont = get_context (n);
-      CosNaming::Name simple_name;
-      simple_name.length (1);
-      simple_name[0] = n[len - 1];
-      cont->rebind_context (simple_name, nc);
-    }
-
-  // if we received a simple name, we need to rebind it in this context.
-  else 
-    {
-      CosNaming::NameComponent comp = n[0];
-      NS_IntId entry (nc, CosNaming::ncontext);
-      NS_ExtId name (n[0].id, n[0].kind);
-      NS_IntId oldentry;
-      NS_ExtId oldname;
-      
-      // try rebinding the name.
-      if (context_.rebind (name, entry, oldname, oldentry) < 0);
-	// deal with consequences
-    }
-}
-    
-CORBA::Object_ptr 
-NS_NamingContext::resolve (const CosNaming::Name& n, 
-				       CORBA::Environment &IT_env) 
-  throw (CORBA::SystemException, 
-	 CosNaming::NamingContext::NotFound, 
-	 CosNaming::NamingContext::CannotProceed, 
-	 CosNaming::NamingContext::InvalidName)
-{
-  // get the length of the name
-  CORBA::ULong len = n.length ();
-
-  // check for invalid name.
-  if (len == 0) {
-    throw CosNaming::NamingContext::InvalidName ();
-  }
-
-  // resolve the first component of the name
-  NS_ExtId name (n[0].id, n[0].kind);
-  NS_IntId entry;
-  if (context_.find (name, entry) == -1) {
-    throw CosNaming::NamingContext::NotFound (CosNaming::NamingContext::not_object, n);
-  }
-  CORBA::Object_ptr item = entry.ref_;
-
-  // if the name we have to resolve is a compound name
-  // we need to recursively resolve it.
-  if (len > 1)
-    {
-      CosNaming::NamingContext_var cont;
-      if (entry.type_ == CosNaming::ncontext)
-	cont = CosNaming::NamingContext::_narrow (item);
-      else
-	throw CosNaming::NamingContext::NotFound (CosNaming::NamingContext::not_context, n);
-      
-      CosNaming::Name rest_of_name;
-      rest_of_name.length (len - 1);
-      for (CORBA::ULong i = 1; i < len; i++)
-	rest_of_name[i-1] = n[i];
-
-      return (cont->resolve (rest_of_name));
-    }
-
-  // if the name we had to resolve was simple, we just need
-  // to return the result.
-  return (item->_duplicate (item));
-}
-
-void 
-NS_NamingContext::unbind (const CosNaming::Name& n, 
-			  CORBA::Environment &IT_env) 
-  throw (CORBA::SystemException, 
-	 CosNaming::NamingContext::NotFound, 
-	 CosNaming::NamingContext::CannotProceed, 
-	 CosNaming::NamingContext::InvalidName)
-{
-  // if (do_operation (n, CORBA::_nil (), NS_NamingContext::unbind) == 0)
-
-  // get the length of the name
-  CORBA::ULong len = n.length ();
-
-  // check for invalid name.
-  if (len == 0)
-    throw CosNaming::NamingContext::InvalidName ();
-
-  // If we received compound name, resolve it to get the context in
-  // which the unbinding should take place, then perform the unbinding
-  // on target context.
-  if (len > 1) 
-    {
-      CosNaming::NamingContext_var cont = get_context (n);
-      CosNaming::Name simple_name;
-      simple_name.length (1);
-      simple_name[0] = n[len - 1];
-      cont->unbind (simple_name);
-    }
-
-  // If we received a simple name, we need to unbind it in this
-  // context.
-    {
-      NS_ExtId name (n[0].id, n[0].kind);
-      // try unbinding the name.
-      if (context_.unbind (name) == -1)
-	throw CosNaming::NamingContext::NotFound (CosNaming::NamingContext::not_object, n);
-    }
-}
-    
-CosNaming::NamingContext_ptr 
-NS_NamingContext::new_context (CORBA::Environment &IT_env) 
-  throw (CORBA::SystemException)
-{
-  NS_NamingContext *c = new NS_NamingContext;
-  CosNaming::NamingContext_ptr cont 
-    = new TIE_CosNaming_NamingContext (NS_NamingContext) (c);
-
-  c->initialize (cont);
-
-  return cont->_duplicate (cont);
-}
-    
-CosNaming::NamingContext_ptr 
-NS_NamingContext::bind_new_context (const CosNaming::Name& n, 
-						CORBA::Environment &IT_env) 
-  throw (CORBA::SystemException, 
-	 CosNaming::NamingContext::NotFound, 
-	 CosNaming::NamingContext::AlreadyBound, 
-	 CosNaming::NamingContext::CannotProceed, 
-	 CosNaming::NamingContext::InvalidName)
-{
-  NS_NamingContext *c = new NS_NamingContext;
-  CosNaming::NamingContext_ptr cont = 
-    new TIE_CosNaming_NamingContext (NS_NamingContext) (c);
-  
-  c->initialize (cont);
-
-  try
-    {
-      bind_context (n, cont);
-    }
-  catch (CosNaming::NamingContext::NotFound &nf)
-    {
-      CORBA::release (cont);
-      throw CosNaming::NamingContext::NotFound (nf);
-    }
-  catch (CosNaming::NamingContext::CannotProceed &cp)
-    {
-      CORBA::release (cont);
-      throw CosNaming::NamingContext::CannotProceed (cp);
-    }
-  catch (CosNaming::NamingContext::InvalidName)
-    {
-      CORBA::release (cont);
-      throw CosNaming::NamingContext::InvalidName ();
-    }
-  catch (CosNaming::NamingContext::AlreadyBound)
-    {
-      CORBA::release (cont);
-      throw CosNaming::NamingContext::AlreadyBound ();
-    }
-
-  return cont->_duplicate (cont);
-}
-    
-void 
-NS_NamingContext::destroy (CORBA::Environment &IT_env) 
-  throw (CORBA::SystemException, 
-	 CosNaming::NamingContext::NotEmpty)
-{
-  if (context_.current_size () != 0)
-    throw CosNaming::NamingContext::NotEmpty ();
-
-  // destroy context
-  CORBA::release (tie_ref_);
-}
-    
-void 
-NS_NamingContext::list (CORBA::ULong how_many, 
-			CosNaming::BindingList *&bl, 
-			CosNaming::BindingIterator_ptr &bi, 
-			CORBA::Environment &IT_env) 
-  throw (CORBA::SystemException)
-{
-  // Dynamically allocate hash map iterator.
-  NS_NamingContext::HASH_MAP::ITERATOR *hash_iter = 
-    new NS_NamingContext::HASH_MAP::ITERATOR (context_);
-
-  // Number of bindings that will go into the BindingList.
-  CORBA::ULong n;
-
-  if (context_.current_size () > how_many)
-    // number of bindings in the context is > <how_many>
-    // so need to return a BindingIterator.
-     {
-       NS_BindingIterator *bind_iter = new NS_BindingIterator (hash_iter);
-	 
-       bind_iter->initialize (bi); 
-       bi->_duplicate (bi);
-       
-       n = how_many;
-    }
-  else
-    {
-      // Number of bindings in the context is <= <how_many>,
-      // so do not need to return a BindingIterator.
-      bi = CosNaming::BindingIterator::_nil (); 
-      n = context_.current_size ();
-    }     
-
-  // use hash iterator to populate a BindingList with
-  // bindings.
-  CosNaming::BindingList bindings;
-  bindings.length (n); 
-  NS_NamingContext::HASH_MAP::ENTRY *hash_entry;
-
-  for (CORBA::ULong i = 0; i < n; i++) 
-    {
-      hash_iter->next (hash_entry);
-      hash_iter->advance ();
-      
-      bindings[i].binding_type = hash_entry->int_id_.type_;
-      
-      bindings[i].binding_name.length (1); 
-      bindings[i].binding_name[0].id =
-	CORBA::string_dup (hash_entry->ext_id_.id_.fast_rep ());
-      bindings[i].binding_name[0].kind =
-	CORBA::string_dup (hash_entry->ext_id_.kind_.fast_rep ());
-    }
-  // Marina, please add check for memory failure.
-  bl = new CosNaming::BindingList (bindings);
-
-  // If did not allocate BindingIterator, deallocate hash map
-  // iterator.
-  if (context_.current_size () <= how_many)
-    delete hash_iter;
-}
-  
-NS_BindingIterator::NS_BindingIterator (NS_NamingContext::HASH_MAP::ITERATOR *hash_iter)
-{
-  hash_iter_ = hash_iter;
-}
- 
-NS_BindingIterator::~NS_BindingIterator (void)
-{
-  delete hash_iter_;
-}
- 
-void
-NS_BindingIterator::initialize (CosNaming::BindingIterator_ptr tie_ref)
-{
-  tie_ref_ = tie_ref;
-}
-  
-CORBA::Boolean 
-NS_BindingIterator::next_one (CosNaming::Binding*& b, 
-			      CORBA::Environment &IT_env) 
-  throw (CORBA::SystemException)
-{
-  if (hash_iter_->done ()) {
-    b = new CosNaming::Binding;
-    return 0;
-  }
-  else
-    {
-      b = new CosNaming::Binding;
-
-      NS_NamingContext::HASH_MAP::ENTRY *hash_entry;
-      hash_iter_->next (hash_entry);
-      hash_iter_->advance ();
-      
-      b->binding_type = hash_entry->int_id_.type_;
-
-      b->binding_name.length (1); 
-      b->binding_name[0].id =
-	CORBA::string_dup (hash_entry->ext_id_.id_.fast_rep ());
-      b->binding_name[0].kind =
-	CORBA::string_dup (hash_entry->ext_id_.kind_.fast_rep ());      
-
-      return 1;
-    }
-}
-    
-CORBA::Boolean 
-NS_BindingIterator::next_n (CORBA::ULong how_many, 
-			    CosNaming::BindingList *&bl,
-			    CORBA::Environment &IT_env) 
-  throw (CORBA::SystemException)
-{
-  if (hash_iter_->done ()) {
-    bl = new CosNaming::BindingList;
-    return 0;
-  }
-  else
-    {
-      // Statically allocate a BindingList.
-      CosNaming::BindingList bindings;
-
-      // Initially assume that iterator has the requested number of
-      // bindings.
-      bindings.length (how_many);
-
-      // Iterate and populate the BindingList.
-      NS_NamingContext::HASH_MAP::ENTRY *hash_entry;
-      for (CORBA::ULong i = 0; i < how_many; i++) 
-	{
-	  hash_iter_->next (hash_entry);
-	  
-	  bindings[i].binding_type = hash_entry->int_id_.type_;
-	  
-	  bindings[i].binding_name.length (1); 
-	  bindings[i].binding_name[0].id =
-	    CORBA::string_dup (hash_entry->ext_id_.id_.fast_rep ());
-	  bindings[i].binding_name[0].kind =
-	    CORBA::string_dup (hash_entry->ext_id_.kind_.fast_rep ());
-	  
-	  if (hash_iter_->advance () == 0)
-	    {
-	      // If no more bindings left, reset length to the actual
-	      // number of bindings populated and get out of the loop.
-	      bindings.length (i + 1);
-	      break;	    
-	    }
-	}
-
-      bl = new CosNaming::BindingList (bindings);
-      // Marina, please check for failed memory allocation.
-      return 1;
-    }
-}
-    
-void 
-NS_BindingIterator::destroy (CORBA::Environment &IT_env) 
-  throw (CORBA::SystemException)
-{
-  CORBA::release (tie_ref_);
-}
-
-
diff --git a/TAO/ORB_Services/Naming_Service/NS_CosNaming.h b/TAO/ORB_Services/Naming_Service/NS_CosNaming.h
deleted file mode 100644
index c347854ef8f..00000000000
--- a/TAO/ORB_Services/Naming_Service/NS_CosNaming.h
+++ /dev/null
@@ -1,278 +0,0 @@
-/* -*- C++ -*- */
-
-// ============================================================================
-//
-// = LIBRARY
-//    cos
-// 
-// = FILENAME
-//   NS_CosNaming.h
-//
-// = AUTHOR
-//    Marina Spivak <marina@cs.wustl.edu>
-// 
-// ============================================================================
-
-#if !defined (NS_COSNAMING_H)
-#define NS_COSNAMING_H
-
-#include "CosNaming.hh"
-#include "ace/Hash_Map_Manager.h"
-#include "ace/Synch.h"
-#include "ace/SString.h"
-
-class NS_IntId 
-  // = TITLE
-  //     Stores information a context keeps for each bound name
-  //     (object reference and the type of binding).
-  //
-  // = DESCRIPTION
-  //
-  //
-  //
-  //
-{
-public:
-  // = Initialization and termination methods.
-  NS_IntId (void);
-  // default constructor.
-
-  NS_IntId (CORBA::Object_ptr obj,
-	    CosNaming::BindingType type = CosNaming::nobject);
-  // constructor.
-  
-  NS_IntId (const NS_IntId & rhs);
-  // copy constructor
-
-  ~NS_IntId (void);
-  // destructor 
-
-  void operator= (const NS_IntId & rhs);
-  // Assignment operator (does copy memory).
-
-  CORBA::Object_ptr ref_;   
-  // CORBA object reference of the bound object.
-
-  CosNaming::BindingType type_;  
-  // Indicator of whether the object is a NamingContext that should
-  // participate in name resolution when compound names are used.
-};
-
-class NS_ExtId 
-  // = TITLE
-  //    Stores the name to which an object is bound.
-  //
-  // = DESCRIPTION
-  //
-  //
-  //
-  //
-{
-public:
-  // = Initialization and termination methods.
-  NS_ExtId (void);
-  // default constructor.
-
-  NS_ExtId (const char *id, 
-	    const char *kind);
-  // constructor.
-  
-  NS_ExtId (const NS_ExtId & rhs);
-  // copy constructor
-
-  ~NS_ExtId (void);
-  // destructor 
-
-  void operator= (const NS_ExtId & rhs);
-  // Assignment operator (does copy memory).
-
-  int operator== (const NS_ExtId &rhs) const;
-  // Equality comparison operator (must match both id_ and kind_).
-
-  int operator!= (const NS_ExtId &rhs) const;
-  // Inequality comparison operator.
-
-  u_long hash (void) const;
-  // This class has to have a hash for use with ACE_Hash_Map_Manager.
-
-  ACE_CString kind_;  
-  // any information user wants to store (not used by Naming Service).
-
-  ACE_CString id_;  
-  // any information user wants to store (not used by Naming Service).
-};
-
-class NS_NamingContext 
-  // = TITLE
-  //     This class implements the NamingContext interface that is part of the 
-  //     CosNaming idl module.  
-  //
-  // = DESCRIPTION
-  //     Extensive comments can be found in the idl file. 
-{
-public:
-  
-  enum
-  {
-    NS_MAP_SIZE = 23
-    // The size of hash map for a NS_NamingContext object.
-  };
-
-  typedef ACE_Hash_Map_Manager<NS_ExtId, NS_IntId, ACE_Null_Mutex> HASH_MAP;
-         
-  NS_NamingContext (void);
-  // default constructor.
-
-  ~NS_NamingContext (void);
-  // destructor.
-
-  void bind (const CosNaming::Name &n, 
-	     CORBA::Object_ptr obj, 
-	     CORBA::Environment &IT_env = CORBA::default_environment) 
-     throw (CORBA::SystemException, 
-	    CosNaming::NamingContext::NotFound, 
-	    CosNaming::NamingContext::CannotProceed, 
-	    CosNaming::NamingContext::InvalidName, 
-	    CosNaming::NamingContext::AlreadyBound);
-                
-  void rebind (const CosNaming::Name &n, 
-	       CORBA::Object_ptr obj, 
-	       CORBA::Environment &IT_env = CORBA::default_environment) 
-    throw (CORBA::SystemException, 
-	   CosNaming::NamingContext::NotFound, 
-	   CosNaming::NamingContext::CannotProceed, 
-	   CosNaming::NamingContext::InvalidName);
-                
-  void bind_context (const CosNaming::Name &n, 
-		     CosNaming::NamingContext_ptr nc, 
-		     CORBA::Environment &IT_env = CORBA::default_environment) 
-    throw (CORBA::SystemException, 
-	   CosNaming::NamingContext::NotFound, 
-	   CosNaming::NamingContext::CannotProceed, 
-	   CosNaming::NamingContext::InvalidName, 
-	   CosNaming::NamingContext::AlreadyBound);
-                
-  void rebind_context (const CosNaming::Name &n, 
-		       CosNaming::NamingContext_ptr nc, 
-		       CORBA::Environment &IT_env = CORBA::default_environment)
-    throw (CORBA::SystemException, 
-	   CosNaming::NamingContext::NotFound, 
-	   CosNaming::NamingContext::CannotProceed, 
-	   CosNaming::NamingContext::InvalidName);
-                
-  CORBA::Object_ptr resolve (const CosNaming::Name &n, 
-			     CORBA::Environment &IT_env = CORBA::default_environment) 
-    throw (CORBA::SystemException, 
-	   CosNaming::NamingContext::NotFound, 
-	   CosNaming::NamingContext::CannotProceed, 
-	   CosNaming::NamingContext::InvalidName);
-                
-  void unbind (const CosNaming::Name &n, 
-	       CORBA::Environment &IT_env = CORBA::default_environment) 
-    throw (CORBA::SystemException, 
-	   CosNaming::NamingContext::NotFound, 
-	   CosNaming::NamingContext::CannotProceed, 
-	   CosNaming::NamingContext::InvalidName);
-                
-  CosNaming::NamingContext_ptr new_context (CORBA::Environment &IT_env = CORBA::default_environment) 
-    throw (CORBA::SystemException);
-                
-  CosNaming::NamingContext_ptr bind_new_context (const CosNaming::Name &n, 
-						 CORBA::Environment &IT_env = CORBA::default_environment) 
-    throw (CORBA::SystemException, 
-	   CosNaming::NamingContext::NotFound, 
-	   CosNaming::NamingContext::AlreadyBound, 
-	   CosNaming::NamingContext::CannotProceed, 
-	   CosNaming::NamingContext::InvalidName);
-                
-  void destroy (CORBA::Environment &IT_env = CORBA::default_environment) 
-    throw (CORBA::SystemException, 
-	   CosNaming::NamingContext::NotEmpty);
-                
-  void list (CORBA::ULong how_many, 
-	     CosNaming::BindingList *&bl, 
-	     CosNaming::BindingIterator_ptr &bi, 
-	     CORBA::Environment &IT_env = CORBA::default_environment) 
-    throw (CORBA::SystemException);
-
-
-  void initialize (CosNaming::NamingContext_ptr tie_ref);
-  // This method is called after context constructor.  It provides the
-  // implementation object with the reference to its TIE object. (This
-  // is needed for implementation of destroy method)
-
-protected:
-  // = These are the helper methods used by other methods.
-
-  CosNaming::NamingContext_ptr get_context (const CosNaming::Name &name)
-       throw (CORBA::SystemException, 
-	      CosNaming::NamingContext::NotFound, 
-	      CosNaming::NamingContext::CannotProceed, 
-	      CosNaming::NamingContext::AlreadyBound);
-  // This is used by methods that need to resolve a compound name to
-  // get the reference to the target context before performing the
-  // actual operation (e.g. bind, unbind, etc.)  Takes a full name
-  // (including the last component that doesn't need to be resolved)
-  // Returns a pointer to the target context.
-
-private:    
-  
-  HASH_MAP context_;
-  // This implementation of NamingContext uses ACE thread-safe Hash
-  // Map for storage and manipulation of name-object bindings.
-
-  CosNaming::NamingContext_ptr tie_ref_;
-  // Stores CORBA object reference to the TIE object this object
-  // implements.  This is needed to implement the <destroy> method.
-};
-
-class NS_BindingIterator
-  // = TITLE
-  //     This class implements the BindingIterator interface 
-  //     that is part of the CosNaming idl module.
-  //
-  // = DESCRIPTION
-  //     NS_BindingIterator constructor expects a pointer to a
-  //     DYNAMICALLY allocated hash map iterator. Destructor
-  //     deallocates hash map iterator.
-{
-public:
-  // = Intialization and termination methods.
-  NS_BindingIterator (NS_NamingContext::HASH_MAP::ITERATOR *hash_iter);
-  // constructor.
-
-  ~NS_BindingIterator (void);
-  // destructor.
-
-  void initialize (CosNaming::BindingIterator_ptr tie_ref);
-  // This method is called after the constructor.  It provides
-  // implementation object with the reference to the TIE object it
-  // implements.
-
-  // Marina, please add comments.
-  CORBA::Boolean next_one (CosNaming::Binding *&b, 
-			   CORBA::Environment &IT_env = CORBA::default_environment) 
-     throw (CORBA::SystemException);
- 
-  CORBA::Boolean next_n (CORBA::ULong how_many, 
-			 CosNaming::BindingList *&bl, 
-			 CORBA::Environment &IT_env = CORBA::default_environment) 
-    throw (CORBA::SystemException);
-
-    
-  void destroy (CORBA::Environment &IT_env = CORBA::default_environment) 
-    throw (CORBA::SystemException);
-
-private:
-  NS_NamingContext::HASH_MAP::ITERATOR *hash_iter_;
-  // A pointer to the hash map iterator.
-
-  CosNaming::BindingIterator_ptr tie_ref_;
-  // A reference to the TIE object this object implements.  this is
-  // used for implementation of <destroy>.
-};
-
-DEF_TIE_CosNaming_NamingContext (NS_NamingContext)
-DEF_TIE_CosNaming_BindingIterator (NS_BindingIterator)
-
-#endif /* NS_COSNAMING_H */
diff --git a/TAO/README b/TAO/README
deleted file mode 100644
index 65ad882dba2..00000000000
--- a/TAO/README
+++ /dev/null
@@ -1,76 +0,0 @@
-Welcome to the alpha release of The ACE ORB (TAO).  TAO is an
-implementation of a CORBA2-compliant ORB that supports real-time
-extensions.  Please see http://www.cs.wustl.edu/~schmidt/TAO.html for
-more information on TAO.
-
-Some detailed information on this version of TAO is available in the
-'docs' subdirectory in HTML format.
-
-The current alpha release of TAO contains the following:
-
-     * An ORB Core based on ACE C++ components. This ORB Core provides 3
-       concurrency models: (1) Reactive, (2) Thread-per-Connection,
-       and (3) Thread-per-Rate (which is optimized for certain types
-       of deterministic real-time systems).
-
-     * A highly optimized version of the SunSoft IIOP protocol
-       interpreter;
-
-     * An prototype implementation of the Portable Object Adapter
-       (POA) specification.
-
-     * A prototype IDL compiler, based on the SunSoft IDL compiler. This 
-       IDL compiler generates stubs and skeletons that utilize the
-       SunSoft IIOP protocol interpreter.
-
-     * Various tests illustrating how to use TAO.
-       
-The current version of TAO contains source code and tests that are
-around 0.4 Megabytes when compressed using GNU gzip.
-
-We've gotten TAO to interoperate with other ORBs (e.g., Orbix and
-Visigenic), so we're confident that the implementation of IIOP is
-robust. We're currently working on the following features for TAO:
-   
-     * A complete POA implementation.
-
-     * An IDL compiler that generates optimized compiled stubs and
-       skeletons. For this, we're planning to use the Flick IDL
-       compiler from University of Utah.
-
-     * A highly extensible, highly optimized set of request
-       demultiplexing strategies that provide constant time lookup of
-       servants based on object keys and operation names contained in
-       CORBA requests.
-
-     * A Real-time Scheduling Service that determines the priority at
-       which Client requests are dispatched by the ORB.
-
-     * A Real-time Event Service that dispatches CORBA events in
-       real-time.
-
-     * Implementations of the CORBA COS Naming service and Trader
-       service.
-       
-We plan to release these features throughout the fall of 1997. You can
-keep track of our progress online.
-
-Please feel free to experiment with, dissect, repair, use, etc., TAO.
-We gratefully accept bug reports, appreciate bug fixes/enhancements,
-and will strive to integrate correct bug fixes quickly!
-
-If you have any questions, please post them to the ACE mailing list
-<ace-users@cs.wustl.edu> until we get a TAO mailing list established.
-
-A quick build note for users who have used ACE with other ORBs:
-linking TAO with a version of ACE that must also be linked against
-another ORB vendor's library, e.g., liborbix.so, will produce
-undefined and most likely unpredictable and erroneous results.
-
-If you have any questions, please post them to the ACE mailing list
-(ace-users@cs.wustl.edu) until we get a TAO mailing list established.
-
-Thanks,
-
-	Douglas C. Schmidt
-	schmidt@cs.wustl.edu
diff --git a/TAO/README.sun b/TAO/README.sun
deleted file mode 100644
index 5fbfaeacbdc..00000000000
--- a/TAO/README.sun
+++ /dev/null
@@ -1,256 +0,0 @@
-========================================
-
-This file contains the original README that came with the SunSoft IIOP
-release.  This information in this file is historical in nature and
-the much of the specific information probably is inaccurate with
-respect to the current state of TAO.  Please see the ./README file
-that comes with TAO for up-to-date information.
-
-Specifically, some of the files referred to below have been renamed in
-TAO.
-
-========================================
-
-@(#)README	1.2 97/02/03
-
-Inter-ORB Engine
-================
-
-02-Feb, 1997
-Version 1.4
-
-	-=+=-	-=+=-	-=+=-	-=+=-	-=+=-	-=+=-	-=+=-
-
-    As of today, this is the most current version of the "IIOP Engine".
-    It's doubtful that a later one will be released by Sun Microsystems.
-
-    This still supports only IIOP v1.0 (no fragmentation or security
-    extensions) and contains a few bugs (GIOP service context typecode
-    is wrong).  This version was completed before the COM/CORBA
-    "Part A" RFP cycle, as well as the "Secure IOP" work.
-
-    It's different from other versions in that it has (a) the benefit
-    of much performance work, including support for multithreading,
-    (b) the source code is reorganized to display more of the internal
-    structure, and (c) it incorporates a simple COM glue layer (which
-    is not the same as the one later standardized by the OMG).  There
-    is surely more; for example, experimental XDR marshaling support.
-
-    Documentation hasn't particularly been updated.  It'll need more work
-    to run "out of the box" since it doesn't use autoconf just now.
-
-    Please drop me a line (brownell@ix.netcom.com) if you're using this.
-
-	    - Dave
-
-	-=+=-	-=+=-	-=+=-	-=+=-	-=+=-	-=+=-	-=+=-
-
-
-INTRODUCTION
-------------
-Welcome to the Inter-ORB Engine!  This is the source code version of
-SunSoft's portable implementation of the CORBA 2.0 mandatory "IIOP"
-interoperability protocol for networked ORBs.
-
-This is a preliminary version.  This software is made available AS IS and
-WITH NO GUARANTEES.  Please make sure you read and understand the copyright
-and license notice under which this software is distributed.  This notice
-may be found in the "LICENSE" file that is part of this distribution, and
-also in the corba/orb.hh header file used by every source file.  Note that
-both commercial and noncommercial usage is allowed.
-
-The rest of this document includes these sections:
-
-    - ENGINE OVERVIEW
-    - TARGET AUDIENCE
-    - HOW TO OBTAIN THIS SOFTWARE
-    - CONTACT POINT AND WORKING ALIAS
-    - ABOUT THIS IIOP SOFTWARE DISTRIBUTION
-    - WHAT ARE:  IOP, IIOP, GIOP, ESIOP, AND DCE-CIOP?
-
-For instructions on how to build and test this software, see the file
-named "BUILDING" in the "docs" directory. [Note, this is renamed to
-TAO-Install.html for TAO].
-
-ENGINE OVERVIEW
----------------
-The Inter-ORB Engine implementation is composed of four parts.  Each of
-these is found in a top level directory with the name used here:
-
- *  "runtime" ... this defines the public binary interface to the engine, as
-	used by application (and test) programs.  It has three main parts:
-
-	- A CDR (Common Data Representation) marshaling engine, which encodes
-	  simple OMG-IDL data types directly and uses a TypeCode interpreter
-	  to marshal complex ones;
-
-	- The TypeCode interpreter is used to manipulate all legal OMG-IDL
-	  data types using just standard OMG-IDL TypeCodes;
-
-	- The runtime framework itself includes a partial ORB implementation.
-	  Its programming interfaces are specified in CORBA and it provides
-	  the OMG-IDL C++ mapping of those abstractions in most cases;
-
- *  "bridge" ... this is an IIOP-specific module which talks to the runtime
-	and to TCP-based sockets to send, receive, and dispatch IIOP messages.
-
- *  "test" ... code for a few basic functional tests is included.
-
- *  "docs" ... text files, such as this one, describe the way the
-	implementation works.  This is oriented toward people who are
-	maintaining, porting, or otherwise enhancing this code.
-
-The package is not a full ORB.  It doesn't support the full set of CORBA
-APIs, an IDL compiler, an Interface Repository, a standard object adapter,
-and more.  You could use this software to help build an ORB, but you
-would need to enhance it.
-
-If you have an interest in using an IDL compiler to generate TypeCodes,
-stubs, and/or skeletons, you may be interested in the portable front end
-for an OMG-IDL compiler which is available through the OMG FTP server.
-Further information may be found in this file:
-
-    ftp.omg.org:/pub/OMG_IDL/ANNOUNCEMENT
-
-
-TARGET AUDIENCE
----------------
-Who should use this release?
-
-- Organizations which are providing their own implementations of the IIOP
-  should use this software to perform protocol testing, helping to ensure
-  that they can in fact interoperate with each other.
-
-- Bridge builders, including ORB implementors who have their own ORB
-  protocols, can use this software to bootstrap bridge construction work.
-  This includes bridge builders working to bridge COM and CORBA.
-  
-- ORB implementors can use this to acquire a TypeCode interpreter.  (ORBs
-  compliant with CORBA 2.0 CORE need one to support the dynamic runtime
-  typing APIs, such as Any, DII, and DSI.)
-
-- ORB implementors without their own protocols can use this software to add
-  networked object capabilities to their systems, using the Internet IOP.
-
-- Implementors of systems which are intended to talk with ORBs may wish to
-  use this software when bridging to ORBs from non-CORBA systems.  A few
-  examples:  (a) specialized applications that don't need a full ORB as
-  infrastructure; (b) "legacy" code which needs either to use an ORB or to
-  be used by one; (c) users or providers other object systems, such as
-  programming environments, which want ORB connectivity.
-
-- And of course, this is the core of a portable ORB, and may be used as
-  one by providing the rest of the CORBA 2.0 programming interfaces and
-  development tools such as one or more IDL compilers.
-
-
-HOW TO OBTAIN THIS SOFTWARE
----------------------------
-There are several distribution sites for this software, and it may also be
-restributed through other ones.  Not all sites will necessarily have the
-most recent version.
-
-OMG MAIL SERVER -- You can use a mail server program to retrieve this
-software. Send email with a body line 'help' to iiop-bridging@omg.org, and
-the mail server will respond with a copy of this README file.  Send email
-with a body line "iiop" and it will return a SHAR file of this software.
-
-OMG FTP SERVER -- You may also use anonymous FTP to the "ftp.omg.org" server.
-To do this the classic (pre-Web) Internet way, use FTP to sign on with the
-username "ftp" and your Internet email address as your password.  Then change
-directory to "/pub/interop" and retrieve:
-
-    - "iiop.sh.Z" ... compressed SHAR format, for UNIX systems
-    - "iiop.tar.Z" ... compressed TAR format, also for UNIX systems
-    - "iiop.zip" ... ZIP format, for MS-Windows systems
-
-In Web-speak, those files are named by these URLs:
-
-    ftp://ftp.omg.org/pub/interop/iiop.sh.Z	... compressed SHAR format
-    ftp://ftp.omg.org/pub/interop/iiop.tar.Z	... compressed TAR format
-    ftp://ftp.omg.org/pub/interop/iiop.zip	... PC ZIP format
-
-Copies of this software may be made available from archives other than
-omg.org. New versions made available by Sun will be placed on omg.org and a
-message will be sent to the comp.object newsgroup announcing availability.
-
-
-CONTACT POINT AND WORKING ALIAS
--------------------------------
-Please let us know who you are if you decide to use this software, and how
-you use it. Please send e-mail to:
-
-     omg-iiop-bridge@sun.com
-
-This address can also be used to report problems, bugs (or better yet, fixes!),
-suggestions and send general comments.  It is not a general mailing list for
-discussion about IIOP implementations. 
-
-There is at least one general access alias intended for discussion about
-IIOP implementations.  You can subscribe by sending email with a subject
-line of "subscribe" to:
-
-    iiop-impl-request@jsoft.com
-
-
-ABOUT THIS IIOP SOFTWARE DISTRIBUTION
--------------------------------------
-On some platforms POSIX threads (P1003.1c; draft 10 became the standard)
-will be available to users of this distribution.  There are still legal
-client side message sequences which will not be emitted by this distribution
-(namely, requests being sent on a connection while a response is pending),
-though by definition the server side must (and will!) accept them when they
-are produced by other implementations of the IIOP.
-
-Also, note that although this is written in C++, ANSI C++ exceptions are not
-required.  This derives from a goal to have this software be highly portable.
-(Few C++ compilers fully comply with the C++ exception specifications.)
-
-Developers should not be surprised to find implementation or specification
-problems at this point in time.  When they do, they are encouraged to
-communicate such problems through the contact point (for problems with this
-implementation of IIOP; see above) or the OMG interoperability revision
-task force (for specification problems; see the REFERENCES file) so that
-they can be resolved.  If you need complete and final ORB software, you
-should use a commercially available ORB product.
-
-There are areas where the software is known to be incomplete; for example,
-it does not provide Interface Repository APIs.  It is expected that bridge
-and ORB implementors will add the missing pieces as appropriate for their
-environments.  In some cases these may be added in future distributions
-of this software.
-
-See the "DIFFERENCES" file for information about where this software differs
-from current OMG specifications.  As a rule, these differences are to
-establish compatibility with CORBA 2.0 specifications which are being
-prepared but which are not (as of this writing) available.  In some cases,
-they address recently recognized problems that are yet to be resolved.
-
-For a brief description of the implementation, including goals, notes, and
-an overview of the source file organization, see the "IMPLEMENTATION" file.
-
-For a brief overview of the functional tests, see the "TESTS" file.
-
-
-WHAT ARE:  IOP, IIOP, GIOP, ESIOP, AND DCE-CIOP?
-------------------------------------------------
-Inter-ORB Protocols (IOPs) support communication between or within ORBs.
-
-The "Internet IOP" (IIOP) is the protocol adopted by OMG that is required
-to be supported by CORBA 2.0 compliant Networked ORBs, either as a native
-protocol or through half bridges.  It is a mapping of the "General IOP"
-(GIOP) onto the Internet's TCP transport layer.  Mappings onto other
-transport layers may be defined in the future.
-
-ORBs are free to support optional Environment Specific IOPs (ESIOPs) as
-their preferred ORB protocols.  The "DCE-Common IOP" (DCE-CIOP) is the the
-first such protocol that has been publicly specified.  It uses a subset of
-DCE-RPC facilities, and reuses parts of the GIOP.  ORB implementors building
-on top of DCE are likely to comply with DCE-CIOP, and bridge to the IIOP
-for communication with ORBs not using the DCE-CIOP.
-
-Of course, other ESIOPs exist and will continue to exist, both in ORBs built
-on top of other distributed computing environments such as ONC+ and ones
-independent of such environments.  Due to the prevalence of such ESIOPs,
-most ORBs are expected to interoperate through bridging to the IIOP.
-
diff --git a/TAO/TAO-INSTALL.html b/TAO/TAO-INSTALL.html
deleted file mode 100644
index bd8739a18d7..00000000000
--- a/TAO/TAO-INSTALL.html
+++ /dev/null
@@ -1,100 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>Building and Installing TAO</TITLE>
-</HEAD>
-<BODY text = "#000000" link="#000fff" vlink="#ff0f0f" bgcolor="#ffffff">
-
-<HR>
-<h3>Building and Installing TAO</h3>
-
-TAO has been ported and tested Windows NT, Solaris, VxWorks, and
-Linux.  I expect that major portions of the release will port easily
-to other platforms that ACE has been ported to.  If you can help port
-TAO to other platforms I'd appreciate it. <P>
-
-TAO can be obtained <A HREF="TAO-obtain.html">electronically</A> via
-the WWW and ftp.  Besides getting the <A
-HREF="http://siesta.cs.wustl.edu/~schmidt/TAO-obtain.html">TAO alpha
-release</A> you will need <A
-HREF="http://siesta.cs.wustl.edu/~schmidt/ACE-obtain.html">ACE</A>.
-You will likely need the most recent beta version of ACE because TAO
-tends to track changes to ACE rather closely. <P>
-
-A quick build note for users who have used ACE with other ORBs:
-linking TAO with a version of ACE that must also be linked against
-another ORB vendor's library, e.g., liborbix.so, will produce
-undefined and most likely unpredictable and erroneous results. <P>
-
-<HR><P>
-<h3>On UNIX platforms</h3>
-
-    <ol>
-      <li>Set <code>ACE_ROOT</code> environment variable as outlined
-      in the <a href="../ACE-INSTALL.html">ACE installation
-      notes</a>.</li> <P>
-
-      <li>Build and install ACE under $ACE_ROOT.</li> <P>
-
-      <UL>
-      <li>Change directory to <code>$ACE_ROOT/ace</code> and execute
-      <code>make</code>.</li> <P>
-      </UL>
-
-      <li>Set <code>TAO_ROOT</code> environment variable to
-           $ACE_ROOT/TAO. <P>
-
-      <li>Build and install the TAO release under $TAO_ROOT.</li> <P>
-
-      <UL>
-      <li>Change directory to <code>$TAO_ROOT/tao</code> and
-      execute <code>make</code>.</li> <P>
-      </UL>
-
-      <li>Change directory to <code>$TAO_ROOT/tests</code> and
-      execute <code>make</code>.</li> <P>
-
-      <li>Follow instructions on executing the various examples under
-      <code>$TAO_ROOT/tests</code>.<P>
-
-    </ol>
-
-<HR><P>
-<H3>On Windows NT</H3>
-
-<H4>Visual C++ 5.0</H4>
-
-<P>It works best if TAO is placed in ACE_wrappers so TAO ends up in 
-ACE_wrappers\TAO because the Visual C++ 5.0 Project files are set up to work 
-in this configuration. If you move it, then make sure you change the project
-file to look for the include and library files in the correct place.</P>
-
-<OL>
-  <LI> Make sure ACE is built (For Visual C++ 5.0, use ace.dsw or ace-vc50.dsw, 
-       whichever is in your copy of ACE). <BR><BR>
-
-  <LI> Load the workspace tao\TAO.dsw and build the TAO library. <BR><BR>
-
-  <LI> To build the Cubit test, load the workspace tests\Cubit\TAO\test.dsw 
-       and build both client and server. <BR><BR>
-</OL>
-
-<H4>Visual C++ 4.x</H4>
-
-<OL>
-  <LI> In Tools|Options, go to the Directories page and make sure that include
-       files paths includes ACE_wrappers\ and the root directory of TAO (which
-       can be ACE_wrappers\TAO if installed there).  The library files paths 
-       should include ACE_wrappers\ace. <P>
-
-  <LI> Load the project file tao\TAO.mdp and build the TAO library. <P>
-
-  <LI> To build the Cubit test, load the project file tests\Cubit\TAO\test.mdp
-       and build both client and server. <P>
-</OL>
-
-<P><HR><P>
-Back to the <A HREF="http://www.cs.wustl.edu/~schmidt/TAO.html">TAO</A> home page.
-
-<!--#include virtual="/~schmidt/cgi-sig.html" -->
-</BODY> 
-</HTML>
diff --git a/TAO/TAO_IDL/ANNOUNCEMENT b/TAO/TAO_IDL/ANNOUNCEMENT
deleted file mode 100644
index 870db6f6006..00000000000
--- a/TAO/TAO_IDL/ANNOUNCEMENT
+++ /dev/null
@@ -1,131 +0,0 @@
-WHAT:
-
-SunSoft, Inc., Mountain View, California, has placed the source code to
-Project DOE's Interface Definition Language (IDL) compiler front end
-(CFE) on OMG's file server, making the implementation publicly
-available. This release is identified by the version number 1.3.
-
-Project DOE is SunSoft's corporate-wide development effort to integrate
-distributed object technology into the Solaris O/S.  OMG (Object Management
-Group) is the industry wide body formed to create specifications for
-distributed object technology. It currently has more than 370 members. OMG
-IDL is part of OMG's CORBA 1.1 specification and provides a standardized
-way for defining object interfaces. OMG IDL forms the basis for distributed
-object interactionin Project DOE.
-
-The SunSoft OMG IDL CFE provides a complete framework for building
-CORBA 1.1-compliant preprocessors for OMG IDL.  By using this standard
-implementation, developers of OMG IDL compilers will save many months
-of work and enhance the portability and interoperability of OMG
-IDL-interfaced objects.
-
-The SunSoft OMG IDL CFE allows convenient and fast integration of new back
-ends to the compiler.  The release consists of a front end which converts
-OMG IDL to an intermediate format, a compiler framework driver, an example
-implementation of a compiler back end, and a set of protocols for
-interaction between the front and back ends.  The SunSoft OMG IDL CFE
-parser uses components generated by yacc and lex.
-
-The SunSoft OMG IDL CFE is designed to allow easy extension of OMG IDL
-without impacting existing back-end implementations.  As the CORBA
-specification evolves, any new updates to the IDE CFE will be placed
-by SunSoft on the OMG server.
-
-This release provides a directory with many examples of OMG IDL
-specifications to allow users to become familiar with the process of
-writing OMG IDL code.
-
-For more information send email to idl-cfe@sun.com.
-
-HOW:
-
-The SunSoft OMG IDL CFE is available at no charge through anonymous FTP
-in source form on the OMG file server, omg.org. Please retrieve the
-file OMG_IDL_CFE_1.3.tar.Z from the directory pub/OMG_IDL_CFE_1.3. Please
-let us know who you are if you retrieve the compiler front end using this
-method, by sending email to idl-cfe@sun.com.
-
-You can also retrieve the software by using the OMG mail server program.
-Send email with the subject 'help' to omg_idl@omg.org, and the mail server
-will respond with instructions on how to retrieve the software.
-
-WHEN:
-
-The SunSoft OMG IDL CFE is available now.
-
-CONTACT:
-
-Please let us know who you are if you decide to use this software, and how
-you use it. Please send email to:
-
-     idl-cfe@sun.com
-
-This address can also be used to report problems, bugs, suggestions and
-send general comments.
-
-We ask that if you make extensions or modifications to this source release,
-please make these extensions available to others using the OMG IDL compiler
-front end, by sending the modified sources to the above email address. This
-will help us evaluate your extensions for inclusion in a future version. It
-also ensures your investment in these extensions when new versions of the
-CFE are released.
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
-COPYRIGHT NOTICE:
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
diff --git a/TAO/TAO_IDL/CHANGES b/TAO/TAO_IDL/CHANGES
deleted file mode 100644
index ae6fca7bcea..00000000000
--- a/TAO/TAO_IDL/CHANGES
+++ /dev/null
@@ -1,122 +0,0 @@
-CHANGES WHICH AFFECT BE WRITERS
--=============================-
-
-INTRODUCTION
-
-This file describes changes that affect BE writers. It contains IMPORTANT
-INFORMATION for BE writers who wish to migrate a BE written to operate with
-release 1.2 to operate with release 1.3. It is likely that not following
-these instructions will result in a compilable but malfunctioning compiler.
-
-AST INHERITANCE CHANGES
-
-The AST has been reorganized so that AST_Union and AST_Exception now
-inherit from AST_Structure. This means that constructors of BE classes
-which inherit from AST_Union or AST_Exception now need to explicitly call
-an initializer for AST_Structure in their init section.
-
-We repeat below the information given in the file WRITING_A_BE, in the
-section entitled "WRITING A BE".
-
-AST_EXCEPTION
-
-The signature for constructors of classes inheriting from AST_Exception
-should now be:
-
-	BE_Exception::BE_Exception(UTL_ScopedName *n,
-				   UTL_StrList *p)
-		    : AST_Decl(AST_Decl::NT_except, n, p),
-		      AST_Structure(AST_Decl::NT_except, n, p),
-		      UTL_Scope(AST_Decl::NT_except)
-
-AST_UNION
-
-The signature for constructors of classes inheriting from AST_Union should
-now be:
-
-	BE_Union::BE_Union(AST_ConcreteType *dt,
-			   UTL_ScopedName *n,
-			   UTL_StrList *p)
-		: AST_Union(dt, n, p),
-		  AST_Structure(AST_Decl::NT_union, n, p),
-		  AST_Decl(AST_Decl::NT_union, n, p),
-		  UTL_Scope(AST_Decl::NT_union)
-
-IDL_BOOL TYPE
-
-To increase portability and reduce dependency of the sources on POSIX
-compliance in targets of ports, IDL now provides its own boolean type which
-is named idl_bool. It provides two truth values, I_TRUE and I_FALSE.
-
-UTL_SCOPEDNAME TYPE
-
-The UTL_ScopedName type is now a list of Identifier nodes; in previous
-releases it used to be a list of String nodes. If your BE constructs scoped
-names this change will prevent recompilation until you modify your
-constructor calls to invoke constructors for Identifier instead of for
-String. The signature of the constructor is:
-
-	Identifier::Identifier(char *, long x=1, long y=0, long z=I_FALSE)
-
-The additional arguments which can be defaulted to the values indicated are
-included for future use.
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
diff --git a/TAO/TAO_IDL/INSTALL b/TAO/TAO_IDL/INSTALL
deleted file mode 100644
index 6fcaa710042..00000000000
--- a/TAO/TAO_IDL/INSTALL
+++ /dev/null
@@ -1,229 +0,0 @@
-INTERFACE DEFINITION LANGUAGE INSTALLATION GUIDE
--==============================================-
-
-INTRODUCTION
-
-This file describes the installation process for OMG_IDL_CFE version 1.3.
-This file explains how to:
-
-- install the source code
-- modify the sources to customize them for different configurations
-- modify the sources to implement your own back end
-
-TESTED CONFIGURATIONS
-
-This release has been tested and is believed to operate correctly on:
-- SunPro Sparcworks 2.x and 3.0 on SunOS 4.1.x
-- SunPro Sparcworks 2.x and 3.0 on Solaris 2.3
-- g++ 2.5.8 on SunOS 4.1.x
-- g++ 2.5.8 on Solaris 2.3
-
-This is the first release of OMG IDL CFE which is preconfigured to compile
-correctly for Solaris 2.x and with SunPro SparcWorks compilers.
-
-CUSTOMIZATION
-
-The release contains a file idl_make_vars in the current directory, which
-is included in each Makefile. This file defines all the customizable
-variables for the CFE.
-
-OSV should be set to a string denoting the operating system upon which you
-wish to build the CFE. The CFE as shipped is preconfigured to compile
-correctly on Solaris 2.x (OSV=SOLARIS2), and has also been tested on SunOS
-4.1.x (OSV=SUNOS4). It contains code donated by HP which enables it to be
-compiled on Apollo Domain systems (OSV=apollo) and HPUX systems (OSV=hpux),
-but these two configurations have not been tested.
-
-C++ and CCC should be set to identify the C++ compiler you will use to
-compile this release. Their values should be identical. Both are set to
-address differences between various make programs - some predefine CCC,
-others use C++ to denote the C++ compiler. The possible values are CC
-(which uses the Sparcworks compilers on SunOS 4.1 and Solaris 2.3) and g++,
-which uses the installed version of GNU C++.
-
-CCFLAGS should be set to a list of flags to pass to the C++ compiler. As
-shipped, this list is -g. NOTE: We have not extensively tested the release
-with optimization turned on.
-
-CPP_FLAGS should be set to a list of flags to pass to the C++ preprocessor.
-Use this variable to enable or disable specific customizations you make to
-the BE or CFE sources.
-
-YFLAGS should be set to a list of flags to pass to the Yacc program. As
-shipped, the list is -d -t, which causes Yacc to generate y.tab.h and
-y.tab.c files.
-
-LEXFLAGS should be set to a list of flags to pass to the Lex program. As
-shipped, the list -t.
-
-RANLIB should be set to the location of the ranlib program on your system.
-As shipped this is ranlib. If your system has no ranlib you can set this
-variable to ':' or /bin/true. As shipped the variable is preset to
-/bin/true since Solaris 2.x does not use ranlib.
-
-AR should be set to the location of the ar program on your system. As
-shipped this is ar. If your system has a different mechanism for creating
-libraries, you should modify the value of this variable accordingly.
-
-ARFLAGS should be set to the flags to be passed to the ar program. As
-shipped this is 'crv'.
-
-INSTALLATION
-
-a. Disk space requirements
-
-This distribution requires approximately 350 KBytes when compressed. When
-uncompressed, untarred and compiled, approximately 10 MBytes of disk space
-are consumed on a Sun 4.
-
-b. Getting the software
-
-Use anonymous FTP to omg.org and supply your e-mail address as password.
-Change directories to pub/OMG_IDL_CFE_1.3, set bin and get the compressed
-tar file OMG_IDL_CFE_1.3.tar.Z.
-
-The distribution may, in the future, be made available from other archives
-on the Internet. However, omg.org will always have the most up-to-date
-version of this software.
-
-After transferring this file, uncompress it and untar it in a directory of
-your choice.
-
-c. Compiling it
-
-If you are using a Sparcstation running Solaris 2.x and have the SunPro
-Sparcworks compilers installed, you may directly install the software. If
-your hardware or operating system configurations are different, read and
-follow the instructions in the previous section first.
-
-At the root directory of the release, issue
-
-   % make
-
-or
-
-   % make all
-
-This will compile the provided sources and the sources found in the be
-directory. Executing this make target causes 'make all' to be invoked in
-each subdirectory, resulting in building the libraries for each component
-and finally a link step producing an executable IDL compiler.
-
-In order to make only the compiler front end components, without compiling
-the sources found in the be directory and without building an executable,
-issue
-
-  % make libs
-
-This will build the libraries in the ast, fe, util, driver and narrow
-directories. To build only the be, issue
-
-  % make be
-
-To build all libraries without creating an executable, issue
-
-  % make all_libs
-
-To remove all files created by the build process, issue
-
-  % make clean
-
-This will not remove any files created by Yacc and Lex, because you may be
-using the ones provided in the distribution (see below).
-
-d. Yacc and Lex
-
-Some installations may not have a C++ aware Yacc and Lex processor. For
-these installations, we have included the output of yacc and lex in the
-release. If you need to use these files to build the release because you
-don't have access to a C++ capable Yacc or Lex, go to the "fe" directory,
-issue the command:
-
-   % touch lex.yy.cc y.tab.cc y.tab.hh
-
-This will ensure that the processed files appear to be newer than the
-source files they were produced from and will cause "make" to skip their
-production.
-
-NOTE: The files provided in the distribution have been produced on Solaris
-2.3 and may contain OS-specific #include directives. If you intend to use
-these files, you may have to edit them to make them work in your
-environment. The provided files are known to compile cleanly without
-modification with both SunPro Sparcworks compilers and GNU C++ on both
-SunOS 4.1 and Solaris 2.3.  We have not tested the grammar and lexer input
-files with bison or flex.
-
-IMPLEMENTING A BACK END
-
-To implement your own back end, you can start with the provided sources in
-the be directory and modify them. The Makefile understands the 'make all'
-target and will generate libbe.a in the demo_be directory. As set up, the
-variable CPP_FLAGS allows you to place include files either in the current
-directory or in the include directory. Alternatively, you can place your
-include files in a new directory and modify CPP_FLAGS to cause the C++
-preprocessor to search this new directory for referenced include files, by
-adding a new -I directive.
-
-Additional detail on the structure and function of back ends, and on the
-protocol which a back end must implement, are found in the document
-entitled WRITING_A_BE.
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
diff --git a/TAO/TAO_IDL/Makefile b/TAO/TAO_IDL/Makefile
deleted file mode 100644
index 8f8e2dc7b0c..00000000000
--- a/TAO/TAO_IDL/Makefile
+++ /dev/null
@@ -1,54 +0,0 @@
-#----------------------------------------------------------------------------
-#	$Id$
-#
-#	Top-level Makefile for the TAO IDL compiler
-#----------------------------------------------------------------------------
-
-#----------------------------------------------------------------------------
-#	Local macros
-#----------------------------------------------------------------------------
-
-#----------------------------------------------------------------------------
-#	Include macros and targets
-#----------------------------------------------------------------------------
-
-include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-ifndef VXWORKS
-  include $(ACE_ROOT)/include/makeinclude/macros.GNU
-  include $(ACE_ROOT)/include/makeinclude/rules.lib.GNU
-  include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
-  include $(ACE_ROOT)/include/makeinclude/rules.nested.GNU
-  include $(ACE_ROOT)/include/makeinclude/rules.nolocal.GNU
-endif # VXWORKS
-
-INFO	=
-# LIBS	= -lACE
-DIRS	= driver fe ast util narrow be
-BIN	= tao_idl
-TAOLIBS	= -L$(ACE_ROOT)/ace -ldrv -lfe -last -ltao_idl_util -lnarrow -lbe -lACE
-CLONE	=
-BUILD	= $(VBIN)
-
-#----------------------------------------------------------------------------
-#	Local targets
-#----------------------------------------------------------------------------
-
-ifdef VXWORKS
-all clean realclean:
-	@echo The IDL compiler won\'t run or build for VxWorks.
-else
-all:
-	$(PRELINK) $(CXX) $(CFLAGS) -o $(BIN) $(TAOLIBS) $(LIBS)
-
-clean:
-	rm -f tao_idl
-
-realclean:
-	rm -f tao_idl TAGS
-endif # VXWORKS
-
-tags:
-	rm -f TAGS
-	etags -C include/*.h be_include/*.h
-	etags -a ast/*.cpp util/*.cpp narrow/*.cpp \
-		driver/*.cpp fe/*.cpp be/*.cpp
diff --git a/TAO/TAO_IDL/README b/TAO/TAO_IDL/README
deleted file mode 100644
index 6d73554acce..00000000000
--- a/TAO/TAO_IDL/README
+++ /dev/null
@@ -1,233 +0,0 @@
-INTERFACE DEFINITION LANGUAGE COMPILER FRONT END
--==============================================-
-
-INTRODUCTION
-
-Welcome to the publicly available source release of SunSoft's
-implementation of the compiler front end (CFE) for OMG Interface Definition
-Language! This is Release 1.3 of the CFE.
-
-The Interface Definition Language (IDL) implementation is divided into
-three parts:
-
-- A main program for driving the compilation process
-- A parser and attendant utilities
-- One or more back ends (BEs) for taking the processed input and producing
-  output in a target language and target format
-
-WARNINGS
-
-This is a preliminary version. This software is made available AS IS and
-WITH NO GUARANTEES. Please read  the copyright notice attached at the
-bottom of this file.
-
-IMPORTANT NOTICE FOR USERS OF OMG IDL CFE VERSION 1.2.
-
-Please carefully read the file CHANGES to obtain IMPORTANT INFORMATION on
-changes in that may affect the manner in which a BE is constructed. You
-must follow instructions contained in the file CHANGES to obtain a
-functional BE if you are migrating an existing BE from OMG IDL CFE v. 1.2.
-
-TARGET AUDIENCE
-
-Who should use this release?
-
-- You can use this source release to create a stand alone parser for OMG
-  Interface Definition Language. This may be useful to verify the legality
-  of IDL input.
-- Developers of OMG Interface Definition Language compilers should use this
-  release as a basis for writing their back ends, to obtain a common
-  framework for their compiler and to provide portable and uniform
-  parsing of IDL input.
-
-HOW TO OBTAIN THIS SOFTWARE
-
-Please use anonymous FTP to omg.org and supply your e-mail address as the
-password. Then change directories to pub/OMG_IDL_CFE_1.3, set binary transfer
-and get the file OMG_IDL_CFE_1.3.TAR.Z. This file includes copies of all
-individual documentation files in the directory.
-
-Precompiled binaries constructed from the sources in this release will be
-made available shortly, in the directory pub/OMG_IDL_CFE_1.3/bin. These
-binaries are useful for parsing IDL source and for learning about the
-language. Precompiled binaries for Solaris 2.x and for SunOS 4.x will be
-provided.
-
-You can also use the mail server program to retrieve this software. Send
-email with the subject 'help' to omg_idl@omg.org, and the mail server will
-respond with instructions on how to retrieve the software.
-
-Copies of this software may be made available from archives other than
-omg.org. New versions made available by Sun will be placed on omg.org and a
-message will be sent to this newsgroup announcing its availability.
-
-Finally, the SunSoft OMG IDL CFE is also available on magnetic tape for a
-nominal media charge directly from SunSoft. Please refer to part number
-DIDL-100-STP when ordering.
-
-CONTACT POINT
-
-Please let us know who you are if you decide to use this software, and how
-you use it. Please send e-mail to:
-
-     idl-cfe@sun.com
-
-This address can also be used to report problems, bugs, suggestions and
-send general comments.
-
-WHAT IS PROVIDED IN THE RELEASE
-
-Provided in this release are:
-
-- A main program for driving an Interface Definition Language compiler
-- A parser for the Interface Definition Language grammar which builds an
-  internal representation of the input parsed. This internal
-  representation, named an Abstract Syntax Tree (AST), is used as input to
-  a back end
-- Some utility functions used by the parser
-- A demonstration back end (BE) which exercises the front end but produces
-  no translated output
-- Documentation of the public interfaces and of the contract between
-  the compiler front end and a back end
-
-OPERATION
-
-A complete compiler operates in two passes:
-
-- The first pass, provided in this release, parses the IDL input and
-  produces an internal representation, called an Abstract Syntax Tree (AST).
-  This pass also does a complete syntax and semantics check of the input
-  provided to ensure that exactly legal IDL input is accepted. If a syntax
-  or semantic error is discovered, the second pass is not invoked.
-- The second pass, provided by compiler developers, takes the AST and
-  produces output in the language and format of choice. A demonstration
-  back end is provided in the release.
-
-HOW TO USE THIS SOFTWARE
-
-To create a complete compiler from OMG Interface Definition Language to a
-target language, compiler developers will:
-
-- Write a back end (BE) to take the internal representation of the input
-  parsed and translate it to the target language and format. You will
-  probably want to replace the BE directory in this source tree with your
-  own BE directory
-- Link the BE with the sources provided here to produce a complete
-  compiler.
-
-DOCUMENTATION
-
-The OMG Interface Definition Language is fully described in the CORBA
-documentation, Chapter 4. This document may be obtained from OMG.
-
-This release also provides the following documents:
-
-- This README file, describing the release
-- INSTALL, describing installation of the software
-- WRITING_A_BE contains all the information needed to start writing a back
-  end for this distribution
-- CHANGES_IN_AST describes changes that affect migration of BEs written
-  against version 1.2 to version 1.3.
-- CLI, describing the command line interface to the CFE
-- ROADMAP, describing the directory structure for the source code. This
-  file will assist a developer in understanding the structure of the code
-  and navigating it
-- PROBLEMS, describing a list of issues that may be addressed in future
-  releases
-- BUG_REPORT, containing a form for use in reporting bugs and problems
-  with the IDL CFE
-
-ENVIRONMENT
-
-The INSTALL file explains how to customize the software for specific
-platforms. The source distribution expects the following environment:
-
-- Sparcstation 1, 2, or 10 hardware
-- SunPro SparcWorks 3.x or 4.0
-
-As preconfigured, it compiles on Solaris 2.x. It can be reconfigured to
-compile on SunOS 4.x, HPUX or Apollo Domain OS. As far as is known, no use
-is made of Sun Make-specific features, and the Makefiles should be usable
-with other make programs.
-
-This release has been tested and is believed to operate correctly with:
-- SunPro Sparcworks 2.x and 3.0 on SunOS 4.1.x
-- SunPro Sparcworks 2.x and 3.0 on Solaris 2.3
-- g++ 2.5.8 on SunOS 4.1.x
-- g++ 2.5.8 on Solaris 2.3
-
-INSTALLATION
-
-This release is targetted for Sun workstations running Solaris 2.x. The
-process of installing this software is described in detail in the file
-INSTALL in this directory. The INSTALL file also describes how to customize
-the release for your own environment if it is different.
-
-KNOWN PROBLEMS
-
-A list of known deficiencies is provided in the file PROBLEMS in this
-directory. If you find a problem which is not mentioned in it, please
-report it as described below. Please read this file now to be apprised of
-the problems found so far with this release.
-
-COPYRIGHT
-
-This copyright notice appears on all files. Please read it!
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
diff --git a/TAO/TAO_IDL/TAO_IDL.mak b/TAO/TAO_IDL/TAO_IDL.mak
deleted file mode 100644
index 407c7ba5672..00000000000
--- a/TAO/TAO_IDL/TAO_IDL.mak
+++ /dev/null
@@ -1,12269 +0,0 @@
-# Microsoft Developer Studio Generated NMAKE File, Format Version 4.20

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Console Application" 0x0103

-

-!IF "$(CFG)" == ""

-CFG=TAO_IDL - Win32 Release

-!MESSAGE No configuration specified.  Defaulting to TAO_IDL - Win32 Release.

-!ENDIF 

-

-!IF "$(CFG)" != "TAO_IDL - Win32 Release" && "$(CFG)" !=\

- "TAO_IDL - Win32 Debug"

-!MESSAGE Invalid configuration "$(CFG)" specified.

-!MESSAGE You can specify a configuration when running NMAKE on this makefile

-!MESSAGE by defining the macro CFG on the command line.  For example:

-!MESSAGE 

-!MESSAGE NMAKE /f "TAO_IDL.mak" CFG="TAO_IDL - Win32 Release"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "TAO_IDL - Win32 Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "TAO_IDL - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE 

-!ERROR An invalid configuration is specified.

-!ENDIF 

-

-!IF "$(OS)" == "Windows_NT"

-NULL=

-!ELSE 

-NULL=nul

-!ENDIF 

-################################################################################

-# Begin Project

-# PROP Target_Last_Scanned "TAO_IDL - Win32 Release"

-CPP=cl.exe

-RSC=rc.exe

-

-!IF  "$(CFG)" == "TAO_IDL - Win32 Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Release"

-# PROP BASE Intermediate_Dir "Release"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir ""

-# PROP Intermediate_Dir "Release"

-# PROP Target_Dir ""

-OUTDIR=.

-INTDIR=.\Release

-

-ALL : "$(OUTDIR)\TAO_IDL.exe"

-

-CLEAN : 

-	-@erase "$(INTDIR)\ast_argument.obj"

-	-@erase "$(INTDIR)\ast_array.obj"

-	-@erase "$(INTDIR)\ast_attribute.obj"

-	-@erase "$(INTDIR)\ast_check.obj"

-	-@erase "$(INTDIR)\ast_concrete_type.obj"

-	-@erase "$(INTDIR)\ast_constant.obj"

-	-@erase "$(INTDIR)\ast_decl.obj"

-	-@erase "$(INTDIR)\ast_enum.obj"

-	-@erase "$(INTDIR)\ast_enum_val.obj"

-	-@erase "$(INTDIR)\ast_exception.obj"

-	-@erase "$(INTDIR)\ast_expression.obj"

-	-@erase "$(INTDIR)\ast_field.obj"

-	-@erase "$(INTDIR)\ast_generator.obj"

-	-@erase "$(INTDIR)\ast_interface.obj"

-	-@erase "$(INTDIR)\ast_interface_fwd.obj"

-	-@erase "$(INTDIR)\ast_module.obj"

-	-@erase "$(INTDIR)\ast_operation.obj"

-	-@erase "$(INTDIR)\ast_predefined_type.obj"

-	-@erase "$(INTDIR)\ast_recursive.obj"

-	-@erase "$(INTDIR)\ast_redef.obj"

-	-@erase "$(INTDIR)\ast_root.obj"

-	-@erase "$(INTDIR)\ast_sequence.obj"

-	-@erase "$(INTDIR)\ast_string.obj"

-	-@erase "$(INTDIR)\ast_structure.obj"

-	-@erase "$(INTDIR)\ast_type.obj"

-	-@erase "$(INTDIR)\ast_typedef.obj"

-	-@erase "$(INTDIR)\ast_union.obj"

-	-@erase "$(INTDIR)\ast_union_branch.obj"

-	-@erase "$(INTDIR)\ast_union_label.obj"

-	-@erase "$(INTDIR)\be_args.obj"

-	-@erase "$(INTDIR)\be_argument.obj"

-	-@erase "$(INTDIR)\be_array.obj"

-	-@erase "$(INTDIR)\be_attribute.obj"

-	-@erase "$(INTDIR)\be_codegen.obj"

-	-@erase "$(INTDIR)\be_constant.obj"

-	-@erase "$(INTDIR)\be_decl.obj"

-	-@erase "$(INTDIR)\be_enum.obj"

-	-@erase "$(INTDIR)\be_enum_val.obj"

-	-@erase "$(INTDIR)\be_exception.obj"

-	-@erase "$(INTDIR)\be_expression.obj"

-	-@erase "$(INTDIR)\be_factory.obj"

-	-@erase "$(INTDIR)\be_field.obj"

-	-@erase "$(INTDIR)\be_generator.obj"

-	-@erase "$(INTDIR)\be_helper.obj"

-	-@erase "$(INTDIR)\be_init.obj"

-	-@erase "$(INTDIR)\be_interface.obj"

-	-@erase "$(INTDIR)\be_interface_fwd.obj"

-	-@erase "$(INTDIR)\be_module.obj"

-	-@erase "$(INTDIR)\be_operation.obj"

-	-@erase "$(INTDIR)\be_predefined_type.obj"

-	-@erase "$(INTDIR)\be_produce.obj"

-	-@erase "$(INTDIR)\be_root.obj"

-	-@erase "$(INTDIR)\be_scope.obj"

-	-@erase "$(INTDIR)\be_sequence.obj"

-	-@erase "$(INTDIR)\be_state.obj"

-	-@erase "$(INTDIR)\be_state_argument.obj"

-	-@erase "$(INTDIR)\be_state_array.obj"

-	-@erase "$(INTDIR)\be_state_attribute.obj"

-	-@erase "$(INTDIR)\be_state_operation.obj"

-	-@erase "$(INTDIR)\be_state_sequence.obj"

-	-@erase "$(INTDIR)\be_state_structure.obj"

-	-@erase "$(INTDIR)\be_state_typedef.obj"

-	-@erase "$(INTDIR)\be_state_union.obj"

-	-@erase "$(INTDIR)\be_string.obj"

-	-@erase "$(INTDIR)\be_structure.obj"

-	-@erase "$(INTDIR)\be_sunsoft.obj"

-	-@erase "$(INTDIR)\be_type.obj"

-	-@erase "$(INTDIR)\be_typedef.obj"

-	-@erase "$(INTDIR)\be_union.obj"

-	-@erase "$(INTDIR)\be_union_branch.obj"

-	-@erase "$(INTDIR)\be_union_label.obj"

-	-@erase "$(INTDIR)\drv_args.obj"

-	-@erase "$(INTDIR)\drv_fork.obj"

-	-@erase "$(INTDIR)\drv_init.obj"

-	-@erase "$(INTDIR)\drv_link.obj"

-	-@erase "$(INTDIR)\drv_main.obj"

-	-@erase "$(INTDIR)\drv_preproc.obj"

-	-@erase "$(INTDIR)\drv_private.obj"

-	-@erase "$(INTDIR)\fe_declarator.obj"

-	-@erase "$(INTDIR)\fe_extern.obj"

-	-@erase "$(INTDIR)\fe_init.obj"

-	-@erase "$(INTDIR)\fe_interface_header.obj"

-	-@erase "$(INTDIR)\fe_private.obj"

-	-@erase "$(INTDIR)\lex.yy.obj"

-	-@erase "$(INTDIR)\narrow.obj"

-	-@erase "$(INTDIR)\utl_decllist.obj"

-	-@erase "$(INTDIR)\utl_error.obj"

-	-@erase "$(INTDIR)\utl_exceptlist.obj"

-	-@erase "$(INTDIR)\utl_exprlist.obj"

-	-@erase "$(INTDIR)\utl_global.obj"

-	-@erase "$(INTDIR)\utl_identifier.obj"

-	-@erase "$(INTDIR)\utl_idlist.obj"

-	-@erase "$(INTDIR)\utl_indenter.obj"

-	-@erase "$(INTDIR)\utl_labellist.obj"

-	-@erase "$(INTDIR)\utl_list.obj"

-	-@erase "$(INTDIR)\utl_namelist.obj"

-	-@erase "$(INTDIR)\utl_scope.obj"

-	-@erase "$(INTDIR)\utl_stack.obj"

-	-@erase "$(INTDIR)\utl_string.obj"

-	-@erase "$(INTDIR)\utl_strlist.obj"

-	-@erase "$(INTDIR)\y.tab.obj"

-	-@erase "$(OUTDIR)\TAO_IDL.exe"

-

-"$(INTDIR)" :

-    if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"

-

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "include" /I "be_include" /I "..\.." /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /D IDL_CFE_VERSION=\"1.3.0\" /D CPP_LOCATION=\"cl\" /YX /c

-CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "include" /I "be_include" /I "..\.." /D\

- "NDEBUG" /D "_CONSOLE" /D "WIN32" /D IDL_CFE_VERSION=\"1.3.0\" /D\

- CPP_LOCATION=\"cl\" /Fp"$(INTDIR)/TAO_IDL.pch" /YX /Fo"$(INTDIR)/" /c 

-CPP_OBJS=.\Release/

-CPP_SBRS=.\.

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-BSC32_FLAGS=/nologo /o"$(OUTDIR)/TAO_IDL.bsc" 

-BSC32_SBRS= \

-	

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-LINK32_FLAGS=ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib\

- comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib\

- odbc32.lib odbccp32.lib /nologo /subsystem:console /incremental:no\

- /pdb:"$(OUTDIR)/TAO_IDL.pdb" /machine:I386 /out:"$(OUTDIR)/TAO_IDL.exe" 

-LINK32_OBJS= \

-	"$(INTDIR)\ast_argument.obj" \

-	"$(INTDIR)\ast_array.obj" \

-	"$(INTDIR)\ast_attribute.obj" \

-	"$(INTDIR)\ast_check.obj" \

-	"$(INTDIR)\ast_concrete_type.obj" \

-	"$(INTDIR)\ast_constant.obj" \

-	"$(INTDIR)\ast_decl.obj" \

-	"$(INTDIR)\ast_enum.obj" \

-	"$(INTDIR)\ast_enum_val.obj" \

-	"$(INTDIR)\ast_exception.obj" \

-	"$(INTDIR)\ast_expression.obj" \

-	"$(INTDIR)\ast_field.obj" \

-	"$(INTDIR)\ast_generator.obj" \

-	"$(INTDIR)\ast_interface.obj" \

-	"$(INTDIR)\ast_interface_fwd.obj" \

-	"$(INTDIR)\ast_module.obj" \

-	"$(INTDIR)\ast_operation.obj" \

-	"$(INTDIR)\ast_predefined_type.obj" \

-	"$(INTDIR)\ast_recursive.obj" \

-	"$(INTDIR)\ast_redef.obj" \

-	"$(INTDIR)\ast_root.obj" \

-	"$(INTDIR)\ast_sequence.obj" \

-	"$(INTDIR)\ast_string.obj" \

-	"$(INTDIR)\ast_structure.obj" \

-	"$(INTDIR)\ast_type.obj" \

-	"$(INTDIR)\ast_typedef.obj" \

-	"$(INTDIR)\ast_union.obj" \

-	"$(INTDIR)\ast_union_branch.obj" \

-	"$(INTDIR)\ast_union_label.obj" \

-	"$(INTDIR)\be_args.obj" \

-	"$(INTDIR)\be_argument.obj" \

-	"$(INTDIR)\be_array.obj" \

-	"$(INTDIR)\be_attribute.obj" \

-	"$(INTDIR)\be_codegen.obj" \

-	"$(INTDIR)\be_constant.obj" \

-	"$(INTDIR)\be_decl.obj" \

-	"$(INTDIR)\be_enum.obj" \

-	"$(INTDIR)\be_enum_val.obj" \

-	"$(INTDIR)\be_exception.obj" \

-	"$(INTDIR)\be_expression.obj" \

-	"$(INTDIR)\be_factory.obj" \

-	"$(INTDIR)\be_field.obj" \

-	"$(INTDIR)\be_generator.obj" \

-	"$(INTDIR)\be_helper.obj" \

-	"$(INTDIR)\be_init.obj" \

-	"$(INTDIR)\be_interface.obj" \

-	"$(INTDIR)\be_interface_fwd.obj" \

-	"$(INTDIR)\be_module.obj" \

-	"$(INTDIR)\be_operation.obj" \

-	"$(INTDIR)\be_predefined_type.obj" \

-	"$(INTDIR)\be_produce.obj" \

-	"$(INTDIR)\be_root.obj" \

-	"$(INTDIR)\be_scope.obj" \

-	"$(INTDIR)\be_sequence.obj" \

-	"$(INTDIR)\be_state.obj" \

-	"$(INTDIR)\be_state_argument.obj" \

-	"$(INTDIR)\be_state_array.obj" \

-	"$(INTDIR)\be_state_attribute.obj" \

-	"$(INTDIR)\be_state_operation.obj" \

-	"$(INTDIR)\be_state_sequence.obj" \

-	"$(INTDIR)\be_state_structure.obj" \

-	"$(INTDIR)\be_state_typedef.obj" \

-	"$(INTDIR)\be_state_union.obj" \

-	"$(INTDIR)\be_string.obj" \

-	"$(INTDIR)\be_structure.obj" \

-	"$(INTDIR)\be_sunsoft.obj" \

-	"$(INTDIR)\be_type.obj" \

-	"$(INTDIR)\be_typedef.obj" \

-	"$(INTDIR)\be_union.obj" \

-	"$(INTDIR)\be_union_branch.obj" \

-	"$(INTDIR)\be_union_label.obj" \

-	"$(INTDIR)\drv_args.obj" \

-	"$(INTDIR)\drv_fork.obj" \

-	"$(INTDIR)\drv_init.obj" \

-	"$(INTDIR)\drv_link.obj" \

-	"$(INTDIR)\drv_main.obj" \

-	"$(INTDIR)\drv_preproc.obj" \

-	"$(INTDIR)\drv_private.obj" \

-	"$(INTDIR)\fe_declarator.obj" \

-	"$(INTDIR)\fe_extern.obj" \

-	"$(INTDIR)\fe_init.obj" \

-	"$(INTDIR)\fe_interface_header.obj" \

-	"$(INTDIR)\fe_private.obj" \

-	"$(INTDIR)\lex.yy.obj" \

-	"$(INTDIR)\narrow.obj" \

-	"$(INTDIR)\utl_decllist.obj" \

-	"$(INTDIR)\utl_error.obj" \

-	"$(INTDIR)\utl_exceptlist.obj" \

-	"$(INTDIR)\utl_exprlist.obj" \

-	"$(INTDIR)\utl_global.obj" \

-	"$(INTDIR)\utl_identifier.obj" \

-	"$(INTDIR)\utl_idlist.obj" \

-	"$(INTDIR)\utl_indenter.obj" \

-	"$(INTDIR)\utl_labellist.obj" \

-	"$(INTDIR)\utl_list.obj" \

-	"$(INTDIR)\utl_namelist.obj" \

-	"$(INTDIR)\utl_scope.obj" \

-	"$(INTDIR)\utl_stack.obj" \

-	"$(INTDIR)\utl_string.obj" \

-	"$(INTDIR)\utl_strlist.obj" \

-	"$(INTDIR)\y.tab.obj"

-

-"$(OUTDIR)\TAO_IDL.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)

-    $(LINK32) @<<

-  $(LINK32_FLAGS) $(LINK32_OBJS)

-<<

-

-!ELSEIF  "$(CFG)" == "TAO_IDL - Win32 Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Debug"

-# PROP BASE Intermediate_Dir "Debug"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir ""

-# PROP Intermediate_Dir "Debug"

-# PROP Target_Dir ""

-OUTDIR=.

-INTDIR=.\Debug

-

-ALL : "$(OUTDIR)\TAO_IDL.exe"

-

-CLEAN : 

-	-@erase "$(INTDIR)\ast_argument.obj"

-	-@erase "$(INTDIR)\ast_array.obj"

-	-@erase "$(INTDIR)\ast_attribute.obj"

-	-@erase "$(INTDIR)\ast_check.obj"

-	-@erase "$(INTDIR)\ast_concrete_type.obj"

-	-@erase "$(INTDIR)\ast_constant.obj"

-	-@erase "$(INTDIR)\ast_decl.obj"

-	-@erase "$(INTDIR)\ast_enum.obj"

-	-@erase "$(INTDIR)\ast_enum_val.obj"

-	-@erase "$(INTDIR)\ast_exception.obj"

-	-@erase "$(INTDIR)\ast_expression.obj"

-	-@erase "$(INTDIR)\ast_field.obj"

-	-@erase "$(INTDIR)\ast_generator.obj"

-	-@erase "$(INTDIR)\ast_interface.obj"

-	-@erase "$(INTDIR)\ast_interface_fwd.obj"

-	-@erase "$(INTDIR)\ast_module.obj"

-	-@erase "$(INTDIR)\ast_operation.obj"

-	-@erase "$(INTDIR)\ast_predefined_type.obj"

-	-@erase "$(INTDIR)\ast_recursive.obj"

-	-@erase "$(INTDIR)\ast_redef.obj"

-	-@erase "$(INTDIR)\ast_root.obj"

-	-@erase "$(INTDIR)\ast_sequence.obj"

-	-@erase "$(INTDIR)\ast_string.obj"

-	-@erase "$(INTDIR)\ast_structure.obj"

-	-@erase "$(INTDIR)\ast_type.obj"

-	-@erase "$(INTDIR)\ast_typedef.obj"

-	-@erase "$(INTDIR)\ast_union.obj"

-	-@erase "$(INTDIR)\ast_union_branch.obj"

-	-@erase "$(INTDIR)\ast_union_label.obj"

-	-@erase "$(INTDIR)\be_args.obj"

-	-@erase "$(INTDIR)\be_argument.obj"

-	-@erase "$(INTDIR)\be_array.obj"

-	-@erase "$(INTDIR)\be_attribute.obj"

-	-@erase "$(INTDIR)\be_codegen.obj"

-	-@erase "$(INTDIR)\be_constant.obj"

-	-@erase "$(INTDIR)\be_decl.obj"

-	-@erase "$(INTDIR)\be_enum.obj"

-	-@erase "$(INTDIR)\be_enum_val.obj"

-	-@erase "$(INTDIR)\be_exception.obj"

-	-@erase "$(INTDIR)\be_expression.obj"

-	-@erase "$(INTDIR)\be_factory.obj"

-	-@erase "$(INTDIR)\be_field.obj"

-	-@erase "$(INTDIR)\be_generator.obj"

-	-@erase "$(INTDIR)\be_helper.obj"

-	-@erase "$(INTDIR)\be_init.obj"

-	-@erase "$(INTDIR)\be_interface.obj"

-	-@erase "$(INTDIR)\be_interface_fwd.obj"

-	-@erase "$(INTDIR)\be_module.obj"

-	-@erase "$(INTDIR)\be_operation.obj"

-	-@erase "$(INTDIR)\be_predefined_type.obj"

-	-@erase "$(INTDIR)\be_produce.obj"

-	-@erase "$(INTDIR)\be_root.obj"

-	-@erase "$(INTDIR)\be_scope.obj"

-	-@erase "$(INTDIR)\be_sequence.obj"

-	-@erase "$(INTDIR)\be_state.obj"

-	-@erase "$(INTDIR)\be_state_argument.obj"

-	-@erase "$(INTDIR)\be_state_array.obj"

-	-@erase "$(INTDIR)\be_state_attribute.obj"

-	-@erase "$(INTDIR)\be_state_operation.obj"

-	-@erase "$(INTDIR)\be_state_sequence.obj"

-	-@erase "$(INTDIR)\be_state_structure.obj"

-	-@erase "$(INTDIR)\be_state_typedef.obj"

-	-@erase "$(INTDIR)\be_state_union.obj"

-	-@erase "$(INTDIR)\be_string.obj"

-	-@erase "$(INTDIR)\be_structure.obj"

-	-@erase "$(INTDIR)\be_sunsoft.obj"

-	-@erase "$(INTDIR)\be_type.obj"

-	-@erase "$(INTDIR)\be_typedef.obj"

-	-@erase "$(INTDIR)\be_union.obj"

-	-@erase "$(INTDIR)\be_union_branch.obj"

-	-@erase "$(INTDIR)\be_union_label.obj"

-	-@erase "$(INTDIR)\drv_args.obj"

-	-@erase "$(INTDIR)\drv_fork.obj"

-	-@erase "$(INTDIR)\drv_init.obj"

-	-@erase "$(INTDIR)\drv_link.obj"

-	-@erase "$(INTDIR)\drv_main.obj"

-	-@erase "$(INTDIR)\drv_preproc.obj"

-	-@erase "$(INTDIR)\drv_private.obj"

-	-@erase "$(INTDIR)\fe_declarator.obj"

-	-@erase "$(INTDIR)\fe_extern.obj"

-	-@erase "$(INTDIR)\fe_init.obj"

-	-@erase "$(INTDIR)\fe_interface_header.obj"

-	-@erase "$(INTDIR)\fe_private.obj"

-	-@erase "$(INTDIR)\lex.yy.obj"

-	-@erase "$(INTDIR)\narrow.obj"

-	-@erase "$(INTDIR)\utl_decllist.obj"

-	-@erase "$(INTDIR)\utl_error.obj"

-	-@erase "$(INTDIR)\utl_exceptlist.obj"

-	-@erase "$(INTDIR)\utl_exprlist.obj"

-	-@erase "$(INTDIR)\utl_global.obj"

-	-@erase "$(INTDIR)\utl_identifier.obj"

-	-@erase "$(INTDIR)\utl_idlist.obj"

-	-@erase "$(INTDIR)\utl_indenter.obj"

-	-@erase "$(INTDIR)\utl_labellist.obj"

-	-@erase "$(INTDIR)\utl_list.obj"

-	-@erase "$(INTDIR)\utl_namelist.obj"

-	-@erase "$(INTDIR)\utl_scope.obj"

-	-@erase "$(INTDIR)\utl_stack.obj"

-	-@erase "$(INTDIR)\utl_string.obj"

-	-@erase "$(INTDIR)\utl_strlist.obj"

-	-@erase "$(INTDIR)\vc40.idb"

-	-@erase "$(INTDIR)\vc40.pdb"

-	-@erase "$(INTDIR)\y.tab.obj"

-	-@erase "$(OUTDIR)\TAO_IDL.exe"

-	-@erase "$(OUTDIR)\TAO_IDL.ilk"

-	-@erase "$(OUTDIR)\TAO_IDL.pdb"

-

-"$(INTDIR)" :

-    if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"

-

-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "include" /I "be_include" /I "..\.." /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /D IDL_CFE_VERSION=\"1.3.0\" /D CPP_LOCATION=\"cl\" /YX /c

-CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "include" /I "be_include" /I\

- "..\.." /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /D IDL_CFE_VERSION=\"1.3.0\" /D\

- CPP_LOCATION=\"cl\" /Fp"$(INTDIR)/TAO_IDL.pch" /YX /Fo"$(INTDIR)/"\

- /Fd"$(INTDIR)/" /c 

-CPP_OBJS=.\Debug/

-CPP_SBRS=.\.

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-BSC32_FLAGS=/nologo /o"$(OUTDIR)/TAO_IDL.bsc" 

-BSC32_SBRS= \

-	

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386

-# ADD LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386

-LINK32_FLAGS=aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib\

- comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib\

- odbc32.lib odbccp32.lib /nologo /subsystem:console /incremental:yes\

- /pdb:"$(OUTDIR)/TAO_IDL.pdb" /debug /machine:I386 /out:"$(OUTDIR)/TAO_IDL.exe" 

-LINK32_OBJS= \

-	"$(INTDIR)\ast_argument.obj" \

-	"$(INTDIR)\ast_array.obj" \

-	"$(INTDIR)\ast_attribute.obj" \

-	"$(INTDIR)\ast_check.obj" \

-	"$(INTDIR)\ast_concrete_type.obj" \

-	"$(INTDIR)\ast_constant.obj" \

-	"$(INTDIR)\ast_decl.obj" \

-	"$(INTDIR)\ast_enum.obj" \

-	"$(INTDIR)\ast_enum_val.obj" \

-	"$(INTDIR)\ast_exception.obj" \

-	"$(INTDIR)\ast_expression.obj" \

-	"$(INTDIR)\ast_field.obj" \

-	"$(INTDIR)\ast_generator.obj" \

-	"$(INTDIR)\ast_interface.obj" \

-	"$(INTDIR)\ast_interface_fwd.obj" \

-	"$(INTDIR)\ast_module.obj" \

-	"$(INTDIR)\ast_operation.obj" \

-	"$(INTDIR)\ast_predefined_type.obj" \

-	"$(INTDIR)\ast_recursive.obj" \

-	"$(INTDIR)\ast_redef.obj" \

-	"$(INTDIR)\ast_root.obj" \

-	"$(INTDIR)\ast_sequence.obj" \

-	"$(INTDIR)\ast_string.obj" \

-	"$(INTDIR)\ast_structure.obj" \

-	"$(INTDIR)\ast_type.obj" \

-	"$(INTDIR)\ast_typedef.obj" \

-	"$(INTDIR)\ast_union.obj" \

-	"$(INTDIR)\ast_union_branch.obj" \

-	"$(INTDIR)\ast_union_label.obj" \

-	"$(INTDIR)\be_args.obj" \

-	"$(INTDIR)\be_argument.obj" \

-	"$(INTDIR)\be_array.obj" \

-	"$(INTDIR)\be_attribute.obj" \

-	"$(INTDIR)\be_codegen.obj" \

-	"$(INTDIR)\be_constant.obj" \

-	"$(INTDIR)\be_decl.obj" \

-	"$(INTDIR)\be_enum.obj" \

-	"$(INTDIR)\be_enum_val.obj" \

-	"$(INTDIR)\be_exception.obj" \

-	"$(INTDIR)\be_expression.obj" \

-	"$(INTDIR)\be_factory.obj" \

-	"$(INTDIR)\be_field.obj" \

-	"$(INTDIR)\be_generator.obj" \

-	"$(INTDIR)\be_helper.obj" \

-	"$(INTDIR)\be_init.obj" \

-	"$(INTDIR)\be_interface.obj" \

-	"$(INTDIR)\be_interface_fwd.obj" \

-	"$(INTDIR)\be_module.obj" \

-	"$(INTDIR)\be_operation.obj" \

-	"$(INTDIR)\be_predefined_type.obj" \

-	"$(INTDIR)\be_produce.obj" \

-	"$(INTDIR)\be_root.obj" \

-	"$(INTDIR)\be_scope.obj" \

-	"$(INTDIR)\be_sequence.obj" \

-	"$(INTDIR)\be_state.obj" \

-	"$(INTDIR)\be_state_argument.obj" \

-	"$(INTDIR)\be_state_array.obj" \

-	"$(INTDIR)\be_state_attribute.obj" \

-	"$(INTDIR)\be_state_operation.obj" \

-	"$(INTDIR)\be_state_sequence.obj" \

-	"$(INTDIR)\be_state_structure.obj" \

-	"$(INTDIR)\be_state_typedef.obj" \

-	"$(INTDIR)\be_state_union.obj" \

-	"$(INTDIR)\be_string.obj" \

-	"$(INTDIR)\be_structure.obj" \

-	"$(INTDIR)\be_sunsoft.obj" \

-	"$(INTDIR)\be_type.obj" \

-	"$(INTDIR)\be_typedef.obj" \

-	"$(INTDIR)\be_union.obj" \

-	"$(INTDIR)\be_union_branch.obj" \

-	"$(INTDIR)\be_union_label.obj" \

-	"$(INTDIR)\drv_args.obj" \

-	"$(INTDIR)\drv_fork.obj" \

-	"$(INTDIR)\drv_init.obj" \

-	"$(INTDIR)\drv_link.obj" \

-	"$(INTDIR)\drv_main.obj" \

-	"$(INTDIR)\drv_preproc.obj" \

-	"$(INTDIR)\drv_private.obj" \

-	"$(INTDIR)\fe_declarator.obj" \

-	"$(INTDIR)\fe_extern.obj" \

-	"$(INTDIR)\fe_init.obj" \

-	"$(INTDIR)\fe_interface_header.obj" \

-	"$(INTDIR)\fe_private.obj" \

-	"$(INTDIR)\lex.yy.obj" \

-	"$(INTDIR)\narrow.obj" \

-	"$(INTDIR)\utl_decllist.obj" \

-	"$(INTDIR)\utl_error.obj" \

-	"$(INTDIR)\utl_exceptlist.obj" \

-	"$(INTDIR)\utl_exprlist.obj" \

-	"$(INTDIR)\utl_global.obj" \

-	"$(INTDIR)\utl_identifier.obj" \

-	"$(INTDIR)\utl_idlist.obj" \

-	"$(INTDIR)\utl_indenter.obj" \

-	"$(INTDIR)\utl_labellist.obj" \

-	"$(INTDIR)\utl_list.obj" \

-	"$(INTDIR)\utl_namelist.obj" \

-	"$(INTDIR)\utl_scope.obj" \

-	"$(INTDIR)\utl_stack.obj" \

-	"$(INTDIR)\utl_string.obj" \

-	"$(INTDIR)\utl_strlist.obj" \

-	"$(INTDIR)\y.tab.obj"

-

-"$(OUTDIR)\TAO_IDL.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)

-    $(LINK32) @<<

-  $(LINK32_FLAGS) $(LINK32_OBJS)

-<<

-

-!ENDIF 

-

-.c{$(CPP_OBJS)}.obj:

-   $(CPP) $(CPP_PROJ) $<  

-

-.cpp{$(CPP_OBJS)}.obj:

-   $(CPP) $(CPP_PROJ) $<  

-

-.cxx{$(CPP_OBJS)}.obj:

-   $(CPP) $(CPP_PROJ) $<  

-

-.c{$(CPP_SBRS)}.sbr:

-   $(CPP) $(CPP_PROJ) $<  

-

-.cpp{$(CPP_SBRS)}.sbr:

-   $(CPP) $(CPP_PROJ) $<  

-

-.cxx{$(CPP_SBRS)}.sbr:

-   $(CPP) $(CPP_PROJ) $<  

-

-################################################################################

-# Begin Target

-

-# Name "TAO_IDL - Win32 Release"

-# Name "TAO_IDL - Win32 Debug"

-

-!IF  "$(CFG)" == "TAO_IDL - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "TAO_IDL - Win32 Debug"

-

-!ENDIF 

-

-################################################################################

-# Begin Source File

-

-SOURCE=.\util\utl_decllist.cpp

-DEP_CPP_UTL_D=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/stdcpp.h"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\include\idl.h"\

-	".\include\idl_extern.h"\

-	{$(INCLUDE)}"\.\include\ast.h"\

-	{$(INCLUDE)}"\.\include\ast_argument.h"\

-	{$(INCLUDE)}"\.\include\ast_array.h"\

-	{$(INCLUDE)}"\.\include\ast_attribute.h"\

-	{$(INCLUDE)}"\.\include\ast_concrete_type.h"\

-	{$(INCLUDE)}"\.\include\ast_constant.h"\

-	{$(INCLUDE)}"\.\include\ast_decl.h"\

-	{$(INCLUDE)}"\.\include\ast_enum.h"\

-	{$(INCLUDE)}"\.\include\ast_enum_val.h"\

-	{$(INCLUDE)}"\.\include\ast_exception.h"\

-	{$(INCLUDE)}"\.\include\ast_expression.h"\

-	{$(INCLUDE)}"\.\include\ast_extern.h"\

-	{$(INCLUDE)}"\.\include\ast_field.h"\

-	{$(INCLUDE)}"\.\include\ast_generator.h"\

-	{$(INCLUDE)}"\.\include\ast_interface.h"\

-	{$(INCLUDE)}"\.\include\ast_interface_fwd.h"\

-	{$(INCLUDE)}"\.\include\ast_module.h"\

-	{$(INCLUDE)}"\.\include\ast_operation.h"\

-	{$(INCLUDE)}"\.\include\ast_predefined_type.h"\

-	{$(INCLUDE)}"\.\include\ast_root.h"\

-	{$(INCLUDE)}"\.\include\ast_sequence.h"\

-	{$(INCLUDE)}"\.\include\ast_string.h"\

-	{$(INCLUDE)}"\.\include\ast_structure.h"\

-	{$(INCLUDE)}"\.\include\ast_type.h"\

-	{$(INCLUDE)}"\.\include\ast_typedef.h"\

-	{$(INCLUDE)}"\.\include\ast_union.h"\

-	{$(INCLUDE)}"\.\include\ast_union_branch.h"\

-	{$(INCLUDE)}"\.\include\ast_union_label.h"\

-	{$(INCLUDE)}"\.\include\be_extern.h"\

-	{$(INCLUDE)}"\.\include\drv_extern.h"\

-	{$(INCLUDE)}"\.\include\fe_extern.h"\

-	{$(INCLUDE)}"\.\include\global_extern.h"\

-	{$(INCLUDE)}"\.\include\idl_bool.h"\

-	{$(INCLUDE)}"\.\include\idl_defines.h"\

-	{$(INCLUDE)}"\.\include\idl_fwd.h"\

-	{$(INCLUDE)}"\.\include\idl_global.h"\

-	{$(INCLUDE)}"\.\include\idl_narrow.h"\

-	{$(INCLUDE)}"\.\include\intlmacros.h"\

-	{$(INCLUDE)}"\.\include\nr_extern.h"\

-	{$(INCLUDE)}"\.\include\util.h"\

-	{$(INCLUDE)}"\.\include\utl_decllist.h"\

-	{$(INCLUDE)}"\.\include\utl_error.h"\

-	{$(INCLUDE)}"\.\include\utl_exceptlist.h"\

-	{$(INCLUDE)}"\.\include\utl_exprlist.h"\

-	{$(INCLUDE)}"\.\include\utl_identifier.h"\

-	{$(INCLUDE)}"\.\include\utl_idlist.h"\

-	{$(INCLUDE)}"\.\include\utl_indenter.h"\

-	{$(INCLUDE)}"\.\include\utl_labellist.h"\

-	{$(INCLUDE)}"\.\include\utl_list.h"\

-	{$(INCLUDE)}"\.\include\utl_namelist.h"\

-	{$(INCLUDE)}"\.\include\utl_scope.h"\

-	{$(INCLUDE)}"\.\include\utl_scoped_name.h"\

-	{$(INCLUDE)}"\.\include\utl_stack.h"\

-	{$(INCLUDE)}"\.\include\utl_string.h"\

-	{$(INCLUDE)}"\.\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\utl_decllist.obj" : $(SOURCE) $(DEP_CPP_UTL_D) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\util\utl_error.cpp

-DEP_CPP_UTL_E=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/stdcpp.h"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\include\idl.h"\

-	".\include\idl_extern.h"\

-	{$(INCLUDE)}"\.\include\ast.h"\

-	{$(INCLUDE)}"\.\include\ast_argument.h"\

-	{$(INCLUDE)}"\.\include\ast_array.h"\

-	{$(INCLUDE)}"\.\include\ast_attribute.h"\

-	{$(INCLUDE)}"\.\include\ast_concrete_type.h"\

-	{$(INCLUDE)}"\.\include\ast_constant.h"\

-	{$(INCLUDE)}"\.\include\ast_decl.h"\

-	{$(INCLUDE)}"\.\include\ast_enum.h"\

-	{$(INCLUDE)}"\.\include\ast_enum_val.h"\

-	{$(INCLUDE)}"\.\include\ast_exception.h"\

-	{$(INCLUDE)}"\.\include\ast_expression.h"\

-	{$(INCLUDE)}"\.\include\ast_extern.h"\

-	{$(INCLUDE)}"\.\include\ast_field.h"\

-	{$(INCLUDE)}"\.\include\ast_generator.h"\

-	{$(INCLUDE)}"\.\include\ast_interface.h"\

-	{$(INCLUDE)}"\.\include\ast_interface_fwd.h"\

-	{$(INCLUDE)}"\.\include\ast_module.h"\

-	{$(INCLUDE)}"\.\include\ast_operation.h"\

-	{$(INCLUDE)}"\.\include\ast_predefined_type.h"\

-	{$(INCLUDE)}"\.\include\ast_root.h"\

-	{$(INCLUDE)}"\.\include\ast_sequence.h"\

-	{$(INCLUDE)}"\.\include\ast_string.h"\

-	{$(INCLUDE)}"\.\include\ast_structure.h"\

-	{$(INCLUDE)}"\.\include\ast_type.h"\

-	{$(INCLUDE)}"\.\include\ast_typedef.h"\

-	{$(INCLUDE)}"\.\include\ast_union.h"\

-	{$(INCLUDE)}"\.\include\ast_union_branch.h"\

-	{$(INCLUDE)}"\.\include\ast_union_label.h"\

-	{$(INCLUDE)}"\.\include\be_extern.h"\

-	{$(INCLUDE)}"\.\include\drv_extern.h"\

-	{$(INCLUDE)}"\.\include\fe_extern.h"\

-	{$(INCLUDE)}"\.\include\global_extern.h"\

-	{$(INCLUDE)}"\.\include\idl_bool.h"\

-	{$(INCLUDE)}"\.\include\idl_defines.h"\

-	{$(INCLUDE)}"\.\include\idl_fwd.h"\

-	{$(INCLUDE)}"\.\include\idl_global.h"\

-	{$(INCLUDE)}"\.\include\idl_narrow.h"\

-	{$(INCLUDE)}"\.\include\intlmacros.h"\

-	{$(INCLUDE)}"\.\include\nr_extern.h"\

-	{$(INCLUDE)}"\.\include\util.h"\

-	{$(INCLUDE)}"\.\include\utl_decllist.h"\

-	{$(INCLUDE)}"\.\include\utl_error.h"\

-	{$(INCLUDE)}"\.\include\utl_exceptlist.h"\

-	{$(INCLUDE)}"\.\include\utl_exprlist.h"\

-	{$(INCLUDE)}"\.\include\utl_identifier.h"\

-	{$(INCLUDE)}"\.\include\utl_idlist.h"\

-	{$(INCLUDE)}"\.\include\utl_indenter.h"\

-	{$(INCLUDE)}"\.\include\utl_labellist.h"\

-	{$(INCLUDE)}"\.\include\utl_list.h"\

-	{$(INCLUDE)}"\.\include\utl_namelist.h"\

-	{$(INCLUDE)}"\.\include\utl_scope.h"\

-	{$(INCLUDE)}"\.\include\utl_scoped_name.h"\

-	{$(INCLUDE)}"\.\include\utl_stack.h"\

-	{$(INCLUDE)}"\.\include\utl_string.h"\

-	{$(INCLUDE)}"\.\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\utl_error.obj" : $(SOURCE) $(DEP_CPP_UTL_E) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\util\utl_exceptlist.cpp

-DEP_CPP_UTL_EX=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/stdcpp.h"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\include\idl.h"\

-	".\include\idl_extern.h"\

-	{$(INCLUDE)}"\.\include\ast.h"\

-	{$(INCLUDE)}"\.\include\ast_argument.h"\

-	{$(INCLUDE)}"\.\include\ast_array.h"\

-	{$(INCLUDE)}"\.\include\ast_attribute.h"\

-	{$(INCLUDE)}"\.\include\ast_concrete_type.h"\

-	{$(INCLUDE)}"\.\include\ast_constant.h"\

-	{$(INCLUDE)}"\.\include\ast_decl.h"\

-	{$(INCLUDE)}"\.\include\ast_enum.h"\

-	{$(INCLUDE)}"\.\include\ast_enum_val.h"\

-	{$(INCLUDE)}"\.\include\ast_exception.h"\

-	{$(INCLUDE)}"\.\include\ast_expression.h"\

-	{$(INCLUDE)}"\.\include\ast_extern.h"\

-	{$(INCLUDE)}"\.\include\ast_field.h"\

-	{$(INCLUDE)}"\.\include\ast_generator.h"\

-	{$(INCLUDE)}"\.\include\ast_interface.h"\

-	{$(INCLUDE)}"\.\include\ast_interface_fwd.h"\

-	{$(INCLUDE)}"\.\include\ast_module.h"\

-	{$(INCLUDE)}"\.\include\ast_operation.h"\

-	{$(INCLUDE)}"\.\include\ast_predefined_type.h"\

-	{$(INCLUDE)}"\.\include\ast_root.h"\

-	{$(INCLUDE)}"\.\include\ast_sequence.h"\

-	{$(INCLUDE)}"\.\include\ast_string.h"\

-	{$(INCLUDE)}"\.\include\ast_structure.h"\

-	{$(INCLUDE)}"\.\include\ast_type.h"\

-	{$(INCLUDE)}"\.\include\ast_typedef.h"\

-	{$(INCLUDE)}"\.\include\ast_union.h"\

-	{$(INCLUDE)}"\.\include\ast_union_branch.h"\

-	{$(INCLUDE)}"\.\include\ast_union_label.h"\

-	{$(INCLUDE)}"\.\include\be_extern.h"\

-	{$(INCLUDE)}"\.\include\drv_extern.h"\

-	{$(INCLUDE)}"\.\include\fe_extern.h"\

-	{$(INCLUDE)}"\.\include\global_extern.h"\

-	{$(INCLUDE)}"\.\include\idl_bool.h"\

-	{$(INCLUDE)}"\.\include\idl_defines.h"\

-	{$(INCLUDE)}"\.\include\idl_fwd.h"\

-	{$(INCLUDE)}"\.\include\idl_global.h"\

-	{$(INCLUDE)}"\.\include\idl_narrow.h"\

-	{$(INCLUDE)}"\.\include\intlmacros.h"\

-	{$(INCLUDE)}"\.\include\nr_extern.h"\

-	{$(INCLUDE)}"\.\include\util.h"\

-	{$(INCLUDE)}"\.\include\utl_decllist.h"\

-	{$(INCLUDE)}"\.\include\utl_error.h"\

-	{$(INCLUDE)}"\.\include\utl_exceptlist.h"\

-	{$(INCLUDE)}"\.\include\utl_exprlist.h"\

-	{$(INCLUDE)}"\.\include\utl_identifier.h"\

-	{$(INCLUDE)}"\.\include\utl_idlist.h"\

-	{$(INCLUDE)}"\.\include\utl_indenter.h"\

-	{$(INCLUDE)}"\.\include\utl_labellist.h"\

-	{$(INCLUDE)}"\.\include\utl_list.h"\

-	{$(INCLUDE)}"\.\include\utl_namelist.h"\

-	{$(INCLUDE)}"\.\include\utl_scope.h"\

-	{$(INCLUDE)}"\.\include\utl_scoped_name.h"\

-	{$(INCLUDE)}"\.\include\utl_stack.h"\

-	{$(INCLUDE)}"\.\include\utl_string.h"\

-	{$(INCLUDE)}"\.\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\utl_exceptlist.obj" : $(SOURCE) $(DEP_CPP_UTL_EX) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\util\utl_exprlist.cpp

-DEP_CPP_UTL_EXP=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/stdcpp.h"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\include\idl.h"\

-	".\include\idl_extern.h"\

-	{$(INCLUDE)}"\.\include\ast.h"\

-	{$(INCLUDE)}"\.\include\ast_argument.h"\

-	{$(INCLUDE)}"\.\include\ast_array.h"\

-	{$(INCLUDE)}"\.\include\ast_attribute.h"\

-	{$(INCLUDE)}"\.\include\ast_concrete_type.h"\

-	{$(INCLUDE)}"\.\include\ast_constant.h"\

-	{$(INCLUDE)}"\.\include\ast_decl.h"\

-	{$(INCLUDE)}"\.\include\ast_enum.h"\

-	{$(INCLUDE)}"\.\include\ast_enum_val.h"\

-	{$(INCLUDE)}"\.\include\ast_exception.h"\

-	{$(INCLUDE)}"\.\include\ast_expression.h"\

-	{$(INCLUDE)}"\.\include\ast_extern.h"\

-	{$(INCLUDE)}"\.\include\ast_field.h"\

-	{$(INCLUDE)}"\.\include\ast_generator.h"\

-	{$(INCLUDE)}"\.\include\ast_interface.h"\

-	{$(INCLUDE)}"\.\include\ast_interface_fwd.h"\

-	{$(INCLUDE)}"\.\include\ast_module.h"\

-	{$(INCLUDE)}"\.\include\ast_operation.h"\

-	{$(INCLUDE)}"\.\include\ast_predefined_type.h"\

-	{$(INCLUDE)}"\.\include\ast_root.h"\

-	{$(INCLUDE)}"\.\include\ast_sequence.h"\

-	{$(INCLUDE)}"\.\include\ast_string.h"\

-	{$(INCLUDE)}"\.\include\ast_structure.h"\

-	{$(INCLUDE)}"\.\include\ast_type.h"\

-	{$(INCLUDE)}"\.\include\ast_typedef.h"\

-	{$(INCLUDE)}"\.\include\ast_union.h"\

-	{$(INCLUDE)}"\.\include\ast_union_branch.h"\

-	{$(INCLUDE)}"\.\include\ast_union_label.h"\

-	{$(INCLUDE)}"\.\include\be_extern.h"\

-	{$(INCLUDE)}"\.\include\drv_extern.h"\

-	{$(INCLUDE)}"\.\include\fe_extern.h"\

-	{$(INCLUDE)}"\.\include\global_extern.h"\

-	{$(INCLUDE)}"\.\include\idl_bool.h"\

-	{$(INCLUDE)}"\.\include\idl_defines.h"\

-	{$(INCLUDE)}"\.\include\idl_fwd.h"\

-	{$(INCLUDE)}"\.\include\idl_global.h"\

-	{$(INCLUDE)}"\.\include\idl_narrow.h"\

-	{$(INCLUDE)}"\.\include\intlmacros.h"\

-	{$(INCLUDE)}"\.\include\nr_extern.h"\

-	{$(INCLUDE)}"\.\include\util.h"\

-	{$(INCLUDE)}"\.\include\utl_decllist.h"\

-	{$(INCLUDE)}"\.\include\utl_error.h"\

-	{$(INCLUDE)}"\.\include\utl_exceptlist.h"\

-	{$(INCLUDE)}"\.\include\utl_exprlist.h"\

-	{$(INCLUDE)}"\.\include\utl_identifier.h"\

-	{$(INCLUDE)}"\.\include\utl_idlist.h"\

-	{$(INCLUDE)}"\.\include\utl_indenter.h"\

-	{$(INCLUDE)}"\.\include\utl_labellist.h"\

-	{$(INCLUDE)}"\.\include\utl_list.h"\

-	{$(INCLUDE)}"\.\include\utl_namelist.h"\

-	{$(INCLUDE)}"\.\include\utl_scope.h"\

-	{$(INCLUDE)}"\.\include\utl_scoped_name.h"\

-	{$(INCLUDE)}"\.\include\utl_stack.h"\

-	{$(INCLUDE)}"\.\include\utl_string.h"\

-	{$(INCLUDE)}"\.\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\utl_exprlist.obj" : $(SOURCE) $(DEP_CPP_UTL_EXP) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\util\utl_global.cpp

-DEP_CPP_UTL_G=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/stdcpp.h"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\include\idl.h"\

-	".\include\idl_extern.h"\

-	{$(INCLUDE)}"\.\include\ast.h"\

-	{$(INCLUDE)}"\.\include\ast_argument.h"\

-	{$(INCLUDE)}"\.\include\ast_array.h"\

-	{$(INCLUDE)}"\.\include\ast_attribute.h"\

-	{$(INCLUDE)}"\.\include\ast_concrete_type.h"\

-	{$(INCLUDE)}"\.\include\ast_constant.h"\

-	{$(INCLUDE)}"\.\include\ast_decl.h"\

-	{$(INCLUDE)}"\.\include\ast_enum.h"\

-	{$(INCLUDE)}"\.\include\ast_enum_val.h"\

-	{$(INCLUDE)}"\.\include\ast_exception.h"\

-	{$(INCLUDE)}"\.\include\ast_expression.h"\

-	{$(INCLUDE)}"\.\include\ast_extern.h"\

-	{$(INCLUDE)}"\.\include\ast_field.h"\

-	{$(INCLUDE)}"\.\include\ast_generator.h"\

-	{$(INCLUDE)}"\.\include\ast_interface.h"\

-	{$(INCLUDE)}"\.\include\ast_interface_fwd.h"\

-	{$(INCLUDE)}"\.\include\ast_module.h"\

-	{$(INCLUDE)}"\.\include\ast_operation.h"\

-	{$(INCLUDE)}"\.\include\ast_predefined_type.h"\

-	{$(INCLUDE)}"\.\include\ast_root.h"\

-	{$(INCLUDE)}"\.\include\ast_sequence.h"\

-	{$(INCLUDE)}"\.\include\ast_string.h"\

-	{$(INCLUDE)}"\.\include\ast_structure.h"\

-	{$(INCLUDE)}"\.\include\ast_type.h"\

-	{$(INCLUDE)}"\.\include\ast_typedef.h"\

-	{$(INCLUDE)}"\.\include\ast_union.h"\

-	{$(INCLUDE)}"\.\include\ast_union_branch.h"\

-	{$(INCLUDE)}"\.\include\ast_union_label.h"\

-	{$(INCLUDE)}"\.\include\be_extern.h"\

-	{$(INCLUDE)}"\.\include\drv_extern.h"\

-	{$(INCLUDE)}"\.\include\fe_extern.h"\

-	{$(INCLUDE)}"\.\include\global_extern.h"\

-	{$(INCLUDE)}"\.\include\idl_bool.h"\

-	{$(INCLUDE)}"\.\include\idl_defines.h"\

-	{$(INCLUDE)}"\.\include\idl_fwd.h"\

-	{$(INCLUDE)}"\.\include\idl_global.h"\

-	{$(INCLUDE)}"\.\include\idl_narrow.h"\

-	{$(INCLUDE)}"\.\include\intlmacros.h"\

-	{$(INCLUDE)}"\.\include\nr_extern.h"\

-	{$(INCLUDE)}"\.\include\util.h"\

-	{$(INCLUDE)}"\.\include\utl_decllist.h"\

-	{$(INCLUDE)}"\.\include\utl_error.h"\

-	{$(INCLUDE)}"\.\include\utl_exceptlist.h"\

-	{$(INCLUDE)}"\.\include\utl_exprlist.h"\

-	{$(INCLUDE)}"\.\include\utl_identifier.h"\

-	{$(INCLUDE)}"\.\include\utl_idlist.h"\

-	{$(INCLUDE)}"\.\include\utl_indenter.h"\

-	{$(INCLUDE)}"\.\include\utl_labellist.h"\

-	{$(INCLUDE)}"\.\include\utl_list.h"\

-	{$(INCLUDE)}"\.\include\utl_namelist.h"\

-	{$(INCLUDE)}"\.\include\utl_scope.h"\

-	{$(INCLUDE)}"\.\include\utl_scoped_name.h"\

-	{$(INCLUDE)}"\.\include\utl_stack.h"\

-	{$(INCLUDE)}"\.\include\utl_string.h"\

-	{$(INCLUDE)}"\.\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\utl_global.obj" : $(SOURCE) $(DEP_CPP_UTL_G) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\util\utl_identifier.cpp

-DEP_CPP_UTL_I=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/stdcpp.h"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\include\idl.h"\

-	".\include\idl_extern.h"\

-	{$(INCLUDE)}"\.\include\ast.h"\

-	{$(INCLUDE)}"\.\include\ast_argument.h"\

-	{$(INCLUDE)}"\.\include\ast_array.h"\

-	{$(INCLUDE)}"\.\include\ast_attribute.h"\

-	{$(INCLUDE)}"\.\include\ast_concrete_type.h"\

-	{$(INCLUDE)}"\.\include\ast_constant.h"\

-	{$(INCLUDE)}"\.\include\ast_decl.h"\

-	{$(INCLUDE)}"\.\include\ast_enum.h"\

-	{$(INCLUDE)}"\.\include\ast_enum_val.h"\

-	{$(INCLUDE)}"\.\include\ast_exception.h"\

-	{$(INCLUDE)}"\.\include\ast_expression.h"\

-	{$(INCLUDE)}"\.\include\ast_extern.h"\

-	{$(INCLUDE)}"\.\include\ast_field.h"\

-	{$(INCLUDE)}"\.\include\ast_generator.h"\

-	{$(INCLUDE)}"\.\include\ast_interface.h"\

-	{$(INCLUDE)}"\.\include\ast_interface_fwd.h"\

-	{$(INCLUDE)}"\.\include\ast_module.h"\

-	{$(INCLUDE)}"\.\include\ast_operation.h"\

-	{$(INCLUDE)}"\.\include\ast_predefined_type.h"\

-	{$(INCLUDE)}"\.\include\ast_root.h"\

-	{$(INCLUDE)}"\.\include\ast_sequence.h"\

-	{$(INCLUDE)}"\.\include\ast_string.h"\

-	{$(INCLUDE)}"\.\include\ast_structure.h"\

-	{$(INCLUDE)}"\.\include\ast_type.h"\

-	{$(INCLUDE)}"\.\include\ast_typedef.h"\

-	{$(INCLUDE)}"\.\include\ast_union.h"\

-	{$(INCLUDE)}"\.\include\ast_union_branch.h"\

-	{$(INCLUDE)}"\.\include\ast_union_label.h"\

-	{$(INCLUDE)}"\.\include\be_extern.h"\

-	{$(INCLUDE)}"\.\include\drv_extern.h"\

-	{$(INCLUDE)}"\.\include\fe_extern.h"\

-	{$(INCLUDE)}"\.\include\global_extern.h"\

-	{$(INCLUDE)}"\.\include\idl_bool.h"\

-	{$(INCLUDE)}"\.\include\idl_defines.h"\

-	{$(INCLUDE)}"\.\include\idl_fwd.h"\

-	{$(INCLUDE)}"\.\include\idl_global.h"\

-	{$(INCLUDE)}"\.\include\idl_narrow.h"\

-	{$(INCLUDE)}"\.\include\intlmacros.h"\

-	{$(INCLUDE)}"\.\include\nr_extern.h"\

-	{$(INCLUDE)}"\.\include\util.h"\

-	{$(INCLUDE)}"\.\include\utl_decllist.h"\

-	{$(INCLUDE)}"\.\include\utl_error.h"\

-	{$(INCLUDE)}"\.\include\utl_exceptlist.h"\

-	{$(INCLUDE)}"\.\include\utl_exprlist.h"\

-	{$(INCLUDE)}"\.\include\utl_identifier.h"\

-	{$(INCLUDE)}"\.\include\utl_idlist.h"\

-	{$(INCLUDE)}"\.\include\utl_indenter.h"\

-	{$(INCLUDE)}"\.\include\utl_labellist.h"\

-	{$(INCLUDE)}"\.\include\utl_list.h"\

-	{$(INCLUDE)}"\.\include\utl_namelist.h"\

-	{$(INCLUDE)}"\.\include\utl_scope.h"\

-	{$(INCLUDE)}"\.\include\utl_scoped_name.h"\

-	{$(INCLUDE)}"\.\include\utl_stack.h"\

-	{$(INCLUDE)}"\.\include\utl_string.h"\

-	{$(INCLUDE)}"\.\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\utl_identifier.obj" : $(SOURCE) $(DEP_CPP_UTL_I) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\util\utl_idlist.cpp

-DEP_CPP_UTL_ID=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/stdcpp.h"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\include\idl.h"\

-	".\include\idl_extern.h"\

-	{$(INCLUDE)}"\.\include\ast.h"\

-	{$(INCLUDE)}"\.\include\ast_argument.h"\

-	{$(INCLUDE)}"\.\include\ast_array.h"\

-	{$(INCLUDE)}"\.\include\ast_attribute.h"\

-	{$(INCLUDE)}"\.\include\ast_concrete_type.h"\

-	{$(INCLUDE)}"\.\include\ast_constant.h"\

-	{$(INCLUDE)}"\.\include\ast_decl.h"\

-	{$(INCLUDE)}"\.\include\ast_enum.h"\

-	{$(INCLUDE)}"\.\include\ast_enum_val.h"\

-	{$(INCLUDE)}"\.\include\ast_exception.h"\

-	{$(INCLUDE)}"\.\include\ast_expression.h"\

-	{$(INCLUDE)}"\.\include\ast_extern.h"\

-	{$(INCLUDE)}"\.\include\ast_field.h"\

-	{$(INCLUDE)}"\.\include\ast_generator.h"\

-	{$(INCLUDE)}"\.\include\ast_interface.h"\

-	{$(INCLUDE)}"\.\include\ast_interface_fwd.h"\

-	{$(INCLUDE)}"\.\include\ast_module.h"\

-	{$(INCLUDE)}"\.\include\ast_operation.h"\

-	{$(INCLUDE)}"\.\include\ast_predefined_type.h"\

-	{$(INCLUDE)}"\.\include\ast_root.h"\

-	{$(INCLUDE)}"\.\include\ast_sequence.h"\

-	{$(INCLUDE)}"\.\include\ast_string.h"\

-	{$(INCLUDE)}"\.\include\ast_structure.h"\

-	{$(INCLUDE)}"\.\include\ast_type.h"\

-	{$(INCLUDE)}"\.\include\ast_typedef.h"\

-	{$(INCLUDE)}"\.\include\ast_union.h"\

-	{$(INCLUDE)}"\.\include\ast_union_branch.h"\

-	{$(INCLUDE)}"\.\include\ast_union_label.h"\

-	{$(INCLUDE)}"\.\include\be_extern.h"\

-	{$(INCLUDE)}"\.\include\drv_extern.h"\

-	{$(INCLUDE)}"\.\include\fe_extern.h"\

-	{$(INCLUDE)}"\.\include\global_extern.h"\

-	{$(INCLUDE)}"\.\include\idl_bool.h"\

-	{$(INCLUDE)}"\.\include\idl_defines.h"\

-	{$(INCLUDE)}"\.\include\idl_fwd.h"\

-	{$(INCLUDE)}"\.\include\idl_global.h"\

-	{$(INCLUDE)}"\.\include\idl_narrow.h"\

-	{$(INCLUDE)}"\.\include\intlmacros.h"\

-	{$(INCLUDE)}"\.\include\nr_extern.h"\

-	{$(INCLUDE)}"\.\include\util.h"\

-	{$(INCLUDE)}"\.\include\utl_decllist.h"\

-	{$(INCLUDE)}"\.\include\utl_error.h"\

-	{$(INCLUDE)}"\.\include\utl_exceptlist.h"\

-	{$(INCLUDE)}"\.\include\utl_exprlist.h"\

-	{$(INCLUDE)}"\.\include\utl_identifier.h"\

-	{$(INCLUDE)}"\.\include\utl_idlist.h"\

-	{$(INCLUDE)}"\.\include\utl_indenter.h"\

-	{$(INCLUDE)}"\.\include\utl_labellist.h"\

-	{$(INCLUDE)}"\.\include\utl_list.h"\

-	{$(INCLUDE)}"\.\include\utl_namelist.h"\

-	{$(INCLUDE)}"\.\include\utl_scope.h"\

-	{$(INCLUDE)}"\.\include\utl_scoped_name.h"\

-	{$(INCLUDE)}"\.\include\utl_stack.h"\

-	{$(INCLUDE)}"\.\include\utl_string.h"\

-	{$(INCLUDE)}"\.\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\utl_idlist.obj" : $(SOURCE) $(DEP_CPP_UTL_ID) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\util\utl_indenter.cpp

-DEP_CPP_UTL_IN=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/stdcpp.h"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\include\idl.h"\

-	".\include\idl_extern.h"\

-	{$(INCLUDE)}"\.\include\ast.h"\

-	{$(INCLUDE)}"\.\include\ast_argument.h"\

-	{$(INCLUDE)}"\.\include\ast_array.h"\

-	{$(INCLUDE)}"\.\include\ast_attribute.h"\

-	{$(INCLUDE)}"\.\include\ast_concrete_type.h"\

-	{$(INCLUDE)}"\.\include\ast_constant.h"\

-	{$(INCLUDE)}"\.\include\ast_decl.h"\

-	{$(INCLUDE)}"\.\include\ast_enum.h"\

-	{$(INCLUDE)}"\.\include\ast_enum_val.h"\

-	{$(INCLUDE)}"\.\include\ast_exception.h"\

-	{$(INCLUDE)}"\.\include\ast_expression.h"\

-	{$(INCLUDE)}"\.\include\ast_extern.h"\

-	{$(INCLUDE)}"\.\include\ast_field.h"\

-	{$(INCLUDE)}"\.\include\ast_generator.h"\

-	{$(INCLUDE)}"\.\include\ast_interface.h"\

-	{$(INCLUDE)}"\.\include\ast_interface_fwd.h"\

-	{$(INCLUDE)}"\.\include\ast_module.h"\

-	{$(INCLUDE)}"\.\include\ast_operation.h"\

-	{$(INCLUDE)}"\.\include\ast_predefined_type.h"\

-	{$(INCLUDE)}"\.\include\ast_root.h"\

-	{$(INCLUDE)}"\.\include\ast_sequence.h"\

-	{$(INCLUDE)}"\.\include\ast_string.h"\

-	{$(INCLUDE)}"\.\include\ast_structure.h"\

-	{$(INCLUDE)}"\.\include\ast_type.h"\

-	{$(INCLUDE)}"\.\include\ast_typedef.h"\

-	{$(INCLUDE)}"\.\include\ast_union.h"\

-	{$(INCLUDE)}"\.\include\ast_union_branch.h"\

-	{$(INCLUDE)}"\.\include\ast_union_label.h"\

-	{$(INCLUDE)}"\.\include\be_extern.h"\

-	{$(INCLUDE)}"\.\include\drv_extern.h"\

-	{$(INCLUDE)}"\.\include\fe_extern.h"\

-	{$(INCLUDE)}"\.\include\global_extern.h"\

-	{$(INCLUDE)}"\.\include\idl_bool.h"\

-	{$(INCLUDE)}"\.\include\idl_defines.h"\

-	{$(INCLUDE)}"\.\include\idl_fwd.h"\

-	{$(INCLUDE)}"\.\include\idl_global.h"\

-	{$(INCLUDE)}"\.\include\idl_narrow.h"\

-	{$(INCLUDE)}"\.\include\intlmacros.h"\

-	{$(INCLUDE)}"\.\include\nr_extern.h"\

-	{$(INCLUDE)}"\.\include\util.h"\

-	{$(INCLUDE)}"\.\include\utl_decllist.h"\

-	{$(INCLUDE)}"\.\include\utl_error.h"\

-	{$(INCLUDE)}"\.\include\utl_exceptlist.h"\

-	{$(INCLUDE)}"\.\include\utl_exprlist.h"\

-	{$(INCLUDE)}"\.\include\utl_identifier.h"\

-	{$(INCLUDE)}"\.\include\utl_idlist.h"\

-	{$(INCLUDE)}"\.\include\utl_indenter.h"\

-	{$(INCLUDE)}"\.\include\utl_labellist.h"\

-	{$(INCLUDE)}"\.\include\utl_list.h"\

-	{$(INCLUDE)}"\.\include\utl_namelist.h"\

-	{$(INCLUDE)}"\.\include\utl_scope.h"\

-	{$(INCLUDE)}"\.\include\utl_scoped_name.h"\

-	{$(INCLUDE)}"\.\include\utl_stack.h"\

-	{$(INCLUDE)}"\.\include\utl_string.h"\

-	{$(INCLUDE)}"\.\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\utl_indenter.obj" : $(SOURCE) $(DEP_CPP_UTL_IN) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\util\utl_labellist.cpp

-DEP_CPP_UTL_L=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/stdcpp.h"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\include\idl.h"\

-	".\include\idl_extern.h"\

-	{$(INCLUDE)}"\.\include\ast.h"\

-	{$(INCLUDE)}"\.\include\ast_argument.h"\

-	{$(INCLUDE)}"\.\include\ast_array.h"\

-	{$(INCLUDE)}"\.\include\ast_attribute.h"\

-	{$(INCLUDE)}"\.\include\ast_concrete_type.h"\

-	{$(INCLUDE)}"\.\include\ast_constant.h"\

-	{$(INCLUDE)}"\.\include\ast_decl.h"\

-	{$(INCLUDE)}"\.\include\ast_enum.h"\

-	{$(INCLUDE)}"\.\include\ast_enum_val.h"\

-	{$(INCLUDE)}"\.\include\ast_exception.h"\

-	{$(INCLUDE)}"\.\include\ast_expression.h"\

-	{$(INCLUDE)}"\.\include\ast_extern.h"\

-	{$(INCLUDE)}"\.\include\ast_field.h"\

-	{$(INCLUDE)}"\.\include\ast_generator.h"\

-	{$(INCLUDE)}"\.\include\ast_interface.h"\

-	{$(INCLUDE)}"\.\include\ast_interface_fwd.h"\

-	{$(INCLUDE)}"\.\include\ast_module.h"\

-	{$(INCLUDE)}"\.\include\ast_operation.h"\

-	{$(INCLUDE)}"\.\include\ast_predefined_type.h"\

-	{$(INCLUDE)}"\.\include\ast_root.h"\

-	{$(INCLUDE)}"\.\include\ast_sequence.h"\

-	{$(INCLUDE)}"\.\include\ast_string.h"\

-	{$(INCLUDE)}"\.\include\ast_structure.h"\

-	{$(INCLUDE)}"\.\include\ast_type.h"\

-	{$(INCLUDE)}"\.\include\ast_typedef.h"\

-	{$(INCLUDE)}"\.\include\ast_union.h"\

-	{$(INCLUDE)}"\.\include\ast_union_branch.h"\

-	{$(INCLUDE)}"\.\include\ast_union_label.h"\

-	{$(INCLUDE)}"\.\include\be_extern.h"\

-	{$(INCLUDE)}"\.\include\drv_extern.h"\

-	{$(INCLUDE)}"\.\include\fe_extern.h"\

-	{$(INCLUDE)}"\.\include\global_extern.h"\

-	{$(INCLUDE)}"\.\include\idl_bool.h"\

-	{$(INCLUDE)}"\.\include\idl_defines.h"\

-	{$(INCLUDE)}"\.\include\idl_fwd.h"\

-	{$(INCLUDE)}"\.\include\idl_global.h"\

-	{$(INCLUDE)}"\.\include\idl_narrow.h"\

-	{$(INCLUDE)}"\.\include\intlmacros.h"\

-	{$(INCLUDE)}"\.\include\nr_extern.h"\

-	{$(INCLUDE)}"\.\include\util.h"\

-	{$(INCLUDE)}"\.\include\utl_decllist.h"\

-	{$(INCLUDE)}"\.\include\utl_error.h"\

-	{$(INCLUDE)}"\.\include\utl_exceptlist.h"\

-	{$(INCLUDE)}"\.\include\utl_exprlist.h"\

-	{$(INCLUDE)}"\.\include\utl_identifier.h"\

-	{$(INCLUDE)}"\.\include\utl_idlist.h"\

-	{$(INCLUDE)}"\.\include\utl_indenter.h"\

-	{$(INCLUDE)}"\.\include\utl_labellist.h"\

-	{$(INCLUDE)}"\.\include\utl_list.h"\

-	{$(INCLUDE)}"\.\include\utl_namelist.h"\

-	{$(INCLUDE)}"\.\include\utl_scope.h"\

-	{$(INCLUDE)}"\.\include\utl_scoped_name.h"\

-	{$(INCLUDE)}"\.\include\utl_stack.h"\

-	{$(INCLUDE)}"\.\include\utl_string.h"\

-	{$(INCLUDE)}"\.\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\utl_labellist.obj" : $(SOURCE) $(DEP_CPP_UTL_L) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\util\utl_list.cpp

-DEP_CPP_UTL_LI=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/stdcpp.h"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\include\idl.h"\

-	".\include\idl_extern.h"\

-	{$(INCLUDE)}"\.\include\ast.h"\

-	{$(INCLUDE)}"\.\include\ast_argument.h"\

-	{$(INCLUDE)}"\.\include\ast_array.h"\

-	{$(INCLUDE)}"\.\include\ast_attribute.h"\

-	{$(INCLUDE)}"\.\include\ast_concrete_type.h"\

-	{$(INCLUDE)}"\.\include\ast_constant.h"\

-	{$(INCLUDE)}"\.\include\ast_decl.h"\

-	{$(INCLUDE)}"\.\include\ast_enum.h"\

-	{$(INCLUDE)}"\.\include\ast_enum_val.h"\

-	{$(INCLUDE)}"\.\include\ast_exception.h"\

-	{$(INCLUDE)}"\.\include\ast_expression.h"\

-	{$(INCLUDE)}"\.\include\ast_extern.h"\

-	{$(INCLUDE)}"\.\include\ast_field.h"\

-	{$(INCLUDE)}"\.\include\ast_generator.h"\

-	{$(INCLUDE)}"\.\include\ast_interface.h"\

-	{$(INCLUDE)}"\.\include\ast_interface_fwd.h"\

-	{$(INCLUDE)}"\.\include\ast_module.h"\

-	{$(INCLUDE)}"\.\include\ast_operation.h"\

-	{$(INCLUDE)}"\.\include\ast_predefined_type.h"\

-	{$(INCLUDE)}"\.\include\ast_root.h"\

-	{$(INCLUDE)}"\.\include\ast_sequence.h"\

-	{$(INCLUDE)}"\.\include\ast_string.h"\

-	{$(INCLUDE)}"\.\include\ast_structure.h"\

-	{$(INCLUDE)}"\.\include\ast_type.h"\

-	{$(INCLUDE)}"\.\include\ast_typedef.h"\

-	{$(INCLUDE)}"\.\include\ast_union.h"\

-	{$(INCLUDE)}"\.\include\ast_union_branch.h"\

-	{$(INCLUDE)}"\.\include\ast_union_label.h"\

-	{$(INCLUDE)}"\.\include\be_extern.h"\

-	{$(INCLUDE)}"\.\include\drv_extern.h"\

-	{$(INCLUDE)}"\.\include\fe_extern.h"\

-	{$(INCLUDE)}"\.\include\global_extern.h"\

-	{$(INCLUDE)}"\.\include\idl_bool.h"\

-	{$(INCLUDE)}"\.\include\idl_defines.h"\

-	{$(INCLUDE)}"\.\include\idl_fwd.h"\

-	{$(INCLUDE)}"\.\include\idl_global.h"\

-	{$(INCLUDE)}"\.\include\idl_narrow.h"\

-	{$(INCLUDE)}"\.\include\intlmacros.h"\

-	{$(INCLUDE)}"\.\include\nr_extern.h"\

-	{$(INCLUDE)}"\.\include\util.h"\

-	{$(INCLUDE)}"\.\include\utl_decllist.h"\

-	{$(INCLUDE)}"\.\include\utl_error.h"\

-	{$(INCLUDE)}"\.\include\utl_exceptlist.h"\

-	{$(INCLUDE)}"\.\include\utl_exprlist.h"\

-	{$(INCLUDE)}"\.\include\utl_identifier.h"\

-	{$(INCLUDE)}"\.\include\utl_idlist.h"\

-	{$(INCLUDE)}"\.\include\utl_indenter.h"\

-	{$(INCLUDE)}"\.\include\utl_labellist.h"\

-	{$(INCLUDE)}"\.\include\utl_list.h"\

-	{$(INCLUDE)}"\.\include\utl_namelist.h"\

-	{$(INCLUDE)}"\.\include\utl_scope.h"\

-	{$(INCLUDE)}"\.\include\utl_scoped_name.h"\

-	{$(INCLUDE)}"\.\include\utl_stack.h"\

-	{$(INCLUDE)}"\.\include\utl_string.h"\

-	{$(INCLUDE)}"\.\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\utl_list.obj" : $(SOURCE) $(DEP_CPP_UTL_LI) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\util\utl_namelist.cpp

-DEP_CPP_UTL_N=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/stdcpp.h"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\include\idl.h"\

-	".\include\idl_extern.h"\

-	{$(INCLUDE)}"\.\include\ast.h"\

-	{$(INCLUDE)}"\.\include\ast_argument.h"\

-	{$(INCLUDE)}"\.\include\ast_array.h"\

-	{$(INCLUDE)}"\.\include\ast_attribute.h"\

-	{$(INCLUDE)}"\.\include\ast_concrete_type.h"\

-	{$(INCLUDE)}"\.\include\ast_constant.h"\

-	{$(INCLUDE)}"\.\include\ast_decl.h"\

-	{$(INCLUDE)}"\.\include\ast_enum.h"\

-	{$(INCLUDE)}"\.\include\ast_enum_val.h"\

-	{$(INCLUDE)}"\.\include\ast_exception.h"\

-	{$(INCLUDE)}"\.\include\ast_expression.h"\

-	{$(INCLUDE)}"\.\include\ast_extern.h"\

-	{$(INCLUDE)}"\.\include\ast_field.h"\

-	{$(INCLUDE)}"\.\include\ast_generator.h"\

-	{$(INCLUDE)}"\.\include\ast_interface.h"\

-	{$(INCLUDE)}"\.\include\ast_interface_fwd.h"\

-	{$(INCLUDE)}"\.\include\ast_module.h"\

-	{$(INCLUDE)}"\.\include\ast_operation.h"\

-	{$(INCLUDE)}"\.\include\ast_predefined_type.h"\

-	{$(INCLUDE)}"\.\include\ast_root.h"\

-	{$(INCLUDE)}"\.\include\ast_sequence.h"\

-	{$(INCLUDE)}"\.\include\ast_string.h"\

-	{$(INCLUDE)}"\.\include\ast_structure.h"\

-	{$(INCLUDE)}"\.\include\ast_type.h"\

-	{$(INCLUDE)}"\.\include\ast_typedef.h"\

-	{$(INCLUDE)}"\.\include\ast_union.h"\

-	{$(INCLUDE)}"\.\include\ast_union_branch.h"\

-	{$(INCLUDE)}"\.\include\ast_union_label.h"\

-	{$(INCLUDE)}"\.\include\be_extern.h"\

-	{$(INCLUDE)}"\.\include\drv_extern.h"\

-	{$(INCLUDE)}"\.\include\fe_extern.h"\

-	{$(INCLUDE)}"\.\include\global_extern.h"\

-	{$(INCLUDE)}"\.\include\idl_bool.h"\

-	{$(INCLUDE)}"\.\include\idl_defines.h"\

-	{$(INCLUDE)}"\.\include\idl_fwd.h"\

-	{$(INCLUDE)}"\.\include\idl_global.h"\

-	{$(INCLUDE)}"\.\include\idl_narrow.h"\

-	{$(INCLUDE)}"\.\include\intlmacros.h"\

-	{$(INCLUDE)}"\.\include\nr_extern.h"\

-	{$(INCLUDE)}"\.\include\util.h"\

-	{$(INCLUDE)}"\.\include\utl_decllist.h"\

-	{$(INCLUDE)}"\.\include\utl_error.h"\

-	{$(INCLUDE)}"\.\include\utl_exceptlist.h"\

-	{$(INCLUDE)}"\.\include\utl_exprlist.h"\

-	{$(INCLUDE)}"\.\include\utl_identifier.h"\

-	{$(INCLUDE)}"\.\include\utl_idlist.h"\

-	{$(INCLUDE)}"\.\include\utl_indenter.h"\

-	{$(INCLUDE)}"\.\include\utl_labellist.h"\

-	{$(INCLUDE)}"\.\include\utl_list.h"\

-	{$(INCLUDE)}"\.\include\utl_namelist.h"\

-	{$(INCLUDE)}"\.\include\utl_scope.h"\

-	{$(INCLUDE)}"\.\include\utl_scoped_name.h"\

-	{$(INCLUDE)}"\.\include\utl_stack.h"\

-	{$(INCLUDE)}"\.\include\utl_string.h"\

-	{$(INCLUDE)}"\.\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\utl_namelist.obj" : $(SOURCE) $(DEP_CPP_UTL_N) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\util\utl_scope.cpp

-DEP_CPP_UTL_S=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/stdcpp.h"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\include\idl.h"\

-	".\include\idl_extern.h"\

-	{$(INCLUDE)}"\.\include\ast.h"\

-	{$(INCLUDE)}"\.\include\ast_argument.h"\

-	{$(INCLUDE)}"\.\include\ast_array.h"\

-	{$(INCLUDE)}"\.\include\ast_attribute.h"\

-	{$(INCLUDE)}"\.\include\ast_concrete_type.h"\

-	{$(INCLUDE)}"\.\include\ast_constant.h"\

-	{$(INCLUDE)}"\.\include\ast_decl.h"\

-	{$(INCLUDE)}"\.\include\ast_enum.h"\

-	{$(INCLUDE)}"\.\include\ast_enum_val.h"\

-	{$(INCLUDE)}"\.\include\ast_exception.h"\

-	{$(INCLUDE)}"\.\include\ast_expression.h"\

-	{$(INCLUDE)}"\.\include\ast_extern.h"\

-	{$(INCLUDE)}"\.\include\ast_field.h"\

-	{$(INCLUDE)}"\.\include\ast_generator.h"\

-	{$(INCLUDE)}"\.\include\ast_interface.h"\

-	{$(INCLUDE)}"\.\include\ast_interface_fwd.h"\

-	{$(INCLUDE)}"\.\include\ast_module.h"\

-	{$(INCLUDE)}"\.\include\ast_operation.h"\

-	{$(INCLUDE)}"\.\include\ast_predefined_type.h"\

-	{$(INCLUDE)}"\.\include\ast_root.h"\

-	{$(INCLUDE)}"\.\include\ast_sequence.h"\

-	{$(INCLUDE)}"\.\include\ast_string.h"\

-	{$(INCLUDE)}"\.\include\ast_structure.h"\

-	{$(INCLUDE)}"\.\include\ast_type.h"\

-	{$(INCLUDE)}"\.\include\ast_typedef.h"\

-	{$(INCLUDE)}"\.\include\ast_union.h"\

-	{$(INCLUDE)}"\.\include\ast_union_branch.h"\

-	{$(INCLUDE)}"\.\include\ast_union_label.h"\

-	{$(INCLUDE)}"\.\include\be_extern.h"\

-	{$(INCLUDE)}"\.\include\drv_extern.h"\

-	{$(INCLUDE)}"\.\include\fe_extern.h"\

-	{$(INCLUDE)}"\.\include\global_extern.h"\

-	{$(INCLUDE)}"\.\include\idl_bool.h"\

-	{$(INCLUDE)}"\.\include\idl_defines.h"\

-	{$(INCLUDE)}"\.\include\idl_fwd.h"\

-	{$(INCLUDE)}"\.\include\idl_global.h"\

-	{$(INCLUDE)}"\.\include\idl_narrow.h"\

-	{$(INCLUDE)}"\.\include\intlmacros.h"\

-	{$(INCLUDE)}"\.\include\nr_extern.h"\

-	{$(INCLUDE)}"\.\include\util.h"\

-	{$(INCLUDE)}"\.\include\utl_decllist.h"\

-	{$(INCLUDE)}"\.\include\utl_error.h"\

-	{$(INCLUDE)}"\.\include\utl_exceptlist.h"\

-	{$(INCLUDE)}"\.\include\utl_exprlist.h"\

-	{$(INCLUDE)}"\.\include\utl_identifier.h"\

-	{$(INCLUDE)}"\.\include\utl_idlist.h"\

-	{$(INCLUDE)}"\.\include\utl_indenter.h"\

-	{$(INCLUDE)}"\.\include\utl_labellist.h"\

-	{$(INCLUDE)}"\.\include\utl_list.h"\

-	{$(INCLUDE)}"\.\include\utl_namelist.h"\

-	{$(INCLUDE)}"\.\include\utl_scope.h"\

-	{$(INCLUDE)}"\.\include\utl_scoped_name.h"\

-	{$(INCLUDE)}"\.\include\utl_stack.h"\

-	{$(INCLUDE)}"\.\include\utl_string.h"\

-	{$(INCLUDE)}"\.\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\utl_scope.obj" : $(SOURCE) $(DEP_CPP_UTL_S) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\util\utl_stack.cpp

-DEP_CPP_UTL_ST=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/stdcpp.h"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\include\idl.h"\

-	".\include\idl_extern.h"\

-	{$(INCLUDE)}"\.\include\ast.h"\

-	{$(INCLUDE)}"\.\include\ast_argument.h"\

-	{$(INCLUDE)}"\.\include\ast_array.h"\

-	{$(INCLUDE)}"\.\include\ast_attribute.h"\

-	{$(INCLUDE)}"\.\include\ast_concrete_type.h"\

-	{$(INCLUDE)}"\.\include\ast_constant.h"\

-	{$(INCLUDE)}"\.\include\ast_decl.h"\

-	{$(INCLUDE)}"\.\include\ast_enum.h"\

-	{$(INCLUDE)}"\.\include\ast_enum_val.h"\

-	{$(INCLUDE)}"\.\include\ast_exception.h"\

-	{$(INCLUDE)}"\.\include\ast_expression.h"\

-	{$(INCLUDE)}"\.\include\ast_extern.h"\

-	{$(INCLUDE)}"\.\include\ast_field.h"\

-	{$(INCLUDE)}"\.\include\ast_generator.h"\

-	{$(INCLUDE)}"\.\include\ast_interface.h"\

-	{$(INCLUDE)}"\.\include\ast_interface_fwd.h"\

-	{$(INCLUDE)}"\.\include\ast_module.h"\

-	{$(INCLUDE)}"\.\include\ast_operation.h"\

-	{$(INCLUDE)}"\.\include\ast_predefined_type.h"\

-	{$(INCLUDE)}"\.\include\ast_root.h"\

-	{$(INCLUDE)}"\.\include\ast_sequence.h"\

-	{$(INCLUDE)}"\.\include\ast_string.h"\

-	{$(INCLUDE)}"\.\include\ast_structure.h"\

-	{$(INCLUDE)}"\.\include\ast_type.h"\

-	{$(INCLUDE)}"\.\include\ast_typedef.h"\

-	{$(INCLUDE)}"\.\include\ast_union.h"\

-	{$(INCLUDE)}"\.\include\ast_union_branch.h"\

-	{$(INCLUDE)}"\.\include\ast_union_label.h"\

-	{$(INCLUDE)}"\.\include\be_extern.h"\

-	{$(INCLUDE)}"\.\include\drv_extern.h"\

-	{$(INCLUDE)}"\.\include\fe_extern.h"\

-	{$(INCLUDE)}"\.\include\global_extern.h"\

-	{$(INCLUDE)}"\.\include\idl_bool.h"\

-	{$(INCLUDE)}"\.\include\idl_defines.h"\

-	{$(INCLUDE)}"\.\include\idl_fwd.h"\

-	{$(INCLUDE)}"\.\include\idl_global.h"\

-	{$(INCLUDE)}"\.\include\idl_narrow.h"\

-	{$(INCLUDE)}"\.\include\intlmacros.h"\

-	{$(INCLUDE)}"\.\include\nr_extern.h"\

-	{$(INCLUDE)}"\.\include\util.h"\

-	{$(INCLUDE)}"\.\include\utl_decllist.h"\

-	{$(INCLUDE)}"\.\include\utl_error.h"\

-	{$(INCLUDE)}"\.\include\utl_exceptlist.h"\

-	{$(INCLUDE)}"\.\include\utl_exprlist.h"\

-	{$(INCLUDE)}"\.\include\utl_identifier.h"\

-	{$(INCLUDE)}"\.\include\utl_idlist.h"\

-	{$(INCLUDE)}"\.\include\utl_indenter.h"\

-	{$(INCLUDE)}"\.\include\utl_labellist.h"\

-	{$(INCLUDE)}"\.\include\utl_list.h"\

-	{$(INCLUDE)}"\.\include\utl_namelist.h"\

-	{$(INCLUDE)}"\.\include\utl_scope.h"\

-	{$(INCLUDE)}"\.\include\utl_scoped_name.h"\

-	{$(INCLUDE)}"\.\include\utl_stack.h"\

-	{$(INCLUDE)}"\.\include\utl_string.h"\

-	{$(INCLUDE)}"\.\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\utl_stack.obj" : $(SOURCE) $(DEP_CPP_UTL_ST) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\util\utl_string.cpp

-DEP_CPP_UTL_STR=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/stdcpp.h"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\include\idl.h"\

-	".\include\idl_extern.h"\

-	{$(INCLUDE)}"\.\include\ast.h"\

-	{$(INCLUDE)}"\.\include\ast_argument.h"\

-	{$(INCLUDE)}"\.\include\ast_array.h"\

-	{$(INCLUDE)}"\.\include\ast_attribute.h"\

-	{$(INCLUDE)}"\.\include\ast_concrete_type.h"\

-	{$(INCLUDE)}"\.\include\ast_constant.h"\

-	{$(INCLUDE)}"\.\include\ast_decl.h"\

-	{$(INCLUDE)}"\.\include\ast_enum.h"\

-	{$(INCLUDE)}"\.\include\ast_enum_val.h"\

-	{$(INCLUDE)}"\.\include\ast_exception.h"\

-	{$(INCLUDE)}"\.\include\ast_expression.h"\

-	{$(INCLUDE)}"\.\include\ast_extern.h"\

-	{$(INCLUDE)}"\.\include\ast_field.h"\

-	{$(INCLUDE)}"\.\include\ast_generator.h"\

-	{$(INCLUDE)}"\.\include\ast_interface.h"\

-	{$(INCLUDE)}"\.\include\ast_interface_fwd.h"\

-	{$(INCLUDE)}"\.\include\ast_module.h"\

-	{$(INCLUDE)}"\.\include\ast_operation.h"\

-	{$(INCLUDE)}"\.\include\ast_predefined_type.h"\

-	{$(INCLUDE)}"\.\include\ast_root.h"\

-	{$(INCLUDE)}"\.\include\ast_sequence.h"\

-	{$(INCLUDE)}"\.\include\ast_string.h"\

-	{$(INCLUDE)}"\.\include\ast_structure.h"\

-	{$(INCLUDE)}"\.\include\ast_type.h"\

-	{$(INCLUDE)}"\.\include\ast_typedef.h"\

-	{$(INCLUDE)}"\.\include\ast_union.h"\

-	{$(INCLUDE)}"\.\include\ast_union_branch.h"\

-	{$(INCLUDE)}"\.\include\ast_union_label.h"\

-	{$(INCLUDE)}"\.\include\be_extern.h"\

-	{$(INCLUDE)}"\.\include\drv_extern.h"\

-	{$(INCLUDE)}"\.\include\fe_extern.h"\

-	{$(INCLUDE)}"\.\include\global_extern.h"\

-	{$(INCLUDE)}"\.\include\idl_bool.h"\

-	{$(INCLUDE)}"\.\include\idl_defines.h"\

-	{$(INCLUDE)}"\.\include\idl_fwd.h"\

-	{$(INCLUDE)}"\.\include\idl_global.h"\

-	{$(INCLUDE)}"\.\include\idl_narrow.h"\

-	{$(INCLUDE)}"\.\include\intlmacros.h"\

-	{$(INCLUDE)}"\.\include\nr_extern.h"\

-	{$(INCLUDE)}"\.\include\util.h"\

-	{$(INCLUDE)}"\.\include\utl_decllist.h"\

-	{$(INCLUDE)}"\.\include\utl_error.h"\

-	{$(INCLUDE)}"\.\include\utl_exceptlist.h"\

-	{$(INCLUDE)}"\.\include\utl_exprlist.h"\

-	{$(INCLUDE)}"\.\include\utl_identifier.h"\

-	{$(INCLUDE)}"\.\include\utl_idlist.h"\

-	{$(INCLUDE)}"\.\include\utl_indenter.h"\

-	{$(INCLUDE)}"\.\include\utl_labellist.h"\

-	{$(INCLUDE)}"\.\include\utl_list.h"\

-	{$(INCLUDE)}"\.\include\utl_namelist.h"\

-	{$(INCLUDE)}"\.\include\utl_scope.h"\

-	{$(INCLUDE)}"\.\include\utl_scoped_name.h"\

-	{$(INCLUDE)}"\.\include\utl_stack.h"\

-	{$(INCLUDE)}"\.\include\utl_string.h"\

-	{$(INCLUDE)}"\.\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\utl_string.obj" : $(SOURCE) $(DEP_CPP_UTL_STR) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\util\utl_strlist.cpp

-DEP_CPP_UTL_STRL=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/stdcpp.h"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\include\idl.h"\

-	".\include\idl_extern.h"\

-	{$(INCLUDE)}"\.\include\ast.h"\

-	{$(INCLUDE)}"\.\include\ast_argument.h"\

-	{$(INCLUDE)}"\.\include\ast_array.h"\

-	{$(INCLUDE)}"\.\include\ast_attribute.h"\

-	{$(INCLUDE)}"\.\include\ast_concrete_type.h"\

-	{$(INCLUDE)}"\.\include\ast_constant.h"\

-	{$(INCLUDE)}"\.\include\ast_decl.h"\

-	{$(INCLUDE)}"\.\include\ast_enum.h"\

-	{$(INCLUDE)}"\.\include\ast_enum_val.h"\

-	{$(INCLUDE)}"\.\include\ast_exception.h"\

-	{$(INCLUDE)}"\.\include\ast_expression.h"\

-	{$(INCLUDE)}"\.\include\ast_extern.h"\

-	{$(INCLUDE)}"\.\include\ast_field.h"\

-	{$(INCLUDE)}"\.\include\ast_generator.h"\

-	{$(INCLUDE)}"\.\include\ast_interface.h"\

-	{$(INCLUDE)}"\.\include\ast_interface_fwd.h"\

-	{$(INCLUDE)}"\.\include\ast_module.h"\

-	{$(INCLUDE)}"\.\include\ast_operation.h"\

-	{$(INCLUDE)}"\.\include\ast_predefined_type.h"\

-	{$(INCLUDE)}"\.\include\ast_root.h"\

-	{$(INCLUDE)}"\.\include\ast_sequence.h"\

-	{$(INCLUDE)}"\.\include\ast_string.h"\

-	{$(INCLUDE)}"\.\include\ast_structure.h"\

-	{$(INCLUDE)}"\.\include\ast_type.h"\

-	{$(INCLUDE)}"\.\include\ast_typedef.h"\

-	{$(INCLUDE)}"\.\include\ast_union.h"\

-	{$(INCLUDE)}"\.\include\ast_union_branch.h"\

-	{$(INCLUDE)}"\.\include\ast_union_label.h"\

-	{$(INCLUDE)}"\.\include\be_extern.h"\

-	{$(INCLUDE)}"\.\include\drv_extern.h"\

-	{$(INCLUDE)}"\.\include\fe_extern.h"\

-	{$(INCLUDE)}"\.\include\global_extern.h"\

-	{$(INCLUDE)}"\.\include\idl_bool.h"\

-	{$(INCLUDE)}"\.\include\idl_defines.h"\

-	{$(INCLUDE)}"\.\include\idl_fwd.h"\

-	{$(INCLUDE)}"\.\include\idl_global.h"\

-	{$(INCLUDE)}"\.\include\idl_narrow.h"\

-	{$(INCLUDE)}"\.\include\intlmacros.h"\

-	{$(INCLUDE)}"\.\include\nr_extern.h"\

-	{$(INCLUDE)}"\.\include\util.h"\

-	{$(INCLUDE)}"\.\include\utl_decllist.h"\

-	{$(INCLUDE)}"\.\include\utl_error.h"\

-	{$(INCLUDE)}"\.\include\utl_exceptlist.h"\

-	{$(INCLUDE)}"\.\include\utl_exprlist.h"\

-	{$(INCLUDE)}"\.\include\utl_identifier.h"\

-	{$(INCLUDE)}"\.\include\utl_idlist.h"\

-	{$(INCLUDE)}"\.\include\utl_indenter.h"\

-	{$(INCLUDE)}"\.\include\utl_labellist.h"\

-	{$(INCLUDE)}"\.\include\utl_list.h"\

-	{$(INCLUDE)}"\.\include\utl_namelist.h"\

-	{$(INCLUDE)}"\.\include\utl_scope.h"\

-	{$(INCLUDE)}"\.\include\utl_scoped_name.h"\

-	{$(INCLUDE)}"\.\include\utl_stack.h"\

-	{$(INCLUDE)}"\.\include\utl_string.h"\

-	{$(INCLUDE)}"\.\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\utl_strlist.obj" : $(SOURCE) $(DEP_CPP_UTL_STRL) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\narrow\narrow.cpp

-DEP_CPP_NARRO=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/stdcpp.h"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\include\idl.h"\

-	".\include\idl_extern.h"\

-	{$(INCLUDE)}"\.\include\ast.h"\

-	{$(INCLUDE)}"\.\include\ast_argument.h"\

-	{$(INCLUDE)}"\.\include\ast_array.h"\

-	{$(INCLUDE)}"\.\include\ast_attribute.h"\

-	{$(INCLUDE)}"\.\include\ast_concrete_type.h"\

-	{$(INCLUDE)}"\.\include\ast_constant.h"\

-	{$(INCLUDE)}"\.\include\ast_decl.h"\

-	{$(INCLUDE)}"\.\include\ast_enum.h"\

-	{$(INCLUDE)}"\.\include\ast_enum_val.h"\

-	{$(INCLUDE)}"\.\include\ast_exception.h"\

-	{$(INCLUDE)}"\.\include\ast_expression.h"\

-	{$(INCLUDE)}"\.\include\ast_extern.h"\

-	{$(INCLUDE)}"\.\include\ast_field.h"\

-	{$(INCLUDE)}"\.\include\ast_generator.h"\

-	{$(INCLUDE)}"\.\include\ast_interface.h"\

-	{$(INCLUDE)}"\.\include\ast_interface_fwd.h"\

-	{$(INCLUDE)}"\.\include\ast_module.h"\

-	{$(INCLUDE)}"\.\include\ast_operation.h"\

-	{$(INCLUDE)}"\.\include\ast_predefined_type.h"\

-	{$(INCLUDE)}"\.\include\ast_root.h"\

-	{$(INCLUDE)}"\.\include\ast_sequence.h"\

-	{$(INCLUDE)}"\.\include\ast_string.h"\

-	{$(INCLUDE)}"\.\include\ast_structure.h"\

-	{$(INCLUDE)}"\.\include\ast_type.h"\

-	{$(INCLUDE)}"\.\include\ast_typedef.h"\

-	{$(INCLUDE)}"\.\include\ast_union.h"\

-	{$(INCLUDE)}"\.\include\ast_union_branch.h"\

-	{$(INCLUDE)}"\.\include\ast_union_label.h"\

-	{$(INCLUDE)}"\.\include\be_extern.h"\

-	{$(INCLUDE)}"\.\include\drv_extern.h"\

-	{$(INCLUDE)}"\.\include\fe_extern.h"\

-	{$(INCLUDE)}"\.\include\global_extern.h"\

-	{$(INCLUDE)}"\.\include\idl_bool.h"\

-	{$(INCLUDE)}"\.\include\idl_defines.h"\

-	{$(INCLUDE)}"\.\include\idl_fwd.h"\

-	{$(INCLUDE)}"\.\include\idl_global.h"\

-	{$(INCLUDE)}"\.\include\idl_narrow.h"\

-	{$(INCLUDE)}"\.\include\intlmacros.h"\

-	{$(INCLUDE)}"\.\include\nr_extern.h"\

-	{$(INCLUDE)}"\.\include\util.h"\

-	{$(INCLUDE)}"\.\include\utl_decllist.h"\

-	{$(INCLUDE)}"\.\include\utl_error.h"\

-	{$(INCLUDE)}"\.\include\utl_exceptlist.h"\

-	{$(INCLUDE)}"\.\include\utl_exprlist.h"\

-	{$(INCLUDE)}"\.\include\utl_identifier.h"\

-	{$(INCLUDE)}"\.\include\utl_idlist.h"\

-	{$(INCLUDE)}"\.\include\utl_indenter.h"\

-	{$(INCLUDE)}"\.\include\utl_labellist.h"\

-	{$(INCLUDE)}"\.\include\utl_list.h"\

-	{$(INCLUDE)}"\.\include\utl_namelist.h"\

-	{$(INCLUDE)}"\.\include\utl_scope.h"\

-	{$(INCLUDE)}"\.\include\utl_scoped_name.h"\

-	{$(INCLUDE)}"\.\include\utl_stack.h"\

-	{$(INCLUDE)}"\.\include\utl_string.h"\

-	{$(INCLUDE)}"\.\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\narrow.obj" : $(SOURCE) $(DEP_CPP_NARRO) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\fe\fe_declarator.cpp

-DEP_CPP_FE_DE=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/stdcpp.h"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\include\fe_declarator.h"\

-	".\include\fe_interface_header.h"\

-	".\include\fe_private.h"\

-	".\include\idl.h"\

-	".\include\idl_extern.h"\

-	{$(INCLUDE)}"\.\include\ast.h"\

-	{$(INCLUDE)}"\.\include\ast_argument.h"\

-	{$(INCLUDE)}"\.\include\ast_array.h"\

-	{$(INCLUDE)}"\.\include\ast_attribute.h"\

-	{$(INCLUDE)}"\.\include\ast_concrete_type.h"\

-	{$(INCLUDE)}"\.\include\ast_constant.h"\

-	{$(INCLUDE)}"\.\include\ast_decl.h"\

-	{$(INCLUDE)}"\.\include\ast_enum.h"\

-	{$(INCLUDE)}"\.\include\ast_enum_val.h"\

-	{$(INCLUDE)}"\.\include\ast_exception.h"\

-	{$(INCLUDE)}"\.\include\ast_expression.h"\

-	{$(INCLUDE)}"\.\include\ast_extern.h"\

-	{$(INCLUDE)}"\.\include\ast_field.h"\

-	{$(INCLUDE)}"\.\include\ast_generator.h"\

-	{$(INCLUDE)}"\.\include\ast_interface.h"\

-	{$(INCLUDE)}"\.\include\ast_interface_fwd.h"\

-	{$(INCLUDE)}"\.\include\ast_module.h"\

-	{$(INCLUDE)}"\.\include\ast_operation.h"\

-	{$(INCLUDE)}"\.\include\ast_predefined_type.h"\

-	{$(INCLUDE)}"\.\include\ast_root.h"\

-	{$(INCLUDE)}"\.\include\ast_sequence.h"\

-	{$(INCLUDE)}"\.\include\ast_string.h"\

-	{$(INCLUDE)}"\.\include\ast_structure.h"\

-	{$(INCLUDE)}"\.\include\ast_type.h"\

-	{$(INCLUDE)}"\.\include\ast_typedef.h"\

-	{$(INCLUDE)}"\.\include\ast_union.h"\

-	{$(INCLUDE)}"\.\include\ast_union_branch.h"\

-	{$(INCLUDE)}"\.\include\ast_union_label.h"\

-	{$(INCLUDE)}"\.\include\be_extern.h"\

-	{$(INCLUDE)}"\.\include\drv_extern.h"\

-	{$(INCLUDE)}"\.\include\fe_extern.h"\

-	{$(INCLUDE)}"\.\include\global_extern.h"\

-	{$(INCLUDE)}"\.\include\idl_bool.h"\

-	{$(INCLUDE)}"\.\include\idl_defines.h"\

-	{$(INCLUDE)}"\.\include\idl_fwd.h"\

-	{$(INCLUDE)}"\.\include\idl_global.h"\

-	{$(INCLUDE)}"\.\include\idl_narrow.h"\

-	{$(INCLUDE)}"\.\include\intlmacros.h"\

-	{$(INCLUDE)}"\.\include\nr_extern.h"\

-	{$(INCLUDE)}"\.\include\util.h"\

-	{$(INCLUDE)}"\.\include\utl_decllist.h"\

-	{$(INCLUDE)}"\.\include\utl_error.h"\

-	{$(INCLUDE)}"\.\include\utl_exceptlist.h"\

-	{$(INCLUDE)}"\.\include\utl_exprlist.h"\

-	{$(INCLUDE)}"\.\include\utl_identifier.h"\

-	{$(INCLUDE)}"\.\include\utl_idlist.h"\

-	{$(INCLUDE)}"\.\include\utl_indenter.h"\

-	{$(INCLUDE)}"\.\include\utl_labellist.h"\

-	{$(INCLUDE)}"\.\include\utl_list.h"\

-	{$(INCLUDE)}"\.\include\utl_namelist.h"\

-	{$(INCLUDE)}"\.\include\utl_scope.h"\

-	{$(INCLUDE)}"\.\include\utl_scoped_name.h"\

-	{$(INCLUDE)}"\.\include\utl_stack.h"\

-	{$(INCLUDE)}"\.\include\utl_string.h"\

-	{$(INCLUDE)}"\.\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\fe_declarator.obj" : $(SOURCE) $(DEP_CPP_FE_DE) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\fe\fe_extern.cpp

-DEP_CPP_FE_EX=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/stdcpp.h"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\include\fe_declarator.h"\

-	".\include\fe_interface_header.h"\

-	".\include\fe_private.h"\

-	".\include\idl.h"\

-	".\include\idl_extern.h"\

-	{$(INCLUDE)}"\.\include\ast.h"\

-	{$(INCLUDE)}"\.\include\ast_argument.h"\

-	{$(INCLUDE)}"\.\include\ast_array.h"\

-	{$(INCLUDE)}"\.\include\ast_attribute.h"\

-	{$(INCLUDE)}"\.\include\ast_concrete_type.h"\

-	{$(INCLUDE)}"\.\include\ast_constant.h"\

-	{$(INCLUDE)}"\.\include\ast_decl.h"\

-	{$(INCLUDE)}"\.\include\ast_enum.h"\

-	{$(INCLUDE)}"\.\include\ast_enum_val.h"\

-	{$(INCLUDE)}"\.\include\ast_exception.h"\

-	{$(INCLUDE)}"\.\include\ast_expression.h"\

-	{$(INCLUDE)}"\.\include\ast_extern.h"\

-	{$(INCLUDE)}"\.\include\ast_field.h"\

-	{$(INCLUDE)}"\.\include\ast_generator.h"\

-	{$(INCLUDE)}"\.\include\ast_interface.h"\

-	{$(INCLUDE)}"\.\include\ast_interface_fwd.h"\

-	{$(INCLUDE)}"\.\include\ast_module.h"\

-	{$(INCLUDE)}"\.\include\ast_operation.h"\

-	{$(INCLUDE)}"\.\include\ast_predefined_type.h"\

-	{$(INCLUDE)}"\.\include\ast_root.h"\

-	{$(INCLUDE)}"\.\include\ast_sequence.h"\

-	{$(INCLUDE)}"\.\include\ast_string.h"\

-	{$(INCLUDE)}"\.\include\ast_structure.h"\

-	{$(INCLUDE)}"\.\include\ast_type.h"\

-	{$(INCLUDE)}"\.\include\ast_typedef.h"\

-	{$(INCLUDE)}"\.\include\ast_union.h"\

-	{$(INCLUDE)}"\.\include\ast_union_branch.h"\

-	{$(INCLUDE)}"\.\include\ast_union_label.h"\

-	{$(INCLUDE)}"\.\include\be_extern.h"\

-	{$(INCLUDE)}"\.\include\drv_extern.h"\

-	{$(INCLUDE)}"\.\include\fe_extern.h"\

-	{$(INCLUDE)}"\.\include\global_extern.h"\

-	{$(INCLUDE)}"\.\include\idl_bool.h"\

-	{$(INCLUDE)}"\.\include\idl_defines.h"\

-	{$(INCLUDE)}"\.\include\idl_fwd.h"\

-	{$(INCLUDE)}"\.\include\idl_global.h"\

-	{$(INCLUDE)}"\.\include\idl_narrow.h"\

-	{$(INCLUDE)}"\.\include\intlmacros.h"\

-	{$(INCLUDE)}"\.\include\nr_extern.h"\

-	{$(INCLUDE)}"\.\include\util.h"\

-	{$(INCLUDE)}"\.\include\utl_decllist.h"\

-	{$(INCLUDE)}"\.\include\utl_error.h"\

-	{$(INCLUDE)}"\.\include\utl_exceptlist.h"\

-	{$(INCLUDE)}"\.\include\utl_exprlist.h"\

-	{$(INCLUDE)}"\.\include\utl_identifier.h"\

-	{$(INCLUDE)}"\.\include\utl_idlist.h"\

-	{$(INCLUDE)}"\.\include\utl_indenter.h"\

-	{$(INCLUDE)}"\.\include\utl_labellist.h"\

-	{$(INCLUDE)}"\.\include\utl_list.h"\

-	{$(INCLUDE)}"\.\include\utl_namelist.h"\

-	{$(INCLUDE)}"\.\include\utl_scope.h"\

-	{$(INCLUDE)}"\.\include\utl_scoped_name.h"\

-	{$(INCLUDE)}"\.\include\utl_stack.h"\

-	{$(INCLUDE)}"\.\include\utl_string.h"\

-	{$(INCLUDE)}"\.\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\fe_extern.obj" : $(SOURCE) $(DEP_CPP_FE_EX) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\fe\fe_init.cpp

-DEP_CPP_FE_IN=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/stdcpp.h"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\include\fe_declarator.h"\

-	".\include\fe_interface_header.h"\

-	".\include\fe_private.h"\

-	".\include\idl.h"\

-	".\include\idl_extern.h"\

-	{$(INCLUDE)}"\.\include\ast.h"\

-	{$(INCLUDE)}"\.\include\ast_argument.h"\

-	{$(INCLUDE)}"\.\include\ast_array.h"\

-	{$(INCLUDE)}"\.\include\ast_attribute.h"\

-	{$(INCLUDE)}"\.\include\ast_concrete_type.h"\

-	{$(INCLUDE)}"\.\include\ast_constant.h"\

-	{$(INCLUDE)}"\.\include\ast_decl.h"\

-	{$(INCLUDE)}"\.\include\ast_enum.h"\

-	{$(INCLUDE)}"\.\include\ast_enum_val.h"\

-	{$(INCLUDE)}"\.\include\ast_exception.h"\

-	{$(INCLUDE)}"\.\include\ast_expression.h"\

-	{$(INCLUDE)}"\.\include\ast_extern.h"\

-	{$(INCLUDE)}"\.\include\ast_field.h"\

-	{$(INCLUDE)}"\.\include\ast_generator.h"\

-	{$(INCLUDE)}"\.\include\ast_interface.h"\

-	{$(INCLUDE)}"\.\include\ast_interface_fwd.h"\

-	{$(INCLUDE)}"\.\include\ast_module.h"\

-	{$(INCLUDE)}"\.\include\ast_operation.h"\

-	{$(INCLUDE)}"\.\include\ast_predefined_type.h"\

-	{$(INCLUDE)}"\.\include\ast_root.h"\

-	{$(INCLUDE)}"\.\include\ast_sequence.h"\

-	{$(INCLUDE)}"\.\include\ast_string.h"\

-	{$(INCLUDE)}"\.\include\ast_structure.h"\

-	{$(INCLUDE)}"\.\include\ast_type.h"\

-	{$(INCLUDE)}"\.\include\ast_typedef.h"\

-	{$(INCLUDE)}"\.\include\ast_union.h"\

-	{$(INCLUDE)}"\.\include\ast_union_branch.h"\

-	{$(INCLUDE)}"\.\include\ast_union_label.h"\

-	{$(INCLUDE)}"\.\include\be_extern.h"\

-	{$(INCLUDE)}"\.\include\drv_extern.h"\

-	{$(INCLUDE)}"\.\include\fe_extern.h"\

-	{$(INCLUDE)}"\.\include\global_extern.h"\

-	{$(INCLUDE)}"\.\include\idl_bool.h"\

-	{$(INCLUDE)}"\.\include\idl_defines.h"\

-	{$(INCLUDE)}"\.\include\idl_fwd.h"\

-	{$(INCLUDE)}"\.\include\idl_global.h"\

-	{$(INCLUDE)}"\.\include\idl_narrow.h"\

-	{$(INCLUDE)}"\.\include\intlmacros.h"\

-	{$(INCLUDE)}"\.\include\nr_extern.h"\

-	{$(INCLUDE)}"\.\include\util.h"\

-	{$(INCLUDE)}"\.\include\utl_decllist.h"\

-	{$(INCLUDE)}"\.\include\utl_error.h"\

-	{$(INCLUDE)}"\.\include\utl_exceptlist.h"\

-	{$(INCLUDE)}"\.\include\utl_exprlist.h"\

-	{$(INCLUDE)}"\.\include\utl_identifier.h"\

-	{$(INCLUDE)}"\.\include\utl_idlist.h"\

-	{$(INCLUDE)}"\.\include\utl_indenter.h"\

-	{$(INCLUDE)}"\.\include\utl_labellist.h"\

-	{$(INCLUDE)}"\.\include\utl_list.h"\

-	{$(INCLUDE)}"\.\include\utl_namelist.h"\

-	{$(INCLUDE)}"\.\include\utl_scope.h"\

-	{$(INCLUDE)}"\.\include\utl_scoped_name.h"\

-	{$(INCLUDE)}"\.\include\utl_stack.h"\

-	{$(INCLUDE)}"\.\include\utl_string.h"\

-	{$(INCLUDE)}"\.\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\fe_init.obj" : $(SOURCE) $(DEP_CPP_FE_IN) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\fe\fe_interface_header.cpp

-DEP_CPP_FE_INT=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/stdcpp.h"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\include\fe_declarator.h"\

-	".\include\fe_interface_header.h"\

-	".\include\fe_private.h"\

-	".\include\idl.h"\

-	".\include\idl_extern.h"\

-	{$(INCLUDE)}"\.\include\ast.h"\

-	{$(INCLUDE)}"\.\include\ast_argument.h"\

-	{$(INCLUDE)}"\.\include\ast_array.h"\

-	{$(INCLUDE)}"\.\include\ast_attribute.h"\

-	{$(INCLUDE)}"\.\include\ast_concrete_type.h"\

-	{$(INCLUDE)}"\.\include\ast_constant.h"\

-	{$(INCLUDE)}"\.\include\ast_decl.h"\

-	{$(INCLUDE)}"\.\include\ast_enum.h"\

-	{$(INCLUDE)}"\.\include\ast_enum_val.h"\

-	{$(INCLUDE)}"\.\include\ast_exception.h"\

-	{$(INCLUDE)}"\.\include\ast_expression.h"\

-	{$(INCLUDE)}"\.\include\ast_extern.h"\

-	{$(INCLUDE)}"\.\include\ast_field.h"\

-	{$(INCLUDE)}"\.\include\ast_generator.h"\

-	{$(INCLUDE)}"\.\include\ast_interface.h"\

-	{$(INCLUDE)}"\.\include\ast_interface_fwd.h"\

-	{$(INCLUDE)}"\.\include\ast_module.h"\

-	{$(INCLUDE)}"\.\include\ast_operation.h"\

-	{$(INCLUDE)}"\.\include\ast_predefined_type.h"\

-	{$(INCLUDE)}"\.\include\ast_root.h"\

-	{$(INCLUDE)}"\.\include\ast_sequence.h"\

-	{$(INCLUDE)}"\.\include\ast_string.h"\

-	{$(INCLUDE)}"\.\include\ast_structure.h"\

-	{$(INCLUDE)}"\.\include\ast_type.h"\

-	{$(INCLUDE)}"\.\include\ast_typedef.h"\

-	{$(INCLUDE)}"\.\include\ast_union.h"\

-	{$(INCLUDE)}"\.\include\ast_union_branch.h"\

-	{$(INCLUDE)}"\.\include\ast_union_label.h"\

-	{$(INCLUDE)}"\.\include\be_extern.h"\

-	{$(INCLUDE)}"\.\include\drv_extern.h"\

-	{$(INCLUDE)}"\.\include\fe_extern.h"\

-	{$(INCLUDE)}"\.\include\global_extern.h"\

-	{$(INCLUDE)}"\.\include\idl_bool.h"\

-	{$(INCLUDE)}"\.\include\idl_defines.h"\

-	{$(INCLUDE)}"\.\include\idl_fwd.h"\

-	{$(INCLUDE)}"\.\include\idl_global.h"\

-	{$(INCLUDE)}"\.\include\idl_narrow.h"\

-	{$(INCLUDE)}"\.\include\intlmacros.h"\

-	{$(INCLUDE)}"\.\include\nr_extern.h"\

-	{$(INCLUDE)}"\.\include\util.h"\

-	{$(INCLUDE)}"\.\include\utl_decllist.h"\

-	{$(INCLUDE)}"\.\include\utl_error.h"\

-	{$(INCLUDE)}"\.\include\utl_exceptlist.h"\

-	{$(INCLUDE)}"\.\include\utl_exprlist.h"\

-	{$(INCLUDE)}"\.\include\utl_identifier.h"\

-	{$(INCLUDE)}"\.\include\utl_idlist.h"\

-	{$(INCLUDE)}"\.\include\utl_indenter.h"\

-	{$(INCLUDE)}"\.\include\utl_labellist.h"\

-	{$(INCLUDE)}"\.\include\utl_list.h"\

-	{$(INCLUDE)}"\.\include\utl_namelist.h"\

-	{$(INCLUDE)}"\.\include\utl_scope.h"\

-	{$(INCLUDE)}"\.\include\utl_scoped_name.h"\

-	{$(INCLUDE)}"\.\include\utl_stack.h"\

-	{$(INCLUDE)}"\.\include\utl_string.h"\

-	{$(INCLUDE)}"\.\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\fe_interface_header.obj" : $(SOURCE) $(DEP_CPP_FE_INT) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\fe\fe_private.cpp

-DEP_CPP_FE_PR=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/stdcpp.h"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\include\fe_declarator.h"\

-	".\include\fe_interface_header.h"\

-	".\include\fe_private.h"\

-	".\include\idl.h"\

-	".\include\idl_extern.h"\

-	{$(INCLUDE)}"\.\include\ast.h"\

-	{$(INCLUDE)}"\.\include\ast_argument.h"\

-	{$(INCLUDE)}"\.\include\ast_array.h"\

-	{$(INCLUDE)}"\.\include\ast_attribute.h"\

-	{$(INCLUDE)}"\.\include\ast_concrete_type.h"\

-	{$(INCLUDE)}"\.\include\ast_constant.h"\

-	{$(INCLUDE)}"\.\include\ast_decl.h"\

-	{$(INCLUDE)}"\.\include\ast_enum.h"\

-	{$(INCLUDE)}"\.\include\ast_enum_val.h"\

-	{$(INCLUDE)}"\.\include\ast_exception.h"\

-	{$(INCLUDE)}"\.\include\ast_expression.h"\

-	{$(INCLUDE)}"\.\include\ast_extern.h"\

-	{$(INCLUDE)}"\.\include\ast_field.h"\

-	{$(INCLUDE)}"\.\include\ast_generator.h"\

-	{$(INCLUDE)}"\.\include\ast_interface.h"\

-	{$(INCLUDE)}"\.\include\ast_interface_fwd.h"\

-	{$(INCLUDE)}"\.\include\ast_module.h"\

-	{$(INCLUDE)}"\.\include\ast_operation.h"\

-	{$(INCLUDE)}"\.\include\ast_predefined_type.h"\

-	{$(INCLUDE)}"\.\include\ast_root.h"\

-	{$(INCLUDE)}"\.\include\ast_sequence.h"\

-	{$(INCLUDE)}"\.\include\ast_string.h"\

-	{$(INCLUDE)}"\.\include\ast_structure.h"\

-	{$(INCLUDE)}"\.\include\ast_type.h"\

-	{$(INCLUDE)}"\.\include\ast_typedef.h"\

-	{$(INCLUDE)}"\.\include\ast_union.h"\

-	{$(INCLUDE)}"\.\include\ast_union_branch.h"\

-	{$(INCLUDE)}"\.\include\ast_union_label.h"\

-	{$(INCLUDE)}"\.\include\be_extern.h"\

-	{$(INCLUDE)}"\.\include\drv_extern.h"\

-	{$(INCLUDE)}"\.\include\fe_extern.h"\

-	{$(INCLUDE)}"\.\include\global_extern.h"\

-	{$(INCLUDE)}"\.\include\idl_bool.h"\

-	{$(INCLUDE)}"\.\include\idl_defines.h"\

-	{$(INCLUDE)}"\.\include\idl_fwd.h"\

-	{$(INCLUDE)}"\.\include\idl_global.h"\

-	{$(INCLUDE)}"\.\include\idl_narrow.h"\

-	{$(INCLUDE)}"\.\include\intlmacros.h"\

-	{$(INCLUDE)}"\.\include\nr_extern.h"\

-	{$(INCLUDE)}"\.\include\util.h"\

-	{$(INCLUDE)}"\.\include\utl_decllist.h"\

-	{$(INCLUDE)}"\.\include\utl_error.h"\

-	{$(INCLUDE)}"\.\include\utl_exceptlist.h"\

-	{$(INCLUDE)}"\.\include\utl_exprlist.h"\

-	{$(INCLUDE)}"\.\include\utl_identifier.h"\

-	{$(INCLUDE)}"\.\include\utl_idlist.h"\

-	{$(INCLUDE)}"\.\include\utl_indenter.h"\

-	{$(INCLUDE)}"\.\include\utl_labellist.h"\

-	{$(INCLUDE)}"\.\include\utl_list.h"\

-	{$(INCLUDE)}"\.\include\utl_namelist.h"\

-	{$(INCLUDE)}"\.\include\utl_scope.h"\

-	{$(INCLUDE)}"\.\include\utl_scoped_name.h"\

-	{$(INCLUDE)}"\.\include\utl_stack.h"\

-	{$(INCLUDE)}"\.\include\utl_string.h"\

-	{$(INCLUDE)}"\.\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\fe_private.obj" : $(SOURCE) $(DEP_CPP_FE_PR) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\fe\lex.yy.cpp

-DEP_CPP_LEX_Y=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/stdcpp.h"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\fe\y.tab.h"\

-	".\include\fe_declarator.h"\

-	".\include\fe_interface_header.h"\

-	".\include\fe_private.h"\

-	".\include\idl.h"\

-	".\include\idl_extern.h"\

-	{$(INCLUDE)}"\.\include\ast.h"\

-	{$(INCLUDE)}"\.\include\ast_argument.h"\

-	{$(INCLUDE)}"\.\include\ast_array.h"\

-	{$(INCLUDE)}"\.\include\ast_attribute.h"\

-	{$(INCLUDE)}"\.\include\ast_concrete_type.h"\

-	{$(INCLUDE)}"\.\include\ast_constant.h"\

-	{$(INCLUDE)}"\.\include\ast_decl.h"\

-	{$(INCLUDE)}"\.\include\ast_enum.h"\

-	{$(INCLUDE)}"\.\include\ast_enum_val.h"\

-	{$(INCLUDE)}"\.\include\ast_exception.h"\

-	{$(INCLUDE)}"\.\include\ast_expression.h"\

-	{$(INCLUDE)}"\.\include\ast_extern.h"\

-	{$(INCLUDE)}"\.\include\ast_field.h"\

-	{$(INCLUDE)}"\.\include\ast_generator.h"\

-	{$(INCLUDE)}"\.\include\ast_interface.h"\

-	{$(INCLUDE)}"\.\include\ast_interface_fwd.h"\

-	{$(INCLUDE)}"\.\include\ast_module.h"\

-	{$(INCLUDE)}"\.\include\ast_operation.h"\

-	{$(INCLUDE)}"\.\include\ast_predefined_type.h"\

-	{$(INCLUDE)}"\.\include\ast_root.h"\

-	{$(INCLUDE)}"\.\include\ast_sequence.h"\

-	{$(INCLUDE)}"\.\include\ast_string.h"\

-	{$(INCLUDE)}"\.\include\ast_structure.h"\

-	{$(INCLUDE)}"\.\include\ast_type.h"\

-	{$(INCLUDE)}"\.\include\ast_typedef.h"\

-	{$(INCLUDE)}"\.\include\ast_union.h"\

-	{$(INCLUDE)}"\.\include\ast_union_branch.h"\

-	{$(INCLUDE)}"\.\include\ast_union_label.h"\

-	{$(INCLUDE)}"\.\include\be_extern.h"\

-	{$(INCLUDE)}"\.\include\drv_extern.h"\

-	{$(INCLUDE)}"\.\include\fe_extern.h"\

-	{$(INCLUDE)}"\.\include\global_extern.h"\

-	{$(INCLUDE)}"\.\include\idl_bool.h"\

-	{$(INCLUDE)}"\.\include\idl_defines.h"\

-	{$(INCLUDE)}"\.\include\idl_fwd.h"\

-	{$(INCLUDE)}"\.\include\idl_global.h"\

-	{$(INCLUDE)}"\.\include\idl_narrow.h"\

-	{$(INCLUDE)}"\.\include\intlmacros.h"\

-	{$(INCLUDE)}"\.\include\nr_extern.h"\

-	{$(INCLUDE)}"\.\include\util.h"\

-	{$(INCLUDE)}"\.\include\utl_decllist.h"\

-	{$(INCLUDE)}"\.\include\utl_error.h"\

-	{$(INCLUDE)}"\.\include\utl_exceptlist.h"\

-	{$(INCLUDE)}"\.\include\utl_exprlist.h"\

-	{$(INCLUDE)}"\.\include\utl_identifier.h"\

-	{$(INCLUDE)}"\.\include\utl_idlist.h"\

-	{$(INCLUDE)}"\.\include\utl_indenter.h"\

-	{$(INCLUDE)}"\.\include\utl_labellist.h"\

-	{$(INCLUDE)}"\.\include\utl_list.h"\

-	{$(INCLUDE)}"\.\include\utl_namelist.h"\

-	{$(INCLUDE)}"\.\include\utl_scope.h"\

-	{$(INCLUDE)}"\.\include\utl_scoped_name.h"\

-	{$(INCLUDE)}"\.\include\utl_stack.h"\

-	{$(INCLUDE)}"\.\include\utl_string.h"\

-	{$(INCLUDE)}"\.\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\lex.yy.obj" : $(SOURCE) $(DEP_CPP_LEX_Y) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\fe\y.tab.cpp

-DEP_CPP_Y_TAB=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/stdcpp.h"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\include\fe_declarator.h"\

-	".\include\fe_interface_header.h"\

-	".\include\fe_private.h"\

-	".\include\idl.h"\

-	".\include\idl_extern.h"\

-	{$(INCLUDE)}"\.\include\ast.h"\

-	{$(INCLUDE)}"\.\include\ast_argument.h"\

-	{$(INCLUDE)}"\.\include\ast_array.h"\

-	{$(INCLUDE)}"\.\include\ast_attribute.h"\

-	{$(INCLUDE)}"\.\include\ast_concrete_type.h"\

-	{$(INCLUDE)}"\.\include\ast_constant.h"\

-	{$(INCLUDE)}"\.\include\ast_decl.h"\

-	{$(INCLUDE)}"\.\include\ast_enum.h"\

-	{$(INCLUDE)}"\.\include\ast_enum_val.h"\

-	{$(INCLUDE)}"\.\include\ast_exception.h"\

-	{$(INCLUDE)}"\.\include\ast_expression.h"\

-	{$(INCLUDE)}"\.\include\ast_extern.h"\

-	{$(INCLUDE)}"\.\include\ast_field.h"\

-	{$(INCLUDE)}"\.\include\ast_generator.h"\

-	{$(INCLUDE)}"\.\include\ast_interface.h"\

-	{$(INCLUDE)}"\.\include\ast_interface_fwd.h"\

-	{$(INCLUDE)}"\.\include\ast_module.h"\

-	{$(INCLUDE)}"\.\include\ast_operation.h"\

-	{$(INCLUDE)}"\.\include\ast_predefined_type.h"\

-	{$(INCLUDE)}"\.\include\ast_root.h"\

-	{$(INCLUDE)}"\.\include\ast_sequence.h"\

-	{$(INCLUDE)}"\.\include\ast_string.h"\

-	{$(INCLUDE)}"\.\include\ast_structure.h"\

-	{$(INCLUDE)}"\.\include\ast_type.h"\

-	{$(INCLUDE)}"\.\include\ast_typedef.h"\

-	{$(INCLUDE)}"\.\include\ast_union.h"\

-	{$(INCLUDE)}"\.\include\ast_union_branch.h"\

-	{$(INCLUDE)}"\.\include\ast_union_label.h"\

-	{$(INCLUDE)}"\.\include\be_extern.h"\

-	{$(INCLUDE)}"\.\include\drv_extern.h"\

-	{$(INCLUDE)}"\.\include\fe_extern.h"\

-	{$(INCLUDE)}"\.\include\global_extern.h"\

-	{$(INCLUDE)}"\.\include\idl_bool.h"\

-	{$(INCLUDE)}"\.\include\idl_defines.h"\

-	{$(INCLUDE)}"\.\include\idl_fwd.h"\

-	{$(INCLUDE)}"\.\include\idl_global.h"\

-	{$(INCLUDE)}"\.\include\idl_narrow.h"\

-	{$(INCLUDE)}"\.\include\intlmacros.h"\

-	{$(INCLUDE)}"\.\include\nr_extern.h"\

-	{$(INCLUDE)}"\.\include\util.h"\

-	{$(INCLUDE)}"\.\include\utl_decllist.h"\

-	{$(INCLUDE)}"\.\include\utl_error.h"\

-	{$(INCLUDE)}"\.\include\utl_exceptlist.h"\

-	{$(INCLUDE)}"\.\include\utl_exprlist.h"\

-	{$(INCLUDE)}"\.\include\utl_identifier.h"\

-	{$(INCLUDE)}"\.\include\utl_idlist.h"\

-	{$(INCLUDE)}"\.\include\utl_indenter.h"\

-	{$(INCLUDE)}"\.\include\utl_labellist.h"\

-	{$(INCLUDE)}"\.\include\utl_list.h"\

-	{$(INCLUDE)}"\.\include\utl_namelist.h"\

-	{$(INCLUDE)}"\.\include\utl_scope.h"\

-	{$(INCLUDE)}"\.\include\utl_scoped_name.h"\

-	{$(INCLUDE)}"\.\include\utl_stack.h"\

-	{$(INCLUDE)}"\.\include\utl_string.h"\

-	{$(INCLUDE)}"\.\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\y.tab.obj" : $(SOURCE) $(DEP_CPP_Y_TAB) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\driver\drv_args.cpp

-DEP_CPP_DRV_A=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/stdcpp.h"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\include\drv_link.h"\

-	".\include\drv_private.h"\

-	".\include\idl.h"\

-	".\include\idl_extern.h"\

-	{$(INCLUDE)}"\.\include\ast.h"\

-	{$(INCLUDE)}"\.\include\ast_argument.h"\

-	{$(INCLUDE)}"\.\include\ast_array.h"\

-	{$(INCLUDE)}"\.\include\ast_attribute.h"\

-	{$(INCLUDE)}"\.\include\ast_concrete_type.h"\

-	{$(INCLUDE)}"\.\include\ast_constant.h"\

-	{$(INCLUDE)}"\.\include\ast_decl.h"\

-	{$(INCLUDE)}"\.\include\ast_enum.h"\

-	{$(INCLUDE)}"\.\include\ast_enum_val.h"\

-	{$(INCLUDE)}"\.\include\ast_exception.h"\

-	{$(INCLUDE)}"\.\include\ast_expression.h"\

-	{$(INCLUDE)}"\.\include\ast_extern.h"\

-	{$(INCLUDE)}"\.\include\ast_field.h"\

-	{$(INCLUDE)}"\.\include\ast_generator.h"\

-	{$(INCLUDE)}"\.\include\ast_interface.h"\

-	{$(INCLUDE)}"\.\include\ast_interface_fwd.h"\

-	{$(INCLUDE)}"\.\include\ast_module.h"\

-	{$(INCLUDE)}"\.\include\ast_operation.h"\

-	{$(INCLUDE)}"\.\include\ast_predefined_type.h"\

-	{$(INCLUDE)}"\.\include\ast_root.h"\

-	{$(INCLUDE)}"\.\include\ast_sequence.h"\

-	{$(INCLUDE)}"\.\include\ast_string.h"\

-	{$(INCLUDE)}"\.\include\ast_structure.h"\

-	{$(INCLUDE)}"\.\include\ast_type.h"\

-	{$(INCLUDE)}"\.\include\ast_typedef.h"\

-	{$(INCLUDE)}"\.\include\ast_union.h"\

-	{$(INCLUDE)}"\.\include\ast_union_branch.h"\

-	{$(INCLUDE)}"\.\include\ast_union_label.h"\

-	{$(INCLUDE)}"\.\include\be_extern.h"\

-	{$(INCLUDE)}"\.\include\drv_extern.h"\

-	{$(INCLUDE)}"\.\include\fe_extern.h"\

-	{$(INCLUDE)}"\.\include\global_extern.h"\

-	{$(INCLUDE)}"\.\include\idl_bool.h"\

-	{$(INCLUDE)}"\.\include\idl_defines.h"\

-	{$(INCLUDE)}"\.\include\idl_fwd.h"\

-	{$(INCLUDE)}"\.\include\idl_global.h"\

-	{$(INCLUDE)}"\.\include\idl_narrow.h"\

-	{$(INCLUDE)}"\.\include\intlmacros.h"\

-	{$(INCLUDE)}"\.\include\nr_extern.h"\

-	{$(INCLUDE)}"\.\include\util.h"\

-	{$(INCLUDE)}"\.\include\utl_decllist.h"\

-	{$(INCLUDE)}"\.\include\utl_error.h"\

-	{$(INCLUDE)}"\.\include\utl_exceptlist.h"\

-	{$(INCLUDE)}"\.\include\utl_exprlist.h"\

-	{$(INCLUDE)}"\.\include\utl_identifier.h"\

-	{$(INCLUDE)}"\.\include\utl_idlist.h"\

-	{$(INCLUDE)}"\.\include\utl_indenter.h"\

-	{$(INCLUDE)}"\.\include\utl_labellist.h"\

-	{$(INCLUDE)}"\.\include\utl_list.h"\

-	{$(INCLUDE)}"\.\include\utl_namelist.h"\

-	{$(INCLUDE)}"\.\include\utl_scope.h"\

-	{$(INCLUDE)}"\.\include\utl_scoped_name.h"\

-	{$(INCLUDE)}"\.\include\utl_stack.h"\

-	{$(INCLUDE)}"\.\include\utl_string.h"\

-	{$(INCLUDE)}"\.\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\drv_args.obj" : $(SOURCE) $(DEP_CPP_DRV_A) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\driver\drv_fork.cpp

-DEP_CPP_DRV_F=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Atomic_Op.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/Event_Handler.h"\

-	"..\..\ace/Event_Handler.i"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/Process.h"\

-	"..\..\ace/Process.i"\

-	"..\..\ace/Process_Manager.h"\

-	"..\..\ace/Process_Manager.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/stdcpp.h"\

-	"..\..\ace/SV_Semaphore_Complex.h"\

-	"..\..\ace/SV_Semaphore_Complex.i"\

-	"..\..\ace/SV_Semaphore_Simple.h"\

-	"..\..\ace/SV_Semaphore_Simple.i"\

-	"..\..\ace/Synch.h"\

-	"..\..\ace/Synch.i"\

-	"..\..\ace/Synch_T.cpp"\

-	"..\..\ace/Synch_T.h"\

-	"..\..\ace/Synch_T.i"\

-	"..\..\ace/Thread.h"\

-	"..\..\ace/Thread.i"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\include\drv_private.h"\

-	".\include\idl.h"\

-	".\include\idl_extern.h"\

-	{$(INCLUDE)}"\.\include\ast.h"\

-	{$(INCLUDE)}"\.\include\ast_argument.h"\

-	{$(INCLUDE)}"\.\include\ast_array.h"\

-	{$(INCLUDE)}"\.\include\ast_attribute.h"\

-	{$(INCLUDE)}"\.\include\ast_concrete_type.h"\

-	{$(INCLUDE)}"\.\include\ast_constant.h"\

-	{$(INCLUDE)}"\.\include\ast_decl.h"\

-	{$(INCLUDE)}"\.\include\ast_enum.h"\

-	{$(INCLUDE)}"\.\include\ast_enum_val.h"\

-	{$(INCLUDE)}"\.\include\ast_exception.h"\

-	{$(INCLUDE)}"\.\include\ast_expression.h"\

-	{$(INCLUDE)}"\.\include\ast_extern.h"\

-	{$(INCLUDE)}"\.\include\ast_field.h"\

-	{$(INCLUDE)}"\.\include\ast_generator.h"\

-	{$(INCLUDE)}"\.\include\ast_interface.h"\

-	{$(INCLUDE)}"\.\include\ast_interface_fwd.h"\

-	{$(INCLUDE)}"\.\include\ast_module.h"\

-	{$(INCLUDE)}"\.\include\ast_operation.h"\

-	{$(INCLUDE)}"\.\include\ast_predefined_type.h"\

-	{$(INCLUDE)}"\.\include\ast_root.h"\

-	{$(INCLUDE)}"\.\include\ast_sequence.h"\

-	{$(INCLUDE)}"\.\include\ast_string.h"\

-	{$(INCLUDE)}"\.\include\ast_structure.h"\

-	{$(INCLUDE)}"\.\include\ast_type.h"\

-	{$(INCLUDE)}"\.\include\ast_typedef.h"\

-	{$(INCLUDE)}"\.\include\ast_union.h"\

-	{$(INCLUDE)}"\.\include\ast_union_branch.h"\

-	{$(INCLUDE)}"\.\include\ast_union_label.h"\

-	{$(INCLUDE)}"\.\include\be_extern.h"\

-	{$(INCLUDE)}"\.\include\drv_extern.h"\

-	{$(INCLUDE)}"\.\include\fe_extern.h"\

-	{$(INCLUDE)}"\.\include\global_extern.h"\

-	{$(INCLUDE)}"\.\include\idl_bool.h"\

-	{$(INCLUDE)}"\.\include\idl_defines.h"\

-	{$(INCLUDE)}"\.\include\idl_fwd.h"\

-	{$(INCLUDE)}"\.\include\idl_global.h"\

-	{$(INCLUDE)}"\.\include\idl_narrow.h"\

-	{$(INCLUDE)}"\.\include\intlmacros.h"\

-	{$(INCLUDE)}"\.\include\nr_extern.h"\

-	{$(INCLUDE)}"\.\include\util.h"\

-	{$(INCLUDE)}"\.\include\utl_decllist.h"\

-	{$(INCLUDE)}"\.\include\utl_error.h"\

-	{$(INCLUDE)}"\.\include\utl_exceptlist.h"\

-	{$(INCLUDE)}"\.\include\utl_exprlist.h"\

-	{$(INCLUDE)}"\.\include\utl_identifier.h"\

-	{$(INCLUDE)}"\.\include\utl_idlist.h"\

-	{$(INCLUDE)}"\.\include\utl_indenter.h"\

-	{$(INCLUDE)}"\.\include\utl_labellist.h"\

-	{$(INCLUDE)}"\.\include\utl_list.h"\

-	{$(INCLUDE)}"\.\include\utl_namelist.h"\

-	{$(INCLUDE)}"\.\include\utl_scope.h"\

-	{$(INCLUDE)}"\.\include\utl_scoped_name.h"\

-	{$(INCLUDE)}"\.\include\utl_stack.h"\

-	{$(INCLUDE)}"\.\include\utl_string.h"\

-	{$(INCLUDE)}"\.\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\drv_fork.obj" : $(SOURCE) $(DEP_CPP_DRV_F) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\driver\drv_init.cpp

-DEP_CPP_DRV_I=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/stdcpp.h"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\include\drv_link.h"\

-	".\include\drv_private.h"\

-	".\include\idl.h"\

-	".\include\idl_extern.h"\

-	{$(INCLUDE)}"\.\include\ast.h"\

-	{$(INCLUDE)}"\.\include\ast_argument.h"\

-	{$(INCLUDE)}"\.\include\ast_array.h"\

-	{$(INCLUDE)}"\.\include\ast_attribute.h"\

-	{$(INCLUDE)}"\.\include\ast_concrete_type.h"\

-	{$(INCLUDE)}"\.\include\ast_constant.h"\

-	{$(INCLUDE)}"\.\include\ast_decl.h"\

-	{$(INCLUDE)}"\.\include\ast_enum.h"\

-	{$(INCLUDE)}"\.\include\ast_enum_val.h"\

-	{$(INCLUDE)}"\.\include\ast_exception.h"\

-	{$(INCLUDE)}"\.\include\ast_expression.h"\

-	{$(INCLUDE)}"\.\include\ast_extern.h"\

-	{$(INCLUDE)}"\.\include\ast_field.h"\

-	{$(INCLUDE)}"\.\include\ast_generator.h"\

-	{$(INCLUDE)}"\.\include\ast_interface.h"\

-	{$(INCLUDE)}"\.\include\ast_interface_fwd.h"\

-	{$(INCLUDE)}"\.\include\ast_module.h"\

-	{$(INCLUDE)}"\.\include\ast_operation.h"\

-	{$(INCLUDE)}"\.\include\ast_predefined_type.h"\

-	{$(INCLUDE)}"\.\include\ast_root.h"\

-	{$(INCLUDE)}"\.\include\ast_sequence.h"\

-	{$(INCLUDE)}"\.\include\ast_string.h"\

-	{$(INCLUDE)}"\.\include\ast_structure.h"\

-	{$(INCLUDE)}"\.\include\ast_type.h"\

-	{$(INCLUDE)}"\.\include\ast_typedef.h"\

-	{$(INCLUDE)}"\.\include\ast_union.h"\

-	{$(INCLUDE)}"\.\include\ast_union_branch.h"\

-	{$(INCLUDE)}"\.\include\ast_union_label.h"\

-	{$(INCLUDE)}"\.\include\be_extern.h"\

-	{$(INCLUDE)}"\.\include\drv_extern.h"\

-	{$(INCLUDE)}"\.\include\fe_extern.h"\

-	{$(INCLUDE)}"\.\include\global_extern.h"\

-	{$(INCLUDE)}"\.\include\idl_bool.h"\

-	{$(INCLUDE)}"\.\include\idl_defines.h"\

-	{$(INCLUDE)}"\.\include\idl_fwd.h"\

-	{$(INCLUDE)}"\.\include\idl_global.h"\

-	{$(INCLUDE)}"\.\include\idl_narrow.h"\

-	{$(INCLUDE)}"\.\include\intlmacros.h"\

-	{$(INCLUDE)}"\.\include\nr_extern.h"\

-	{$(INCLUDE)}"\.\include\util.h"\

-	{$(INCLUDE)}"\.\include\utl_decllist.h"\

-	{$(INCLUDE)}"\.\include\utl_error.h"\

-	{$(INCLUDE)}"\.\include\utl_exceptlist.h"\

-	{$(INCLUDE)}"\.\include\utl_exprlist.h"\

-	{$(INCLUDE)}"\.\include\utl_identifier.h"\

-	{$(INCLUDE)}"\.\include\utl_idlist.h"\

-	{$(INCLUDE)}"\.\include\utl_indenter.h"\

-	{$(INCLUDE)}"\.\include\utl_labellist.h"\

-	{$(INCLUDE)}"\.\include\utl_list.h"\

-	{$(INCLUDE)}"\.\include\utl_namelist.h"\

-	{$(INCLUDE)}"\.\include\utl_scope.h"\

-	{$(INCLUDE)}"\.\include\utl_scoped_name.h"\

-	{$(INCLUDE)}"\.\include\utl_stack.h"\

-	{$(INCLUDE)}"\.\include\utl_string.h"\

-	{$(INCLUDE)}"\.\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\drv_init.obj" : $(SOURCE) $(DEP_CPP_DRV_I) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\driver\drv_link.cpp

-DEP_CPP_DRV_L=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/stdcpp.h"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\include\drv_link.h"\

-	".\include\drv_private.h"\

-	".\include\idl.h"\

-	".\include\idl_extern.h"\

-	{$(INCLUDE)}"\.\include\ast.h"\

-	{$(INCLUDE)}"\.\include\ast_argument.h"\

-	{$(INCLUDE)}"\.\include\ast_array.h"\

-	{$(INCLUDE)}"\.\include\ast_attribute.h"\

-	{$(INCLUDE)}"\.\include\ast_concrete_type.h"\

-	{$(INCLUDE)}"\.\include\ast_constant.h"\

-	{$(INCLUDE)}"\.\include\ast_decl.h"\

-	{$(INCLUDE)}"\.\include\ast_enum.h"\

-	{$(INCLUDE)}"\.\include\ast_enum_val.h"\

-	{$(INCLUDE)}"\.\include\ast_exception.h"\

-	{$(INCLUDE)}"\.\include\ast_expression.h"\

-	{$(INCLUDE)}"\.\include\ast_extern.h"\

-	{$(INCLUDE)}"\.\include\ast_field.h"\

-	{$(INCLUDE)}"\.\include\ast_generator.h"\

-	{$(INCLUDE)}"\.\include\ast_interface.h"\

-	{$(INCLUDE)}"\.\include\ast_interface_fwd.h"\

-	{$(INCLUDE)}"\.\include\ast_module.h"\

-	{$(INCLUDE)}"\.\include\ast_operation.h"\

-	{$(INCLUDE)}"\.\include\ast_predefined_type.h"\

-	{$(INCLUDE)}"\.\include\ast_root.h"\

-	{$(INCLUDE)}"\.\include\ast_sequence.h"\

-	{$(INCLUDE)}"\.\include\ast_string.h"\

-	{$(INCLUDE)}"\.\include\ast_structure.h"\

-	{$(INCLUDE)}"\.\include\ast_type.h"\

-	{$(INCLUDE)}"\.\include\ast_typedef.h"\

-	{$(INCLUDE)}"\.\include\ast_union.h"\

-	{$(INCLUDE)}"\.\include\ast_union_branch.h"\

-	{$(INCLUDE)}"\.\include\ast_union_label.h"\

-	{$(INCLUDE)}"\.\include\be_extern.h"\

-	{$(INCLUDE)}"\.\include\drv_extern.h"\

-	{$(INCLUDE)}"\.\include\fe_extern.h"\

-	{$(INCLUDE)}"\.\include\global_extern.h"\

-	{$(INCLUDE)}"\.\include\idl_bool.h"\

-	{$(INCLUDE)}"\.\include\idl_defines.h"\

-	{$(INCLUDE)}"\.\include\idl_fwd.h"\

-	{$(INCLUDE)}"\.\include\idl_global.h"\

-	{$(INCLUDE)}"\.\include\idl_narrow.h"\

-	{$(INCLUDE)}"\.\include\intlmacros.h"\

-	{$(INCLUDE)}"\.\include\nr_extern.h"\

-	{$(INCLUDE)}"\.\include\util.h"\

-	{$(INCLUDE)}"\.\include\utl_decllist.h"\

-	{$(INCLUDE)}"\.\include\utl_error.h"\

-	{$(INCLUDE)}"\.\include\utl_exceptlist.h"\

-	{$(INCLUDE)}"\.\include\utl_exprlist.h"\

-	{$(INCLUDE)}"\.\include\utl_identifier.h"\

-	{$(INCLUDE)}"\.\include\utl_idlist.h"\

-	{$(INCLUDE)}"\.\include\utl_indenter.h"\

-	{$(INCLUDE)}"\.\include\utl_labellist.h"\

-	{$(INCLUDE)}"\.\include\utl_list.h"\

-	{$(INCLUDE)}"\.\include\utl_namelist.h"\

-	{$(INCLUDE)}"\.\include\utl_scope.h"\

-	{$(INCLUDE)}"\.\include\utl_scoped_name.h"\

-	{$(INCLUDE)}"\.\include\utl_stack.h"\

-	{$(INCLUDE)}"\.\include\utl_string.h"\

-	{$(INCLUDE)}"\.\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\drv_link.obj" : $(SOURCE) $(DEP_CPP_DRV_L) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\driver\drv_main.cpp

-DEP_CPP_DRV_M=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/stdcpp.h"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\include\drv_link.h"\

-	".\include\drv_private.h"\

-	".\include\idl.h"\

-	".\include\idl_extern.h"\

-	{$(INCLUDE)}"\.\include\ast.h"\

-	{$(INCLUDE)}"\.\include\ast_argument.h"\

-	{$(INCLUDE)}"\.\include\ast_array.h"\

-	{$(INCLUDE)}"\.\include\ast_attribute.h"\

-	{$(INCLUDE)}"\.\include\ast_concrete_type.h"\

-	{$(INCLUDE)}"\.\include\ast_constant.h"\

-	{$(INCLUDE)}"\.\include\ast_decl.h"\

-	{$(INCLUDE)}"\.\include\ast_enum.h"\

-	{$(INCLUDE)}"\.\include\ast_enum_val.h"\

-	{$(INCLUDE)}"\.\include\ast_exception.h"\

-	{$(INCLUDE)}"\.\include\ast_expression.h"\

-	{$(INCLUDE)}"\.\include\ast_extern.h"\

-	{$(INCLUDE)}"\.\include\ast_field.h"\

-	{$(INCLUDE)}"\.\include\ast_generator.h"\

-	{$(INCLUDE)}"\.\include\ast_interface.h"\

-	{$(INCLUDE)}"\.\include\ast_interface_fwd.h"\

-	{$(INCLUDE)}"\.\include\ast_module.h"\

-	{$(INCLUDE)}"\.\include\ast_operation.h"\

-	{$(INCLUDE)}"\.\include\ast_predefined_type.h"\

-	{$(INCLUDE)}"\.\include\ast_root.h"\

-	{$(INCLUDE)}"\.\include\ast_sequence.h"\

-	{$(INCLUDE)}"\.\include\ast_string.h"\

-	{$(INCLUDE)}"\.\include\ast_structure.h"\

-	{$(INCLUDE)}"\.\include\ast_type.h"\

-	{$(INCLUDE)}"\.\include\ast_typedef.h"\

-	{$(INCLUDE)}"\.\include\ast_union.h"\

-	{$(INCLUDE)}"\.\include\ast_union_branch.h"\

-	{$(INCLUDE)}"\.\include\ast_union_label.h"\

-	{$(INCLUDE)}"\.\include\be_extern.h"\

-	{$(INCLUDE)}"\.\include\drv_extern.h"\

-	{$(INCLUDE)}"\.\include\fe_extern.h"\

-	{$(INCLUDE)}"\.\include\global_extern.h"\

-	{$(INCLUDE)}"\.\include\idl_bool.h"\

-	{$(INCLUDE)}"\.\include\idl_defines.h"\

-	{$(INCLUDE)}"\.\include\idl_fwd.h"\

-	{$(INCLUDE)}"\.\include\idl_global.h"\

-	{$(INCLUDE)}"\.\include\idl_narrow.h"\

-	{$(INCLUDE)}"\.\include\intlmacros.h"\

-	{$(INCLUDE)}"\.\include\nr_extern.h"\

-	{$(INCLUDE)}"\.\include\util.h"\

-	{$(INCLUDE)}"\.\include\utl_decllist.h"\

-	{$(INCLUDE)}"\.\include\utl_error.h"\

-	{$(INCLUDE)}"\.\include\utl_exceptlist.h"\

-	{$(INCLUDE)}"\.\include\utl_exprlist.h"\

-	{$(INCLUDE)}"\.\include\utl_identifier.h"\

-	{$(INCLUDE)}"\.\include\utl_idlist.h"\

-	{$(INCLUDE)}"\.\include\utl_indenter.h"\

-	{$(INCLUDE)}"\.\include\utl_labellist.h"\

-	{$(INCLUDE)}"\.\include\utl_list.h"\

-	{$(INCLUDE)}"\.\include\utl_namelist.h"\

-	{$(INCLUDE)}"\.\include\utl_scope.h"\

-	{$(INCLUDE)}"\.\include\utl_scoped_name.h"\

-	{$(INCLUDE)}"\.\include\utl_stack.h"\

-	{$(INCLUDE)}"\.\include\utl_string.h"\

-	{$(INCLUDE)}"\.\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\drv_main.obj" : $(SOURCE) $(DEP_CPP_DRV_M) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\driver\drv_preproc.cpp

-DEP_CPP_DRV_P=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Atomic_Op.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/Event_Handler.h"\

-	"..\..\ace/Event_Handler.i"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/Process.h"\

-	"..\..\ace/Process.i"\

-	"..\..\ace/Process_Manager.h"\

-	"..\..\ace/Process_Manager.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/stdcpp.h"\

-	"..\..\ace/SV_Semaphore_Complex.h"\

-	"..\..\ace/SV_Semaphore_Complex.i"\

-	"..\..\ace/SV_Semaphore_Simple.h"\

-	"..\..\ace/SV_Semaphore_Simple.i"\

-	"..\..\ace/Synch.h"\

-	"..\..\ace/Synch.i"\

-	"..\..\ace/Synch_T.cpp"\

-	"..\..\ace/Synch_T.h"\

-	"..\..\ace/Synch_T.i"\

-	"..\..\ace/Thread.h"\

-	"..\..\ace/Thread.i"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\include\drv_link.h"\

-	".\include\drv_private.h"\

-	".\include\idl.h"\

-	".\include\idl_extern.h"\

-	{$(INCLUDE)}"\.\include\ast.h"\

-	{$(INCLUDE)}"\.\include\ast_argument.h"\

-	{$(INCLUDE)}"\.\include\ast_array.h"\

-	{$(INCLUDE)}"\.\include\ast_attribute.h"\

-	{$(INCLUDE)}"\.\include\ast_concrete_type.h"\

-	{$(INCLUDE)}"\.\include\ast_constant.h"\

-	{$(INCLUDE)}"\.\include\ast_decl.h"\

-	{$(INCLUDE)}"\.\include\ast_enum.h"\

-	{$(INCLUDE)}"\.\include\ast_enum_val.h"\

-	{$(INCLUDE)}"\.\include\ast_exception.h"\

-	{$(INCLUDE)}"\.\include\ast_expression.h"\

-	{$(INCLUDE)}"\.\include\ast_extern.h"\

-	{$(INCLUDE)}"\.\include\ast_field.h"\

-	{$(INCLUDE)}"\.\include\ast_generator.h"\

-	{$(INCLUDE)}"\.\include\ast_interface.h"\

-	{$(INCLUDE)}"\.\include\ast_interface_fwd.h"\

-	{$(INCLUDE)}"\.\include\ast_module.h"\

-	{$(INCLUDE)}"\.\include\ast_operation.h"\

-	{$(INCLUDE)}"\.\include\ast_predefined_type.h"\

-	{$(INCLUDE)}"\.\include\ast_root.h"\

-	{$(INCLUDE)}"\.\include\ast_sequence.h"\

-	{$(INCLUDE)}"\.\include\ast_string.h"\

-	{$(INCLUDE)}"\.\include\ast_structure.h"\

-	{$(INCLUDE)}"\.\include\ast_type.h"\

-	{$(INCLUDE)}"\.\include\ast_typedef.h"\

-	{$(INCLUDE)}"\.\include\ast_union.h"\

-	{$(INCLUDE)}"\.\include\ast_union_branch.h"\

-	{$(INCLUDE)}"\.\include\ast_union_label.h"\

-	{$(INCLUDE)}"\.\include\be_extern.h"\

-	{$(INCLUDE)}"\.\include\drv_extern.h"\

-	{$(INCLUDE)}"\.\include\fe_extern.h"\

-	{$(INCLUDE)}"\.\include\global_extern.h"\

-	{$(INCLUDE)}"\.\include\idl_bool.h"\

-	{$(INCLUDE)}"\.\include\idl_defines.h"\

-	{$(INCLUDE)}"\.\include\idl_fwd.h"\

-	{$(INCLUDE)}"\.\include\idl_global.h"\

-	{$(INCLUDE)}"\.\include\idl_narrow.h"\

-	{$(INCLUDE)}"\.\include\intlmacros.h"\

-	{$(INCLUDE)}"\.\include\nr_extern.h"\

-	{$(INCLUDE)}"\.\include\util.h"\

-	{$(INCLUDE)}"\.\include\utl_decllist.h"\

-	{$(INCLUDE)}"\.\include\utl_error.h"\

-	{$(INCLUDE)}"\.\include\utl_exceptlist.h"\

-	{$(INCLUDE)}"\.\include\utl_exprlist.h"\

-	{$(INCLUDE)}"\.\include\utl_identifier.h"\

-	{$(INCLUDE)}"\.\include\utl_idlist.h"\

-	{$(INCLUDE)}"\.\include\utl_indenter.h"\

-	{$(INCLUDE)}"\.\include\utl_labellist.h"\

-	{$(INCLUDE)}"\.\include\utl_list.h"\

-	{$(INCLUDE)}"\.\include\utl_namelist.h"\

-	{$(INCLUDE)}"\.\include\utl_scope.h"\

-	{$(INCLUDE)}"\.\include\utl_scoped_name.h"\

-	{$(INCLUDE)}"\.\include\utl_stack.h"\

-	{$(INCLUDE)}"\.\include\utl_string.h"\

-	{$(INCLUDE)}"\.\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\drv_preproc.obj" : $(SOURCE) $(DEP_CPP_DRV_P) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\driver\drv_private.cpp

-DEP_CPP_DRV_PR=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/stdcpp.h"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\include\drv_private.h"\

-	".\include\idl.h"\

-	".\include\idl_extern.h"\

-	{$(INCLUDE)}"\.\include\ast.h"\

-	{$(INCLUDE)}"\.\include\ast_argument.h"\

-	{$(INCLUDE)}"\.\include\ast_array.h"\

-	{$(INCLUDE)}"\.\include\ast_attribute.h"\

-	{$(INCLUDE)}"\.\include\ast_concrete_type.h"\

-	{$(INCLUDE)}"\.\include\ast_constant.h"\

-	{$(INCLUDE)}"\.\include\ast_decl.h"\

-	{$(INCLUDE)}"\.\include\ast_enum.h"\

-	{$(INCLUDE)}"\.\include\ast_enum_val.h"\

-	{$(INCLUDE)}"\.\include\ast_exception.h"\

-	{$(INCLUDE)}"\.\include\ast_expression.h"\

-	{$(INCLUDE)}"\.\include\ast_extern.h"\

-	{$(INCLUDE)}"\.\include\ast_field.h"\

-	{$(INCLUDE)}"\.\include\ast_generator.h"\

-	{$(INCLUDE)}"\.\include\ast_interface.h"\

-	{$(INCLUDE)}"\.\include\ast_interface_fwd.h"\

-	{$(INCLUDE)}"\.\include\ast_module.h"\

-	{$(INCLUDE)}"\.\include\ast_operation.h"\

-	{$(INCLUDE)}"\.\include\ast_predefined_type.h"\

-	{$(INCLUDE)}"\.\include\ast_root.h"\

-	{$(INCLUDE)}"\.\include\ast_sequence.h"\

-	{$(INCLUDE)}"\.\include\ast_string.h"\

-	{$(INCLUDE)}"\.\include\ast_structure.h"\

-	{$(INCLUDE)}"\.\include\ast_type.h"\

-	{$(INCLUDE)}"\.\include\ast_typedef.h"\

-	{$(INCLUDE)}"\.\include\ast_union.h"\

-	{$(INCLUDE)}"\.\include\ast_union_branch.h"\

-	{$(INCLUDE)}"\.\include\ast_union_label.h"\

-	{$(INCLUDE)}"\.\include\be_extern.h"\

-	{$(INCLUDE)}"\.\include\drv_extern.h"\

-	{$(INCLUDE)}"\.\include\fe_extern.h"\

-	{$(INCLUDE)}"\.\include\global_extern.h"\

-	{$(INCLUDE)}"\.\include\idl_bool.h"\

-	{$(INCLUDE)}"\.\include\idl_defines.h"\

-	{$(INCLUDE)}"\.\include\idl_fwd.h"\

-	{$(INCLUDE)}"\.\include\idl_global.h"\

-	{$(INCLUDE)}"\.\include\idl_narrow.h"\

-	{$(INCLUDE)}"\.\include\intlmacros.h"\

-	{$(INCLUDE)}"\.\include\nr_extern.h"\

-	{$(INCLUDE)}"\.\include\util.h"\

-	{$(INCLUDE)}"\.\include\utl_decllist.h"\

-	{$(INCLUDE)}"\.\include\utl_error.h"\

-	{$(INCLUDE)}"\.\include\utl_exceptlist.h"\

-	{$(INCLUDE)}"\.\include\utl_exprlist.h"\

-	{$(INCLUDE)}"\.\include\utl_identifier.h"\

-	{$(INCLUDE)}"\.\include\utl_idlist.h"\

-	{$(INCLUDE)}"\.\include\utl_indenter.h"\

-	{$(INCLUDE)}"\.\include\utl_labellist.h"\

-	{$(INCLUDE)}"\.\include\utl_list.h"\

-	{$(INCLUDE)}"\.\include\utl_namelist.h"\

-	{$(INCLUDE)}"\.\include\utl_scope.h"\

-	{$(INCLUDE)}"\.\include\utl_scoped_name.h"\

-	{$(INCLUDE)}"\.\include\utl_stack.h"\

-	{$(INCLUDE)}"\.\include\utl_string.h"\

-	{$(INCLUDE)}"\.\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\drv_private.obj" : $(SOURCE) $(DEP_CPP_DRV_PR) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\be\be_args.cpp

-DEP_CPP_BE_AR=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Atomic_Op.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/Event_Handler.h"\

-	"..\..\ace/Event_Handler.i"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/Singleton.cpp"\

-	"..\..\ace/Singleton.h"\

-	"..\..\ace/Singleton.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/stdcpp.h"\

-	"..\..\ace/SV_Semaphore_Complex.h"\

-	"..\..\ace/SV_Semaphore_Complex.i"\

-	"..\..\ace/SV_Semaphore_Simple.h"\

-	"..\..\ace/SV_Semaphore_Simple.i"\

-	"..\..\ace/Synch.h"\

-	"..\..\ace/Synch.i"\

-	"..\..\ace/Synch_T.cpp"\

-	"..\..\ace/Synch_T.h"\

-	"..\..\ace/Synch_T.i"\

-	"..\..\ace/Thread.h"\

-	"..\..\ace/Thread.i"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\be_include\be.h"\

-	".\include\idl.h"\

-	".\include\idl_extern.h"\

-	{$(INCLUDE)}"\.\be_include\be_argument.h"\

-	{$(INCLUDE)}"\.\be_include\be_array.h"\

-	{$(INCLUDE)}"\.\be_include\be_attribute.h"\

-	{$(INCLUDE)}"\.\be_include\be_codegen.h"\

-	{$(INCLUDE)}"\.\be_include\be_constant.h"\

-	{$(INCLUDE)}"\.\be_include\be_decl.h"\

-	{$(INCLUDE)}"\.\be_include\be_enum.h"\

-	{$(INCLUDE)}"\.\be_include\be_enum_val.h"\

-	{$(INCLUDE)}"\.\be_include\be_exception.h"\

-	{$(INCLUDE)}"\.\be_include\be_expression.h"\

-	{$(INCLUDE)}"\.\be_include\be_factory.h"\

-	{$(INCLUDE)}"\.\be_include\be_field.h"\

-	{$(INCLUDE)}"\.\be_include\be_generator.h"\

-	{$(INCLUDE)}"\.\be_include\be_helper.h"\

-	{$(INCLUDE)}"\.\be_include\be_interface.h"\

-	{$(INCLUDE)}"\.\be_include\be_interface_fwd.h"\

-	{$(INCLUDE)}"\.\be_include\be_module.h"\

-	{$(INCLUDE)}"\.\be_include\be_operation.h"\

-	{$(INCLUDE)}"\.\be_include\be_predefined_type.h"\

-	{$(INCLUDE)}"\.\be_include\be_root.h"\

-	{$(INCLUDE)}"\.\be_include\be_scope.h"\

-	{$(INCLUDE)}"\.\be_include\be_sequence.h"\

-	{$(INCLUDE)}"\.\be_include\be_state.h"\

-	{$(INCLUDE)}"\.\be_include\be_string.h"\

-	{$(INCLUDE)}"\.\be_include\be_structure.h"\

-	{$(INCLUDE)}"\.\be_include\be_type.h"\

-	{$(INCLUDE)}"\.\be_include\be_typedef.h"\

-	{$(INCLUDE)}"\.\be_include\be_union.h"\

-	{$(INCLUDE)}"\.\be_include\be_union_branch.h"\

-	{$(INCLUDE)}"\.\be_include\be_union_label.h"\

-	{$(INCLUDE)}"\.\include\ast.h"\

-	{$(INCLUDE)}"\.\include\ast_argument.h"\

-	{$(INCLUDE)}"\.\include\ast_array.h"\

-	{$(INCLUDE)}"\.\include\ast_attribute.h"\

-	{$(INCLUDE)}"\.\include\ast_concrete_type.h"\

-	{$(INCLUDE)}"\.\include\ast_constant.h"\

-	{$(INCLUDE)}"\.\include\ast_decl.h"\

-	{$(INCLUDE)}"\.\include\ast_enum.h"\

-	{$(INCLUDE)}"\.\include\ast_enum_val.h"\

-	{$(INCLUDE)}"\.\include\ast_exception.h"\

-	{$(INCLUDE)}"\.\include\ast_expression.h"\

-	{$(INCLUDE)}"\.\include\ast_extern.h"\

-	{$(INCLUDE)}"\.\include\ast_field.h"\

-	{$(INCLUDE)}"\.\include\ast_generator.h"\

-	{$(INCLUDE)}"\.\include\ast_interface.h"\

-	{$(INCLUDE)}"\.\include\ast_interface_fwd.h"\

-	{$(INCLUDE)}"\.\include\ast_module.h"\

-	{$(INCLUDE)}"\.\include\ast_operation.h"\

-	{$(INCLUDE)}"\.\include\ast_predefined_type.h"\

-	{$(INCLUDE)}"\.\include\ast_root.h"\

-	{$(INCLUDE)}"\.\include\ast_sequence.h"\

-	{$(INCLUDE)}"\.\include\ast_string.h"\

-	{$(INCLUDE)}"\.\include\ast_structure.h"\

-	{$(INCLUDE)}"\.\include\ast_type.h"\

-	{$(INCLUDE)}"\.\include\ast_typedef.h"\

-	{$(INCLUDE)}"\.\include\ast_union.h"\

-	{$(INCLUDE)}"\.\include\ast_union_branch.h"\

-	{$(INCLUDE)}"\.\include\ast_union_label.h"\

-	{$(INCLUDE)}"\.\include\be_extern.h"\

-	{$(INCLUDE)}"\.\include\drv_extern.h"\

-	{$(INCLUDE)}"\.\include\fe_extern.h"\

-	{$(INCLUDE)}"\.\include\global_extern.h"\

-	{$(INCLUDE)}"\.\include\idl_bool.h"\

-	{$(INCLUDE)}"\.\include\idl_defines.h"\

-	{$(INCLUDE)}"\.\include\idl_fwd.h"\

-	{$(INCLUDE)}"\.\include\idl_global.h"\

-	{$(INCLUDE)}"\.\include\idl_narrow.h"\

-	{$(INCLUDE)}"\.\include\intlmacros.h"\

-	{$(INCLUDE)}"\.\include\nr_extern.h"\

-	{$(INCLUDE)}"\.\include\util.h"\

-	{$(INCLUDE)}"\.\include\utl_decllist.h"\

-	{$(INCLUDE)}"\.\include\utl_error.h"\

-	{$(INCLUDE)}"\.\include\utl_exceptlist.h"\

-	{$(INCLUDE)}"\.\include\utl_exprlist.h"\

-	{$(INCLUDE)}"\.\include\utl_identifier.h"\

-	{$(INCLUDE)}"\.\include\utl_idlist.h"\

-	{$(INCLUDE)}"\.\include\utl_indenter.h"\

-	{$(INCLUDE)}"\.\include\utl_labellist.h"\

-	{$(INCLUDE)}"\.\include\utl_list.h"\

-	{$(INCLUDE)}"\.\include\utl_namelist.h"\

-	{$(INCLUDE)}"\.\include\utl_scope.h"\

-	{$(INCLUDE)}"\.\include\utl_scoped_name.h"\

-	{$(INCLUDE)}"\.\include\utl_stack.h"\

-	{$(INCLUDE)}"\.\include\utl_string.h"\

-	{$(INCLUDE)}"\.\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\be_args.obj" : $(SOURCE) $(DEP_CPP_BE_AR) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\be\be_argument.cpp

-DEP_CPP_BE_ARG=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Atomic_Op.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/Event_Handler.h"\

-	"..\..\ace/Event_Handler.i"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/Singleton.cpp"\

-	"..\..\ace/Singleton.h"\

-	"..\..\ace/Singleton.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/stdcpp.h"\

-	"..\..\ace/SV_Semaphore_Complex.h"\

-	"..\..\ace/SV_Semaphore_Complex.i"\

-	"..\..\ace/SV_Semaphore_Simple.h"\

-	"..\..\ace/SV_Semaphore_Simple.i"\

-	"..\..\ace/Synch.h"\

-	"..\..\ace/Synch.i"\

-	"..\..\ace/Synch_T.cpp"\

-	"..\..\ace/Synch_T.h"\

-	"..\..\ace/Synch_T.i"\

-	"..\..\ace/Thread.h"\

-	"..\..\ace/Thread.i"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\be_include\be.h"\

-	".\include\idl.h"\

-	".\include\idl_extern.h"\

-	{$(INCLUDE)}"\.\be_include\be_argument.h"\

-	{$(INCLUDE)}"\.\be_include\be_array.h"\

-	{$(INCLUDE)}"\.\be_include\be_attribute.h"\

-	{$(INCLUDE)}"\.\be_include\be_codegen.h"\

-	{$(INCLUDE)}"\.\be_include\be_constant.h"\

-	{$(INCLUDE)}"\.\be_include\be_decl.h"\

-	{$(INCLUDE)}"\.\be_include\be_enum.h"\

-	{$(INCLUDE)}"\.\be_include\be_enum_val.h"\

-	{$(INCLUDE)}"\.\be_include\be_exception.h"\

-	{$(INCLUDE)}"\.\be_include\be_expression.h"\

-	{$(INCLUDE)}"\.\be_include\be_factory.h"\

-	{$(INCLUDE)}"\.\be_include\be_field.h"\

-	{$(INCLUDE)}"\.\be_include\be_generator.h"\

-	{$(INCLUDE)}"\.\be_include\be_helper.h"\

-	{$(INCLUDE)}"\.\be_include\be_interface.h"\

-	{$(INCLUDE)}"\.\be_include\be_interface_fwd.h"\

-	{$(INCLUDE)}"\.\be_include\be_module.h"\

-	{$(INCLUDE)}"\.\be_include\be_operation.h"\

-	{$(INCLUDE)}"\.\be_include\be_predefined_type.h"\

-	{$(INCLUDE)}"\.\be_include\be_root.h"\

-	{$(INCLUDE)}"\.\be_include\be_scope.h"\

-	{$(INCLUDE)}"\.\be_include\be_sequence.h"\

-	{$(INCLUDE)}"\.\be_include\be_state.h"\

-	{$(INCLUDE)}"\.\be_include\be_string.h"\

-	{$(INCLUDE)}"\.\be_include\be_structure.h"\

-	{$(INCLUDE)}"\.\be_include\be_type.h"\

-	{$(INCLUDE)}"\.\be_include\be_typedef.h"\

-	{$(INCLUDE)}"\.\be_include\be_union.h"\

-	{$(INCLUDE)}"\.\be_include\be_union_branch.h"\

-	{$(INCLUDE)}"\.\be_include\be_union_label.h"\

-	{$(INCLUDE)}"\.\include\ast.h"\

-	{$(INCLUDE)}"\.\include\ast_argument.h"\

-	{$(INCLUDE)}"\.\include\ast_array.h"\

-	{$(INCLUDE)}"\.\include\ast_attribute.h"\

-	{$(INCLUDE)}"\.\include\ast_concrete_type.h"\

-	{$(INCLUDE)}"\.\include\ast_constant.h"\

-	{$(INCLUDE)}"\.\include\ast_decl.h"\

-	{$(INCLUDE)}"\.\include\ast_enum.h"\

-	{$(INCLUDE)}"\.\include\ast_enum_val.h"\

-	{$(INCLUDE)}"\.\include\ast_exception.h"\

-	{$(INCLUDE)}"\.\include\ast_expression.h"\

-	{$(INCLUDE)}"\.\include\ast_extern.h"\

-	{$(INCLUDE)}"\.\include\ast_field.h"\

-	{$(INCLUDE)}"\.\include\ast_generator.h"\

-	{$(INCLUDE)}"\.\include\ast_interface.h"\

-	{$(INCLUDE)}"\.\include\ast_interface_fwd.h"\

-	{$(INCLUDE)}"\.\include\ast_module.h"\

-	{$(INCLUDE)}"\.\include\ast_operation.h"\

-	{$(INCLUDE)}"\.\include\ast_predefined_type.h"\

-	{$(INCLUDE)}"\.\include\ast_root.h"\

-	{$(INCLUDE)}"\.\include\ast_sequence.h"\

-	{$(INCLUDE)}"\.\include\ast_string.h"\

-	{$(INCLUDE)}"\.\include\ast_structure.h"\

-	{$(INCLUDE)}"\.\include\ast_type.h"\

-	{$(INCLUDE)}"\.\include\ast_typedef.h"\

-	{$(INCLUDE)}"\.\include\ast_union.h"\

-	{$(INCLUDE)}"\.\include\ast_union_branch.h"\

-	{$(INCLUDE)}"\.\include\ast_union_label.h"\

-	{$(INCLUDE)}"\.\include\be_extern.h"\

-	{$(INCLUDE)}"\.\include\drv_extern.h"\

-	{$(INCLUDE)}"\.\include\fe_extern.h"\

-	{$(INCLUDE)}"\.\include\global_extern.h"\

-	{$(INCLUDE)}"\.\include\idl_bool.h"\

-	{$(INCLUDE)}"\.\include\idl_defines.h"\

-	{$(INCLUDE)}"\.\include\idl_fwd.h"\

-	{$(INCLUDE)}"\.\include\idl_global.h"\

-	{$(INCLUDE)}"\.\include\idl_narrow.h"\

-	{$(INCLUDE)}"\.\include\intlmacros.h"\

-	{$(INCLUDE)}"\.\include\nr_extern.h"\

-	{$(INCLUDE)}"\.\include\util.h"\

-	{$(INCLUDE)}"\.\include\utl_decllist.h"\

-	{$(INCLUDE)}"\.\include\utl_error.h"\

-	{$(INCLUDE)}"\.\include\utl_exceptlist.h"\

-	{$(INCLUDE)}"\.\include\utl_exprlist.h"\

-	{$(INCLUDE)}"\.\include\utl_identifier.h"\

-	{$(INCLUDE)}"\.\include\utl_idlist.h"\

-	{$(INCLUDE)}"\.\include\utl_indenter.h"\

-	{$(INCLUDE)}"\.\include\utl_labellist.h"\

-	{$(INCLUDE)}"\.\include\utl_list.h"\

-	{$(INCLUDE)}"\.\include\utl_namelist.h"\

-	{$(INCLUDE)}"\.\include\utl_scope.h"\

-	{$(INCLUDE)}"\.\include\utl_scoped_name.h"\

-	{$(INCLUDE)}"\.\include\utl_stack.h"\

-	{$(INCLUDE)}"\.\include\utl_string.h"\

-	{$(INCLUDE)}"\.\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\be_argument.obj" : $(SOURCE) $(DEP_CPP_BE_ARG) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\be\be_array.cpp

-DEP_CPP_BE_ARR=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Atomic_Op.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/Event_Handler.h"\

-	"..\..\ace/Event_Handler.i"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/Singleton.cpp"\

-	"..\..\ace/Singleton.h"\

-	"..\..\ace/Singleton.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/stdcpp.h"\

-	"..\..\ace/SV_Semaphore_Complex.h"\

-	"..\..\ace/SV_Semaphore_Complex.i"\

-	"..\..\ace/SV_Semaphore_Simple.h"\

-	"..\..\ace/SV_Semaphore_Simple.i"\

-	"..\..\ace/Synch.h"\

-	"..\..\ace/Synch.i"\

-	"..\..\ace/Synch_T.cpp"\

-	"..\..\ace/Synch_T.h"\

-	"..\..\ace/Synch_T.i"\

-	"..\..\ace/Thread.h"\

-	"..\..\ace/Thread.i"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\be_include\be.h"\

-	".\include\idl.h"\

-	".\include\idl_extern.h"\

-	{$(INCLUDE)}"\.\be_include\be_argument.h"\

-	{$(INCLUDE)}"\.\be_include\be_array.h"\

-	{$(INCLUDE)}"\.\be_include\be_attribute.h"\

-	{$(INCLUDE)}"\.\be_include\be_codegen.h"\

-	{$(INCLUDE)}"\.\be_include\be_constant.h"\

-	{$(INCLUDE)}"\.\be_include\be_decl.h"\

-	{$(INCLUDE)}"\.\be_include\be_enum.h"\

-	{$(INCLUDE)}"\.\be_include\be_enum_val.h"\

-	{$(INCLUDE)}"\.\be_include\be_exception.h"\

-	{$(INCLUDE)}"\.\be_include\be_expression.h"\

-	{$(INCLUDE)}"\.\be_include\be_factory.h"\

-	{$(INCLUDE)}"\.\be_include\be_field.h"\

-	{$(INCLUDE)}"\.\be_include\be_generator.h"\

-	{$(INCLUDE)}"\.\be_include\be_helper.h"\

-	{$(INCLUDE)}"\.\be_include\be_interface.h"\

-	{$(INCLUDE)}"\.\be_include\be_interface_fwd.h"\

-	{$(INCLUDE)}"\.\be_include\be_module.h"\

-	{$(INCLUDE)}"\.\be_include\be_operation.h"\

-	{$(INCLUDE)}"\.\be_include\be_predefined_type.h"\

-	{$(INCLUDE)}"\.\be_include\be_root.h"\

-	{$(INCLUDE)}"\.\be_include\be_scope.h"\

-	{$(INCLUDE)}"\.\be_include\be_sequence.h"\

-	{$(INCLUDE)}"\.\be_include\be_state.h"\

-	{$(INCLUDE)}"\.\be_include\be_string.h"\

-	{$(INCLUDE)}"\.\be_include\be_structure.h"\

-	{$(INCLUDE)}"\.\be_include\be_type.h"\

-	{$(INCLUDE)}"\.\be_include\be_typedef.h"\

-	{$(INCLUDE)}"\.\be_include\be_union.h"\

-	{$(INCLUDE)}"\.\be_include\be_union_branch.h"\

-	{$(INCLUDE)}"\.\be_include\be_union_label.h"\

-	{$(INCLUDE)}"\.\include\ast.h"\

-	{$(INCLUDE)}"\.\include\ast_argument.h"\

-	{$(INCLUDE)}"\.\include\ast_array.h"\

-	{$(INCLUDE)}"\.\include\ast_attribute.h"\

-	{$(INCLUDE)}"\.\include\ast_concrete_type.h"\

-	{$(INCLUDE)}"\.\include\ast_constant.h"\

-	{$(INCLUDE)}"\.\include\ast_decl.h"\

-	{$(INCLUDE)}"\.\include\ast_enum.h"\

-	{$(INCLUDE)}"\.\include\ast_enum_val.h"\

-	{$(INCLUDE)}"\.\include\ast_exception.h"\

-	{$(INCLUDE)}"\.\include\ast_expression.h"\

-	{$(INCLUDE)}"\.\include\ast_extern.h"\

-	{$(INCLUDE)}"\.\include\ast_field.h"\

-	{$(INCLUDE)}"\.\include\ast_generator.h"\

-	{$(INCLUDE)}"\.\include\ast_interface.h"\

-	{$(INCLUDE)}"\.\include\ast_interface_fwd.h"\

-	{$(INCLUDE)}"\.\include\ast_module.h"\

-	{$(INCLUDE)}"\.\include\ast_operation.h"\

-	{$(INCLUDE)}"\.\include\ast_predefined_type.h"\

-	{$(INCLUDE)}"\.\include\ast_root.h"\

-	{$(INCLUDE)}"\.\include\ast_sequence.h"\

-	{$(INCLUDE)}"\.\include\ast_string.h"\

-	{$(INCLUDE)}"\.\include\ast_structure.h"\

-	{$(INCLUDE)}"\.\include\ast_type.h"\

-	{$(INCLUDE)}"\.\include\ast_typedef.h"\

-	{$(INCLUDE)}"\.\include\ast_union.h"\

-	{$(INCLUDE)}"\.\include\ast_union_branch.h"\

-	{$(INCLUDE)}"\.\include\ast_union_label.h"\

-	{$(INCLUDE)}"\.\include\be_extern.h"\

-	{$(INCLUDE)}"\.\include\drv_extern.h"\

-	{$(INCLUDE)}"\.\include\fe_extern.h"\

-	{$(INCLUDE)}"\.\include\global_extern.h"\

-	{$(INCLUDE)}"\.\include\idl_bool.h"\

-	{$(INCLUDE)}"\.\include\idl_defines.h"\

-	{$(INCLUDE)}"\.\include\idl_fwd.h"\

-	{$(INCLUDE)}"\.\include\idl_global.h"\

-	{$(INCLUDE)}"\.\include\idl_narrow.h"\

-	{$(INCLUDE)}"\.\include\intlmacros.h"\

-	{$(INCLUDE)}"\.\include\nr_extern.h"\

-	{$(INCLUDE)}"\.\include\util.h"\

-	{$(INCLUDE)}"\.\include\utl_decllist.h"\

-	{$(INCLUDE)}"\.\include\utl_error.h"\

-	{$(INCLUDE)}"\.\include\utl_exceptlist.h"\

-	{$(INCLUDE)}"\.\include\utl_exprlist.h"\

-	{$(INCLUDE)}"\.\include\utl_identifier.h"\

-	{$(INCLUDE)}"\.\include\utl_idlist.h"\

-	{$(INCLUDE)}"\.\include\utl_indenter.h"\

-	{$(INCLUDE)}"\.\include\utl_labellist.h"\

-	{$(INCLUDE)}"\.\include\utl_list.h"\

-	{$(INCLUDE)}"\.\include\utl_namelist.h"\

-	{$(INCLUDE)}"\.\include\utl_scope.h"\

-	{$(INCLUDE)}"\.\include\utl_scoped_name.h"\

-	{$(INCLUDE)}"\.\include\utl_stack.h"\

-	{$(INCLUDE)}"\.\include\utl_string.h"\

-	{$(INCLUDE)}"\.\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\be_array.obj" : $(SOURCE) $(DEP_CPP_BE_ARR) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\be\be_attribute.cpp

-DEP_CPP_BE_AT=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Atomic_Op.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/Event_Handler.h"\

-	"..\..\ace/Event_Handler.i"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/Singleton.cpp"\

-	"..\..\ace/Singleton.h"\

-	"..\..\ace/Singleton.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/stdcpp.h"\

-	"..\..\ace/SV_Semaphore_Complex.h"\

-	"..\..\ace/SV_Semaphore_Complex.i"\

-	"..\..\ace/SV_Semaphore_Simple.h"\

-	"..\..\ace/SV_Semaphore_Simple.i"\

-	"..\..\ace/Synch.h"\

-	"..\..\ace/Synch.i"\

-	"..\..\ace/Synch_T.cpp"\

-	"..\..\ace/Synch_T.h"\

-	"..\..\ace/Synch_T.i"\

-	"..\..\ace/Thread.h"\

-	"..\..\ace/Thread.i"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\be_include\be.h"\

-	".\include\idl.h"\

-	".\include\idl_extern.h"\

-	{$(INCLUDE)}"\.\be_include\be_argument.h"\

-	{$(INCLUDE)}"\.\be_include\be_array.h"\

-	{$(INCLUDE)}"\.\be_include\be_attribute.h"\

-	{$(INCLUDE)}"\.\be_include\be_codegen.h"\

-	{$(INCLUDE)}"\.\be_include\be_constant.h"\

-	{$(INCLUDE)}"\.\be_include\be_decl.h"\

-	{$(INCLUDE)}"\.\be_include\be_enum.h"\

-	{$(INCLUDE)}"\.\be_include\be_enum_val.h"\

-	{$(INCLUDE)}"\.\be_include\be_exception.h"\

-	{$(INCLUDE)}"\.\be_include\be_expression.h"\

-	{$(INCLUDE)}"\.\be_include\be_factory.h"\

-	{$(INCLUDE)}"\.\be_include\be_field.h"\

-	{$(INCLUDE)}"\.\be_include\be_generator.h"\

-	{$(INCLUDE)}"\.\be_include\be_helper.h"\

-	{$(INCLUDE)}"\.\be_include\be_interface.h"\

-	{$(INCLUDE)}"\.\be_include\be_interface_fwd.h"\

-	{$(INCLUDE)}"\.\be_include\be_module.h"\

-	{$(INCLUDE)}"\.\be_include\be_operation.h"\

-	{$(INCLUDE)}"\.\be_include\be_predefined_type.h"\

-	{$(INCLUDE)}"\.\be_include\be_root.h"\

-	{$(INCLUDE)}"\.\be_include\be_scope.h"\

-	{$(INCLUDE)}"\.\be_include\be_sequence.h"\

-	{$(INCLUDE)}"\.\be_include\be_state.h"\

-	{$(INCLUDE)}"\.\be_include\be_string.h"\

-	{$(INCLUDE)}"\.\be_include\be_structure.h"\

-	{$(INCLUDE)}"\.\be_include\be_type.h"\

-	{$(INCLUDE)}"\.\be_include\be_typedef.h"\

-	{$(INCLUDE)}"\.\be_include\be_union.h"\

-	{$(INCLUDE)}"\.\be_include\be_union_branch.h"\

-	{$(INCLUDE)}"\.\be_include\be_union_label.h"\

-	{$(INCLUDE)}"\.\include\ast.h"\

-	{$(INCLUDE)}"\.\include\ast_argument.h"\

-	{$(INCLUDE)}"\.\include\ast_array.h"\

-	{$(INCLUDE)}"\.\include\ast_attribute.h"\

-	{$(INCLUDE)}"\.\include\ast_concrete_type.h"\

-	{$(INCLUDE)}"\.\include\ast_constant.h"\

-	{$(INCLUDE)}"\.\include\ast_decl.h"\

-	{$(INCLUDE)}"\.\include\ast_enum.h"\

-	{$(INCLUDE)}"\.\include\ast_enum_val.h"\

-	{$(INCLUDE)}"\.\include\ast_exception.h"\

-	{$(INCLUDE)}"\.\include\ast_expression.h"\

-	{$(INCLUDE)}"\.\include\ast_extern.h"\

-	{$(INCLUDE)}"\.\include\ast_field.h"\

-	{$(INCLUDE)}"\.\include\ast_generator.h"\

-	{$(INCLUDE)}"\.\include\ast_interface.h"\

-	{$(INCLUDE)}"\.\include\ast_interface_fwd.h"\

-	{$(INCLUDE)}"\.\include\ast_module.h"\

-	{$(INCLUDE)}"\.\include\ast_operation.h"\

-	{$(INCLUDE)}"\.\include\ast_predefined_type.h"\

-	{$(INCLUDE)}"\.\include\ast_root.h"\

-	{$(INCLUDE)}"\.\include\ast_sequence.h"\

-	{$(INCLUDE)}"\.\include\ast_string.h"\

-	{$(INCLUDE)}"\.\include\ast_structure.h"\

-	{$(INCLUDE)}"\.\include\ast_type.h"\

-	{$(INCLUDE)}"\.\include\ast_typedef.h"\

-	{$(INCLUDE)}"\.\include\ast_union.h"\

-	{$(INCLUDE)}"\.\include\ast_union_branch.h"\

-	{$(INCLUDE)}"\.\include\ast_union_label.h"\

-	{$(INCLUDE)}"\.\include\be_extern.h"\

-	{$(INCLUDE)}"\.\include\drv_extern.h"\

-	{$(INCLUDE)}"\.\include\fe_extern.h"\

-	{$(INCLUDE)}"\.\include\global_extern.h"\

-	{$(INCLUDE)}"\.\include\idl_bool.h"\

-	{$(INCLUDE)}"\.\include\idl_defines.h"\

-	{$(INCLUDE)}"\.\include\idl_fwd.h"\

-	{$(INCLUDE)}"\.\include\idl_global.h"\

-	{$(INCLUDE)}"\.\include\idl_narrow.h"\

-	{$(INCLUDE)}"\.\include\intlmacros.h"\

-	{$(INCLUDE)}"\.\include\nr_extern.h"\

-	{$(INCLUDE)}"\.\include\util.h"\

-	{$(INCLUDE)}"\.\include\utl_decllist.h"\

-	{$(INCLUDE)}"\.\include\utl_error.h"\

-	{$(INCLUDE)}"\.\include\utl_exceptlist.h"\

-	{$(INCLUDE)}"\.\include\utl_exprlist.h"\

-	{$(INCLUDE)}"\.\include\utl_identifier.h"\

-	{$(INCLUDE)}"\.\include\utl_idlist.h"\

-	{$(INCLUDE)}"\.\include\utl_indenter.h"\

-	{$(INCLUDE)}"\.\include\utl_labellist.h"\

-	{$(INCLUDE)}"\.\include\utl_list.h"\

-	{$(INCLUDE)}"\.\include\utl_namelist.h"\

-	{$(INCLUDE)}"\.\include\utl_scope.h"\

-	{$(INCLUDE)}"\.\include\utl_scoped_name.h"\

-	{$(INCLUDE)}"\.\include\utl_stack.h"\

-	{$(INCLUDE)}"\.\include\utl_string.h"\

-	{$(INCLUDE)}"\.\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\be_attribute.obj" : $(SOURCE) $(DEP_CPP_BE_AT) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\be\be_codegen.cpp

-DEP_CPP_BE_CO=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Atomic_Op.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/Event_Handler.h"\

-	"..\..\ace/Event_Handler.i"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/Singleton.cpp"\

-	"..\..\ace/Singleton.h"\

-	"..\..\ace/Singleton.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/stdcpp.h"\

-	"..\..\ace/SV_Semaphore_Complex.h"\

-	"..\..\ace/SV_Semaphore_Complex.i"\

-	"..\..\ace/SV_Semaphore_Simple.h"\

-	"..\..\ace/SV_Semaphore_Simple.i"\

-	"..\..\ace/Synch.h"\

-	"..\..\ace/Synch.i"\

-	"..\..\ace/Synch_T.cpp"\

-	"..\..\ace/Synch_T.h"\

-	"..\..\ace/Synch_T.i"\

-	"..\..\ace/Thread.h"\

-	"..\..\ace/Thread.i"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\be_include\be.h"\

-	".\include\idl.h"\

-	".\include\idl_extern.h"\

-	{$(INCLUDE)}"\.\be_include\be_argument.h"\

-	{$(INCLUDE)}"\.\be_include\be_array.h"\

-	{$(INCLUDE)}"\.\be_include\be_attribute.h"\

-	{$(INCLUDE)}"\.\be_include\be_codegen.h"\

-	{$(INCLUDE)}"\.\be_include\be_constant.h"\

-	{$(INCLUDE)}"\.\be_include\be_decl.h"\

-	{$(INCLUDE)}"\.\be_include\be_enum.h"\

-	{$(INCLUDE)}"\.\be_include\be_enum_val.h"\

-	{$(INCLUDE)}"\.\be_include\be_exception.h"\

-	{$(INCLUDE)}"\.\be_include\be_expression.h"\

-	{$(INCLUDE)}"\.\be_include\be_factory.h"\

-	{$(INCLUDE)}"\.\be_include\be_field.h"\

-	{$(INCLUDE)}"\.\be_include\be_generator.h"\

-	{$(INCLUDE)}"\.\be_include\be_helper.h"\

-	{$(INCLUDE)}"\.\be_include\be_interface.h"\

-	{$(INCLUDE)}"\.\be_include\be_interface_fwd.h"\

-	{$(INCLUDE)}"\.\be_include\be_module.h"\

-	{$(INCLUDE)}"\.\be_include\be_operation.h"\

-	{$(INCLUDE)}"\.\be_include\be_predefined_type.h"\

-	{$(INCLUDE)}"\.\be_include\be_root.h"\

-	{$(INCLUDE)}"\.\be_include\be_scope.h"\

-	{$(INCLUDE)}"\.\be_include\be_sequence.h"\

-	{$(INCLUDE)}"\.\be_include\be_state.h"\

-	{$(INCLUDE)}"\.\be_include\be_string.h"\

-	{$(INCLUDE)}"\.\be_include\be_structure.h"\

-	{$(INCLUDE)}"\.\be_include\be_type.h"\

-	{$(INCLUDE)}"\.\be_include\be_typedef.h"\

-	{$(INCLUDE)}"\.\be_include\be_union.h"\

-	{$(INCLUDE)}"\.\be_include\be_union_branch.h"\

-	{$(INCLUDE)}"\.\be_include\be_union_label.h"\

-	{$(INCLUDE)}"\.\include\ast.h"\

-	{$(INCLUDE)}"\.\include\ast_argument.h"\

-	{$(INCLUDE)}"\.\include\ast_array.h"\

-	{$(INCLUDE)}"\.\include\ast_attribute.h"\

-	{$(INCLUDE)}"\.\include\ast_concrete_type.h"\

-	{$(INCLUDE)}"\.\include\ast_constant.h"\

-	{$(INCLUDE)}"\.\include\ast_decl.h"\

-	{$(INCLUDE)}"\.\include\ast_enum.h"\

-	{$(INCLUDE)}"\.\include\ast_enum_val.h"\

-	{$(INCLUDE)}"\.\include\ast_exception.h"\

-	{$(INCLUDE)}"\.\include\ast_expression.h"\

-	{$(INCLUDE)}"\.\include\ast_extern.h"\

-	{$(INCLUDE)}"\.\include\ast_field.h"\

-	{$(INCLUDE)}"\.\include\ast_generator.h"\

-	{$(INCLUDE)}"\.\include\ast_interface.h"\

-	{$(INCLUDE)}"\.\include\ast_interface_fwd.h"\

-	{$(INCLUDE)}"\.\include\ast_module.h"\

-	{$(INCLUDE)}"\.\include\ast_operation.h"\

-	{$(INCLUDE)}"\.\include\ast_predefined_type.h"\

-	{$(INCLUDE)}"\.\include\ast_root.h"\

-	{$(INCLUDE)}"\.\include\ast_sequence.h"\

-	{$(INCLUDE)}"\.\include\ast_string.h"\

-	{$(INCLUDE)}"\.\include\ast_structure.h"\

-	{$(INCLUDE)}"\.\include\ast_type.h"\

-	{$(INCLUDE)}"\.\include\ast_typedef.h"\

-	{$(INCLUDE)}"\.\include\ast_union.h"\

-	{$(INCLUDE)}"\.\include\ast_union_branch.h"\

-	{$(INCLUDE)}"\.\include\ast_union_label.h"\

-	{$(INCLUDE)}"\.\include\be_extern.h"\

-	{$(INCLUDE)}"\.\include\drv_extern.h"\

-	{$(INCLUDE)}"\.\include\fe_extern.h"\

-	{$(INCLUDE)}"\.\include\global_extern.h"\

-	{$(INCLUDE)}"\.\include\idl_bool.h"\

-	{$(INCLUDE)}"\.\include\idl_defines.h"\

-	{$(INCLUDE)}"\.\include\idl_fwd.h"\

-	{$(INCLUDE)}"\.\include\idl_global.h"\

-	{$(INCLUDE)}"\.\include\idl_narrow.h"\

-	{$(INCLUDE)}"\.\include\intlmacros.h"\

-	{$(INCLUDE)}"\.\include\nr_extern.h"\

-	{$(INCLUDE)}"\.\include\util.h"\

-	{$(INCLUDE)}"\.\include\utl_decllist.h"\

-	{$(INCLUDE)}"\.\include\utl_error.h"\

-	{$(INCLUDE)}"\.\include\utl_exceptlist.h"\

-	{$(INCLUDE)}"\.\include\utl_exprlist.h"\

-	{$(INCLUDE)}"\.\include\utl_identifier.h"\

-	{$(INCLUDE)}"\.\include\utl_idlist.h"\

-	{$(INCLUDE)}"\.\include\utl_indenter.h"\

-	{$(INCLUDE)}"\.\include\utl_labellist.h"\

-	{$(INCLUDE)}"\.\include\utl_list.h"\

-	{$(INCLUDE)}"\.\include\utl_namelist.h"\

-	{$(INCLUDE)}"\.\include\utl_scope.h"\

-	{$(INCLUDE)}"\.\include\utl_scoped_name.h"\

-	{$(INCLUDE)}"\.\include\utl_stack.h"\

-	{$(INCLUDE)}"\.\include\utl_string.h"\

-	{$(INCLUDE)}"\.\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\be_codegen.obj" : $(SOURCE) $(DEP_CPP_BE_CO) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\be\be_constant.cpp

-DEP_CPP_BE_CON=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Atomic_Op.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/Event_Handler.h"\

-	"..\..\ace/Event_Handler.i"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/Singleton.cpp"\

-	"..\..\ace/Singleton.h"\

-	"..\..\ace/Singleton.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/stdcpp.h"\

-	"..\..\ace/SV_Semaphore_Complex.h"\

-	"..\..\ace/SV_Semaphore_Complex.i"\

-	"..\..\ace/SV_Semaphore_Simple.h"\

-	"..\..\ace/SV_Semaphore_Simple.i"\

-	"..\..\ace/Synch.h"\

-	"..\..\ace/Synch.i"\

-	"..\..\ace/Synch_T.cpp"\

-	"..\..\ace/Synch_T.h"\

-	"..\..\ace/Synch_T.i"\

-	"..\..\ace/Thread.h"\

-	"..\..\ace/Thread.i"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\be_include\be.h"\

-	".\include\idl.h"\

-	".\include\idl_extern.h"\

-	{$(INCLUDE)}"\.\be_include\be_argument.h"\

-	{$(INCLUDE)}"\.\be_include\be_array.h"\

-	{$(INCLUDE)}"\.\be_include\be_attribute.h"\

-	{$(INCLUDE)}"\.\be_include\be_codegen.h"\

-	{$(INCLUDE)}"\.\be_include\be_constant.h"\

-	{$(INCLUDE)}"\.\be_include\be_decl.h"\

-	{$(INCLUDE)}"\.\be_include\be_enum.h"\

-	{$(INCLUDE)}"\.\be_include\be_enum_val.h"\

-	{$(INCLUDE)}"\.\be_include\be_exception.h"\

-	{$(INCLUDE)}"\.\be_include\be_expression.h"\

-	{$(INCLUDE)}"\.\be_include\be_factory.h"\

-	{$(INCLUDE)}"\.\be_include\be_field.h"\

-	{$(INCLUDE)}"\.\be_include\be_generator.h"\

-	{$(INCLUDE)}"\.\be_include\be_helper.h"\

-	{$(INCLUDE)}"\.\be_include\be_interface.h"\

-	{$(INCLUDE)}"\.\be_include\be_interface_fwd.h"\

-	{$(INCLUDE)}"\.\be_include\be_module.h"\

-	{$(INCLUDE)}"\.\be_include\be_operation.h"\

-	{$(INCLUDE)}"\.\be_include\be_predefined_type.h"\

-	{$(INCLUDE)}"\.\be_include\be_root.h"\

-	{$(INCLUDE)}"\.\be_include\be_scope.h"\

-	{$(INCLUDE)}"\.\be_include\be_sequence.h"\

-	{$(INCLUDE)}"\.\be_include\be_state.h"\

-	{$(INCLUDE)}"\.\be_include\be_string.h"\

-	{$(INCLUDE)}"\.\be_include\be_structure.h"\

-	{$(INCLUDE)}"\.\be_include\be_type.h"\

-	{$(INCLUDE)}"\.\be_include\be_typedef.h"\

-	{$(INCLUDE)}"\.\be_include\be_union.h"\

-	{$(INCLUDE)}"\.\be_include\be_union_branch.h"\

-	{$(INCLUDE)}"\.\be_include\be_union_label.h"\

-	{$(INCLUDE)}"\.\include\ast.h"\

-	{$(INCLUDE)}"\.\include\ast_argument.h"\

-	{$(INCLUDE)}"\.\include\ast_array.h"\

-	{$(INCLUDE)}"\.\include\ast_attribute.h"\

-	{$(INCLUDE)}"\.\include\ast_concrete_type.h"\

-	{$(INCLUDE)}"\.\include\ast_constant.h"\

-	{$(INCLUDE)}"\.\include\ast_decl.h"\

-	{$(INCLUDE)}"\.\include\ast_enum.h"\

-	{$(INCLUDE)}"\.\include\ast_enum_val.h"\

-	{$(INCLUDE)}"\.\include\ast_exception.h"\

-	{$(INCLUDE)}"\.\include\ast_expression.h"\

-	{$(INCLUDE)}"\.\include\ast_extern.h"\

-	{$(INCLUDE)}"\.\include\ast_field.h"\

-	{$(INCLUDE)}"\.\include\ast_generator.h"\

-	{$(INCLUDE)}"\.\include\ast_interface.h"\

-	{$(INCLUDE)}"\.\include\ast_interface_fwd.h"\

-	{$(INCLUDE)}"\.\include\ast_module.h"\

-	{$(INCLUDE)}"\.\include\ast_operation.h"\

-	{$(INCLUDE)}"\.\include\ast_predefined_type.h"\

-	{$(INCLUDE)}"\.\include\ast_root.h"\

-	{$(INCLUDE)}"\.\include\ast_sequence.h"\

-	{$(INCLUDE)}"\.\include\ast_string.h"\

-	{$(INCLUDE)}"\.\include\ast_structure.h"\

-	{$(INCLUDE)}"\.\include\ast_type.h"\

-	{$(INCLUDE)}"\.\include\ast_typedef.h"\

-	{$(INCLUDE)}"\.\include\ast_union.h"\

-	{$(INCLUDE)}"\.\include\ast_union_branch.h"\

-	{$(INCLUDE)}"\.\include\ast_union_label.h"\

-	{$(INCLUDE)}"\.\include\be_extern.h"\

-	{$(INCLUDE)}"\.\include\drv_extern.h"\

-	{$(INCLUDE)}"\.\include\fe_extern.h"\

-	{$(INCLUDE)}"\.\include\global_extern.h"\

-	{$(INCLUDE)}"\.\include\idl_bool.h"\

-	{$(INCLUDE)}"\.\include\idl_defines.h"\

-	{$(INCLUDE)}"\.\include\idl_fwd.h"\

-	{$(INCLUDE)}"\.\include\idl_global.h"\

-	{$(INCLUDE)}"\.\include\idl_narrow.h"\

-	{$(INCLUDE)}"\.\include\intlmacros.h"\

-	{$(INCLUDE)}"\.\include\nr_extern.h"\

-	{$(INCLUDE)}"\.\include\util.h"\

-	{$(INCLUDE)}"\.\include\utl_decllist.h"\

-	{$(INCLUDE)}"\.\include\utl_error.h"\

-	{$(INCLUDE)}"\.\include\utl_exceptlist.h"\

-	{$(INCLUDE)}"\.\include\utl_exprlist.h"\

-	{$(INCLUDE)}"\.\include\utl_identifier.h"\

-	{$(INCLUDE)}"\.\include\utl_idlist.h"\

-	{$(INCLUDE)}"\.\include\utl_indenter.h"\

-	{$(INCLUDE)}"\.\include\utl_labellist.h"\

-	{$(INCLUDE)}"\.\include\utl_list.h"\

-	{$(INCLUDE)}"\.\include\utl_namelist.h"\

-	{$(INCLUDE)}"\.\include\utl_scope.h"\

-	{$(INCLUDE)}"\.\include\utl_scoped_name.h"\

-	{$(INCLUDE)}"\.\include\utl_stack.h"\

-	{$(INCLUDE)}"\.\include\utl_string.h"\

-	{$(INCLUDE)}"\.\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\be_constant.obj" : $(SOURCE) $(DEP_CPP_BE_CON) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\be\be_decl.cpp

-DEP_CPP_BE_DE=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Atomic_Op.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/Event_Handler.h"\

-	"..\..\ace/Event_Handler.i"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/Singleton.cpp"\

-	"..\..\ace/Singleton.h"\

-	"..\..\ace/Singleton.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/stdcpp.h"\

-	"..\..\ace/SV_Semaphore_Complex.h"\

-	"..\..\ace/SV_Semaphore_Complex.i"\

-	"..\..\ace/SV_Semaphore_Simple.h"\

-	"..\..\ace/SV_Semaphore_Simple.i"\

-	"..\..\ace/Synch.h"\

-	"..\..\ace/Synch.i"\

-	"..\..\ace/Synch_T.cpp"\

-	"..\..\ace/Synch_T.h"\

-	"..\..\ace/Synch_T.i"\

-	"..\..\ace/Thread.h"\

-	"..\..\ace/Thread.i"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\be_include\be.h"\

-	".\include\idl.h"\

-	".\include\idl_extern.h"\

-	{$(INCLUDE)}"\.\be_include\be_argument.h"\

-	{$(INCLUDE)}"\.\be_include\be_array.h"\

-	{$(INCLUDE)}"\.\be_include\be_attribute.h"\

-	{$(INCLUDE)}"\.\be_include\be_codegen.h"\

-	{$(INCLUDE)}"\.\be_include\be_constant.h"\

-	{$(INCLUDE)}"\.\be_include\be_decl.h"\

-	{$(INCLUDE)}"\.\be_include\be_enum.h"\

-	{$(INCLUDE)}"\.\be_include\be_enum_val.h"\

-	{$(INCLUDE)}"\.\be_include\be_exception.h"\

-	{$(INCLUDE)}"\.\be_include\be_expression.h"\

-	{$(INCLUDE)}"\.\be_include\be_factory.h"\

-	{$(INCLUDE)}"\.\be_include\be_field.h"\

-	{$(INCLUDE)}"\.\be_include\be_generator.h"\

-	{$(INCLUDE)}"\.\be_include\be_helper.h"\

-	{$(INCLUDE)}"\.\be_include\be_interface.h"\

-	{$(INCLUDE)}"\.\be_include\be_interface_fwd.h"\

-	{$(INCLUDE)}"\.\be_include\be_module.h"\

-	{$(INCLUDE)}"\.\be_include\be_operation.h"\

-	{$(INCLUDE)}"\.\be_include\be_predefined_type.h"\

-	{$(INCLUDE)}"\.\be_include\be_root.h"\

-	{$(INCLUDE)}"\.\be_include\be_scope.h"\

-	{$(INCLUDE)}"\.\be_include\be_sequence.h"\

-	{$(INCLUDE)}"\.\be_include\be_state.h"\

-	{$(INCLUDE)}"\.\be_include\be_string.h"\

-	{$(INCLUDE)}"\.\be_include\be_structure.h"\

-	{$(INCLUDE)}"\.\be_include\be_type.h"\

-	{$(INCLUDE)}"\.\be_include\be_typedef.h"\

-	{$(INCLUDE)}"\.\be_include\be_union.h"\

-	{$(INCLUDE)}"\.\be_include\be_union_branch.h"\

-	{$(INCLUDE)}"\.\be_include\be_union_label.h"\

-	{$(INCLUDE)}"\.\include\ast.h"\

-	{$(INCLUDE)}"\.\include\ast_argument.h"\

-	{$(INCLUDE)}"\.\include\ast_array.h"\

-	{$(INCLUDE)}"\.\include\ast_attribute.h"\

-	{$(INCLUDE)}"\.\include\ast_concrete_type.h"\

-	{$(INCLUDE)}"\.\include\ast_constant.h"\

-	{$(INCLUDE)}"\.\include\ast_decl.h"\

-	{$(INCLUDE)}"\.\include\ast_enum.h"\

-	{$(INCLUDE)}"\.\include\ast_enum_val.h"\

-	{$(INCLUDE)}"\.\include\ast_exception.h"\

-	{$(INCLUDE)}"\.\include\ast_expression.h"\

-	{$(INCLUDE)}"\.\include\ast_extern.h"\

-	{$(INCLUDE)}"\.\include\ast_field.h"\

-	{$(INCLUDE)}"\.\include\ast_generator.h"\

-	{$(INCLUDE)}"\.\include\ast_interface.h"\

-	{$(INCLUDE)}"\.\include\ast_interface_fwd.h"\

-	{$(INCLUDE)}"\.\include\ast_module.h"\

-	{$(INCLUDE)}"\.\include\ast_operation.h"\

-	{$(INCLUDE)}"\.\include\ast_predefined_type.h"\

-	{$(INCLUDE)}"\.\include\ast_root.h"\

-	{$(INCLUDE)}"\.\include\ast_sequence.h"\

-	{$(INCLUDE)}"\.\include\ast_string.h"\

-	{$(INCLUDE)}"\.\include\ast_structure.h"\

-	{$(INCLUDE)}"\.\include\ast_type.h"\

-	{$(INCLUDE)}"\.\include\ast_typedef.h"\

-	{$(INCLUDE)}"\.\include\ast_union.h"\

-	{$(INCLUDE)}"\.\include\ast_union_branch.h"\

-	{$(INCLUDE)}"\.\include\ast_union_label.h"\

-	{$(INCLUDE)}"\.\include\be_extern.h"\

-	{$(INCLUDE)}"\.\include\drv_extern.h"\

-	{$(INCLUDE)}"\.\include\fe_extern.h"\

-	{$(INCLUDE)}"\.\include\global_extern.h"\

-	{$(INCLUDE)}"\.\include\idl_bool.h"\

-	{$(INCLUDE)}"\.\include\idl_defines.h"\

-	{$(INCLUDE)}"\.\include\idl_fwd.h"\

-	{$(INCLUDE)}"\.\include\idl_global.h"\

-	{$(INCLUDE)}"\.\include\idl_narrow.h"\

-	{$(INCLUDE)}"\.\include\intlmacros.h"\

-	{$(INCLUDE)}"\.\include\nr_extern.h"\

-	{$(INCLUDE)}"\.\include\util.h"\

-	{$(INCLUDE)}"\.\include\utl_decllist.h"\

-	{$(INCLUDE)}"\.\include\utl_error.h"\

-	{$(INCLUDE)}"\.\include\utl_exceptlist.h"\

-	{$(INCLUDE)}"\.\include\utl_exprlist.h"\

-	{$(INCLUDE)}"\.\include\utl_identifier.h"\

-	{$(INCLUDE)}"\.\include\utl_idlist.h"\

-	{$(INCLUDE)}"\.\include\utl_indenter.h"\

-	{$(INCLUDE)}"\.\include\utl_labellist.h"\

-	{$(INCLUDE)}"\.\include\utl_list.h"\

-	{$(INCLUDE)}"\.\include\utl_namelist.h"\

-	{$(INCLUDE)}"\.\include\utl_scope.h"\

-	{$(INCLUDE)}"\.\include\utl_scoped_name.h"\

-	{$(INCLUDE)}"\.\include\utl_stack.h"\

-	{$(INCLUDE)}"\.\include\utl_string.h"\

-	{$(INCLUDE)}"\.\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\be_decl.obj" : $(SOURCE) $(DEP_CPP_BE_DE) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\be\be_enum.cpp

-DEP_CPP_BE_EN=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Atomic_Op.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/Event_Handler.h"\

-	"..\..\ace/Event_Handler.i"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/Singleton.cpp"\

-	"..\..\ace/Singleton.h"\

-	"..\..\ace/Singleton.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/stdcpp.h"\

-	"..\..\ace/SV_Semaphore_Complex.h"\

-	"..\..\ace/SV_Semaphore_Complex.i"\

-	"..\..\ace/SV_Semaphore_Simple.h"\

-	"..\..\ace/SV_Semaphore_Simple.i"\

-	"..\..\ace/Synch.h"\

-	"..\..\ace/Synch.i"\

-	"..\..\ace/Synch_T.cpp"\

-	"..\..\ace/Synch_T.h"\

-	"..\..\ace/Synch_T.i"\

-	"..\..\ace/Thread.h"\

-	"..\..\ace/Thread.i"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\be_include\be.h"\

-	".\include\idl.h"\

-	".\include\idl_extern.h"\

-	{$(INCLUDE)}"\.\be_include\be_argument.h"\

-	{$(INCLUDE)}"\.\be_include\be_array.h"\

-	{$(INCLUDE)}"\.\be_include\be_attribute.h"\

-	{$(INCLUDE)}"\.\be_include\be_codegen.h"\

-	{$(INCLUDE)}"\.\be_include\be_constant.h"\

-	{$(INCLUDE)}"\.\be_include\be_decl.h"\

-	{$(INCLUDE)}"\.\be_include\be_enum.h"\

-	{$(INCLUDE)}"\.\be_include\be_enum_val.h"\

-	{$(INCLUDE)}"\.\be_include\be_exception.h"\

-	{$(INCLUDE)}"\.\be_include\be_expression.h"\

-	{$(INCLUDE)}"\.\be_include\be_factory.h"\

-	{$(INCLUDE)}"\.\be_include\be_field.h"\

-	{$(INCLUDE)}"\.\be_include\be_generator.h"\

-	{$(INCLUDE)}"\.\be_include\be_helper.h"\

-	{$(INCLUDE)}"\.\be_include\be_interface.h"\

-	{$(INCLUDE)}"\.\be_include\be_interface_fwd.h"\

-	{$(INCLUDE)}"\.\be_include\be_module.h"\

-	{$(INCLUDE)}"\.\be_include\be_operation.h"\

-	{$(INCLUDE)}"\.\be_include\be_predefined_type.h"\

-	{$(INCLUDE)}"\.\be_include\be_root.h"\

-	{$(INCLUDE)}"\.\be_include\be_scope.h"\

-	{$(INCLUDE)}"\.\be_include\be_sequence.h"\

-	{$(INCLUDE)}"\.\be_include\be_state.h"\

-	{$(INCLUDE)}"\.\be_include\be_string.h"\

-	{$(INCLUDE)}"\.\be_include\be_structure.h"\

-	{$(INCLUDE)}"\.\be_include\be_type.h"\

-	{$(INCLUDE)}"\.\be_include\be_typedef.h"\

-	{$(INCLUDE)}"\.\be_include\be_union.h"\

-	{$(INCLUDE)}"\.\be_include\be_union_branch.h"\

-	{$(INCLUDE)}"\.\be_include\be_union_label.h"\

-	{$(INCLUDE)}"\.\include\ast.h"\

-	{$(INCLUDE)}"\.\include\ast_argument.h"\

-	{$(INCLUDE)}"\.\include\ast_array.h"\

-	{$(INCLUDE)}"\.\include\ast_attribute.h"\

-	{$(INCLUDE)}"\.\include\ast_concrete_type.h"\

-	{$(INCLUDE)}"\.\include\ast_constant.h"\

-	{$(INCLUDE)}"\.\include\ast_decl.h"\

-	{$(INCLUDE)}"\.\include\ast_enum.h"\

-	{$(INCLUDE)}"\.\include\ast_enum_val.h"\

-	{$(INCLUDE)}"\.\include\ast_exception.h"\

-	{$(INCLUDE)}"\.\include\ast_expression.h"\

-	{$(INCLUDE)}"\.\include\ast_extern.h"\

-	{$(INCLUDE)}"\.\include\ast_field.h"\

-	{$(INCLUDE)}"\.\include\ast_generator.h"\

-	{$(INCLUDE)}"\.\include\ast_interface.h"\

-	{$(INCLUDE)}"\.\include\ast_interface_fwd.h"\

-	{$(INCLUDE)}"\.\include\ast_module.h"\

-	{$(INCLUDE)}"\.\include\ast_operation.h"\

-	{$(INCLUDE)}"\.\include\ast_predefined_type.h"\

-	{$(INCLUDE)}"\.\include\ast_root.h"\

-	{$(INCLUDE)}"\.\include\ast_sequence.h"\

-	{$(INCLUDE)}"\.\include\ast_string.h"\

-	{$(INCLUDE)}"\.\include\ast_structure.h"\

-	{$(INCLUDE)}"\.\include\ast_type.h"\

-	{$(INCLUDE)}"\.\include\ast_typedef.h"\

-	{$(INCLUDE)}"\.\include\ast_union.h"\

-	{$(INCLUDE)}"\.\include\ast_union_branch.h"\

-	{$(INCLUDE)}"\.\include\ast_union_label.h"\

-	{$(INCLUDE)}"\.\include\be_extern.h"\

-	{$(INCLUDE)}"\.\include\drv_extern.h"\

-	{$(INCLUDE)}"\.\include\fe_extern.h"\

-	{$(INCLUDE)}"\.\include\global_extern.h"\

-	{$(INCLUDE)}"\.\include\idl_bool.h"\

-	{$(INCLUDE)}"\.\include\idl_defines.h"\

-	{$(INCLUDE)}"\.\include\idl_fwd.h"\

-	{$(INCLUDE)}"\.\include\idl_global.h"\

-	{$(INCLUDE)}"\.\include\idl_narrow.h"\

-	{$(INCLUDE)}"\.\include\intlmacros.h"\

-	{$(INCLUDE)}"\.\include\nr_extern.h"\

-	{$(INCLUDE)}"\.\include\util.h"\

-	{$(INCLUDE)}"\.\include\utl_decllist.h"\

-	{$(INCLUDE)}"\.\include\utl_error.h"\

-	{$(INCLUDE)}"\.\include\utl_exceptlist.h"\

-	{$(INCLUDE)}"\.\include\utl_exprlist.h"\

-	{$(INCLUDE)}"\.\include\utl_identifier.h"\

-	{$(INCLUDE)}"\.\include\utl_idlist.h"\

-	{$(INCLUDE)}"\.\include\utl_indenter.h"\

-	{$(INCLUDE)}"\.\include\utl_labellist.h"\

-	{$(INCLUDE)}"\.\include\utl_list.h"\

-	{$(INCLUDE)}"\.\include\utl_namelist.h"\

-	{$(INCLUDE)}"\.\include\utl_scope.h"\

-	{$(INCLUDE)}"\.\include\utl_scoped_name.h"\

-	{$(INCLUDE)}"\.\include\utl_stack.h"\

-	{$(INCLUDE)}"\.\include\utl_string.h"\

-	{$(INCLUDE)}"\.\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\be_enum.obj" : $(SOURCE) $(DEP_CPP_BE_EN) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\be\be_enum_val.cpp

-DEP_CPP_BE_ENU=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Atomic_Op.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/Event_Handler.h"\

-	"..\..\ace/Event_Handler.i"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/Singleton.cpp"\

-	"..\..\ace/Singleton.h"\

-	"..\..\ace/Singleton.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/stdcpp.h"\

-	"..\..\ace/SV_Semaphore_Complex.h"\

-	"..\..\ace/SV_Semaphore_Complex.i"\

-	"..\..\ace/SV_Semaphore_Simple.h"\

-	"..\..\ace/SV_Semaphore_Simple.i"\

-	"..\..\ace/Synch.h"\

-	"..\..\ace/Synch.i"\

-	"..\..\ace/Synch_T.cpp"\

-	"..\..\ace/Synch_T.h"\

-	"..\..\ace/Synch_T.i"\

-	"..\..\ace/Thread.h"\

-	"..\..\ace/Thread.i"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\be_include\be.h"\

-	".\include\idl.h"\

-	".\include\idl_extern.h"\

-	{$(INCLUDE)}"\.\be_include\be_argument.h"\

-	{$(INCLUDE)}"\.\be_include\be_array.h"\

-	{$(INCLUDE)}"\.\be_include\be_attribute.h"\

-	{$(INCLUDE)}"\.\be_include\be_codegen.h"\

-	{$(INCLUDE)}"\.\be_include\be_constant.h"\

-	{$(INCLUDE)}"\.\be_include\be_decl.h"\

-	{$(INCLUDE)}"\.\be_include\be_enum.h"\

-	{$(INCLUDE)}"\.\be_include\be_enum_val.h"\

-	{$(INCLUDE)}"\.\be_include\be_exception.h"\

-	{$(INCLUDE)}"\.\be_include\be_expression.h"\

-	{$(INCLUDE)}"\.\be_include\be_factory.h"\

-	{$(INCLUDE)}"\.\be_include\be_field.h"\

-	{$(INCLUDE)}"\.\be_include\be_generator.h"\

-	{$(INCLUDE)}"\.\be_include\be_helper.h"\

-	{$(INCLUDE)}"\.\be_include\be_interface.h"\

-	{$(INCLUDE)}"\.\be_include\be_interface_fwd.h"\

-	{$(INCLUDE)}"\.\be_include\be_module.h"\

-	{$(INCLUDE)}"\.\be_include\be_operation.h"\

-	{$(INCLUDE)}"\.\be_include\be_predefined_type.h"\

-	{$(INCLUDE)}"\.\be_include\be_root.h"\

-	{$(INCLUDE)}"\.\be_include\be_scope.h"\

-	{$(INCLUDE)}"\.\be_include\be_sequence.h"\

-	{$(INCLUDE)}"\.\be_include\be_state.h"\

-	{$(INCLUDE)}"\.\be_include\be_string.h"\

-	{$(INCLUDE)}"\.\be_include\be_structure.h"\

-	{$(INCLUDE)}"\.\be_include\be_type.h"\

-	{$(INCLUDE)}"\.\be_include\be_typedef.h"\

-	{$(INCLUDE)}"\.\be_include\be_union.h"\

-	{$(INCLUDE)}"\.\be_include\be_union_branch.h"\

-	{$(INCLUDE)}"\.\be_include\be_union_label.h"\

-	{$(INCLUDE)}"\.\include\ast.h"\

-	{$(INCLUDE)}"\.\include\ast_argument.h"\

-	{$(INCLUDE)}"\.\include\ast_array.h"\

-	{$(INCLUDE)}"\.\include\ast_attribute.h"\

-	{$(INCLUDE)}"\.\include\ast_concrete_type.h"\

-	{$(INCLUDE)}"\.\include\ast_constant.h"\

-	{$(INCLUDE)}"\.\include\ast_decl.h"\

-	{$(INCLUDE)}"\.\include\ast_enum.h"\

-	{$(INCLUDE)}"\.\include\ast_enum_val.h"\

-	{$(INCLUDE)}"\.\include\ast_exception.h"\

-	{$(INCLUDE)}"\.\include\ast_expression.h"\

-	{$(INCLUDE)}"\.\include\ast_extern.h"\

-	{$(INCLUDE)}"\.\include\ast_field.h"\

-	{$(INCLUDE)}"\.\include\ast_generator.h"\

-	{$(INCLUDE)}"\.\include\ast_interface.h"\

-	{$(INCLUDE)}"\.\include\ast_interface_fwd.h"\

-	{$(INCLUDE)}"\.\include\ast_module.h"\

-	{$(INCLUDE)}"\.\include\ast_operation.h"\

-	{$(INCLUDE)}"\.\include\ast_predefined_type.h"\

-	{$(INCLUDE)}"\.\include\ast_root.h"\

-	{$(INCLUDE)}"\.\include\ast_sequence.h"\

-	{$(INCLUDE)}"\.\include\ast_string.h"\

-	{$(INCLUDE)}"\.\include\ast_structure.h"\

-	{$(INCLUDE)}"\.\include\ast_type.h"\

-	{$(INCLUDE)}"\.\include\ast_typedef.h"\

-	{$(INCLUDE)}"\.\include\ast_union.h"\

-	{$(INCLUDE)}"\.\include\ast_union_branch.h"\

-	{$(INCLUDE)}"\.\include\ast_union_label.h"\

-	{$(INCLUDE)}"\.\include\be_extern.h"\

-	{$(INCLUDE)}"\.\include\drv_extern.h"\

-	{$(INCLUDE)}"\.\include\fe_extern.h"\

-	{$(INCLUDE)}"\.\include\global_extern.h"\

-	{$(INCLUDE)}"\.\include\idl_bool.h"\

-	{$(INCLUDE)}"\.\include\idl_defines.h"\

-	{$(INCLUDE)}"\.\include\idl_fwd.h"\

-	{$(INCLUDE)}"\.\include\idl_global.h"\

-	{$(INCLUDE)}"\.\include\idl_narrow.h"\

-	{$(INCLUDE)}"\.\include\intlmacros.h"\

-	{$(INCLUDE)}"\.\include\nr_extern.h"\

-	{$(INCLUDE)}"\.\include\util.h"\

-	{$(INCLUDE)}"\.\include\utl_decllist.h"\

-	{$(INCLUDE)}"\.\include\utl_error.h"\

-	{$(INCLUDE)}"\.\include\utl_exceptlist.h"\

-	{$(INCLUDE)}"\.\include\utl_exprlist.h"\

-	{$(INCLUDE)}"\.\include\utl_identifier.h"\

-	{$(INCLUDE)}"\.\include\utl_idlist.h"\

-	{$(INCLUDE)}"\.\include\utl_indenter.h"\

-	{$(INCLUDE)}"\.\include\utl_labellist.h"\

-	{$(INCLUDE)}"\.\include\utl_list.h"\

-	{$(INCLUDE)}"\.\include\utl_namelist.h"\

-	{$(INCLUDE)}"\.\include\utl_scope.h"\

-	{$(INCLUDE)}"\.\include\utl_scoped_name.h"\

-	{$(INCLUDE)}"\.\include\utl_stack.h"\

-	{$(INCLUDE)}"\.\include\utl_string.h"\

-	{$(INCLUDE)}"\.\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\be_enum_val.obj" : $(SOURCE) $(DEP_CPP_BE_ENU) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\be\be_exception.cpp

-DEP_CPP_BE_EX=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Atomic_Op.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/Event_Handler.h"\

-	"..\..\ace/Event_Handler.i"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/Singleton.cpp"\

-	"..\..\ace/Singleton.h"\

-	"..\..\ace/Singleton.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/stdcpp.h"\

-	"..\..\ace/SV_Semaphore_Complex.h"\

-	"..\..\ace/SV_Semaphore_Complex.i"\

-	"..\..\ace/SV_Semaphore_Simple.h"\

-	"..\..\ace/SV_Semaphore_Simple.i"\

-	"..\..\ace/Synch.h"\

-	"..\..\ace/Synch.i"\

-	"..\..\ace/Synch_T.cpp"\

-	"..\..\ace/Synch_T.h"\

-	"..\..\ace/Synch_T.i"\

-	"..\..\ace/Thread.h"\

-	"..\..\ace/Thread.i"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\be_include\be.h"\

-	".\include\idl.h"\

-	".\include\idl_extern.h"\

-	{$(INCLUDE)}"\.\be_include\be_argument.h"\

-	{$(INCLUDE)}"\.\be_include\be_array.h"\

-	{$(INCLUDE)}"\.\be_include\be_attribute.h"\

-	{$(INCLUDE)}"\.\be_include\be_codegen.h"\

-	{$(INCLUDE)}"\.\be_include\be_constant.h"\

-	{$(INCLUDE)}"\.\be_include\be_decl.h"\

-	{$(INCLUDE)}"\.\be_include\be_enum.h"\

-	{$(INCLUDE)}"\.\be_include\be_enum_val.h"\

-	{$(INCLUDE)}"\.\be_include\be_exception.h"\

-	{$(INCLUDE)}"\.\be_include\be_expression.h"\

-	{$(INCLUDE)}"\.\be_include\be_factory.h"\

-	{$(INCLUDE)}"\.\be_include\be_field.h"\

-	{$(INCLUDE)}"\.\be_include\be_generator.h"\

-	{$(INCLUDE)}"\.\be_include\be_helper.h"\

-	{$(INCLUDE)}"\.\be_include\be_interface.h"\

-	{$(INCLUDE)}"\.\be_include\be_interface_fwd.h"\

-	{$(INCLUDE)}"\.\be_include\be_module.h"\

-	{$(INCLUDE)}"\.\be_include\be_operation.h"\

-	{$(INCLUDE)}"\.\be_include\be_predefined_type.h"\

-	{$(INCLUDE)}"\.\be_include\be_root.h"\

-	{$(INCLUDE)}"\.\be_include\be_scope.h"\

-	{$(INCLUDE)}"\.\be_include\be_sequence.h"\

-	{$(INCLUDE)}"\.\be_include\be_state.h"\

-	{$(INCLUDE)}"\.\be_include\be_string.h"\

-	{$(INCLUDE)}"\.\be_include\be_structure.h"\

-	{$(INCLUDE)}"\.\be_include\be_type.h"\

-	{$(INCLUDE)}"\.\be_include\be_typedef.h"\

-	{$(INCLUDE)}"\.\be_include\be_union.h"\

-	{$(INCLUDE)}"\.\be_include\be_union_branch.h"\

-	{$(INCLUDE)}"\.\be_include\be_union_label.h"\

-	{$(INCLUDE)}"\.\include\ast.h"\

-	{$(INCLUDE)}"\.\include\ast_argument.h"\

-	{$(INCLUDE)}"\.\include\ast_array.h"\

-	{$(INCLUDE)}"\.\include\ast_attribute.h"\

-	{$(INCLUDE)}"\.\include\ast_concrete_type.h"\

-	{$(INCLUDE)}"\.\include\ast_constant.h"\

-	{$(INCLUDE)}"\.\include\ast_decl.h"\

-	{$(INCLUDE)}"\.\include\ast_enum.h"\

-	{$(INCLUDE)}"\.\include\ast_enum_val.h"\

-	{$(INCLUDE)}"\.\include\ast_exception.h"\

-	{$(INCLUDE)}"\.\include\ast_expression.h"\

-	{$(INCLUDE)}"\.\include\ast_extern.h"\

-	{$(INCLUDE)}"\.\include\ast_field.h"\

-	{$(INCLUDE)}"\.\include\ast_generator.h"\

-	{$(INCLUDE)}"\.\include\ast_interface.h"\

-	{$(INCLUDE)}"\.\include\ast_interface_fwd.h"\

-	{$(INCLUDE)}"\.\include\ast_module.h"\

-	{$(INCLUDE)}"\.\include\ast_operation.h"\

-	{$(INCLUDE)}"\.\include\ast_predefined_type.h"\

-	{$(INCLUDE)}"\.\include\ast_root.h"\

-	{$(INCLUDE)}"\.\include\ast_sequence.h"\

-	{$(INCLUDE)}"\.\include\ast_string.h"\

-	{$(INCLUDE)}"\.\include\ast_structure.h"\

-	{$(INCLUDE)}"\.\include\ast_type.h"\

-	{$(INCLUDE)}"\.\include\ast_typedef.h"\

-	{$(INCLUDE)}"\.\include\ast_union.h"\

-	{$(INCLUDE)}"\.\include\ast_union_branch.h"\

-	{$(INCLUDE)}"\.\include\ast_union_label.h"\

-	{$(INCLUDE)}"\.\include\be_extern.h"\

-	{$(INCLUDE)}"\.\include\drv_extern.h"\

-	{$(INCLUDE)}"\.\include\fe_extern.h"\

-	{$(INCLUDE)}"\.\include\global_extern.h"\

-	{$(INCLUDE)}"\.\include\idl_bool.h"\

-	{$(INCLUDE)}"\.\include\idl_defines.h"\

-	{$(INCLUDE)}"\.\include\idl_fwd.h"\

-	{$(INCLUDE)}"\.\include\idl_global.h"\

-	{$(INCLUDE)}"\.\include\idl_narrow.h"\

-	{$(INCLUDE)}"\.\include\intlmacros.h"\

-	{$(INCLUDE)}"\.\include\nr_extern.h"\

-	{$(INCLUDE)}"\.\include\util.h"\

-	{$(INCLUDE)}"\.\include\utl_decllist.h"\

-	{$(INCLUDE)}"\.\include\utl_error.h"\

-	{$(INCLUDE)}"\.\include\utl_exceptlist.h"\

-	{$(INCLUDE)}"\.\include\utl_exprlist.h"\

-	{$(INCLUDE)}"\.\include\utl_identifier.h"\

-	{$(INCLUDE)}"\.\include\utl_idlist.h"\

-	{$(INCLUDE)}"\.\include\utl_indenter.h"\

-	{$(INCLUDE)}"\.\include\utl_labellist.h"\

-	{$(INCLUDE)}"\.\include\utl_list.h"\

-	{$(INCLUDE)}"\.\include\utl_namelist.h"\

-	{$(INCLUDE)}"\.\include\utl_scope.h"\

-	{$(INCLUDE)}"\.\include\utl_scoped_name.h"\

-	{$(INCLUDE)}"\.\include\utl_stack.h"\

-	{$(INCLUDE)}"\.\include\utl_string.h"\

-	{$(INCLUDE)}"\.\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\be_exception.obj" : $(SOURCE) $(DEP_CPP_BE_EX) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\be\be_expression.cpp

-DEP_CPP_BE_EXP=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Atomic_Op.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/Event_Handler.h"\

-	"..\..\ace/Event_Handler.i"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/Singleton.cpp"\

-	"..\..\ace/Singleton.h"\

-	"..\..\ace/Singleton.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/stdcpp.h"\

-	"..\..\ace/SV_Semaphore_Complex.h"\

-	"..\..\ace/SV_Semaphore_Complex.i"\

-	"..\..\ace/SV_Semaphore_Simple.h"\

-	"..\..\ace/SV_Semaphore_Simple.i"\

-	"..\..\ace/Synch.h"\

-	"..\..\ace/Synch.i"\

-	"..\..\ace/Synch_T.cpp"\

-	"..\..\ace/Synch_T.h"\

-	"..\..\ace/Synch_T.i"\

-	"..\..\ace/Thread.h"\

-	"..\..\ace/Thread.i"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\be_include\be.h"\

-	".\include\idl.h"\

-	".\include\idl_extern.h"\

-	{$(INCLUDE)}"\.\be_include\be_argument.h"\

-	{$(INCLUDE)}"\.\be_include\be_array.h"\

-	{$(INCLUDE)}"\.\be_include\be_attribute.h"\

-	{$(INCLUDE)}"\.\be_include\be_codegen.h"\

-	{$(INCLUDE)}"\.\be_include\be_constant.h"\

-	{$(INCLUDE)}"\.\be_include\be_decl.h"\

-	{$(INCLUDE)}"\.\be_include\be_enum.h"\

-	{$(INCLUDE)}"\.\be_include\be_enum_val.h"\

-	{$(INCLUDE)}"\.\be_include\be_exception.h"\

-	{$(INCLUDE)}"\.\be_include\be_expression.h"\

-	{$(INCLUDE)}"\.\be_include\be_factory.h"\

-	{$(INCLUDE)}"\.\be_include\be_field.h"\

-	{$(INCLUDE)}"\.\be_include\be_generator.h"\

-	{$(INCLUDE)}"\.\be_include\be_helper.h"\

-	{$(INCLUDE)}"\.\be_include\be_interface.h"\

-	{$(INCLUDE)}"\.\be_include\be_interface_fwd.h"\

-	{$(INCLUDE)}"\.\be_include\be_module.h"\

-	{$(INCLUDE)}"\.\be_include\be_operation.h"\

-	{$(INCLUDE)}"\.\be_include\be_predefined_type.h"\

-	{$(INCLUDE)}"\.\be_include\be_root.h"\

-	{$(INCLUDE)}"\.\be_include\be_scope.h"\

-	{$(INCLUDE)}"\.\be_include\be_sequence.h"\

-	{$(INCLUDE)}"\.\be_include\be_state.h"\

-	{$(INCLUDE)}"\.\be_include\be_string.h"\

-	{$(INCLUDE)}"\.\be_include\be_structure.h"\

-	{$(INCLUDE)}"\.\be_include\be_type.h"\

-	{$(INCLUDE)}"\.\be_include\be_typedef.h"\

-	{$(INCLUDE)}"\.\be_include\be_union.h"\

-	{$(INCLUDE)}"\.\be_include\be_union_branch.h"\

-	{$(INCLUDE)}"\.\be_include\be_union_label.h"\

-	{$(INCLUDE)}"\.\include\ast.h"\

-	{$(INCLUDE)}"\.\include\ast_argument.h"\

-	{$(INCLUDE)}"\.\include\ast_array.h"\

-	{$(INCLUDE)}"\.\include\ast_attribute.h"\

-	{$(INCLUDE)}"\.\include\ast_concrete_type.h"\

-	{$(INCLUDE)}"\.\include\ast_constant.h"\

-	{$(INCLUDE)}"\.\include\ast_decl.h"\

-	{$(INCLUDE)}"\.\include\ast_enum.h"\

-	{$(INCLUDE)}"\.\include\ast_enum_val.h"\

-	{$(INCLUDE)}"\.\include\ast_exception.h"\

-	{$(INCLUDE)}"\.\include\ast_expression.h"\

-	{$(INCLUDE)}"\.\include\ast_extern.h"\

-	{$(INCLUDE)}"\.\include\ast_field.h"\

-	{$(INCLUDE)}"\.\include\ast_generator.h"\

-	{$(INCLUDE)}"\.\include\ast_interface.h"\

-	{$(INCLUDE)}"\.\include\ast_interface_fwd.h"\

-	{$(INCLUDE)}"\.\include\ast_module.h"\

-	{$(INCLUDE)}"\.\include\ast_operation.h"\

-	{$(INCLUDE)}"\.\include\ast_predefined_type.h"\

-	{$(INCLUDE)}"\.\include\ast_root.h"\

-	{$(INCLUDE)}"\.\include\ast_sequence.h"\

-	{$(INCLUDE)}"\.\include\ast_string.h"\

-	{$(INCLUDE)}"\.\include\ast_structure.h"\

-	{$(INCLUDE)}"\.\include\ast_type.h"\

-	{$(INCLUDE)}"\.\include\ast_typedef.h"\

-	{$(INCLUDE)}"\.\include\ast_union.h"\

-	{$(INCLUDE)}"\.\include\ast_union_branch.h"\

-	{$(INCLUDE)}"\.\include\ast_union_label.h"\

-	{$(INCLUDE)}"\.\include\be_extern.h"\

-	{$(INCLUDE)}"\.\include\drv_extern.h"\

-	{$(INCLUDE)}"\.\include\fe_extern.h"\

-	{$(INCLUDE)}"\.\include\global_extern.h"\

-	{$(INCLUDE)}"\.\include\idl_bool.h"\

-	{$(INCLUDE)}"\.\include\idl_defines.h"\

-	{$(INCLUDE)}"\.\include\idl_fwd.h"\

-	{$(INCLUDE)}"\.\include\idl_global.h"\

-	{$(INCLUDE)}"\.\include\idl_narrow.h"\

-	{$(INCLUDE)}"\.\include\intlmacros.h"\

-	{$(INCLUDE)}"\.\include\nr_extern.h"\

-	{$(INCLUDE)}"\.\include\util.h"\

-	{$(INCLUDE)}"\.\include\utl_decllist.h"\

-	{$(INCLUDE)}"\.\include\utl_error.h"\

-	{$(INCLUDE)}"\.\include\utl_exceptlist.h"\

-	{$(INCLUDE)}"\.\include\utl_exprlist.h"\

-	{$(INCLUDE)}"\.\include\utl_identifier.h"\

-	{$(INCLUDE)}"\.\include\utl_idlist.h"\

-	{$(INCLUDE)}"\.\include\utl_indenter.h"\

-	{$(INCLUDE)}"\.\include\utl_labellist.h"\

-	{$(INCLUDE)}"\.\include\utl_list.h"\

-	{$(INCLUDE)}"\.\include\utl_namelist.h"\

-	{$(INCLUDE)}"\.\include\utl_scope.h"\

-	{$(INCLUDE)}"\.\include\utl_scoped_name.h"\

-	{$(INCLUDE)}"\.\include\utl_stack.h"\

-	{$(INCLUDE)}"\.\include\utl_string.h"\

-	{$(INCLUDE)}"\.\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\be_expression.obj" : $(SOURCE) $(DEP_CPP_BE_EXP) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\be\be_factory.cpp

-DEP_CPP_BE_FA=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Atomic_Op.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/Event_Handler.h"\

-	"..\..\ace/Event_Handler.i"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/Singleton.cpp"\

-	"..\..\ace/Singleton.h"\

-	"..\..\ace/Singleton.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/stdcpp.h"\

-	"..\..\ace/SV_Semaphore_Complex.h"\

-	"..\..\ace/SV_Semaphore_Complex.i"\

-	"..\..\ace/SV_Semaphore_Simple.h"\

-	"..\..\ace/SV_Semaphore_Simple.i"\

-	"..\..\ace/Synch.h"\

-	"..\..\ace/Synch.i"\

-	"..\..\ace/Synch_T.cpp"\

-	"..\..\ace/Synch_T.h"\

-	"..\..\ace/Synch_T.i"\

-	"..\..\ace/Thread.h"\

-	"..\..\ace/Thread.i"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\be_include\be.h"\

-	".\be_include\be_sunsoft.h"\

-	".\include\idl.h"\

-	".\include\idl_extern.h"\

-	{$(INCLUDE)}"\.\be_include\be_argument.h"\

-	{$(INCLUDE)}"\.\be_include\be_array.h"\

-	{$(INCLUDE)}"\.\be_include\be_attribute.h"\

-	{$(INCLUDE)}"\.\be_include\be_codegen.h"\

-	{$(INCLUDE)}"\.\be_include\be_constant.h"\

-	{$(INCLUDE)}"\.\be_include\be_decl.h"\

-	{$(INCLUDE)}"\.\be_include\be_enum.h"\

-	{$(INCLUDE)}"\.\be_include\be_enum_val.h"\

-	{$(INCLUDE)}"\.\be_include\be_exception.h"\

-	{$(INCLUDE)}"\.\be_include\be_expression.h"\

-	{$(INCLUDE)}"\.\be_include\be_factory.h"\

-	{$(INCLUDE)}"\.\be_include\be_field.h"\

-	{$(INCLUDE)}"\.\be_include\be_generator.h"\

-	{$(INCLUDE)}"\.\be_include\be_helper.h"\

-	{$(INCLUDE)}"\.\be_include\be_interface.h"\

-	{$(INCLUDE)}"\.\be_include\be_interface_fwd.h"\

-	{$(INCLUDE)}"\.\be_include\be_module.h"\

-	{$(INCLUDE)}"\.\be_include\be_operation.h"\

-	{$(INCLUDE)}"\.\be_include\be_predefined_type.h"\

-	{$(INCLUDE)}"\.\be_include\be_root.h"\

-	{$(INCLUDE)}"\.\be_include\be_scope.h"\

-	{$(INCLUDE)}"\.\be_include\be_sequence.h"\

-	{$(INCLUDE)}"\.\be_include\be_state.h"\

-	{$(INCLUDE)}"\.\be_include\be_string.h"\

-	{$(INCLUDE)}"\.\be_include\be_structure.h"\

-	{$(INCLUDE)}"\.\be_include\be_type.h"\

-	{$(INCLUDE)}"\.\be_include\be_typedef.h"\

-	{$(INCLUDE)}"\.\be_include\be_union.h"\

-	{$(INCLUDE)}"\.\be_include\be_union_branch.h"\

-	{$(INCLUDE)}"\.\be_include\be_union_label.h"\

-	{$(INCLUDE)}"\.\include\ast.h"\

-	{$(INCLUDE)}"\.\include\ast_argument.h"\

-	{$(INCLUDE)}"\.\include\ast_array.h"\

-	{$(INCLUDE)}"\.\include\ast_attribute.h"\

-	{$(INCLUDE)}"\.\include\ast_concrete_type.h"\

-	{$(INCLUDE)}"\.\include\ast_constant.h"\

-	{$(INCLUDE)}"\.\include\ast_decl.h"\

-	{$(INCLUDE)}"\.\include\ast_enum.h"\

-	{$(INCLUDE)}"\.\include\ast_enum_val.h"\

-	{$(INCLUDE)}"\.\include\ast_exception.h"\

-	{$(INCLUDE)}"\.\include\ast_expression.h"\

-	{$(INCLUDE)}"\.\include\ast_extern.h"\

-	{$(INCLUDE)}"\.\include\ast_field.h"\

-	{$(INCLUDE)}"\.\include\ast_generator.h"\

-	{$(INCLUDE)}"\.\include\ast_interface.h"\

-	{$(INCLUDE)}"\.\include\ast_interface_fwd.h"\

-	{$(INCLUDE)}"\.\include\ast_module.h"\

-	{$(INCLUDE)}"\.\include\ast_operation.h"\

-	{$(INCLUDE)}"\.\include\ast_predefined_type.h"\

-	{$(INCLUDE)}"\.\include\ast_root.h"\

-	{$(INCLUDE)}"\.\include\ast_sequence.h"\

-	{$(INCLUDE)}"\.\include\ast_string.h"\

-	{$(INCLUDE)}"\.\include\ast_structure.h"\

-	{$(INCLUDE)}"\.\include\ast_type.h"\

-	{$(INCLUDE)}"\.\include\ast_typedef.h"\

-	{$(INCLUDE)}"\.\include\ast_union.h"\

-	{$(INCLUDE)}"\.\include\ast_union_branch.h"\

-	{$(INCLUDE)}"\.\include\ast_union_label.h"\

-	{$(INCLUDE)}"\.\include\be_extern.h"\

-	{$(INCLUDE)}"\.\include\drv_extern.h"\

-	{$(INCLUDE)}"\.\include\fe_extern.h"\

-	{$(INCLUDE)}"\.\include\global_extern.h"\

-	{$(INCLUDE)}"\.\include\idl_bool.h"\

-	{$(INCLUDE)}"\.\include\idl_defines.h"\

-	{$(INCLUDE)}"\.\include\idl_fwd.h"\

-	{$(INCLUDE)}"\.\include\idl_global.h"\

-	{$(INCLUDE)}"\.\include\idl_narrow.h"\

-	{$(INCLUDE)}"\.\include\intlmacros.h"\

-	{$(INCLUDE)}"\.\include\nr_extern.h"\

-	{$(INCLUDE)}"\.\include\util.h"\

-	{$(INCLUDE)}"\.\include\utl_decllist.h"\

-	{$(INCLUDE)}"\.\include\utl_error.h"\

-	{$(INCLUDE)}"\.\include\utl_exceptlist.h"\

-	{$(INCLUDE)}"\.\include\utl_exprlist.h"\

-	{$(INCLUDE)}"\.\include\utl_identifier.h"\

-	{$(INCLUDE)}"\.\include\utl_idlist.h"\

-	{$(INCLUDE)}"\.\include\utl_indenter.h"\

-	{$(INCLUDE)}"\.\include\utl_labellist.h"\

-	{$(INCLUDE)}"\.\include\utl_list.h"\

-	{$(INCLUDE)}"\.\include\utl_namelist.h"\

-	{$(INCLUDE)}"\.\include\utl_scope.h"\

-	{$(INCLUDE)}"\.\include\utl_scoped_name.h"\

-	{$(INCLUDE)}"\.\include\utl_stack.h"\

-	{$(INCLUDE)}"\.\include\utl_string.h"\

-	{$(INCLUDE)}"\.\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\be_factory.obj" : $(SOURCE) $(DEP_CPP_BE_FA) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\be\be_field.cpp

-DEP_CPP_BE_FI=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Atomic_Op.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/Event_Handler.h"\

-	"..\..\ace/Event_Handler.i"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/Singleton.cpp"\

-	"..\..\ace/Singleton.h"\

-	"..\..\ace/Singleton.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/stdcpp.h"\

-	"..\..\ace/SV_Semaphore_Complex.h"\

-	"..\..\ace/SV_Semaphore_Complex.i"\

-	"..\..\ace/SV_Semaphore_Simple.h"\

-	"..\..\ace/SV_Semaphore_Simple.i"\

-	"..\..\ace/Synch.h"\

-	"..\..\ace/Synch.i"\

-	"..\..\ace/Synch_T.cpp"\

-	"..\..\ace/Synch_T.h"\

-	"..\..\ace/Synch_T.i"\

-	"..\..\ace/Thread.h"\

-	"..\..\ace/Thread.i"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\be_include\be.h"\

-	".\include\idl.h"\

-	".\include\idl_extern.h"\

-	{$(INCLUDE)}"\.\be_include\be_argument.h"\

-	{$(INCLUDE)}"\.\be_include\be_array.h"\

-	{$(INCLUDE)}"\.\be_include\be_attribute.h"\

-	{$(INCLUDE)}"\.\be_include\be_codegen.h"\

-	{$(INCLUDE)}"\.\be_include\be_constant.h"\

-	{$(INCLUDE)}"\.\be_include\be_decl.h"\

-	{$(INCLUDE)}"\.\be_include\be_enum.h"\

-	{$(INCLUDE)}"\.\be_include\be_enum_val.h"\

-	{$(INCLUDE)}"\.\be_include\be_exception.h"\

-	{$(INCLUDE)}"\.\be_include\be_expression.h"\

-	{$(INCLUDE)}"\.\be_include\be_factory.h"\

-	{$(INCLUDE)}"\.\be_include\be_field.h"\

-	{$(INCLUDE)}"\.\be_include\be_generator.h"\

-	{$(INCLUDE)}"\.\be_include\be_helper.h"\

-	{$(INCLUDE)}"\.\be_include\be_interface.h"\

-	{$(INCLUDE)}"\.\be_include\be_interface_fwd.h"\

-	{$(INCLUDE)}"\.\be_include\be_module.h"\

-	{$(INCLUDE)}"\.\be_include\be_operation.h"\

-	{$(INCLUDE)}"\.\be_include\be_predefined_type.h"\

-	{$(INCLUDE)}"\.\be_include\be_root.h"\

-	{$(INCLUDE)}"\.\be_include\be_scope.h"\

-	{$(INCLUDE)}"\.\be_include\be_sequence.h"\

-	{$(INCLUDE)}"\.\be_include\be_state.h"\

-	{$(INCLUDE)}"\.\be_include\be_string.h"\

-	{$(INCLUDE)}"\.\be_include\be_structure.h"\

-	{$(INCLUDE)}"\.\be_include\be_type.h"\

-	{$(INCLUDE)}"\.\be_include\be_typedef.h"\

-	{$(INCLUDE)}"\.\be_include\be_union.h"\

-	{$(INCLUDE)}"\.\be_include\be_union_branch.h"\

-	{$(INCLUDE)}"\.\be_include\be_union_label.h"\

-	{$(INCLUDE)}"\.\include\ast.h"\

-	{$(INCLUDE)}"\.\include\ast_argument.h"\

-	{$(INCLUDE)}"\.\include\ast_array.h"\

-	{$(INCLUDE)}"\.\include\ast_attribute.h"\

-	{$(INCLUDE)}"\.\include\ast_concrete_type.h"\

-	{$(INCLUDE)}"\.\include\ast_constant.h"\

-	{$(INCLUDE)}"\.\include\ast_decl.h"\

-	{$(INCLUDE)}"\.\include\ast_enum.h"\

-	{$(INCLUDE)}"\.\include\ast_enum_val.h"\

-	{$(INCLUDE)}"\.\include\ast_exception.h"\

-	{$(INCLUDE)}"\.\include\ast_expression.h"\

-	{$(INCLUDE)}"\.\include\ast_extern.h"\

-	{$(INCLUDE)}"\.\include\ast_field.h"\

-	{$(INCLUDE)}"\.\include\ast_generator.h"\

-	{$(INCLUDE)}"\.\include\ast_interface.h"\

-	{$(INCLUDE)}"\.\include\ast_interface_fwd.h"\

-	{$(INCLUDE)}"\.\include\ast_module.h"\

-	{$(INCLUDE)}"\.\include\ast_operation.h"\

-	{$(INCLUDE)}"\.\include\ast_predefined_type.h"\

-	{$(INCLUDE)}"\.\include\ast_root.h"\

-	{$(INCLUDE)}"\.\include\ast_sequence.h"\

-	{$(INCLUDE)}"\.\include\ast_string.h"\

-	{$(INCLUDE)}"\.\include\ast_structure.h"\

-	{$(INCLUDE)}"\.\include\ast_type.h"\

-	{$(INCLUDE)}"\.\include\ast_typedef.h"\

-	{$(INCLUDE)}"\.\include\ast_union.h"\

-	{$(INCLUDE)}"\.\include\ast_union_branch.h"\

-	{$(INCLUDE)}"\.\include\ast_union_label.h"\

-	{$(INCLUDE)}"\.\include\be_extern.h"\

-	{$(INCLUDE)}"\.\include\drv_extern.h"\

-	{$(INCLUDE)}"\.\include\fe_extern.h"\

-	{$(INCLUDE)}"\.\include\global_extern.h"\

-	{$(INCLUDE)}"\.\include\idl_bool.h"\

-	{$(INCLUDE)}"\.\include\idl_defines.h"\

-	{$(INCLUDE)}"\.\include\idl_fwd.h"\

-	{$(INCLUDE)}"\.\include\idl_global.h"\

-	{$(INCLUDE)}"\.\include\idl_narrow.h"\

-	{$(INCLUDE)}"\.\include\intlmacros.h"\

-	{$(INCLUDE)}"\.\include\nr_extern.h"\

-	{$(INCLUDE)}"\.\include\util.h"\

-	{$(INCLUDE)}"\.\include\utl_decllist.h"\

-	{$(INCLUDE)}"\.\include\utl_error.h"\

-	{$(INCLUDE)}"\.\include\utl_exceptlist.h"\

-	{$(INCLUDE)}"\.\include\utl_exprlist.h"\

-	{$(INCLUDE)}"\.\include\utl_identifier.h"\

-	{$(INCLUDE)}"\.\include\utl_idlist.h"\

-	{$(INCLUDE)}"\.\include\utl_indenter.h"\

-	{$(INCLUDE)}"\.\include\utl_labellist.h"\

-	{$(INCLUDE)}"\.\include\utl_list.h"\

-	{$(INCLUDE)}"\.\include\utl_namelist.h"\

-	{$(INCLUDE)}"\.\include\utl_scope.h"\

-	{$(INCLUDE)}"\.\include\utl_scoped_name.h"\

-	{$(INCLUDE)}"\.\include\utl_stack.h"\

-	{$(INCLUDE)}"\.\include\utl_string.h"\

-	{$(INCLUDE)}"\.\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\be_field.obj" : $(SOURCE) $(DEP_CPP_BE_FI) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\be\be_generator.cpp

-DEP_CPP_BE_GE=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Atomic_Op.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/Event_Handler.h"\

-	"..\..\ace/Event_Handler.i"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/Singleton.cpp"\

-	"..\..\ace/Singleton.h"\

-	"..\..\ace/Singleton.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/stdcpp.h"\

-	"..\..\ace/SV_Semaphore_Complex.h"\

-	"..\..\ace/SV_Semaphore_Complex.i"\

-	"..\..\ace/SV_Semaphore_Simple.h"\

-	"..\..\ace/SV_Semaphore_Simple.i"\

-	"..\..\ace/Synch.h"\

-	"..\..\ace/Synch.i"\

-	"..\..\ace/Synch_T.cpp"\

-	"..\..\ace/Synch_T.h"\

-	"..\..\ace/Synch_T.i"\

-	"..\..\ace/Thread.h"\

-	"..\..\ace/Thread.i"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\be_include\be.h"\

-	".\include\idl.h"\

-	".\include\idl_extern.h"\

-	{$(INCLUDE)}"\.\be_include\be_argument.h"\

-	{$(INCLUDE)}"\.\be_include\be_array.h"\

-	{$(INCLUDE)}"\.\be_include\be_attribute.h"\

-	{$(INCLUDE)}"\.\be_include\be_codegen.h"\

-	{$(INCLUDE)}"\.\be_include\be_constant.h"\

-	{$(INCLUDE)}"\.\be_include\be_decl.h"\

-	{$(INCLUDE)}"\.\be_include\be_enum.h"\

-	{$(INCLUDE)}"\.\be_include\be_enum_val.h"\

-	{$(INCLUDE)}"\.\be_include\be_exception.h"\

-	{$(INCLUDE)}"\.\be_include\be_expression.h"\

-	{$(INCLUDE)}"\.\be_include\be_factory.h"\

-	{$(INCLUDE)}"\.\be_include\be_field.h"\

-	{$(INCLUDE)}"\.\be_include\be_generator.h"\

-	{$(INCLUDE)}"\.\be_include\be_helper.h"\

-	{$(INCLUDE)}"\.\be_include\be_interface.h"\

-	{$(INCLUDE)}"\.\be_include\be_interface_fwd.h"\

-	{$(INCLUDE)}"\.\be_include\be_module.h"\

-	{$(INCLUDE)}"\.\be_include\be_operation.h"\

-	{$(INCLUDE)}"\.\be_include\be_predefined_type.h"\

-	{$(INCLUDE)}"\.\be_include\be_root.h"\

-	{$(INCLUDE)}"\.\be_include\be_scope.h"\

-	{$(INCLUDE)}"\.\be_include\be_sequence.h"\

-	{$(INCLUDE)}"\.\be_include\be_state.h"\

-	{$(INCLUDE)}"\.\be_include\be_string.h"\

-	{$(INCLUDE)}"\.\be_include\be_structure.h"\

-	{$(INCLUDE)}"\.\be_include\be_type.h"\

-	{$(INCLUDE)}"\.\be_include\be_typedef.h"\

-	{$(INCLUDE)}"\.\be_include\be_union.h"\

-	{$(INCLUDE)}"\.\be_include\be_union_branch.h"\

-	{$(INCLUDE)}"\.\be_include\be_union_label.h"\

-	{$(INCLUDE)}"\.\include\ast.h"\

-	{$(INCLUDE)}"\.\include\ast_argument.h"\

-	{$(INCLUDE)}"\.\include\ast_array.h"\

-	{$(INCLUDE)}"\.\include\ast_attribute.h"\

-	{$(INCLUDE)}"\.\include\ast_concrete_type.h"\

-	{$(INCLUDE)}"\.\include\ast_constant.h"\

-	{$(INCLUDE)}"\.\include\ast_decl.h"\

-	{$(INCLUDE)}"\.\include\ast_enum.h"\

-	{$(INCLUDE)}"\.\include\ast_enum_val.h"\

-	{$(INCLUDE)}"\.\include\ast_exception.h"\

-	{$(INCLUDE)}"\.\include\ast_expression.h"\

-	{$(INCLUDE)}"\.\include\ast_extern.h"\

-	{$(INCLUDE)}"\.\include\ast_field.h"\

-	{$(INCLUDE)}"\.\include\ast_generator.h"\

-	{$(INCLUDE)}"\.\include\ast_interface.h"\

-	{$(INCLUDE)}"\.\include\ast_interface_fwd.h"\

-	{$(INCLUDE)}"\.\include\ast_module.h"\

-	{$(INCLUDE)}"\.\include\ast_operation.h"\

-	{$(INCLUDE)}"\.\include\ast_predefined_type.h"\

-	{$(INCLUDE)}"\.\include\ast_root.h"\

-	{$(INCLUDE)}"\.\include\ast_sequence.h"\

-	{$(INCLUDE)}"\.\include\ast_string.h"\

-	{$(INCLUDE)}"\.\include\ast_structure.h"\

-	{$(INCLUDE)}"\.\include\ast_type.h"\

-	{$(INCLUDE)}"\.\include\ast_typedef.h"\

-	{$(INCLUDE)}"\.\include\ast_union.h"\

-	{$(INCLUDE)}"\.\include\ast_union_branch.h"\

-	{$(INCLUDE)}"\.\include\ast_union_label.h"\

-	{$(INCLUDE)}"\.\include\be_extern.h"\

-	{$(INCLUDE)}"\.\include\drv_extern.h"\

-	{$(INCLUDE)}"\.\include\fe_extern.h"\

-	{$(INCLUDE)}"\.\include\global_extern.h"\

-	{$(INCLUDE)}"\.\include\idl_bool.h"\

-	{$(INCLUDE)}"\.\include\idl_defines.h"\

-	{$(INCLUDE)}"\.\include\idl_fwd.h"\

-	{$(INCLUDE)}"\.\include\idl_global.h"\

-	{$(INCLUDE)}"\.\include\idl_narrow.h"\

-	{$(INCLUDE)}"\.\include\intlmacros.h"\

-	{$(INCLUDE)}"\.\include\nr_extern.h"\

-	{$(INCLUDE)}"\.\include\util.h"\

-	{$(INCLUDE)}"\.\include\utl_decllist.h"\

-	{$(INCLUDE)}"\.\include\utl_error.h"\

-	{$(INCLUDE)}"\.\include\utl_exceptlist.h"\

-	{$(INCLUDE)}"\.\include\utl_exprlist.h"\

-	{$(INCLUDE)}"\.\include\utl_identifier.h"\

-	{$(INCLUDE)}"\.\include\utl_idlist.h"\

-	{$(INCLUDE)}"\.\include\utl_indenter.h"\

-	{$(INCLUDE)}"\.\include\utl_labellist.h"\

-	{$(INCLUDE)}"\.\include\utl_list.h"\

-	{$(INCLUDE)}"\.\include\utl_namelist.h"\

-	{$(INCLUDE)}"\.\include\utl_scope.h"\

-	{$(INCLUDE)}"\.\include\utl_scoped_name.h"\

-	{$(INCLUDE)}"\.\include\utl_stack.h"\

-	{$(INCLUDE)}"\.\include\utl_string.h"\

-	{$(INCLUDE)}"\.\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\be_generator.obj" : $(SOURCE) $(DEP_CPP_BE_GE) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\be\be_helper.cpp

-DEP_CPP_BE_HE=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Atomic_Op.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/Event_Handler.h"\

-	"..\..\ace/Event_Handler.i"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/Singleton.cpp"\

-	"..\..\ace/Singleton.h"\

-	"..\..\ace/Singleton.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/stdcpp.h"\

-	"..\..\ace/SV_Semaphore_Complex.h"\

-	"..\..\ace/SV_Semaphore_Complex.i"\

-	"..\..\ace/SV_Semaphore_Simple.h"\

-	"..\..\ace/SV_Semaphore_Simple.i"\

-	"..\..\ace/Synch.h"\

-	"..\..\ace/Synch.i"\

-	"..\..\ace/Synch_T.cpp"\

-	"..\..\ace/Synch_T.h"\

-	"..\..\ace/Synch_T.i"\

-	"..\..\ace/Thread.h"\

-	"..\..\ace/Thread.i"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\be_include\be.h"\

-	".\include\idl.h"\

-	".\include\idl_extern.h"\

-	{$(INCLUDE)}"\.\be_include\be_argument.h"\

-	{$(INCLUDE)}"\.\be_include\be_array.h"\

-	{$(INCLUDE)}"\.\be_include\be_attribute.h"\

-	{$(INCLUDE)}"\.\be_include\be_codegen.h"\

-	{$(INCLUDE)}"\.\be_include\be_constant.h"\

-	{$(INCLUDE)}"\.\be_include\be_decl.h"\

-	{$(INCLUDE)}"\.\be_include\be_enum.h"\

-	{$(INCLUDE)}"\.\be_include\be_enum_val.h"\

-	{$(INCLUDE)}"\.\be_include\be_exception.h"\

-	{$(INCLUDE)}"\.\be_include\be_expression.h"\

-	{$(INCLUDE)}"\.\be_include\be_factory.h"\

-	{$(INCLUDE)}"\.\be_include\be_field.h"\

-	{$(INCLUDE)}"\.\be_include\be_generator.h"\

-	{$(INCLUDE)}"\.\be_include\be_helper.h"\

-	{$(INCLUDE)}"\.\be_include\be_interface.h"\

-	{$(INCLUDE)}"\.\be_include\be_interface_fwd.h"\

-	{$(INCLUDE)}"\.\be_include\be_module.h"\

-	{$(INCLUDE)}"\.\be_include\be_operation.h"\

-	{$(INCLUDE)}"\.\be_include\be_predefined_type.h"\

-	{$(INCLUDE)}"\.\be_include\be_root.h"\

-	{$(INCLUDE)}"\.\be_include\be_scope.h"\

-	{$(INCLUDE)}"\.\be_include\be_sequence.h"\

-	{$(INCLUDE)}"\.\be_include\be_state.h"\

-	{$(INCLUDE)}"\.\be_include\be_string.h"\

-	{$(INCLUDE)}"\.\be_include\be_structure.h"\

-	{$(INCLUDE)}"\.\be_include\be_type.h"\

-	{$(INCLUDE)}"\.\be_include\be_typedef.h"\

-	{$(INCLUDE)}"\.\be_include\be_union.h"\

-	{$(INCLUDE)}"\.\be_include\be_union_branch.h"\

-	{$(INCLUDE)}"\.\be_include\be_union_label.h"\

-	{$(INCLUDE)}"\.\include\ast.h"\

-	{$(INCLUDE)}"\.\include\ast_argument.h"\

-	{$(INCLUDE)}"\.\include\ast_array.h"\

-	{$(INCLUDE)}"\.\include\ast_attribute.h"\

-	{$(INCLUDE)}"\.\include\ast_concrete_type.h"\

-	{$(INCLUDE)}"\.\include\ast_constant.h"\

-	{$(INCLUDE)}"\.\include\ast_decl.h"\

-	{$(INCLUDE)}"\.\include\ast_enum.h"\

-	{$(INCLUDE)}"\.\include\ast_enum_val.h"\

-	{$(INCLUDE)}"\.\include\ast_exception.h"\

-	{$(INCLUDE)}"\.\include\ast_expression.h"\

-	{$(INCLUDE)}"\.\include\ast_extern.h"\

-	{$(INCLUDE)}"\.\include\ast_field.h"\

-	{$(INCLUDE)}"\.\include\ast_generator.h"\

-	{$(INCLUDE)}"\.\include\ast_interface.h"\

-	{$(INCLUDE)}"\.\include\ast_interface_fwd.h"\

-	{$(INCLUDE)}"\.\include\ast_module.h"\

-	{$(INCLUDE)}"\.\include\ast_operation.h"\

-	{$(INCLUDE)}"\.\include\ast_predefined_type.h"\

-	{$(INCLUDE)}"\.\include\ast_root.h"\

-	{$(INCLUDE)}"\.\include\ast_sequence.h"\

-	{$(INCLUDE)}"\.\include\ast_string.h"\

-	{$(INCLUDE)}"\.\include\ast_structure.h"\

-	{$(INCLUDE)}"\.\include\ast_type.h"\

-	{$(INCLUDE)}"\.\include\ast_typedef.h"\

-	{$(INCLUDE)}"\.\include\ast_union.h"\

-	{$(INCLUDE)}"\.\include\ast_union_branch.h"\

-	{$(INCLUDE)}"\.\include\ast_union_label.h"\

-	{$(INCLUDE)}"\.\include\be_extern.h"\

-	{$(INCLUDE)}"\.\include\drv_extern.h"\

-	{$(INCLUDE)}"\.\include\fe_extern.h"\

-	{$(INCLUDE)}"\.\include\global_extern.h"\

-	{$(INCLUDE)}"\.\include\idl_bool.h"\

-	{$(INCLUDE)}"\.\include\idl_defines.h"\

-	{$(INCLUDE)}"\.\include\idl_fwd.h"\

-	{$(INCLUDE)}"\.\include\idl_global.h"\

-	{$(INCLUDE)}"\.\include\idl_narrow.h"\

-	{$(INCLUDE)}"\.\include\intlmacros.h"\

-	{$(INCLUDE)}"\.\include\nr_extern.h"\

-	{$(INCLUDE)}"\.\include\util.h"\

-	{$(INCLUDE)}"\.\include\utl_decllist.h"\

-	{$(INCLUDE)}"\.\include\utl_error.h"\

-	{$(INCLUDE)}"\.\include\utl_exceptlist.h"\

-	{$(INCLUDE)}"\.\include\utl_exprlist.h"\

-	{$(INCLUDE)}"\.\include\utl_identifier.h"\

-	{$(INCLUDE)}"\.\include\utl_idlist.h"\

-	{$(INCLUDE)}"\.\include\utl_indenter.h"\

-	{$(INCLUDE)}"\.\include\utl_labellist.h"\

-	{$(INCLUDE)}"\.\include\utl_list.h"\

-	{$(INCLUDE)}"\.\include\utl_namelist.h"\

-	{$(INCLUDE)}"\.\include\utl_scope.h"\

-	{$(INCLUDE)}"\.\include\utl_scoped_name.h"\

-	{$(INCLUDE)}"\.\include\utl_stack.h"\

-	{$(INCLUDE)}"\.\include\utl_string.h"\

-	{$(INCLUDE)}"\.\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\be_helper.obj" : $(SOURCE) $(DEP_CPP_BE_HE) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\be\be_init.cpp

-DEP_CPP_BE_IN=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Atomic_Op.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/Event_Handler.h"\

-	"..\..\ace/Event_Handler.i"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/Singleton.cpp"\

-	"..\..\ace/Singleton.h"\

-	"..\..\ace/Singleton.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/stdcpp.h"\

-	"..\..\ace/SV_Semaphore_Complex.h"\

-	"..\..\ace/SV_Semaphore_Complex.i"\

-	"..\..\ace/SV_Semaphore_Simple.h"\

-	"..\..\ace/SV_Semaphore_Simple.i"\

-	"..\..\ace/Synch.h"\

-	"..\..\ace/Synch.i"\

-	"..\..\ace/Synch_T.cpp"\

-	"..\..\ace/Synch_T.h"\

-	"..\..\ace/Synch_T.i"\

-	"..\..\ace/Thread.h"\

-	"..\..\ace/Thread.i"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\be_include\be.h"\

-	".\include\idl.h"\

-	".\include\idl_extern.h"\

-	{$(INCLUDE)}"\.\be_include\be_argument.h"\

-	{$(INCLUDE)}"\.\be_include\be_array.h"\

-	{$(INCLUDE)}"\.\be_include\be_attribute.h"\

-	{$(INCLUDE)}"\.\be_include\be_codegen.h"\

-	{$(INCLUDE)}"\.\be_include\be_constant.h"\

-	{$(INCLUDE)}"\.\be_include\be_decl.h"\

-	{$(INCLUDE)}"\.\be_include\be_enum.h"\

-	{$(INCLUDE)}"\.\be_include\be_enum_val.h"\

-	{$(INCLUDE)}"\.\be_include\be_exception.h"\

-	{$(INCLUDE)}"\.\be_include\be_expression.h"\

-	{$(INCLUDE)}"\.\be_include\be_factory.h"\

-	{$(INCLUDE)}"\.\be_include\be_field.h"\

-	{$(INCLUDE)}"\.\be_include\be_generator.h"\

-	{$(INCLUDE)}"\.\be_include\be_helper.h"\

-	{$(INCLUDE)}"\.\be_include\be_interface.h"\

-	{$(INCLUDE)}"\.\be_include\be_interface_fwd.h"\

-	{$(INCLUDE)}"\.\be_include\be_module.h"\

-	{$(INCLUDE)}"\.\be_include\be_operation.h"\

-	{$(INCLUDE)}"\.\be_include\be_predefined_type.h"\

-	{$(INCLUDE)}"\.\be_include\be_root.h"\

-	{$(INCLUDE)}"\.\be_include\be_scope.h"\

-	{$(INCLUDE)}"\.\be_include\be_sequence.h"\

-	{$(INCLUDE)}"\.\be_include\be_state.h"\

-	{$(INCLUDE)}"\.\be_include\be_string.h"\

-	{$(INCLUDE)}"\.\be_include\be_structure.h"\

-	{$(INCLUDE)}"\.\be_include\be_type.h"\

-	{$(INCLUDE)}"\.\be_include\be_typedef.h"\

-	{$(INCLUDE)}"\.\be_include\be_union.h"\

-	{$(INCLUDE)}"\.\be_include\be_union_branch.h"\

-	{$(INCLUDE)}"\.\be_include\be_union_label.h"\

-	{$(INCLUDE)}"\.\include\ast.h"\

-	{$(INCLUDE)}"\.\include\ast_argument.h"\

-	{$(INCLUDE)}"\.\include\ast_array.h"\

-	{$(INCLUDE)}"\.\include\ast_attribute.h"\

-	{$(INCLUDE)}"\.\include\ast_concrete_type.h"\

-	{$(INCLUDE)}"\.\include\ast_constant.h"\

-	{$(INCLUDE)}"\.\include\ast_decl.h"\

-	{$(INCLUDE)}"\.\include\ast_enum.h"\

-	{$(INCLUDE)}"\.\include\ast_enum_val.h"\

-	{$(INCLUDE)}"\.\include\ast_exception.h"\

-	{$(INCLUDE)}"\.\include\ast_expression.h"\

-	{$(INCLUDE)}"\.\include\ast_extern.h"\

-	{$(INCLUDE)}"\.\include\ast_field.h"\

-	{$(INCLUDE)}"\.\include\ast_generator.h"\

-	{$(INCLUDE)}"\.\include\ast_interface.h"\

-	{$(INCLUDE)}"\.\include\ast_interface_fwd.h"\

-	{$(INCLUDE)}"\.\include\ast_module.h"\

-	{$(INCLUDE)}"\.\include\ast_operation.h"\

-	{$(INCLUDE)}"\.\include\ast_predefined_type.h"\

-	{$(INCLUDE)}"\.\include\ast_root.h"\

-	{$(INCLUDE)}"\.\include\ast_sequence.h"\

-	{$(INCLUDE)}"\.\include\ast_string.h"\

-	{$(INCLUDE)}"\.\include\ast_structure.h"\

-	{$(INCLUDE)}"\.\include\ast_type.h"\

-	{$(INCLUDE)}"\.\include\ast_typedef.h"\

-	{$(INCLUDE)}"\.\include\ast_union.h"\

-	{$(INCLUDE)}"\.\include\ast_union_branch.h"\

-	{$(INCLUDE)}"\.\include\ast_union_label.h"\

-	{$(INCLUDE)}"\.\include\be_extern.h"\

-	{$(INCLUDE)}"\.\include\drv_extern.h"\

-	{$(INCLUDE)}"\.\include\fe_extern.h"\

-	{$(INCLUDE)}"\.\include\global_extern.h"\

-	{$(INCLUDE)}"\.\include\idl_bool.h"\

-	{$(INCLUDE)}"\.\include\idl_defines.h"\

-	{$(INCLUDE)}"\.\include\idl_fwd.h"\

-	{$(INCLUDE)}"\.\include\idl_global.h"\

-	{$(INCLUDE)}"\.\include\idl_narrow.h"\

-	{$(INCLUDE)}"\.\include\intlmacros.h"\

-	{$(INCLUDE)}"\.\include\nr_extern.h"\

-	{$(INCLUDE)}"\.\include\util.h"\

-	{$(INCLUDE)}"\.\include\utl_decllist.h"\

-	{$(INCLUDE)}"\.\include\utl_error.h"\

-	{$(INCLUDE)}"\.\include\utl_exceptlist.h"\

-	{$(INCLUDE)}"\.\include\utl_exprlist.h"\

-	{$(INCLUDE)}"\.\include\utl_identifier.h"\

-	{$(INCLUDE)}"\.\include\utl_idlist.h"\

-	{$(INCLUDE)}"\.\include\utl_indenter.h"\

-	{$(INCLUDE)}"\.\include\utl_labellist.h"\

-	{$(INCLUDE)}"\.\include\utl_list.h"\

-	{$(INCLUDE)}"\.\include\utl_namelist.h"\

-	{$(INCLUDE)}"\.\include\utl_scope.h"\

-	{$(INCLUDE)}"\.\include\utl_scoped_name.h"\

-	{$(INCLUDE)}"\.\include\utl_stack.h"\

-	{$(INCLUDE)}"\.\include\utl_string.h"\

-	{$(INCLUDE)}"\.\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\be_init.obj" : $(SOURCE) $(DEP_CPP_BE_IN) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\be\be_interface.cpp

-DEP_CPP_BE_INT=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Atomic_Op.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/Event_Handler.h"\

-	"..\..\ace/Event_Handler.i"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/Singleton.cpp"\

-	"..\..\ace/Singleton.h"\

-	"..\..\ace/Singleton.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/stdcpp.h"\

-	"..\..\ace/SV_Semaphore_Complex.h"\

-	"..\..\ace/SV_Semaphore_Complex.i"\

-	"..\..\ace/SV_Semaphore_Simple.h"\

-	"..\..\ace/SV_Semaphore_Simple.i"\

-	"..\..\ace/Synch.h"\

-	"..\..\ace/Synch.i"\

-	"..\..\ace/Synch_T.cpp"\

-	"..\..\ace/Synch_T.h"\

-	"..\..\ace/Synch_T.i"\

-	"..\..\ace/Thread.h"\

-	"..\..\ace/Thread.i"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\be_include\be.h"\

-	".\include\idl.h"\

-	".\include\idl_extern.h"\

-	{$(INCLUDE)}"\.\be_include\be_argument.h"\

-	{$(INCLUDE)}"\.\be_include\be_array.h"\

-	{$(INCLUDE)}"\.\be_include\be_attribute.h"\

-	{$(INCLUDE)}"\.\be_include\be_codegen.h"\

-	{$(INCLUDE)}"\.\be_include\be_constant.h"\

-	{$(INCLUDE)}"\.\be_include\be_decl.h"\

-	{$(INCLUDE)}"\.\be_include\be_enum.h"\

-	{$(INCLUDE)}"\.\be_include\be_enum_val.h"\

-	{$(INCLUDE)}"\.\be_include\be_exception.h"\

-	{$(INCLUDE)}"\.\be_include\be_expression.h"\

-	{$(INCLUDE)}"\.\be_include\be_factory.h"\

-	{$(INCLUDE)}"\.\be_include\be_field.h"\

-	{$(INCLUDE)}"\.\be_include\be_generator.h"\

-	{$(INCLUDE)}"\.\be_include\be_helper.h"\

-	{$(INCLUDE)}"\.\be_include\be_interface.h"\

-	{$(INCLUDE)}"\.\be_include\be_interface_fwd.h"\

-	{$(INCLUDE)}"\.\be_include\be_module.h"\

-	{$(INCLUDE)}"\.\be_include\be_operation.h"\

-	{$(INCLUDE)}"\.\be_include\be_predefined_type.h"\

-	{$(INCLUDE)}"\.\be_include\be_root.h"\

-	{$(INCLUDE)}"\.\be_include\be_scope.h"\

-	{$(INCLUDE)}"\.\be_include\be_sequence.h"\

-	{$(INCLUDE)}"\.\be_include\be_state.h"\

-	{$(INCLUDE)}"\.\be_include\be_string.h"\

-	{$(INCLUDE)}"\.\be_include\be_structure.h"\

-	{$(INCLUDE)}"\.\be_include\be_type.h"\

-	{$(INCLUDE)}"\.\be_include\be_typedef.h"\

-	{$(INCLUDE)}"\.\be_include\be_union.h"\

-	{$(INCLUDE)}"\.\be_include\be_union_branch.h"\

-	{$(INCLUDE)}"\.\be_include\be_union_label.h"\

-	{$(INCLUDE)}"\.\include\ast.h"\

-	{$(INCLUDE)}"\.\include\ast_argument.h"\

-	{$(INCLUDE)}"\.\include\ast_array.h"\

-	{$(INCLUDE)}"\.\include\ast_attribute.h"\

-	{$(INCLUDE)}"\.\include\ast_concrete_type.h"\

-	{$(INCLUDE)}"\.\include\ast_constant.h"\

-	{$(INCLUDE)}"\.\include\ast_decl.h"\

-	{$(INCLUDE)}"\.\include\ast_enum.h"\

-	{$(INCLUDE)}"\.\include\ast_enum_val.h"\

-	{$(INCLUDE)}"\.\include\ast_exception.h"\

-	{$(INCLUDE)}"\.\include\ast_expression.h"\

-	{$(INCLUDE)}"\.\include\ast_extern.h"\

-	{$(INCLUDE)}"\.\include\ast_field.h"\

-	{$(INCLUDE)}"\.\include\ast_generator.h"\

-	{$(INCLUDE)}"\.\include\ast_interface.h"\

-	{$(INCLUDE)}"\.\include\ast_interface_fwd.h"\

-	{$(INCLUDE)}"\.\include\ast_module.h"\

-	{$(INCLUDE)}"\.\include\ast_operation.h"\

-	{$(INCLUDE)}"\.\include\ast_predefined_type.h"\

-	{$(INCLUDE)}"\.\include\ast_root.h"\

-	{$(INCLUDE)}"\.\include\ast_sequence.h"\

-	{$(INCLUDE)}"\.\include\ast_string.h"\

-	{$(INCLUDE)}"\.\include\ast_structure.h"\

-	{$(INCLUDE)}"\.\include\ast_type.h"\

-	{$(INCLUDE)}"\.\include\ast_typedef.h"\

-	{$(INCLUDE)}"\.\include\ast_union.h"\

-	{$(INCLUDE)}"\.\include\ast_union_branch.h"\

-	{$(INCLUDE)}"\.\include\ast_union_label.h"\

-	{$(INCLUDE)}"\.\include\be_extern.h"\

-	{$(INCLUDE)}"\.\include\drv_extern.h"\

-	{$(INCLUDE)}"\.\include\fe_extern.h"\

-	{$(INCLUDE)}"\.\include\global_extern.h"\

-	{$(INCLUDE)}"\.\include\idl_bool.h"\

-	{$(INCLUDE)}"\.\include\idl_defines.h"\

-	{$(INCLUDE)}"\.\include\idl_fwd.h"\

-	{$(INCLUDE)}"\.\include\idl_global.h"\

-	{$(INCLUDE)}"\.\include\idl_narrow.h"\

-	{$(INCLUDE)}"\.\include\intlmacros.h"\

-	{$(INCLUDE)}"\.\include\nr_extern.h"\

-	{$(INCLUDE)}"\.\include\util.h"\

-	{$(INCLUDE)}"\.\include\utl_decllist.h"\

-	{$(INCLUDE)}"\.\include\utl_error.h"\

-	{$(INCLUDE)}"\.\include\utl_exceptlist.h"\

-	{$(INCLUDE)}"\.\include\utl_exprlist.h"\

-	{$(INCLUDE)}"\.\include\utl_identifier.h"\

-	{$(INCLUDE)}"\.\include\utl_idlist.h"\

-	{$(INCLUDE)}"\.\include\utl_indenter.h"\

-	{$(INCLUDE)}"\.\include\utl_labellist.h"\

-	{$(INCLUDE)}"\.\include\utl_list.h"\

-	{$(INCLUDE)}"\.\include\utl_namelist.h"\

-	{$(INCLUDE)}"\.\include\utl_scope.h"\

-	{$(INCLUDE)}"\.\include\utl_scoped_name.h"\

-	{$(INCLUDE)}"\.\include\utl_stack.h"\

-	{$(INCLUDE)}"\.\include\utl_string.h"\

-	{$(INCLUDE)}"\.\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\be_interface.obj" : $(SOURCE) $(DEP_CPP_BE_INT) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\be\be_interface_fwd.cpp

-DEP_CPP_BE_INTE=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Atomic_Op.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/Event_Handler.h"\

-	"..\..\ace/Event_Handler.i"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/Singleton.cpp"\

-	"..\..\ace/Singleton.h"\

-	"..\..\ace/Singleton.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/stdcpp.h"\

-	"..\..\ace/SV_Semaphore_Complex.h"\

-	"..\..\ace/SV_Semaphore_Complex.i"\

-	"..\..\ace/SV_Semaphore_Simple.h"\

-	"..\..\ace/SV_Semaphore_Simple.i"\

-	"..\..\ace/Synch.h"\

-	"..\..\ace/Synch.i"\

-	"..\..\ace/Synch_T.cpp"\

-	"..\..\ace/Synch_T.h"\

-	"..\..\ace/Synch_T.i"\

-	"..\..\ace/Thread.h"\

-	"..\..\ace/Thread.i"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\be_include\be.h"\

-	".\include\idl.h"\

-	".\include\idl_extern.h"\

-	{$(INCLUDE)}"\.\be_include\be_argument.h"\

-	{$(INCLUDE)}"\.\be_include\be_array.h"\

-	{$(INCLUDE)}"\.\be_include\be_attribute.h"\

-	{$(INCLUDE)}"\.\be_include\be_codegen.h"\

-	{$(INCLUDE)}"\.\be_include\be_constant.h"\

-	{$(INCLUDE)}"\.\be_include\be_decl.h"\

-	{$(INCLUDE)}"\.\be_include\be_enum.h"\

-	{$(INCLUDE)}"\.\be_include\be_enum_val.h"\

-	{$(INCLUDE)}"\.\be_include\be_exception.h"\

-	{$(INCLUDE)}"\.\be_include\be_expression.h"\

-	{$(INCLUDE)}"\.\be_include\be_factory.h"\

-	{$(INCLUDE)}"\.\be_include\be_field.h"\

-	{$(INCLUDE)}"\.\be_include\be_generator.h"\

-	{$(INCLUDE)}"\.\be_include\be_helper.h"\

-	{$(INCLUDE)}"\.\be_include\be_interface.h"\

-	{$(INCLUDE)}"\.\be_include\be_interface_fwd.h"\

-	{$(INCLUDE)}"\.\be_include\be_module.h"\

-	{$(INCLUDE)}"\.\be_include\be_operation.h"\

-	{$(INCLUDE)}"\.\be_include\be_predefined_type.h"\

-	{$(INCLUDE)}"\.\be_include\be_root.h"\

-	{$(INCLUDE)}"\.\be_include\be_scope.h"\

-	{$(INCLUDE)}"\.\be_include\be_sequence.h"\

-	{$(INCLUDE)}"\.\be_include\be_state.h"\

-	{$(INCLUDE)}"\.\be_include\be_string.h"\

-	{$(INCLUDE)}"\.\be_include\be_structure.h"\

-	{$(INCLUDE)}"\.\be_include\be_type.h"\

-	{$(INCLUDE)}"\.\be_include\be_typedef.h"\

-	{$(INCLUDE)}"\.\be_include\be_union.h"\

-	{$(INCLUDE)}"\.\be_include\be_union_branch.h"\

-	{$(INCLUDE)}"\.\be_include\be_union_label.h"\

-	{$(INCLUDE)}"\.\include\ast.h"\

-	{$(INCLUDE)}"\.\include\ast_argument.h"\

-	{$(INCLUDE)}"\.\include\ast_array.h"\

-	{$(INCLUDE)}"\.\include\ast_attribute.h"\

-	{$(INCLUDE)}"\.\include\ast_concrete_type.h"\

-	{$(INCLUDE)}"\.\include\ast_constant.h"\

-	{$(INCLUDE)}"\.\include\ast_decl.h"\

-	{$(INCLUDE)}"\.\include\ast_enum.h"\

-	{$(INCLUDE)}"\.\include\ast_enum_val.h"\

-	{$(INCLUDE)}"\.\include\ast_exception.h"\

-	{$(INCLUDE)}"\.\include\ast_expression.h"\

-	{$(INCLUDE)}"\.\include\ast_extern.h"\

-	{$(INCLUDE)}"\.\include\ast_field.h"\

-	{$(INCLUDE)}"\.\include\ast_generator.h"\

-	{$(INCLUDE)}"\.\include\ast_interface.h"\

-	{$(INCLUDE)}"\.\include\ast_interface_fwd.h"\

-	{$(INCLUDE)}"\.\include\ast_module.h"\

-	{$(INCLUDE)}"\.\include\ast_operation.h"\

-	{$(INCLUDE)}"\.\include\ast_predefined_type.h"\

-	{$(INCLUDE)}"\.\include\ast_root.h"\

-	{$(INCLUDE)}"\.\include\ast_sequence.h"\

-	{$(INCLUDE)}"\.\include\ast_string.h"\

-	{$(INCLUDE)}"\.\include\ast_structure.h"\

-	{$(INCLUDE)}"\.\include\ast_type.h"\

-	{$(INCLUDE)}"\.\include\ast_typedef.h"\

-	{$(INCLUDE)}"\.\include\ast_union.h"\

-	{$(INCLUDE)}"\.\include\ast_union_branch.h"\

-	{$(INCLUDE)}"\.\include\ast_union_label.h"\

-	{$(INCLUDE)}"\.\include\be_extern.h"\

-	{$(INCLUDE)}"\.\include\drv_extern.h"\

-	{$(INCLUDE)}"\.\include\fe_extern.h"\

-	{$(INCLUDE)}"\.\include\global_extern.h"\

-	{$(INCLUDE)}"\.\include\idl_bool.h"\

-	{$(INCLUDE)}"\.\include\idl_defines.h"\

-	{$(INCLUDE)}"\.\include\idl_fwd.h"\

-	{$(INCLUDE)}"\.\include\idl_global.h"\

-	{$(INCLUDE)}"\.\include\idl_narrow.h"\

-	{$(INCLUDE)}"\.\include\intlmacros.h"\

-	{$(INCLUDE)}"\.\include\nr_extern.h"\

-	{$(INCLUDE)}"\.\include\util.h"\

-	{$(INCLUDE)}"\.\include\utl_decllist.h"\

-	{$(INCLUDE)}"\.\include\utl_error.h"\

-	{$(INCLUDE)}"\.\include\utl_exceptlist.h"\

-	{$(INCLUDE)}"\.\include\utl_exprlist.h"\

-	{$(INCLUDE)}"\.\include\utl_identifier.h"\

-	{$(INCLUDE)}"\.\include\utl_idlist.h"\

-	{$(INCLUDE)}"\.\include\utl_indenter.h"\

-	{$(INCLUDE)}"\.\include\utl_labellist.h"\

-	{$(INCLUDE)}"\.\include\utl_list.h"\

-	{$(INCLUDE)}"\.\include\utl_namelist.h"\

-	{$(INCLUDE)}"\.\include\utl_scope.h"\

-	{$(INCLUDE)}"\.\include\utl_scoped_name.h"\

-	{$(INCLUDE)}"\.\include\utl_stack.h"\

-	{$(INCLUDE)}"\.\include\utl_string.h"\

-	{$(INCLUDE)}"\.\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\be_interface_fwd.obj" : $(SOURCE) $(DEP_CPP_BE_INTE) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\be\be_module.cpp

-DEP_CPP_BE_MO=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Atomic_Op.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/Event_Handler.h"\

-	"..\..\ace/Event_Handler.i"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/Singleton.cpp"\

-	"..\..\ace/Singleton.h"\

-	"..\..\ace/Singleton.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/stdcpp.h"\

-	"..\..\ace/SV_Semaphore_Complex.h"\

-	"..\..\ace/SV_Semaphore_Complex.i"\

-	"..\..\ace/SV_Semaphore_Simple.h"\

-	"..\..\ace/SV_Semaphore_Simple.i"\

-	"..\..\ace/Synch.h"\

-	"..\..\ace/Synch.i"\

-	"..\..\ace/Synch_T.cpp"\

-	"..\..\ace/Synch_T.h"\

-	"..\..\ace/Synch_T.i"\

-	"..\..\ace/Thread.h"\

-	"..\..\ace/Thread.i"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\be_include\be.h"\

-	".\include\idl.h"\

-	".\include\idl_extern.h"\

-	{$(INCLUDE)}"\.\be_include\be_argument.h"\

-	{$(INCLUDE)}"\.\be_include\be_array.h"\

-	{$(INCLUDE)}"\.\be_include\be_attribute.h"\

-	{$(INCLUDE)}"\.\be_include\be_codegen.h"\

-	{$(INCLUDE)}"\.\be_include\be_constant.h"\

-	{$(INCLUDE)}"\.\be_include\be_decl.h"\

-	{$(INCLUDE)}"\.\be_include\be_enum.h"\

-	{$(INCLUDE)}"\.\be_include\be_enum_val.h"\

-	{$(INCLUDE)}"\.\be_include\be_exception.h"\

-	{$(INCLUDE)}"\.\be_include\be_expression.h"\

-	{$(INCLUDE)}"\.\be_include\be_factory.h"\

-	{$(INCLUDE)}"\.\be_include\be_field.h"\

-	{$(INCLUDE)}"\.\be_include\be_generator.h"\

-	{$(INCLUDE)}"\.\be_include\be_helper.h"\

-	{$(INCLUDE)}"\.\be_include\be_interface.h"\

-	{$(INCLUDE)}"\.\be_include\be_interface_fwd.h"\

-	{$(INCLUDE)}"\.\be_include\be_module.h"\

-	{$(INCLUDE)}"\.\be_include\be_operation.h"\

-	{$(INCLUDE)}"\.\be_include\be_predefined_type.h"\

-	{$(INCLUDE)}"\.\be_include\be_root.h"\

-	{$(INCLUDE)}"\.\be_include\be_scope.h"\

-	{$(INCLUDE)}"\.\be_include\be_sequence.h"\

-	{$(INCLUDE)}"\.\be_include\be_state.h"\

-	{$(INCLUDE)}"\.\be_include\be_string.h"\

-	{$(INCLUDE)}"\.\be_include\be_structure.h"\

-	{$(INCLUDE)}"\.\be_include\be_type.h"\

-	{$(INCLUDE)}"\.\be_include\be_typedef.h"\

-	{$(INCLUDE)}"\.\be_include\be_union.h"\

-	{$(INCLUDE)}"\.\be_include\be_union_branch.h"\

-	{$(INCLUDE)}"\.\be_include\be_union_label.h"\

-	{$(INCLUDE)}"\.\include\ast.h"\

-	{$(INCLUDE)}"\.\include\ast_argument.h"\

-	{$(INCLUDE)}"\.\include\ast_array.h"\

-	{$(INCLUDE)}"\.\include\ast_attribute.h"\

-	{$(INCLUDE)}"\.\include\ast_concrete_type.h"\

-	{$(INCLUDE)}"\.\include\ast_constant.h"\

-	{$(INCLUDE)}"\.\include\ast_decl.h"\

-	{$(INCLUDE)}"\.\include\ast_enum.h"\

-	{$(INCLUDE)}"\.\include\ast_enum_val.h"\

-	{$(INCLUDE)}"\.\include\ast_exception.h"\

-	{$(INCLUDE)}"\.\include\ast_expression.h"\

-	{$(INCLUDE)}"\.\include\ast_extern.h"\

-	{$(INCLUDE)}"\.\include\ast_field.h"\

-	{$(INCLUDE)}"\.\include\ast_generator.h"\

-	{$(INCLUDE)}"\.\include\ast_interface.h"\

-	{$(INCLUDE)}"\.\include\ast_interface_fwd.h"\

-	{$(INCLUDE)}"\.\include\ast_module.h"\

-	{$(INCLUDE)}"\.\include\ast_operation.h"\

-	{$(INCLUDE)}"\.\include\ast_predefined_type.h"\

-	{$(INCLUDE)}"\.\include\ast_root.h"\

-	{$(INCLUDE)}"\.\include\ast_sequence.h"\

-	{$(INCLUDE)}"\.\include\ast_string.h"\

-	{$(INCLUDE)}"\.\include\ast_structure.h"\

-	{$(INCLUDE)}"\.\include\ast_type.h"\

-	{$(INCLUDE)}"\.\include\ast_typedef.h"\

-	{$(INCLUDE)}"\.\include\ast_union.h"\

-	{$(INCLUDE)}"\.\include\ast_union_branch.h"\

-	{$(INCLUDE)}"\.\include\ast_union_label.h"\

-	{$(INCLUDE)}"\.\include\be_extern.h"\

-	{$(INCLUDE)}"\.\include\drv_extern.h"\

-	{$(INCLUDE)}"\.\include\fe_extern.h"\

-	{$(INCLUDE)}"\.\include\global_extern.h"\

-	{$(INCLUDE)}"\.\include\idl_bool.h"\

-	{$(INCLUDE)}"\.\include\idl_defines.h"\

-	{$(INCLUDE)}"\.\include\idl_fwd.h"\

-	{$(INCLUDE)}"\.\include\idl_global.h"\

-	{$(INCLUDE)}"\.\include\idl_narrow.h"\

-	{$(INCLUDE)}"\.\include\intlmacros.h"\

-	{$(INCLUDE)}"\.\include\nr_extern.h"\

-	{$(INCLUDE)}"\.\include\util.h"\

-	{$(INCLUDE)}"\.\include\utl_decllist.h"\

-	{$(INCLUDE)}"\.\include\utl_error.h"\

-	{$(INCLUDE)}"\.\include\utl_exceptlist.h"\

-	{$(INCLUDE)}"\.\include\utl_exprlist.h"\

-	{$(INCLUDE)}"\.\include\utl_identifier.h"\

-	{$(INCLUDE)}"\.\include\utl_idlist.h"\

-	{$(INCLUDE)}"\.\include\utl_indenter.h"\

-	{$(INCLUDE)}"\.\include\utl_labellist.h"\

-	{$(INCLUDE)}"\.\include\utl_list.h"\

-	{$(INCLUDE)}"\.\include\utl_namelist.h"\

-	{$(INCLUDE)}"\.\include\utl_scope.h"\

-	{$(INCLUDE)}"\.\include\utl_scoped_name.h"\

-	{$(INCLUDE)}"\.\include\utl_stack.h"\

-	{$(INCLUDE)}"\.\include\utl_string.h"\

-	{$(INCLUDE)}"\.\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\be_module.obj" : $(SOURCE) $(DEP_CPP_BE_MO) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\be\be_operation.cpp

-DEP_CPP_BE_OP=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Atomic_Op.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/Event_Handler.h"\

-	"..\..\ace/Event_Handler.i"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/Singleton.cpp"\

-	"..\..\ace/Singleton.h"\

-	"..\..\ace/Singleton.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/stdcpp.h"\

-	"..\..\ace/SV_Semaphore_Complex.h"\

-	"..\..\ace/SV_Semaphore_Complex.i"\

-	"..\..\ace/SV_Semaphore_Simple.h"\

-	"..\..\ace/SV_Semaphore_Simple.i"\

-	"..\..\ace/Synch.h"\

-	"..\..\ace/Synch.i"\

-	"..\..\ace/Synch_T.cpp"\

-	"..\..\ace/Synch_T.h"\

-	"..\..\ace/Synch_T.i"\

-	"..\..\ace/Thread.h"\

-	"..\..\ace/Thread.i"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\be_include\be.h"\

-	".\include\idl.h"\

-	".\include\idl_extern.h"\

-	{$(INCLUDE)}"\.\be_include\be_argument.h"\

-	{$(INCLUDE)}"\.\be_include\be_array.h"\

-	{$(INCLUDE)}"\.\be_include\be_attribute.h"\

-	{$(INCLUDE)}"\.\be_include\be_codegen.h"\

-	{$(INCLUDE)}"\.\be_include\be_constant.h"\

-	{$(INCLUDE)}"\.\be_include\be_decl.h"\

-	{$(INCLUDE)}"\.\be_include\be_enum.h"\

-	{$(INCLUDE)}"\.\be_include\be_enum_val.h"\

-	{$(INCLUDE)}"\.\be_include\be_exception.h"\

-	{$(INCLUDE)}"\.\be_include\be_expression.h"\

-	{$(INCLUDE)}"\.\be_include\be_factory.h"\

-	{$(INCLUDE)}"\.\be_include\be_field.h"\

-	{$(INCLUDE)}"\.\be_include\be_generator.h"\

-	{$(INCLUDE)}"\.\be_include\be_helper.h"\

-	{$(INCLUDE)}"\.\be_include\be_interface.h"\

-	{$(INCLUDE)}"\.\be_include\be_interface_fwd.h"\

-	{$(INCLUDE)}"\.\be_include\be_module.h"\

-	{$(INCLUDE)}"\.\be_include\be_operation.h"\

-	{$(INCLUDE)}"\.\be_include\be_predefined_type.h"\

-	{$(INCLUDE)}"\.\be_include\be_root.h"\

-	{$(INCLUDE)}"\.\be_include\be_scope.h"\

-	{$(INCLUDE)}"\.\be_include\be_sequence.h"\

-	{$(INCLUDE)}"\.\be_include\be_state.h"\

-	{$(INCLUDE)}"\.\be_include\be_string.h"\

-	{$(INCLUDE)}"\.\be_include\be_structure.h"\

-	{$(INCLUDE)}"\.\be_include\be_type.h"\

-	{$(INCLUDE)}"\.\be_include\be_typedef.h"\

-	{$(INCLUDE)}"\.\be_include\be_union.h"\

-	{$(INCLUDE)}"\.\be_include\be_union_branch.h"\

-	{$(INCLUDE)}"\.\be_include\be_union_label.h"\

-	{$(INCLUDE)}"\.\include\ast.h"\

-	{$(INCLUDE)}"\.\include\ast_argument.h"\

-	{$(INCLUDE)}"\.\include\ast_array.h"\

-	{$(INCLUDE)}"\.\include\ast_attribute.h"\

-	{$(INCLUDE)}"\.\include\ast_concrete_type.h"\

-	{$(INCLUDE)}"\.\include\ast_constant.h"\

-	{$(INCLUDE)}"\.\include\ast_decl.h"\

-	{$(INCLUDE)}"\.\include\ast_enum.h"\

-	{$(INCLUDE)}"\.\include\ast_enum_val.h"\

-	{$(INCLUDE)}"\.\include\ast_exception.h"\

-	{$(INCLUDE)}"\.\include\ast_expression.h"\

-	{$(INCLUDE)}"\.\include\ast_extern.h"\

-	{$(INCLUDE)}"\.\include\ast_field.h"\

-	{$(INCLUDE)}"\.\include\ast_generator.h"\

-	{$(INCLUDE)}"\.\include\ast_interface.h"\

-	{$(INCLUDE)}"\.\include\ast_interface_fwd.h"\

-	{$(INCLUDE)}"\.\include\ast_module.h"\

-	{$(INCLUDE)}"\.\include\ast_operation.h"\

-	{$(INCLUDE)}"\.\include\ast_predefined_type.h"\

-	{$(INCLUDE)}"\.\include\ast_root.h"\

-	{$(INCLUDE)}"\.\include\ast_sequence.h"\

-	{$(INCLUDE)}"\.\include\ast_string.h"\

-	{$(INCLUDE)}"\.\include\ast_structure.h"\

-	{$(INCLUDE)}"\.\include\ast_type.h"\

-	{$(INCLUDE)}"\.\include\ast_typedef.h"\

-	{$(INCLUDE)}"\.\include\ast_union.h"\

-	{$(INCLUDE)}"\.\include\ast_union_branch.h"\

-	{$(INCLUDE)}"\.\include\ast_union_label.h"\

-	{$(INCLUDE)}"\.\include\be_extern.h"\

-	{$(INCLUDE)}"\.\include\drv_extern.h"\

-	{$(INCLUDE)}"\.\include\fe_extern.h"\

-	{$(INCLUDE)}"\.\include\global_extern.h"\

-	{$(INCLUDE)}"\.\include\idl_bool.h"\

-	{$(INCLUDE)}"\.\include\idl_defines.h"\

-	{$(INCLUDE)}"\.\include\idl_fwd.h"\

-	{$(INCLUDE)}"\.\include\idl_global.h"\

-	{$(INCLUDE)}"\.\include\idl_narrow.h"\

-	{$(INCLUDE)}"\.\include\intlmacros.h"\

-	{$(INCLUDE)}"\.\include\nr_extern.h"\

-	{$(INCLUDE)}"\.\include\util.h"\

-	{$(INCLUDE)}"\.\include\utl_decllist.h"\

-	{$(INCLUDE)}"\.\include\utl_error.h"\

-	{$(INCLUDE)}"\.\include\utl_exceptlist.h"\

-	{$(INCLUDE)}"\.\include\utl_exprlist.h"\

-	{$(INCLUDE)}"\.\include\utl_identifier.h"\

-	{$(INCLUDE)}"\.\include\utl_idlist.h"\

-	{$(INCLUDE)}"\.\include\utl_indenter.h"\

-	{$(INCLUDE)}"\.\include\utl_labellist.h"\

-	{$(INCLUDE)}"\.\include\utl_list.h"\

-	{$(INCLUDE)}"\.\include\utl_namelist.h"\

-	{$(INCLUDE)}"\.\include\utl_scope.h"\

-	{$(INCLUDE)}"\.\include\utl_scoped_name.h"\

-	{$(INCLUDE)}"\.\include\utl_stack.h"\

-	{$(INCLUDE)}"\.\include\utl_string.h"\

-	{$(INCLUDE)}"\.\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\be_operation.obj" : $(SOURCE) $(DEP_CPP_BE_OP) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\be\be_predefined_type.cpp

-DEP_CPP_BE_PR=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Atomic_Op.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/Event_Handler.h"\

-	"..\..\ace/Event_Handler.i"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/Singleton.cpp"\

-	"..\..\ace/Singleton.h"\

-	"..\..\ace/Singleton.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/stdcpp.h"\

-	"..\..\ace/SV_Semaphore_Complex.h"\

-	"..\..\ace/SV_Semaphore_Complex.i"\

-	"..\..\ace/SV_Semaphore_Simple.h"\

-	"..\..\ace/SV_Semaphore_Simple.i"\

-	"..\..\ace/Synch.h"\

-	"..\..\ace/Synch.i"\

-	"..\..\ace/Synch_T.cpp"\

-	"..\..\ace/Synch_T.h"\

-	"..\..\ace/Synch_T.i"\

-	"..\..\ace/Thread.h"\

-	"..\..\ace/Thread.i"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\be_include\be.h"\

-	".\include\idl.h"\

-	".\include\idl_extern.h"\

-	{$(INCLUDE)}"\.\be_include\be_argument.h"\

-	{$(INCLUDE)}"\.\be_include\be_array.h"\

-	{$(INCLUDE)}"\.\be_include\be_attribute.h"\

-	{$(INCLUDE)}"\.\be_include\be_codegen.h"\

-	{$(INCLUDE)}"\.\be_include\be_constant.h"\

-	{$(INCLUDE)}"\.\be_include\be_decl.h"\

-	{$(INCLUDE)}"\.\be_include\be_enum.h"\

-	{$(INCLUDE)}"\.\be_include\be_enum_val.h"\

-	{$(INCLUDE)}"\.\be_include\be_exception.h"\

-	{$(INCLUDE)}"\.\be_include\be_expression.h"\

-	{$(INCLUDE)}"\.\be_include\be_factory.h"\

-	{$(INCLUDE)}"\.\be_include\be_field.h"\

-	{$(INCLUDE)}"\.\be_include\be_generator.h"\

-	{$(INCLUDE)}"\.\be_include\be_helper.h"\

-	{$(INCLUDE)}"\.\be_include\be_interface.h"\

-	{$(INCLUDE)}"\.\be_include\be_interface_fwd.h"\

-	{$(INCLUDE)}"\.\be_include\be_module.h"\

-	{$(INCLUDE)}"\.\be_include\be_operation.h"\

-	{$(INCLUDE)}"\.\be_include\be_predefined_type.h"\

-	{$(INCLUDE)}"\.\be_include\be_root.h"\

-	{$(INCLUDE)}"\.\be_include\be_scope.h"\

-	{$(INCLUDE)}"\.\be_include\be_sequence.h"\

-	{$(INCLUDE)}"\.\be_include\be_state.h"\

-	{$(INCLUDE)}"\.\be_include\be_string.h"\

-	{$(INCLUDE)}"\.\be_include\be_structure.h"\

-	{$(INCLUDE)}"\.\be_include\be_type.h"\

-	{$(INCLUDE)}"\.\be_include\be_typedef.h"\

-	{$(INCLUDE)}"\.\be_include\be_union.h"\

-	{$(INCLUDE)}"\.\be_include\be_union_branch.h"\

-	{$(INCLUDE)}"\.\be_include\be_union_label.h"\

-	{$(INCLUDE)}"\.\include\ast.h"\

-	{$(INCLUDE)}"\.\include\ast_argument.h"\

-	{$(INCLUDE)}"\.\include\ast_array.h"\

-	{$(INCLUDE)}"\.\include\ast_attribute.h"\

-	{$(INCLUDE)}"\.\include\ast_concrete_type.h"\

-	{$(INCLUDE)}"\.\include\ast_constant.h"\

-	{$(INCLUDE)}"\.\include\ast_decl.h"\

-	{$(INCLUDE)}"\.\include\ast_enum.h"\

-	{$(INCLUDE)}"\.\include\ast_enum_val.h"\

-	{$(INCLUDE)}"\.\include\ast_exception.h"\

-	{$(INCLUDE)}"\.\include\ast_expression.h"\

-	{$(INCLUDE)}"\.\include\ast_extern.h"\

-	{$(INCLUDE)}"\.\include\ast_field.h"\

-	{$(INCLUDE)}"\.\include\ast_generator.h"\

-	{$(INCLUDE)}"\.\include\ast_interface.h"\

-	{$(INCLUDE)}"\.\include\ast_interface_fwd.h"\

-	{$(INCLUDE)}"\.\include\ast_module.h"\

-	{$(INCLUDE)}"\.\include\ast_operation.h"\

-	{$(INCLUDE)}"\.\include\ast_predefined_type.h"\

-	{$(INCLUDE)}"\.\include\ast_root.h"\

-	{$(INCLUDE)}"\.\include\ast_sequence.h"\

-	{$(INCLUDE)}"\.\include\ast_string.h"\

-	{$(INCLUDE)}"\.\include\ast_structure.h"\

-	{$(INCLUDE)}"\.\include\ast_type.h"\

-	{$(INCLUDE)}"\.\include\ast_typedef.h"\

-	{$(INCLUDE)}"\.\include\ast_union.h"\

-	{$(INCLUDE)}"\.\include\ast_union_branch.h"\

-	{$(INCLUDE)}"\.\include\ast_union_label.h"\

-	{$(INCLUDE)}"\.\include\be_extern.h"\

-	{$(INCLUDE)}"\.\include\drv_extern.h"\

-	{$(INCLUDE)}"\.\include\fe_extern.h"\

-	{$(INCLUDE)}"\.\include\global_extern.h"\

-	{$(INCLUDE)}"\.\include\idl_bool.h"\

-	{$(INCLUDE)}"\.\include\idl_defines.h"\

-	{$(INCLUDE)}"\.\include\idl_fwd.h"\

-	{$(INCLUDE)}"\.\include\idl_global.h"\

-	{$(INCLUDE)}"\.\include\idl_narrow.h"\

-	{$(INCLUDE)}"\.\include\intlmacros.h"\

-	{$(INCLUDE)}"\.\include\nr_extern.h"\

-	{$(INCLUDE)}"\.\include\util.h"\

-	{$(INCLUDE)}"\.\include\utl_decllist.h"\

-	{$(INCLUDE)}"\.\include\utl_error.h"\

-	{$(INCLUDE)}"\.\include\utl_exceptlist.h"\

-	{$(INCLUDE)}"\.\include\utl_exprlist.h"\

-	{$(INCLUDE)}"\.\include\utl_identifier.h"\

-	{$(INCLUDE)}"\.\include\utl_idlist.h"\

-	{$(INCLUDE)}"\.\include\utl_indenter.h"\

-	{$(INCLUDE)}"\.\include\utl_labellist.h"\

-	{$(INCLUDE)}"\.\include\utl_list.h"\

-	{$(INCLUDE)}"\.\include\utl_namelist.h"\

-	{$(INCLUDE)}"\.\include\utl_scope.h"\

-	{$(INCLUDE)}"\.\include\utl_scoped_name.h"\

-	{$(INCLUDE)}"\.\include\utl_stack.h"\

-	{$(INCLUDE)}"\.\include\utl_string.h"\

-	{$(INCLUDE)}"\.\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\be_predefined_type.obj" : $(SOURCE) $(DEP_CPP_BE_PR) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\be\be_produce.cpp

-DEP_CPP_BE_PRO=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Atomic_Op.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/Event_Handler.h"\

-	"..\..\ace/Event_Handler.i"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/Singleton.cpp"\

-	"..\..\ace/Singleton.h"\

-	"..\..\ace/Singleton.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/stdcpp.h"\

-	"..\..\ace/SV_Semaphore_Complex.h"\

-	"..\..\ace/SV_Semaphore_Complex.i"\

-	"..\..\ace/SV_Semaphore_Simple.h"\

-	"..\..\ace/SV_Semaphore_Simple.i"\

-	"..\..\ace/Synch.h"\

-	"..\..\ace/Synch.i"\

-	"..\..\ace/Synch_T.cpp"\

-	"..\..\ace/Synch_T.h"\

-	"..\..\ace/Synch_T.i"\

-	"..\..\ace/Thread.h"\

-	"..\..\ace/Thread.i"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\be_include\be.h"\

-	".\include\idl.h"\

-	".\include\idl_extern.h"\

-	{$(INCLUDE)}"\.\be_include\be_argument.h"\

-	{$(INCLUDE)}"\.\be_include\be_array.h"\

-	{$(INCLUDE)}"\.\be_include\be_attribute.h"\

-	{$(INCLUDE)}"\.\be_include\be_codegen.h"\

-	{$(INCLUDE)}"\.\be_include\be_constant.h"\

-	{$(INCLUDE)}"\.\be_include\be_decl.h"\

-	{$(INCLUDE)}"\.\be_include\be_enum.h"\

-	{$(INCLUDE)}"\.\be_include\be_enum_val.h"\

-	{$(INCLUDE)}"\.\be_include\be_exception.h"\

-	{$(INCLUDE)}"\.\be_include\be_expression.h"\

-	{$(INCLUDE)}"\.\be_include\be_factory.h"\

-	{$(INCLUDE)}"\.\be_include\be_field.h"\

-	{$(INCLUDE)}"\.\be_include\be_generator.h"\

-	{$(INCLUDE)}"\.\be_include\be_helper.h"\

-	{$(INCLUDE)}"\.\be_include\be_interface.h"\

-	{$(INCLUDE)}"\.\be_include\be_interface_fwd.h"\

-	{$(INCLUDE)}"\.\be_include\be_module.h"\

-	{$(INCLUDE)}"\.\be_include\be_operation.h"\

-	{$(INCLUDE)}"\.\be_include\be_predefined_type.h"\

-	{$(INCLUDE)}"\.\be_include\be_root.h"\

-	{$(INCLUDE)}"\.\be_include\be_scope.h"\

-	{$(INCLUDE)}"\.\be_include\be_sequence.h"\

-	{$(INCLUDE)}"\.\be_include\be_state.h"\

-	{$(INCLUDE)}"\.\be_include\be_string.h"\

-	{$(INCLUDE)}"\.\be_include\be_structure.h"\

-	{$(INCLUDE)}"\.\be_include\be_type.h"\

-	{$(INCLUDE)}"\.\be_include\be_typedef.h"\

-	{$(INCLUDE)}"\.\be_include\be_union.h"\

-	{$(INCLUDE)}"\.\be_include\be_union_branch.h"\

-	{$(INCLUDE)}"\.\be_include\be_union_label.h"\

-	{$(INCLUDE)}"\.\include\ast.h"\

-	{$(INCLUDE)}"\.\include\ast_argument.h"\

-	{$(INCLUDE)}"\.\include\ast_array.h"\

-	{$(INCLUDE)}"\.\include\ast_attribute.h"\

-	{$(INCLUDE)}"\.\include\ast_concrete_type.h"\

-	{$(INCLUDE)}"\.\include\ast_constant.h"\

-	{$(INCLUDE)}"\.\include\ast_decl.h"\

-	{$(INCLUDE)}"\.\include\ast_enum.h"\

-	{$(INCLUDE)}"\.\include\ast_enum_val.h"\

-	{$(INCLUDE)}"\.\include\ast_exception.h"\

-	{$(INCLUDE)}"\.\include\ast_expression.h"\

-	{$(INCLUDE)}"\.\include\ast_extern.h"\

-	{$(INCLUDE)}"\.\include\ast_field.h"\

-	{$(INCLUDE)}"\.\include\ast_generator.h"\

-	{$(INCLUDE)}"\.\include\ast_interface.h"\

-	{$(INCLUDE)}"\.\include\ast_interface_fwd.h"\

-	{$(INCLUDE)}"\.\include\ast_module.h"\

-	{$(INCLUDE)}"\.\include\ast_operation.h"\

-	{$(INCLUDE)}"\.\include\ast_predefined_type.h"\

-	{$(INCLUDE)}"\.\include\ast_root.h"\

-	{$(INCLUDE)}"\.\include\ast_sequence.h"\

-	{$(INCLUDE)}"\.\include\ast_string.h"\

-	{$(INCLUDE)}"\.\include\ast_structure.h"\

-	{$(INCLUDE)}"\.\include\ast_type.h"\

-	{$(INCLUDE)}"\.\include\ast_typedef.h"\

-	{$(INCLUDE)}"\.\include\ast_union.h"\

-	{$(INCLUDE)}"\.\include\ast_union_branch.h"\

-	{$(INCLUDE)}"\.\include\ast_union_label.h"\

-	{$(INCLUDE)}"\.\include\be_extern.h"\

-	{$(INCLUDE)}"\.\include\drv_extern.h"\

-	{$(INCLUDE)}"\.\include\fe_extern.h"\

-	{$(INCLUDE)}"\.\include\global_extern.h"\

-	{$(INCLUDE)}"\.\include\idl_bool.h"\

-	{$(INCLUDE)}"\.\include\idl_defines.h"\

-	{$(INCLUDE)}"\.\include\idl_fwd.h"\

-	{$(INCLUDE)}"\.\include\idl_global.h"\

-	{$(INCLUDE)}"\.\include\idl_narrow.h"\

-	{$(INCLUDE)}"\.\include\intlmacros.h"\

-	{$(INCLUDE)}"\.\include\nr_extern.h"\

-	{$(INCLUDE)}"\.\include\util.h"\

-	{$(INCLUDE)}"\.\include\utl_decllist.h"\

-	{$(INCLUDE)}"\.\include\utl_error.h"\

-	{$(INCLUDE)}"\.\include\utl_exceptlist.h"\

-	{$(INCLUDE)}"\.\include\utl_exprlist.h"\

-	{$(INCLUDE)}"\.\include\utl_identifier.h"\

-	{$(INCLUDE)}"\.\include\utl_idlist.h"\

-	{$(INCLUDE)}"\.\include\utl_indenter.h"\

-	{$(INCLUDE)}"\.\include\utl_labellist.h"\

-	{$(INCLUDE)}"\.\include\utl_list.h"\

-	{$(INCLUDE)}"\.\include\utl_namelist.h"\

-	{$(INCLUDE)}"\.\include\utl_scope.h"\

-	{$(INCLUDE)}"\.\include\utl_scoped_name.h"\

-	{$(INCLUDE)}"\.\include\utl_stack.h"\

-	{$(INCLUDE)}"\.\include\utl_string.h"\

-	{$(INCLUDE)}"\.\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\be_produce.obj" : $(SOURCE) $(DEP_CPP_BE_PRO) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\be\be_root.cpp

-DEP_CPP_BE_RO=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Atomic_Op.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/Event_Handler.h"\

-	"..\..\ace/Event_Handler.i"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/Singleton.cpp"\

-	"..\..\ace/Singleton.h"\

-	"..\..\ace/Singleton.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/stdcpp.h"\

-	"..\..\ace/SV_Semaphore_Complex.h"\

-	"..\..\ace/SV_Semaphore_Complex.i"\

-	"..\..\ace/SV_Semaphore_Simple.h"\

-	"..\..\ace/SV_Semaphore_Simple.i"\

-	"..\..\ace/Synch.h"\

-	"..\..\ace/Synch.i"\

-	"..\..\ace/Synch_T.cpp"\

-	"..\..\ace/Synch_T.h"\

-	"..\..\ace/Synch_T.i"\

-	"..\..\ace/Thread.h"\

-	"..\..\ace/Thread.i"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\be_include\be.h"\

-	".\include\idl.h"\

-	".\include\idl_extern.h"\

-	{$(INCLUDE)}"\.\be_include\be_argument.h"\

-	{$(INCLUDE)}"\.\be_include\be_array.h"\

-	{$(INCLUDE)}"\.\be_include\be_attribute.h"\

-	{$(INCLUDE)}"\.\be_include\be_codegen.h"\

-	{$(INCLUDE)}"\.\be_include\be_constant.h"\

-	{$(INCLUDE)}"\.\be_include\be_decl.h"\

-	{$(INCLUDE)}"\.\be_include\be_enum.h"\

-	{$(INCLUDE)}"\.\be_include\be_enum_val.h"\

-	{$(INCLUDE)}"\.\be_include\be_exception.h"\

-	{$(INCLUDE)}"\.\be_include\be_expression.h"\

-	{$(INCLUDE)}"\.\be_include\be_factory.h"\

-	{$(INCLUDE)}"\.\be_include\be_field.h"\

-	{$(INCLUDE)}"\.\be_include\be_generator.h"\

-	{$(INCLUDE)}"\.\be_include\be_helper.h"\

-	{$(INCLUDE)}"\.\be_include\be_interface.h"\

-	{$(INCLUDE)}"\.\be_include\be_interface_fwd.h"\

-	{$(INCLUDE)}"\.\be_include\be_module.h"\

-	{$(INCLUDE)}"\.\be_include\be_operation.h"\

-	{$(INCLUDE)}"\.\be_include\be_predefined_type.h"\

-	{$(INCLUDE)}"\.\be_include\be_root.h"\

-	{$(INCLUDE)}"\.\be_include\be_scope.h"\

-	{$(INCLUDE)}"\.\be_include\be_sequence.h"\

-	{$(INCLUDE)}"\.\be_include\be_state.h"\

-	{$(INCLUDE)}"\.\be_include\be_string.h"\

-	{$(INCLUDE)}"\.\be_include\be_structure.h"\

-	{$(INCLUDE)}"\.\be_include\be_type.h"\

-	{$(INCLUDE)}"\.\be_include\be_typedef.h"\

-	{$(INCLUDE)}"\.\be_include\be_union.h"\

-	{$(INCLUDE)}"\.\be_include\be_union_branch.h"\

-	{$(INCLUDE)}"\.\be_include\be_union_label.h"\

-	{$(INCLUDE)}"\.\include\ast.h"\

-	{$(INCLUDE)}"\.\include\ast_argument.h"\

-	{$(INCLUDE)}"\.\include\ast_array.h"\

-	{$(INCLUDE)}"\.\include\ast_attribute.h"\

-	{$(INCLUDE)}"\.\include\ast_concrete_type.h"\

-	{$(INCLUDE)}"\.\include\ast_constant.h"\

-	{$(INCLUDE)}"\.\include\ast_decl.h"\

-	{$(INCLUDE)}"\.\include\ast_enum.h"\

-	{$(INCLUDE)}"\.\include\ast_enum_val.h"\

-	{$(INCLUDE)}"\.\include\ast_exception.h"\

-	{$(INCLUDE)}"\.\include\ast_expression.h"\

-	{$(INCLUDE)}"\.\include\ast_extern.h"\

-	{$(INCLUDE)}"\.\include\ast_field.h"\

-	{$(INCLUDE)}"\.\include\ast_generator.h"\

-	{$(INCLUDE)}"\.\include\ast_interface.h"\

-	{$(INCLUDE)}"\.\include\ast_interface_fwd.h"\

-	{$(INCLUDE)}"\.\include\ast_module.h"\

-	{$(INCLUDE)}"\.\include\ast_operation.h"\

-	{$(INCLUDE)}"\.\include\ast_predefined_type.h"\

-	{$(INCLUDE)}"\.\include\ast_root.h"\

-	{$(INCLUDE)}"\.\include\ast_sequence.h"\

-	{$(INCLUDE)}"\.\include\ast_string.h"\

-	{$(INCLUDE)}"\.\include\ast_structure.h"\

-	{$(INCLUDE)}"\.\include\ast_type.h"\

-	{$(INCLUDE)}"\.\include\ast_typedef.h"\

-	{$(INCLUDE)}"\.\include\ast_union.h"\

-	{$(INCLUDE)}"\.\include\ast_union_branch.h"\

-	{$(INCLUDE)}"\.\include\ast_union_label.h"\

-	{$(INCLUDE)}"\.\include\be_extern.h"\

-	{$(INCLUDE)}"\.\include\drv_extern.h"\

-	{$(INCLUDE)}"\.\include\fe_extern.h"\

-	{$(INCLUDE)}"\.\include\global_extern.h"\

-	{$(INCLUDE)}"\.\include\idl_bool.h"\

-	{$(INCLUDE)}"\.\include\idl_defines.h"\

-	{$(INCLUDE)}"\.\include\idl_fwd.h"\

-	{$(INCLUDE)}"\.\include\idl_global.h"\

-	{$(INCLUDE)}"\.\include\idl_narrow.h"\

-	{$(INCLUDE)}"\.\include\intlmacros.h"\

-	{$(INCLUDE)}"\.\include\nr_extern.h"\

-	{$(INCLUDE)}"\.\include\util.h"\

-	{$(INCLUDE)}"\.\include\utl_decllist.h"\

-	{$(INCLUDE)}"\.\include\utl_error.h"\

-	{$(INCLUDE)}"\.\include\utl_exceptlist.h"\

-	{$(INCLUDE)}"\.\include\utl_exprlist.h"\

-	{$(INCLUDE)}"\.\include\utl_identifier.h"\

-	{$(INCLUDE)}"\.\include\utl_idlist.h"\

-	{$(INCLUDE)}"\.\include\utl_indenter.h"\

-	{$(INCLUDE)}"\.\include\utl_labellist.h"\

-	{$(INCLUDE)}"\.\include\utl_list.h"\

-	{$(INCLUDE)}"\.\include\utl_namelist.h"\

-	{$(INCLUDE)}"\.\include\utl_scope.h"\

-	{$(INCLUDE)}"\.\include\utl_scoped_name.h"\

-	{$(INCLUDE)}"\.\include\utl_stack.h"\

-	{$(INCLUDE)}"\.\include\utl_string.h"\

-	{$(INCLUDE)}"\.\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\be_root.obj" : $(SOURCE) $(DEP_CPP_BE_RO) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\be\be_scope.cpp

-DEP_CPP_BE_SC=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Atomic_Op.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/Event_Handler.h"\

-	"..\..\ace/Event_Handler.i"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/Singleton.cpp"\

-	"..\..\ace/Singleton.h"\

-	"..\..\ace/Singleton.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/stdcpp.h"\

-	"..\..\ace/SV_Semaphore_Complex.h"\

-	"..\..\ace/SV_Semaphore_Complex.i"\

-	"..\..\ace/SV_Semaphore_Simple.h"\

-	"..\..\ace/SV_Semaphore_Simple.i"\

-	"..\..\ace/Synch.h"\

-	"..\..\ace/Synch.i"\

-	"..\..\ace/Synch_T.cpp"\

-	"..\..\ace/Synch_T.h"\

-	"..\..\ace/Synch_T.i"\

-	"..\..\ace/Thread.h"\

-	"..\..\ace/Thread.i"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\be_include\be.h"\

-	".\include\idl.h"\

-	".\include\idl_extern.h"\

-	{$(INCLUDE)}"\.\be_include\be_argument.h"\

-	{$(INCLUDE)}"\.\be_include\be_array.h"\

-	{$(INCLUDE)}"\.\be_include\be_attribute.h"\

-	{$(INCLUDE)}"\.\be_include\be_codegen.h"\

-	{$(INCLUDE)}"\.\be_include\be_constant.h"\

-	{$(INCLUDE)}"\.\be_include\be_decl.h"\

-	{$(INCLUDE)}"\.\be_include\be_enum.h"\

-	{$(INCLUDE)}"\.\be_include\be_enum_val.h"\

-	{$(INCLUDE)}"\.\be_include\be_exception.h"\

-	{$(INCLUDE)}"\.\be_include\be_expression.h"\

-	{$(INCLUDE)}"\.\be_include\be_factory.h"\

-	{$(INCLUDE)}"\.\be_include\be_field.h"\

-	{$(INCLUDE)}"\.\be_include\be_generator.h"\

-	{$(INCLUDE)}"\.\be_include\be_helper.h"\

-	{$(INCLUDE)}"\.\be_include\be_interface.h"\

-	{$(INCLUDE)}"\.\be_include\be_interface_fwd.h"\

-	{$(INCLUDE)}"\.\be_include\be_module.h"\

-	{$(INCLUDE)}"\.\be_include\be_operation.h"\

-	{$(INCLUDE)}"\.\be_include\be_predefined_type.h"\

-	{$(INCLUDE)}"\.\be_include\be_root.h"\

-	{$(INCLUDE)}"\.\be_include\be_scope.h"\

-	{$(INCLUDE)}"\.\be_include\be_sequence.h"\

-	{$(INCLUDE)}"\.\be_include\be_state.h"\

-	{$(INCLUDE)}"\.\be_include\be_string.h"\

-	{$(INCLUDE)}"\.\be_include\be_structure.h"\

-	{$(INCLUDE)}"\.\be_include\be_type.h"\

-	{$(INCLUDE)}"\.\be_include\be_typedef.h"\

-	{$(INCLUDE)}"\.\be_include\be_union.h"\

-	{$(INCLUDE)}"\.\be_include\be_union_branch.h"\

-	{$(INCLUDE)}"\.\be_include\be_union_label.h"\

-	{$(INCLUDE)}"\.\include\ast.h"\

-	{$(INCLUDE)}"\.\include\ast_argument.h"\

-	{$(INCLUDE)}"\.\include\ast_array.h"\

-	{$(INCLUDE)}"\.\include\ast_attribute.h"\

-	{$(INCLUDE)}"\.\include\ast_concrete_type.h"\

-	{$(INCLUDE)}"\.\include\ast_constant.h"\

-	{$(INCLUDE)}"\.\include\ast_decl.h"\

-	{$(INCLUDE)}"\.\include\ast_enum.h"\

-	{$(INCLUDE)}"\.\include\ast_enum_val.h"\

-	{$(INCLUDE)}"\.\include\ast_exception.h"\

-	{$(INCLUDE)}"\.\include\ast_expression.h"\

-	{$(INCLUDE)}"\.\include\ast_extern.h"\

-	{$(INCLUDE)}"\.\include\ast_field.h"\

-	{$(INCLUDE)}"\.\include\ast_generator.h"\

-	{$(INCLUDE)}"\.\include\ast_interface.h"\

-	{$(INCLUDE)}"\.\include\ast_interface_fwd.h"\

-	{$(INCLUDE)}"\.\include\ast_module.h"\

-	{$(INCLUDE)}"\.\include\ast_operation.h"\

-	{$(INCLUDE)}"\.\include\ast_predefined_type.h"\

-	{$(INCLUDE)}"\.\include\ast_root.h"\

-	{$(INCLUDE)}"\.\include\ast_sequence.h"\

-	{$(INCLUDE)}"\.\include\ast_string.h"\

-	{$(INCLUDE)}"\.\include\ast_structure.h"\

-	{$(INCLUDE)}"\.\include\ast_type.h"\

-	{$(INCLUDE)}"\.\include\ast_typedef.h"\

-	{$(INCLUDE)}"\.\include\ast_union.h"\

-	{$(INCLUDE)}"\.\include\ast_union_branch.h"\

-	{$(INCLUDE)}"\.\include\ast_union_label.h"\

-	{$(INCLUDE)}"\.\include\be_extern.h"\

-	{$(INCLUDE)}"\.\include\drv_extern.h"\

-	{$(INCLUDE)}"\.\include\fe_extern.h"\

-	{$(INCLUDE)}"\.\include\global_extern.h"\

-	{$(INCLUDE)}"\.\include\idl_bool.h"\

-	{$(INCLUDE)}"\.\include\idl_defines.h"\

-	{$(INCLUDE)}"\.\include\idl_fwd.h"\

-	{$(INCLUDE)}"\.\include\idl_global.h"\

-	{$(INCLUDE)}"\.\include\idl_narrow.h"\

-	{$(INCLUDE)}"\.\include\intlmacros.h"\

-	{$(INCLUDE)}"\.\include\nr_extern.h"\

-	{$(INCLUDE)}"\.\include\util.h"\

-	{$(INCLUDE)}"\.\include\utl_decllist.h"\

-	{$(INCLUDE)}"\.\include\utl_error.h"\

-	{$(INCLUDE)}"\.\include\utl_exceptlist.h"\

-	{$(INCLUDE)}"\.\include\utl_exprlist.h"\

-	{$(INCLUDE)}"\.\include\utl_identifier.h"\

-	{$(INCLUDE)}"\.\include\utl_idlist.h"\

-	{$(INCLUDE)}"\.\include\utl_indenter.h"\

-	{$(INCLUDE)}"\.\include\utl_labellist.h"\

-	{$(INCLUDE)}"\.\include\utl_list.h"\

-	{$(INCLUDE)}"\.\include\utl_namelist.h"\

-	{$(INCLUDE)}"\.\include\utl_scope.h"\

-	{$(INCLUDE)}"\.\include\utl_scoped_name.h"\

-	{$(INCLUDE)}"\.\include\utl_stack.h"\

-	{$(INCLUDE)}"\.\include\utl_string.h"\

-	{$(INCLUDE)}"\.\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\be_scope.obj" : $(SOURCE) $(DEP_CPP_BE_SC) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\be\be_sequence.cpp

-DEP_CPP_BE_SE=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Atomic_Op.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/Event_Handler.h"\

-	"..\..\ace/Event_Handler.i"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/Singleton.cpp"\

-	"..\..\ace/Singleton.h"\

-	"..\..\ace/Singleton.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/stdcpp.h"\

-	"..\..\ace/SV_Semaphore_Complex.h"\

-	"..\..\ace/SV_Semaphore_Complex.i"\

-	"..\..\ace/SV_Semaphore_Simple.h"\

-	"..\..\ace/SV_Semaphore_Simple.i"\

-	"..\..\ace/Synch.h"\

-	"..\..\ace/Synch.i"\

-	"..\..\ace/Synch_T.cpp"\

-	"..\..\ace/Synch_T.h"\

-	"..\..\ace/Synch_T.i"\

-	"..\..\ace/Thread.h"\

-	"..\..\ace/Thread.i"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\be_include\be.h"\

-	".\include\idl.h"\

-	".\include\idl_extern.h"\

-	{$(INCLUDE)}"\.\be_include\be_argument.h"\

-	{$(INCLUDE)}"\.\be_include\be_array.h"\

-	{$(INCLUDE)}"\.\be_include\be_attribute.h"\

-	{$(INCLUDE)}"\.\be_include\be_codegen.h"\

-	{$(INCLUDE)}"\.\be_include\be_constant.h"\

-	{$(INCLUDE)}"\.\be_include\be_decl.h"\

-	{$(INCLUDE)}"\.\be_include\be_enum.h"\

-	{$(INCLUDE)}"\.\be_include\be_enum_val.h"\

-	{$(INCLUDE)}"\.\be_include\be_exception.h"\

-	{$(INCLUDE)}"\.\be_include\be_expression.h"\

-	{$(INCLUDE)}"\.\be_include\be_factory.h"\

-	{$(INCLUDE)}"\.\be_include\be_field.h"\

-	{$(INCLUDE)}"\.\be_include\be_generator.h"\

-	{$(INCLUDE)}"\.\be_include\be_helper.h"\

-	{$(INCLUDE)}"\.\be_include\be_interface.h"\

-	{$(INCLUDE)}"\.\be_include\be_interface_fwd.h"\

-	{$(INCLUDE)}"\.\be_include\be_module.h"\

-	{$(INCLUDE)}"\.\be_include\be_operation.h"\

-	{$(INCLUDE)}"\.\be_include\be_predefined_type.h"\

-	{$(INCLUDE)}"\.\be_include\be_root.h"\

-	{$(INCLUDE)}"\.\be_include\be_scope.h"\

-	{$(INCLUDE)}"\.\be_include\be_sequence.h"\

-	{$(INCLUDE)}"\.\be_include\be_state.h"\

-	{$(INCLUDE)}"\.\be_include\be_string.h"\

-	{$(INCLUDE)}"\.\be_include\be_structure.h"\

-	{$(INCLUDE)}"\.\be_include\be_type.h"\

-	{$(INCLUDE)}"\.\be_include\be_typedef.h"\

-	{$(INCLUDE)}"\.\be_include\be_union.h"\

-	{$(INCLUDE)}"\.\be_include\be_union_branch.h"\

-	{$(INCLUDE)}"\.\be_include\be_union_label.h"\

-	{$(INCLUDE)}"\.\include\ast.h"\

-	{$(INCLUDE)}"\.\include\ast_argument.h"\

-	{$(INCLUDE)}"\.\include\ast_array.h"\

-	{$(INCLUDE)}"\.\include\ast_attribute.h"\

-	{$(INCLUDE)}"\.\include\ast_concrete_type.h"\

-	{$(INCLUDE)}"\.\include\ast_constant.h"\

-	{$(INCLUDE)}"\.\include\ast_decl.h"\

-	{$(INCLUDE)}"\.\include\ast_enum.h"\

-	{$(INCLUDE)}"\.\include\ast_enum_val.h"\

-	{$(INCLUDE)}"\.\include\ast_exception.h"\

-	{$(INCLUDE)}"\.\include\ast_expression.h"\

-	{$(INCLUDE)}"\.\include\ast_extern.h"\

-	{$(INCLUDE)}"\.\include\ast_field.h"\

-	{$(INCLUDE)}"\.\include\ast_generator.h"\

-	{$(INCLUDE)}"\.\include\ast_interface.h"\

-	{$(INCLUDE)}"\.\include\ast_interface_fwd.h"\

-	{$(INCLUDE)}"\.\include\ast_module.h"\

-	{$(INCLUDE)}"\.\include\ast_operation.h"\

-	{$(INCLUDE)}"\.\include\ast_predefined_type.h"\

-	{$(INCLUDE)}"\.\include\ast_root.h"\

-	{$(INCLUDE)}"\.\include\ast_sequence.h"\

-	{$(INCLUDE)}"\.\include\ast_string.h"\

-	{$(INCLUDE)}"\.\include\ast_structure.h"\

-	{$(INCLUDE)}"\.\include\ast_type.h"\

-	{$(INCLUDE)}"\.\include\ast_typedef.h"\

-	{$(INCLUDE)}"\.\include\ast_union.h"\

-	{$(INCLUDE)}"\.\include\ast_union_branch.h"\

-	{$(INCLUDE)}"\.\include\ast_union_label.h"\

-	{$(INCLUDE)}"\.\include\be_extern.h"\

-	{$(INCLUDE)}"\.\include\drv_extern.h"\

-	{$(INCLUDE)}"\.\include\fe_extern.h"\

-	{$(INCLUDE)}"\.\include\global_extern.h"\

-	{$(INCLUDE)}"\.\include\idl_bool.h"\

-	{$(INCLUDE)}"\.\include\idl_defines.h"\

-	{$(INCLUDE)}"\.\include\idl_fwd.h"\

-	{$(INCLUDE)}"\.\include\idl_global.h"\

-	{$(INCLUDE)}"\.\include\idl_narrow.h"\

-	{$(INCLUDE)}"\.\include\intlmacros.h"\

-	{$(INCLUDE)}"\.\include\nr_extern.h"\

-	{$(INCLUDE)}"\.\include\util.h"\

-	{$(INCLUDE)}"\.\include\utl_decllist.h"\

-	{$(INCLUDE)}"\.\include\utl_error.h"\

-	{$(INCLUDE)}"\.\include\utl_exceptlist.h"\

-	{$(INCLUDE)}"\.\include\utl_exprlist.h"\

-	{$(INCLUDE)}"\.\include\utl_identifier.h"\

-	{$(INCLUDE)}"\.\include\utl_idlist.h"\

-	{$(INCLUDE)}"\.\include\utl_indenter.h"\

-	{$(INCLUDE)}"\.\include\utl_labellist.h"\

-	{$(INCLUDE)}"\.\include\utl_list.h"\

-	{$(INCLUDE)}"\.\include\utl_namelist.h"\

-	{$(INCLUDE)}"\.\include\utl_scope.h"\

-	{$(INCLUDE)}"\.\include\utl_scoped_name.h"\

-	{$(INCLUDE)}"\.\include\utl_stack.h"\

-	{$(INCLUDE)}"\.\include\utl_string.h"\

-	{$(INCLUDE)}"\.\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\be_sequence.obj" : $(SOURCE) $(DEP_CPP_BE_SE) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\be\be_state.cpp

-DEP_CPP_BE_ST=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Atomic_Op.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/Event_Handler.h"\

-	"..\..\ace/Event_Handler.i"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/Singleton.cpp"\

-	"..\..\ace/Singleton.h"\

-	"..\..\ace/Singleton.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/stdcpp.h"\

-	"..\..\ace/SV_Semaphore_Complex.h"\

-	"..\..\ace/SV_Semaphore_Complex.i"\

-	"..\..\ace/SV_Semaphore_Simple.h"\

-	"..\..\ace/SV_Semaphore_Simple.i"\

-	"..\..\ace/Synch.h"\

-	"..\..\ace/Synch.i"\

-	"..\..\ace/Synch_T.cpp"\

-	"..\..\ace/Synch_T.h"\

-	"..\..\ace/Synch_T.i"\

-	"..\..\ace/Thread.h"\

-	"..\..\ace/Thread.i"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\be_include\be.h"\

-	".\include\idl.h"\

-	".\include\idl_extern.h"\

-	{$(INCLUDE)}"\.\be_include\be_argument.h"\

-	{$(INCLUDE)}"\.\be_include\be_array.h"\

-	{$(INCLUDE)}"\.\be_include\be_attribute.h"\

-	{$(INCLUDE)}"\.\be_include\be_codegen.h"\

-	{$(INCLUDE)}"\.\be_include\be_constant.h"\

-	{$(INCLUDE)}"\.\be_include\be_decl.h"\

-	{$(INCLUDE)}"\.\be_include\be_enum.h"\

-	{$(INCLUDE)}"\.\be_include\be_enum_val.h"\

-	{$(INCLUDE)}"\.\be_include\be_exception.h"\

-	{$(INCLUDE)}"\.\be_include\be_expression.h"\

-	{$(INCLUDE)}"\.\be_include\be_factory.h"\

-	{$(INCLUDE)}"\.\be_include\be_field.h"\

-	{$(INCLUDE)}"\.\be_include\be_generator.h"\

-	{$(INCLUDE)}"\.\be_include\be_helper.h"\

-	{$(INCLUDE)}"\.\be_include\be_interface.h"\

-	{$(INCLUDE)}"\.\be_include\be_interface_fwd.h"\

-	{$(INCLUDE)}"\.\be_include\be_module.h"\

-	{$(INCLUDE)}"\.\be_include\be_operation.h"\

-	{$(INCLUDE)}"\.\be_include\be_predefined_type.h"\

-	{$(INCLUDE)}"\.\be_include\be_root.h"\

-	{$(INCLUDE)}"\.\be_include\be_scope.h"\

-	{$(INCLUDE)}"\.\be_include\be_sequence.h"\

-	{$(INCLUDE)}"\.\be_include\be_state.h"\

-	{$(INCLUDE)}"\.\be_include\be_string.h"\

-	{$(INCLUDE)}"\.\be_include\be_structure.h"\

-	{$(INCLUDE)}"\.\be_include\be_type.h"\

-	{$(INCLUDE)}"\.\be_include\be_typedef.h"\

-	{$(INCLUDE)}"\.\be_include\be_union.h"\

-	{$(INCLUDE)}"\.\be_include\be_union_branch.h"\

-	{$(INCLUDE)}"\.\be_include\be_union_label.h"\

-	{$(INCLUDE)}"\.\include\ast.h"\

-	{$(INCLUDE)}"\.\include\ast_argument.h"\

-	{$(INCLUDE)}"\.\include\ast_array.h"\

-	{$(INCLUDE)}"\.\include\ast_attribute.h"\

-	{$(INCLUDE)}"\.\include\ast_concrete_type.h"\

-	{$(INCLUDE)}"\.\include\ast_constant.h"\

-	{$(INCLUDE)}"\.\include\ast_decl.h"\

-	{$(INCLUDE)}"\.\include\ast_enum.h"\

-	{$(INCLUDE)}"\.\include\ast_enum_val.h"\

-	{$(INCLUDE)}"\.\include\ast_exception.h"\

-	{$(INCLUDE)}"\.\include\ast_expression.h"\

-	{$(INCLUDE)}"\.\include\ast_extern.h"\

-	{$(INCLUDE)}"\.\include\ast_field.h"\

-	{$(INCLUDE)}"\.\include\ast_generator.h"\

-	{$(INCLUDE)}"\.\include\ast_interface.h"\

-	{$(INCLUDE)}"\.\include\ast_interface_fwd.h"\

-	{$(INCLUDE)}"\.\include\ast_module.h"\

-	{$(INCLUDE)}"\.\include\ast_operation.h"\

-	{$(INCLUDE)}"\.\include\ast_predefined_type.h"\

-	{$(INCLUDE)}"\.\include\ast_root.h"\

-	{$(INCLUDE)}"\.\include\ast_sequence.h"\

-	{$(INCLUDE)}"\.\include\ast_string.h"\

-	{$(INCLUDE)}"\.\include\ast_structure.h"\

-	{$(INCLUDE)}"\.\include\ast_type.h"\

-	{$(INCLUDE)}"\.\include\ast_typedef.h"\

-	{$(INCLUDE)}"\.\include\ast_union.h"\

-	{$(INCLUDE)}"\.\include\ast_union_branch.h"\

-	{$(INCLUDE)}"\.\include\ast_union_label.h"\

-	{$(INCLUDE)}"\.\include\be_extern.h"\

-	{$(INCLUDE)}"\.\include\drv_extern.h"\

-	{$(INCLUDE)}"\.\include\fe_extern.h"\

-	{$(INCLUDE)}"\.\include\global_extern.h"\

-	{$(INCLUDE)}"\.\include\idl_bool.h"\

-	{$(INCLUDE)}"\.\include\idl_defines.h"\

-	{$(INCLUDE)}"\.\include\idl_fwd.h"\

-	{$(INCLUDE)}"\.\include\idl_global.h"\

-	{$(INCLUDE)}"\.\include\idl_narrow.h"\

-	{$(INCLUDE)}"\.\include\intlmacros.h"\

-	{$(INCLUDE)}"\.\include\nr_extern.h"\

-	{$(INCLUDE)}"\.\include\util.h"\

-	{$(INCLUDE)}"\.\include\utl_decllist.h"\

-	{$(INCLUDE)}"\.\include\utl_error.h"\

-	{$(INCLUDE)}"\.\include\utl_exceptlist.h"\

-	{$(INCLUDE)}"\.\include\utl_exprlist.h"\

-	{$(INCLUDE)}"\.\include\utl_identifier.h"\

-	{$(INCLUDE)}"\.\include\utl_idlist.h"\

-	{$(INCLUDE)}"\.\include\utl_indenter.h"\

-	{$(INCLUDE)}"\.\include\utl_labellist.h"\

-	{$(INCLUDE)}"\.\include\utl_list.h"\

-	{$(INCLUDE)}"\.\include\utl_namelist.h"\

-	{$(INCLUDE)}"\.\include\utl_scope.h"\

-	{$(INCLUDE)}"\.\include\utl_scoped_name.h"\

-	{$(INCLUDE)}"\.\include\utl_stack.h"\

-	{$(INCLUDE)}"\.\include\utl_string.h"\

-	{$(INCLUDE)}"\.\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\be_state.obj" : $(SOURCE) $(DEP_CPP_BE_ST) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\be\be_string.cpp

-DEP_CPP_BE_STR=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Atomic_Op.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/Event_Handler.h"\

-	"..\..\ace/Event_Handler.i"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/Singleton.cpp"\

-	"..\..\ace/Singleton.h"\

-	"..\..\ace/Singleton.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/stdcpp.h"\

-	"..\..\ace/SV_Semaphore_Complex.h"\

-	"..\..\ace/SV_Semaphore_Complex.i"\

-	"..\..\ace/SV_Semaphore_Simple.h"\

-	"..\..\ace/SV_Semaphore_Simple.i"\

-	"..\..\ace/Synch.h"\

-	"..\..\ace/Synch.i"\

-	"..\..\ace/Synch_T.cpp"\

-	"..\..\ace/Synch_T.h"\

-	"..\..\ace/Synch_T.i"\

-	"..\..\ace/Thread.h"\

-	"..\..\ace/Thread.i"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\be_include\be.h"\

-	".\include\idl.h"\

-	".\include\idl_extern.h"\

-	{$(INCLUDE)}"\.\be_include\be_argument.h"\

-	{$(INCLUDE)}"\.\be_include\be_array.h"\

-	{$(INCLUDE)}"\.\be_include\be_attribute.h"\

-	{$(INCLUDE)}"\.\be_include\be_codegen.h"\

-	{$(INCLUDE)}"\.\be_include\be_constant.h"\

-	{$(INCLUDE)}"\.\be_include\be_decl.h"\

-	{$(INCLUDE)}"\.\be_include\be_enum.h"\

-	{$(INCLUDE)}"\.\be_include\be_enum_val.h"\

-	{$(INCLUDE)}"\.\be_include\be_exception.h"\

-	{$(INCLUDE)}"\.\be_include\be_expression.h"\

-	{$(INCLUDE)}"\.\be_include\be_factory.h"\

-	{$(INCLUDE)}"\.\be_include\be_field.h"\

-	{$(INCLUDE)}"\.\be_include\be_generator.h"\

-	{$(INCLUDE)}"\.\be_include\be_helper.h"\

-	{$(INCLUDE)}"\.\be_include\be_interface.h"\

-	{$(INCLUDE)}"\.\be_include\be_interface_fwd.h"\

-	{$(INCLUDE)}"\.\be_include\be_module.h"\

-	{$(INCLUDE)}"\.\be_include\be_operation.h"\

-	{$(INCLUDE)}"\.\be_include\be_predefined_type.h"\

-	{$(INCLUDE)}"\.\be_include\be_root.h"\

-	{$(INCLUDE)}"\.\be_include\be_scope.h"\

-	{$(INCLUDE)}"\.\be_include\be_sequence.h"\

-	{$(INCLUDE)}"\.\be_include\be_state.h"\

-	{$(INCLUDE)}"\.\be_include\be_string.h"\

-	{$(INCLUDE)}"\.\be_include\be_structure.h"\

-	{$(INCLUDE)}"\.\be_include\be_type.h"\

-	{$(INCLUDE)}"\.\be_include\be_typedef.h"\

-	{$(INCLUDE)}"\.\be_include\be_union.h"\

-	{$(INCLUDE)}"\.\be_include\be_union_branch.h"\

-	{$(INCLUDE)}"\.\be_include\be_union_label.h"\

-	{$(INCLUDE)}"\.\include\ast.h"\

-	{$(INCLUDE)}"\.\include\ast_argument.h"\

-	{$(INCLUDE)}"\.\include\ast_array.h"\

-	{$(INCLUDE)}"\.\include\ast_attribute.h"\

-	{$(INCLUDE)}"\.\include\ast_concrete_type.h"\

-	{$(INCLUDE)}"\.\include\ast_constant.h"\

-	{$(INCLUDE)}"\.\include\ast_decl.h"\

-	{$(INCLUDE)}"\.\include\ast_enum.h"\

-	{$(INCLUDE)}"\.\include\ast_enum_val.h"\

-	{$(INCLUDE)}"\.\include\ast_exception.h"\

-	{$(INCLUDE)}"\.\include\ast_expression.h"\

-	{$(INCLUDE)}"\.\include\ast_extern.h"\

-	{$(INCLUDE)}"\.\include\ast_field.h"\

-	{$(INCLUDE)}"\.\include\ast_generator.h"\

-	{$(INCLUDE)}"\.\include\ast_interface.h"\

-	{$(INCLUDE)}"\.\include\ast_interface_fwd.h"\

-	{$(INCLUDE)}"\.\include\ast_module.h"\

-	{$(INCLUDE)}"\.\include\ast_operation.h"\

-	{$(INCLUDE)}"\.\include\ast_predefined_type.h"\

-	{$(INCLUDE)}"\.\include\ast_root.h"\

-	{$(INCLUDE)}"\.\include\ast_sequence.h"\

-	{$(INCLUDE)}"\.\include\ast_string.h"\

-	{$(INCLUDE)}"\.\include\ast_structure.h"\

-	{$(INCLUDE)}"\.\include\ast_type.h"\

-	{$(INCLUDE)}"\.\include\ast_typedef.h"\

-	{$(INCLUDE)}"\.\include\ast_union.h"\

-	{$(INCLUDE)}"\.\include\ast_union_branch.h"\

-	{$(INCLUDE)}"\.\include\ast_union_label.h"\

-	{$(INCLUDE)}"\.\include\be_extern.h"\

-	{$(INCLUDE)}"\.\include\drv_extern.h"\

-	{$(INCLUDE)}"\.\include\fe_extern.h"\

-	{$(INCLUDE)}"\.\include\global_extern.h"\

-	{$(INCLUDE)}"\.\include\idl_bool.h"\

-	{$(INCLUDE)}"\.\include\idl_defines.h"\

-	{$(INCLUDE)}"\.\include\idl_fwd.h"\

-	{$(INCLUDE)}"\.\include\idl_global.h"\

-	{$(INCLUDE)}"\.\include\idl_narrow.h"\

-	{$(INCLUDE)}"\.\include\intlmacros.h"\

-	{$(INCLUDE)}"\.\include\nr_extern.h"\

-	{$(INCLUDE)}"\.\include\util.h"\

-	{$(INCLUDE)}"\.\include\utl_decllist.h"\

-	{$(INCLUDE)}"\.\include\utl_error.h"\

-	{$(INCLUDE)}"\.\include\utl_exceptlist.h"\

-	{$(INCLUDE)}"\.\include\utl_exprlist.h"\

-	{$(INCLUDE)}"\.\include\utl_identifier.h"\

-	{$(INCLUDE)}"\.\include\utl_idlist.h"\

-	{$(INCLUDE)}"\.\include\utl_indenter.h"\

-	{$(INCLUDE)}"\.\include\utl_labellist.h"\

-	{$(INCLUDE)}"\.\include\utl_list.h"\

-	{$(INCLUDE)}"\.\include\utl_namelist.h"\

-	{$(INCLUDE)}"\.\include\utl_scope.h"\

-	{$(INCLUDE)}"\.\include\utl_scoped_name.h"\

-	{$(INCLUDE)}"\.\include\utl_stack.h"\

-	{$(INCLUDE)}"\.\include\utl_string.h"\

-	{$(INCLUDE)}"\.\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\be_string.obj" : $(SOURCE) $(DEP_CPP_BE_STR) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\be\be_structure.cpp

-DEP_CPP_BE_STRU=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Atomic_Op.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/Event_Handler.h"\

-	"..\..\ace/Event_Handler.i"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/Singleton.cpp"\

-	"..\..\ace/Singleton.h"\

-	"..\..\ace/Singleton.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/stdcpp.h"\

-	"..\..\ace/SV_Semaphore_Complex.h"\

-	"..\..\ace/SV_Semaphore_Complex.i"\

-	"..\..\ace/SV_Semaphore_Simple.h"\

-	"..\..\ace/SV_Semaphore_Simple.i"\

-	"..\..\ace/Synch.h"\

-	"..\..\ace/Synch.i"\

-	"..\..\ace/Synch_T.cpp"\

-	"..\..\ace/Synch_T.h"\

-	"..\..\ace/Synch_T.i"\

-	"..\..\ace/Thread.h"\

-	"..\..\ace/Thread.i"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\be_include\be.h"\

-	".\include\idl.h"\

-	".\include\idl_extern.h"\

-	{$(INCLUDE)}"\.\be_include\be_argument.h"\

-	{$(INCLUDE)}"\.\be_include\be_array.h"\

-	{$(INCLUDE)}"\.\be_include\be_attribute.h"\

-	{$(INCLUDE)}"\.\be_include\be_codegen.h"\

-	{$(INCLUDE)}"\.\be_include\be_constant.h"\

-	{$(INCLUDE)}"\.\be_include\be_decl.h"\

-	{$(INCLUDE)}"\.\be_include\be_enum.h"\

-	{$(INCLUDE)}"\.\be_include\be_enum_val.h"\

-	{$(INCLUDE)}"\.\be_include\be_exception.h"\

-	{$(INCLUDE)}"\.\be_include\be_expression.h"\

-	{$(INCLUDE)}"\.\be_include\be_factory.h"\

-	{$(INCLUDE)}"\.\be_include\be_field.h"\

-	{$(INCLUDE)}"\.\be_include\be_generator.h"\

-	{$(INCLUDE)}"\.\be_include\be_helper.h"\

-	{$(INCLUDE)}"\.\be_include\be_interface.h"\

-	{$(INCLUDE)}"\.\be_include\be_interface_fwd.h"\

-	{$(INCLUDE)}"\.\be_include\be_module.h"\

-	{$(INCLUDE)}"\.\be_include\be_operation.h"\

-	{$(INCLUDE)}"\.\be_include\be_predefined_type.h"\

-	{$(INCLUDE)}"\.\be_include\be_root.h"\

-	{$(INCLUDE)}"\.\be_include\be_scope.h"\

-	{$(INCLUDE)}"\.\be_include\be_sequence.h"\

-	{$(INCLUDE)}"\.\be_include\be_state.h"\

-	{$(INCLUDE)}"\.\be_include\be_string.h"\

-	{$(INCLUDE)}"\.\be_include\be_structure.h"\

-	{$(INCLUDE)}"\.\be_include\be_type.h"\

-	{$(INCLUDE)}"\.\be_include\be_typedef.h"\

-	{$(INCLUDE)}"\.\be_include\be_union.h"\

-	{$(INCLUDE)}"\.\be_include\be_union_branch.h"\

-	{$(INCLUDE)}"\.\be_include\be_union_label.h"\

-	{$(INCLUDE)}"\.\include\ast.h"\

-	{$(INCLUDE)}"\.\include\ast_argument.h"\

-	{$(INCLUDE)}"\.\include\ast_array.h"\

-	{$(INCLUDE)}"\.\include\ast_attribute.h"\

-	{$(INCLUDE)}"\.\include\ast_concrete_type.h"\

-	{$(INCLUDE)}"\.\include\ast_constant.h"\

-	{$(INCLUDE)}"\.\include\ast_decl.h"\

-	{$(INCLUDE)}"\.\include\ast_enum.h"\

-	{$(INCLUDE)}"\.\include\ast_enum_val.h"\

-	{$(INCLUDE)}"\.\include\ast_exception.h"\

-	{$(INCLUDE)}"\.\include\ast_expression.h"\

-	{$(INCLUDE)}"\.\include\ast_extern.h"\

-	{$(INCLUDE)}"\.\include\ast_field.h"\

-	{$(INCLUDE)}"\.\include\ast_generator.h"\

-	{$(INCLUDE)}"\.\include\ast_interface.h"\

-	{$(INCLUDE)}"\.\include\ast_interface_fwd.h"\

-	{$(INCLUDE)}"\.\include\ast_module.h"\

-	{$(INCLUDE)}"\.\include\ast_operation.h"\

-	{$(INCLUDE)}"\.\include\ast_predefined_type.h"\

-	{$(INCLUDE)}"\.\include\ast_root.h"\

-	{$(INCLUDE)}"\.\include\ast_sequence.h"\

-	{$(INCLUDE)}"\.\include\ast_string.h"\

-	{$(INCLUDE)}"\.\include\ast_structure.h"\

-	{$(INCLUDE)}"\.\include\ast_type.h"\

-	{$(INCLUDE)}"\.\include\ast_typedef.h"\

-	{$(INCLUDE)}"\.\include\ast_union.h"\

-	{$(INCLUDE)}"\.\include\ast_union_branch.h"\

-	{$(INCLUDE)}"\.\include\ast_union_label.h"\

-	{$(INCLUDE)}"\.\include\be_extern.h"\

-	{$(INCLUDE)}"\.\include\drv_extern.h"\

-	{$(INCLUDE)}"\.\include\fe_extern.h"\

-	{$(INCLUDE)}"\.\include\global_extern.h"\

-	{$(INCLUDE)}"\.\include\idl_bool.h"\

-	{$(INCLUDE)}"\.\include\idl_defines.h"\

-	{$(INCLUDE)}"\.\include\idl_fwd.h"\

-	{$(INCLUDE)}"\.\include\idl_global.h"\

-	{$(INCLUDE)}"\.\include\idl_narrow.h"\

-	{$(INCLUDE)}"\.\include\intlmacros.h"\

-	{$(INCLUDE)}"\.\include\nr_extern.h"\

-	{$(INCLUDE)}"\.\include\util.h"\

-	{$(INCLUDE)}"\.\include\utl_decllist.h"\

-	{$(INCLUDE)}"\.\include\utl_error.h"\

-	{$(INCLUDE)}"\.\include\utl_exceptlist.h"\

-	{$(INCLUDE)}"\.\include\utl_exprlist.h"\

-	{$(INCLUDE)}"\.\include\utl_identifier.h"\

-	{$(INCLUDE)}"\.\include\utl_idlist.h"\

-	{$(INCLUDE)}"\.\include\utl_indenter.h"\

-	{$(INCLUDE)}"\.\include\utl_labellist.h"\

-	{$(INCLUDE)}"\.\include\utl_list.h"\

-	{$(INCLUDE)}"\.\include\utl_namelist.h"\

-	{$(INCLUDE)}"\.\include\utl_scope.h"\

-	{$(INCLUDE)}"\.\include\utl_scoped_name.h"\

-	{$(INCLUDE)}"\.\include\utl_stack.h"\

-	{$(INCLUDE)}"\.\include\utl_string.h"\

-	{$(INCLUDE)}"\.\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\be_structure.obj" : $(SOURCE) $(DEP_CPP_BE_STRU) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\be\be_sunsoft.cpp

-DEP_CPP_BE_SU=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Atomic_Op.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/Event_Handler.h"\

-	"..\..\ace/Event_Handler.i"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/Singleton.cpp"\

-	"..\..\ace/Singleton.h"\

-	"..\..\ace/Singleton.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/stdcpp.h"\

-	"..\..\ace/SV_Semaphore_Complex.h"\

-	"..\..\ace/SV_Semaphore_Complex.i"\

-	"..\..\ace/SV_Semaphore_Simple.h"\

-	"..\..\ace/SV_Semaphore_Simple.i"\

-	"..\..\ace/Synch.h"\

-	"..\..\ace/Synch.i"\

-	"..\..\ace/Synch_T.cpp"\

-	"..\..\ace/Synch_T.h"\

-	"..\..\ace/Synch_T.i"\

-	"..\..\ace/Thread.h"\

-	"..\..\ace/Thread.i"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\be_include\be.h"\

-	".\be_include\be_sunsoft.h"\

-	".\include\idl.h"\

-	".\include\idl_extern.h"\

-	{$(INCLUDE)}"\.\be_include\be_argument.h"\

-	{$(INCLUDE)}"\.\be_include\be_array.h"\

-	{$(INCLUDE)}"\.\be_include\be_attribute.h"\

-	{$(INCLUDE)}"\.\be_include\be_codegen.h"\

-	{$(INCLUDE)}"\.\be_include\be_constant.h"\

-	{$(INCLUDE)}"\.\be_include\be_decl.h"\

-	{$(INCLUDE)}"\.\be_include\be_enum.h"\

-	{$(INCLUDE)}"\.\be_include\be_enum_val.h"\

-	{$(INCLUDE)}"\.\be_include\be_exception.h"\

-	{$(INCLUDE)}"\.\be_include\be_expression.h"\

-	{$(INCLUDE)}"\.\be_include\be_factory.h"\

-	{$(INCLUDE)}"\.\be_include\be_field.h"\

-	{$(INCLUDE)}"\.\be_include\be_generator.h"\

-	{$(INCLUDE)}"\.\be_include\be_helper.h"\

-	{$(INCLUDE)}"\.\be_include\be_interface.h"\

-	{$(INCLUDE)}"\.\be_include\be_interface_fwd.h"\

-	{$(INCLUDE)}"\.\be_include\be_module.h"\

-	{$(INCLUDE)}"\.\be_include\be_operation.h"\

-	{$(INCLUDE)}"\.\be_include\be_predefined_type.h"\

-	{$(INCLUDE)}"\.\be_include\be_root.h"\

-	{$(INCLUDE)}"\.\be_include\be_scope.h"\

-	{$(INCLUDE)}"\.\be_include\be_sequence.h"\

-	{$(INCLUDE)}"\.\be_include\be_state.h"\

-	{$(INCLUDE)}"\.\be_include\be_string.h"\

-	{$(INCLUDE)}"\.\be_include\be_structure.h"\

-	{$(INCLUDE)}"\.\be_include\be_type.h"\

-	{$(INCLUDE)}"\.\be_include\be_typedef.h"\

-	{$(INCLUDE)}"\.\be_include\be_union.h"\

-	{$(INCLUDE)}"\.\be_include\be_union_branch.h"\

-	{$(INCLUDE)}"\.\be_include\be_union_label.h"\

-	{$(INCLUDE)}"\.\include\ast.h"\

-	{$(INCLUDE)}"\.\include\ast_argument.h"\

-	{$(INCLUDE)}"\.\include\ast_array.h"\

-	{$(INCLUDE)}"\.\include\ast_attribute.h"\

-	{$(INCLUDE)}"\.\include\ast_concrete_type.h"\

-	{$(INCLUDE)}"\.\include\ast_constant.h"\

-	{$(INCLUDE)}"\.\include\ast_decl.h"\

-	{$(INCLUDE)}"\.\include\ast_enum.h"\

-	{$(INCLUDE)}"\.\include\ast_enum_val.h"\

-	{$(INCLUDE)}"\.\include\ast_exception.h"\

-	{$(INCLUDE)}"\.\include\ast_expression.h"\

-	{$(INCLUDE)}"\.\include\ast_extern.h"\

-	{$(INCLUDE)}"\.\include\ast_field.h"\

-	{$(INCLUDE)}"\.\include\ast_generator.h"\

-	{$(INCLUDE)}"\.\include\ast_interface.h"\

-	{$(INCLUDE)}"\.\include\ast_interface_fwd.h"\

-	{$(INCLUDE)}"\.\include\ast_module.h"\

-	{$(INCLUDE)}"\.\include\ast_operation.h"\

-	{$(INCLUDE)}"\.\include\ast_predefined_type.h"\

-	{$(INCLUDE)}"\.\include\ast_root.h"\

-	{$(INCLUDE)}"\.\include\ast_sequence.h"\

-	{$(INCLUDE)}"\.\include\ast_string.h"\

-	{$(INCLUDE)}"\.\include\ast_structure.h"\

-	{$(INCLUDE)}"\.\include\ast_type.h"\

-	{$(INCLUDE)}"\.\include\ast_typedef.h"\

-	{$(INCLUDE)}"\.\include\ast_union.h"\

-	{$(INCLUDE)}"\.\include\ast_union_branch.h"\

-	{$(INCLUDE)}"\.\include\ast_union_label.h"\

-	{$(INCLUDE)}"\.\include\be_extern.h"\

-	{$(INCLUDE)}"\.\include\drv_extern.h"\

-	{$(INCLUDE)}"\.\include\fe_extern.h"\

-	{$(INCLUDE)}"\.\include\global_extern.h"\

-	{$(INCLUDE)}"\.\include\idl_bool.h"\

-	{$(INCLUDE)}"\.\include\idl_defines.h"\

-	{$(INCLUDE)}"\.\include\idl_fwd.h"\

-	{$(INCLUDE)}"\.\include\idl_global.h"\

-	{$(INCLUDE)}"\.\include\idl_narrow.h"\

-	{$(INCLUDE)}"\.\include\intlmacros.h"\

-	{$(INCLUDE)}"\.\include\nr_extern.h"\

-	{$(INCLUDE)}"\.\include\util.h"\

-	{$(INCLUDE)}"\.\include\utl_decllist.h"\

-	{$(INCLUDE)}"\.\include\utl_error.h"\

-	{$(INCLUDE)}"\.\include\utl_exceptlist.h"\

-	{$(INCLUDE)}"\.\include\utl_exprlist.h"\

-	{$(INCLUDE)}"\.\include\utl_identifier.h"\

-	{$(INCLUDE)}"\.\include\utl_idlist.h"\

-	{$(INCLUDE)}"\.\include\utl_indenter.h"\

-	{$(INCLUDE)}"\.\include\utl_labellist.h"\

-	{$(INCLUDE)}"\.\include\utl_list.h"\

-	{$(INCLUDE)}"\.\include\utl_namelist.h"\

-	{$(INCLUDE)}"\.\include\utl_scope.h"\

-	{$(INCLUDE)}"\.\include\utl_scoped_name.h"\

-	{$(INCLUDE)}"\.\include\utl_stack.h"\

-	{$(INCLUDE)}"\.\include\utl_string.h"\

-	{$(INCLUDE)}"\.\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\be_sunsoft.obj" : $(SOURCE) $(DEP_CPP_BE_SU) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\be\be_type.cpp

-DEP_CPP_BE_TY=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Atomic_Op.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/Event_Handler.h"\

-	"..\..\ace/Event_Handler.i"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/Singleton.cpp"\

-	"..\..\ace/Singleton.h"\

-	"..\..\ace/Singleton.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/stdcpp.h"\

-	"..\..\ace/SV_Semaphore_Complex.h"\

-	"..\..\ace/SV_Semaphore_Complex.i"\

-	"..\..\ace/SV_Semaphore_Simple.h"\

-	"..\..\ace/SV_Semaphore_Simple.i"\

-	"..\..\ace/Synch.h"\

-	"..\..\ace/Synch.i"\

-	"..\..\ace/Synch_T.cpp"\

-	"..\..\ace/Synch_T.h"\

-	"..\..\ace/Synch_T.i"\

-	"..\..\ace/Thread.h"\

-	"..\..\ace/Thread.i"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\be_include\be.h"\

-	".\include\idl.h"\

-	".\include\idl_extern.h"\

-	{$(INCLUDE)}"\.\be_include\be_argument.h"\

-	{$(INCLUDE)}"\.\be_include\be_array.h"\

-	{$(INCLUDE)}"\.\be_include\be_attribute.h"\

-	{$(INCLUDE)}"\.\be_include\be_codegen.h"\

-	{$(INCLUDE)}"\.\be_include\be_constant.h"\

-	{$(INCLUDE)}"\.\be_include\be_decl.h"\

-	{$(INCLUDE)}"\.\be_include\be_enum.h"\

-	{$(INCLUDE)}"\.\be_include\be_enum_val.h"\

-	{$(INCLUDE)}"\.\be_include\be_exception.h"\

-	{$(INCLUDE)}"\.\be_include\be_expression.h"\

-	{$(INCLUDE)}"\.\be_include\be_factory.h"\

-	{$(INCLUDE)}"\.\be_include\be_field.h"\

-	{$(INCLUDE)}"\.\be_include\be_generator.h"\

-	{$(INCLUDE)}"\.\be_include\be_helper.h"\

-	{$(INCLUDE)}"\.\be_include\be_interface.h"\

-	{$(INCLUDE)}"\.\be_include\be_interface_fwd.h"\

-	{$(INCLUDE)}"\.\be_include\be_module.h"\

-	{$(INCLUDE)}"\.\be_include\be_operation.h"\

-	{$(INCLUDE)}"\.\be_include\be_predefined_type.h"\

-	{$(INCLUDE)}"\.\be_include\be_root.h"\

-	{$(INCLUDE)}"\.\be_include\be_scope.h"\

-	{$(INCLUDE)}"\.\be_include\be_sequence.h"\

-	{$(INCLUDE)}"\.\be_include\be_state.h"\

-	{$(INCLUDE)}"\.\be_include\be_string.h"\

-	{$(INCLUDE)}"\.\be_include\be_structure.h"\

-	{$(INCLUDE)}"\.\be_include\be_type.h"\

-	{$(INCLUDE)}"\.\be_include\be_typedef.h"\

-	{$(INCLUDE)}"\.\be_include\be_union.h"\

-	{$(INCLUDE)}"\.\be_include\be_union_branch.h"\

-	{$(INCLUDE)}"\.\be_include\be_union_label.h"\

-	{$(INCLUDE)}"\.\include\ast.h"\

-	{$(INCLUDE)}"\.\include\ast_argument.h"\

-	{$(INCLUDE)}"\.\include\ast_array.h"\

-	{$(INCLUDE)}"\.\include\ast_attribute.h"\

-	{$(INCLUDE)}"\.\include\ast_concrete_type.h"\

-	{$(INCLUDE)}"\.\include\ast_constant.h"\

-	{$(INCLUDE)}"\.\include\ast_decl.h"\

-	{$(INCLUDE)}"\.\include\ast_enum.h"\

-	{$(INCLUDE)}"\.\include\ast_enum_val.h"\

-	{$(INCLUDE)}"\.\include\ast_exception.h"\

-	{$(INCLUDE)}"\.\include\ast_expression.h"\

-	{$(INCLUDE)}"\.\include\ast_extern.h"\

-	{$(INCLUDE)}"\.\include\ast_field.h"\

-	{$(INCLUDE)}"\.\include\ast_generator.h"\

-	{$(INCLUDE)}"\.\include\ast_interface.h"\

-	{$(INCLUDE)}"\.\include\ast_interface_fwd.h"\

-	{$(INCLUDE)}"\.\include\ast_module.h"\

-	{$(INCLUDE)}"\.\include\ast_operation.h"\

-	{$(INCLUDE)}"\.\include\ast_predefined_type.h"\

-	{$(INCLUDE)}"\.\include\ast_root.h"\

-	{$(INCLUDE)}"\.\include\ast_sequence.h"\

-	{$(INCLUDE)}"\.\include\ast_string.h"\

-	{$(INCLUDE)}"\.\include\ast_structure.h"\

-	{$(INCLUDE)}"\.\include\ast_type.h"\

-	{$(INCLUDE)}"\.\include\ast_typedef.h"\

-	{$(INCLUDE)}"\.\include\ast_union.h"\

-	{$(INCLUDE)}"\.\include\ast_union_branch.h"\

-	{$(INCLUDE)}"\.\include\ast_union_label.h"\

-	{$(INCLUDE)}"\.\include\be_extern.h"\

-	{$(INCLUDE)}"\.\include\drv_extern.h"\

-	{$(INCLUDE)}"\.\include\fe_extern.h"\

-	{$(INCLUDE)}"\.\include\global_extern.h"\

-	{$(INCLUDE)}"\.\include\idl_bool.h"\

-	{$(INCLUDE)}"\.\include\idl_defines.h"\

-	{$(INCLUDE)}"\.\include\idl_fwd.h"\

-	{$(INCLUDE)}"\.\include\idl_global.h"\

-	{$(INCLUDE)}"\.\include\idl_narrow.h"\

-	{$(INCLUDE)}"\.\include\intlmacros.h"\

-	{$(INCLUDE)}"\.\include\nr_extern.h"\

-	{$(INCLUDE)}"\.\include\util.h"\

-	{$(INCLUDE)}"\.\include\utl_decllist.h"\

-	{$(INCLUDE)}"\.\include\utl_error.h"\

-	{$(INCLUDE)}"\.\include\utl_exceptlist.h"\

-	{$(INCLUDE)}"\.\include\utl_exprlist.h"\

-	{$(INCLUDE)}"\.\include\utl_identifier.h"\

-	{$(INCLUDE)}"\.\include\utl_idlist.h"\

-	{$(INCLUDE)}"\.\include\utl_indenter.h"\

-	{$(INCLUDE)}"\.\include\utl_labellist.h"\

-	{$(INCLUDE)}"\.\include\utl_list.h"\

-	{$(INCLUDE)}"\.\include\utl_namelist.h"\

-	{$(INCLUDE)}"\.\include\utl_scope.h"\

-	{$(INCLUDE)}"\.\include\utl_scoped_name.h"\

-	{$(INCLUDE)}"\.\include\utl_stack.h"\

-	{$(INCLUDE)}"\.\include\utl_string.h"\

-	{$(INCLUDE)}"\.\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\be_type.obj" : $(SOURCE) $(DEP_CPP_BE_TY) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\be\be_typedef.cpp

-DEP_CPP_BE_TYP=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Atomic_Op.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/Event_Handler.h"\

-	"..\..\ace/Event_Handler.i"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/Singleton.cpp"\

-	"..\..\ace/Singleton.h"\

-	"..\..\ace/Singleton.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/stdcpp.h"\

-	"..\..\ace/SV_Semaphore_Complex.h"\

-	"..\..\ace/SV_Semaphore_Complex.i"\

-	"..\..\ace/SV_Semaphore_Simple.h"\

-	"..\..\ace/SV_Semaphore_Simple.i"\

-	"..\..\ace/Synch.h"\

-	"..\..\ace/Synch.i"\

-	"..\..\ace/Synch_T.cpp"\

-	"..\..\ace/Synch_T.h"\

-	"..\..\ace/Synch_T.i"\

-	"..\..\ace/Thread.h"\

-	"..\..\ace/Thread.i"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\be_include\be.h"\

-	".\include\idl.h"\

-	".\include\idl_extern.h"\

-	{$(INCLUDE)}"\.\be_include\be_argument.h"\

-	{$(INCLUDE)}"\.\be_include\be_array.h"\

-	{$(INCLUDE)}"\.\be_include\be_attribute.h"\

-	{$(INCLUDE)}"\.\be_include\be_codegen.h"\

-	{$(INCLUDE)}"\.\be_include\be_constant.h"\

-	{$(INCLUDE)}"\.\be_include\be_decl.h"\

-	{$(INCLUDE)}"\.\be_include\be_enum.h"\

-	{$(INCLUDE)}"\.\be_include\be_enum_val.h"\

-	{$(INCLUDE)}"\.\be_include\be_exception.h"\

-	{$(INCLUDE)}"\.\be_include\be_expression.h"\

-	{$(INCLUDE)}"\.\be_include\be_factory.h"\

-	{$(INCLUDE)}"\.\be_include\be_field.h"\

-	{$(INCLUDE)}"\.\be_include\be_generator.h"\

-	{$(INCLUDE)}"\.\be_include\be_helper.h"\

-	{$(INCLUDE)}"\.\be_include\be_interface.h"\

-	{$(INCLUDE)}"\.\be_include\be_interface_fwd.h"\

-	{$(INCLUDE)}"\.\be_include\be_module.h"\

-	{$(INCLUDE)}"\.\be_include\be_operation.h"\

-	{$(INCLUDE)}"\.\be_include\be_predefined_type.h"\

-	{$(INCLUDE)}"\.\be_include\be_root.h"\

-	{$(INCLUDE)}"\.\be_include\be_scope.h"\

-	{$(INCLUDE)}"\.\be_include\be_sequence.h"\

-	{$(INCLUDE)}"\.\be_include\be_state.h"\

-	{$(INCLUDE)}"\.\be_include\be_string.h"\

-	{$(INCLUDE)}"\.\be_include\be_structure.h"\

-	{$(INCLUDE)}"\.\be_include\be_type.h"\

-	{$(INCLUDE)}"\.\be_include\be_typedef.h"\

-	{$(INCLUDE)}"\.\be_include\be_union.h"\

-	{$(INCLUDE)}"\.\be_include\be_union_branch.h"\

-	{$(INCLUDE)}"\.\be_include\be_union_label.h"\

-	{$(INCLUDE)}"\.\include\ast.h"\

-	{$(INCLUDE)}"\.\include\ast_argument.h"\

-	{$(INCLUDE)}"\.\include\ast_array.h"\

-	{$(INCLUDE)}"\.\include\ast_attribute.h"\

-	{$(INCLUDE)}"\.\include\ast_concrete_type.h"\

-	{$(INCLUDE)}"\.\include\ast_constant.h"\

-	{$(INCLUDE)}"\.\include\ast_decl.h"\

-	{$(INCLUDE)}"\.\include\ast_enum.h"\

-	{$(INCLUDE)}"\.\include\ast_enum_val.h"\

-	{$(INCLUDE)}"\.\include\ast_exception.h"\

-	{$(INCLUDE)}"\.\include\ast_expression.h"\

-	{$(INCLUDE)}"\.\include\ast_extern.h"\

-	{$(INCLUDE)}"\.\include\ast_field.h"\

-	{$(INCLUDE)}"\.\include\ast_generator.h"\

-	{$(INCLUDE)}"\.\include\ast_interface.h"\

-	{$(INCLUDE)}"\.\include\ast_interface_fwd.h"\

-	{$(INCLUDE)}"\.\include\ast_module.h"\

-	{$(INCLUDE)}"\.\include\ast_operation.h"\

-	{$(INCLUDE)}"\.\include\ast_predefined_type.h"\

-	{$(INCLUDE)}"\.\include\ast_root.h"\

-	{$(INCLUDE)}"\.\include\ast_sequence.h"\

-	{$(INCLUDE)}"\.\include\ast_string.h"\

-	{$(INCLUDE)}"\.\include\ast_structure.h"\

-	{$(INCLUDE)}"\.\include\ast_type.h"\

-	{$(INCLUDE)}"\.\include\ast_typedef.h"\

-	{$(INCLUDE)}"\.\include\ast_union.h"\

-	{$(INCLUDE)}"\.\include\ast_union_branch.h"\

-	{$(INCLUDE)}"\.\include\ast_union_label.h"\

-	{$(INCLUDE)}"\.\include\be_extern.h"\

-	{$(INCLUDE)}"\.\include\drv_extern.h"\

-	{$(INCLUDE)}"\.\include\fe_extern.h"\

-	{$(INCLUDE)}"\.\include\global_extern.h"\

-	{$(INCLUDE)}"\.\include\idl_bool.h"\

-	{$(INCLUDE)}"\.\include\idl_defines.h"\

-	{$(INCLUDE)}"\.\include\idl_fwd.h"\

-	{$(INCLUDE)}"\.\include\idl_global.h"\

-	{$(INCLUDE)}"\.\include\idl_narrow.h"\

-	{$(INCLUDE)}"\.\include\intlmacros.h"\

-	{$(INCLUDE)}"\.\include\nr_extern.h"\

-	{$(INCLUDE)}"\.\include\util.h"\

-	{$(INCLUDE)}"\.\include\utl_decllist.h"\

-	{$(INCLUDE)}"\.\include\utl_error.h"\

-	{$(INCLUDE)}"\.\include\utl_exceptlist.h"\

-	{$(INCLUDE)}"\.\include\utl_exprlist.h"\

-	{$(INCLUDE)}"\.\include\utl_identifier.h"\

-	{$(INCLUDE)}"\.\include\utl_idlist.h"\

-	{$(INCLUDE)}"\.\include\utl_indenter.h"\

-	{$(INCLUDE)}"\.\include\utl_labellist.h"\

-	{$(INCLUDE)}"\.\include\utl_list.h"\

-	{$(INCLUDE)}"\.\include\utl_namelist.h"\

-	{$(INCLUDE)}"\.\include\utl_scope.h"\

-	{$(INCLUDE)}"\.\include\utl_scoped_name.h"\

-	{$(INCLUDE)}"\.\include\utl_stack.h"\

-	{$(INCLUDE)}"\.\include\utl_string.h"\

-	{$(INCLUDE)}"\.\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\be_typedef.obj" : $(SOURCE) $(DEP_CPP_BE_TYP) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\be\be_union.cpp

-DEP_CPP_BE_UN=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Atomic_Op.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/Event_Handler.h"\

-	"..\..\ace/Event_Handler.i"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/Singleton.cpp"\

-	"..\..\ace/Singleton.h"\

-	"..\..\ace/Singleton.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/stdcpp.h"\

-	"..\..\ace/SV_Semaphore_Complex.h"\

-	"..\..\ace/SV_Semaphore_Complex.i"\

-	"..\..\ace/SV_Semaphore_Simple.h"\

-	"..\..\ace/SV_Semaphore_Simple.i"\

-	"..\..\ace/Synch.h"\

-	"..\..\ace/Synch.i"\

-	"..\..\ace/Synch_T.cpp"\

-	"..\..\ace/Synch_T.h"\

-	"..\..\ace/Synch_T.i"\

-	"..\..\ace/Thread.h"\

-	"..\..\ace/Thread.i"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\be_include\be.h"\

-	".\include\idl.h"\

-	".\include\idl_extern.h"\

-	{$(INCLUDE)}"\.\be_include\be_argument.h"\

-	{$(INCLUDE)}"\.\be_include\be_array.h"\

-	{$(INCLUDE)}"\.\be_include\be_attribute.h"\

-	{$(INCLUDE)}"\.\be_include\be_codegen.h"\

-	{$(INCLUDE)}"\.\be_include\be_constant.h"\

-	{$(INCLUDE)}"\.\be_include\be_decl.h"\

-	{$(INCLUDE)}"\.\be_include\be_enum.h"\

-	{$(INCLUDE)}"\.\be_include\be_enum_val.h"\

-	{$(INCLUDE)}"\.\be_include\be_exception.h"\

-	{$(INCLUDE)}"\.\be_include\be_expression.h"\

-	{$(INCLUDE)}"\.\be_include\be_factory.h"\

-	{$(INCLUDE)}"\.\be_include\be_field.h"\

-	{$(INCLUDE)}"\.\be_include\be_generator.h"\

-	{$(INCLUDE)}"\.\be_include\be_helper.h"\

-	{$(INCLUDE)}"\.\be_include\be_interface.h"\

-	{$(INCLUDE)}"\.\be_include\be_interface_fwd.h"\

-	{$(INCLUDE)}"\.\be_include\be_module.h"\

-	{$(INCLUDE)}"\.\be_include\be_operation.h"\

-	{$(INCLUDE)}"\.\be_include\be_predefined_type.h"\

-	{$(INCLUDE)}"\.\be_include\be_root.h"\

-	{$(INCLUDE)}"\.\be_include\be_scope.h"\

-	{$(INCLUDE)}"\.\be_include\be_sequence.h"\

-	{$(INCLUDE)}"\.\be_include\be_state.h"\

-	{$(INCLUDE)}"\.\be_include\be_string.h"\

-	{$(INCLUDE)}"\.\be_include\be_structure.h"\

-	{$(INCLUDE)}"\.\be_include\be_type.h"\

-	{$(INCLUDE)}"\.\be_include\be_typedef.h"\

-	{$(INCLUDE)}"\.\be_include\be_union.h"\

-	{$(INCLUDE)}"\.\be_include\be_union_branch.h"\

-	{$(INCLUDE)}"\.\be_include\be_union_label.h"\

-	{$(INCLUDE)}"\.\include\ast.h"\

-	{$(INCLUDE)}"\.\include\ast_argument.h"\

-	{$(INCLUDE)}"\.\include\ast_array.h"\

-	{$(INCLUDE)}"\.\include\ast_attribute.h"\

-	{$(INCLUDE)}"\.\include\ast_concrete_type.h"\

-	{$(INCLUDE)}"\.\include\ast_constant.h"\

-	{$(INCLUDE)}"\.\include\ast_decl.h"\

-	{$(INCLUDE)}"\.\include\ast_enum.h"\

-	{$(INCLUDE)}"\.\include\ast_enum_val.h"\

-	{$(INCLUDE)}"\.\include\ast_exception.h"\

-	{$(INCLUDE)}"\.\include\ast_expression.h"\

-	{$(INCLUDE)}"\.\include\ast_extern.h"\

-	{$(INCLUDE)}"\.\include\ast_field.h"\

-	{$(INCLUDE)}"\.\include\ast_generator.h"\

-	{$(INCLUDE)}"\.\include\ast_interface.h"\

-	{$(INCLUDE)}"\.\include\ast_interface_fwd.h"\

-	{$(INCLUDE)}"\.\include\ast_module.h"\

-	{$(INCLUDE)}"\.\include\ast_operation.h"\

-	{$(INCLUDE)}"\.\include\ast_predefined_type.h"\

-	{$(INCLUDE)}"\.\include\ast_root.h"\

-	{$(INCLUDE)}"\.\include\ast_sequence.h"\

-	{$(INCLUDE)}"\.\include\ast_string.h"\

-	{$(INCLUDE)}"\.\include\ast_structure.h"\

-	{$(INCLUDE)}"\.\include\ast_type.h"\

-	{$(INCLUDE)}"\.\include\ast_typedef.h"\

-	{$(INCLUDE)}"\.\include\ast_union.h"\

-	{$(INCLUDE)}"\.\include\ast_union_branch.h"\

-	{$(INCLUDE)}"\.\include\ast_union_label.h"\

-	{$(INCLUDE)}"\.\include\be_extern.h"\

-	{$(INCLUDE)}"\.\include\drv_extern.h"\

-	{$(INCLUDE)}"\.\include\fe_extern.h"\

-	{$(INCLUDE)}"\.\include\global_extern.h"\

-	{$(INCLUDE)}"\.\include\idl_bool.h"\

-	{$(INCLUDE)}"\.\include\idl_defines.h"\

-	{$(INCLUDE)}"\.\include\idl_fwd.h"\

-	{$(INCLUDE)}"\.\include\idl_global.h"\

-	{$(INCLUDE)}"\.\include\idl_narrow.h"\

-	{$(INCLUDE)}"\.\include\intlmacros.h"\

-	{$(INCLUDE)}"\.\include\nr_extern.h"\

-	{$(INCLUDE)}"\.\include\util.h"\

-	{$(INCLUDE)}"\.\include\utl_decllist.h"\

-	{$(INCLUDE)}"\.\include\utl_error.h"\

-	{$(INCLUDE)}"\.\include\utl_exceptlist.h"\

-	{$(INCLUDE)}"\.\include\utl_exprlist.h"\

-	{$(INCLUDE)}"\.\include\utl_identifier.h"\

-	{$(INCLUDE)}"\.\include\utl_idlist.h"\

-	{$(INCLUDE)}"\.\include\utl_indenter.h"\

-	{$(INCLUDE)}"\.\include\utl_labellist.h"\

-	{$(INCLUDE)}"\.\include\utl_list.h"\

-	{$(INCLUDE)}"\.\include\utl_namelist.h"\

-	{$(INCLUDE)}"\.\include\utl_scope.h"\

-	{$(INCLUDE)}"\.\include\utl_scoped_name.h"\

-	{$(INCLUDE)}"\.\include\utl_stack.h"\

-	{$(INCLUDE)}"\.\include\utl_string.h"\

-	{$(INCLUDE)}"\.\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\be_union.obj" : $(SOURCE) $(DEP_CPP_BE_UN) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\be\be_union_branch.cpp

-DEP_CPP_BE_UNI=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Atomic_Op.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/Event_Handler.h"\

-	"..\..\ace/Event_Handler.i"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/Singleton.cpp"\

-	"..\..\ace/Singleton.h"\

-	"..\..\ace/Singleton.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/stdcpp.h"\

-	"..\..\ace/SV_Semaphore_Complex.h"\

-	"..\..\ace/SV_Semaphore_Complex.i"\

-	"..\..\ace/SV_Semaphore_Simple.h"\

-	"..\..\ace/SV_Semaphore_Simple.i"\

-	"..\..\ace/Synch.h"\

-	"..\..\ace/Synch.i"\

-	"..\..\ace/Synch_T.cpp"\

-	"..\..\ace/Synch_T.h"\

-	"..\..\ace/Synch_T.i"\

-	"..\..\ace/Thread.h"\

-	"..\..\ace/Thread.i"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\be_include\be.h"\

-	".\include\idl.h"\

-	".\include\idl_extern.h"\

-	{$(INCLUDE)}"\.\be_include\be_argument.h"\

-	{$(INCLUDE)}"\.\be_include\be_array.h"\

-	{$(INCLUDE)}"\.\be_include\be_attribute.h"\

-	{$(INCLUDE)}"\.\be_include\be_codegen.h"\

-	{$(INCLUDE)}"\.\be_include\be_constant.h"\

-	{$(INCLUDE)}"\.\be_include\be_decl.h"\

-	{$(INCLUDE)}"\.\be_include\be_enum.h"\

-	{$(INCLUDE)}"\.\be_include\be_enum_val.h"\

-	{$(INCLUDE)}"\.\be_include\be_exception.h"\

-	{$(INCLUDE)}"\.\be_include\be_expression.h"\

-	{$(INCLUDE)}"\.\be_include\be_factory.h"\

-	{$(INCLUDE)}"\.\be_include\be_field.h"\

-	{$(INCLUDE)}"\.\be_include\be_generator.h"\

-	{$(INCLUDE)}"\.\be_include\be_helper.h"\

-	{$(INCLUDE)}"\.\be_include\be_interface.h"\

-	{$(INCLUDE)}"\.\be_include\be_interface_fwd.h"\

-	{$(INCLUDE)}"\.\be_include\be_module.h"\

-	{$(INCLUDE)}"\.\be_include\be_operation.h"\

-	{$(INCLUDE)}"\.\be_include\be_predefined_type.h"\

-	{$(INCLUDE)}"\.\be_include\be_root.h"\

-	{$(INCLUDE)}"\.\be_include\be_scope.h"\

-	{$(INCLUDE)}"\.\be_include\be_sequence.h"\

-	{$(INCLUDE)}"\.\be_include\be_state.h"\

-	{$(INCLUDE)}"\.\be_include\be_string.h"\

-	{$(INCLUDE)}"\.\be_include\be_structure.h"\

-	{$(INCLUDE)}"\.\be_include\be_type.h"\

-	{$(INCLUDE)}"\.\be_include\be_typedef.h"\

-	{$(INCLUDE)}"\.\be_include\be_union.h"\

-	{$(INCLUDE)}"\.\be_include\be_union_branch.h"\

-	{$(INCLUDE)}"\.\be_include\be_union_label.h"\

-	{$(INCLUDE)}"\.\include\ast.h"\

-	{$(INCLUDE)}"\.\include\ast_argument.h"\

-	{$(INCLUDE)}"\.\include\ast_array.h"\

-	{$(INCLUDE)}"\.\include\ast_attribute.h"\

-	{$(INCLUDE)}"\.\include\ast_concrete_type.h"\

-	{$(INCLUDE)}"\.\include\ast_constant.h"\

-	{$(INCLUDE)}"\.\include\ast_decl.h"\

-	{$(INCLUDE)}"\.\include\ast_enum.h"\

-	{$(INCLUDE)}"\.\include\ast_enum_val.h"\

-	{$(INCLUDE)}"\.\include\ast_exception.h"\

-	{$(INCLUDE)}"\.\include\ast_expression.h"\

-	{$(INCLUDE)}"\.\include\ast_extern.h"\

-	{$(INCLUDE)}"\.\include\ast_field.h"\

-	{$(INCLUDE)}"\.\include\ast_generator.h"\

-	{$(INCLUDE)}"\.\include\ast_interface.h"\

-	{$(INCLUDE)}"\.\include\ast_interface_fwd.h"\

-	{$(INCLUDE)}"\.\include\ast_module.h"\

-	{$(INCLUDE)}"\.\include\ast_operation.h"\

-	{$(INCLUDE)}"\.\include\ast_predefined_type.h"\

-	{$(INCLUDE)}"\.\include\ast_root.h"\

-	{$(INCLUDE)}"\.\include\ast_sequence.h"\

-	{$(INCLUDE)}"\.\include\ast_string.h"\

-	{$(INCLUDE)}"\.\include\ast_structure.h"\

-	{$(INCLUDE)}"\.\include\ast_type.h"\

-	{$(INCLUDE)}"\.\include\ast_typedef.h"\

-	{$(INCLUDE)}"\.\include\ast_union.h"\

-	{$(INCLUDE)}"\.\include\ast_union_branch.h"\

-	{$(INCLUDE)}"\.\include\ast_union_label.h"\

-	{$(INCLUDE)}"\.\include\be_extern.h"\

-	{$(INCLUDE)}"\.\include\drv_extern.h"\

-	{$(INCLUDE)}"\.\include\fe_extern.h"\

-	{$(INCLUDE)}"\.\include\global_extern.h"\

-	{$(INCLUDE)}"\.\include\idl_bool.h"\

-	{$(INCLUDE)}"\.\include\idl_defines.h"\

-	{$(INCLUDE)}"\.\include\idl_fwd.h"\

-	{$(INCLUDE)}"\.\include\idl_global.h"\

-	{$(INCLUDE)}"\.\include\idl_narrow.h"\

-	{$(INCLUDE)}"\.\include\intlmacros.h"\

-	{$(INCLUDE)}"\.\include\nr_extern.h"\

-	{$(INCLUDE)}"\.\include\util.h"\

-	{$(INCLUDE)}"\.\include\utl_decllist.h"\

-	{$(INCLUDE)}"\.\include\utl_error.h"\

-	{$(INCLUDE)}"\.\include\utl_exceptlist.h"\

-	{$(INCLUDE)}"\.\include\utl_exprlist.h"\

-	{$(INCLUDE)}"\.\include\utl_identifier.h"\

-	{$(INCLUDE)}"\.\include\utl_idlist.h"\

-	{$(INCLUDE)}"\.\include\utl_indenter.h"\

-	{$(INCLUDE)}"\.\include\utl_labellist.h"\

-	{$(INCLUDE)}"\.\include\utl_list.h"\

-	{$(INCLUDE)}"\.\include\utl_namelist.h"\

-	{$(INCLUDE)}"\.\include\utl_scope.h"\

-	{$(INCLUDE)}"\.\include\utl_scoped_name.h"\

-	{$(INCLUDE)}"\.\include\utl_stack.h"\

-	{$(INCLUDE)}"\.\include\utl_string.h"\

-	{$(INCLUDE)}"\.\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\be_union_branch.obj" : $(SOURCE) $(DEP_CPP_BE_UNI) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\be\be_union_label.cpp

-DEP_CPP_BE_UNIO=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Atomic_Op.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/Event_Handler.h"\

-	"..\..\ace/Event_Handler.i"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/Singleton.cpp"\

-	"..\..\ace/Singleton.h"\

-	"..\..\ace/Singleton.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/stdcpp.h"\

-	"..\..\ace/SV_Semaphore_Complex.h"\

-	"..\..\ace/SV_Semaphore_Complex.i"\

-	"..\..\ace/SV_Semaphore_Simple.h"\

-	"..\..\ace/SV_Semaphore_Simple.i"\

-	"..\..\ace/Synch.h"\

-	"..\..\ace/Synch.i"\

-	"..\..\ace/Synch_T.cpp"\

-	"..\..\ace/Synch_T.h"\

-	"..\..\ace/Synch_T.i"\

-	"..\..\ace/Thread.h"\

-	"..\..\ace/Thread.i"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\be_include\be.h"\

-	".\include\idl.h"\

-	".\include\idl_extern.h"\

-	{$(INCLUDE)}"\.\be_include\be_argument.h"\

-	{$(INCLUDE)}"\.\be_include\be_array.h"\

-	{$(INCLUDE)}"\.\be_include\be_attribute.h"\

-	{$(INCLUDE)}"\.\be_include\be_codegen.h"\

-	{$(INCLUDE)}"\.\be_include\be_constant.h"\

-	{$(INCLUDE)}"\.\be_include\be_decl.h"\

-	{$(INCLUDE)}"\.\be_include\be_enum.h"\

-	{$(INCLUDE)}"\.\be_include\be_enum_val.h"\

-	{$(INCLUDE)}"\.\be_include\be_exception.h"\

-	{$(INCLUDE)}"\.\be_include\be_expression.h"\

-	{$(INCLUDE)}"\.\be_include\be_factory.h"\

-	{$(INCLUDE)}"\.\be_include\be_field.h"\

-	{$(INCLUDE)}"\.\be_include\be_generator.h"\

-	{$(INCLUDE)}"\.\be_include\be_helper.h"\

-	{$(INCLUDE)}"\.\be_include\be_interface.h"\

-	{$(INCLUDE)}"\.\be_include\be_interface_fwd.h"\

-	{$(INCLUDE)}"\.\be_include\be_module.h"\

-	{$(INCLUDE)}"\.\be_include\be_operation.h"\

-	{$(INCLUDE)}"\.\be_include\be_predefined_type.h"\

-	{$(INCLUDE)}"\.\be_include\be_root.h"\

-	{$(INCLUDE)}"\.\be_include\be_scope.h"\

-	{$(INCLUDE)}"\.\be_include\be_sequence.h"\

-	{$(INCLUDE)}"\.\be_include\be_state.h"\

-	{$(INCLUDE)}"\.\be_include\be_string.h"\

-	{$(INCLUDE)}"\.\be_include\be_structure.h"\

-	{$(INCLUDE)}"\.\be_include\be_type.h"\

-	{$(INCLUDE)}"\.\be_include\be_typedef.h"\

-	{$(INCLUDE)}"\.\be_include\be_union.h"\

-	{$(INCLUDE)}"\.\be_include\be_union_branch.h"\

-	{$(INCLUDE)}"\.\be_include\be_union_label.h"\

-	{$(INCLUDE)}"\.\include\ast.h"\

-	{$(INCLUDE)}"\.\include\ast_argument.h"\

-	{$(INCLUDE)}"\.\include\ast_array.h"\

-	{$(INCLUDE)}"\.\include\ast_attribute.h"\

-	{$(INCLUDE)}"\.\include\ast_concrete_type.h"\

-	{$(INCLUDE)}"\.\include\ast_constant.h"\

-	{$(INCLUDE)}"\.\include\ast_decl.h"\

-	{$(INCLUDE)}"\.\include\ast_enum.h"\

-	{$(INCLUDE)}"\.\include\ast_enum_val.h"\

-	{$(INCLUDE)}"\.\include\ast_exception.h"\

-	{$(INCLUDE)}"\.\include\ast_expression.h"\

-	{$(INCLUDE)}"\.\include\ast_extern.h"\

-	{$(INCLUDE)}"\.\include\ast_field.h"\

-	{$(INCLUDE)}"\.\include\ast_generator.h"\

-	{$(INCLUDE)}"\.\include\ast_interface.h"\

-	{$(INCLUDE)}"\.\include\ast_interface_fwd.h"\

-	{$(INCLUDE)}"\.\include\ast_module.h"\

-	{$(INCLUDE)}"\.\include\ast_operation.h"\

-	{$(INCLUDE)}"\.\include\ast_predefined_type.h"\

-	{$(INCLUDE)}"\.\include\ast_root.h"\

-	{$(INCLUDE)}"\.\include\ast_sequence.h"\

-	{$(INCLUDE)}"\.\include\ast_string.h"\

-	{$(INCLUDE)}"\.\include\ast_structure.h"\

-	{$(INCLUDE)}"\.\include\ast_type.h"\

-	{$(INCLUDE)}"\.\include\ast_typedef.h"\

-	{$(INCLUDE)}"\.\include\ast_union.h"\

-	{$(INCLUDE)}"\.\include\ast_union_branch.h"\

-	{$(INCLUDE)}"\.\include\ast_union_label.h"\

-	{$(INCLUDE)}"\.\include\be_extern.h"\

-	{$(INCLUDE)}"\.\include\drv_extern.h"\

-	{$(INCLUDE)}"\.\include\fe_extern.h"\

-	{$(INCLUDE)}"\.\include\global_extern.h"\

-	{$(INCLUDE)}"\.\include\idl_bool.h"\

-	{$(INCLUDE)}"\.\include\idl_defines.h"\

-	{$(INCLUDE)}"\.\include\idl_fwd.h"\

-	{$(INCLUDE)}"\.\include\idl_global.h"\

-	{$(INCLUDE)}"\.\include\idl_narrow.h"\

-	{$(INCLUDE)}"\.\include\intlmacros.h"\

-	{$(INCLUDE)}"\.\include\nr_extern.h"\

-	{$(INCLUDE)}"\.\include\util.h"\

-	{$(INCLUDE)}"\.\include\utl_decllist.h"\

-	{$(INCLUDE)}"\.\include\utl_error.h"\

-	{$(INCLUDE)}"\.\include\utl_exceptlist.h"\

-	{$(INCLUDE)}"\.\include\utl_exprlist.h"\

-	{$(INCLUDE)}"\.\include\utl_identifier.h"\

-	{$(INCLUDE)}"\.\include\utl_idlist.h"\

-	{$(INCLUDE)}"\.\include\utl_indenter.h"\

-	{$(INCLUDE)}"\.\include\utl_labellist.h"\

-	{$(INCLUDE)}"\.\include\utl_list.h"\

-	{$(INCLUDE)}"\.\include\utl_namelist.h"\

-	{$(INCLUDE)}"\.\include\utl_scope.h"\

-	{$(INCLUDE)}"\.\include\utl_scoped_name.h"\

-	{$(INCLUDE)}"\.\include\utl_stack.h"\

-	{$(INCLUDE)}"\.\include\utl_string.h"\

-	{$(INCLUDE)}"\.\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\be_union_label.obj" : $(SOURCE) $(DEP_CPP_BE_UNIO) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\ast\ast_argument.cpp

-DEP_CPP_AST_A=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/stdcpp.h"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\include\idl.h"\

-	".\include\idl_extern.h"\

-	{$(INCLUDE)}"\.\include\ast.h"\

-	{$(INCLUDE)}"\.\include\ast_argument.h"\

-	{$(INCLUDE)}"\.\include\ast_array.h"\

-	{$(INCLUDE)}"\.\include\ast_attribute.h"\

-	{$(INCLUDE)}"\.\include\ast_concrete_type.h"\

-	{$(INCLUDE)}"\.\include\ast_constant.h"\

-	{$(INCLUDE)}"\.\include\ast_decl.h"\

-	{$(INCLUDE)}"\.\include\ast_enum.h"\

-	{$(INCLUDE)}"\.\include\ast_enum_val.h"\

-	{$(INCLUDE)}"\.\include\ast_exception.h"\

-	{$(INCLUDE)}"\.\include\ast_expression.h"\

-	{$(INCLUDE)}"\.\include\ast_extern.h"\

-	{$(INCLUDE)}"\.\include\ast_field.h"\

-	{$(INCLUDE)}"\.\include\ast_generator.h"\

-	{$(INCLUDE)}"\.\include\ast_interface.h"\

-	{$(INCLUDE)}"\.\include\ast_interface_fwd.h"\

-	{$(INCLUDE)}"\.\include\ast_module.h"\

-	{$(INCLUDE)}"\.\include\ast_operation.h"\

-	{$(INCLUDE)}"\.\include\ast_predefined_type.h"\

-	{$(INCLUDE)}"\.\include\ast_root.h"\

-	{$(INCLUDE)}"\.\include\ast_sequence.h"\

-	{$(INCLUDE)}"\.\include\ast_string.h"\

-	{$(INCLUDE)}"\.\include\ast_structure.h"\

-	{$(INCLUDE)}"\.\include\ast_type.h"\

-	{$(INCLUDE)}"\.\include\ast_typedef.h"\

-	{$(INCLUDE)}"\.\include\ast_union.h"\

-	{$(INCLUDE)}"\.\include\ast_union_branch.h"\

-	{$(INCLUDE)}"\.\include\ast_union_label.h"\

-	{$(INCLUDE)}"\.\include\be_extern.h"\

-	{$(INCLUDE)}"\.\include\drv_extern.h"\

-	{$(INCLUDE)}"\.\include\fe_extern.h"\

-	{$(INCLUDE)}"\.\include\global_extern.h"\

-	{$(INCLUDE)}"\.\include\idl_bool.h"\

-	{$(INCLUDE)}"\.\include\idl_defines.h"\

-	{$(INCLUDE)}"\.\include\idl_fwd.h"\

-	{$(INCLUDE)}"\.\include\idl_global.h"\

-	{$(INCLUDE)}"\.\include\idl_narrow.h"\

-	{$(INCLUDE)}"\.\include\intlmacros.h"\

-	{$(INCLUDE)}"\.\include\nr_extern.h"\

-	{$(INCLUDE)}"\.\include\util.h"\

-	{$(INCLUDE)}"\.\include\utl_decllist.h"\

-	{$(INCLUDE)}"\.\include\utl_error.h"\

-	{$(INCLUDE)}"\.\include\utl_exceptlist.h"\

-	{$(INCLUDE)}"\.\include\utl_exprlist.h"\

-	{$(INCLUDE)}"\.\include\utl_identifier.h"\

-	{$(INCLUDE)}"\.\include\utl_idlist.h"\

-	{$(INCLUDE)}"\.\include\utl_indenter.h"\

-	{$(INCLUDE)}"\.\include\utl_labellist.h"\

-	{$(INCLUDE)}"\.\include\utl_list.h"\

-	{$(INCLUDE)}"\.\include\utl_namelist.h"\

-	{$(INCLUDE)}"\.\include\utl_scope.h"\

-	{$(INCLUDE)}"\.\include\utl_scoped_name.h"\

-	{$(INCLUDE)}"\.\include\utl_stack.h"\

-	{$(INCLUDE)}"\.\include\utl_string.h"\

-	{$(INCLUDE)}"\.\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\ast_argument.obj" : $(SOURCE) $(DEP_CPP_AST_A) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\ast\ast_array.cpp

-DEP_CPP_AST_AR=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/stdcpp.h"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\include\idl.h"\

-	".\include\idl_extern.h"\

-	{$(INCLUDE)}"\.\include\ast.h"\

-	{$(INCLUDE)}"\.\include\ast_argument.h"\

-	{$(INCLUDE)}"\.\include\ast_array.h"\

-	{$(INCLUDE)}"\.\include\ast_attribute.h"\

-	{$(INCLUDE)}"\.\include\ast_concrete_type.h"\

-	{$(INCLUDE)}"\.\include\ast_constant.h"\

-	{$(INCLUDE)}"\.\include\ast_decl.h"\

-	{$(INCLUDE)}"\.\include\ast_enum.h"\

-	{$(INCLUDE)}"\.\include\ast_enum_val.h"\

-	{$(INCLUDE)}"\.\include\ast_exception.h"\

-	{$(INCLUDE)}"\.\include\ast_expression.h"\

-	{$(INCLUDE)}"\.\include\ast_extern.h"\

-	{$(INCLUDE)}"\.\include\ast_field.h"\

-	{$(INCLUDE)}"\.\include\ast_generator.h"\

-	{$(INCLUDE)}"\.\include\ast_interface.h"\

-	{$(INCLUDE)}"\.\include\ast_interface_fwd.h"\

-	{$(INCLUDE)}"\.\include\ast_module.h"\

-	{$(INCLUDE)}"\.\include\ast_operation.h"\

-	{$(INCLUDE)}"\.\include\ast_predefined_type.h"\

-	{$(INCLUDE)}"\.\include\ast_root.h"\

-	{$(INCLUDE)}"\.\include\ast_sequence.h"\

-	{$(INCLUDE)}"\.\include\ast_string.h"\

-	{$(INCLUDE)}"\.\include\ast_structure.h"\

-	{$(INCLUDE)}"\.\include\ast_type.h"\

-	{$(INCLUDE)}"\.\include\ast_typedef.h"\

-	{$(INCLUDE)}"\.\include\ast_union.h"\

-	{$(INCLUDE)}"\.\include\ast_union_branch.h"\

-	{$(INCLUDE)}"\.\include\ast_union_label.h"\

-	{$(INCLUDE)}"\.\include\be_extern.h"\

-	{$(INCLUDE)}"\.\include\drv_extern.h"\

-	{$(INCLUDE)}"\.\include\fe_extern.h"\

-	{$(INCLUDE)}"\.\include\global_extern.h"\

-	{$(INCLUDE)}"\.\include\idl_bool.h"\

-	{$(INCLUDE)}"\.\include\idl_defines.h"\

-	{$(INCLUDE)}"\.\include\idl_fwd.h"\

-	{$(INCLUDE)}"\.\include\idl_global.h"\

-	{$(INCLUDE)}"\.\include\idl_narrow.h"\

-	{$(INCLUDE)}"\.\include\intlmacros.h"\

-	{$(INCLUDE)}"\.\include\nr_extern.h"\

-	{$(INCLUDE)}"\.\include\util.h"\

-	{$(INCLUDE)}"\.\include\utl_decllist.h"\

-	{$(INCLUDE)}"\.\include\utl_error.h"\

-	{$(INCLUDE)}"\.\include\utl_exceptlist.h"\

-	{$(INCLUDE)}"\.\include\utl_exprlist.h"\

-	{$(INCLUDE)}"\.\include\utl_identifier.h"\

-	{$(INCLUDE)}"\.\include\utl_idlist.h"\

-	{$(INCLUDE)}"\.\include\utl_indenter.h"\

-	{$(INCLUDE)}"\.\include\utl_labellist.h"\

-	{$(INCLUDE)}"\.\include\utl_list.h"\

-	{$(INCLUDE)}"\.\include\utl_namelist.h"\

-	{$(INCLUDE)}"\.\include\utl_scope.h"\

-	{$(INCLUDE)}"\.\include\utl_scoped_name.h"\

-	{$(INCLUDE)}"\.\include\utl_stack.h"\

-	{$(INCLUDE)}"\.\include\utl_string.h"\

-	{$(INCLUDE)}"\.\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\ast_array.obj" : $(SOURCE) $(DEP_CPP_AST_AR) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\ast\ast_attribute.cpp

-DEP_CPP_AST_AT=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/stdcpp.h"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\include\idl.h"\

-	".\include\idl_extern.h"\

-	{$(INCLUDE)}"\.\include\ast.h"\

-	{$(INCLUDE)}"\.\include\ast_argument.h"\

-	{$(INCLUDE)}"\.\include\ast_array.h"\

-	{$(INCLUDE)}"\.\include\ast_attribute.h"\

-	{$(INCLUDE)}"\.\include\ast_concrete_type.h"\

-	{$(INCLUDE)}"\.\include\ast_constant.h"\

-	{$(INCLUDE)}"\.\include\ast_decl.h"\

-	{$(INCLUDE)}"\.\include\ast_enum.h"\

-	{$(INCLUDE)}"\.\include\ast_enum_val.h"\

-	{$(INCLUDE)}"\.\include\ast_exception.h"\

-	{$(INCLUDE)}"\.\include\ast_expression.h"\

-	{$(INCLUDE)}"\.\include\ast_extern.h"\

-	{$(INCLUDE)}"\.\include\ast_field.h"\

-	{$(INCLUDE)}"\.\include\ast_generator.h"\

-	{$(INCLUDE)}"\.\include\ast_interface.h"\

-	{$(INCLUDE)}"\.\include\ast_interface_fwd.h"\

-	{$(INCLUDE)}"\.\include\ast_module.h"\

-	{$(INCLUDE)}"\.\include\ast_operation.h"\

-	{$(INCLUDE)}"\.\include\ast_predefined_type.h"\

-	{$(INCLUDE)}"\.\include\ast_root.h"\

-	{$(INCLUDE)}"\.\include\ast_sequence.h"\

-	{$(INCLUDE)}"\.\include\ast_string.h"\

-	{$(INCLUDE)}"\.\include\ast_structure.h"\

-	{$(INCLUDE)}"\.\include\ast_type.h"\

-	{$(INCLUDE)}"\.\include\ast_typedef.h"\

-	{$(INCLUDE)}"\.\include\ast_union.h"\

-	{$(INCLUDE)}"\.\include\ast_union_branch.h"\

-	{$(INCLUDE)}"\.\include\ast_union_label.h"\

-	{$(INCLUDE)}"\.\include\be_extern.h"\

-	{$(INCLUDE)}"\.\include\drv_extern.h"\

-	{$(INCLUDE)}"\.\include\fe_extern.h"\

-	{$(INCLUDE)}"\.\include\global_extern.h"\

-	{$(INCLUDE)}"\.\include\idl_bool.h"\

-	{$(INCLUDE)}"\.\include\idl_defines.h"\

-	{$(INCLUDE)}"\.\include\idl_fwd.h"\

-	{$(INCLUDE)}"\.\include\idl_global.h"\

-	{$(INCLUDE)}"\.\include\idl_narrow.h"\

-	{$(INCLUDE)}"\.\include\intlmacros.h"\

-	{$(INCLUDE)}"\.\include\nr_extern.h"\

-	{$(INCLUDE)}"\.\include\util.h"\

-	{$(INCLUDE)}"\.\include\utl_decllist.h"\

-	{$(INCLUDE)}"\.\include\utl_error.h"\

-	{$(INCLUDE)}"\.\include\utl_exceptlist.h"\

-	{$(INCLUDE)}"\.\include\utl_exprlist.h"\

-	{$(INCLUDE)}"\.\include\utl_identifier.h"\

-	{$(INCLUDE)}"\.\include\utl_idlist.h"\

-	{$(INCLUDE)}"\.\include\utl_indenter.h"\

-	{$(INCLUDE)}"\.\include\utl_labellist.h"\

-	{$(INCLUDE)}"\.\include\utl_list.h"\

-	{$(INCLUDE)}"\.\include\utl_namelist.h"\

-	{$(INCLUDE)}"\.\include\utl_scope.h"\

-	{$(INCLUDE)}"\.\include\utl_scoped_name.h"\

-	{$(INCLUDE)}"\.\include\utl_stack.h"\

-	{$(INCLUDE)}"\.\include\utl_string.h"\

-	{$(INCLUDE)}"\.\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\ast_attribute.obj" : $(SOURCE) $(DEP_CPP_AST_AT) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\ast\ast_check.cpp

-DEP_CPP_AST_C=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/stdcpp.h"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\include\idl.h"\

-	".\include\idl_extern.h"\

-	{$(INCLUDE)}"\.\include\ast.h"\

-	{$(INCLUDE)}"\.\include\ast_argument.h"\

-	{$(INCLUDE)}"\.\include\ast_array.h"\

-	{$(INCLUDE)}"\.\include\ast_attribute.h"\

-	{$(INCLUDE)}"\.\include\ast_concrete_type.h"\

-	{$(INCLUDE)}"\.\include\ast_constant.h"\

-	{$(INCLUDE)}"\.\include\ast_decl.h"\

-	{$(INCLUDE)}"\.\include\ast_enum.h"\

-	{$(INCLUDE)}"\.\include\ast_enum_val.h"\

-	{$(INCLUDE)}"\.\include\ast_exception.h"\

-	{$(INCLUDE)}"\.\include\ast_expression.h"\

-	{$(INCLUDE)}"\.\include\ast_extern.h"\

-	{$(INCLUDE)}"\.\include\ast_field.h"\

-	{$(INCLUDE)}"\.\include\ast_generator.h"\

-	{$(INCLUDE)}"\.\include\ast_interface.h"\

-	{$(INCLUDE)}"\.\include\ast_interface_fwd.h"\

-	{$(INCLUDE)}"\.\include\ast_module.h"\

-	{$(INCLUDE)}"\.\include\ast_operation.h"\

-	{$(INCLUDE)}"\.\include\ast_predefined_type.h"\

-	{$(INCLUDE)}"\.\include\ast_root.h"\

-	{$(INCLUDE)}"\.\include\ast_sequence.h"\

-	{$(INCLUDE)}"\.\include\ast_string.h"\

-	{$(INCLUDE)}"\.\include\ast_structure.h"\

-	{$(INCLUDE)}"\.\include\ast_type.h"\

-	{$(INCLUDE)}"\.\include\ast_typedef.h"\

-	{$(INCLUDE)}"\.\include\ast_union.h"\

-	{$(INCLUDE)}"\.\include\ast_union_branch.h"\

-	{$(INCLUDE)}"\.\include\ast_union_label.h"\

-	{$(INCLUDE)}"\.\include\be_extern.h"\

-	{$(INCLUDE)}"\.\include\drv_extern.h"\

-	{$(INCLUDE)}"\.\include\fe_extern.h"\

-	{$(INCLUDE)}"\.\include\global_extern.h"\

-	{$(INCLUDE)}"\.\include\idl_bool.h"\

-	{$(INCLUDE)}"\.\include\idl_defines.h"\

-	{$(INCLUDE)}"\.\include\idl_fwd.h"\

-	{$(INCLUDE)}"\.\include\idl_global.h"\

-	{$(INCLUDE)}"\.\include\idl_narrow.h"\

-	{$(INCLUDE)}"\.\include\intlmacros.h"\

-	{$(INCLUDE)}"\.\include\nr_extern.h"\

-	{$(INCLUDE)}"\.\include\util.h"\

-	{$(INCLUDE)}"\.\include\utl_decllist.h"\

-	{$(INCLUDE)}"\.\include\utl_error.h"\

-	{$(INCLUDE)}"\.\include\utl_exceptlist.h"\

-	{$(INCLUDE)}"\.\include\utl_exprlist.h"\

-	{$(INCLUDE)}"\.\include\utl_identifier.h"\

-	{$(INCLUDE)}"\.\include\utl_idlist.h"\

-	{$(INCLUDE)}"\.\include\utl_indenter.h"\

-	{$(INCLUDE)}"\.\include\utl_labellist.h"\

-	{$(INCLUDE)}"\.\include\utl_list.h"\

-	{$(INCLUDE)}"\.\include\utl_namelist.h"\

-	{$(INCLUDE)}"\.\include\utl_scope.h"\

-	{$(INCLUDE)}"\.\include\utl_scoped_name.h"\

-	{$(INCLUDE)}"\.\include\utl_stack.h"\

-	{$(INCLUDE)}"\.\include\utl_string.h"\

-	{$(INCLUDE)}"\.\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\ast_check.obj" : $(SOURCE) $(DEP_CPP_AST_C) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\ast\ast_concrete_type.cpp

-DEP_CPP_AST_CO=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/stdcpp.h"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\include\idl.h"\

-	".\include\idl_extern.h"\

-	{$(INCLUDE)}"\.\include\ast.h"\

-	{$(INCLUDE)}"\.\include\ast_argument.h"\

-	{$(INCLUDE)}"\.\include\ast_array.h"\

-	{$(INCLUDE)}"\.\include\ast_attribute.h"\

-	{$(INCLUDE)}"\.\include\ast_concrete_type.h"\

-	{$(INCLUDE)}"\.\include\ast_constant.h"\

-	{$(INCLUDE)}"\.\include\ast_decl.h"\

-	{$(INCLUDE)}"\.\include\ast_enum.h"\

-	{$(INCLUDE)}"\.\include\ast_enum_val.h"\

-	{$(INCLUDE)}"\.\include\ast_exception.h"\

-	{$(INCLUDE)}"\.\include\ast_expression.h"\

-	{$(INCLUDE)}"\.\include\ast_extern.h"\

-	{$(INCLUDE)}"\.\include\ast_field.h"\

-	{$(INCLUDE)}"\.\include\ast_generator.h"\

-	{$(INCLUDE)}"\.\include\ast_interface.h"\

-	{$(INCLUDE)}"\.\include\ast_interface_fwd.h"\

-	{$(INCLUDE)}"\.\include\ast_module.h"\

-	{$(INCLUDE)}"\.\include\ast_operation.h"\

-	{$(INCLUDE)}"\.\include\ast_predefined_type.h"\

-	{$(INCLUDE)}"\.\include\ast_root.h"\

-	{$(INCLUDE)}"\.\include\ast_sequence.h"\

-	{$(INCLUDE)}"\.\include\ast_string.h"\

-	{$(INCLUDE)}"\.\include\ast_structure.h"\

-	{$(INCLUDE)}"\.\include\ast_type.h"\

-	{$(INCLUDE)}"\.\include\ast_typedef.h"\

-	{$(INCLUDE)}"\.\include\ast_union.h"\

-	{$(INCLUDE)}"\.\include\ast_union_branch.h"\

-	{$(INCLUDE)}"\.\include\ast_union_label.h"\

-	{$(INCLUDE)}"\.\include\be_extern.h"\

-	{$(INCLUDE)}"\.\include\drv_extern.h"\

-	{$(INCLUDE)}"\.\include\fe_extern.h"\

-	{$(INCLUDE)}"\.\include\global_extern.h"\

-	{$(INCLUDE)}"\.\include\idl_bool.h"\

-	{$(INCLUDE)}"\.\include\idl_defines.h"\

-	{$(INCLUDE)}"\.\include\idl_fwd.h"\

-	{$(INCLUDE)}"\.\include\idl_global.h"\

-	{$(INCLUDE)}"\.\include\idl_narrow.h"\

-	{$(INCLUDE)}"\.\include\intlmacros.h"\

-	{$(INCLUDE)}"\.\include\nr_extern.h"\

-	{$(INCLUDE)}"\.\include\util.h"\

-	{$(INCLUDE)}"\.\include\utl_decllist.h"\

-	{$(INCLUDE)}"\.\include\utl_error.h"\

-	{$(INCLUDE)}"\.\include\utl_exceptlist.h"\

-	{$(INCLUDE)}"\.\include\utl_exprlist.h"\

-	{$(INCLUDE)}"\.\include\utl_identifier.h"\

-	{$(INCLUDE)}"\.\include\utl_idlist.h"\

-	{$(INCLUDE)}"\.\include\utl_indenter.h"\

-	{$(INCLUDE)}"\.\include\utl_labellist.h"\

-	{$(INCLUDE)}"\.\include\utl_list.h"\

-	{$(INCLUDE)}"\.\include\utl_namelist.h"\

-	{$(INCLUDE)}"\.\include\utl_scope.h"\

-	{$(INCLUDE)}"\.\include\utl_scoped_name.h"\

-	{$(INCLUDE)}"\.\include\utl_stack.h"\

-	{$(INCLUDE)}"\.\include\utl_string.h"\

-	{$(INCLUDE)}"\.\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\ast_concrete_type.obj" : $(SOURCE) $(DEP_CPP_AST_CO) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\ast\ast_constant.cpp

-DEP_CPP_AST_CON=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/stdcpp.h"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\include\idl.h"\

-	".\include\idl_extern.h"\

-	{$(INCLUDE)}"\.\include\ast.h"\

-	{$(INCLUDE)}"\.\include\ast_argument.h"\

-	{$(INCLUDE)}"\.\include\ast_array.h"\

-	{$(INCLUDE)}"\.\include\ast_attribute.h"\

-	{$(INCLUDE)}"\.\include\ast_concrete_type.h"\

-	{$(INCLUDE)}"\.\include\ast_constant.h"\

-	{$(INCLUDE)}"\.\include\ast_decl.h"\

-	{$(INCLUDE)}"\.\include\ast_enum.h"\

-	{$(INCLUDE)}"\.\include\ast_enum_val.h"\

-	{$(INCLUDE)}"\.\include\ast_exception.h"\

-	{$(INCLUDE)}"\.\include\ast_expression.h"\

-	{$(INCLUDE)}"\.\include\ast_extern.h"\

-	{$(INCLUDE)}"\.\include\ast_field.h"\

-	{$(INCLUDE)}"\.\include\ast_generator.h"\

-	{$(INCLUDE)}"\.\include\ast_interface.h"\

-	{$(INCLUDE)}"\.\include\ast_interface_fwd.h"\

-	{$(INCLUDE)}"\.\include\ast_module.h"\

-	{$(INCLUDE)}"\.\include\ast_operation.h"\

-	{$(INCLUDE)}"\.\include\ast_predefined_type.h"\

-	{$(INCLUDE)}"\.\include\ast_root.h"\

-	{$(INCLUDE)}"\.\include\ast_sequence.h"\

-	{$(INCLUDE)}"\.\include\ast_string.h"\

-	{$(INCLUDE)}"\.\include\ast_structure.h"\

-	{$(INCLUDE)}"\.\include\ast_type.h"\

-	{$(INCLUDE)}"\.\include\ast_typedef.h"\

-	{$(INCLUDE)}"\.\include\ast_union.h"\

-	{$(INCLUDE)}"\.\include\ast_union_branch.h"\

-	{$(INCLUDE)}"\.\include\ast_union_label.h"\

-	{$(INCLUDE)}"\.\include\be_extern.h"\

-	{$(INCLUDE)}"\.\include\drv_extern.h"\

-	{$(INCLUDE)}"\.\include\fe_extern.h"\

-	{$(INCLUDE)}"\.\include\global_extern.h"\

-	{$(INCLUDE)}"\.\include\idl_bool.h"\

-	{$(INCLUDE)}"\.\include\idl_defines.h"\

-	{$(INCLUDE)}"\.\include\idl_fwd.h"\

-	{$(INCLUDE)}"\.\include\idl_global.h"\

-	{$(INCLUDE)}"\.\include\idl_narrow.h"\

-	{$(INCLUDE)}"\.\include\intlmacros.h"\

-	{$(INCLUDE)}"\.\include\nr_extern.h"\

-	{$(INCLUDE)}"\.\include\util.h"\

-	{$(INCLUDE)}"\.\include\utl_decllist.h"\

-	{$(INCLUDE)}"\.\include\utl_error.h"\

-	{$(INCLUDE)}"\.\include\utl_exceptlist.h"\

-	{$(INCLUDE)}"\.\include\utl_exprlist.h"\

-	{$(INCLUDE)}"\.\include\utl_identifier.h"\

-	{$(INCLUDE)}"\.\include\utl_idlist.h"\

-	{$(INCLUDE)}"\.\include\utl_indenter.h"\

-	{$(INCLUDE)}"\.\include\utl_labellist.h"\

-	{$(INCLUDE)}"\.\include\utl_list.h"\

-	{$(INCLUDE)}"\.\include\utl_namelist.h"\

-	{$(INCLUDE)}"\.\include\utl_scope.h"\

-	{$(INCLUDE)}"\.\include\utl_scoped_name.h"\

-	{$(INCLUDE)}"\.\include\utl_stack.h"\

-	{$(INCLUDE)}"\.\include\utl_string.h"\

-	{$(INCLUDE)}"\.\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\ast_constant.obj" : $(SOURCE) $(DEP_CPP_AST_CON) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\ast\ast_decl.cpp

-DEP_CPP_AST_D=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/stdcpp.h"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\include\idl.h"\

-	".\include\idl_extern.h"\

-	{$(INCLUDE)}"\.\include\ast.h"\

-	{$(INCLUDE)}"\.\include\ast_argument.h"\

-	{$(INCLUDE)}"\.\include\ast_array.h"\

-	{$(INCLUDE)}"\.\include\ast_attribute.h"\

-	{$(INCLUDE)}"\.\include\ast_concrete_type.h"\

-	{$(INCLUDE)}"\.\include\ast_constant.h"\

-	{$(INCLUDE)}"\.\include\ast_decl.h"\

-	{$(INCLUDE)}"\.\include\ast_enum.h"\

-	{$(INCLUDE)}"\.\include\ast_enum_val.h"\

-	{$(INCLUDE)}"\.\include\ast_exception.h"\

-	{$(INCLUDE)}"\.\include\ast_expression.h"\

-	{$(INCLUDE)}"\.\include\ast_extern.h"\

-	{$(INCLUDE)}"\.\include\ast_field.h"\

-	{$(INCLUDE)}"\.\include\ast_generator.h"\

-	{$(INCLUDE)}"\.\include\ast_interface.h"\

-	{$(INCLUDE)}"\.\include\ast_interface_fwd.h"\

-	{$(INCLUDE)}"\.\include\ast_module.h"\

-	{$(INCLUDE)}"\.\include\ast_operation.h"\

-	{$(INCLUDE)}"\.\include\ast_predefined_type.h"\

-	{$(INCLUDE)}"\.\include\ast_root.h"\

-	{$(INCLUDE)}"\.\include\ast_sequence.h"\

-	{$(INCLUDE)}"\.\include\ast_string.h"\

-	{$(INCLUDE)}"\.\include\ast_structure.h"\

-	{$(INCLUDE)}"\.\include\ast_type.h"\

-	{$(INCLUDE)}"\.\include\ast_typedef.h"\

-	{$(INCLUDE)}"\.\include\ast_union.h"\

-	{$(INCLUDE)}"\.\include\ast_union_branch.h"\

-	{$(INCLUDE)}"\.\include\ast_union_label.h"\

-	{$(INCLUDE)}"\.\include\be_extern.h"\

-	{$(INCLUDE)}"\.\include\drv_extern.h"\

-	{$(INCLUDE)}"\.\include\fe_extern.h"\

-	{$(INCLUDE)}"\.\include\global_extern.h"\

-	{$(INCLUDE)}"\.\include\idl_bool.h"\

-	{$(INCLUDE)}"\.\include\idl_defines.h"\

-	{$(INCLUDE)}"\.\include\idl_fwd.h"\

-	{$(INCLUDE)}"\.\include\idl_global.h"\

-	{$(INCLUDE)}"\.\include\idl_narrow.h"\

-	{$(INCLUDE)}"\.\include\intlmacros.h"\

-	{$(INCLUDE)}"\.\include\nr_extern.h"\

-	{$(INCLUDE)}"\.\include\util.h"\

-	{$(INCLUDE)}"\.\include\utl_decllist.h"\

-	{$(INCLUDE)}"\.\include\utl_error.h"\

-	{$(INCLUDE)}"\.\include\utl_exceptlist.h"\

-	{$(INCLUDE)}"\.\include\utl_exprlist.h"\

-	{$(INCLUDE)}"\.\include\utl_identifier.h"\

-	{$(INCLUDE)}"\.\include\utl_idlist.h"\

-	{$(INCLUDE)}"\.\include\utl_indenter.h"\

-	{$(INCLUDE)}"\.\include\utl_labellist.h"\

-	{$(INCLUDE)}"\.\include\utl_list.h"\

-	{$(INCLUDE)}"\.\include\utl_namelist.h"\

-	{$(INCLUDE)}"\.\include\utl_scope.h"\

-	{$(INCLUDE)}"\.\include\utl_scoped_name.h"\

-	{$(INCLUDE)}"\.\include\utl_stack.h"\

-	{$(INCLUDE)}"\.\include\utl_string.h"\

-	{$(INCLUDE)}"\.\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\ast_decl.obj" : $(SOURCE) $(DEP_CPP_AST_D) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\ast\ast_enum.cpp

-DEP_CPP_AST_E=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/stdcpp.h"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\include\idl.h"\

-	".\include\idl_extern.h"\

-	{$(INCLUDE)}"\.\include\ast.h"\

-	{$(INCLUDE)}"\.\include\ast_argument.h"\

-	{$(INCLUDE)}"\.\include\ast_array.h"\

-	{$(INCLUDE)}"\.\include\ast_attribute.h"\

-	{$(INCLUDE)}"\.\include\ast_concrete_type.h"\

-	{$(INCLUDE)}"\.\include\ast_constant.h"\

-	{$(INCLUDE)}"\.\include\ast_decl.h"\

-	{$(INCLUDE)}"\.\include\ast_enum.h"\

-	{$(INCLUDE)}"\.\include\ast_enum_val.h"\

-	{$(INCLUDE)}"\.\include\ast_exception.h"\

-	{$(INCLUDE)}"\.\include\ast_expression.h"\

-	{$(INCLUDE)}"\.\include\ast_extern.h"\

-	{$(INCLUDE)}"\.\include\ast_field.h"\

-	{$(INCLUDE)}"\.\include\ast_generator.h"\

-	{$(INCLUDE)}"\.\include\ast_interface.h"\

-	{$(INCLUDE)}"\.\include\ast_interface_fwd.h"\

-	{$(INCLUDE)}"\.\include\ast_module.h"\

-	{$(INCLUDE)}"\.\include\ast_operation.h"\

-	{$(INCLUDE)}"\.\include\ast_predefined_type.h"\

-	{$(INCLUDE)}"\.\include\ast_root.h"\

-	{$(INCLUDE)}"\.\include\ast_sequence.h"\

-	{$(INCLUDE)}"\.\include\ast_string.h"\

-	{$(INCLUDE)}"\.\include\ast_structure.h"\

-	{$(INCLUDE)}"\.\include\ast_type.h"\

-	{$(INCLUDE)}"\.\include\ast_typedef.h"\

-	{$(INCLUDE)}"\.\include\ast_union.h"\

-	{$(INCLUDE)}"\.\include\ast_union_branch.h"\

-	{$(INCLUDE)}"\.\include\ast_union_label.h"\

-	{$(INCLUDE)}"\.\include\be_extern.h"\

-	{$(INCLUDE)}"\.\include\drv_extern.h"\

-	{$(INCLUDE)}"\.\include\fe_extern.h"\

-	{$(INCLUDE)}"\.\include\global_extern.h"\

-	{$(INCLUDE)}"\.\include\idl_bool.h"\

-	{$(INCLUDE)}"\.\include\idl_defines.h"\

-	{$(INCLUDE)}"\.\include\idl_fwd.h"\

-	{$(INCLUDE)}"\.\include\idl_global.h"\

-	{$(INCLUDE)}"\.\include\idl_narrow.h"\

-	{$(INCLUDE)}"\.\include\intlmacros.h"\

-	{$(INCLUDE)}"\.\include\nr_extern.h"\

-	{$(INCLUDE)}"\.\include\util.h"\

-	{$(INCLUDE)}"\.\include\utl_decllist.h"\

-	{$(INCLUDE)}"\.\include\utl_error.h"\

-	{$(INCLUDE)}"\.\include\utl_exceptlist.h"\

-	{$(INCLUDE)}"\.\include\utl_exprlist.h"\

-	{$(INCLUDE)}"\.\include\utl_identifier.h"\

-	{$(INCLUDE)}"\.\include\utl_idlist.h"\

-	{$(INCLUDE)}"\.\include\utl_indenter.h"\

-	{$(INCLUDE)}"\.\include\utl_labellist.h"\

-	{$(INCLUDE)}"\.\include\utl_list.h"\

-	{$(INCLUDE)}"\.\include\utl_namelist.h"\

-	{$(INCLUDE)}"\.\include\utl_scope.h"\

-	{$(INCLUDE)}"\.\include\utl_scoped_name.h"\

-	{$(INCLUDE)}"\.\include\utl_stack.h"\

-	{$(INCLUDE)}"\.\include\utl_string.h"\

-	{$(INCLUDE)}"\.\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\ast_enum.obj" : $(SOURCE) $(DEP_CPP_AST_E) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\ast\ast_enum_val.cpp

-DEP_CPP_AST_EN=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/stdcpp.h"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\include\idl.h"\

-	".\include\idl_extern.h"\

-	{$(INCLUDE)}"\.\include\ast.h"\

-	{$(INCLUDE)}"\.\include\ast_argument.h"\

-	{$(INCLUDE)}"\.\include\ast_array.h"\

-	{$(INCLUDE)}"\.\include\ast_attribute.h"\

-	{$(INCLUDE)}"\.\include\ast_concrete_type.h"\

-	{$(INCLUDE)}"\.\include\ast_constant.h"\

-	{$(INCLUDE)}"\.\include\ast_decl.h"\

-	{$(INCLUDE)}"\.\include\ast_enum.h"\

-	{$(INCLUDE)}"\.\include\ast_enum_val.h"\

-	{$(INCLUDE)}"\.\include\ast_exception.h"\

-	{$(INCLUDE)}"\.\include\ast_expression.h"\

-	{$(INCLUDE)}"\.\include\ast_extern.h"\

-	{$(INCLUDE)}"\.\include\ast_field.h"\

-	{$(INCLUDE)}"\.\include\ast_generator.h"\

-	{$(INCLUDE)}"\.\include\ast_interface.h"\

-	{$(INCLUDE)}"\.\include\ast_interface_fwd.h"\

-	{$(INCLUDE)}"\.\include\ast_module.h"\

-	{$(INCLUDE)}"\.\include\ast_operation.h"\

-	{$(INCLUDE)}"\.\include\ast_predefined_type.h"\

-	{$(INCLUDE)}"\.\include\ast_root.h"\

-	{$(INCLUDE)}"\.\include\ast_sequence.h"\

-	{$(INCLUDE)}"\.\include\ast_string.h"\

-	{$(INCLUDE)}"\.\include\ast_structure.h"\

-	{$(INCLUDE)}"\.\include\ast_type.h"\

-	{$(INCLUDE)}"\.\include\ast_typedef.h"\

-	{$(INCLUDE)}"\.\include\ast_union.h"\

-	{$(INCLUDE)}"\.\include\ast_union_branch.h"\

-	{$(INCLUDE)}"\.\include\ast_union_label.h"\

-	{$(INCLUDE)}"\.\include\be_extern.h"\

-	{$(INCLUDE)}"\.\include\drv_extern.h"\

-	{$(INCLUDE)}"\.\include\fe_extern.h"\

-	{$(INCLUDE)}"\.\include\global_extern.h"\

-	{$(INCLUDE)}"\.\include\idl_bool.h"\

-	{$(INCLUDE)}"\.\include\idl_defines.h"\

-	{$(INCLUDE)}"\.\include\idl_fwd.h"\

-	{$(INCLUDE)}"\.\include\idl_global.h"\

-	{$(INCLUDE)}"\.\include\idl_narrow.h"\

-	{$(INCLUDE)}"\.\include\intlmacros.h"\

-	{$(INCLUDE)}"\.\include\nr_extern.h"\

-	{$(INCLUDE)}"\.\include\util.h"\

-	{$(INCLUDE)}"\.\include\utl_decllist.h"\

-	{$(INCLUDE)}"\.\include\utl_error.h"\

-	{$(INCLUDE)}"\.\include\utl_exceptlist.h"\

-	{$(INCLUDE)}"\.\include\utl_exprlist.h"\

-	{$(INCLUDE)}"\.\include\utl_identifier.h"\

-	{$(INCLUDE)}"\.\include\utl_idlist.h"\

-	{$(INCLUDE)}"\.\include\utl_indenter.h"\

-	{$(INCLUDE)}"\.\include\utl_labellist.h"\

-	{$(INCLUDE)}"\.\include\utl_list.h"\

-	{$(INCLUDE)}"\.\include\utl_namelist.h"\

-	{$(INCLUDE)}"\.\include\utl_scope.h"\

-	{$(INCLUDE)}"\.\include\utl_scoped_name.h"\

-	{$(INCLUDE)}"\.\include\utl_stack.h"\

-	{$(INCLUDE)}"\.\include\utl_string.h"\

-	{$(INCLUDE)}"\.\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\ast_enum_val.obj" : $(SOURCE) $(DEP_CPP_AST_EN) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\ast\ast_exception.cpp

-DEP_CPP_AST_EX=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/stdcpp.h"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\include\idl.h"\

-	".\include\idl_extern.h"\

-	{$(INCLUDE)}"\.\include\ast.h"\

-	{$(INCLUDE)}"\.\include\ast_argument.h"\

-	{$(INCLUDE)}"\.\include\ast_array.h"\

-	{$(INCLUDE)}"\.\include\ast_attribute.h"\

-	{$(INCLUDE)}"\.\include\ast_concrete_type.h"\

-	{$(INCLUDE)}"\.\include\ast_constant.h"\

-	{$(INCLUDE)}"\.\include\ast_decl.h"\

-	{$(INCLUDE)}"\.\include\ast_enum.h"\

-	{$(INCLUDE)}"\.\include\ast_enum_val.h"\

-	{$(INCLUDE)}"\.\include\ast_exception.h"\

-	{$(INCLUDE)}"\.\include\ast_expression.h"\

-	{$(INCLUDE)}"\.\include\ast_extern.h"\

-	{$(INCLUDE)}"\.\include\ast_field.h"\

-	{$(INCLUDE)}"\.\include\ast_generator.h"\

-	{$(INCLUDE)}"\.\include\ast_interface.h"\

-	{$(INCLUDE)}"\.\include\ast_interface_fwd.h"\

-	{$(INCLUDE)}"\.\include\ast_module.h"\

-	{$(INCLUDE)}"\.\include\ast_operation.h"\

-	{$(INCLUDE)}"\.\include\ast_predefined_type.h"\

-	{$(INCLUDE)}"\.\include\ast_root.h"\

-	{$(INCLUDE)}"\.\include\ast_sequence.h"\

-	{$(INCLUDE)}"\.\include\ast_string.h"\

-	{$(INCLUDE)}"\.\include\ast_structure.h"\

-	{$(INCLUDE)}"\.\include\ast_type.h"\

-	{$(INCLUDE)}"\.\include\ast_typedef.h"\

-	{$(INCLUDE)}"\.\include\ast_union.h"\

-	{$(INCLUDE)}"\.\include\ast_union_branch.h"\

-	{$(INCLUDE)}"\.\include\ast_union_label.h"\

-	{$(INCLUDE)}"\.\include\be_extern.h"\

-	{$(INCLUDE)}"\.\include\drv_extern.h"\

-	{$(INCLUDE)}"\.\include\fe_extern.h"\

-	{$(INCLUDE)}"\.\include\global_extern.h"\

-	{$(INCLUDE)}"\.\include\idl_bool.h"\

-	{$(INCLUDE)}"\.\include\idl_defines.h"\

-	{$(INCLUDE)}"\.\include\idl_fwd.h"\

-	{$(INCLUDE)}"\.\include\idl_global.h"\

-	{$(INCLUDE)}"\.\include\idl_narrow.h"\

-	{$(INCLUDE)}"\.\include\intlmacros.h"\

-	{$(INCLUDE)}"\.\include\nr_extern.h"\

-	{$(INCLUDE)}"\.\include\util.h"\

-	{$(INCLUDE)}"\.\include\utl_decllist.h"\

-	{$(INCLUDE)}"\.\include\utl_error.h"\

-	{$(INCLUDE)}"\.\include\utl_exceptlist.h"\

-	{$(INCLUDE)}"\.\include\utl_exprlist.h"\

-	{$(INCLUDE)}"\.\include\utl_identifier.h"\

-	{$(INCLUDE)}"\.\include\utl_idlist.h"\

-	{$(INCLUDE)}"\.\include\utl_indenter.h"\

-	{$(INCLUDE)}"\.\include\utl_labellist.h"\

-	{$(INCLUDE)}"\.\include\utl_list.h"\

-	{$(INCLUDE)}"\.\include\utl_namelist.h"\

-	{$(INCLUDE)}"\.\include\utl_scope.h"\

-	{$(INCLUDE)}"\.\include\utl_scoped_name.h"\

-	{$(INCLUDE)}"\.\include\utl_stack.h"\

-	{$(INCLUDE)}"\.\include\utl_string.h"\

-	{$(INCLUDE)}"\.\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\ast_exception.obj" : $(SOURCE) $(DEP_CPP_AST_EX) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\ast\ast_expression.cpp

-DEP_CPP_AST_EXP=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/stdcpp.h"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\include\idl.h"\

-	".\include\idl_extern.h"\

-	{$(INCLUDE)}"\.\include\ast.h"\

-	{$(INCLUDE)}"\.\include\ast_argument.h"\

-	{$(INCLUDE)}"\.\include\ast_array.h"\

-	{$(INCLUDE)}"\.\include\ast_attribute.h"\

-	{$(INCLUDE)}"\.\include\ast_concrete_type.h"\

-	{$(INCLUDE)}"\.\include\ast_constant.h"\

-	{$(INCLUDE)}"\.\include\ast_decl.h"\

-	{$(INCLUDE)}"\.\include\ast_enum.h"\

-	{$(INCLUDE)}"\.\include\ast_enum_val.h"\

-	{$(INCLUDE)}"\.\include\ast_exception.h"\

-	{$(INCLUDE)}"\.\include\ast_expression.h"\

-	{$(INCLUDE)}"\.\include\ast_extern.h"\

-	{$(INCLUDE)}"\.\include\ast_field.h"\

-	{$(INCLUDE)}"\.\include\ast_generator.h"\

-	{$(INCLUDE)}"\.\include\ast_interface.h"\

-	{$(INCLUDE)}"\.\include\ast_interface_fwd.h"\

-	{$(INCLUDE)}"\.\include\ast_module.h"\

-	{$(INCLUDE)}"\.\include\ast_operation.h"\

-	{$(INCLUDE)}"\.\include\ast_predefined_type.h"\

-	{$(INCLUDE)}"\.\include\ast_root.h"\

-	{$(INCLUDE)}"\.\include\ast_sequence.h"\

-	{$(INCLUDE)}"\.\include\ast_string.h"\

-	{$(INCLUDE)}"\.\include\ast_structure.h"\

-	{$(INCLUDE)}"\.\include\ast_type.h"\

-	{$(INCLUDE)}"\.\include\ast_typedef.h"\

-	{$(INCLUDE)}"\.\include\ast_union.h"\

-	{$(INCLUDE)}"\.\include\ast_union_branch.h"\

-	{$(INCLUDE)}"\.\include\ast_union_label.h"\

-	{$(INCLUDE)}"\.\include\be_extern.h"\

-	{$(INCLUDE)}"\.\include\drv_extern.h"\

-	{$(INCLUDE)}"\.\include\fe_extern.h"\

-	{$(INCLUDE)}"\.\include\global_extern.h"\

-	{$(INCLUDE)}"\.\include\idl_bool.h"\

-	{$(INCLUDE)}"\.\include\idl_defines.h"\

-	{$(INCLUDE)}"\.\include\idl_fwd.h"\

-	{$(INCLUDE)}"\.\include\idl_global.h"\

-	{$(INCLUDE)}"\.\include\idl_narrow.h"\

-	{$(INCLUDE)}"\.\include\intlmacros.h"\

-	{$(INCLUDE)}"\.\include\nr_extern.h"\

-	{$(INCLUDE)}"\.\include\util.h"\

-	{$(INCLUDE)}"\.\include\utl_decllist.h"\

-	{$(INCLUDE)}"\.\include\utl_error.h"\

-	{$(INCLUDE)}"\.\include\utl_exceptlist.h"\

-	{$(INCLUDE)}"\.\include\utl_exprlist.h"\

-	{$(INCLUDE)}"\.\include\utl_identifier.h"\

-	{$(INCLUDE)}"\.\include\utl_idlist.h"\

-	{$(INCLUDE)}"\.\include\utl_indenter.h"\

-	{$(INCLUDE)}"\.\include\utl_labellist.h"\

-	{$(INCLUDE)}"\.\include\utl_list.h"\

-	{$(INCLUDE)}"\.\include\utl_namelist.h"\

-	{$(INCLUDE)}"\.\include\utl_scope.h"\

-	{$(INCLUDE)}"\.\include\utl_scoped_name.h"\

-	{$(INCLUDE)}"\.\include\utl_stack.h"\

-	{$(INCLUDE)}"\.\include\utl_string.h"\

-	{$(INCLUDE)}"\.\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\ast_expression.obj" : $(SOURCE) $(DEP_CPP_AST_EXP) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\ast\ast_field.cpp

-DEP_CPP_AST_F=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/stdcpp.h"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\include\idl.h"\

-	".\include\idl_extern.h"\

-	{$(INCLUDE)}"\.\include\ast.h"\

-	{$(INCLUDE)}"\.\include\ast_argument.h"\

-	{$(INCLUDE)}"\.\include\ast_array.h"\

-	{$(INCLUDE)}"\.\include\ast_attribute.h"\

-	{$(INCLUDE)}"\.\include\ast_concrete_type.h"\

-	{$(INCLUDE)}"\.\include\ast_constant.h"\

-	{$(INCLUDE)}"\.\include\ast_decl.h"\

-	{$(INCLUDE)}"\.\include\ast_enum.h"\

-	{$(INCLUDE)}"\.\include\ast_enum_val.h"\

-	{$(INCLUDE)}"\.\include\ast_exception.h"\

-	{$(INCLUDE)}"\.\include\ast_expression.h"\

-	{$(INCLUDE)}"\.\include\ast_extern.h"\

-	{$(INCLUDE)}"\.\include\ast_field.h"\

-	{$(INCLUDE)}"\.\include\ast_generator.h"\

-	{$(INCLUDE)}"\.\include\ast_interface.h"\

-	{$(INCLUDE)}"\.\include\ast_interface_fwd.h"\

-	{$(INCLUDE)}"\.\include\ast_module.h"\

-	{$(INCLUDE)}"\.\include\ast_operation.h"\

-	{$(INCLUDE)}"\.\include\ast_predefined_type.h"\

-	{$(INCLUDE)}"\.\include\ast_root.h"\

-	{$(INCLUDE)}"\.\include\ast_sequence.h"\

-	{$(INCLUDE)}"\.\include\ast_string.h"\

-	{$(INCLUDE)}"\.\include\ast_structure.h"\

-	{$(INCLUDE)}"\.\include\ast_type.h"\

-	{$(INCLUDE)}"\.\include\ast_typedef.h"\

-	{$(INCLUDE)}"\.\include\ast_union.h"\

-	{$(INCLUDE)}"\.\include\ast_union_branch.h"\

-	{$(INCLUDE)}"\.\include\ast_union_label.h"\

-	{$(INCLUDE)}"\.\include\be_extern.h"\

-	{$(INCLUDE)}"\.\include\drv_extern.h"\

-	{$(INCLUDE)}"\.\include\fe_extern.h"\

-	{$(INCLUDE)}"\.\include\global_extern.h"\

-	{$(INCLUDE)}"\.\include\idl_bool.h"\

-	{$(INCLUDE)}"\.\include\idl_defines.h"\

-	{$(INCLUDE)}"\.\include\idl_fwd.h"\

-	{$(INCLUDE)}"\.\include\idl_global.h"\

-	{$(INCLUDE)}"\.\include\idl_narrow.h"\

-	{$(INCLUDE)}"\.\include\intlmacros.h"\

-	{$(INCLUDE)}"\.\include\nr_extern.h"\

-	{$(INCLUDE)}"\.\include\util.h"\

-	{$(INCLUDE)}"\.\include\utl_decllist.h"\

-	{$(INCLUDE)}"\.\include\utl_error.h"\

-	{$(INCLUDE)}"\.\include\utl_exceptlist.h"\

-	{$(INCLUDE)}"\.\include\utl_exprlist.h"\

-	{$(INCLUDE)}"\.\include\utl_identifier.h"\

-	{$(INCLUDE)}"\.\include\utl_idlist.h"\

-	{$(INCLUDE)}"\.\include\utl_indenter.h"\

-	{$(INCLUDE)}"\.\include\utl_labellist.h"\

-	{$(INCLUDE)}"\.\include\utl_list.h"\

-	{$(INCLUDE)}"\.\include\utl_namelist.h"\

-	{$(INCLUDE)}"\.\include\utl_scope.h"\

-	{$(INCLUDE)}"\.\include\utl_scoped_name.h"\

-	{$(INCLUDE)}"\.\include\utl_stack.h"\

-	{$(INCLUDE)}"\.\include\utl_string.h"\

-	{$(INCLUDE)}"\.\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\ast_field.obj" : $(SOURCE) $(DEP_CPP_AST_F) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\ast\ast_generator.cpp

-DEP_CPP_AST_G=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/stdcpp.h"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\include\idl.h"\

-	".\include\idl_extern.h"\

-	{$(INCLUDE)}"\.\include\ast.h"\

-	{$(INCLUDE)}"\.\include\ast_argument.h"\

-	{$(INCLUDE)}"\.\include\ast_array.h"\

-	{$(INCLUDE)}"\.\include\ast_attribute.h"\

-	{$(INCLUDE)}"\.\include\ast_concrete_type.h"\

-	{$(INCLUDE)}"\.\include\ast_constant.h"\

-	{$(INCLUDE)}"\.\include\ast_decl.h"\

-	{$(INCLUDE)}"\.\include\ast_enum.h"\

-	{$(INCLUDE)}"\.\include\ast_enum_val.h"\

-	{$(INCLUDE)}"\.\include\ast_exception.h"\

-	{$(INCLUDE)}"\.\include\ast_expression.h"\

-	{$(INCLUDE)}"\.\include\ast_extern.h"\

-	{$(INCLUDE)}"\.\include\ast_field.h"\

-	{$(INCLUDE)}"\.\include\ast_generator.h"\

-	{$(INCLUDE)}"\.\include\ast_interface.h"\

-	{$(INCLUDE)}"\.\include\ast_interface_fwd.h"\

-	{$(INCLUDE)}"\.\include\ast_module.h"\

-	{$(INCLUDE)}"\.\include\ast_operation.h"\

-	{$(INCLUDE)}"\.\include\ast_predefined_type.h"\

-	{$(INCLUDE)}"\.\include\ast_root.h"\

-	{$(INCLUDE)}"\.\include\ast_sequence.h"\

-	{$(INCLUDE)}"\.\include\ast_string.h"\

-	{$(INCLUDE)}"\.\include\ast_structure.h"\

-	{$(INCLUDE)}"\.\include\ast_type.h"\

-	{$(INCLUDE)}"\.\include\ast_typedef.h"\

-	{$(INCLUDE)}"\.\include\ast_union.h"\

-	{$(INCLUDE)}"\.\include\ast_union_branch.h"\

-	{$(INCLUDE)}"\.\include\ast_union_label.h"\

-	{$(INCLUDE)}"\.\include\be_extern.h"\

-	{$(INCLUDE)}"\.\include\drv_extern.h"\

-	{$(INCLUDE)}"\.\include\fe_extern.h"\

-	{$(INCLUDE)}"\.\include\global_extern.h"\

-	{$(INCLUDE)}"\.\include\idl_bool.h"\

-	{$(INCLUDE)}"\.\include\idl_defines.h"\

-	{$(INCLUDE)}"\.\include\idl_fwd.h"\

-	{$(INCLUDE)}"\.\include\idl_global.h"\

-	{$(INCLUDE)}"\.\include\idl_narrow.h"\

-	{$(INCLUDE)}"\.\include\intlmacros.h"\

-	{$(INCLUDE)}"\.\include\nr_extern.h"\

-	{$(INCLUDE)}"\.\include\util.h"\

-	{$(INCLUDE)}"\.\include\utl_decllist.h"\

-	{$(INCLUDE)}"\.\include\utl_error.h"\

-	{$(INCLUDE)}"\.\include\utl_exceptlist.h"\

-	{$(INCLUDE)}"\.\include\utl_exprlist.h"\

-	{$(INCLUDE)}"\.\include\utl_identifier.h"\

-	{$(INCLUDE)}"\.\include\utl_idlist.h"\

-	{$(INCLUDE)}"\.\include\utl_indenter.h"\

-	{$(INCLUDE)}"\.\include\utl_labellist.h"\

-	{$(INCLUDE)}"\.\include\utl_list.h"\

-	{$(INCLUDE)}"\.\include\utl_namelist.h"\

-	{$(INCLUDE)}"\.\include\utl_scope.h"\

-	{$(INCLUDE)}"\.\include\utl_scoped_name.h"\

-	{$(INCLUDE)}"\.\include\utl_stack.h"\

-	{$(INCLUDE)}"\.\include\utl_string.h"\

-	{$(INCLUDE)}"\.\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\ast_generator.obj" : $(SOURCE) $(DEP_CPP_AST_G) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\ast\ast_interface.cpp

-DEP_CPP_AST_I=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/stdcpp.h"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\include\idl.h"\

-	".\include\idl_extern.h"\

-	{$(INCLUDE)}"\.\include\ast.h"\

-	{$(INCLUDE)}"\.\include\ast_argument.h"\

-	{$(INCLUDE)}"\.\include\ast_array.h"\

-	{$(INCLUDE)}"\.\include\ast_attribute.h"\

-	{$(INCLUDE)}"\.\include\ast_concrete_type.h"\

-	{$(INCLUDE)}"\.\include\ast_constant.h"\

-	{$(INCLUDE)}"\.\include\ast_decl.h"\

-	{$(INCLUDE)}"\.\include\ast_enum.h"\

-	{$(INCLUDE)}"\.\include\ast_enum_val.h"\

-	{$(INCLUDE)}"\.\include\ast_exception.h"\

-	{$(INCLUDE)}"\.\include\ast_expression.h"\

-	{$(INCLUDE)}"\.\include\ast_extern.h"\

-	{$(INCLUDE)}"\.\include\ast_field.h"\

-	{$(INCLUDE)}"\.\include\ast_generator.h"\

-	{$(INCLUDE)}"\.\include\ast_interface.h"\

-	{$(INCLUDE)}"\.\include\ast_interface_fwd.h"\

-	{$(INCLUDE)}"\.\include\ast_module.h"\

-	{$(INCLUDE)}"\.\include\ast_operation.h"\

-	{$(INCLUDE)}"\.\include\ast_predefined_type.h"\

-	{$(INCLUDE)}"\.\include\ast_root.h"\

-	{$(INCLUDE)}"\.\include\ast_sequence.h"\

-	{$(INCLUDE)}"\.\include\ast_string.h"\

-	{$(INCLUDE)}"\.\include\ast_structure.h"\

-	{$(INCLUDE)}"\.\include\ast_type.h"\

-	{$(INCLUDE)}"\.\include\ast_typedef.h"\

-	{$(INCLUDE)}"\.\include\ast_union.h"\

-	{$(INCLUDE)}"\.\include\ast_union_branch.h"\

-	{$(INCLUDE)}"\.\include\ast_union_label.h"\

-	{$(INCLUDE)}"\.\include\be_extern.h"\

-	{$(INCLUDE)}"\.\include\drv_extern.h"\

-	{$(INCLUDE)}"\.\include\fe_extern.h"\

-	{$(INCLUDE)}"\.\include\global_extern.h"\

-	{$(INCLUDE)}"\.\include\idl_bool.h"\

-	{$(INCLUDE)}"\.\include\idl_defines.h"\

-	{$(INCLUDE)}"\.\include\idl_fwd.h"\

-	{$(INCLUDE)}"\.\include\idl_global.h"\

-	{$(INCLUDE)}"\.\include\idl_narrow.h"\

-	{$(INCLUDE)}"\.\include\intlmacros.h"\

-	{$(INCLUDE)}"\.\include\nr_extern.h"\

-	{$(INCLUDE)}"\.\include\util.h"\

-	{$(INCLUDE)}"\.\include\utl_decllist.h"\

-	{$(INCLUDE)}"\.\include\utl_error.h"\

-	{$(INCLUDE)}"\.\include\utl_exceptlist.h"\

-	{$(INCLUDE)}"\.\include\utl_exprlist.h"\

-	{$(INCLUDE)}"\.\include\utl_identifier.h"\

-	{$(INCLUDE)}"\.\include\utl_idlist.h"\

-	{$(INCLUDE)}"\.\include\utl_indenter.h"\

-	{$(INCLUDE)}"\.\include\utl_labellist.h"\

-	{$(INCLUDE)}"\.\include\utl_list.h"\

-	{$(INCLUDE)}"\.\include\utl_namelist.h"\

-	{$(INCLUDE)}"\.\include\utl_scope.h"\

-	{$(INCLUDE)}"\.\include\utl_scoped_name.h"\

-	{$(INCLUDE)}"\.\include\utl_stack.h"\

-	{$(INCLUDE)}"\.\include\utl_string.h"\

-	{$(INCLUDE)}"\.\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\ast_interface.obj" : $(SOURCE) $(DEP_CPP_AST_I) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\ast\ast_interface_fwd.cpp

-DEP_CPP_AST_IN=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/stdcpp.h"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\include\idl.h"\

-	".\include\idl_extern.h"\

-	{$(INCLUDE)}"\.\include\ast.h"\

-	{$(INCLUDE)}"\.\include\ast_argument.h"\

-	{$(INCLUDE)}"\.\include\ast_array.h"\

-	{$(INCLUDE)}"\.\include\ast_attribute.h"\

-	{$(INCLUDE)}"\.\include\ast_concrete_type.h"\

-	{$(INCLUDE)}"\.\include\ast_constant.h"\

-	{$(INCLUDE)}"\.\include\ast_decl.h"\

-	{$(INCLUDE)}"\.\include\ast_enum.h"\

-	{$(INCLUDE)}"\.\include\ast_enum_val.h"\

-	{$(INCLUDE)}"\.\include\ast_exception.h"\

-	{$(INCLUDE)}"\.\include\ast_expression.h"\

-	{$(INCLUDE)}"\.\include\ast_extern.h"\

-	{$(INCLUDE)}"\.\include\ast_field.h"\

-	{$(INCLUDE)}"\.\include\ast_generator.h"\

-	{$(INCLUDE)}"\.\include\ast_interface.h"\

-	{$(INCLUDE)}"\.\include\ast_interface_fwd.h"\

-	{$(INCLUDE)}"\.\include\ast_module.h"\

-	{$(INCLUDE)}"\.\include\ast_operation.h"\

-	{$(INCLUDE)}"\.\include\ast_predefined_type.h"\

-	{$(INCLUDE)}"\.\include\ast_root.h"\

-	{$(INCLUDE)}"\.\include\ast_sequence.h"\

-	{$(INCLUDE)}"\.\include\ast_string.h"\

-	{$(INCLUDE)}"\.\include\ast_structure.h"\

-	{$(INCLUDE)}"\.\include\ast_type.h"\

-	{$(INCLUDE)}"\.\include\ast_typedef.h"\

-	{$(INCLUDE)}"\.\include\ast_union.h"\

-	{$(INCLUDE)}"\.\include\ast_union_branch.h"\

-	{$(INCLUDE)}"\.\include\ast_union_label.h"\

-	{$(INCLUDE)}"\.\include\be_extern.h"\

-	{$(INCLUDE)}"\.\include\drv_extern.h"\

-	{$(INCLUDE)}"\.\include\fe_extern.h"\

-	{$(INCLUDE)}"\.\include\global_extern.h"\

-	{$(INCLUDE)}"\.\include\idl_bool.h"\

-	{$(INCLUDE)}"\.\include\idl_defines.h"\

-	{$(INCLUDE)}"\.\include\idl_fwd.h"\

-	{$(INCLUDE)}"\.\include\idl_global.h"\

-	{$(INCLUDE)}"\.\include\idl_narrow.h"\

-	{$(INCLUDE)}"\.\include\intlmacros.h"\

-	{$(INCLUDE)}"\.\include\nr_extern.h"\

-	{$(INCLUDE)}"\.\include\util.h"\

-	{$(INCLUDE)}"\.\include\utl_decllist.h"\

-	{$(INCLUDE)}"\.\include\utl_error.h"\

-	{$(INCLUDE)}"\.\include\utl_exceptlist.h"\

-	{$(INCLUDE)}"\.\include\utl_exprlist.h"\

-	{$(INCLUDE)}"\.\include\utl_identifier.h"\

-	{$(INCLUDE)}"\.\include\utl_idlist.h"\

-	{$(INCLUDE)}"\.\include\utl_indenter.h"\

-	{$(INCLUDE)}"\.\include\utl_labellist.h"\

-	{$(INCLUDE)}"\.\include\utl_list.h"\

-	{$(INCLUDE)}"\.\include\utl_namelist.h"\

-	{$(INCLUDE)}"\.\include\utl_scope.h"\

-	{$(INCLUDE)}"\.\include\utl_scoped_name.h"\

-	{$(INCLUDE)}"\.\include\utl_stack.h"\

-	{$(INCLUDE)}"\.\include\utl_string.h"\

-	{$(INCLUDE)}"\.\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\ast_interface_fwd.obj" : $(SOURCE) $(DEP_CPP_AST_IN) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\ast\ast_module.cpp

-DEP_CPP_AST_M=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/stdcpp.h"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\include\idl.h"\

-	".\include\idl_extern.h"\

-	{$(INCLUDE)}"\.\include\ast.h"\

-	{$(INCLUDE)}"\.\include\ast_argument.h"\

-	{$(INCLUDE)}"\.\include\ast_array.h"\

-	{$(INCLUDE)}"\.\include\ast_attribute.h"\

-	{$(INCLUDE)}"\.\include\ast_concrete_type.h"\

-	{$(INCLUDE)}"\.\include\ast_constant.h"\

-	{$(INCLUDE)}"\.\include\ast_decl.h"\

-	{$(INCLUDE)}"\.\include\ast_enum.h"\

-	{$(INCLUDE)}"\.\include\ast_enum_val.h"\

-	{$(INCLUDE)}"\.\include\ast_exception.h"\

-	{$(INCLUDE)}"\.\include\ast_expression.h"\

-	{$(INCLUDE)}"\.\include\ast_extern.h"\

-	{$(INCLUDE)}"\.\include\ast_field.h"\

-	{$(INCLUDE)}"\.\include\ast_generator.h"\

-	{$(INCLUDE)}"\.\include\ast_interface.h"\

-	{$(INCLUDE)}"\.\include\ast_interface_fwd.h"\

-	{$(INCLUDE)}"\.\include\ast_module.h"\

-	{$(INCLUDE)}"\.\include\ast_operation.h"\

-	{$(INCLUDE)}"\.\include\ast_predefined_type.h"\

-	{$(INCLUDE)}"\.\include\ast_root.h"\

-	{$(INCLUDE)}"\.\include\ast_sequence.h"\

-	{$(INCLUDE)}"\.\include\ast_string.h"\

-	{$(INCLUDE)}"\.\include\ast_structure.h"\

-	{$(INCLUDE)}"\.\include\ast_type.h"\

-	{$(INCLUDE)}"\.\include\ast_typedef.h"\

-	{$(INCLUDE)}"\.\include\ast_union.h"\

-	{$(INCLUDE)}"\.\include\ast_union_branch.h"\

-	{$(INCLUDE)}"\.\include\ast_union_label.h"\

-	{$(INCLUDE)}"\.\include\be_extern.h"\

-	{$(INCLUDE)}"\.\include\drv_extern.h"\

-	{$(INCLUDE)}"\.\include\fe_extern.h"\

-	{$(INCLUDE)}"\.\include\global_extern.h"\

-	{$(INCLUDE)}"\.\include\idl_bool.h"\

-	{$(INCLUDE)}"\.\include\idl_defines.h"\

-	{$(INCLUDE)}"\.\include\idl_fwd.h"\

-	{$(INCLUDE)}"\.\include\idl_global.h"\

-	{$(INCLUDE)}"\.\include\idl_narrow.h"\

-	{$(INCLUDE)}"\.\include\intlmacros.h"\

-	{$(INCLUDE)}"\.\include\nr_extern.h"\

-	{$(INCLUDE)}"\.\include\util.h"\

-	{$(INCLUDE)}"\.\include\utl_decllist.h"\

-	{$(INCLUDE)}"\.\include\utl_error.h"\

-	{$(INCLUDE)}"\.\include\utl_exceptlist.h"\

-	{$(INCLUDE)}"\.\include\utl_exprlist.h"\

-	{$(INCLUDE)}"\.\include\utl_identifier.h"\

-	{$(INCLUDE)}"\.\include\utl_idlist.h"\

-	{$(INCLUDE)}"\.\include\utl_indenter.h"\

-	{$(INCLUDE)}"\.\include\utl_labellist.h"\

-	{$(INCLUDE)}"\.\include\utl_list.h"\

-	{$(INCLUDE)}"\.\include\utl_namelist.h"\

-	{$(INCLUDE)}"\.\include\utl_scope.h"\

-	{$(INCLUDE)}"\.\include\utl_scoped_name.h"\

-	{$(INCLUDE)}"\.\include\utl_stack.h"\

-	{$(INCLUDE)}"\.\include\utl_string.h"\

-	{$(INCLUDE)}"\.\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\ast_module.obj" : $(SOURCE) $(DEP_CPP_AST_M) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\ast\ast_operation.cpp

-DEP_CPP_AST_O=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/stdcpp.h"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\include\idl.h"\

-	".\include\idl_extern.h"\

-	{$(INCLUDE)}"\.\include\ast.h"\

-	{$(INCLUDE)}"\.\include\ast_argument.h"\

-	{$(INCLUDE)}"\.\include\ast_array.h"\

-	{$(INCLUDE)}"\.\include\ast_attribute.h"\

-	{$(INCLUDE)}"\.\include\ast_concrete_type.h"\

-	{$(INCLUDE)}"\.\include\ast_constant.h"\

-	{$(INCLUDE)}"\.\include\ast_decl.h"\

-	{$(INCLUDE)}"\.\include\ast_enum.h"\

-	{$(INCLUDE)}"\.\include\ast_enum_val.h"\

-	{$(INCLUDE)}"\.\include\ast_exception.h"\

-	{$(INCLUDE)}"\.\include\ast_expression.h"\

-	{$(INCLUDE)}"\.\include\ast_extern.h"\

-	{$(INCLUDE)}"\.\include\ast_field.h"\

-	{$(INCLUDE)}"\.\include\ast_generator.h"\

-	{$(INCLUDE)}"\.\include\ast_interface.h"\

-	{$(INCLUDE)}"\.\include\ast_interface_fwd.h"\

-	{$(INCLUDE)}"\.\include\ast_module.h"\

-	{$(INCLUDE)}"\.\include\ast_operation.h"\

-	{$(INCLUDE)}"\.\include\ast_predefined_type.h"\

-	{$(INCLUDE)}"\.\include\ast_root.h"\

-	{$(INCLUDE)}"\.\include\ast_sequence.h"\

-	{$(INCLUDE)}"\.\include\ast_string.h"\

-	{$(INCLUDE)}"\.\include\ast_structure.h"\

-	{$(INCLUDE)}"\.\include\ast_type.h"\

-	{$(INCLUDE)}"\.\include\ast_typedef.h"\

-	{$(INCLUDE)}"\.\include\ast_union.h"\

-	{$(INCLUDE)}"\.\include\ast_union_branch.h"\

-	{$(INCLUDE)}"\.\include\ast_union_label.h"\

-	{$(INCLUDE)}"\.\include\be_extern.h"\

-	{$(INCLUDE)}"\.\include\drv_extern.h"\

-	{$(INCLUDE)}"\.\include\fe_extern.h"\

-	{$(INCLUDE)}"\.\include\global_extern.h"\

-	{$(INCLUDE)}"\.\include\idl_bool.h"\

-	{$(INCLUDE)}"\.\include\idl_defines.h"\

-	{$(INCLUDE)}"\.\include\idl_fwd.h"\

-	{$(INCLUDE)}"\.\include\idl_global.h"\

-	{$(INCLUDE)}"\.\include\idl_narrow.h"\

-	{$(INCLUDE)}"\.\include\intlmacros.h"\

-	{$(INCLUDE)}"\.\include\nr_extern.h"\

-	{$(INCLUDE)}"\.\include\util.h"\

-	{$(INCLUDE)}"\.\include\utl_decllist.h"\

-	{$(INCLUDE)}"\.\include\utl_error.h"\

-	{$(INCLUDE)}"\.\include\utl_exceptlist.h"\

-	{$(INCLUDE)}"\.\include\utl_exprlist.h"\

-	{$(INCLUDE)}"\.\include\utl_identifier.h"\

-	{$(INCLUDE)}"\.\include\utl_idlist.h"\

-	{$(INCLUDE)}"\.\include\utl_indenter.h"\

-	{$(INCLUDE)}"\.\include\utl_labellist.h"\

-	{$(INCLUDE)}"\.\include\utl_list.h"\

-	{$(INCLUDE)}"\.\include\utl_namelist.h"\

-	{$(INCLUDE)}"\.\include\utl_scope.h"\

-	{$(INCLUDE)}"\.\include\utl_scoped_name.h"\

-	{$(INCLUDE)}"\.\include\utl_stack.h"\

-	{$(INCLUDE)}"\.\include\utl_string.h"\

-	{$(INCLUDE)}"\.\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\ast_operation.obj" : $(SOURCE) $(DEP_CPP_AST_O) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\ast\ast_predefined_type.cpp

-DEP_CPP_AST_P=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/stdcpp.h"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\include\idl.h"\

-	".\include\idl_extern.h"\

-	{$(INCLUDE)}"\.\include\ast.h"\

-	{$(INCLUDE)}"\.\include\ast_argument.h"\

-	{$(INCLUDE)}"\.\include\ast_array.h"\

-	{$(INCLUDE)}"\.\include\ast_attribute.h"\

-	{$(INCLUDE)}"\.\include\ast_concrete_type.h"\

-	{$(INCLUDE)}"\.\include\ast_constant.h"\

-	{$(INCLUDE)}"\.\include\ast_decl.h"\

-	{$(INCLUDE)}"\.\include\ast_enum.h"\

-	{$(INCLUDE)}"\.\include\ast_enum_val.h"\

-	{$(INCLUDE)}"\.\include\ast_exception.h"\

-	{$(INCLUDE)}"\.\include\ast_expression.h"\

-	{$(INCLUDE)}"\.\include\ast_extern.h"\

-	{$(INCLUDE)}"\.\include\ast_field.h"\

-	{$(INCLUDE)}"\.\include\ast_generator.h"\

-	{$(INCLUDE)}"\.\include\ast_interface.h"\

-	{$(INCLUDE)}"\.\include\ast_interface_fwd.h"\

-	{$(INCLUDE)}"\.\include\ast_module.h"\

-	{$(INCLUDE)}"\.\include\ast_operation.h"\

-	{$(INCLUDE)}"\.\include\ast_predefined_type.h"\

-	{$(INCLUDE)}"\.\include\ast_root.h"\

-	{$(INCLUDE)}"\.\include\ast_sequence.h"\

-	{$(INCLUDE)}"\.\include\ast_string.h"\

-	{$(INCLUDE)}"\.\include\ast_structure.h"\

-	{$(INCLUDE)}"\.\include\ast_type.h"\

-	{$(INCLUDE)}"\.\include\ast_typedef.h"\

-	{$(INCLUDE)}"\.\include\ast_union.h"\

-	{$(INCLUDE)}"\.\include\ast_union_branch.h"\

-	{$(INCLUDE)}"\.\include\ast_union_label.h"\

-	{$(INCLUDE)}"\.\include\be_extern.h"\

-	{$(INCLUDE)}"\.\include\drv_extern.h"\

-	{$(INCLUDE)}"\.\include\fe_extern.h"\

-	{$(INCLUDE)}"\.\include\global_extern.h"\

-	{$(INCLUDE)}"\.\include\idl_bool.h"\

-	{$(INCLUDE)}"\.\include\idl_defines.h"\

-	{$(INCLUDE)}"\.\include\idl_fwd.h"\

-	{$(INCLUDE)}"\.\include\idl_global.h"\

-	{$(INCLUDE)}"\.\include\idl_narrow.h"\

-	{$(INCLUDE)}"\.\include\intlmacros.h"\

-	{$(INCLUDE)}"\.\include\nr_extern.h"\

-	{$(INCLUDE)}"\.\include\util.h"\

-	{$(INCLUDE)}"\.\include\utl_decllist.h"\

-	{$(INCLUDE)}"\.\include\utl_error.h"\

-	{$(INCLUDE)}"\.\include\utl_exceptlist.h"\

-	{$(INCLUDE)}"\.\include\utl_exprlist.h"\

-	{$(INCLUDE)}"\.\include\utl_identifier.h"\

-	{$(INCLUDE)}"\.\include\utl_idlist.h"\

-	{$(INCLUDE)}"\.\include\utl_indenter.h"\

-	{$(INCLUDE)}"\.\include\utl_labellist.h"\

-	{$(INCLUDE)}"\.\include\utl_list.h"\

-	{$(INCLUDE)}"\.\include\utl_namelist.h"\

-	{$(INCLUDE)}"\.\include\utl_scope.h"\

-	{$(INCLUDE)}"\.\include\utl_scoped_name.h"\

-	{$(INCLUDE)}"\.\include\utl_stack.h"\

-	{$(INCLUDE)}"\.\include\utl_string.h"\

-	{$(INCLUDE)}"\.\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\ast_predefined_type.obj" : $(SOURCE) $(DEP_CPP_AST_P) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\ast\ast_recursive.cpp

-DEP_CPP_AST_R=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/stdcpp.h"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\include\idl.h"\

-	".\include\idl_extern.h"\

-	{$(INCLUDE)}"\.\include\ast.h"\

-	{$(INCLUDE)}"\.\include\ast_argument.h"\

-	{$(INCLUDE)}"\.\include\ast_array.h"\

-	{$(INCLUDE)}"\.\include\ast_attribute.h"\

-	{$(INCLUDE)}"\.\include\ast_concrete_type.h"\

-	{$(INCLUDE)}"\.\include\ast_constant.h"\

-	{$(INCLUDE)}"\.\include\ast_decl.h"\

-	{$(INCLUDE)}"\.\include\ast_enum.h"\

-	{$(INCLUDE)}"\.\include\ast_enum_val.h"\

-	{$(INCLUDE)}"\.\include\ast_exception.h"\

-	{$(INCLUDE)}"\.\include\ast_expression.h"\

-	{$(INCLUDE)}"\.\include\ast_extern.h"\

-	{$(INCLUDE)}"\.\include\ast_field.h"\

-	{$(INCLUDE)}"\.\include\ast_generator.h"\

-	{$(INCLUDE)}"\.\include\ast_interface.h"\

-	{$(INCLUDE)}"\.\include\ast_interface_fwd.h"\

-	{$(INCLUDE)}"\.\include\ast_module.h"\

-	{$(INCLUDE)}"\.\include\ast_operation.h"\

-	{$(INCLUDE)}"\.\include\ast_predefined_type.h"\

-	{$(INCLUDE)}"\.\include\ast_root.h"\

-	{$(INCLUDE)}"\.\include\ast_sequence.h"\

-	{$(INCLUDE)}"\.\include\ast_string.h"\

-	{$(INCLUDE)}"\.\include\ast_structure.h"\

-	{$(INCLUDE)}"\.\include\ast_type.h"\

-	{$(INCLUDE)}"\.\include\ast_typedef.h"\

-	{$(INCLUDE)}"\.\include\ast_union.h"\

-	{$(INCLUDE)}"\.\include\ast_union_branch.h"\

-	{$(INCLUDE)}"\.\include\ast_union_label.h"\

-	{$(INCLUDE)}"\.\include\be_extern.h"\

-	{$(INCLUDE)}"\.\include\drv_extern.h"\

-	{$(INCLUDE)}"\.\include\fe_extern.h"\

-	{$(INCLUDE)}"\.\include\global_extern.h"\

-	{$(INCLUDE)}"\.\include\idl_bool.h"\

-	{$(INCLUDE)}"\.\include\idl_defines.h"\

-	{$(INCLUDE)}"\.\include\idl_fwd.h"\

-	{$(INCLUDE)}"\.\include\idl_global.h"\

-	{$(INCLUDE)}"\.\include\idl_narrow.h"\

-	{$(INCLUDE)}"\.\include\intlmacros.h"\

-	{$(INCLUDE)}"\.\include\nr_extern.h"\

-	{$(INCLUDE)}"\.\include\util.h"\

-	{$(INCLUDE)}"\.\include\utl_decllist.h"\

-	{$(INCLUDE)}"\.\include\utl_error.h"\

-	{$(INCLUDE)}"\.\include\utl_exceptlist.h"\

-	{$(INCLUDE)}"\.\include\utl_exprlist.h"\

-	{$(INCLUDE)}"\.\include\utl_identifier.h"\

-	{$(INCLUDE)}"\.\include\utl_idlist.h"\

-	{$(INCLUDE)}"\.\include\utl_indenter.h"\

-	{$(INCLUDE)}"\.\include\utl_labellist.h"\

-	{$(INCLUDE)}"\.\include\utl_list.h"\

-	{$(INCLUDE)}"\.\include\utl_namelist.h"\

-	{$(INCLUDE)}"\.\include\utl_scope.h"\

-	{$(INCLUDE)}"\.\include\utl_scoped_name.h"\

-	{$(INCLUDE)}"\.\include\utl_stack.h"\

-	{$(INCLUDE)}"\.\include\utl_string.h"\

-	{$(INCLUDE)}"\.\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\ast_recursive.obj" : $(SOURCE) $(DEP_CPP_AST_R) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\ast\ast_redef.cpp

-DEP_CPP_AST_RE=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/stdcpp.h"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\include\idl.h"\

-	".\include\idl_extern.h"\

-	{$(INCLUDE)}"\.\include\ast.h"\

-	{$(INCLUDE)}"\.\include\ast_argument.h"\

-	{$(INCLUDE)}"\.\include\ast_array.h"\

-	{$(INCLUDE)}"\.\include\ast_attribute.h"\

-	{$(INCLUDE)}"\.\include\ast_concrete_type.h"\

-	{$(INCLUDE)}"\.\include\ast_constant.h"\

-	{$(INCLUDE)}"\.\include\ast_decl.h"\

-	{$(INCLUDE)}"\.\include\ast_enum.h"\

-	{$(INCLUDE)}"\.\include\ast_enum_val.h"\

-	{$(INCLUDE)}"\.\include\ast_exception.h"\

-	{$(INCLUDE)}"\.\include\ast_expression.h"\

-	{$(INCLUDE)}"\.\include\ast_extern.h"\

-	{$(INCLUDE)}"\.\include\ast_field.h"\

-	{$(INCLUDE)}"\.\include\ast_generator.h"\

-	{$(INCLUDE)}"\.\include\ast_interface.h"\

-	{$(INCLUDE)}"\.\include\ast_interface_fwd.h"\

-	{$(INCLUDE)}"\.\include\ast_module.h"\

-	{$(INCLUDE)}"\.\include\ast_operation.h"\

-	{$(INCLUDE)}"\.\include\ast_predefined_type.h"\

-	{$(INCLUDE)}"\.\include\ast_root.h"\

-	{$(INCLUDE)}"\.\include\ast_sequence.h"\

-	{$(INCLUDE)}"\.\include\ast_string.h"\

-	{$(INCLUDE)}"\.\include\ast_structure.h"\

-	{$(INCLUDE)}"\.\include\ast_type.h"\

-	{$(INCLUDE)}"\.\include\ast_typedef.h"\

-	{$(INCLUDE)}"\.\include\ast_union.h"\

-	{$(INCLUDE)}"\.\include\ast_union_branch.h"\

-	{$(INCLUDE)}"\.\include\ast_union_label.h"\

-	{$(INCLUDE)}"\.\include\be_extern.h"\

-	{$(INCLUDE)}"\.\include\drv_extern.h"\

-	{$(INCLUDE)}"\.\include\fe_extern.h"\

-	{$(INCLUDE)}"\.\include\global_extern.h"\

-	{$(INCLUDE)}"\.\include\idl_bool.h"\

-	{$(INCLUDE)}"\.\include\idl_defines.h"\

-	{$(INCLUDE)}"\.\include\idl_fwd.h"\

-	{$(INCLUDE)}"\.\include\idl_global.h"\

-	{$(INCLUDE)}"\.\include\idl_narrow.h"\

-	{$(INCLUDE)}"\.\include\intlmacros.h"\

-	{$(INCLUDE)}"\.\include\nr_extern.h"\

-	{$(INCLUDE)}"\.\include\util.h"\

-	{$(INCLUDE)}"\.\include\utl_decllist.h"\

-	{$(INCLUDE)}"\.\include\utl_error.h"\

-	{$(INCLUDE)}"\.\include\utl_exceptlist.h"\

-	{$(INCLUDE)}"\.\include\utl_exprlist.h"\

-	{$(INCLUDE)}"\.\include\utl_identifier.h"\

-	{$(INCLUDE)}"\.\include\utl_idlist.h"\

-	{$(INCLUDE)}"\.\include\utl_indenter.h"\

-	{$(INCLUDE)}"\.\include\utl_labellist.h"\

-	{$(INCLUDE)}"\.\include\utl_list.h"\

-	{$(INCLUDE)}"\.\include\utl_namelist.h"\

-	{$(INCLUDE)}"\.\include\utl_scope.h"\

-	{$(INCLUDE)}"\.\include\utl_scoped_name.h"\

-	{$(INCLUDE)}"\.\include\utl_stack.h"\

-	{$(INCLUDE)}"\.\include\utl_string.h"\

-	{$(INCLUDE)}"\.\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\ast_redef.obj" : $(SOURCE) $(DEP_CPP_AST_RE) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\ast\ast_root.cpp

-DEP_CPP_AST_RO=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/stdcpp.h"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\include\idl.h"\

-	".\include\idl_extern.h"\

-	{$(INCLUDE)}"\.\include\ast.h"\

-	{$(INCLUDE)}"\.\include\ast_argument.h"\

-	{$(INCLUDE)}"\.\include\ast_array.h"\

-	{$(INCLUDE)}"\.\include\ast_attribute.h"\

-	{$(INCLUDE)}"\.\include\ast_concrete_type.h"\

-	{$(INCLUDE)}"\.\include\ast_constant.h"\

-	{$(INCLUDE)}"\.\include\ast_decl.h"\

-	{$(INCLUDE)}"\.\include\ast_enum.h"\

-	{$(INCLUDE)}"\.\include\ast_enum_val.h"\

-	{$(INCLUDE)}"\.\include\ast_exception.h"\

-	{$(INCLUDE)}"\.\include\ast_expression.h"\

-	{$(INCLUDE)}"\.\include\ast_extern.h"\

-	{$(INCLUDE)}"\.\include\ast_field.h"\

-	{$(INCLUDE)}"\.\include\ast_generator.h"\

-	{$(INCLUDE)}"\.\include\ast_interface.h"\

-	{$(INCLUDE)}"\.\include\ast_interface_fwd.h"\

-	{$(INCLUDE)}"\.\include\ast_module.h"\

-	{$(INCLUDE)}"\.\include\ast_operation.h"\

-	{$(INCLUDE)}"\.\include\ast_predefined_type.h"\

-	{$(INCLUDE)}"\.\include\ast_root.h"\

-	{$(INCLUDE)}"\.\include\ast_sequence.h"\

-	{$(INCLUDE)}"\.\include\ast_string.h"\

-	{$(INCLUDE)}"\.\include\ast_structure.h"\

-	{$(INCLUDE)}"\.\include\ast_type.h"\

-	{$(INCLUDE)}"\.\include\ast_typedef.h"\

-	{$(INCLUDE)}"\.\include\ast_union.h"\

-	{$(INCLUDE)}"\.\include\ast_union_branch.h"\

-	{$(INCLUDE)}"\.\include\ast_union_label.h"\

-	{$(INCLUDE)}"\.\include\be_extern.h"\

-	{$(INCLUDE)}"\.\include\drv_extern.h"\

-	{$(INCLUDE)}"\.\include\fe_extern.h"\

-	{$(INCLUDE)}"\.\include\global_extern.h"\

-	{$(INCLUDE)}"\.\include\idl_bool.h"\

-	{$(INCLUDE)}"\.\include\idl_defines.h"\

-	{$(INCLUDE)}"\.\include\idl_fwd.h"\

-	{$(INCLUDE)}"\.\include\idl_global.h"\

-	{$(INCLUDE)}"\.\include\idl_narrow.h"\

-	{$(INCLUDE)}"\.\include\intlmacros.h"\

-	{$(INCLUDE)}"\.\include\nr_extern.h"\

-	{$(INCLUDE)}"\.\include\util.h"\

-	{$(INCLUDE)}"\.\include\utl_decllist.h"\

-	{$(INCLUDE)}"\.\include\utl_error.h"\

-	{$(INCLUDE)}"\.\include\utl_exceptlist.h"\

-	{$(INCLUDE)}"\.\include\utl_exprlist.h"\

-	{$(INCLUDE)}"\.\include\utl_identifier.h"\

-	{$(INCLUDE)}"\.\include\utl_idlist.h"\

-	{$(INCLUDE)}"\.\include\utl_indenter.h"\

-	{$(INCLUDE)}"\.\include\utl_labellist.h"\

-	{$(INCLUDE)}"\.\include\utl_list.h"\

-	{$(INCLUDE)}"\.\include\utl_namelist.h"\

-	{$(INCLUDE)}"\.\include\utl_scope.h"\

-	{$(INCLUDE)}"\.\include\utl_scoped_name.h"\

-	{$(INCLUDE)}"\.\include\utl_stack.h"\

-	{$(INCLUDE)}"\.\include\utl_string.h"\

-	{$(INCLUDE)}"\.\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\ast_root.obj" : $(SOURCE) $(DEP_CPP_AST_RO) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\ast\ast_sequence.cpp

-DEP_CPP_AST_S=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/stdcpp.h"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\include\idl.h"\

-	".\include\idl_extern.h"\

-	{$(INCLUDE)}"\.\include\ast.h"\

-	{$(INCLUDE)}"\.\include\ast_argument.h"\

-	{$(INCLUDE)}"\.\include\ast_array.h"\

-	{$(INCLUDE)}"\.\include\ast_attribute.h"\

-	{$(INCLUDE)}"\.\include\ast_concrete_type.h"\

-	{$(INCLUDE)}"\.\include\ast_constant.h"\

-	{$(INCLUDE)}"\.\include\ast_decl.h"\

-	{$(INCLUDE)}"\.\include\ast_enum.h"\

-	{$(INCLUDE)}"\.\include\ast_enum_val.h"\

-	{$(INCLUDE)}"\.\include\ast_exception.h"\

-	{$(INCLUDE)}"\.\include\ast_expression.h"\

-	{$(INCLUDE)}"\.\include\ast_extern.h"\

-	{$(INCLUDE)}"\.\include\ast_field.h"\

-	{$(INCLUDE)}"\.\include\ast_generator.h"\

-	{$(INCLUDE)}"\.\include\ast_interface.h"\

-	{$(INCLUDE)}"\.\include\ast_interface_fwd.h"\

-	{$(INCLUDE)}"\.\include\ast_module.h"\

-	{$(INCLUDE)}"\.\include\ast_operation.h"\

-	{$(INCLUDE)}"\.\include\ast_predefined_type.h"\

-	{$(INCLUDE)}"\.\include\ast_root.h"\

-	{$(INCLUDE)}"\.\include\ast_sequence.h"\

-	{$(INCLUDE)}"\.\include\ast_string.h"\

-	{$(INCLUDE)}"\.\include\ast_structure.h"\

-	{$(INCLUDE)}"\.\include\ast_type.h"\

-	{$(INCLUDE)}"\.\include\ast_typedef.h"\

-	{$(INCLUDE)}"\.\include\ast_union.h"\

-	{$(INCLUDE)}"\.\include\ast_union_branch.h"\

-	{$(INCLUDE)}"\.\include\ast_union_label.h"\

-	{$(INCLUDE)}"\.\include\be_extern.h"\

-	{$(INCLUDE)}"\.\include\drv_extern.h"\

-	{$(INCLUDE)}"\.\include\fe_extern.h"\

-	{$(INCLUDE)}"\.\include\global_extern.h"\

-	{$(INCLUDE)}"\.\include\idl_bool.h"\

-	{$(INCLUDE)}"\.\include\idl_defines.h"\

-	{$(INCLUDE)}"\.\include\idl_fwd.h"\

-	{$(INCLUDE)}"\.\include\idl_global.h"\

-	{$(INCLUDE)}"\.\include\idl_narrow.h"\

-	{$(INCLUDE)}"\.\include\intlmacros.h"\

-	{$(INCLUDE)}"\.\include\nr_extern.h"\

-	{$(INCLUDE)}"\.\include\util.h"\

-	{$(INCLUDE)}"\.\include\utl_decllist.h"\

-	{$(INCLUDE)}"\.\include\utl_error.h"\

-	{$(INCLUDE)}"\.\include\utl_exceptlist.h"\

-	{$(INCLUDE)}"\.\include\utl_exprlist.h"\

-	{$(INCLUDE)}"\.\include\utl_identifier.h"\

-	{$(INCLUDE)}"\.\include\utl_idlist.h"\

-	{$(INCLUDE)}"\.\include\utl_indenter.h"\

-	{$(INCLUDE)}"\.\include\utl_labellist.h"\

-	{$(INCLUDE)}"\.\include\utl_list.h"\

-	{$(INCLUDE)}"\.\include\utl_namelist.h"\

-	{$(INCLUDE)}"\.\include\utl_scope.h"\

-	{$(INCLUDE)}"\.\include\utl_scoped_name.h"\

-	{$(INCLUDE)}"\.\include\utl_stack.h"\

-	{$(INCLUDE)}"\.\include\utl_string.h"\

-	{$(INCLUDE)}"\.\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\ast_sequence.obj" : $(SOURCE) $(DEP_CPP_AST_S) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\ast\ast_string.cpp

-DEP_CPP_AST_ST=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/stdcpp.h"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\include\idl.h"\

-	".\include\idl_extern.h"\

-	{$(INCLUDE)}"\.\include\ast.h"\

-	{$(INCLUDE)}"\.\include\ast_argument.h"\

-	{$(INCLUDE)}"\.\include\ast_array.h"\

-	{$(INCLUDE)}"\.\include\ast_attribute.h"\

-	{$(INCLUDE)}"\.\include\ast_concrete_type.h"\

-	{$(INCLUDE)}"\.\include\ast_constant.h"\

-	{$(INCLUDE)}"\.\include\ast_decl.h"\

-	{$(INCLUDE)}"\.\include\ast_enum.h"\

-	{$(INCLUDE)}"\.\include\ast_enum_val.h"\

-	{$(INCLUDE)}"\.\include\ast_exception.h"\

-	{$(INCLUDE)}"\.\include\ast_expression.h"\

-	{$(INCLUDE)}"\.\include\ast_extern.h"\

-	{$(INCLUDE)}"\.\include\ast_field.h"\

-	{$(INCLUDE)}"\.\include\ast_generator.h"\

-	{$(INCLUDE)}"\.\include\ast_interface.h"\

-	{$(INCLUDE)}"\.\include\ast_interface_fwd.h"\

-	{$(INCLUDE)}"\.\include\ast_module.h"\

-	{$(INCLUDE)}"\.\include\ast_operation.h"\

-	{$(INCLUDE)}"\.\include\ast_predefined_type.h"\

-	{$(INCLUDE)}"\.\include\ast_root.h"\

-	{$(INCLUDE)}"\.\include\ast_sequence.h"\

-	{$(INCLUDE)}"\.\include\ast_string.h"\

-	{$(INCLUDE)}"\.\include\ast_structure.h"\

-	{$(INCLUDE)}"\.\include\ast_type.h"\

-	{$(INCLUDE)}"\.\include\ast_typedef.h"\

-	{$(INCLUDE)}"\.\include\ast_union.h"\

-	{$(INCLUDE)}"\.\include\ast_union_branch.h"\

-	{$(INCLUDE)}"\.\include\ast_union_label.h"\

-	{$(INCLUDE)}"\.\include\be_extern.h"\

-	{$(INCLUDE)}"\.\include\drv_extern.h"\

-	{$(INCLUDE)}"\.\include\fe_extern.h"\

-	{$(INCLUDE)}"\.\include\global_extern.h"\

-	{$(INCLUDE)}"\.\include\idl_bool.h"\

-	{$(INCLUDE)}"\.\include\idl_defines.h"\

-	{$(INCLUDE)}"\.\include\idl_fwd.h"\

-	{$(INCLUDE)}"\.\include\idl_global.h"\

-	{$(INCLUDE)}"\.\include\idl_narrow.h"\

-	{$(INCLUDE)}"\.\include\intlmacros.h"\

-	{$(INCLUDE)}"\.\include\nr_extern.h"\

-	{$(INCLUDE)}"\.\include\util.h"\

-	{$(INCLUDE)}"\.\include\utl_decllist.h"\

-	{$(INCLUDE)}"\.\include\utl_error.h"\

-	{$(INCLUDE)}"\.\include\utl_exceptlist.h"\

-	{$(INCLUDE)}"\.\include\utl_exprlist.h"\

-	{$(INCLUDE)}"\.\include\utl_identifier.h"\

-	{$(INCLUDE)}"\.\include\utl_idlist.h"\

-	{$(INCLUDE)}"\.\include\utl_indenter.h"\

-	{$(INCLUDE)}"\.\include\utl_labellist.h"\

-	{$(INCLUDE)}"\.\include\utl_list.h"\

-	{$(INCLUDE)}"\.\include\utl_namelist.h"\

-	{$(INCLUDE)}"\.\include\utl_scope.h"\

-	{$(INCLUDE)}"\.\include\utl_scoped_name.h"\

-	{$(INCLUDE)}"\.\include\utl_stack.h"\

-	{$(INCLUDE)}"\.\include\utl_string.h"\

-	{$(INCLUDE)}"\.\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\ast_string.obj" : $(SOURCE) $(DEP_CPP_AST_ST) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\ast\ast_structure.cpp

-DEP_CPP_AST_STR=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/stdcpp.h"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\include\idl.h"\

-	".\include\idl_extern.h"\

-	{$(INCLUDE)}"\.\include\ast.h"\

-	{$(INCLUDE)}"\.\include\ast_argument.h"\

-	{$(INCLUDE)}"\.\include\ast_array.h"\

-	{$(INCLUDE)}"\.\include\ast_attribute.h"\

-	{$(INCLUDE)}"\.\include\ast_concrete_type.h"\

-	{$(INCLUDE)}"\.\include\ast_constant.h"\

-	{$(INCLUDE)}"\.\include\ast_decl.h"\

-	{$(INCLUDE)}"\.\include\ast_enum.h"\

-	{$(INCLUDE)}"\.\include\ast_enum_val.h"\

-	{$(INCLUDE)}"\.\include\ast_exception.h"\

-	{$(INCLUDE)}"\.\include\ast_expression.h"\

-	{$(INCLUDE)}"\.\include\ast_extern.h"\

-	{$(INCLUDE)}"\.\include\ast_field.h"\

-	{$(INCLUDE)}"\.\include\ast_generator.h"\

-	{$(INCLUDE)}"\.\include\ast_interface.h"\

-	{$(INCLUDE)}"\.\include\ast_interface_fwd.h"\

-	{$(INCLUDE)}"\.\include\ast_module.h"\

-	{$(INCLUDE)}"\.\include\ast_operation.h"\

-	{$(INCLUDE)}"\.\include\ast_predefined_type.h"\

-	{$(INCLUDE)}"\.\include\ast_root.h"\

-	{$(INCLUDE)}"\.\include\ast_sequence.h"\

-	{$(INCLUDE)}"\.\include\ast_string.h"\

-	{$(INCLUDE)}"\.\include\ast_structure.h"\

-	{$(INCLUDE)}"\.\include\ast_type.h"\

-	{$(INCLUDE)}"\.\include\ast_typedef.h"\

-	{$(INCLUDE)}"\.\include\ast_union.h"\

-	{$(INCLUDE)}"\.\include\ast_union_branch.h"\

-	{$(INCLUDE)}"\.\include\ast_union_label.h"\

-	{$(INCLUDE)}"\.\include\be_extern.h"\

-	{$(INCLUDE)}"\.\include\drv_extern.h"\

-	{$(INCLUDE)}"\.\include\fe_extern.h"\

-	{$(INCLUDE)}"\.\include\global_extern.h"\

-	{$(INCLUDE)}"\.\include\idl_bool.h"\

-	{$(INCLUDE)}"\.\include\idl_defines.h"\

-	{$(INCLUDE)}"\.\include\idl_fwd.h"\

-	{$(INCLUDE)}"\.\include\idl_global.h"\

-	{$(INCLUDE)}"\.\include\idl_narrow.h"\

-	{$(INCLUDE)}"\.\include\intlmacros.h"\

-	{$(INCLUDE)}"\.\include\nr_extern.h"\

-	{$(INCLUDE)}"\.\include\util.h"\

-	{$(INCLUDE)}"\.\include\utl_decllist.h"\

-	{$(INCLUDE)}"\.\include\utl_error.h"\

-	{$(INCLUDE)}"\.\include\utl_exceptlist.h"\

-	{$(INCLUDE)}"\.\include\utl_exprlist.h"\

-	{$(INCLUDE)}"\.\include\utl_identifier.h"\

-	{$(INCLUDE)}"\.\include\utl_idlist.h"\

-	{$(INCLUDE)}"\.\include\utl_indenter.h"\

-	{$(INCLUDE)}"\.\include\utl_labellist.h"\

-	{$(INCLUDE)}"\.\include\utl_list.h"\

-	{$(INCLUDE)}"\.\include\utl_namelist.h"\

-	{$(INCLUDE)}"\.\include\utl_scope.h"\

-	{$(INCLUDE)}"\.\include\utl_scoped_name.h"\

-	{$(INCLUDE)}"\.\include\utl_stack.h"\

-	{$(INCLUDE)}"\.\include\utl_string.h"\

-	{$(INCLUDE)}"\.\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\ast_structure.obj" : $(SOURCE) $(DEP_CPP_AST_STR) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\ast\ast_type.cpp

-DEP_CPP_AST_T=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/stdcpp.h"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\include\idl.h"\

-	".\include\idl_extern.h"\

-	{$(INCLUDE)}"\.\include\ast.h"\

-	{$(INCLUDE)}"\.\include\ast_argument.h"\

-	{$(INCLUDE)}"\.\include\ast_array.h"\

-	{$(INCLUDE)}"\.\include\ast_attribute.h"\

-	{$(INCLUDE)}"\.\include\ast_concrete_type.h"\

-	{$(INCLUDE)}"\.\include\ast_constant.h"\

-	{$(INCLUDE)}"\.\include\ast_decl.h"\

-	{$(INCLUDE)}"\.\include\ast_enum.h"\

-	{$(INCLUDE)}"\.\include\ast_enum_val.h"\

-	{$(INCLUDE)}"\.\include\ast_exception.h"\

-	{$(INCLUDE)}"\.\include\ast_expression.h"\

-	{$(INCLUDE)}"\.\include\ast_extern.h"\

-	{$(INCLUDE)}"\.\include\ast_field.h"\

-	{$(INCLUDE)}"\.\include\ast_generator.h"\

-	{$(INCLUDE)}"\.\include\ast_interface.h"\

-	{$(INCLUDE)}"\.\include\ast_interface_fwd.h"\

-	{$(INCLUDE)}"\.\include\ast_module.h"\

-	{$(INCLUDE)}"\.\include\ast_operation.h"\

-	{$(INCLUDE)}"\.\include\ast_predefined_type.h"\

-	{$(INCLUDE)}"\.\include\ast_root.h"\

-	{$(INCLUDE)}"\.\include\ast_sequence.h"\

-	{$(INCLUDE)}"\.\include\ast_string.h"\

-	{$(INCLUDE)}"\.\include\ast_structure.h"\

-	{$(INCLUDE)}"\.\include\ast_type.h"\

-	{$(INCLUDE)}"\.\include\ast_typedef.h"\

-	{$(INCLUDE)}"\.\include\ast_union.h"\

-	{$(INCLUDE)}"\.\include\ast_union_branch.h"\

-	{$(INCLUDE)}"\.\include\ast_union_label.h"\

-	{$(INCLUDE)}"\.\include\be_extern.h"\

-	{$(INCLUDE)}"\.\include\drv_extern.h"\

-	{$(INCLUDE)}"\.\include\fe_extern.h"\

-	{$(INCLUDE)}"\.\include\global_extern.h"\

-	{$(INCLUDE)}"\.\include\idl_bool.h"\

-	{$(INCLUDE)}"\.\include\idl_defines.h"\

-	{$(INCLUDE)}"\.\include\idl_fwd.h"\

-	{$(INCLUDE)}"\.\include\idl_global.h"\

-	{$(INCLUDE)}"\.\include\idl_narrow.h"\

-	{$(INCLUDE)}"\.\include\intlmacros.h"\

-	{$(INCLUDE)}"\.\include\nr_extern.h"\

-	{$(INCLUDE)}"\.\include\util.h"\

-	{$(INCLUDE)}"\.\include\utl_decllist.h"\

-	{$(INCLUDE)}"\.\include\utl_error.h"\

-	{$(INCLUDE)}"\.\include\utl_exceptlist.h"\

-	{$(INCLUDE)}"\.\include\utl_exprlist.h"\

-	{$(INCLUDE)}"\.\include\utl_identifier.h"\

-	{$(INCLUDE)}"\.\include\utl_idlist.h"\

-	{$(INCLUDE)}"\.\include\utl_indenter.h"\

-	{$(INCLUDE)}"\.\include\utl_labellist.h"\

-	{$(INCLUDE)}"\.\include\utl_list.h"\

-	{$(INCLUDE)}"\.\include\utl_namelist.h"\

-	{$(INCLUDE)}"\.\include\utl_scope.h"\

-	{$(INCLUDE)}"\.\include\utl_scoped_name.h"\

-	{$(INCLUDE)}"\.\include\utl_stack.h"\

-	{$(INCLUDE)}"\.\include\utl_string.h"\

-	{$(INCLUDE)}"\.\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\ast_type.obj" : $(SOURCE) $(DEP_CPP_AST_T) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\ast\ast_typedef.cpp

-DEP_CPP_AST_TY=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/stdcpp.h"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\include\idl.h"\

-	".\include\idl_extern.h"\

-	{$(INCLUDE)}"\.\include\ast.h"\

-	{$(INCLUDE)}"\.\include\ast_argument.h"\

-	{$(INCLUDE)}"\.\include\ast_array.h"\

-	{$(INCLUDE)}"\.\include\ast_attribute.h"\

-	{$(INCLUDE)}"\.\include\ast_concrete_type.h"\

-	{$(INCLUDE)}"\.\include\ast_constant.h"\

-	{$(INCLUDE)}"\.\include\ast_decl.h"\

-	{$(INCLUDE)}"\.\include\ast_enum.h"\

-	{$(INCLUDE)}"\.\include\ast_enum_val.h"\

-	{$(INCLUDE)}"\.\include\ast_exception.h"\

-	{$(INCLUDE)}"\.\include\ast_expression.h"\

-	{$(INCLUDE)}"\.\include\ast_extern.h"\

-	{$(INCLUDE)}"\.\include\ast_field.h"\

-	{$(INCLUDE)}"\.\include\ast_generator.h"\

-	{$(INCLUDE)}"\.\include\ast_interface.h"\

-	{$(INCLUDE)}"\.\include\ast_interface_fwd.h"\

-	{$(INCLUDE)}"\.\include\ast_module.h"\

-	{$(INCLUDE)}"\.\include\ast_operation.h"\

-	{$(INCLUDE)}"\.\include\ast_predefined_type.h"\

-	{$(INCLUDE)}"\.\include\ast_root.h"\

-	{$(INCLUDE)}"\.\include\ast_sequence.h"\

-	{$(INCLUDE)}"\.\include\ast_string.h"\

-	{$(INCLUDE)}"\.\include\ast_structure.h"\

-	{$(INCLUDE)}"\.\include\ast_type.h"\

-	{$(INCLUDE)}"\.\include\ast_typedef.h"\

-	{$(INCLUDE)}"\.\include\ast_union.h"\

-	{$(INCLUDE)}"\.\include\ast_union_branch.h"\

-	{$(INCLUDE)}"\.\include\ast_union_label.h"\

-	{$(INCLUDE)}"\.\include\be_extern.h"\

-	{$(INCLUDE)}"\.\include\drv_extern.h"\

-	{$(INCLUDE)}"\.\include\fe_extern.h"\

-	{$(INCLUDE)}"\.\include\global_extern.h"\

-	{$(INCLUDE)}"\.\include\idl_bool.h"\

-	{$(INCLUDE)}"\.\include\idl_defines.h"\

-	{$(INCLUDE)}"\.\include\idl_fwd.h"\

-	{$(INCLUDE)}"\.\include\idl_global.h"\

-	{$(INCLUDE)}"\.\include\idl_narrow.h"\

-	{$(INCLUDE)}"\.\include\intlmacros.h"\

-	{$(INCLUDE)}"\.\include\nr_extern.h"\

-	{$(INCLUDE)}"\.\include\util.h"\

-	{$(INCLUDE)}"\.\include\utl_decllist.h"\

-	{$(INCLUDE)}"\.\include\utl_error.h"\

-	{$(INCLUDE)}"\.\include\utl_exceptlist.h"\

-	{$(INCLUDE)}"\.\include\utl_exprlist.h"\

-	{$(INCLUDE)}"\.\include\utl_identifier.h"\

-	{$(INCLUDE)}"\.\include\utl_idlist.h"\

-	{$(INCLUDE)}"\.\include\utl_indenter.h"\

-	{$(INCLUDE)}"\.\include\utl_labellist.h"\

-	{$(INCLUDE)}"\.\include\utl_list.h"\

-	{$(INCLUDE)}"\.\include\utl_namelist.h"\

-	{$(INCLUDE)}"\.\include\utl_scope.h"\

-	{$(INCLUDE)}"\.\include\utl_scoped_name.h"\

-	{$(INCLUDE)}"\.\include\utl_stack.h"\

-	{$(INCLUDE)}"\.\include\utl_string.h"\

-	{$(INCLUDE)}"\.\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\ast_typedef.obj" : $(SOURCE) $(DEP_CPP_AST_TY) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\ast\ast_union.cpp

-DEP_CPP_AST_U=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/stdcpp.h"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\include\idl.h"\

-	".\include\idl_extern.h"\

-	{$(INCLUDE)}"\.\include\ast.h"\

-	{$(INCLUDE)}"\.\include\ast_argument.h"\

-	{$(INCLUDE)}"\.\include\ast_array.h"\

-	{$(INCLUDE)}"\.\include\ast_attribute.h"\

-	{$(INCLUDE)}"\.\include\ast_concrete_type.h"\

-	{$(INCLUDE)}"\.\include\ast_constant.h"\

-	{$(INCLUDE)}"\.\include\ast_decl.h"\

-	{$(INCLUDE)}"\.\include\ast_enum.h"\

-	{$(INCLUDE)}"\.\include\ast_enum_val.h"\

-	{$(INCLUDE)}"\.\include\ast_exception.h"\

-	{$(INCLUDE)}"\.\include\ast_expression.h"\

-	{$(INCLUDE)}"\.\include\ast_extern.h"\

-	{$(INCLUDE)}"\.\include\ast_field.h"\

-	{$(INCLUDE)}"\.\include\ast_generator.h"\

-	{$(INCLUDE)}"\.\include\ast_interface.h"\

-	{$(INCLUDE)}"\.\include\ast_interface_fwd.h"\

-	{$(INCLUDE)}"\.\include\ast_module.h"\

-	{$(INCLUDE)}"\.\include\ast_operation.h"\

-	{$(INCLUDE)}"\.\include\ast_predefined_type.h"\

-	{$(INCLUDE)}"\.\include\ast_root.h"\

-	{$(INCLUDE)}"\.\include\ast_sequence.h"\

-	{$(INCLUDE)}"\.\include\ast_string.h"\

-	{$(INCLUDE)}"\.\include\ast_structure.h"\

-	{$(INCLUDE)}"\.\include\ast_type.h"\

-	{$(INCLUDE)}"\.\include\ast_typedef.h"\

-	{$(INCLUDE)}"\.\include\ast_union.h"\

-	{$(INCLUDE)}"\.\include\ast_union_branch.h"\

-	{$(INCLUDE)}"\.\include\ast_union_label.h"\

-	{$(INCLUDE)}"\.\include\be_extern.h"\

-	{$(INCLUDE)}"\.\include\drv_extern.h"\

-	{$(INCLUDE)}"\.\include\fe_extern.h"\

-	{$(INCLUDE)}"\.\include\global_extern.h"\

-	{$(INCLUDE)}"\.\include\idl_bool.h"\

-	{$(INCLUDE)}"\.\include\idl_defines.h"\

-	{$(INCLUDE)}"\.\include\idl_fwd.h"\

-	{$(INCLUDE)}"\.\include\idl_global.h"\

-	{$(INCLUDE)}"\.\include\idl_narrow.h"\

-	{$(INCLUDE)}"\.\include\intlmacros.h"\

-	{$(INCLUDE)}"\.\include\nr_extern.h"\

-	{$(INCLUDE)}"\.\include\util.h"\

-	{$(INCLUDE)}"\.\include\utl_decllist.h"\

-	{$(INCLUDE)}"\.\include\utl_error.h"\

-	{$(INCLUDE)}"\.\include\utl_exceptlist.h"\

-	{$(INCLUDE)}"\.\include\utl_exprlist.h"\

-	{$(INCLUDE)}"\.\include\utl_identifier.h"\

-	{$(INCLUDE)}"\.\include\utl_idlist.h"\

-	{$(INCLUDE)}"\.\include\utl_indenter.h"\

-	{$(INCLUDE)}"\.\include\utl_labellist.h"\

-	{$(INCLUDE)}"\.\include\utl_list.h"\

-	{$(INCLUDE)}"\.\include\utl_namelist.h"\

-	{$(INCLUDE)}"\.\include\utl_scope.h"\

-	{$(INCLUDE)}"\.\include\utl_scoped_name.h"\

-	{$(INCLUDE)}"\.\include\utl_stack.h"\

-	{$(INCLUDE)}"\.\include\utl_string.h"\

-	{$(INCLUDE)}"\.\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\ast_union.obj" : $(SOURCE) $(DEP_CPP_AST_U) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\ast\ast_union_branch.cpp

-DEP_CPP_AST_UN=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/stdcpp.h"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\include\idl.h"\

-	".\include\idl_extern.h"\

-	{$(INCLUDE)}"\.\include\ast.h"\

-	{$(INCLUDE)}"\.\include\ast_argument.h"\

-	{$(INCLUDE)}"\.\include\ast_array.h"\

-	{$(INCLUDE)}"\.\include\ast_attribute.h"\

-	{$(INCLUDE)}"\.\include\ast_concrete_type.h"\

-	{$(INCLUDE)}"\.\include\ast_constant.h"\

-	{$(INCLUDE)}"\.\include\ast_decl.h"\

-	{$(INCLUDE)}"\.\include\ast_enum.h"\

-	{$(INCLUDE)}"\.\include\ast_enum_val.h"\

-	{$(INCLUDE)}"\.\include\ast_exception.h"\

-	{$(INCLUDE)}"\.\include\ast_expression.h"\

-	{$(INCLUDE)}"\.\include\ast_extern.h"\

-	{$(INCLUDE)}"\.\include\ast_field.h"\

-	{$(INCLUDE)}"\.\include\ast_generator.h"\

-	{$(INCLUDE)}"\.\include\ast_interface.h"\

-	{$(INCLUDE)}"\.\include\ast_interface_fwd.h"\

-	{$(INCLUDE)}"\.\include\ast_module.h"\

-	{$(INCLUDE)}"\.\include\ast_operation.h"\

-	{$(INCLUDE)}"\.\include\ast_predefined_type.h"\

-	{$(INCLUDE)}"\.\include\ast_root.h"\

-	{$(INCLUDE)}"\.\include\ast_sequence.h"\

-	{$(INCLUDE)}"\.\include\ast_string.h"\

-	{$(INCLUDE)}"\.\include\ast_structure.h"\

-	{$(INCLUDE)}"\.\include\ast_type.h"\

-	{$(INCLUDE)}"\.\include\ast_typedef.h"\

-	{$(INCLUDE)}"\.\include\ast_union.h"\

-	{$(INCLUDE)}"\.\include\ast_union_branch.h"\

-	{$(INCLUDE)}"\.\include\ast_union_label.h"\

-	{$(INCLUDE)}"\.\include\be_extern.h"\

-	{$(INCLUDE)}"\.\include\drv_extern.h"\

-	{$(INCLUDE)}"\.\include\fe_extern.h"\

-	{$(INCLUDE)}"\.\include\global_extern.h"\

-	{$(INCLUDE)}"\.\include\idl_bool.h"\

-	{$(INCLUDE)}"\.\include\idl_defines.h"\

-	{$(INCLUDE)}"\.\include\idl_fwd.h"\

-	{$(INCLUDE)}"\.\include\idl_global.h"\

-	{$(INCLUDE)}"\.\include\idl_narrow.h"\

-	{$(INCLUDE)}"\.\include\intlmacros.h"\

-	{$(INCLUDE)}"\.\include\nr_extern.h"\

-	{$(INCLUDE)}"\.\include\util.h"\

-	{$(INCLUDE)}"\.\include\utl_decllist.h"\

-	{$(INCLUDE)}"\.\include\utl_error.h"\

-	{$(INCLUDE)}"\.\include\utl_exceptlist.h"\

-	{$(INCLUDE)}"\.\include\utl_exprlist.h"\

-	{$(INCLUDE)}"\.\include\utl_identifier.h"\

-	{$(INCLUDE)}"\.\include\utl_idlist.h"\

-	{$(INCLUDE)}"\.\include\utl_indenter.h"\

-	{$(INCLUDE)}"\.\include\utl_labellist.h"\

-	{$(INCLUDE)}"\.\include\utl_list.h"\

-	{$(INCLUDE)}"\.\include\utl_namelist.h"\

-	{$(INCLUDE)}"\.\include\utl_scope.h"\

-	{$(INCLUDE)}"\.\include\utl_scoped_name.h"\

-	{$(INCLUDE)}"\.\include\utl_stack.h"\

-	{$(INCLUDE)}"\.\include\utl_string.h"\

-	{$(INCLUDE)}"\.\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\ast_union_branch.obj" : $(SOURCE) $(DEP_CPP_AST_UN) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\ast\ast_union_label.cpp

-DEP_CPP_AST_UNI=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/stdcpp.h"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\include\idl.h"\

-	".\include\idl_extern.h"\

-	{$(INCLUDE)}"\.\include\ast.h"\

-	{$(INCLUDE)}"\.\include\ast_argument.h"\

-	{$(INCLUDE)}"\.\include\ast_array.h"\

-	{$(INCLUDE)}"\.\include\ast_attribute.h"\

-	{$(INCLUDE)}"\.\include\ast_concrete_type.h"\

-	{$(INCLUDE)}"\.\include\ast_constant.h"\

-	{$(INCLUDE)}"\.\include\ast_decl.h"\

-	{$(INCLUDE)}"\.\include\ast_enum.h"\

-	{$(INCLUDE)}"\.\include\ast_enum_val.h"\

-	{$(INCLUDE)}"\.\include\ast_exception.h"\

-	{$(INCLUDE)}"\.\include\ast_expression.h"\

-	{$(INCLUDE)}"\.\include\ast_extern.h"\

-	{$(INCLUDE)}"\.\include\ast_field.h"\

-	{$(INCLUDE)}"\.\include\ast_generator.h"\

-	{$(INCLUDE)}"\.\include\ast_interface.h"\

-	{$(INCLUDE)}"\.\include\ast_interface_fwd.h"\

-	{$(INCLUDE)}"\.\include\ast_module.h"\

-	{$(INCLUDE)}"\.\include\ast_operation.h"\

-	{$(INCLUDE)}"\.\include\ast_predefined_type.h"\

-	{$(INCLUDE)}"\.\include\ast_root.h"\

-	{$(INCLUDE)}"\.\include\ast_sequence.h"\

-	{$(INCLUDE)}"\.\include\ast_string.h"\

-	{$(INCLUDE)}"\.\include\ast_structure.h"\

-	{$(INCLUDE)}"\.\include\ast_type.h"\

-	{$(INCLUDE)}"\.\include\ast_typedef.h"\

-	{$(INCLUDE)}"\.\include\ast_union.h"\

-	{$(INCLUDE)}"\.\include\ast_union_branch.h"\

-	{$(INCLUDE)}"\.\include\ast_union_label.h"\

-	{$(INCLUDE)}"\.\include\be_extern.h"\

-	{$(INCLUDE)}"\.\include\drv_extern.h"\

-	{$(INCLUDE)}"\.\include\fe_extern.h"\

-	{$(INCLUDE)}"\.\include\global_extern.h"\

-	{$(INCLUDE)}"\.\include\idl_bool.h"\

-	{$(INCLUDE)}"\.\include\idl_defines.h"\

-	{$(INCLUDE)}"\.\include\idl_fwd.h"\

-	{$(INCLUDE)}"\.\include\idl_global.h"\

-	{$(INCLUDE)}"\.\include\idl_narrow.h"\

-	{$(INCLUDE)}"\.\include\intlmacros.h"\

-	{$(INCLUDE)}"\.\include\nr_extern.h"\

-	{$(INCLUDE)}"\.\include\util.h"\

-	{$(INCLUDE)}"\.\include\utl_decllist.h"\

-	{$(INCLUDE)}"\.\include\utl_error.h"\

-	{$(INCLUDE)}"\.\include\utl_exceptlist.h"\

-	{$(INCLUDE)}"\.\include\utl_exprlist.h"\

-	{$(INCLUDE)}"\.\include\utl_identifier.h"\

-	{$(INCLUDE)}"\.\include\utl_idlist.h"\

-	{$(INCLUDE)}"\.\include\utl_indenter.h"\

-	{$(INCLUDE)}"\.\include\utl_labellist.h"\

-	{$(INCLUDE)}"\.\include\utl_list.h"\

-	{$(INCLUDE)}"\.\include\utl_namelist.h"\

-	{$(INCLUDE)}"\.\include\utl_scope.h"\

-	{$(INCLUDE)}"\.\include\utl_scoped_name.h"\

-	{$(INCLUDE)}"\.\include\utl_stack.h"\

-	{$(INCLUDE)}"\.\include\utl_string.h"\

-	{$(INCLUDE)}"\.\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\ast_union_label.obj" : $(SOURCE) $(DEP_CPP_AST_UNI) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\be\be_state_union.cpp

-DEP_CPP_BE_STA=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Atomic_Op.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/Event_Handler.h"\

-	"..\..\ace/Event_Handler.i"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/Singleton.cpp"\

-	"..\..\ace/Singleton.h"\

-	"..\..\ace/Singleton.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/stdcpp.h"\

-	"..\..\ace/SV_Semaphore_Complex.h"\

-	"..\..\ace/SV_Semaphore_Complex.i"\

-	"..\..\ace/SV_Semaphore_Simple.h"\

-	"..\..\ace/SV_Semaphore_Simple.i"\

-	"..\..\ace/Synch.h"\

-	"..\..\ace/Synch.i"\

-	"..\..\ace/Synch_T.cpp"\

-	"..\..\ace/Synch_T.h"\

-	"..\..\ace/Synch_T.i"\

-	"..\..\ace/Thread.h"\

-	"..\..\ace/Thread.i"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\be_include\be.h"\

-	".\include\idl.h"\

-	".\include\idl_extern.h"\

-	{$(INCLUDE)}"\.\be_include\be_argument.h"\

-	{$(INCLUDE)}"\.\be_include\be_array.h"\

-	{$(INCLUDE)}"\.\be_include\be_attribute.h"\

-	{$(INCLUDE)}"\.\be_include\be_codegen.h"\

-	{$(INCLUDE)}"\.\be_include\be_constant.h"\

-	{$(INCLUDE)}"\.\be_include\be_decl.h"\

-	{$(INCLUDE)}"\.\be_include\be_enum.h"\

-	{$(INCLUDE)}"\.\be_include\be_enum_val.h"\

-	{$(INCLUDE)}"\.\be_include\be_exception.h"\

-	{$(INCLUDE)}"\.\be_include\be_expression.h"\

-	{$(INCLUDE)}"\.\be_include\be_factory.h"\

-	{$(INCLUDE)}"\.\be_include\be_field.h"\

-	{$(INCLUDE)}"\.\be_include\be_generator.h"\

-	{$(INCLUDE)}"\.\be_include\be_helper.h"\

-	{$(INCLUDE)}"\.\be_include\be_interface.h"\

-	{$(INCLUDE)}"\.\be_include\be_interface_fwd.h"\

-	{$(INCLUDE)}"\.\be_include\be_module.h"\

-	{$(INCLUDE)}"\.\be_include\be_operation.h"\

-	{$(INCLUDE)}"\.\be_include\be_predefined_type.h"\

-	{$(INCLUDE)}"\.\be_include\be_root.h"\

-	{$(INCLUDE)}"\.\be_include\be_scope.h"\

-	{$(INCLUDE)}"\.\be_include\be_sequence.h"\

-	{$(INCLUDE)}"\.\be_include\be_state.h"\

-	{$(INCLUDE)}"\.\be_include\be_string.h"\

-	{$(INCLUDE)}"\.\be_include\be_structure.h"\

-	{$(INCLUDE)}"\.\be_include\be_type.h"\

-	{$(INCLUDE)}"\.\be_include\be_typedef.h"\

-	{$(INCLUDE)}"\.\be_include\be_union.h"\

-	{$(INCLUDE)}"\.\be_include\be_union_branch.h"\

-	{$(INCLUDE)}"\.\be_include\be_union_label.h"\

-	{$(INCLUDE)}"\.\include\ast.h"\

-	{$(INCLUDE)}"\.\include\ast_argument.h"\

-	{$(INCLUDE)}"\.\include\ast_array.h"\

-	{$(INCLUDE)}"\.\include\ast_attribute.h"\

-	{$(INCLUDE)}"\.\include\ast_concrete_type.h"\

-	{$(INCLUDE)}"\.\include\ast_constant.h"\

-	{$(INCLUDE)}"\.\include\ast_decl.h"\

-	{$(INCLUDE)}"\.\include\ast_enum.h"\

-	{$(INCLUDE)}"\.\include\ast_enum_val.h"\

-	{$(INCLUDE)}"\.\include\ast_exception.h"\

-	{$(INCLUDE)}"\.\include\ast_expression.h"\

-	{$(INCLUDE)}"\.\include\ast_extern.h"\

-	{$(INCLUDE)}"\.\include\ast_field.h"\

-	{$(INCLUDE)}"\.\include\ast_generator.h"\

-	{$(INCLUDE)}"\.\include\ast_interface.h"\

-	{$(INCLUDE)}"\.\include\ast_interface_fwd.h"\

-	{$(INCLUDE)}"\.\include\ast_module.h"\

-	{$(INCLUDE)}"\.\include\ast_operation.h"\

-	{$(INCLUDE)}"\.\include\ast_predefined_type.h"\

-	{$(INCLUDE)}"\.\include\ast_root.h"\

-	{$(INCLUDE)}"\.\include\ast_sequence.h"\

-	{$(INCLUDE)}"\.\include\ast_string.h"\

-	{$(INCLUDE)}"\.\include\ast_structure.h"\

-	{$(INCLUDE)}"\.\include\ast_type.h"\

-	{$(INCLUDE)}"\.\include\ast_typedef.h"\

-	{$(INCLUDE)}"\.\include\ast_union.h"\

-	{$(INCLUDE)}"\.\include\ast_union_branch.h"\

-	{$(INCLUDE)}"\.\include\ast_union_label.h"\

-	{$(INCLUDE)}"\.\include\be_extern.h"\

-	{$(INCLUDE)}"\.\include\drv_extern.h"\

-	{$(INCLUDE)}"\.\include\fe_extern.h"\

-	{$(INCLUDE)}"\.\include\global_extern.h"\

-	{$(INCLUDE)}"\.\include\idl_bool.h"\

-	{$(INCLUDE)}"\.\include\idl_defines.h"\

-	{$(INCLUDE)}"\.\include\idl_fwd.h"\

-	{$(INCLUDE)}"\.\include\idl_global.h"\

-	{$(INCLUDE)}"\.\include\idl_narrow.h"\

-	{$(INCLUDE)}"\.\include\intlmacros.h"\

-	{$(INCLUDE)}"\.\include\nr_extern.h"\

-	{$(INCLUDE)}"\.\include\util.h"\

-	{$(INCLUDE)}"\.\include\utl_decllist.h"\

-	{$(INCLUDE)}"\.\include\utl_error.h"\

-	{$(INCLUDE)}"\.\include\utl_exceptlist.h"\

-	{$(INCLUDE)}"\.\include\utl_exprlist.h"\

-	{$(INCLUDE)}"\.\include\utl_identifier.h"\

-	{$(INCLUDE)}"\.\include\utl_idlist.h"\

-	{$(INCLUDE)}"\.\include\utl_indenter.h"\

-	{$(INCLUDE)}"\.\include\utl_labellist.h"\

-	{$(INCLUDE)}"\.\include\utl_list.h"\

-	{$(INCLUDE)}"\.\include\utl_namelist.h"\

-	{$(INCLUDE)}"\.\include\utl_scope.h"\

-	{$(INCLUDE)}"\.\include\utl_scoped_name.h"\

-	{$(INCLUDE)}"\.\include\utl_stack.h"\

-	{$(INCLUDE)}"\.\include\utl_string.h"\

-	{$(INCLUDE)}"\.\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\be_state_union.obj" : $(SOURCE) $(DEP_CPP_BE_STA) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\be\be_state_array.cpp

-DEP_CPP_BE_STAT=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Atomic_Op.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/Event_Handler.h"\

-	"..\..\ace/Event_Handler.i"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/Singleton.cpp"\

-	"..\..\ace/Singleton.h"\

-	"..\..\ace/Singleton.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/stdcpp.h"\

-	"..\..\ace/SV_Semaphore_Complex.h"\

-	"..\..\ace/SV_Semaphore_Complex.i"\

-	"..\..\ace/SV_Semaphore_Simple.h"\

-	"..\..\ace/SV_Semaphore_Simple.i"\

-	"..\..\ace/Synch.h"\

-	"..\..\ace/Synch.i"\

-	"..\..\ace/Synch_T.cpp"\

-	"..\..\ace/Synch_T.h"\

-	"..\..\ace/Synch_T.i"\

-	"..\..\ace/Thread.h"\

-	"..\..\ace/Thread.i"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\be_include\be.h"\

-	".\include\idl.h"\

-	".\include\idl_extern.h"\

-	{$(INCLUDE)}"\.\be_include\be_argument.h"\

-	{$(INCLUDE)}"\.\be_include\be_array.h"\

-	{$(INCLUDE)}"\.\be_include\be_attribute.h"\

-	{$(INCLUDE)}"\.\be_include\be_codegen.h"\

-	{$(INCLUDE)}"\.\be_include\be_constant.h"\

-	{$(INCLUDE)}"\.\be_include\be_decl.h"\

-	{$(INCLUDE)}"\.\be_include\be_enum.h"\

-	{$(INCLUDE)}"\.\be_include\be_enum_val.h"\

-	{$(INCLUDE)}"\.\be_include\be_exception.h"\

-	{$(INCLUDE)}"\.\be_include\be_expression.h"\

-	{$(INCLUDE)}"\.\be_include\be_factory.h"\

-	{$(INCLUDE)}"\.\be_include\be_field.h"\

-	{$(INCLUDE)}"\.\be_include\be_generator.h"\

-	{$(INCLUDE)}"\.\be_include\be_helper.h"\

-	{$(INCLUDE)}"\.\be_include\be_interface.h"\

-	{$(INCLUDE)}"\.\be_include\be_interface_fwd.h"\

-	{$(INCLUDE)}"\.\be_include\be_module.h"\

-	{$(INCLUDE)}"\.\be_include\be_operation.h"\

-	{$(INCLUDE)}"\.\be_include\be_predefined_type.h"\

-	{$(INCLUDE)}"\.\be_include\be_root.h"\

-	{$(INCLUDE)}"\.\be_include\be_scope.h"\

-	{$(INCLUDE)}"\.\be_include\be_sequence.h"\

-	{$(INCLUDE)}"\.\be_include\be_state.h"\

-	{$(INCLUDE)}"\.\be_include\be_string.h"\

-	{$(INCLUDE)}"\.\be_include\be_structure.h"\

-	{$(INCLUDE)}"\.\be_include\be_type.h"\

-	{$(INCLUDE)}"\.\be_include\be_typedef.h"\

-	{$(INCLUDE)}"\.\be_include\be_union.h"\

-	{$(INCLUDE)}"\.\be_include\be_union_branch.h"\

-	{$(INCLUDE)}"\.\be_include\be_union_label.h"\

-	{$(INCLUDE)}"\.\include\ast.h"\

-	{$(INCLUDE)}"\.\include\ast_argument.h"\

-	{$(INCLUDE)}"\.\include\ast_array.h"\

-	{$(INCLUDE)}"\.\include\ast_attribute.h"\

-	{$(INCLUDE)}"\.\include\ast_concrete_type.h"\

-	{$(INCLUDE)}"\.\include\ast_constant.h"\

-	{$(INCLUDE)}"\.\include\ast_decl.h"\

-	{$(INCLUDE)}"\.\include\ast_enum.h"\

-	{$(INCLUDE)}"\.\include\ast_enum_val.h"\

-	{$(INCLUDE)}"\.\include\ast_exception.h"\

-	{$(INCLUDE)}"\.\include\ast_expression.h"\

-	{$(INCLUDE)}"\.\include\ast_extern.h"\

-	{$(INCLUDE)}"\.\include\ast_field.h"\

-	{$(INCLUDE)}"\.\include\ast_generator.h"\

-	{$(INCLUDE)}"\.\include\ast_interface.h"\

-	{$(INCLUDE)}"\.\include\ast_interface_fwd.h"\

-	{$(INCLUDE)}"\.\include\ast_module.h"\

-	{$(INCLUDE)}"\.\include\ast_operation.h"\

-	{$(INCLUDE)}"\.\include\ast_predefined_type.h"\

-	{$(INCLUDE)}"\.\include\ast_root.h"\

-	{$(INCLUDE)}"\.\include\ast_sequence.h"\

-	{$(INCLUDE)}"\.\include\ast_string.h"\

-	{$(INCLUDE)}"\.\include\ast_structure.h"\

-	{$(INCLUDE)}"\.\include\ast_type.h"\

-	{$(INCLUDE)}"\.\include\ast_typedef.h"\

-	{$(INCLUDE)}"\.\include\ast_union.h"\

-	{$(INCLUDE)}"\.\include\ast_union_branch.h"\

-	{$(INCLUDE)}"\.\include\ast_union_label.h"\

-	{$(INCLUDE)}"\.\include\be_extern.h"\

-	{$(INCLUDE)}"\.\include\drv_extern.h"\

-	{$(INCLUDE)}"\.\include\fe_extern.h"\

-	{$(INCLUDE)}"\.\include\global_extern.h"\

-	{$(INCLUDE)}"\.\include\idl_bool.h"\

-	{$(INCLUDE)}"\.\include\idl_defines.h"\

-	{$(INCLUDE)}"\.\include\idl_fwd.h"\

-	{$(INCLUDE)}"\.\include\idl_global.h"\

-	{$(INCLUDE)}"\.\include\idl_narrow.h"\

-	{$(INCLUDE)}"\.\include\intlmacros.h"\

-	{$(INCLUDE)}"\.\include\nr_extern.h"\

-	{$(INCLUDE)}"\.\include\util.h"\

-	{$(INCLUDE)}"\.\include\utl_decllist.h"\

-	{$(INCLUDE)}"\.\include\utl_error.h"\

-	{$(INCLUDE)}"\.\include\utl_exceptlist.h"\

-	{$(INCLUDE)}"\.\include\utl_exprlist.h"\

-	{$(INCLUDE)}"\.\include\utl_identifier.h"\

-	{$(INCLUDE)}"\.\include\utl_idlist.h"\

-	{$(INCLUDE)}"\.\include\utl_indenter.h"\

-	{$(INCLUDE)}"\.\include\utl_labellist.h"\

-	{$(INCLUDE)}"\.\include\utl_list.h"\

-	{$(INCLUDE)}"\.\include\utl_namelist.h"\

-	{$(INCLUDE)}"\.\include\utl_scope.h"\

-	{$(INCLUDE)}"\.\include\utl_scoped_name.h"\

-	{$(INCLUDE)}"\.\include\utl_stack.h"\

-	{$(INCLUDE)}"\.\include\utl_string.h"\

-	{$(INCLUDE)}"\.\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\be_state_array.obj" : $(SOURCE) $(DEP_CPP_BE_STAT) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\be\be_state_attribute.cpp

-DEP_CPP_BE_STATE=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Atomic_Op.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/Event_Handler.h"\

-	"..\..\ace/Event_Handler.i"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/Singleton.cpp"\

-	"..\..\ace/Singleton.h"\

-	"..\..\ace/Singleton.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/stdcpp.h"\

-	"..\..\ace/SV_Semaphore_Complex.h"\

-	"..\..\ace/SV_Semaphore_Complex.i"\

-	"..\..\ace/SV_Semaphore_Simple.h"\

-	"..\..\ace/SV_Semaphore_Simple.i"\

-	"..\..\ace/Synch.h"\

-	"..\..\ace/Synch.i"\

-	"..\..\ace/Synch_T.cpp"\

-	"..\..\ace/Synch_T.h"\

-	"..\..\ace/Synch_T.i"\

-	"..\..\ace/Thread.h"\

-	"..\..\ace/Thread.i"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\be_include\be.h"\

-	".\include\idl.h"\

-	".\include\idl_extern.h"\

-	{$(INCLUDE)}"\.\be_include\be_argument.h"\

-	{$(INCLUDE)}"\.\be_include\be_array.h"\

-	{$(INCLUDE)}"\.\be_include\be_attribute.h"\

-	{$(INCLUDE)}"\.\be_include\be_codegen.h"\

-	{$(INCLUDE)}"\.\be_include\be_constant.h"\

-	{$(INCLUDE)}"\.\be_include\be_decl.h"\

-	{$(INCLUDE)}"\.\be_include\be_enum.h"\

-	{$(INCLUDE)}"\.\be_include\be_enum_val.h"\

-	{$(INCLUDE)}"\.\be_include\be_exception.h"\

-	{$(INCLUDE)}"\.\be_include\be_expression.h"\

-	{$(INCLUDE)}"\.\be_include\be_factory.h"\

-	{$(INCLUDE)}"\.\be_include\be_field.h"\

-	{$(INCLUDE)}"\.\be_include\be_generator.h"\

-	{$(INCLUDE)}"\.\be_include\be_helper.h"\

-	{$(INCLUDE)}"\.\be_include\be_interface.h"\

-	{$(INCLUDE)}"\.\be_include\be_interface_fwd.h"\

-	{$(INCLUDE)}"\.\be_include\be_module.h"\

-	{$(INCLUDE)}"\.\be_include\be_operation.h"\

-	{$(INCLUDE)}"\.\be_include\be_predefined_type.h"\

-	{$(INCLUDE)}"\.\be_include\be_root.h"\

-	{$(INCLUDE)}"\.\be_include\be_scope.h"\

-	{$(INCLUDE)}"\.\be_include\be_sequence.h"\

-	{$(INCLUDE)}"\.\be_include\be_state.h"\

-	{$(INCLUDE)}"\.\be_include\be_string.h"\

-	{$(INCLUDE)}"\.\be_include\be_structure.h"\

-	{$(INCLUDE)}"\.\be_include\be_type.h"\

-	{$(INCLUDE)}"\.\be_include\be_typedef.h"\

-	{$(INCLUDE)}"\.\be_include\be_union.h"\

-	{$(INCLUDE)}"\.\be_include\be_union_branch.h"\

-	{$(INCLUDE)}"\.\be_include\be_union_label.h"\

-	{$(INCLUDE)}"\.\include\ast.h"\

-	{$(INCLUDE)}"\.\include\ast_argument.h"\

-	{$(INCLUDE)}"\.\include\ast_array.h"\

-	{$(INCLUDE)}"\.\include\ast_attribute.h"\

-	{$(INCLUDE)}"\.\include\ast_concrete_type.h"\

-	{$(INCLUDE)}"\.\include\ast_constant.h"\

-	{$(INCLUDE)}"\.\include\ast_decl.h"\

-	{$(INCLUDE)}"\.\include\ast_enum.h"\

-	{$(INCLUDE)}"\.\include\ast_enum_val.h"\

-	{$(INCLUDE)}"\.\include\ast_exception.h"\

-	{$(INCLUDE)}"\.\include\ast_expression.h"\

-	{$(INCLUDE)}"\.\include\ast_extern.h"\

-	{$(INCLUDE)}"\.\include\ast_field.h"\

-	{$(INCLUDE)}"\.\include\ast_generator.h"\

-	{$(INCLUDE)}"\.\include\ast_interface.h"\

-	{$(INCLUDE)}"\.\include\ast_interface_fwd.h"\

-	{$(INCLUDE)}"\.\include\ast_module.h"\

-	{$(INCLUDE)}"\.\include\ast_operation.h"\

-	{$(INCLUDE)}"\.\include\ast_predefined_type.h"\

-	{$(INCLUDE)}"\.\include\ast_root.h"\

-	{$(INCLUDE)}"\.\include\ast_sequence.h"\

-	{$(INCLUDE)}"\.\include\ast_string.h"\

-	{$(INCLUDE)}"\.\include\ast_structure.h"\

-	{$(INCLUDE)}"\.\include\ast_type.h"\

-	{$(INCLUDE)}"\.\include\ast_typedef.h"\

-	{$(INCLUDE)}"\.\include\ast_union.h"\

-	{$(INCLUDE)}"\.\include\ast_union_branch.h"\

-	{$(INCLUDE)}"\.\include\ast_union_label.h"\

-	{$(INCLUDE)}"\.\include\be_extern.h"\

-	{$(INCLUDE)}"\.\include\drv_extern.h"\

-	{$(INCLUDE)}"\.\include\fe_extern.h"\

-	{$(INCLUDE)}"\.\include\global_extern.h"\

-	{$(INCLUDE)}"\.\include\idl_bool.h"\

-	{$(INCLUDE)}"\.\include\idl_defines.h"\

-	{$(INCLUDE)}"\.\include\idl_fwd.h"\

-	{$(INCLUDE)}"\.\include\idl_global.h"\

-	{$(INCLUDE)}"\.\include\idl_narrow.h"\

-	{$(INCLUDE)}"\.\include\intlmacros.h"\

-	{$(INCLUDE)}"\.\include\nr_extern.h"\

-	{$(INCLUDE)}"\.\include\util.h"\

-	{$(INCLUDE)}"\.\include\utl_decllist.h"\

-	{$(INCLUDE)}"\.\include\utl_error.h"\

-	{$(INCLUDE)}"\.\include\utl_exceptlist.h"\

-	{$(INCLUDE)}"\.\include\utl_exprlist.h"\

-	{$(INCLUDE)}"\.\include\utl_identifier.h"\

-	{$(INCLUDE)}"\.\include\utl_idlist.h"\

-	{$(INCLUDE)}"\.\include\utl_indenter.h"\

-	{$(INCLUDE)}"\.\include\utl_labellist.h"\

-	{$(INCLUDE)}"\.\include\utl_list.h"\

-	{$(INCLUDE)}"\.\include\utl_namelist.h"\

-	{$(INCLUDE)}"\.\include\utl_scope.h"\

-	{$(INCLUDE)}"\.\include\utl_scoped_name.h"\

-	{$(INCLUDE)}"\.\include\utl_stack.h"\

-	{$(INCLUDE)}"\.\include\utl_string.h"\

-	{$(INCLUDE)}"\.\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\be_state_attribute.obj" : $(SOURCE) $(DEP_CPP_BE_STATE) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\be\be_state_operation.cpp

-DEP_CPP_BE_STATE_=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Atomic_Op.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/Event_Handler.h"\

-	"..\..\ace/Event_Handler.i"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/Singleton.cpp"\

-	"..\..\ace/Singleton.h"\

-	"..\..\ace/Singleton.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/stdcpp.h"\

-	"..\..\ace/SV_Semaphore_Complex.h"\

-	"..\..\ace/SV_Semaphore_Complex.i"\

-	"..\..\ace/SV_Semaphore_Simple.h"\

-	"..\..\ace/SV_Semaphore_Simple.i"\

-	"..\..\ace/Synch.h"\

-	"..\..\ace/Synch.i"\

-	"..\..\ace/Synch_T.cpp"\

-	"..\..\ace/Synch_T.h"\

-	"..\..\ace/Synch_T.i"\

-	"..\..\ace/Thread.h"\

-	"..\..\ace/Thread.i"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\be_include\be.h"\

-	".\include\idl.h"\

-	".\include\idl_extern.h"\

-	{$(INCLUDE)}"\.\be_include\be_argument.h"\

-	{$(INCLUDE)}"\.\be_include\be_array.h"\

-	{$(INCLUDE)}"\.\be_include\be_attribute.h"\

-	{$(INCLUDE)}"\.\be_include\be_codegen.h"\

-	{$(INCLUDE)}"\.\be_include\be_constant.h"\

-	{$(INCLUDE)}"\.\be_include\be_decl.h"\

-	{$(INCLUDE)}"\.\be_include\be_enum.h"\

-	{$(INCLUDE)}"\.\be_include\be_enum_val.h"\

-	{$(INCLUDE)}"\.\be_include\be_exception.h"\

-	{$(INCLUDE)}"\.\be_include\be_expression.h"\

-	{$(INCLUDE)}"\.\be_include\be_factory.h"\

-	{$(INCLUDE)}"\.\be_include\be_field.h"\

-	{$(INCLUDE)}"\.\be_include\be_generator.h"\

-	{$(INCLUDE)}"\.\be_include\be_helper.h"\

-	{$(INCLUDE)}"\.\be_include\be_interface.h"\

-	{$(INCLUDE)}"\.\be_include\be_interface_fwd.h"\

-	{$(INCLUDE)}"\.\be_include\be_module.h"\

-	{$(INCLUDE)}"\.\be_include\be_operation.h"\

-	{$(INCLUDE)}"\.\be_include\be_predefined_type.h"\

-	{$(INCLUDE)}"\.\be_include\be_root.h"\

-	{$(INCLUDE)}"\.\be_include\be_scope.h"\

-	{$(INCLUDE)}"\.\be_include\be_sequence.h"\

-	{$(INCLUDE)}"\.\be_include\be_state.h"\

-	{$(INCLUDE)}"\.\be_include\be_string.h"\

-	{$(INCLUDE)}"\.\be_include\be_structure.h"\

-	{$(INCLUDE)}"\.\be_include\be_type.h"\

-	{$(INCLUDE)}"\.\be_include\be_typedef.h"\

-	{$(INCLUDE)}"\.\be_include\be_union.h"\

-	{$(INCLUDE)}"\.\be_include\be_union_branch.h"\

-	{$(INCLUDE)}"\.\be_include\be_union_label.h"\

-	{$(INCLUDE)}"\.\include\ast.h"\

-	{$(INCLUDE)}"\.\include\ast_argument.h"\

-	{$(INCLUDE)}"\.\include\ast_array.h"\

-	{$(INCLUDE)}"\.\include\ast_attribute.h"\

-	{$(INCLUDE)}"\.\include\ast_concrete_type.h"\

-	{$(INCLUDE)}"\.\include\ast_constant.h"\

-	{$(INCLUDE)}"\.\include\ast_decl.h"\

-	{$(INCLUDE)}"\.\include\ast_enum.h"\

-	{$(INCLUDE)}"\.\include\ast_enum_val.h"\

-	{$(INCLUDE)}"\.\include\ast_exception.h"\

-	{$(INCLUDE)}"\.\include\ast_expression.h"\

-	{$(INCLUDE)}"\.\include\ast_extern.h"\

-	{$(INCLUDE)}"\.\include\ast_field.h"\

-	{$(INCLUDE)}"\.\include\ast_generator.h"\

-	{$(INCLUDE)}"\.\include\ast_interface.h"\

-	{$(INCLUDE)}"\.\include\ast_interface_fwd.h"\

-	{$(INCLUDE)}"\.\include\ast_module.h"\

-	{$(INCLUDE)}"\.\include\ast_operation.h"\

-	{$(INCLUDE)}"\.\include\ast_predefined_type.h"\

-	{$(INCLUDE)}"\.\include\ast_root.h"\

-	{$(INCLUDE)}"\.\include\ast_sequence.h"\

-	{$(INCLUDE)}"\.\include\ast_string.h"\

-	{$(INCLUDE)}"\.\include\ast_structure.h"\

-	{$(INCLUDE)}"\.\include\ast_type.h"\

-	{$(INCLUDE)}"\.\include\ast_typedef.h"\

-	{$(INCLUDE)}"\.\include\ast_union.h"\

-	{$(INCLUDE)}"\.\include\ast_union_branch.h"\

-	{$(INCLUDE)}"\.\include\ast_union_label.h"\

-	{$(INCLUDE)}"\.\include\be_extern.h"\

-	{$(INCLUDE)}"\.\include\drv_extern.h"\

-	{$(INCLUDE)}"\.\include\fe_extern.h"\

-	{$(INCLUDE)}"\.\include\global_extern.h"\

-	{$(INCLUDE)}"\.\include\idl_bool.h"\

-	{$(INCLUDE)}"\.\include\idl_defines.h"\

-	{$(INCLUDE)}"\.\include\idl_fwd.h"\

-	{$(INCLUDE)}"\.\include\idl_global.h"\

-	{$(INCLUDE)}"\.\include\idl_narrow.h"\

-	{$(INCLUDE)}"\.\include\intlmacros.h"\

-	{$(INCLUDE)}"\.\include\nr_extern.h"\

-	{$(INCLUDE)}"\.\include\util.h"\

-	{$(INCLUDE)}"\.\include\utl_decllist.h"\

-	{$(INCLUDE)}"\.\include\utl_error.h"\

-	{$(INCLUDE)}"\.\include\utl_exceptlist.h"\

-	{$(INCLUDE)}"\.\include\utl_exprlist.h"\

-	{$(INCLUDE)}"\.\include\utl_identifier.h"\

-	{$(INCLUDE)}"\.\include\utl_idlist.h"\

-	{$(INCLUDE)}"\.\include\utl_indenter.h"\

-	{$(INCLUDE)}"\.\include\utl_labellist.h"\

-	{$(INCLUDE)}"\.\include\utl_list.h"\

-	{$(INCLUDE)}"\.\include\utl_namelist.h"\

-	{$(INCLUDE)}"\.\include\utl_scope.h"\

-	{$(INCLUDE)}"\.\include\utl_scoped_name.h"\

-	{$(INCLUDE)}"\.\include\utl_stack.h"\

-	{$(INCLUDE)}"\.\include\utl_string.h"\

-	{$(INCLUDE)}"\.\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\be_state_operation.obj" : $(SOURCE) $(DEP_CPP_BE_STATE_) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\be\be_state_sequence.cpp

-DEP_CPP_BE_STATE_S=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Atomic_Op.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/Event_Handler.h"\

-	"..\..\ace/Event_Handler.i"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/Singleton.cpp"\

-	"..\..\ace/Singleton.h"\

-	"..\..\ace/Singleton.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/stdcpp.h"\

-	"..\..\ace/SV_Semaphore_Complex.h"\

-	"..\..\ace/SV_Semaphore_Complex.i"\

-	"..\..\ace/SV_Semaphore_Simple.h"\

-	"..\..\ace/SV_Semaphore_Simple.i"\

-	"..\..\ace/Synch.h"\

-	"..\..\ace/Synch.i"\

-	"..\..\ace/Synch_T.cpp"\

-	"..\..\ace/Synch_T.h"\

-	"..\..\ace/Synch_T.i"\

-	"..\..\ace/Thread.h"\

-	"..\..\ace/Thread.i"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\be_include\be.h"\

-	".\include\idl.h"\

-	".\include\idl_extern.h"\

-	{$(INCLUDE)}"\.\be_include\be_argument.h"\

-	{$(INCLUDE)}"\.\be_include\be_array.h"\

-	{$(INCLUDE)}"\.\be_include\be_attribute.h"\

-	{$(INCLUDE)}"\.\be_include\be_codegen.h"\

-	{$(INCLUDE)}"\.\be_include\be_constant.h"\

-	{$(INCLUDE)}"\.\be_include\be_decl.h"\

-	{$(INCLUDE)}"\.\be_include\be_enum.h"\

-	{$(INCLUDE)}"\.\be_include\be_enum_val.h"\

-	{$(INCLUDE)}"\.\be_include\be_exception.h"\

-	{$(INCLUDE)}"\.\be_include\be_expression.h"\

-	{$(INCLUDE)}"\.\be_include\be_factory.h"\

-	{$(INCLUDE)}"\.\be_include\be_field.h"\

-	{$(INCLUDE)}"\.\be_include\be_generator.h"\

-	{$(INCLUDE)}"\.\be_include\be_helper.h"\

-	{$(INCLUDE)}"\.\be_include\be_interface.h"\

-	{$(INCLUDE)}"\.\be_include\be_interface_fwd.h"\

-	{$(INCLUDE)}"\.\be_include\be_module.h"\

-	{$(INCLUDE)}"\.\be_include\be_operation.h"\

-	{$(INCLUDE)}"\.\be_include\be_predefined_type.h"\

-	{$(INCLUDE)}"\.\be_include\be_root.h"\

-	{$(INCLUDE)}"\.\be_include\be_scope.h"\

-	{$(INCLUDE)}"\.\be_include\be_sequence.h"\

-	{$(INCLUDE)}"\.\be_include\be_state.h"\

-	{$(INCLUDE)}"\.\be_include\be_string.h"\

-	{$(INCLUDE)}"\.\be_include\be_structure.h"\

-	{$(INCLUDE)}"\.\be_include\be_type.h"\

-	{$(INCLUDE)}"\.\be_include\be_typedef.h"\

-	{$(INCLUDE)}"\.\be_include\be_union.h"\

-	{$(INCLUDE)}"\.\be_include\be_union_branch.h"\

-	{$(INCLUDE)}"\.\be_include\be_union_label.h"\

-	{$(INCLUDE)}"\.\include\ast.h"\

-	{$(INCLUDE)}"\.\include\ast_argument.h"\

-	{$(INCLUDE)}"\.\include\ast_array.h"\

-	{$(INCLUDE)}"\.\include\ast_attribute.h"\

-	{$(INCLUDE)}"\.\include\ast_concrete_type.h"\

-	{$(INCLUDE)}"\.\include\ast_constant.h"\

-	{$(INCLUDE)}"\.\include\ast_decl.h"\

-	{$(INCLUDE)}"\.\include\ast_enum.h"\

-	{$(INCLUDE)}"\.\include\ast_enum_val.h"\

-	{$(INCLUDE)}"\.\include\ast_exception.h"\

-	{$(INCLUDE)}"\.\include\ast_expression.h"\

-	{$(INCLUDE)}"\.\include\ast_extern.h"\

-	{$(INCLUDE)}"\.\include\ast_field.h"\

-	{$(INCLUDE)}"\.\include\ast_generator.h"\

-	{$(INCLUDE)}"\.\include\ast_interface.h"\

-	{$(INCLUDE)}"\.\include\ast_interface_fwd.h"\

-	{$(INCLUDE)}"\.\include\ast_module.h"\

-	{$(INCLUDE)}"\.\include\ast_operation.h"\

-	{$(INCLUDE)}"\.\include\ast_predefined_type.h"\

-	{$(INCLUDE)}"\.\include\ast_root.h"\

-	{$(INCLUDE)}"\.\include\ast_sequence.h"\

-	{$(INCLUDE)}"\.\include\ast_string.h"\

-	{$(INCLUDE)}"\.\include\ast_structure.h"\

-	{$(INCLUDE)}"\.\include\ast_type.h"\

-	{$(INCLUDE)}"\.\include\ast_typedef.h"\

-	{$(INCLUDE)}"\.\include\ast_union.h"\

-	{$(INCLUDE)}"\.\include\ast_union_branch.h"\

-	{$(INCLUDE)}"\.\include\ast_union_label.h"\

-	{$(INCLUDE)}"\.\include\be_extern.h"\

-	{$(INCLUDE)}"\.\include\drv_extern.h"\

-	{$(INCLUDE)}"\.\include\fe_extern.h"\

-	{$(INCLUDE)}"\.\include\global_extern.h"\

-	{$(INCLUDE)}"\.\include\idl_bool.h"\

-	{$(INCLUDE)}"\.\include\idl_defines.h"\

-	{$(INCLUDE)}"\.\include\idl_fwd.h"\

-	{$(INCLUDE)}"\.\include\idl_global.h"\

-	{$(INCLUDE)}"\.\include\idl_narrow.h"\

-	{$(INCLUDE)}"\.\include\intlmacros.h"\

-	{$(INCLUDE)}"\.\include\nr_extern.h"\

-	{$(INCLUDE)}"\.\include\util.h"\

-	{$(INCLUDE)}"\.\include\utl_decllist.h"\

-	{$(INCLUDE)}"\.\include\utl_error.h"\

-	{$(INCLUDE)}"\.\include\utl_exceptlist.h"\

-	{$(INCLUDE)}"\.\include\utl_exprlist.h"\

-	{$(INCLUDE)}"\.\include\utl_identifier.h"\

-	{$(INCLUDE)}"\.\include\utl_idlist.h"\

-	{$(INCLUDE)}"\.\include\utl_indenter.h"\

-	{$(INCLUDE)}"\.\include\utl_labellist.h"\

-	{$(INCLUDE)}"\.\include\utl_list.h"\

-	{$(INCLUDE)}"\.\include\utl_namelist.h"\

-	{$(INCLUDE)}"\.\include\utl_scope.h"\

-	{$(INCLUDE)}"\.\include\utl_scoped_name.h"\

-	{$(INCLUDE)}"\.\include\utl_stack.h"\

-	{$(INCLUDE)}"\.\include\utl_string.h"\

-	{$(INCLUDE)}"\.\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\be_state_sequence.obj" : $(SOURCE) $(DEP_CPP_BE_STATE_S) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\be\be_state_structure.cpp

-DEP_CPP_BE_STATE_ST=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Atomic_Op.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/Event_Handler.h"\

-	"..\..\ace/Event_Handler.i"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/Singleton.cpp"\

-	"..\..\ace/Singleton.h"\

-	"..\..\ace/Singleton.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/stdcpp.h"\

-	"..\..\ace/SV_Semaphore_Complex.h"\

-	"..\..\ace/SV_Semaphore_Complex.i"\

-	"..\..\ace/SV_Semaphore_Simple.h"\

-	"..\..\ace/SV_Semaphore_Simple.i"\

-	"..\..\ace/Synch.h"\

-	"..\..\ace/Synch.i"\

-	"..\..\ace/Synch_T.cpp"\

-	"..\..\ace/Synch_T.h"\

-	"..\..\ace/Synch_T.i"\

-	"..\..\ace/Thread.h"\

-	"..\..\ace/Thread.i"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\be_include\be.h"\

-	".\include\idl.h"\

-	".\include\idl_extern.h"\

-	{$(INCLUDE)}"\.\be_include\be_argument.h"\

-	{$(INCLUDE)}"\.\be_include\be_array.h"\

-	{$(INCLUDE)}"\.\be_include\be_attribute.h"\

-	{$(INCLUDE)}"\.\be_include\be_codegen.h"\

-	{$(INCLUDE)}"\.\be_include\be_constant.h"\

-	{$(INCLUDE)}"\.\be_include\be_decl.h"\

-	{$(INCLUDE)}"\.\be_include\be_enum.h"\

-	{$(INCLUDE)}"\.\be_include\be_enum_val.h"\

-	{$(INCLUDE)}"\.\be_include\be_exception.h"\

-	{$(INCLUDE)}"\.\be_include\be_expression.h"\

-	{$(INCLUDE)}"\.\be_include\be_factory.h"\

-	{$(INCLUDE)}"\.\be_include\be_field.h"\

-	{$(INCLUDE)}"\.\be_include\be_generator.h"\

-	{$(INCLUDE)}"\.\be_include\be_helper.h"\

-	{$(INCLUDE)}"\.\be_include\be_interface.h"\

-	{$(INCLUDE)}"\.\be_include\be_interface_fwd.h"\

-	{$(INCLUDE)}"\.\be_include\be_module.h"\

-	{$(INCLUDE)}"\.\be_include\be_operation.h"\

-	{$(INCLUDE)}"\.\be_include\be_predefined_type.h"\

-	{$(INCLUDE)}"\.\be_include\be_root.h"\

-	{$(INCLUDE)}"\.\be_include\be_scope.h"\

-	{$(INCLUDE)}"\.\be_include\be_sequence.h"\

-	{$(INCLUDE)}"\.\be_include\be_state.h"\

-	{$(INCLUDE)}"\.\be_include\be_string.h"\

-	{$(INCLUDE)}"\.\be_include\be_structure.h"\

-	{$(INCLUDE)}"\.\be_include\be_type.h"\

-	{$(INCLUDE)}"\.\be_include\be_typedef.h"\

-	{$(INCLUDE)}"\.\be_include\be_union.h"\

-	{$(INCLUDE)}"\.\be_include\be_union_branch.h"\

-	{$(INCLUDE)}"\.\be_include\be_union_label.h"\

-	{$(INCLUDE)}"\.\include\ast.h"\

-	{$(INCLUDE)}"\.\include\ast_argument.h"\

-	{$(INCLUDE)}"\.\include\ast_array.h"\

-	{$(INCLUDE)}"\.\include\ast_attribute.h"\

-	{$(INCLUDE)}"\.\include\ast_concrete_type.h"\

-	{$(INCLUDE)}"\.\include\ast_constant.h"\

-	{$(INCLUDE)}"\.\include\ast_decl.h"\

-	{$(INCLUDE)}"\.\include\ast_enum.h"\

-	{$(INCLUDE)}"\.\include\ast_enum_val.h"\

-	{$(INCLUDE)}"\.\include\ast_exception.h"\

-	{$(INCLUDE)}"\.\include\ast_expression.h"\

-	{$(INCLUDE)}"\.\include\ast_extern.h"\

-	{$(INCLUDE)}"\.\include\ast_field.h"\

-	{$(INCLUDE)}"\.\include\ast_generator.h"\

-	{$(INCLUDE)}"\.\include\ast_interface.h"\

-	{$(INCLUDE)}"\.\include\ast_interface_fwd.h"\

-	{$(INCLUDE)}"\.\include\ast_module.h"\

-	{$(INCLUDE)}"\.\include\ast_operation.h"\

-	{$(INCLUDE)}"\.\include\ast_predefined_type.h"\

-	{$(INCLUDE)}"\.\include\ast_root.h"\

-	{$(INCLUDE)}"\.\include\ast_sequence.h"\

-	{$(INCLUDE)}"\.\include\ast_string.h"\

-	{$(INCLUDE)}"\.\include\ast_structure.h"\

-	{$(INCLUDE)}"\.\include\ast_type.h"\

-	{$(INCLUDE)}"\.\include\ast_typedef.h"\

-	{$(INCLUDE)}"\.\include\ast_union.h"\

-	{$(INCLUDE)}"\.\include\ast_union_branch.h"\

-	{$(INCLUDE)}"\.\include\ast_union_label.h"\

-	{$(INCLUDE)}"\.\include\be_extern.h"\

-	{$(INCLUDE)}"\.\include\drv_extern.h"\

-	{$(INCLUDE)}"\.\include\fe_extern.h"\

-	{$(INCLUDE)}"\.\include\global_extern.h"\

-	{$(INCLUDE)}"\.\include\idl_bool.h"\

-	{$(INCLUDE)}"\.\include\idl_defines.h"\

-	{$(INCLUDE)}"\.\include\idl_fwd.h"\

-	{$(INCLUDE)}"\.\include\idl_global.h"\

-	{$(INCLUDE)}"\.\include\idl_narrow.h"\

-	{$(INCLUDE)}"\.\include\intlmacros.h"\

-	{$(INCLUDE)}"\.\include\nr_extern.h"\

-	{$(INCLUDE)}"\.\include\util.h"\

-	{$(INCLUDE)}"\.\include\utl_decllist.h"\

-	{$(INCLUDE)}"\.\include\utl_error.h"\

-	{$(INCLUDE)}"\.\include\utl_exceptlist.h"\

-	{$(INCLUDE)}"\.\include\utl_exprlist.h"\

-	{$(INCLUDE)}"\.\include\utl_identifier.h"\

-	{$(INCLUDE)}"\.\include\utl_idlist.h"\

-	{$(INCLUDE)}"\.\include\utl_indenter.h"\

-	{$(INCLUDE)}"\.\include\utl_labellist.h"\

-	{$(INCLUDE)}"\.\include\utl_list.h"\

-	{$(INCLUDE)}"\.\include\utl_namelist.h"\

-	{$(INCLUDE)}"\.\include\utl_scope.h"\

-	{$(INCLUDE)}"\.\include\utl_scoped_name.h"\

-	{$(INCLUDE)}"\.\include\utl_stack.h"\

-	{$(INCLUDE)}"\.\include\utl_string.h"\

-	{$(INCLUDE)}"\.\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\be_state_structure.obj" : $(SOURCE) $(DEP_CPP_BE_STATE_ST)\

- "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\be\be_state_typedef.cpp

-DEP_CPP_BE_STATE_T=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Atomic_Op.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/Event_Handler.h"\

-	"..\..\ace/Event_Handler.i"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/Singleton.cpp"\

-	"..\..\ace/Singleton.h"\

-	"..\..\ace/Singleton.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/stdcpp.h"\

-	"..\..\ace/SV_Semaphore_Complex.h"\

-	"..\..\ace/SV_Semaphore_Complex.i"\

-	"..\..\ace/SV_Semaphore_Simple.h"\

-	"..\..\ace/SV_Semaphore_Simple.i"\

-	"..\..\ace/Synch.h"\

-	"..\..\ace/Synch.i"\

-	"..\..\ace/Synch_T.cpp"\

-	"..\..\ace/Synch_T.h"\

-	"..\..\ace/Synch_T.i"\

-	"..\..\ace/Thread.h"\

-	"..\..\ace/Thread.i"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\be_include\be.h"\

-	".\include\idl.h"\

-	".\include\idl_extern.h"\

-	{$(INCLUDE)}"\.\be_include\be_argument.h"\

-	{$(INCLUDE)}"\.\be_include\be_array.h"\

-	{$(INCLUDE)}"\.\be_include\be_attribute.h"\

-	{$(INCLUDE)}"\.\be_include\be_codegen.h"\

-	{$(INCLUDE)}"\.\be_include\be_constant.h"\

-	{$(INCLUDE)}"\.\be_include\be_decl.h"\

-	{$(INCLUDE)}"\.\be_include\be_enum.h"\

-	{$(INCLUDE)}"\.\be_include\be_enum_val.h"\

-	{$(INCLUDE)}"\.\be_include\be_exception.h"\

-	{$(INCLUDE)}"\.\be_include\be_expression.h"\

-	{$(INCLUDE)}"\.\be_include\be_factory.h"\

-	{$(INCLUDE)}"\.\be_include\be_field.h"\

-	{$(INCLUDE)}"\.\be_include\be_generator.h"\

-	{$(INCLUDE)}"\.\be_include\be_helper.h"\

-	{$(INCLUDE)}"\.\be_include\be_interface.h"\

-	{$(INCLUDE)}"\.\be_include\be_interface_fwd.h"\

-	{$(INCLUDE)}"\.\be_include\be_module.h"\

-	{$(INCLUDE)}"\.\be_include\be_operation.h"\

-	{$(INCLUDE)}"\.\be_include\be_predefined_type.h"\

-	{$(INCLUDE)}"\.\be_include\be_root.h"\

-	{$(INCLUDE)}"\.\be_include\be_scope.h"\

-	{$(INCLUDE)}"\.\be_include\be_sequence.h"\

-	{$(INCLUDE)}"\.\be_include\be_state.h"\

-	{$(INCLUDE)}"\.\be_include\be_string.h"\

-	{$(INCLUDE)}"\.\be_include\be_structure.h"\

-	{$(INCLUDE)}"\.\be_include\be_type.h"\

-	{$(INCLUDE)}"\.\be_include\be_typedef.h"\

-	{$(INCLUDE)}"\.\be_include\be_union.h"\

-	{$(INCLUDE)}"\.\be_include\be_union_branch.h"\

-	{$(INCLUDE)}"\.\be_include\be_union_label.h"\

-	{$(INCLUDE)}"\.\include\ast.h"\

-	{$(INCLUDE)}"\.\include\ast_argument.h"\

-	{$(INCLUDE)}"\.\include\ast_array.h"\

-	{$(INCLUDE)}"\.\include\ast_attribute.h"\

-	{$(INCLUDE)}"\.\include\ast_concrete_type.h"\

-	{$(INCLUDE)}"\.\include\ast_constant.h"\

-	{$(INCLUDE)}"\.\include\ast_decl.h"\

-	{$(INCLUDE)}"\.\include\ast_enum.h"\

-	{$(INCLUDE)}"\.\include\ast_enum_val.h"\

-	{$(INCLUDE)}"\.\include\ast_exception.h"\

-	{$(INCLUDE)}"\.\include\ast_expression.h"\

-	{$(INCLUDE)}"\.\include\ast_extern.h"\

-	{$(INCLUDE)}"\.\include\ast_field.h"\

-	{$(INCLUDE)}"\.\include\ast_generator.h"\

-	{$(INCLUDE)}"\.\include\ast_interface.h"\

-	{$(INCLUDE)}"\.\include\ast_interface_fwd.h"\

-	{$(INCLUDE)}"\.\include\ast_module.h"\

-	{$(INCLUDE)}"\.\include\ast_operation.h"\

-	{$(INCLUDE)}"\.\include\ast_predefined_type.h"\

-	{$(INCLUDE)}"\.\include\ast_root.h"\

-	{$(INCLUDE)}"\.\include\ast_sequence.h"\

-	{$(INCLUDE)}"\.\include\ast_string.h"\

-	{$(INCLUDE)}"\.\include\ast_structure.h"\

-	{$(INCLUDE)}"\.\include\ast_type.h"\

-	{$(INCLUDE)}"\.\include\ast_typedef.h"\

-	{$(INCLUDE)}"\.\include\ast_union.h"\

-	{$(INCLUDE)}"\.\include\ast_union_branch.h"\

-	{$(INCLUDE)}"\.\include\ast_union_label.h"\

-	{$(INCLUDE)}"\.\include\be_extern.h"\

-	{$(INCLUDE)}"\.\include\drv_extern.h"\

-	{$(INCLUDE)}"\.\include\fe_extern.h"\

-	{$(INCLUDE)}"\.\include\global_extern.h"\

-	{$(INCLUDE)}"\.\include\idl_bool.h"\

-	{$(INCLUDE)}"\.\include\idl_defines.h"\

-	{$(INCLUDE)}"\.\include\idl_fwd.h"\

-	{$(INCLUDE)}"\.\include\idl_global.h"\

-	{$(INCLUDE)}"\.\include\idl_narrow.h"\

-	{$(INCLUDE)}"\.\include\intlmacros.h"\

-	{$(INCLUDE)}"\.\include\nr_extern.h"\

-	{$(INCLUDE)}"\.\include\util.h"\

-	{$(INCLUDE)}"\.\include\utl_decllist.h"\

-	{$(INCLUDE)}"\.\include\utl_error.h"\

-	{$(INCLUDE)}"\.\include\utl_exceptlist.h"\

-	{$(INCLUDE)}"\.\include\utl_exprlist.h"\

-	{$(INCLUDE)}"\.\include\utl_identifier.h"\

-	{$(INCLUDE)}"\.\include\utl_idlist.h"\

-	{$(INCLUDE)}"\.\include\utl_indenter.h"\

-	{$(INCLUDE)}"\.\include\utl_labellist.h"\

-	{$(INCLUDE)}"\.\include\utl_list.h"\

-	{$(INCLUDE)}"\.\include\utl_namelist.h"\

-	{$(INCLUDE)}"\.\include\utl_scope.h"\

-	{$(INCLUDE)}"\.\include\utl_scoped_name.h"\

-	{$(INCLUDE)}"\.\include\utl_stack.h"\

-	{$(INCLUDE)}"\.\include\utl_string.h"\

-	{$(INCLUDE)}"\.\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\be_state_typedef.obj" : $(SOURCE) $(DEP_CPP_BE_STATE_T) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\be\be_state_argument.cpp

-DEP_CPP_BE_STATE_A=\

-	"..\..\ace/ACE.h"\

-	"..\..\ace/ACE.i"\

-	"..\..\ace/Atomic_Op.i"\

-	"..\..\ace/Auto_Ptr.cpp"\

-	"..\..\ace/Auto_Ptr.h"\

-	"..\..\ace/Auto_Ptr.i"\

-	"..\..\ace/config-win32-common.h"\

-	"..\..\ace/config-win32.h"\

-	"..\..\ace/config.h"\

-	"..\..\ace/Event_Handler.h"\

-	"..\..\ace/Event_Handler.i"\

-	"..\..\ace/Log_Msg.h"\

-	"..\..\ace/Log_Priority.h"\

-	"..\..\ace/Log_Record.h"\

-	"..\..\ace/Log_Record.i"\

-	"..\..\ace/Managed_Object.cpp"\

-	"..\..\ace/Managed_Object.h"\

-	"..\..\ace/Managed_Object.i"\

-	"..\..\ace/Object_Manager.h"\

-	"..\..\ace/Object_Manager.i"\

-	"..\..\ace/OS.h"\

-	"..\..\ace/OS.i"\

-	"..\..\ace/Singleton.cpp"\

-	"..\..\ace/Singleton.h"\

-	"..\..\ace/Singleton.i"\

-	"..\..\ace/SString.h"\

-	"..\..\ace/SString.i"\

-	"..\..\ace/stdcpp.h"\

-	"..\..\ace/SV_Semaphore_Complex.h"\

-	"..\..\ace/SV_Semaphore_Complex.i"\

-	"..\..\ace/SV_Semaphore_Simple.h"\

-	"..\..\ace/SV_Semaphore_Simple.i"\

-	"..\..\ace/Synch.h"\

-	"..\..\ace/Synch.i"\

-	"..\..\ace/Synch_T.cpp"\

-	"..\..\ace/Synch_T.h"\

-	"..\..\ace/Synch_T.i"\

-	"..\..\ace/Thread.h"\

-	"..\..\ace/Thread.i"\

-	"..\..\ace/Trace.h"\

-	"..\..\ace/Version.h"\

-	"..\..\ace/ws2tcpip.h"\

-	".\be_include\be.h"\

-	".\include\idl.h"\

-	".\include\idl_extern.h"\

-	{$(INCLUDE)}"\.\be_include\be_argument.h"\

-	{$(INCLUDE)}"\.\be_include\be_array.h"\

-	{$(INCLUDE)}"\.\be_include\be_attribute.h"\

-	{$(INCLUDE)}"\.\be_include\be_codegen.h"\

-	{$(INCLUDE)}"\.\be_include\be_constant.h"\

-	{$(INCLUDE)}"\.\be_include\be_decl.h"\

-	{$(INCLUDE)}"\.\be_include\be_enum.h"\

-	{$(INCLUDE)}"\.\be_include\be_enum_val.h"\

-	{$(INCLUDE)}"\.\be_include\be_exception.h"\

-	{$(INCLUDE)}"\.\be_include\be_expression.h"\

-	{$(INCLUDE)}"\.\be_include\be_factory.h"\

-	{$(INCLUDE)}"\.\be_include\be_field.h"\

-	{$(INCLUDE)}"\.\be_include\be_generator.h"\

-	{$(INCLUDE)}"\.\be_include\be_helper.h"\

-	{$(INCLUDE)}"\.\be_include\be_interface.h"\

-	{$(INCLUDE)}"\.\be_include\be_interface_fwd.h"\

-	{$(INCLUDE)}"\.\be_include\be_module.h"\

-	{$(INCLUDE)}"\.\be_include\be_operation.h"\

-	{$(INCLUDE)}"\.\be_include\be_predefined_type.h"\

-	{$(INCLUDE)}"\.\be_include\be_root.h"\

-	{$(INCLUDE)}"\.\be_include\be_scope.h"\

-	{$(INCLUDE)}"\.\be_include\be_sequence.h"\

-	{$(INCLUDE)}"\.\be_include\be_state.h"\

-	{$(INCLUDE)}"\.\be_include\be_string.h"\

-	{$(INCLUDE)}"\.\be_include\be_structure.h"\

-	{$(INCLUDE)}"\.\be_include\be_type.h"\

-	{$(INCLUDE)}"\.\be_include\be_typedef.h"\

-	{$(INCLUDE)}"\.\be_include\be_union.h"\

-	{$(INCLUDE)}"\.\be_include\be_union_branch.h"\

-	{$(INCLUDE)}"\.\be_include\be_union_label.h"\

-	{$(INCLUDE)}"\.\include\ast.h"\

-	{$(INCLUDE)}"\.\include\ast_argument.h"\

-	{$(INCLUDE)}"\.\include\ast_array.h"\

-	{$(INCLUDE)}"\.\include\ast_attribute.h"\

-	{$(INCLUDE)}"\.\include\ast_concrete_type.h"\

-	{$(INCLUDE)}"\.\include\ast_constant.h"\

-	{$(INCLUDE)}"\.\include\ast_decl.h"\

-	{$(INCLUDE)}"\.\include\ast_enum.h"\

-	{$(INCLUDE)}"\.\include\ast_enum_val.h"\

-	{$(INCLUDE)}"\.\include\ast_exception.h"\

-	{$(INCLUDE)}"\.\include\ast_expression.h"\

-	{$(INCLUDE)}"\.\include\ast_extern.h"\

-	{$(INCLUDE)}"\.\include\ast_field.h"\

-	{$(INCLUDE)}"\.\include\ast_generator.h"\

-	{$(INCLUDE)}"\.\include\ast_interface.h"\

-	{$(INCLUDE)}"\.\include\ast_interface_fwd.h"\

-	{$(INCLUDE)}"\.\include\ast_module.h"\

-	{$(INCLUDE)}"\.\include\ast_operation.h"\

-	{$(INCLUDE)}"\.\include\ast_predefined_type.h"\

-	{$(INCLUDE)}"\.\include\ast_root.h"\

-	{$(INCLUDE)}"\.\include\ast_sequence.h"\

-	{$(INCLUDE)}"\.\include\ast_string.h"\

-	{$(INCLUDE)}"\.\include\ast_structure.h"\

-	{$(INCLUDE)}"\.\include\ast_type.h"\

-	{$(INCLUDE)}"\.\include\ast_typedef.h"\

-	{$(INCLUDE)}"\.\include\ast_union.h"\

-	{$(INCLUDE)}"\.\include\ast_union_branch.h"\

-	{$(INCLUDE)}"\.\include\ast_union_label.h"\

-	{$(INCLUDE)}"\.\include\be_extern.h"\

-	{$(INCLUDE)}"\.\include\drv_extern.h"\

-	{$(INCLUDE)}"\.\include\fe_extern.h"\

-	{$(INCLUDE)}"\.\include\global_extern.h"\

-	{$(INCLUDE)}"\.\include\idl_bool.h"\

-	{$(INCLUDE)}"\.\include\idl_defines.h"\

-	{$(INCLUDE)}"\.\include\idl_fwd.h"\

-	{$(INCLUDE)}"\.\include\idl_global.h"\

-	{$(INCLUDE)}"\.\include\idl_narrow.h"\

-	{$(INCLUDE)}"\.\include\intlmacros.h"\

-	{$(INCLUDE)}"\.\include\nr_extern.h"\

-	{$(INCLUDE)}"\.\include\util.h"\

-	{$(INCLUDE)}"\.\include\utl_decllist.h"\

-	{$(INCLUDE)}"\.\include\utl_error.h"\

-	{$(INCLUDE)}"\.\include\utl_exceptlist.h"\

-	{$(INCLUDE)}"\.\include\utl_exprlist.h"\

-	{$(INCLUDE)}"\.\include\utl_identifier.h"\

-	{$(INCLUDE)}"\.\include\utl_idlist.h"\

-	{$(INCLUDE)}"\.\include\utl_indenter.h"\

-	{$(INCLUDE)}"\.\include\utl_labellist.h"\

-	{$(INCLUDE)}"\.\include\utl_list.h"\

-	{$(INCLUDE)}"\.\include\utl_namelist.h"\

-	{$(INCLUDE)}"\.\include\utl_scope.h"\

-	{$(INCLUDE)}"\.\include\utl_scoped_name.h"\

-	{$(INCLUDE)}"\.\include\utl_stack.h"\

-	{$(INCLUDE)}"\.\include\utl_string.h"\

-	{$(INCLUDE)}"\.\include\utl_strlist.h"\

-	{$(INCLUDE)}"\sys\types.h"\

-	

-

-"$(INTDIR)\be_state_argument.obj" : $(SOURCE) $(DEP_CPP_BE_STATE_A) "$(INTDIR)"

-   $(CPP) $(CPP_PROJ) $(SOURCE)

-

-

-# End Source File

-# End Target

-# End Project

-################################################################################

diff --git a/TAO/TAO_IDL/TAO_IDL.mdp b/TAO/TAO_IDL/TAO_IDL.mdp
deleted file mode 100644
index c8ec987c1b1..00000000000
--- a/TAO/TAO_IDL/TAO_IDL.mdp
+++ /dev/null
diff --git a/TAO/TAO_IDL/ast/Makefile b/TAO/TAO_IDL/ast/Makefile
deleted file mode 100644
index 161e5368ac1..00000000000
--- a/TAO/TAO_IDL/ast/Makefile
+++ /dev/null
@@ -1,868 +0,0 @@
-#----------------------------------------------------------------------------
-#	$Id$
-#
-#	Makefile for libast
-#----------------------------------------------------------------------------
-
-MAKEFILE = Makefile
-LIBNAME  = libast
-LIB      = $(LIBNAME).a
-SHLIB    = $(LIBNAME).$(SOEXT)
-IDL_CFE_VERSION	= \"1.3.0\"
-
-# These are components that are sources of
-AST_FILES	= \
-		ast_array \
-		ast_argument \
-		ast_attribute \
-		ast_check \
-		ast_concrete_type \
-		ast_constant \
-		ast_decl \
-		ast_enum \
-		ast_enum_val \
-		ast_exception \
-		ast_expression \
-		ast_field \
-		ast_interface \
-		ast_interface_fwd \
-		ast_module \
-		ast_operation \
-		ast_predefined_type \
-		ast_root \
-		ast_sequence \
-		ast_string \
-		ast_structure \
-		ast_type \
-		ast_typedef \
-		ast_union \
-		ast_union_branch \
-		ast_union_label \
-		ast_generator \
-		ast_redef \
-		ast_recursive
-
-FILES	 = $(AST_FILES)
-
-LSRC	= $(addsuffix .cpp,$(FILES))
-LOBJ    = $(addsuffix .o,$(FILES))
-SHOBJ   = $(addsuffix .so,$(FILES))
-
-
-LDLIBS	= -lACE
-LIBS = -lACE
-VLDLIBS = $(LDLIBS:%=%$(VAR))
-
-BUILD	= $(VSHLIB) #$(VLIB)
-
-
-#----------------------------------------------------------------------------
-#	Include macros and targets
-#----------------------------------------------------------------------------
-
-include	$(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-include	$(ACE_ROOT)/include/makeinclude/macros.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.common.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.lib.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.bin.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
-
-#----------------------------------------------------------------------------
-#	Local targets (and local hacks)
-#----------------------------------------------------------------------------
-
-CPPFLAGS += -I../include -I. -DCPP_LOCATION=\"$(CXX)\" -DIDL_CFE_VERSION=$(IDL_CFE_VERSION)
-
-#----------------------------------------------------------------------------
-#	Dependencies
-#----------------------------------------------------------------------------
-
-# DO NOT DELETE THIS LINE -- g++dep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-
-.obj/ast_array.o .shobj/ast_array.so: ast_array.cpp ../include/idl.h ../include/intlmacros.h \
- ../include/idl_narrow.h ../include/idl_defines.h ../include/idl_fwd.h \
- ../include/idl_bool.h ../include/utl_string.h \
- ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/utl_strlist.h ../include/utl_exprlist.h \
- ../include/ast_generator.h ../include/util.h ../include/utl_stack.h \
- ../include/utl_idlist.h ../include/utl_exceptlist.h \
- ../include/utl_namelist.h ../include/utl_labellist.h \
- ../include/utl_decllist.h ../include/idl_global.h \
- ../include/utl_error.h ../include/utl_indenter.h \
- ../include/idl_extern.h ../include/fe_extern.h ../include/be_extern.h \
- ../include/drv_extern.h ../include/ast_extern.h \
- ../include/nr_extern.h ../include/global_extern.h
-.obj/ast_argument.o .shobj/ast_argument.so: ast_argument.cpp ../include/idl.h \
- ../include/intlmacros.h ../include/idl_narrow.h \
- ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \
- ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/utl_strlist.h ../include/utl_exprlist.h \
- ../include/ast_generator.h ../include/util.h ../include/utl_stack.h \
- ../include/utl_idlist.h ../include/utl_exceptlist.h \
- ../include/utl_namelist.h ../include/utl_labellist.h \
- ../include/utl_decllist.h ../include/idl_global.h \
- ../include/utl_error.h ../include/utl_indenter.h \
- ../include/idl_extern.h ../include/fe_extern.h ../include/be_extern.h \
- ../include/drv_extern.h ../include/ast_extern.h \
- ../include/nr_extern.h ../include/global_extern.h
-.obj/ast_attribute.o .shobj/ast_attribute.so: ast_attribute.cpp ../include/idl.h \
- ../include/intlmacros.h ../include/idl_narrow.h \
- ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \
- ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/utl_strlist.h ../include/utl_exprlist.h \
- ../include/ast_generator.h ../include/util.h ../include/utl_stack.h \
- ../include/utl_idlist.h ../include/utl_exceptlist.h \
- ../include/utl_namelist.h ../include/utl_labellist.h \
- ../include/utl_decllist.h ../include/idl_global.h \
- ../include/utl_error.h ../include/utl_indenter.h \
- ../include/idl_extern.h ../include/fe_extern.h ../include/be_extern.h \
- ../include/drv_extern.h ../include/ast_extern.h \
- ../include/nr_extern.h ../include/global_extern.h
-.obj/ast_check.o .shobj/ast_check.so: ast_check.cpp ../include/idl.h ../include/intlmacros.h \
- ../include/idl_narrow.h ../include/idl_defines.h ../include/idl_fwd.h \
- ../include/idl_bool.h ../include/utl_string.h \
- ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/utl_strlist.h ../include/utl_exprlist.h \
- ../include/ast_generator.h ../include/util.h ../include/utl_stack.h \
- ../include/utl_idlist.h ../include/utl_exceptlist.h \
- ../include/utl_namelist.h ../include/utl_labellist.h \
- ../include/utl_decllist.h ../include/idl_global.h \
- ../include/utl_error.h ../include/utl_indenter.h \
- ../include/idl_extern.h ../include/fe_extern.h ../include/be_extern.h \
- ../include/drv_extern.h ../include/ast_extern.h \
- ../include/nr_extern.h ../include/global_extern.h
-.obj/ast_concrete_type.o .shobj/ast_concrete_type.so: ast_concrete_type.cpp ../include/idl.h \
- ../include/intlmacros.h ../include/idl_narrow.h \
- ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \
- ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/utl_strlist.h ../include/utl_exprlist.h \
- ../include/ast_generator.h ../include/util.h ../include/utl_stack.h \
- ../include/utl_idlist.h ../include/utl_exceptlist.h \
- ../include/utl_namelist.h ../include/utl_labellist.h \
- ../include/utl_decllist.h ../include/idl_global.h \
- ../include/utl_error.h ../include/utl_indenter.h \
- ../include/idl_extern.h ../include/fe_extern.h ../include/be_extern.h \
- ../include/drv_extern.h ../include/ast_extern.h \
- ../include/nr_extern.h ../include/global_extern.h
-.obj/ast_constant.o .shobj/ast_constant.so: ast_constant.cpp ../include/idl.h \
- ../include/intlmacros.h ../include/idl_narrow.h \
- ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \
- ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/utl_strlist.h ../include/utl_exprlist.h \
- ../include/ast_generator.h ../include/util.h ../include/utl_stack.h \
- ../include/utl_idlist.h ../include/utl_exceptlist.h \
- ../include/utl_namelist.h ../include/utl_labellist.h \
- ../include/utl_decllist.h ../include/idl_global.h \
- ../include/utl_error.h ../include/utl_indenter.h \
- ../include/idl_extern.h ../include/fe_extern.h ../include/be_extern.h \
- ../include/drv_extern.h ../include/ast_extern.h \
- ../include/nr_extern.h ../include/global_extern.h
-.obj/ast_decl.o .shobj/ast_decl.so: ast_decl.cpp ../include/idl.h ../include/intlmacros.h \
- ../include/idl_narrow.h ../include/idl_defines.h ../include/idl_fwd.h \
- ../include/idl_bool.h ../include/utl_string.h \
- ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/utl_strlist.h ../include/utl_exprlist.h \
- ../include/ast_generator.h ../include/util.h ../include/utl_stack.h \
- ../include/utl_idlist.h ../include/utl_exceptlist.h \
- ../include/utl_namelist.h ../include/utl_labellist.h \
- ../include/utl_decllist.h ../include/idl_global.h \
- ../include/utl_error.h ../include/utl_indenter.h \
- ../include/idl_extern.h ../include/fe_extern.h ../include/be_extern.h \
- ../include/drv_extern.h ../include/ast_extern.h \
- ../include/nr_extern.h ../include/global_extern.h
-.obj/ast_enum.o .shobj/ast_enum.so: ast_enum.cpp ../include/idl.h ../include/intlmacros.h \
- ../include/idl_narrow.h ../include/idl_defines.h ../include/idl_fwd.h \
- ../include/idl_bool.h ../include/utl_string.h \
- ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/utl_strlist.h ../include/utl_exprlist.h \
- ../include/ast_generator.h ../include/util.h ../include/utl_stack.h \
- ../include/utl_idlist.h ../include/utl_exceptlist.h \
- ../include/utl_namelist.h ../include/utl_labellist.h \
- ../include/utl_decllist.h ../include/idl_global.h \
- ../include/utl_error.h ../include/utl_indenter.h \
- ../include/idl_extern.h ../include/fe_extern.h ../include/be_extern.h \
- ../include/drv_extern.h ../include/ast_extern.h \
- ../include/nr_extern.h ../include/global_extern.h
-.obj/ast_enum_val.o .shobj/ast_enum_val.so: ast_enum_val.cpp ../include/idl.h \
- ../include/intlmacros.h ../include/idl_narrow.h \
- ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \
- ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/utl_strlist.h ../include/utl_exprlist.h \
- ../include/ast_generator.h ../include/util.h ../include/utl_stack.h \
- ../include/utl_idlist.h ../include/utl_exceptlist.h \
- ../include/utl_namelist.h ../include/utl_labellist.h \
- ../include/utl_decllist.h ../include/idl_global.h \
- ../include/utl_error.h ../include/utl_indenter.h \
- ../include/idl_extern.h ../include/fe_extern.h ../include/be_extern.h \
- ../include/drv_extern.h ../include/ast_extern.h \
- ../include/nr_extern.h ../include/global_extern.h
-.obj/ast_exception.o .shobj/ast_exception.so: ast_exception.cpp ../include/idl.h \
- ../include/intlmacros.h ../include/idl_narrow.h \
- ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \
- ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/utl_strlist.h ../include/utl_exprlist.h \
- ../include/ast_generator.h ../include/util.h ../include/utl_stack.h \
- ../include/utl_idlist.h ../include/utl_exceptlist.h \
- ../include/utl_namelist.h ../include/utl_labellist.h \
- ../include/utl_decllist.h ../include/idl_global.h \
- ../include/utl_error.h ../include/utl_indenter.h \
- ../include/idl_extern.h ../include/fe_extern.h ../include/be_extern.h \
- ../include/drv_extern.h ../include/ast_extern.h \
- ../include/nr_extern.h ../include/global_extern.h
-.obj/ast_expression.o .shobj/ast_expression.so: ast_expression.cpp ../include/idl.h \
- ../include/intlmacros.h ../include/idl_narrow.h \
- ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \
- ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/utl_strlist.h ../include/utl_exprlist.h \
- ../include/ast_generator.h ../include/util.h ../include/utl_stack.h \
- ../include/utl_idlist.h ../include/utl_exceptlist.h \
- ../include/utl_namelist.h ../include/utl_labellist.h \
- ../include/utl_decllist.h ../include/idl_global.h \
- ../include/utl_error.h ../include/utl_indenter.h \
- ../include/idl_extern.h ../include/fe_extern.h ../include/be_extern.h \
- ../include/drv_extern.h ../include/ast_extern.h \
- ../include/nr_extern.h ../include/global_extern.h
-.obj/ast_field.o .shobj/ast_field.so: ast_field.cpp ../include/idl.h ../include/intlmacros.h \
- ../include/idl_narrow.h ../include/idl_defines.h ../include/idl_fwd.h \
- ../include/idl_bool.h ../include/utl_string.h \
- ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/utl_strlist.h ../include/utl_exprlist.h \
- ../include/ast_generator.h ../include/util.h ../include/utl_stack.h \
- ../include/utl_idlist.h ../include/utl_exceptlist.h \
- ../include/utl_namelist.h ../include/utl_labellist.h \
- ../include/utl_decllist.h ../include/idl_global.h \
- ../include/utl_error.h ../include/utl_indenter.h \
- ../include/idl_extern.h ../include/fe_extern.h ../include/be_extern.h \
- ../include/drv_extern.h ../include/ast_extern.h \
- ../include/nr_extern.h ../include/global_extern.h
-.obj/ast_interface.o .shobj/ast_interface.so: ast_interface.cpp ../include/idl.h \
- ../include/intlmacros.h ../include/idl_narrow.h \
- ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \
- ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/utl_strlist.h ../include/utl_exprlist.h \
- ../include/ast_generator.h ../include/util.h ../include/utl_stack.h \
- ../include/utl_idlist.h ../include/utl_exceptlist.h \
- ../include/utl_namelist.h ../include/utl_labellist.h \
- ../include/utl_decllist.h ../include/idl_global.h \
- ../include/utl_error.h ../include/utl_indenter.h \
- ../include/idl_extern.h ../include/fe_extern.h ../include/be_extern.h \
- ../include/drv_extern.h ../include/ast_extern.h \
- ../include/nr_extern.h ../include/global_extern.h
-.obj/ast_interface_fwd.o .shobj/ast_interface_fwd.so: ast_interface_fwd.cpp ../include/idl.h \
- ../include/intlmacros.h ../include/idl_narrow.h \
- ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \
- ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/utl_strlist.h ../include/utl_exprlist.h \
- ../include/ast_generator.h ../include/util.h ../include/utl_stack.h \
- ../include/utl_idlist.h ../include/utl_exceptlist.h \
- ../include/utl_namelist.h ../include/utl_labellist.h \
- ../include/utl_decllist.h ../include/idl_global.h \
- ../include/utl_error.h ../include/utl_indenter.h \
- ../include/idl_extern.h ../include/fe_extern.h ../include/be_extern.h \
- ../include/drv_extern.h ../include/ast_extern.h \
- ../include/nr_extern.h ../include/global_extern.h
-.obj/ast_module.o .shobj/ast_module.so: ast_module.cpp ../include/idl.h ../include/intlmacros.h \
- ../include/idl_narrow.h ../include/idl_defines.h ../include/idl_fwd.h \
- ../include/idl_bool.h ../include/utl_string.h \
- ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/utl_strlist.h ../include/utl_exprlist.h \
- ../include/ast_generator.h ../include/util.h ../include/utl_stack.h \
- ../include/utl_idlist.h ../include/utl_exceptlist.h \
- ../include/utl_namelist.h ../include/utl_labellist.h \
- ../include/utl_decllist.h ../include/idl_global.h \
- ../include/utl_error.h ../include/utl_indenter.h \
- ../include/idl_extern.h ../include/fe_extern.h ../include/be_extern.h \
- ../include/drv_extern.h ../include/ast_extern.h \
- ../include/nr_extern.h ../include/global_extern.h
-.obj/ast_operation.o .shobj/ast_operation.so: ast_operation.cpp ../include/idl.h \
- ../include/intlmacros.h ../include/idl_narrow.h \
- ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \
- ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/utl_strlist.h ../include/utl_exprlist.h \
- ../include/ast_generator.h ../include/util.h ../include/utl_stack.h \
- ../include/utl_idlist.h ../include/utl_exceptlist.h \
- ../include/utl_namelist.h ../include/utl_labellist.h \
- ../include/utl_decllist.h ../include/idl_global.h \
- ../include/utl_error.h ../include/utl_indenter.h \
- ../include/idl_extern.h ../include/fe_extern.h ../include/be_extern.h \
- ../include/drv_extern.h ../include/ast_extern.h \
- ../include/nr_extern.h ../include/global_extern.h
-.obj/ast_predefined_type.o .shobj/ast_predefined_type.so: ast_predefined_type.cpp ../include/idl.h \
- ../include/intlmacros.h ../include/idl_narrow.h \
- ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \
- ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/utl_strlist.h ../include/utl_exprlist.h \
- ../include/ast_generator.h ../include/util.h ../include/utl_stack.h \
- ../include/utl_idlist.h ../include/utl_exceptlist.h \
- ../include/utl_namelist.h ../include/utl_labellist.h \
- ../include/utl_decllist.h ../include/idl_global.h \
- ../include/utl_error.h ../include/utl_indenter.h \
- ../include/idl_extern.h ../include/fe_extern.h ../include/be_extern.h \
- ../include/drv_extern.h ../include/ast_extern.h \
- ../include/nr_extern.h ../include/global_extern.h
-.obj/ast_root.o .shobj/ast_root.so: ast_root.cpp ../include/idl.h ../include/intlmacros.h \
- ../include/idl_narrow.h ../include/idl_defines.h ../include/idl_fwd.h \
- ../include/idl_bool.h ../include/utl_string.h \
- ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/utl_strlist.h ../include/utl_exprlist.h \
- ../include/ast_generator.h ../include/util.h ../include/utl_stack.h \
- ../include/utl_idlist.h ../include/utl_exceptlist.h \
- ../include/utl_namelist.h ../include/utl_labellist.h \
- ../include/utl_decllist.h ../include/idl_global.h \
- ../include/utl_error.h ../include/utl_indenter.h \
- ../include/idl_extern.h ../include/fe_extern.h ../include/be_extern.h \
- ../include/drv_extern.h ../include/ast_extern.h \
- ../include/nr_extern.h ../include/global_extern.h
-.obj/ast_sequence.o .shobj/ast_sequence.so: ast_sequence.cpp ../include/idl.h \
- ../include/intlmacros.h ../include/idl_narrow.h \
- ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \
- ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/utl_strlist.h ../include/utl_exprlist.h \
- ../include/ast_generator.h ../include/util.h ../include/utl_stack.h \
- ../include/utl_idlist.h ../include/utl_exceptlist.h \
- ../include/utl_namelist.h ../include/utl_labellist.h \
- ../include/utl_decllist.h ../include/idl_global.h \
- ../include/utl_error.h ../include/utl_indenter.h \
- ../include/idl_extern.h ../include/fe_extern.h ../include/be_extern.h \
- ../include/drv_extern.h ../include/ast_extern.h \
- ../include/nr_extern.h ../include/global_extern.h
-.obj/ast_string.o .shobj/ast_string.so: ast_string.cpp ../include/idl.h ../include/intlmacros.h \
- ../include/idl_narrow.h ../include/idl_defines.h ../include/idl_fwd.h \
- ../include/idl_bool.h ../include/utl_string.h \
- ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/utl_strlist.h ../include/utl_exprlist.h \
- ../include/ast_generator.h ../include/util.h ../include/utl_stack.h \
- ../include/utl_idlist.h ../include/utl_exceptlist.h \
- ../include/utl_namelist.h ../include/utl_labellist.h \
- ../include/utl_decllist.h ../include/idl_global.h \
- ../include/utl_error.h ../include/utl_indenter.h \
- ../include/idl_extern.h ../include/fe_extern.h ../include/be_extern.h \
- ../include/drv_extern.h ../include/ast_extern.h \
- ../include/nr_extern.h ../include/global_extern.h
-.obj/ast_structure.o .shobj/ast_structure.so: ast_structure.cpp ../include/idl.h \
- ../include/intlmacros.h ../include/idl_narrow.h \
- ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \
- ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/utl_strlist.h ../include/utl_exprlist.h \
- ../include/ast_generator.h ../include/util.h ../include/utl_stack.h \
- ../include/utl_idlist.h ../include/utl_exceptlist.h \
- ../include/utl_namelist.h ../include/utl_labellist.h \
- ../include/utl_decllist.h ../include/idl_global.h \
- ../include/utl_error.h ../include/utl_indenter.h \
- ../include/idl_extern.h ../include/fe_extern.h ../include/be_extern.h \
- ../include/drv_extern.h ../include/ast_extern.h \
- ../include/nr_extern.h ../include/global_extern.h
-.obj/ast_type.o .shobj/ast_type.so: ast_type.cpp ../include/idl.h ../include/intlmacros.h \
- ../include/idl_narrow.h ../include/idl_defines.h ../include/idl_fwd.h \
- ../include/idl_bool.h ../include/utl_string.h \
- ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/utl_strlist.h ../include/utl_exprlist.h \
- ../include/ast_generator.h ../include/util.h ../include/utl_stack.h \
- ../include/utl_idlist.h ../include/utl_exceptlist.h \
- ../include/utl_namelist.h ../include/utl_labellist.h \
- ../include/utl_decllist.h ../include/idl_global.h \
- ../include/utl_error.h ../include/utl_indenter.h \
- ../include/idl_extern.h ../include/fe_extern.h ../include/be_extern.h \
- ../include/drv_extern.h ../include/ast_extern.h \
- ../include/nr_extern.h ../include/global_extern.h
-.obj/ast_typedef.o .shobj/ast_typedef.so: ast_typedef.cpp ../include/idl.h \
- ../include/intlmacros.h ../include/idl_narrow.h \
- ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \
- ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/utl_strlist.h ../include/utl_exprlist.h \
- ../include/ast_generator.h ../include/util.h ../include/utl_stack.h \
- ../include/utl_idlist.h ../include/utl_exceptlist.h \
- ../include/utl_namelist.h ../include/utl_labellist.h \
- ../include/utl_decllist.h ../include/idl_global.h \
- ../include/utl_error.h ../include/utl_indenter.h \
- ../include/idl_extern.h ../include/fe_extern.h ../include/be_extern.h \
- ../include/drv_extern.h ../include/ast_extern.h \
- ../include/nr_extern.h ../include/global_extern.h
-.obj/ast_union.o .shobj/ast_union.so: ast_union.cpp ../include/idl.h ../include/intlmacros.h \
- ../include/idl_narrow.h ../include/idl_defines.h ../include/idl_fwd.h \
- ../include/idl_bool.h ../include/utl_string.h \
- ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/utl_strlist.h ../include/utl_exprlist.h \
- ../include/ast_generator.h ../include/util.h ../include/utl_stack.h \
- ../include/utl_idlist.h ../include/utl_exceptlist.h \
- ../include/utl_namelist.h ../include/utl_labellist.h \
- ../include/utl_decllist.h ../include/idl_global.h \
- ../include/utl_error.h ../include/utl_indenter.h \
- ../include/idl_extern.h ../include/fe_extern.h ../include/be_extern.h \
- ../include/drv_extern.h ../include/ast_extern.h \
- ../include/nr_extern.h ../include/global_extern.h
-.obj/ast_union_branch.o .shobj/ast_union_branch.so: ast_union_branch.cpp ../include/idl.h \
- ../include/intlmacros.h ../include/idl_narrow.h \
- ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \
- ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/utl_strlist.h ../include/utl_exprlist.h \
- ../include/ast_generator.h ../include/util.h ../include/utl_stack.h \
- ../include/utl_idlist.h ../include/utl_exceptlist.h \
- ../include/utl_namelist.h ../include/utl_labellist.h \
- ../include/utl_decllist.h ../include/idl_global.h \
- ../include/utl_error.h ../include/utl_indenter.h \
- ../include/idl_extern.h ../include/fe_extern.h ../include/be_extern.h \
- ../include/drv_extern.h ../include/ast_extern.h \
- ../include/nr_extern.h ../include/global_extern.h
-.obj/ast_union_label.o .shobj/ast_union_label.so: ast_union_label.cpp ../include/idl.h \
- ../include/intlmacros.h ../include/idl_narrow.h \
- ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \
- ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/utl_strlist.h ../include/utl_exprlist.h \
- ../include/ast_generator.h ../include/util.h ../include/utl_stack.h \
- ../include/utl_idlist.h ../include/utl_exceptlist.h \
- ../include/utl_namelist.h ../include/utl_labellist.h \
- ../include/utl_decllist.h ../include/idl_global.h \
- ../include/utl_error.h ../include/utl_indenter.h \
- ../include/idl_extern.h ../include/fe_extern.h ../include/be_extern.h \
- ../include/drv_extern.h ../include/ast_extern.h \
- ../include/nr_extern.h ../include/global_extern.h
-.obj/ast_generator.o .shobj/ast_generator.so: ast_generator.cpp ../include/idl.h \
- ../include/intlmacros.h ../include/idl_narrow.h \
- ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \
- ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/utl_strlist.h ../include/utl_exprlist.h \
- ../include/ast_generator.h ../include/util.h ../include/utl_stack.h \
- ../include/utl_idlist.h ../include/utl_exceptlist.h \
- ../include/utl_namelist.h ../include/utl_labellist.h \
- ../include/utl_decllist.h ../include/idl_global.h \
- ../include/utl_error.h ../include/utl_indenter.h \
- ../include/idl_extern.h ../include/fe_extern.h ../include/be_extern.h \
- ../include/drv_extern.h ../include/ast_extern.h \
- ../include/nr_extern.h ../include/global_extern.h
-.obj/ast_redef.o .shobj/ast_redef.so: ast_redef.cpp ../include/idl.h ../include/intlmacros.h \
- ../include/idl_narrow.h ../include/idl_defines.h ../include/idl_fwd.h \
- ../include/idl_bool.h ../include/utl_string.h \
- ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/utl_strlist.h ../include/utl_exprlist.h \
- ../include/ast_generator.h ../include/util.h ../include/utl_stack.h \
- ../include/utl_idlist.h ../include/utl_exceptlist.h \
- ../include/utl_namelist.h ../include/utl_labellist.h \
- ../include/utl_decllist.h ../include/idl_global.h \
- ../include/utl_error.h ../include/utl_indenter.h \
- ../include/idl_extern.h ../include/fe_extern.h ../include/be_extern.h \
- ../include/drv_extern.h ../include/ast_extern.h \
- ../include/nr_extern.h ../include/global_extern.h
-.obj/ast_recursive.o .shobj/ast_recursive.so: ast_recursive.cpp ../include/idl.h \
- ../include/intlmacros.h ../include/idl_narrow.h \
- ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \
- ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/utl_strlist.h ../include/utl_exprlist.h \
- ../include/ast_generator.h ../include/util.h ../include/utl_stack.h \
- ../include/utl_idlist.h ../include/utl_exceptlist.h \
- ../include/utl_namelist.h ../include/utl_labellist.h \
- ../include/utl_decllist.h ../include/idl_global.h \
- ../include/utl_error.h ../include/utl_indenter.h \
- ../include/idl_extern.h ../include/fe_extern.h ../include/be_extern.h \
- ../include/drv_extern.h ../include/ast_extern.h \
- ../include/nr_extern.h ../include/global_extern.h
-
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/TAO_IDL/ast/ast_argument.cpp b/TAO/TAO_IDL/ast/ast_argument.cpp
deleted file mode 100644
index 3e1b2e34cd0..00000000000
--- a/TAO/TAO_IDL/ast/ast_argument.cpp
+++ /dev/null
@@ -1,152 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-/*
- * ast_argument.cc - Implementation of class AST_Argument.cc
- *
- * AST_Argument nodes denote arguments to an operation. They
- * are AST_Fields with directions. Thus, they have a name
- * (an UTL_ScopedName) and a type (a subclass of AST_Type).
- * Additionally they have a direction field which takes values
- * from the enum AST_Argument::Direction.
- */
-
-#include	"idl.h"
-#include	"idl_extern.h"
-
-/*
- * Static functions
- */
-
-/*
- * Convert an enum Direction value to a char *
- */
-static char *
-direction_to_string(AST_Argument::Direction d)
-{
-  switch (d) {
-  case AST_Argument::dir_IN:
-    return "in";
-  case AST_Argument::dir_OUT:
-    return "out";
-  case AST_Argument::dir_INOUT:
-    return "inout";
-  }
-  return NULL;
-}
-
-/*
- * Constructor(s) and destructor
- */
-
-AST_Argument::AST_Argument()
-	    : pd_direction(dir_IN)
-{
-}
-
-AST_Argument::AST_Argument(Direction d, AST_Type *ft, UTL_ScopedName *n,
-			   UTL_StrList *p)
-	   : AST_Field(AST_Decl::NT_argument, ft, n, p),
-	     AST_Decl(AST_Decl::NT_argument, n, p),
-	     pd_direction(d)
-{
-}
-
-/*
- * Private operations
- */
-
-/*
- * Public operations
- */
-
-/*
- * Redefinition of inherited virtual operations
- */
-
-/*
- * Dump this AST_Argument node to the ostream o
- */
-void
-AST_Argument::dump(ostream &o)
-{
-  o << direction_to_string(pd_direction) << " ";
-  AST_Field::dump(o);
-}
-
-/*
- * Data accessors
- */
-
-AST_Argument::Direction
-AST_Argument::direction()
-{
-  return pd_direction;
-}
-
-/*
- * Narrowing operations
- */
-IMPL_NARROW_METHODS1(AST_Argument, AST_Field)
-IMPL_NARROW_FROM_DECL(AST_Argument)
diff --git a/TAO/TAO_IDL/ast/ast_array.cpp b/TAO/TAO_IDL/ast/ast_array.cpp
deleted file mode 100644
index 9464f1f4a2d..00000000000
--- a/TAO/TAO_IDL/ast/ast_array.cpp
+++ /dev/null
@@ -1,187 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-/*
- * ast_array.cc - Implementation of class AST_Array
- *
- * AST_Array nodes denote array type and field modifiers.
- * AST_Array nodes have a list of dimensions (a UTL_ExprList)
- * a count of the number of dimensions and a base type (a
- * subtype of AST_ConcreteType. This means that we cannot have
- * arrays of AST_Interfaces???
- */
-
-#include	"idl.h"
-#include	"idl_extern.h"
-      
-/*
- * Constructor(s) and destructor
- */
-AST_Array::AST_Array()
-	 : pd_n_dims(0), 
-	   pd_dims(NULL),
-	   pd_base_type(NULL)
-{
-}
-
-AST_Array::AST_Array(UTL_ScopedName *n, unsigned long nd, UTL_ExprList *ds)
-	 : pd_n_dims(nd), pd_base_type(NULL),
-	   AST_Decl(AST_Decl::NT_array, n, NULL)
-{
-  pd_dims = compute_dims(ds, nd);
-}
-
-/*
- * Private operations
- */
-
-/*
- * Compute how many dimensions there are and collect their expressions
- * into an array
- */
-AST_Expression **
-AST_Array::compute_dims(UTL_ExprList *ds, unsigned long nds)
-{
-  AST_Expression	**result;
-  UTL_ExprlistActiveIterator *l;
-  unsigned long		i;
-
-  if (ds == NULL)
-    return NULL;
-
-  result = new AST_Expression *[nds];
-  l      = new UTL_ExprlistActiveIterator(ds);
-
-  for (i = 0; !(l->is_done()) && i < nds; l->next(), i++)
-    result[i] = l->item();
-  delete l;
-  return result;
-}
-
-/*
- * Public operations
- */
-
-
-/*
- * Redefinition of inherited virtual operations
- */
-
-/*
- * Dump this AST_Array node to the ostream o
- */
-void
-AST_Array::dump(ostream &o)
-{
-  unsigned long	i;
-
-  pd_base_type->dump(o);
-  o << " ";
-  local_name()->dump(o);
-  for (i = 0; i < pd_n_dims; i++) {
-    o << "[";
-    pd_dims[i]->dump(o);
-    o << "]";
-  }
-}
-
-/*
- * Data accessors
- */
-unsigned long 
-AST_Array::n_dims()
-{
-  return pd_n_dims;
-}
-
-AST_Expression **
-AST_Array::dims()
-{
-  return pd_dims;
-}
-
-AST_Type *
-AST_Array::base_type()
-{
-  return pd_base_type;
-}
-
-void 
-AST_Array::set_base_type(AST_Type *nbt)
-{
-  pd_base_type = nbt;
-}
-
-void
-AST_Array::set_dims(AST_Expression **ds, unsigned long nds)
-{
-    pd_dims = ds;
-    pd_n_dims = nds;
-}
-
-/*
- * Narrowing methods
- */
-IMPL_NARROW_METHODS1(AST_Array, AST_ConcreteType)
-IMPL_NARROW_FROM_DECL(AST_Array)
diff --git a/TAO/TAO_IDL/ast/ast_attribute.cpp b/TAO/TAO_IDL/ast/ast_attribute.cpp
deleted file mode 100644
index 57019823810..00000000000
--- a/TAO/TAO_IDL/ast/ast_attribute.cpp
+++ /dev/null
@@ -1,132 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-/*
- * ast_attribute.cc - Implementation of class AST_Attribute.cc
- *
- * AST_Attribute nodes denote IDL attribute declarations.
- * AST_Attribute nodes are AST_Fields with a readonly indication.
- * Hence they have a name (an UTL_ScopedName), a type (a subtype
- * of AST_Type) and a boolean indicating whether the attribute is
- * readonly.
- */
-
-#include	"idl.h"
-#include	"idl_extern.h"
-
-/*
- * Constructor(s) and destructor
- */
-AST_Attribute::AST_Attribute()
-	     : pd_readonly(I_TRUE)
-{
-}
-
-AST_Attribute::AST_Attribute(idl_bool ro,
-			     AST_Type *ft,
-			     UTL_ScopedName *n,
-			     UTL_StrList *p)
-	     : AST_Field(AST_Decl::NT_attr, ft, n, p),
-	       AST_Decl(AST_Decl::NT_attr, n, p),
-	       pd_readonly(ro)
-{
-}
-
-/*
- * Private operations
- */
-
-/*
- * Public operations
- */
-
-/*
- * Redefinition of inherited virtual operations
- */
-
-/*
- * Dump this AST_Attribute to the ostream o
- */
-void
-AST_Attribute::dump(ostream &o)
-{
-  o << (pd_readonly == I_TRUE ? "readonly" : "") << " attribute ";
-  AST_Field::dump(o);
-}
-
-/*
- * Data accessors
- */
-
-idl_bool
-AST_Attribute::readonly()
-{
-  return pd_readonly;
-}
-
-/*
- * Narrowing methods
- */
-IMPL_NARROW_METHODS1(AST_Attribute, AST_Field)
-IMPL_NARROW_FROM_DECL(AST_Attribute)
diff --git a/TAO/TAO_IDL/ast/ast_check.cpp b/TAO/TAO_IDL/ast/ast_check.cpp
deleted file mode 100644
index a8e3677cceb..00000000000
--- a/TAO/TAO_IDL/ast/ast_check.cpp
+++ /dev/null
@@ -1,138 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-/*
- * ast_check.cc - Check AST nodes representing fwd declared interfaces
- *		  after parse of AST is completed.
- *
- * The check ensures that for every forward declared interface we also
- * saw a full definition of that interface.
- */
-
-#include	"idl.h"
-#include	"idl_extern.h"
-
-/*
- * Static storage for remembering nodes
- */
-static AST_InterfaceFwd	**ast_fwds = NULL;
-static long		ast_n_fwds_used = 0;
-static long		ast_n_fwds_alloc = 0;
-
-#undef	INCREMENT
-#define	INCREMENT	64
-
-/*
- * Store a node representing a forward declared interface
- */
-void
-AST_record_fwd_interface(AST_InterfaceFwd *n)
-{
-  AST_InterfaceFwd	**o_ast_fwds;
-  long			o_ast_n_fwds_alloc;
-  long			i;
-
-  /*
-   * Make sure there's space to store one more
-   */
-  if (ast_n_fwds_used == ast_n_fwds_alloc) {
-    if (ast_n_fwds_alloc == 0) {
-      ast_n_fwds_alloc = INCREMENT;
-      ast_fwds = new AST_InterfaceFwd *[ast_n_fwds_alloc];
-    } else {
-      o_ast_fwds = ast_fwds;
-      o_ast_n_fwds_alloc = ast_n_fwds_alloc;
-
-      ast_n_fwds_alloc += INCREMENT;
-      ast_fwds = new AST_InterfaceFwd *[ast_n_fwds_alloc];
-
-      for (i = 0; i < o_ast_n_fwds_alloc; i++)
-        ast_fwds[i] = o_ast_fwds[i];
-
-      delete o_ast_fwds;
-    }
-  }
-  /*
-   * Insert new node
-   */
-  ast_fwds[ast_n_fwds_used++] = n;
-}
-
-/*
- * Check that all forward declared interfaces were also defined
- */
-void
-AST_check_fwd_interface()
-{
-  long			i;
-  AST_InterfaceFwd	*d;
-  AST_Interface		*itf;
-
-  for (i = 0; i < ast_n_fwds_used; i++) {
-    d = ast_fwds[i];
-    itf = d->full_definition();
-    if (!(itf->is_defined()))
-      idl_global->err()->fwd_decl_not_defined(itf);
-  }
-}
diff --git a/TAO/TAO_IDL/ast/ast_concrete_type.cpp b/TAO/TAO_IDL/ast/ast_concrete_type.cpp
deleted file mode 100644
index 44f010e19df..00000000000
--- a/TAO/TAO_IDL/ast/ast_concrete_type.cpp
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-/*
- * ast_concrete_type.cc - Implementation of class AST_ConcreteType
- *
- * AST_ConcreteType nodes denote all non-interface types of IDL.
- * They are AST_Type nodes.
- */
-
-#include	"idl.h"
-#include	"idl_extern.h"
-
-/*
- * Constructor(s) and destructor
- */
-AST_ConcreteType::AST_ConcreteType()
-{
-}
-
-AST_ConcreteType::AST_ConcreteType(AST_Decl::NodeType nt, UTL_ScopedName *n,
-				     UTL_StrList *p)
-		 : AST_Decl(nt, n, p)
-{
-}
-
-/*
- * Private operations
- */
-
-/*
- * Public operations
- */
-
-/*
- * Redefinition of inherited virtual operations
- */
-
-/*
- * Narrowing methods
- */
-IMPL_NARROW_METHODS1(AST_ConcreteType, AST_Type)
-IMPL_NARROW_FROM_DECL(AST_ConcreteType)
diff --git a/TAO/TAO_IDL/ast/ast_constant.cpp b/TAO/TAO_IDL/ast/ast_constant.cpp
deleted file mode 100644
index d17bd242159..00000000000
--- a/TAO/TAO_IDL/ast/ast_constant.cpp
+++ /dev/null
@@ -1,210 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-/*
- * ast_constant.cc - Implementation of class AST_Constant
- *
- * AST_Constant nodes denote IDL constant declarations.
- * AST_Constants have a value (an AST_Expression) and a value type
- * (a value from the enum AST_Expression::ExprType).
- * AST_Constant has two constructors, one for use in creating constants
- * and the other for use in creating enumerators (see the class
- * AST_EnumVal)
- */
-
-#include	"idl.h"
-#include	"idl_extern.h"
-
-/*
- * Static functions
- */
-
-/*
- * Convert a value from the enum AST_Expression::ExprType to a char *
- */
-static char *
-exprtype_to_string(AST_Expression::ExprType et)
-{
-  switch (et) {
-  case AST_Expression::EV_short:
-    return "short";
-  case AST_Expression::EV_ushort:
-    return "unsigned short";
-  case AST_Expression::EV_long:
-    return "long";
-  case AST_Expression::EV_ulong:
-    return "unsigned long";
-  case AST_Expression::EV_float:
-    return "float";
-  case AST_Expression::EV_double:
-    return "double";
-  case AST_Expression::EV_char:
-    return "char";
-  case AST_Expression::EV_octet:
-    return "octet";
-  case AST_Expression::EV_bool:
-    return "boolean";
-  case AST_Expression::EV_string:
-    return "string";
-  case AST_Expression::EV_any:
-    return "any";
-  case AST_Expression::EV_void:
-    return "void";
-  case AST_Expression::EV_none:
-    return "none";
-  case AST_Expression::EV_wstring:
-  case AST_Expression::EV_wchar:
-  case AST_Expression::EV_longdouble:
-  case AST_Expression::EV_ulonglong:
-  case AST_Expression::EV_longlong:
-    return NULL;
-  }
-  return NULL;
-}
-
-/*
- * Constructor(s) and destructor
- */
-
-/*
- * Default constructor
- */
-AST_Constant::AST_Constant()
-	    : pd_constant_value(NULL), pd_et(AST_Expression::EV_none)
-{
-}
-
-/*
- * Used in constructing AST_EnumVal nodes
- */
-AST_Constant::AST_Constant(AST_Expression::ExprType t,
-			   AST_Decl::NodeType nt,
-			   AST_Expression *v,
-			   UTL_ScopedName *n,
-			   UTL_StrList *p)
-	    : AST_Decl(nt, n, p),
-	      pd_constant_value(idl_global->gen()->create_expr(v, t)),
-	      pd_et(t)
-{
-}
-
-/*
- * Used when constructing AST_Constant nodes
- */
-AST_Constant::AST_Constant(AST_Expression::ExprType t,
-			   AST_Expression *v,
-			   UTL_ScopedName *n,
-			   UTL_StrList *p)
-	    : AST_Decl(AST_Decl::NT_const, n, p),
-	      pd_constant_value(idl_global->gen()->create_expr(v, t)),
-	      pd_et(t)
-{
-}
-
-/*
- * Private operations
- */
-
-/*
- * Public operations
- */
-
-
-/*
- * Redefinition of inherited virtual operations
- */
-
-/*
- * Dump this AST_Constant node to the ostream o
- */
-void
-AST_Constant::dump(ostream &o)
-{
-  o << "const " << exprtype_to_string(pd_et) << " ";
-  local_name()->dump(o);
-  o << " = ";
-  pd_constant_value->dump(o);
-}
-
-/*
- * Data accessors
- */
-
-AST_Expression *
-AST_Constant::constant_value()
-{
-  return pd_constant_value;
-}
-
-AST_Expression::ExprType
-AST_Constant::et()
-{
-  return pd_et;
-}
-
-/*
- * Narrowing methods
- */
-IMPL_NARROW_METHODS1(AST_Constant, AST_Decl)
-IMPL_NARROW_FROM_DECL(AST_Constant)
diff --git a/TAO/TAO_IDL/ast/ast_decl.cpp b/TAO/TAO_IDL/ast/ast_decl.cpp
deleted file mode 100644
index b7d376a3576..00000000000
--- a/TAO/TAO_IDL/ast/ast_decl.cpp
+++ /dev/null
@@ -1,312 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-/*
- * ast_decl.cc - Implementation of class AST_Decl
- *
- * AST_Decl is the base class for all AST nodes except AST_Expression.
- * AST_Decls have a node type (a value from the enum AST_Decl::NodeType)
- * a name (a UTL_ScopedName) and a list of pragmas (a UTL_StrList).
- * Additionally AST_Decl nodes record the scope of definition, the
- * file name in which they were defined, the line on which they were
- * defined in that file, and a boolean denoting whether this is the
- * main file or an #include'd file.
- */
-
-#include	"idl.h"
-#include	"idl_extern.h"
-
-/*
- * Constructor(s) and destructor
- */
-
-AST_Decl::AST_Decl()
-  : pd_imported(I_FALSE),
-    pd_in_main_file(I_FALSE),
-    pd_defined_in(NULL),
-    pd_node_type(NT_module),
-    pd_line(-1),
-    pd_file_name(NULL),
-    pd_name(NULL),
-    pd_local_name(NULL),
-    pd_pragmas(NULL),
-    pd_added(I_FALSE)
-{
-}
-
-AST_Decl::AST_Decl(NodeType nt, UTL_ScopedName *n, UTL_StrList *p)
-  : pd_imported(idl_global->imported()),
-    pd_in_main_file(idl_global->in_main_file()),
-    pd_defined_in(idl_global->scopes()->depth() > 0
-		  ? idl_global->scopes()->top()
-		  : 0),
-    pd_node_type(nt),
-    pd_line(idl_global->lineno()),
-    pd_file_name(idl_global->filename()),
-    pd_local_name(n == NULL ? 0 : n->last_component()),
-    pd_pragmas(p),
-    pd_added(I_FALSE)
-{
-  compute_full_name (n);
-}
-
-/*
- * Private operations
- */
-
-/*
- * Compute the full scoped name of an AST node
- */
-void
-AST_Decl::compute_full_name(UTL_ScopedName *n)
-{
-  UTL_ScopedName	*cn = NULL;
-  AST_Decl		*d  = NULL;
-
-  /*
-   * Initialize this name to NULL
-   */
-  pd_name = NULL;
-  /*
-   * Global scope?
-   */
-  if (defined_in() == NULL) {
-    pd_name = n;
-    return;
-  }
-  /*
-   * OK, not global. So copy name of containing scope, then
-   * smash last cdr of copy with new component
-   */
-  d = ScopeAsDecl(defined_in());
-  if (d != NULL)
-    cn = d->name();
-  if (cn != NULL)
-    pd_name = (UTL_ScopedName *) cn->copy();
-  if (pd_name == NULL)
-    pd_name = new UTL_ScopedName(local_name(), NULL);
-  else
-    pd_name->nconc(new UTL_ScopedName(local_name(), NULL));
-}
-
-/*
- * Public operations
- */
-
-/*
- * Return TRUE if one of my ancestor scopes is "s"
- * and FALSE otherwise
- */
-idl_bool
-AST_Decl::has_ancestor(AST_Decl *s)
-{
-  if (this == s)
-    return I_TRUE;
-  if (pd_defined_in == NULL)
-    return I_FALSE;
-  return ScopeAsDecl(pd_defined_in)->has_ancestor(s);
-}    
-
-/*
- * Dump this AST_Decl to the ostream o
- */
-void
-AST_Decl::dump(ostream &o)
-{
-  pd_local_name->dump(o);
-}
-
-/*
- * Redefinition of inherited virtual operations
- */
-
-/*
- * Data accessors
- */
-
-idl_bool
-AST_Decl::imported()
-{
-  return pd_imported;
-}
-
-void
-AST_Decl::set_imported(idl_bool is_it)
-{
-  pd_imported = is_it;
-}
-
-idl_bool
-AST_Decl::in_main_file()
-{
-  return pd_in_main_file;
-}
-
-void
-AST_Decl::set_in_main_file(idl_bool is_it)
-{
-  pd_in_main_file = is_it;
-}
-
-idl_bool
-AST_Decl::added()
-{
-  return pd_added;
-}
-
-void
-AST_Decl::set_added(idl_bool is_it)
-{
-  pd_added = is_it;
-}
-
-UTL_Scope *
-AST_Decl::defined_in()
-{
-  return pd_defined_in;
-}
-
-void
-AST_Decl::set_defined_in(UTL_Scope *s)
-{
-  pd_defined_in = s;
-}
-
-AST_Decl::NodeType 
-AST_Decl::node_type()
-{
-  return pd_node_type;
-}
-
-long
-AST_Decl::line()
-{
-  return pd_line;
-}
-
-void
-AST_Decl::set_line(long l)
-{
-  pd_line = l;
-}
-
-String *
-AST_Decl::file_name()
-{
-  return pd_file_name;
-}
-
-void
-AST_Decl::set_file_name(String *s)
-{
-  pd_file_name = s;
-}
-
-UTL_ScopedName *
-AST_Decl::name()
-{
-  return pd_name;
-}
-
-void
-AST_Decl::set_name(UTL_ScopedName *n)
-{
-  pd_name = n;
-  if (n != NULL)
-    pd_local_name = n->last_component();
-}
-
-Identifier *
-AST_Decl::local_name()
-{
-  return pd_local_name;
-}
-
-void
-AST_Decl::add_pragmas(UTL_StrList *p)
-{
-  if (p != NULL) {
-    if (pd_pragmas != NULL)
-      pd_pragmas->nconc(p);
-    else
-      pd_pragmas = p;
-  }
-}
-
-UTL_StrList *
-AST_Decl::pragmas()
-{
-  return pd_pragmas;
-}
-
-/*
- * Narrowing methods for AST_Decl
- */
-IMPL_NARROW_METHODS0(AST_Decl)
-IMPL_NARROW_FROM_DECL(AST_Decl)
-
-/*
-** Narrowing methods for COMMON_Base
-*/
-IMPL_NARROW_METHODS0(COMMON_Base)
diff --git a/TAO/TAO_IDL/ast/ast_enum.cpp b/TAO/TAO_IDL/ast/ast_enum.cpp
deleted file mode 100644
index e77fdece3cd..00000000000
--- a/TAO/TAO_IDL/ast/ast_enum.cpp
+++ /dev/null
@@ -1,253 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-/*
- * ast_enum.cc - Implementation of class AST_Enum
- *
- * AST_Enum nodes denote IDL enum declarations.
- * AST_Enums are a subclass of AST_ConcreteType and UTL_Scope.
- * They have a counter denoting the next value to be assigned to
- * an enumerator, and a name (a UTL_ScopedName).
- */
-
-#include	"idl.h"
-#include	"idl_extern.h"
-
-/*
- * Constructor(s) and destructor
- */
-AST_Enum::AST_Enum()
-	: pd_enum_counter(0)
-{
-}
-
-AST_Enum::AST_Enum(UTL_ScopedName *n, UTL_StrList *p)
-       : AST_Decl(AST_Decl::NT_enum, n, p),
-	 UTL_Scope(AST_Decl::NT_enum),
-	 pd_enum_counter(0)
-{
-}
-
-/*
- * Private operations
- */
-
-/*
- * Public operations
- */
-
-/*
- * Look up an enumerator by the value of the supplied expression
- */
-AST_EnumVal *
-AST_Enum::lookup_by_value(const AST_Expression *v)
-{
-  UTL_ScopeActiveIterator *iter;
-  AST_EnumVal		    *item;
-  AST_Decl		  *i;
-
-  iter = new UTL_ScopeActiveIterator(this, IK_decls);
-
-  while (!iter->is_done()) {
-    i = iter->item();
-    item = AST_EnumVal::narrow_from_decl(i);
-    if (item->constant_value() == v) {
-      delete iter;
-      return item;
-    }
-    iter->next();
-  }
-  delete iter;
-  return NULL;
-}
-
-/*
- * Compute the value to be assigned to the next enumerator. Bump the
- * counter
- */
-unsigned long
-AST_Enum::next_enum_val()
-{
-  unsigned long i = pd_enum_counter++;
-
-  return i;
-}
-
-/*
- * Static helper functions
- */
-
-/*
- * Modify scoped name of an enumval so that it is scoped inside the scope
- * in which the enum is defined and not inside the enum itself
- */
-static UTL_ScopedName *
-munge_name_for_enumval(UTL_ScopedName *n, Identifier *last_component)
-{
-  long		  l	= n->length();
-  UTL_ScopedName *hold	= n;
-
-  /*
-   * last three components are:
-   * - scope in which enum is defined
-   * - scope for enum
-   * - name of enumval
-   *
-   * We want to stop cdr'ing down the list when the head of the
-   * list is at the name for the scope in which the enum is defined
-   */
-  while (l > 3) {
-    l--;
-    n = (UTL_ScopedName *) n->tail();
-  }
-
-  n->set_tail(new UTL_IdList(last_component, NULL));
-
-  return hold;
-}
-  
-/*
- * Redefinition of inherited virtual operations
- */
-
-/*
- * Add an AST_EnumVal node to this scope
- */
-AST_EnumVal *AST_Enum::fe_add_enum_val(AST_EnumVal *t)
-{
-  AST_Decl *d;
-  AST_EnumVal *t1 = NULL;
-
-  if (t != NULL) {
-    t1 = idl_global->gen()->create_enum_val
-      (t->constant_value()->coerce(AST_Expression::EV_ulong)->u.ulval, 
-       t->name(), t->pragmas());
-    t->set_name(munge_name_for_enumval(t->name(), t->local_name()));
-    t1->set_name(munge_name_for_enumval(t1->name(), t1->local_name()));
-  }
-  /*
-   * Already defined and cannot be redefined? Or already used?
-   */
-  if ((d = lookup_for_add(t, I_FALSE)) != NULL) {
-    if (!can_be_redefined(d)) {
-      idl_global->err()->error3(UTL_Error::EIDL_REDEF, t, this, d);
-      return NULL;
-    }
-    if (referenced(d)) {
-      idl_global->err()->error3(UTL_Error::EIDL_DEF_USE, t, this, d);
-      return NULL;
-    }
-    if (t->has_ancestor(d)) {
-      idl_global->err()->redefinition_in_scope(t, d);
-      return NULL;
-    }
-  }
-  /*
-   * Add it to scope
-   */
-  add_to_scope(t);
-  /*
-   * Add it to set of locally referenced symbols
-   */
-  add_to_referenced(t, I_FALSE);
-  /*
-   * Add it to enclosing scope
-   */
-  idl_global->scopes()->next_to_top()->fe_add_enum_val(t1);
-
-  return t;
-}
-
-/*
- * Dump this AST_Enum to the ostream o
- */
-void
-AST_Enum::dump(ostream &o)
-{
-  UTL_ScopeActiveIterator *i = new UTL_ScopeActiveIterator(this, IK_decls);
-  AST_Decl		    *d;
-
-  o << "enum ";
-  local_name()->dump(o);
-  o << " {\n";
-
-  while (!(i->is_done())) {
-    d = i->item();
-    d->local_name()->dump(o);
-    i->next();
-    if (!(i->is_done()))
-      o << ", ";
-  }
-  delete i;
-
-  idl_global->indent()->skip_to(o);
-  o << "}";
-}
-
-/*
- * Narrowing methods
- */
-IMPL_NARROW_METHODS2(AST_Enum, AST_ConcreteType, UTL_Scope)
-IMPL_NARROW_FROM_DECL(AST_Enum)
-IMPL_NARROW_FROM_SCOPE(AST_Enum)
diff --git a/TAO/TAO_IDL/ast/ast_enum_val.cpp b/TAO/TAO_IDL/ast/ast_enum_val.cpp
deleted file mode 100644
index e8b263d1b2b..00000000000
--- a/TAO/TAO_IDL/ast/ast_enum_val.cpp
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-/*
- * ast_enum_val.cc - Implementation of class AST_EnumVal
- *
- * AST_EnumVals denote IDL enumerator declarations
- * AST_EnumVals are a subclass of AST_Constant
- * AST_EnumVals have no additional fields
- */
-
-#include	"idl.h"
-#include	"idl_extern.h"
-
-/*
- * Constructor(s) and destructor
- */
-AST_EnumVal::AST_EnumVal()
-{
-}
-
-AST_EnumVal::AST_EnumVal(unsigned long v, UTL_ScopedName *n, UTL_StrList *p)
-	    : AST_Constant(AST_Expression::EV_ulong,
-			   AST_Decl::NT_enum_val,
-			   new AST_Expression(v), n, p),
-	      AST_Decl(AST_Decl::NT_enum_val, n, p)
-{
-}
-
-/*
- * Private operations
- */
-
-/*
- * Public operations
- */
-
-
-/*
- * Redefinition of inherited virtual operations
- */
-
-/*
- * Dump this AST_EnumVal to the ostream o
- */
-void
-AST_EnumVal::dump(ostream &o)
-{
-  AST_Constant::dump(o);
-}
-
-/*
- * Narrowing methods
- */
-IMPL_NARROW_METHODS1(AST_EnumVal, AST_Constant)
-IMPL_NARROW_FROM_DECL(AST_EnumVal)
diff --git a/TAO/TAO_IDL/ast/ast_exception.cpp b/TAO/TAO_IDL/ast/ast_exception.cpp
deleted file mode 100644
index a465674521d..00000000000
--- a/TAO/TAO_IDL/ast/ast_exception.cpp
+++ /dev/null
@@ -1,304 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-/*
- * ast_exception.cc - Implementation of class AST_Exception
- *
- * AST_Exceptions denote IDL exception declarations
- * AST_Exceptions are a subclass of AST_Decl (they are not types!)
- * and of UTL_Scope
- */
-
-#include	"idl.h"
-#include	"idl_extern.h"
-
-/*
- * Constructor(s) and destructor
- */
-AST_Exception::AST_Exception()
-{
-}
-
-AST_Exception::AST_Exception(UTL_ScopedName *n, UTL_StrList *p)
-	     : AST_Structure(AST_Decl::NT_except, n, p)
-{
-}
-
-/*
- * Private operations
- */
-
-/*
- * Public operations
- */
-
-
-/*
- * Redefinition of inherited virtual operations
- */
-
-/*
- * Add this AST_Field node to the current scope
- */
-AST_Field *AST_Exception::fe_add_field(AST_Field *t)
-{
-  AST_Decl *d;
-
-  /*
-   * Already defined and cannot be redefined? Or already used?
-   */
-  if ((d = lookup_for_add(t, I_FALSE)) != NULL) {
-    if (!can_be_redefined(d)) {
-      idl_global->err()->error3(UTL_Error::EIDL_REDEF, t, this, d);
-      return NULL;
-    }
-    if (referenced(d)) {
-      idl_global->err()->error3(UTL_Error::EIDL_DEF_USE, t, this, d);
-      return NULL;
-    }
-    if (t->has_ancestor(d)) {
-      idl_global->err()->redefinition_in_scope(t, d);
-      return NULL;
-    }
-  }
-  /*
-   * Add it to scope
-   */
-  add_to_scope(t);
-  /*
-   * Add it to set of locally referenced symbols
-   */
-  add_to_referenced(t, I_FALSE);
-
-  return t;
-}
-
-/*
- * Add this AST_Union (manifest type declaration) to the current scope
- */
-AST_Union *AST_Exception::fe_add_union(AST_Union *t)
-{
-  AST_Decl *d;
-
-  /*
-   * Already defined and cannot be redefined? Or already used?
-   */
-  if ((d = lookup_for_add(t, I_FALSE)) != NULL) {
-    if (!can_be_redefined(d)) {
-      idl_global->err()->error3(UTL_Error::EIDL_REDEF, t, this, d);
-      return NULL;
-    }
-    if (referenced(d)) {
-      idl_global->err()->error3(UTL_Error::EIDL_DEF_USE, t, this, d);
-      return NULL;
-    }
-    if (t->has_ancestor(d)) {
-      idl_global->err()->redefinition_in_scope(t, d);
-      return NULL;
-    }
-  }
-  /*
-   * Add it to local types
-   */
-  add_to_local_types(t);
-  /*
-   * Add it to set of locally referenced symbols
-   */
-  add_to_referenced(t, I_FALSE);
-
-  return t;
-}
-
-/*
- * Add this AST_Structure (manifest type declaration) to the current
- * scope
- */
-AST_Structure *AST_Exception::fe_add_structure(AST_Structure *t)
-{
-  AST_Decl *d;
-
-  /*
-   * Already defined and cannot be redefined? Or already used?
-   */
-  if ((d = lookup_for_add(t, I_FALSE)) != NULL) {
-    if (!can_be_redefined(d)) {
-      idl_global->err()->error2(UTL_Error::EIDL_REDEF, t, this);
-      return NULL;
-    }
-    if (referenced(d)) {
-      idl_global->err()->error3(UTL_Error::EIDL_DEF_USE, t, this, d);
-      return NULL;
-    }
-    if (t->has_ancestor(d)) {
-      idl_global->err()->redefinition_in_scope(t, d);
-      return NULL;
-    }
-  }
-  /*
-   * Add it to local types
-   */
-  add_to_local_types(t);
-  /*
-   * Add it to set of locally referenced symbols
-   */
-  add_to_referenced(t, I_FALSE);
-
-  return t;
-}
-
-/*
- * Add this AST_Enum (manifest type declaration) to the current scope
- */
-AST_Enum *AST_Exception::fe_add_enum(AST_Enum *t)
-{
-  AST_Decl *d;
-
-  /*
-   * Already defined and cannot be redefined? Or already used?
-   */
-  if ((d = lookup_for_add(t, I_FALSE)) != NULL) {
-    if (!can_be_redefined(d)) {
-      idl_global->err()->error3(UTL_Error::EIDL_REDEF, t, this, d);
-      return NULL;
-    }
-    if (referenced(d)) {
-      idl_global->err()->error3(UTL_Error::EIDL_DEF_USE, t, this, d);
-      return NULL;
-    }
-    if (t->has_ancestor(d)) {
-      idl_global->err()->redefinition_in_scope(t, d);
-      return NULL;
-    }
-  }
-  /*
-   * Add it to local types
-   */
-  add_to_local_types(t);
-  /*
-   * Add it to set of locally referenced symbols
-   */
-  add_to_referenced(t, I_FALSE);
-
-  return t;
-}
-
-/*
- * Add this AST_EnumVal (enumerator declaration) to the current scope.
- * This is done to conform to the C++ scoping rules which declare
- * enumerators in the enclosing scope (in addition to declaring them
- * in the enum itself)
- */
-AST_EnumVal *AST_Exception::fe_add_enum_val(AST_EnumVal *t)
-{
-  AST_Decl *d;
-
-  /*
-   * Already defined and cannot be redefined? Or already used?
-   */
-  if ((d = lookup_for_add(t, I_FALSE)) != NULL) {
-    if (!can_be_redefined(d)) {
-      idl_global->err()->error3(UTL_Error::EIDL_REDEF, t, this, d);
-      return NULL;
-    }
-    if (referenced(d)) {
-      idl_global->err()->error3(UTL_Error::EIDL_DEF_USE, t, this, d);
-      return NULL;
-    }
-    if (t->has_ancestor(d)) {
-      idl_global->err()->redefinition_in_scope(t, d);
-      return NULL;
-    }
-  }
-  /*
-   * Add it to scope
-   */
-  add_to_scope(t);
-  /*
-   * Add it to set of locally referenced symbols
-   */
-  add_to_referenced(t, I_FALSE);
-
-  return t;
-}
-
-/*
- * Dump this AST_Exception node to the ostream o
- */
-void
-AST_Exception::dump(ostream &o)
-{
-  o << "exception ";
-  local_name()->dump(o);
-  o << " {\n";
-  UTL_Scope::dump(o);
-  idl_global->indent()->skip_to(o);
-  o << "}";
-}
-
-/*
- * Narrowing methods
- */
-IMPL_NARROW_METHODS1(AST_Exception, AST_Structure)
-IMPL_NARROW_FROM_DECL(AST_Exception)
-IMPL_NARROW_FROM_SCOPE(AST_Exception)
diff --git a/TAO/TAO_IDL/ast/ast_expression.cpp b/TAO/TAO_IDL/ast/ast_expression.cpp
deleted file mode 100644
index fd9d03fabbd..00000000000
--- a/TAO/TAO_IDL/ast/ast_expression.cpp
+++ /dev/null
@@ -1,1597 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-/* * ast_expression.cc - Implementation of class AST_Expression
- *
- * AST_Expression nodes denote IDL expressions used in the IDL input.
- */
-
-#include	"idl.h"
-#include	"idl_extern.h"
-
-#include	<limits.h>
-#include	<float.h>
-
-#undef	MAXCHAR
-#define MAXCHAR	128
-
-// Helper function to fill out the details of where this expression
-// is defined
-void
-AST_Expression::fill_definition_details()
-{
-  pd_defined_in = idl_global->scopes()->depth() > 0 
-    ? idl_global->scopes()->top()
-    : 0 ;
-  pd_line       = idl_global->lineno();
-  pd_file_name	= idl_global->filename();
-}
-
-/*
- * Constructor(s) and destructor
- */
-
-/*
- * An AST_Expression denoting a symbolic name
- */
-AST_Expression::AST_Expression(UTL_ScopedName *nm)
-	      : pd_ec(EC_symbol),
-		pd_ev(NULL),
-		pd_v1(NULL),
-		pd_v2(NULL),
-		pd_n(nm)
-{
-  fill_definition_details();
-}
-
-/*
- * An AST_Expression denoting a type coercion from another AST_Expression
- */
-AST_Expression::AST_Expression(AST_Expression *v, ExprType t)
-	      : pd_ec(EC_none),
-		pd_ev(NULL),
-		pd_v1(NULL),
-		pd_v2(NULL),
-		pd_n(NULL)
-{
-  fill_definition_details();
-
-  pd_ev = v->coerce(t);
-  if (pd_ev == NULL)
-    idl_global->err()->coercion_error(v, t);
-}
-
-/*
- * An AST_Expression denoting a binary expression combination from
- * two other AST_Expressions
- */
-AST_Expression::AST_Expression(ExprComb c, AST_Expression *ev1,
-			       AST_Expression *ev2)
-	      : pd_ec(c),
-		pd_ev(NULL),
-		pd_v1(ev1),
-		pd_v2(ev2),
-		pd_n(NULL)
-{
-  fill_definition_details();
-}
-
-/*
- * An AST_Expression denoting a short integer
- */
-AST_Expression::AST_Expression(short sv)
-	      : pd_ec(EC_none),
-		pd_ev(NULL),
-		pd_v1(NULL),
-		pd_v2(NULL),
-		pd_n(NULL)
-{
-  fill_definition_details();
-
-  pd_ev = new AST_ExprValue;
-  pd_ev->et = EV_short;
-  pd_ev->u.sval = sv;
-}
-
-/*
- * An AST_Expression denoting an unsigned short integer
- */
-AST_Expression::AST_Expression(unsigned short usv)
-	      : pd_ec(EC_none),
-		pd_ev(NULL),
-		pd_v1(NULL),
-		pd_v2(NULL),
-		pd_n(NULL)
-{
-  fill_definition_details();
-
-  pd_ev = new AST_ExprValue;
-  pd_ev->et = EV_ushort;
-  pd_ev->u.usval = usv;
-}
-
-/*
- * An AST_Expression denoting a long integer
- */
-AST_Expression::AST_Expression(long lv)
-	      : pd_ec(EC_none),
-		pd_ev(NULL),
-		pd_v1(NULL),
-		pd_v2(NULL),
-		pd_n(NULL)
-{
-  fill_definition_details();
-
-  pd_ev = new AST_ExprValue;
-  pd_ev->et = EV_long;
-  pd_ev->u.lval = lv;
-}
-
-/*
- * An AST_Expression denoting a long integer being used as a boolean
- */
-AST_Expression::AST_Expression(long lv, ExprType t)
-	      : pd_ec(EC_none),
-		pd_ev(NULL),
-		pd_v1(NULL),
-		pd_v2(NULL),
-		pd_n(NULL)
-{
-  fill_definition_details();
-
-  pd_ev = new AST_ExprValue;
-  pd_ev->et = t;
-  pd_ev->u.lval = lv;
-}
-
-/*
- * An AST_Expression denoting an unsigned long integer
- */
-AST_Expression::AST_Expression(unsigned long ulv)
-	      : pd_ec(EC_none),
-		pd_ev(NULL),
-		pd_v1(NULL),
-		pd_v2(NULL),
-		pd_n(NULL)
-{
-  fill_definition_details();
-
-  pd_ev = new AST_ExprValue;
-  pd_ev->et = EV_ulong;
-  pd_ev->u.ulval = ulv;
-}
-
-/* 
- * An AST_Expression denoting a 32-bit floating point number
- */
-AST_Expression::AST_Expression(float fv)
-	      : pd_ec(EC_none),
-		pd_ev(NULL),
-		pd_v1(NULL),
-		pd_v2(NULL),
-		pd_n(NULL)
-{
-  fill_definition_details();
-
-  pd_ev = new AST_ExprValue;
-  pd_ev->et = EV_float;
-  pd_ev->u.fval = fv;
-}
-
-/*
- * An AST_Expression denoting a 64-bit floating point number
- */
-AST_Expression::AST_Expression(double dv)
-	      : pd_ec(EC_none),
-		pd_ev(NULL),
-		pd_v1(NULL),
-		pd_v2(NULL),
-		pd_n(NULL)
-{
-  fill_definition_details();
-
-  pd_ev = new AST_ExprValue;
-  pd_ev->et = EV_double;
-  pd_ev->u.dval = dv;
-}
-
-/*
- * An AST_Expression denoting a character
- */
-AST_Expression::AST_Expression(char cv)
-	      : pd_ec(EC_none),
-		pd_ev(NULL),
-		pd_v1(NULL),
-		pd_v2(NULL),
-		pd_n(NULL)
-{
-  fill_definition_details();
-
-  pd_ev = new AST_ExprValue;
-  pd_ev->et = EV_char;
-  pd_ev->u.cval = cv;
-}
-
-/*
- * An AST_Expression denoting an octet (unsigned char)
- */
-AST_Expression::AST_Expression(unsigned char ov)
-	      : pd_ec(EC_none),
-		pd_ev(NULL),
-		pd_v1(NULL),
-		pd_v2(NULL),
-		pd_n(NULL)
-{
-  fill_definition_details();
-
-  pd_ev = new AST_ExprValue;
-  pd_ev->et = EV_octet;
-  pd_ev->u.oval = ov;
-}
-
-/*
- * An AST_Expression denotign a string (char * encapsulated as a String)
- */
-AST_Expression::AST_Expression(String *sv)
-	      : pd_ec(EC_none),
-		pd_ev(NULL),
-		pd_v1(NULL),
-		pd_v2(NULL),
-		pd_n(NULL)
-{
-  fill_definition_details();
-
-  pd_ev = new AST_ExprValue;
-  pd_ev->et = EV_string;
-  pd_ev->u.strval = sv;
-}
-
-/*
- * Static operations
- */
-
-/*
- * Perform the coercion from the given AST_ExprValue to the requested
- * ExprType. Return an AST_ExprValue if successful, NULL if failed.
- */
-static AST_Expression::AST_ExprValue *
-coerce_value(AST_Expression::AST_ExprValue *ev, AST_Expression::ExprType t)
-{
-  if (ev == NULL)
-    return NULL;
-
-  switch (t) {
-  case AST_Expression::EV_short:
-    switch (ev->et) {
-    case AST_Expression::EV_short:
-      return ev;
-    case AST_Expression::EV_ushort:
-      if (ev->u.usval > (unsigned short) SHRT_MAX)
-	return NULL;
-      ev->u.sval = (short) ev->u.usval;
-      ev->et = AST_Expression::EV_short;
-      return ev;
-    case AST_Expression::EV_long:
-      if (ev->u.lval > (long) SHRT_MAX || ev->u.lval < (long) -(SHRT_MAX))
-	return NULL;
-      ev->u.sval = (short) ev->u.lval;
-      ev->et = AST_Expression::EV_short;
-      return ev;
-    case AST_Expression::EV_ulong:
-      if (ev->u.ulval > (unsigned long) SHRT_MAX)
-	return NULL;
-      ev->u.sval = (short) ev->u.ulval;
-      ev->et = AST_Expression::EV_short;
-      return ev;
-    case AST_Expression::EV_bool:
-      ev->u.sval = (short) ev->u.bval;
-      ev->et = AST_Expression::EV_short;
-      return ev;
-    case AST_Expression::EV_float:
-      if (ev->u.fval > (float) SHRT_MAX || ev->u.fval < (float) -(SHRT_MAX))
-	return NULL;
-      ev->u.sval = (short) ev->u.fval;
-      ev->et = AST_Expression::EV_short;
-      return ev;
-    case AST_Expression::EV_double:
-      if (ev->u.dval > (double) SHRT_MAX || ev->u.dval < (double) -(SHRT_MAX))
-	return NULL;
-      ev->u.sval = (short) ev->u.dval;
-      ev->et = AST_Expression::EV_short;
-      return ev;
-    case AST_Expression::EV_char:
-      ev->u.sval = (short) ev->u.cval;
-      ev->et = AST_Expression::EV_short;
-      return ev;
-    case AST_Expression::EV_octet:
-      ev->u.sval = (short) ev->u.oval;
-      ev->et = AST_Expression::EV_short;
-      return ev;
-    case AST_Expression::EV_longlong:
-    case AST_Expression::EV_ulonglong:
-    case AST_Expression::EV_longdouble:
-    case AST_Expression::EV_wchar:
-    case AST_Expression::EV_string:
-    case AST_Expression::EV_wstring:
-    case AST_Expression::EV_any:
-    case AST_Expression::EV_void:
-    case AST_Expression::EV_none:
-      return NULL;
-    }
-  case AST_Expression::EV_ushort:
-    switch (ev->et) {
-    case AST_Expression::EV_short:
-      if (ev->u.sval < 0)
-	return NULL;
-      ev->u.usval = (unsigned short) ev->u.sval;
-      ev->et = AST_Expression::EV_ushort;
-      return ev;
-    case AST_Expression::EV_ushort:
-      return ev;
-    case AST_Expression::EV_long:
-      if (ev->u.lval > (long) (SHRT_MAX << 1) || ev->u.lval < 0)
-	return NULL;
-      ev->u.usval = (unsigned short) ev->u.lval;
-      ev->et = AST_Expression::EV_ushort;
-      return ev;
-    case AST_Expression::EV_ulong:
-      if (ev->u.ulval > (unsigned long) (SHRT_MAX << 1))
-	return NULL;
-      ev->u.usval = (unsigned short) ev->u.ulval;
-      ev->et = AST_Expression::EV_ushort;
-      return ev;
-    case AST_Expression::EV_bool:
-      ev->u.usval = (unsigned short) ev->u.bval;
-      ev->et = AST_Expression::EV_short;
-      return ev;
-    case AST_Expression::EV_float:
-      if (ev->u.fval < 0.0 || ev->u.fval > (float) (SHRT_MAX << 1))
-	return NULL;
-      ev->u.usval = (unsigned short) ev->u.fval;
-      ev->et = AST_Expression::EV_short;
-      return ev;
-    case AST_Expression::EV_double:
-      if (ev->u.dval < 0.0 || ev->u.dval > (double) (SHRT_MAX << 1))
-	return NULL;
-      ev->u.usval = (unsigned short) ev->u.dval;
-      ev->et = AST_Expression::EV_short;
-      return ev;
-    case AST_Expression::EV_char:
-      if ((signed char) ev->u.cval < 0)
-	return NULL;
-      ev->u.usval = (unsigned short) ev->u.cval;
-      ev->et = AST_Expression::EV_ushort;
-      return ev;
-    case AST_Expression::EV_octet:
-      ev->u.usval = (unsigned short) ev->u.oval;
-      ev->et = AST_Expression::EV_ushort;
-      return ev;
-    case AST_Expression::EV_longlong:
-    case AST_Expression::EV_ulonglong:
-    case AST_Expression::EV_longdouble:
-    case AST_Expression::EV_wchar:
-    case AST_Expression::EV_wstring:
-    case AST_Expression::EV_string:
-    case AST_Expression::EV_any:
-    case AST_Expression::EV_void:
-    case AST_Expression::EV_none:
-      return NULL;
-    }
-  case AST_Expression::EV_long:
-    switch (ev->et) {
-    case AST_Expression::EV_short:
-      ev->u.lval = (long) ev->u.sval;
-      ev->et = AST_Expression::EV_long;
-      return ev;
-    case AST_Expression::EV_ushort:
-      ev->u.lval = (long) ev->u.usval;
-      ev->et = AST_Expression::EV_long;
-      return ev;
-    case AST_Expression::EV_long:
-      return ev;
-    case AST_Expression::EV_ulong:
-      if (ev->u.ulval > (unsigned long) LONG_MAX)
-	return NULL;
-      ev->u.lval = (long) ev->u.ulval;
-      ev->et = AST_Expression::EV_long;
-      return ev;
-    case AST_Expression::EV_bool:
-      ev->u.lval = (long) ev->u.bval;
-      ev->et = AST_Expression::EV_long;
-      return ev;
-    case AST_Expression::EV_float:
-      if (ev->u.fval > (float) LONG_MAX || ev->u.fval < (float) -(LONG_MAX))
-	return NULL;
-      ev->u.lval = (long) ev->u.fval;
-      ev->et = AST_Expression::EV_long;
-      return ev;
-    case AST_Expression::EV_double:
-      if (ev->u.dval > (double) LONG_MAX || ev->u.dval < (double) -(LONG_MAX))
-	return NULL;
-      ev->u.lval = (long) ev->u.dval;
-      ev->et = AST_Expression::EV_long;
-      return ev;
-    case AST_Expression::EV_char:
-      ev->u.lval = (long) ev->u.cval;
-      ev->et = AST_Expression::EV_long;
-      return ev;
-    case AST_Expression::EV_octet:
-      ev->u.lval = (long) ev->u.oval;
-      ev->et = AST_Expression::EV_long;
-      return ev;
-    case AST_Expression::EV_longlong:
-    case AST_Expression::EV_ulonglong:
-    case AST_Expression::EV_longdouble:
-    case AST_Expression::EV_wchar:
-    case AST_Expression::EV_wstring:
-    case AST_Expression::EV_string:
-    case AST_Expression::EV_any:
-    case AST_Expression::EV_void:
-    case AST_Expression::EV_none:
-      return NULL;
-    }
-  case AST_Expression::EV_ulong:
-    switch (ev->et) {
-    case AST_Expression::EV_short:
-      if (ev->u.sval < 0)
-	return NULL;
-      ev->u.ulval = (unsigned long) ev->u.sval;
-      ev->et = AST_Expression::EV_ulong;
-      return ev;
-    case AST_Expression::EV_ushort:
-      ev->u.ulval = (unsigned long) ev->u.usval;
-      ev->et = AST_Expression::EV_ulong;
-      return ev;
-    case AST_Expression::EV_long:
-      if (ev->u.lval < 0)
-	return NULL;
-      ev->u.ulval = (unsigned long) ev->u.lval;
-      ev->et = AST_Expression::EV_ulong;
-      return ev;
-    case AST_Expression::EV_ulong:
-      return ev;
-    case AST_Expression::EV_bool:
-      ev->u.ulval = (unsigned long) ev->u.bval;
-      ev->et = AST_Expression::EV_ulong;
-      return ev;
-    case AST_Expression::EV_float:
-      if (ev->u.fval < 0.0 || ev->u.fval > (float) LONG_MAX)
-	return NULL;
-      ev->u.ulval = (unsigned long) ev->u.fval;
-      ev->et = AST_Expression::EV_ulong;
-      return ev;
-    case AST_Expression::EV_double:
-      if (ev->u.dval < 0.0 || ev->u.dval > (double) LONG_MAX)
-	return NULL;
-      ev->u.ulval = (unsigned long) ev->u.dval;
-      ev->et = AST_Expression::EV_ulong;
-      return ev;
-    case AST_Expression::EV_char:
-      if ((signed char) ev->u.cval < 0)
-	return NULL;
-      ev->u.ulval = (unsigned long) ev->u.cval;
-      ev->et = AST_Expression::EV_ulong;
-      return ev;
-    case AST_Expression::EV_octet:
-      ev->u.ulval = (unsigned long) ev->u.oval;
-      ev->et = AST_Expression::EV_ulong;
-      return ev;
-    case AST_Expression::EV_longlong:
-    case AST_Expression::EV_ulonglong:
-    case AST_Expression::EV_longdouble:
-    case AST_Expression::EV_wchar:
-    case AST_Expression::EV_wstring:
-    case AST_Expression::EV_string:
-    case AST_Expression::EV_any:
-    case AST_Expression::EV_void:
-    case AST_Expression::EV_none:
-      return NULL;
-    }
-  case AST_Expression::EV_bool:
-    switch (ev->et) {
-    case AST_Expression::EV_short:
-      ev->u.bval = (ev->u.sval == 0) ? I_FALSE : I_TRUE;
-      ev->et = AST_Expression::EV_bool;
-      return ev;
-    case AST_Expression::EV_ushort:
-      ev->u.bval = (ev->u.usval == 0) ? I_FALSE : I_TRUE;
-      ev->et = AST_Expression::EV_bool;
-      return ev;
-    case AST_Expression::EV_long:
-      ev->u.bval = (ev->u.lval == 0) ? I_FALSE : I_TRUE;
-      ev->et = AST_Expression::EV_bool;
-      return ev;
-    case AST_Expression::EV_ulong:
-      ev->u.bval = (ev->u.ulval == 0) ? I_FALSE : I_TRUE;
-      ev->et = AST_Expression::EV_bool;
-      return ev;
-    case AST_Expression::EV_bool:
-      return ev;
-    case AST_Expression::EV_float:
-      ev->u.bval = (ev->u.fval == 0.0) ? I_FALSE : I_TRUE;
-      ev->et = AST_Expression::EV_bool;
-      return ev;
-    case AST_Expression::EV_double:
-      ev->u.bval = (ev->u.dval == 0.0) ? I_FALSE : I_TRUE;
-      ev->et = AST_Expression::EV_bool;
-      return ev;
-    case AST_Expression::EV_char:
-      ev->u.bval = (ev->u.cval == 0) ? I_FALSE : I_TRUE;
-      ev->et = AST_Expression::EV_bool;
-      return ev;
-    case AST_Expression::EV_octet:
-      ev->u.bval = (ev->u.oval == 0) ? I_FALSE : I_TRUE;
-      ev->et = AST_Expression::EV_bool;
-      return ev;
-    case AST_Expression::EV_longlong:
-    case AST_Expression::EV_ulonglong:
-    case AST_Expression::EV_longdouble:
-    case AST_Expression::EV_wchar:
-    case AST_Expression::EV_wstring:
-    case AST_Expression::EV_string:
-    case AST_Expression::EV_any:
-    case AST_Expression::EV_void:
-    case AST_Expression::EV_none:
-      return NULL;
-    }
-  case AST_Expression::EV_float:
-    switch (ev->et) {
-    case AST_Expression::EV_short:
-      ev->u.fval = (float) ev->u.sval;
-      ev->et = AST_Expression::EV_float;
-      return ev;
-    case AST_Expression::EV_ushort:
-      ev->u.fval = (float) ev->u.usval;
-      ev->et = AST_Expression::EV_float;
-      return ev;
-    case AST_Expression::EV_long:
-      ev->u.fval = (float) ev->u.lval;
-      ev->et = AST_Expression::EV_float;
-      return ev;
-    case AST_Expression::EV_ulong:
-      ev->u.fval = (float) ev->u.ulval;
-      ev->et = AST_Expression::EV_float;
-      return ev;
-    case AST_Expression::EV_bool:
-      ev->u.fval = (float) ((ev->u.bval == I_TRUE) ? 1.0 : 0.0);
-      ev->et = AST_Expression::EV_float;
-      return ev;
-    case AST_Expression::EV_float:
-      return ev;
-    case AST_Expression::EV_double:
-      if (ev->u.dval > FLT_MAX || ev->u.dval < -FLT_MAX)
-	return NULL;
-      ev->u.fval = (float) ev->u.dval;
-      ev->et = AST_Expression::EV_float;
-      return ev;
-    case AST_Expression::EV_char:
-      ev->u.fval = (float) ev->u.cval;
-      ev->et = AST_Expression::EV_float;
-      return ev;
-    case AST_Expression::EV_octet:
-      ev->u.fval = (float) ev->u.oval;
-      ev->et = AST_Expression::EV_float;
-      return ev;
-    case AST_Expression::EV_longlong:
-    case AST_Expression::EV_ulonglong:
-    case AST_Expression::EV_longdouble:
-    case AST_Expression::EV_wchar:
-    case AST_Expression::EV_wstring:
-    case AST_Expression::EV_string:
-    case AST_Expression::EV_any:
-    case AST_Expression::EV_void:
-    case AST_Expression::EV_none:
-      return NULL;
-    }
-  case AST_Expression::EV_double:
-    switch (ev->et) {
-    case AST_Expression::EV_short:
-      ev->u.dval = (double) ev->u.sval;
-      ev->et = AST_Expression::EV_double;
-      return ev;
-    case AST_Expression::EV_ushort:
-      ev->u.dval = (double) ev->u.usval;
-      ev->et = AST_Expression::EV_double;
-      return ev;
-    case AST_Expression::EV_long:
-      ev->u.dval = (double) ev->u.lval;
-      ev->et = AST_Expression::EV_double;
-      return ev;
-    case AST_Expression::EV_ulong:
-      ev->u.dval = (double) ev->u.ulval;
-      ev->et = AST_Expression::EV_double;
-      return ev;
-    case AST_Expression::EV_bool:
-      ev->u.dval = (ev->u.bval == I_TRUE) ? 1.0 : 0.0;
-      ev->et = AST_Expression::EV_double;
-      return ev;
-    case AST_Expression::EV_float:
-      ev->u.dval = (double) ev->u.fval;
-      ev->et = AST_Expression::EV_double;
-      return ev;
-    case AST_Expression::EV_double:
-      return ev;
-    case AST_Expression::EV_char:
-      ev->u.dval = (double) ev->u.cval;
-      ev->et = AST_Expression::EV_double;
-      return ev;
-    case AST_Expression::EV_octet:
-      ev->u.dval = (double) ev->u.oval;
-      ev->et = AST_Expression::EV_double;
-      return ev;
-    case AST_Expression::EV_longlong:
-    case AST_Expression::EV_ulonglong:
-    case AST_Expression::EV_longdouble:
-    case AST_Expression::EV_wchar:
-    case AST_Expression::EV_wstring:
-    case AST_Expression::EV_string:
-    case AST_Expression::EV_any:
-    case AST_Expression::EV_void:
-    case AST_Expression::EV_none:
-      return NULL;
-    }
-  case AST_Expression::EV_char:
-    switch (ev->et) {
-    case AST_Expression::EV_short:
-      if (ev->u.sval > (short) MAXCHAR || ev->u.sval < (short) -(MAXCHAR))
-	return NULL;
-      ev->u.cval = (char) ev->u.sval;
-      ev->et = AST_Expression::EV_char;
-      return ev;
-    case AST_Expression::EV_ushort:
-      if (ev->u.usval > (unsigned short) MAXCHAR)
-	return NULL;
-      ev->u.cval = (char) ev->u.usval;
-      ev->et = AST_Expression::EV_char;
-      return ev;
-    case AST_Expression::EV_long:
-      if (ev->u.lval > (long) MAXCHAR || ev->u.lval < (long) -(MAXCHAR))
-	return NULL;
-      ev->u.cval = (char) ev->u.lval;
-      ev->et = AST_Expression::EV_char;
-      return ev;
-    case AST_Expression::EV_ulong:
-      if (ev->u.ulval > (unsigned long) MAXCHAR)
-	return NULL;
-      ev->u.cval = (char) ev->u.ulval;
-      ev->et = AST_Expression::EV_char;
-      return ev;
-    case AST_Expression::EV_bool:
-      ev->u.cval = (char) ev->u.bval;
-      ev->et = AST_Expression::EV_char;
-      return ev;
-    case AST_Expression::EV_float:
-      if (ev->u.fval > (float) MAXCHAR || ev->u.fval < (float) -(MAXCHAR))
-	return NULL;
-      ev->u.cval = (char) ev->u.fval;
-      ev->et = AST_Expression::EV_char;
-      return ev;
-    case AST_Expression::EV_double:
-      if (ev->u.dval > (double) MAXCHAR || ev->u.dval < (double) -(MAXCHAR))
-	return NULL;
-      ev->u.cval = (char) ev->u.dval;
-      ev->et = AST_Expression::EV_char;
-      return ev;
-    case AST_Expression::EV_char:
-      return ev;
-    case AST_Expression::EV_octet:
-      if (ev->u.oval > (unsigned char) MAXCHAR)
-	return NULL;
-      ev->u.cval = (char) ev->u.oval;
-      ev->et = AST_Expression::EV_char;
-      return ev;
-    case AST_Expression::EV_longlong:
-    case AST_Expression::EV_ulonglong:
-    case AST_Expression::EV_longdouble:
-    case AST_Expression::EV_wchar:
-    case AST_Expression::EV_wstring:
-    case AST_Expression::EV_string:
-    case AST_Expression::EV_any:
-    case AST_Expression::EV_void:
-    case AST_Expression::EV_none:
-      return NULL;
-    }
-  case AST_Expression::EV_octet:
-    switch (ev->et) {
-    case AST_Expression::EV_short:
-      if (ev->u.sval < 0 || ev->u.sval > (short) (MAXCHAR << 1))
-	return NULL;
-      ev->u.oval = (unsigned char) ev->u.sval;
-      ev->et = AST_Expression::EV_octet;
-      return ev;
-    case AST_Expression::EV_ushort:
-      if (ev->u.usval > (unsigned short) (MAXCHAR << 1))
-	return NULL;
-      ev->u.oval = (unsigned char) ev->u.usval;
-      ev->et = AST_Expression::EV_octet;
-      return ev;
-    case AST_Expression::EV_long:
-      if (ev->u.lval < 0 || ev->u.lval > (long) (MAXCHAR << 1))
-	return NULL;
-      ev->u.oval = (unsigned char) ev->u.lval;
-      ev->et = AST_Expression::EV_octet;
-      return ev;
-    case AST_Expression::EV_ulong:
-      if (ev->u.ulval > (unsigned long) (MAXCHAR << 1))
-	return NULL;
-      ev->u.oval = (unsigned char) ev->u.ulval;
-      ev->et = AST_Expression::EV_octet;
-      return ev;
-    case AST_Expression::EV_bool:
-      ev->u.oval = (ev->u.bval == I_FALSE) ? 1 : 0;
-      ev->et = AST_Expression::EV_octet;
-      return ev;
-    case AST_Expression::EV_float:
-      if (ev->u.fval < 0.0 || ev->u.fval > (float) (MAXCHAR << 1))
-	return NULL;
-      ev->u.oval = (unsigned char) ev->u.fval;
-      ev->et = AST_Expression::EV_octet;
-      return ev;
-    case AST_Expression::EV_double:
-      if (ev->u.dval < 0.0 || ev->u.dval > (double) (MAXCHAR << 1))
-	return NULL;
-      ev->u.oval = (unsigned char) ev->u.dval;
-      ev->et = AST_Expression::EV_octet;
-      return ev;
-    case AST_Expression::EV_char:
-      if ((signed char) ev->u.cval < 0)
-	return NULL;
-      ev->u.oval = (unsigned char) ev->u.cval;
-      ev->et = AST_Expression::EV_octet;
-      return ev;
-    case AST_Expression::EV_octet:
-      return ev;
-    case AST_Expression::EV_longlong:
-    case AST_Expression::EV_ulonglong:
-    case AST_Expression::EV_longdouble:
-    case AST_Expression::EV_wchar:
-    case AST_Expression::EV_wstring:
-    case AST_Expression::EV_string:
-    case AST_Expression::EV_any:
-    case AST_Expression::EV_void:
-    case AST_Expression::EV_none:
-      return NULL;
-    }
-  case AST_Expression::EV_any:
-    switch (ev->et) {
-    case AST_Expression::EV_any:
-      return ev;
-    default:
-      return NULL;
-    }
-  case AST_Expression::EV_void:
-    switch (ev->et) {
-    case AST_Expression::EV_void:
-      return ev;
-    default:
-      return NULL;
-    }
-  case AST_Expression::EV_none:
-    return NULL;
-  case AST_Expression::EV_string:
-    switch (ev->et) {
-    case AST_Expression::EV_string:
-      return ev;
-    default:
-      return NULL;
-    }
-  case AST_Expression::EV_longlong:
-  case AST_Expression::EV_ulonglong:
-  case AST_Expression::EV_longdouble:
-  case AST_Expression::EV_wchar:
-  case AST_Expression::EV_wstring:
-    return NULL;
-  }
-  return NULL;
-}
-
-/*
- * Evaluate the expression wrt the evaluation kind requested. Supported
- * evaluation kinds are
- * - EK_const:		The expression must evaluate to a constant
- * - EK_positive_int:	The expression must further evaluate to a
- *			positive integer
- */
-static AST_Expression::AST_ExprValue *
-eval_kind(AST_Expression::AST_ExprValue *ev, AST_Expression::EvalKind ek)
-{
-  if (ek == AST_Expression::EK_const)
-    return ev;
-  if (ek == AST_Expression::EK_positive_int)
-    return coerce_value(ev, AST_Expression::EV_ulong);
-
-  return NULL;
-}
-
-/*
- * Private operations
- */
-
-/*
- * Apply binary operators to an AST_Expression after evaluating
- * its sub-expressions.
- * Operations supported:
- *
- * '+', '-', '*', '/'
- */
-AST_Expression::AST_ExprValue *
-AST_Expression::eval_bin_op(AST_Expression::EvalKind ek)
-{
-  AST_ExprValue	*retval = NULL;
-
-  if (ek != EK_const && ek != EK_positive_int)
-    return NULL;
-  if (pd_v1 == NULL || pd_v2 == NULL)
-    return NULL;
-  pd_v1->set_ev(pd_v1->eval_internal(ek));
-  if (pd_v1->ev() == NULL)
-    return NULL;
-  pd_v1->set_ev(pd_v1->coerce(EV_double));
-  if (pd_v1->ev() == NULL)
-    return NULL;
-  pd_v2->set_ev(pd_v2->eval_internal(ek));
-  if (pd_v2->ev() == NULL)
-    return NULL;
-  pd_v2->set_ev(pd_v2->coerce(EV_double));
-  if (pd_v2->ev() == NULL)
-    return NULL;
-
-  retval = new AST_ExprValue;
-  retval->et = EV_double;
-
-  switch (pd_ec) {
-  case EC_mod:
-    if (pd_v2->ev()->u.lval == 0)
-      return NULL;
-    retval->u.lval = pd_v1->ev()->u.lval % pd_v2->ev()->u.lval;
-    break;
-  case EC_add:
-    retval->u.dval = pd_v1->ev()->u.dval + pd_v2->ev()->u.dval;
-    break;
-  case EC_minus:
-    retval->u.dval = pd_v1->ev()->u.dval - pd_v2->ev()->u.dval;
-    break;
-  case EC_mul:
-    retval->u.dval = pd_v1->ev()->u.dval * pd_v2->ev()->u.dval;
-    break;
-  case EC_div:
-    if (pd_v2->ev()->u.dval == 0.0)
-      return NULL;
-    retval->u.dval = pd_v1->ev()->u.dval / pd_v2->ev()->u.dval;
-    break;
-  default:
-    return NULL;
-  }
-  return retval;
-}
-
-/*
- * Apply bitwise operations to an AST_Expression after evaluating
- * its sub-expressions.
- * Operations supported:
- *
- * '%', '|', '&', '^', '<<', '>>'
- */
-AST_Expression::AST_ExprValue *
-AST_Expression::eval_bit_op(AST_Expression::EvalKind ek)
-{
-  AST_Expression::AST_ExprValue	*retval=NULL;
-
-  if (ek != EK_const && ek != EK_positive_int)
-    return NULL;
-  if (pd_v1 == NULL || pd_v2 == NULL)
-    return NULL;
-  pd_v1->set_ev(pd_v1->eval_internal(ek));
-  if (pd_v1->ev() == NULL)
-    return NULL;
-  pd_v1->set_ev(pd_v1->coerce(EV_long));
-  if (pd_v1->ev() == NULL)
-    return NULL;
-  pd_v2->set_ev(pd_v2->eval_internal(ek));
-  if (pd_v2->ev() == NULL)
-    return NULL;
-  pd_v2->set_ev(pd_v2->coerce(EV_long));
-  if (pd_v2->ev() == NULL)
-    return NULL;
-
-  retval = new AST_ExprValue;
-  retval->et = EV_long;
-
-  switch (pd_ec) {
-  case EC_or:
-    retval->u.lval = pd_v1->ev()->u.lval | pd_v2->ev()->u.lval;
-    break;
-  case EC_xor:
-    retval->u.lval = pd_v1->ev()->u.lval ^ pd_v2->ev()->u.lval;
-    break;
-  case EC_and:
-    retval->u.lval = pd_v1->ev()->u.lval & pd_v2->ev()->u.lval;
-    break;
-  case EC_left:
-    retval->u.lval = pd_v1->ev()->u.lval << pd_v2->ev()->u.lval;
-    break;
-  case EC_right:
-    retval->u.lval = pd_v1->ev()->u.lval >> pd_v2->ev()->u.lval;
-    break;
-  default:
-    return NULL;
-  }
-  return retval;
-}
-
-/*
- * Apply unary operators to an AST_Expression after evaluating its
- * sub-expression.
- * Operations supported:
- *
- * '-', '+', '~'
- */
-AST_Expression::AST_ExprValue *
-AST_Expression::eval_un_op(AST_Expression::EvalKind ek)
-{
-  AST_ExprValue	*retval = NULL;
-
-  if (pd_ev != NULL)
-    return pd_ev;
-
-  if (ek != EK_const && ek != EK_positive_int)
-    return NULL;
-  if (pd_v1 == NULL)
-    return NULL;
-  pd_v1->set_ev(pd_v1->eval_internal(ek));
-  if (pd_v1->ev() == NULL)
-    return NULL;
-  pd_v1->set_ev(pd_v1->coerce(EV_double));
-  if (pd_v1->ev() == NULL)
-    return NULL;
-
-  retval = new AST_ExprValue;
-  retval->et = EV_double;
-
-  switch (pd_ec) {
-  case EC_u_plus:
-    retval->u.lval = pd_v1->ev()->u.lval;
-    break;
-  case EC_u_minus:
-    retval->u.lval = -(pd_v1->ev()->u.lval);
-    break;
-  case EC_bit_neg:
-    pd_v1->set_ev(pd_v1->coerce(EV_long));
-    if (pd_v1->ev() == NULL)
-      return NULL;
-    retval->u.lval = ~pd_v1->ev()->u.lval;
-    break;
-  default:
-    return NULL;
-  }
-  return retval;
-}
-
-/*
- * Evaluate a symbolic AST_Expression by looking up the named
- * symbol.
- */
-AST_Expression::AST_ExprValue *
-AST_Expression::eval_symbol(AST_Expression::EvalKind ek)
-{
-  UTL_Scope		*s = 0;
-  AST_Decl		*d = 0;
-  AST_Constant		*c = 0;
-
-  /*
-   * Is there a symbol stored?
-   */
-  if (pd_n == NULL) {
-    idl_global->err()->eval_error(this);
-    return NULL;
-  }
-  /*
-   * Get current scope for lookup
-   */
-  if (idl_global->scopes()->depth() > 0)
-     s = idl_global->scopes()->top_non_null();
-  if (s == NULL) {
-    idl_global->err()->lookup_error(pd_n);
-    return NULL;
-  }
-  /*
-   * Do lookup
-   */
-  d = s->lookup_by_name(pd_n, I_TRUE);
-  if (d == NULL) {
-    idl_global->err()->lookup_error(pd_n);
-    return NULL;
-  }
-  /*
-   * Is it a constant?
-   */
-  if (d->node_type() != AST_Decl::NT_const &&
-      d->node_type() != AST_Decl::NT_enum_val) {
-    idl_global->err()->constant_expected(pd_n, d);
-    return NULL;
-  }
-  /*
-   * OK, now evaluate the constant we just got, to produce its value
-   */
-  c = AST_Constant::narrow_from_decl(d);
-  if (c == NULL) return NULL;
-  return c->constant_value()->eval_internal(ek);
-}
-
-/*
- * Coerce "this" to the ExprType required. Returns a copy of the
- * original ExprValue with the coercion applied, if successful, or
- * NULL if failed.
- */
-AST_Expression::AST_ExprValue *
-AST_Expression::coerce(AST_Expression::ExprType t)
-{
-  AST_ExprValue *copy;
-
-  /*
-   * Is it already of the right type?
-   */
-  if (pd_ev != NULL && pd_ev->et == t)
-    return pd_ev;
-  /*
-   * OK, must coerce
-   *
-   * First, evaluate it, then try to coerce result type
-   * If already evaluated, return the result
-   */
-  pd_ev = eval_internal(EK_const);
-  if (pd_ev == NULL)
-    return NULL;
-
-  /*
-   * Create a copy to contain coercion result
-   */
-  copy = new AST_ExprValue;
-
-  copy->et = pd_ev->et;
-  switch (pd_ev->et) {
-  case EV_longlong:
-  case EV_ulonglong:
-  case EV_longdouble:
-  case EV_wchar:
-  case EV_wstring:
-  case EV_void:
-  case EV_none:
-  case EV_any:
-    return NULL;
-  case EV_short:
-    copy->u.sval = pd_ev->u.sval;
-    break;
-  case EV_ushort:
-    copy->u.usval = pd_ev->u.usval;
-    break;
-  case EV_long:
-    copy->u.lval = pd_ev->u.lval;
-    break;
-  case EV_ulong:
-    copy->u.ulval = pd_ev->u.ulval;
-    break;
-  case EV_bool:
-    copy->u.bval = pd_ev->u.bval;
-    break;
-  case EV_float:
-    copy->u.fval = pd_ev->u.fval;
-    break;
-  case EV_double:
-    copy->u.dval = pd_ev->u.dval;
-    break;
-  case EV_char:
-    copy->u.cval = pd_ev->u.cval;
-    break;
-  case EV_octet:
-    copy->u.oval = pd_ev->u.oval;
-    break;
-  case EV_string:
-    copy->u.strval = pd_ev->u.strval;
-    break;
-  }
-
-  return coerce_value(copy, t);
-}
-
-/*
- * Eval used internally
- */
-AST_Expression::AST_ExprValue *
-AST_Expression::eval_internal(AST_Expression::EvalKind ek)
-{
-  /*
-   * Already evaluated?
-   */
-  if (pd_ev != NULL)
-    return eval_kind(pd_ev, ek);
-  /*
-   * OK, must evaluate operator
-   */
-  switch (pd_ec) {
-  case EC_add:
-  case EC_minus:
-  case EC_mul:
-  case EC_div:
-  case EC_mod:
-    pd_ev = eval_bin_op(ek);
-    return eval_kind(pd_ev, ek);
-  case EC_or:
-  case EC_xor:
-  case EC_and:
-  case EC_left:
-  case EC_right:
-    pd_ev = eval_bit_op(ek);
-    return eval_kind(pd_ev, ek);
-  case EC_u_plus:
-  case EC_u_minus:
-  case EC_bit_neg:
-    pd_ev = eval_un_op(ek);
-    return eval_kind(pd_ev, ek);
-  case EC_symbol:
-    pd_ev = eval_symbol(ek);
-    return eval_kind(pd_ev, ek);
-  case EC_none:
-    return NULL;
-  }
-  return NULL;
-}
-
-/*
- * Public operations
- */
-
-/*
- * Evaluate an AST_Expression, producing an AST_ExprValue or NULL
- */
-AST_Expression::AST_ExprValue *
-AST_Expression::eval(AST_Expression::EvalKind ek)
-{
-  AST_Expression::AST_ExprValue *v = NULL;
-
-  /*
-   * Call internal evaluator which does not coerce value to
-   * EvalKind-expected format
-   */
-  v = eval_internal(ek);
-  /*
-   * Then coerce according to EvalKind-expected format
-   */
-  return eval_kind(v, ek);
-}
-
-/*
- * Evaluate "this", assigning the value to the pd_ev field.
- */
-void
-AST_Expression::evaluate(EvalKind ek)
-{
-  pd_ev = eval_internal(ek);
-  pd_ev = eval_kind(pd_ev, ek);
-}
-
-/*
- * Expression equality comparison operator
- */
-long
-AST_Expression::operator==(AST_Expression *vc)
-{
-  if (pd_ec != vc->ec())
-    return I_FALSE;
-  evaluate(EK_const);
-  vc->evaluate(EK_const);
-  if (pd_ev == NULL || vc->ev() == NULL)
-    return I_FALSE;
-  if (pd_ev->et != vc->ev()->et)
-    return I_FALSE;
-  switch (pd_ev->et) {
-  case EV_short:
-    return (pd_ev->u.sval == vc->ev()->u.sval) ? I_TRUE : I_FALSE;
-  case EV_ushort:
-    return (pd_ev->u.usval == vc->ev()->u.usval) ? I_TRUE : I_FALSE;
-  case EV_long:
-    return (pd_ev->u.lval == vc->ev()->u.lval) ? I_TRUE : I_FALSE;
-  case EV_ulong:
-    return (pd_ev->u.ulval == vc->ev()->u.ulval) ? I_TRUE : I_FALSE;
-  case EV_float:
-    return (pd_ev->u.fval == vc->ev()->u.fval) ? I_TRUE : I_FALSE;
-  case EV_double:
-    return (pd_ev->u.dval == vc->ev()->u.dval) ? I_TRUE : I_FALSE;
-  case EV_char:
-    return (pd_ev->u.cval == vc->ev()->u.cval) ? I_TRUE : I_FALSE;
-  case EV_octet:
-    return (pd_ev->u.oval == vc->ev()->u.oval) ? I_TRUE : I_FALSE;
-  case EV_bool:
-    return (pd_ev->u.lval == vc->ev()->u.lval) ? I_TRUE : I_FALSE;
-  case EV_string:
-    if (pd_ev->u.strval == NULL) {
-      if (vc->ev()->u.strval == NULL)
-	return I_TRUE;
-      else
-	return I_FALSE;
-    } else if (vc->ev()->u.strval == NULL)
-      return I_FALSE;
-    else
-      return (pd_ev->u.strval == vc->ev()->u.strval) ? I_TRUE : I_FALSE;
-  case EV_longlong:
-  case EV_ulonglong:
-  case EV_longdouble:
-  case EV_wchar:
-  case EV_wstring:
-  case EV_any:
-  case EV_void:
-  case EV_none:
-    return I_FALSE;
-  }
-  return I_FALSE;
-}
-
-long
-AST_Expression::compare(AST_Expression *vc)
-{
-  if (pd_ec != vc->ec())
-    return I_FALSE;
-  evaluate(EK_const);
-  vc->evaluate(EK_const);
-  if (pd_ev == NULL || vc->ev() == NULL)
-    return I_FALSE;
-  if (pd_ev->et != vc->ev()->et)
-    return I_FALSE;
-  switch (pd_ev->et) {
-  case EV_short:
-    return (pd_ev->u.sval == vc->ev()->u.sval) ? I_TRUE : I_FALSE;
- case EV_ushort:
-    return (pd_ev->u.usval == vc->ev()->u.usval) ? I_TRUE : I_FALSE;
-  case EV_long:
-    return (pd_ev->u.lval == vc->ev()->u.lval) ? I_TRUE : I_FALSE;
-  case EV_ulong:
-    return (pd_ev->u.ulval == vc->ev()->u.ulval) ? I_TRUE : I_FALSE;
-  case EV_float:
-    return (pd_ev->u.fval == vc->ev()->u.fval) ? I_TRUE : I_FALSE;
-  case EV_double:
-    return (pd_ev->u.dval == vc->ev()->u.dval) ? I_TRUE : I_FALSE;
-  case EV_char:
-    return (pd_ev->u.cval == vc->ev()->u.cval) ? I_TRUE : I_FALSE;
-  case EV_octet:
-    return (pd_ev->u.oval == vc->ev()->u.oval) ? I_TRUE : I_FALSE;
-  case EV_bool:
-    return (pd_ev->u.lval == vc->ev()->u.lval) ? I_TRUE : I_FALSE;
-  case EV_string:
-    if (pd_ev->u.strval == NULL) {
-      if (vc->ev()->u.strval == NULL)
-	return I_TRUE;
-      else
-	return I_FALSE;
-    } else if (vc->ev()->u.strval == NULL)
-      return I_FALSE;
-    else
-      return (pd_ev->u.strval == vc->ev()->u.strval) ? I_TRUE : I_FALSE;
-  case EV_longlong:
-  case EV_ulonglong:
-  case EV_longdouble:
-  case EV_wchar:
-  case EV_wstring:
-  case EV_any:
-  case EV_void:
-  case EV_none:
-    return I_FALSE;
-  }
-  return I_FALSE;
-}
-
-/*
- * Redefinition of inherited virtual operations
- */
-
-/*
- * Helper functions for expression dumpers
- */
-
-/*
- * Dump this binary AST_Expression node to the ostream o
- */
-static void
-dump_binary_expr(ostream &o, char *s, AST_Expression *n1, AST_Expression *n2)
-{
-  if (n1 != NULL) n1->dump(o);
-  o << " " << s << " ";
-  if (n2 != NULL) n2->dump(o);
-}
-
-/*
- * Dump this unary AST_Expression node to the ostream o
- */
-static void
-dump_unary_expr(ostream &o, char *s, AST_Expression *e)
-{
-  o << s;
-  e->dump(o);
-}
-
-/*
- * Dump the supplied AST_ExprValue to the ostream o
- */
-static void
-dump_expr_val(ostream &o, AST_Expression::AST_ExprValue *ev)
-{
-  switch (ev->et) {
-  case AST_Expression::EV_short:
-    o << ev->u.sval;
-    break;
-  case AST_Expression::EV_ushort:
-    o << ev->u.usval;
-    break;
-  case AST_Expression::EV_long:
-    o << ev->u.lval;
-    break;
-  case AST_Expression::EV_ulong:
-    o << ev->u.ulval;
-    break;
-  case AST_Expression::EV_float:
-    o << ev->u.fval;
-    break;
-  case AST_Expression::EV_double:
-    o << ev->u.dval;
-    break;
-  case AST_Expression::EV_char:
-    o << ev->u.cval;
-    break;
-  case AST_Expression::EV_octet:
-    o << ev->u.oval;
-    break;
-  case AST_Expression::EV_bool:
-    o << (ev->u.bval == I_TRUE) ? "TRUE" : "FALSE";
-    break;
-  case AST_Expression::EV_string:
-    if (ev->u.strval != NULL)
-      ev->u.strval->dump(o);
-  case AST_Expression::EV_longlong:
-  case AST_Expression::EV_ulonglong:
-  case AST_Expression::EV_longdouble:
-  case AST_Expression::EV_wchar:
-  case AST_Expression::EV_wstring:
-  case AST_Expression::EV_any:
-  case AST_Expression::EV_none:
-  case AST_Expression::EV_void:
-    break;
-  }
-}
-
-/*
- * Dump an AST_Expression node to the ostream o
- */
-void
-AST_Expression::dump(ostream &o)
-{
-  /*
-   * See if it was a constant or was evaluated already
-   */
-  if (pd_ev != NULL) {
-    dump_expr_val(o, pd_ev);
-    return;
-  }
-  /*
-   * OK, must print out an expression
-   */
-  switch (pd_ec) {
-    /*
-     * Binary expressions:
-     */
-  case EC_add:
-    dump_binary_expr(o, "+", pd_v1, pd_v2);
-    break;
-  case EC_minus:
-    dump_binary_expr(o, "-", pd_v1, pd_v2);
-    break;
-  case EC_mul:
-    dump_binary_expr(o, "*", pd_v1, pd_v2);
-    break;
-  case EC_div:
-    dump_binary_expr(o, "/", pd_v1, pd_v2);
-    break;
-  case EC_mod:
-    dump_binary_expr(o, "%", pd_v1, pd_v2);
-    break;
-  case EC_or:
-    dump_binary_expr(o, "|", pd_v1, pd_v2);
-    break;
-  case EC_xor:
-    dump_binary_expr(o, "^", pd_v1, pd_v2);
-    break;
-  case EC_and:
-    dump_binary_expr(o, "&", pd_v1, pd_v2);
-    break;
-  case EC_left:
-    dump_binary_expr(o, "<<", pd_v1, pd_v2);
-    break;
-  case EC_right:
-    dump_binary_expr(o, ">>", pd_v1, pd_v2);
-    break;
-    /*
-     * Unary expressions:
-     */
-  case EC_u_plus:
-    dump_unary_expr(o, "+", pd_v1);
-    break;
-  case EC_u_minus:
-    dump_unary_expr(o, "-", pd_v1);
-    break;
-  case EC_bit_neg:
-    dump_unary_expr(o, "~", pd_v1);
-    break;
-    /*
-     * Unevaluated symbol
-     */
-  case EC_symbol:
-    pd_n->dump(o);
-    break;
-  case EC_none:
-    break;
-  default:
-    o << GTDEVEL("unsupported dump mode for expression with ec == ") 
-      << (int) pd_ec ;
-    break;
-  }
-}
-
-/*
- * Data accessors
- */
-
-UTL_Scope *
-AST_Expression::defined_in()
-{
-  return pd_defined_in;
-}
-
-void
-AST_Expression::set_defined_in(UTL_Scope *d)
-{
-  pd_defined_in = d;
-}
-
-long
-AST_Expression::line()
-{
-  return pd_line;
-}
-
-void
-AST_Expression::set_line(long l)
-{
-  pd_line = l;
-}
-
-String *
-AST_Expression::file_name()
-{
-  return pd_file_name;
-}
-
-void
-AST_Expression::set_file_name(String *f)
-{
-  pd_file_name = f;
-}
-
-AST_Expression::ExprComb
-AST_Expression::ec()
-{
-  return pd_ec;
-}
-
-void
-AST_Expression::set_ec(AST_Expression::ExprComb new_ec)
-{
-  pd_ec = new_ec;
-}
-
-AST_Expression::AST_ExprValue	*
-AST_Expression::ev()
-{
-  return pd_ev;
-}
-
-void
-AST_Expression::set_ev(AST_Expression::AST_ExprValue *new_ev)
-{
-  pd_ev = new_ev;
-}
-
-AST_Expression *
-AST_Expression::v1()
-{
-  return pd_v1;
-}
-
-void
-AST_Expression::set_v1(AST_Expression *e)
-{
-
-  pd_v1 = e;
-}
-
-AST_Expression *
-AST_Expression::v2()
-{
-  return pd_v2;
-}
-
-void
-AST_Expression::set_v2(AST_Expression *e)
-{
-  pd_v2 = e;
-}
-
-UTL_ScopedName *
-AST_Expression::n()
-{
-  return pd_n;
-}
-
-void
-AST_Expression::set_n(UTL_ScopedName *new_n)
-{
-  pd_n = new_n;
-}
diff --git a/TAO/TAO_IDL/ast/ast_field.cpp b/TAO/TAO_IDL/ast/ast_field.cpp
deleted file mode 100644
index 44912c1d03b..00000000000
--- a/TAO/TAO_IDL/ast/ast_field.cpp
+++ /dev/null
@@ -1,151 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-/*
- * ast_field.cc - Implementation of class AST_Field
- *
- * AST_Fields denote fields in IDL structure, union and exception
- * declarations. AST_Field is also used as a superclass of AST_Argument
- * and AST_UnionBranch.
- * AST_Fields have a field type (a subclass of AST_Type) and a name
- * (a UTL_ScopedName)
- *
- * AST_Field supplies two constructors, one to be used in constructing
- * AST_Field nodes, the other to be used in constructing AST_Argument
- * nodes and AST_UnionBranch nodes.
- */
-
-#include	"idl.h"
-#include	"idl_extern.h"
-
-/*
- * Constructor(s) and destructor
- */
-
-/*
- * Default constructor
- */
-AST_Field::AST_Field()
-	 : pd_field_type(NULL)
-{
-}
-
-/*
- * To be used when constructing an AST_Field node
- */
-AST_Field::AST_Field(AST_Type *ft, UTL_ScopedName *n, UTL_StrList *p)
-	 : AST_Decl(AST_Decl::NT_field, n, p),
-	   pd_field_type(ft)
-{
-}
-
-/*
- * To be used when constructing a node of a subclass of AST_Field
- */
-AST_Field::AST_Field(AST_Decl::NodeType nt, AST_Type *ft,
-		   UTL_ScopedName *n, UTL_StrList *p)
-	 : AST_Decl(nt, n, p),
-	   pd_field_type(ft)
-{
-}
-
-/*
- * Private operations
- */
-
-/*
- * Public operations
- */
-
-
-/*
- * Redefinition of inherited virtual operations
- */
-
-/*
- * Dump this AST_Field node to the ostream o
- */
-void
-AST_Field::dump(ostream &o)
-{
-  pd_field_type->local_name()->dump(o);
-  o << " ";
-  local_name()->dump(o);
-}
-
-/*
- * Data accessors
- */
-
-AST_Type *
-AST_Field::field_type()
-{
-  return pd_field_type;
-}
-
-/*
- * Narrowing methods
- */
-IMPL_NARROW_METHODS1(AST_Field, AST_Decl)
-IMPL_NARROW_FROM_DECL(AST_Field)
diff --git a/TAO/TAO_IDL/ast/ast_generator.cpp b/TAO/TAO_IDL/ast/ast_generator.cpp
deleted file mode 100644
index 56b8bc152fc..00000000000
--- a/TAO/TAO_IDL/ast/ast_generator.cpp
+++ /dev/null
@@ -1,401 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-/*
- * ast_generator.cc - Implements the base AST node generator
- *
- * The generator protocol is explained in detail in the IDL CFE
- * design document.
- * The AST_Generator class provides operations to instantiate any
- * of the AST nodes. It contains an operation for every constructor
- * of every AST class.
- */
-
-#include	"idl.h"
-#include	"idl_extern.h"
-
-/*
- * Constructors
- */
-
-/*
- * Private operations
- */
-
-/*
- * Public operations
- */
-
-/*
- * Construct an AST_PredefinedType node (a predefined type)
- */
-AST_PredefinedType *
-AST_Generator::create_predefined_type(AST_PredefinedType::PredefinedType t,
-				    UTL_ScopedName *n,
-				    UTL_StrList *p)
-{
-  return new AST_PredefinedType(t, n, p);
-}
-
-/*
- * Construct an AST_Module node (a module)
- */
-AST_Module	*
-AST_Generator::create_module(UTL_ScopedName *n, UTL_StrList *p)
-{
-  return new AST_Module(n, p);
-}
-
-/*
- * Construct an AST_Root node (a node representing the root of an AST)
- */
-AST_Root *
-AST_Generator::create_root(UTL_ScopedName *n,
-			  UTL_StrList *p)
-{
-    return new AST_Root(n, p);
-}
-
-/*
- * Construct an AST_Interface node (an interface)
- */
-AST_Interface	*
-AST_Generator::create_interface(UTL_ScopedName *n,
-			       AST_Interface **ih,
-			       long nih,
-			       UTL_StrList *p)
-{
-  return new AST_Interface(n, ih, nih, p);
-}
-
-/*
- * Construct an AST_InterfaceFwd node (a node representing the forward
- * declaration of an interface)
- */
-AST_InterfaceFwd *
-AST_Generator::create_interface_fwd(UTL_ScopedName *n, UTL_StrList *p)
-{
-  return new AST_InterfaceFwd(n, p);
-}
-
-/*
- * Construct an AST_Exception node (an exception)
- */
-AST_Exception	*
-AST_Generator::create_exception(UTL_ScopedName *n, UTL_StrList *p)
-{
-  return new AST_Exception(n, p);
-}
-
-/*
- * Construct an AST_Structure node (a struct)
- */
-AST_Structure	*
-AST_Generator::create_structure(UTL_ScopedName *n, UTL_StrList *p)
-{
-  return new AST_Structure(n, p);
-}
-
-/*
- * Construct an AST_Enum node (an enum)
- */
-AST_Enum	*
-AST_Generator::create_enum(UTL_ScopedName *n, UTL_StrList *p)
-{
-  return new AST_Enum(n, p);
-}
-
-/*
- * Construct an AST_Operation node (an operation on an interface)
- */
-AST_Operation	*
-AST_Generator::create_operation(AST_Type *rt,
-			       AST_Operation::Flags fl,
-			       UTL_ScopedName *n,
-			       UTL_StrList *p)
-{
-  return new AST_Operation(rt, fl, n, p);
-}
-
-/*
- * Construct an AST_Field node (a field in a struct, union or exception)
- */
-AST_Field	*
-AST_Generator::create_field(AST_Type *ft, UTL_ScopedName *n, UTL_StrList *p)
-{
-  return new AST_Field(ft, n, p);
-}
-
-/*
- * Construct an AST_Argument node (an argument to an operation)
- */
-AST_Argument	*
-AST_Generator::create_argument(AST_Argument::Direction d,
-			      AST_Type *ft,
-			      UTL_ScopedName *n,
-			      UTL_StrList *p)
-{
-  return new AST_Argument(d, ft, n, p);
-}
-
-/*
- * Construct an AST_Attribute node (an attribute)
- */
-AST_Attribute	*
-AST_Generator::create_attribute(idl_bool ro,
-			       AST_Type *ft,
-			       UTL_ScopedName *n,
-			       UTL_StrList *p)
-{
-  return new AST_Attribute(ro, ft, n, p);
-}
-
-/*
- * Construct an AST_Union node (a union)
- */
-AST_Union	*
-AST_Generator::create_union(AST_ConcreteType *dt,
-			   UTL_ScopedName *n,
-			   UTL_StrList *p)
-{
-  return new AST_Union(dt, n, p);
-}
-
-/*
- * Construct an AST_UnionBranch node (a branch in a union)
- */
-AST_UnionBranch *
-AST_Generator::create_union_branch(AST_UnionLabel *lab,
-				 AST_Type *ft,
-				 UTL_ScopedName *n,
-				 UTL_StrList *p)
-{
-  return new AST_UnionBranch(lab, ft, n, p);
-}
-
-/*
- * Construct an AST_UnionLabel node (a label in a union)
- */
-AST_UnionLabel	*
-AST_Generator::create_union_label(AST_UnionLabel::UnionLabel ul,
-				AST_Expression *v)
-{
-  return new AST_UnionLabel(ul, v);
-}
-
-/*
- * Construct an AST_Constant node (a constant)
- */
-AST_Constant	*
-AST_Generator::create_constant(AST_Expression::ExprType et,
-			      AST_Expression *ev,
-			      UTL_ScopedName *n,
-			      UTL_StrList *p)
-{
-  return new AST_Constant(et, ev, n, p);
-}
-
-/*
- * Construct an AST_Expression node denoting a symbolic name
- */
-AST_Expression	*
-AST_Generator::create_expr(UTL_ScopedName *n)
-{
-  return new AST_Expression(n);
-}
-
-/*
- * Construct an AST_Expression denoting a coercion
- */
-AST_Expression	*
-AST_Generator::create_expr(AST_Expression *v, AST_Expression::ExprType t)
-{
-  return new AST_Expression(v, t);
-}
-
-/*
- * Construct an AST_Expression node denoting a binary combinator
- * of two other AST_Expression nodes
- */
-AST_Expression	*
-AST_Generator::create_expr(AST_Expression::ExprComb c,
-			   AST_Expression *v1,
-			   AST_Expression *v2)
-{
-  return new AST_Expression(c, v1, v2);
-}
-
-/*
- * Construct an AST_Expression node denoting a long integer
- */
-AST_Expression	*
-AST_Generator::create_expr(long v)
-{
-  return new AST_Expression(v);
-}
-
-/*
- * Construct an AST_Expression node denoting a long integer being used
- * as a boolean
- */
-AST_Expression	*
-AST_Generator::create_expr(long v, AST_Expression::ExprType t)
-{
-  return new AST_Expression(v, t);
-}
-
-/*
- * Construct an AST_Expression node denoting an unsigned long integer
- */
-AST_Expression	*
-AST_Generator::create_expr(unsigned long v)
-{
-  return new AST_Expression(v);
-}
-
-/*
- * Construct an AST_Expression node denoting a string (a char *
- * encapsulated as String)
- */
-AST_Expression	*
-AST_Generator::create_expr(String *s)
-{
-  return new AST_Expression(s);
-}
-
-/*
- * Construct an AST_Expression node denoting a character
- */
-AST_Expression	*
-AST_Generator::create_expr(char c)
-{
-  return new AST_Expression(c);
-}
-
-/*
- * Construct an AST_Expression node denoting a 64-bit floating point number
- */
-AST_Expression	*
-AST_Generator::create_expr(double d)
-{
-  return new AST_Expression(d);
-}
-
-/*
- * Construct an AST_EnumVal node (an enumerator)
- */
-AST_EnumVal	*
-AST_Generator::create_enum_val(unsigned long v,
-			     UTL_ScopedName *n,
-			     UTL_StrList *p)
-{
-  return new AST_EnumVal(v, n, p);
-}
-
-/*
- * Construct an AST_Array node (an array type or field modifier)
- */
-AST_Array	*
-AST_Generator::create_array(UTL_ScopedName *n,
-			   unsigned long ndims,
-			   UTL_ExprList *dims)
-{
-  return new AST_Array(n, ndims, dims);
-}
-
-/*
- * Construct an AST_Sequence node (a sequence type definition)
- */
-AST_Sequence	*
-AST_Generator::create_sequence(AST_Expression *ms, AST_Type *bt)
-{
-  return new AST_Sequence(ms, bt);
-}
-
-/*
- * Construct an AST_String node (a string type definition)
- */
-AST_String	*
-AST_Generator::create_string(AST_Expression *ms)
-{
-  return new AST_String(ms);
-}
-
-/*
- * Construct an AST_String node denoting a wide string type definition
- */
-AST_String	*
-AST_Generator::create_wstring(AST_Expression *ms)
-{
-  return new AST_String(ms, sizeof(wchar_t));
-}
-
-/*
- * Construct an AST_Typedef node (a typedef)
- */
-AST_Typedef	*
-AST_Generator::create_typedef(AST_Type *bt, UTL_ScopedName *n, UTL_StrList *p)
-{
-  return new AST_Typedef(bt, n, p);
-}
diff --git a/TAO/TAO_IDL/ast/ast_interface.cpp b/TAO/TAO_IDL/ast/ast_interface.cpp
deleted file mode 100644
index 569173d7069..00000000000
--- a/TAO/TAO_IDL/ast/ast_interface.cpp
+++ /dev/null
@@ -1,560 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-/*
- * ast_interface.cc - Implementation of class AST_Interface
- *
- * AST_Interfaces denote IDL interface definitions
- * AST_Interfaces are subclasses of AST_Type and UTL_Scope
- * AST_Interfaces have an array of inherited interfaces and
- * a count of the number of inherited interfaces. This count
- * represents the total number of unique (recursively) inherited
- * interfaces.
- */
-
-#include	"idl.h"
-#include	"idl_extern.h"
-
-/*
- * Constructor(s) and destructor
- */
-AST_Interface::AST_Interface()
-  : pd_inherits(NULL),
-    pd_n_inherits(0)
-{
-}
-
-AST_Interface::AST_Interface(UTL_ScopedName *n,
-			     AST_Interface **ih,
-			     long nih,
-			     UTL_StrList *p)
-  : AST_Decl(AST_Decl::NT_interface, n, p),
-    UTL_Scope(AST_Decl::NT_interface),
-    pd_inherits(ih),
-    pd_n_inherits(nih)
-{
-}
-
-/*
- * Private operations
- */
-
-/*
- * Public operations
- */
-
-
-/*
- * Redefinition of inherited virtual operations
- */
-
-/*
- * Add an AST_Constant node (a constant declaration) to this scope
- */
-AST_Constant *AST_Interface::fe_add_constant(AST_Constant *t)
-{
-  AST_Decl *d;
-
-  /*
-   * Can't add to interface which was not yet defined
-   */
-  if (!is_defined()) {
-    idl_global->err()->error2(UTL_Error::EIDL_DECL_NOT_DEFINED, this, t);
-    return NULL;
-  }
-  /*
-   * Already defined and cannot be redefined? Or already used?
-   */
-  if ((d = lookup_for_add(t, I_FALSE)) != NULL) {
-    if (!can_be_redefined(d)) {
-      idl_global->err()->error3(UTL_Error::EIDL_REDEF, t, this, d);
-      return NULL;
-    }
-    if (referenced(d)) {
-      idl_global->err()->error3(UTL_Error::EIDL_DEF_USE, t, this, d);
-      return NULL;
-    }
-    if (t->has_ancestor(d)) {
-      idl_global->err()->redefinition_in_scope(t, d);
-      return NULL;
-    }
-  }
-  /*
-   * Add it to scope
-   */
-  add_to_scope(t);
-  /*
-   * Add it to set of locally referenced symbols
-   */
-  add_to_referenced(t, I_FALSE);
-
-  return t;
-}
-
-/*
- * Add an AST_Exception node (an exception declaration) to this scope
- */
-AST_Exception *AST_Interface::fe_add_exception(AST_Exception *t)
-{
-  AST_Decl *d;
-
-  /*
-   * Can't add to interface which was not yet defined
-   */
-  if (!is_defined()) {
-    idl_global->err()->error2(UTL_Error::EIDL_DECL_NOT_DEFINED, this, t);
-    return NULL;
-  }
-  /*
-   * Already defined and cannot be redefined? Or already used?
-   */
-  if ((d = lookup_for_add(t, I_FALSE)) != NULL) {
-    if (!can_be_redefined(d)) {
-      idl_global->err()->error3(UTL_Error::EIDL_REDEF, t, this, d);
-      return NULL;
-    }
-    if (referenced(d)) {
-      idl_global->err()->error3(UTL_Error::EIDL_DEF_USE, t, this, d);
-      return NULL;
-    }
-    if (t->has_ancestor(d)) {
-      idl_global->err()->redefinition_in_scope(t, d);
-      return NULL;
-    }
-  }
-  /*
-   * Add it to scope
-   */
-  add_to_scope(t);
-  /*
-   * Add it to set of locally referenced symbols
-   */
-  add_to_referenced(t, I_FALSE);
-
-  return t;
-}
-
-/*
- * Add an AST_Attribute node (an attribute declaration) to this scope
- */
-AST_Attribute *AST_Interface::fe_add_attribute(AST_Attribute *t)
-{
-  AST_Decl *d;
-
-  /*
-   * Can't add to interface which was not yet defined
-   */
-  if (!is_defined()) {
-    idl_global->err()->error2(UTL_Error::EIDL_DECL_NOT_DEFINED, this, t);
-    return NULL;
-  }
-  /*
-   * Already defined and cannot be redefined? Or already used?
-   */
-  if ((d = lookup_for_add(t, I_FALSE)) != NULL) {
-    if (!can_be_redefined(d)) {
-      idl_global->err()->error3(UTL_Error::EIDL_REDEF, t, this, d);
-      return NULL;
-    }
-    if (referenced(d)) {
-      idl_global->err()->error3(UTL_Error::EIDL_DEF_USE, t, this, d);
-      return NULL;
-    }
-    if (t->has_ancestor(d)) {
-      idl_global->err()->redefinition_in_scope(t, d);
-      return NULL;
-    }
-  }
-  /*
-   * Add it to scope
-   */
-  add_to_scope(t);
-  /*
-   * Add it to set of locally referenced symbols
-   */
-  add_to_referenced(t, I_FALSE);
-
-  return t;
-}
-
-/*
- * Add an AST_Operation node (an operation declaration) to this scope
- */
-AST_Operation *AST_Interface::fe_add_operation(AST_Operation *t)
-{
-  AST_Decl *d;
-
-  /*
-   * Can't add to interface which was not yet defined
-   */
-  if (!is_defined()) {
-    idl_global->err()->error2(UTL_Error::EIDL_DECL_NOT_DEFINED, this, t);
-    return NULL;
-  }
-  /*
-   * Already defined and cannot be redefined? Or already used?
-   */
-  if ((d = lookup_for_add(t, I_FALSE)) != NULL) {
-    if (!can_be_redefined(d)) {
-      idl_global->err()->error3(UTL_Error::EIDL_REDEF, t, this, d);
-      return NULL;
-    }
-    if (referenced(d)) {
-      idl_global->err()->error3(UTL_Error::EIDL_DEF_USE, t, this, d);
-      return NULL;
-    }
-    if (t->has_ancestor(d)) {
-      idl_global->err()->redefinition_in_scope(t, d);
-      return NULL;
-    }
-  }
-  /*
-   * Add it to scope
-   */
-  add_to_scope(t);
-  /*
-   * Add it to set of locally referenced symbols
-   */
-  add_to_referenced(t, I_FALSE);
-
-  return t;
-}
-
-/*
- * Add an AST_Structure (a struct declaration) to this scope
- */
-AST_Structure *AST_Interface::fe_add_structure(AST_Structure *t)
-{
-  AST_Decl *d;
-
-  /*
-   * Can't add to interface which was not yet defined
-   */
-  if (!is_defined()) {
-    idl_global->err()->error2(UTL_Error::EIDL_DECL_NOT_DEFINED, this, t);
-    return NULL;
-  }
-  /*
-   * Already defined and cannot be redefined? Or already used?
-   */
-  if ((d = lookup_for_add(t, I_FALSE)) != NULL) {
-    if (!can_be_redefined(d)) {
-      idl_global->err()->error3(UTL_Error::EIDL_REDEF, t, this, d);
-      return NULL;
-    }
-    if (referenced(d)) {
-      idl_global->err()->error3(UTL_Error::EIDL_DEF_USE, t, this, d);
-      return NULL;
-    }
-    if (t->has_ancestor(d)) {
-      idl_global->err()->redefinition_in_scope(t, d);
-      return NULL;
-    }
-  }
-  /*
-   * Add it to scope
-   */
-  add_to_scope(t);
-  /*
-   * Add it to set of locally referenced symbols
-   */
-  add_to_referenced(t, I_FALSE);
-
-  return t;
-}
-
-/*
- * Add an AST_Enum node (an enum declaration) to this scope
- */
-AST_Enum *AST_Interface::fe_add_enum(AST_Enum *t)
-{
-  AST_Decl *d;
-
-  /*
-   * Can't add to interface which was not yet defined
-   */
-  if (!is_defined()) {
-    idl_global->err()->error2(UTL_Error::EIDL_DECL_NOT_DEFINED, this, t);
-    return NULL;
-  }
-  /*
-   * Already defined and cannot be redefined? Or already used?
-   */
-  if ((d = lookup_for_add(t, I_FALSE)) != NULL) {
-    if (!can_be_redefined(d)) {
-      idl_global->err()->error3(UTL_Error::EIDL_REDEF, t, this, d);
-      return NULL;
-    }
-    if (referenced(d)) {
-      idl_global->err()->error3(UTL_Error::EIDL_DEF_USE, t, this, d);
-      return NULL;
-    }
-    if (t->has_ancestor(d)) {
-      idl_global->err()->redefinition_in_scope(t, d);
-      return NULL;
-    }
-  }
-  /*
-   * Add it to scope
-   */
-  add_to_scope(t);
-  /*
-   * Add it to set of locally referenced symbols
-   */
-  add_to_referenced(t, I_FALSE);
-
-  return t;
-}
-
-/*
- * Add an AST_Union (a union declaration) to this scope
- */
-AST_Union *AST_Interface::fe_add_union(AST_Union *t)
-{
-  AST_Decl *d;
-
-  /*
-   * Can't add to interface which was not yet defined
-   */
-  if (!is_defined()) {
-    idl_global->err()->error2(UTL_Error::EIDL_DECL_NOT_DEFINED, this, t);
-    return NULL;
-  }
-  /*
-   * Already defined and cannot be redefined? Or already used?
-   */
-  if ((d = lookup_for_add(t, I_FALSE)) != NULL) {
-    if (!can_be_redefined(d)) {
-      idl_global->err()->error3(UTL_Error::EIDL_REDEF, t, this, d);
-      return NULL;
-    }
-    if (referenced(d)) {
-      idl_global->err()->error3(UTL_Error::EIDL_DEF_USE, t, this, d);
-      return NULL;
-    }
-    if (t->has_ancestor(d)) {
-      idl_global->err()->redefinition_in_scope(t, d);
-      return NULL;
-    }
-  }
-  /*
-   * Add it to scope
-   */
-  add_to_scope(t);
-  /*
-   * Add it to set of locally referenced symbols
-   */
-  add_to_referenced(t, I_FALSE);
-
-  return t;
-}
-
-/*
- * Add an AST_EnumVal node (an enumerator) to this scope.
- * This is done to conform to the C++ scoping rules which declare
- * enumerators in the enclosing scope (in addition to declaring them
- * in the enum itself)
- */
-AST_EnumVal *AST_Interface::fe_add_enum_val(AST_EnumVal *t)
-{
-  AST_Decl *d;
-
-  /*
-   * Can't add to interface which was not yet defined
-   */
-  if (!is_defined()) {
-    idl_global->err()->error2(UTL_Error::EIDL_DECL_NOT_DEFINED, this, t);
-    return NULL;
-  }
-  /*
-   * Already defined and cannot be redefined? Or already used?
-   */
-  if ((d = lookup_for_add(t, I_FALSE)) != NULL) {
-    if (!can_be_redefined(d)) {
-      idl_global->err()->error3(UTL_Error::EIDL_REDEF, t, this, d);
-      return NULL;
-    }
-    if (referenced(d)) {
-      idl_global->err()->error3(UTL_Error::EIDL_DEF_USE, t, this, d);
-      return NULL;
-    }
-    if (t->has_ancestor(d)) {
-      idl_global->err()->redefinition_in_scope(t, d);
-      return NULL;
-    }
-  }
-  /*
-   * Add it to scope
-   */
-  add_to_scope(t);
-  /*
-   * Add it to set of locally referenced symbols
-   */
-  add_to_referenced(t, I_FALSE);
-
-  return t;
-}
-
-/*
- * Add an AST_Typedef (a typedef) to the current scope
- */
-AST_Typedef *AST_Interface::fe_add_typedef(AST_Typedef *t)
-{
-  AST_Decl *d;
-
-  /*
-   * Can't add to interface which was not yet defined
-   */
-  if (!is_defined()) {
-    idl_global->err()->error2(UTL_Error::EIDL_DECL_NOT_DEFINED, this, t);
-    return NULL;
-  }
-  /*
-   * Already defined and cannot be redefined? Or already used?
-   */
-  if ((d = lookup_for_add(t, I_FALSE)) != NULL) {
-    if (!can_be_redefined(d)) {
-      idl_global->err()->error3(UTL_Error::EIDL_REDEF, t, this, d);
-      return NULL;
-    }
-    if (referenced(d)) {
-      idl_global->err()->error3(UTL_Error::EIDL_DEF_USE, t, this, d);
-      return NULL;
-    }
-    if (t->has_ancestor(d)) {
-      idl_global->err()->redefinition_in_scope(t, d);
-      return NULL;
-    }
-  }
-  /*
-   * Add it to scope
-   */
-  add_to_scope(t);
-  /*
-   * Add it to set of locally referenced symbols
-   */
-  add_to_referenced(t, I_FALSE);
-
-  return t;
-}
-
-/*
- * Dump this AST_Interface node to the ostream o
- */
-void
-AST_Interface::dump(ostream &o)
-{
-  long	i;
-
-  o << "interface ";
-  local_name()->dump(o);
-  o << " ";
-  if (pd_n_inherits > 0) {
-    o << ": ";
-    for (i = 0; i < pd_n_inherits; i++) {
-      pd_inherits[i]->local_name()->dump(o);
-      if (i < pd_n_inherits - 1)
-	o << ", ";
-    }
-  }
-  o << " {\n";
-  UTL_Scope::dump(o);
-  idl_global->indent()->skip_to(o);
-  o << "}";
-}
-
-/*
- * Data accessors
- */
-
-AST_Interface	**
-AST_Interface::inherits()
-{
-  return pd_inherits;
-}
-
-void
-AST_Interface::set_inherits(AST_Interface **i)
-{
-  pd_inherits = i;
-}
-
-long
-AST_Interface::n_inherits()
-{
-  return pd_n_inherits;
-}
-
-void
-AST_Interface::set_n_inherits(long i)
-{
-  pd_n_inherits = i;
-}
-
-/*
- * Narrowing methods
- */
-IMPL_NARROW_METHODS2(AST_Interface, AST_Type, UTL_Scope)
-IMPL_NARROW_FROM_DECL(AST_Interface)
-IMPL_NARROW_FROM_SCOPE(AST_Interface)
diff --git a/TAO/TAO_IDL/ast/ast_interface_fwd.cpp b/TAO/TAO_IDL/ast/ast_interface_fwd.cpp
deleted file mode 100644
index 1382fb91468..00000000000
--- a/TAO/TAO_IDL/ast/ast_interface_fwd.cpp
+++ /dev/null
@@ -1,145 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-/*
- * ast_interface_fwd.cc - Implementation of class AST_InterfaceFwd
- *
- * AST_InterfaceFwd nodes denote forward declarations of IDL interfaces
- * AST_InterfaceFwd nodes have a field containing the full declaration
- * of the interface, which is initialized when that declaration is
- * encountered.
- */
-
-#include	"idl.h"
-#include	"idl_extern.h"
-
-/*
- * Constructor(s) and destructor
- */
-AST_InterfaceFwd::AST_InterfaceFwd()
-		: pd_full_definition(NULL)
-{
-}
-
-AST_InterfaceFwd::AST_InterfaceFwd(UTL_ScopedName *n, UTL_StrList *p)
-		 : AST_Decl(AST_Decl::NT_interface_fwd, n, p)
-{
-  /*
-   * Create a dummy placeholder for the forward declared interface. This
-   * interface node is not yet defined (n_inherits < 0), so some operations
-   * will fail
-   */
-  pd_full_definition = idl_global->gen()->create_interface(n, NULL, -1, p);
-  /*
-   * Record the node in a list to be checked after the entire AST has been
-   * parsed. All nodes in the list must have n_inherits >= 0, else this
-   * indicates that a full definition was not seen for this forward
-   * delcared interface
-   */
-  AST_record_fwd_interface(this);
-}
-
-/*
- * Private operations
- */
-
-/*
- * Public operations
- */
-
-/*
- * Redefinition of inherited virtual operations
- */
-
-/*
- * Dump this AST_InterfaceFwd node to the ostream o
- */
-void
-AST_InterfaceFwd::dump(ostream &o)
-{
-  o << "interface ";
-  local_name()->dump(o);
-}
-
-/*
- * Data accessors
- */
-
-AST_Interface	*
-AST_InterfaceFwd::full_definition()
-{
-  return pd_full_definition;
-}
-
-void
-AST_InterfaceFwd::set_full_definition(AST_Interface *nfd)
-{
-  pd_full_definition = nfd;
-}    
-
-/*
- * Narrowing methods 
- */
-IMPL_NARROW_METHODS1 (AST_InterfaceFwd, AST_Type)
-IMPL_NARROW_FROM_DECL (AST_InterfaceFwd)
diff --git a/TAO/TAO_IDL/ast/ast_module.cpp b/TAO/TAO_IDL/ast/ast_module.cpp
deleted file mode 100644
index 582fa267668..00000000000
--- a/TAO/TAO_IDL/ast/ast_module.cpp
+++ /dev/null
@@ -1,554 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-/*
- * ast_module.cc - Implementation of class AST_Module
- *
- * AST_Modules denote IDL module declarations
- * AST_Modules are subclasses of AST_Decl (they are not a type!) and
- * of UTL_Scope.
- */
-
-#include	"idl.h"
-#include	"idl_extern.h"
-
-/*
- * Constructor(s) and destructor
- */
-AST_Module::AST_Module()
-{
-}
-
-AST_Module::AST_Module(UTL_ScopedName *n, UTL_StrList *p)
-	 : AST_Decl(AST_Decl::NT_module, n, p),
-	   UTL_Scope(AST_Decl::NT_module)
-{
-}
-
-/*
- * Private operations
- */
-
-/*
- * Public operations
- */
-
-/*
- * Redefinition of inherited virtual operations
- */
-
-/*
- * Add this AST_PredefinedType node (a predefined type declaration) to
- * this scope
- */
-AST_PredefinedType *AST_Module::fe_add_predefined_type(AST_PredefinedType *t)
-{
-  AST_Decl *d;
-
-  /*
-   * Already defined and cannot be redefined? Or already used?
-   */
-  if ((d = lookup_for_add(t, I_FALSE)) != NULL) {
-    if (!can_be_redefined(d)) {
-      idl_global->err()->error3(UTL_Error::EIDL_REDEF, t, this, d);
-      return NULL;
-    }
-    if (referenced(d)) {
-      idl_global->err()->error3(UTL_Error::EIDL_DEF_USE, t, this, d);
-      return NULL;
-    }
-    if (t->has_ancestor(d)) {
-      idl_global->err()->redefinition_in_scope(t, d);
-      return NULL;
-    }
-  }
-  /*
-   * Add it to scope
-   */
-  add_to_scope(t);
-  /*
-   * Add it to set of locally referenced symbols
-   */
-  add_to_referenced(t, I_FALSE);
-
-  return t;
-}
-
-/*
- * Add this AST_Module node (a module declaration) to this scope
- */
-AST_Module *AST_Module::fe_add_module(AST_Module *t)
-{
-  AST_Decl *d;
-
-  /*
-   * Already defined and cannot be redefined? Or already used?
-   */
-  if ((d = lookup_for_add(t, I_FALSE)) != NULL) {
-    if (!can_be_redefined(d)) {
-      idl_global->err()->error3(UTL_Error::EIDL_REDEF, t, this, d);
-      return NULL;
-    }
-    if (referenced(d)) {
-      idl_global->err()->error3(UTL_Error::EIDL_DEF_USE, t, this, d);
-      return NULL;
-    }
-    if (t->has_ancestor(d)) {
-      idl_global->err()->redefinition_in_scope(t, d);
-      return NULL;
-    }
-  }
-  /*
-   * Add it to scope
-   */
-  add_to_scope(t);
-  /*
-   * Add it to set of locally referenced symbols
-   */
-  add_to_referenced(t, I_FALSE);
-
-  return t;
-}
-
-/*
- * Add this AST_Interface node (an interface declaration) to this scope
- */
-AST_Interface *AST_Module::fe_add_interface(AST_Interface *t)
-{
-  AST_Decl		*predef;
-  AST_Interface		*fwd;
-
-  /*
-   * Already defined?
-   */
-  if ((predef = lookup_for_add(t, I_FALSE)) != NULL) {
-    /*
-     * Treat fwd declared interfaces specially
-     */
-    if (predef->node_type() == AST_Decl::NT_interface) {
-      fwd = AST_Interface::narrow_from_decl(predef);
-
-      if (fwd == NULL)
-          return NULL;
-      
-      if (!fwd->is_defined()) {	/* Forward declared and not defined yet */
-	if (fwd->defined_in() != this) {
-	  idl_global->err()
-	     ->error3(UTL_Error::EIDL_SCOPE_CONFLICT, fwd, t, this);
-	  return NULL;
-        }
-      }
-      /*
-       * OK, not illegal redef of forward declaration. Now check whether
-       * it has been referenced already
-       */
-      else if (referenced(predef)) {
-        idl_global->err()->error3(UTL_Error::EIDL_DEF_USE, t, this, predef);
-	return NULL;
-      }
-    } else if (!can_be_redefined(predef)) {
-      idl_global->err()->error3(UTL_Error::EIDL_REDEF, t, this, predef);
-      return NULL;
-    } else if (referenced(predef)) {
-      idl_global->err()->error3(UTL_Error::EIDL_DEF_USE, t, this, predef);
-      return NULL;
-    } else if (t->has_ancestor(predef)) {
-      idl_global->err()->redefinition_in_scope(t, predef);
-      return NULL;
-    }
-  }
-  /*
-   * Add it to scope
-   */
-  add_to_scope(t);
-  /*
-   * Add it to set of locally referenced symbols
-   */
-  add_to_referenced(t, I_FALSE);
-
-  return t;
-}
-
-/*
- * Add this AST_InterfaceFwd node (a forward declaration of an IDL
- * interface) to this scope
- */
-AST_InterfaceFwd *AST_Module::fe_add_interface_fwd(AST_InterfaceFwd *i)
-{
-  AST_Decl	*d;
-  AST_Interface	*itf;
-
-  /*
-   * Already defined and cannot be redefined? Or already used?
-   */
-  if ((d = lookup_for_add(i, I_FALSE)) != NULL) {
-    if (d->node_type() == AST_Decl::NT_interface &&
-	d->defined_in() == this) {
-      itf = AST_Interface::narrow_from_decl(d);
-      if (itf == NULL)
-          return NULL;
-      
-      i->set_full_definition(itf);
-      return i;
-    }
-    if (!can_be_redefined(d)) {
-      idl_global->err()->error3(UTL_Error::EIDL_REDEF, i, this, d);
-      return NULL;
-    }
-    if (referenced(d)) {
-      idl_global->err()->error3(UTL_Error::EIDL_DEF_USE, i, this, d);
-      return NULL;
-    }
-    if (i->has_ancestor(d)) {
-      idl_global->err()->redefinition_in_scope(i, d);
-      return NULL;
-    }
-  }
-  /*
-   * Add it to scope
-   */
-  add_to_scope(i);
-  /*
-   * Add it to set of locally referenced symbols
-   */
-  add_to_referenced(i, I_FALSE);
-
-  return i;
-}
-
-/*
- * Add this AST_Constant node (a constant declaration) to this scope
- */
-AST_Constant *AST_Module::fe_add_constant(AST_Constant *t)
-{
-  AST_Decl *d;
-
-  /*
-   * Already defined and cannot be redefined? Or already used?
-   */
-  if ((d = lookup_for_add(t, I_FALSE)) != NULL) {
-    if (!can_be_redefined(d)) {
-      idl_global->err()->error3(UTL_Error::EIDL_REDEF, t, this, d);
-      return NULL;
-    }
-    if (referenced(d)) {
-      idl_global->err()->error3(UTL_Error::EIDL_DEF_USE, t, this, d);
-      return NULL;
-    }
-    if (t->has_ancestor(d)) {
-      idl_global->err()->redefinition_in_scope(t, d);
-      return NULL;
-    }
-  }
-  /*
-   * Add it to scope
-   */
-  add_to_scope(t);
-  /*
-   * Add it to set of locally referenced symbols
-   */
-  add_to_referenced(t, I_FALSE);
-
-  return t;
-}
-
-/*
- * Add this AST_Exception node (an exception declaration) to this scope
- */
-AST_Exception *AST_Module::fe_add_exception(AST_Exception *t)
-{
-  AST_Decl *d;
-
-  /*
-   * Already defined and cannot be redefined? Or already used?
-   */
-  if ((d = lookup_for_add(t, I_FALSE)) != NULL) {
-    if (!can_be_redefined(d)) {
-      idl_global->err()->error3(UTL_Error::EIDL_REDEF, t, this, d);
-      return NULL;
-    }
-    if (referenced(d)) {
-      idl_global->err()->error3(UTL_Error::EIDL_DEF_USE, t, this, d);
-      return NULL;
-    }
-    if (t->has_ancestor(d)) {
-      idl_global->err()->redefinition_in_scope(t, d);
-      return NULL;
-    }
-  }
-  /*
-   * Add it to scope
-   */
-  add_to_scope(t);
-  /*
-   * Add it to set of locally referenced symbols
-   */
-  add_to_referenced(t, I_FALSE);
-
-  return t;
-}
-
-/*
- * Add this AST_Union node (a union declaration) to this scope
- */
-AST_Union *AST_Module::fe_add_union(AST_Union *t)
-{
-  AST_Decl *d;
-
-  /*
-   * Already defined and cannot be redefined? Or already used?
-   */
-  if ((d = lookup_for_add(t, I_FALSE)) != NULL) {
-    if (!can_be_redefined(d)) {
-      idl_global->err()->error3(UTL_Error::EIDL_REDEF, t, this, d);
-      return NULL;
-    }
-    if (referenced(d)) {
-      idl_global->err()->error3(UTL_Error::EIDL_DEF_USE, t, this, d);
-      return NULL;
-    }
-    if (t->has_ancestor(d)) {
-      idl_global->err()->redefinition_in_scope(t, d);
-      return NULL;
-    }
-  }
-  /*
-   * Add it to scope
-   */
-  add_to_scope(t);
-  /*
-   * Add it to set of locally referenced symbols
-   */
-  add_to_referenced(t, I_FALSE);
-
-  return t;
-}
-
-/*
- * Add this AST_Structure node (a struct declaration) to this scope
- */
-AST_Structure *AST_Module::fe_add_structure(AST_Structure *t)
-{
-  AST_Decl *d;
-
-  /*
-   * Already defined and cannot be redefined? Or already used?
-   */
-  if ((d = lookup_for_add(t, I_FALSE)) != NULL) {
-    if (!can_be_redefined(d)) {
-      idl_global->err()->error3(UTL_Error::EIDL_REDEF, t, this, d);
-      return NULL;
-    }
-    if (referenced(d)) {
-      idl_global->err()->error3(UTL_Error::EIDL_DEF_USE, t, this, d);
-      return NULL;
-    }
-    if (t->has_ancestor(d)) {
-      idl_global->err()->redefinition_in_scope(t, d);
-      return NULL;
-    }
-  }
-  /*
-   * Add it to scope
-   */
-  add_to_scope(t);
-  /*
-   * Add it to set of locally referenced symbols
-   */
-  add_to_referenced(t, I_FALSE);
-
-  return t;
-}
-
-/*
- * Add this AST_Enum node (an enum declaration) to this scope
- */
-AST_Enum *AST_Module::fe_add_enum(AST_Enum *t)
-{
-  AST_Decl *d;
-
-  /*
-   * Already defined and cannot be redefined? Or already used?
-   */
-  if ((d = lookup_for_add(t, I_FALSE)) != NULL) {
-    if (!can_be_redefined(d)) {
-      idl_global->err()->error3(UTL_Error::EIDL_REDEF, t, this, d);
-      return NULL;
-    }
-    if (referenced(d)) {
-      idl_global->err()->error3(UTL_Error::EIDL_DEF_USE, t, this, d);
-      return NULL;
-    }
-    if (t->has_ancestor(d)) {
-      idl_global->err()->redefinition_in_scope(t, d);
-      return NULL;
-    }
-  }
-  /*
-   * Add it to scope
-   */
-  add_to_scope(t);
-  /*
-   * Add it to set of locally referenced symbols
-   */
-  add_to_referenced(t, I_FALSE);
-
-  return t;
-}
-
-/*
- * Add this AST_EnumVal node (an enumerator declaration) to this scope
- * This is done to conform to the C++ scoping rules which declare
- * enumerators in the enclosing scope (in addition to declaring them
- * in the enum itself)
- */
-AST_EnumVal *AST_Module::fe_add_enum_val(AST_EnumVal *t)
-{
-  AST_Decl *d;
-
-  /*
-   * Already defined and cannot be redefined? Or already used?
-   */
-  if ((d = lookup_for_add(t, I_FALSE)) != NULL) {
-    if (!can_be_redefined(d)) {
-      idl_global->err()->error3(UTL_Error::EIDL_REDEF, t, this, d);
-      return NULL;
-    }
-    if (referenced(d)) {
-      idl_global->err()->error3(UTL_Error::EIDL_DEF_USE, t, this, d);
-      return NULL;
-    }
-    if (t->has_ancestor(d)) {
-      idl_global->err()->redefinition_in_scope(t, d);
-      return NULL;
-    }
-  }
-  /*
-   * Add it to scope
-   */
-  add_to_scope(t);
-  /*
-   * Add it to set of locally referenced symbols
-   */
-  add_to_referenced(t, I_FALSE);
-
-  return t;
-}
-
-/*
- * Add this AST_Typedef node (a typedef) to this scope
- */
-AST_Typedef *AST_Module::fe_add_typedef(AST_Typedef *t)
-{
-  AST_Decl *d;
-
-  /*
-   * Already defined and cannot be redefined? Or already used?
-   */
-  if ((d = lookup_for_add(t, I_FALSE)) != NULL) {
-    if (!can_be_redefined(d)) {
-      idl_global->err()->error3(UTL_Error::EIDL_REDEF, t, this, d);
-      return NULL;
-    }
-    if (referenced(d)) {
-      idl_global->err()->error3(UTL_Error::EIDL_DEF_USE, t, this, d);
-      return NULL;
-    }
-    if (t->has_ancestor(d)) {
-      idl_global->err()->redefinition_in_scope(t, d);
-      return NULL;
-    }
-  }
-  /*
-   * Add it to scope
-   */
-  add_to_scope(t);
-  /*
-   * Add it to set of locally referenced symbols
-   */
-  add_to_referenced(t, I_FALSE);
-
-  return t;
-}
-
-/*
- * Dump this AST_Module node to the ostream o
- */
-void
-AST_Module::dump(ostream &o)
-{
-  o << "module ";
-  local_name()->dump(o);
-  o << " {\n";
-  UTL_Scope::dump(o);
-  idl_global->indent()->skip_to(o);
-  o << "}";
-}
-
-/*
- * Narrowing methods
- */
-IMPL_NARROW_METHODS2(AST_Module, AST_Decl, UTL_Scope)
-IMPL_NARROW_FROM_DECL(AST_Module)
-IMPL_NARROW_FROM_SCOPE(AST_Module)
diff --git a/TAO/TAO_IDL/ast/ast_operation.cpp b/TAO/TAO_IDL/ast/ast_operation.cpp
deleted file mode 100644
index 288c268d49e..00000000000
--- a/TAO/TAO_IDL/ast/ast_operation.cpp
+++ /dev/null
@@ -1,326 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-/*
- * ast_operation.cc - Implementation of class AST_Operation
- *
- * AST_Operation nodes denote IDL operation declarations
- * AST_Operations are a subclass of AST_Decl (they are not a type!)
- * and of UTL_Scope (the arguments are managed in a scope).
- * AST_Operations have a return type (a subclass of AST_Type),
- * a bitfield for denoting various properties of the operation (the
- * values are ORed together from constants defined in the enum
- * AST_Operation::FLags), a name (a UTL_ScopedName), a context
- * (implemented as a list of Strings, a UTL_StrList), and a raises
- * clause (implemented as an array of AST_Exceptions).
- */
-
-#include	"idl.h"
-#include	"idl_extern.h"
-
-/*
- * Constructor(s) and destructor
- */
-AST_Operation::AST_Operation()
-  : pd_return_type(NULL),
-    pd_flags(OP_noflags),
-    pd_context(NULL),
-    pd_exceptions(NULL)
-{
-}
-
-AST_Operation::AST_Operation(AST_Type *rt, Flags fl, UTL_ScopedName *n,
-			   UTL_StrList *p)
-  : pd_return_type(rt),
-    pd_flags(fl),
-    pd_context(NULL),
-    pd_exceptions(NULL),
-    AST_Decl(AST_Decl::NT_op, n, p),
-    UTL_Scope(AST_Decl::NT_op)
-{
-  AST_PredefinedType *pdt;
-
-  /*
-   * Check that if the operation is oneway, the return type must be void
-   */
-  if (rt != NULL && pd_flags == OP_oneway) {
-    if (rt->node_type() != AST_Decl::NT_pre_defined)
-      idl_global->err()->error1(UTL_Error::EIDL_NONVOID_ONEWAY, this);
-    else {
-      pdt = AST_PredefinedType::narrow_from_decl(rt);
-      if (pdt == NULL || pdt->pt() != AST_PredefinedType::PT_void)
-        idl_global->err()->error1(UTL_Error::EIDL_NONVOID_ONEWAY, this);
-    }
-  }
-}
-
-/*
- * Private operations
- */
-
-/*
- * Public operations
- */
-
-/*
- * Redefinition of inherited virtual operations
- */
-
-/*
- * Add this context (a UTL_StrList) to this scope
- */
-UTL_StrList *
-AST_Operation::fe_add_context(UTL_StrList *t)
-{
-  pd_context = t;
-
-  return t;
-}
-
-/*
- * Add these exceptions (identified by name) to this scope.
- * This looks up each name to resolve it to the name of a known
- * exception, and then adds the referenced exception to the list
- * of exceptions that this operation can raise.
- *
- * NOTE: No attempt is made to ensure that exceptions are mentioned
- *       only once..
- */
-UTL_NameList *
-AST_Operation::fe_add_exceptions(UTL_NameList *t)
-{
-  UTL_NamelistActiveIterator *nl_i;
-  UTL_ScopedName	     *nl_n;
-  UTL_Scope		     *fs = idl_global->scopes()->top();
-  AST_Exception		     *fe;
-  AST_Decl		     *d;
-
-  // Macro to avoid "warning: unused parameter" type warning.
-  ACE_UNUSED_ARG (fs);
-
-  pd_exceptions = NULL;
-  nl_i = new UTL_NamelistActiveIterator(t);
-  while (!(nl_i->is_done())) {
-    nl_n = nl_i->item();
-    d = lookup_by_name(nl_n, I_TRUE);
-    if (d == NULL || d->node_type() != AST_Decl::NT_except) {
-      idl_global->err()->lookup_error(nl_n);
-      delete nl_i;
-      return NULL;
-    }
-    fe = AST_Exception::narrow_from_decl(d);
-    if (fe == NULL) {
-      idl_global->err()->error1(UTL_Error::EIDL_ILLEGAL_RAISES, this);
-      return NULL;
-    }
-    if (pd_exceptions == NULL)
-      pd_exceptions = new UTL_ExceptList(fe, NULL);
-    else
-      pd_exceptions->nconc(new UTL_ExceptList(fe, NULL));
-    nl_i->next();
-  }
-  delete nl_i;
-
-  return t;
-}
-
-/*
- * Add this AST_Argument node (an operation argument declaration)
- * to this scope
- */
-AST_Argument *AST_Operation::fe_add_argument(AST_Argument *t)
-{
-  AST_Decl *d;
-
-  /*
-   * Already defined and cannot be redefined? Or already used?
-   */
-  if ((d = lookup_by_name_local(t->local_name(), I_FALSE)) != NULL) {
-    if (!can_be_redefined(d)) {
-      idl_global->err()->error3(UTL_Error::EIDL_REDEF, t, this, d);
-      return NULL;
-    }
-    if (referenced(d)) {
-      idl_global->err()->error3(UTL_Error::EIDL_DEF_USE, t, this, d);
-      return NULL;
-    }
-    if (t->has_ancestor(d)) {
-      idl_global->err()->redefinition_in_scope(t, d);
-      return NULL;
-    }
-  }
-  /*
-   * Cannot add OUT or INOUT argument to oneway operation
-   */
-  if ((t->direction() == AST_Argument::dir_OUT ||
-       t->direction() == AST_Argument::dir_INOUT) &&
-      pd_flags == OP_oneway) {
-    idl_global->err()->error2(UTL_Error::EIDL_ONEWAY_CONFLICT, t, this);
-    return NULL;
-  }
-  /*
-   * Add it to scope
-   */
-  add_to_scope(t);
-  /*
-   * Add it to set of locally referenced symbols
-   */
-  add_to_referenced(t, I_FALSE);
-
-  return t;
-}
-
-/*
- * Dump this AST_Operation node (an operation) to the ostream o
- */
-void
-AST_Operation::dump(ostream &o)
-{
-  UTL_ScopeActiveIterator   *i;
-  UTL_StrlistActiveIterator *si;
-  UTL_ExceptlistActiveIterator *ei;
-  AST_Decl		    *d;
-  AST_Exception		    *e;
-  String		    *s;
-
-  if (pd_flags == OP_oneway)
-    o << "oneway ";
-  else if (pd_flags == OP_idempotent)
-    o << "idempotent ";
-
-  i = new UTL_ScopeActiveIterator(this, IK_decls);
-  pd_return_type->name()->dump(o);
-  o << " ";
-  local_name()->dump(o);
-  o << "(";
-  while (!(i->is_done())) {
-    d = i->item();
-    d->dump(o);
-    i->next();
-    if (!(i->is_done()))
-      o << ", ";
-  }
-  delete i;
-  o << ")";
-
-  if (pd_exceptions != NULL) {
-    o << " raises(";
-    ei = new UTL_ExceptlistActiveIterator(pd_exceptions);
-    while (!(ei->is_done())) {
-      e = ei->item();
-      ei->next();
-      e->local_name()->dump(o);
-      if (!(ei->is_done()))
-	o << ", ";
-    }
-    delete ei;
-    o << ")";
-  }
-  if (pd_context != NULL) {
-    o << " context(";
-    si = new UTL_StrlistActiveIterator(pd_context);
-    while (!(si->is_done())) {
-      s = si->item();
-      si->next();
-      o << s->get_string();
-      if (!(si->is_done()))
-	o << ", ";
-    }
-    delete si;
-    o << ")";
-  }    
-}
-
-/*
- * Data accessors
- */
-
-AST_Type *
-AST_Operation::return_type()
-{
-  return pd_return_type;
-}
-
-AST_Operation::Flags
-AST_Operation::flags()
-{
-  return pd_flags;
-}
-
-UTL_StrList *
-AST_Operation::context()
-{
-  return pd_context;
-}
-
-UTL_ExceptList *
-AST_Operation::exceptions()
-{
-  return pd_exceptions;
-}
-
-// Narrowing
-IMPL_NARROW_METHODS2(AST_Operation, AST_Decl, UTL_Scope)
-IMPL_NARROW_FROM_DECL(AST_Operation)
-IMPL_NARROW_FROM_SCOPE(AST_Operation)
diff --git a/TAO/TAO_IDL/ast/ast_predefined_type.cpp b/TAO/TAO_IDL/ast/ast_predefined_type.cpp
deleted file mode 100644
index 3e0d868bdce..00000000000
--- a/TAO/TAO_IDL/ast/ast_predefined_type.cpp
+++ /dev/null
@@ -1,128 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-/*
- * ast_predefined_type.cc - Implementation of class AST_PredefinedType
- *
- * AST_PredefinedType nodes denote the various predefined types such
- * as long, short, etc. that are available in IDL. Each AST_PredefinedType
- * node has a field (the value of this field is from the enum
- * AST_PredefinedType::PredefinedType) which denotes the specific predefined
- * type that this node represents. There is only one node in the entire
- * AST which represents each predefined type, such as long etc.
- */
-
-#include	"idl.h"
-#include	"idl_extern.h"
-
-/*
- * Constructor(s)
- */
-AST_PredefinedType::AST_PredefinedType()
-		  : pd_pt(PT_long)
-{
-}
-
-AST_PredefinedType::AST_PredefinedType(PredefinedType t, UTL_ScopedName *n,
-				       UTL_StrList *p)
-		   : AST_Decl(AST_Decl::NT_pre_defined, n, p),
-		     pd_pt(t)
-{
-}
-
-/*
- * Private operations
- */
-
-/*
- * Public operations
- */
-
-
-/*
- * Redefinition of inherited virtual operations
- */
-
-/*
- * Dump this AST_PredefinedType node to the ostream o
- */
-void
-AST_PredefinedType::dump(ostream &o)
-{
-  AST_Decl::dump(o);
-}
-
-/*
- * Data accessors
- */
-
-AST_PredefinedType::PredefinedType
-AST_PredefinedType::pt()
-{
-  return pd_pt;
-}
-
-// Narrowing
-IMPL_NARROW_METHODS1(AST_PredefinedType, AST_ConcreteType)
-IMPL_NARROW_FROM_DECL(AST_PredefinedType)
diff --git a/TAO/TAO_IDL/ast/ast_recursive.cpp b/TAO/TAO_IDL/ast/ast_recursive.cpp
deleted file mode 100644
index 6a904999b63..00000000000
--- a/TAO/TAO_IDL/ast/ast_recursive.cpp
+++ /dev/null
@@ -1,165 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-/*
- * ast_recursive.cc - Check whether a type is used recursively in a situation
- *		      where this use would be illegal.
- *
- * EXPLANATION: The CORBAS says that the only legal use of recursive types is
- * in a manifest sequence declared inside a struct or union whose base type is
- * the struct or union
- *
- * ALGORITH FOR CHECK:
- * Sequences push a NULL on the scope stack to mark where in the scope nesting
- * they appear.
- *
- * - If the type is not a struct or union, return FALSE (legal use of type)
- * - Otherwise check up the scope stack, looking for this base type. If we
- *   find a NULL return FALSE (legal use of type, since it is inside some
- *   sequence). If we find the type on the stack, return TRUE (illegal use
- *   since it was not bracketed by a sequence). If we don't find the base
- *   type nor a sequence, return FALSE (legal use, since we're not nested).
- */
-
-#include	"idl.h"
-#include	"idl_extern.h"
-
-/*
- * FE_illegal_recursive_type() - Implement the algorithm described above
- */
-idl_bool
-AST_illegal_recursive_type(AST_Decl *t)
-{
-  UTL_ScopeStackActiveIterator *i = 0;
-  UTL_Scope		       *s = 0;
-  AST_Structure		       *st1 = 0, *st2 = 0;
-  AST_Union		       *un1 = 0, *un2 = 0;
-  idl_bool		       check_for_struct = I_FALSE,
-			       check_for_union = I_FALSE;
-
-  if (t == NULL) return I_FALSE;
-  
-  /*
-   * We only care about structs and unions
-   */
-  if (t->node_type() != AST_Decl::NT_struct &&
-      t->node_type() != AST_Decl::NT_union)
-    return I_FALSE;	// NOT ILLEGAL
-  /*
-   * Narrow the type appropriately so comparison will work
-   */
-  if (t->node_type() == AST_Decl::NT_struct) {
-    check_for_struct = I_TRUE;
-    st1 = AST_Structure::narrow_from_decl(t);
-    if (st1 == NULL)
-      return I_FALSE;	// NOT ILLEGAL
-  } else if (t->node_type() == AST_Decl::NT_union) {
-    check_for_union = I_TRUE;
-    un1 = AST_Union::narrow_from_decl(t);
-    if (un1 == NULL)
-      return I_FALSE;	// NOT ILLEGAL
-  }
-  /*
-   * OK, iterate up the stack
-   */
-  i = new UTL_ScopeStackActiveIterator(idl_global->scopes());
-  while (!(i->is_done())) {
-    s = i->item();
-    /*
-     * If we hit a NULL we're done since it means that we're nested inside
-     * a sequence, where recursive types may be used
-     */
-    if (s == NULL) {
-      delete i;
-      return I_FALSE;	// NOT ILLEGAL
-    }
-    /*
-     * OK, must check this scope
-     */
-    if (s->scope_node_type() == AST_Decl::NT_struct && check_for_struct) {
-      st2 = AST_Structure::narrow_from_scope(s);
-      if (st2 != NULL && st2 == st1) {
-	delete i;
-        return I_TRUE;	// ILLEGAL RECURSIVE TYPE USE
-      }
-    } else if (s->scope_node_type() == AST_Decl::NT_union &&
-	       check_for_union) {
-      un2 = AST_Union::narrow_from_scope(s);
-      if (un2 != NULL && un2 == un1) {
-        delete i;
-	return I_TRUE;	// ILLEGAL RECURSIVE TYPE USE
-      }
-    }
-    /*
-     * This one is fine, get next item
-     */
-    i->next();
-  }
-  /*
-   * No more scopes to check. This type was used legally
-   */
-  delete i;
-  return I_FALSE;		// NOT ILLEGAL
-}
-
diff --git a/TAO/TAO_IDL/ast/ast_redef.cpp b/TAO/TAO_IDL/ast/ast_redef.cpp
deleted file mode 100644
index 6567e90ebbf..00000000000
--- a/TAO/TAO_IDL/ast/ast_redef.cpp
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-/*
- * ast_redef.cc - Implement utility function to decide when redefinition
- * 		  is allowed
- */
-
-#include	"idl.h"
-#include	"idl_extern.h"
-
-/*
- * Return TRUE if the node d represents an IDL construct whose name
- * can be redefined.
- */
-idl_bool
-can_be_redefined(AST_Decl *d)
-{
-  switch (d->node_type()) {
-  case AST_Decl::NT_module:
-  case AST_Decl::NT_interface:
-  case AST_Decl::NT_interface_fwd:
-  case AST_Decl::NT_const:
-  case AST_Decl::NT_except:
-  case AST_Decl::NT_argument:
-  case AST_Decl::NT_enum_val:
-  case AST_Decl::NT_string:
-  case AST_Decl::NT_array:
-  case AST_Decl::NT_sequence:
-  case AST_Decl::NT_union:
-  case AST_Decl::NT_struct:
-  case AST_Decl::NT_enum:
-  case AST_Decl::NT_typedef:
-    return I_TRUE;
-
-  case AST_Decl::NT_union_branch:
-  case AST_Decl::NT_field:
-  case AST_Decl::NT_attr:
-  case AST_Decl::NT_op:
-  case AST_Decl::NT_pre_defined:
-  default:
-    return I_FALSE;
-  }
-}
-
diff --git a/TAO/TAO_IDL/ast/ast_root.cpp b/TAO/TAO_IDL/ast/ast_root.cpp
deleted file mode 100644
index 2af71a474b5..00000000000
--- a/TAO/TAO_IDL/ast/ast_root.cpp
+++ /dev/null
@@ -1,164 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-/*
- * ast_root.cc - Implementation of class AST_Root
- *
- * AST_Root nodes represent the roots of ASTs.
- * AST_Root is a subclass of AST_Module, and is defined to allow BEs
- * to subclass it to associate their own information with an entire
- * AST.
- */
-
-#include	"idl.h"
-#include	"idl_extern.h"
-
-/*
- * Constructor(s) and destructor
- */
-AST_Root::AST_Root()
-{
-}
-
-AST_Root::AST_Root(UTL_ScopedName *n, UTL_StrList *p)
-	: AST_Decl(AST_Decl::NT_module, n, p),
-	  UTL_Scope(AST_Decl::NT_module)
-{
-}
-
-/*
- * Private operations
- */
-
-/*
- * Public operations
- */
-
-/*
- * Add protocol
- */
-
-/*
- * Add this AST_Sequence to the locally defined types in this scope
- */
-AST_Sequence *
-AST_Root::fe_add_sequence(AST_Sequence *t)
-{
-  if (t == NULL)
-    return NULL;
-  t->set_name(new UTL_ScopedName(new Identifier("local type", 1, 0, I_FALSE),
-				 NULL));
-  add_to_local_types(t);
-  return t;
-}
-
-/*
- * Add this AST_String to the locally defined types in this scope
- */
-AST_String *
-AST_Root::fe_add_string(AST_String *t)
-{
-  if (t == NULL)
-    return NULL;
-  t->set_name(new UTL_ScopedName(new Identifier("local type", 1, 0, I_FALSE),
-				 NULL));
-  add_to_local_types(t);
-
-  return t;
-}
-
-/*
- * Add this AST_Array to the locally defined types in this scope
- */
-AST_Array *
-AST_Root::fe_add_array(AST_Array *t)
-{
-  if (t == NULL)
-    return NULL;
-  t->set_name(new UTL_ScopedName(new Identifier("local type",1,0,I_FALSE),
-				 NULL));
-  add_to_local_types(t);
-
-  return t;
-}
-
-/*
- * Redefinition of inherited virtual operations
- */
-
-/*
- * Dump this AST_Root node to the ostream o
- */
-void
-AST_Root::dump(ostream &o)
-{
-  UTL_Scope::dump(o);
-}
-
-/*
- * Narrowing methods
- */
-IMPL_NARROW_METHODS1(AST_Root, AST_Module)
-IMPL_NARROW_FROM_DECL(AST_Root)
-IMPL_NARROW_FROM_SCOPE(AST_Root)
diff --git a/TAO/TAO_IDL/ast/ast_sequence.cpp b/TAO/TAO_IDL/ast/ast_sequence.cpp
deleted file mode 100644
index fb170005dfd..00000000000
--- a/TAO/TAO_IDL/ast/ast_sequence.cpp
+++ /dev/null
@@ -1,141 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-/*
- * ast_sequence.cc - Implementation of class AST_Sequence
- *
- * AST_Sequence nodes represent IDL sequence declarations.
- * AST_Sequence is a subclass of AST_ConcreteType.
- * AST_Sequence nodes have a maximum size (an AST_Expression which
- * must evaluate to a positive integer) and a base type (a subclass
- * of AST_Type).
- */
-
-#include	"idl.h"
-#include	"idl_extern.h"
-
-/*
- * Constructor(s) and destructor
- */
-AST_Sequence::AST_Sequence()
-	    : pd_max_size(0),
-	      pd_base_type(NULL)
-{
-}
-
-AST_Sequence::AST_Sequence(AST_Expression *ms, AST_Type *bt)
-	    : pd_max_size(ms),
-	      pd_base_type(bt),
-	      AST_Decl(AST_Decl::NT_sequence,
-		       new UTL_ScopedName(
-				      new Identifier("sequence",1,0,I_FALSE),
-				      NULL),
-		       NULL)
-{
-}
-
-/*
- * Private operations
- */
-
-/*
- * Public operations
- */
-
-/*
- * Redefinition of inherited virtual operations
- */
-
-/*
- * Dump this AST_Sequence node to the ostream o
- */
-void
-AST_Sequence::dump(ostream &o)
-{
-  o << "sequence <";
-  pd_base_type->dump(o);
-  o << ", ";
-  pd_max_size->dump(o);
-  o << ">";
-}
-
-/*
- * Data accessors
- */
-
-AST_Expression *
-AST_Sequence::max_size()
-{
-  return pd_max_size;
-}
-
-AST_Type *
-AST_Sequence::base_type()
-{
-  return pd_base_type;
-}
-
-// Narrowing
-IMPL_NARROW_METHODS1(AST_Sequence, AST_ConcreteType)
-IMPL_NARROW_FROM_DECL(AST_Sequence)
diff --git a/TAO/TAO_IDL/ast/ast_string.cpp b/TAO/TAO_IDL/ast/ast_string.cpp
deleted file mode 100644
index 092955866a3..00000000000
--- a/TAO/TAO_IDL/ast/ast_string.cpp
+++ /dev/null
@@ -1,149 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-/*
- * ast_string.cc - Implementation of class AST_String
- *
- * AST_String nodes represent IDL string declarations.
- * AST_String is a subclass of AST_ConcreteType.
- * AST_String nodes have a maximum size (an AST_Expression which must
- * evaluate to a positive integer).
- */
-
-#include	"idl.h"
-#include	"idl_extern.h"
-
-/*
- * Constructor(s) and destructor
- */
-AST_String::AST_String()
-	  : pd_max_size(0), pd_width(1)
-{
-}
-
-AST_String::AST_String(AST_Expression *ms)
-	  : pd_max_size(ms), pd_width(sizeof(char)),
-	    AST_Decl(AST_Decl::NT_string,
-		     new UTL_ScopedName(new Identifier("string",1,0,I_FALSE),
-					NULL),
-		     NULL)
-{
-}
-
-AST_String::AST_String(AST_Expression *ms, long wide)
-	  : pd_max_size(ms), pd_width(wide),
-	    AST_Decl(AST_Decl::NT_string,
-		     new UTL_ScopedName(wide == sizeof(char)
-					? new Identifier("string",1,0,I_FALSE)
-					: new Identifier("wstring_t",
-                                                         1,
-                                                         0,
-                                                         I_FALSE),
-					NULL),
-		     NULL)
-{
-}
-
-/*
- * Private operations
- */
-
-/*
- * Public operations
- */
-
-/*
- * Redefinition of inherited virtual operations
- */
-
-/*
- * Dump this AST_String node to the ostream o
- */
-void
-AST_String::dump(ostream &o)
-{
-  o << "string <";
-  pd_max_size->dump(o);
-  o << ">";
-}
-
-/*
- * Data accessors
- */
-
-AST_Expression *
-AST_String::max_size()
-{
-  return pd_max_size;
-}
-
-long
-AST_String::width()
-{
-  return pd_width;
-}
-
-// Narrowing
-IMPL_NARROW_METHODS1(AST_String, AST_ConcreteType)
-IMPL_NARROW_FROM_DECL(AST_String)
diff --git a/TAO/TAO_IDL/ast/ast_structure.cpp b/TAO/TAO_IDL/ast/ast_structure.cpp
deleted file mode 100644
index e821569c05d..00000000000
--- a/TAO/TAO_IDL/ast/ast_structure.cpp
+++ /dev/null
@@ -1,309 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-/*
- * ast_structure.cc - Implementation of class AST_Structure
- *
- * AST_Structure nodes denote IDL struct declarations.
- * AST_Structure is a subclass of AST_ConcreteType and of UTL_Scope (the
- * structure's fields are managed in a scope).
- */
-
-#include	"idl.h"
-#include	"idl_extern.h"
-
-/*
- * Constructor(s) and destructor
- */
-AST_Structure::AST_Structure()
-{
-}
-
-AST_Structure::AST_Structure(UTL_ScopedName *n, UTL_StrList *p)
-	     : AST_Decl(AST_Decl::NT_struct, n, p),
-	       UTL_Scope(AST_Decl::NT_struct)
-{
-}
-
-AST_Structure::AST_Structure(AST_Decl::NodeType nt,
-			     UTL_ScopedName *n,
-			     UTL_StrList *p)
-	     : AST_Decl(nt, n, p),
-	       UTL_Scope(nt)
-{
-}
-
-/*
- * Private operations
- */
-
-/*
- * Public operations
- */
-
-/*
- * Redefinition of inherited virtual operations
- */
-
-/*
- * Add this AST_Field node (a field declaration) to this scope
- */
-AST_Field *AST_Structure::fe_add_field(AST_Field *t)
-{
-  AST_Decl *d;
-
-  /*
-   * Already defined and cannot be redefined? Or already used?
-   */
-  if ((d = lookup_for_add(t, I_FALSE)) != NULL) {
-    if (!can_be_redefined(d)) {
-      idl_global->err()->error3(UTL_Error::EIDL_REDEF, t, this, d);
-      return NULL;
-    }
-    if (referenced(d)) {
-      idl_global->err()->error3(UTL_Error::EIDL_DEF_USE, t, this, d);
-      return NULL;
-    }
-    if (t->has_ancestor(d)) {
-      idl_global->err()->redefinition_in_scope(t, d);
-      return NULL;
-    }
-  }
-  /*
-   * Add it to scope
-   */
-  add_to_scope(t);
-  /*
-   * Add it to set of locally referenced symbols
-   */
-  add_to_referenced(t, I_FALSE);
-
-  return t;
-}
-
-/*
- * Add an AST_Structure node (a manifest struct type) to this scope
- */
-AST_Structure *AST_Structure::fe_add_structure(AST_Structure *t)
-{
-  AST_Decl *d;
-
-  /*
-   * Already defined and cannot be redefined? Or already used?
-   */
-  if ((d = lookup_for_add(t, I_FALSE)) != NULL) {
-    if (!can_be_redefined(d)) {
-      idl_global->err()->error3(UTL_Error::EIDL_REDEF, t, this, d);
-      return NULL;
-    }
-    if (referenced(d)) {
-      idl_global->err()->error3(UTL_Error::EIDL_DEF_USE, t, this, d);
-      return NULL;
-    }
-    if (t->has_ancestor(d)) {
-      idl_global->err()->redefinition_in_scope(t, d);
-      return NULL;
-    }
-  }
-  /*
-   * Add it to local types
-   */
-  add_to_local_types(t);
-  /*
-   * Add it to set of locally referenced symbols
-   */
-  add_to_referenced(t, I_FALSE);
-
-  return t;
-}
-
-/*
- * Add an AST_Union node (a manifest union type) to this scope
- */
-AST_Union *AST_Structure::fe_add_union(AST_Union *t)
-{
-  AST_Decl *d;
-
-  /*
-   * Already defined and cannot be redefined? Or already used?
-   */
-  if ((d = lookup_for_add(t, I_FALSE)) != NULL) {
-    if (!can_be_redefined(d)) {
-      idl_global->err()->error3(UTL_Error::EIDL_REDEF, t, this, d);
-      return NULL;
-    }
-    if (referenced(d)) {
-      idl_global->err()->error3(UTL_Error::EIDL_DEF_USE, t, this, d);
-      return NULL;
-    }
-    if (t->has_ancestor(d)) {
-      idl_global->err()->redefinition_in_scope(t, d);
-      return NULL;
-    }
-  }
-  /*
-   * Add it to local types
-   */
-  add_to_local_types(t);
-  /*
-   * Add it to set of locally referenced symbols
-   */
-  add_to_referenced(t, I_FALSE);
-
-  return t;
-}
-
-/*
- * Add this AST_Enum node (a manifest enum declaration) to this scope
- */
-AST_Enum *AST_Structure::fe_add_enum(AST_Enum *t)
-{
-  AST_Decl *d;
-
-  /*
-   * Already defined and cannot be redefined? Or already used?
-   */
-  if ((d = lookup_for_add(t, I_FALSE)) != NULL) {
-    if (!can_be_redefined(d)) {
-      idl_global->err()->error3(UTL_Error::EIDL_REDEF, t, this, d);
-      return NULL;
-    }
-    if (referenced(d)) {
-      idl_global->err()->error3(UTL_Error::EIDL_DEF_USE, t, this, d);
-      return NULL;
-    }
-    if (t->has_ancestor(d)) {
-      idl_global->err()->redefinition_in_scope(t, d);
-      return NULL;
-    }
-  }
-  /*
-   * Add it to local types
-   */
-  add_to_local_types(t);
-  /*
-   * Add it to set of locally referenced symbols
-   */
-  add_to_referenced(t, I_FALSE);
-
-  return t;
-}
-
-/*
- * Add this AST_EnumVal node (an enumerator declaration) to this scope.
- * This is done to conform to the C++ scoping rules which declare
- * enumerators in the enclosing scope (in addition to declaring them
- * in the enum itself)
- */
-AST_EnumVal *AST_Structure::fe_add_enum_val(AST_EnumVal *t)
-{
-  AST_Decl *d;
-
-  /*
-   * Already defined and cannot be redefined? Or already used?
-   */
-  if ((d = lookup_for_add(t, I_FALSE)) != NULL) {
-    if (!can_be_redefined(d)) {
-      idl_global->err()->error3(UTL_Error::EIDL_REDEF, t, this, d);
-      return NULL;
-    }
-    if (referenced(d)) {
-      idl_global->err()->error3(UTL_Error::EIDL_DEF_USE, t, this, d);
-      return NULL;
-    }
-    if (t->has_ancestor(d)) {
-      idl_global->err()->redefinition_in_scope(t, d);
-      return NULL;
-    }
-  }
-  /*
-   * Add it to scope
-   */
-  add_to_scope(t);
-  /*
-   * Add it to set of locally referenced symbols
-   */
-  add_to_referenced(t, I_FALSE);
-
-  return t;
-}
-
-/*
- * Dump this AST_Structure node to the ostream o
- */
-void
-AST_Structure::dump(ostream &o)
-{
-  o << "struct ";
-  AST_Decl::dump(o);
-  o << " {\n";
-  UTL_Scope::dump(o);
-  idl_global->indent()->skip_to(o);
-  o << "}";
-}
-
-// Narrowing
-IMPL_NARROW_METHODS2(AST_Structure, AST_ConcreteType, UTL_Scope)
-IMPL_NARROW_FROM_DECL(AST_Structure)
-IMPL_NARROW_FROM_SCOPE(AST_Structure)
diff --git a/TAO/TAO_IDL/ast/ast_type.cpp b/TAO/TAO_IDL/ast/ast_type.cpp
deleted file mode 100644
index fb9b83ae219..00000000000
--- a/TAO/TAO_IDL/ast/ast_type.cpp
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-/*
- * ast_type.cc - Implementation of class AST_Type
- *
- * AST_Type is the base class for all AST classes which represent
- * IDL type constructs.
- */
-
-#include	"idl.h"
-#include	"idl_extern.h"
-
-/*
- * Constructor(s) and destructor
- */
-AST_Type::AST_Type()
-{
-}
-
-AST_Type::AST_Type(AST_Decl::NodeType nt, UTL_ScopedName *n, UTL_StrList *p)
-	: AST_Decl(nt, n, p)
-{
-}
-
-/*
- * Private operations
- */
-
-/*
- * Public operations
- */
-
-
-/*
- * Redefinition of inherited virtual operations
- */
-
-
-// Narrowing
-IMPL_NARROW_METHODS1(AST_Type, AST_Decl)
-IMPL_NARROW_FROM_DECL(AST_Type)
diff --git a/TAO/TAO_IDL/ast/ast_typedef.cpp b/TAO/TAO_IDL/ast/ast_typedef.cpp
deleted file mode 100644
index ecd4f28de46..00000000000
--- a/TAO/TAO_IDL/ast/ast_typedef.cpp
+++ /dev/null
@@ -1,129 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-/*
- * ast_typedef.cc - Implementation of class AST_Typedef
- *
- * AST_Typedef nodes represent an IDL typedef statement.
- * AST_Typedef is a subclass of AST_Decl (it is not a type,
- * but instead is a type renaming).
- * AST_Typedef nodes have a base type (a subclass of AST_Type)
- * and a name (an UTL_ScopedName).
- */
-
-#include	"idl.h"
-#include	"idl_extern.h"
-
-/*
- * Constructor(s) and destructor
- */
-AST_Typedef::AST_Typedef()
-	   : pd_base_type(NULL)
-{
-}
-
-AST_Typedef::AST_Typedef(AST_Type *bt, UTL_ScopedName *n, UTL_StrList *p)
-	   : AST_Decl(AST_Decl::NT_typedef, n, p),
-	     pd_base_type(bt)
-{
-}
-
-/*
- * Private operations
- */
-
-/*
- * Public operations
- */
-
-
-/*
- * Redefinition of inherited virtual operations
- */
-
-/*
- * Dump this AST_Typedef node to the ostream o
- */
-void
-AST_Typedef::dump(ostream &o)
-{
-  o << "typedef ";
-  pd_base_type->dump(o);
-  o << " ";
-  local_name()->dump(o);
-}
-
-/*
- * Data accessors
- */
-
-AST_Type *
-AST_Typedef::base_type()
-{
-  return pd_base_type;
-}
-
-// Narrowing
-IMPL_NARROW_METHODS1(AST_Typedef, AST_Type)
-IMPL_NARROW_FROM_DECL(AST_Typedef)
diff --git a/TAO/TAO_IDL/ast/ast_union.cpp b/TAO/TAO_IDL/ast/ast_union.cpp
deleted file mode 100644
index b5bb4c14f2d..00000000000
--- a/TAO/TAO_IDL/ast/ast_union.cpp
+++ /dev/null
@@ -1,553 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.
-2550 Garcia Avenue
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-/*
- * ast_union.cc - Implementation of class AST_Union
- *
- * AST_Union nodes represent IDL union declarations.
- * AST_Union is a subclass of AST_ConcreteType and of UTL_Scope (the
- * union branches are managed in a scope).
- * AST_Union nodes have a discriminator type (a subclass of AST_ConcreteType),
- * a name (an UTL_ScopedName) and a field denoting the discriminator type if
- * it is a primitive type (the value of this field is from the union
- * AST_Expression::ExprType and serves as a cache). This field is used
- * to compute coercions for labels based on the expected discriminator type.
- */
-
-#include	"idl.h"
-#include	"idl_extern.h"
-
-/*
- * Constructor(s) and destructor
- */
-AST_Union::AST_Union()
-{
-}
-
-AST_Union::AST_Union(AST_ConcreteType *dt, UTL_ScopedName *n, UTL_StrList *p)
-	 : AST_Decl(AST_Decl::NT_union, n, p),
-	   UTL_Scope(AST_Decl::NT_union)
-{
-  AST_PredefinedType *pdt;
-
-  if (dt == NULL) {
-    pd_disc_type = NULL;
-    pd_udisc_type = AST_Expression::EV_none;
-    return;
-  }
-  /*
-   * If the discriminator type is a predefined type
-   * then install the equivalent coercion target type in
-   * the pd_udisc_type field.
-   */
-  if (dt->node_type() == AST_Decl::NT_pre_defined) {
-    pdt = AST_PredefinedType::narrow_from_decl(dt);
-    if (pdt == NULL) {
-        pd_disc_type = NULL;
-        pd_udisc_type = AST_Expression::EV_none;
-        return;
-    }
-    pd_disc_type = dt;
-    switch (pdt->pt()) {
-    case AST_PredefinedType::PT_long:
-      pd_udisc_type = AST_Expression::EV_long;
-      break;
-    case AST_PredefinedType::PT_ulong:
-      pd_udisc_type = AST_Expression::EV_ulong;
-      break;
-    case AST_PredefinedType::PT_short:
-      pd_udisc_type = AST_Expression::EV_short;
-      break;
-    case AST_PredefinedType::PT_ushort:
-      pd_udisc_type = AST_Expression::EV_ushort;
-      break;
-    case AST_PredefinedType::PT_char:
-      pd_udisc_type = AST_Expression::EV_char;
-      break;
-    case AST_PredefinedType::PT_octet:
-      pd_udisc_type = AST_Expression::EV_octet;
-      break;
-    case AST_PredefinedType::PT_boolean:
-      pd_udisc_type = AST_Expression::EV_bool;
-      break;
-    default:
-      pd_udisc_type = AST_Expression::EV_none;
-      pd_disc_type = NULL;
-      break;
-    }
-  } else if (dt->node_type() == AST_Decl::NT_enum) {
-    pd_udisc_type = AST_Expression::EV_any;
-    pd_disc_type = dt;
-  } else {
-    pd_udisc_type = AST_Expression::EV_none;
-    pd_disc_type = NULL;
-  }
-
-  if (pd_disc_type == NULL)
-    idl_global->err()->error2(UTL_Error::EIDL_DISC_TYPE, this, dt);
-}
-
-/*
- * Private operations
- */
-
-/*
- * Look up the default branch in union
- */
-AST_UnionBranch *
-AST_Union::lookup_default()
-{
-  UTL_ScopeActiveIterator *i = new UTL_ScopeActiveIterator(this, IK_both);
-  AST_UnionBranch	    *b;
-  AST_Decl		    *d;
-
-  while (!(i->is_done())) {
-    d = i->item();
-    if (d->node_type() == AST_Decl::NT_union_branch) {
-      b = AST_UnionBranch::narrow_from_decl(d);
-      if (b == NULL) {
-        i->next();
-        continue;
-      }
-      if (b->label() != NULL &&
-	  b->label()->label_kind() == AST_UnionLabel::UL_default) {
-	idl_global->err()->error2(UTL_Error::EIDL_MULTIPLE_BRANCH, this, b);
-	delete i;
-	return b;
-      }
-    }
-    i->next();
-  }
-  delete i;
-  return NULL;
-}
-
-/*
- * Look up a branch by label
- */
-AST_UnionBranch *
-AST_Union::lookup_label(AST_UnionBranch *b)
-{
-  AST_UnionLabel		*l = b->label();
-  UTL_ScopeActiveIterator	*i;
-  AST_Decl			*d;
-  AST_UnionBranch		*fb;
-
-  if (l->label_val() == NULL)
-    return b;
-  l->label_val()->set_ev(l->label_val()->coerce(pd_udisc_type));
-  if (l->label_val()->ev() == NULL) {
-    idl_global->err()->eval_error(l->label_val());
-    return b;
-  }
-
-  i = new UTL_ScopeActiveIterator(this, IK_decls);
-
-  while (!(i->is_done())) {
-    d = i->item();
-    if (d->node_type() == AST_Decl::NT_union_branch) {
-      fb = AST_UnionBranch::narrow_from_decl(d);
-      if (fb == NULL) {
-        i->next();
-        continue;
-      }
-      if (fb->label() != NULL &&
-	  fb->label()->label_kind() == AST_UnionLabel::UL_label &&
-	  fb->label()->label_val()->compare(l->label_val())) {
-	idl_global->err()->error2(UTL_Error::EIDL_MULTIPLE_BRANCH, this, b);
-	delete i;
-	return b;
-      }
-    }
-    i->next();
-  }
-  delete i;
-  return NULL;
-}
-
-/*
- * Look up a branch in an enum which is the discriminator type for this
- * union, based on the label value which must be an enumerator in that
- * enum.
- */
-AST_UnionBranch *
-AST_Union::lookup_enum(AST_UnionBranch *b)
-{
-  AST_UnionLabel		*l = b->label();
-  AST_Expression		*v;
-  AST_Enum			*e = AST_Enum::narrow_from_decl(pd_disc_type);
-  UTL_ScopeActiveIterator	*i;
-  AST_Decl			*d;
-  AST_UnionBranch		*fb;
-
-  if (e == NULL) return NULL;
-  if (l->label_val() == NULL)
-    return b;
-  v = l->label_val();
-  /*
-   * Expecting a symbol label
-   */
-  if (v->ec() != AST_Expression::EC_symbol) {
-    idl_global->err()->enum_val_expected(this, l);
-    return b;
-  }
-  /*
-   * See if the symbol defines a constant in the discriminator enum
-   */
-  d = e->lookup_by_name(v->n(), I_TRUE);
-  if (d == NULL || d->defined_in() != e) {
-    idl_global->err()->enum_val_lookup_failure(this, e, v->n());
-    return b;
-  }
-  /*
-   * OK, now see if this symbol is already used as the label of
-   * some other branch
-   */
-  i = new UTL_ScopeActiveIterator(this, IK_decls);
-  while (!(i->is_done())) {
-    d = i->item();
-    if (d->node_type() == AST_Decl::NT_union_branch) {
-      fb = AST_UnionBranch::narrow_from_decl(d);
-      if (fb == NULL) {
-          i->next();
-          continue;
-      }
-      if (fb->label() != NULL &&
-	  fb->label()->label_kind() == AST_UnionLabel::UL_label &&
-	  fb->label()->label_val()->compare (l->label_val())) {
-	idl_global->err()->error2(UTL_Error::EIDL_MULTIPLE_BRANCH, this, b);
-	delete i;
-	return b;
-      }
-    }
-    i->next();
-  }
-  delete i;
-  return NULL;
-}
-
-/*
- * Look up a branch by value. This is the top level branch label resolution
- * entry point. It dispatches to the right lookup function depending on the
- * union discriminator type.
- */
-AST_UnionBranch *
-AST_Union::lookup_branch(AST_UnionBranch *branch)
-{
-  AST_UnionLabel	*l = NULL;
-
-  if (branch != NULL)
-    l = branch->label();
-
-  if (l != NULL) {
-    if (l->label_kind() == AST_UnionLabel::UL_default)
-      return lookup_default();
-    if (pd_udisc_type == AST_Expression::EV_any)
-      /* CONVENTION: indicates enum discr */
-      return lookup_enum(branch);
-    return lookup_label(branch);
-  }
-  return NULL;
-}
-
-/*
- * Public operations
- */
-
-/*
- * Redefinition of inherited virtual operations
- */
-
-/*
- * Add this AST_UnionBranch node (a node representing one branch in a
- * union declaration) to this scope
- */
-AST_UnionBranch *AST_Union::fe_add_union_branch(AST_UnionBranch *t)
-{
-  AST_Decl *d;
-
-  /*
-   * If this is a malformed branch, don't do anything with it
-   */
-  if (t == NULL || t->label() == NULL)
-    return NULL;
-  /*
-   * If branch with that label already exists, complain
-   */
-  if (lookup_branch(t) != NULL) {
-    idl_global->err()->error2(UTL_Error::EIDL_MULTIPLE_BRANCH, this, t);
-    return NULL;
-  }
-  /*
-   * If branch with same field name exists, complain
-   */
-  if ((d = lookup_for_add(t, I_FALSE)) != NULL) {
-    if (!can_be_redefined(d)) {
-      idl_global->err()->error3(UTL_Error::EIDL_REDEF, t, this, d);
-      return NULL;
-    }
-    if (referenced(d)) {
-      idl_global->err()->error3(UTL_Error::EIDL_DEF_USE, t, this, d);
-      return NULL;
-    }
-    if (t->has_ancestor(d)) {
-      idl_global->err()->redefinition_in_scope(t, d);
-      return NULL;
-    }
-  }
-  /*
-   * Add it to scope
-   */
-  add_to_scope(t);
-  /*
-   * Add it to set of locally referenced symbols
-   */
-  add_to_referenced(t, I_FALSE);
-
-  return t;
-}
-
-/*
- * Add this AST_Union (manifest union type) to this scope
- */
-AST_Union *AST_Union::fe_add_union(AST_Union *t)
-{
-  AST_Decl *d;
-
-  /*
-   * Already defined and cannot be redefined? Or already used?
-   */
-  if ((d = lookup_for_add(t, I_FALSE)) != NULL) {
-    if (!can_be_redefined(d)) {
-      idl_global->err()->error3(UTL_Error::EIDL_REDEF, t, this, d);
-      return NULL;
-    }
-    if (referenced(d)) {
-      idl_global->err()->error3(UTL_Error::EIDL_DEF_USE, t, this, d);
-      return NULL;
-    }
-    if (t->has_ancestor(d)) {
-      idl_global->err()->redefinition_in_scope(t, d);
-      return NULL;
-    }
-  }
-  /*
-   * Add it to local types
-   */
-  add_to_local_types(t);
-  /*
-   * Add it to set of locally referenced symbols
-   */
-  add_to_referenced(t, I_FALSE);
-
-  return t;
-}
-
-/*
- * Add this AST_Structure node (manifest struct type) to this scope
- */
-AST_Structure *AST_Union::fe_add_structure(AST_Structure *t)
-{
-  AST_Decl *d;
-
-  /*
-   * Already defined and cannot be redefined? Or already used?
-   */
-  if ((d = lookup_for_add(t, I_FALSE)) != NULL) {
-    if (!can_be_redefined(d)) {
-      idl_global->err()->error3(UTL_Error::EIDL_REDEF, t, this, d);
-      return NULL;
-    }
-    if (referenced(d)) {
-      idl_global->err()->error3(UTL_Error::EIDL_DEF_USE, t, this, d);
-      return NULL;
-    }
-    if (t->has_ancestor(d)) {
-      idl_global->err()->redefinition_in_scope(t, d);
-      return NULL;
-    }
-  }
-  /*
-   * Add it to local types
-   */
-  add_to_local_types(t);
-  /*
-   * Add it to set of locally referenced symbols
-   */
-  add_to_referenced(t, I_FALSE);
-
-  return t;
-}
-
-/*
- * Add this AST_Enum node (manifest enum type) to this scope
- */
-AST_Enum *AST_Union::fe_add_enum(AST_Enum *t)
-{
-  AST_Decl *d;
-
-  /*
-   * Already defined and cannot be redefined? Or already used?
-   */
-  if ((d = lookup_for_add(t, I_FALSE)) != NULL) {
-    if (!can_be_redefined(d)) {
-      idl_global->err()->error3(UTL_Error::EIDL_REDEF, t, this, d);
-      return NULL;
-    }
-    if (referenced(d)) {
-      idl_global->err()->error3(UTL_Error::EIDL_DEF_USE, t, this, d);
-      return NULL;
-    }
-    if (t->has_ancestor(d)) {
-      idl_global->err()->redefinition_in_scope(t, d);
-      return NULL;
-    }
-  }
-  /*
-   * Add it to local types
-   */
-  add_to_local_types(t);
-  /*
-   * Add it to set of locally referenced symbols
-   */
-  add_to_referenced(t, I_FALSE);
-
-  return t;
-}
-
-/*
- * Add this AST_EnumVal node (enumerator declaration) to this scope.
- * This is done to conform to the C++ scoping rules which declare
- * enumerators in the enclosing scope (in addition to declaring them
- * in the enum itself)
- */
-AST_EnumVal *AST_Union::fe_add_enum_val(AST_EnumVal *t)
-{
-  AST_Decl *d;
-
-  /*
-   * Already defined and cannot be redefined? Or already used?
-   */
-  if ((d = lookup_for_add(t, I_FALSE)) != NULL) {
-    if (!can_be_redefined(d)) {
-      idl_global->err()->error3(UTL_Error::EIDL_REDEF, t, this, d);
-      return NULL;
-    }
-    if (referenced(d)) {
-      idl_global->err()->error3(UTL_Error::EIDL_DEF_USE, t, this, d);
-      return NULL;
-    }
-    if (t->has_ancestor(d)) {
-      idl_global->err()->redefinition_in_scope(t, d);
-      return NULL;
-    }
-  }
-  /*
-   * Add it to scope
-   */
-  add_to_scope(t);
-  /*
-   * Add it to set of locally referenced symbols
-   */
-  add_to_referenced(t, I_FALSE);
-
-  return t;
-}
-
-/*
- * Dump this AST_Union node to the ostream o
- */
-void
-AST_Union::dump(ostream &o)
-{
-  o << "union ";
-  local_name()->dump(o);
-  o << " switch (";
-  pd_disc_type->local_name()->dump(o);
-  o << ") {\n";
-  UTL_Scope::dump(o);
-  idl_global->indent()->skip_to(o);
-  o << "}";
-}
-
-/*
- * Data accessors
- */
-
-AST_ConcreteType *
-AST_Union::disc_type()
-{
-  return pd_disc_type;
-}
-
-AST_Expression::ExprType
-AST_Union::udisc_type()
-{
-  return pd_udisc_type;
-}
-
-// Narrowing
-IMPL_NARROW_METHODS2(AST_Union, AST_ConcreteType, UTL_Scope)
-IMPL_NARROW_FROM_DECL(AST_Union)
-IMPL_NARROW_FROM_SCOPE(AST_Union)
diff --git a/TAO/TAO_IDL/ast/ast_union_branch.cpp b/TAO/TAO_IDL/ast/ast_union_branch.cpp
deleted file mode 100644
index 55220d7c29f..00000000000
--- a/TAO/TAO_IDL/ast/ast_union_branch.cpp
+++ /dev/null
@@ -1,129 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-/*
- * ast_union_branch.cc - Implementation of class AST_UnionBranch
- *
- * AST_UnionBranch nodes represent a single branch of an IDL union
- * declaration.
- * AST_UnionBranch is a subclass of AST_Field, adding a label (which
- * is a subclass of AST_UnionLabel).
- */
-
-#include	"idl.h"
-#include	"idl_extern.h"
-
-/*
- * Constructor(s) and destructor
- */
-AST_UnionBranch::AST_UnionBranch()
-	       : pd_label(NULL)
-{
-}
-
-AST_UnionBranch::AST_UnionBranch(AST_UnionLabel *fl, AST_Type *ft,
-				   UTL_ScopedName *n, UTL_StrList *p)
-		: AST_Field(AST_Decl::NT_union_branch, ft, n, p),
-		  AST_Decl(AST_Decl::NT_union_branch, n, p),
-		  pd_label(fl)
-{
-}
-
-/*
- * Private operations
- */
-
-/*
- * Public operations
- */
-
-/*
- * Redefinition of inherited virtual operations
- */
-
-/*
- * Dump this AST_UnionBranch node to the ostream o
- */
-void
-AST_UnionBranch::dump(ostream &o)
-{
-  o << "case ";
-  pd_label->dump(o);
-  o << ": ";
-  AST_Field::dump(o);
-}
-
-/*
- * Data accessors
- */
-
-AST_UnionLabel *
-AST_UnionBranch::label()
-{
-  return pd_label;
-}
-
-// Narrowing
-IMPL_NARROW_METHODS1(AST_UnionBranch, AST_Field)
-IMPL_NARROW_FROM_DECL(AST_UnionBranch)
diff --git a/TAO/TAO_IDL/ast/ast_union_label.cpp b/TAO/TAO_IDL/ast/ast_union_label.cpp
deleted file mode 100644
index 18b080d323c..00000000000
--- a/TAO/TAO_IDL/ast/ast_union_label.cpp
+++ /dev/null
@@ -1,133 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-/*
- * ast_union_label.cc - Implementation of class AST_UnionLabel
- *
- * AST_UnionLabel denotes the label of a branch in an IDL union
- * declaration.
- * AST_UnionLabel nodes have a label kind (the values come from the
- * enum AST_UnionLabel::LabelKind) and a label value (which is a
- * subclass of AST_Expression).
- */
-
-#include	"idl.h"
-#include	"idl_extern.h"
-
-/*
- * Constructor(s)
- */
-AST_UnionLabel::AST_UnionLabel()
-	      : pd_label_kind(UL_default),
-		pd_label_val(NULL)
-{
-}
-
-AST_UnionLabel::AST_UnionLabel(UnionLabel lk, AST_Expression *lv)
-	       : pd_label_kind(lk),
-		 pd_label_val(lv)
-{
-    if (lv != NULL)
-      lv->evaluate(AST_Expression::EK_const);
-}
-
-/*
- * Private operations
- */
-
-/*
- * Public operations
- */
-
-/*
- * Redefinition of inherited virtual operations
- */
-
-/*
- * Data accessors
- */
-
-AST_UnionLabel::UnionLabel
-AST_UnionLabel::label_kind()
-{
-  return pd_label_kind;
-}
-
-AST_Expression *
-AST_UnionLabel::label_val()
-{
-  return pd_label_val;
-}
-
-/*
- * Dump this AST_UnionLabel node to the ostream o
- */
-void
-AST_UnionLabel::dump(ostream &o)
-{
-  if (pd_label_kind == UL_default)
-    o << "default";
-  else
-    pd_label_val->dump(o);
-}
diff --git a/TAO/TAO_IDL/be/Makefile b/TAO/TAO_IDL/be/Makefile
deleted file mode 100644
index 5c5c70d8a89..00000000000
--- a/TAO/TAO_IDL/be/Makefile
+++ /dev/null
@@ -1,3001 +0,0 @@
-#----------------------------------------------------------------------------
-#	$Id$
-#
-#	Makefile for libbe
-#----------------------------------------------------------------------------
-
-MAKEFILE = Makefile
-LIBNAME	 = libbe
-LIB	 = $(LIBNAME).a
-SHLIB	 = $(LIBNAME).$(SOEXT)
-IDL_CFE_VERSION	= \"1.3.0\"
-
-# These are components that are sources of
-BE_FILES	= \
-		be_array \
-		be_argument \
-		be_attribute \
-		be_constant \
-		be_enum \
-		be_enum_val \
-		be_exception \
-		be_expression \
-		be_field \
-		be_interface \
-		be_interface_fwd \
-		be_module \
-		be_operation \
-		be_predefined_type \
-		be_root \
-		be_sequence \
-		be_string \
-		be_structure \
-		be_type \
-		be_typedef \
-		be_union \
-		be_union_branch \
-		be_union_label \
-		be_generator \
-		be_init \
-		be_produce \
-		be_args  \
-		be_helper \
-		be_state \
-		be_state_array \
-		be_state_argument \
-		be_state_attribute \
-		be_state_operation \
-		be_state_sequence \
-		be_state_structure \
-		be_state_typedef \
-		be_state_union \
-		be_codegen \
-		be_factory \
-		be_sunsoft \
-		be_decl \
-		be_scope
-
-FILES	 = $(BE_FILES)
-
-LSRC	= $(addsuffix .cpp,$(FILES))
-LOBJ    = $(addsuffix .o,$(FILES))
-SHOBJ   = $(addsuffix .so,$(FILES))
-
-
-LDLIBS  =  -lACE
-LIBS	= -lACE
-VLDLIBS = $(LDLIBS:%=%$(VAR))
-
-BUILD	= $(VSHLIB) #$(VLIB)
-
-#----------------------------------------------------------------------------
-#	Include macros and targets
-#----------------------------------------------------------------------------
-
-include	$(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-include	$(ACE_ROOT)/include/makeinclude/macros.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.common.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.lib.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.bin.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
-
-#----------------------------------------------------------------------------
-#	Local targets (and local hacks)
-#----------------------------------------------------------------------------
-
-ifeq ($(CXX),g++)
-CCFLAGS += -Wno-switch
-endif
-
-CPPFLAGS += -I../include -I../be_include -I. -DCPP_LOCATION=\"$(CXX)\" -DIDL_CFE_VERSION=$(IDL_CFE_VERSION)
-
-#----------------------------------------------------------------------------
-#	Dependencies
-#----------------------------------------------------------------------------
-
-# DO NOT DELETE THIS LINE -- g++dep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-
-.obj/be_array.o .shobj/be_array.so: be_array.cpp ../include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/stdcpp.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- ../include/intlmacros.h ../include/idl_narrow.h \
- ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \
- ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/utl_strlist.h ../include/utl_exprlist.h \
- ../include/ast_generator.h ../include/util.h ../include/utl_stack.h \
- ../include/utl_idlist.h ../include/utl_exceptlist.h \
- ../include/utl_namelist.h ../include/utl_labellist.h \
- ../include/utl_decllist.h ../include/idl_global.h \
- ../include/utl_error.h ../include/utl_indenter.h \
- ../include/idl_extern.h ../include/fe_extern.h ../include/be_extern.h \
- ../include/drv_extern.h ../include/ast_extern.h \
- ../include/nr_extern.h ../include/global_extern.h ../be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Singleton.i \
- ../be_include/be_decl.h ../be_include/be_scope.h \
- ../be_include/be_generator.h ../be_include/be_type.h \
- ../be_include/be_predefined_type.h ../be_include/be_module.h \
- ../be_include/be_interface.h ../be_include/be_interface_fwd.h \
- ../be_include/be_structure.h ../be_include/be_exception.h \
- ../be_include/be_expression.h ../be_include/be_enum.h \
- ../be_include/be_operation.h ../be_include/be_field.h \
- ../be_include/be_argument.h ../be_include/be_attribute.h \
- ../be_include/be_union.h ../be_include/be_union_branch.h \
- ../be_include/be_union_label.h ../be_include/be_constant.h \
- ../be_include/be_enum_val.h ../be_include/be_array.h \
- ../be_include/be_sequence.h ../be_include/be_string.h \
- ../be_include/be_typedef.h ../be_include/be_root.h \
- ../be_include/be_helper.h ../be_include/be_state.h \
- ../be_include/be_codegen.h ../be_include/be_factory.h
-.obj/be_argument.o .shobj/be_argument.so: be_argument.cpp ../include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/stdcpp.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- ../include/intlmacros.h ../include/idl_narrow.h \
- ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \
- ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/utl_strlist.h ../include/utl_exprlist.h \
- ../include/ast_generator.h ../include/util.h ../include/utl_stack.h \
- ../include/utl_idlist.h ../include/utl_exceptlist.h \
- ../include/utl_namelist.h ../include/utl_labellist.h \
- ../include/utl_decllist.h ../include/idl_global.h \
- ../include/utl_error.h ../include/utl_indenter.h \
- ../include/idl_extern.h ../include/fe_extern.h ../include/be_extern.h \
- ../include/drv_extern.h ../include/ast_extern.h \
- ../include/nr_extern.h ../include/global_extern.h ../be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Singleton.i \
- ../be_include/be_decl.h ../be_include/be_scope.h \
- ../be_include/be_generator.h ../be_include/be_type.h \
- ../be_include/be_predefined_type.h ../be_include/be_module.h \
- ../be_include/be_interface.h ../be_include/be_interface_fwd.h \
- ../be_include/be_structure.h ../be_include/be_exception.h \
- ../be_include/be_expression.h ../be_include/be_enum.h \
- ../be_include/be_operation.h ../be_include/be_field.h \
- ../be_include/be_argument.h ../be_include/be_attribute.h \
- ../be_include/be_union.h ../be_include/be_union_branch.h \
- ../be_include/be_union_label.h ../be_include/be_constant.h \
- ../be_include/be_enum_val.h ../be_include/be_array.h \
- ../be_include/be_sequence.h ../be_include/be_string.h \
- ../be_include/be_typedef.h ../be_include/be_root.h \
- ../be_include/be_helper.h ../be_include/be_state.h \
- ../be_include/be_codegen.h ../be_include/be_factory.h
-.obj/be_attribute.o .shobj/be_attribute.so: be_attribute.cpp ../include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/stdcpp.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- ../include/intlmacros.h ../include/idl_narrow.h \
- ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \
- ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/utl_strlist.h ../include/utl_exprlist.h \
- ../include/ast_generator.h ../include/util.h ../include/utl_stack.h \
- ../include/utl_idlist.h ../include/utl_exceptlist.h \
- ../include/utl_namelist.h ../include/utl_labellist.h \
- ../include/utl_decllist.h ../include/idl_global.h \
- ../include/utl_error.h ../include/utl_indenter.h \
- ../include/idl_extern.h ../include/fe_extern.h ../include/be_extern.h \
- ../include/drv_extern.h ../include/ast_extern.h \
- ../include/nr_extern.h ../include/global_extern.h ../be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Singleton.i \
- ../be_include/be_decl.h ../be_include/be_scope.h \
- ../be_include/be_generator.h ../be_include/be_type.h \
- ../be_include/be_predefined_type.h ../be_include/be_module.h \
- ../be_include/be_interface.h ../be_include/be_interface_fwd.h \
- ../be_include/be_structure.h ../be_include/be_exception.h \
- ../be_include/be_expression.h ../be_include/be_enum.h \
- ../be_include/be_operation.h ../be_include/be_field.h \
- ../be_include/be_argument.h ../be_include/be_attribute.h \
- ../be_include/be_union.h ../be_include/be_union_branch.h \
- ../be_include/be_union_label.h ../be_include/be_constant.h \
- ../be_include/be_enum_val.h ../be_include/be_array.h \
- ../be_include/be_sequence.h ../be_include/be_string.h \
- ../be_include/be_typedef.h ../be_include/be_root.h \
- ../be_include/be_helper.h ../be_include/be_state.h \
- ../be_include/be_codegen.h ../be_include/be_factory.h
-.obj/be_constant.o .shobj/be_constant.so: be_constant.cpp ../include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/stdcpp.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- ../include/intlmacros.h ../include/idl_narrow.h \
- ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \
- ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/utl_strlist.h ../include/utl_exprlist.h \
- ../include/ast_generator.h ../include/util.h ../include/utl_stack.h \
- ../include/utl_idlist.h ../include/utl_exceptlist.h \
- ../include/utl_namelist.h ../include/utl_labellist.h \
- ../include/utl_decllist.h ../include/idl_global.h \
- ../include/utl_error.h ../include/utl_indenter.h \
- ../include/idl_extern.h ../include/fe_extern.h ../include/be_extern.h \
- ../include/drv_extern.h ../include/ast_extern.h \
- ../include/nr_extern.h ../include/global_extern.h ../be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Singleton.i \
- ../be_include/be_decl.h ../be_include/be_scope.h \
- ../be_include/be_generator.h ../be_include/be_type.h \
- ../be_include/be_predefined_type.h ../be_include/be_module.h \
- ../be_include/be_interface.h ../be_include/be_interface_fwd.h \
- ../be_include/be_structure.h ../be_include/be_exception.h \
- ../be_include/be_expression.h ../be_include/be_enum.h \
- ../be_include/be_operation.h ../be_include/be_field.h \
- ../be_include/be_argument.h ../be_include/be_attribute.h \
- ../be_include/be_union.h ../be_include/be_union_branch.h \
- ../be_include/be_union_label.h ../be_include/be_constant.h \
- ../be_include/be_enum_val.h ../be_include/be_array.h \
- ../be_include/be_sequence.h ../be_include/be_string.h \
- ../be_include/be_typedef.h ../be_include/be_root.h \
- ../be_include/be_helper.h ../be_include/be_state.h \
- ../be_include/be_codegen.h ../be_include/be_factory.h
-.obj/be_enum.o .shobj/be_enum.so: be_enum.cpp ../include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/stdcpp.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- ../include/intlmacros.h ../include/idl_narrow.h \
- ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \
- ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/utl_strlist.h ../include/utl_exprlist.h \
- ../include/ast_generator.h ../include/util.h ../include/utl_stack.h \
- ../include/utl_idlist.h ../include/utl_exceptlist.h \
- ../include/utl_namelist.h ../include/utl_labellist.h \
- ../include/utl_decllist.h ../include/idl_global.h \
- ../include/utl_error.h ../include/utl_indenter.h \
- ../include/idl_extern.h ../include/fe_extern.h ../include/be_extern.h \
- ../include/drv_extern.h ../include/ast_extern.h \
- ../include/nr_extern.h ../include/global_extern.h ../be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Singleton.i \
- ../be_include/be_decl.h ../be_include/be_scope.h \
- ../be_include/be_generator.h ../be_include/be_type.h \
- ../be_include/be_predefined_type.h ../be_include/be_module.h \
- ../be_include/be_interface.h ../be_include/be_interface_fwd.h \
- ../be_include/be_structure.h ../be_include/be_exception.h \
- ../be_include/be_expression.h ../be_include/be_enum.h \
- ../be_include/be_operation.h ../be_include/be_field.h \
- ../be_include/be_argument.h ../be_include/be_attribute.h \
- ../be_include/be_union.h ../be_include/be_union_branch.h \
- ../be_include/be_union_label.h ../be_include/be_constant.h \
- ../be_include/be_enum_val.h ../be_include/be_array.h \
- ../be_include/be_sequence.h ../be_include/be_string.h \
- ../be_include/be_typedef.h ../be_include/be_root.h \
- ../be_include/be_helper.h ../be_include/be_state.h \
- ../be_include/be_codegen.h ../be_include/be_factory.h
-.obj/be_enum_val.o .shobj/be_enum_val.so: be_enum_val.cpp ../include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/stdcpp.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- ../include/intlmacros.h ../include/idl_narrow.h \
- ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \
- ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/utl_strlist.h ../include/utl_exprlist.h \
- ../include/ast_generator.h ../include/util.h ../include/utl_stack.h \
- ../include/utl_idlist.h ../include/utl_exceptlist.h \
- ../include/utl_namelist.h ../include/utl_labellist.h \
- ../include/utl_decllist.h ../include/idl_global.h \
- ../include/utl_error.h ../include/utl_indenter.h \
- ../include/idl_extern.h ../include/fe_extern.h ../include/be_extern.h \
- ../include/drv_extern.h ../include/ast_extern.h \
- ../include/nr_extern.h ../include/global_extern.h ../be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Singleton.i \
- ../be_include/be_decl.h ../be_include/be_scope.h \
- ../be_include/be_generator.h ../be_include/be_type.h \
- ../be_include/be_predefined_type.h ../be_include/be_module.h \
- ../be_include/be_interface.h ../be_include/be_interface_fwd.h \
- ../be_include/be_structure.h ../be_include/be_exception.h \
- ../be_include/be_expression.h ../be_include/be_enum.h \
- ../be_include/be_operation.h ../be_include/be_field.h \
- ../be_include/be_argument.h ../be_include/be_attribute.h \
- ../be_include/be_union.h ../be_include/be_union_branch.h \
- ../be_include/be_union_label.h ../be_include/be_constant.h \
- ../be_include/be_enum_val.h ../be_include/be_array.h \
- ../be_include/be_sequence.h ../be_include/be_string.h \
- ../be_include/be_typedef.h ../be_include/be_root.h \
- ../be_include/be_helper.h ../be_include/be_state.h \
- ../be_include/be_codegen.h ../be_include/be_factory.h
-.obj/be_exception.o .shobj/be_exception.so: be_exception.cpp ../include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/stdcpp.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- ../include/intlmacros.h ../include/idl_narrow.h \
- ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \
- ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/utl_strlist.h ../include/utl_exprlist.h \
- ../include/ast_generator.h ../include/util.h ../include/utl_stack.h \
- ../include/utl_idlist.h ../include/utl_exceptlist.h \
- ../include/utl_namelist.h ../include/utl_labellist.h \
- ../include/utl_decllist.h ../include/idl_global.h \
- ../include/utl_error.h ../include/utl_indenter.h \
- ../include/idl_extern.h ../include/fe_extern.h ../include/be_extern.h \
- ../include/drv_extern.h ../include/ast_extern.h \
- ../include/nr_extern.h ../include/global_extern.h ../be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Singleton.i \
- ../be_include/be_decl.h ../be_include/be_scope.h \
- ../be_include/be_generator.h ../be_include/be_type.h \
- ../be_include/be_predefined_type.h ../be_include/be_module.h \
- ../be_include/be_interface.h ../be_include/be_interface_fwd.h \
- ../be_include/be_structure.h ../be_include/be_exception.h \
- ../be_include/be_expression.h ../be_include/be_enum.h \
- ../be_include/be_operation.h ../be_include/be_field.h \
- ../be_include/be_argument.h ../be_include/be_attribute.h \
- ../be_include/be_union.h ../be_include/be_union_branch.h \
- ../be_include/be_union_label.h ../be_include/be_constant.h \
- ../be_include/be_enum_val.h ../be_include/be_array.h \
- ../be_include/be_sequence.h ../be_include/be_string.h \
- ../be_include/be_typedef.h ../be_include/be_root.h \
- ../be_include/be_helper.h ../be_include/be_state.h \
- ../be_include/be_codegen.h ../be_include/be_factory.h
-.obj/be_expression.o .shobj/be_expression.so: be_expression.cpp ../include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/stdcpp.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- ../include/intlmacros.h ../include/idl_narrow.h \
- ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \
- ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/utl_strlist.h ../include/utl_exprlist.h \
- ../include/ast_generator.h ../include/util.h ../include/utl_stack.h \
- ../include/utl_idlist.h ../include/utl_exceptlist.h \
- ../include/utl_namelist.h ../include/utl_labellist.h \
- ../include/utl_decllist.h ../include/idl_global.h \
- ../include/utl_error.h ../include/utl_indenter.h \
- ../include/idl_extern.h ../include/fe_extern.h ../include/be_extern.h \
- ../include/drv_extern.h ../include/ast_extern.h \
- ../include/nr_extern.h ../include/global_extern.h ../be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Singleton.i \
- ../be_include/be_decl.h ../be_include/be_scope.h \
- ../be_include/be_generator.h ../be_include/be_type.h \
- ../be_include/be_predefined_type.h ../be_include/be_module.h \
- ../be_include/be_interface.h ../be_include/be_interface_fwd.h \
- ../be_include/be_structure.h ../be_include/be_exception.h \
- ../be_include/be_expression.h ../be_include/be_enum.h \
- ../be_include/be_operation.h ../be_include/be_field.h \
- ../be_include/be_argument.h ../be_include/be_attribute.h \
- ../be_include/be_union.h ../be_include/be_union_branch.h \
- ../be_include/be_union_label.h ../be_include/be_constant.h \
- ../be_include/be_enum_val.h ../be_include/be_array.h \
- ../be_include/be_sequence.h ../be_include/be_string.h \
- ../be_include/be_typedef.h ../be_include/be_root.h \
- ../be_include/be_helper.h ../be_include/be_state.h \
- ../be_include/be_codegen.h ../be_include/be_factory.h
-.obj/be_field.o .shobj/be_field.so: be_field.cpp ../include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/stdcpp.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- ../include/intlmacros.h ../include/idl_narrow.h \
- ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \
- ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/utl_strlist.h ../include/utl_exprlist.h \
- ../include/ast_generator.h ../include/util.h ../include/utl_stack.h \
- ../include/utl_idlist.h ../include/utl_exceptlist.h \
- ../include/utl_namelist.h ../include/utl_labellist.h \
- ../include/utl_decllist.h ../include/idl_global.h \
- ../include/utl_error.h ../include/utl_indenter.h \
- ../include/idl_extern.h ../include/fe_extern.h ../include/be_extern.h \
- ../include/drv_extern.h ../include/ast_extern.h \
- ../include/nr_extern.h ../include/global_extern.h ../be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Singleton.i \
- ../be_include/be_decl.h ../be_include/be_scope.h \
- ../be_include/be_generator.h ../be_include/be_type.h \
- ../be_include/be_predefined_type.h ../be_include/be_module.h \
- ../be_include/be_interface.h ../be_include/be_interface_fwd.h \
- ../be_include/be_structure.h ../be_include/be_exception.h \
- ../be_include/be_expression.h ../be_include/be_enum.h \
- ../be_include/be_operation.h ../be_include/be_field.h \
- ../be_include/be_argument.h ../be_include/be_attribute.h \
- ../be_include/be_union.h ../be_include/be_union_branch.h \
- ../be_include/be_union_label.h ../be_include/be_constant.h \
- ../be_include/be_enum_val.h ../be_include/be_array.h \
- ../be_include/be_sequence.h ../be_include/be_string.h \
- ../be_include/be_typedef.h ../be_include/be_root.h \
- ../be_include/be_helper.h ../be_include/be_state.h \
- ../be_include/be_codegen.h ../be_include/be_factory.h
-.obj/be_interface.o .shobj/be_interface.so: be_interface.cpp ../include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/stdcpp.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- ../include/intlmacros.h ../include/idl_narrow.h \
- ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \
- ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/utl_strlist.h ../include/utl_exprlist.h \
- ../include/ast_generator.h ../include/util.h ../include/utl_stack.h \
- ../include/utl_idlist.h ../include/utl_exceptlist.h \
- ../include/utl_namelist.h ../include/utl_labellist.h \
- ../include/utl_decllist.h ../include/idl_global.h \
- ../include/utl_error.h ../include/utl_indenter.h \
- ../include/idl_extern.h ../include/fe_extern.h ../include/be_extern.h \
- ../include/drv_extern.h ../include/ast_extern.h \
- ../include/nr_extern.h ../include/global_extern.h ../be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Singleton.i \
- ../be_include/be_decl.h ../be_include/be_scope.h \
- ../be_include/be_generator.h ../be_include/be_type.h \
- ../be_include/be_predefined_type.h ../be_include/be_module.h \
- ../be_include/be_interface.h ../be_include/be_interface_fwd.h \
- ../be_include/be_structure.h ../be_include/be_exception.h \
- ../be_include/be_expression.h ../be_include/be_enum.h \
- ../be_include/be_operation.h ../be_include/be_field.h \
- ../be_include/be_argument.h ../be_include/be_attribute.h \
- ../be_include/be_union.h ../be_include/be_union_branch.h \
- ../be_include/be_union_label.h ../be_include/be_constant.h \
- ../be_include/be_enum_val.h ../be_include/be_array.h \
- ../be_include/be_sequence.h ../be_include/be_string.h \
- ../be_include/be_typedef.h ../be_include/be_root.h \
- ../be_include/be_helper.h ../be_include/be_state.h \
- ../be_include/be_codegen.h ../be_include/be_factory.h
-.obj/be_interface_fwd.o .shobj/be_interface_fwd.so: be_interface_fwd.cpp ../include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/stdcpp.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- ../include/intlmacros.h ../include/idl_narrow.h \
- ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \
- ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/utl_strlist.h ../include/utl_exprlist.h \
- ../include/ast_generator.h ../include/util.h ../include/utl_stack.h \
- ../include/utl_idlist.h ../include/utl_exceptlist.h \
- ../include/utl_namelist.h ../include/utl_labellist.h \
- ../include/utl_decllist.h ../include/idl_global.h \
- ../include/utl_error.h ../include/utl_indenter.h \
- ../include/idl_extern.h ../include/fe_extern.h ../include/be_extern.h \
- ../include/drv_extern.h ../include/ast_extern.h \
- ../include/nr_extern.h ../include/global_extern.h ../be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Singleton.i \
- ../be_include/be_decl.h ../be_include/be_scope.h \
- ../be_include/be_generator.h ../be_include/be_type.h \
- ../be_include/be_predefined_type.h ../be_include/be_module.h \
- ../be_include/be_interface.h ../be_include/be_interface_fwd.h \
- ../be_include/be_structure.h ../be_include/be_exception.h \
- ../be_include/be_expression.h ../be_include/be_enum.h \
- ../be_include/be_operation.h ../be_include/be_field.h \
- ../be_include/be_argument.h ../be_include/be_attribute.h \
- ../be_include/be_union.h ../be_include/be_union_branch.h \
- ../be_include/be_union_label.h ../be_include/be_constant.h \
- ../be_include/be_enum_val.h ../be_include/be_array.h \
- ../be_include/be_sequence.h ../be_include/be_string.h \
- ../be_include/be_typedef.h ../be_include/be_root.h \
- ../be_include/be_helper.h ../be_include/be_state.h \
- ../be_include/be_codegen.h ../be_include/be_factory.h
-.obj/be_module.o .shobj/be_module.so: be_module.cpp ../include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/stdcpp.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- ../include/intlmacros.h ../include/idl_narrow.h \
- ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \
- ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/utl_strlist.h ../include/utl_exprlist.h \
- ../include/ast_generator.h ../include/util.h ../include/utl_stack.h \
- ../include/utl_idlist.h ../include/utl_exceptlist.h \
- ../include/utl_namelist.h ../include/utl_labellist.h \
- ../include/utl_decllist.h ../include/idl_global.h \
- ../include/utl_error.h ../include/utl_indenter.h \
- ../include/idl_extern.h ../include/fe_extern.h ../include/be_extern.h \
- ../include/drv_extern.h ../include/ast_extern.h \
- ../include/nr_extern.h ../include/global_extern.h ../be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Singleton.i \
- ../be_include/be_decl.h ../be_include/be_scope.h \
- ../be_include/be_generator.h ../be_include/be_type.h \
- ../be_include/be_predefined_type.h ../be_include/be_module.h \
- ../be_include/be_interface.h ../be_include/be_interface_fwd.h \
- ../be_include/be_structure.h ../be_include/be_exception.h \
- ../be_include/be_expression.h ../be_include/be_enum.h \
- ../be_include/be_operation.h ../be_include/be_field.h \
- ../be_include/be_argument.h ../be_include/be_attribute.h \
- ../be_include/be_union.h ../be_include/be_union_branch.h \
- ../be_include/be_union_label.h ../be_include/be_constant.h \
- ../be_include/be_enum_val.h ../be_include/be_array.h \
- ../be_include/be_sequence.h ../be_include/be_string.h \
- ../be_include/be_typedef.h ../be_include/be_root.h \
- ../be_include/be_helper.h ../be_include/be_state.h \
- ../be_include/be_codegen.h ../be_include/be_factory.h
-.obj/be_operation.o .shobj/be_operation.so: be_operation.cpp ../include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/stdcpp.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- ../include/intlmacros.h ../include/idl_narrow.h \
- ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \
- ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/utl_strlist.h ../include/utl_exprlist.h \
- ../include/ast_generator.h ../include/util.h ../include/utl_stack.h \
- ../include/utl_idlist.h ../include/utl_exceptlist.h \
- ../include/utl_namelist.h ../include/utl_labellist.h \
- ../include/utl_decllist.h ../include/idl_global.h \
- ../include/utl_error.h ../include/utl_indenter.h \
- ../include/idl_extern.h ../include/fe_extern.h ../include/be_extern.h \
- ../include/drv_extern.h ../include/ast_extern.h \
- ../include/nr_extern.h ../include/global_extern.h ../be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Singleton.i \
- ../be_include/be_decl.h ../be_include/be_scope.h \
- ../be_include/be_generator.h ../be_include/be_type.h \
- ../be_include/be_predefined_type.h ../be_include/be_module.h \
- ../be_include/be_interface.h ../be_include/be_interface_fwd.h \
- ../be_include/be_structure.h ../be_include/be_exception.h \
- ../be_include/be_expression.h ../be_include/be_enum.h \
- ../be_include/be_operation.h ../be_include/be_field.h \
- ../be_include/be_argument.h ../be_include/be_attribute.h \
- ../be_include/be_union.h ../be_include/be_union_branch.h \
- ../be_include/be_union_label.h ../be_include/be_constant.h \
- ../be_include/be_enum_val.h ../be_include/be_array.h \
- ../be_include/be_sequence.h ../be_include/be_string.h \
- ../be_include/be_typedef.h ../be_include/be_root.h \
- ../be_include/be_helper.h ../be_include/be_state.h \
- ../be_include/be_codegen.h ../be_include/be_factory.h
-.obj/be_predefined_type.o .shobj/be_predefined_type.so: be_predefined_type.cpp ../include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/stdcpp.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- ../include/intlmacros.h ../include/idl_narrow.h \
- ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \
- ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/utl_strlist.h ../include/utl_exprlist.h \
- ../include/ast_generator.h ../include/util.h ../include/utl_stack.h \
- ../include/utl_idlist.h ../include/utl_exceptlist.h \
- ../include/utl_namelist.h ../include/utl_labellist.h \
- ../include/utl_decllist.h ../include/idl_global.h \
- ../include/utl_error.h ../include/utl_indenter.h \
- ../include/idl_extern.h ../include/fe_extern.h ../include/be_extern.h \
- ../include/drv_extern.h ../include/ast_extern.h \
- ../include/nr_extern.h ../include/global_extern.h ../be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Singleton.i \
- ../be_include/be_decl.h ../be_include/be_scope.h \
- ../be_include/be_generator.h ../be_include/be_type.h \
- ../be_include/be_predefined_type.h ../be_include/be_module.h \
- ../be_include/be_interface.h ../be_include/be_interface_fwd.h \
- ../be_include/be_structure.h ../be_include/be_exception.h \
- ../be_include/be_expression.h ../be_include/be_enum.h \
- ../be_include/be_operation.h ../be_include/be_field.h \
- ../be_include/be_argument.h ../be_include/be_attribute.h \
- ../be_include/be_union.h ../be_include/be_union_branch.h \
- ../be_include/be_union_label.h ../be_include/be_constant.h \
- ../be_include/be_enum_val.h ../be_include/be_array.h \
- ../be_include/be_sequence.h ../be_include/be_string.h \
- ../be_include/be_typedef.h ../be_include/be_root.h \
- ../be_include/be_helper.h ../be_include/be_state.h \
- ../be_include/be_codegen.h ../be_include/be_factory.h
-.obj/be_root.o .shobj/be_root.so: be_root.cpp ../include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/stdcpp.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- ../include/intlmacros.h ../include/idl_narrow.h \
- ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \
- ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/utl_strlist.h ../include/utl_exprlist.h \
- ../include/ast_generator.h ../include/util.h ../include/utl_stack.h \
- ../include/utl_idlist.h ../include/utl_exceptlist.h \
- ../include/utl_namelist.h ../include/utl_labellist.h \
- ../include/utl_decllist.h ../include/idl_global.h \
- ../include/utl_error.h ../include/utl_indenter.h \
- ../include/idl_extern.h ../include/fe_extern.h ../include/be_extern.h \
- ../include/drv_extern.h ../include/ast_extern.h \
- ../include/nr_extern.h ../include/global_extern.h ../be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Singleton.i \
- ../be_include/be_decl.h ../be_include/be_scope.h \
- ../be_include/be_generator.h ../be_include/be_type.h \
- ../be_include/be_predefined_type.h ../be_include/be_module.h \
- ../be_include/be_interface.h ../be_include/be_interface_fwd.h \
- ../be_include/be_structure.h ../be_include/be_exception.h \
- ../be_include/be_expression.h ../be_include/be_enum.h \
- ../be_include/be_operation.h ../be_include/be_field.h \
- ../be_include/be_argument.h ../be_include/be_attribute.h \
- ../be_include/be_union.h ../be_include/be_union_branch.h \
- ../be_include/be_union_label.h ../be_include/be_constant.h \
- ../be_include/be_enum_val.h ../be_include/be_array.h \
- ../be_include/be_sequence.h ../be_include/be_string.h \
- ../be_include/be_typedef.h ../be_include/be_root.h \
- ../be_include/be_helper.h ../be_include/be_state.h \
- ../be_include/be_codegen.h ../be_include/be_factory.h
-.obj/be_sequence.o .shobj/be_sequence.so: be_sequence.cpp ../include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/stdcpp.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- ../include/intlmacros.h ../include/idl_narrow.h \
- ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \
- ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/utl_strlist.h ../include/utl_exprlist.h \
- ../include/ast_generator.h ../include/util.h ../include/utl_stack.h \
- ../include/utl_idlist.h ../include/utl_exceptlist.h \
- ../include/utl_namelist.h ../include/utl_labellist.h \
- ../include/utl_decllist.h ../include/idl_global.h \
- ../include/utl_error.h ../include/utl_indenter.h \
- ../include/idl_extern.h ../include/fe_extern.h ../include/be_extern.h \
- ../include/drv_extern.h ../include/ast_extern.h \
- ../include/nr_extern.h ../include/global_extern.h ../be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Singleton.i \
- ../be_include/be_decl.h ../be_include/be_scope.h \
- ../be_include/be_generator.h ../be_include/be_type.h \
- ../be_include/be_predefined_type.h ../be_include/be_module.h \
- ../be_include/be_interface.h ../be_include/be_interface_fwd.h \
- ../be_include/be_structure.h ../be_include/be_exception.h \
- ../be_include/be_expression.h ../be_include/be_enum.h \
- ../be_include/be_operation.h ../be_include/be_field.h \
- ../be_include/be_argument.h ../be_include/be_attribute.h \
- ../be_include/be_union.h ../be_include/be_union_branch.h \
- ../be_include/be_union_label.h ../be_include/be_constant.h \
- ../be_include/be_enum_val.h ../be_include/be_array.h \
- ../be_include/be_sequence.h ../be_include/be_string.h \
- ../be_include/be_typedef.h ../be_include/be_root.h \
- ../be_include/be_helper.h ../be_include/be_state.h \
- ../be_include/be_codegen.h ../be_include/be_factory.h
-.obj/be_string.o .shobj/be_string.so: be_string.cpp ../include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/stdcpp.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- ../include/intlmacros.h ../include/idl_narrow.h \
- ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \
- ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/utl_strlist.h ../include/utl_exprlist.h \
- ../include/ast_generator.h ../include/util.h ../include/utl_stack.h \
- ../include/utl_idlist.h ../include/utl_exceptlist.h \
- ../include/utl_namelist.h ../include/utl_labellist.h \
- ../include/utl_decllist.h ../include/idl_global.h \
- ../include/utl_error.h ../include/utl_indenter.h \
- ../include/idl_extern.h ../include/fe_extern.h ../include/be_extern.h \
- ../include/drv_extern.h ../include/ast_extern.h \
- ../include/nr_extern.h ../include/global_extern.h ../be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Singleton.i \
- ../be_include/be_decl.h ../be_include/be_scope.h \
- ../be_include/be_generator.h ../be_include/be_type.h \
- ../be_include/be_predefined_type.h ../be_include/be_module.h \
- ../be_include/be_interface.h ../be_include/be_interface_fwd.h \
- ../be_include/be_structure.h ../be_include/be_exception.h \
- ../be_include/be_expression.h ../be_include/be_enum.h \
- ../be_include/be_operation.h ../be_include/be_field.h \
- ../be_include/be_argument.h ../be_include/be_attribute.h \
- ../be_include/be_union.h ../be_include/be_union_branch.h \
- ../be_include/be_union_label.h ../be_include/be_constant.h \
- ../be_include/be_enum_val.h ../be_include/be_array.h \
- ../be_include/be_sequence.h ../be_include/be_string.h \
- ../be_include/be_typedef.h ../be_include/be_root.h \
- ../be_include/be_helper.h ../be_include/be_state.h \
- ../be_include/be_codegen.h ../be_include/be_factory.h
-.obj/be_structure.o .shobj/be_structure.so: be_structure.cpp ../include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/stdcpp.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- ../include/intlmacros.h ../include/idl_narrow.h \
- ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \
- ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/utl_strlist.h ../include/utl_exprlist.h \
- ../include/ast_generator.h ../include/util.h ../include/utl_stack.h \
- ../include/utl_idlist.h ../include/utl_exceptlist.h \
- ../include/utl_namelist.h ../include/utl_labellist.h \
- ../include/utl_decllist.h ../include/idl_global.h \
- ../include/utl_error.h ../include/utl_indenter.h \
- ../include/idl_extern.h ../include/fe_extern.h ../include/be_extern.h \
- ../include/drv_extern.h ../include/ast_extern.h \
- ../include/nr_extern.h ../include/global_extern.h ../be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Singleton.i \
- ../be_include/be_decl.h ../be_include/be_scope.h \
- ../be_include/be_generator.h ../be_include/be_type.h \
- ../be_include/be_predefined_type.h ../be_include/be_module.h \
- ../be_include/be_interface.h ../be_include/be_interface_fwd.h \
- ../be_include/be_structure.h ../be_include/be_exception.h \
- ../be_include/be_expression.h ../be_include/be_enum.h \
- ../be_include/be_operation.h ../be_include/be_field.h \
- ../be_include/be_argument.h ../be_include/be_attribute.h \
- ../be_include/be_union.h ../be_include/be_union_branch.h \
- ../be_include/be_union_label.h ../be_include/be_constant.h \
- ../be_include/be_enum_val.h ../be_include/be_array.h \
- ../be_include/be_sequence.h ../be_include/be_string.h \
- ../be_include/be_typedef.h ../be_include/be_root.h \
- ../be_include/be_helper.h ../be_include/be_state.h \
- ../be_include/be_codegen.h ../be_include/be_factory.h
-.obj/be_type.o .shobj/be_type.so: be_type.cpp ../include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/stdcpp.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- ../include/intlmacros.h ../include/idl_narrow.h \
- ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \
- ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/utl_strlist.h ../include/utl_exprlist.h \
- ../include/ast_generator.h ../include/util.h ../include/utl_stack.h \
- ../include/utl_idlist.h ../include/utl_exceptlist.h \
- ../include/utl_namelist.h ../include/utl_labellist.h \
- ../include/utl_decllist.h ../include/idl_global.h \
- ../include/utl_error.h ../include/utl_indenter.h \
- ../include/idl_extern.h ../include/fe_extern.h ../include/be_extern.h \
- ../include/drv_extern.h ../include/ast_extern.h \
- ../include/nr_extern.h ../include/global_extern.h ../be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Singleton.i \
- ../be_include/be_decl.h ../be_include/be_scope.h \
- ../be_include/be_generator.h ../be_include/be_type.h \
- ../be_include/be_predefined_type.h ../be_include/be_module.h \
- ../be_include/be_interface.h ../be_include/be_interface_fwd.h \
- ../be_include/be_structure.h ../be_include/be_exception.h \
- ../be_include/be_expression.h ../be_include/be_enum.h \
- ../be_include/be_operation.h ../be_include/be_field.h \
- ../be_include/be_argument.h ../be_include/be_attribute.h \
- ../be_include/be_union.h ../be_include/be_union_branch.h \
- ../be_include/be_union_label.h ../be_include/be_constant.h \
- ../be_include/be_enum_val.h ../be_include/be_array.h \
- ../be_include/be_sequence.h ../be_include/be_string.h \
- ../be_include/be_typedef.h ../be_include/be_root.h \
- ../be_include/be_helper.h ../be_include/be_state.h \
- ../be_include/be_codegen.h ../be_include/be_factory.h
-.obj/be_typedef.o .shobj/be_typedef.so: be_typedef.cpp ../include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/stdcpp.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- ../include/intlmacros.h ../include/idl_narrow.h \
- ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \
- ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/utl_strlist.h ../include/utl_exprlist.h \
- ../include/ast_generator.h ../include/util.h ../include/utl_stack.h \
- ../include/utl_idlist.h ../include/utl_exceptlist.h \
- ../include/utl_namelist.h ../include/utl_labellist.h \
- ../include/utl_decllist.h ../include/idl_global.h \
- ../include/utl_error.h ../include/utl_indenter.h \
- ../include/idl_extern.h ../include/fe_extern.h ../include/be_extern.h \
- ../include/drv_extern.h ../include/ast_extern.h \
- ../include/nr_extern.h ../include/global_extern.h ../be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Singleton.i \
- ../be_include/be_decl.h ../be_include/be_scope.h \
- ../be_include/be_generator.h ../be_include/be_type.h \
- ../be_include/be_predefined_type.h ../be_include/be_module.h \
- ../be_include/be_interface.h ../be_include/be_interface_fwd.h \
- ../be_include/be_structure.h ../be_include/be_exception.h \
- ../be_include/be_expression.h ../be_include/be_enum.h \
- ../be_include/be_operation.h ../be_include/be_field.h \
- ../be_include/be_argument.h ../be_include/be_attribute.h \
- ../be_include/be_union.h ../be_include/be_union_branch.h \
- ../be_include/be_union_label.h ../be_include/be_constant.h \
- ../be_include/be_enum_val.h ../be_include/be_array.h \
- ../be_include/be_sequence.h ../be_include/be_string.h \
- ../be_include/be_typedef.h ../be_include/be_root.h \
- ../be_include/be_helper.h ../be_include/be_state.h \
- ../be_include/be_codegen.h ../be_include/be_factory.h
-.obj/be_union.o .shobj/be_union.so: be_union.cpp ../include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/stdcpp.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- ../include/intlmacros.h ../include/idl_narrow.h \
- ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \
- ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/utl_strlist.h ../include/utl_exprlist.h \
- ../include/ast_generator.h ../include/util.h ../include/utl_stack.h \
- ../include/utl_idlist.h ../include/utl_exceptlist.h \
- ../include/utl_namelist.h ../include/utl_labellist.h \
- ../include/utl_decllist.h ../include/idl_global.h \
- ../include/utl_error.h ../include/utl_indenter.h \
- ../include/idl_extern.h ../include/fe_extern.h ../include/be_extern.h \
- ../include/drv_extern.h ../include/ast_extern.h \
- ../include/nr_extern.h ../include/global_extern.h ../be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Singleton.i \
- ../be_include/be_decl.h ../be_include/be_scope.h \
- ../be_include/be_generator.h ../be_include/be_type.h \
- ../be_include/be_predefined_type.h ../be_include/be_module.h \
- ../be_include/be_interface.h ../be_include/be_interface_fwd.h \
- ../be_include/be_structure.h ../be_include/be_exception.h \
- ../be_include/be_expression.h ../be_include/be_enum.h \
- ../be_include/be_operation.h ../be_include/be_field.h \
- ../be_include/be_argument.h ../be_include/be_attribute.h \
- ../be_include/be_union.h ../be_include/be_union_branch.h \
- ../be_include/be_union_label.h ../be_include/be_constant.h \
- ../be_include/be_enum_val.h ../be_include/be_array.h \
- ../be_include/be_sequence.h ../be_include/be_string.h \
- ../be_include/be_typedef.h ../be_include/be_root.h \
- ../be_include/be_helper.h ../be_include/be_state.h \
- ../be_include/be_codegen.h ../be_include/be_factory.h
-.obj/be_union_branch.o .shobj/be_union_branch.so: be_union_branch.cpp ../include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/stdcpp.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- ../include/intlmacros.h ../include/idl_narrow.h \
- ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \
- ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/utl_strlist.h ../include/utl_exprlist.h \
- ../include/ast_generator.h ../include/util.h ../include/utl_stack.h \
- ../include/utl_idlist.h ../include/utl_exceptlist.h \
- ../include/utl_namelist.h ../include/utl_labellist.h \
- ../include/utl_decllist.h ../include/idl_global.h \
- ../include/utl_error.h ../include/utl_indenter.h \
- ../include/idl_extern.h ../include/fe_extern.h ../include/be_extern.h \
- ../include/drv_extern.h ../include/ast_extern.h \
- ../include/nr_extern.h ../include/global_extern.h ../be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Singleton.i \
- ../be_include/be_decl.h ../be_include/be_scope.h \
- ../be_include/be_generator.h ../be_include/be_type.h \
- ../be_include/be_predefined_type.h ../be_include/be_module.h \
- ../be_include/be_interface.h ../be_include/be_interface_fwd.h \
- ../be_include/be_structure.h ../be_include/be_exception.h \
- ../be_include/be_expression.h ../be_include/be_enum.h \
- ../be_include/be_operation.h ../be_include/be_field.h \
- ../be_include/be_argument.h ../be_include/be_attribute.h \
- ../be_include/be_union.h ../be_include/be_union_branch.h \
- ../be_include/be_union_label.h ../be_include/be_constant.h \
- ../be_include/be_enum_val.h ../be_include/be_array.h \
- ../be_include/be_sequence.h ../be_include/be_string.h \
- ../be_include/be_typedef.h ../be_include/be_root.h \
- ../be_include/be_helper.h ../be_include/be_state.h \
- ../be_include/be_codegen.h ../be_include/be_factory.h
-.obj/be_union_label.o .shobj/be_union_label.so: be_union_label.cpp ../include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/stdcpp.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- ../include/intlmacros.h ../include/idl_narrow.h \
- ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \
- ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/utl_strlist.h ../include/utl_exprlist.h \
- ../include/ast_generator.h ../include/util.h ../include/utl_stack.h \
- ../include/utl_idlist.h ../include/utl_exceptlist.h \
- ../include/utl_namelist.h ../include/utl_labellist.h \
- ../include/utl_decllist.h ../include/idl_global.h \
- ../include/utl_error.h ../include/utl_indenter.h \
- ../include/idl_extern.h ../include/fe_extern.h ../include/be_extern.h \
- ../include/drv_extern.h ../include/ast_extern.h \
- ../include/nr_extern.h ../include/global_extern.h ../be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Singleton.i \
- ../be_include/be_decl.h ../be_include/be_scope.h \
- ../be_include/be_generator.h ../be_include/be_type.h \
- ../be_include/be_predefined_type.h ../be_include/be_module.h \
- ../be_include/be_interface.h ../be_include/be_interface_fwd.h \
- ../be_include/be_structure.h ../be_include/be_exception.h \
- ../be_include/be_expression.h ../be_include/be_enum.h \
- ../be_include/be_operation.h ../be_include/be_field.h \
- ../be_include/be_argument.h ../be_include/be_attribute.h \
- ../be_include/be_union.h ../be_include/be_union_branch.h \
- ../be_include/be_union_label.h ../be_include/be_constant.h \
- ../be_include/be_enum_val.h ../be_include/be_array.h \
- ../be_include/be_sequence.h ../be_include/be_string.h \
- ../be_include/be_typedef.h ../be_include/be_root.h \
- ../be_include/be_helper.h ../be_include/be_state.h \
- ../be_include/be_codegen.h ../be_include/be_factory.h
-.obj/be_generator.o .shobj/be_generator.so: be_generator.cpp ../include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/stdcpp.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- ../include/intlmacros.h ../include/idl_narrow.h \
- ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \
- ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/utl_strlist.h ../include/utl_exprlist.h \
- ../include/ast_generator.h ../include/util.h ../include/utl_stack.h \
- ../include/utl_idlist.h ../include/utl_exceptlist.h \
- ../include/utl_namelist.h ../include/utl_labellist.h \
- ../include/utl_decllist.h ../include/idl_global.h \
- ../include/utl_error.h ../include/utl_indenter.h \
- ../include/idl_extern.h ../include/fe_extern.h ../include/be_extern.h \
- ../include/drv_extern.h ../include/ast_extern.h \
- ../include/nr_extern.h ../include/global_extern.h ../be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Singleton.i \
- ../be_include/be_decl.h ../be_include/be_scope.h \
- ../be_include/be_generator.h ../be_include/be_type.h \
- ../be_include/be_predefined_type.h ../be_include/be_module.h \
- ../be_include/be_interface.h ../be_include/be_interface_fwd.h \
- ../be_include/be_structure.h ../be_include/be_exception.h \
- ../be_include/be_expression.h ../be_include/be_enum.h \
- ../be_include/be_operation.h ../be_include/be_field.h \
- ../be_include/be_argument.h ../be_include/be_attribute.h \
- ../be_include/be_union.h ../be_include/be_union_branch.h \
- ../be_include/be_union_label.h ../be_include/be_constant.h \
- ../be_include/be_enum_val.h ../be_include/be_array.h \
- ../be_include/be_sequence.h ../be_include/be_string.h \
- ../be_include/be_typedef.h ../be_include/be_root.h \
- ../be_include/be_helper.h ../be_include/be_state.h \
- ../be_include/be_codegen.h ../be_include/be_factory.h
-.obj/be_init.o .shobj/be_init.so: be_init.cpp ../include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/stdcpp.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- ../include/intlmacros.h ../include/idl_narrow.h \
- ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \
- ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/utl_strlist.h ../include/utl_exprlist.h \
- ../include/ast_generator.h ../include/util.h ../include/utl_stack.h \
- ../include/utl_idlist.h ../include/utl_exceptlist.h \
- ../include/utl_namelist.h ../include/utl_labellist.h \
- ../include/utl_decllist.h ../include/idl_global.h \
- ../include/utl_error.h ../include/utl_indenter.h \
- ../include/idl_extern.h ../include/fe_extern.h ../include/be_extern.h \
- ../include/drv_extern.h ../include/ast_extern.h \
- ../include/nr_extern.h ../include/global_extern.h ../be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Singleton.i \
- ../be_include/be_decl.h ../be_include/be_scope.h \
- ../be_include/be_generator.h ../be_include/be_type.h \
- ../be_include/be_predefined_type.h ../be_include/be_module.h \
- ../be_include/be_interface.h ../be_include/be_interface_fwd.h \
- ../be_include/be_structure.h ../be_include/be_exception.h \
- ../be_include/be_expression.h ../be_include/be_enum.h \
- ../be_include/be_operation.h ../be_include/be_field.h \
- ../be_include/be_argument.h ../be_include/be_attribute.h \
- ../be_include/be_union.h ../be_include/be_union_branch.h \
- ../be_include/be_union_label.h ../be_include/be_constant.h \
- ../be_include/be_enum_val.h ../be_include/be_array.h \
- ../be_include/be_sequence.h ../be_include/be_string.h \
- ../be_include/be_typedef.h ../be_include/be_root.h \
- ../be_include/be_helper.h ../be_include/be_state.h \
- ../be_include/be_codegen.h ../be_include/be_factory.h
-.obj/be_produce.o .shobj/be_produce.so: be_produce.cpp ../include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/stdcpp.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- ../include/intlmacros.h ../include/idl_narrow.h \
- ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \
- ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/utl_strlist.h ../include/utl_exprlist.h \
- ../include/ast_generator.h ../include/util.h ../include/utl_stack.h \
- ../include/utl_idlist.h ../include/utl_exceptlist.h \
- ../include/utl_namelist.h ../include/utl_labellist.h \
- ../include/utl_decllist.h ../include/idl_global.h \
- ../include/utl_error.h ../include/utl_indenter.h \
- ../include/idl_extern.h ../include/fe_extern.h ../include/be_extern.h \
- ../include/drv_extern.h ../include/ast_extern.h \
- ../include/nr_extern.h ../include/global_extern.h ../be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Singleton.i \
- ../be_include/be_decl.h ../be_include/be_scope.h \
- ../be_include/be_generator.h ../be_include/be_type.h \
- ../be_include/be_predefined_type.h ../be_include/be_module.h \
- ../be_include/be_interface.h ../be_include/be_interface_fwd.h \
- ../be_include/be_structure.h ../be_include/be_exception.h \
- ../be_include/be_expression.h ../be_include/be_enum.h \
- ../be_include/be_operation.h ../be_include/be_field.h \
- ../be_include/be_argument.h ../be_include/be_attribute.h \
- ../be_include/be_union.h ../be_include/be_union_branch.h \
- ../be_include/be_union_label.h ../be_include/be_constant.h \
- ../be_include/be_enum_val.h ../be_include/be_array.h \
- ../be_include/be_sequence.h ../be_include/be_string.h \
- ../be_include/be_typedef.h ../be_include/be_root.h \
- ../be_include/be_helper.h ../be_include/be_state.h \
- ../be_include/be_codegen.h ../be_include/be_factory.h
-.obj/be_args.o .shobj/be_args.so: be_args.cpp ../include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/stdcpp.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- ../include/intlmacros.h ../include/idl_narrow.h \
- ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \
- ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/utl_strlist.h ../include/utl_exprlist.h \
- ../include/ast_generator.h ../include/util.h ../include/utl_stack.h \
- ../include/utl_idlist.h ../include/utl_exceptlist.h \
- ../include/utl_namelist.h ../include/utl_labellist.h \
- ../include/utl_decllist.h ../include/idl_global.h \
- ../include/utl_error.h ../include/utl_indenter.h \
- ../include/idl_extern.h ../include/fe_extern.h ../include/be_extern.h \
- ../include/drv_extern.h ../include/ast_extern.h \
- ../include/nr_extern.h ../include/global_extern.h ../be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Singleton.i \
- ../be_include/be_decl.h ../be_include/be_scope.h \
- ../be_include/be_generator.h ../be_include/be_type.h \
- ../be_include/be_predefined_type.h ../be_include/be_module.h \
- ../be_include/be_interface.h ../be_include/be_interface_fwd.h \
- ../be_include/be_structure.h ../be_include/be_exception.h \
- ../be_include/be_expression.h ../be_include/be_enum.h \
- ../be_include/be_operation.h ../be_include/be_field.h \
- ../be_include/be_argument.h ../be_include/be_attribute.h \
- ../be_include/be_union.h ../be_include/be_union_branch.h \
- ../be_include/be_union_label.h ../be_include/be_constant.h \
- ../be_include/be_enum_val.h ../be_include/be_array.h \
- ../be_include/be_sequence.h ../be_include/be_string.h \
- ../be_include/be_typedef.h ../be_include/be_root.h \
- ../be_include/be_helper.h ../be_include/be_state.h \
- ../be_include/be_codegen.h ../be_include/be_factory.h
-.obj/be_helper.o .shobj/be_helper.so: be_helper.cpp ../include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/stdcpp.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- ../include/intlmacros.h ../include/idl_narrow.h \
- ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \
- ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/utl_strlist.h ../include/utl_exprlist.h \
- ../include/ast_generator.h ../include/util.h ../include/utl_stack.h \
- ../include/utl_idlist.h ../include/utl_exceptlist.h \
- ../include/utl_namelist.h ../include/utl_labellist.h \
- ../include/utl_decllist.h ../include/idl_global.h \
- ../include/utl_error.h ../include/utl_indenter.h \
- ../include/idl_extern.h ../include/fe_extern.h ../include/be_extern.h \
- ../include/drv_extern.h ../include/ast_extern.h \
- ../include/nr_extern.h ../include/global_extern.h ../be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Singleton.i \
- ../be_include/be_decl.h ../be_include/be_scope.h \
- ../be_include/be_generator.h ../be_include/be_type.h \
- ../be_include/be_predefined_type.h ../be_include/be_module.h \
- ../be_include/be_interface.h ../be_include/be_interface_fwd.h \
- ../be_include/be_structure.h ../be_include/be_exception.h \
- ../be_include/be_expression.h ../be_include/be_enum.h \
- ../be_include/be_operation.h ../be_include/be_field.h \
- ../be_include/be_argument.h ../be_include/be_attribute.h \
- ../be_include/be_union.h ../be_include/be_union_branch.h \
- ../be_include/be_union_label.h ../be_include/be_constant.h \
- ../be_include/be_enum_val.h ../be_include/be_array.h \
- ../be_include/be_sequence.h ../be_include/be_string.h \
- ../be_include/be_typedef.h ../be_include/be_root.h \
- ../be_include/be_helper.h ../be_include/be_state.h \
- ../be_include/be_codegen.h ../be_include/be_factory.h
-.obj/be_state.o .shobj/be_state.so: be_state.cpp ../include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/stdcpp.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- ../include/intlmacros.h ../include/idl_narrow.h \
- ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \
- ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/utl_strlist.h ../include/utl_exprlist.h \
- ../include/ast_generator.h ../include/util.h ../include/utl_stack.h \
- ../include/utl_idlist.h ../include/utl_exceptlist.h \
- ../include/utl_namelist.h ../include/utl_labellist.h \
- ../include/utl_decllist.h ../include/idl_global.h \
- ../include/utl_error.h ../include/utl_indenter.h \
- ../include/idl_extern.h ../include/fe_extern.h ../include/be_extern.h \
- ../include/drv_extern.h ../include/ast_extern.h \
- ../include/nr_extern.h ../include/global_extern.h ../be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Singleton.i \
- ../be_include/be_decl.h ../be_include/be_scope.h \
- ../be_include/be_generator.h ../be_include/be_type.h \
- ../be_include/be_predefined_type.h ../be_include/be_module.h \
- ../be_include/be_interface.h ../be_include/be_interface_fwd.h \
- ../be_include/be_structure.h ../be_include/be_exception.h \
- ../be_include/be_expression.h ../be_include/be_enum.h \
- ../be_include/be_operation.h ../be_include/be_field.h \
- ../be_include/be_argument.h ../be_include/be_attribute.h \
- ../be_include/be_union.h ../be_include/be_union_branch.h \
- ../be_include/be_union_label.h ../be_include/be_constant.h \
- ../be_include/be_enum_val.h ../be_include/be_array.h \
- ../be_include/be_sequence.h ../be_include/be_string.h \
- ../be_include/be_typedef.h ../be_include/be_root.h \
- ../be_include/be_helper.h ../be_include/be_state.h \
- ../be_include/be_codegen.h ../be_include/be_factory.h
-.obj/be_state_array.o .shobj/be_state_array.so: be_state_array.cpp ../include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/stdcpp.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- ../include/intlmacros.h ../include/idl_narrow.h \
- ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \
- ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/utl_strlist.h ../include/utl_exprlist.h \
- ../include/ast_generator.h ../include/util.h ../include/utl_stack.h \
- ../include/utl_idlist.h ../include/utl_exceptlist.h \
- ../include/utl_namelist.h ../include/utl_labellist.h \
- ../include/utl_decllist.h ../include/idl_global.h \
- ../include/utl_error.h ../include/utl_indenter.h \
- ../include/idl_extern.h ../include/fe_extern.h ../include/be_extern.h \
- ../include/drv_extern.h ../include/ast_extern.h \
- ../include/nr_extern.h ../include/global_extern.h ../be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Singleton.i \
- ../be_include/be_decl.h ../be_include/be_scope.h \
- ../be_include/be_generator.h ../be_include/be_type.h \
- ../be_include/be_predefined_type.h ../be_include/be_module.h \
- ../be_include/be_interface.h ../be_include/be_interface_fwd.h \
- ../be_include/be_structure.h ../be_include/be_exception.h \
- ../be_include/be_expression.h ../be_include/be_enum.h \
- ../be_include/be_operation.h ../be_include/be_field.h \
- ../be_include/be_argument.h ../be_include/be_attribute.h \
- ../be_include/be_union.h ../be_include/be_union_branch.h \
- ../be_include/be_union_label.h ../be_include/be_constant.h \
- ../be_include/be_enum_val.h ../be_include/be_array.h \
- ../be_include/be_sequence.h ../be_include/be_string.h \
- ../be_include/be_typedef.h ../be_include/be_root.h \
- ../be_include/be_helper.h ../be_include/be_state.h \
- ../be_include/be_codegen.h ../be_include/be_factory.h
-.obj/be_state_argument.o .shobj/be_state_argument.so: be_state_argument.cpp ../include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/stdcpp.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- ../include/intlmacros.h ../include/idl_narrow.h \
- ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \
- ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/utl_strlist.h ../include/utl_exprlist.h \
- ../include/ast_generator.h ../include/util.h ../include/utl_stack.h \
- ../include/utl_idlist.h ../include/utl_exceptlist.h \
- ../include/utl_namelist.h ../include/utl_labellist.h \
- ../include/utl_decllist.h ../include/idl_global.h \
- ../include/utl_error.h ../include/utl_indenter.h \
- ../include/idl_extern.h ../include/fe_extern.h ../include/be_extern.h \
- ../include/drv_extern.h ../include/ast_extern.h \
- ../include/nr_extern.h ../include/global_extern.h ../be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Singleton.i \
- ../be_include/be_decl.h ../be_include/be_scope.h \
- ../be_include/be_generator.h ../be_include/be_type.h \
- ../be_include/be_predefined_type.h ../be_include/be_module.h \
- ../be_include/be_interface.h ../be_include/be_interface_fwd.h \
- ../be_include/be_structure.h ../be_include/be_exception.h \
- ../be_include/be_expression.h ../be_include/be_enum.h \
- ../be_include/be_operation.h ../be_include/be_field.h \
- ../be_include/be_argument.h ../be_include/be_attribute.h \
- ../be_include/be_union.h ../be_include/be_union_branch.h \
- ../be_include/be_union_label.h ../be_include/be_constant.h \
- ../be_include/be_enum_val.h ../be_include/be_array.h \
- ../be_include/be_sequence.h ../be_include/be_string.h \
- ../be_include/be_typedef.h ../be_include/be_root.h \
- ../be_include/be_helper.h ../be_include/be_state.h \
- ../be_include/be_codegen.h ../be_include/be_factory.h
-.obj/be_state_attribute.o .shobj/be_state_attribute.so: be_state_attribute.cpp ../include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/stdcpp.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- ../include/intlmacros.h ../include/idl_narrow.h \
- ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \
- ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/utl_strlist.h ../include/utl_exprlist.h \
- ../include/ast_generator.h ../include/util.h ../include/utl_stack.h \
- ../include/utl_idlist.h ../include/utl_exceptlist.h \
- ../include/utl_namelist.h ../include/utl_labellist.h \
- ../include/utl_decllist.h ../include/idl_global.h \
- ../include/utl_error.h ../include/utl_indenter.h \
- ../include/idl_extern.h ../include/fe_extern.h ../include/be_extern.h \
- ../include/drv_extern.h ../include/ast_extern.h \
- ../include/nr_extern.h ../include/global_extern.h ../be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Singleton.i \
- ../be_include/be_decl.h ../be_include/be_scope.h \
- ../be_include/be_generator.h ../be_include/be_type.h \
- ../be_include/be_predefined_type.h ../be_include/be_module.h \
- ../be_include/be_interface.h ../be_include/be_interface_fwd.h \
- ../be_include/be_structure.h ../be_include/be_exception.h \
- ../be_include/be_expression.h ../be_include/be_enum.h \
- ../be_include/be_operation.h ../be_include/be_field.h \
- ../be_include/be_argument.h ../be_include/be_attribute.h \
- ../be_include/be_union.h ../be_include/be_union_branch.h \
- ../be_include/be_union_label.h ../be_include/be_constant.h \
- ../be_include/be_enum_val.h ../be_include/be_array.h \
- ../be_include/be_sequence.h ../be_include/be_string.h \
- ../be_include/be_typedef.h ../be_include/be_root.h \
- ../be_include/be_helper.h ../be_include/be_state.h \
- ../be_include/be_codegen.h ../be_include/be_factory.h
-.obj/be_state_operation.o .shobj/be_state_operation.so: be_state_operation.cpp ../include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/stdcpp.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- ../include/intlmacros.h ../include/idl_narrow.h \
- ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \
- ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/utl_strlist.h ../include/utl_exprlist.h \
- ../include/ast_generator.h ../include/util.h ../include/utl_stack.h \
- ../include/utl_idlist.h ../include/utl_exceptlist.h \
- ../include/utl_namelist.h ../include/utl_labellist.h \
- ../include/utl_decllist.h ../include/idl_global.h \
- ../include/utl_error.h ../include/utl_indenter.h \
- ../include/idl_extern.h ../include/fe_extern.h ../include/be_extern.h \
- ../include/drv_extern.h ../include/ast_extern.h \
- ../include/nr_extern.h ../include/global_extern.h ../be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Singleton.i \
- ../be_include/be_decl.h ../be_include/be_scope.h \
- ../be_include/be_generator.h ../be_include/be_type.h \
- ../be_include/be_predefined_type.h ../be_include/be_module.h \
- ../be_include/be_interface.h ../be_include/be_interface_fwd.h \
- ../be_include/be_structure.h ../be_include/be_exception.h \
- ../be_include/be_expression.h ../be_include/be_enum.h \
- ../be_include/be_operation.h ../be_include/be_field.h \
- ../be_include/be_argument.h ../be_include/be_attribute.h \
- ../be_include/be_union.h ../be_include/be_union_branch.h \
- ../be_include/be_union_label.h ../be_include/be_constant.h \
- ../be_include/be_enum_val.h ../be_include/be_array.h \
- ../be_include/be_sequence.h ../be_include/be_string.h \
- ../be_include/be_typedef.h ../be_include/be_root.h \
- ../be_include/be_helper.h ../be_include/be_state.h \
- ../be_include/be_codegen.h ../be_include/be_factory.h
-.obj/be_state_sequence.o .shobj/be_state_sequence.so: be_state_sequence.cpp ../include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/stdcpp.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- ../include/intlmacros.h ../include/idl_narrow.h \
- ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \
- ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/utl_strlist.h ../include/utl_exprlist.h \
- ../include/ast_generator.h ../include/util.h ../include/utl_stack.h \
- ../include/utl_idlist.h ../include/utl_exceptlist.h \
- ../include/utl_namelist.h ../include/utl_labellist.h \
- ../include/utl_decllist.h ../include/idl_global.h \
- ../include/utl_error.h ../include/utl_indenter.h \
- ../include/idl_extern.h ../include/fe_extern.h ../include/be_extern.h \
- ../include/drv_extern.h ../include/ast_extern.h \
- ../include/nr_extern.h ../include/global_extern.h ../be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Singleton.i \
- ../be_include/be_decl.h ../be_include/be_scope.h \
- ../be_include/be_generator.h ../be_include/be_type.h \
- ../be_include/be_predefined_type.h ../be_include/be_module.h \
- ../be_include/be_interface.h ../be_include/be_interface_fwd.h \
- ../be_include/be_structure.h ../be_include/be_exception.h \
- ../be_include/be_expression.h ../be_include/be_enum.h \
- ../be_include/be_operation.h ../be_include/be_field.h \
- ../be_include/be_argument.h ../be_include/be_attribute.h \
- ../be_include/be_union.h ../be_include/be_union_branch.h \
- ../be_include/be_union_label.h ../be_include/be_constant.h \
- ../be_include/be_enum_val.h ../be_include/be_array.h \
- ../be_include/be_sequence.h ../be_include/be_string.h \
- ../be_include/be_typedef.h ../be_include/be_root.h \
- ../be_include/be_helper.h ../be_include/be_state.h \
- ../be_include/be_codegen.h ../be_include/be_factory.h
-.obj/be_state_structure.o .shobj/be_state_structure.so: be_state_structure.cpp ../include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/stdcpp.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- ../include/intlmacros.h ../include/idl_narrow.h \
- ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \
- ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/utl_strlist.h ../include/utl_exprlist.h \
- ../include/ast_generator.h ../include/util.h ../include/utl_stack.h \
- ../include/utl_idlist.h ../include/utl_exceptlist.h \
- ../include/utl_namelist.h ../include/utl_labellist.h \
- ../include/utl_decllist.h ../include/idl_global.h \
- ../include/utl_error.h ../include/utl_indenter.h \
- ../include/idl_extern.h ../include/fe_extern.h ../include/be_extern.h \
- ../include/drv_extern.h ../include/ast_extern.h \
- ../include/nr_extern.h ../include/global_extern.h ../be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Singleton.i \
- ../be_include/be_decl.h ../be_include/be_scope.h \
- ../be_include/be_generator.h ../be_include/be_type.h \
- ../be_include/be_predefined_type.h ../be_include/be_module.h \
- ../be_include/be_interface.h ../be_include/be_interface_fwd.h \
- ../be_include/be_structure.h ../be_include/be_exception.h \
- ../be_include/be_expression.h ../be_include/be_enum.h \
- ../be_include/be_operation.h ../be_include/be_field.h \
- ../be_include/be_argument.h ../be_include/be_attribute.h \
- ../be_include/be_union.h ../be_include/be_union_branch.h \
- ../be_include/be_union_label.h ../be_include/be_constant.h \
- ../be_include/be_enum_val.h ../be_include/be_array.h \
- ../be_include/be_sequence.h ../be_include/be_string.h \
- ../be_include/be_typedef.h ../be_include/be_root.h \
- ../be_include/be_helper.h ../be_include/be_state.h \
- ../be_include/be_codegen.h ../be_include/be_factory.h
-.obj/be_state_typedef.o .shobj/be_state_typedef.so: be_state_typedef.cpp ../include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/stdcpp.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- ../include/intlmacros.h ../include/idl_narrow.h \
- ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \
- ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/utl_strlist.h ../include/utl_exprlist.h \
- ../include/ast_generator.h ../include/util.h ../include/utl_stack.h \
- ../include/utl_idlist.h ../include/utl_exceptlist.h \
- ../include/utl_namelist.h ../include/utl_labellist.h \
- ../include/utl_decllist.h ../include/idl_global.h \
- ../include/utl_error.h ../include/utl_indenter.h \
- ../include/idl_extern.h ../include/fe_extern.h ../include/be_extern.h \
- ../include/drv_extern.h ../include/ast_extern.h \
- ../include/nr_extern.h ../include/global_extern.h ../be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Singleton.i \
- ../be_include/be_decl.h ../be_include/be_scope.h \
- ../be_include/be_generator.h ../be_include/be_type.h \
- ../be_include/be_predefined_type.h ../be_include/be_module.h \
- ../be_include/be_interface.h ../be_include/be_interface_fwd.h \
- ../be_include/be_structure.h ../be_include/be_exception.h \
- ../be_include/be_expression.h ../be_include/be_enum.h \
- ../be_include/be_operation.h ../be_include/be_field.h \
- ../be_include/be_argument.h ../be_include/be_attribute.h \
- ../be_include/be_union.h ../be_include/be_union_branch.h \
- ../be_include/be_union_label.h ../be_include/be_constant.h \
- ../be_include/be_enum_val.h ../be_include/be_array.h \
- ../be_include/be_sequence.h ../be_include/be_string.h \
- ../be_include/be_typedef.h ../be_include/be_root.h \
- ../be_include/be_helper.h ../be_include/be_state.h \
- ../be_include/be_codegen.h ../be_include/be_factory.h
-.obj/be_state_union.o .shobj/be_state_union.so: be_state_union.cpp ../include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/stdcpp.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- ../include/intlmacros.h ../include/idl_narrow.h \
- ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \
- ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/utl_strlist.h ../include/utl_exprlist.h \
- ../include/ast_generator.h ../include/util.h ../include/utl_stack.h \
- ../include/utl_idlist.h ../include/utl_exceptlist.h \
- ../include/utl_namelist.h ../include/utl_labellist.h \
- ../include/utl_decllist.h ../include/idl_global.h \
- ../include/utl_error.h ../include/utl_indenter.h \
- ../include/idl_extern.h ../include/fe_extern.h ../include/be_extern.h \
- ../include/drv_extern.h ../include/ast_extern.h \
- ../include/nr_extern.h ../include/global_extern.h ../be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Singleton.i \
- ../be_include/be_decl.h ../be_include/be_scope.h \
- ../be_include/be_generator.h ../be_include/be_type.h \
- ../be_include/be_predefined_type.h ../be_include/be_module.h \
- ../be_include/be_interface.h ../be_include/be_interface_fwd.h \
- ../be_include/be_structure.h ../be_include/be_exception.h \
- ../be_include/be_expression.h ../be_include/be_enum.h \
- ../be_include/be_operation.h ../be_include/be_field.h \
- ../be_include/be_argument.h ../be_include/be_attribute.h \
- ../be_include/be_union.h ../be_include/be_union_branch.h \
- ../be_include/be_union_label.h ../be_include/be_constant.h \
- ../be_include/be_enum_val.h ../be_include/be_array.h \
- ../be_include/be_sequence.h ../be_include/be_string.h \
- ../be_include/be_typedef.h ../be_include/be_root.h \
- ../be_include/be_helper.h ../be_include/be_state.h \
- ../be_include/be_codegen.h ../be_include/be_factory.h
-.obj/be_codegen.o .shobj/be_codegen.so: be_codegen.cpp ../include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/stdcpp.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- ../include/intlmacros.h ../include/idl_narrow.h \
- ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \
- ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/utl_strlist.h ../include/utl_exprlist.h \
- ../include/ast_generator.h ../include/util.h ../include/utl_stack.h \
- ../include/utl_idlist.h ../include/utl_exceptlist.h \
- ../include/utl_namelist.h ../include/utl_labellist.h \
- ../include/utl_decllist.h ../include/idl_global.h \
- ../include/utl_error.h ../include/utl_indenter.h \
- ../include/idl_extern.h ../include/fe_extern.h ../include/be_extern.h \
- ../include/drv_extern.h ../include/ast_extern.h \
- ../include/nr_extern.h ../include/global_extern.h ../be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Singleton.i \
- ../be_include/be_decl.h ../be_include/be_scope.h \
- ../be_include/be_generator.h ../be_include/be_type.h \
- ../be_include/be_predefined_type.h ../be_include/be_module.h \
- ../be_include/be_interface.h ../be_include/be_interface_fwd.h \
- ../be_include/be_structure.h ../be_include/be_exception.h \
- ../be_include/be_expression.h ../be_include/be_enum.h \
- ../be_include/be_operation.h ../be_include/be_field.h \
- ../be_include/be_argument.h ../be_include/be_attribute.h \
- ../be_include/be_union.h ../be_include/be_union_branch.h \
- ../be_include/be_union_label.h ../be_include/be_constant.h \
- ../be_include/be_enum_val.h ../be_include/be_array.h \
- ../be_include/be_sequence.h ../be_include/be_string.h \
- ../be_include/be_typedef.h ../be_include/be_root.h \
- ../be_include/be_helper.h ../be_include/be_state.h \
- ../be_include/be_codegen.h ../be_include/be_factory.h
-.obj/be_factory.o .shobj/be_factory.so: be_factory.cpp ../include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/stdcpp.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- ../include/intlmacros.h ../include/idl_narrow.h \
- ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \
- ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/utl_strlist.h ../include/utl_exprlist.h \
- ../include/ast_generator.h ../include/util.h ../include/utl_stack.h \
- ../include/utl_idlist.h ../include/utl_exceptlist.h \
- ../include/utl_namelist.h ../include/utl_labellist.h \
- ../include/utl_decllist.h ../include/idl_global.h \
- ../include/utl_error.h ../include/utl_indenter.h \
- ../include/idl_extern.h ../include/fe_extern.h ../include/be_extern.h \
- ../include/drv_extern.h ../include/ast_extern.h \
- ../include/nr_extern.h ../include/global_extern.h ../be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Singleton.i \
- ../be_include/be_decl.h ../be_include/be_scope.h \
- ../be_include/be_generator.h ../be_include/be_type.h \
- ../be_include/be_predefined_type.h ../be_include/be_module.h \
- ../be_include/be_interface.h ../be_include/be_interface_fwd.h \
- ../be_include/be_structure.h ../be_include/be_exception.h \
- ../be_include/be_expression.h ../be_include/be_enum.h \
- ../be_include/be_operation.h ../be_include/be_field.h \
- ../be_include/be_argument.h ../be_include/be_attribute.h \
- ../be_include/be_union.h ../be_include/be_union_branch.h \
- ../be_include/be_union_label.h ../be_include/be_constant.h \
- ../be_include/be_enum_val.h ../be_include/be_array.h \
- ../be_include/be_sequence.h ../be_include/be_string.h \
- ../be_include/be_typedef.h ../be_include/be_root.h \
- ../be_include/be_helper.h ../be_include/be_state.h \
- ../be_include/be_codegen.h ../be_include/be_factory.h \
- ../be_include/be_sunsoft.h
-.obj/be_sunsoft.o .shobj/be_sunsoft.so: be_sunsoft.cpp ../include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/stdcpp.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- ../include/intlmacros.h ../include/idl_narrow.h \
- ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \
- ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/utl_strlist.h ../include/utl_exprlist.h \
- ../include/ast_generator.h ../include/util.h ../include/utl_stack.h \
- ../include/utl_idlist.h ../include/utl_exceptlist.h \
- ../include/utl_namelist.h ../include/utl_labellist.h \
- ../include/utl_decllist.h ../include/idl_global.h \
- ../include/utl_error.h ../include/utl_indenter.h \
- ../include/idl_extern.h ../include/fe_extern.h ../include/be_extern.h \
- ../include/drv_extern.h ../include/ast_extern.h \
- ../include/nr_extern.h ../include/global_extern.h ../be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Singleton.i \
- ../be_include/be_decl.h ../be_include/be_scope.h \
- ../be_include/be_generator.h ../be_include/be_type.h \
- ../be_include/be_predefined_type.h ../be_include/be_module.h \
- ../be_include/be_interface.h ../be_include/be_interface_fwd.h \
- ../be_include/be_structure.h ../be_include/be_exception.h \
- ../be_include/be_expression.h ../be_include/be_enum.h \
- ../be_include/be_operation.h ../be_include/be_field.h \
- ../be_include/be_argument.h ../be_include/be_attribute.h \
- ../be_include/be_union.h ../be_include/be_union_branch.h \
- ../be_include/be_union_label.h ../be_include/be_constant.h \
- ../be_include/be_enum_val.h ../be_include/be_array.h \
- ../be_include/be_sequence.h ../be_include/be_string.h \
- ../be_include/be_typedef.h ../be_include/be_root.h \
- ../be_include/be_helper.h ../be_include/be_state.h \
- ../be_include/be_codegen.h ../be_include/be_factory.h \
- ../be_include/be_sunsoft.h
-.obj/be_decl.o .shobj/be_decl.so: be_decl.cpp ../include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/stdcpp.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- ../include/intlmacros.h ../include/idl_narrow.h \
- ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \
- ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/utl_strlist.h ../include/utl_exprlist.h \
- ../include/ast_generator.h ../include/util.h ../include/utl_stack.h \
- ../include/utl_idlist.h ../include/utl_exceptlist.h \
- ../include/utl_namelist.h ../include/utl_labellist.h \
- ../include/utl_decllist.h ../include/idl_global.h \
- ../include/utl_error.h ../include/utl_indenter.h \
- ../include/idl_extern.h ../include/fe_extern.h ../include/be_extern.h \
- ../include/drv_extern.h ../include/ast_extern.h \
- ../include/nr_extern.h ../include/global_extern.h ../be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Singleton.i \
- ../be_include/be_decl.h ../be_include/be_scope.h \
- ../be_include/be_generator.h ../be_include/be_type.h \
- ../be_include/be_predefined_type.h ../be_include/be_module.h \
- ../be_include/be_interface.h ../be_include/be_interface_fwd.h \
- ../be_include/be_structure.h ../be_include/be_exception.h \
- ../be_include/be_expression.h ../be_include/be_enum.h \
- ../be_include/be_operation.h ../be_include/be_field.h \
- ../be_include/be_argument.h ../be_include/be_attribute.h \
- ../be_include/be_union.h ../be_include/be_union_branch.h \
- ../be_include/be_union_label.h ../be_include/be_constant.h \
- ../be_include/be_enum_val.h ../be_include/be_array.h \
- ../be_include/be_sequence.h ../be_include/be_string.h \
- ../be_include/be_typedef.h ../be_include/be_root.h \
- ../be_include/be_helper.h ../be_include/be_state.h \
- ../be_include/be_codegen.h ../be_include/be_factory.h
-.obj/be_scope.o .shobj/be_scope.so: be_scope.cpp ../include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/stdcpp.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- ../include/intlmacros.h ../include/idl_narrow.h \
- ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \
- ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/utl_strlist.h ../include/utl_exprlist.h \
- ../include/ast_generator.h ../include/util.h ../include/utl_stack.h \
- ../include/utl_idlist.h ../include/utl_exceptlist.h \
- ../include/utl_namelist.h ../include/utl_labellist.h \
- ../include/utl_decllist.h ../include/idl_global.h \
- ../include/utl_error.h ../include/utl_indenter.h \
- ../include/idl_extern.h ../include/fe_extern.h ../include/be_extern.h \
- ../include/drv_extern.h ../include/ast_extern.h \
- ../include/nr_extern.h ../include/global_extern.h ../be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Singleton.i \
- ../be_include/be_decl.h ../be_include/be_scope.h \
- ../be_include/be_generator.h ../be_include/be_type.h \
- ../be_include/be_predefined_type.h ../be_include/be_module.h \
- ../be_include/be_interface.h ../be_include/be_interface_fwd.h \
- ../be_include/be_structure.h ../be_include/be_exception.h \
- ../be_include/be_expression.h ../be_include/be_enum.h \
- ../be_include/be_operation.h ../be_include/be_field.h \
- ../be_include/be_argument.h ../be_include/be_attribute.h \
- ../be_include/be_union.h ../be_include/be_union_branch.h \
- ../be_include/be_union_label.h ../be_include/be_constant.h \
- ../be_include/be_enum_val.h ../be_include/be_array.h \
- ../be_include/be_sequence.h ../be_include/be_string.h \
- ../be_include/be_typedef.h ../be_include/be_root.h \
- ../be_include/be_helper.h ../be_include/be_state.h \
- ../be_include/be_codegen.h ../be_include/be_factory.h
-
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/TAO_IDL/be/be_args.cpp b/TAO/TAO_IDL/be/be_args.cpp
deleted file mode 100644
index f4ee9159feb..00000000000
--- a/TAO/TAO_IDL/be/be_args.cpp
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-// be_args.cc - Collect command line arguments for the BE
-
-#include	"idl.h"
-#include	"idl_extern.h"
-#include	"be.h"
-
-/*
- * Prepare an argument for a BE
- *
- * Since this is the dummy BE, it doesn't do anything with the passed string
- */
-void
-BE_prep_arg(char *, idl_bool)
-{
-}
diff --git a/TAO/TAO_IDL/be/be_argument.cpp b/TAO/TAO_IDL/be/be_argument.cpp
deleted file mode 100644
index 5fbd90661be..00000000000
--- a/TAO/TAO_IDL/be/be_argument.cpp
+++ /dev/null
@@ -1,152 +0,0 @@
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    be_argument.cpp
-//
-// = DESCRIPTION
-//    Extension of class AST_Argument that provides additional means for C++
-//    mapping.
-//
-// = AUTHOR
-//    Copyright 1994-1995 by Sun Microsystems, Inc.
-//    and
-//    Aniruddha Gokhale
-//
-// ============================================================================
-
-#include	"idl.h"
-#include	"idl_extern.h"
-#include	"be.h"
-
-/*
- * BE_Argument
- */
-
-be_argument::be_argument (void)
-{
-}
-
-be_argument::be_argument (AST_Argument::Direction d, AST_Type *ft,
-                          UTL_ScopedName *n, UTL_StrList *p)
-  : AST_Argument (d, ft, n, p),
-    AST_Field (AST_Decl::NT_argument, ft, n, p),
-    AST_Decl (AST_Decl::NT_argument, n, p)
-{
-}
-
-
-// All the methods here are very similar. The state is set by the be_operation
-// method which then invokes its scope which inturn calls one of these methods
-// with the state that was set.
-
-
-int
-be_argument::gen_client_header (void)
-{
-  be_type *bt;  // the field type
-  be_state *s;  // state based code gen object
-
-  // retrieve a singleton instance of the code generator
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-
-  bt = be_type::narrow_from_decl (this->field_type ());
-  s = cg->make_state ();
-
-  if (!s || !bt || (s->gen_code (bt, this) == -1))
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_argument::gen_client_header - "
-                         "error generating type\n"),
-                        -1);
-    }
-  return 0;
-}
-
-int
-be_argument::gen_client_stubs (void)
-{
-  be_type *bt;  // the field type
-  be_state *s;  // state based code gen object
-
-  // retrieve a singleton instance of the code generator
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-
-  bt = be_type::narrow_from_decl (this->field_type ());
-  s = cg->make_state ();
-
-  if (!s || !bt || (s->gen_code (bt, this) == -1))
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_argument::gen_client_stubs - "
-                         "error generating type\n"),
-                        -1);
-    }
-  return 0;
-}
-
-int
-be_argument::gen_server_header (void)
-{
-  be_type *bt;  // the field type
-  be_state *s;  // state based code gen object
-
-  // retrieve a singleton instance of the code generator
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-
-  bt = be_type::narrow_from_decl (this->field_type ());
-  s = cg->make_state ();
-
-  if (!s || !bt || (s->gen_code (bt, this) == -1))
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_argument::gen_server_header - "
-                         "error generating type\n"),
-                        -1);
-    }
-  return 0;
-}
-
-int
-be_argument::gen_server_skeletons (void)
-{
-  be_type *bt;  // the field type
-  be_state *s;  // state based code gen object
-
-  // retrieve a singleton instance of the code generator
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-
-  bt = be_type::narrow_from_decl (this->field_type ());
-  s = cg->make_state ();
-
-  if (!s || !bt || (s->gen_code (bt, this) == -1))
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_argument::gen_server_skeletons - "
-                         "error generating type\n"),
-                        -1);
-    }
-  return 0;
-}
-
-// Generates the client-side inline information
-int
-be_argument::gen_client_inline (void)
-{
-  // nothing to be done
-  return 0;
-}
-
-// Generates the server-side inline
-int
-be_argument::gen_server_inline (void)
-{
-  // nothing to be done
-  return 0;
-}
-
-// Narrowing
-IMPL_NARROW_METHODS2 (be_argument, AST_Argument, be_decl)
-IMPL_NARROW_FROM_DECL (be_argument)
diff --git a/TAO/TAO_IDL/be/be_array.cpp b/TAO/TAO_IDL/be/be_array.cpp
deleted file mode 100644
index 6a8a7639efe..00000000000
--- a/TAO/TAO_IDL/be/be_array.cpp
+++ /dev/null
@@ -1,1262 +0,0 @@
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    be_array.cpp
-//
-// = DESCRIPTION
-//    Extension of class AST_Array that provides additional means for C++
-//    mapping.
-//
-// = AUTHOR
-//    Copyright 1994-1995 by Sun Microsystems, Inc.
-//    and
-//    Aniruddha Gokhale
-//
-// ============================================================================
-
-#include	"idl.h"
-#include	"idl_extern.h"
-#include	"be.h"
-
-/*
- * BE_Array
- */
-be_array::be_array (void)
-{
-}
-
-be_array::be_array (UTL_ScopedName *n, unsigned long ndims, UTL_ExprList *dims)
-  : AST_Array (n, ndims, dims),
-    AST_Decl (AST_Decl::NT_array, n, NULL)
-{
-  be_type *bt;
-
-  // Macro to avoid "warning: unused parameter" type warning.
-  ACE_UNUSED_ARG (bt);
-
-  // if we are inside of a union, we change our local name to have an
-  // underscore before us
-  AST_Decl *d = ScopeAsDecl (this->defined_in ());
-  if (d && (d->node_type () == AST_Decl::NT_union))
-    {
-      static char namebuf [200];
-      UTL_ScopedName *myname;
-
-      ACE_OS::memset (namebuf, '\0', 200);
-
-      // make a copy of our parent's name
-      myname = (UTL_ScopedName *)d->name ()->copy ();
-      ACE_OS::sprintf (namebuf, "_%s", this->local_name ()->get_string ());
-      myname->nconc (new UTL_ScopedName (new Identifier (ACE_OS::strdup
-                                                         (namebuf), 1, 0,
-                                                         I_FALSE), NULL));
-      this->set_name (myname);
-    }
-}
-
-// Code generation
-
-int
-be_array::gen_client_header (void)
-{
-  TAO_OutStream *ch; // output stream
-  unsigned long i;   // loop index
-  TAO_NL  nl;        // end line
-  be_type *bt;       // our base type
-  be_decl *d;        // enclosing scope
-  be_state *s;       // state based code gen object
-
-  // Macro to avoid "warning: unused parameter" type warning.
-  ACE_UNUSED_ARG (d);
-
-  if (!this->cli_hdr_gen_) // not already generated
-    {
-      // retrieve a singleton instance of the code generator
-      TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-      cg->push (TAO_CodeGen::TAO_ARRAY_DEFN_CH); // set current code gen state
-
-      ch = cg->client_header (); // retrieve client hdr stream
-      cg->outstream (ch); // set client hdr as the current stream
-      cg->node (this);    // pass ourselves for type gen
-
-      s = cg->make_state (); // get the state-based code generation object
-
-      bt = be_type::narrow_from_decl (this->base_type ());
-
-      // generate our base type
-      if (!s || !bt || (s->gen_code (bt, this) == -1))
-        {
-          ACE_ERROR ((LM_ERROR, "be_array: type generation failed\n"));
-          return -1;
-        }
-
-      // print our name
-      *ch << " " <<  this->local_name ();
-      // print our dimensions
-      for (i = 0; i < this->n_dims (); i++)
-        {
-          AST_Expression *expr = this->dims ()[i]; // retrieve the ith
-                                                   // dimension value
-          if ((expr == NULL) || ((expr != NULL) && (expr->ev () == NULL)))
-            {
-              ACE_ERROR ((LM_ERROR, "be_array: bad dimensions\n\n"));
-              return -1;
-            }
-          if (expr->ev ()->et == AST_Expression::EV_ulong)
-            {
-              *ch << "[" << ((int)expr->ev ()->u.ulval) << "]";
-            }
-          else
-            {
-              ACE_ERROR ((LM_ERROR, "be_array: bad dimension value\n"));
-              return -1;
-            }
-        }
-      *ch << ";" << nl;
-
-      // if our base type is VARIABLE length, then we are variable length too
-      this->size_type (bt->size_type ());
-
-      cg->pop ();
-
-      cg->push (TAO_CodeGen::TAO_ARRAY_OTHER_CH); // rest of the array defn
-      s = cg->make_state ();
-
-      *ch << "typedef ";
-
-      // now generate the slice definition
-      if (!s || !bt || (s->gen_code (bt, this) == -1))
-        {
-          ACE_ERROR ((LM_ERROR, "be_array: type generation failed\n"));
-          return -1;
-        }
-
-      *ch << " " <<  this->local_name () << "_slice";
-      // print dimensions except first one
-      for (i = 1; i < this->n_dims (); i++)
-        {
-          // no error checking. Assumption is that everything is valid since we
-          // already checked it before.
-          AST_Expression *expr = this->dims ()[i]; // retrieve the ith
-                                                   // dimension value
-          *ch << "[" << ((int)expr->ev ()->u.ulval) << "]";
-        }
-      *ch << ";" << nl;
-
-      // memory management functions
-      // first find if we are inside a scope
-      if (this->is_nested ()) // we were defined inside a scope. Hence the
-        // memory management
-        // functions become static members of the enclosing class
-        *ch << "static ";
-      *ch <<  this->local_name () << "_slice *" << this->local_name () <<
-        "_alloc (void);" << nl;
-      if (this->is_nested ())
-        *ch << "static ";
-      *ch <<  this->local_name () << "_slice *" << this->local_name () <<
-        "_dup (const " << this->local_name () << "_slice *);" << nl;
-      if (this->is_nested ())
-        *ch << "static ";
-      *ch << "void " << this->local_name () << "_free (" << this->local_name ()
-          << "_slice *);\n\n";
-
-      // generate the _var, _out, and _forany definition
-      this->gen_var_defn ();
-      this->gen_out_defn ();
-      this->gen_forany_defn ();
-
-      // Generate the typecode decl
-      // All names in the root scope have length 2 (for the root and
-      // ourself). The children have length greater than 2. Thus, if our name
-      // length is 2 or less, we are outermost and our typecode decl must be
-      // extern, else we are defined static inside the enclosing scope.
-      if (this->is_nested ())
-        {
-          // we have a scoped name
-          ch->indent ();
-          *ch << "static CORBA::TypeCode_ptr " << this->tc_name
-            ()->last_component () << ";\n\n";
-        }
-      else
-        {
-          // we are in the ROOT scope
-          ch->indent ();
-          *ch << "extern CORBA::TypeCode_ptr " << this->tc_name
-            ()->last_component () << ";\n\n";
-        }
-      this->cli_hdr_gen_ = I_TRUE;
-      cg->pop ();
-    }
-  return 0;
-}
-
-int
-be_array::gen_client_stubs (void)
-{
-  TAO_OutStream *cs; // output stream
-  TAO_NL  nl;        // end line
-
-
-  if (!this->cli_stub_gen_)
-    {
-      // retrieve a singleton instance of the code generator
-      TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-      cg->push (TAO_CodeGen::TAO_SEQUENCE_BODY_CS); // set current code gen state
-
-      cs = cg->client_stubs ();
-      // pass info
-      cg->outstream (cs);
-      cg->node (this);
-      // generate the typecode information here
-      cs->indent (); // start from current indentation level
-      *cs << "static const CORBA::Long _oc_" << this->flatname () << "[] =" <<
-        nl;
-      *cs << "{\n";
-      cs->incr_indent (0);
-      if (this->gen_encapsulation () == -1)
-        {
-          ACE_ERROR ((LM_ERROR, "be_array:Error generating encapsulation\n\n"));
-          return -1;
-        }
-      cs->decr_indent ();
-      *cs << "};" << nl;
-
-      *cs << "static CORBA::TypeCode _tc__tc_" << this->flatname () <<
-        " (CORBA::tk_sequence, sizeof (_oc_" <<  this->flatname () <<
-        "), (unsigned char *) &_oc_" << this->flatname () <<
-        ", CORBA::B_FALSE);" << nl;
-      *cs << "CORBA::TypeCode_ptr " << this->tc_name () << " = &_tc__tc_" <<
-        this->flatname () << ";\n\n";
-
-      cg->pop ();
-      this->cli_stub_gen_ = I_TRUE;
-
-    }
-  return 0;
-}
-
-int
-be_array::gen_server_header (void)
-{
-  return 0;
-}
-
-int
-be_array::gen_server_skeletons (void)
-{
-  return 0;
-}
-
-// Generates the client-side inline information
-int
-be_array::gen_client_inline (void)
-{
-  if (!this->cli_inline_gen_)
-    {
-      TAO_OutStream *ci; // output stream
-      unsigned long i;   // loop index
-      TAO_NL  nl;        // end line
-      be_type *bt;       // our base type
-      be_decl *d;        // enclosing scope
-      be_state *s;       // state based code gen obj
-
-      // Macro to avoid "warning: unused parameter" type warning.
-      ACE_UNUSED_ARG (d);
-
-      // retrieve a singleton instance of the code generator
-      TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-
-      ci = cg->client_inline ();
-      cg->outstream (ci);
-      cg->node (this);
-      cg->push (TAO_CodeGen::TAO_ARRAY_DEFN_CI);
-      s = cg->make_state ();
-
-      // retrieve our base type
-      bt = be_type::narrow_from_decl (this->base_type ());
-
-      // first define the _alloc, _dup and _free methods
-      // If we are defined inside some scope, these methods become static
-      // members of the enclosing scope
-
-      ci->indent (); // start from current indentation
-
-      // alloc method
-      *ci << "ACE_INLINE " << this->name () << "_slice *" << nl;
-      *ci << this->name () << "_alloc (void)" << nl;
-      *ci << "{\n";
-      ci->incr_indent ();
-      *ci << "new ";
-      if (s->gen_code (bt, this) == -1)
-        return -1;
-
-      ci->decr_indent ();
-      *ci << "}\n\n";
-
-      // dup method
-      *ci << "ACE_INLINE " << this->name () << "_slice *" << nl;
-      *ci << this->name () << "_dup (" << this->name () << "_slice * s)" << nl;
-      *ci << "{\n";
-      ci->incr_indent ();
-      *ci << this->name () << "_slice *temp;" << nl;
-      *ci << "temp = " << this->name () << "_alloc ();" << nl;
-      *ci << "// copy each individual elements" << nl;
-      for (i = 0; i < this->n_dims (); i++)
-        {
-          AST_Expression *expr = this->dims ()[i]; // retrieve the ith
-                                                   // dimension value
-          if ((expr == NULL) || ((expr != NULL) && (expr->ev () == NULL)))
-            {
-              ACE_ERROR ((LM_ERROR, "be_array: bad dimensions\n\n"));
-              return -1;
-            }
-          if (expr->ev ()->et == AST_Expression::EV_ulong)
-            {
-              // generate a loop for each dimension
-              *ci << "for (CORBA::ULong i" << i << " = 0; i" << i << " < " <<
-                expr->ev ()->u.ulval << "; i" << i << "++)\n";
-              ci->incr_indent ();
-            }
-          else
-            {
-              ACE_ERROR ((LM_ERROR, "be_array: bad dimension value\n"));
-              return -1;
-            }
-        }
-
-      // the code below looks terribly complex. However, all it is trying to do
-      // is to generate code of the form
-      // temp [i0][i1].... =
-      *ci << "temp ";
-      for (i = 0; i < this->n_dims (); i++)
-        {
-          AST_Expression *expr = this->dims ()[i]; // retrieve the ith
-                                                   // dimension value
-          if ((expr == NULL) || ((expr != NULL) && (expr->ev () == NULL)))
-            {
-              ACE_ERROR ((LM_ERROR, "be_array: bad dimensions\n\n"));
-              return -1;
-            }
-          if (expr->ev ()->et == AST_Expression::EV_ulong)
-            {
-              *ci << "[" << ((int)expr->ev ()->u.ulval) << "]";
-            }
-          else
-            {
-              ACE_ERROR ((LM_ERROR, "be_array: bad dimension value\n"));
-              return -1;
-            }
-        }
-      *ci << " = s";
-      for (i = 0; i < this->n_dims (); i++)
-        {
-          AST_Expression *expr = this->dims ()[i]; // retrieve the ith
-                                                   // dimension value
-          if ((expr == NULL) || ((expr != NULL) && (expr->ev () == NULL)))
-            {
-              ACE_ERROR ((LM_ERROR, "be_array: bad dimensions\n\n"));
-              return -1;
-            }
-          if (expr->ev ()->et == AST_Expression::EV_ulong)
-            {
-              *ci << "[" << ((int)expr->ev ()->u.ulval) << "]";
-            }
-          else
-            {
-              ACE_ERROR ((LM_ERROR, "be_array: bad dimension value\n"));
-              return -1;
-            }
-        }
-      *ci << ";\n";
-      for (i = 0; i < this->n_dims (); i++)
-        {
-          // decrement indentation as many times as the number of dimensions
-          ci->decr_indent ();
-        }
-
-      ci->decr_indent ();
-      *ci << "}\n\n";
-
-      // free method
-      *ci << this->name () << "_free (" << this->name () << "_slice *s)" << nl;
-      *ci << "{\n";
-      ci->incr_indent ();
-      *ci << "delete [] s;\n";
-      ci->decr_indent ();
-      *ci << "}\n\n";
-
-      // emit implementations of methods of the _var, _out, and _forany classes
-      if (this->gen_var_impl () == -1)
-        {
-          ACE_ERROR ((LM_ERROR, "be_array: _var impl code gen failed\n"));
-          return -1;
-        }
-      if (this->gen_out_impl () == -1)
-        {
-          ACE_ERROR ((LM_ERROR, "be_array: _out impl code gen failed\n"));
-          return -1;
-        }
-      if (this->gen_forany_impl () == -1)
-        {
-          ACE_ERROR ((LM_ERROR, "be_array: _forany impl code gen failed\n"));
-          return -1;
-        }
-
-      // generate client inline for base type
-      if (bt->gen_client_inline () == -1)
-        {
-          ACE_ERROR ((LM_ERROR, "be_array: base type inline code gen failed\n"));
-          return -1;
-        }
-
-      cg->pop ();
-      this->cli_inline_gen_ = I_TRUE;
-    }
-
-  return 0;
-}
-
-// Generates the server-side inline
-int
-be_array::gen_server_inline (void)
-{
-  // nothing to be done
-  return 0;
-}
-
-// generate the var defn
-int
-be_array::gen_var_defn (void)
-{
-  TAO_OutStream *ch; // output stream
-  TAO_NL  nl;        // end line
-  char namebuf [NAMEBUFSIZE];  // names
-
-  ACE_OS::memset (namebuf, '\0', NAMEBUFSIZE);
-  ACE_OS::sprintf (namebuf, "%s_var", this->local_name ()->get_string ());
-
-  // retrieve a singleton instance of the code generator
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-
-  ch = cg->client_header ();
-
-  // generate the var definition (always in the client header).
-  // Depending upon the data type, there are some differences which we account
-  // for over here.
-
-  ch->indent (); // start with whatever was our current indent level
-  *ch << "class " << namebuf << nl;
-  *ch << "{" << nl;
-  *ch << "public:\n";
-  ch->incr_indent ();
-  // default constr
-  *ch << namebuf << " (void); // default constructor" << nl;
-  // constr
-  *ch << namebuf << " (" << local_name () << "_slice *);" << nl;
-  // copy constructor
-  *ch << namebuf << " (const " << namebuf <<
-    " &); // copy constructor" << nl;
-  // destructor
-  *ch << "~" << namebuf << " (void); // destructor" << nl;
-  *ch << nl;
-  // assignment operator from a pointer
-  *ch << namebuf << " &operator= (" << local_name () << "_slice *);" << nl;
-  // assignment from _var
-  *ch << namebuf << " &operator= (const " << namebuf <<
-    " &);" << nl;
-
-  // arrow operator
-  // nothing here
-  *ch << nl;
-
-  // other extra types (cast operators, [] operator, and others)
-  // overloaded [] operator
-  *ch << namebuf << "_slice &operator[] (CORBA::ULong index);" << nl;
-  *ch << "const " << namebuf <<
-    "_slice &operator[] (CORBA::ULong index) const;" << nl;
-
-  // cast operators
-  *ch << "operator const " << local_name () << "_slice *&() const;" << nl;
-  *ch << "operator " << local_name () << "_slice *&();" << nl;
-
-  *ch << "// in, inout, out, _retn " << nl;
-  // the return types of in, out, inout, and _retn are based on the parameter
-  // passing rules and the base type
-  if (this->size_type () == be_decl::FIXED)
-    {
-      *ch << "const " << local_name () << " in (void) const;" << nl;
-      *ch << local_name () << " inout (void);" << nl;
-      *ch << local_name () << " out (void);" << nl;
-      *ch << local_name () << "_slice *_retn (void);" << nl;
-    }
-  else
-    {
-      *ch << "const " << local_name () << " in (void) const;" << nl;
-      *ch << local_name () << " inout (void);" << nl;
-      *ch << local_name () << "_slice *&out (void);" << nl;
-      *ch << local_name () << " *_retn (void);" << nl;
-    }
-
-  // generate an additional member function that returns the underlying pointer
-
-  *ch << local_name () << "_slice *ptr (void) const;\n";
-
-  *ch << "\n";
-  ch->decr_indent ();
-
-  // generate the private section
-  *ch << "private:\n";
-  ch->incr_indent ();
-  *ch << local_name () << "_slice *ptr_;\n";
-
-  ch->decr_indent ();
-  *ch << "};\n\n";
-
-  return 0;
-}
-
-// implementation of the _var class. All of these get generated in the inline
-// file
-int
-be_array::gen_var_impl (void)
-{
-  TAO_OutStream *ci; // output stream
-  TAO_NL  nl;        // end line
-  char fname [NAMEBUFSIZE];  // to hold the full and
-  char lname [NAMEBUFSIZE];  // local _var names
-
-  ACE_OS::memset (fname, '\0', NAMEBUFSIZE);
-  ACE_OS::sprintf (fname, "%s_var", this->fullname ());
-
-  ACE_OS::memset (lname, '\0', NAMEBUFSIZE);
-  ACE_OS::sprintf (lname, "%s_var", local_name ()->get_string ());
-
-  // retrieve a singleton instance of the code generator
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-
-  ci = cg->client_inline ();
-  cg->outstream (ci);
-
-  // generate the var implementation in the inline file
-
-  ci->indent (); // start with whatever was our current indent level
-
-  *ci << "// *************************************************************"
-      << nl;
-  *ci << "// Inline operations for class " << fname << nl;
-  *ci << "// *************************************************************\n\n";
-
-  be_array *b;
-
-  b = be_array::narrow_from_decl (this);
-  // default constr
-  *ci << "ACE_INLINE" << nl;
-  *ci << fname << "::" << lname <<
-    " (void) // default constructor" << nl;
-  *ci << "\t" << ": ptr_ ((" << name () << "_slice *)0)" << nl;
-  *ci << "{}\n\n";
-
-  // constr from a _slice *
-  ci->indent ();
-  *ci << "ACE_INLINE" << nl;
-  *ci << fname << "::" << lname << " (" << name () << "_slice *p)" << nl;
-  *ci << "\t: ptr_ (p)" << nl;
-  *ci << "{}\n\n";
-
-  // copy constructor (deep copy)
-  ci->indent ();
-  *ci << "ACE_INLINE" << nl;
-  *ci << fname << "::" << lname << " (const " << fname <<
-    " &p) // copy constructor" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "this->ptr_ = " << this->name () << "_dup (p.ptr_);\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  // destructor
-  ci->indent ();
-  *ci << "ACE_INLINE" << nl;
-  *ci << fname << "::~" << lname << " (void) // destructor" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << this->name () << "_free (this->ptr_);\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  // assignment operator
-  ci->indent ();
-  *ci << "ACE_INLINE " << fname << " &" << nl;
-  *ci << fname << "::operator= (" << this->name () <<
-    "_slice p)" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "// is what we own the same that is being assigned to us?" <<
-    nl;
-  *ci << "if (this->ptr_ != p)" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "// delete our stuff and assume ownership of p" << nl;
-  *ci << this->name () << "_free (this->ptr_);" << nl;
-  *ci << "this->ptr_ = p;\n";
-  ci->decr_indent ();
-  *ci << "}" << nl;
-  *ci << "return *this;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  // assignment operator from _var
-  ci->indent ();
-  *ci << "ACE_INLINE " << fname << " &" << nl;
-  *ci << fname << "::operator= (const " << fname <<
-    " &p)" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "if (this != &p)" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "// not assigning to ourselves" << nl;
-  *ci << this->name () << "_free (this->ptr_); // free old stuff" << nl;
-  *ci << "this->ptr_ = " << this->name () <<
-    "_dup (p.ptr_);// deep copy\n";
-  ci->decr_indent ();
-  *ci << "}" << nl;
-  *ci << "return *this;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  // other extra methods - cast operators ()
-  ci->indent ();
-  *ci << "ACE_INLINE " << nl;
-  *ci << fname << "::operator const " << name () <<
-    "_slice *&() const // cast" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "return this->ptr_;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  ci->indent ();
-  *ci << "ACE_INLINE " << nl;
-  *ci << fname << "::operator " << name () << "_slice *&() // cast " << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "return this->ptr_;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  // two operator []s instead of ->
-  ci->indent ();
-  *ci << "ACE_INLINE const" << name () << "_slice &" << nl;
-  *ci << fname << "::operator[] (CORBA::ULong index) const" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "return this->ptr_[index];\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  ci->indent ();
-  *ci << "ACE_INLINE " << name () << "_slice &" << nl;
-  *ci << fname << "::operator[] (CORBA::ULong index)" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "return this->ptr_[index];\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  // in, inout, out, and _retn
-  ci->indent ();
-  *ci << "ACE_INLINE " << fname << nl;
-  *ci << fname << "::in (void) const" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "return this->ptr_;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  ci->indent ();
-  *ci << "ACE_INLINE " << fname << nl;
-  *ci << fname << "::inout (void)" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "return this->ptr_;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  ci->indent ();
-  *ci << "ACE_INLINE " << fname << nl;
-  *ci << fname << "::out (void)" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "return this->ptr_;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  ci->indent ();
-  *ci << "ACE_INLINE " << name () << "_slice " << nl;
-  *ci << fname << "::_retn (void)" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "return this->val;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  // the additional ptr () member function
-  ci->indent ();
-  *ci << "ACE_INLINE " << name () << "_slice *" << nl;
-  *ci << fname << "::ptr (void) const" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "return this->ptr_;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  return 0;
-}
-
-// generate the _out definition
-int
-be_array::gen_out_defn (void)
-{
-  TAO_OutStream *ch; // output stream
-  TAO_NL  nl;        // end line
-  char namebuf [NAMEBUFSIZE];  // to hold the _out name
-
-  ACE_OS::memset (namebuf, '\0', NAMEBUFSIZE);
-  ACE_OS::sprintf (namebuf, "%s_out", local_name ()->get_string ());
-
-  // retrieve a singleton instance of the code generator
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-
-  ch = cg->client_header ();
-
-  // generate the out definition (always in the client header)
-  ch->indent (); // start with whatever was our current indent level
-
-  *ch << "class " << namebuf << nl;
-  *ch << "{" << nl;
-  *ch << "public:\n";
-  ch->incr_indent ();
-
-  // No default constructor
-
-  // constructor from a pointer
-  *ch << namebuf << " (" << local_name () << "_slice *&);" << nl;
-  // constructor from a _var &
-  *ch << namebuf << " (" << local_name () << "_var &);" << nl;
-  // constructor from a _out &
-  *ch << namebuf << " (" << namebuf << " &);" << nl;
-  // assignment operator from a _out &
-  *ch << namebuf << " &operator= (" << namebuf << " &);" << nl;
-  // assignment operator from a pointer &, cast operator, ptr fn, operator
-  // -> and any other extra operators
-  // assignment from slice *
-  *ch << namebuf << " &operator= (" << local_name () << "_slice *);" << nl;
-  // cast
-  *ch << "operator " << local_name () << "_slice *&();" << nl;
-  // ptr fn
-  *ch << local_name () << "_slice *&ptr (void);" << nl;
-  // operator [] instead of ->
-  *ch << namebuf << "_slice &operator[] (CORBA::ULong index);" << nl;
-  *ch << "const " << namebuf <<
-    "_slice &operator[] (CORBA::ULong index) const;" << nl;
-
-  *ch << "\n";
-  ch->decr_indent ();
-  *ch << "private:\n";
-  ch->incr_indent ();
-  *ch << local_name () << "_slice *&ptr_;" << nl;
-  *ch << "// assignment from T_var not allowed" << nl;
-  *ch << "void operator= (const " << local_name () << "_var &);\n";
-
-  ch->decr_indent ();
-  *ch << "};\n\n";
-  return 0;
-}
-
-int
-be_array::gen_out_impl (void)
-{
-  TAO_OutStream *ci; // output stream
-  TAO_NL  nl;        // end line
-  char fname [NAMEBUFSIZE];  // to hold the full and
-  char lname [NAMEBUFSIZE];  // local _out names
-
-  ACE_OS::memset (fname, '\0', NAMEBUFSIZE);
-  ACE_OS::sprintf (fname, "%s_out", this->fullname ());
-
-  ACE_OS::memset (lname, '\0', NAMEBUFSIZE);
-  ACE_OS::sprintf (lname, "%s_out", local_name ()->get_string ());
-
-  // retrieve a singleton instance of the code generator
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-
-  ci = cg->client_inline ();
-  cg->outstream (ci);
-
-  // generate the out implementation in the inline file
-
-  ci->indent (); // start with whatever was our current indent level
-
-  *ci << "// *************************************************************"
-      << nl;
-  *ci << "// Inline operations for class " << fname << nl;
-  *ci << "// *************************************************************\n\n";
-
-  be_array *b;
-
-  b = be_array::narrow_from_decl (this);
-  // constr from a pointer to slice
-  ci->indent ();
-  *ci << "ACE_INLINE" << nl;
-  *ci << fname << "::" << lname << " (" << name () << "_slice *&p)" << nl;
-  *ci << "\t: ptr_ (p)" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "this->ptr_ = 0;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  // constructor from _var &
-  ci->indent ();
-  *ci << "ACE_INLINE" << nl;
-  *ci << fname << "::" << lname << " (" << this->name () <<
-    "_var &p) // constructor from _var" << nl;
-  *ci << "\t: ptr_ (p.out ())" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << this->name () << "_free (this->ptr_);" << nl;
-  *ci << "this->ptr_ = 0;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  // copy constructor
-  ci->indent ();
-  *ci << "ACE_INLINE" << nl;
-  *ci << fname << "::" << lname << " (" << fname <<
-    " &p) // copy constructor" << nl;
-  *ci << "\t: ptr_ (p.ptr_)" << nl;
-  *ci << "{}\n\n";
-
-  // assignment operator from _out &
-  ci->indent ();
-  *ci << "ACE_INLINE " << fname << " &" << nl;
-  *ci << fname << "::operator= (" << fname <<
-    " &p)" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "this->ptr_ = p.ptr_;" << nl;
-  *ci << "return *this;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  // assignment from _var is not allowed by a private declaration
-
-  // assignment operator from _ptr
-  ci->indent ();
-  *ci << "ACE_INLINE " << fname << " &" << nl;
-  *ci << fname << "::operator= (" << this->name () <<
-    "_slice *p)" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "this->ptr_ = p;" << nl;
-  *ci << "return *this;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  // other extra methods - cast operator ()
-  ci->indent ();
-  *ci << "ACE_INLINE " << nl;
-  *ci << fname << "::operator " << this->name () <<
-    "_slice *&() // cast" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "return this->ptr_;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  // ptr function
-  ci->indent ();
-  *ci << "ACE_INLINE " << this->name () << "_slice *&" << nl;
-  *ci << fname << "::ptr (void) // ptr" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "return this->ptr_;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  // operator [] instead of ->
-  ci->indent ();
-  *ci << "ACE_INLINE " << this->name () << "_slice &" << nl;
-  *ci << fname << "::operator[] (CORBA::ULong index)" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "return this->ptr_[index];\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  return 0;
-}
-
-// generate the _var definition for ourself
-int
-be_array::gen_forany_defn (void)
-{
-  TAO_OutStream *ch; // output stream
-  long i;            // loop index
-  TAO_NL  nl;        // end line
-  char namebuf [NAMEBUFSIZE];  // to hold the _out name
-
-  // Macro to avoid "warning: unused parameter" type warning.
-  ACE_UNUSED_ARG (i);
-
-  ACE_OS::memset (namebuf, '\0', NAMEBUFSIZE);
-  ACE_OS::sprintf (namebuf, "%s_forany", local_name ()->get_string ());
-
-  // retrieve a singleton instance of the code generator
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-
-  ch = cg->client_header ();
-
-  // generate the var definition (always in the client header).
-  // Depending upon the data type, there are some differences which we account
-  // for over here.
-
-  ch->indent (); // start with whatever was our current indent level
-  *ch << "class " << namebuf << nl;
-  *ch << "{" << nl;
-  *ch << "public:\n";
-  ch->incr_indent ();
-  // default constr
-  *ch << namebuf << " (void); // default constructor" << nl;
-  // constr
-  *ch << namebuf << " (" << local_name () << "_slice *);" << nl;
-  // copy constructor
-  *ch << namebuf << " (const " << namebuf <<
-    " &); // copy constructor" << nl;
-  // destructor
-  *ch << "~" << namebuf << " (void); // destructor" << nl;
-  *ch << nl;
-  // assignment operator from a pointer
-  *ch << namebuf << " &operator= (" << local_name () <<
-    "_slice *, CORBA::Boolean nocopy=0);" << nl;
-  // assignment from _var
-  *ch << namebuf << " &operator= (const " << namebuf <<
-    " &);" << nl;
-
-  // overloaded [] operator
-  *ch << namebuf << "_slice &operator[] (CORBA::ULong index);" << nl;
-  *ch << "const " << namebuf <<
-    "_slice &operator[] (CORBA::ULong index) const;" << nl;
-
-  // cast operators
-  *ch << "operator const " << local_name () << "_slice *&() (void) const;" << nl;
-  *ch << "operator " << local_name () << "_slice *&() (void);" << nl;
-
-  *ch << "// in, inout, out, _retn " << nl;
-  // the return types of in, out, inout, and _retn are based on the parameter
-  // passing rules and the base type
-  if (this->size_type () == be_decl::FIXED)
-    {
-      *ch << "const " << local_name () << " in (void) const;" << nl;
-      *ch << local_name () << " inout (void);" << nl;
-      *ch << local_name () << " out (void);" << nl;
-      *ch << local_name () << "_slice *_retn (void);" << nl;
-    }
-  else
-    {
-      *ch << "const " << local_name () << " in (void) const;" << nl;
-      *ch << local_name () << " inout (void);" << nl;
-      *ch << local_name () << "_slice *&out (void);" << nl;
-      *ch << local_name () << " *_retn (void);" << nl;
-    }
-  *ch << "\n";
-  ch->decr_indent ();
-  *ch << "private:\n";
-  ch->incr_indent ();
-  *ch << local_name () << "_slice *ptr_;\n";
-  ch->decr_indent ();
-  *ch << "};\n\n";
-
-  return 0;
-}
-
-int
-be_array::gen_forany_impl (void)
-{
-  TAO_OutStream *ci; // output stream
-  long i;            // loop index
-  TAO_NL  nl;        // end line
-  char fname [NAMEBUFSIZE];  // to hold the full and
-  char lname [NAMEBUFSIZE];  // local _var names
-
-  // Macro to avoid "warning: unused parameter" type warning.
-  ACE_UNUSED_ARG (i);
-
-  ACE_OS::memset (fname, '\0', NAMEBUFSIZE);
-  ACE_OS::sprintf (fname, "%s_forany", this->fullname ());
-
-  ACE_OS::memset (lname, '\0', NAMEBUFSIZE);
-  ACE_OS::sprintf (lname, "%s_forany", local_name ()->get_string ());
-
-  // retrieve a singleton instance of the code generator
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-
-  ci = cg->client_inline ();
-  cg->outstream (ci);
-
-  // generate the forany implementation in the inline file
-  // Depending upon the data type, there are some differences which we account
-  // for over here.
-
-  ci->indent (); // start with whatever was our current indent level
-
-  *ci << "// *************************************************************"
-      << nl;
-  *ci << "// Inline operations for class " << fname << nl;
-  *ci << "// *************************************************************\n\n";
-
-  // default constr
-  *ci << "ACE_INLINE" << nl;
-  *ci << fname << "::" << lname <<
-    " (void) // default constructor" << nl;
-  *ci << "\t" << ": ptr_ ((" << name () << "_slice *)0)" << nl;
-  *ci << "{}\n\n";
-
-  // constr from a _slice *
-  ci->indent ();
-  *ci << "ACE_INLINE" << nl;
-  *ci << fname << "::" << lname << " (" << name () << "_slice *p)" << nl;
-  *ci << "\t: ptr_ (p)" << nl;
-  *ci << "{}\n\n";
-
-  // copy constructor (deep copy)
-  ci->indent ();
-  *ci << "ACE_INLINE" << nl;
-  *ci << fname << "::" << lname << " (const " << fname <<
-    " &p) // copy constructor" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "this->ptr_ = " << this->name () << "_dup (p->ptr);\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  // destructor
-  ci->indent ();
-  *ci << "ACE_INLINE" << nl;
-  *ci << fname << "::~" << lname << " (void) // destructor" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << this->name () << "_free (this->ptr_);\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  // assignment operator
-  ci->indent ();
-  *ci << "ACE_INLINE " << fname << " &" << nl;
-  *ci << fname << "::operator= (" << this->name () <<
-    "_slice p)" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "// is what we own the same that is being assigned to us?" <<
-    nl;
-  *ci << "if (this->ptr_ != p)" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "// delete our stuff and assume ownership of p" << nl;
-  *ci << this->name () << "_free (this->ptr_);" << nl;
-  *ci << "this->ptr_ = p;\n";
-  ci->decr_indent ();
-  *ci << "}" << nl;
-  *ci << "return *this;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  // assignment operator from _var
-  ci->indent ();
-  *ci << "ACE_INLINE " << fname << " &" << nl;
-  *ci << fname << "::operator= (const " << fname <<
-    " &p)" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "if (this != &p)" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "// not assigning to ourselves" << nl;
-  *ci << this->name () << "_free (this->ptr_); // free old stuff" << nl;
-  *ci << "this->ptr_ = " << this->name () <<
-    "_dup (p->ptr);// deep copy\n";
-  ci->decr_indent ();
-  *ci << "}" << nl;
-  *ci << "return *this;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  // other extra methods - cast operators ()
-  ci->indent ();
-  *ci << "ACE_INLINE " << nl;
-  *ci << fname << "::operator const " << name () <<
-    "_slice &() const // cast" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "return this->ptr_;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  ci->indent ();
-  *ci << "ACE_INLINE " << nl;
-  *ci << fname << "::operator " << name () << "_slice &() // cast " << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "return this->ptr_;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  // two operator []s instead of ->
-  ci->indent ();
-  *ci << "ACE_INLINE const" << name () << "_slice &" << nl;
-  *ci << fname << "::operator[] (CORBA::ULong index) const" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "return this->ptr_[index];\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  ci->indent ();
-  *ci << "ACE_INLINE " << name () << "_slice &" << nl;
-  *ci << fname << "::operator[] (CORBA::ULong index)" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "return this->ptr_[index];\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  // in, inout, out, and _retn
-  ci->indent ();
-  *ci << "ACE_INLINE " << fname << nl;
-  *ci << fname << "::in (void) const" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "return this->ptr_;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  ci->indent ();
-  *ci << "ACE_INLINE " << fname << nl;
-  *ci << fname << "::inout (void)" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "return this->ptr_;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  ci->indent ();
-  *ci << "ACE_INLINE " << fname << nl;
-  *ci << fname << "::out (void)" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "return this->ptr_;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  ci->indent ();
-  *ci << "ACE_INLINE " << name () << "_slice " << nl;
-  *ci << fname << "::_retn (void)" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "return this->val;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  return 0;
-}
-
-int
-be_array::gen_typecode (void)
-{
-  TAO_OutStream *cs; // output stream
-  TAO_NL  nl;        // end line
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-
-  cs = cg->client_stubs ();
-  cs->indent (); // start from whatever indentation level we were at
-
-  *cs << "CORBA::tk_array, // typecode kind" << nl;
-  *cs << this->tc_size () << ", // encapsulation length\n";
-  // now emit the encapsulation
-  return this->gen_encapsulation ();
-}
-
-// generate encapsulation
-// An encapsulation for ourselves will be necessary when we are part of some
-// other IDL type and a typecode for that other type is being generated. This
-// will comprise our typecode kind. IDL types with parameters will additionally
-// have the encapsulation length and the entire typecode description
-
-int
-be_array::gen_encapsulation (void)
-{
-  TAO_OutStream *os; // output stream
-  TAO_NL  nl;        // end line
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-  be_type *bt; // base type
-
-  os = cg->client_stubs ();
-  os->indent (); // start from the current indentation level
-
-  // XXXASG - byte order must be based on what m/c we are generating code -
-  // TODO
-  *os << "TAO_ENCAP_BYTE_ORDER, // byte order" << nl;
-
-  // emit typecode of element type
-  bt = be_type::narrow_from_decl (this->base_type ());
-  if (!bt || (bt->gen_typecode () == -1))
-    {
-      ACE_ERROR ((LM_ERROR, "be_sequence::gen_typecode - bad base type\n"));
-      return -1;
-    }
-
-  //  emit the length
-  os->indent ();
-  //  *os << this->max_size () << ",\n";
-  return 0;
-}
-
-// compute typecode size
-long
-be_array::tc_size (void)
-{
-  // 4 bytes for enumeration, 4 bytes for storing encap length val, followed by the
-  // actual encapsulation length
-  return 4 + 4 + this->tc_encap_len ();
-}
-
-long
-be_array::tc_encap_len (void)
-{
-  if (this->encap_len_ == -1) // not computed yet
-    {
-      be_type *bt; // base type
-
-      this->encap_len_ = 4;  // holds the byte order flag
-      // add the encapsulation length of our base type
-      bt = be_type::narrow_from_decl (this->base_type ());
-      if (!bt)
-        {
-          ACE_ERROR ((LM_ERROR,
-                      "be_array::tc_encap_len - bad base type\n"));
-          return 0;
-        }
-      this->encap_len_ += bt->tc_size ();
-      this->encap_len_ += 4; // to hold the array size
-
-    }
-  return this->encap_len_;
-}
-
-// Narrowing
-IMPL_NARROW_METHODS2 (be_array, AST_Array, be_type)
-IMPL_NARROW_FROM_DECL (be_array)
diff --git a/TAO/TAO_IDL/be/be_attribute.cpp b/TAO/TAO_IDL/be/be_attribute.cpp
deleted file mode 100644
index fa87112369b..00000000000
--- a/TAO/TAO_IDL/be/be_attribute.cpp
+++ /dev/null
@@ -1,662 +0,0 @@
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    be_attribute.cpp
-//
-// = DESCRIPTION
-//    Extension of class AST_Attribute that provides additional means for C++
-//    mapping.
-//
-// = AUTHOR
-//    Copyright 1994-1995 by Sun Microsystems, Inc.
-//    and
-//    Aniruddha Gokhale
-//
-// ============================================================================
-
-#include	"idl.h"
-#include	"idl_extern.h"
-#include	"be.h"
-
-/*
- * BE_Attribute
- */
-be_attribute::be_attribute (void)
-{
-}
-
-be_attribute::be_attribute (idl_bool ro, AST_Type *ft, UTL_ScopedName *n,
-                            UTL_StrList *p)
-  : AST_Attribute (ro, ft, n, p),
-    AST_Field (AST_Decl::NT_attr, ft, n, p),
-    AST_Decl (AST_Decl::NT_attr, n, p)
-{
-}
-
-// Handling attributes is very similar to operations. Attributes are mapped to
-// two methods - one to set the value and one to get the value. For a readonly
-// attribute we only have the method that retrieves the value. For the "set"
-// method we pass an in parameter which is of the type of the attribute. So the
-// handling here is exactly like the "in" parameters for arguments. The
-// handling of the "get" method is exactly like the return values of
-// operations.
-
-int
-be_attribute::gen_client_header (void)
-{
-  TAO_OutStream *ch; // output stream
-  be_type *bt;       // type node
-  be_state *s;       // state based code gen object
-
-  // retrieve a singleton instance of the code generator
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-  ch = cg->client_header ();
-
-  ch->indent (); // start with the current indentation level
-
-  bt = be_type::narrow_from_decl (this->field_type ());
-  if (!bt)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_attribute::gen_client_header - "
-                         "bad type\n"),
-                        -1);
-    }
-
-
-  // first the "get" method
-
-  // the retrieve method is defined virtual
-  *ch << "virtual ";
-
-  // first generate the return type
-  cg->push (TAO_CodeGen::TAO_ATTRIBUTE_RETURN_TYPE_CH); // we are now generating
-                                                       // an attribute "get"
-                                                       // definition with the
-                                                       // return type first
-
-  s = cg->make_state (); // retrieve state based object
-
-  if (!s || (s->gen_code (bt, this) == -1))
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_attribute::gen_client_header - "
-                         "return type generation failure\n"),
-                        -1);
-    }
-  cg->pop (); // restore previous state
-
-  // generate the operation name
-  // additional argument in the form of CORBA::Environment since TAO does not
-  // yet support C++ style Exceptions. However, we can have an option to the
-  // "tao" IDL compiler to ask it to generate code for exceptions. This will be
-  // handled in a later release.
-  *ch << " " << this->local_name () << " (CORBA::Environment &env);\n";
-
-  // now the set method. However, this is not defined if we are readonly
-  if (!this->readonly ())
-    {
-      ch->indent ();
-      *ch << "virtual void " << this->local_name () << "(";
-
-      // we pass the type as an "in" parameter
-      cg->push (TAO_CodeGen::TAO_ATTRIBUTE_INPARAM_TYPE_CH);
-
-      s = cg->make_state (); // retrieve state based object
-
-      if (!s || !bt || (s->gen_code (bt, this) == -1))
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_attribute::gen_client_header - "
-                             "in param type generation failure\n"),
-                            -1);
-        }
-      cg->pop (); // restore previous state
-      *ch << ", CORBA::Environment &env);\n";
-    }
-
-  return 0;
-}
-
-int
-be_attribute::gen_client_stubs (void)
-{
-  TAO_OutStream *cs; // output stream
-  TAO_NL  nl;        // end line
-  be_type *bt;       // type node
-  be_state *s;       // state based code gen object
-
-
-  // retrieve a singleton instance of the code generator
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-
-  cs = cg->client_stubs ();
-
-  // retrieve the type
-  bt = be_type::narrow_from_decl (this->field_type ());
-  if (!bt)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_attribute::gen_client_stubs - "
-                         "bad type\n"),
-                        -1);
-    }
-
-  // first the retrieve method
-  cs->indent (); // start with current indentation level
-
-  // generate the TAO_Param_Data table for the "get" method
-  *cs << "static const TAO_Param_Data _get_" << this->flatname () <<
-    "_paramdata [] = " << nl;
-  *cs << "{\n";
-  cs->incr_indent ();
-
-  // entry for the return type
-  *cs << "{" << bt->tc_name () << ", PARAM_RETURN, 0}";
-  cs->decr_indent ();
-  *cs << "};\n\n";
-
-  // now generate the calldata table
-
-  cs->indent ();
-  *cs << "static const TAO_Call_Data _get_" << this->flatname () << "_calldata = "
-      << nl;
-  *cs << "{";
-  // prepend a "_get_"
-  *cs << "\"_get_" << this->local_name () << "\", ";
-  *cs << "1, "; // always a twoway call
-  *cs << "1, "; // size is 1
-  // insert the address of the paramdata table
-  *cs << "_get_" << this->flatname () << "_paramdata, ";
-  // XXXASG - Exception list goes here (if it exists) - TODO
-  *cs << "0, 0};\n\n";
-
-  // now generate the actual stub
-
-  // first generate the return type
-  cs->indent ();
-  cg->push (TAO_CodeGen::TAO_ATTRIBUTE_RETURN_TYPE_CS); // declare a return
-                                                        // type of the stub
-  s = cg->make_state ();
-  if (!s || (s->gen_code (bt, this) == -1))
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_attribute::gen_client_stubs - "
-                         "return type generation failure\n"),
-                        -1);
-    }
-  cg->pop ();
-
-  // generate the operation name
-  *cs << " " << this->name () << "(CORBA::Environment &env)" << nl;
-  *cs << "{\n";
-  cs->incr_indent ();
-
-  // declare a return type
-  cg->push (TAO_CodeGen::TAO_ATTRIBUTE_RETVAL_DECL_CS);
-  s = cg->make_state ();
-  if (!s || (s->gen_code (bt, this) == -1))
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_attribute::gen_client_stubs - "
-                         "retval declaration failure\n"),
-                        -1);
-    }
-  cg->pop ();
-
-  // generate code that calls QueryInterface
-  *cs << "STUB_Object *istub;\n\n";
-  cs->indent ();
-  *cs << "if (this->QueryInterface (IID_STUB_Object, " <<
-    "(void **)&istub) != NOERROR)" << nl;
-  *cs << "{\n";
-  cs->incr_indent ();
-  *cs << "env.exception (new CORBA::DATA_CONVERSION (CORBA::COMPLETED_NO));" <<
-    nl;
-
-  // return the appropriate error value on exception
-  cg->push (TAO_CodeGen::TAO_ATTRIBUTE_RETVAL_EXCEPTION_CS);
-  s = cg->make_state ();
-  if (!s || (s->gen_code (bt, this) == -1))
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_attribute::gen_client_stubs - "
-                         "failure returning from exception\n"),
-                        -1);
-    }
-  cg->pop ();
-
-  cs->decr_indent ();
-  *cs << "}" << nl;
-  *cs << "this->Release (); // QueryInterface has bumped up our refcount" << nl;
-
-  // call do_call with appropriate number of arguments
-  *cs << "istub->do_call (env, &_get_" << this->flatname () <<
-    "_calldata, &retval);" << nl;
-
-  // return the retval
-  cg->push (TAO_CodeGen::TAO_ATTRIBUTE_RETVAL_RETURN_CS);
-  s = cg->make_state ();
-  if (!s || (s->gen_code (bt, this) == -1))
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_operation::gen_client_stubs\n"
-                         "return val return generation failure\n"),
-                        -1);
-      return -1;
-    }
-  cg->pop ();
-
-  cs->decr_indent (0);
-  *cs << "\n}\n\n";
-
-  if (this->readonly ())
-    return 0;  // we were readonly, nothing else to do.
-
-  // Now generate the stub for the "set" method
-  cs->indent (); // start with current indentation level
-
-  // generate the TAO_Param_Data table for the "set" method
-  *cs << "static const TAO_Param_Data _set_" << this->flatname () <<
-    "_paramdata [] = " << nl;
-  *cs << "{\n";
-  cs->incr_indent ();
-
-  // entry for the return type
-  *cs << "{CORBA::_tc_void, PARAM_RETURN, 0}," << nl;
-  *cs << "{" << bt->tc_name () << ", PARAM_IN, 0}\n";
-  cs->decr_indent ();
-  *cs << "};\n\n";
-
-  // now generate the calldata table
-
-  cs->indent ();
-  *cs << "static const TAO_Call_Data _set_" << this->flatname () << "_calldata = "
-      << nl;
-  *cs << "{";
-  // prepend a "_set_"
-  *cs << "\"_set_" << this->local_name () << "\", ";
-  *cs << "1, "; // always a twoway call
-  *cs << "2, "; // size is 2
-  // insert the address of the paramdata table
-  *cs << "_get_" << this->flatname () << "_paramdata, ";
-  // XXXASG - Exception list goes here (if it exists) - TODO
-  *cs << "0, 0};\n\n";
-
-  // now generate the actual stub
-
-  cs->indent ();
-  *cs << "void " << this->name () << "(";
-  // generate the in parameter
-  cg->push (TAO_CodeGen::TAO_ATTRIBUTE_INPARAM_TYPE_CS);
-  s = cg->make_state ();
-  if (!s || (s->gen_code (bt, this) == -1))
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_operation::gen_client_stubs - "
-                         "failure in argument generation in signature\n"),
-                        -1);
-    }
-  cg->pop ();
-
-  // last argument - is always CORBA::Environment
-  *cs << ", CORBA::Environment &env)" << nl;
-  *cs << "{\n";
-  cs->incr_indent ();
-
-  // generate code that calls QueryInterface
-  *cs << "STUB_Object *istub;\n\n";
-  cs->indent ();
-  *cs << "if (this->QueryInterface (IID_STUB_Object, " <<
-    "(void **)&istub) != NOERROR)" << nl;
-  *cs << "{\n";
-  cs->incr_indent ();
-  *cs << "env.exception (new CORBA::DATA_CONVERSION (CORBA::COMPLETED_NO));" <<
-    nl;
-  *cs << "return;\n";
-  cs->decr_indent ();
-  *cs << "}" << nl;
-  *cs << "this->Release (); // QueryInterface has bumped up our refcount" << nl;
-
-  // do any pre do_call stuff with the lone IN parameter
-  cg->push (TAO_CodeGen::TAO_ATTRIBUTE_PRE_DOCALL_CS);
-  if (!s || (s->gen_code (bt, this) == -1))
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_atribute::gen_client_stubs - "
-                         "failure generating pre docall stuff\n"),
-                        -1);
-    }
-  cg->pop ();
-
-  // call do_call with appropriate number of arguments
-  *cs << "istub->do_call (env, &_set_" << this->flatname () <<
-  "_calldata, 0"; // no return value
-
-  cg->push (TAO_CodeGen::TAO_ATTRIBUTE_DOCALL_CS);
-  s = cg->make_state ();
-  if (!s || (s->gen_code (bt, this) == -1))
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_attribute::gen_client_stubs - "
-                         "in param in docall generation failure\n"),
-                        -1);
-      return -1;
-    }
-  cg->pop ();
-  *cs << ");" << nl;
-
-  // do any post do_call processing
-  cg->push (TAO_CodeGen::TAO_ATTRIBUTE_POST_DOCALL_CS);
-  s = cg->make_state ();
-  if (!s || !bt || (s->gen_code (bt, this) == -1))
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_attribute::gen_client_stubs\n"
-                         "post docall generation failure\n"),
-                        -1);
-      return -1;
-    }
-  cg->pop ();
-
-  cs->decr_indent (0);
-  *cs << "\n}\n\n";
-
-  return 0;
-}
-
-int
-be_attribute::gen_server_header (void)
-{
-  TAO_OutStream *sh; // output stream
-  be_type *bt;       // type node
-  be_state *s;       // state based code generator object
-  TAO_NL nl;         // newline generator
-
-  // retrieve a singleton instance of the code generator
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-
-  sh = cg->server_header ();
-
-  // first retrieve the type
-  bt = be_type::narrow_from_decl (this->field_type ());
-  if (!bt)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_attribute::gen_server_header - "
-                         "bad type\n"),
-                        -1);
-    }
-
-  // first the "get" method
-
-  sh->indent (); // start with the current indentation level
-
-  // the retrieve method is defined pure virtual
-  *sh << "virtual ";
-  cg->push (TAO_CodeGen::TAO_ATTRIBUTE_RETURN_TYPE_SH); // we are now generating
-                                                       // an operation
-                                                       // definition with the
-                                                       // return type first
-
-  s = cg->make_state (); // retrieve state based object
-
-  if (!s || (s->gen_code (bt, this) == -1))
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_attribute::gen_server_header - "
-                         "return type generation failure\n"),
-                        -1);
-    }
-  cg->pop (); // restore previous state
-
-  *sh << " " << this->local_name () << " (CORBA::Environment &env) = 0;" << nl;
-
-  // generate the static method corresponding to the method
-  *sh << "static void _get_" << this->local_name () <<
-    "_skel (CORBA::ServerRequest &req, " <<
-    "CORBA::Object_ptr obj, CORBA::Environment &env);\n\n";
-
-
-  // now the set method. However, this is not defined if we are readonly
-  if (this->readonly ())
-    return 0;
-
-  sh->indent ();
-  *sh << "virtual void " << this->local_name () << "(";
-
-  // we pass the type as an "in" parameter
-  cg->push (TAO_CodeGen::TAO_ATTRIBUTE_INPARAM_TYPE_SH);
-
-  s = cg->make_state (); // retrieve state based object
-
-  if (!s || (s->gen_code (bt, this) == -1))
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_attribute::gen_server_header - "
-                         "in param type generation failure\n"),
-                        -1);
-    }
-  cg->pop (); // restore previous state
-  *sh << ", CORBA::Environment &env) = 0;" << nl;
-
-  // generate the static method corresponding to the method
-  *sh << "static void _set_" << this->local_name () <<
-    "_skel (CORBA::ServerRequest &req, " <<
-    "CORBA::Object_ptr obj, CORBA::Environment &env);\n\n";
-
-
-  return 0;
-}
-
-int
-be_attribute::gen_server_skeletons (void)
-{
-  TAO_OutStream *ss; // output stream
-  TAO_NL  nl;        // end line
-  be_type *bt;       // type node
-  be_state *s;       // state based code gen object
-  be_interface *intf; // enclosing interface node
-
-  // retrieve a singleton instance of the code generator
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-  ss = cg->server_skeletons ();
-
-  ss->indent (); // start with the current indentation level
-
-  // retrieve our type
-  bt = be_type::narrow_from_decl (this->field_type ());
-  if (!bt)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_attribute::gen_server_skeletons - "
-                         "bad type\n"),
-                        -1);
-    }
-
-  // retrieve our enclosing interface decl
-  intf = be_interface::narrow_from_decl (ScopeAsDecl (this->defined_in ()));
-  if (!intf)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_attribute::gen_server_skeletons - "
-                         "bad enclosing interface\n"),
-                        -1);
-    }
-
-
-  // code generation - first the "get" method
-  *ss << "void " << intf->full_skel_name () << "::_get_"
-      << this->local_name () << "_skel ("
-      << "CORBA::ServerRequest &_tao_server_request, "
-      << "CORBA::Object_ptr _tao_object_reference, "
-      << "CORBA::Environment &_tao_environment)" << nl;
-  *ss << "{\n";
-  ss->incr_indent ();
-  // define a variable that will eventually point to our implementation object
-  *ss << intf->full_skel_name () << "_ptr \t impl;" << nl;
-  // store the result in this Any
-  *ss << "CORBA::Any *result;" << nl;
-  // emit the return type
-  cg->push (TAO_CodeGen::TAO_ATTRIBUTE_RETVAL_DECL_SS); // emit type for return
-                                                        // value
-  // get a state based code gen object
-  s = cg->make_state ();
-  if (!s || (s->gen_code (bt, this) == -1))
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_attribute::gen_server_skeletons - "
-                         "codegen for return val decl failed\n"),
-                        -1);
-    }
-  cg->pop ();
-
-  ss->indent ();
-  *ss << "// this method has no incoming parameters. Nothing to parse" << nl;
-
-  // make the upcall
-  *ss << "impl = (" << intf->full_skel_name () << "_ptr) _tao_object_reference->get_subclass ();"
-      << nl;
-  cg->push (TAO_CodeGen::TAO_ATTRIBUTE_RETVAL_ASSIGN_SS);
-  s = cg->make_state ();
-  // emit code to assign to retval
-  if (!s || (s->gen_code (bt, this) == -1))
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_attribute::gen_server_skeletons - "
-                         "codegen for return val assign failed\n"),
-                        -1);
-    }
-  *ss << " = impl->" << this->local_name () << "(_tao_environment);" << nl;
-  cg->pop ();
-
-  // insert our return val into the result
-  cg->push (TAO_CodeGen::TAO_ATTRIBUTE_RESULT_SS);
-  s = cg->make_state ();
-  if (!s || (s->gen_code (bt, this) == -1))
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_attribute::gen_server_skeletons - "
-                         "codegen for returning result failed\n"),
-                        -1);
-    }
-  cg->pop ();
-  // insert the result into the server request
-  *ss << "_tao_server_request.result (result, _tao_environment);\n";
-  ss->decr_indent ();
-  *ss << "}\n\n";
-
-  if (this->readonly ())
-    return 0; // nothing else to do as we are readonly
-
-  // generate skeleton for the "set" method
-
-  ss->indent ();
-  *ss << "void " << intf->full_skel_name () << "::_set_"
-      << this->local_name () << "_skel ("
-      << "CORBA::ServerRequest &_tao_server_request, "
-      << "CORBA::Object_ptr _tao_object_reference, "
-      << "CORBA::Environment &_tao_environment)" << nl;
-  *ss << "{\n";
-  ss->incr_indent ();
-  // define an NVList to hold the in argument
-  *ss << "CORBA::NVList_ptr \t nvlist;" << nl;
-  // define a variable that will eventually point to our implementation object
-  *ss << intf->full_skel_name () << "_ptr \t impl;" << nl;
-
-  // if we have any arguments, get each one of them and allocate an Any and
-  // NamedValue for each. In addition, define a variable of that type
-  cg->push (TAO_CodeGen::TAO_ATTRIBUTE_INPARAM_TYPE_SS);
-  s = cg->make_state ();
-  if (!s || (s->gen_code (bt, this) == -1))
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_attribute::gen_server_skeletons - "
-                         "codegen for returning result failed\n"),
-                        -1);
-    }
-  cg->pop ();
-
-  // declare an NVList and create one
-  ss->indent ();
-  *ss << "// create an NV list and populate it with typecodes" << nl;
-  *ss << "_tao_server_request.orb ()->create_list (0, nvlist); // initialize a list" << nl;
-
-  // add the "in" argument
-  // emit code that adds this argument to the NVList
-  *ss << "nv_" << this->local_name () << " = nvlist->add_value (\"" <<
-    this->local_name () << "\", any_" << this->local_name () <<
-    ", CORBA::ARG_IN, _tao_environment);" << nl;
-
-  *ss << "// parse the arguments" << nl;
-  *ss << "_tao_server_request.params (nvlist, _tao_environment);" << nl;
-  *ss << "if (_tao_environment.exception ()) return;" << nl;
-
-  cg->push (TAO_CodeGen::TAO_ATTRIBUTE_PRE_UPCALL_SS);
-  s = cg->make_state ();
-  if (!s || (s->gen_code (bt, this) == -1))
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_attribute::gen_server_skeletons - "
-                         "preupcall code failed\n"),
-                        -1);
-    }
-  cg->pop ();
-
-  // make the upcall
-  *ss << "impl = (" << intf->full_skel_name () << "_ptr) _tao_object_reference->get_subclass ();"
-      << nl;
-
-  *ss << "impl->" << this->local_name () << "(";
-  cg->push (TAO_CodeGen::TAO_ATTRIBUTE_UPCALL_SS);
-  s = cg->make_state ();
-  if (!s || (s->gen_code (bt, this) == -1))
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_attribute::gen_server_skeletons - "
-                         "upcall code failed\n"),
-                        -1);
-    }
-  cg->pop ();
-  *ss << "_tao_environment);" << nl;
-
-  cg->push (TAO_CodeGen::TAO_ATTRIBUTE_POST_UPCALL_SS);
-  s = cg->make_state ();
-  if (!s || (s->gen_code (bt, this) == -1))
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_attribute::gen_server_skeletons - "
-                         "post upcall code failed\n"),
-                        -1);
-    }
-  cg->pop ();
-
-  *ss << "\n";
-  ss->decr_indent ();
-  *ss << "}\n\n";
-
-  return 0;
-}
-
-// Generates the client-side inline information
-int
-be_attribute::gen_client_inline (void)
-{
-  // nothing to be done
-  return 0;
-}
-
-// Generates the server-side inline
-int
-be_attribute::gen_server_inline (void)
-{
-  // nothing to be done
-  return 0;
-}
-
-// Narrowing
-IMPL_NARROW_METHODS2 (be_attribute, AST_Attribute, be_decl)
-IMPL_NARROW_FROM_DECL (be_attribute)
diff --git a/TAO/TAO_IDL/be/be_codegen.cpp b/TAO/TAO_IDL/be/be_codegen.cpp
deleted file mode 100644
index 72468faa7bf..00000000000
--- a/TAO/TAO_IDL/be/be_codegen.cpp
+++ /dev/null
@@ -1,510 +0,0 @@
-/* -*- c++ -*- */
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    be_codegen.h
-//
-// = DESCRIPTION
-//
-//   Code generation
-// = AUTHOR
-//    Aniruddha Gokhale
-//
-// ============================================================================
-
-#include	"idl.h"
-#include	"idl_extern.h"
-#include	"be.h"
-
-static const int CHUNK = 100;
-
-/* BE global Data */
-TAO_CodeGen::TAO_CodeGen (void)
-  : client_header_ (0),
-    client_stubs_ (0),
-    client_inline_ (0),
-    server_header_ (0),
-    server_skeletons_ (0),
-    server_inline_ (0),
-    curr_os_ (0),
-    state_ (new TAO_CodeGen::CG_STATE [CHUNK]),
-    top_ (0),
-    size_ (CHUNK)
-{
-  // set the current code generation state
-  this->state_ [this->top_++] = TAO_CodeGen::TAO_INITIAL;
-}
-
-// destructor
-TAO_CodeGen::~TAO_CodeGen (void)
-{
-  delete client_header_;
-  delete server_header_;
-  delete client_stubs_;
-  delete server_skeletons_;
-  delete client_inline_;
-  delete server_inline_;
-  curr_os_ = 0;
-  delete [] state_;
-}
-
-// factory method
-be_state *
-TAO_CodeGen::make_state (void)
-{
-  switch (this->state ())
-    {
-    case TAO_STRUCT_CH:
-      return TAO_BE_STATE_STRUCT_CH::instance ();
-    case TAO_UNION_DISCTYPEDEFN_CH:
-      return TAO_BE_STATE_UNION_DISCTYPEDEFN_CH::instance ();
-    case TAO_UNION_DISCTYPEDEFN_CI:
-      return TAO_BE_STATE_UNION_DISCTYPEDEFN_CI::instance ();
-    case TAO_UNION_PUBLIC_CH:
-      return TAO_BE_STATE_UNION_PUBLIC_CH::instance ();
-    case TAO_UNION_PUBLIC_CI:
-      return TAO_BE_STATE_UNION_PUBLIC_CI::instance ();
-    case TAO_UNION_PRIVATE_CH:
-      return TAO_BE_STATE_UNION_PRIVATE_CH::instance ();
-    case TAO_OPERATION_CH:
-    case TAO_OPERATION_RETURN_TYPE_CS:
-    case TAO_OPERATION_RETVAL_DECL_CS:
-    case TAO_OPERATION_RETVAL_EXCEPTION_CS:
-    case TAO_OPERATION_RETVAL_RETURN_CS:
-    case TAO_OPERATION_SH:
-    case TAO_OPERATION_RETVAL_DECL_SS:
-    case TAO_OPERATION_RETVAL_ASSIGN_SS:
-    case TAO_OPERATION_RESULT_SS:
-      return TAO_BE_STATE_OPERATION::instance ();
-    case TAO_ARGUMENT_CH:
-    case TAO_ARGUMENT_CS:
-    case TAO_ARGUMENT_PRE_DOCALL_CS:
-    case TAO_ARGUMENT_DOCALL_CS:
-    case TAO_ARGUMENT_POST_DOCALL_CS:
-    case TAO_ARGUMENT_SH:
-    case TAO_ARGUMENT_SS:
-    case TAO_ARGUMENT_VARDECL_SS:
-    case TAO_ARGUMENT_PRE_UPCALL_SS:
-    case TAO_ARGUMENT_UPCALL_SS:
-    case TAO_ARGUMENT_POST_UPCALL_SS:
-      return TAO_BE_STATE_ARGUMENT::instance ();
-    case TAO_TYPEDEF_CH:
-    case TAO_TYPEDEF_CS:
-    case TAO_TYPEDEF_CI:
-      return TAO_BE_STATE_TYPEDEF::instance ();
-    case TAO_ARRAY_DEFN_CH:
-    case TAO_ARRAY_OTHER_CH:
-    case TAO_ARRAY_DEFN_CI:
-      return TAO_BE_STATE_ARRAY::instance ();
-    case TAO_SEQUENCE_BASE_CH:
-    case TAO_SEQUENCE_BASE_CS:
-    case TAO_SEQUENCE_BASE_CI:
-    case TAO_SEQUENCE_BODY_CH:
-    case TAO_SEQUENCE_BODY_CS:
-    case TAO_SEQUENCE_BODY_CI:
-      return TAO_BE_STATE_SEQUENCE::instance ();
-    case TAO_ATTRIBUTE_RETURN_TYPE_CH:
-    case TAO_ATTRIBUTE_INPARAM_TYPE_CH:
-    case TAO_ATTRIBUTE_RETURN_TYPE_CS:
-    case TAO_ATTRIBUTE_RETVAL_DECL_CS:
-    case TAO_ATTRIBUTE_RETVAL_EXCEPTION_CS:
-    case TAO_ATTRIBUTE_RETVAL_RETURN_CS:
-    case TAO_ATTRIBUTE_INPARAM_TYPE_CS:
-    case TAO_ATTRIBUTE_PRE_DOCALL_CS:
-    case TAO_ATTRIBUTE_DOCALL_CS:
-    case TAO_ATTRIBUTE_POST_DOCALL_CS:
-    case TAO_ATTRIBUTE_RETURN_TYPE_SH:
-    case TAO_ATTRIBUTE_INPARAM_TYPE_SH:
-    case TAO_ATTRIBUTE_RETVAL_DECL_SS:
-    case TAO_ATTRIBUTE_RETVAL_ASSIGN_SS:
-    case TAO_ATTRIBUTE_RESULT_SS:
-    case TAO_ATTRIBUTE_INPARAM_TYPE_SS:
-    case TAO_ATTRIBUTE_PRE_UPCALL_SS:
-    case TAO_ATTRIBUTE_UPCALL_SS:
-    case TAO_ATTRIBUTE_POST_UPCALL_SS:
-      return TAO_BE_STATE_ATTRIBUTE::instance ();
-    default:
-      return 0;
-    }
-}
-
-// change the string to all upcase
-const char *
-TAO_CodeGen::upcase (const char *str)
-{
-  static char upcase_str [NAMEBUFSIZE];
-
-  ACE_OS::memset (upcase_str, '\0', NAMEBUFSIZE);
-  // convert letters in str to upcase
-  for (unsigned int i=0; i < ACE_OS::strlen (str); i++)
-    {
-      if (isalpha (str [i]))
-        {
-          upcase_str[i] = toupper (str [i]);
-        }
-      else
-        {
-          // copy it as it is
-          upcase_str[i] = str[i];
-        }
-    }
-  return upcase_str;
-}
-
-// set the client header stream
-int
-TAO_CodeGen::client_header (const char *fname)
-{
-  // retrieve the singleton instance to the outstream factory
-  TAO_OutStream_Factory *factory = TAO_OUTSTREAM_FACTORY::instance ();
-
-  // retrieve a specialized instance
-  this->client_header_ = factory->make_outstream ();
-  if (!this->client_header_)
-    {
-      return -1;
-    }
-
-  if (this->client_header_->open (fname, TAO_OutStream::TAO_CLI_HDR) == -1)
-    return -1;
-  else
-    {
-      // now generate the #if !defined clause
-      static char macro_name [NAMEBUFSIZE];
-
-      ACE_OS::memset (macro_name, '\0', NAMEBUFSIZE);
-      const char *suffix = ACE_OS::strstr (fname, ".h");
-      if (suffix == 0)
-	return -1; // bad file name
-      else
-        {
-          ACE_OS::sprintf (macro_name, "_TAO_IDL_");
-          // convert letters in fname to upcase
-          for (int i=0; i < (suffix - fname); i++)
-            if (isalpha (fname [i]))
-              macro_name[i+9] = toupper (fname [i]);
-
-          ACE_OS::strcat (macro_name, "_H_");
-
-          this->client_header_->print ("#if !defined (%s)\n", macro_name);
-          this->client_header_->print ("#define %s\n\n", macro_name);
-          *this->client_header_ << "#include \"tao/corba.h\"\n";
-
-	  // We must include all the skeleton headers corresponding to
-	  // IDL files included by the current IDL file.
-	  for (size_t j = 0;
-	       j < idl_global->n_include_file_names ();
-	       ++j)
-	    {
-	      String* idl_name =
-		idl_global->include_file_names()[j];
-
-	      const char* client_hdr =
-		IDL_GlobalData::be_get_client_hdr (idl_name);
-
-	      this->client_header_->print ("#include \"%s\"\n",
-					   client_hdr);
-	    }
-	  *this->client_header_ << "\n";
-          return 0;
-        }
-    }
-}
-
-// get the client header stream
-TAO_OutStream *
-TAO_CodeGen::client_header (void)
-{
-  return this->client_header_;
-}
-
-// set the client stub stream
-int
-TAO_CodeGen::client_stubs (const char *fname)
-{
-  // retrieve the singleton instance to the outstream factory
-  TAO_OutStream_Factory *factory = TAO_OUTSTREAM_FACTORY::instance ();
-
-  // retrieve a specialized instance
-  this->client_stubs_ = factory->make_outstream ();
-  if (!this->client_stubs_)
-    {
-      return -1;
-    }
-
-  if (this->client_stubs_->open (fname, TAO_OutStream::TAO_CLI_IMPL) == -1)
-    {
-      return -1;
-    }
-  // generate the include statement for the client header
-  *this->client_stubs_ << "#include \"" <<
-    idl_global->be_get_client_hdr_fname () << "\"\n\n";
-
-  // generate the code that includes the inline file if not included in the
-  // header file
-  *this->client_stubs_ << "#if !defined (__ACE_INLINE__)\n";
-  *this->client_stubs_ << "#include \"" <<
-    idl_global->be_get_client_inline_fname () << "\"\n";
-  *this->client_stubs_ << "#endif // !defined INLINE\n\n";
-  return 0;
-}
-
-// get the client stubs stream
-TAO_OutStream *
-TAO_CodeGen::client_stubs (void)
-{
-  return this->client_stubs_;
-}
-
-// set the client inline stream
-int
-TAO_CodeGen::client_inline (const char *fname)
-{
-  // retrieve the singleton instance to the outstream factory
-  TAO_OutStream_Factory *factory = TAO_OUTSTREAM_FACTORY::instance ();
-
-  // retrieve a specialized instance
-  this->client_inline_ = factory->make_outstream ();
-  if (!this->client_inline_)
-    {
-      return -1;
-    }
-
-  return this->client_inline_->open (fname, TAO_OutStream::TAO_CLI_INL);
-}
-
-// get the client inline stream
-TAO_OutStream *
-TAO_CodeGen::client_inline (void)
-{
-  return this->client_inline_;
-}
-
-// set the server header stream
-int
-TAO_CodeGen::server_header (const char *fname)
-{
-  // retrieve the singleton instance to the outstream factory
-  TAO_OutStream_Factory *factory = TAO_OUTSTREAM_FACTORY::instance ();
-
-  // retrieve a specialized instance
-  this->server_header_ = factory->make_outstream ();
-  if (!this->server_header_)
-    {
-      return -1;
-    }
-
-  if (this->server_header_->open (fname, TAO_OutStream::TAO_SVR_HDR) == -1)
-    return -1;
-  else
-    {
-      // now generate the #if !defined clause
-      static char macro_name [NAMEBUFSIZE];
-
-      ACE_OS::memset (macro_name, '\0', NAMEBUFSIZE);
-      const char *suffix = ACE_OS::strstr (fname, ".h");
-      if (suffix == 0)
-	return -1; // bad file name
-      else
-	{
-          ACE_OS::sprintf (macro_name, "_TAO_IDL_");
-          // convert letters in fname to upcase
-          for (int i=0; i < (suffix - fname); i++)
-            {
-              if (isalpha (fname [i]))
-                {
-                  macro_name[i+9] = toupper (fname [i]);
-                }
-            }
-          ACE_OS::strcat (macro_name, "_H_");
-
-          this->server_header_->print ("#if !defined (%s)\n", macro_name);
-          this->server_header_->print ("#define %s\n\n", macro_name);
-
-	  // We must include all the skeleton headers corresponding to
-	  // IDL files included by the current IDL file.
-	  for (size_t j = 0;
-	       j < idl_global->n_include_file_names ();
-	       ++j)
-	    {
-	      String* idl_name =
-		idl_global->include_file_names()[j];
-
-	      const char* server_hdr =
-		IDL_GlobalData::be_get_server_hdr (idl_name);
-
-	      this->server_header_->print ("#include \"%s\"\n",
-					   server_hdr);
-	    }
-          // the server header should include the client header
-          *this->server_header_ << "#include \"" <<
-            idl_global->be_get_client_hdr_fname () << "\"\n\n";
-
-          return 0;
-        }
-    }
-}
-
-// get the server header stream
-TAO_OutStream *
-TAO_CodeGen::server_header (void)
-{
-  return this->server_header_;
-}
-
-// set the server skeletons stream
-int
-TAO_CodeGen::server_skeletons (const char *fname)
-{
-  // retrieve the singleton instance to the outstream factory
-  TAO_OutStream_Factory *factory = TAO_OUTSTREAM_FACTORY::instance ();
-
-  // retrieve a specialized instance
-  this->server_skeletons_ = factory->make_outstream ();
-  if (!this->server_skeletons_)
-    {
-      return -1;
-    }
-
-  if (this->server_skeletons_->open (fname, TAO_OutStream::TAO_SVR_IMPL) == -1)
-    {
-      return -1;
-    }
-
-  // generate the include statement for the server header
-  *this->server_skeletons_ << "#include \"" <<
-    idl_global->be_get_server_hdr_fname () << "\"\n\n";
-
-  // generate the code that includes the inline file if not included in the
-  // header file
-  *this->server_skeletons_ << "#if !defined (__ACE_INLINE__)\n";
-  *this->server_skeletons_ << "#include \"" <<
-    idl_global->be_get_server_inline_fname () << "\"\n";
-  *this->server_skeletons_ << "#endif // !defined INLINE\n\n";
-  return 0;
-}
-
-// get the server skeletons stream
-TAO_OutStream *
-TAO_CodeGen::server_skeletons (void)
-{
-  return this->server_skeletons_;
-}
-
-// set the server inline stream
-int
-TAO_CodeGen::server_inline (const char *fname)
-{
-  // retrieve the singleton instance to the outstream factory
-  TAO_OutStream_Factory *factory = TAO_OUTSTREAM_FACTORY::instance ();
-
-  // retrieve a specialized instance
-  this->server_inline_ = factory->make_outstream ();
-  if (!this->server_inline_)
-    {
-      return -1;
-    }
-
-  return this->server_inline_->open (fname, TAO_OutStream::TAO_SVR_INL);
-}
-
-// get the server inline stream
-TAO_OutStream *
-TAO_CodeGen::server_inline (void)
-{
-  return this->server_inline_;
-}
-
-// put the last #endif in the client and server headers
-int
-TAO_CodeGen::end_client_header (void)
-{
-  // insert the code to include the inline file
-  *this->client_header_ << "\n#if defined (__ACE_INLINE__)\n";
-  *this->client_header_ << "#include \"" <<
-    idl_global->be_get_client_inline_fname () << "\"\n";
-  *this->client_header_ << "#endif // defined INLINE\n\n";
-
-  // code to put the last #endif
-  *this->client_header_ << "\n#endif // if !defined\n";
-  return 0;
-}
-
-int
-TAO_CodeGen::end_server_header (void)
-{
-  // insert the code to include the inline file
-  *this->server_header_ << "\n#if defined (__ACE_INLINE__)\n";
-  *this->server_header_ << "#include \"" <<
-    idl_global->be_get_server_inline_fname () << "\"\n";
-  *this->server_header_ << "#endif // defined INLINE\n\n";
-
-  // code to put the last #endif
-  *this->server_header_ << "\n#endif // if !defined\n";
-  return 0;
-}
-
-// We use the following helper functions to pass information. This class is the
-// best place to pass such information rather than passing information through
-// global variables spread everywhere. This class is a singleton and is
-// effectively a global.
-
-void
-TAO_CodeGen::outstream (TAO_OutStream *os)
-{
-  this->curr_os_ = os;
-}
-
-TAO_OutStream *
-TAO_CodeGen::outstream (void)
-{
-  return this->curr_os_;
-}
-
-void
-TAO_CodeGen::push (TAO_CodeGen::CG_STATE s)
-{
-  if (this->top_ == this->size_)
-    {
-      TAO_CodeGen::CG_STATE *temp = this->state_;
-      this->size_ += CHUNK;
-      this->state_ = new TAO_CodeGen::CG_STATE [this->size_];
-      for (int i=0; i < this->top_; i++)
-        this->state_ [i] = temp [i];
-      delete []temp;
-    }
-  this->state_[this->top_++] = s;
-}
-
-void
-TAO_CodeGen::pop (void)
-{
-  this->top_--;
-}
-
-TAO_CodeGen::CG_STATE
-TAO_CodeGen::state (void)
-{
-  return this->state_[this->top_ - 1]; // top points to the next free slot
-}
-
-void
-TAO_CodeGen::reset (void)
-{
-  this->top_ = 1; // the 0th posn is always the INITIAL state
-}
-
-void
-TAO_CodeGen::node (be_decl *n)
-{
-  this->node_ = n;
-}
-
-be_decl *
-TAO_CodeGen::node (void)
-{
-  return this->node_;
-}
diff --git a/TAO/TAO_IDL/be/be_constant.cpp b/TAO/TAO_IDL/be/be_constant.cpp
deleted file mode 100644
index efe50f9f355..00000000000
--- a/TAO/TAO_IDL/be/be_constant.cpp
+++ /dev/null
@@ -1,172 +0,0 @@
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    be_constant.cpp
-//
-// = DESCRIPTION
-//    Extension of class AST_Constant that provides additional means for C++
-//    mapping.
-//
-// = AUTHOR
-//    Copyright 1994-1995 by Sun Microsystems, Inc.
-//    and
-//    Aniruddha Gokhale
-//
-// ============================================================================
-
-#include	"idl.h"
-#include	"idl_extern.h"
-#include	"be.h"
-
-/*
- * BE_Constant
- */
-be_constant::be_constant (void)
-{
-}
-
-be_constant::be_constant (AST_Expression::ExprType et,
-			  AST_Expression *v,
-                          UTL_ScopedName *n,
-                          UTL_StrList *p)
-  : AST_Constant (et, v, n, p),
-    AST_Decl (AST_Decl::NT_const, n, p)
-{
-}
-
-// ----------------------------------------
-//            CODE GENERATION METHODS
-// ----------------------------------------
-
-// Generates the client-side header information for the constant
-int
-be_constant::gen_client_header (void)
-{
-  TAO_OutStream *ch; // output stream
-
-  // retrieve a singleton instance of the code generator
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-  cg->push (TAO_CodeGen::TAO_CONSTANT_CH);
-
-  ch = cg->client_header ();
-
-  // if we are defined in the outermost scope, then the value is assigned
-  // to us here itself, else it will be in the *.cpp file
-
-  ch->indent (); // start from whatever indentation level we were at
-  *ch << "static const " << this->exprtype_to_string () << " " << local_name ();
-  if (!this->is_nested ())
-    {
-      // We were defined at the outermost scope. So we put the value in the
-      // header itself
-      *ch << " = " << this->constant_value ();
-    }
-  *ch << ";\n\n";
-  cg->pop ();
-  return 0;
-}
-
-// Generates the client-side stubs for the constant
-int
-be_constant::gen_client_stubs (void)
-{
-  TAO_OutStream *cs; // output stream
-
-  // retrieve a singleton instance of the code generator
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-  cg->push (TAO_CodeGen::TAO_CONSTANT_CS);
-
-  cs = cg->client_stubs ();
-
-  if (this->is_nested ())
-    {
-      // for those constants not defined in the outer most scope, they get
-      // assigned to their values in the
-      cs->indent (); // start from whatever indentation level we were at
-      *cs << "const " << this->exprtype_to_string () << " " << this->name ();
-      *cs << " = " << this->constant_value ();
-      *cs << ";\n\n";
-    }
-  cg->pop ();
-  return 0;
-}
-
-// Generates the server-side header information for the constant
-int
-be_constant::gen_server_header (void)
-{
-  // nothing to be done
-  return 0;
-}
-
-// Generates the server-side skeletons for the constant
-int
-be_constant::gen_server_skeletons (void)
-{
-  // nothing to be done
-  return 0;
-}
-
-// Generates the client-side inline information
-int
-be_constant::gen_client_inline (void)
-{
-  // nothing to be done
-  return 0;
-}
-
-// Generates the server-side inline
-int
-be_constant::gen_server_inline (void)
-{
-  // nothing to be done
-  return 0;
-}
-
-char *
-be_constant::exprtype_to_string (void)
-{
-  switch (this->et ())
-    {
-    case AST_Expression::EV_short:
-      return "CORBA::Short";
-    case AST_Expression::EV_ushort:
-      return "CORBA::UShort";
-    case AST_Expression::EV_long:
-      return "CORBA::Long";
-    case AST_Expression::EV_ulong:
-      return "CORBA::ULong";
-    case AST_Expression::EV_float:
-      return "CORBA::Float";
-    case AST_Expression::EV_double:
-      return "CORBA::Double";
-    case AST_Expression::EV_char:
-      return "CORBA::Char";
-    case AST_Expression::EV_octet:
-      return "CORBA::Octet";
-    case AST_Expression::EV_bool:
-      return "CORBA::Boolean";
-    case AST_Expression::EV_string:
-      return "char *const";
-    case AST_Expression::EV_any:
-      return "CORBA::Any";
-    case AST_Expression::EV_void:
-      return "void";
-    case AST_Expression::EV_none:
-      return "none";
-    case AST_Expression::EV_longlong:
-    case AST_Expression::EV_ulonglong:
-    case AST_Expression::EV_longdouble:
-    case AST_Expression::EV_wchar:
-    case AST_Expression::EV_wstring:
-      return NULL;
-    }
-  return NULL;
-}
-
-// Narrowing
-IMPL_NARROW_METHODS2 (be_constant, AST_Constant, be_decl)
-IMPL_NARROW_FROM_DECL (be_constant)
diff --git a/TAO/TAO_IDL/be/be_decl.cpp b/TAO/TAO_IDL/be/be_decl.cpp
deleted file mode 100644
index e242c719b0a..00000000000
--- a/TAO/TAO_IDL/be/be_decl.cpp
+++ /dev/null
@@ -1,417 +0,0 @@
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    be_decl.cpp
-//
-// = DESCRIPTION
-//    Extension of class AST_Decl that provides additional means for C++
-//    mapping.
-//
-// = AUTHOR
-//    Copyright 1994-1995 by Sun Microsystems, Inc.
-//    and
-//    Aniruddha Gokhale
-//
-// ============================================================================
-
-#include	"idl.h"
-#include	"idl_extern.h"
-#include	"be.h"
-
-// Default Constructor
-be_decl::be_decl (void)
-  : cli_hdr_gen_ (I_FALSE),
-    cli_stub_gen_ (I_FALSE),
-    cli_inline_gen_ (I_FALSE),
-    srv_hdr_gen_ (I_FALSE),
-    srv_skel_gen_ (I_FALSE),
-    srv_inline_gen_ (I_FALSE),
-    fullname_ (0),
-    flatname_ (0),
-    repoID_ (0),
-    size_type_ (be_decl::FIXED), // everybody is fixed size to start with
-    encap_len_ (-1)
-{
-}
-
-// Constructor
-be_decl::be_decl (AST_Decl::NodeType type, UTL_ScopedName *n, UTL_StrList
-                  *pragmas)
-  : AST_Decl (type, n, pragmas),
-    cli_hdr_gen_ (I_FALSE),
-    cli_stub_gen_ (I_FALSE),
-    cli_inline_gen_ (I_FALSE),
-    srv_hdr_gen_ (I_FALSE),
-    srv_skel_gen_ (I_FALSE),
-    srv_inline_gen_ (I_FALSE),
-    fullname_ (0),
-    size_type_ (be_decl::FIXED), // everybody is fixed size to start with
-    encap_len_ (-1)
-{
-}
-
-//destructor
-be_decl::~be_decl (void)
-{
-}
-
-int
-be_decl::gen_encapsulation (void)
-{
-  // do nothing
-  return 0;
-}
-
-long
-be_decl::tc_encap_len (void)
-{
-  return -1;
-}
-
-// return our size type
-be_decl::SIZE_TYPE
-be_decl::size_type (void) const
-{
-  return this->size_type_;
-}
-
-// set our size type and that of all our ancestors
-void
-be_decl::size_type (be_decl::SIZE_TYPE st)
-{
-  if (st == be_decl::FIXED) // does not affect ancestors
-    return;
-
-  if (this->size_type_ == st) // already of that type.
-    return; // nothing to do
-
-  // precondition
-  ACE_ASSERT (st == be_decl::VARIABLE);
-
-  this->size_type_ = st;
-
-  // if we are just a typedef, nothing else to do
-  if (this->node_type () == AST_Decl::NT_typedef)
-    return;
-
-  // update our parent if it is of a specific type
-  if (!this->defined_in ()) // we are outermost
-    return; // nothing to do
-  else
-    {
-      // get the scope we are defined in
-      be_decl *d = be_decl::narrow_from_decl (ScopeAsDecl (this->defined_in
-                                                           ()));
-      switch (d->node_type ())
-        {
-          // only these define valid scopes whose size needs to be set the same
-          // as ours.
-        case AST_Decl::NT_struct:
-        case AST_Decl::NT_union:
-          d->size_type (st); // call recursively to set the size type of
-          // our ancestors
-        default:
-          return; // we are done
-        }
-    } // end else
-}
-
-// compute stringified fully scoped name
-void
-be_decl::compute_fullname (void)
-{
-  if (fullname_)
-    return;
-  else
-    {
-      long namelen;
-      UTL_IdListActiveIterator	*i;
-      long				first = I_TRUE;
-      long				second = I_FALSE;
-
-      // in the first loop compute the total length
-      namelen = 0;
-      i = new UTL_IdListActiveIterator (this->name ());
-      while (!(i->is_done ()))
-        {
-          if (!first)
-            namelen += 2; // for "::"
-          else if (second)
-            first = second = I_FALSE;
-          // print the identifier
-          namelen += ACE_OS::strlen (i->item ()->get_string ());
-          if (first)
-            {
-              if (ACE_OS::strcmp (i->item ()->get_string (), "") != 0)
-                // does not start with a ""
-                first = I_FALSE;
-              else
-                second = I_TRUE;
-            }
-          i->next ();
-        }
-      delete i;
-
-      this->fullname_ = new char [namelen+1];
-      this->fullname_[0] = '\0';
-      first = I_TRUE;
-      second = I_FALSE;
-      i = new UTL_IdListActiveIterator (this->name ());
-      while (!(i->is_done ()))
-        {
-          if (!first)
-            ACE_OS::strcat (this->fullname_, "::");
-          else if (second)
-            first = second = I_FALSE;
-          // print the identifier
-          ACE_OS::strcat (this->fullname_, i->item ()->get_string ());
-          if (first)
-            {
-              if (ACE_OS::strcmp (i->item ()->get_string (), "") != 0)
-                // does not start with a ""
-                first = I_FALSE;
-              else
-                second = I_TRUE;
-            }
-          i->next ();
-        }
-      delete i;
-    }
-  return;
-}
-
-const char*
-be_decl::fullname (void)
-{
-  if (!this->fullname_)
-    compute_fullname ();
-
-  return this->fullname_;
-}
-
-// compute stringified flattened fully scoped name
-void
-be_decl::compute_flatname (void)
-{
-  if (flatname_)
-    return;
-  else
-    {
-      long namelen;
-      UTL_IdListActiveIterator	*i;
-      long				first = I_TRUE;
-      long				second = I_FALSE;
-
-      // in the first loop compute the total length
-      namelen = 0;
-      i = new UTL_IdListActiveIterator (this->name ());
-      while (!(i->is_done ()))
-        {
-          if (!first)
-            namelen += 1; // for "_"
-          else if (second)
-            first = second = I_FALSE;
-          // print the identifier
-          namelen += ACE_OS::strlen (i->item ()->get_string ());
-          if (first)
-            {
-              if (ACE_OS::strcmp (i->item ()->get_string (), "") != 0)
-                // does not start with a ""
-                first = I_FALSE;
-              else
-                second = I_TRUE;
-            }
-          i->next ();
-        }
-      delete i;
-
-      this->flatname_ = new char [namelen+1];
-      this->flatname_[0] = '\0';
-      first = I_TRUE;
-      second = I_FALSE;
-      i = new UTL_IdListActiveIterator (this->name ());
-      while (!(i->is_done ()))
-        {
-          if (!first)
-            ACE_OS::strcat (this->flatname_, "_");
-          else if (second)
-            first = second = I_FALSE;
-          // print the identifier
-          ACE_OS::strcat (this->flatname_, i->item ()->get_string ());
-          if (first)
-            {
-              if (ACE_OS::strcmp (i->item ()->get_string (), "") != 0)
-                // does not start with a ""
-                first = I_FALSE;
-              else
-                second = I_TRUE;
-            }
-          i->next ();
-        }
-      delete i;
-    }
-  return;
-}
-
-const char*
-be_decl::flatname (void)
-{
-  if (!this->flatname_)
-    compute_flatname ();
-
-  return this->flatname_;
-}
-
-// compute stringified repository ID
-void
-be_decl::compute_repoID (void)
-{
-  if (repoID_)
-    return;
-  else
-    {
-      long namelen;
-      UTL_IdListActiveIterator	*i;
-      long				first = I_TRUE;
-      long				second = I_FALSE;
-
-      // in the first loop compute the total length
-      namelen = 8; // for the prefix "IDL:" and suffix ":1.0"
-      i = new UTL_IdListActiveIterator (this->name ());
-      while (!(i->is_done ()))
-        {
-          if (!first)
-            namelen += 1; // for "/"
-          else if (second)
-            first = second = I_FALSE;
-          // print the identifier
-          namelen += ACE_OS::strlen (i->item ()->get_string ());
-          if (first)
-            {
-              if (ACE_OS::strcmp (i->item ()->get_string (), "") != 0)
-                // does not start with a ""
-                first = I_FALSE;
-              else
-                second = I_TRUE;
-            }
-          i->next ();
-        }
-      delete i;
-
-      this->repoID_ = new char [namelen+1];
-      this->repoID_[0] = '\0';
-      ACE_OS::sprintf (this->repoID_, "%s", "IDL:");
-      i = new UTL_IdListActiveIterator (this->name ());
-      first = I_TRUE;
-      second = I_FALSE;
-      while (!(i->is_done ()))
-        {
-          if (!first)
-            ACE_OS::strcat (this->repoID_, "/");
-          else if (second)
-            first = second = I_FALSE;
-          // print the identifier
-          ACE_OS::strcat (this->repoID_, i->item ()->get_string ());
-          if (first)
-            {
-              if (ACE_OS::strcmp (i->item ()->get_string (), "") != 0)
-                // does not start with a ""
-                first = I_FALSE;
-              else
-                second = I_TRUE;
-            }
-          i->next ();
-        }
-      delete i;
-      ACE_OS::strcat (this->repoID_, ":1.0");
-    }
-  return;
-}
-
-const char *
-be_decl::repoID (void)
-{
-  if (!this->repoID_)
-    compute_repoID ();
-
-  return this->repoID_;
-}
-
-// converts a string name into an array of 4 byte longs
-int
-be_decl::tc_name2long (const char *name, long *&larr, long &arrlen)
-{
-  static char buf [NAMEBUFSIZE];
-  long slen;
-  unsigned int i;
-
-  slen = ACE_OS::strlen (name) + 1; // 1 for NULL terminating
-
-  // compute the number of bytes necessary to hold the name rounded to the next
-  // multiple of 4 (i.e., size of long)
-  arrlen = slen/4 + (slen%4 ? 1:0);
-
-  ACE_OS::memset (buf, '\0', arrlen*4);
-  larr = (long *)buf;
-
-  for (i=0; i < ACE_OS::strlen (name); i++)
-    {
-      long shift; // num bytes to shift left
-
-      shift = 3 - (i%4);
-      // store the computed shifted quantity in the appropriate byte of the
-      // array to be returned
-      larr [i/4] |= ((name[i] & 0xff) << (shift*8));
-    }
-  return 0;
-}
-
-idl_bool
-be_decl::is_nested (void)
-{
-  AST_Decl *d;
-
-  d = ScopeAsDecl (this->defined_in ());
-  // if we have an outermost scope and if that scope is not that of the Root,
-  // then we are defined at some nesting level
-  if (d && d->node_type () != AST_Decl::NT_root)
-    return I_TRUE;
-
-  return I_FALSE;
-}
-
-// return the length in bytes to hold the repoID inside a typecode. This
-// comprises 4 bytes indicating the length of the string followed by the actual
-// string represented as longs.
-long
-be_decl::repoID_encap_len (void)
-{
-  long slen;
-
-  slen = ACE_OS::strlen (this->repoID ()) + 1; // + 1 for NULL terminating char
-  // the number of bytes to hold the string must be a multiple of 4 since this
-  // will be represented as an array of longs
-  return 4 + 4 * (slen/4 + (slen%4 ? 1:0));
-}
-
-// return the length in bytes to hold the name inside a typecode. This
-// comprises 4 bytes indicating the length of the string followed by the actual
-// string represented as longs.
-long
-be_decl::name_encap_len (void)
-{
-  long slen;
-
-  slen = ACE_OS::strlen (this->local_name ()->get_string ()) + 1; // + 1 for
-                                                    // NULL terminating char
-  // the number of bytes to hold the string must be a multiple of 4 since this
-  // will be represented as an array of longs
-  return 4 + 4 * (slen/4 + (slen%4 ? 1:0));
-}
-
-// narrowing methods
-IMPL_NARROW_METHODS1 (be_decl, AST_Decl)
-IMPL_NARROW_FROM_DECL (be_decl)
diff --git a/TAO/TAO_IDL/be/be_enum.cpp b/TAO/TAO_IDL/be/be_enum.cpp
deleted file mode 100644
index ae430917c03..00000000000
--- a/TAO/TAO_IDL/be/be_enum.cpp
+++ /dev/null
@@ -1,319 +0,0 @@
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    be_enum.cpp
-//
-// = DESCRIPTION
-//    Extension of class AST_Enum that provides additional means for C++
-//    mapping.
-//
-// = AUTHOR
-//    Copyright 1994-1995 by Sun Microsystems, Inc.
-//    and
-//    Aniruddha Gokhale
-//
-// ============================================================================
-
-#include	"idl.h"
-#include	"idl_extern.h"
-#include	"be.h"
-
-/*
- * BE_Enum
- */
-be_enum::be_enum (void)
-{
-}
-
-be_enum::be_enum (UTL_ScopedName *n, UTL_StrList *p)
-  : AST_Enum (n, p),
-    AST_Decl (AST_Decl::NT_enum, n, p),
-    UTL_Scope (AST_Decl::NT_enum),
-    member_count_ (-1)
-{
-}
-
-// compute total number of members
-int
-be_enum::compute_member_count (void)
-{
-  UTL_ScopeActiveIterator *si;  // iterator
-  AST_Decl *d;  // temp node
-
-  this->member_count_ = 0;
-
-  // if there are elements in this scope
-  if (this->nmembers () > 0)
-    {
-      // instantiate a scope iterator.
-      si = new UTL_ScopeActiveIterator (this, UTL_Scope::IK_decls);
-
-      while (!(si->is_done ()))
-	{
-	  // get the next AST decl node
-	  d = si->item ();
-	  if (!d->imported ())
-	    {
-              this->member_count_++;
-            }
-          si->next ();
-        } // end of while
-      delete si; // free the iterator object
-    }
-  return 0;
-}
-
-// return the member count
-int
-be_enum::member_count (void)
-{
-  if (this->member_count_ == -1)
-    this->compute_member_count ();
-
-  return this->member_count_;
-}
-
-
-// ----------------------------------------
-//            CODE GENERATION METHODS
-// ----------------------------------------
-
-// Generates the client-side header information for the interface
-int
-be_enum::gen_client_header (void)
-{
-  TAO_OutStream *ch; // output stream
-  TAO_NL  nl;        // end line
-
-  if (!this->cli_hdr_gen_)
-    {
-      UTL_ScopeActiveIterator *i = new UTL_ScopeActiveIterator(this, IK_decls);
-      // scope iterator
-      AST_Decl		    *d; // AST node
-
-      // retrieve a singleton instance of the code generator
-      TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-      cg->push (TAO_CodeGen::TAO_ENUM_CH);
-
-      ch = cg->client_header ();
-
-      ch->indent (); // start from whatever indentation level we were at
-      *ch << "enum " << this->local_name () << nl;
-      *ch << "{\n";
-      ch->incr_indent ();
-      while (!(i->is_done ()))
-        {
-          d = i->item ();
-          *ch << d->local_name ();
-          i->next ();
-          if (!(i->is_done()))
-            *ch << ", " << nl;
-        }
-      delete i;
-      *ch << "\n";
-      ch->decr_indent ();
-      *ch << "};" << nl;
-      // As per the ORBOS spec, we need the following typedef
-      *ch << "typedef " << this->local_name () << " &" << this->local_name () <<
-        "_out;\n";
-      cg->pop ();
-
-      // Generate the typecode decl
-      // All names in the root scope have length 2 (for the root and
-      // ourself). The children have length greater than 2. Thus, if our name
-      // length is 2 or less, we are outermost and our typecode decl must be
-      // extern, else we are defined static inside the enclosing scope.
-      if (this->name ()->length () > 2)
-        {
-          // we have a scoped name
-          ch->indent ();
-          *ch << "static CORBA::TypeCode_ptr " << this->tc_name
-            ()->last_component () << ";\n\n";
-        }
-      else
-        {
-          // we are in the ROOT scope
-          ch->indent ();
-          *ch << "extern CORBA::TypeCode_ptr " << this->tc_name
-            ()->last_component () << ";\n\n";
-        }
-      this->cli_hdr_gen_ =  I_TRUE;
-    }
-  return 0;
-}
-
-// Generates the client-side stubs for the interface
-int
-be_enum::gen_client_stubs (void)
-{
-  TAO_OutStream *cs; // output stream
-  TAO_NL  nl;        // end line
-
-  if (!this->cli_stub_gen_)
-    {
-      // retrieve a singleton instance of the code generator
-      TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-      cg->push (TAO_CodeGen::TAO_ENUM_CS); // set current code gen state
-
-      cs = cg->client_stubs ();
-      cg->outstream (cs);
-
-      // generate the typecode information here
-      cs->indent (); // start from current indentation level
-      *cs << nl;
-      *cs << "static const CORBA::Long _oc_" << this->flatname () << "[] =" <<
-        nl;
-      *cs << "{\n";
-      cs->incr_indent (0);
-      if (this->gen_encapsulation () == -1)
-        {
-          ACE_ERROR ((LM_ERROR, "be_enum:Error generating encapsulation\n\n"));
-          return -1;
-        }
-      cs->decr_indent ();
-      *cs << "};" << nl;
-
-      *cs << "static CORBA::TypeCode _tc__tc_" << this->flatname () <<
-        " (CORBA::tk_enum, sizeof (_oc_" <<  this->flatname () <<
-        "), (unsigned char *) &_oc_" << this->flatname () <<
-        ", CORBA::B_FALSE);" << nl;
-      *cs << "CORBA::TypeCode_ptr " << this->tc_name () << " = &_tc__tc_" <<
-        this->flatname () << ";\n\n";
-      this->cli_stub_gen_ = I_TRUE;
-      cg->pop ();
-    }
-  return 0;
-}
-
-// Generates the server-side header information for the interface
-int
-be_enum::gen_server_header (void)
-{
-  // nothing to be done
-  return 0;
-}
-
-// Generates the server-side skeletons for the interface
-int
-be_enum::gen_server_skeletons (void)
-{
-  // nothing to be done
-  return 0;
-}
-
-// Generates the client-side inline information
-int
-be_enum::gen_client_inline (void)
-{
-  // nothing to be done
-  return 0;
-}
-
-// Generates the server-side inline
-int
-be_enum::gen_server_inline (void)
-{
-  // nothing to be done
-  return 0;
-}
-
-// generate typecode.
-// Typecode for enum comprises the enumerated value followed by the
-// encapsulation of the parameters
-
-int
-be_enum::gen_typecode (void)
-{
-  TAO_OutStream *cs; // output stream
-  TAO_NL  nl;        // end line
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-
-  cs = cg->client_stubs ();
-  cs->indent (); // start from whatever indentation level we were at
-
-  *cs << "CORBA::tk_enum, // typecode kind" << nl;
-  *cs << this->tc_encap_len () << ", // encapsulation length\n";
-  // now emit the encapsulation
-  return this->gen_encapsulation ();
-}
-
-int
-be_enum::gen_encapsulation (void)
-{
-  TAO_OutStream *cs; // output stream
-  TAO_NL  nl;        // end line
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-  long i, arrlen;
-  long *arr;  // an array holding string names converted to array of longs
-
-
-  cs = cg->outstream ();
-  cs->indent (); // start from whatever indentation level we were at
-
-  *cs << "TAO_ENCAP_BYTE_ORDER, // byte order" << nl;
-  // generate repoID
-  *cs << (ACE_OS::strlen (this->repoID ())+1) << ", ";
-  (void)this->tc_name2long (this->repoID (), arr, arrlen);
-  for (i=0; i < arrlen; i++)
-    {
-      cs->print ("0x%x, ", arr[i]);
-    }
-  *cs << " // repository ID = " << this->repoID () << nl;
-  // generate name
-  *cs << (ACE_OS::strlen (this->local_name ()->get_string ())+1) << ", ";
-  (void)this->tc_name2long(this->local_name ()->get_string (), arr, arrlen);
-  for (i=0; i < arrlen; i++)
-    {
-      cs->print ("0x%x, ", arr[i]);
-    }
-  *cs << " // name = " << this->local_name () << nl;
-  // generate the member count
-  *cs << this->member_count () << ", // member count\n";
-  cs->incr_indent (0);
-  // hand over to the scope to generate the typecode for elements
-  if (be_scope::gen_encapsulation () == -1)
-    {
-      ACE_ERROR ((LM_ERROR, "be_structure: cannot generate code for members\n"));
-      return -1;
-    }
-  cs->decr_indent (0);
-  return 0;
-}
-
-// compute typecode size
-long
-be_enum::tc_size (void)
-{
-  // 4 bytes for enumeration, 4 bytes for storing encap length val, followed by the
-  // actual encapsulation length
-  return 4 + 4 + this->tc_encap_len ();
-}
-
-// return encapsulation length
-long
-be_enum::tc_encap_len (void)
-{
-  if (this->encap_len_ == -1) // not computed yet
-    {
-      this->encap_len_ = 4;  // holds the byte order flag
-
-      this->encap_len_ += this->repoID_encap_len (); // repoID storage
-
-      // do the same thing for the local name
-      this->encap_len_ += this->name_encap_len ();
-
-      this->encap_len_ += 4; // to hold the member count
-
-      // compute encap length for members
-      this->encap_len_ += be_scope::tc_encap_len ();
-    }
-  return this->encap_len_;
-}
-
-// Narrowing
-IMPL_NARROW_METHODS3 (be_enum, AST_Enum, be_scope, be_type)
-  IMPL_NARROW_FROM_DECL (be_enum)
-  IMPL_NARROW_FROM_SCOPE (be_enum)
diff --git a/TAO/TAO_IDL/be/be_enum_val.cpp b/TAO/TAO_IDL/be/be_enum_val.cpp
deleted file mode 100644
index e122e3a3cf7..00000000000
--- a/TAO/TAO_IDL/be/be_enum_val.cpp
+++ /dev/null
@@ -1,148 +0,0 @@
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    be_enum_val.cpp
-//
-// = DESCRIPTION
-//    Extension of class AST_EnumVal that provides additional means for C++
-//    mapping.
-//
-// = AUTHOR
-//    Copyright 1994-1995 by Sun Microsystems, Inc.
-//    and
-//    Aniruddha Gokhale
-//
-// ============================================================================
-
-#include	"idl.h"
-#include	"idl_extern.h"
-#include	"be.h"
-
-be_enum_val::be_enum_val (void)
-{
-}
-
-be_enum_val::be_enum_val (unsigned long v, UTL_ScopedName *n, UTL_StrList *p)
-  : AST_Constant (AST_Expression::EV_ulong,
-                  AST_Decl::NT_enum_val,
-                  new AST_Expression(v),
-                  n,
-                  p),
-    AST_Decl (AST_Decl::NT_enum_val, n, p)
-{
-#if 0
-  // computes the repoID
-  compute_repoID ();
-
-  // computes the fully scoped name
-  compute_fullname ();
-
-  // compute the flattened fully scoped name
-  compute_flatname ();
-#endif
-}
-
-// ----------------------------------------
-//            CODE GENERATION METHODS
-// ----------------------------------------
-
-// NOTE: The IDL front end does a strange thing of putting the enum_vals in the
-// Enum decl scope as well as the scope that encloses the ENUM decl. Since we
-// took care of generating the client header declarations for all the
-// enum_vals, we do not do anything in any of the methods below. However, we
-// have to provide them so that whenever be_scope finds an enum_val in a scope
-// that is not an ENUM, it just ignores it.
-
-// Generates the client-side header information for the enum val
-int
-be_enum_val::gen_client_header (void)
-{
-  // nothing to be done
-  return 0;
-}
-
-// Generates the client-side stubs for the enum val
-int
-be_enum_val::gen_client_stubs (void)
-{
-  return 0;
-}
-
-// Generates the server-side header information for the enum val
-int
-be_enum_val::gen_server_header (void)
-{
-  // nothing to be done
-  return 0;
-}
-
-// Generates the server-side skeletons for the enum val
-int
-be_enum_val::gen_server_skeletons (void)
-{
-  // nothing to be done
-  return 0;
-}
-
-// Generates the client-side inline information
-int
-be_enum_val::gen_client_inline (void)
-{
-  // nothing to be done
-  return 0;
-}
-
-// Generates the server-side inline
-int
-be_enum_val::gen_server_inline (void)
-{
-  // nothing to be done
-  return 0;
-}
-
-int
-be_enum_val::gen_encapsulation (void)
-{
-  TAO_OutStream *cs; // output stream
-  TAO_NL  nl;        // end line
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-  be_type *bt;  // our type node
-  long i, arrlen;
-  long *arr;  // an array holding string names converted to array of longs
-
-  // Macro to avoid "warning: unused parameter" type warning.
-  ACE_UNUSED_ARG (bt);
-  ACE_UNUSED_ARG (nl);
-
-  cs = cg->client_stubs ();
-  cg->node (this); // pass ourselves in case we are needed
-  cs->indent (); // start from whatever indentation level we were at
-
-  // generate name
-  *cs << (ACE_OS::strlen (this->local_name ()->get_string ())+1) << ", ";
-  (void)this->tc_name2long(this->local_name ()->get_string (), arr, arrlen);
-  for (i=0; i < arrlen; i++)
-    {
-      cs->print ("0x%x, ", arr[i]);
-    }
-  *cs << " // name = " << this->local_name () << "\n";
-  return 0;
-}
-
-long
-be_enum_val::tc_encap_len (void)
-{
-  if (this->encap_len_ == -1) // not computed yet
-    {
-      this->encap_len_ = this->name_encap_len (); // for name
-    }
-
-  return this->encap_len_;
-}
-
-// Narrowing
-IMPL_NARROW_METHODS2 (be_enum_val, AST_EnumVal, be_decl)
-IMPL_NARROW_FROM_DECL (be_enum_val)
diff --git a/TAO/TAO_IDL/be/be_exception.cpp b/TAO/TAO_IDL/be/be_exception.cpp
deleted file mode 100644
index b06f60afe3b..00000000000
--- a/TAO/TAO_IDL/be/be_exception.cpp
+++ /dev/null
@@ -1,309 +0,0 @@
-//
-// $Id$
-//
-
-#include	"idl.h"
-#include	"idl_extern.h"
-#include	"be.h"
-
-/*
- * BE_Exception
- */
-be_exception::be_exception (void)
-{
-}
-
-be_exception::be_exception (UTL_ScopedName *n, UTL_StrList *p)
-	    : AST_Decl (AST_Decl::NT_except, n, p),
-              AST_Structure (AST_Decl::NT_except, n, p),
-	      UTL_Scope (AST_Decl::NT_except),
-              member_count_ (-1)
-{
-}
-
-// compute total number of members
-int
-be_exception::compute_member_count (void)
-{
-  UTL_ScopeActiveIterator *si;  // iterator
-  AST_Decl *d;  // temp node
-
-  this->member_count_ = 0;
-
-  // if there are elements in this scope
-  if (this->nmembers () > 0)
-    {
-      // instantiate a scope iterator.
-      si = new UTL_ScopeActiveIterator (this, UTL_Scope::IK_decls);
-
-      while (!(si->is_done ()))
-	{
-	  // get the next AST decl node
-	  d = si->item ();
-	  if (!d->imported ())
-	    {
-              this->member_count_++;
-            }
-          si->next ();
-        } // end of while
-      delete si; // free the iterator object
-    }
-  return 0;
-}
-
-// return the member count
-int
-be_exception::member_count (void)
-{
-  if (this->member_count_ == -1)
-    this->compute_member_count ();
-
-  return this->member_count_;
-}
-
-
-int
-be_exception::gen_client_header (void)
-{
-  if (!this->cli_hdr_gen_) // not already generated
-    {
-      TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-
-      TAO_OutStream *ch = cg->client_header (); // output stream
-      TAO_NL  nl;        // end line
-
-
-      cg->outstream (ch);
-      ch->indent (); // start from whatever indentation level we were at
-
-      ch->gen_ifdef_macro (this->flatname (), "_ptr");
-
-      ch->indent ();
-      *ch << "class " << this->local_name () << ";" << nl;
-      // generate the _ptr declaration
-      *ch << "typedef " << this->local_name () << " *"
-	  << this->local_name () << "_ptr;" << nl;
-      ch->gen_endif ();
-
-      ch->gen_ifdef_macro (this->flatname ());
-
-      ch->indent ();
-      *ch << "class " << this->local_name ()
-	  << " : public virtual CORBA::UserException" << nl;
-      *ch << "{" << nl
-	  << "public:" << nl;
-      ch->incr_indent ();
-      *ch << this->local_name () << " (void);\n";
-      ch->decr_indent ();
-      *ch << "};" << nl << nl;
-      ch->gen_endif ();
-
-      *ch << "static CORBA::TypeCode_ptr " << this->tc_name
-	()->last_component () << ";\n\n";
-
-      this->cli_hdr_gen_ = I_TRUE;
-    }
-
-  return 0;
-}
-
-int
-be_exception::gen_client_inline (void)
-{
-  if (!this->cli_inline_gen_)
-    {
-      TAO_NL  nl;        // end line
-
-      TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-      TAO_OutStream *ci = cg->client_inline ();
-
-      *ci << "// *************************************************************"
-          << nl;
-      *ci << "// Inline operations for exception " << this->name () << nl;
-      *ci << "// *************************************************************\n\n";
-
-      ci->indent ();
-      *ci << "// default constructor" << nl;
-      *ci << "ACE_INLINE" << nl;
-      *ci << this->name () << "::" << this->local_name () << " (void)" << nl;
-      ci->incr_indent ();
-      *ci << ": CORBA_UserException (_tc_"
-	  << this->local_name ()
-	  << ")\n";
-      ci->decr_indent ();
-      *ci << "{" << nl;
-      *ci << "}" << nl << nl;
-
-      this->cli_inline_gen_ = I_TRUE;
-    }
-  return 0;
-}
-
-int
-be_exception::gen_client_stubs (void)
-{
-  TAO_OutStream *cs; // output stream
-  TAO_NL  nl;        // end line
-
-
-  if (!this->cli_stub_gen_)
-    {
-      // retrieve a singleton instance of the code generator
-      TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-      cg->push (TAO_CodeGen::TAO_STRUCT_CS); // set current code gen state
-
-      cs = cg->client_stubs ();
-      // pass info
-      cg->outstream (cs);
-      cg->node (this);
-
-      // generate the typecode information here
-      cs->indent (); // start from current indentation level
-      *cs << "static const CORBA::Long _oc_" << this->flatname () << "[] =" <<
-        nl;
-      *cs << "{\n";
-      cs->incr_indent (0);
-      // note that we just need the parameters here and hence we generate the
-      // encapsulation for the parameters
-      if (this->gen_encapsulation () == -1)
-        {
-          ACE_ERROR ((LM_ERROR, "Error generating encapsulation\n\n"));
-          return -1;
-        }
-      cs->decr_indent ();
-      *cs << "};" << nl;
-
-      *cs << "static CORBA::TypeCode _tc__tc_" << this->flatname () <<
-        " (CORBA::tk_struct, sizeof (_oc_" <<  this->flatname () <<
-        "), (unsigned char *) &_oc_" << this->flatname () <<
-        ", CORBA::B_FALSE);" << nl;
-      *cs << "CORBA::TypeCode_ptr " << this->tc_name () << " = &_tc__tc_" <<
-        this->flatname () << ";\n\n";
-      this->cli_stub_gen_ = I_TRUE;
-      cg->pop ();
-    }
-
-  return 0;
-}
-
-int
-be_exception::gen_server_header (void)
-{
-  return 0;
-}
-
-int
-be_exception::gen_server_inline (void)
-{
-  return 0;
-}
-
-int
-be_exception::gen_server_skeletons (void)
-{
-  return 0;
-}
-
-// generate typecode.
-// Typecode for exceptions comprises the enumerated value followed by the
-// encapsulation of the parameters
-
-int
-be_exception::gen_typecode (void)
-{
-  TAO_OutStream *cs; // output stream
-  TAO_NL  nl;        // end line
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-
-  cs = cg->client_stubs ();
-  cs->indent (); // start from whatever indentation level we were at
-
-  *cs << "CORBA::tk_struct, // typecode kind" << nl;
-  *cs << this->tc_size () << ", // encapsulation length\n";
-  // now emit the encapsulation
-  return this->gen_encapsulation ();
-}
-
-// generate encapsulation
-// An encapsulation for ourselves will be necessary when we are part of some
-// other IDL type and a typecode for that other type is being generated. This
-// will comprise our typecode kind. IDL types with parameters will additionally
-// have the encapsulation length and the entire typecode description
-int
-be_exception::gen_encapsulation (void)
-{
-  TAO_OutStream *cs; // output stream
-  TAO_NL  nl;        // end line
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-  long i, arrlen;
-  long *arr;  // an array holding string names converted to array of longs
-
-  cs = cg->client_stubs ();
-  cs->indent (); // start from whatever indentation level we were at
-
-  // XXXASG - byte order must be based on what m/c we are generating code -
-  // TODO
-  *cs << "0, // byte order" << nl;
-  // generate repoID
-  *cs << (ACE_OS::strlen (this->repoID ())+1) << ", ";
-  (void)this->tc_name2long (this->repoID (), arr, arrlen);
-  for (i=0; i < arrlen; i++)
-    {
-      cs->print ("0x%x, ", arr[i]);
-    }
-  *cs << " // repository ID = " << this->repoID () << nl;
-  // generate name
-  *cs << (ACE_OS::strlen (this->local_name ()->get_string ())+1) << ", ";
-  (void)this->tc_name2long(this->local_name ()->get_string (), arr, arrlen);
-  for (i=0; i < arrlen; i++)
-    {
-      cs->print ("0x%x, ", arr[i]);
-    }
-  *cs << " // name = " << this->local_name () << nl;
-  // generate the member count
-  *cs << this->member_count () << ", // member count\n";
-  cs->incr_indent (0);
-  // hand over to the scope to generate the typecode for elements
-  if (be_scope::gen_encapsulation () == -1)
-    {
-      ACE_ERROR ((LM_ERROR, "be_exception: cannot generate typecode for members\n"));
-      return -1;
-    }
-  cs->decr_indent (0);
-  return 0;
-}
-
-// compute typecode size
-long
-be_exception::tc_size (void)
-{
-  // 4 bytes for enumeration, 4 bytes for storing encap length val, followed by the
-  // actual encapsulation length
-  return 4 + 4 + this->tc_encap_len ();
-}
-
-// compute encapsulation length
-long
-be_exception::tc_encap_len (void)
-{
-  if (this->encap_len_ == -1) // not computed yet
-    {
-      this->encap_len_ = 4;  // holds the byte order flag
-
-      this->encap_len_ += this->repoID_encap_len (); // repoID
-
-      // do the same thing for the local name
-      this->encap_len_ += this->name_encap_len ();
-
-      this->encap_len_ += 4; // to hold the member count
-
-      // compute encap length for members
-      this->encap_len_ += be_scope::tc_encap_len ();
-    }
-  return this->encap_len_;
-}
-
-// Narrowing
-IMPL_NARROW_METHODS3 (be_exception, AST_Exception, be_scope, be_type)
-IMPL_NARROW_FROM_DECL (be_exception)
-IMPL_NARROW_FROM_SCOPE (be_exception)
diff --git a/TAO/TAO_IDL/be/be_expression.cpp b/TAO/TAO_IDL/be/be_expression.cpp
deleted file mode 100644
index 1b95320823a..00000000000
--- a/TAO/TAO_IDL/be/be_expression.cpp
+++ /dev/null
@@ -1,77 +0,0 @@
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-// 
-// = FILENAME
-//    be_expression.cpp
-//
-// = DESCRIPTION
-//    Extension of class AST_Expression that provides additional means for C++
-//    mapping.
-//
-// = AUTHOR
-//    Copyright 1994-1995 by Sun Microsystems, Inc.
-//    and 
-//    Aniruddha Gokhale
-// 
-// ============================================================================
-
-#include	"idl.h"
-#include	"idl_extern.h"
-#include	"be.h"
-
-/*
- * BE_Expression
- */
-
-// the constructors
-be_expression::be_expression (UTL_ScopedName *n) 
-  : AST_Expression (n) 
-{
-}
-
-be_expression::be_expression (AST_Expression *b, AST_Expression::ExprType t)
-  : AST_Expression (b, t) 
-{
-}
-
-be_expression::be_expression (AST_Expression::ExprComb c,
-                              AST_Expression *v1,
-                              AST_Expression *v2)
-  : AST_Expression (c, v1, v2)
-{
-}
-
-be_expression::be_expression (long l) 
-  : AST_Expression (l) 
-{
-}
-
-be_expression::be_expression (long l, AST_Expression::ExprType t)
-  : AST_Expression (l, t)
-{
-}
-
-be_expression::be_expression (unsigned long l) 
-  : AST_Expression (l) 
-{
-}
-
-be_expression::be_expression (String *s) 
-  : AST_Expression (s) 
-{
-}
-
-be_expression::be_expression (char c) 
-  : AST_Expression (c) 
-{
-}
-
-be_expression::be_expression (double d) 
-  : AST_Expression (d) 
-{
-}
-
-
-
diff --git a/TAO/TAO_IDL/be/be_factory.cpp b/TAO/TAO_IDL/be/be_factory.cpp
deleted file mode 100644
index e0ef83d2f78..00000000000
--- a/TAO/TAO_IDL/be/be_factory.cpp
+++ /dev/null
@@ -1,39 +0,0 @@
-#include	"idl.h"
-#include	"idl_extern.h"
-#include	"be.h"
-#include        "be_sunsoft.h"
-
-// constructor
-TAO_OutStream_Factory::TAO_OutStream_Factory (void)
-  : strm_type_ (TAO_OutStream_Factory::TAO_SUNSOFT)
-{
-}
-
-// destructor
-TAO_OutStream_Factory::~TAO_OutStream_Factory (void)
-{
-}
-
-// set the type of specialized o/p stream we want
-int
-TAO_OutStream_Factory::set_stream_type
-(TAO_OutStream_Factory::TAO_OutStream_Type t) 
-{
-  this->strm_type_ = t;
-  return 0;
-}
-
-// factory method
-TAO_OutStream *
-TAO_OutStream_Factory::make_outstream (void)
-{
-  switch (this->strm_type_)
-    {
-    case TAO_OutStream_Factory::TAO_SUNSOFT:
-      return new TAO_SunSoft_OutStream ();
-    case TAO_OutStream_Factory::TAO_FLICK:
-      return (TAO_OutStream *)0;  // not implemented as yet
-    default:
-      return (TAO_OutStream *)0;
-    }
-}
diff --git a/TAO/TAO_IDL/be/be_field.cpp b/TAO/TAO_IDL/be/be_field.cpp
deleted file mode 100644
index 804e84ef057..00000000000
--- a/TAO/TAO_IDL/be/be_field.cpp
+++ /dev/null
@@ -1,165 +0,0 @@
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    be_field.cpp
-//
-// = DESCRIPTION
-//    Extension of class AST_Field that provides additional means for C++
-//    mapping.
-//
-// = AUTHOR
-//    Copyright 1994-1995 by Sun Microsystems, Inc.
-//    and
-//    Aniruddha Gokhale
-//
-// ============================================================================
-
-#include	"idl.h"
-#include	"idl_extern.h"
-#include	"be.h"
-
-/*
- * BE_Field
- */
-be_field::be_field (void)
-{
-}
-be_field::be_field (AST_Type *ft, UTL_ScopedName *n, UTL_StrList *p)
-  : AST_Field (ft, n, p),
-    AST_Decl (AST_Decl::NT_field, n, p)
-{
-}
-
-// ----------------------------------------
-//            CODE GENERATION METHODS
-// ----------------------------------------
-
-// Generates the client-side header information for the field
-int
-be_field::gen_client_header (void)
-{
-  be_type *bt;  // the field type
-  be_state *s;  // code generation state
-
-  // retrieve a singleton instance of the code generator
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-
-  cg->node (this); // pass info thru singleton
-  cg->outstream (cg->client_header ());
-
-  bt = be_type::narrow_from_decl (this->field_type ());
-
-  s = cg->make_state ();
-  if (s && bt)
-    return s->gen_code (bt, this); // no third parameter here
-  else
-    return -1;
-}
-
-// Generates the client-side stubs for the field
-int
-be_field::gen_client_stubs (void)
-{
-  return 0;
-}
-
-// Generates the server-side header information for the field
-int
-be_field::gen_server_header (void)
-{
-  // nothing to be done
-  return 0;
-}
-
-// Generates the server-side skeletons for the field
-int
-be_field::gen_server_skeletons (void)
-{
-  // nothing to be done
-  return 0;
-}
-
-// Generates the client-side inline information
-int
-be_field::gen_client_inline (void)
-{
-  // The field type may need inline definitions, example:
-  // struct A {
-  //   sequence<long> x;
-  // };
-  be_type *bt = be_type::narrow_from_decl (this->field_type ());
-
-  // The type may be imported, then we cannot generate the inline
-  // info. Note: this does not fall in the general protection against
-  // multiple definition.
-  if (bt->imported ())
-    {
-      return 0;
-    }
-  return bt->gen_client_inline ();
-}
-
-// Generates the server-side inline
-int
-be_field::gen_server_inline (void)
-{
-  // nothing to be done
-  return 0;
-}
-
-int
-be_field::gen_encapsulation (void)
-{
-  TAO_OutStream *cs; // output stream
-  TAO_NL  nl;        // end line
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-  be_type *bt;  // our type node
-  long i, arrlen;
-  long *arr;  // an array holding string names converted to array of longs
-
-  // Macro to avoid "warning: unused parameter" type warning.
-  ACE_UNUSED_ARG (nl);
-
-  cs = cg->client_stubs ();
-  cg->node (this); // pass ourselves in case we are needed
-  cs->indent (); // start from whatever indentation level we were at
-
-  // generate name
-  *cs << (ACE_OS::strlen (this->local_name ()->get_string ())+1) << ", ";
-  (void)this->tc_name2long(this->local_name ()->get_string (), arr, arrlen);
-  for (i=0; i < arrlen; i++)
-    {
-      cs->print ("0x%x, ", arr[i]);
-    }
-  *cs << " // name = " << this->local_name () << "\n";
-
-  // hand over code generation to our type node
-  bt = be_type::narrow_from_decl (this->field_type ());
-  return bt->gen_typecode ();
-}
-
-long
-be_field::tc_encap_len (void)
-{
-  if (this->encap_len_ == -1)  // not computed yet
-    {
-      be_type *bt;
-
-      // struct member is represented as the "name" followed by the typecode
-
-      this->encap_len_ = this->name_encap_len (); // for name
-
-      // add to this, the size of our typecode
-      bt = be_type::narrow_from_decl (this->field_type ());
-      this->encap_len_ += bt->tc_size (); // note that we must add typecode
-                                          // size of the type
-    }
-  return this->encap_len_;
-}
-
-// Narrowing
-IMPL_NARROW_METHODS2 (be_field, AST_Field, be_decl)
-IMPL_NARROW_FROM_DECL (be_field)
diff --git a/TAO/TAO_IDL/be/be_generator.cpp b/TAO/TAO_IDL/be/be_generator.cpp
deleted file mode 100644
index b93c92ea88a..00000000000
--- a/TAO/TAO_IDL/be/be_generator.cpp
+++ /dev/null
@@ -1,399 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-// be_generator.cc
-//
-// Implementation of BE generator class
-//
-// This implements the same protocol as AST_Generator but creates instances
-// of the BE-subclassed classes instead of of AST classes
-
-#include	"idl.h"
-#include	"idl_extern.h"
-#include	"be.h"
-
-/*
- * Constructor
- */
-
-/*
- * Private operations
- */
-
-/*
- * Public operations
- */
-
-/*
- * Inherited operations redefined here
- */
-
-/*
- * Construct a be_root node (a node representing the root of an AST of BE nodes)
- */
-AST_Root *
-be_generator::create_root(UTL_ScopedName *n,
-			  UTL_StrList *p)
-{
-    return new be_root(n, p);
-}
-
-/*
- * Create a BE_PredefinedType node
- */
-AST_PredefinedType *
-be_generator::create_predefined_type(AST_PredefinedType::PredefinedType t,
-				     UTL_ScopedName *n,
-				     UTL_StrList *p)
-{
-  return (AST_PredefinedType *) new be_predefined_type(t, n, p);
-}
-
-/*
- * Create a BE_Module node
- */
-AST_Module *
-be_generator::create_module(UTL_ScopedName *n, UTL_StrList *p)
-{
-  return (AST_Module *) new be_module(n, p);
-}
-
-/*
- * Create a BE_Interface node
- */
-AST_Interface *
-be_generator::create_interface(UTL_ScopedName *n,
-			       AST_Interface **ih,
-			       long nih,
-			       UTL_StrList *p)
-{
-  return (AST_Interface *) new be_interface(n, ih, nih, p);
-}
-
-/*
- * Create a BE_InterfaceFwd node
- */
-AST_InterfaceFwd *
-be_generator::create_interface_fwd(UTL_ScopedName *n, UTL_StrList *p)
-{
-  return (AST_InterfaceFwd *) new be_interface_fwd(n, p);
-}
-
-/*
- * Create a BE_Exception node
- */
-AST_Exception *
-be_generator::create_exception(UTL_ScopedName *n, UTL_StrList *p)
-{
-  return (AST_Exception *) new be_exception(n, p);
-}
-
-/*
- * Create a BE_Structure node
- */
-AST_Structure *
-be_generator::create_structure(UTL_ScopedName *n, UTL_StrList *p)
-{
-  return (AST_Structure *) new be_structure(n, p);
-}
-
-/*
- * Create a BE_Enum node
- */
-AST_Enum *
-be_generator::create_enum(UTL_ScopedName *n, UTL_StrList *p)
-{
-  return (AST_Enum *) new be_enum(n, p);
-}
-
-/*
- * Create a BE_Operation node
- */
-AST_Operation *
-be_generator::create_operation(AST_Type *rt,
-			       AST_Operation::Flags fl,
-			       UTL_ScopedName *n,
-			       UTL_StrList *p)
-{
-  return (AST_Operation *) new be_operation(rt, fl, n, p);
-}
-
-/*
- * Create a BE_Field node
- */
-AST_Field *
-be_generator::create_field(AST_Type *ft, UTL_ScopedName *n, UTL_StrList *p)
-{
-  return (AST_Field *) new be_field(ft, n, p);
-}
-
-/*
- * Create a BE_Argument node
- */
-AST_Argument *
-be_generator::create_argument(AST_Argument::Direction d,
-			      AST_Type *ft,
-			      UTL_ScopedName *n,
-			      UTL_StrList *p)
-{
-  return (AST_Argument *) new be_argument(d, ft, n, p);
-}
-
-/*
- * Create a BE_Attribute node
- */
-AST_Attribute *
-be_generator::create_attribute(idl_bool ro,
-			       AST_Type *ft,
-			       UTL_ScopedName *n,
-			       UTL_StrList *p)
-{
-  return (AST_Attribute *) new be_attribute(ro, ft, n, p);
-}
-
-/*
- * Create a BE_Union node
- */
-AST_Union *
-be_generator::create_union(AST_ConcreteType *dt,
-			   UTL_ScopedName *n,
-			   UTL_StrList *p)
-{
-  return (AST_Union *) new be_union(dt, n, p);
-}
-
-/*
- * Create a BE_UnionBranch node
- */
-AST_UnionBranch *
-be_generator::create_union_branch(AST_UnionLabel *lab,
-				  AST_Type *ft,
-				  UTL_ScopedName *n,
-				  UTL_StrList *p)
-{
-  return (AST_UnionBranch *) new be_union_branch(lab, ft, n, p);
-}
-
-/*
- * Create a BE_UnionLabel node
- */
-AST_UnionLabel *
-be_generator::create_union_label(AST_UnionLabel::UnionLabel ul,
-				 AST_Expression *lv)
-{
-  return (AST_UnionLabel *) new be_union_label(ul, lv);
-}
-
-/*
- * Create a BE_Constant node
- */
-AST_Constant *
-be_generator::create_constant(AST_Expression::ExprType et,
-			      AST_Expression *ev,
-			      UTL_ScopedName *n,
-			      UTL_StrList *p)
-{
-  return (AST_Constant *) new be_constant (et, ev, n, p);
-}
-
-/*
- * Create a symbolic BE_Expression node
- */
-AST_Expression *
-be_generator::create_expr(UTL_ScopedName *n)
-{
-  return (AST_Expression *) new be_expression (n);
-}
-
-/*
- * Create a BE_Expression node denoting a coercion
- */
-AST_Expression *
-be_generator::create_expr(AST_Expression *b, AST_Expression::ExprType t)
-{
-  return (AST_Expression *) new be_expression (b, t);
-}
-
-/*
- * Create a BE_Expression node combining two other AST_Expression nodes
- */
-AST_Expression *
-be_generator::create_expr(AST_Expression::ExprComb c,
-			  AST_Expression *v1,
-			  AST_Expression *v2)
-{
-  return (AST_Expression *) new be_expression (c, v1, v2);
-}
-
-/*
- * Create a BE_Expression node denoting a long integer
- */
-AST_Expression *
-be_generator::create_expr(long l)
-{
-  return (AST_Expression *) new be_expression (l);
-}
-
-/*
- * Create a BE_Expression node denoting a long integer being used as a boolean
- */
-AST_Expression *
-be_generator::create_expr(long l, AST_Expression::ExprType t)
-{
-  return (AST_Expression *) new be_expression (l, t);
-}
-
-/*
- * Create a BE_Expression node denoting an unsigned long integer
- */
-AST_Expression *
-be_generator::create_expr(unsigned long l)
-{
-  return (AST_Expression *) new be_expression(l);
-}
-
-/*
- * Create a BE_Expression node denoting a char * (encapsulated as a String)
- */
-AST_Expression *
-be_generator::create_expr (String *s)
-{
-  return (AST_Expression *) new be_expression (s);
-}
-
-/*
- * Create a BE_Expression node denoting a character
- */
-AST_Expression *
-be_generator::create_expr(char c)
-{
-  return (AST_Expression *) new be_expression (c);
-}
-
-/*
- * Create a BE_Expression node denoting a 64-bit floating point number
- */
-AST_Expression *
-be_generator::create_expr (double d)
-{
-  return (AST_Expression *) new be_expression (d);
-}
-
-/*
- * Create a BE_EnumVal node
- */
-AST_EnumVal *
-be_generator::create_enum_val(unsigned long v,
-			      UTL_ScopedName *n,
-			      UTL_StrList *p)
-{
-  return (AST_EnumVal *) new be_enum_val(v, n, p);
-}
-
-/*
- * Create a BE_Array node
- */
-AST_Array *
-be_generator::create_array(UTL_ScopedName *n,
-			   unsigned long ndims,
-			   UTL_ExprList *dims)
-{
-  return (AST_Array *) new be_array(n, ndims, dims);
-}
-
-/*
- * Create a BE_Sequence node
- */
-AST_Sequence *
-be_generator::create_sequence(AST_Expression *v, AST_Type *bt)
-{
-  return (AST_Sequence *) new be_sequence(v, bt);
-}
-
-/*
- * Create a BE_String node
- */
-AST_String *
-be_generator::create_string(AST_Expression *v)
-{
-  return (AST_String *) new be_string(v);
-}
-
-/*
- * Create a BE_string node for a wide string
- */
-AST_String *
-be_generator::create_wstring(AST_Expression *v)
-{
-  return (AST_String *) new be_string(v, sizeof(wchar_t));
-}
-
-/*
- * Create a BE_Typedef node
- */
-AST_Typedef *
-be_generator::create_typedef(AST_Type *bt, UTL_ScopedName *n, UTL_StrList *p)
-{
-  return (AST_Typedef *) new be_typedef(bt, n, p);
-}
diff --git a/TAO/TAO_IDL/be/be_helper.cpp b/TAO/TAO_IDL/be/be_helper.cpp
deleted file mode 100644
index 7c72dedfb97..00000000000
--- a/TAO/TAO_IDL/be/be_helper.cpp
+++ /dev/null
@@ -1,242 +0,0 @@
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    be_helper.cpp
-//
-// = DESCRIPTION
-//   Provides helper classes to print generated code to the output
-//
-// = AUTHOR
-//    Copyright 1994-1995 by Sun Microsystems, Inc.
-//    and
-//    Aniruddha Gokhale
-//
-// ============================================================================
-
-#include	"idl.h"
-#include	"idl_extern.h"
-#include	"be.h"
-
-static const char copyright [] =
-"// ******  Code generated by the The ACE ORB (TAO) IDL Compiler *******\n\
-// TAO ORB and the TAO IDL Compiler have been developed by Washington \n\
-// University Computer Science's Distributed Object Computing Group.\n\
-//\n\
-// Information on TAO is available at\n\
-//                 http://www.cs.wustl.edu/~schmidt/TAO.html\n";
-
-TAO_NL::TAO_NL (void)
-{
-}
-
-// methods of the TAO_OutStream class
-
-TAO_OutStream::TAO_OutStream (void)
-  : fp_ (NULL),
-    indent_level_ (0)
-{
-}
-
-TAO_OutStream::~TAO_OutStream (void)
-{
-  // close the underlying I/O handle only if it exists
-  if (fp_)
-    {
-      ACE_OS::fclose (fp_);
-      fp_ = NULL;
-    }
-  indent_level_ = 0;
-}
-
-int
-TAO_OutStream::open (const char *fname, TAO_OutStream::STREAM_TYPE st)
-{
-  if (fname)
-    {
-      // file name exists, open an I/O file handle
-      fp_ = ACE_OS::fopen (fname, "w");
-      if (fp_)
-        {
-          this->st_ = st;
-          // put the copyright notice
-          ACE_OS::fprintf (fp_, "%s\n", copyright);
-	  ACE_OS::fflush (fp_);
-          return 0;
-        }
-      else
-        return -1;
-    }
-  else
-    {
-      return -1;
-    }
-}
-
-// set and get the stream type
-void
-TAO_OutStream::stream_type (TAO_OutStream::STREAM_TYPE st)
-{
-  this->st_ = st;
-}
-
-TAO_OutStream::STREAM_TYPE
-TAO_OutStream::stream_type (void)
-{
-  return this->st_;
-}
-
-// indentation
-int
-TAO_OutStream::incr_indent (unsigned short flag)
-{
-  indent_level_++;
-  if (flag)
-    return this->indent ();
-  else
-    return 0; // do not indent output
-}
-
-// indentation
-int
-TAO_OutStream::decr_indent (unsigned short flag)
-{
-  indent_level_--;
-  if (flag)
-    return this->indent ();
-  else
-    return 0; // do not indent output
-}
-
-int
-TAO_OutStream::reset (void)
-{
-  indent_level_ = 0;
-  return 0;
-}
-
-// indented print
-int
-TAO_OutStream::indent (void)
-{
-  int i;
-  // based on the current indentation level, leave appropriate number of blank
-  // spaces in the output
-  if (this->indent_level_ > 0)
-    {
-      for (i=0; i < this->indent_level_; i++)
-        {
-          ACE_OS::fprintf (this->fp_, "  ");
-	  ACE_OS::fflush (fp_);
-        }
-    }
-  return 0;
-}
-
-// macro generation
-int
-TAO_OutStream::gen_ifdef_macro (const char *flatname, const char *suffix)
-{
-  static char macro [NAMEBUFSIZE];
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-
-  ACE_OS::memset (macro, '\0', NAMEBUFSIZE);
-  ACE_OS::sprintf (macro, "_%s_", cg->upcase (flatname));
-  if (suffix)
-    {
-      ACE_OS::sprintf (macro, "%s_%s_", macro, cg->upcase (suffix));
-    }
-
-  // append a suffix representing the stream type
-  switch (this->st_)
-    {
-    case TAO_OutStream::TAO_CLI_HDR:
-      ACE_OS::strcat (macro, "CH_");
-      break;
-    case TAO_OutStream::TAO_CLI_INL:
-      ACE_OS::strcat (macro, "CI_");
-      break;
-    case TAO_OutStream::TAO_CLI_IMPL:
-      ACE_OS::strcat (macro, "CS_");
-      break;
-    case TAO_OutStream::TAO_SVR_HDR:
-      ACE_OS::strcat (macro, "SH_");
-      break;
-    case TAO_OutStream::TAO_SVR_INL:
-      ACE_OS::strcat (macro, "SI_");
-      break;
-    case TAO_OutStream::TAO_SVR_IMPL:
-      ACE_OS::strcat (macro, "SS_");
-      break;
-    }
-  *this << "\n#if !defined (" << macro << ")\n";
-  *this << "#define " << macro << "\n\n";
-  return 0;
-}
-
-int
-TAO_OutStream::gen_endif (void)
-{
-  *this << "\n#endif // end #if !defined\n\n";
-  return 0;
-}
-
-// printf style variable argument print
-int
-TAO_OutStream::print (const char *format, ...)
-{
-  int result = 0;
-  va_list ap;
-  va_start (ap, format);
-  ACE_OSCALL (::vfprintf (this->fp_, format, ap), int, -1, result);
-  ACE_OS::fflush (fp_);
-  va_end (ap);
-  return result;
-}
-
-TAO_OutStream &
-TAO_OutStream::operator<< (const char *str)
-{
-  ACE_OS::fprintf (this->fp_, "%s", str);
-  ACE_OS::fflush (fp_);
-  return *this;
-}
-
-TAO_OutStream &
-TAO_OutStream::operator<< (const long num)
-{
-  ACE_OS::fprintf (this->fp_, "%ld", num);
-  ACE_OS::fflush (fp_);
-  return *this;
-}
-
-TAO_OutStream &
-TAO_OutStream::operator<< (const TAO_NL nl)
-{
-  // Macro to avoid "warning: unused parameter" type warning.
-  ACE_UNUSED_ARG (nl);
-
-  ACE_OS::fprintf (this->fp_ , "\n");
-  this->indent ();
-  return *this;
-}
-
-TAO_OutStream &
-TAO_OutStream::operator<< (Identifier *id)
-{
-  return this->print (id);
-}
-
-TAO_OutStream &
-TAO_OutStream::operator<< (UTL_IdList *id)
-{
-  return this->print (id);
-}
-
-TAO_OutStream &
-TAO_OutStream::operator<< (AST_Expression *expr)
-{
-  return this->print (expr);
-}
diff --git a/TAO/TAO_IDL/be/be_init.cpp b/TAO/TAO_IDL/be/be_init.cpp
deleted file mode 100644
index 47a72c9936d..00000000000
--- a/TAO/TAO_IDL/be/be_init.cpp
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-// BE_init.cc - Initialization for dummy BE
-
-#include	"idl.h"
-#include	"idl_extern.h"
-#include	"be.h"
-
-/*
- * Initialize the BE. The protocol requires only that this routine
- * return an instance of AST_Generator (or a subclass thereof).
- *
- * Remember that none of the FE initialization has been done, when you
- * add stuff here.
- */
-AST_Generator *
-BE_init()
-{
-  AST_Generator	*g = new be_generator();
-
-  if (g == NULL) {
-    cerr << GTDEVEL("IDL: BE init failed to create generator, exiting\n");
-    exit(99);
-  }
-  return g;
-}
-
-/*
- * Print out a version string for the BE
- */
-void
-BE_version()
-{
-  cerr << GTDEVEL("Demonstration BE, version 1.0.0\n");
-}
diff --git a/TAO/TAO_IDL/be/be_interface.cpp b/TAO/TAO_IDL/be/be_interface.cpp
deleted file mode 100644
index 8b730d4dff9..00000000000
--- a/TAO/TAO_IDL/be/be_interface.cpp
+++ /dev/null
@@ -1,1379 +0,0 @@
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    be_interface.cpp
-//
-// = DESCRIPTION
-//    Extension of class AST_Interface that provides additional means for C++
-//    mapping of an interface.
-//
-// = AUTHOR
-//    Copyright 1994-1995 by Sun Microsystems, Inc.
-//    and
-//    Aniruddha Gokhale
-//
-// ============================================================================
-
-#include	"idl.h"
-#include	"idl_extern.h"
-#include	"be.h"
-
-/*
- * BE_Interface
- */
-
-// default constructor
-be_interface::be_interface (void)
-  : full_skel_name_ (0)
-{
-  this->size_type (be_decl::VARIABLE); // always the case
-}
-
-// constructor used to build the AST
-be_interface::be_interface (UTL_ScopedName *n, AST_Interface **ih, long nih,
-                            UTL_StrList *p)
-  : AST_Interface (n, ih, nih, p),
-    AST_Decl (AST_Decl::NT_interface, n, p),
-    UTL_Scope (AST_Decl::NT_interface),
-    full_skel_name_ (0)
-{
-  this->size_type (be_decl::VARIABLE); // always the case
-}
-
-// compute stringified fully scoped skel name
-void
-be_interface::compute_fullskelname (void)
-{
-  if (full_skel_name_)
-    return;
-  else
-    {
-      long namelen;
-      UTL_IdListActiveIterator	*i;
-      long				first = I_TRUE;
-      long				second = I_FALSE;
-
-      // in the first loop compute the total length
-      namelen = 4;
-      i = new UTL_IdListActiveIterator (this->name ());
-      while (!(i->is_done ()))
-        {
-          if (!first)
-            namelen += 2; // for "::"
-          else if (second)
-            first = second = I_FALSE;
-          // print the identifier
-          namelen += ACE_OS::strlen (i->item ()->get_string ()); //
-          // additional 4 for the POA_ characters
-          if (first)
-            {
-              if (ACE_OS::strcmp (i->item ()->get_string (), "") != 0)
-                // does not start with a ""
-                first = I_FALSE;
-              else
-                second = I_TRUE;
-            }
-          i->next ();
-        }
-      delete i;
-
-      this->full_skel_name_ = new char [namelen+1];
-      this->full_skel_name_[0] = '\0';
-      first = I_TRUE;
-      second = I_FALSE;
-      ACE_OS::strcat (this->full_skel_name_, "POA_");
-      i = new UTL_IdListActiveIterator (this->name ());
-      while (!(i->is_done ()))
-        {
-          if (!first)
-            ACE_OS::strcat (this->full_skel_name_, "::");
-          else if (second)
-            first = second = I_FALSE;
-          // print the identifier
-          ACE_OS::strcat (this->full_skel_name_, i->item ()->get_string ());
-          if (first)
-            {
-              if (ACE_OS::strcmp (i->item ()->get_string (), "") != 0)
-                // does not start with a ""
-                first = I_FALSE;
-              else
-                second = I_TRUE;
-            }
-          i->next ();
-        }
-      delete i;
-    }
-  return;
-}
-
-const char*
-be_interface::full_skel_name (void)
-{
-  if (!this->full_skel_name_)
-    compute_fullskelname ();
-
-  return this->full_skel_name_;
-}
-
-// ----------------------------------------
-//            CODE GENERATION METHODS
-// ----------------------------------------
-
-// generate the client header
-int be_interface::gen_client_header (void)
-{
-  TAO_OutStream *ch; // output stream
-  long i;            // loop index
-  TAO_NL  nl;        // end line
-
-
-  if (!this->cli_hdr_gen_) // not already generated
-    {
-      // retrieve a singleton instance of the code generator
-      TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-
-      cg->push (TAO_CodeGen::TAO_INTERFACE_CH); // set the current code
-      // generation  state
-
-      ch = cg->client_header ();
-
-      // pass info
-      cg->outstream (ch);
-      cg->node (this);
-
-      // == STEP 1:  generate the class name and class names we inherit ==
-      ch->indent (); // start with whatever indentation level we are at
-
-      // generate the ifdefined macro for  the _ptr type
-      ch->gen_ifdef_macro (this->flatname (), "_ptr");
-
-      // the following two are required to be under the ifdef macro to avoid
-      // multiple declarations
-
-      // forward declaration
-      *ch << "class " << this->local_name () << ";" << nl;
-      // generate the _ptr declaration
-      *ch << "typedef " << this->local_name () << " *" << this->local_name ()
-          << "_ptr;" << nl;
-
-      ch->gen_endif ();
-
-      ch->gen_ifdef_macro (this->flatname ());
-
-      // now generate the class definition
-      *ch << "class " << this->local_name ();
-
-      if (n_inherits () > 0)  // this interface inherits from other interfaces
-        {
-          *ch << ": ";
-          for (i = 0; i < n_inherits (); i++)
-            {
-              *ch << "public virtual ";
-              *ch << inherits ()[i]->name ();  // dump the scoped name
-              if (i < n_inherits () - 1) // this is the case of multiple
-                // inheritance
-                {
-                  *ch << ", ";
-                }
-            }  // end of for loop
-          *ch << nl;
-        }
-      else
-        {
-          // we do not inherit from anybody, hence we do so from the base
-          // CORBA::Object class
-          *ch << ": public virtual ACE_CORBA_1 (Object)" << nl;
-        }
-
-      // generate the body
-
-      *ch << "{" << nl;
-      *ch << "public:\n";
-      ch->incr_indent ();
-      // generate the static _duplicate, _narrow, and _nil operations
-      *ch << "// the static operations" << nl;
-      *ch << "static " << local_name () << "_ptr " << "_duplicate (" <<
-        local_name () << "_ptr obj);" << nl;
-      *ch << "static " << local_name () << "_ptr " << "_narrow (" <<
-        "CORBA::Object_ptr obj, CORBA::Environment &env);" << nl;
-      *ch << "static " << local_name () << "_ptr " << "_nil (" <<
-        "void);" << nl;
-
-      // generate a TAO-specific _bind method similar to what Orbix and VisiBroker
-      // have
-      *ch << "static " << this->local_name () << "_ptr _bind (const char *host, "
-          << "CORBA::UShort port, const char *key, CORBA::Environment &env);\n\n";
-
-      // generate code for the interface definition by traversing thru the
-      // elements of its scope. We depend on the front-end to have made sure
-      // that only legal syntactic elements appear in our scope.
-      if (be_scope::gen_client_header () == -1)
-        {
-          ACE_ERROR ((LM_ERROR, "be_interface::gen_client_header\n"));
-          ACE_ERROR ((LM_ERROR, "Scope code generation failure\n"));
-          return -1;
-        }
-
-      // generate the "protected" constructor so that users cannot instantiate
-      // us
-      ch->decr_indent ();
-      *ch << "protected:\n";
-      ch->incr_indent ();
-      *ch << local_name () << " (void); // default constructor" << nl;
-      *ch << local_name () << " (STUB_Object *objref);" << nl;
-      *ch << "virtual ~" << local_name () << " (void);\n";
-      ch->decr_indent ();
-
-      // private copy constructor and assignment operator. These are not
-      // allowed, hence they are private.
-      *ch << "private:\n";
-      ch->incr_indent ();
-      *ch << local_name () << " (const " << local_name () << "&);" << nl;
-      *ch << "void operator= (const " << local_name () << "&);\n";
-      ch->decr_indent ();
-      *ch << "};\n\n";
-      ch->gen_endif ();
-
-      // generate the ifdefined macro for the var type
-      ch->gen_ifdef_macro (this->flatname (), "_var");
-
-      // generate the _var declaration
-      if (this->gen_var_defn () == -1)
-        {
-          ACE_ERROR ((LM_ERROR,
-                      "be_interface - error generating _var definition\n"));
-          return -1;
-        }
-      ch->gen_endif ();
-
-      // generate the ifdef macro for the _out class
-      ch->gen_ifdef_macro (this->flatname (), "_out");
-
-      // generate the _out declaration - ORBOS/97-05-15 pg 16-20 spec
-      if (this->gen_out_defn () == -1)
-        {
-          ACE_ERROR ((LM_ERROR,
-                      "be_interface - error generating _var definition\n"));
-          return -1;
-        }
-      // generate the endif macro
-      ch->gen_endif ();
-
-
-      // generate the typecode decl. If we are in the outermost scope, our typecode
-      // decl is extern
-      if (this->is_nested ())
-        {
-          // we have a scoped name
-          ch->indent ();
-          *ch << "static CORBA::TypeCode_ptr " << this->tc_name
-            ()->last_component () << ";\n\n";
-        }
-      else
-        {
-          // we are in the ROOT scope
-          ch->indent ();
-          *ch << "extern CORBA::TypeCode_ptr " << this->tc_name
-            ()->last_component () << ";\n\n";
-        }
-
-      cg->pop ();
-      this->cli_hdr_gen_ = I_TRUE;
-    }
-  return 0;
-}
-
-int be_interface::gen_client_stubs (void)
-{
-  TAO_OutStream *cs; // output stream
-  long i;            // loop index
-  TAO_NL  nl;        // end line
-
-  // Macro to avoid "warning: unused parameter" type warning.
-  ACE_UNUSED_ARG (i);
-
-  // retrieve a singleton instance of the code generator
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-  cg->push (TAO_CodeGen::TAO_INTERFACE_CS); // set the current code generation
-                                            // state
-
-  cs = cg->client_stubs ();
-  //pass info
-  cg->node (this);
-  cg->outstream (cs);
-
-  cs->indent (); // start with whatever indentation level we are at
-
-  // first generate the code for the static methods
-  // The _duplicate method
-  *cs << name () << "_ptr " << name () << "::_duplicate (" <<
-    name () << "_ptr obj)" << nl;
-  *cs << "{\n";
-  cs->incr_indent ();
-  *cs << "if (!CORBA::is_nil (obj))\n";
-  cs->incr_indent ();
-  *cs << "obj->AddRef ();\n";
-  cs->decr_indent ();
-  *cs << nl;
-  *cs << "return obj;\n";
-  cs->decr_indent ();
-  *cs << "} // end of _duplicate" << nl << nl;
-
-  // The _narrow method
-  *cs << name () << "_ptr " << name () <<
-    "::_narrow (CORBA::Object_ptr obj, CORBA::Environment &env)" << nl;
-  *cs << "{\n";
-  cs->incr_indent ();
-  *cs << "if (CORBA::is_nil (obj)) return " << this->name () << "::_nil ();" <<
-    nl;
-  *cs << "if (obj->_is_a (\"" << this->repoID () << "\", env))" << nl;
-  *cs << "{\n";
-  cs->incr_indent ();
-  *cs << "STUB_Object *istub;" << nl;
-  *cs << name () << "_ptr new_obj; // to be returned " << nl;
-#if 0 // XXXASG - I was told that emitting this line of code is the root cause
-      // of all evil
-  *cs << "obj->Release ();" <<
-    " // need this since _is_a grabbed an obj reference " << nl;
-#endif
-  *cs << "if (obj->QueryInterface (IID_STUB_Object, (void **)&istub) " <<
-    "!= NOERROR)\n";
-  cs->incr_indent ();
-  *cs << "return " << this->name () << "::_nil ();\n";
-  cs->decr_indent ();
-  *cs << nl;
-  *cs << "obj->Release (); " <<
-    "// need this since QueryIntf bumped our refcount" << nl;
-  *cs << "new_obj = new " << name () << " (istub); " <<
-    "// construct obj ref using the stub object" << nl;
-  *cs << "return new_obj;\n";
-  cs->decr_indent ();
-  *cs << "} // end of if" << nl;
-  *cs << "return " << this->name () << "::_nil (); // _narrow failed\n";
-  cs->decr_indent ();
-  *cs << "} // end of _narrow" << nl << nl;
-
-  // _nil method
-  *cs << this->name () << "_ptr " << this->name () << "::_nil (void)" <<
-    nl;
-  *cs << "{\n";
-  cs->incr_indent ();
-  *cs << "return (" << name () << "_ptr)NULL;\n";
-  cs->decr_indent ();
-  *cs << "} // end of _nil" << nl << nl;
-
-  // the _bind method
-  *cs << this->name () << "_ptr " << this->name () << "::_bind (" <<
-    "const char *host, CORBA::UShort port, const char *key, " <<
-    "CORBA::Environment &env)" << nl;
-  *cs << "{\n";
-  cs->incr_indent ();
-  *cs << "CORBA::Object_ptr objref = CORBA::Object::_nil ();" << nl;
-  *cs << "IIOP_Object *data = new IIOP_Object (host, port, key);" << nl;
-  *cs << "if (!data) return " << this->name () << "::_nil ();" << nl;
-  *cs << "// get the object_ptr using Query Interface" << nl;
-  *cs <<
-    "if (data->QueryInterface (IID_CORBA_Object, (void **)&objref) != NOERROR)"
-      << nl;
-  *cs << "{" << nl;
-  *cs << "\tenv.exception (new CORBA::DATA_CONVERSION (CORBA::COMPLETED_NO));"
-      << nl;
-  *cs << "\treturn " << this->name () << "::_nil ();" << nl;
-  *cs << "}" << nl;
-  *cs << "data->Release (); // QueryInterface had bumped up our count" << nl;
-  *cs << "if (CORBA::is_nil (objref))" << nl;
-  *cs << "\treturn " << this->name () << "::_nil ();" << nl;
-  *cs << "else // narrow it" << nl;
-  *cs << "\treturn " << this->name () << "::_narrow (objref, env);\n";
-  cs->decr_indent ();
-  *cs << "}\n\n";
-
-  // generate code for the elements of the interface
-  if (be_scope::gen_client_stubs () == -1)
-    {
-      ACE_ERROR ((LM_ERROR, "be_interface::gen_client_stubs\n"));
-      ACE_ERROR ((LM_ERROR, "Scope code generation failure\n"));
-      return -1;
-    }
-
-  // generate the typecode information here
-  cs->indent (); // start from current indentation level
-  *cs << "static const CORBA::Long _oc_" << this->flatname () << "[] =" <<
-    nl;
-  *cs << "{\n";
-  cs->incr_indent (0);
-  if (this->gen_encapsulation () == -1)
-    {
-      ACE_ERROR ((LM_ERROR, "Error generating typecode\n\n"));
-      return -1;
-    }
-  cs->decr_indent ();
-  *cs << "};" << nl;
-
-  *cs << "static CORBA::TypeCode _tc__tc_" << this->flatname () <<
-    " (CORBA::tk_objref, sizeof (_oc_" <<  this->flatname () <<
-    "), (unsigned char *) &_oc_" << this->flatname () <<
-    ", CORBA::B_FALSE);" << nl;
-  *cs << "CORBA::TypeCode_ptr " << this->tc_name () << " = &_tc__tc_" <<
-    this->flatname () << ";\n\n";
-
-  cg->pop ();
-  return 0;
-}
-
-// generate server header
-int be_interface::gen_server_header (void)
-{
-  TAO_OutStream *sh; // output stream
-  long i;            // loop index
-  TAO_NL  nl;        // end line
-  static char namebuf [NAMEBUFSIZE]; // holds the class name
-  AST_Decl *d;       // enclosing scope
-
-  ACE_OS::memset (namebuf, '\0', NAMEBUFSIZE);
-
-  // retrieve a singleton instance of the code generator
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-  cg->push (TAO_CodeGen::TAO_INTERFACE_SH); // set the current code generation
-                                          // state
-
-  sh = cg->server_header ();
-  // pass info
-  cg->node (this);
-  cg->outstream (sh);
-
-  // generate the skeleton class name
-
-  sh->indent (); // start with whatever indentation level we are at
-
-  // we shall have a POA_ prefix only if we are at the topmost level
-  // generate the forward declaration
-  d = ScopeAsDecl (this->defined_in ());
-  if (d->node_type () == AST_Decl::NT_root)
-    {
-      // we are outermost
-      ACE_OS::sprintf (namebuf, "POA_%s", this->local_name ()->get_string ());
-    }
-  else
-    {
-      ACE_OS::sprintf (namebuf, "%s", this->local_name ()->get_string ());
-    }
-
-  *sh << "class " << namebuf << ";" << nl;
-
-  // generate the _ptr declaration
-  *sh << "typedef " << namebuf << " *" << namebuf
-      << "_ptr;" << nl;
-
-  // now generate the class definition
-  *sh << "class " << namebuf << " : public virtual " << name ();
-  if (n_inherits () > 0)  // this interface inherits from other interfaces
-    {
-      be_interface *intf;
-
-      for (i = 0; i < n_inherits (); i++)
-        {
-          *sh << ", public virtual ";
-          intf = be_interface::narrow_from_decl (inherits ()[i]);
-          *sh << intf->full_skel_name ();  // dump the scoped name
-        }  // end of for loop
-    }
-  *sh << nl;
-  *sh << "{" << nl;
-  *sh << "protected:\n";
-  sh->incr_indent ();
-  *sh << namebuf << " (const char *obj_name = 0);" << nl;
-  *sh << "virtual ~" << namebuf << " (void);\n";
-  sh->decr_indent ();
-  *sh << "public:\n";
-  sh->incr_indent (0);
-  // generate code for elements in the scope (e.g., operations)
-  if (be_scope::gen_server_header () == -1)
-    {
-      ACE_ERROR ((LM_ERROR, "be_interface::gen_server_header\n"));
-      ACE_ERROR ((LM_ERROR, "Scope code generation failure\n"));
-      return -1;
-    }
-
-  // add our _is_a method
-  sh->indent ();
-  *sh << "static void _is_a_skel (CORBA::ServerRequest &req, " <<
-    "CORBA::Object_ptr obj, CORBA::Environment &env);\n\n";
-
-  sh->decr_indent ();
-  *sh << "};\n\n";
-
-  cg->pop ();
-  return 0;
-}
-
-int be_interface::gen_server_skeletons (void)
-{
-  TAO_OutStream *ss; // output stream
-  long i;            // loop index
-  TAO_NL  nl;        // end line
-  AST_Decl *d;        // temporary
-
-  // Macro to avoid "warning: unused parameter" type warning.
-  ACE_UNUSED_ARG (i);
-
-  // retrieve a singleton instance of the code generator
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-  cg->push (TAO_CodeGen::TAO_INTERFACE_SS); // set the current code generation
-                                          // state
-
-  ss = cg->server_skeletons ();
-  // pass info
-  cg->node (this);
-  cg->outstream (ss);
-
-  // generate the skeleton class name
-
-  ss->indent (); // start with whatever indentation level we are at
-
-  if (this->gen_operation_table () == -1)
-    {
-      ACE_ERROR ((LM_ERROR,
-                  "be_interface::gen_operation_table failure\n"));
-      return -1;
-    }
-
-  *ss << "// skeleton constructor" << nl;
-  // find if we are at the top scope or inside some module
-  d = ScopeAsDecl (this->defined_in ());
-
-  if (d && d->node_type () == AST_Decl::NT_root)
-    {
-      // we are outermost. So the POA_ prefix is prepended to our name
-      *ss << this->full_skel_name () << "::POA_" << this->local_name () <<
-        " (const char *obj_name)" << nl;
-    }
-  else
-    {
-      // the POA_ prefix is prepended to our outermost module name
-      *ss << this->full_skel_name () << "::" << this->local_name () <<
-        " (const char *obj_name)" << nl;
-    }
-
-  *ss << "{\n";
-  ss->incr_indent ();
-  // code for the skeleton constructor
-  *ss << "const CORBA::String repoID = \"" << this->repoID () << "\"; // repository ID" << nl;
-  *ss << "IIOP_Object *data; // Actual object reference" << nl;
-  *ss << "TAO_ORB_Core *ocp = TAO_ORB_Core_instance (); " <<
-    "// underlying ORB core instance" << nl;
-  *ss << "CORBA::POA_ptr oa = TAO_ORB_Core_instance ()->root_poa (); " <<
-    "// underlying OA" << nl;
-  *ss << "const ACE_INET_Addr &addr = ocp->orb_params ()->addr ();" << nl;
-  *ss << "this->optable_ = &tao_" << this->flatname () << "_optable;" << nl <<
-    nl;
-  *ss << "// set up an IIOP object" << nl;
-#if 0
-  *ss << "data = new IIOP_Object (CORBA::string_dup (repoID));" << nl;
-  *ss << "data->profile.iiop_version.major = IIOP::MY_MAJOR;" << nl;
-  *ss << "data->profile.iiop_version.minor = IIOP::MY_MINOR;" << nl;
-  *ss << "const ACE_INET_Addr &addr = ocp->orb_params ()->addr ();" << nl;
-  *ss << "data->profile.host = ACE_OS::strdup (" <<
-    "addr.get_host_name ());" << nl;
-  *ss << "data->profile.port = addr.get_port_number ();" << nl;
-  *ss << "data->profile.object_key.length = " <<
-    "ACE_OS::strlen (obj_name);" << nl;
-  *ss << "data->profile.object_key.maximum = " <<
-    "data->profile.object_key.length;" << nl;
-  *ss << "data->profile.object_key.buffer = " <<
-    "new CORBA::Octet [(size_t)data->profile.object_key.length+1];" << nl;
-  *ss << "ACE_OS::strcpy ((char *)data->profile.object_key.buffer, obj_name);"
-      << " // set the object key" << nl;
-#endif
-  *ss << "data = new IIOP_Object (CORBA::string_dup (repoID), addr, obj_name);"
-      << nl;
-  *ss << "this->set_parent (data); // store the IIOP obj ref with us" <<
-    nl;
-  *ss << "this->sub_ = this; // set the most derived type to be us" << nl;
-  *ss << "if (oa) oa->bind (data->profile.object_key, this); " <<
-    "// register ourselves\n";
-  ss->decr_indent ();
-  *ss << "}\n\n";
-
-  // generate code for elements in the scope (e.g., operations)
-  if (be_scope::gen_server_skeletons () == -1)
-    {
-      ACE_ERROR ((LM_ERROR, "be_interface::gen_server_skeletons\n"));
-      ACE_ERROR ((LM_ERROR, "Scope code generation failure\n"));
-      return -1;
-    }
-
-  // generate code for the _is_a skeleton
-  ss->indent ();
-  *ss << "void " << this->full_skel_name () <<
-    "::_is_a_skel (CORBA::ServerRequest &req, " <<
-    "CORBA::Object_ptr /* obj */, CORBA::Environment &env)" << nl;
-  *ss << "{\n";
-  ss->incr_indent ();
-  *ss << "const CORBA::String type_id = \"" << this->repoID () <<
-    "\"; // repository ID" << nl;
-  *ss << "CORBA::NVList_ptr nvlist;" << nl;
-  *ss << "CORBA::NamedValue_ptr nv;" << nl;
-  *ss << "CORBA::Any temp_value (CORBA::_tc_string);" << nl;
-  *ss << "CORBA::Any *any;" << nl;
-  *ss << "CORBA::Boolean *retval;" << nl;
-  *ss << "CORBA::String value;" << nl;
-  *ss << nl;
-  *ss << "req.orb()->create_list (0, nvlist);" << nl;
-  *ss << "nv = nvlist->add_value (0, temp_value, CORBA::ARG_IN, env);" << nl;
-  *ss << "req.params (nvlist, env); // parse the args" << nl;
-  *ss << "if (env.exception () != 0) return;" << nl;
-  *ss << "value = *(CORBA::String *)nv->value ()->value ();" << nl;
-  *ss << "if (ACE_OS::strcmp ((char *)value, (char *)type_id) == 0" << nl;
-  *ss << "  || ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (env)) == 0)\n"
-      << nl;
-  *ss << "\tretval = new CORBA::Boolean (CORBA::B_TRUE);" << nl;
-  * ss << "else" << nl;
-  *ss << "\tretval = new CORBA::Boolean (CORBA::B_FALSE);" << nl;
-  *ss << "any = new CORBA::Any (CORBA::_tc_boolean, retval, CORBA::B_TRUE);" <<
-    nl;
-  *ss << "req.result (any, env);\n";
-  ss->decr_indent ();
-  *ss << "}\n\n";
-
-  cg->pop ();
-  return 0;
-}
-
-// helper
-int
-be_interface::gen_operation_table (void)
-{
-  int count = 0;
-  UTL_ScopeActiveIterator *si;
-  AST_Decl *d;
-  TAO_OutStream *ss; // output stream
-  long i;            // loop index
-  TAO_NL  nl;        // end line
-
-  // Macro to avoid "warning: unused parameter" type warning.
-  ACE_UNUSED_ARG (i);
-
-  // retrieve a singleton instance of the code generator
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-
-  ss = cg->server_skeletons ();
-
-  ss->indent (); // start from current indentation level
-  *ss << "static const TAO_operation_db_entry " << this->flatname () <<
-    "_operations [] = {\n";
-  ss->incr_indent ();
-  if (this->nmembers () > 0)
-    {
-      // if there are elements in this scope
-
-      si = new UTL_ScopeActiveIterator (this, UTL_Scope::IK_decls);
-      // instantiate a scope iterator.
-
-      while (!(si->is_done ()))
-	{
-	  // get the next AST decl node
-	  d = si->item ();
-	  if (!d->imported ())
-	    {
-	      // we are not imported.
-
-              if (d->node_type () == AST_Decl::NT_op)
-                {
-                  // we are an operation node
-                  *ss << "{\"" << d->local_name () << "\", &" << this->full_skel_name
-                    () << "::" << d->local_name () << "_skel},"
-                      << nl;
-                  count++;
-                }
-              else if (d->node_type () == AST_Decl::NT_attr)
-                {
-                  AST_Attribute *attr;
-
-                  // generate only the "get" entry if we are readonly
-                  *ss << "{\"_get_" << d->local_name () << "\", &" <<
-                    this->full_skel_name () << "::_get_" << d->local_name () <<
-                    "_skel}," << nl;
-                  count++;
-
-                  attr = AST_Attribute::narrow_from_decl (d);
-                  if (!attr)
-                    return -1;
-
-                  if (!attr->readonly ())
-                    {
-                      // the set method
-                      *ss << "{\"_set_" << d->local_name () << "\", &" <<
-                        this->full_skel_name () << "::_set_" << d->local_name
-                        () << "_skel}," << nl;
-                      count++;
-                    }
-                }
-            }
-          si->next ();
-        } // end of while
-      delete si; // free the iterator object
-    }
-  *ss << "{\"_is_a\", &" << this->full_skel_name () << "::_is_a_skel}\n";
-  count++;
-  ss->decr_indent ();
-  *ss << "};" << nl << nl;
-
-  // XXXASG - this code should be based on using different strategies for
-  // demux - for next release
-  *ss << "TAO_Dynamic_Hash_OpTable tao_" << this->flatname () << "_optable " <<
-    "(" << this->flatname () << "_operations, " << count << ", " << 2*count << ");"
-      << nl;
-  return 0;
-}
-
-// Generates the client-side inline information
-int
-be_interface::gen_client_inline (void)
-{
-  TAO_OutStream *ci; // output stream
-  TAO_NL  nl;        // end line
-
-  // retrieve a singleton instance of the code generator
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-
-  ci = cg->client_inline ();
-  ci->indent (); // start from the current indentation level
-
-  // generate the constructors and destructor
-  *ci << "ACE_INLINE" << nl;
-  *ci << this->name () << "::" << this->local_name () <<
-    " (void) // default constructor" << nl;
-  *ci << "{}" << nl << nl;
-
-  *ci << "ACE_INLINE" << nl;
-  *ci << this->name () << "::" << this->local_name () <<
-    " (STUB_Object *objref) // constructor" << nl;
-  *ci << "\t: ACE_CORBA_1 (Object) (objref)" << nl;
-  *ci << "{}" << nl << nl;
-
-  *ci << "ACE_INLINE" << nl;
-  *ci << this->name () << "::~" << this->local_name () <<
-    " (void) // destructor" << nl;
-  *ci << "{}\n\n";
-
-  // generate the ifdefined macro for  the _var type
-  ci->gen_ifdef_macro (this->flatname (), "_var");
-
-  if (this->gen_var_impl () == -1)
-    {
-      ACE_ERROR ((LM_ERROR, "be_interface: _var impl code gen failed\n"));
-      return -1;
-    }
-  ci->gen_endif ();
-
-  // generate the ifdefined macro for  the _out type
-  ci->gen_ifdef_macro (this->flatname (), "_out");
-
-  if (this->gen_out_impl () == -1)
-    {
-      ACE_ERROR ((LM_ERROR, "be_interface: _out impl code gen failed\n"));
-      return -1;
-    }
-  ci->gen_endif ();
-
-  if (be_scope::gen_client_inline () == -1)
-    {
-      ACE_ERROR ((LM_ERROR, "be_interface: code gen failed for scope\n"));
-      return -1;
-    }
-  return 0;
-}
-
-// Generates the server-side inline
-int
-be_interface::gen_server_inline (void)
-{
-  // nothing to be done
-  TAO_OutStream *si; // output stream
-  long i;            // loop index
-  TAO_NL  nl;        // end line
-
-  // Macro to avoid "warning: unused parameter" type warning.
-  ACE_UNUSED_ARG (i);
-
-  // retrieve a singleton instance of the code generator
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-
-  si = cg->server_inline ();
-
-  // generate the skeleton class name
-
-  si->indent (); // start with whatever indentation level we are at
-
-  *si << "// skeleton destructor" << nl;
-
-  *si << "ACE_INLINE" << nl;
-  if (!this->is_nested ())
-    {
-      // we are outermost. So the POA_ prefix is prepended to our name
-      *si << this->full_skel_name () << "::~POA_" << this->local_name () <<
-        " (void)" << nl;
-    }
-  else
-    {
-      // the POA_ prefix is prepended to our outermost module name
-      *si << this->full_skel_name () << "::~" << this->local_name () <<
-        " (void)" << nl;
-    }
-
-  *si << "{" << nl;
-  *si << "}\n";
-
-  return 0;
-}
-
-// generate the var definition
-int
-be_interface::gen_var_defn (void)
-{
-  TAO_OutStream *ch; // output stream
-  TAO_NL  nl;        // end line
-  char namebuf [NAMEBUFSIZE];  // names
-
-  ACE_OS::memset (namebuf, '\0', NAMEBUFSIZE);
-  ACE_OS::sprintf (namebuf, "%s_var", this->local_name ()->get_string ());
-
-  // retrieve a singleton instance of the code generator
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-
-  ch = cg->client_header ();
-
-  // generate the var definition (always in the client header).
-  // Depending upon the data type, there are some differences which we account
-  // for over here.
-
-  ch->indent (); // start with whatever was our current indent level
-  *ch << "class " << namebuf << nl;
-  *ch << "{" << nl;
-  *ch << "public:\n";
-  ch->incr_indent ();
-
-  // default constr
-  *ch << namebuf << " (void); // default constructor" << nl;
-  *ch << namebuf << " (" << local_name () << "_ptr);" << nl;
-
-  // copy constructor
-  *ch << namebuf << " (const " << namebuf <<
-    " &); // copy constructor" << nl;
-
-  // destructor
-  *ch << "~" << namebuf << " (void); // destructor" << nl;
-  *ch << nl;
-
-  // assignment operator from a pointer
-  *ch << namebuf << " &operator= (" << local_name () << "_ptr);" << nl;
-
-  // assignment from _var
-  *ch << namebuf << " &operator= (const " << namebuf <<
-    " &);" << nl;
-
-  // arrow operator
-  *ch << local_name () << "_ptr operator-> (void) const;" << nl;
-
-  *ch << nl;
-
-  // other extra types (cast operators, [] operator, and others)
-  *ch << "operator const " << local_name () << "_ptr &() const;" << nl;
-  *ch << "operator " << local_name () << "_ptr &();" << nl;
-
-  *ch << "// in, inout, out, _retn " << nl;
-  // the return types of in, out, inout, and _retn are based on the parameter
-  // passing rules and the base type
-  *ch << local_name () << "_ptr in (void) const;" << nl;
-  *ch << local_name () << "_ptr &inout (void);" << nl;
-  *ch << local_name () << "_ptr &out (void);" << nl;
-  *ch << local_name () << "_ptr _retn (void);" << nl;
-
-  // generate an additional member function that returns the underlying pointer
-  *ch << local_name () << "_ptr ptr (void) const;\n";
-
-  *ch << "\n";
-  ch->decr_indent ();
-
-  // private
-  *ch << "private:\n";
-  ch->incr_indent ();
-  *ch << local_name () << "_ptr ptr_;\n";
-
-  ch->decr_indent ();
-  *ch << "};\n\n";
-
-  return 0;
-}
-
-// implementation of the _var class. All of these get generated in the inline
-// file
-int
-be_interface::gen_var_impl (void)
-{
-  TAO_OutStream *ci; // output stream
-  TAO_NL  nl;        // end line
-  char fname [NAMEBUFSIZE];  // to hold the full and
-  char lname [NAMEBUFSIZE];  // local _var names
-
-  ACE_OS::memset (fname, '\0', NAMEBUFSIZE);
-  ACE_OS::sprintf (fname, "%s_var", this->fullname ());
-
-  ACE_OS::memset (lname, '\0', NAMEBUFSIZE);
-  ACE_OS::sprintf (lname, "%s_var", local_name ()->get_string ());
-
-  // retrieve a singleton instance of the code generator
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-
-  ci = cg->client_inline ();
-  cg->outstream (ci);
-
-  // generate the var implementation in the inline file
-  // Depending upon the data type, there are some differences which we account
-  // for over here.
-
-  ci->indent (); // start with whatever was our current indent level
-
-  *ci << "// *************************************************************"
-      << nl;
-  *ci << "// Inline operations for class " << fname << nl;
-  *ci << "// *************************************************************\n\n";
-
-  // default constr
-  *ci << "ACE_INLINE" << nl;
-  *ci << fname << "::" << lname <<
-    " (void) // default constructor" << nl;
-  *ci << "\t" << ": ptr_ (" << this->name () << "::_nil ())" << nl;
-  *ci << "{}\n\n";
-
-  // constr from a _ptr
-  ci->indent ();
-  *ci << "ACE_INLINE" << nl;
-  *ci << fname << "::" << lname << " (" << name () << "_ptr p)" << nl;
-  *ci << "\t: ptr_ (p)" << nl;
-  *ci << "{}\n\n";
-
-  // the additional ptr () member function. This member function must be
-  // defined before the remaining member functions including the copy
-  // constructor because this inline function is used elsewhere. Hence to make
-  // inlining of this function possible, we must define it before its use.
-  ci->indent ();
-  *ci << "ACE_INLINE " << name () << "_ptr " << nl;
-  *ci << fname << "::ptr (void) const" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "return this->ptr_;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  // copy constructor
-  ci->indent ();
-  *ci << "ACE_INLINE" << nl;
-  *ci << fname << "::" << lname << " (const " << fname <<
-    " &p) // copy constructor" << nl;
-  *ci << "\t: ptr_ (" << name () << "::_duplicate (p.ptr ()))" << nl;
-  *ci << "{}\n\n";
-
-  // destructor
-  ci->indent ();
-  *ci << "ACE_INLINE" << nl;
-  *ci << fname << "::~" << lname << " (void) // destructor" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "CORBA::release (this->ptr_);\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  // assignment operator
-  ci->indent ();
-  *ci << "ACE_INLINE " << fname << " &" << nl;
-  *ci << fname << "::operator= (" << name () <<
-    "_ptr p)" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "CORBA::release (this->ptr_);" << nl;
-  *ci << "this->ptr_ = p;" << nl;
-  *ci << "return *this;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  // assignment operator from _var
-  ci->indent ();
-  *ci << "ACE_INLINE " << fname << " &" << nl;
-  *ci << fname << "::operator= (const " << fname <<
-    " &p)" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "if (this != &p)" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "CORBA::release (this->ptr_);" << nl;
-  *ci << "this->ptr_ = " << name () << "::_duplicate (p.ptr ());\n";
-  ci->decr_indent ();
-  *ci << "}" << nl;
-  *ci << "return *this;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  // other extra methods - cast operator ()
-  ci->indent ();
-  *ci << "ACE_INLINE " << nl;
-  *ci << fname << "::operator const " << name () <<
-    "_ptr &() const // cast" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "return this->ptr_;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  ci->indent ();
-  *ci << "ACE_INLINE " << nl;
-  *ci << fname << "::operator " << name () << "_ptr &() // cast " << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "return this->ptr_;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  // operator->
-  ci->indent ();
-  *ci << "ACE_INLINE " << name () << "_ptr " << nl;
-  *ci << fname << "::operator-> (void) const" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "return this->ptr_;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  // in, inout, out, and _retn
-  ci->indent ();
-  *ci << "ACE_INLINE " << name () << "_ptr" << nl;
-  *ci << fname << "::in (void) const" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "return this->ptr_;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  ci->indent ();
-  *ci << "ACE_INLINE " << name () << "_ptr &" << nl;
-  *ci << fname << "::inout (void)" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "return this->ptr_;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  ci->indent ();
-  *ci << "ACE_INLINE " << name () << "_ptr &" << nl;
-  *ci << fname << "::out (void)" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "CORBA::release (this->ptr_);" << nl;
-  *ci << "this->ptr_ = " << this->name () << "::_nil ();" << nl;
-  *ci << "return this->ptr_;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  ci->indent ();
-  *ci << "ACE_INLINE " << name () << "_ptr " << nl;
-  *ci << fname << "::_retn (void)" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "// yield ownership of managed obj reference" << nl;
-  *ci << this->name () << "_ptr val = this->ptr_;" << nl;
-  *ci << "this->ptr_ = " << this->name () << "::_nil ();" << nl;
-  *ci << "return val;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  return 0;
-}
-
-// generate the _out definition
-int
-be_interface::gen_out_defn (void)
-{
-  TAO_OutStream *ch; // output stream
-  TAO_NL  nl;        // end line
-  char namebuf [NAMEBUFSIZE];  // to hold the _out name
-
-  ACE_OS::memset (namebuf, '\0', NAMEBUFSIZE);
-  ACE_OS::sprintf (namebuf, "%s_out", local_name ()->get_string ());
-
-  // retrieve a singleton instance of the code generator
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-
-  ch = cg->client_header ();
-
-  // generate the out definition (always in the client header)
-  ch->indent (); // start with whatever was our current indent level
-
-  *ch << "class " << namebuf << nl;
-  *ch << "{" << nl;
-  *ch << "public:\n";
-  ch->incr_indent ();
-
-  // No default constructor
-
-  // constructor from a pointer
-  *ch << namebuf << " (" << local_name () << "_ptr &);" << nl;
-  // constructor from a _var &
-  *ch << namebuf << " (" << local_name () << "_var &);" << nl;
-  // constructor from a _out &
-  *ch << namebuf << " (" << namebuf << " &);" << nl;
-  // assignment operator from a _out &
-  *ch << namebuf << " &operator= (" << namebuf << " &);" << nl;
-  // assignment operator from a pointer &, cast operator, ptr fn, operator
-  // -> and any other extra operators
-  // only interface allows assignment from var &
-  *ch << namebuf << " &operator= (const " << local_name () << "_var &);" << nl;
-  *ch << namebuf << " &operator= (" << local_name () << "_ptr);" << nl;
-  // cast
-  *ch << "operator " << local_name () << "_ptr &();" << nl;
-  // ptr fn
-  *ch << local_name () << "_ptr &ptr (void);" << nl;
-  // operator ->
-  *ch << local_name () << "_ptr operator-> (void);" << nl;
-
-  *ch << "\n";
-  ch->decr_indent ();
-  *ch << "private:\n";
-  ch->incr_indent ();
-  *ch << local_name () << "_ptr &ptr_;\n";
-
-  ch->decr_indent ();
-  *ch << "};\n\n";
-  return 0;
-}
-
-int
-be_interface::gen_out_impl (void)
-{
-  TAO_OutStream *ci; // output stream
-  TAO_NL  nl;        // end line
-  char fname [NAMEBUFSIZE];  // to hold the full and
-  char lname [NAMEBUFSIZE];  // local _out names
-
-  ACE_OS::memset (fname, '\0', NAMEBUFSIZE);
-  ACE_OS::sprintf (fname, "%s_out", this->fullname ());
-
-  ACE_OS::memset (lname, '\0', NAMEBUFSIZE);
-  ACE_OS::sprintf (lname, "%s_out", local_name ()->get_string ());
-
-  // retrieve a singleton instance of the code generator
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-
-  ci = cg->client_inline ();
-  cg->outstream (ci);
-
-  // generate the var implementation in the inline file
-  // Depending upon the data type, there are some differences which we account
-  // for over here.
-
-  ci->indent (); // start with whatever was our current indent level
-
-  *ci << "// *************************************************************"
-      << nl;
-  *ci << "// Inline operations for class " << fname << nl;
-  *ci << "// *************************************************************\n\n";
-
-      // constr from a _ptr
-  ci->indent ();
-  *ci << "ACE_INLINE" << nl;
-  *ci << fname << "::" << lname << " (" << name () << "_ptr &p)" << nl;
-  *ci << "\t: ptr_ (p)" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "this->ptr_ = " << this->name () << "::_nil ();\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  // constructor from _var &
-  ci->indent ();
-  *ci << "ACE_INLINE" << nl;
-  *ci << fname << "::" << lname << " (" << this->name () <<
-    "_var &p) // constructor from _var" << nl;
-  *ci << "\t: ptr_ (p.out ())" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "CORBA::release (this->ptr_);" << nl;
-  *ci << "this->ptr_ = " << this->name () << "::_nil ();\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  // copy constructor
-  ci->indent ();
-  *ci << "ACE_INLINE" << nl;
-  *ci << fname << "::" << lname << " (" << fname <<
-    " &p) // copy constructor" << nl;
-  *ci << "\t: ptr_ (p.ptr_)" << nl;
-  *ci << "{}\n\n";
-
-      // assignment operator from _out &
-  ci->indent ();
-  *ci << "ACE_INLINE " << fname << " &" << nl;
-  *ci << fname << "::operator= (" << fname <<
-    " &p)" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "this->ptr_ = p.ptr_;" << nl;
-  *ci << "return *this;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-      // assignment operator from _var
-  ci->indent ();
-  *ci << "ACE_INLINE " << fname << " &" << nl;
-  *ci << fname << "::operator= (const " << this->name () <<
-    "_var &p)" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "this->ptr_ = " << this->name () << "::_duplicate (p.ptr ());" << nl;
-  *ci << "return *this;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-      // assignment operator from _ptr
-  ci->indent ();
-  *ci << "ACE_INLINE " << fname << " &" << nl;
-  *ci << fname << "::operator= (" << this->name () <<
-    "_ptr p)" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "this->ptr_ = p;" << nl;
-  *ci << "return *this;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-      // other extra methods - cast operator ()
-  ci->indent ();
-  *ci << "ACE_INLINE " << nl;
-  *ci << fname << "::operator " << this->name () <<
-    "_ptr &() // cast" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "return this->ptr_;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  // ptr function
-  ci->indent ();
-  *ci << "ACE_INLINE " << this->name () << "_ptr &" << nl;
-  *ci << fname << "::ptr (void) // ptr" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "return this->ptr_;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-      // operator->
-  ci->indent ();
-  *ci << "ACE_INLINE " << this->name () << "_ptr " << nl;
-  *ci << fname << "::operator-> (void)" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "return this->ptr_;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  return 0;
-}
-
-// generate typecode.
-// Typecode for interface comprises the enumerated value followed by the
-// encapsulation of the parameters
-
-int
-be_interface::gen_typecode (void)
-{
-  TAO_OutStream *cs; // output stream
-  TAO_NL  nl;        // end line
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-
-  cs = cg->client_stubs ();
-  cs->indent (); // start from whatever indentation level we were at
-
-  *cs << "CORBA::tk_objref, // typecode kind" << nl;
-  *cs << this->tc_size () << ", // encapsulation length\n";
-  // now emit the encapsulation
-  return this->gen_encapsulation ();
-}
-
-// generate encapsulation
-// An encapsulation for ourselves will be necessary when we are part of some
-// other IDL type and a typecode for that other type is being generated. This
-// will comprise our typecode kind. IDL types with parameters will additionally
-// have the encapsulation length and the entire typecode description
-int
-be_interface::gen_encapsulation (void)
-{
-  TAO_OutStream *cs; // output stream
-  TAO_NL  nl;        // end line
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-  long i, arrlen;
-  long *arr;  // an array holding string names converted to array of longs
-
-  cs = cg->client_stubs ();
-  cs->indent (); // start from whatever indentation level we were at
-
-  // XXXASG - byte order must be based on what m/c we are generating code -
-  // TODO
-  *cs << "TAO_ENCAP_BYTE_ORDER, // byte order" << nl;
-  // generate repoID
-  *cs << (ACE_OS::strlen (this->repoID ())+1) << ", ";
-  (void)this->tc_name2long (this->repoID (), arr, arrlen);
-  for (i=0; i < arrlen; i++)
-    {
-      cs->print ("0x%x, ", arr[i]);
-    }
-  *cs << " // repository ID = " << this->repoID () << nl;
-  // generate name
-  *cs << (ACE_OS::strlen (this->local_name ()->get_string ())+1) << ", ";
-  (void)this->tc_name2long(this->local_name ()->get_string (), arr, arrlen);
-  for (i=0; i < arrlen; i++)
-    {
-      cs->print ("0x%x, ", arr[i]);
-    }
-  *cs << " // name = " << this->local_name () << ",\n";
-
-  return 0;
-}
-
-// compute size of typecode
-long
-be_interface::tc_size (void)
-{
-   return 4 + 4 + this->tc_encap_len ();
-}
-
-// compute the encapsulation length
-long
-be_interface::tc_encap_len (void)
-{
-  if (this->encap_len_ == -1) // not computed yet
-    {
-      long slen;
-
-      // Macro to avoid "warning: unused parameter" type warning.
-      ACE_UNUSED_ARG (slen);
-
-      this->encap_len_ = 4;  // holds the byte order flag
-
-      this->encap_len_ += this->repoID_encap_len (); // for repoID
-
-      // do the same thing for the local name
-      this->encap_len_ += this->name_encap_len ();
-
-    }
-  return this->encap_len_;
-}
-
-// Narrowing
-IMPL_NARROW_METHODS3 (be_interface, AST_Interface, be_scope, be_type)
-IMPL_NARROW_FROM_DECL (be_interface)
-IMPL_NARROW_FROM_SCOPE (be_interface)
diff --git a/TAO/TAO_IDL/be/be_interface_fwd.cpp b/TAO/TAO_IDL/be/be_interface_fwd.cpp
deleted file mode 100644
index b23b934a1f7..00000000000
--- a/TAO/TAO_IDL/be/be_interface_fwd.cpp
+++ /dev/null
@@ -1,629 +0,0 @@
-/* -*- c++ -*- */
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    be_interface.h
-//
-// = DESCRIPTION
-//    Extension of class AST_Interface_Fwd that provides additional means for C++
-//    mapping of an interface.
-//
-// = AUTHOR
-//    Copyright 1994-1995 by Sun Microsystems, Inc.
-//    and
-//    Aniruddha Gokhale
-//
-// ============================================================================
-
-#include	"idl.h"
-#include	"idl_extern.h"
-#include	"be.h"
-
-/*
- * BE_InterfaceFwd
- */
-
-be_interface_fwd::be_interface_fwd (void)
-{
-}
-
-be_interface_fwd::be_interface_fwd (UTL_ScopedName *n, UTL_StrList *p)
-  : AST_InterfaceFwd (n, p),
-    AST_Decl (AST_Decl::NT_interface_fwd, n, p)
-{
-  this->size_type (be_decl::VARIABLE); // always the case
-}
-
-// ----------------------------------------
-//            CODE GENERATION METHODS
-// ----------------------------------------
-
-// generate the client header
-int be_interface_fwd::gen_client_header (void)
-{
-  TAO_OutStream *ch; // output stream
-  TAO_NL  nl;        // end line
-
-  if (!this->cli_hdr_gen_) // not already generated
-    {
-      // retrieve a singleton instance of the code generator
-      TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-
-      // get the client header
-      ch = cg->client_header ();
-
-      ch->indent (); // start from the current
-
-      // all we do in this is generate a forward declaration of the class
-      *ch << "class " << this->local_name () << ";" << nl;
-
-      // generate the ifdefined macro for the _ptr type
-      ch->gen_ifdef_macro (this->flatname (), "_ptr");
-
-      // generate the _ptr declaration
-      *ch << "typedef " << this->local_name () << " *" << this->local_name () <<
-        "_ptr; \n";
-
-      ch->gen_endif ();
-
-      // enclose under an ifdef macro
-      ch->gen_ifdef_macro (this->flatname (), "_var");
-
-      // generate the _var declaration
-      if (this->gen_var_defn () == -1)
-        {
-          ACE_ERROR ((LM_ERROR,
-                      "be_interface_fwd - error generating _var definition\n"));
-          return -1;
-        }
-      // gen an endif
-      ch->gen_endif ();
-
-      // enclose under an ifdef macro
-      ch->gen_ifdef_macro (this->flatname (), "_out");
-
-      // generate the _out declaration - ORBOS/97-05-15 pg 16-20 spec
-      if (this->gen_out_defn () == -1)
-        {
-          ACE_ERROR ((LM_ERROR,
-                      "be_interface_fwd - error generating _var definition\n"));
-          return -1;
-        }
-
-      // generate the endif macro
-      ch->gen_endif ();
-
-      this->cli_hdr_gen_ = I_TRUE;
-    }
-  return 0;
-}
-
-int
-be_interface_fwd::gen_client_stubs (void)
-{
-  return 0;
-}
-
-int
-be_interface_fwd::gen_client_inline (void)
-{
-  TAO_OutStream *ci; // output stream
-
-  // retrieve a singleton instance of the code generator
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-
-  ci = cg->client_inline ();
-
-  // generate the ifdefined macro for  the _var type
-  ci->gen_ifdef_macro (this->flatname (), "_var");
-
-  if (this->gen_var_impl () == -1)
-    {
-      ACE_ERROR ((LM_ERROR, "be_interface_fwd: _var impl code gen failed\n"));
-      return -1;
-    }
-
-  ci->gen_endif ();
-
-  // generate the ifdefined macro for  the _out type
-  ci->gen_ifdef_macro (this->flatname (), "_out");
-
-  if (this->gen_out_impl () == -1)
-    {
-      ACE_ERROR ((LM_ERROR, "be_interface_fwd: _out impl code gen failed\n"));
-      return -1;
-    }
-  ci->gen_endif ();
-
-  return 0;
-}
-
-int
-be_interface_fwd::gen_server_header (void)
-{
-  return 0;
-}
-
-int
-be_interface_fwd::gen_server_skeletons (void)
-{
-  return 0;
-}
-
-int
-be_interface_fwd::gen_server_inline (void)
-{
-  return 0;
-}
-
-// generate the var definition
-int
-be_interface_fwd::gen_var_defn (void)
-{
-  TAO_OutStream *ch; // output stream
-  TAO_NL  nl;        // end line
-  char namebuf [NAMEBUFSIZE];  // names
-
-  ACE_OS::memset (namebuf, '\0', NAMEBUFSIZE);
-  ACE_OS::sprintf (namebuf, "%s_var", this->local_name ()->get_string ());
-
-  // retrieve a singleton instance of the code generator
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-
-  ch = cg->client_header ();
-
-  // generate the var definition (always in the client header).
-  // Depending upon the data type, there are some differences which we account
-  // for over here.
-
-  ch->indent (); // start with whatever was our current indent level
-  *ch << "class " << namebuf << nl;
-  *ch << "{" << nl;
-  *ch << "public:\n";
-  ch->incr_indent ();
-
-  // default constr
-  *ch << namebuf << " (void); // default constructor" << nl;
-  *ch << namebuf << " (" << local_name () << "_ptr);" << nl;
-
-  // copy constructor
-  *ch << namebuf << " (const " << namebuf <<
-    " &); // copy constructor" << nl;
-
-  // destructor
-  *ch << "~" << namebuf << " (void); // destructor" << nl;
-  *ch << nl;
-
-  // assignment operator from a pointer
-  *ch << namebuf << " &operator= (" << local_name () << "_ptr);" << nl;
-
-  // assignment from _var
-  *ch << namebuf << " &operator= (const " << namebuf <<
-    " &);" << nl;
-
-  // arrow operator
-  *ch << local_name () << "_ptr operator-> (void) const;" << nl;
-
-  *ch << nl;
-
-  // other extra types (cast operators, [] operator, and others)
-  *ch << "operator const " << local_name () << "_ptr &() const;" << nl;
-  *ch << "operator " << local_name () << "_ptr &();" << nl;
-
-  *ch << "// in, inout, out, _retn " << nl;
-  // the return types of in, out, inout, and _retn are based on the parameter
-  // passing rules and the base type
-  *ch << local_name () << "_ptr in (void) const;" << nl;
-  *ch << local_name () << "_ptr &inout (void);" << nl;
-  *ch << local_name () << "_ptr &out (void);" << nl;
-  *ch << local_name () << "_ptr _retn (void);" << nl;
-
-  // generate an additional member function that returns the underlying pointer
-  *ch << local_name () << "_ptr ptr (void) const;\n";
-
-  *ch << "\n";
-  ch->decr_indent ();
-
-  // private
-  *ch << "private:\n";
-  ch->incr_indent ();
-  *ch << local_name () << "_ptr ptr_;\n";
-
-  ch->decr_indent ();
-  *ch << "};\n\n";
-
-  return 0;
-}
-
-// implementation of the _var class. All of these get generated in the inline
-// file
-int
-be_interface_fwd::gen_var_impl (void)
-{
-  TAO_OutStream *ci; // output stream
-  TAO_NL  nl;        // end line
-  char fname [NAMEBUFSIZE];  // to hold the full and
-  char lname [NAMEBUFSIZE];  // local _var names
-
-  ACE_OS::memset (fname, '\0', NAMEBUFSIZE);
-  ACE_OS::sprintf (fname, "%s_var", this->fullname ());
-
-  ACE_OS::memset (lname, '\0', NAMEBUFSIZE);
-  ACE_OS::sprintf (lname, "%s_var", local_name ()->get_string ());
-
-  // retrieve a singleton instance of the code generator
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-
-  ci = cg->client_inline ();
-  cg->outstream (ci);
-
-  // generate the var implementation in the inline file
-  // Depending upon the data type, there are some differences which we account
-  // for over here.
-
-  ci->indent (); // start with whatever was our current indent level
-
-  *ci << "// *************************************************************"
-      << nl;
-  *ci << "// Inline operations for class " << fname << nl;
-  *ci << "// *************************************************************\n\n";
-
-  // default constr
-  *ci << "ACE_INLINE" << nl;
-  *ci << fname << "::" << lname <<
-    " (void) // default constructor" << nl;
-  *ci << "\t" << ": ptr_ (" << this->name () << "::_nil ())" << nl;
-  *ci << "{}\n\n";
-
-  // constr from a _ptr
-  ci->indent ();
-  *ci << "ACE_INLINE" << nl;
-  *ci << fname << "::" << lname << " (" << name () << "_ptr p)" << nl;
-  *ci << "\t: ptr_ (p)" << nl;
-  *ci << "{}\n\n";
-
-  // the additional ptr () member function. This member function must be
-  // defined before the remaining member functions including the copy
-  // constructor because this inline function is used elsewhere. Hence to make
-  // inlining of this function possible, we must define it before its use.
-  ci->indent ();
-  *ci << "ACE_INLINE " << name () << "_ptr " << nl;
-  *ci << fname << "::ptr (void) const" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "return this->ptr_;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  // copy constructor
-  ci->indent ();
-  *ci << "ACE_INLINE" << nl;
-  *ci << fname << "::" << lname << " (const " << fname <<
-    " &p) // copy constructor" << nl;
-  *ci << "\t: ptr_ (" << name () << "::_duplicate (p.ptr ()))" << nl;
-  *ci << "{}\n\n";
-
-  // destructor
-  ci->indent ();
-  *ci << "ACE_INLINE" << nl;
-  *ci << fname << "::~" << lname << " (void) // destructor" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "CORBA::release (this->ptr_);\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  // assignment operator
-  ci->indent ();
-  *ci << "ACE_INLINE " << fname << " &" << nl;
-  *ci << fname << "::operator= (" << name () <<
-    "_ptr p)" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "CORBA::release (this->ptr_);" << nl;
-  *ci << "this->ptr_ = p;" << nl;
-  *ci << "return *this;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  // assignment operator from _var
-  ci->indent ();
-  *ci << "ACE_INLINE " << fname << " &" << nl;
-  *ci << fname << "::operator= (const " << fname <<
-    " &p)" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "if (this != &p)" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "CORBA::release (this->ptr_);" << nl;
-  *ci << "this->ptr_ = " << name () << "::_duplicate (p.ptr ());\n";
-  ci->decr_indent ();
-  *ci << "}" << nl;
-  *ci << "return *this;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  // other extra methods - cast operator ()
-  ci->indent ();
-  *ci << "ACE_INLINE " << nl;
-  *ci << fname << "::operator const " << name () <<
-    "_ptr &() const // cast" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "return this->ptr_;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  ci->indent ();
-  *ci << "ACE_INLINE " << nl;
-  *ci << fname << "::operator " << name () << "_ptr &() // cast " << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "return this->ptr_;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  // operator->
-  ci->indent ();
-  *ci << "ACE_INLINE " << name () << "_ptr " << nl;
-  *ci << fname << "::operator-> (void) const" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "return this->ptr_;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  // in, inout, out, and _retn
-  ci->indent ();
-  *ci << "ACE_INLINE " << name () << "_ptr" << nl;
-  *ci << fname << "::in (void) const" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "return this->ptr_;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  ci->indent ();
-  *ci << "ACE_INLINE " << name () << "_ptr &" << nl;
-  *ci << fname << "::inout (void)" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "return this->ptr_;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  ci->indent ();
-  *ci << "ACE_INLINE " << name () << "_ptr &" << nl;
-  *ci << fname << "::out (void)" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "CORBA::release (this->ptr_);" << nl;
-  *ci << "this->ptr_ = " << this->name () << "::_nil ();" << nl;
-  *ci << "return this->ptr_;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  ci->indent ();
-  *ci << "ACE_INLINE " << name () << "_ptr " << nl;
-  *ci << fname << "::_retn (void)" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "// yield ownership of managed obj reference" << nl;
-  *ci << this->name () << "_ptr val = this->ptr_;" << nl;
-  *ci << "this->ptr_ = " << this->name () << "::_nil ();" << nl;
-  *ci << "return val;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  return 0;
-}
-
-// generate the _out definition
-int
-be_interface_fwd::gen_out_defn (void)
-{
-  TAO_OutStream *ch; // output stream
-  TAO_NL  nl;        // end line
-  char namebuf [NAMEBUFSIZE];  // to hold the _out name
-
-  ACE_OS::memset (namebuf, '\0', NAMEBUFSIZE);
-  ACE_OS::sprintf (namebuf, "%s_out", local_name ()->get_string ());
-
-  // retrieve a singleton instance of the code generator
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-
-  ch = cg->client_header ();
-
-  // generate the out definition (always in the client header)
-  ch->indent (); // start with whatever was our current indent level
-
-  *ch << "class " << namebuf << nl;
-  *ch << "{" << nl;
-  *ch << "public:\n";
-  ch->incr_indent ();
-
-  // No default constructor
-
-  // constructor from a pointer
-  *ch << namebuf << " (" << local_name () << "_ptr &);" << nl;
-  // constructor from a _var &
-  *ch << namebuf << " (" << local_name () << "_var &);" << nl;
-  // constructor from a _out &
-  *ch << namebuf << " (" << namebuf << " &);" << nl;
-  // assignment operator from a _out &
-  *ch << namebuf << " &operator= (" << namebuf << " &);" << nl;
-  // assignment operator from a pointer &, cast operator, ptr fn, operator
-  // -> and any other extra operators
-  // only interface allows assignment from var &
-  *ch << namebuf << " &operator= (const " << local_name () << "_var &);" << nl;
-  *ch << namebuf << " &operator= (" << local_name () << "_ptr);" << nl;
-  // cast
-  *ch << "operator " << local_name () << "_ptr &();" << nl;
-  // ptr fn
-  *ch << local_name () << "_ptr &ptr (void);" << nl;
-  // operator ->
-  *ch << local_name () << "_ptr operator-> (void);" << nl;
-
-  *ch << "\n";
-  ch->decr_indent ();
-  *ch << "private:\n";
-  ch->incr_indent ();
-  *ch << local_name () << "_ptr &ptr_;\n";
-
-  ch->decr_indent ();
-  *ch << "};\n\n";
-
-  return 0;
-}
-
-int
-be_interface_fwd::gen_out_impl (void)
-{
-  TAO_OutStream *ci; // output stream
-  TAO_NL  nl;        // end line
-  char fname [NAMEBUFSIZE];  // to hold the full and
-  char lname [NAMEBUFSIZE];  // local _out names
-
-  ACE_OS::memset (fname, '\0', NAMEBUFSIZE);
-  ACE_OS::sprintf (fname, "%s_out", this->fullname ());
-
-  ACE_OS::memset (lname, '\0', NAMEBUFSIZE);
-  ACE_OS::sprintf (lname, "%s_out", local_name ()->get_string ());
-
-  // retrieve a singleton instance of the code generator
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-
-  ci = cg->client_inline ();
-  cg->outstream (ci);
-
-  // generate the var implementation in the inline file
-  // Depending upon the data type, there are some differences which we account
-  // for over here.
-
-  ci->indent (); // start with whatever was our current indent level
-
-  *ci << "// *************************************************************"
-      << nl;
-  *ci << "// Inline operations for class " << fname << nl;
-  *ci << "// *************************************************************\n\n";
-
-      // constr from a _ptr
-  ci->indent ();
-  *ci << "ACE_INLINE" << nl;
-  *ci << fname << "::" << lname << " (" << name () << "_ptr &p)" << nl;
-  *ci << "\t: ptr_ (p)" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "this->ptr_ = " << this->name () << "::_nil ();\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  // constructor from _var &
-  ci->indent ();
-  *ci << "ACE_INLINE" << nl;
-  *ci << fname << "::" << lname << " (" << this->name () <<
-    "_var &p) // constructor from _var" << nl;
-  *ci << "\t: ptr_ (p.out ())" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "CORBA::release (this->ptr_);" << nl;
-  *ci << "this->ptr_ = " << this->name () << "::_nil ();\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  // copy constructor
-  ci->indent ();
-  *ci << "ACE_INLINE" << nl;
-  *ci << fname << "::" << lname << " (" << fname <<
-    " &p) // copy constructor" << nl;
-  *ci << "\t: ptr_ (p.ptr_)" << nl;
-  *ci << "{}\n\n";
-
-      // assignment operator from _out &
-  ci->indent ();
-  *ci << "ACE_INLINE " << fname << " &" << nl;
-  *ci << fname << "::operator= (" << fname <<
-    " &p)" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "this->ptr_ = p.ptr_;" << nl;
-  *ci << "return *this;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-      // assignment operator from _var
-  ci->indent ();
-  *ci << "ACE_INLINE " << fname << " &" << nl;
-  *ci << fname << "::operator= (const " << this->name () <<
-    "_var &p)" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "this->ptr_ = " << this->name () << "::_duplicate (p.ptr ());" << nl;
-  *ci << "return *this;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-      // assignment operator from _ptr
-  ci->indent ();
-  *ci << "ACE_INLINE " << fname << " &" << nl;
-  *ci << fname << "::operator= (" << this->name () <<
-    "_ptr p)" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "this->ptr_ = p;" << nl;
-  *ci << "return *this;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-      // other extra methods - cast operator ()
-  ci->indent ();
-  *ci << "ACE_INLINE " << nl;
-  *ci << fname << "::operator " << this->name () <<
-    "_ptr &() // cast" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "return this->ptr_;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  // ptr function
-  ci->indent ();
-  *ci << "ACE_INLINE " << this->name () << "_ptr &" << nl;
-  *ci << fname << "::ptr (void) // ptr" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "return this->ptr_;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-      // operator->
-  ci->indent ();
-  *ci << "ACE_INLINE " << this->name () << "_ptr " << nl;
-  *ci << fname << "::operator-> (void)" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "return this->ptr_;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  return 0;
-}
-int
-be_interface_fwd::gen_typecode (void)
-{
-  return 0;
-}
-
-long
-be_interface_fwd::tc_size (void)
-{
-  return 0;
-}
-
-// Narrowing
-IMPL_NARROW_METHODS2 (be_interface_fwd, AST_InterfaceFwd, be_type)
-IMPL_NARROW_FROM_DECL (be_interface_fwd)
diff --git a/TAO/TAO_IDL/be/be_module.cpp b/TAO/TAO_IDL/be/be_module.cpp
deleted file mode 100644
index e9cddfab94a..00000000000
--- a/TAO/TAO_IDL/be/be_module.cpp
+++ /dev/null
@@ -1,203 +0,0 @@
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    be_module.cpp
-//
-// = DESCRIPTION
-//    Extension of class AST_Module that provides additional means for C++
-//    mapping of a module
-//
-// = AUTHOR
-//    Copyright 1994-1995 by Sun Microsystems, Inc.
-//    and
-//    Aniruddha Gokhale
-//
-// ============================================================================
-
-#include	"idl.h"
-#include	"idl_extern.h"
-#include	"be.h"
-
-/*
- * BE_Module
- */
-be_module::be_module (void)
-{
-}
-
-be_module::be_module (UTL_ScopedName *n, UTL_StrList *p)
-  : AST_Decl (AST_Decl::NT_module, n, p),
-    UTL_Scope (AST_Decl::NT_module)
-{
-}
-
-// ----------------------------------------
-//            CODE GENERATION METHODS
-// ----------------------------------------
-
-// generate the client header
-int be_module::gen_client_header (void)
-{
-  TAO_OutStream *ch; // output stream
-  TAO_NL  nl;        // end line
-
-
-  // retrieve a singleton instance of the code generator
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-  cg->push (TAO_CodeGen::TAO_MODULE_CH); // set the current code generation state
-  ch = cg->client_header (); // get the stream
-
-  // XXXASG - Modules really map to namespace. We need to see if our target
-  // compiler supports namespaces or not. For this release we opt to generate a
-  // class definition for a module
-
-  ch->indent (); // start with whatever indentation level we are at
-
-  // now generate the class definition
-  *ch << "class " << local_name ();
-
-  // generate the body
-  *ch << "{" << nl;
-  *ch << "public:\n";
-  ch->incr_indent (0);
-
-  // generate code for the module definition by traversing thru the
-  // elements of its scope. We depend on the front-end to have made sure
-  // that only legal syntactic elements appear in our scope.
-  if (be_scope::gen_client_header () == -1)
-    {
-      ACE_ERROR ((LM_ERROR, "be_module::gen_client_header\n"));
-      ACE_ERROR ((LM_ERROR, "Scope code generation failure\n"));
-      return -1;
-    }
-
-  ch->decr_indent ();
-  *ch << "};\n\n";
-  cg->pop ();
-  return 0;
-}
-
-int be_module::gen_client_stubs (void)
-{
-  // retrieve a singleton instance of the code generator
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-  cg->push (TAO_CodeGen::TAO_MODULE_CS); // set the current code generation state
-
-  // gen code for elements in the scope
-  if (be_scope::gen_client_stubs () == -1)
-    {
-      ACE_ERROR ((LM_ERROR, "be_module::gen_client_stubs\n"));
-      ACE_ERROR ((LM_ERROR, "Scope code generation failure\n"));
-      return -1;
-    }
-
-  cg->pop ();
-  return 0;
-}
-
-int be_module::gen_server_header (void)
-{
-  TAO_OutStream *sh; // output stream
-  TAO_NL  nl;        // end line
-  AST_Decl *d;
-
-  // retrieve a singleton instance of the code generator
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-  cg->push (TAO_CodeGen::TAO_MODULE_SH); // set the current code generation state
-
-  sh = cg->server_header ();
-
-  // generate the skeleton class name
-
-  sh->indent (); // start with whatever indentation level we are at
-
-  // now generate the class definition. The prefix POA_ is prepended to our
-  // name only if we are the outermost module
-  d = ScopeAsDecl (this->defined_in ());
-  if (d->node_type () == AST_Decl::NT_root)
-    // we are outermost module
-    *sh << "class POA_" << local_name () << nl;
-  else
-    // we are inside another module
-    *sh << "class " << local_name () << nl;
-
-  *sh << "{" << nl;
-  *sh << "public:\n";
-  sh->incr_indent (0);
-
-  if (be_scope::gen_server_header () == -1)
-    {
-      ACE_ERROR ((LM_ERROR, "be_module::gen_server_header\n"));
-      ACE_ERROR ((LM_ERROR, "Scope code generation failure\n"));
-      return -1;
-    }
-
-  sh->decr_indent ();
-  *sh << "};\n\n";
-  cg->pop ();
-  return 0;
-}
-
-int be_module::gen_server_skeletons (void)
-{
-  // retrieve a singleton instance of the code generator
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-  cg->push (TAO_CodeGen::TAO_MODULE_SS); // set the current code generation state
-
-  if (be_scope::gen_server_skeletons () == -1)
-    {
-      ACE_ERROR ((LM_ERROR, "be_module::gen_server_skeletons\n"));
-      ACE_ERROR ((LM_ERROR, "Scope code generation failure\n"));
-      return -1;
-    }
-  cg->pop ();
-  return 0;
-}
-
-// Generates the client-side inline information
-int
-be_module::gen_client_inline (void)
-{
-  // retrieve a singleton instance of the code generator
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-  cg->push (TAO_CodeGen::TAO_MODULE_CI); // set the current code generation state
-
-  // gen code for elements in the scope
-  if (be_scope::gen_client_inline () == -1)
-    {
-      ACE_ERROR ((LM_ERROR, "be_module::gen_client_inline\n"));
-      ACE_ERROR ((LM_ERROR, "Scope code generation failure\n"));
-      return -1;
-    }
-
-  cg->pop ();
-  return 0;
-}
-
-// Generates the server-side inline
-int
-be_module::gen_server_inline (void)
-{
-  // retrieve a singleton instance of the code generator
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-  cg->push (TAO_CodeGen::TAO_MODULE_SI); // set the current code generation state
-
-  // gen code for elements in the scope
-  if (be_scope::gen_server_inline () == -1)
-    {
-      ACE_ERROR ((LM_ERROR, "be_module::gen_server_inline\n"));
-      ACE_ERROR ((LM_ERROR, "Scope code generation failure\n"));
-      return -1;
-    }
-
-  cg->pop ();
-  return 0;
-}
-
-// Narrowing
-IMPL_NARROW_METHODS3 (be_module, AST_Module, be_scope, be_decl)
-IMPL_NARROW_FROM_DECL (be_module)
-IMPL_NARROW_FROM_SCOPE (be_module)
diff --git a/TAO/TAO_IDL/be/be_operation.cpp b/TAO/TAO_IDL/be/be_operation.cpp
deleted file mode 100644
index 07fae5799dd..00000000000
--- a/TAO/TAO_IDL/be/be_operation.cpp
+++ /dev/null
@@ -1,642 +0,0 @@
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    be_operation.cpp
-//
-// = DESCRIPTION
-//    Extension of class AST_Operation that provides additional means for C++
-//    mapping.
-//
-// = AUTHOR
-//    Copyright 1994-1995 by Sun Microsystems, Inc.
-//    and
-//    Aniruddha Gokhale
-//
-// ============================================================================
-
-#include	"idl.h"
-#include	"idl_extern.h"
-#include	"be.h"
-
-/*
- * BE_Operation
- */
-be_operation::be_operation (void)
-{
-}
-
-be_operation::be_operation (AST_Type *rt, AST_Operation::Flags fl,
-                            UTL_ScopedName *n, UTL_StrList *p)
-  : AST_Operation (rt, fl, n, p),
-    AST_Decl (AST_Decl::NT_op, n, p),
-    UTL_Scope (AST_Decl::NT_op)
-{
-}
-
-int
-be_operation::gen_client_header (void)
-{
-  TAO_OutStream *ch; // output stream
-  be_type *bt;       // type node
-  be_state *s;       // state based code gen object
-
-  // retrieve a singleton instance of the code generator
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-  ch = cg->client_header ();
-  cg->outstream (ch); // important to set the current stream
-
-  ch->indent (); // start with the current indentation level
-
-  // every operation is declared virtual in the client code
-  *ch << "virtual ";
-
-  // first generate the return type
-  bt = be_type::narrow_from_decl (this->return_type ());
-  cg->push (TAO_CodeGen::TAO_OPERATION_CH); // we are now generating an
-                                            // operation definition with the
-                                            // return type first
-
-  s = cg->make_state (); // retrieve state based object
-
-  if (!s || !bt || (s->gen_code (bt, this) == -1))
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_operation::gen_client_header - "
-                         "return type generation failure\n"),
-                        -1);
-    }
-  cg->pop (); // restore previous state
-
-  // generate the operation name
-  *ch << " " << this->local_name () << " (";
-
-  // generate the arguments with the appropriate mapping
-  cg->push (TAO_CodeGen::TAO_ARGUMENT_CH); // generating code for arguments in
-                                           // the signature
-  if (be_scope::gen_client_header () == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_operation::gen_client_header - "
-                         "failed in argument generation in signature\n"),
-                        -1);
-    }
-  cg->pop ();
-
-  // XXXASG
-  // additional argument in the form of CORBA::Environment since TAO does not
-  // yet support C++ style Exceptions. However, we can have an option to the
-  // "tao" IDL compiler to ask it to generate code for exceptions. This will be
-  // handled in a later release.
-  *ch << "CORBA::Environment &env);\n";
-
-  return 0;
-}
-
-int
-be_operation::gen_client_stubs (void)
-{
-  TAO_OutStream *cs; // output stream
-  TAO_NL  nl;        // end line
-  be_type *bt;       // type node
-  UTL_ScopeActiveIterator *si; // scope iterator
-  AST_Decl *d;       // temp node
-  be_argument *bd;   // argument node
-  be_predefined_type *bpd=0; // predefined type used for return VOID type
-  be_state *s;       // state based code gen object
-  long paramtblsize = 0;  // size of the paradata table
-
-
-  // retrieve a singleton instance of the code generator
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-
-  cs = cg->client_stubs ();
-
-  // for each operation, generate the paramdata and calldata tables followed by
-  // the actual stub
-
-  cs->indent (); // start with current indentation level
-
-  // retrieve the return type
-  bt = be_type::narrow_from_decl (this->return_type ());
-
-  // bt holds the return type. Declare a variable that will hold the return
-  // type. However, we must be careful if the return type is a void
-  if (bt->node_type () == AST_Decl::NT_pre_defined)
-    {
-      bpd = be_predefined_type::narrow_from_decl (bt);
-    }
-
-  // generate the TAO_Param_Data table
-  *cs << "static const TAO_Param_Data " << this->flatname () <<
-    "_paramdata [] = " << nl;
-  *cs << "{\n";
-  cs->incr_indent ();
-
-  // entry for the return type
-  *cs << "{" << bt->tc_name () << ", PARAM_RETURN, 0}";
-  paramtblsize++;
-  // if we have any arguments, get each one of them
-  if (this->nmembers () > 0)
-    {
-      // if there are elements in this scope
-
-      si = new UTL_ScopeActiveIterator (this, UTL_Scope::IK_decls);
-      // instantiate a scope iterator.
-
-      while (!(si->is_done ()))
-        {
-          // get the next AST decl node
-          d = si->item ();
-          // only if this is an argument node
-          if (d->node_type () == AST_Decl::NT_argument)
-            {
-              bd = be_argument::narrow_from_decl (d);
-              bt = be_type::narrow_from_decl (bd->field_type ());
-              *cs << "," << nl; // put a comma and newline before the
-              // previous entry
-              *cs << "{" << bt->tc_name ();
-              // based on the direction, output the appropriate constant.
-              switch (bd->direction ())
-                {
-                case AST_Argument::dir_IN:
-                  *cs << ", PARAM_IN, 0}";
-                  break;
-                case AST_Argument::dir_INOUT:
-                  *cs << ", PARAM_INOUT, 0}";
-                  break;
-                case AST_Argument::dir_OUT:
-                  *cs << ", PARAM_OUT, 0}";
-                  break;
-                } // end switch
-              paramtblsize++;
-            } // end if argument node
-          si->next ();
-        } // end of while
-      delete si; // free the iterator object
-    } // end of arg list
-  *cs << "\n";
-  cs->decr_indent ();
-  *cs << "};\n\n";
-
-  // now generate the calldata table
-
-  cs->indent ();
-  *cs << "static const TAO_Call_Data " << this->flatname () << "_calldata = "
-      << nl;
-  *cs << "{";
-  *cs << "\"" << this->local_name () << "\", ";
-
-  // are we oneway or two operation?
-  if (this->flags () == AST_Operation::OP_oneway)
-    {
-      *cs << "0, "; // for false
-    }
-  else
-    {
-      *cs << "1, "; // for true
-    }
-  // insert the size of the paramdata table
-  *cs << paramtblsize << ", ";
-
-  // insert the address of the paramdata table
-  *cs << this->flatname () << "_paramdata, ";
-
-  // XXXASG - Exception list goes here (if it exists) - TODO
-  *cs << "0, 0};\n\n";
-
-  // now generate the actual stub
-
-  // retrieve the return type again because we have used bt to also retrieve
-  // the argument types
-  bt = be_type::narrow_from_decl (this->return_type ());
-
-  // bt holds the return type. Declare a variable that will hold the return
-  // type. However, we must be careful if the return type is a void
-  if (bt->node_type () == AST_Decl::NT_pre_defined)
-    {
-      bpd = be_predefined_type::narrow_from_decl (bt);
-    }
-
-  // first generate the return type
-  cs->indent ();
-  cg->push (TAO_CodeGen::TAO_OPERATION_RETURN_TYPE_CS); // declare a return
-                                                        // type of the stub
-  s = cg->make_state ();
-  if (!s || !bt || (s->gen_code (bt, this) == -1))
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_operation::gen_client_stubs - "
-                         "return type generation failure\n"),
-                        -1);
-    }
-  cg->pop ();
-
-  // generate the operation name
-  *cs << " " << this->name () << " (";
-
-  // generate the arguments with the appropriate mapping
-  cg->push (TAO_CodeGen::TAO_ARGUMENT_CS); // generating code for arguments in
-                                           // the signature
-  if (be_scope::gen_client_stubs () == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_operation::gen_client_stubs - "
-                         "failure in argument generation in signature\n"),
-                        -1);
-    }
-  cg->pop ();
-
-  // last argument - is always CORBA::Environment
-  *cs << "CORBA::Environment &env)" << nl;
-  *cs << "{\n";
-  cs->incr_indent ();
-
-  // declare a return type
-  cg->push (TAO_CodeGen::TAO_OPERATION_RETVAL_DECL_CS);
-  s = cg->make_state ();
-  if (!s || !bt || (s->gen_code (bt, this) == -1))
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_operation::gen_client_stubs - "
-                         "retval declaration failure\n"),
-                        -1);
-    }
-  cg->pop ();
-
-  // generate code that calls QueryInterface
-  *cs << "STUB_Object *istub;\n\n";
-  cs->indent ();
-  *cs << "if (this->QueryInterface (IID_STUB_Object, " <<
-    "(void **)&istub) != NOERROR)" << nl;
-  *cs << "{\n";
-  cs->incr_indent ();
-  *cs << "env.exception (new CORBA::DATA_CONVERSION (CORBA::COMPLETED_NO));" <<
-    nl;
-
-  // return the appropriate error value on exception
-  cg->push (TAO_CodeGen::TAO_OPERATION_RETVAL_EXCEPTION_CS);
-  s = cg->make_state ();
-  if (!s || !bt || (s->gen_code (bt, this) == -1))
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_operation::gen_client_stubs - "
-                         "failure returning from exception\n"),
-                        -1);
-    }
-  cg->pop ();
-
-  cs->decr_indent ();
-  *cs << "}" << nl;
-  *cs << "this->Release (); // QueryInterface has bumped up our refcount" << nl;
-
-  // do any pre do_call stuff with arguments
-  cg->push (TAO_CodeGen::TAO_ARGUMENT_PRE_DOCALL_CS);
-  if (be_scope::gen_client_stubs () == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_operation::gen_client_stubs - "
-                         "failure generating pre docall stuff\n"),
-                        -1);
-    }
-  cg->pop ();
-
-  // call do_call with appropriate number of arguments
-  *cs << "istub->do_call (env, &" << this->flatname () << "_calldata";
-
-  // if our return type is not void, then pass the address of retval
-  if (!bpd || (bpd->pt () != AST_PredefinedType::PT_void))
-    {
-      *cs << ", &retval";
-    }
-  else
-    {
-      // pass a 0
-      *cs << ", 0";
-    }
-
-  cg->push (TAO_CodeGen::TAO_ARGUMENT_DOCALL_CS);
-  if (be_scope::gen_client_stubs () == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_operation::gen_client_stubs - "
-                         "failed to emit code for arguments in docall\n"),
-                        -1);
-    }
-  cg->pop ();
-  *cs << ");" << nl;
-
-  // do any post do_call stuff with arguments
-  cg->push (TAO_CodeGen::TAO_ARGUMENT_POST_DOCALL_CS);
-  if (be_scope::gen_client_stubs () == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_operation::gen_client_stubs - "
-                         "failed to emit code for post docall processing\n"),
-                        -1);
-    }
-  cg->pop ();
-
-  // return the retval
-  cg->push (TAO_CodeGen::TAO_OPERATION_RETVAL_RETURN_CS);
-  s = cg->make_state ();
-  if (!s || !bt || (s->gen_code (bt, this) == -1))
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_operation::gen_client_stubs\n"
-                         "return val return generation failure\n"),
-                        -1);
-    }
-  cg->pop ();
-
-  cs->decr_indent (0);
-  *cs << "\n}\n\n";
-  return 0;
-}
-
-int
-be_operation::gen_server_header (void)
-{
-  TAO_OutStream *sh; // output stream
-  be_type *bt;       // type node
-  be_state *s;       // state based code generator object
-
-  // retrieve a singleton instance of the code generator
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-  cg->push (TAO_CodeGen::TAO_OPERATION_SH); // we are now generating an
-                                            // operation definition
-
-  sh = cg->server_header ();
-  cg->outstream (sh); // set current stream
-  sh->indent (); // start with the current indentation level
-
-  // every operation is declared virtual
-  *sh << "virtual ";
-
-  // first generate the return type
-  bt = be_type::narrow_from_decl (this->return_type ());
-  s = cg->make_state (); // retrieve code gen object for this state
-  if (!s || !bt || (s->gen_code (bt, this) == -1))
-    {
-      ACE_ERROR ((LM_ERROR, "be_operation::gen_server_header\n"));
-      ACE_ERROR ((LM_ERROR, "return type generation failure\n"));
-      return -1;
-    }
-  // generate the operation name
-  *sh << " " << this->local_name () << " (";
-
-  // generate the arguments with the appropriate mapping
-  cg->push (TAO_CodeGen::TAO_ARGUMENT_SH); // generating code for arguments in
-                                           // the signature
-  if (be_scope::gen_server_header () == -1)
-    {
-      ACE_ERROR ((LM_ERROR, "be_operation::gen_server_header\n"));
-      ACE_ERROR ((LM_ERROR, "Argument generation failure\n"));
-      return -1;
-    }
-  cg->pop ();
-
-  // XXXASG
-  // additional argument in the form of CORBA::Environment since TAO does not
-  // yet support Exceptions. However, we can have an option to the "tao" IDL
-  // compiler to ask it to generate code for exceptions. This will be handled
-  // in a later release.
-  *sh << " CORBA::Environment &env) = 0; // pure virtual\n";
-
-  sh->indent ();
-
-  // generate the static method corresponding to this method
-  *sh << "static void " << this->local_name () << "_skel (CORBA::ServerRequest &req,"
-      << " CORBA::Object_ptr obj, CORBA::Environment &env);\n\n";
-  cg->pop (); // restore previous state
-  return 0;
-}
-
-// Generate code for the operation skeleton that makes the upcall.
-// Special Note: We deviate a bit from our policy of handing over code
-// generation for elements in our scope to the be_scope class. For this method,
-// it is best to simulate that behavior here as it involves a lot of
-// complexity.
-int
-be_operation::gen_server_skeletons (void)
-{
-  TAO_OutStream *ss; // output stream
-  TAO_NL  nl;        // end line
-  be_type *bt;       // type node
-  be_type *rt;       // type node for the return type
-  UTL_ScopeActiveIterator *si; // scope iterator
-  AST_Decl *d;       // temp node
-  be_argument *bd = 0;   // argument node
-  be_state *s;       // state based code gen object
-  be_predefined_type *bpd=0; // predefined return type
-  be_interface *intf; // enclosing interface node
-
-  // retrieve a singleton instance of the code generator
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-  ss = cg->server_skeletons ();
-  cg->outstream (ss); // set current stream
-
-  ss->indent (); // start with the current indentation level
-
-  // retrieve our enclosing interface decl
-  intf = be_interface::narrow_from_decl (ScopeAsDecl (this->defined_in ()));
-
-  *ss << "void " << intf->full_skel_name () << "::"
-      << this->local_name () << "_skel ("
-      << "CORBA::ServerRequest &_tao_server_request, "
-      << "CORBA::Object_ptr _tao_object_reference, "
-      << "CORBA::Environment &_tao_environment)" << nl;
-  *ss << "{\n";
-  ss->incr_indent ();
-  // define an NVList to hold arguments
-  *ss << "CORBA::NVList_ptr \t nvlist;" << nl;
-  // define a variable that will eventually point to our implementation object
-  *ss << intf->full_skel_name () << "_ptr \t impl;" << nl;
-
-  // verify if we need to define a variable intended to hold the operation
-  // return type. We do not need one if the return type is void
-
-  rt = be_type::narrow_from_decl (this->return_type ());
-  if (!rt)
-    {
-      ACE_ERROR ((LM_ERROR,
-                  "be_operation::gen_server_skeletons - bad return type\n"));
-      return -1;
-    }
-  if (rt->node_type () == AST_Decl::NT_pre_defined)
-    {
-      bpd = be_predefined_type::narrow_from_decl (rt);
-    }
-  if (!bpd || (bpd->pt () != AST_PredefinedType::PT_void))
-    {
-      // not a void type
-      *ss << "CORBA::Any *result;" << nl;
-
-      // emit the return type
-      cg->push (TAO_CodeGen::TAO_OPERATION_RETVAL_DECL_SS); // emit type for
-                                                            // return value
-      // get a state based code gen object
-      s = cg->make_state ();
-
-      if (s->gen_code (rt, this) == -1)
-        {
-          ACE_ERROR ((LM_ERROR,
-           "be_operation::gen_server_skeletons - codegen failed for return type\n"));
-          return -1;
-        }
-      cg->pop ();
-    }
-
-  // if we have any arguments, get each one of them and allocate an Any and
-  // NamedValue for each. In addition, define a variable of that type
-  cg->push (TAO_CodeGen::TAO_ARGUMENT_VARDECL_SS);
-  if (be_scope::gen_server_skeletons () == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-          "be_operation::gen_server_skeletons - argument gen code failed\n"),
-                         -1);
-    }
-  *ss << "\n";
-  cg->pop ();
-
-  // declare an NVList and create one
-  ss->indent ();
-  *ss << "// create an NV list and populate it with typecodes" << nl;
-  *ss << "_tao_server_request.orb ()->create_list (0, nvlist); // initialize a list" << nl;
-
-  // add each argument according to the in, out, inout semantics
-  *ss << "// add each argument according to the in, out, inout semantics" << nl;
-  if (this->nmembers () > 0)
-    {
-      // if there are elements in this scope
-
-      si = new UTL_ScopeActiveIterator (this, UTL_Scope::IK_decls);
-      // instantiate a scope iterator.
-
-      while (!(si->is_done ()))
-        {
-          // get the next AST decl node
-          d = si->item ();
-          if (!d->imported ())
-            {
-              // only if this is an argument node
-              if (d->node_type () == AST_Decl::NT_argument)
-                {
-                  bd = be_argument::narrow_from_decl (d);
-                  bt = be_type::narrow_from_decl (bd->field_type ());
-                  // emit code that adds this argument to the
-                  *ss << "nv_" << bd->local_name () <<
-                    " = nvlist->add_value (\"" << bd->local_name () << "\", "
-                      << "any_" << bd->local_name () << ", ";
-                  switch (bd->direction ())
-                    {
-                    case AST_Argument::dir_IN:
-                      *ss << "CORBA::ARG_IN, _tao_environment);" << nl;
-                      break;
-                    case AST_Argument::dir_INOUT:
-                      *ss << "CORBA::ARG_INOUT, _tao_environment);" << nl;
-                      break;
-                    case AST_Argument::dir_OUT:
-                      *ss << "CORBA::ARG_OUT, _tao_environment);" << nl;
-                      break;
-                    }
-                } // end if argument node
-            } // end if ! imported
-          si->next ();
-        } // end of while
-      delete si; // free the iterator object
-    } // end of arg list
-
-  // parse the arguments
-  *ss << "// parse the arguments" << nl;
-  *ss << "_tao_server_request.params (nvlist, _tao_environment);" << nl;
-  *ss << "if (_tao_environment.exception ()) return;" << nl;
-
-  cg->push (TAO_CodeGen::TAO_ARGUMENT_PRE_UPCALL_SS);
-  if (be_scope::gen_server_skeletons () == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-          "be_operation::gen_server_skeletons - argument gen code failed\n"),
-                         -1);
-    }
-  cg->pop ();
-
-  // make the upcall
-  *ss << "impl = (" << intf->full_skel_name () << "_ptr) _tao_object_reference->get_subclass ();"
-      << nl;
-  if (!bpd || (bpd->pt () != AST_PredefinedType::PT_void))
-    {
-      cg->push (TAO_CodeGen::TAO_OPERATION_RETVAL_ASSIGN_SS);
-      s = cg->make_state ();
-      // emit code to assign to retval
-      if (!s || (s->gen_code (rt, this) == -1))
-        {
-          return -1;
-        }
-      *ss << " = impl->" << this->local_name () << "(";
-      cg->pop ();
-    }
-  else
-    {
-      // void return type
-      *ss << "impl->" << this->local_name () << "(";
-    }
-
-  cg->push (TAO_CodeGen::TAO_ARGUMENT_UPCALL_SS);
-  if (be_scope::gen_server_skeletons () == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-       "be_operation::gen_server_skeletons - argument in upcall\n"),
-                        -1);
-    }
-  cg->pop ();
-  *ss << "_tao_environment);" << nl;
-
-  cg->push (TAO_CodeGen::TAO_ARGUMENT_POST_UPCALL_SS);
-  if (be_scope::gen_server_skeletons () == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-          "be_operation::gen_server_skeletons - argument gen code failed\n"),
-                         -1);
-    }
-  cg->pop ();
-
-  // if there is any return type, send it via the ServerRequest
-  if (!bpd || (bpd->pt () != AST_PredefinedType::PT_void))
-    {
-      cg->push (TAO_CodeGen::TAO_OPERATION_RESULT_SS);
-      s = cg->make_state ();
-      if (!s || (s->gen_code (rt, this) == -1))
-        return -1;
-      cg->pop ();
-      *ss << "_tao_server_request.result (result, _tao_environment);" << nl;
-    }
-  *ss << "\n";
-  ss->decr_indent ();
-  *ss << "}\n\n";
-
-  return 0;
-}
-
-// Generates the client-side inline information
-int
-be_operation::gen_client_inline (void)
-{
-  // nothing to be done
-  return 0;
-}
-
-// Generates the server-side inline
-int
-be_operation::gen_server_inline (void)
-{
-  // nothing to be done
-  return 0;
-}
-
-// Narrowing
-IMPL_NARROW_METHODS3 (be_operation, AST_Operation, be_scope, be_decl)
-IMPL_NARROW_FROM_DECL (be_operation)
-IMPL_NARROW_FROM_SCOPE (be_operation)
diff --git a/TAO/TAO_IDL/be/be_predefined_type.cpp b/TAO/TAO_IDL/be/be_predefined_type.cpp
deleted file mode 100644
index e869f9889db..00000000000
--- a/TAO/TAO_IDL/be/be_predefined_type.cpp
+++ /dev/null
@@ -1,413 +0,0 @@
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    be_predefined_type.cpp
-//
-// = DESCRIPTION
-//    Extension of class AST_PredefinedType that provides additional means for C++
-//    mapping.
-//
-// = AUTHOR
-//    Copyright 1994-1995 by Sun Microsystems, Inc.
-//    and
-//    Aniruddha Gokhale
-//
-// ============================================================================
-
-#include	"idl.h"
-#include	"idl_extern.h"
-#include	"be.h"
-
-/*
- * BE_PredefinedType
- */
-be_predefined_type::be_predefined_type (void)
-{
-}
-
-be_predefined_type::be_predefined_type (AST_PredefinedType::PredefinedType t,
-                                        UTL_ScopedName *n, UTL_StrList *p)
-  : AST_PredefinedType (t, n, p),
-    AST_Decl (AST_Decl::NT_pre_defined, n, p)
-{
-  // generate a new Scoped Name for us such that we belong to the CORBA
-  // namespace
-  if (this->pt () != AST_PredefinedType::PT_void)
-    {
-
-      UTL_ScopedName *new_name = new UTL_ScopedName (new Identifier ("CORBA", 1, 0,
-                                                                     I_FALSE),
-                                                     NULL);
-      switch (this->pt ())
-        {
-        case AST_PredefinedType::PT_long:
-          {
-            new_name->nconc (new UTL_ScopedName (new Identifier ("Long", 1, 0,
-                                                                 I_FALSE), NULL));
-          }
-          break;
-        case AST_PredefinedType::PT_ulong:
-          {
-            new_name->nconc (new UTL_ScopedName (new Identifier ("ULong", 1, 0,
-                                                                 I_FALSE), NULL));
-          }
-          break;
-        case AST_PredefinedType::PT_short:
-          {
-            new_name->nconc (new UTL_ScopedName (new Identifier ("Short", 1, 0,
-                                                                 I_FALSE), NULL));
-          }
-          break;
-        case AST_PredefinedType::PT_ushort:
-          {
-            new_name->nconc (new UTL_ScopedName (new Identifier ("UShort", 1, 0,
-                                                                 I_FALSE), NULL));
-          }
-          break;
-        case AST_PredefinedType::PT_float:
-          {
-            new_name->nconc (new UTL_ScopedName (new Identifier ("Float", 1, 0,
-                                                                 I_FALSE), NULL));
-          }
-          break;
-        case AST_PredefinedType::PT_double:
-          {
-            new_name->nconc (new UTL_ScopedName (new Identifier ("Double", 1, 0,
-                                                                 I_FALSE), NULL));
-          }
-          break;
-        case AST_PredefinedType::PT_char:
-          {
-            new_name->nconc (new UTL_ScopedName (new Identifier ("Char", 1, 0,
-                                                                 I_FALSE), NULL));
-          }
-          break;
-        case AST_PredefinedType::PT_octet:
-          {
-            new_name->nconc (new UTL_ScopedName (new Identifier ("Octet", 1, 0,
-                                                                 I_FALSE), NULL));
-          }
-          break;
-        case AST_PredefinedType::PT_wchar:
-          {
-            new_name->nconc (new UTL_ScopedName (new Identifier ("WChar", 1, 0,
-                                                                 I_FALSE), NULL));
-          }
-          break;
-        case AST_PredefinedType::PT_boolean:
-          {
-            new_name->nconc (new UTL_ScopedName (new Identifier ("Boolean", 1, 0,
-                                                                 I_FALSE), NULL));
-          }
-          break;
-        case AST_PredefinedType::PT_any:
-          {
-            new_name->nconc (new UTL_ScopedName (new Identifier ("Any", 1, 0,
-                                                                 I_FALSE), NULL));
-            // we are variable length type
-            this->size_type (be_decl::VARIABLE);
-          }
-          break;
-        default:
-          {
-            new_name->nconc (new UTL_ScopedName (this->local_name (), NULL));
-          }
-        }
-      this->set_name (new_name);
-    }
-
-  // computes the repoID
-  compute_repoID ();
-
-  // computes the fully scoped name
-  compute_fullname ();
-
-  // computes the fully scoped typecode name
-  compute_tc_name ();
-
-  // compute the flattened fully scoped name
-  compute_flatname ();
-}
-
-// overriden method
-void
-be_predefined_type::compute_tc_name (void)
-{
-  // start with the head as the CORBA namespace
-  this->tc_name_ = new UTL_ScopedName (new Identifier ("CORBA", 1, 0, I_FALSE),
-                                       NULL);
-
-  switch (this->pt ())
-    {
-    case AST_PredefinedType::PT_void:
-      {
-        this->tc_name_->nconc (new UTL_ScopedName (new Identifier ("_tc_void", 1, 0,
-                                                             I_FALSE), NULL));
-      }
-      break;
-    case AST_PredefinedType::PT_long:
-      {
-        this->tc_name_->nconc (new UTL_ScopedName (new Identifier ("_tc_long", 1, 0,
-                                                             I_FALSE), NULL));
-      }
-      break;
-    case AST_PredefinedType::PT_longlong:
-      {
-        this->tc_name_->nconc (new UTL_ScopedName (new Identifier ("_tc_longlong", 1, 0,
-                                                             I_FALSE), NULL));
-      }
-      break;
-    case AST_PredefinedType::PT_ulong:
-      {
-        this->tc_name_->nconc (new UTL_ScopedName (new Identifier ("_tc_ulong", 1, 0,
-                                                             I_FALSE), NULL));
-      }
-      break;
-    case AST_PredefinedType::PT_ulonglong:
-      {
-        this->tc_name_->nconc (new UTL_ScopedName (new Identifier ("_tc_ulonglong", 1, 0,
-                                                             I_FALSE), NULL));
-      }
-      break;
-    case AST_PredefinedType::PT_short:
-      {
-        this->tc_name_->nconc (new UTL_ScopedName (new Identifier ("_tc_short", 1, 0,
-                                                             I_FALSE), NULL));
-      }
-      break;
-    case AST_PredefinedType::PT_ushort:
-      {
-        this->tc_name_->nconc (new UTL_ScopedName (new Identifier ("_tc_ushort", 1, 0,
-                                                             I_FALSE), NULL));
-      }
-      break;
-    case AST_PredefinedType::PT_float:
-      {
-        this->tc_name_->nconc (new UTL_ScopedName (new Identifier ("_tc_float", 1, 0,
-                                                             I_FALSE), NULL));
-      }
-      break;
-    case AST_PredefinedType::PT_double:
-      {
-        this->tc_name_->nconc (new UTL_ScopedName (new Identifier ("_tc_double", 1, 0,
-                                                             I_FALSE), NULL));
-      }
-      break;
-    case AST_PredefinedType::PT_longdouble:
-      {
-        this->tc_name_->nconc (new UTL_ScopedName (new Identifier ("_tc_longdouble", 1, 0,
-                                                             I_FALSE), NULL));
-      }
-      break;
-    case AST_PredefinedType::PT_char:
-      {
-        this->tc_name_->nconc (new UTL_ScopedName (new Identifier ("_tc_char", 1, 0,
-                                                             I_FALSE), NULL));
-      }
-      break;
-    case AST_PredefinedType::PT_wchar:
-      {
-        this->tc_name_->nconc (new UTL_ScopedName (new Identifier ("_tc_wchar", 1, 0,
-                                                             I_FALSE), NULL));
-      }
-      break;
-    case AST_PredefinedType::PT_octet:
-      {
-        this->tc_name_->nconc (new UTL_ScopedName (new Identifier ("_tc_octet", 1, 0,
-                                                             I_FALSE), NULL));
-      }
-      break;
-    case AST_PredefinedType::PT_boolean:
-      {
-        this->tc_name_->nconc (new UTL_ScopedName (new Identifier ("_tc_boolean", 1, 0,
-                                                             I_FALSE), NULL));
-      }
-      break;
-    case AST_PredefinedType::PT_any:
-      {
-        this->tc_name_->nconc (new UTL_ScopedName (new Identifier ("_tc_any", 1, 0,
-                                                             I_FALSE), NULL));
-      }
-    break;
-    case AST_PredefinedType::PT_pseudo:
-      // TODO: This is a kind of hack, there are other things that are
-      // pseudo objects, not only objref (aka CORBA::Object).
-      {
-        this->tc_name_->nconc (new UTL_ScopedName (new Identifier ("_tc_Object", 1, 0,
-                                                             I_FALSE), NULL));
-      }
-    break;
-    default:
-      ACE_ERROR ((LM_WARNING, "Unknown or invalid predefined type"));
-      break;
-    }
-}
-
-// ----------------------------------------
-//            CODE GENERATION METHODS
-// ----------------------------------------
-
-// Generates the client-side header information for the predefined type
-int
-be_predefined_type::gen_client_header (void)
-{
-  TAO_OutStream *ch; // output stream
-
-  // retrieve a singleton instance of the code generator
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-
-  ch = cg->client_header ();
-
-  ch->indent ();
-  *ch << this->name ();
-  return 0;
-}
-
-// Generates the client-side stubs for the predefined type
-int
-be_predefined_type::gen_client_stubs (void)
-{
-  TAO_OutStream *cs; // output stream
-
-  // retrieve a singleton instance of the code generator
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-
-  cs = cg->client_stubs ();
-
-  return 0;
-}
-
-// Generates the server-side header information for the predefined type
-int
-be_predefined_type::gen_server_header (void)
-{
-  TAO_OutStream *sh; // output stream
-
-  // retrieve a singleton instance of the code generator
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-
-  sh = cg->server_header ();
-
-  return 0;
-}
-
-// Generates the server-side skeletons for the predefined type
-int
-be_predefined_type::gen_server_skeletons (void)
-{
-  TAO_OutStream *ss; // output stream
-
-  // retrieve a singleton instance of the code generator
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-
-  ss = cg->server_skeletons ();
-
-  return 0;
-}
-
-// Generates the client-side inline information
-int
-be_predefined_type::gen_client_inline (void)
-{
-  // nothing to be done
-  return 0;
-}
-
-// Generates the server-side inline
-int
-be_predefined_type::gen_server_inline (void)
-{
-  // nothing to be done
-  return 0;
-}
-
-int
-be_predefined_type::gen_typecode (void)
-{
-  TAO_OutStream *cs; // output stream
-  TAO_NL  nl;        // end line
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-
-  // Macro to avoid "warning: unused parameter" type warning.
-  ACE_UNUSED_ARG (nl);
-
-  cs = cg->client_stubs ();
-  cs->indent (); // start from the current indentation level
-
-  switch (this->pt ())
-    {
-    case AST_PredefinedType::PT_void:
-      *cs << "CORBA::tk_void,\n\n";
-      break;
-    case AST_PredefinedType::PT_short:
-      *cs << "CORBA::tk_short,\n\n";
-      break;
-    case AST_PredefinedType::PT_ushort:
-      *cs << "CORBA::tk_ushort,\n\n";
-      break;
-    case AST_PredefinedType::PT_long:
-      *cs << "CORBA::tk_long,\n\n";
-      break;
-    case AST_PredefinedType::PT_ulong:
-      *cs << "CORBA::tk_ulong,\n\n";
-      break;
-    case AST_PredefinedType::PT_longlong:
-      *cs << "CORBA::tk_longlong,\n\n";
-      break;
-    case AST_PredefinedType::PT_ulonglong:
-      *cs << "CORBA::tk_ulonglong,\n\n";
-      break;
-    case AST_PredefinedType::PT_float:
-      *cs << "CORBA::tk_float,\n\n";
-      break;
-    case AST_PredefinedType::PT_double:
-      *cs << "CORBA::tk_double,\n\n";
-      break;
-    case AST_PredefinedType::PT_longdouble:
-      *cs << "CORBA::tk_longdouble,\n\n";
-      break;
-    case AST_PredefinedType::PT_boolean:
-      *cs << "CORBA::tk_boolean,\n\n";
-      break;
-    case AST_PredefinedType::PT_char:
-      *cs << "CORBA::tk_char,\n\n";
-      break;
-    case AST_PredefinedType::PT_octet:
-      *cs << "CORBA::tk_octet,\n\n";
-      break;
-    case AST_PredefinedType::PT_any:
-      *cs << "CORBA::tk_any,\n\n";
-      break;
-    case AST_PredefinedType::PT_wchar:
-      *cs << "CORBA::tk_wchar,\n\n";
-      break;
-    }
-  return 0;
-}
-
-long
-be_predefined_type::tc_size (void)
-{
-  return 4; // for the enum value
-}
-
-long
-be_predefined_type::tc_encap_len (void)
-{
-  // XXXASG - TODO what if it was of type Object? or one of the pseudo-objects
-  return 0; // no encapsulation
-}
-
-int
-be_predefined_type::gen_encapsulation (void)
-{
-  // XXXASG - TODO what if it was of type Object? or one of the pseudo-objects
-  return 0; // nothing to be done
-}
-
-// Narrowing
-IMPL_NARROW_METHODS2 (be_predefined_type, AST_PredefinedType, be_type)
-IMPL_NARROW_FROM_DECL (be_predefined_type)
diff --git a/TAO/TAO_IDL/be/be_produce.cpp b/TAO/TAO_IDL/be/be_produce.cpp
deleted file mode 100644
index 15691d84164..00000000000
--- a/TAO/TAO_IDL/be/be_produce.cpp
+++ /dev/null
@@ -1,129 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.
-2550 Garcia Avenue
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-// BE_produce.cc - Produce the work of the BE - does nothing in the
-//		   dummy BE
-
-#include	"idl.h"
-#include	"idl_extern.h"
-#include	"be.h"
-
-/*
- * Do the work of this BE. This is the dummy BE so we dont do anything in
- * particular here
- */
-void
-BE_produce()
-{
-
-#if 0
-  // let us print all the global values
-  cout << "filename is " << endl;
-  idl_global->filename()->dump(cout);
-  cout << endl;
-  cout << "main filename is " << endl;
-  idl_global->main_filename()->dump(cout);
-  cout << endl;
-  cout << "real filename is " << endl;
-  idl_global->real_filename()->dump(cout);
-  cout << endl;
-  cout << "stripped filename is " << endl;
-  idl_global->stripped_filename()->dump(cout);
-  cout << endl;
-  cout << "IDL source filename is " << endl;
-  idl_global->idl_src_file()->dump(cout);
-  cout << endl;
-  cout << "prog_name is " << idl_global->prog_name() << endl;
-#endif
-  be_root *root;   // root of the AST made up of BE nodes
-  AST_Decl *d = idl_global->root ();
-  root = be_root::narrow_from_decl (d);
-  if (root == NULL)
-    {
-      cerr << "No root" << endl;
-      BE_abort();
-    }
-
-#if 0
-  // this was just for debugging
-  root->dump (cerr);
-#endif
-
-  // start the code generation process
-  if (root->gen_idl2cplusplus_mapping() == -1)
-    {
-      cerr << "Mapping process failed" << endl;
-      BE_abort();
-    }
-}
-
-/*
- * Abort this run of the BE
- */
-void
-BE_abort()
-{
-  cerr << "Fatal Error" << endl;
-  exit (1);
-}
diff --git a/TAO/TAO_IDL/be/be_root.cpp b/TAO/TAO_IDL/be/be_root.cpp
deleted file mode 100644
index 4fbe89ebf3a..00000000000
--- a/TAO/TAO_IDL/be/be_root.cpp
+++ /dev/null
@@ -1,308 +0,0 @@
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    be_root.cpp
-//
-// = DESCRIPTION
-//    Extension of class AST_Root that provides additional means for C++
-//    mapping.
-//
-// = AUTHOR
-//    Copyright 1994-1995 by Sun Microsystems, Inc.
-//    and
-//    Aniruddha Gokhale
-//
-// ============================================================================
-
-#include	"idl.h"
-#include	"idl_extern.h"
-#include	"be.h"
-
-// Default Constructor
-be_root::be_root (void)
-{
-}
-
-// Constructor used to build the root of the abstract syntax tree (AST)
-be_root::be_root (UTL_ScopedName *n, UTL_StrList *p)
-  : AST_Root (n, p),
-    AST_Decl (AST_Decl::NT_root, n, p),
-    UTL_Scope (AST_Decl::NT_root)
-
-{
-}
-
-// =====================================================
-//           CODE GENERATION METHODS
-// =====================================================
-
-// Starting point for the code generation. Called inside BE_produce ()
-int be_root::gen_idl2cplusplus_mapping (void)
-{
-  // this is the main starting point from which the files are generated. We
-  // delegate the task of code generation to a special Code Generation
-  // object. This allows a number of different front ends to access the services
-  // of a single code generator
-
-  // C++ mapping involves producing 6 files. These include the client and
-  // server side headers, the client and server side inlines, as well as client
-  // stubs and server skeletons.
-  if (this->gen_client_header () == -1)
-    {
-      ACE_ERROR ((LM_ERROR, "be_root: Error generating client header file: %s\n",
-		  idl_global->be_get_client_hdr_fname ()));
-      return -1;
-    }
-  if (this->gen_client_inline () == -1)
-    {
-      ACE_ERROR ((LM_ERROR, "be_root: Error generating client inline file: %s\n",
-		  idl_global->be_get_client_inline_fname ()));
-      return -1;
-    }
-  if (this->gen_client_stubs () == -1)
-    {
-      ACE_ERROR ((LM_ERROR, "be_root: Error generating client stubs file: %s\n",
-		  idl_global->be_get_client_stub_fname ()));
-      return -1;
-    }
-  if (this->gen_server_header () == -1)
-    {
-      ACE_ERROR ((LM_ERROR, "be_root: Error generating server header file: %s\n",
-		  idl_global->be_get_server_hdr_fname ()));
-      return -1;
-    }
-  if (this->gen_server_inline () == -1)
-    {
-      ACE_ERROR ((LM_ERROR, "be_root: Error generating server inline file: %s\n",
-		  idl_global->be_get_server_inline_fname ()));
-      return -1;
-    }
-  if (this->gen_server_skeletons () == -1)
-    {
-      ACE_ERROR ((LM_ERROR, "be_root: Error generating server skeleton file: %s\n",
-		  idl_global->be_get_server_skeleton_fname ()));
-      return -1;
-    }
-
-  return 0;
-}
-
-// generate client header
-int be_root::gen_client_header (void)
-{
-  // retrieve a singleton instance of the code generator
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-  cg->push (TAO_CodeGen::TAO_ROOT_CH); // set the code generation state
-
-  // open the client-side header file
-  if (cg->client_header (idl_global->be_get_client_hdr_fname ()) == -1)
-    {
-      ACE_ERROR ((LM_ERROR, "be_root: Error opening client header\n"));
-      return -1;
-    }
-  // delegate the task of code generation to the scope
-  if (be_scope::gen_client_header () == -1)
-    {
-      ACE_ERROR ((LM_ERROR, "be_root: code generation for scope failed\n"));
-      return -1;
-    }
-  cg->pop ();
-
-  // at this point, we must be in the initial state
-  ACE_ASSERT (cg->state () == TAO_CodeGen::TAO_INITIAL);
-
-  (void) cg->end_client_header (); // generate the last #endif
-  return 0;
-}
-
-// Generates the client-side stubs for the root
-int be_root::gen_client_stubs (void)
-{
-  // retrieve a singleton instance of the code generator
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-  cg->push (TAO_CodeGen::TAO_ROOT_CS); // set the code generation state
-
-  // open the client-side stub file
-  if (cg->client_stubs (idl_global->be_get_client_stub_fname ()) == -1)
-    {
-      ACE_ERROR ((LM_ERROR, "be_root: Error opening client stubs file\n"));
-      return -1;
-    }
-  // delegate the task of code generation to the scope
-  if (be_scope::gen_client_stubs () == -1)
-    {
-      ACE_ERROR ((LM_ERROR, "be_root: code generation for scope failed\n"));
-      return -1;
-    }
-  cg->pop ();
-
-  // at this point, we must be in the initial state
-  //  ACE_ASSERT (cg->state () == TAO_CodeGen::TAO_INITIAL);
-
-  return 0;
-}
-
-// Generates the client-side inlines for the root
-int be_root::gen_client_inline (void)
-{
-  // retrieve a singleton instance of the code generator
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-  cg->push (TAO_CodeGen::TAO_ROOT_CI); // set the code generation state
-
-  // open the client-side inline file
-  if (cg->client_inline (idl_global->be_get_client_inline_fname ()) == -1)
-    {
-      ACE_ERROR ((LM_ERROR, "be_root: Error opening client inline file\n"));
-      return -1;
-    }
-  // delegate the task of code generation to the scope
-  if (be_scope::gen_client_inline () == -1)
-    {
-      ACE_ERROR ((LM_ERROR, "be_root: code generation for scope failed\n"));
-      return -1;
-    }
-  cg->pop ();
-
-  // at this point, we must be in the initial state
-  //  ACE_ASSERT (cg->state () == TAO_CodeGen::TAO_INITIAL);
-
-  return 0;
-}
-
-// Generates the server-side header information for the root
-int be_root::gen_server_header (void)
-{
-  // retrieve a singleton instance of the code generator
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-  cg->push (TAO_CodeGen::TAO_ROOT_SH); // set the code generation state
-
-  // open the server-side header file
-  if (cg->server_header (idl_global->be_get_server_hdr_fname ()) == -1)
-    {
-      ACE_ERROR ((LM_ERROR, "be_root: Error opening server header\n"));
-      return -1;
-    }
-  // delegate the task of code generation to the scope
-  if (be_scope::gen_server_header () == -1)
-    {
-      ACE_ERROR ((LM_ERROR,
-                  "be_root: server code generation for scope failed\n"));
-      return -1;
-    }
-
-  cg->pop ();
-
-  // at this point, we must be in the initial state
-  //  ACE_ASSERT (cg->state () == TAO_CodeGen::TAO_INITIAL);
-
-  (void) cg->end_server_header (); // generate the last #endif statement
-  return 0;
-}
-
-// Generates the server-side skeletons for the root
-int be_root::gen_server_skeletons (void)
-{
-  // retrieve a singleton instance of the code generator
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-  cg->push (TAO_CodeGen::TAO_ROOT_SS); // set the code generation state
-
-  // open the server-side skeleton file
-  if (cg->server_skeletons (idl_global->be_get_server_skeleton_fname ()) == -1)
-    {
-      ACE_ERROR ((LM_ERROR, "be_root: Error opening server skeletons file\n"));
-      return -1;
-    }
-  // delegate the task of code generation to the scope
-  if (be_scope::gen_server_skeletons () == -1)
-    {
-      ACE_ERROR ((LM_ERROR, "be_root: code generation for scope failed\n"));
-      return -1;
-    }
-  cg->pop ();
-
-  // at this point, we must be in the initial state
-  //  ACE_ASSERT (cg->state () == TAO_CodeGen::TAO_INITIAL);
-
-  return 0;
-}
-
-// Generates the server-side inlines for the root
-int be_root::gen_server_inline (void)
-{
-  // retrieve a singleton instance of the code generator
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-  cg->push (TAO_CodeGen::TAO_ROOT_SI); // set the code generation state
-
-  // open the server-side inline file
-  if (cg->server_inline (idl_global->be_get_server_inline_fname ()) == -1)
-    {
-      ACE_ERROR ((LM_ERROR, "be_root: Error opening server inline file\n"));
-      return -1;
-    }
-  // delegate the task of code generation to the scope
-  if (be_scope::gen_server_inline () == -1)
-    {
-      ACE_ERROR ((LM_ERROR, "be_root: code generation for scope failed\n"));
-      return -1;
-    }
-  cg->pop ();
-
-  // at this point, we must be in the initial state
-  //  ACE_ASSERT (cg->state () == TAO_CodeGen::TAO_INITIAL);
-
-  return 0;
-}
-
-// We had to provide these since the AST_Root::fe_* method was setting the
-// names of these three to "local type"
-
-/*
- * Add this AST_Sequence to the locally defined types in this scope
- */
-AST_Sequence *
-be_root::fe_add_sequence (AST_Sequence *t)
-{
-  if (t == NULL)
-    return NULL;
-
-  add_to_local_types(t);
-  return t;
-}
-
-/*
- * Add this AST_String to the locally defined types in this scope
- */
-AST_String *
-be_root::fe_add_string (AST_String *t)
-{
-  if (t == NULL)
-    return NULL;
-
-  add_to_local_types (t);
-
-  return t;
-}
-
-/*
- * Add this AST_Array to the locally defined types in this scope
- */
-AST_Array *
-be_root::fe_add_array (AST_Array *t)
-{
-  if (t == NULL)
-    return NULL;
-
-  add_to_local_types (t);
-
-  return t;
-}
-
-/*
- * Narrowing methods
- */
-IMPL_NARROW_METHODS3 (be_root, AST_Root, be_scope, be_decl)
-IMPL_NARROW_FROM_DECL (be_root)
-IMPL_NARROW_FROM_SCOPE (be_root)
diff --git a/TAO/TAO_IDL/be/be_scope.cpp b/TAO/TAO_IDL/be/be_scope.cpp
deleted file mode 100644
index 4b653b0a2a1..00000000000
--- a/TAO/TAO_IDL/be/be_scope.cpp
+++ /dev/null
@@ -1,413 +0,0 @@
-//
-// $Id$
-//
-#include	"idl.h"
-#include	"idl_extern.h"
-#include	"be.h"
-
-// Default Constructor
-be_scope::be_scope (void)
-{
-}
-
-// Constructor
-be_scope::be_scope (AST_Decl::NodeType type)
-  : UTL_Scope (type)
-{
-}
-
-be_scope::~be_scope (void)
-{
-}
-
-// Code generation methods
-int
-be_scope::gen_client_header (void)
-{
-  UTL_ScopeActiveIterator *si;
-  AST_Decl *d;
-  be_decl *bd;
-
-  if (this->nmembers () > 0)
-    {
-      // if there are elements in this scope
-
-      si = new UTL_ScopeActiveIterator (this, UTL_Scope::IK_decls);
-      // instantiate a scope iterator.
-
-      while (!(si->is_done ()))
-        {
-          // get the next AST decl node
-          d = si->item ();
-          if (!d->imported ())
-            {
-              // we are not imported.
-
-              // NOTE: Our assumption here is that whatever scope we are in, the
-              // node type that shows up here *MUST* be valid according to the
-              // IDL grammar. We do not check for this since the front end must
-              // have taken care of weeding out such errors
-
-              // The FE does some strange things in which items get added to
-              // the enclosing scope as well as the scope that encloses the
-              // enclosing scope. We do not want to generate code for items
-              // that do not belong to the appropriate scope
-
-              bd = be_decl::narrow_from_decl (d);
-              // @@ Despite the comment above the following code will
-              // crash without the if() around it.
-              if (bd != 0)
-                {
-                  if (bd->gen_client_header () == -1)
-                    {
-                      ACE_ERROR_RETURN ((LM_ERROR,
-                                         "(%N:%l) be_scope::gen_client_header failed\n"),
-                                        -1);
-                    }
-                }
-              else
-                {
-                  ACE_DEBUG ((LM_DEBUG,
-                              "WARNING (%N:%l) be_scope::gen_client_header - "
-                              "narrow_from_decl returned 0\n"));
-                }
-            } // no imported
-          si->next ();
-        } // end of while
-      delete si; // free the iterator object
-    }
-  return 0;
-}
-
-int
-be_scope::gen_client_stubs (void)
-{
-  UTL_ScopeActiveIterator *si;
-  AST_Decl *d;
-  be_decl *bd;
-
-  if (this->nmembers () > 0)
-    {
-      // if there are elements in this scope
-
-      si = new UTL_ScopeActiveIterator (this, UTL_Scope::IK_decls);
-      // instantiate a scope iterator.
-
-      while (!(si->is_done ()))
-        {
-          // get the next AST decl node
-          d = si->item ();
-          if (!d->imported ())
-            {
-              // we are not imported.
-              // NOTE: Our assumptin here is that whatever scope we are in, the
-              // node type that shows up here *MUST* be valid according to the
-              // IDL grammar. We do not check for this since the front end must
-              // have taken care of weeding out such errors
-
-              bd = be_decl::narrow_from_decl (d);
-              // @@ Despite the comment above the following code will
-              // crash without the if() around it.
-              if (bd != 0)
-                {
-                  if (bd->gen_client_stubs () == -1)
-                    {
-                      ACE_ERROR_RETURN ((LM_ERROR,
-                                         "(%N:%l) be_scope::gen_client_stubs failed\n"),
-                                        -1);
-                    }
-                }
-              else
-                {
-                  ACE_DEBUG ((LM_DEBUG,
-                              "WARNING (%N:%l) be_scope::gen_client_stubs - "
-                              "narrow_from_decl returned 0\n"));
-                }
-            } // not imported
-          si->next ();
-        } // end of while
-      delete si; // free the iterator object
-    }
-  return 0;
-}
-
-int
-be_scope::gen_client_inline (void)
-{
-  UTL_ScopeActiveIterator *si;
-  AST_Decl *d;
-  be_decl *bd;
-
-  if (this->nmembers () > 0)
-    {
-      // if there are elements in this scope
-
-      si = new UTL_ScopeActiveIterator (this, UTL_Scope::IK_decls);
-      // instantiate a scope iterator.
-
-      while (!(si->is_done ()))
-        {
-          // get the next AST decl node
-          d = si->item ();
-          if (!d->imported ())
-            {
-              // we are not imported.
-              // NOTE: Our assumptin here is that whatever scope we are in, the
-              // node type that shows up here *MUST* be valid according to the
-              // IDL grammar. We do not check for this since the front end must
-              // have taken care of weeding out such errors
-
-              bd = be_decl::narrow_from_decl (d);
-              if (bd != 0)
-                {
-                  if (bd->gen_client_inline () == -1)
-                    {
-                      ACE_ERROR_RETURN ((LM_ERROR,
-                                         "(%N:%l) be_scope::gen_client_inline failed\n"),
-                                        -1);
-                    }
-                }
-              else
-                {
-                  ACE_DEBUG ((LM_DEBUG,
-                              "WARNING (%N:%l) be_scope::gen_client_inline - "
-                              "narrow_from_decl returned 0\n"));
-                }
-            } // not imported
-          si->next ();
-        } // end of while
-      delete si; // free the iterator object
-    }
-  return 0;
-}
-
-int
-be_scope::gen_server_header (void)
-{
-  UTL_ScopeActiveIterator *si;
-  AST_Decl *d;
-  be_decl *bd;
-
-  if (this->nmembers () > 0)
-    {
-      // if there are elements in this scope
-
-      si = new UTL_ScopeActiveIterator (this, UTL_Scope::IK_decls);
-      // instantiate a scope iterator.
-
-      while (!(si->is_done ()))
-        {
-          // get the next AST decl node
-          d = si->item ();
-          if (!d->imported ())
-            {
-              // we are not imported.
-              // we are not imported.
-
-          // NOTE: Our assumptin here is that whatever scope we are in, the
-          // node type that shows up here *MUST* be valid according to the
-          // IDL grammar. We do not check for this since the front end must
-          // have taken care of weeding out such errors
-
-              bd = be_decl::narrow_from_decl (d);
-              if (bd != 0)
-                {
-                  if (bd->gen_server_header () == -1)
-                    {
-                      ACE_ERROR_RETURN ((LM_ERROR,
-                                         "(%N:%l) be_scope::gen_server_header failed\n"),
-                                        -1);
-                    }
-                }
-              else
-                {
-                  ACE_DEBUG ((LM_DEBUG,
-                              "WARNING (%N:%l) be_scope::gen_server_header - "
-                              "narrow_from_decl returned 0\n"));
-                }
-            } // not imported
-          si->next ();
-        } // end of while
-      delete si; // free the iterator object
-    }
-  return 0;
-}
-
-int
-be_scope::gen_server_skeletons (void)
-{
-  UTL_ScopeActiveIterator *si;
-  AST_Decl *d;
-  be_decl *bd;
-
-  if (this->nmembers () > 0)
-    {
-      // if there are elements in this scope
-
-      si = new UTL_ScopeActiveIterator (this, UTL_Scope::IK_decls);
-      // instantiate a scope iterator.
-
-      while (!(si->is_done ()))
-        {
-          // get the next AST decl node
-          d = si->item ();
-          if (!d->imported ())
-            {
-              // we are not imported.
-
-              // NOTE: Our assumptin here is that whatever scope we are in, the
-              // node type that shows up here *MUST* be valid according to the
-              // IDL grammar. We do not check for this since the front end must
-              // have taken care of weeding out such errors
-
-              bd = be_decl::narrow_from_decl (d);
-              if (bd != 0)
-                {
-                  if (bd->gen_server_skeletons () == -1)
-                    {
-                      ACE_ERROR_RETURN ((LM_ERROR,
-                                         "(%N:%l) be_scope::gen_server_skeletons failed\n"),
-                                        -1);
-                    }
-                }
-              else
-                {
-                  ACE_DEBUG ((LM_DEBUG,
-                              "WARNING (%N:%l): be_scope::gen-server_skeletons - "
-                              "narrow_from_decl returned 0\n"));
-                }
-            } // not imported
-          si->next ();
-        } // end of while
-      delete si; // free the iterator object
-    }
-  return 0;
-}
-
-int
-be_scope::gen_server_inline (void)
-{
-  UTL_ScopeActiveIterator *si;
-  AST_Decl *d;
-  be_decl *bd;
-
-  if (this->nmembers () > 0)
-    {
-      // if there are elements in this scope
-
-      si = new UTL_ScopeActiveIterator (this, UTL_Scope::IK_decls);
-      // instantiate a scope iterator.
-
-      while (!(si->is_done ()))
-        {
-          // get the next AST decl node
-          d = si->item ();
-
-          if (!d->imported ())
-            {
-              // we are not imported.
-              // NOTE: Our assumptin here is that whatever scope we are in, the
-              // node type that shows up here *MUST* be valid according to the
-              // IDL grammar. We do not check for this since the front end must
-              // have taken care of weeding out such errors
-
-              bd = be_decl::narrow_from_decl (d);
-              if (bd != 0)
-                {
-                  if (bd->gen_server_inline () == -1)
-                    {
-                      ACE_ERROR_RETURN ((LM_ERROR,
-                                         "(%N:%l) be_scope::gen_server_inline failed\n"),
-                                        -1);
-                    }
-                }
-              else
-                {
-                  ACE_DEBUG ((LM_DEBUG,
-                              "WARNING (%N:%l): be_scope::gen_server_inline - "
-                              "narrow_from_decl returned 0\n"));
-                }
-            }
-          si->next ();
-        } // end of while
-      delete si; // free the iterator object
-    }
-  return 0;
-}
-
-int
-be_scope::gen_encapsulation (void)
-{
-  UTL_ScopeActiveIterator *si;
-  AST_Decl *d;
-  be_decl *bd;
-
-  // if there are elements in this scope
-  if (this->nmembers () > 0)
-    {
-      // instantiate a scope iterator.
-      si = new UTL_ScopeActiveIterator (this, UTL_Scope::IK_decls);
-
-      while (!(si->is_done ()))
-        {
-          // get the next AST decl node
-          d = si->item ();
-          bd = be_decl::narrow_from_decl (d);
-          if (bd->gen_encapsulation () == -1)
-            {
-              // failure
-              return -1;
-            }
-          si->next ();
-        } // end of while
-      delete si; // free the iterator object
-    }
-  return 0;
-}
-
-long
-be_scope::tc_encap_len (void)
-{
-  UTL_ScopeActiveIterator *si;
-  AST_Decl *d;
-  be_decl *bd;
-  long encap_len = 0;
-
-  if (this->nmembers () > 0)
-    {
-      // if there are elements in this scope
-
-      si = new UTL_ScopeActiveIterator (this, UTL_Scope::IK_decls);
-      // instantiate a scope iterator.
-
-      while (!(si->is_done ()))
-        {
-          // get the next AST decl node
-          d = si->item ();
-
-          // NOTE: Our assumptin here is that whatever scope we are in, the
-          // node type that shows up here *MUST* be valid according to the
-          // IDL grammar. We do not check for this since the front end must
-          // have taken care of weeding out such errors
-
-          bd = be_decl::narrow_from_decl (d);
-          if (bd != 0)
-            {
-              encap_len += bd->tc_encap_len ();
-            }
-          else
-            {
-              ACE_DEBUG ((LM_DEBUG,
-                          "WARNING (%N:%l): be_scope::tc_encap_len - "
-                          "narrow_from_decl returned 0\n"));
-            }
-          si->next ();
-        } // end of while
-      delete si; // free the iterator object
-    }
-  return encap_len;
-}
-
-// narrowing methods
-IMPL_NARROW_METHODS1 (be_scope, UTL_Scope)
-IMPL_NARROW_FROM_SCOPE (be_scope)
diff --git a/TAO/TAO_IDL/be/be_sequence.cpp b/TAO/TAO_IDL/be/be_sequence.cpp
deleted file mode 100644
index 96dc38d0182..00000000000
--- a/TAO/TAO_IDL/be/be_sequence.cpp
+++ /dev/null
@@ -1,1406 +0,0 @@
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    be_sequence.cpp
-//
-// = DESCRIPTION
-//    Extension of class AST_Sequence that provides additional means for C++
-//    mapping.
-//
-// = AUTHOR
-//    Copyright 1994-1995 by Sun Microsystems, Inc.
-//    and
-//    Aniruddha Gokhale
-//
-// ============================================================================
-
-#include	"idl.h"
-#include	"idl_extern.h"
-#include	"be.h"
-
-/*
- * BE_Sequence
- */
-be_sequence::be_sequence (void)
-{
-  this->size_type (be_decl::VARIABLE); // always the case
-}
-
-be_sequence::be_sequence (AST_Expression *v, AST_Type *t)
-  : AST_Sequence (v, t),
-    AST_Decl (AST_Decl::NT_sequence,
-              NULL,
-              NULL),
-    seq_node_ (NULL)
-{
-  // check if we are bounded or unbounded. An expression value of 0 means
-  // unbounded
-  if (v->ev ()->u.ulval == 0)
-    {
-      this->unbounded_ = I_TRUE;
-    }
-  else
-    {
-      this->unbounded_ = I_FALSE;
-    }
-
-  this->size_type (be_decl::VARIABLE); // a sequence data type is always
-                                       // VARIABLE
-}
-
-int
-be_sequence::create_name (void)
-{
-  static char namebuf [200];
-  UTL_ScopedName *n = NULL;
-  be_decl *d;   // may point to a typedef node
-  be_decl *scope; // scope in which we are defined
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-
-
-  d = cg->node (); // retrieve the node that was passed in via the CodeGen
-  // object
-
-  if (!d)
-    return -1; // error, we cannot be free standing.
-
-  // we generate a name for ourselves. Start by generating a local name
-
-  ACE_OS::memset (namebuf, '\0', 200);
-  ACE_OS::sprintf (namebuf, "_tao__seq_%s", d->local_name ()->get_string ());
-
-  if (d->node_type () == AST_Decl::NT_sequence)
-    {
-      // this means that we are an anonymous sequence who happens to be a
-      // base type of the sequence denoted by the node "d".
-      // Hence we set our enclosing scope to be the node "d"
-      this->set_defined_in (DeclAsScope (d));
-    }
-
-  // now set our fully scoped name
-
-  // now see if we have a fully scoped name.
-  scope = be_decl::narrow_from_decl (ScopeAsDecl (this->defined_in ()));
-  if (scope != NULL)
-    {
-      // make a copy of the enclosing scope's  name
-      n = (UTL_ScopedName *)scope->name ()->copy () ;
-
-      // add our local name as the last component
-      n->nconc (new UTL_ScopedName (new Identifier (ACE_OS::strdup
-                                                    (namebuf), 1,
-                                                    0, I_FALSE),
-                                    NULL));
-      // set the fully scoped name
-      this->set_name (n);
-    }
-  else
-    {
-      // We better be not here because we must be inside some scope,
-      // atleast the ROOT scope.
-      return -1;
-    }
-  return 0;
-}
-
-void
-be_sequence::compute_scoped_name (void)
-{
-  UTL_ScopedName *n = (UTL_ScopedName *)this->seq_node_->name ()->copy ();
-  n->nconc (this->name ());
-  this->set_name (n);
-}
-
-int
-be_sequence::gen_client_header (void)
-{
-  TAO_OutStream *ch; // output stream
-  TAO_NL  nl;        // end line
-  be_type *bt;       // type node
-  be_state *s;       // state based code gen object
-
-  if (!this->cli_hdr_gen_)
-    {
-      // retrieve a singleton instance of the code generator
-      TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-
-      // first create a name for ourselves. We defer name creation for
-      // ourselves to this point since named sequences should get the name
-      // of the typedef node, else some other technique of name generation
-      // should be used.
-      if (this->create_name () == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "be_sequence::gen_client_header - name creation failed\n"),
-                            -1);
-        }
-
-      ch = cg->client_header ();
-
-      // generate the ifdefined macro for the sequence type
-      ch->gen_ifdef_macro (this->flatname ());
-
-      ch->indent (); // start with the current indentation level
-
-      *ch << "// *************************************************************"
-          << nl;
-      *ch << "// class " << this->local_name () << nl;
-      *ch << "// *************************************************************"
-              << nl << nl;
-
-      *ch << "class " << this->local_name () << nl;
-      *ch << "{" << nl;
-      *ch << "public:\n";
-      ch->incr_indent (0);
-
-      // retrieve the base type since we may need to do some code
-      // generation for the base type.
-      bt = be_type::narrow_from_decl (this->base_type ());
-      if (bt == NULL)
-        {
-          ACE_ERROR ((LM_ERROR, "be_sequence: base type NULL\n"));
-          return -1;
-        }
-
-      cg->push (TAO_CodeGen::TAO_SEQUENCE_BASE_CH); // set current code gen
-      // state
-      s = cg->make_state ();
-      if (!s || (s->gen_code (bt, this) == -1))
-        {
-          ACE_ERROR ((LM_ERROR, "be_sequence: base type codegen failed\n"));
-          return -1;
-        }
-      cg->pop ();
-
-      // now generate the sequence body
-      cg->push (TAO_CodeGen::TAO_SEQUENCE_BODY_CH);
-      s = cg->make_state ();
-
-      // generate constructors
-      ch->indent ();
-      *ch << this->local_name () << " (void); // default constructor" << nl;
-      // check whether we are bounded or not. Depending on that the mapping is
-      // slightly different as shown below
-      if (this->unbounded_)
-        {
-          *ch << local_name () << " (CORBA::ULong max);" << nl;
-          *ch << local_name () << " (CORBA::ULong max, CORBA::ULong length, " << nl;
-        }
-      else
-        {
-          // bounded seq does not take the "max" argument
-          *ch << local_name () << " (CORBA::ULong length, " << nl;
-        }
-
-      *ch << "\t";
-      // generate the type info for the element type
-      if (s->gen_code (bt, this) == -1)
-        return -1;
-      *ch << " *value, CORBA::Boolean release=CORBA::B_FALSE);" << nl;
-      *ch << local_name () << "(const " << local_name () <<
-        " &); // copy constructor" << nl;
-      *ch << "~" << this->local_name () << " (void);" << nl;
-      *ch << this->local_name () << " &operator= (const " <<
-        this->local_name () << " &);" << nl;
-      *ch << "CORBA::ULong maximum (void) const;" << nl;
-      *ch << "void length (CORBA::ULong);" << nl;
-      *ch << "CORBA::ULong length (void) const;" << nl;
-      if (s->gen_code (bt, this) == -1)
-        return -1;
-      *ch << " &operator[] (CORBA::ULong index);" << nl;
-      *ch << "const ";
-      if (s->gen_code (bt, this) == -1)
-        return -1;
-      *ch << " &operator[] (CORBA::ULong index) const;" << nl;
-
-      // generate the static allocbuf and freebuf methods
-      *ch << "static ";
-      if (s->gen_code (bt, this) == -1)
-        return -1;
-      *ch << " *allocbuf (CORBA::ULong nelems);" << nl;
-      *ch << "static void freebuf (";
-      if (s->gen_code (bt, this) == -1)
-        return -1;
-      *ch << " *);\n" ;
-      ch->decr_indent ();
-      *ch << "private:\n";
-      ch->incr_indent ();
-      *ch << "CORBA::ULong maximum_;" << nl;
-      *ch << "CORBA::ULong length_;" << nl;
-      if (s->gen_code (bt, this) == -1)
-        return -1;
-      *ch << " *buffer_;" << nl;
-      *ch << "CORBA::Boolean release_;\n";
-      ch->decr_indent ();
-      *ch << "};\n";
-      ch->indent ();
-      *ch << "typedef " << this->local_name () << "* "
-	  << this->local_name () << "_ptr;\n";
-
-      // Generate the typecode decl
-      if (this->is_nested ())
-        {
-          // we have a scoped name
-          ch->indent ();
-          *ch << "static CORBA::TypeCode_ptr " << this->tc_name
-            ()->last_component () << ";\n\n";
-        }
-      else
-        {
-          // we are in the ROOT scope
-          ch->indent ();
-          *ch << "extern CORBA::TypeCode_ptr " << this->tc_name
-            ()->last_component () << ";\n\n";
-        }
-
-      ch->gen_endif (); // endif macro
-
-      // generate the ifdefined macro for the var type
-      ch->gen_ifdef_macro (this->flatname (), "_var");
-
-      // generate the var and out types
-      if (this->gen_var_defn () == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "be_sequence::gen_client_hdr - _var defn failed\n"), -1);
-        }
-      ch->gen_endif ();
-
-      // generate the ifdefined macro for the var type
-      ch->gen_ifdef_macro (this->flatname (), "_out");
-
-      if (this->gen_out_defn () == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "be_sequence::gen_client_hdr - _out defn failed\n"), -1);
-        }
-      ch->gen_endif ();
-
-      cg->pop ();
-
-      this->cli_hdr_gen_ = I_TRUE;
-    } // if (cli_hdr_gen_)
-  return 0;
-}
-
-int
-be_sequence::gen_client_stubs (void)
-{
-  TAO_OutStream *cs; // output stream
-  TAO_NL  nl;        // end line
-  be_type *bt; // base type
-  be_state *s; //state object
-
-  if (!this->cli_stub_gen_)
-    {
-      // retrieve a singleton instance of the code generator
-      TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-
-      cs = cg->client_stubs (); // retrieve the client stubs stream
-
-      // retrieve base type
-      bt = be_type::narrow_from_decl (this->base_type ());
-      if (!bt)
-        return -1;
-
-      cg->push (TAO_CodeGen::TAO_SEQUENCE_BASE_CS);
-      s = cg->make_state ();
-
-      // generate stubs for our base type if it itself is a sequence
-      if (!s || (s->gen_code (bt, this) == -1))
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                "be_sequence::gen_client_stubs - base type code gen\n"), -1);
-        }
-      cg->pop ();
-
-      // generate the methods of the sequence C++ mapping
-      cg->push (TAO_CodeGen::TAO_SEQUENCE_BODY_CS);
-      s = cg->make_state ();
-
-      if (!s)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                "be_sequence::gen_client_stubs - invalid state\n"), -1);
-        }
-
-      *cs << "// *************************************************************"
-          << nl;
-      *cs << "// class " << this->name () << nl;
-      *cs << "// *************************************************************\n\n";
-
-      // copy constructor
-      cs->indent ();
-      *cs << "// copy constructor" << nl;
-      *cs << this->name () << "::" << this->local_name () <<
-        " (const " << this->name () << " &seq)" << nl;
-      *cs << "\t: maximum_ (seq.maximum_)," << nl;
-      *cs << "\t  length_ (seq.length_)," << nl;
-      *cs << "\t  buffer_ (" << this->name () << "::allocbuf (seq.maximum_)),"
-          << nl;
-      *cs << "\t  release_ (1) // we always own it" << nl;
-      *cs << "{\n";
-      cs->incr_indent ();
-      // copy each element
-      *cs << "for (CORBA::ULong i=0; i < seq.length_; i++)" << nl;
-      *cs << "\tthis->buffer_[i] = seq.buffer_[i];\n";
-      cs->decr_indent ();
-      *cs << "}\n\n";
-
-      // destructor
-      cs->indent ();
-      *cs << "// destructor" << nl;
-      *cs << this->name () << "::~" << this->local_name () << " (void)" << nl;
-      *cs << "{\n";
-      cs->incr_indent ();
-      *cs << "if (this->release_) // we own the buffer" << nl;
-      *cs << "{\n";
-      cs->incr_indent ();
-      // only for obj references and strings, we need to free each individual
-      // element
-      switch (bt->node_type ())
-        {
-        case AST_Decl::NT_interface:
-        case AST_Decl::NT_interface_fwd:
-        case AST_Decl::NT_string:
-          {
-            // XXXASG - TODO (tricky)
-          }
-          break;
-        default:
-          break;
-        }
-      // call freebuf
-      *cs << this->name () << "::freebuf (this->buffer_);\n";
-      cs->decr_indent ();
-      *cs << "}\n";
-      cs->decr_indent ();
-      *cs << "}\n\n";
-
-      // assignment operator
-      cs->indent ();
-      *cs << "// assignment operator" << nl;
-      *cs << this->name () << "& " << nl;
-      *cs << this->name () << "::operator=" <<
-        " (const " << this->name () << " &seq)" << nl;
-      *cs << "{\n";
-      cs->incr_indent ();
-      // check for equality
-      *cs << "if (this == &seq) return *this;" << nl;
-      // otherwise, if release flag, free the buffer
-      *cs << "if (this->release_)" << nl;
-      *cs << "{\n";
-      cs->incr_indent ();
-      *cs << this->name () << "::freebuf (this->buffer_);\n";
-      cs->decr_indent ();
-      *cs << "}" << nl;
-
-      *cs << "this->length_ = seq.length_;" << nl;
-      *cs << "this->maximum_ = seq.maximum_;" << nl;
-      *cs << "this->buffer_ = " << this->name () << "::allocbuf (seq.maximum_),"
-          << nl;
-      *cs << "this->release_ =1; // we always own it" << nl;
-      // copy each element
-      *cs << "for (CORBA::ULong i=0; i < seq.length_; i++)" << nl;
-      *cs << "\tthis->buffer_[i] = seq.buffer_[i];" << nl;
-      *cs << "return *this;\n";
-      cs->decr_indent ();
-      *cs << "}\n\n";
-
-      // set the length
-      cs->indent ();
-      *cs << "void" << nl;
-      *cs << this->name () << "::length (CORBA::ULong length)" << nl;
-      *cs << "{\n";
-      cs->incr_indent ();
-      if (this->max_size () == 0)
-        {
-          // The sequence has a maximum length, check that the new
-          // length is valid before changing anything.
-          *cs << "if (length > this->maximum_)" << nl;
-          *cs << "{\n";
-          cs->incr_indent ();
-          *cs << "// @@ throw something?" << nl;
-          *cs << "return;" << nl;
-          cs->decr_indent ();
-          *cs << "}" << nl;
-          *cs << "this->length_ = length;\n";
-        }
-      else
-        {
-          // Reallocate the buffer.
-          *cs << "if (length > this->maximum_)" << nl;
-          *cs << "{\n";
-          cs->incr_indent ();
-          if (s->gen_code (bt, this) == -1)
-            return -1;
-          *cs << " *tmp = " << this->name ()
-              << "::allocbuf (length);" << nl;
-          *cs << "if (tmp == 0)\n";
-          cs->incr_indent ();
-          *cs << "return;\n";
-          cs->decr_indent ();
-
-          *cs << "for (CORBA::ULong i = 0; i < this->length_; ++i)" << nl;
-          *cs << "{\n";
-          cs->incr_indent ();
-          *cs << "tmp[i] = this->buffer_[i];\n";
-          cs->decr_indent ();
-          *cs << "}" << nl;
-          *cs << "if (this->release_)\n";
-          cs->incr_indent ();
-          *cs << this->name () << "::freebuf (this->buffer_);\n";
-          cs->decr_indent ();
-          *cs << "this->buffer_ = tmp;" << nl;
-          *cs << "this->release_ = 1;" << nl;
-          *cs << "this->maximum_ = length;\n";
-          cs->decr_indent ();
-          *cs << "}\n";
-          *cs << "this->length_ = length;\n";
-        }
-      cs->decr_indent ();
-      *cs << "}\n\n";
-
-      // generate the typecode information here
-      cs->indent (); // start from current indentation level
-      *cs << "static const CORBA::Long _oc_" << this->flatname () << "[] =" <<
-        nl;
-      *cs << "{\n";
-      cs->incr_indent (0);
-      if (this->gen_encapsulation () == -1)
-        {
-          ACE_ERROR ((LM_ERROR, "be_sequence:Error generating encapsulation\n\n"));
-          return -1;
-        }
-      cs->decr_indent ();
-      *cs << "};" << nl;
-
-      *cs << "static CORBA::TypeCode _tc__tc_" << this->flatname () <<
-        " (CORBA::tk_sequence, sizeof (_oc_" <<  this->flatname () <<
-        "), (unsigned char *) &_oc_" << this->flatname () <<
-        ", CORBA::B_FALSE);" << nl;
-      *cs << "CORBA::TypeCode_ptr " << this->tc_name () << " = &_tc__tc_" <<
-        this->flatname () << ";\n\n";
-
-      cg->pop ();
-      this->cli_stub_gen_ = I_TRUE;
-    }
-  return 0;
-}
-
-// Generates the client-side inline information
-int
-be_sequence::gen_client_inline (void)
-{
-  TAO_OutStream *ci; // output stream
-  TAO_NL  nl;        // end line
-  be_state *s;       // code gen state
-  be_type *bt;  // base type
-
-  if (!this->cli_inline_gen_)
-    {
-      // retrieve a singleton instance of the code generator
-      TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-
-      ci = cg->client_inline ();
-
-      // retrieve base type
-      bt = be_type::narrow_from_decl (this->base_type ());
-      if (!bt)
-        return -1;
-
-      cg->push (TAO_CodeGen::TAO_SEQUENCE_BASE_CI);
-      s = cg->make_state ();
-
-      // generate inline methods for our base type if it itself is a sequence
-      if (!s || (s->gen_code (bt, this) == -1))
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                "be_sequence::gen_client_inline - base type code gen\n"), -1);
-        }
-      cg->pop ();
-
-      // generate the methods of the sequence C++ mapping
-      cg->push (TAO_CodeGen::TAO_SEQUENCE_BODY_CI);
-      s = cg->make_state ();
-
-      if (!s)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                "be_sequence::gen_client_inline - invalid state\n"), -1);
-        }
-
-      // the allocbuf method
-      ci->indent ();
-      *ci << "ACE_INLINE ";
-      if (s->gen_code (bt, this) == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-             "be_sequence - base type code gen failure\n"), -1);
-        }
-      *ci << " *" << nl;
-      *ci << this->name () << "::allocbuf (CORBA::ULong nelems)" << nl;
-      *ci << "{\n";
-      ci->incr_indent ();
-      *ci << "return new ";
-      if (s->gen_code (bt, this) == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-             "be_sequence - base type code gen failure\n"), -1);
-        }
-      *ci << "[nelems]; // allocate from heap\n";
-      ci->decr_indent ();
-      *ci << "}\n\n";
-
-      // freebuf method
-      ci->indent ();
-      *ci << "ACE_INLINE void" << nl;
-      *ci << this->name () << "::freebuf (";
-      if (s->gen_code (bt, this) == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-             "be_sequence - base type code gen failure\n"), -1);
-        }
-      *ci << " *seq)" << nl;
-      *ci << "{\n";
-      ci->incr_indent ();
-      *ci << "delete [] seq;\n";
-      ci->decr_indent ();
-      *ci << "}\n\n";
-
-      // default constructor
-      ci->indent ();
-      *ci << "//default constructor" << nl;
-      *ci << "ACE_INLINE " << nl;
-      *ci << this->name () << "::" << this->local_name () << " (void)" << nl;
-      // for bounded and unbounded, initialize the data members differently
-      if (this->unbounded_)
-        {
-          *ci << "\t: maximum_ (0)," << nl;
-          *ci << "\t  length_ (0)," << nl;
-          *ci << "\t  buffer_ (0)," << nl;
-          *ci << "\t  release_ (0) // does not own" << nl;
-        }
-      else
-        {
-          *ci << "\t: maximum_ (" << this->max_size () << ")," << nl;
-          *ci << "\t  length_ (0)," << nl;
-          *ci << "\t  buffer_ (" << this->name () << "::allocbuf (" <<
-            this->max_size () << "))," << nl;
-          *ci << "\t  release_ (1) // owns" << nl;
-        }
-      *ci << "{}\n\n";
-
-      // constructor only for unbounded seq. This takes in "max length"
-      if (this->unbounded_)
-        {
-          ci->indent ();
-          *ci << "// constructor for unbounded seq" << nl;
-          *ci << "ACE_INLINE " << nl;
-          *ci << this->name () << "::" << this->local_name () <<
-            "(CORBA::ULong max )" << nl;
-          *ci << "\t: maximum_ (max)," << nl;
-          *ci << "\t  length_ (0)," << nl;
-          *ci << "\t  buffer_ (" << this->name () << "::allocbuf (max))," << nl;
-          *ci << "\t  release_ (1) // owns" << nl;
-          *ci << "{}\n\n";
-        }
-
-      // constructor that takes in the data buffer
-      // XXXASG - may not work for seq of strings or obj refs
-      ci->indent ();
-      *ci << "// constructor from data buffer" << nl;
-      *ci << "ACE_INLINE " << nl;
-      *ci << this->name () << "::" << this->local_name ();
-      // depending on whether we are bounded ot not, the constructor has
-      // different sets of parameters
-      if (this->unbounded_)
-        {
-          *ci << " (CORBA::ULong max, CORBA::ULong length, " << nl;
-        }
-      else
-        {
-          // bounded seq does not take the "max" argument
-          *ci << " (CORBA::ULong length, " << nl;
-        }
-      *ci << "\t";
-      if (s->gen_code (bt, this) == -1)
-        return -1;
-      *ci << " *value, CORBA::Boolean release)" << nl;
-      // for unbounded we have the additional max parameter
-      if (this->unbounded_)
-        {
-          *ci << "\t: maximum_ (max)," << nl;
-        }
-      else
-        {
-          *ci << "\t: maximum_ (" << this->max_size () << ")," << nl;
-        }
-      *ci << "\t  length_ (length)," << nl;
-      *ci << "\t  buffer_ (value)," << nl;
-      *ci << "\t  release_ (release) // ownership depends on release" << nl;
-      *ci << "{}\n\n";
-
-      // the maximum method
-      ci->indent ();
-      *ci << "ACE_INLINE CORBA::ULong" << nl;
-      *ci << this->name () << "::maximum (void) const" << nl;
-      *ci << "{\n";
-      ci->incr_indent ();
-      *ci << "return this->maximum_;\n";
-      ci->decr_indent ();
-      *ci << "}\n\n";
-
-      // the length method
-      ci->indent ();
-      *ci << "ACE_INLINE CORBA::ULong" << nl;
-      *ci << this->name () << "::length  (void) const" << nl;
-      *ci << "{\n";
-      ci->incr_indent ();
-      *ci << "return this->length_;\n";
-      ci->decr_indent ();
-      *ci << "}\n\n";
-
-      // subscript operators (1) read-only, (2) read/write
-      ci->indent ();
-      *ci << "ACE_INLINE ";
-      if (s->gen_code (bt, this) == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-             "be_sequence - base type code gen failure\n"), -1);
-        }
-      *ci << " &" << nl;
-      *ci << this->name () << "::operator[] (CORBA::ULong index) // read/write"
-         << nl;
-      *ci << "{\n";
-      ci->incr_indent ();
-      *ci << "return this->buffer_[index];\n";
-      ci->decr_indent ();
-      *ci << "}\n\n";
-
-      ci->indent ();
-      *ci << "ACE_INLINE const ";
-      if (s->gen_code (bt, this) == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-             "be_sequence - base type code gen failure\n"), -1);
-        }
-      *ci << " &" << nl;
-      *ci << this->name () << "::operator[] (CORBA::ULong index) const // read"
-         << nl;
-      *ci << "{\n";
-      ci->incr_indent ();
-      *ci << "return this->buffer_[index];\n";
-      ci->decr_indent ();
-      *ci << "}\n\n";
-
-      // generate the implementations for the _var and _impl classes
-      if (this->gen_var_impl () == -1)
-        {
-          ACE_ERROR ((LM_ERROR, "be_sequence: _var impl code gen failed\n"));
-          return -1;
-        }
-      if (this->gen_out_impl () == -1)
-        {
-          ACE_ERROR ((LM_ERROR, "be_sequence: _out impl code gen failed\n"));
-          return -1;
-        }
-
-      this->cli_inline_gen_ = I_TRUE;
-      cg->pop ();
-    }
-  return 0;
-}
-
-int
-be_sequence::gen_server_header (void)
-{
-  return 0;
-}
-
-int
-be_sequence::gen_server_skeletons (void)
-{
-  return 0;
-}
-
-// Generates the server-side inline
-int
-be_sequence::gen_server_inline (void)
-{
-  // nothing to be done
-  return 0;
-}
-
-// generate the _var definition for ourself
-int
-be_sequence::gen_var_defn (void)
-{
-  TAO_OutStream *ch; // output stream
-  TAO_NL  nl;        // end line
-  char namebuf [NAMEBUFSIZE];  // names
-  be_state *s;       // code gen state
-  be_type *bt;  // base type
-
-
-  ACE_OS::memset (namebuf, '\0', NAMEBUFSIZE);
-  ACE_OS::sprintf (namebuf, "%s_var", this->local_name ()->get_string ());
-
-  // retrieve a singleton instance of the code generator
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-
-  ch = cg->client_header ();
-
-  *ch << "// *************************************************************"
-      << nl;
-  *ch << "// class " << this->name () << "_var" << nl;
-  *ch << "// *************************************************************\n\n";
-
-  cg->push (TAO_CodeGen::TAO_SEQUENCE_BODY_CH);
-  s = cg->make_state ();
-
-  if (!s)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-          "be_sequence::gen_var_defn - invalid state obj\n"), -1);
-    }
-
-  // retrieve base type
-  bt = be_type::narrow_from_decl (this->base_type ());
-
-  // generate the var definition (always in the client header).
-  // Depending upon the data type, there are some differences which we account
-  // for over here.
-
-  ch->indent (); // start with whatever was our current indent level
-  *ch << "class " << namebuf << nl;
-  *ch << "{" << nl;
-  *ch << "public:\n";
-  ch->incr_indent ();
-  // default constr
-  *ch << namebuf << " (void); // default constructor" << nl;
-  // constr
-  *ch << namebuf << " (" << this->local_name () << " *);" << nl;
-  // copy constructor
-  *ch << namebuf << " (const " << namebuf <<
-    " &); // copy constructor" << nl;
-  // destructor
-  *ch << "~" << namebuf << " (void); // destructor" << nl;
-  *ch << nl;
-  // assignment operator from a pointer
-  *ch << namebuf << " &operator= (" << this->local_name () << " *);" << nl;
-  // assignment from _var
-  *ch << namebuf << " &operator= (const " << namebuf <<
-    " &);" << nl;
-
-  // arrow operator
-  *ch << this->local_name () << " *operator-> (void);" << nl;
-  *ch << "const " << this->local_name () << " *operator-> (void) const;" << nl;
-  *ch << nl;
-
-  // other extra types (cast operators, [] operator, and others)
-
-  // cast operator
-  *ch << "operator const " << this->local_name () << " &() const;" << nl;
-  *ch << "operator " << this->local_name () << " &();" << nl;
-  *ch << "operator " << this->local_name () << " &() const;" << nl;
-
-  // overloaded [] operator. The const version is not required for sequences
-
-  // gen code for base return type
-  if (s->gen_code (bt, this) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-          "be_sequence::gen_var_impl - base type codegen failed\n"), -1);
-    }
-  *ch << " &operator[] (CORBA::ULong index);" << nl;
-
-  *ch << "// in, inout, out, _retn " << nl;
-  // the return types of in, out, inout, and _retn are based on the parameter
-  // passing rules and the base type
-  *ch << "const " << this->local_name () << " &in (void) const;" << nl;
-  *ch << this->local_name () << " &inout (void);" << nl;
-  *ch << this->local_name () << " *&out (void);" << nl;
-  *ch << this->local_name () << " *_retn (void);" << nl;
-
-  // generate an additional member function that returns the underlying pointer
-  *ch << this->local_name () << " *ptr (void) const;\n";
-
-  *ch << "\n";
-  ch->decr_indent ();
-
-  // generate the private section
-  *ch << "private:\n";
-  ch->incr_indent ();
-  *ch << this->local_name () << " *ptr_;\n";
-
-  ch->decr_indent ();
-  *ch << "};\n\n";
-  cg->pop ();
-
-  return 0;
-}
-
-// implementation of the _var class. All of these get generated in the inline
-// file
-int
-be_sequence::gen_var_impl (void)
-{
-  TAO_OutStream *ci; // output stream
-  TAO_NL  nl;        // end line
-  char fname [NAMEBUFSIZE];  // to hold the full and
-  char lname [NAMEBUFSIZE];  // local _var names
-  be_state *s;       // code gen state
-  be_type *bt;  // base type
-
-
-  ACE_OS::memset (fname, '\0', NAMEBUFSIZE);
-  ACE_OS::sprintf (fname, "%s_var", this->fullname ());
-
-  ACE_OS::memset (lname, '\0', NAMEBUFSIZE);
-  ACE_OS::sprintf (lname, "%s_var", this->local_name ()->get_string ());
-
-  // retrieve a singleton instance of the code generator
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-
-  ci = cg->client_inline ();
-
-  cg->push (TAO_CodeGen::TAO_SEQUENCE_BODY_CI);
-  s = cg->make_state ();
-
-  if (!s)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-          "be_sequence::gen_var_impl - invalid state obj\n"), -1);
-    }
-
-  // retrieve base type
-  bt = be_type::narrow_from_decl (this->base_type ());
-
-  // generate the var implementation in the inline file
-  ci->indent (); // start with whatever was our current indent level
-
-  *ci << "// *************************************************************"
-      << nl;
-  *ci << "// Inline operations for class " << fname << nl;
-  *ci << "// *************************************************************\n\n";
-
-  // default constr
-  *ci << "ACE_INLINE" << nl;
-  *ci << fname << "::" << lname <<
-    " (void) // default constructor" << nl;
-  *ci << "\t" << ": ptr_ (0)" << nl;
-  *ci << "{}\n\n";
-
-  // constr from a _ptr
-  ci->indent ();
-  *ci << "ACE_INLINE" << nl;
-  *ci << fname << "::" << lname << " (" << name () << "_ptr p)" << nl;
-  *ci << "\t: ptr_ (p)" << nl;
-  *ci << "{}\n\n";
-
-  // copy constructor
-  ci->indent ();
-  *ci << "ACE_INLINE" << nl;
-  *ci << fname << "::" << lname << " (const " << fname <<
-    " &p) // copy constructor" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "if (p.ptr_)" << nl;
-  *ci << "\tthis->ptr_ = new " << this->name () << "(*p.ptr_);" << nl;
-  *ci << "else" << nl;
-  *ci << "\tthis->ptr_ = 0;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  // destructor
-  ci->indent ();
-  *ci << "ACE_INLINE" << nl;
-  *ci << fname << "::~" << lname << " (void) // destructor" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "delete this->ptr_;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  // assignment operator from a pointer
-  ci->indent ();
-  *ci << "ACE_INLINE " << fname << " &" << nl;
-  *ci << fname << "::operator= (" << name () <<
-    " *p)" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "delete this->ptr_;" << nl;
-  *ci << "this->ptr_ = p;" << nl;
-  *ci << "return *this;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  // assignment operator from _var
-  ci->indent ();
-  *ci << "ACE_INLINE " << fname << " &" << nl;
-  *ci << fname << "::operator= (const " << fname <<
-    " &p) // deep copy" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "if (this != &p)" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "delete this->ptr_;" << nl;
-  *ci << "this->ptr_ = new " << this->name () << " (*p.ptr_);\n";
-  ci->decr_indent ();
-  *ci << "}" << nl;
-  *ci << "return *this;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  // two arrow operators
-  ci->indent ();
-  *ci << "ACE_INLINE const " << this->name () << " *" << nl;
-  *ci << fname << "::operator-> (void) const" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "return this->ptr_;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  ci->indent ();
-  *ci << "ACE_INLINE " << this->name () << " *" << nl;
-  *ci << fname << "::operator-> (void)" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "return this->ptr_;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  // other extra methods - 3 cast operator ()
-  ci->indent ();
-  *ci << "ACE_INLINE " << nl;
-  *ci << fname << "::operator const " << name () <<
-    " &() const // cast" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "return *this->ptr_;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  ci->indent ();
-  *ci << "ACE_INLINE " << nl;
-  *ci << fname << "::operator " << name () << " &() // cast " << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "return *this->ptr_;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  ci->indent ();
-  *ci << "ACE_INLINE " << nl;
-  *ci << fname << "::operator " << name () << " &() const// cast " << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "return *this->ptr_;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  // operator []
-  ci->indent ();
-  *ci << "ACE_INLINE ";
-  // gen code for base return type
-  if (s->gen_code (bt, this) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-          "be_sequence::gen_var_impl - base type codegen failed\n"), -1);
-    }
-  *ci << "&" << nl;
-  *ci << fname << "::operator[] (CORBA::ULong index)" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "return this->ptr_->operator[] (index);\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  // in, inout, out, and _retn
-  ci->indent ();
-  *ci << "ACE_INLINE const " << name () << " &" << nl;
-  *ci << fname << "::in (void) const" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "return *this->ptr_;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  ci->indent ();
-  *ci << "ACE_INLINE " << name () << " &" << nl;
-  *ci << fname << "::inout (void)" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "return *this->ptr_;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  ci->indent ();
-  *ci << "// mapping for variable size " << nl;
-  *ci << "ACE_INLINE " << name () << " *&" << nl;
-  *ci << fname << "::out (void)" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "delete this->ptr_;" << nl;
-  *ci << "this->ptr_ = 0;" << nl;
-  *ci << "return this->ptr_;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  ci->indent ();
-  *ci << "ACE_INLINE " << name () << " *" << nl;
-  *ci << fname << "::_retn (void)" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << this->name () << " *tmp = this->ptr_;" << nl;
-  *ci << "this->ptr_ = 0;" << nl;
-  *ci << "return tmp;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  // the additional ptr () member function
-  ci->indent ();
-  *ci << "ACE_INLINE " << name () << " *" << nl;
-  *ci << fname << "::ptr (void) const" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "return this->ptr_;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  cg->pop ();
-
-  return 0;
-}
-
-// generate the _out definition
-int
-be_sequence::gen_out_defn (void)
-{
-  TAO_OutStream *ch; // output stream
-  TAO_NL  nl;        // end line
-  char namebuf [NAMEBUFSIZE];  // to hold the _out name
-  be_state *s;       // code gen state
-  be_type *bt;  // base type
-
-  ACE_OS::memset (namebuf, '\0', NAMEBUFSIZE);
-  ACE_OS::sprintf (namebuf, "%s_out", this->local_name ()->get_string ());
-
-  // retrieve a singleton instance of the code generator
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-
-  ch = cg->client_header ();
-  cg->push (TAO_CodeGen::TAO_SEQUENCE_BODY_CH);
-  s = cg->make_state ();
-
-  if (!s)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-          "be_sequence::gen_out_defn - invalid state obj\n"), -1);
-    }
-
-  // retrieve base type
-  bt = be_type::narrow_from_decl (this->base_type ());
-
-  // generate the out definition (always in the client header)
-  ch->indent (); // start with whatever was our current indent level
-
-  *ch << "class " << namebuf << nl;
-  *ch << "{" << nl;
-  *ch << "public:\n";
-  ch->incr_indent ();
-
-  // No default constructor
-
-  // constructor from a pointer
-  *ch << namebuf << " (" << this->local_name () << " *&);" << nl;
-  // constructor from a _var &
-  *ch << namebuf << " (" << this->local_name () << "_var &);" << nl;
-  // constructor from a _out &
-  *ch << namebuf << " (" << namebuf << " &);" << nl;
-  // assignment operator from a _out &
-  *ch << namebuf << " &operator= (" << namebuf << " &);" << nl;
-  // assignment operator from a pointer &, cast operator, ptr fn, operator
-  // -> and any other extra operators
-  // assignment
-  *ch << namebuf << " &operator= (" << this->local_name () << " *);" << nl;
-  // operator ()
-  *ch << "operator " << this->local_name () << " *&();" << nl;
-  // ptr fn
-  *ch << this->local_name () << " *&ptr (void);" << nl;
-  // operator ->
-  *ch << this->local_name () << " *operator-> (void);" << nl;
-
-  // overloaded [] operator only for sequence. The const version is not
-  // required
-
-  // gen code for base return type
-  if (s->gen_code (bt, this) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-          "be_sequence::gen_var_impl - base type codegen failed\n"), -1);
-    }
-  *ch << " &operator[] (CORBA::ULong index);" << nl;
-  *ch << "\n";
-  ch->decr_indent ();
-  *ch << "private:\n";
-  ch->incr_indent ();
-
-  *ch << this->local_name () << " *&ptr_;" << nl;
-  *ch << "// assignment from T_var not allowed" << nl;
-  *ch << "void operator= (const " << this->local_name () << "_var &);\n";
-
-  ch->decr_indent ();
-  *ch << "};\n\n";
-
-  cg->pop ();
-  return 0;
-}
-
-int
-be_sequence::gen_out_impl (void)
-{
-  TAO_OutStream *ci; // output stream
-  TAO_NL  nl;        // end line
-  char fname [NAMEBUFSIZE];  // to hold the full and
-  char lname [NAMEBUFSIZE];  // local _out names
-  be_state *s;       // code gen state
-  be_type *bt;  // base type
-
-
-  ACE_OS::memset (fname, '\0', NAMEBUFSIZE);
-  ACE_OS::sprintf (fname, "%s_out", this->fullname ());
-
-  ACE_OS::memset (lname, '\0', NAMEBUFSIZE);
-  ACE_OS::sprintf (lname, "%s_out", this->local_name ()->get_string ());
-
-  // retrieve a singleton instance of the code generator
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-
-  ci = cg->client_inline ();
-
-  cg->push (TAO_CodeGen::TAO_SEQUENCE_BODY_CI);
-  s = cg->make_state ();
-
-  if (!s)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-          "be_sequence::gen_out_impl - invalid state obj\n"), -1);
-    }
-
-  // retrieve base type
-  bt = be_type::narrow_from_decl (this->base_type ());
-
-  // generate the out implementation in the inline file
-
-  ci->indent (); // start with whatever was our current indent level
-
-  *ci << "// *************************************************************"
-      << nl;
-  *ci << "// Inline operations for class " << fname << nl;
-  *ci << "// *************************************************************\n\n";
-
-  // constr from a pointer
-  ci->indent ();
-  *ci << "ACE_INLINE" << nl;
-  *ci << fname << "::" << lname << " (" << name () << " *&p)" << nl;
-  *ci << "\t: ptr_ (p)" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "this->ptr_ = 0;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  // constructor from _var &
-  ci->indent ();
-  *ci << "ACE_INLINE" << nl;
-  *ci << fname << "::" << lname << " (" << this->name () <<
-    "_var &p) // constructor from _var" << nl;
-  *ci << "\t: ptr_ (p.out ())" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "delete this->ptr_;" << nl;
-  *ci << "this->ptr_ = 0;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  // copy constructor
-  ci->indent ();
-  *ci << "ACE_INLINE" << nl;
-  *ci << fname << "::" << lname << " (" << fname <<
-    " &p) // copy constructor" << nl;
-  *ci << "\t: ptr_ (p.ptr_)" << nl;
-  *ci << "{}\n\n";
-
-  // assignment operator from _out &
-  ci->indent ();
-  *ci << "ACE_INLINE " << fname << " &" << nl;
-  *ci << fname << "::operator= (" << fname <<
-    " &p)" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "this->ptr_ = p.ptr_;" << nl;
-  *ci << "return *this;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  // assignment from _var is not allowed by a private declaration
-
-  // assignment operator from pointer
-  ci->indent ();
-  *ci << "ACE_INLINE " << fname << " &" << nl;
-  *ci << fname << "::operator= (" << this->name () <<
-    " *p)" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "this->ptr_ = p;" << nl;
-  *ci << "return *this;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  // other extra methods - cast operator ()
-  ci->indent ();
-  *ci << "ACE_INLINE " << nl;
-  *ci << fname << "::operator " << this->name () <<
-    " *&() // cast" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "return this->ptr_;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  // ptr function
-  ci->indent ();
-  *ci << "ACE_INLINE " << this->name () << " *&" << nl;
-  *ci << fname << "::ptr (void) // ptr" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "return this->ptr_;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  // operator ->
-  ci->indent ();
-  *ci << "ACE_INLINE " << this->name () << " *" << nl;
-  *ci << fname << "::operator-> (void)" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "return this->ptr_;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  // sequence has an additional method
-  ci->indent ();
-  *ci << "ACE_INLINE ";
-  // gen code for base return type
-  if (s->gen_code (bt, this) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-          "be_sequence::gen_out_impl - base type codegen failed\n"), -1);
-    }
-  *ci << "& " << nl;
-  *ci << fname << "::operator[] (CORBA::ULong index)" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "return this->ptr_->operator[] (index);\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  cg->pop ();
-  return 0;
-}
-
-// generate typecode.
-// Typecode for sequences comprises the enumerated value followed by the
-// encapsulation of the parameters
-
-int
-be_sequence::gen_typecode (void)
-{
-  TAO_OutStream *cs; // output stream
-  TAO_NL  nl;        // end line
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-
-  cs = cg->client_stubs ();
-  cs->indent (); // start from whatever indentation level we were at
-
-  *cs << "CORBA::tk_sequence, // typecode kind" << nl;
-  *cs << this->tc_size () << ", // encapsulation length\n";
-  // now emit the encapsulation
-  return this->gen_encapsulation ();
-}
-
-// generate encapsulation
-// An encapsulation for ourselves will be necessary when we are part of some
-// other IDL type and a typecode for that other type is being generated. This
-// will comprise our typecode kind. IDL types with parameters will additionally
-// have the encapsulation length and the entire typecode description
-
-int
-be_sequence::gen_encapsulation (void)
-{
-  TAO_OutStream *os; // output stream
-  TAO_NL  nl;        // end line
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-  be_type *bt; // base type
-
-  os = cg->client_stubs ();
-  os->indent (); // start from the current indentation level
-
-  *os << "TAO_ENCAP_BYTE_ORDER, // byte order" << nl;
-
-  // emit typecode of element type
-  bt = be_type::narrow_from_decl (this->base_type ());
-  if (!bt || (bt->gen_typecode () == -1))
-    {
-      ACE_ERROR ((LM_ERROR, "be_sequence::gen_typecode - bad base type\n"));
-      return -1;
-    }
-
-  //  emit the length
-  os->indent ();
-  *os << this->max_size () << ",\n";
-  return 0;
-}
-
-// compute typecode size
-long
-be_sequence::tc_size (void)
-{
-  // 4 bytes for enumeration, 4 bytes for storing encap length val, followed by the
-  // actual encapsulation length
-  return 4 + 4 + this->tc_encap_len ();
-}
-
-long
-be_sequence::tc_encap_len (void)
-{
-  if (this->encap_len_ == -1) // not computed yet
-    {
-      be_type *bt; // base type
-
-      this->encap_len_ = 4;  // holds the byte order flag
-      // add the encapsulation length of our base type
-      bt = be_type::narrow_from_decl (this->base_type ());
-      if (!bt)
-        {
-          ACE_ERROR ((LM_ERROR,
-                      "be_sequence::tc_encap_len - bad base type\n"));
-          return 0;
-        }
-      this->encap_len_ += bt->tc_size ();
-      this->encap_len_ += 4; // to hold the max size
-
-    }
-  return this->encap_len_;
-}
-
-// Narrowing
-IMPL_NARROW_METHODS3 (be_sequence, AST_Sequence, be_scope, be_type)
-IMPL_NARROW_FROM_DECL (be_sequence)
diff --git a/TAO/TAO_IDL/be/be_state.cpp b/TAO/TAO_IDL/be/be_state.cpp
deleted file mode 100644
index 5d762a189c5..00000000000
--- a/TAO/TAO_IDL/be/be_state.cpp
+++ /dev/null
@@ -1,61 +0,0 @@
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    be_state.cpp
-//
-// = DESCRIPTION
-//    state based code generation.
-//
-// = AUTHOR
-//    Aniruddha Gokhale
-//
-// ============================================================================
-
-#include	"idl.h"
-#include	"idl_extern.h"
-#include	"be.h"
-
-// constructor
-be_state::be_state (void)
-{
-}
-
-// destructor
-be_state::~be_state (void)
-{
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Singleton<be_state_struct_ch, ACE_SYNCH_RECURSIVE_MUTEX>;
-template class ACE_Singleton<be_state_union_disctypedefn_ch, ACE_SYNCH_RECURSIVE_MUTEX>;
-template class ACE_Singleton<be_state_union_disctypedefn_ci, ACE_SYNCH_RECURSIVE_MUTEX>;
-template class ACE_Singleton<be_state_union_public_ch, ACE_SYNCH_RECURSIVE_MUTEX>;
-template class ACE_Singleton<be_state_union_public_ci, ACE_SYNCH_RECURSIVE_MUTEX>;
-template class ACE_Singleton<be_state_union_private_ch, ACE_SYNCH_RECURSIVE_MUTEX>;
-template class ACE_Singleton<be_state_operation, ACE_SYNCH_RECURSIVE_MUTEX>;
-template class ACE_Singleton<be_state_argument, ACE_SYNCH_RECURSIVE_MUTEX>;
-template class ACE_Singleton<be_state_typedef, ACE_SYNCH_RECURSIVE_MUTEX>;
-template class ACE_Singleton<be_state_array, ACE_SYNCH_RECURSIVE_MUTEX>;
-template class ACE_Singleton<be_state_sequence, ACE_SYNCH_RECURSIVE_MUTEX>;
-template class ACE_Singleton<be_state_attribute, ACE_SYNCH_RECURSIVE_MUTEX>;
-template class ACE_Singleton<TAO_CodeGen, ACE_SYNCH_RECURSIVE_MUTEX>;
-template class ACE_Singleton<TAO_OutStream_Factory, ACE_SYNCH_RECURSIVE_MUTEX>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Singleton<be_state_struct_ch, ACE_SYNCH_RECURSIVE_MUTEX>
-#pragma instantiate ACE_Singleton<be_state_union_disctypedefn_ch, ACE_SYNCH_RECURSIVE_MUTEX>
-#pragma instantiate ACE_Singleton<be_state_union_disctypedefn_ci, ACE_SYNCH_RECURSIVE_MUTEX>
-#pragma instantiate ACE_Singleton<be_state_union_public_ch, ACE_SYNCH_RECURSIVE_MUTEX>
-#pragma instantiate ACE_Singleton<be_state_union_public_ci, ACE_SYNCH_RECURSIVE_MUTEX>
-#pragma instantiate ACE_Singleton<be_state_union_private_ch, ACE_SYNCH_RECURSIVE_MUTEX>
-#pragma instantiate ACE_Singleton<be_state_operation, ACE_SYNCH_RECURSIVE_MUTEX>
-#pragma instantiate ACE_Singleton<be_state_argument, ACE_SYNCH_RECURSIVE_MUTEX>
-#pragma instantiate ACE_Singleton<be_state_typedef, ACE_SYNCH_RECURSIVE_MUTEX>
-#pragma instantiate ACE_Singleton<be_state_array, ACE_SYNCH_RECURSIVE_MUTEX>
-#pragma instantiate ACE_Singleton<be_state_sequence, ACE_SYNCH_RECURSIVE_MUTEX>
-#pragma instantiate ACE_Singleton<be_state_attribute, ACE_SYNCH_RECURSIVE_MUTEX>
-#pragma instantiate ACE_Singleton<TAO_CodeGen, ACE_SYNCH_RECURSIVE_MUTEX>
-#pragma instantiate ACE_Singleton<TAO_OutStream_Factory, ACE_SYNCH_RECURSIVE_MUTEX>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/TAO_IDL/be/be_state_argument.cpp b/TAO/TAO_IDL/be/be_state_argument.cpp
deleted file mode 100644
index c42831e448b..00000000000
--- a/TAO/TAO_IDL/be/be_state_argument.cpp
+++ /dev/null
@@ -1,1973 +0,0 @@
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    be_state_argument.cpp
-//
-// = DESCRIPTION
-//    state based code generation for arguments.
-//
-// = AUTHOR
-//    Aniruddha Gokhale
-//
-// ============================================================================
-
-#include	"idl.h"
-#include	"idl_extern.h"
-#include	"be.h"
-
-// return type for argument
-be_state_argument::be_state_argument (void)
-{
-}
-
-// generate code for the mapping of the argument.
-// The different cases below have the following meaning:
-// TAO_ARGUMENT_CH
-// TAO_ARGUMENT_CS
-// TAO_ARGUMENT_SH -- all three generate the arguments in the signature of the
-//                    method . The CH case uses the ACE_NESTED_CLASS macro to
-//                    keep the MSVC++ compiler happy
-// The rest of the enumerated constants are self-explanatory
-//
-// There are 3 levels of nested switch statements
-// Level (1): The "type" of each argument, e.g., predefined, structure, ...
-// Level (2): The direction - in, inout, out
-// Level (3): The current state we are in
-
-int
-be_state_argument::gen_code (be_type *bt, be_decl *d, be_type *type)
-{
-  TAO_OutStream *os = 0; // output stream
-  TAO_NL  nl;        // end line
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-  be_argument *arg;  // argument node
-  be_interface *bif; // interface inside which the operation that uses this
-                     // argument was defined
-
-  switch (cg->state ())
-    {
-    case TAO_CodeGen::TAO_ARGUMENT_CH:
-      os = cg->client_header ();
-      break;
-    case TAO_CodeGen::TAO_ARGUMENT_CS:
-    case TAO_CodeGen::TAO_ARGUMENT_PRE_DOCALL_CS:
-    case TAO_CodeGen::TAO_ARGUMENT_DOCALL_CS:
-    case TAO_CodeGen::TAO_ARGUMENT_POST_DOCALL_CS:
-      os = cg->client_stubs ();
-      break;
-    case TAO_CodeGen::TAO_ARGUMENT_SH:
-      os = cg->server_header ();
-      break;
-    case TAO_CodeGen::TAO_ARGUMENT_SS:
-    case TAO_CodeGen::TAO_ARGUMENT_VARDECL_SS:
-    case TAO_CodeGen::TAO_ARGUMENT_PRE_UPCALL_SS:
-    case TAO_CodeGen::TAO_ARGUMENT_UPCALL_SS:
-    case TAO_CodeGen::TAO_ARGUMENT_POST_UPCALL_SS:
-      os = cg->server_skeletons ();
-      break;
-    }
-
-  // retrieve the argument node
-  arg = be_argument::narrow_from_decl (d);
-  if (!arg)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_state_argument.cpp - "
-                         "Bad argument\n"),
-                        -1);
-    }
-
-  // get the scope of the arg which is the operation. Its scope is the
-  // interface node. We need this interface node for generating the
-  // ACE_NESTED_CLASS macro
-  bif = be_interface::narrow_from_scope (ScopeAsDecl (arg->defined_in
-                                                      ())->defined_in ());
-  if (!bif)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_state_argument.cpp - "
-                         "Bad interface\n"),
-                        -1);
-    }
-
-  if (!type) // not a recursive call
-    type = bt;
-  else // recursively called thru a typedef. "type" will have the most primitive
-    // base class of the typedef
-    ACE_ASSERT (bt->node_type () == AST_Decl::NT_typedef);
-
-  // find the direction of the argument. Depending on the direction and the
-  // type, generate the mapping
-  switch (type->node_type ())  // LEVEL (1) switch on node type of the "type"
-    {
-    case AST_Decl::NT_interface: // type is an obj reference
-    case AST_Decl::NT_interface_fwd: // type is an obj reference
-      {
-        switch (arg->direction ())
-          {
-          case AST_Argument::dir_IN:
-            // what state are we in
-            switch (cg->state ())
-              {
-              case TAO_CodeGen::TAO_ARGUMENT_PRE_DOCALL_CS:
-                {
-                  // assign to a CORBA::Object_ptr
-                  *os << "CORBA::Object_ptr _tao_base_" << arg->local_name ()
-                      << " = " << arg->local_name () << "; // cast it" << nl;
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_DOCALL_CS:
-                {
-                  // pass the cast value
-                  *os << ", &_tao_base_" << arg->local_name ();
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_POST_DOCALL_CS:
-                {
-                  // nothing for in parameters
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_VARDECL_SS:
-                {
-                  // declare a variable
-                  *os << bt->name () << "_ptr ";
-                  *os << arg->local_name () << ";" << nl;
-                  // we also declare a corresponding CORBA::Object_ptr to be
-                  // passed to the decoder
-                  *os << "CORBA::Object_ptr _tao_base_" << arg->local_name ()
-                      << ";" << nl;
-                  // now define a NamedValue_ptr
-                  *os << "CORBA::NamedValue_ptr nv_" << arg->local_name () <<
-                    ";" << nl;
-                  // declare an Any
-                  *os << "CORBA::Any \t any_" << arg->local_name () << " (" <<
-                    bt->tc_name () << ", &_tao_base_" << arg->local_name () <<
-                    "); // ORB does not own" << nl;
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_PRE_UPCALL_SS:
-                {
-                  // convert from the CORBA::Object_ptr to the interface type
-                  // using a _narrow
-                  *os << arg->local_name () << " = " << bt->name () <<
-                    "::_narrow (_tao_base_" << arg->local_name () << ", " <<
-                    "_tao_environment);" << nl;
-                  *os << "if (_tao_environment.exception ()) return;" << nl;
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_POST_UPCALL_SS:
-                {
-                  // nothing for an in parameter
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_UPCALL_SS:
-                {
-                  *os << arg->local_name () << ", ";
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_CH:
-                {
-                  // to keep the MSVC++ compiler happy
-                  *os << bt->nested_type_name (bif, "_ptr") << " " <<
-                    arg->local_name () << ", ";
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_CS:
-              case TAO_CodeGen::TAO_ARGUMENT_SH:
-                {
-                  *os << bt->name () << "_ptr " << arg->local_name () << ", ";
-                }
-                break;
-              default:
-                {
-                  ACE_ERROR_RETURN ((LM_ERROR,
-                   "(%N:%l) be_state_argument - unknown state\n"), -1);
-                }
-              } // switch state
-            break;
-          case AST_Argument::dir_INOUT: // inout
-            switch (cg->state ())
-              {
-              case TAO_CodeGen::TAO_ARGUMENT_PRE_DOCALL_CS:
-                {
-                  // assign to a CORBA::Object_ptr
-                  *os << "CORBA::Object_ptr _tao_base_" << arg->local_name ()
-                      << " = " << arg->local_name () << ";" << nl;
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_DOCALL_CS:
-                {
-                  *os << ", &_tao_base_" << arg->local_name ();
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_POST_DOCALL_CS:
-                {
-                  // reassign to the inout parameter doing a _narrow
-                  *os << arg->local_name () << " = " << bt->name () <<
-                    "::_narrow (_tao_base_" << arg->local_name () << ", env);"
-                      << nl;
-                  *os << "CORBA::release (_tao_base_" << arg->local_name () <<
-                    ");" << nl;
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_VARDECL_SS:
-                {
-                  // declare a variable
-                  *os << bt->name () << "_ptr ";
-                  *os << arg->local_name () << ";" << nl;
-                  // we also declare a corresponding CORBA::Object_ptr to be
-                  // passed to the decoder
-                  *os << "CORBA::Object_ptr *_tao_base_" << arg->local_name ()
-                      << " = new CORBA::Object_ptr;" << nl;
-                  // now define a NamedValue_ptr
-                  *os << "CORBA::NamedValue_ptr nv_" << arg->local_name () <<
-                    ";" << nl;
-                  // declare an Any
-                  *os << "CORBA::Any \t any_" << arg->local_name () << " (" <<
-                    bt->tc_name () << ", _tao_base_" << arg->local_name () <<
-                    ", 1); // ORB owns" << nl;
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_PRE_UPCALL_SS:
-                {
-                  // convert from the CORBA::Object_ptr to the interface type
-                  // using a _narrow
-                  *os << arg->local_name () << " = " << bt->name () <<
-                    "::_narrow (*_tao_base_" << arg->local_name () << ", " <<
-                    "_tao_environment);" << nl;
-                  *os << "if (_tao_environment.exception ()) return;" << nl;
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_POST_UPCALL_SS:
-                {
-                  // assign modified interface obj ref to object_ptr
-                  *os << "*_tao_base_" << arg->local_name () << " = " <<
-                    arg->local_name () << ";" << nl;
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_UPCALL_SS:
-                {
-                  *os << arg->local_name () << ", ";
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_CH:
-                {
-                  // to keep the MSVC++ compiler happy
-                  *os << bt->nested_type_name (bif, "_ptr") << " &" <<
-                    arg->local_name () << ", ";
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_CS:
-              case TAO_CodeGen::TAO_ARGUMENT_SH:
-                {
-                  *os << bt->name () << "_ptr &" << arg->local_name () << ", ";
-                }
-                break;
-              default:
-                {
-                  ACE_ERROR_RETURN ((LM_ERROR,
-                   "(%N:%l) be_state_argument - unknown state\n"), -1);
-                }
-              } // end switch state
-            break;
-          case AST_Argument::dir_OUT:
-            switch (cg->state ())
-              {
-              case TAO_CodeGen::TAO_ARGUMENT_PRE_DOCALL_CS:
-                {
-                  // assign to a CORBA::Object_ptr
-                  *os << "CORBA::Object_ptr _tao_base_" << arg->local_name ()
-                      << ";" << nl;
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_DOCALL_CS:
-                {
-                  *os << ", &_tao_base_" << arg->local_name ();
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_POST_DOCALL_CS:
-                {
-                  // reassign to the inout parameter doing a _narrow
-                  *os << arg->local_name () << " = " << bt->name () <<
-                    "::_narrow (_tao_base_" << arg->local_name () << ", env);"
-                      << nl;
-                  *os << "// free the Object_ptr" << nl;
-                  *os << "CORBA::release (_tao_base_" << arg->local_name () <<
-                    ");" << nl;
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_VARDECL_SS:
-                {
-                  // declare a variable
-                  *os << bt->name () << "_ptr ";
-                  *os << arg->local_name () << ";" << nl;
-                  *os << bt->name () << "_out " << arg->local_name () <<
-                    "_out (" << arg->local_name () << ");" << nl;
-                  // we also declare a corresponding CORBA::Object_ptr to be
-                  // passed to the decoder
-                  *os << "CORBA::Object_ptr *_tao_base_" << arg->local_name ()
-                      << " = new CORBA::Object_ptr;" << nl;
-                  // now define a NamedValue_ptr
-                  *os << "CORBA::NamedValue_ptr nv_" << arg->local_name () <<
-                    ";" << nl;
-                  // declare an Any
-                  *os << "CORBA::Any \t any_" << arg->local_name () << " (" <<
-                    bt->tc_name () << ", _tao_base_" << arg->local_name () <<
-                    ", 1); // ORB owns" << nl;
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_PRE_UPCALL_SS:
-                {
-                  // nothing
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_POST_UPCALL_SS:
-                {
-                  // out parameter is cast to Object_ptr
-                  *os << "*_tao_base_" << arg->local_name () << " = " <<
-                    arg->local_name () << "_out;" << nl;
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_UPCALL_SS:
-                {
-                  *os << arg->local_name () << "_out, ";
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_CH:
-                {
-                  // to keep the MSVC++ compiler happy
-                  *os << bt->nested_type_name (bif, "_out") << " " <<
-                    arg->local_name () << ", ";
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_CS:
-              case TAO_CodeGen::TAO_ARGUMENT_SH:
-                {
-                  *os << bt->name () << "_out " << arg->local_name () << ", ";
-                }
-                break;
-              default:
-                {
-                  ACE_ERROR_RETURN ((LM_ERROR,
-                   "(%N:%l) be_state_argument - unknown state\n"), -1);
-                }
-              } // end switch state
-            break;
-          } // end switch direction
-      } // end of case interface/interface_fwd
-      break;
-    case AST_Decl::NT_pre_defined: // type is predefined type
-      {
-        be_predefined_type *bpd = be_predefined_type::narrow_from_decl (type);
-
-        // check if the type is an any
-        if (bpd->pt () == AST_PredefinedType::PT_any)
-          {
-            switch (arg->direction ())
-              {
-              case AST_Argument::dir_IN:
-                switch (cg->state ())
-                  {
-                  case TAO_CodeGen::TAO_ARGUMENT_VARDECL_SS:
-                    {
-                      *os << bt->name () << " ";
-                    // declare a variable
-                      *os << arg->local_name () << ";" << nl;
-                    // now define a NamedValue_ptr
-                      *os << "CORBA::NamedValue_ptr nv_" << arg->local_name () <<
-                        ";" << nl;
-                    // declare an Any
-                      *os << "CORBA::Any \t any_" << arg->local_name () << " (" <<
-                        bt->tc_name () << ", &" << arg->local_name () <<
-                        "); // ORB does not own" << nl;
-                    }
-                    break;
-                  case TAO_CodeGen::TAO_ARGUMENT_PRE_DOCALL_CS:
-                    {
-                      // XXXASG - TODO
-                    }
-                    break;
-                  case TAO_CodeGen::TAO_ARGUMENT_DOCALL_CS:
-                    {
-                      // XXXASG - TODO
-                    }
-                    break;
-                  case TAO_CodeGen::TAO_ARGUMENT_POST_DOCALL_CS:
-                    {
-                      // XXXASG - TODO
-                    }
-                    break;
-                  case TAO_CodeGen::TAO_ARGUMENT_UPCALL_SS:
-                    {
-                      *os << arg->local_name () << ", ";
-                    }
-                    break;
-                  case TAO_CodeGen::TAO_ARGUMENT_PRE_UPCALL_SS:
-                    {
-                      // XXXASG - TODO
-                    }
-                    break;
-                  case TAO_CodeGen::TAO_ARGUMENT_POST_UPCALL_SS:
-                    {
-                      // XXXASG - TODO
-                    }
-                    break;
-                  case TAO_CodeGen::TAO_ARGUMENT_CH:
-                    {
-                      // keep MSVC++ happy
-                      *os << "const " << bt->nested_type_name (bif) << " &" <<
-                        arg->local_name () << ", ";
-                    }
-                    break;
-                  case TAO_CodeGen::TAO_ARGUMENT_CS:
-                  case TAO_CodeGen::TAO_ARGUMENT_SH:
-                    {
-                      *os << "const " << bt->name () << " &" << arg->local_name
-                        () << ", ";
-                    }
-                    break;
-                  default:
-                    {
-                      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_state_argument - unknown state\n"), -1);
-                    }
-                  } // end switch state
-                break;
-              case AST_Argument::dir_INOUT:
-                switch (cg->state ())
-                  {
-                  case TAO_CodeGen::TAO_ARGUMENT_VARDECL_SS:
-                    {
-                    // declare a variable
-                      *os << bt->name () << " ";
-                      *os << arg->local_name () << ";" << nl;
-                    // now define a NamedValue_ptr
-                      *os << "CORBA::NamedValue_ptr nv_" << arg->local_name () <<
-                        ";" << nl;
-                    // declare an Any
-                      *os << "CORBA::Any \t any_" << arg->local_name () << " (" <<
-                        bt->tc_name () << ", &" << arg->local_name () <<
-                        ", 1); // ORB owns" << nl;
-                    }
-                    break;
-                  case TAO_CodeGen::TAO_ARGUMENT_PRE_DOCALL_CS:
-                    {
-                      // XXXASG - TODO very similar to ObjRef
-                    }
-                    break;
-                  case TAO_CodeGen::TAO_ARGUMENT_DOCALL_CS:
-                    {
-                      // XXXASG - TODO very similar to ObjRef
-                    }
-                    break;
-                  case TAO_CodeGen::TAO_ARGUMENT_POST_DOCALL_CS:
-                    {
-                      // XXXASG - TODO very similar to ObjRef
-                    }
-                    break;
-                  case TAO_CodeGen::TAO_ARGUMENT_UPCALL_SS:
-                    {
-                      *os << arg->local_name () << ", ";
-                    }
-                    break;
-                  case TAO_CodeGen::TAO_ARGUMENT_PRE_UPCALL_SS:
-                    {
-                      // nothing
-                    }
-                    break;
-                  case TAO_CodeGen::TAO_ARGUMENT_POST_UPCALL_SS:
-                    {
-                      // nothing
-                    }
-                    break;
-                  case TAO_CodeGen::TAO_ARGUMENT_CH:
-                    {
-                      *os << "const " << bt->nested_type_name (bif) << " &" <<
-                        arg->local_name () << ", ";
-                    }
-                    break;
-                  case TAO_CodeGen::TAO_ARGUMENT_CS:
-                  case TAO_CodeGen::TAO_ARGUMENT_SH:
-                    {
-                      *os << bt->name () << " &" << arg->local_name () << ", ";
-                    }
-                    break;
-                  default:
-                    {
-                      ACE_ERROR_RETURN ((LM_ERROR,
-                           "(%N:%l) be_state_argument - unknown state\n"), -1);
-                    }
-                  } // end switch state
-                break;
-              case AST_Argument::dir_OUT:
-                switch (cg->state ())
-                  {
-                  case TAO_CodeGen::TAO_ARGUMENT_VARDECL_SS:
-                    {
-                    // declare a variable
-                      *os << bt->name () << " *";
-                      *os << arg->local_name () << ";" << nl;
-                    // now define a NamedValue_ptr
-                      *os << "CORBA::NamedValue_ptr nv_" << arg->local_name () <<
-                        ";" << nl;
-                    // declare an Any
-                      *os << "CORBA::Any \t any_" << arg->local_name () << " (" <<
-                        bt->tc_name () << ", " << arg->local_name () <<
-                        ", 1); // ORB owns" << nl;
-                    }
-                    break;
-                  case TAO_CodeGen::TAO_ARGUMENT_PRE_DOCALL_CS:
-                    {
-                      // nothing
-                    }
-                    break;
-                  case TAO_CodeGen::TAO_ARGUMENT_DOCALL_CS:
-                    {
-                      // nothing
-                    }
-                    break;
-                  case TAO_CodeGen::TAO_ARGUMENT_POST_DOCALL_CS:
-                    {
-                      // nothing
-                    }
-                    break;
-                  case TAO_CodeGen::TAO_ARGUMENT_UPCALL_SS:
-                    {
-                      *os << arg->local_name () << ", ";
-                    }
-                    break;
-                  case TAO_CodeGen::TAO_ARGUMENT_PRE_UPCALL_SS:
-                    {
-                      // nothing
-                    }
-                    break;
-                  case TAO_CodeGen::TAO_ARGUMENT_POST_UPCALL_SS:
-                    {
-                      // nothing
-                    }
-                    break;
-                  case TAO_CodeGen::TAO_ARGUMENT_CH:
-                    {
-                      *os << bt->nested_type_name (bif, "_out") << " " <<
-                        arg->local_name () << ", ";
-                    }
-                    break;
-                  case TAO_CodeGen::TAO_ARGUMENT_CS:
-                  case TAO_CodeGen::TAO_ARGUMENT_SH:
-                    {
-                      *os << bt->name () << "_out " << arg->local_name () <<
-                        ", ";
-                    }
-                    break;
-                  default:
-                    {
-                      ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_state_argument - unknown state\n"), -1);
-                    }
-                  } // end switch state
-                break;
-              } // end switch direction
-          } // end of if
-        else if (bpd->pt () == AST_PredefinedType::PT_pseudo) // e.g., CORBA::Object
-          {
-            switch (arg->direction ())
-              {
-              case AST_Argument::dir_IN:
-                switch (cg->state ())
-                  {
-                  case TAO_CodeGen::TAO_ARGUMENT_VARDECL_SS:
-                    {
-                    // declare a variable
-                      *os << bt->name () << "_ptr ";
-                      *os << arg->local_name () << ";" << nl;
-                    // now define a NamedValue_ptr
-                      *os << "CORBA::NamedValue_ptr nv_" << arg->local_name () <<
-                        ";" << nl;
-                    // declare an Any
-                      *os << "CORBA::Any \t any_" << arg->local_name () << " (" <<
-                        bt->tc_name () << ", &" << arg->local_name () <<
-                        "); // ORB does not own" << nl;
-                    }
-                    break;
-                  case TAO_CodeGen::TAO_ARGUMENT_PRE_DOCALL_CS:
-                    {
-                      // no casting necessary as we already are object_ptr
-                    }
-                    break;
-                  case TAO_CodeGen::TAO_ARGUMENT_DOCALL_CS:
-                    {
-                      *os << ", &" << arg->local_name ();
-                    }
-                    break;
-                  case TAO_CodeGen::TAO_ARGUMENT_POST_DOCALL_CS:
-                    {
-                      // nothing
-                    }
-                    break;
-                  case TAO_CodeGen::TAO_ARGUMENT_UPCALL_SS:
-                    {
-                      *os << arg->local_name () << ", ";
-                    }
-                    break;
-                  case TAO_CodeGen::TAO_ARGUMENT_PRE_UPCALL_SS:
-                    {
-                      // nothing to be done as we are Object_ptr
-                    }
-                    break;
-                  case TAO_CodeGen::TAO_ARGUMENT_POST_UPCALL_SS:
-                    {
-                      // nothing
-                    }
-                    break;
-                  case TAO_CodeGen::TAO_ARGUMENT_CH:
-                    {
-                      *os << bt->nested_type_name (bif, "_ptr") << " " <<
-                        arg->local_name () << ", ";
-                    }
-                    break;
-                  case TAO_CodeGen::TAO_ARGUMENT_CS:
-                  case TAO_CodeGen::TAO_ARGUMENT_SH:
-                    {
-                      *os << bt->name () << "_ptr " << arg->local_name () <<
-                        ", ";
-                    }
-                    break;
-                  default:
-                    {
-                      ACE_ERROR_RETURN ((LM_ERROR,
-                        "(%N:%l) be_state_argument - unknown state\n"), -1);
-                    }
-                  } // end of switch state
-                break;
-              case AST_Argument::dir_INOUT:
-                switch (cg->state ())
-                  {
-                  case TAO_CodeGen::TAO_ARGUMENT_VARDECL_SS:
-                    {
-                    // declare a variable
-                      *os << bt->name () << "_ptr *" << arg->local_name () <<
-                        " = new " << bt->name () << "_ptr;" << nl;
-                    // now define a NamedValue_ptr
-                      *os << "CORBA::NamedValue_ptr nv_" << arg->local_name () <<
-                        ";" << nl;
-                    // declare an Any
-                      *os << "CORBA::Any \t any_" << arg->local_name () << " (" <<
-                        bt->tc_name () << ", " << arg->local_name () <<
-                        ", 1); // ORB owns" << nl;
-                    }
-                    break;
-                  case TAO_CodeGen::TAO_ARGUMENT_PRE_DOCALL_CS:
-                    {
-                      // nothing
-                    }
-                    break;
-                  case TAO_CodeGen::TAO_ARGUMENT_DOCALL_CS:
-                    {
-                      *os << ", &" << arg->local_name ();
-                    }
-                    break;
-                  case TAO_CodeGen::TAO_ARGUMENT_POST_DOCALL_CS:
-                    {
-                      // nothing
-                    }
-                    break;
-                  case TAO_CodeGen::TAO_ARGUMENT_UPCALL_SS:
-                    {
-                      *os << arg->local_name () << ", ";
-                    }
-                    break;
-                  case TAO_CodeGen::TAO_ARGUMENT_PRE_UPCALL_SS:
-                    {
-                      // nothing
-                    }
-                    break;
-                  case TAO_CodeGen::TAO_ARGUMENT_POST_UPCALL_SS:
-                    {
-                      // nothing
-                    }
-                    break;
-                  case TAO_CodeGen::TAO_ARGUMENT_CH:
-                    {
-                      *os << bt->nested_type_name (bif, "_ptr") << " &" <<
-                        arg->local_name () << ", ";
-                    }
-                    break;
-                  case TAO_CodeGen::TAO_ARGUMENT_CS:
-                  case TAO_CodeGen::TAO_ARGUMENT_SH:
-                    {
-                      *os << bt->name () << "_ptr &" << arg->local_name () <<
-                        ", ";
-                    }
-                    break;
-                  default:
-                    {
-                      ACE_ERROR_RETURN ((LM_ERROR,
-                          "(%N:%l) be_state_argument - unknown state\n"), -1);
-                    }
-                  } // end switch state
-                break;
-              case AST_Argument::dir_OUT:
-                switch (cg->state ())
-                  {
-                  case TAO_CodeGen::TAO_ARGUMENT_VARDECL_SS:
-                    {
-                    // declare a variable
-                      *os << bt->name () << "_ptr ";
-                      *os << arg->local_name () << ";" << nl;
-                      *os << bt->name () << "_out ";
-                      *os << arg->local_name () << "_out (" << arg->local_name
-                        () << ");" << nl;
-                    // now define a NamedValue_ptr
-                      *os << "CORBA::NamedValue_ptr nv_" << arg->local_name () <<
-                        ";" << nl;
-                    // declare an Any
-                      *os << "CORBA::Any \t any_" << arg->local_name () << " (" <<
-                        bt->tc_name () << ", &" << arg->local_name () <<
-                        ", 1); // ORB owns" << nl;
-                    }
-                    break;
-                  case TAO_CodeGen::TAO_ARGUMENT_PRE_DOCALL_CS:
-                    {
-                      // declare a variable
-                      *os << bt->name () << "_ptr _tao_base_" <<
-                        arg->local_name () << ";" << nl;
-                    }
-                    break;
-                  case TAO_CodeGen::TAO_ARGUMENT_DOCALL_CS:
-                    {
-                      *os << ", &_tao_base_" << arg->local_name ();
-                    }
-                    break;
-                  case TAO_CodeGen::TAO_ARGUMENT_POST_DOCALL_CS:
-                    {
-                      // assign to the _out parameter
-                      *os << arg->local_name () << " = _tao_base_" <<
-                        arg->local_name () << ";" << nl;
-                    }
-                    break;
-                  case TAO_CodeGen::TAO_ARGUMENT_UPCALL_SS:
-                    {
-                      *os << arg->local_name () << "_out, ";
-                    }
-                    break;
-                  case TAO_CodeGen::TAO_ARGUMENT_PRE_UPCALL_SS:
-                    {
-                      // nothing
-                    }
-                    break;
-                  case TAO_CodeGen::TAO_ARGUMENT_POST_UPCALL_SS:
-                    {
-                      // nothing
-                    }
-                    break;
-                  case TAO_CodeGen::TAO_ARGUMENT_CH:
-                    {
-                      *os << bt->nested_type_name (bif, "_out") << " " <<
-                        arg->local_name () << ", ";
-                    }
-                    break;
-                  case TAO_CodeGen::TAO_ARGUMENT_CS:
-                  case TAO_CodeGen::TAO_ARGUMENT_SH:
-                    {
-                      *os << bt->name () << "_out " << arg->local_name () <<
-                        ", ";
-                    }
-                    break;
-                  default:
-                    {
-                      ACE_ERROR_RETURN ((LM_ERROR,
-                        "(%N:%l) be_state_argument - unknown state\n"), -1);
-                    }
-                  } // end switch state
-                break;
-              } // end switch direction
-          } // end else if
-        else // simple predefined types
-          {
-            switch (arg->direction ())
-              {
-              case AST_Argument::dir_IN:
-                switch (cg->state ())
-                  {
-                  case TAO_CodeGen::TAO_ARGUMENT_VARDECL_SS:
-                    {
-                    // declare a variable
-                      *os << bt->name () << " " << arg->local_name () << ";" <<
-                        nl;
-                    // now define a NamedValue_ptr
-                      *os << "CORBA::NamedValue_ptr nv_" << arg->local_name () <<
-                        ";" << nl;
-                    // declare an Any
-                      *os << "CORBA::Any \t any_" << arg->local_name () << " (" <<
-                        bt->tc_name () << ", &" << arg->local_name () <<
-                        "); // ORB does not own" << nl;
-                    }
-                    break;
-                  case TAO_CodeGen::TAO_ARGUMENT_PRE_DOCALL_CS:
-                    {
-                      // nothing
-                    }
-                    break;
-                  case TAO_CodeGen::TAO_ARGUMENT_DOCALL_CS:
-                    {
-                      *os << ", &" << arg->local_name ();
-                    }
-                    break;
-                  case TAO_CodeGen::TAO_ARGUMENT_POST_DOCALL_CS:
-                    {
-                      // nothing
-                    }
-                    break;
-                  case TAO_CodeGen::TAO_ARGUMENT_UPCALL_SS:
-                    {
-                      *os << arg->local_name () << ", ";
-                    }
-                    break;
-                  case TAO_CodeGen::TAO_ARGUMENT_PRE_UPCALL_SS:
-                    {
-                      // nothing
-                    }
-                    break;
-                  case TAO_CodeGen::TAO_ARGUMENT_POST_UPCALL_SS:
-                    {
-                      // nothing
-                    }
-                    break;
-                  case TAO_CodeGen::TAO_ARGUMENT_CH:
-                    {
-                      *os << bt->nested_type_name (bif) << " " <<
-                        arg->local_name () << ", ";
-                    }
-                    break;
-                  case TAO_CodeGen::TAO_ARGUMENT_CS:
-                  case TAO_CodeGen::TAO_ARGUMENT_SH:
-                    {
-                      *os << bt->name () << " " << arg->local_name () << ", ";
-                    }
-                    break;
-                  default:
-                    {
-                      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_state_argument - unknown state\n"), -1);
-                    }
-                  } // end switch state
-                break;
-              case AST_Argument::dir_INOUT:
-                switch (cg->state ())
-                  {
-                  case TAO_CodeGen::TAO_ARGUMENT_VARDECL_SS:
-                    {
-                    // declare a variable
-                      *os << bt->name () << " *" << arg->local_name () <<
-                        " = new " << bt->name () << ";" << nl;
-                    // now define a NamedValue_ptr
-                      *os << "CORBA::NamedValue_ptr nv_" << arg->local_name () <<
-                        ";" << nl;
-                    // declare an Any
-                      *os << "CORBA::Any \t any_" << arg->local_name () << " (" <<
-                        bt->tc_name () << ", " << arg->local_name () <<
-                        "); // ORB owns " << nl;
-                    }
-                    break;
-                  case TAO_CodeGen::TAO_ARGUMENT_PRE_DOCALL_CS:
-                    {
-                      // nothing
-                    }
-                    break;
-                  case TAO_CodeGen::TAO_ARGUMENT_DOCALL_CS:
-                    {
-                      *os << ", &" << arg->local_name ();
-                    }
-                    break;
-                  case TAO_CodeGen::TAO_ARGUMENT_POST_DOCALL_CS:
-                    {
-                      // nothing
-                    }
-                    break;
-                  case TAO_CodeGen::TAO_ARGUMENT_UPCALL_SS:
-                    {
-                      *os << "*" << arg->local_name () << ", ";
-                    }
-                    break;
-                  case TAO_CodeGen::TAO_ARGUMENT_PRE_UPCALL_SS:
-                    {
-                      // nothing
-                    }
-                    break;
-                  case TAO_CodeGen::TAO_ARGUMENT_POST_UPCALL_SS:
-                    {
-                      // nothing
-                    }
-                    break;
-                  case TAO_CodeGen::TAO_ARGUMENT_CH:
-                    {
-                      *os << bt->nested_type_name (bif) << " &" <<
-                        arg->local_name () << ", ";
-                    }
-                    break;
-                  case TAO_CodeGen::TAO_ARGUMENT_CS:
-                  case TAO_CodeGen::TAO_ARGUMENT_SH:
-                    {
-                      *os << bt->name () << " &" << arg->local_name () << ", ";
-                    }
-                    break;
-                  default:
-                    {
-                      ACE_ERROR_RETURN ((LM_ERROR,
-                        "(%N:%l) be_state_argument - unknown state\n"), -1);
-                    }
-                  } // end switch state
-                break;
-              case AST_Argument::dir_OUT:
-                switch (cg->state ())
-                  {
-                  case TAO_CodeGen::TAO_ARGUMENT_VARDECL_SS:
-                    {
-                    // declare a variable
-                      *os << bt->name () << " *" << arg->local_name () <<
-                        " = new " << bt->name () << ";" << nl;
-                    // now define a NamedValue_ptr
-                      *os << "CORBA::NamedValue_ptr nv_" << arg->local_name () <<
-                        ";" << nl;
-                    // declare an Any
-                      *os << "CORBA::Any \t any_" << arg->local_name () << " (" <<
-                        bt->tc_name () << ", " << arg->local_name () <<
-                        ", 1); // ORB owns" << nl;
-                    }
-                    break;
-                  case TAO_CodeGen::TAO_ARGUMENT_PRE_DOCALL_CS:
-                    {
-                      // nothing
-                    }
-                    break;
-                  case TAO_CodeGen::TAO_ARGUMENT_DOCALL_CS:
-                    {
-                      *os << ", &" << arg->local_name ();
-                    }
-                    break;
-                  case TAO_CodeGen::TAO_ARGUMENT_POST_DOCALL_CS:
-                    {
-                      // nothing
-                    }
-                    break;
-                  case TAO_CodeGen::TAO_ARGUMENT_UPCALL_SS:
-                    {
-                      *os << "*" << arg->local_name () << ", ";
-                    }
-                    break;
-                  case TAO_CodeGen::TAO_ARGUMENT_PRE_UPCALL_SS:
-                    {
-                      // nothing
-                    }
-                    break;
-                  case TAO_CodeGen::TAO_ARGUMENT_POST_UPCALL_SS:
-                    {
-                      // nothing
-                    }
-                    break;
-                  case TAO_CodeGen::TAO_ARGUMENT_CH:
-                    {
-                      *os << bt->nested_type_name (bif, "_out") << " " <<
-                        arg->local_name () << ", ";
-                    }
-                    break;
-                  case TAO_CodeGen::TAO_ARGUMENT_CS:
-                  case TAO_CodeGen::TAO_ARGUMENT_SH:
-                    {
-                      *os << bt->name () << "_out " << arg->local_name () <<
-                        ", ";
-                    }
-                    break;
-                  default:
-                    {
-                      ACE_ERROR_RETURN ((LM_ERROR,
-                          "(%N:%l) be_state_argument - unknown state\n"), -1);
-                    }
-                  } // end of switch
-                break;
-              } // end switch direction
-          } // end of else
-      } // end of case predefined
-      break;
-    case AST_Decl::NT_string: // type is a string
-      {
-        switch (arg->direction ())
-          {
-          case AST_Argument::dir_IN:
-            switch (cg->state ())
-              {
-              case TAO_CodeGen::TAO_ARGUMENT_VARDECL_SS:
-                {
-                    // declare a variable
-                  if (bt->node_type () == AST_Decl::NT_typedef)
-                    *os << bt->name ();
-                  else
-                    *os << "char *";
-                  *os << " " << arg->local_name () << ";" <<
-                    nl;
-                    // now define a NamedValue_ptr
-                  *os << "CORBA::NamedValue_ptr nv_" << arg->local_name () <<
-                    ";" << nl;
-                    // declare an Any
-                  *os << "CORBA::Any \t any_" << arg->local_name () << " (" <<
-                    bt->tc_name () << ", &" << arg->local_name () <<
-                    "); // ORB does not own" << nl;
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_PRE_DOCALL_CS:
-                {
-                  // nothing
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_DOCALL_CS:
-                {
-                  *os << ", &" << arg->local_name ();
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_POST_DOCALL_CS:
-                {
-                  // nothing
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_PRE_UPCALL_SS:
-                {
-                  // nothing
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_POST_UPCALL_SS:
-                {
-                  // nothing
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_UPCALL_SS:
-                {
-                  *os << arg->local_name () << ", ";
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_CH:
-                {
-                  *os << "const ";
-                  if (bt->node_type () == AST_Decl::NT_typedef)
-                    *os << bt->nested_type_name (bif);
-                  else
-                    *os << "char *";
-                  *os << " " << arg->local_name () << ", ";
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_SH:
-              case TAO_CodeGen::TAO_ARGUMENT_CS:
-                {
-                  *os << "const ";
-                  if (bt->node_type () == AST_Decl::NT_typedef)
-                    *os << bt->name ();
-                  else
-                    *os << "char *";
-                  *os << " " << arg->local_name () << ", ";
-                }
-                break;
-              default:
-                {
-                  ACE_ERROR_RETURN ((LM_ERROR,
-                   "(%N:%l) be_state_argument - unknown state\n"), -1);
-                }
-              } // end switch state
-            break;
-          case AST_Argument::dir_INOUT:
-            switch (cg->state ())
-              {
-              case TAO_CodeGen::TAO_ARGUMENT_VARDECL_SS:
-                {
-                    // declare a variable
-                  if (bt->node_type () == AST_Decl::NT_typedef)
-                    *os << bt->name ();
-                  else
-                    *os << "char *";
-                  *os << " " << arg->local_name () << ";" <<
-                    nl;
-                    // now define a NamedValue_ptr
-                  *os << "CORBA::NamedValue_ptr nv_" << arg->local_name () <<
-                    ";" << nl;
-                    // declare an Any
-                  *os << "CORBA::Any \t any_" << arg->local_name () << " (" <<
-                    bt->tc_name () << ", &" << arg->local_name () <<
-                    "); // ORB does not own" << nl;
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_PRE_DOCALL_CS:
-                {
-                  // nothing
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_DOCALL_CS:
-                {
-                  *os << ", &" << arg->local_name ();
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_POST_DOCALL_CS:
-                {
-                  // nothing
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_PRE_UPCALL_SS:
-                {
-                  // nothing
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_POST_UPCALL_SS:
-                {
-                  // nothing
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_UPCALL_SS:
-                {
-                  *os << arg->local_name () << ", ";
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_CH:
-                {
-                  if (bt->node_type () == AST_Decl::NT_typedef)
-                    *os << bt->nested_type_name (bif);
-                  else
-                    *os << "char *";
-                  *os << " " << arg->local_name () << ", ";
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_SH:
-              case TAO_CodeGen::TAO_ARGUMENT_CS:
-                {
-                  if (bt->node_type () == AST_Decl::NT_typedef)
-                    *os << bt->name ();
-                  else
-                    *os << "char *";
-                  *os << " " << arg->local_name () << ", ";
-                }
-                break;
-              default:
-                {
-                  ACE_ERROR_RETURN ((LM_ERROR,
-                   "(%N:%l) be_state_argument - unknown state\n"), -1);
-                }
-              } // end switch state
-            break;
-          case AST_Argument::dir_OUT:
-            switch (cg->state ())
-              {
-              case TAO_CodeGen::TAO_ARGUMENT_VARDECL_SS:
-                {
-                  // declare a variable
-                  if (bt->node_type () == AST_Decl::NT_typedef)
-                    *os << bt->name ();
-                  else
-                    *os << "char *";
-                  *os << arg->local_name () << ";" << nl;
-                  if (bt->node_type () == AST_Decl::NT_typedef)
-                    *os << bt->name () << "_out";
-                  else
-                    *os << "CORBA::String_out";
-                  *os << " " << arg->local_name () << "_out (" <<
-                    arg->local_name () << ");" << nl;
-                  // we also declare a corresponding char*
-                  // passed to the decoder
-                  *os << "char **_tao_base_" << arg->local_name ()
-                      << " = new char*;" << nl;
-                  // now define a NamedValue_ptr
-                  *os << "CORBA::NamedValue_ptr nv_" << arg->local_name () <<
-                    ";" << nl;
-                  // declare an Any
-                  *os << "CORBA::Any \t any_" << arg->local_name () << " (" <<
-                    bt->tc_name () << ", _tao_base_" << arg->local_name () <<
-                    ", 1); // ORB owns" << nl;
-
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_PRE_DOCALL_CS:
-                {
-                  // declare a string variable
-                  if (bt->node_type () == AST_Decl::NT_typedef)
-                    *os << bt->name ();
-                  else
-                    *os << "char *";
-                  *os << " _tao_base_" << arg->local_name () << ";" << nl;
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_DOCALL_CS:
-                {
-                  *os << ", &_tao_base_" << arg->local_name ();
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_POST_DOCALL_CS:
-                {
-                  // assign the _tao_base_<string> variable to the out
-                  // parameter
-                  *os << arg->local_name () << " = _tao_base_" <<
-                    arg->local_name () << ";" << nl;
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_UPCALL_SS:
-                {
-                  *os << arg->local_name () << "_out, ";
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_PRE_UPCALL_SS:
-                {
-                  // nothing
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_POST_UPCALL_SS:
-                {
-                  // out parameter is cast
-                  *os << "*_tao_base_" << arg->local_name () << " = " <<
-                    arg->local_name () << "_out;" << nl;
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_CH:
-                {
-                  if (bt->node_type () == AST_Decl::NT_typedef)
-                    *os << bt->nested_type_name (bif, "_out");
-                  else
-                    *os << "CORBA::String_out";
-                  *os << " " << arg->local_name () << ", ";
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_CS:
-              case TAO_CodeGen::TAO_ARGUMENT_SH:
-                {
-                  if (bt->node_type () == AST_Decl::NT_typedef)
-                    *os << bt->name () << "_out";
-                  else
-                    *os << "CORBA::String_out";
-                  *os << " " << arg->local_name () << ", ";
-                }
-                break;
-              default:
-                {
-                  ACE_ERROR_RETURN ((LM_ERROR,
-                   "(%N:%l) be_state_argument - unknown state\n"), -1);
-                }
-              } // end switch state
-            break;
-          } // end switch direction
-      } // end case string
-      break;
-    case AST_Decl::NT_array: // type is an array
-      switch (arg->direction ())
-        {
-        case AST_Argument::dir_IN:
-          {
-            switch (cg->state ())
-              {
-              case TAO_CodeGen::TAO_ARGUMENT_VARDECL_SS:
-                {
-                  // declare a variable
-                  *os << bt->name () << " " << arg->local_name ()
-                      << ";" << nl;
-                  // now define a NamedValue_ptr
-                  *os << "CORBA::NamedValue_ptr nv_" << arg->local_name () <<
-                    ";" << nl;
-                  // declare an Any
-                  *os << "CORBA::Any \t any_" << arg->local_name () << " (" <<
-                    bt->tc_name () << ", " << arg->local_name () <<
-                    "); // ORB does not own" << nl;
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_PRE_DOCALL_CS:
-                {
-                  // XXXASG TODO
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_DOCALL_CS:
-                {
-                  // XXXASG TODO
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_POST_DOCALL_CS:
-                {
-                  // XXXASG TODO
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_UPCALL_SS:
-                {
-                  *os << arg->local_name () << ", ";
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_PRE_UPCALL_SS:
-                {
-                  // nothing
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_POST_UPCALL_SS:
-                {
-                  // nothing
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_CH:
-                {
-                  // to keep the MSVC++ compiler happy
-                  *os << "const " << bt->nested_type_name (bif) << " " <<
-                    arg->local_name () << ", ";
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_CS:
-              case TAO_CodeGen::TAO_ARGUMENT_SH:
-                {
-                  *os << "const " << bt->name () << " " << arg->local_name ()
-                      << ", ";
-                }
-                break;
-              default:
-                {
-                  ACE_ERROR_RETURN ((LM_ERROR,
-                   "(%N:%l) be_state_argument - unknown state\n"), -1);
-                }
-              } // end switch state
-          } // end case
-          break;
-        case AST_Argument::dir_INOUT:
-          {
-            switch (cg->state ())
-              {
-              case TAO_CodeGen::TAO_ARGUMENT_VARDECL_SS:
-                {
-                    // declare a variable
-                  *os << bt->name ();
-                  if (bt->size_type () == be_decl::VARIABLE)
-                    {
-                      *os << "_slice *";
-                    }
-                  *os << " " << arg->local_name () << ";" << nl;
-                    // now define a NamedValue_ptr
-                  *os << "CORBA::NamedValue_ptr nv_" << arg->local_name () <<
-                    ";" << nl;
-                    // declare an Any
-                  *os << "CORBA::Any \t any_" << arg->local_name () << " (" <<
-                    bt->tc_name () << ", " << arg->local_name () <<
-                    "); // ORB does not own" << nl;
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_PRE_DOCALL_CS:
-                {
-                  // TODO XXXASG
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_DOCALL_CS:
-                {
-                  // TODO XXXASG
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_POST_DOCALL_CS:
-                {
-                  // TODO XXXASG
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_UPCALL_SS:
-                {
-                  *os << arg->local_name () << ", ";
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_PRE_UPCALL_SS:
-                {
-                  // nothing
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_POST_UPCALL_SS:
-                {
-                  // nothing
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_CH:
-                {
-                  // to keep the MSVC++ compiler happy
-                  if (bt->size_type () == be_decl::VARIABLE)
-                    {
-                      *os << bt->nested_type_name (bif, "_slice") << " *" <<
-                        arg->local_name () << ", ";
-                    }
-                  else
-                    {
-                      *os << bt->nested_type_name (bif) << " " <<
-                        arg->local_name () << ", ";
-                    }
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_CS:
-              case TAO_CodeGen::TAO_ARGUMENT_SH:
-                {
-                  *os << bt->name ();
-                  if (bt->size_type () == be_decl::VARIABLE)
-                    {
-                      *os << "_slice *";
-                    }
-                  *os << arg->local_name () << ", ";
-                }
-                break;
-              default:
-                {
-                  ACE_ERROR_RETURN ((LM_ERROR,
-                   "(%N:%l) be_state_argument - unknown state\n"), -1);
-                }
-              } // end switch state
-          } // end case
-          break;
-        case AST_Argument::dir_OUT:
-          {
-            switch (cg->state ())
-              {
-              case TAO_CodeGen::TAO_ARGUMENT_VARDECL_SS:
-                {
-                    // declare a variable
-                  *os << bt->name () << "_slice *" << arg->local_name () << ";" <<
-                    nl;
-                    // now define a NamedValue_ptr
-                  *os << "CORBA::NamedValue_ptr nv_" << arg->local_name () <<
-                    ";" << nl;
-                    // declare an Any
-                  *os << "CORBA::Any \t any_" << arg->local_name () << " (" <<
-                    bt->tc_name () << ", " << arg->local_name () <<
-                    ", 1); // ORB owns" << nl;
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_PRE_DOCALL_CS:
-                {
-                  // TODO XXXASG
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_DOCALL_CS:
-                {
-                  // TODO XXXASG
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_POST_DOCALL_CS:
-                {
-                  // TODO XXXASG
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_UPCALL_SS:
-                {
-                  *os << arg->local_name () << ", ";
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_PRE_UPCALL_SS:
-                {
-                  // nothing
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_POST_UPCALL_SS:
-                {
-                  // nothing
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_CH:
-                {
-                  // to keep the MSVC++ compiler happy
-                  *os << bt->nested_type_name (bif, "_out") << " " <<
-                    arg->local_name () << ", ";
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_CS:
-              case TAO_CodeGen::TAO_ARGUMENT_SH:
-                {
-                  *os << bt->name () << "_out " << arg->local_name () << ", ";
-                }
-                break;
-              default:
-                {
-                  ACE_ERROR_RETURN ((LM_ERROR,
-                   "(%N:%l) be_state_argument - unknown state\n"), -1);
-                }
-              } // end switch state
-          }
-          break;
-        } // end of switch direction
-      break;
-    case AST_Decl::NT_sequence: // type is a sequence
-    case AST_Decl::NT_struct: // type is a struct
-    case AST_Decl::NT_union: // type is a union
-      switch (arg->direction ())
-        {
-        case AST_Argument::dir_IN:
-          {
-            switch (cg->state ())
-              {
-              case TAO_CodeGen::TAO_ARGUMENT_VARDECL_SS:
-                {
-                  // declare a variable
-                  *os << bt->name () << " " << arg->local_name () <<
-                    ";" << nl;
-                  // now define a NamedValue_ptr
-                  *os << "CORBA::NamedValue_ptr nv_" << arg->local_name () <<
-                    ";" << nl;
-                  // declare an Any
-                  *os << "CORBA::Any \t any_" << arg->local_name () << " (" <<
-                    bt->tc_name () << ", &" << arg->local_name () <<
-                    "); // ORB does not own" << nl;
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_PRE_DOCALL_CS:
-                {
-                  // nothing
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_DOCALL_CS:
-                {
-                  *os << ", &" << arg->local_name ();
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_POST_DOCALL_CS:
-                {
-                  // nothing
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_UPCALL_SS:
-                {
-                  *os << arg->local_name () << ", ";
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_PRE_UPCALL_SS:
-                {
-                  // nothing
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_POST_UPCALL_SS:
-                {
-                  // nothing
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_CH:
-                {
-                  // to keep the MSVC++ compiler happy
-                  *os << "const " << bt->nested_type_name (bif) << " &" <<
-                    arg->local_name () << ", ";
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_CS:
-              case TAO_CodeGen::TAO_ARGUMENT_SH:
-                {
-                  *os << "const " << bt->name () << " &" << arg->local_name ()
-                      << ", ";
-                }
-                break;
-              default:
-                {
-                  ACE_ERROR_RETURN ((LM_ERROR,
-                   "(%N:%l) be_state_argument - unknown state\n"), -1);
-                }
-              } // end switch state
-          }
-          break;
-        case AST_Argument::dir_INOUT:
-          {
-            switch (cg->state ())
-              {
-              case TAO_CodeGen::TAO_ARGUMENT_VARDECL_SS:
-                {
-                  // declare a variable
-                  *os << bt->name () << " " << arg->local_name () <<
-                    ";" << nl;
-                  // now define a NamedValue_ptr
-                  *os << "CORBA::NamedValue_ptr nv_" << arg->local_name () <<
-                    ";" << nl;
-                  // declare an Any
-                  *os << "CORBA::Any \t any_" << arg->local_name () << " (" <<
-                    bt->tc_name () << ", &" << arg->local_name () <<
-                    "); // ORB does not own" << nl;
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_PRE_DOCALL_CS:
-                {
-                  // nothing
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_DOCALL_CS:
-                {
-                  *os << ", &" << arg->local_name ();
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_POST_DOCALL_CS:
-                {
-                  // nothing
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_UPCALL_SS:
-                {
-                  *os << arg->local_name () << ", ";
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_PRE_UPCALL_SS:
-                {
-                  // nothing
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_POST_UPCALL_SS:
-                {
-                  // nothing
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_CH:
-                {
-                  // to keep the MSVC++ compiler happy
-                  *os << bt->nested_type_name (bif) << " &" << arg->local_name
-                    () << ", ";
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_CS:
-              case TAO_CodeGen::TAO_ARGUMENT_SH:
-                {
-                  *os << bt->name () << " &" << arg->local_name () << ", ";
-                }
-                break;
-              default:
-                {
-                  ACE_ERROR_RETURN ((LM_ERROR,
-                   "(%N:%l) be_state_argument - unknown state\n"), -1);
-                }
-              } // end switch state
-          } // end case
-          break;
-        case AST_Argument::dir_OUT:
-          {
-            switch (cg->state ())
-              {
-              case TAO_CodeGen::TAO_ARGUMENT_VARDECL_SS:
-                {
-                  if (bt->size_type () == be_decl::VARIABLE)
-                    {
-                    // declare a variable
-                      *os << bt->name () << " *" << arg->local_name () << ";" <<
-                        nl;
-                      *os << bt->name () << "_out " << arg->local_name () <<
-                        "_out (" << arg->local_name () << ");" << nl;
-                    // now define a NamedValue_ptr
-                      *os << "CORBA::NamedValue_ptr nv_" << arg->local_name () <<
-                        ";" << nl;
-                    // declare an Any
-                      *os << "CORBA::Any \t any_" << arg->local_name () << " (" <<
-                        bt->tc_name () << ", " << arg->local_name () <<
-                        ", 1); // ORB owns" << nl;
-                    }
-                  else
-                    {
-                    // declare a variable
-                      *os << bt->name () << " " << arg->local_name () << ";" <<
-                        nl;
-                    // now define a NamedValue_ptr
-                      *os << "CORBA::NamedValue_ptr nv_" << arg->local_name () <<
-                        ";" << nl;
-                    // declare an Any
-                      *os << "CORBA::Any \t any_" << arg->local_name () << " (" <<
-                        bt->tc_name () << ", &" << arg->local_name () <<
-                        ", 1); // ORB owns" << nl;
-                    } // end else
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_PRE_DOCALL_CS:
-                {
-                  // declare a variable. We need this only if we are variable
-                  // sized. If we are fixed sized, we already know our size and
-                  // hence we have already been allocated
-                  if (bt->size_type () == be_decl::VARIABLE)
-                    {
-                      *os << bt->name () << " *_tao_base_" << arg->local_name
-                        () << " = new " << bt->name () << ";" << nl;
-                    }
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_DOCALL_CS:
-                {
-                  if (bt->size_type () == be_decl::VARIABLE)
-                    {
-                      *os << ", _tao_base_" << arg->local_name ();
-                    }
-                  else
-                    {
-                      // simply pass our address
-                      *os << ", &" << arg->local_name ();
-                    }
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_POST_DOCALL_CS:
-                {
-                  if (bt->size_type () == be_decl::VARIABLE)
-                    {
-                      *os << arg->local_name () << " = _tao_base_" <<
-                        arg->local_name () << ";" << nl;
-                    }
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_UPCALL_SS:
-                {
-                  if (bt->size_type () == be_decl::VARIABLE)
-                    *os << arg->local_name () << "_out, ";
-                  else
-                    *os << arg->local_name () << ", ";
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_PRE_UPCALL_SS:
-                {
-                  // nothing
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_POST_UPCALL_SS:
-                {
-                  // nothing
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_CH:
-                {
-                  // to keep the MSVC++ compiler happy
-                  *os << bt->nested_type_name (bif, "_out") << " " <<
-                    arg->local_name () << ", ";
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_CS:
-              case TAO_CodeGen::TAO_ARGUMENT_SH:
-                {
-                  *os << bt->name () << "_out " << arg->local_name () << ", ";
-                  break;
-                }
-                break;
-              default:
-                {
-                  ACE_ERROR_RETURN ((LM_ERROR,
-                   "(%N:%l) be_state_argument - unknown state\n"), -1);
-                }
-              } // end switch state
-          } // end case
-          break;
-        } // end switch direction
-      break;
-    case AST_Decl::NT_enum: // type is an enum
-      switch (arg->direction ())
-        {
-        case AST_Argument::dir_IN:
-          {
-            switch (cg->state ())
-              {
-              case TAO_CodeGen::TAO_ARGUMENT_VARDECL_SS:
-                {
-                    // declare a variable
-                  *os << bt->name () << " " << arg->local_name () << ";" <<
-                    nl;
-                    // now define a NamedValue_ptr
-                  *os << "CORBA::NamedValue_ptr nv_" << arg->local_name () <<
-                    ";" << nl;
-                    // declare an Any
-                  *os << "CORBA::Any \t any_" << arg->local_name () << " (" <<
-                    bt->tc_name () << ", &" << arg->local_name () <<
-                    "); // ORB does not own" << nl;
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_PRE_DOCALL_CS:
-                {
-                  // nothing
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_DOCALL_CS:
-                {
-                  *os << ", &" << arg->local_name ();
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_POST_DOCALL_CS:
-                {
-                  // nothing
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_UPCALL_SS:
-                {
-                  *os << arg->local_name () << ", ";
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_PRE_UPCALL_SS:
-                {
-                  // nothing
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_POST_UPCALL_SS:
-                {
-                  // nothing
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_CH:
-                {
-                  // to keep the MSVC++ compiler happy
-                  *os << bt->nested_type_name (bif) << " " << arg->local_name
-                    () << ", ";
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_CS:
-              case TAO_CodeGen::TAO_ARGUMENT_SH:
-                {
-                  *os << bt->name () << " " << arg->local_name () << ", ";
-                }
-                break;
-              default:
-                {
-                  ACE_ERROR_RETURN ((LM_ERROR,
-                   "(%N:%l) be_state_argument - unknown state\n"), -1);
-                }
-              } // end of switch state
-          } // end case
-          break;
-        case AST_Argument::dir_INOUT:
-          {
-            switch (cg->state ())
-              {
-              case TAO_CodeGen::TAO_ARGUMENT_VARDECL_SS:
-                {
-                    // declare a variable
-                  *os << bt->name () << " " << arg->local_name () << ";" <<
-                    nl;
-                    // now define a NamedValue_ptr
-                  *os << "CORBA::NamedValue_ptr nv_" << arg->local_name () <<
-                    ";" << nl;
-                    // declare an Any
-                  *os << "CORBA::Any \t any_" << arg->local_name () << " (" <<
-                    bt->tc_name () << ", &" << arg->local_name () <<
-                    "); // ORB does not own" << nl;
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_PRE_DOCALL_CS:
-                {
-                  // nothing
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_DOCALL_CS:
-                {
-                  *os << ", &" << arg->local_name ();
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_POST_DOCALL_CS:
-                {
-                  // nothing
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_UPCALL_SS:
-                {
-                  *os << arg->local_name () << ", ";
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_PRE_UPCALL_SS:
-                {
-                  // nothing
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_POST_UPCALL_SS:
-                {
-                  // nothing
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_CH:
-                {
-                  // to keep the MSVC++ compiler happy
-                  *os << bt->nested_type_name (bif) << " &" << arg->local_name
-                    () << ", ";
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_CS:
-              case TAO_CodeGen::TAO_ARGUMENT_SH:
-                {
-                  *os << bt->name () << " &" << arg->local_name () << ", ";
-                }
-                break;
-              default:
-                {
-                  ACE_ERROR_RETURN ((LM_ERROR,
-                   "(%N:%l) be_state_argument - unknown state\n"), -1);
-                }
-              } // end switch state
-          } // end case
-          break;
-        case AST_Argument::dir_OUT:
-          {
-            switch (cg->state ())
-              {
-              case TAO_CodeGen::TAO_ARGUMENT_VARDECL_SS:
-                {
-                    // declare a variable
-                  *os << bt->name () << " " << arg->local_name () << ";" <<
-                    nl;
-                    // now define a NamedValue_ptr
-                  *os << "CORBA::NamedValue_ptr nv_" << arg->local_name () <<
-                    ";" << nl;
-                    // declare an Any
-                  *os << "CORBA::Any \t any_" << arg->local_name () << " (" <<
-                    bt->tc_name () << ", &" << arg->local_name () <<
-                    "); // ORB does not own" << nl;
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_PRE_DOCALL_CS:
-                {
-                  // nothing
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_DOCALL_CS:
-                {
-                  *os << ", &" << arg->local_name ();
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_POST_DOCALL_CS:
-                {
-                  // nothing
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_UPCALL_SS:
-                {
-                  *os << arg->local_name () << ", ";
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_PRE_UPCALL_SS:
-                {
-                  // nothing
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_POST_UPCALL_SS:
-                {
-                  // nothing
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_CH:
-                {
-                  // to keep the MSVC++ compiler happy
-                  *os << bt->nested_type_name (bif, "_out") << " " <<
-                    arg->local_name () << ", ";
-                }
-                break;
-              case TAO_CodeGen::TAO_ARGUMENT_CS:
-              case TAO_CodeGen::TAO_ARGUMENT_SH:
-                {
-                  *os << bt->name () << "_out " << arg->local_name () << ", ";
-                }
-                break;
-              default:
-                {
-                  ACE_ERROR_RETURN ((LM_ERROR,
-                   "(%N:%l) be_state_argument - unknown state\n"), -1);
-                }
-              } // end switch state
-          } // end case
-          break;
-        } // end switch direction
-      break;
-    case AST_Decl::NT_except: // type is an exception
-      {
-        // XXXASG TODO: is this allowed ???
-      }
-      break;
-    case AST_Decl::NT_typedef: // type is a typedef
-      {
-        be_type *temp;
-        be_typedef *t = be_typedef::narrow_from_decl (bt);
-
-        if (!t)
-          return -1;
-
-        temp = t->primitive_base_type ();
-        // make a recursive call
-        return this->gen_code (t, d, temp);
-      } // end of case
-      break;
-    } //end switch node type
-  return 0;
-}
diff --git a/TAO/TAO_IDL/be/be_state_array.cpp b/TAO/TAO_IDL/be/be_state_array.cpp
deleted file mode 100644
index 618c891bc7b..00000000000
--- a/TAO/TAO_IDL/be/be_state_array.cpp
+++ /dev/null
@@ -1,118 +0,0 @@
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    be_state_array.cpp
-//
-// = DESCRIPTION
-//    state based code generation for arrays.
-//
-// = AUTHOR
-//    Aniruddha Gokhale
-//
-// ============================================================================
-
-#include	"idl.h"
-#include	"idl_extern.h"
-#include	"be.h"
-
-// return type for array
-be_state_array::be_state_array (void)
-{
-}
-
-// generate code for array type
-int
-be_state_array::gen_code (be_type *bt, be_decl *d, be_type *type)
-{
-  TAO_OutStream *os = 0; // output stream
-  TAO_NL  nl;        // end line
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-
-  // Macro to avoid "warning: unused parameter" type warning.
-  ACE_UNUSED_ARG (nl);
-
-  // get the appropriate stream
-  switch (cg->state ())
-    {
-    case TAO_CodeGen::TAO_ARRAY_DEFN_CH:
-    case TAO_CodeGen::TAO_ARRAY_OTHER_CH:
-      os = cg->client_header ();
-      break;
-    case TAO_CodeGen::TAO_ARRAY_DEFN_CI:
-      os = cg->client_inline ();
-      break;
-    }
-
-  if (!type) // not a recursive call
-    type = bt;
-  else // recursively called thru a typedef. "type" will have the most primitive
-       // base class of the typedef
-    ACE_ASSERT (bt->node_type () == AST_Decl::NT_typedef);
-
-  // generate code based on type. For every case, first downcast to the
-  // appropriate type. If the downcast fails, return error, else proceed. In
-  // some cases, the type itself may need code generation, e.g., anonymous
-  // struct types.
-  switch (type->node_type ())
-    {
-    case AST_Decl::NT_interface: // type is an obj reference
-      {
-        *os << bt->name () << "_var ";
-      }
-      break;
-    case AST_Decl::NT_pre_defined: // type is predefined type
-      {
-        *os << bt->name ();
-      }
-      break;
-    case AST_Decl::NT_string: // type is a string
-      {
-        *os << "CORBA::String_var ";
-      }
-      break;
-    case AST_Decl::NT_array:
-      // type is an array. This is possible only if we
-      // are here thru the typedef node
-      {
-        *os << bt->name () << "_slice *";
-      }
-      break;
-      // these are all anonymous types
-    case AST_Decl::NT_enum:     // type is an enum
-    case AST_Decl::NT_sequence: // type is a sequence
-    case AST_Decl::NT_struct:   // type is a struct
-    case AST_Decl::NT_union:    // type is a union
-      {
-        // based on what state we are in, we may have to generate the definition
-        // of the type first
-        if (cg->state () == TAO_CodeGen::TAO_ARRAY_DEFN_CH)
-          if (bt->gen_client_header () == -1)  // generate the defn
-            return -1;
-
-        *os << bt->name ();
-      }
-      break;
-    case AST_Decl::NT_except: // type is an exception
-      {
-        // XXXASG TODO: is this allowed ???
-      }
-      break;
-    case AST_Decl::NT_typedef: // type is a typedef
-      {
-        be_type *temp;
-        be_typedef *t = be_typedef::narrow_from_decl (bt);
-
-        if (!t)
-          return -1;
-
-        temp = t->primitive_base_type ();
-        // make a recursive call
-        return this->gen_code (t, d, temp);
-      } // end of switch
-      //break; unreachable statement!
-    }
-  return 0;
-}
diff --git a/TAO/TAO_IDL/be/be_state_attribute.cpp b/TAO/TAO_IDL/be/be_state_attribute.cpp
deleted file mode 100644
index 73fb5819be5..00000000000
--- a/TAO/TAO_IDL/be/be_state_attribute.cpp
+++ /dev/null
@@ -1,1080 +0,0 @@
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    be_state_attribute.cpp
-//
-// = DESCRIPTION
-//    state based code generation for attributes.
-//
-// = AUTHOR
-//    Aniruddha Gokhale
-//
-// ============================================================================
-
-#include	"idl.h"
-#include	"idl_extern.h"
-#include	"be.h"
-
-// constructor
-be_state_attribute::be_state_attribute (void)
-{
-}
-
-int
-be_state_attribute::gen_code (be_type *bt, be_decl *d, be_type *type)
-{
-  TAO_OutStream *os = 0; // output stream
-  TAO_NL  nl;        // end line
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-  be_attribute *attr; // attribute node
-  be_interface *bif;  // enclosing scope which is an interface
-
-  switch (cg->state ())
-    {
-    case TAO_CodeGen::TAO_ATTRIBUTE_RETURN_TYPE_CH:
-    case TAO_CodeGen::TAO_ATTRIBUTE_INPARAM_TYPE_CH:
-      os = cg->client_header ();
-      break;
-    case TAO_CodeGen::TAO_ATTRIBUTE_RETURN_TYPE_CS:
-    case TAO_CodeGen::TAO_ATTRIBUTE_RETVAL_DECL_CS:
-    case TAO_CodeGen::TAO_ATTRIBUTE_RETVAL_EXCEPTION_CS:
-    case TAO_CodeGen::TAO_ATTRIBUTE_RETVAL_RETURN_CS:
-    case TAO_CodeGen::TAO_ATTRIBUTE_INPARAM_TYPE_CS:
-    case TAO_CodeGen::TAO_ATTRIBUTE_PRE_DOCALL_CS:
-    case TAO_CodeGen::TAO_ATTRIBUTE_DOCALL_CS:
-    case TAO_CodeGen::TAO_ATTRIBUTE_POST_DOCALL_CS:
-      os = cg->client_stubs ();
-      break;
-    case TAO_CodeGen::TAO_ATTRIBUTE_RETURN_TYPE_SH:
-    case TAO_CodeGen::TAO_ATTRIBUTE_INPARAM_TYPE_SH:
-      os = cg->server_header ();
-      break;
-    case TAO_CodeGen::TAO_ATTRIBUTE_RETVAL_DECL_SS:
-    case TAO_CodeGen::TAO_ATTRIBUTE_RETVAL_ASSIGN_SS:
-    case TAO_CodeGen::TAO_ATTRIBUTE_RESULT_SS:
-    case TAO_CodeGen::TAO_ATTRIBUTE_INPARAM_TYPE_SS:
-    case TAO_CodeGen::TAO_ATTRIBUTE_PRE_UPCALL_SS:
-    case TAO_CodeGen::TAO_ATTRIBUTE_UPCALL_SS:
-    case TAO_CodeGen::TAO_ATTRIBUTE_POST_UPCALL_SS:
-      os = cg->server_skeletons ();
-      break;
-    }
-
-  // retrieve the ATTRIBUTE node
-  attr = be_attribute::narrow_from_decl (d);
-  if (!attr)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_state_attribute.cpp - "
-                         "Bad attribute node\n"),
-                        -1);
-    }
-
-  // get the enclosing interface scope to be used in the NESTED_CLASS macro
-  bif = be_interface::narrow_from_decl (ScopeAsDecl (attr->defined_in ()));
-  if (!bif)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_state_attribute.cpp - "
-                         "Bad interface\n"),
-                        -1);
-    }
-
-  if (!type) // not a recursive call
-    type = bt;
-  else // recursively called thru a typedef. "type" will have the most primitive
-    // base class of the typedef
-    ACE_ASSERT (bt->node_type () == AST_Decl::NT_typedef);
-
-  // Two level switching
-  // (1) switch on node type
-  // (2) switch on current code generation state
-
-  switch (type->node_type ())  // LEVEL (1) switch based on node type
-    {
-    case AST_Decl::NT_interface: // type is an obj reference
-    case AST_Decl::NT_interface_fwd: // type is an obj reference
-      {
-        // what state are we in
-        switch (cg->state ())
-          {
-          case TAO_CodeGen::TAO_ATTRIBUTE_RETURN_TYPE_CH:
-            {
-              // to keep MSVC++ happy
-              *os << bt->nested_type_name (bif, "_ptr") << " ";
-            }
-            break;
-          case TAO_CodeGen::TAO_ATTRIBUTE_INPARAM_TYPE_CH:
-            {
-              // to keep the MSVC++ compiler happy
-              *os << bt->nested_type_name (bif, "_ptr") << " " <<
-                attr->local_name ();
-            }
-            break;
-          case TAO_CodeGen::TAO_ATTRIBUTE_RETURN_TYPE_CS:
-          case TAO_CodeGen::TAO_ATTRIBUTE_RETURN_TYPE_SH:
-            {
-              *os << bt->name () << "_ptr ";
-            }
-            break;
-          case TAO_CodeGen::TAO_ATTRIBUTE_INPARAM_TYPE_CS:
-          case TAO_CodeGen::TAO_ATTRIBUTE_INPARAM_TYPE_SH:
-            {
-              *os << bt->name () << "_ptr " << attr->local_name ();
-            }
-            break;
-          case TAO_CodeGen::TAO_ATTRIBUTE_RETVAL_DECL_CS:
-            {
-              *os << "CORBA::Object_ptr retval = CORBA::Object::_nil ();" << nl;
-            }
-          break;
-          case TAO_CodeGen::TAO_ATTRIBUTE_RETVAL_EXCEPTION_CS:
-            {
-              *os << "return " << bt->name () << "::_nil ();\n";
-            }
-          break;
-          case TAO_CodeGen::TAO_ATTRIBUTE_RETVAL_RETURN_CS:
-            {
-              *os << "return " << bt->name () << "::_narrow (retval, env);" << nl;
-            }
-          break;
-          case TAO_CodeGen::TAO_ATTRIBUTE_RETVAL_DECL_SS:
-            {
-              *os << "CORBA::Object_ptr *retval ="
-                " new CORBA::Object_ptr;" << nl;
-              *os << "*retval = CORBA::Object::_nil ();" << nl;
-            }
-            break;
-          case TAO_CodeGen::TAO_ATTRIBUTE_RETVAL_ASSIGN_SS:
-            {
-              *os << "*retval"; // assign to retval
-            }
-            break;
-          case TAO_CodeGen::TAO_ATTRIBUTE_RESULT_SS:
-            {
-              *os << "result = new CORBA::Any (" << bt->tc_name () <<
-                ", retval, 1); // ORB owns" << nl;
-            }
-            break;
-          case TAO_CodeGen::TAO_ATTRIBUTE_PRE_DOCALL_CS:
-            {
-              // assign to a CORBA::Object_ptr
-              *os << "CORBA::Object_ptr _tao_base_" << attr->local_name ()
-                  << " = " << attr->local_name () << "; // cast it" << nl;
-            }
-            break;
-          case TAO_CodeGen::TAO_ATTRIBUTE_DOCALL_CS:
-            {
-              // pass the cast value
-              *os << ", &_tao_base_" << attr->local_name ();
-            }
-            break;
-          case TAO_CodeGen::TAO_ATTRIBUTE_POST_DOCALL_CS:
-            {
-              // nothing for in parameters
-            }
-            break;
-          case TAO_CodeGen::TAO_ATTRIBUTE_INPARAM_TYPE_SS:
-            {
-              // declare a variable
-              *os << bt->name () << "_ptr ";
-              *os << attr->local_name () << ";" << nl;
-              // we also declare a corresponding CORBA::Object_ptr to be
-              // passed to the decoder
-              *os << "CORBA::Object_ptr _tao_base_" << attr->local_name ()
-                  << ";" << nl;
-              // now define a NamedValue_ptr
-              *os << "CORBA::NamedValue_ptr nv_" << attr->local_name () <<
-                ";" << nl;
-              // declare an Any
-              *os << "CORBA::Any \t any_" << attr->local_name () << " (" <<
-                bt->tc_name () << ", &_tao_base_" << attr->local_name () <<
-                "); // ORB does not own" << nl;
-            }
-            break;
-          case TAO_CodeGen::TAO_ATTRIBUTE_PRE_UPCALL_SS:
-            {
-              // convert from the CORBA::Object_ptr to the interface type
-              // using a _narrow
-              *os << attr->local_name () << " = " << bt->name () <<
-                "::_narrow (_tao_base_" << attr->local_name () << ", " <<
-                "_tao_environment);" << nl;
-              *os << "if (_tao_environment.exception ()) return;" << nl;
-            }
-            break;
-          case TAO_CodeGen::TAO_ATTRIBUTE_POST_UPCALL_SS:
-            {
-              // nothing for an in parameter
-            }
-            break;
-          case TAO_CodeGen::TAO_ATTRIBUTE_UPCALL_SS:
-            {
-              *os << attr->local_name () << ", ";
-            }
-            break;
-          default:
-            {
-              ACE_ERROR_RETURN ((LM_ERROR,
-                                 "(%N:%l) be_state_attribute - unknown state\n"), -1);
-            }
-          } // switch state
-      } // end of case interface/interface_fwd
-      break;
-    case AST_Decl::NT_pre_defined: // type is predefined type
-      {
-        be_predefined_type *bpd = be_predefined_type::narrow_from_decl (type);
-
-        // check if the type is an any
-        if (bpd->pt () == AST_PredefinedType::PT_any)
-          {
-            switch (cg->state ())
-              {
-              case TAO_CodeGen::TAO_ATTRIBUTE_RETVAL_DECL_CS:
-                {
-                  // if it is an any, return a pointer to it
-                  *os << bt->name () << " *retval;" << nl;
-                }
-                break;
-              case TAO_CodeGen::TAO_ATTRIBUTE_RETVAL_EXCEPTION_CS:
-                {
-                  // if it is an any, return a pointer to it
-                  *os << "return 0;\n";
-                }
-                break;
-              case TAO_CodeGen::TAO_ATTRIBUTE_RETVAL_RETURN_CS:
-                {
-                  *os << "return retval;" << nl;
-                }
-                break;
-              case TAO_CodeGen::TAO_ATTRIBUTE_RETVAL_DECL_SS:
-                {
-                  // if it is an any, return a pointer to it
-                  *os << bt->name () << " *retval;" << nl;
-                }
-                break;
-              case TAO_CodeGen::TAO_ATTRIBUTE_RETVAL_ASSIGN_SS:
-                {
-                  // if it is an any, return a pointer to it
-                  *os << "retval";
-                }
-                break;
-              case TAO_CodeGen::TAO_ATTRIBUTE_RESULT_SS:
-                {
-                  // if it is an any, return a pointer to it
-                  *os << "result = new CORBA::Any (" << bt->tc_name () <<
-                    ", retval, 1); // ORB owns" << nl;
-                }
-                break;
-              case TAO_CodeGen::TAO_ATTRIBUTE_INPARAM_TYPE_SS:
-                {
-                  *os << bt->name () << " ";
-                    // declare a variable
-                  *os << attr->local_name () << ";" << nl;
-                    // now define a NamedValue_ptr
-                  *os << "CORBA::NamedValue_ptr nv_" << attr->local_name () <<
-                    ";" << nl;
-                    // declare an Any
-                  *os << "CORBA::Any \t any_" << attr->local_name () << " (" <<
-                    bt->tc_name () << ", &" << attr->local_name () <<
-                    "); // ORB does not own" << nl;
-                }
-                break;
-              case TAO_CodeGen::TAO_ATTRIBUTE_PRE_DOCALL_CS:
-                {
-                  // XXXASG - TODO
-                }
-                break;
-              case TAO_CodeGen::TAO_ATTRIBUTE_DOCALL_CS:
-                {
-                  // XXXASG - TODO
-                }
-                break;
-              case TAO_CodeGen::TAO_ATTRIBUTE_POST_DOCALL_CS:
-                {
-                  // XXXASG - TODO
-                }
-                break;
-              case TAO_CodeGen::TAO_ATTRIBUTE_UPCALL_SS:
-                {
-                  *os << attr->local_name () << ", ";
-                }
-                break;
-              case TAO_CodeGen::TAO_ATTRIBUTE_PRE_UPCALL_SS:
-                {
-                  // XXXASG - TODO
-                }
-                break;
-              case TAO_CodeGen::TAO_ATTRIBUTE_POST_UPCALL_SS:
-                {
-                  // XXXASG - TODO
-                }
-                break;
-              case TAO_CodeGen::TAO_ATTRIBUTE_RETURN_TYPE_CH:
-                {
-                  // keep MSVC++ happy
-                  *os << bt->nested_type_name (bif);
-                }
-                break;
-              case TAO_CodeGen::TAO_ATTRIBUTE_RETURN_TYPE_CS:
-              case TAO_CodeGen::TAO_ATTRIBUTE_RETURN_TYPE_SH:
-                {
-                  *os << bt->name () << "* ";
-                }
-                break;
-              case TAO_CodeGen::TAO_ATTRIBUTE_INPARAM_TYPE_CH:
-                {
-                  // keep MSVC++ happy
-                  *os << "const " << bt->nested_type_name (bif) << " &" <<
-                    attr->local_name ();
-                }
-                break;
-              case TAO_CodeGen::TAO_ATTRIBUTE_INPARAM_TYPE_CS:
-              case TAO_CodeGen::TAO_ATTRIBUTE_INPARAM_TYPE_SH:
-                {
-                  *os << "const " << bt->name () << " &" << attr->local_name
-                    ();
-                }
-                break;
-              default:
-                {
-                  ACE_ERROR_RETURN ((LM_ERROR,
-                                     "(%N:%l) be_state_attribute - unknown state\n"), -1);
-                }
-              } // end switch state
-          } // end of if
-        else if (bpd->pt () == AST_PredefinedType::PT_pseudo) // e.g., CORBA::Object
-          {
-            switch (cg->state ())
-              {
-              case TAO_CodeGen::TAO_ATTRIBUTE_RETVAL_DECL_CS:
-                {
-                  // pseudo object, return a pointer
-                  *os << bt->name () << "_ptr retval;" << nl;
-                }
-                break;
-              case TAO_CodeGen::TAO_ATTRIBUTE_RETVAL_EXCEPTION_CS:
-                {
-                  // pseudo object, return a pointer
-                  *os << "return 0;\n";
-                }
-                break;
-              case TAO_CodeGen::TAO_ATTRIBUTE_RETVAL_RETURN_CS:
-                {
-                  *os << "return retval;" << nl;
-                }
-                break;
-              case TAO_CodeGen::TAO_ATTRIBUTE_RETVAL_DECL_SS:
-                {
-                  // pseudo object, return a pointer
-                  *os << bt->name () << "_ptr *retval = new " << bt->name () <<
-                    "_ptr;" << nl;
-                }
-                break;
-              case TAO_CodeGen::TAO_ATTRIBUTE_RETVAL_ASSIGN_SS:
-                {
-                  // pseudo object, return a pointer
-                  *os << "*retval";
-                }
-                break;
-              case TAO_CodeGen::TAO_ATTRIBUTE_RESULT_SS:
-                {
-                  // pseudo object, return a pointer
-                  *os << "result = new CORBA::Any (" << bt->tc_name () <<
-                    ", retval, 1); // ORB owns" << nl;
-                }
-                break;
-              case TAO_CodeGen::TAO_ATTRIBUTE_INPARAM_TYPE_SS:
-                {
-                    // declare a variable
-                  *os << bt->name () << "_ptr ";
-                  *os << attr->local_name () << ";" << nl;
-                    // now define a NamedValue_ptr
-                  *os << "CORBA::NamedValue_ptr nv_" << attr->local_name () <<
-                    ";" << nl;
-                    // declare an Any
-                  *os << "CORBA::Any \t any_" << attr->local_name () << " (" <<
-                    bt->tc_name () << ", &" << attr->local_name () <<
-                    "); // ORB does not own" << nl;
-                }
-                break;
-              case TAO_CodeGen::TAO_ATTRIBUTE_PRE_DOCALL_CS:
-                {
-                  // no casting necessary as we already are object_ptr
-                }
-                break;
-              case TAO_CodeGen::TAO_ATTRIBUTE_DOCALL_CS:
-                {
-                  *os << ", &" << attr->local_name ();
-                }
-                break;
-              case TAO_CodeGen::TAO_ATTRIBUTE_POST_DOCALL_CS:
-                {
-                  // nothing
-                }
-                break;
-              case TAO_CodeGen::TAO_ATTRIBUTE_UPCALL_SS:
-                {
-                  *os << attr->local_name () << ", ";
-                }
-                break;
-              case TAO_CodeGen::TAO_ATTRIBUTE_PRE_UPCALL_SS:
-                {
-                  // nothing to be done as we are Object_ptr
-                }
-                break;
-              case TAO_CodeGen::TAO_ATTRIBUTE_POST_UPCALL_SS:
-                {
-                  // nothing
-                }
-                break;
-              case TAO_CodeGen::TAO_ATTRIBUTE_RETURN_TYPE_CH:
-                {
-                  // keep MSVC++ happy
-                  *os << bt->nested_type_name (bif);
-                }
-                break;
-              case TAO_CodeGen::TAO_ATTRIBUTE_RETURN_TYPE_CS:
-              case TAO_CodeGen::TAO_ATTRIBUTE_RETURN_TYPE_SH:
-                {
-                  *os << bt->name ();
-                }
-                break;
-              case TAO_CodeGen::TAO_ATTRIBUTE_INPARAM_TYPE_CH:
-                {
-                  // keep MSVC++ happy
-                  *os << "const " << bt->nested_type_name (bif) << " &" <<
-                    attr->local_name ();
-                }
-                break;
-              case TAO_CodeGen::TAO_ATTRIBUTE_INPARAM_TYPE_CS:
-              case TAO_CodeGen::TAO_ATTRIBUTE_INPARAM_TYPE_SH:
-                {
-                  *os << "const " << bt->name () << " &" << attr->local_name
-                    ();
-                }
-                break;
-              default:
-                {
-                  ACE_ERROR_RETURN ((LM_ERROR,
-                                     "(%N:%l) be_state_attribute - unknown state\n"), -1);
-                }
-              } // end of switch state
-          } // end else if
-        else // simple predefined types
-          {
-            switch (cg->state ())
-              {
-              case TAO_CodeGen::TAO_ATTRIBUTE_RETVAL_DECL_CS:
-                {
-                  *os << bt->name () << " retval;" << nl;
-                }
-                break;
-              case TAO_CodeGen::TAO_ATTRIBUTE_RETVAL_EXCEPTION_CS:
-                {
-                  *os << "return retval;\n";
-                }
-                break;
-              case TAO_CodeGen::TAO_ATTRIBUTE_RETVAL_RETURN_CS:
-                {
-                  *os << "return retval;" << nl;
-                }
-                break;
-              case TAO_CodeGen::TAO_ATTRIBUTE_RETVAL_DECL_SS:
-                {
-                  *os << bt->name () << " *retval = new " << bt->name () << ";"
-                      << nl;
-                }
-                break;
-              case TAO_CodeGen::TAO_ATTRIBUTE_RETVAL_ASSIGN_SS:
-                {
-                  *os << " *retval";
-                }
-                break;
-              case TAO_CodeGen::TAO_ATTRIBUTE_RESULT_SS:
-                {
-                  *os << "result = new CORBA::Any (" << bt->tc_name () <<
-                    ", retval, 1); // ORB owns" << nl;
-                }
-                break;
-              case TAO_CodeGen::TAO_ATTRIBUTE_INPARAM_TYPE_SS:
-                {
-                    // declare a variable
-                  *os << bt->name () << " " << attr->local_name () << ";" <<
-                    nl;
-                    // now define a NamedValue_ptr
-                  *os << "CORBA::NamedValue_ptr nv_" << attr->local_name () <<
-                    ";" << nl;
-                    // declare an Any
-                  *os << "CORBA::Any \t any_" << attr->local_name () << " (" <<
-                    bt->tc_name () << ", &" << attr->local_name () <<
-                    "); // ORB does not own" << nl;
-                }
-                break;
-              case TAO_CodeGen::TAO_ATTRIBUTE_PRE_DOCALL_CS:
-                {
-                  // nothing
-                }
-                break;
-              case TAO_CodeGen::TAO_ATTRIBUTE_DOCALL_CS:
-                {
-                  *os << ", &" << attr->local_name ();
-                }
-                break;
-              case TAO_CodeGen::TAO_ATTRIBUTE_POST_DOCALL_CS:
-                {
-                  // nothing
-                }
-                break;
-              case TAO_CodeGen::TAO_ATTRIBUTE_UPCALL_SS:
-                {
-                  *os << attr->local_name () << ", ";
-                }
-                break;
-              case TAO_CodeGen::TAO_ATTRIBUTE_PRE_UPCALL_SS:
-                {
-                  // nothing
-                }
-                break;
-              case TAO_CodeGen::TAO_ATTRIBUTE_POST_UPCALL_SS:
-                {
-                  // nothing
-                }
-                break;
-              case TAO_CodeGen::TAO_ATTRIBUTE_RETURN_TYPE_CH:
-                {
-                  // keep MSVC++ happy
-                  *os << bt->nested_type_name (bif);
-                }
-                break;
-              case TAO_CodeGen::TAO_ATTRIBUTE_RETURN_TYPE_CS:
-              case TAO_CodeGen::TAO_ATTRIBUTE_RETURN_TYPE_SH:
-                {
-                  *os << bt->name ();
-                }
-                break;
-              case TAO_CodeGen::TAO_ATTRIBUTE_INPARAM_TYPE_CH:
-                {
-                  // keep MSVC++ happy
-                  *os << "const " << bt->nested_type_name (bif) << " &" <<
-                    attr->local_name ();
-                }
-                break;
-              case TAO_CodeGen::TAO_ATTRIBUTE_INPARAM_TYPE_CS:
-              case TAO_CodeGen::TAO_ATTRIBUTE_INPARAM_TYPE_SH:
-                {
-                  *os << "const " << bt->name () << " &" << attr->local_name
-                    ();
-                }
-                break;
-              default:
-                {
-                  ACE_ERROR_RETURN ((LM_ERROR,
-                                     "(%N:%l) be_state_attribute - unknown state\n"), -1);
-                }
-              } // end switch state
-          } // end of else
-      } // end of case predefined
-      break;
-    case AST_Decl::NT_string: // type is a string
-      {
-        switch (cg->state ())
-          {
-          case TAO_CodeGen::TAO_ATTRIBUTE_RETVAL_DECL_CS:
-            {
-              if (bt->node_type () == AST_Decl::NT_typedef)
-                {
-                  *os << bt->name () << " retval = 0;" << nl;
-                }
-              else
-                {
-                  *os << "char *retval = 0;" << nl;
-                }
-            }
-          break;
-          case TAO_CodeGen::TAO_ATTRIBUTE_RETVAL_EXCEPTION_CS:
-            {
-              *os << "return 0;\n";
-            }
-          break;
-          case TAO_CodeGen::TAO_ATTRIBUTE_RETVAL_RETURN_CS:
-            {
-              *os << "return retval;" << nl;
-            }
-          break;
-          case TAO_CodeGen::TAO_ATTRIBUTE_RETVAL_DECL_SS:
-            {
-              if (bt->node_type () == AST_Decl::NT_typedef)
-                {
-                  *os << bt->name () << " *retval = new " << bt->name () << "*;" << nl;
-                }
-              else
-                {
-                  *os << "char **retval = new char*;" << nl;
-                }
-            }
-            break;
-          case TAO_CodeGen::TAO_ATTRIBUTE_RETVAL_ASSIGN_SS:
-            {
-              *os << "*retval";
-            }
-            break;
-          case TAO_CodeGen::TAO_ATTRIBUTE_RESULT_SS:
-            {
-              *os << "result = new CORBA::Any (" << bt->tc_name () <<
-                ", retval, 1); // ORB owns" << nl;
-            }
-            break;
-          case TAO_CodeGen::TAO_ATTRIBUTE_INPARAM_TYPE_SS:
-            {
-                    // declare a variable
-              *os << "char *" << attr->local_name () << ";" <<
-                nl;
-                    // now define a NamedValue_ptr
-              *os << "CORBA::NamedValue_ptr nv_" << attr->local_name () <<
-                ";" << nl;
-                    // declare an Any
-              *os << "CORBA::Any \t any_" << attr->local_name () << " (" <<
-                bt->tc_name () << ", &" << attr->local_name () <<
-                "); // ORB does not own" << nl;
-            }
-            break;
-          case TAO_CodeGen::TAO_ATTRIBUTE_PRE_DOCALL_CS:
-            {
-              // nothing
-            }
-            break;
-          case TAO_CodeGen::TAO_ATTRIBUTE_DOCALL_CS:
-            {
-              *os << ", &" << attr->local_name ();
-            }
-            break;
-          case TAO_CodeGen::TAO_ATTRIBUTE_POST_DOCALL_CS:
-            {
-              // nothing
-            }
-            break;
-          case TAO_CodeGen::TAO_ATTRIBUTE_PRE_UPCALL_SS:
-            {
-              // nothing
-            }
-            break;
-          case TAO_CodeGen::TAO_ATTRIBUTE_POST_UPCALL_SS:
-            {
-              // nothing
-            }
-            break;
-          case TAO_CodeGen::TAO_ATTRIBUTE_UPCALL_SS:
-            {
-              *os << attr->local_name () << ", ";
-            }
-            break;
-          case TAO_CodeGen::TAO_ATTRIBUTE_RETURN_TYPE_CH:
-            {
-              if (bt->node_type () == AST_Decl::NT_typedef)
-                {
-                  // to keep MSVC++ happy
-                  *os << bt->nested_type_name (bif);
-                }
-              else
-                {
-                  *os << "char *";
-                }
-            }
-            break;
-          case TAO_CodeGen::TAO_ATTRIBUTE_RETURN_TYPE_CS:
-          case TAO_CodeGen::TAO_ATTRIBUTE_RETURN_TYPE_SH:
-            {
-              if (bt->node_type () == AST_Decl::NT_typedef)
-                {
-                  *os << bt->name ();
-                }
-              else
-                {
-                  *os << "char *";
-                }
-            }
-          break;
-          case TAO_CodeGen::TAO_ATTRIBUTE_INPARAM_TYPE_SH:
-          case TAO_CodeGen::TAO_ATTRIBUTE_INPARAM_TYPE_CS:
-            {
-              *os << "const char *" << attr->local_name ();
-            }
-            break;
-          default:
-            {
-              ACE_ERROR_RETURN ((LM_ERROR,
-                                 "(%N:%l) be_state_attribute - unknown state\n"), -1);
-            }
-          } // end switch state
-      } // end case string
-      break;
-    case AST_Decl::NT_array: // type is an array
-      {
-        switch (cg->state ())
-          {
-          case TAO_CodeGen::TAO_ATTRIBUTE_RETVAL_DECL_CS:
-            {
-              *os << bt->name () << "_slice *retval;" << nl;
-            }
-          break;
-          case TAO_CodeGen::TAO_ATTRIBUTE_RETVAL_EXCEPTION_CS:
-            {
-              *os << "return 0;\n";
-            }
-          break;
-          case TAO_CodeGen::TAO_ATTRIBUTE_RETVAL_RETURN_CS:
-            {
-              *os << "return retval;" << nl;
-            }
-          break;
-          case TAO_CodeGen::TAO_ATTRIBUTE_RETVAL_DECL_SS:
-            {
-              *os << bt->name () << "_slice *retval;" << nl;
-            }
-            break;
-          case TAO_CodeGen::TAO_ATTRIBUTE_RETVAL_ASSIGN_SS:
-            {
-              *os << "retval";
-            }
-            break;
-          case TAO_CodeGen::TAO_ATTRIBUTE_RESULT_SS:
-            {
-              *os << "result = new CORBA::Any (" << bt->tc_name () <<
-                ", retval, 1); // ORB owns" << nl;
-            }
-            break;
-          case TAO_CodeGen::TAO_ATTRIBUTE_INPARAM_TYPE_SS:
-            {
-              // declare a variable
-              *os << bt->name () << " " << attr->local_name ()
-                  << ";" << nl;
-              // now define a NamedValue_ptr
-              *os << "CORBA::NamedValue_ptr nv_" << attr->local_name () <<
-                ";" << nl;
-              // declare an Any
-              *os << "CORBA::Any \t any_" << attr->local_name () << " (" <<
-                bt->tc_name () << ", " << attr->local_name () <<
-                "); // ORB does not own" << nl;
-            }
-            break;
-          case TAO_CodeGen::TAO_ATTRIBUTE_PRE_DOCALL_CS:
-            {
-              // XXXASG TODO
-            }
-            break;
-          case TAO_CodeGen::TAO_ATTRIBUTE_DOCALL_CS:
-            {
-              // XXXASG TODO
-            }
-            break;
-          case TAO_CodeGen::TAO_ATTRIBUTE_POST_DOCALL_CS:
-            {
-              // XXXASG TODO
-            }
-            break;
-          case TAO_CodeGen::TAO_ATTRIBUTE_UPCALL_SS:
-            {
-              *os << attr->local_name () << ", ";
-            }
-            break;
-          case TAO_CodeGen::TAO_ATTRIBUTE_PRE_UPCALL_SS:
-            {
-              // nothing
-            }
-            break;
-          case TAO_CodeGen::TAO_ATTRIBUTE_POST_UPCALL_SS:
-            {
-              // nothing
-            }
-            break;
-          case TAO_CodeGen::TAO_ATTRIBUTE_RETURN_TYPE_CH:
-            {
-              // to keep MSVC++ happy
-              *os << bt->nested_type_name (bif, "_slice") << " *";
-            }
-            break;
-          case TAO_CodeGen::TAO_ATTRIBUTE_RETURN_TYPE_CS:
-          case TAO_CodeGen::TAO_ATTRIBUTE_RETURN_TYPE_SH:
-            {
-              *os << bt->name () << "_slice *";
-            }
-          break;
-          case TAO_CodeGen::TAO_ATTRIBUTE_INPARAM_TYPE_CH:
-            {
-              // to keep the MSVC++ compiler happy
-              *os << "const " << bt->nested_type_name (bif) << " " <<
-                attr->local_name ();
-            }
-            break;
-          case TAO_CodeGen::TAO_ATTRIBUTE_INPARAM_TYPE_CS:
-          case TAO_CodeGen::TAO_ATTRIBUTE_INPARAM_TYPE_SH:
-            {
-              *os << "const " << bt->name () << " " << attr->local_name ();
-            }
-            break;
-          default:
-            {
-              ACE_ERROR_RETURN ((LM_ERROR,
-                                 "(%N:%l) be_state_attribute - unknown state\n"), -1);
-            }
-          } // end switch state
-      } // end of case array
-      break;
-    case AST_Decl::NT_sequence: // type is a sequence
-    case AST_Decl::NT_struct: // type is a struct
-    case AST_Decl::NT_union: // type is a union
-      {
-        switch (cg->state ())
-          {
-          case TAO_CodeGen::TAO_ATTRIBUTE_INPARAM_TYPE_SS:
-            {
-              // declare a variable
-              *os << bt->name () << " " << attr->local_name () <<
-                ";" << nl;
-              // now define a NamedValue_ptr
-              *os << "CORBA::NamedValue_ptr nv_" << attr->local_name () <<
-                ";" << nl;
-              // declare an Any
-              *os << "CORBA::Any \t any_" << attr->local_name () << " (" <<
-                bt->tc_name () << ", &" << attr->local_name () <<
-                "); // ORB does not own" << nl;
-            }
-            break;
-          case TAO_CodeGen::TAO_ATTRIBUTE_PRE_DOCALL_CS:
-            {
-              // nothing
-            }
-            break;
-          case TAO_CodeGen::TAO_ATTRIBUTE_DOCALL_CS:
-            {
-              *os << ", &" << attr->local_name ();
-            }
-            break;
-          case TAO_CodeGen::TAO_ATTRIBUTE_POST_DOCALL_CS:
-            {
-              // nothing
-            }
-            break;
-          case TAO_CodeGen::TAO_ATTRIBUTE_UPCALL_SS:
-            {
-              *os << attr->local_name () << ", ";
-            }
-            break;
-          case TAO_CodeGen::TAO_ATTRIBUTE_PRE_UPCALL_SS:
-            {
-              // nothing
-            }
-            break;
-          case TAO_CodeGen::TAO_ATTRIBUTE_POST_UPCALL_SS:
-            {
-              // nothing
-            }
-            break;
-          break;
-          case TAO_CodeGen::TAO_ATTRIBUTE_RETVAL_DECL_CS:
-            {
-              *os << bt->name () << " *retval = 0;" << nl;
-            }
-          break;
-          case TAO_CodeGen::TAO_ATTRIBUTE_RETVAL_EXCEPTION_CS:
-            {
-              *os << "return 0;\n";
-            }
-          break;
-          case TAO_CodeGen::TAO_ATTRIBUTE_RETVAL_RETURN_CS:
-            {
-              *os << "return retval;" << nl;
-            }
-          break;
-          case TAO_CodeGen::TAO_ATTRIBUTE_RETVAL_DECL_SS:
-            {
-              *os << bt->name () << " *retval;" << nl;
-            }
-            break;
-          case TAO_CodeGen::TAO_ATTRIBUTE_RETVAL_ASSIGN_SS:
-            {
-              *os << "retval";
-            }
-            break;
-          case TAO_CodeGen::TAO_ATTRIBUTE_RESULT_SS:
-            {
-              *os << "result = new CORBA::Any (" << bt->tc_name () <<
-                ", retval, 1); // ORB owns" << nl;
-            }
-            break;
-          case TAO_CodeGen::TAO_ATTRIBUTE_RETURN_TYPE_CH:
-            {
-              if (bt->size_type () == be_decl::VARIABLE)
-                // to keep MSVC++ happy
-                *os << bt->nested_type_name (bif) << " *";
-              else
-                *os << bt->nested_type_name (bif);
-            }
-            break;
-          case TAO_CodeGen::TAO_ATTRIBUTE_RETURN_TYPE_CS:
-          case TAO_CodeGen::TAO_ATTRIBUTE_RETURN_TYPE_SH:
-            {
-              if (bt->size_type () == be_decl::VARIABLE)
-                *os << bt->name () << " *";
-              else
-                *os << bt->name ();
-            }
-            break;
-          case TAO_CodeGen::TAO_ATTRIBUTE_INPARAM_TYPE_CH:
-            {
-              // to keep the MSVC++ compiler happy
-              *os << "const " << bt->nested_type_name (bif) << " &" <<
-                attr->local_name ();
-            }
-            break;
-          case TAO_CodeGen::TAO_ATTRIBUTE_INPARAM_TYPE_CS:
-          case TAO_CodeGen::TAO_ATTRIBUTE_INPARAM_TYPE_SH:
-            {
-              *os << "const " << bt->name () << " &" << attr->local_name ();
-            }
-            break;
-          default:
-            {
-              ACE_ERROR_RETURN ((LM_ERROR,
-                                 "(%N:%l) be_state_attribute - unknown state\n"), -1);
-            }
-          } // end switch state
-      } // end case
-      break;
-    case AST_Decl::NT_enum: // type is an enum
-      {
-        switch (cg->state ())
-          {
-          case TAO_CodeGen::TAO_ATTRIBUTE_RETVAL_DECL_CS:
-            {
-              *os << bt->name () << " retval;" << nl;
-            }
-          break;
-          case TAO_CodeGen::TAO_ATTRIBUTE_RETVAL_EXCEPTION_CS:
-            {
-              *os << "return retval;\n";
-            }
-          break;
-          case TAO_CodeGen::TAO_ATTRIBUTE_RETVAL_RETURN_CS:
-            {
-              *os << "return retval;" << nl;
-            }
-          break;
-          case TAO_CodeGen::TAO_ATTRIBUTE_RETVAL_DECL_SS:
-            {
-              *os << bt->name () << " *retval = new " << bt->name () << ";" <<
-                nl;
-            }
-            break;
-          case TAO_CodeGen::TAO_ATTRIBUTE_RETVAL_ASSIGN_SS:
-            {
-              *os << "*retval";
-            }
-            break;
-          case TAO_CodeGen::TAO_ATTRIBUTE_RESULT_SS:
-            {
-              *os << "result = new CORBA::Any (" << bt->tc_name () <<
-                ", retval, 1); // ORB owns" << nl;
-            }
-            break;
-          case TAO_CodeGen::TAO_ATTRIBUTE_INPARAM_TYPE_SS:
-            {
-                    // declare a variable
-              *os << bt->name () << " " << attr->local_name () << ";" <<
-                nl;
-                    // now define a NamedValue_ptr
-              *os << "CORBA::NamedValue_ptr nv_" << attr->local_name () <<
-                ";" << nl;
-                    // declare an Any
-              *os << "CORBA::Any \t any_" << attr->local_name () << " (" <<
-                bt->tc_name () << ", &" << attr->local_name () <<
-                "); // ORB does not own" << nl;
-            }
-            break;
-          case TAO_CodeGen::TAO_ATTRIBUTE_PRE_DOCALL_CS:
-            {
-              // nothing
-            }
-            break;
-          case TAO_CodeGen::TAO_ATTRIBUTE_DOCALL_CS:
-            {
-              // nothing
-            }
-            break;
-          case TAO_CodeGen::TAO_ATTRIBUTE_POST_DOCALL_CS:
-            {
-              // nothing
-            }
-            break;
-          case TAO_CodeGen::TAO_ATTRIBUTE_UPCALL_SS:
-            {
-              *os << attr->local_name () << ", ";
-            }
-            break;
-          case TAO_CodeGen::TAO_ATTRIBUTE_PRE_UPCALL_SS:
-            {
-              // nothing
-            }
-            break;
-          case TAO_CodeGen::TAO_ATTRIBUTE_POST_UPCALL_SS:
-            {
-              // nothing
-            }
-            break;
-          case TAO_CodeGen::TAO_ATTRIBUTE_INPARAM_TYPE_CH:
-            {
-              // to keep the MSVC++ compiler happy
-              *os << bt->nested_type_name (bif) << " " << attr->local_name
-                ();
-            }
-            break;
-          case TAO_CodeGen::TAO_ATTRIBUTE_INPARAM_TYPE_CS:
-          case TAO_CodeGen::TAO_ATTRIBUTE_INPARAM_TYPE_SH:
-            {
-              *os << bt->name () << " " << attr->local_name ();
-            }
-            break;
-          case TAO_CodeGen::TAO_ATTRIBUTE_RETURN_TYPE_CH:
-            {
-              // to keep MSVC++ happy
-              *os << bt->nested_type_name (bif);
-            }
-            break;
-          case TAO_CodeGen::TAO_ATTRIBUTE_RETURN_TYPE_CS:
-          case TAO_CodeGen::TAO_ATTRIBUTE_RETURN_TYPE_SH:
-            {
-              *os << bt->name ();
-            }
-            break;
-          default:
-            {
-              ACE_ERROR_RETURN ((LM_ERROR,
-                                 "(%N:%l) be_state_attribute - unknown state\n"), -1);
-            }
-          } // end switch state
-      } //   end case
-      break;
-    case AST_Decl::NT_except: // type is an exception
-      {
-        // XXXASG TODO: is this allowed ???
-      }
-      break;
-    case AST_Decl::NT_typedef: // type is a typedef
-      {
-        be_type *temp;
-        be_typedef *t = be_typedef::narrow_from_decl (bt);
-
-        if (!t)
-          return -1;
-
-        temp = t->primitive_base_type ();
-        // make a recursive call
-        return this->gen_code (t, d, temp);
-      } // end of case
-      break;
-    } //end switch node type
-  return 0;
-}
diff --git a/TAO/TAO_IDL/be/be_state_operation.cpp b/TAO/TAO_IDL/be/be_state_operation.cpp
deleted file mode 100644
index bd6894d4d1c..00000000000
--- a/TAO/TAO_IDL/be/be_state_operation.cpp
+++ /dev/null
@@ -1,658 +0,0 @@
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    be_state_operation.cpp
-//
-// = DESCRIPTION
-//    state based code generation for operations.
-//
-// = AUTHOR
-//    Aniruddha Gokhale
-//
-// ============================================================================
-
-#include	"idl.h"
-#include	"idl_extern.h"
-#include	"be.h"
-
-// return type for operation
-be_state_operation::be_state_operation (void)
-{
-}
-
-// generate code for return type of operation
-int
-be_state_operation::gen_code (be_type *bt, be_decl *d, be_type *type)
-{
-  TAO_OutStream *os = 0; // output stream
-  TAO_NL  nl;        // end line
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-  be_operation *bop;
-  be_interface *bif; // interface in which the operation was defined
-
-  bop = be_operation::narrow_from_decl (d);
-  if (!bop)
-    return -1;
-
-  bif = be_interface::narrow_from_scope (bop->defined_in ());
-  if (!bif)
-    return -1;
-
-  switch (cg->state ())
-    {
-    case TAO_CodeGen::TAO_OPERATION_CH:
-      os = cg->client_header ();
-      break;
-    case TAO_CodeGen::TAO_OPERATION_RETURN_TYPE_CS:
-    case TAO_CodeGen::TAO_OPERATION_RETVAL_DECL_CS:
-    case TAO_CodeGen::TAO_OPERATION_RETVAL_EXCEPTION_CS:
-    case TAO_CodeGen::TAO_OPERATION_RETVAL_RETURN_CS:
-      os = cg->client_stubs ();
-      break;
-    case TAO_CodeGen::TAO_OPERATION_SH:
-      os = cg->server_header ();
-      break;
-    case TAO_CodeGen::TAO_OPERATION_RETVAL_DECL_SS:
-    case TAO_CodeGen::TAO_OPERATION_RETVAL_ASSIGN_SS:
-    case TAO_CodeGen::TAO_OPERATION_RESULT_SS:
-      os = cg->server_skeletons ();
-      break;
-    }
-
-  if (!type) // not a recursive call
-    type = bt;
-  else // recursively called thru a typedef. "type" will have the most primitive
-       // base class of the typedef
-    ACE_ASSERT (bt->node_type () == AST_Decl::NT_typedef);
-
-  // generate code based on type. For every case, first downcast to the
-  // appropriate type. If the downcast fails, return error, else proceed. In
-  // some cases, the type itself may need code generation, e.g., anonymous
-  // struct types.
-  switch (type->node_type ())
-    {
-    case AST_Decl::NT_interface: // type is an obj reference
-    case AST_Decl::NT_interface_fwd: // type is an obj reference
-      {
-        switch (cg->state ())
-          {
-          case TAO_CodeGen::TAO_OPERATION_RETURN_TYPE_CS:
-            {
-              *os << bt->name () << "_ptr ";
-            }
-          break;
-          case TAO_CodeGen::TAO_OPERATION_RETVAL_DECL_CS:
-            {
-              *os << "CORBA::Object_ptr retval = CORBA::Object::_nil ();" << nl;
-            }
-          break;
-          case TAO_CodeGen::TAO_OPERATION_RETVAL_EXCEPTION_CS:
-            {
-              *os << "return " << bt->name () << "::_nil ();\n";
-            }
-          break;
-          case TAO_CodeGen::TAO_OPERATION_RETVAL_RETURN_CS:
-            {
-              *os << "return " << bt->name () << "::_narrow (retval, env);" << nl;
-            }
-          break;
-          case TAO_CodeGen::TAO_OPERATION_RETVAL_DECL_SS:
-            {
-              *os << "CORBA::Object_ptr *retval ="
-                " new CORBA::Object_ptr;" << nl;
-              *os << "*retval = CORBA::Object::_nil ();" << nl;
-            }
-            break;
-          case TAO_CodeGen::TAO_OPERATION_RETVAL_ASSIGN_SS:
-            {
-              *os << "*retval"; // assign to retval
-            }
-            break;
-          case TAO_CodeGen::TAO_OPERATION_RESULT_SS:
-            {
-              *os << "result = new CORBA::Any (" << bt->tc_name () <<
-                ", retval, 1); // ORB owns" << nl;
-            }
-            break;
-          case TAO_CodeGen::TAO_OPERATION_CH:
-            {
-              // to keep MSVC++ happy
-              *os << bt->nested_type_name (bif, "_ptr") << " ";
-            }
-            break;
-          default:
-            {
-              *os << bt->name () << "_ptr ";
-            }
-          }
-      }
-      break;
-    case AST_Decl::NT_pre_defined: // type is predefined type
-      {
-        be_predefined_type *bpd = be_predefined_type::narrow_from_decl (type);
-
-        switch (cg->state ())
-          {
-          case TAO_CodeGen::TAO_OPERATION_RETURN_TYPE_CS:
-            {
-              // check if the type is an any
-              if (bpd->pt () == AST_PredefinedType::PT_any)
-                {
-                  // if it is an any, return a pointer to it
-                  *os << bt->name () << " *";
-                }
-              else if (bpd->pt () == AST_PredefinedType::PT_pseudo)
-                {
-                  // pseudo object, return a pointer
-                  *os << bt->name () << "_ptr ";
-                }
-              else if (bpd->pt () == AST_PredefinedType::PT_void)
-                {
-                  *os << "void ";
-                }
-              else
-                {
-                  *os << bt->name () << " ";
-                }
-            }
-          break;
-          case TAO_CodeGen::TAO_OPERATION_RETVAL_DECL_CS:
-            {
-              // check if the type is an any
-              if (bpd->pt () == AST_PredefinedType::PT_any)
-                {
-                  // if it is an any, return a pointer to it
-                  *os << bt->name () << " *retval;" << nl;
-                }
-              else if (bpd->pt () == AST_PredefinedType::PT_pseudo)
-                {
-                  // pseudo object, return a pointer
-                  *os << bt->name () << "_ptr retval;" << nl;
-                }
-              else if (bpd->pt () == AST_PredefinedType::PT_void)
-                {
-                  // no return variable
-                }
-              else
-                {
-                  *os << bt->name () << " retval;" << nl;
-                }
-            }
-          break;
-          case TAO_CodeGen::TAO_OPERATION_RETVAL_EXCEPTION_CS:
-            {
-              // check if the type is an any
-              if (bpd->pt () == AST_PredefinedType::PT_any)
-                {
-                  // if it is an any, return a pointer to it
-                  *os << "return 0;\n";
-                }
-              else if (bpd->pt () == AST_PredefinedType::PT_pseudo)
-                {
-                  // pseudo object, return a pointer
-                  *os << "return 0;\n";
-                }
-              else if (bpd->pt () == AST_PredefinedType::PT_void)
-                {
-                  *os << "return;\n";
-                }
-              else
-                {
-                  *os << "return retval;\n";
-                }
-            }
-          break;
-          case TAO_CodeGen::TAO_OPERATION_RETVAL_RETURN_CS:
-            {
-              if (bpd->pt () == AST_PredefinedType::PT_void)
-                {
-                  *os << "return; // no value" << nl;
-                }
-              else
-                {
-                  *os << "return retval;" << nl;
-                }
-            }
-          break;
-          case TAO_CodeGen::TAO_OPERATION_RETVAL_DECL_SS:
-            {
-              // check if the type is an any
-              if (bpd->pt () == AST_PredefinedType::PT_any)
-                {
-                  // if it is an any, return a pointer to it
-                  *os << bt->name () << " *retval;" << nl;
-                }
-              else if (bpd->pt () == AST_PredefinedType::PT_pseudo)
-                {
-                  // pseudo object, return a pointer
-                  *os << bt->name () << "_ptr *retval = new " << bt->name () <<
-                      "_ptr;" << nl;
-                }
-              else
-                {
-                  *os << bt->name () << " *retval = new " << bt->name () << ";"
-                      << nl;
-                }
-            }
-            break;
-          case TAO_CodeGen::TAO_OPERATION_RETVAL_ASSIGN_SS:
-            {
-              // check if the type is an any
-              if (bpd->pt () == AST_PredefinedType::PT_any)
-                {
-                  // if it is an any, return a pointer to it
-                  *os << "retval";
-                }
-              else if (bpd->pt () == AST_PredefinedType::PT_pseudo)
-                {
-                  // pseudo object, return a pointer
-                  *os << "*retval";
-                }
-              else
-                {
-                  *os << " *retval";
-                }
-            }
-            break;
-          case TAO_CodeGen::TAO_OPERATION_RESULT_SS:
-            {
-              if (bpd->pt () == AST_PredefinedType::PT_any)
-                {
-                  // if it is an any, return a pointer to it
-                  *os << "result = new CORBA::Any (" << bt->tc_name () <<
-                    ", retval, 1); // ORB owns" << nl;
-                }
-              else if (bpd->pt () == AST_PredefinedType::PT_pseudo)
-                {
-                  // pseudo object, return a pointer
-                  *os << "result = new CORBA::Any (" << bt->tc_name () <<
-                    ", retval, 1); // ORB owns" << nl;
-                }
-              else
-                {
-                  *os << "result = new CORBA::Any (" << bt->tc_name () <<
-                    ", retval, 1); // ORB owns" << nl;
-                }
-            }
-            break;
-          default:
-            {
-              *os << bt->name ();
-              // check if the type is an any
-              if (bpd->pt () == AST_PredefinedType::PT_any)
-                {
-                  // if it is an any, return a pointer to it
-                  *os << " *";
-                }
-              else if (bpd->pt () == AST_PredefinedType::PT_pseudo)
-                {
-                  // pseudo object, return a pointer
-                  *os << "_ptr";
-                }
-            }
-          } // end switch (cg->state())
-      }
-      break;
-    case AST_Decl::NT_string: // type is a string
-      {
-        switch (cg->state ())
-          {
-          case TAO_CodeGen::TAO_OPERATION_RETURN_TYPE_CS:
-            {
-              if (bt->node_type () == AST_Decl::NT_typedef)
-                {
-                  *os << bt->name ();
-                }
-              else
-                {
-                  *os << "char *";
-                }
-            }
-          break;
-          case TAO_CodeGen::TAO_OPERATION_RETVAL_DECL_CS:
-            {
-              if (bt->node_type () == AST_Decl::NT_typedef)
-                {
-                  *os << bt->name () << " retval = 0;" << nl;
-                }
-              else
-                {
-                  *os << "char *retval = 0;" << nl;
-                }
-            }
-          break;
-          case TAO_CodeGen::TAO_OPERATION_RETVAL_EXCEPTION_CS:
-            {
-              *os << "return 0;\n";
-            }
-          break;
-          case TAO_CodeGen::TAO_OPERATION_RETVAL_RETURN_CS:
-            {
-              *os << "return retval;" << nl;
-            }
-          break;
-          case TAO_CodeGen::TAO_OPERATION_RETVAL_DECL_SS:
-            {
-              if (bt->node_type () == AST_Decl::NT_typedef)
-                {
-                  *os << bt->name () << " *retval = new " << bt->name () << "*;" << nl;
-                }
-              else
-                {
-                  *os << "char **retval = new char*;" << nl;
-                }
-            }
-            break;
-          case TAO_CodeGen::TAO_OPERATION_RETVAL_ASSIGN_SS:
-            {
-              *os << "*retval";
-            }
-            break;
-          case TAO_CodeGen::TAO_OPERATION_RESULT_SS:
-            {
-              *os << "result = new CORBA::Any (" << bt->tc_name () <<
-                ", retval, 1); // ORB owns" << nl;
-            }
-            break;
-          case TAO_CodeGen::TAO_OPERATION_CH:
-            {
-              if (bt->node_type () == AST_Decl::NT_typedef)
-                {
-                  // to keep MSVC++ happy
-                  *os << bt->nested_type_name (bif);
-                }
-              else
-                {
-                  *os << "char *";
-                }
-            }
-            break;
-          default:
-            {
-              *os << "char *";
-            }
-          } // end of switch cg->state
-      }
-      break;
-      // these are all anonymous types
-    case AST_Decl::NT_array: // type is an array
-      {
-        switch (cg->state ())
-          {
-          case TAO_CodeGen::TAO_OPERATION_RETURN_TYPE_CS:
-            {
-              *os << bt->name () << "_slice *";
-            }
-          break;
-          case TAO_CodeGen::TAO_OPERATION_RETVAL_DECL_CS:
-            {
-              *os << bt->name () << "_slice *retval;" << nl;
-            }
-          break;
-          case TAO_CodeGen::TAO_OPERATION_RETVAL_EXCEPTION_CS:
-            {
-              *os << "return 0;\n";
-            }
-          break;
-          case TAO_CodeGen::TAO_OPERATION_RETVAL_RETURN_CS:
-            {
-              *os << "return retval;" << nl;
-            }
-          break;
-          case TAO_CodeGen::TAO_OPERATION_RETVAL_DECL_SS:
-            {
-              *os << bt->name () << "_slice *retval;" << nl;
-            }
-            break;
-          case TAO_CodeGen::TAO_OPERATION_RETVAL_ASSIGN_SS:
-            {
-              *os << "retval";
-            }
-            break;
-          case TAO_CodeGen::TAO_OPERATION_RESULT_SS:
-            {
-              *os << "result = new CORBA::Any (" << bt->tc_name () <<
-                ", retval, 1); // ORB owns" << nl;
-            }
-            break;
-          case TAO_CodeGen::TAO_OPERATION_CH:
-            {
-              // to keep MSVC++ happy
-              *os << bt->nested_type_name (bif, "_slice") << " *";
-            }
-            break;
-          default:
-            {
-              // return a pointer to slice
-              *os << bt->name () << "_slice *";
-            }
-          } // end of switch cg->state
-      }
-      break;
-    case AST_Decl::NT_sequence: // type is a sequence
-      // return type is a pointer to sequence
-      {
-        switch (cg->state ())
-          {
-          case TAO_CodeGen::TAO_OPERATION_RETURN_TYPE_CS:
-            {
-              *os << bt->name () << " *";
-            }
-          break;
-          case TAO_CodeGen::TAO_OPERATION_RETVAL_DECL_CS:
-            {
-              *os << bt->name () << " *retval = 0;" << nl;
-            }
-          break;
-          case TAO_CodeGen::TAO_OPERATION_RETVAL_EXCEPTION_CS:
-            {
-              *os << "return 0;\n";
-            }
-          break;
-          case TAO_CodeGen::TAO_OPERATION_RETVAL_RETURN_CS:
-            {
-              *os << "return retval;" << nl;
-            }
-          break;
-          case TAO_CodeGen::TAO_OPERATION_RETVAL_DECL_SS:
-            {
-              *os << bt->name () << " *retval;" << nl;
-            }
-            break;
-          case TAO_CodeGen::TAO_OPERATION_RETVAL_ASSIGN_SS:
-            {
-              *os << "retval";
-            }
-            break;
-          case TAO_CodeGen::TAO_OPERATION_RESULT_SS:
-            {
-              *os << "result = new CORBA::Any (" << bt->tc_name () <<
-                ", retval, 1); // ORB owns" << nl;
-            }
-            break;
-          case TAO_CodeGen::TAO_OPERATION_CH:
-            {
-              // to keep MSVC++ happy
-              *os << bt->nested_type_name (bif) << " *";
-            }
-            break;
-          default:
-            {
-              *os << bt->name () << " *";
-            }
-          } // end of swithc cg->state
-      }
-      break;
-    case AST_Decl::NT_enum: // type is an enum
-      {
-        switch (cg->state ())
-          {
-          case TAO_CodeGen::TAO_OPERATION_RETURN_TYPE_CS:
-            {
-              *os << bt->name () << " ";
-            }
-          break;
-          case TAO_CodeGen::TAO_OPERATION_RETVAL_DECL_CS:
-            {
-              *os << bt->name () << " retval;" << nl;
-            }
-          break;
-          case TAO_CodeGen::TAO_OPERATION_RETVAL_EXCEPTION_CS:
-            {
-              *os << "return retval;\n";
-            }
-          break;
-          case TAO_CodeGen::TAO_OPERATION_RETVAL_RETURN_CS:
-            {
-              *os << "return retval;" << nl;
-            }
-          break;
-          case TAO_CodeGen::TAO_OPERATION_RETVAL_DECL_SS:
-            {
-              *os << bt->name () << " *retval = new " << bt->name () << ";" <<
-                nl;
-            }
-            break;
-          case TAO_CodeGen::TAO_OPERATION_RETVAL_ASSIGN_SS:
-            {
-              *os << "*retval";
-            }
-            break;
-          case TAO_CodeGen::TAO_OPERATION_RESULT_SS:
-            {
-              *os << "result = new CORBA::Any (" << bt->tc_name () <<
-                ", retval, 1); // ORB owns" << nl;
-            }
-            break;
-          case TAO_CodeGen::TAO_OPERATION_CH:
-            {
-              // to keep MSVC++ happy
-              *os << bt->nested_type_name (bif);
-            }
-            break;
-          default:
-            {
-              *os << bt->name ();
-            }
-          } // end of switch cg->state
-      }
-      break;
-    case AST_Decl::NT_struct: // type is a struct
-    case AST_Decl::NT_union: // type is a union
-      {
-        switch (cg->state ())
-          {
-          case TAO_CodeGen::TAO_OPERATION_RETURN_TYPE_CS:
-            {
-              *os << bt->name () << " ";
-              if (bt->size_type () == be_decl::VARIABLE)
-                {
-                  *os << "*";
-                }
-            }
-          break;
-          case TAO_CodeGen::TAO_OPERATION_RETVAL_DECL_CS:
-            {
-              if (bt->size_type () == be_decl::VARIABLE)
-                {
-                  *os << bt->name () << " *retval;" << nl;
-                }
-              else
-                {
-                  *os << bt->name () << " retval;" << nl;
-                }
-            }
-          break;
-          case TAO_CodeGen::TAO_OPERATION_RETVAL_EXCEPTION_CS:
-            {
-              if (bt->size_type () == be_decl::VARIABLE)
-                {
-                  *os << "return 0;\n";
-                }
-              else
-                {
-                  *os << "return retval;\n";
-                }
-            }
-          break;
-          case TAO_CodeGen::TAO_OPERATION_RETVAL_RETURN_CS:
-            {
-              *os << "return retval;" << nl;
-            }
-          break;
-          case TAO_CodeGen::TAO_OPERATION_RETVAL_DECL_SS:
-            {
-              if (type->size_type () == be_decl::VARIABLE)
-                {
-                  *os << bt->name () << " *retval;" << nl;
-                }
-              else
-                {
-                  *os << bt->name () << " *retval = new " << bt->name () << ";"
-                      << nl;
-                }
-            }
-            break;
-          case TAO_CodeGen::TAO_OPERATION_RETVAL_ASSIGN_SS:
-            {
-              if (type->size_type () == be_decl::VARIABLE)
-                {
-                  *os << "retval";
-                }
-              else
-                {
-                  *os << "*retval";
-                }
-            }
-            break;
-          case TAO_CodeGen::TAO_OPERATION_RESULT_SS:
-            {
-              *os << "result = new CORBA::Any (" << bt->tc_name () <<
-                ", retval, 1); // ORB owns" << nl;
-            }
-            break;
-          case TAO_CodeGen::TAO_OPERATION_CH:
-            {
-              // to keep MSVC++ happy
-              *os << bt->nested_type_name (bif);
-              // check if we are fixed size or variable sized. Depending on that we
-              // return a pointer or the aggregate itself
-              if (type->size_type () == be_decl::VARIABLE)
-                *os << " *";
-            }
-            break;
-          default:
-            {
-              *os << bt->name ();
-              // check if we are fixed size or variable sized. Depending on that we
-              // return a pointer or the aggregate itself
-              if (type->size_type () == be_decl::VARIABLE)
-                *os << " *";
-            }
-          } // end of switch cg->state
-      }
-      break;
-    case AST_Decl::NT_except: // type is an exception
-      {
-        // XXXASG TODO: is this allowed ???
-      }
-      break;
-    case AST_Decl::NT_typedef: // type is a typedef
-      {
-        be_type *temp;
-        be_typedef *t = be_typedef::narrow_from_decl (bt);
-
-        if (!t)
-          return -1;
-
-        temp = t->primitive_base_type ();
-        // make a recursive call
-        return this->gen_code (t, d, temp);
-      } // end of switch
-      //break; unreachable statement!
-    } // switch of main switch
-  return 0;
-}
diff --git a/TAO/TAO_IDL/be/be_state_sequence.cpp b/TAO/TAO_IDL/be/be_state_sequence.cpp
deleted file mode 100644
index f4628bb6eff..00000000000
--- a/TAO/TAO_IDL/be/be_state_sequence.cpp
+++ /dev/null
@@ -1,171 +0,0 @@
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    be_state_sequence.cpp
-//
-// = DESCRIPTION
-//    state based code generation for sequences.
-//
-// = AUTHOR
-//    Aniruddha Gokhale
-//
-// ============================================================================
-
-#include	"idl.h"
-#include	"idl_extern.h"
-#include	"be.h"
-
-// return type for sequence
-be_state_sequence::be_state_sequence (void)
-{
-}
-
-// generate code for sequence type
-int
-be_state_sequence::gen_code (be_type *bt, be_decl *d, be_type *type)
-{
-  TAO_OutStream *os = 0; // output stream
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-  be_sequence *seq;
-
-  seq = be_sequence::narrow_from_decl (d);
-  if (!seq)
-    return -1;
-
-  switch (cg->state ())
-    {
-    case TAO_CodeGen::TAO_SEQUENCE_BASE_CH:
-    case TAO_CodeGen::TAO_SEQUENCE_BODY_CH:
-      os = cg->client_header (); // get client header stream
-      break;
-    case TAO_CodeGen::TAO_SEQUENCE_BASE_CS:
-    case TAO_CodeGen::TAO_SEQUENCE_BODY_CS:
-      os = cg->client_stubs (); // get client stubs stream
-      break;
-    case TAO_CodeGen::TAO_SEQUENCE_BASE_CI:
-    case TAO_CodeGen::TAO_SEQUENCE_BODY_CI:
-      os = cg->client_inline (); // get client inline stream
-      break;
-    default:
-      return -1;
-    }
-
-  if (!type) // not a recursive call
-    type = bt;
-  else // recursively called thru a typedef. "type" will have the most primitive
-    // base class of the typedef
-    ACE_ASSERT (bt->node_type () == AST_Decl::NT_typedef);
-
-  // enclosing scope in which the typedef occurs
-  be_decl *scope =
-    be_decl::narrow_from_decl (ScopeAsDecl (bt->defined_in ()));
-
-  // for sequences, all we do is generate the type
-  switch (type->node_type ())
-    {
-    case AST_Decl::NT_interface: // type is an obj reference
-    case AST_Decl::NT_string: // type is a string
-      {
-        switch (cg->state ())
-          {
-          case TAO_CodeGen::TAO_SEQUENCE_BASE_CH:
-          case TAO_CodeGen::TAO_SEQUENCE_BASE_CS:
-          case TAO_CodeGen::TAO_SEQUENCE_BASE_CI:
-            break;
-          case TAO_CodeGen::TAO_SEQUENCE_BODY_CH:
-            *os << bt->nested_type_name (scope, "_var");
-            break;
-          case TAO_CodeGen::TAO_SEQUENCE_BODY_CS:
-          case TAO_CodeGen::TAO_SEQUENCE_BODY_CI:
-          default:
-            *os << bt->name () << "_var";
-          }
-      }
-      break;
-    case AST_Decl::NT_pre_defined: // type is predefined type
-    case AST_Decl::NT_enum: // type is an enum
-    case AST_Decl::NT_array: // type is an array
-    case AST_Decl::NT_struct: // type is a struct
-    case AST_Decl::NT_union: // type is a union
-      {
-        switch (cg->state ())
-          {
-          case TAO_CodeGen::TAO_SEQUENCE_BASE_CH:
-          case TAO_CodeGen::TAO_SEQUENCE_BASE_CS:
-          case TAO_CodeGen::TAO_SEQUENCE_BASE_CI:
-            break;
-          case TAO_CodeGen::TAO_SEQUENCE_BODY_CH:
-            *os << bt->nested_type_name (scope, "");
-            break;
-          case TAO_CodeGen::TAO_SEQUENCE_BODY_CS:
-          case TAO_CodeGen::TAO_SEQUENCE_BODY_CI:
-          default:
-            *os << bt->name ();
-          }
-      }
-      break;
-    case AST_Decl::NT_sequence: // type is a sequence
-      {
-        switch (cg->state ())
-          {
-          case TAO_CodeGen::TAO_SEQUENCE_BASE_CH:
-            {
-              // generate the base type sequence
-              if (bt->gen_client_header () == -1)
-                {
-                  return -1;
-                }
-            }
-            break;
-          case TAO_CodeGen::TAO_SEQUENCE_BASE_CS:
-            {
-              // generate the base type sequence
-              if (bt->gen_client_stubs () == -1)
-                {
-                  return -1;
-                }
-            }
-            break;
-          case TAO_CodeGen::TAO_SEQUENCE_BASE_CI:
-            {
-              // generate the base type sequence
-              if (bt->gen_client_inline () == -1)
-                {
-                  return -1;
-                }
-            }
-            break;
-          case TAO_CodeGen::TAO_SEQUENCE_BODY_CH:
-            *os << bt->nested_type_name (scope, "");
-            break;
-          case TAO_CodeGen::TAO_SEQUENCE_BODY_CS:
-          case TAO_CodeGen::TAO_SEQUENCE_BODY_CI:
-          default:
-            *os << bt->name ();
-          }
-      }
-      break;
-    case AST_Decl::NT_except: // type is an exception
-      {
-        // XXXASG: Is this case valid ???
-      }
-      break;
-    case AST_Decl::NT_typedef: // type is a typedef
-      {
-        be_type *temp; // most primitive base type
-        be_typedef *t = be_typedef::narrow_from_decl (bt);
-
-        if (!t)
-          return -1;
-
-        temp = t->primitive_base_type ();
-        // make a recursive call
-        return this->gen_code (t, d, temp);
-      }
-      //break;  unreachable statement!
-    } // end of switch
-  return 0;
-}
diff --git a/TAO/TAO_IDL/be/be_state_structure.cpp b/TAO/TAO_IDL/be/be_state_structure.cpp
deleted file mode 100644
index 2226d3b131f..00000000000
--- a/TAO/TAO_IDL/be/be_state_structure.cpp
+++ /dev/null
@@ -1,128 +0,0 @@
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    be_state_struct.cpp
-//
-// = DESCRIPTION
-//    state based code generation for structs.
-//
-// = AUTHOR
-//    Aniruddha Gokhale
-//
-// ============================================================================
-
-#include	"idl.h"
-#include	"idl_extern.h"
-#include	"be.h"
-
-be_state_struct_ch::be_state_struct_ch (void)
-{
-}
-
-// generate code for structure member
-int
-be_state_struct_ch::gen_code (be_type *bt, be_decl *d, be_type *type)
-{
-  TAO_OutStream *os; // output stream
-  TAO_NL  nl;        // end line
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-  be_field *f;       // field node
-  be_structure *bs;  // enclosing structure node
-
-  // Macro to avoid "warning: unused parameter" type warning.
-  ACE_UNUSED_ARG (nl);
-
-  os = cg->client_header (); // get client header stream
-  f = be_field::narrow_from_decl (d); // downcast to field node
-  if (!f)
-    return -1;
-
-  bs = be_structure::narrow_from_scope (f->defined_in ());
-  if (bs == NULL)
-    return -1;
-
-  // pass the field node just incase it is needed
-  cg->node (f);
-
-  if (!type) // not a recursive call
-    type = bt;
-  else // recursively called thru a typedef. "type" will have the most primitive
-       // base class of the typedef
-    ACE_ASSERT (bt->node_type () == AST_Decl::NT_typedef);
-
-  // generate code based on type. For every case, first downcast to the
-  // appropriate type. If the downcast fails, return error, else proceed. In
-  // some cases, the type itself may need code generation, e.g., anonymous
-  // struct types.
-  switch (type->node_type ())
-    {
-    case AST_Decl::NT_interface: // type is an obj reference
-      {
-        os->indent (); // start from current indentation
-        *os << bt->nested_type_name (bs, "_var") << " " << f->local_name () <<
-          ";\n\n";
-      }
-      break;
-    case AST_Decl::NT_pre_defined: // type is predefined type
-      {
-        os->indent (); // start from current indentation
-        *os << bt->nested_type_name (bs) << " " << f->local_name () << ";\n\n";
-      }
-      break;
-    case AST_Decl::NT_string: // type is a string
-      {
-        os->indent (); // start from current indentation
-        if (bt->node_type () == AST_Decl::NT_typedef)
-          {
-            *os << bt->nested_type_name (bs, "_var") << " " << f->local_name () << ";\n\n";
-          }
-        else
-          {
-            *os << "CORBA::String_var " << f->local_name () << ";\n\n";
-          }
-      }
-      break;
-      // these are all anonymous types
-    case AST_Decl::NT_array: // type is an array
-    case AST_Decl::NT_sequence: // type is a sequence
-    case AST_Decl::NT_enum: // type is an enum
-    case AST_Decl::NT_struct: // type is a struct
-    case AST_Decl::NT_union: // type is a union
-      {
-        // We first need to generate code for this aggregate type. Check if we
-        // are not called recursively thru a typedef
-        if (bt->node_type () != AST_Decl::NT_typedef)
-          if (bt->gen_client_header () == -1)
-            return -1;
-
-        os->indent ();
-        *os << bt->nested_type_name (bs) << " " << f->local_name () << ";\n\n";
-      }
-      break;
-    case AST_Decl::NT_except: // type is an exception
-      {
-        // XXXASG TODO: is this allowed ???
-      }
-      break;
-    case AST_Decl::NT_typedef: // type is a typedef
-      {
-        be_type *temp;
-        be_typedef *t = be_typedef::narrow_from_decl (bt);
-
-        if (!t)
-          return -1;
-
-        temp = t->primitive_base_type ();
-        // make a recursive call
-        return this->gen_code (t, f, temp);
-      } // end of switch
-      //break;  unreachable statement!
-    }
-  // the enclosing structure will be variable length the field is variable
-  // length
-  bs->size_type (type->size_type ());
-  return 0;
-}
diff --git a/TAO/TAO_IDL/be/be_state_typedef.cpp b/TAO/TAO_IDL/be/be_state_typedef.cpp
deleted file mode 100644
index f1d6879a5f6..00000000000
--- a/TAO/TAO_IDL/be/be_state_typedef.cpp
+++ /dev/null
@@ -1,321 +0,0 @@
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    be_state_typedef.cpp
-//
-// = DESCRIPTION
-//    state based code generation for typedefs.
-//
-// = AUTHOR
-//    Aniruddha Gokhale
-//
-// ============================================================================
-
-#include	"idl.h"
-#include	"idl_extern.h"
-#include	"be.h"
-
-// return type for typedef
-be_state_typedef::be_state_typedef (void)
-{
-}
-
-// generate code for structure member
-int
-be_state_typedef::gen_code (be_type *bt, be_decl *d, be_type *type)
-{
-  TAO_OutStream *os; // output stream
-  TAO_NL  nl;        // end line
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-  be_typedef *tdef;  // typedef node
-  be_decl *scope; // enclosing scope in which the typedef occurs
-
-  switch (cg->state ())
-    {
-    case TAO_CodeGen::TAO_TYPEDEF_CH:
-      os = cg->client_header (); // set the stream to be the client header
-      break;
-    case TAO_CodeGen::TAO_TYPEDEF_CI:
-      os = cg->client_inline ();
-      break;
-    case TAO_CodeGen::TAO_TYPEDEF_CS:
-      os = cg->client_stubs ();
-      break;
-    default:
-      return -1;
-    } // end of outermost switch
-
-
-  tdef = be_typedef::narrow_from_decl (d); // downcast to typedef node
-  if (!tdef)
-    return -1;
-
-  // pass the typedef node, just in case it is needed
-  cg->node (tdef);
-
-  scope = be_decl::narrow_from_decl (ScopeAsDecl (tdef->defined_in ()));
-
-  if (!type) // not a recursive call
-    type = bt;
-  else // recursively called thru a typedef. "type" will have the most primitive
-    // base class of the typedef
-    ACE_ASSERT (bt->node_type () == AST_Decl::NT_typedef);
-
-  // the typedef node has the same size type as its base type
-  tdef->size_type (bt->size_type ());
-
-  switch (type->node_type ())
-    {
-    case AST_Decl::NT_interface: // type is an obj reference
-    case AST_Decl::NT_interface_fwd: // type is an obj reference
-      {
-        switch (cg->state ())
-          {
-          case TAO_CodeGen::TAO_TYPEDEF_CH:
-            {
-              os->indent (); // start from current indentation
-
-              // typedef of an interface results in 3 typedefs as shown below
-              *os << "typedef " << bt->nested_type_name (scope) << " " <<
-                d->local_name () << ";" << nl;
-              *os << "typedef " << bt->nested_type_name (scope, "_ptr") << " " <<
-                d->local_name () << "_ptr;" << nl;
-              *os << "typedef " << bt->nested_type_name (scope, "_var") << " " <<
-                d->local_name () << "_var;" << nl;
-              *os << "typedef " << bt->nested_type_name (scope, "_out") << " " <<
-                d->local_name () << "_out;\n\n";
-            }
-            break;
-          default:  // nothing to do for other cases
-            break;
-          } // end of switch state
-      }
-      break;
-    case AST_Decl::NT_pre_defined: // type is predefined type
-      {
-        switch (cg->state ())
-          {
-          case TAO_CodeGen::TAO_TYPEDEF_CH:
-            {
-              be_predefined_type *pd = be_predefined_type::narrow_from_decl (type);
-
-              if (!pd)
-                return -1;
-              os->indent (); // start from current indentation
-              *os << "typedef " << bt->nested_type_name (scope) << " " <<
-                d->local_name () << ";";
-              // if the predefined type is an ANY, we also define a typedef to _var
-              if (pd->pt () == AST_PredefinedType::PT_any)
-                {
-                  *os << nl;
-                  *os << "typedef " << bt->name () << "_var " << d->local_name
-                    () << "_var;";
-                }
-              else if (pd->pt () == AST_PredefinedType::PT_pseudo)
-                {
-                  // pseudo object
-                  *os << "typedef " << bt->nested_type_name (scope, "_ptr") <<
-                    " " << d->local_name () << "_ptr;" << nl;
-                  *os << "typedef " << bt->nested_type_name (scope, "_var") <<
-                    " " << d->local_name () << "_var;" << nl;
-                }
-              *os << "typedef " << bt->nested_type_name (scope, "_out") << " "
-                  << d->local_name () << "_out;\n\n";
-            } // end of case
-            break;
-          default: // nothing to do for other cases
-            break;
-          } // end switch
-      }
-      break;
-    case AST_Decl::NT_string: // type is a string
-      {
-        switch (cg->state ())
-          {
-          case TAO_CodeGen::TAO_TYPEDEF_CH:
-            {
-              os->indent (); // start from current indentation
-              if (bt->node_type () == AST_Decl::NT_typedef)
-                {
-                  *os << "typedef " << bt->nested_type_name (scope) << " " <<
-                    d->local_name () << ";" << nl;
-                  *os << "typedef " << bt->nested_type_name (scope, "_var") <<
-                    " " << d->local_name () << "_var;" << nl;
-                  *os << "typedef " << bt->nested_type_name (scope, "_out") <<
-                    " " << d->local_name () << "_out;\n\n";
-                }
-              else
-                {
-                  *os << "typedef CORBA::String " << d->local_name () << ";" <<
-                    nl;
-                  *os << "typedef CORBA::String_var " << d->local_name
-                    () << "_var;" << nl;
-                  *os << "typedef CORBA::String_out " << d->local_name
-                    () << "_out;\n\n";
-                }
-            }
-            break;
-          default: // nothing to do for the rest of the cases
-            break;
-          } // end switch state
-      }
-      break;
-    case AST_Decl::NT_enum: // type is an enum
-      {
-        switch (cg->state ())
-          {
-          case TAO_CodeGen::TAO_TYPEDEF_CH:
-            {
-              os->indent (); // start from current indentation
-              // if we are not here recursively, then we need to generate the
-              // definition first
-              if (bt->node_type () != AST_Decl::NT_typedef)
-                {
-                  if (bt->gen_client_header () == -1)
-                    {
-                      ACE_ERROR_RETURN ((LM_ERROR,
-                         "be_state_typedef - enum gen failed\n"), -1);
-                    }
-                }
-              *os << "typedef " << bt->nested_type_name (scope) << " " <<
-                d->local_name () << ";" << nl;
-              *os << "typedef " << bt->nested_type_name (scope, "_out") << " "
-                  << d->local_name () << "_out;\n\n";
-            }
-            break;
-          default:
-            break;
-          } // end of switch
-      }
-      break;
-      // these are all anonymous types
-    case AST_Decl::NT_array: // type is an array
-      {
-        switch (cg->state ())
-          {
-          case TAO_CodeGen::TAO_TYPEDEF_CH:
-            {
-              // if we are not here recursively, then we need to generate the
-              // definition first
-              if (bt->node_type () != AST_Decl::NT_typedef)
-                {
-                  if (bt->gen_client_header () == -1)
-                    {
-                      ACE_ERROR_RETURN ((LM_ERROR,
-                           "be_state_typedef - array gen failed\n"), -1);
-                    }
-                }
-              os->indent ();
-              *os << "typedef " << bt->name () << " " << d->local_name () <<
-                ";" << nl;
-              *os << "typedef " << bt->name () << "_forany " << d->local_name
-                () << "_forany;" << nl;
-              // typedefs for the auxiliary methods. If we are nested inside
-              // some scope, these methods become static to the enclosing scope
-              if (d->is_nested ())
-                *os << "static ";
-              *os << d->name () << "_slice* " << d->local_name () <<
-                "_alloc (void);" << nl;
-              if (d->is_nested ())
-                *os << "static ";
-              *os << d->name () << "_slice* " << d->local_name () << "_dup ("
-                  << d->name () << "_slice* " << ");" << nl;
-              if (d->is_nested ())
-                *os << "static ";
-              *os << "void " << d->name () << "_free (" << d->name () <<
-                "_slice *);\n\n";
-            }
-            break;
-          default:
-            break;
-          } // end of switch
-      }
-      break;
-    case AST_Decl::NT_sequence: // type is a sequence
-    case AST_Decl::NT_struct:   // type is a struct
-    case AST_Decl::NT_union:    // type is a union
-      {
-        switch (cg->state ())
-          {
-          case TAO_CodeGen::TAO_TYPEDEF_CH:
-            {
-              // if we are not here recursively, then we need to generate the
-              // definition first
-              if (bt->node_type () != AST_Decl::NT_typedef)
-                {
-                  if (bt->gen_client_header () == -1)
-                    {
-                      ACE_ERROR_RETURN ((LM_ERROR,
-                          "be_state_typedef - struct/union/seq gen failed\n"),
-                                        -1);
-                    }
-                }
-              os->indent (); // start from current indentation
-              *os << "typedef " << bt->nested_type_name (scope) << " " <<
-                d->local_name () << ";" << nl;
-              *os << "typedef " << bt->nested_type_name (scope, "_var") << " "
-                  << d->local_name () << "_var;" << nl;
-              *os << "typedef " << bt->nested_type_name (scope, "_out") << " "
-                  << d->local_name () << "_out;\n\n";
-            }
-            break;
-          case TAO_CodeGen::TAO_TYPEDEF_CI:
-            {
-              // if we are not here recursively, then we need to generate the
-              // definition first
-              if (bt->node_type () != AST_Decl::NT_typedef)
-                {
-                  if (bt->gen_client_inline () == -1)
-                    {
-                      ACE_ERROR_RETURN ((LM_ERROR,
-                          "be_state_typedef - struct/union/seq gen failed\n"),
-                                        -1);
-                    }
-                }
-            }
-            break;
-          case TAO_CodeGen::TAO_TYPEDEF_CS:
-            {
-              // if we are not here recursively, then we need to generate the
-              // definition first
-              if (bt->node_type () != AST_Decl::NT_typedef)
-                {
-                  if (bt->gen_client_stubs () == -1)
-                    {
-                      ACE_ERROR_RETURN ((LM_ERROR,
-                          "be_state_typedef - struct/union/seq gen failed\n"),
-                                        -1);
-                    }
-                }
-            }
-            break;
-          default:
-            break;
-          } // end of switch state
-      }
-      break;
-    case AST_Decl::NT_except: // type is an exception
-      {
-        // XXXASG TODO: is this allowed ???
-      }
-      break;
-    case AST_Decl::NT_typedef: // type is a typedef
-      {
-        be_type *temp;
-        be_typedef *t = be_typedef::narrow_from_decl (bt);
-
-        if (!t)
-          return -1;
-
-        temp = t->primitive_base_type ();
-        // make a recursive call
-        return this->gen_code (t, tdef, temp);
-      } // end of case
-      //break;  unreachable statement!
-    } // end of switch
-
-  return 0;
-}
diff --git a/TAO/TAO_IDL/be/be_state_union.cpp b/TAO/TAO_IDL/be/be_state_union.cpp
deleted file mode 100644
index 0cdb3150b95..00000000000
--- a/TAO/TAO_IDL/be/be_state_union.cpp
+++ /dev/null
@@ -1,855 +0,0 @@
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    be_state_union.cpp
-//
-// = DESCRIPTION
-//    state based code generation for unions.
-//
-// = AUTHOR
-//    Aniruddha Gokhale
-//
-// ============================================================================
-
-#include	"idl.h"
-#include	"idl_extern.h"
-#include	"be.h"
-
-be_state_union_disctypedefn_ch::be_state_union_disctypedefn_ch (void)
-{
-}
-
-// generate code for union discriminant type in client header
-int
-be_state_union_disctypedefn_ch::gen_code (be_type *bt, be_decl *d, be_type *type)
-{
-  TAO_OutStream *os; // output stream
-  TAO_NL  nl;        // end line
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-  be_union *bu;
-
-  bu = be_union::narrow_from_decl (d); // downcast to union type
-  if (!bu)
-    return -1;
-
-  if (!type) // not a recursive call
-    type = bt;
-  else // recursively called thru a typedef. "type" will have the most primitive
-       // base class of the typedef
-    ACE_ASSERT (bt->node_type () == AST_Decl::NT_typedef);
-
-  os = cg->client_header (); // get client header stream
-
-  // generate code based on type. For every case, first downcast to the
-  // appropriate type. If the downcast fails, return error, else proceed. In
-  // some cases, the type itself may need code generation, e.g., anonymous
-  // struct types.
-  switch (type->node_type ())
-    {
-    case AST_Decl::NT_interface: // type is an obj reference
-    case AST_Decl::NT_string: // type is a string
-    case AST_Decl::NT_array: // type is an array
-    case AST_Decl::NT_sequence: // type is a sequence
-    case AST_Decl::NT_struct: // type is a struct
-    case AST_Decl::NT_union: // type is a union
-    case AST_Decl::NT_except: // type is an exception
-      // all these cases are syntax errors which the front-end should have
-      // flagged as error cases
-      return -1;
-    case AST_Decl::NT_pre_defined: // type is predefined type
-    case AST_Decl::NT_enum: // type is an enum
-      {
-        // if the discriminant is an enum, first generate the enum
-        // definition. However, check that we are not inside a recursive call
-        if (bt->node_type () == AST_Decl::NT_enum)
-          if (bt->gen_client_header () == -1)
-            return -1;
-
-        os->indent ();
-        // the set method
-        *os << "void _d (" << bt->nested_type_name (bu) << ");" << nl;
-        // the get method
-        *os << bt->nested_type_name (bu) << " _d (void) const;\n\n";
-      }
-      break;
-    case AST_Decl::NT_typedef: // type is a typedef
-      {
-        // a scoped name must result in one of the allowed types. Hopefully the
-        // front-end has done a good job of ensuring this.
-        be_type *temp; // most primitive base type
-        be_typedef *t = be_typedef::narrow_from_decl (bt);
-        if (!t)
-          return -1;
-        temp = t->primitive_base_type ();
-        return this->gen_code (t, d, temp);
-      }
-      //break;  unreachable statement!
-    } // end of switch
-  return 0;
-}
-
-be_state_union_disctypedefn_ci::be_state_union_disctypedefn_ci (void)
-{
-}
-
-// generate code for union discriminant type in client inline
-int
-be_state_union_disctypedefn_ci::gen_code (be_type *bt, be_decl *d, be_type *type)
-{
-  TAO_OutStream *os; // output stream
-  TAO_NL  nl;        // end line
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-  be_union *bu;
-
-  bu = be_union::narrow_from_decl (d); // downcast to union type
-  if (!bu)
-    return -1;
-
-  if (!type) // not a recursive call
-    type = bt;
-  else // recursively called thru a typedef. "type" will have the most primitive
-       // base class of the typedef
-    ACE_ASSERT (bt->node_type () == AST_Decl::NT_typedef);
-
-  os = cg->client_inline (); // get client inline stream
-
-  // generate code based on type. For every case, first downcast to the
-  // appropriate type. If the downcast fails, return error, else proceed. In
-  // some cases, the type itself may need code generation, e.g., anonymous
-  // struct types.
-  switch (type->node_type ())
-    {
-    case AST_Decl::NT_interface: // type is an obj reference
-    case AST_Decl::NT_string: // type is a string
-    case AST_Decl::NT_array: // type is an array
-    case AST_Decl::NT_sequence: // type is a sequence
-    case AST_Decl::NT_struct: // type is a struct
-    case AST_Decl::NT_union: // type is a union
-    case AST_Decl::NT_except: // type is an exception
-      // all these cases are syntax errors which the front-end should have
-      // flagged as error
-      return -1;
-    case AST_Decl::NT_pre_defined: // type is predefined type
-    case AST_Decl::NT_enum: // type is an enum
-    case AST_Decl::NT_typedef: // type is a typedef
-      {
-        os->indent ();
-        // the set method
-        *os << "// accessor to set the discriminant" << nl;
-        *os << "ACE_INLINE void" << nl;
-        *os << bu->name () << "::_d (" << bt->name () <<
-          " discval)" << nl;
-        *os << "{\n";
-        os->incr_indent ();
-        *os << "this->disc_ = discval;\n";
-        os->decr_indent ();
-        *os << "}" << nl;
-        // the get method
-        *os << "// accessor to get the discriminant" << nl;
-        *os << "ACE_INLINE " << bt->name () << nl;
-        *os << bu->name () << "::_d (void) const" << nl;
-        *os << "{\n";
-        os->incr_indent ();
-        *os << "return this->disc_;\n";
-        os->decr_indent ();
-        *os << "}\n\n";
-      }
-      break;
-    } // end of switch
-  return 0;
-}
-
-be_state_union_public_ch::be_state_union_public_ch (void)
-{
-}
-
-// generate code for union branch members in client header.  This involves
-// generating the set/get methods corresponding to the members
-int
-be_state_union_public_ch::gen_code (be_type *bt, be_decl *d, be_type *type)
-{
-  TAO_OutStream *os; // output stream
-  TAO_NL  nl;        // end line
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-  be_union_branch *ub; // union branch member
-  be_union *bu;      // enclosing union
-
-  os = cg->client_header (); // get client header stream
-  ub = be_union_branch::narrow_from_decl (d); // downcast to union branch node
-  if (!ub)
-    return -1;
-
-  bu = be_union::narrow_from_scope (ub->defined_in ());
-  if (bu == NULL)
-    return -1;
-
-  // pass the union branch node just incase it is needed
-  cg->node (ub);
-
-  if (!type) // not a recursive call
-    type = bt;
-  else // recursively called thru a typedef. "type" will have the most primitive
-       // base class of the typedef
-    ACE_ASSERT (bt->node_type () == AST_Decl::NT_typedef);
-
-  // generate code based on type. For every case, first downcast to the
-  // appropriate type. If the downcast fails, return error, else proceed. In
-  // some cases, the type itself may need code generation, e.g., anonymous
-  // struct types.
-  switch (type->node_type ())
-    {
-    case AST_Decl::NT_interface: // type is an obj reference
-      {
-        os->indent (); // start from current indentation
-        *os << "void " << ub->local_name () << " (" << bt->nested_type_name
-          (bu, "_ptr") << ");// set" << nl;
-        *os << bt->nested_type_name (bu, "_ptr") << " " << ub->local_name () <<
-          " (void) const; // get method\n\n";
-      }
-      break;
-    case AST_Decl::NT_pre_defined: // type is predefined type
-    case AST_Decl::NT_enum: // type is an enum
-      {
-        // if the type is an enum, we generate its defn first
-        if (bt->node_type () == AST_Decl::NT_enum)
-          if (bt->gen_client_header () == -1)
-            return -1;
-
-        os->indent (); // start from current indentation
-        *os << "void " << ub->local_name () << " (" << bt->nested_type_name (bu)
-          << ");// set" << nl;
-        *os << bt->nested_type_name (bu) << " " << ub->local_name () <<
-          " (void) const; // get method\n\n";
-      }
-      break;
-    case AST_Decl::NT_string: // type is a string
-      {
-        os->indent (); // start from current indentation
-        if (bt->node_type () == AST_Decl::NT_typedef)
-          {
-            // three methods to set the string value
-            *os << "void " << ub->local_name () << " (" << bt->nested_type_name
-              (bu) << "); // set" << nl;
-            *os << "void " << ub->local_name () << " (const " <<
-              bt->nested_type_name (bu) << "); // set"
-                << nl;
-            *os << "void " << ub->local_name () <<
-              " (const " << bt->nested_type_name (bu, "_var") << " &); // set"  <<
-              nl;
-            *os << "const " << bt->nested_type_name (bu) << " " <<
-              ub->local_name () << " (void) const; // get method\n\n";
-          }
-        else
-          {
-            // three methods to set the string value
-            *os << "void " << ub->local_name () << " (char *); // set" << nl;
-            *os << "void " << ub->local_name () << " (const char *); // set"
-                << nl;
-            *os << "void " << ub->local_name () <<
-              " (const CORBA::String_var&); // set"  << nl;
-            *os << "const char *" << ub->local_name () <<
-              " (void) const; // get method\n\n";
-          }
-      }
-      break;
-    case AST_Decl::NT_array: // type is an array
-      {
-        // generate code for the array. So let the array handle code
-        // generation. Check if this is not a recursive call
-        if (bt->node_type () != AST_Decl::NT_typedef)
-          if (bt->gen_client_header () == -1)
-            return -1;
-
-        os->indent ();
-        *os << "void " << ub->local_name () << " (" << bt->nested_type_name
-          (bu) << ");// set" << nl;
-        *os << bt->nested_type_name (bu, "_slice") << " *" << ub->local_name () <<
-          " (void) const; // get method\n\n";
-
-      }
-      break;
-    case AST_Decl::NT_sequence: // type is a sequence
-    case AST_Decl::NT_struct: // type is a struct
-    case AST_Decl::NT_union: // type is a union
-      {
-        // generate defn for this aggregate unless we are recursively called
-        if (bt->node_type () != AST_Decl::NT_typedef)
-          if (bt->gen_client_header () == -1)
-            return -1;
-        os->indent ();
-        *os << "void " << ub->local_name () << " (const " <<
-          bt->nested_type_name (bu) << " &);// set" << nl;
-        *os << "const " << bt->nested_type_name (bu) << " &" << ub->local_name
-          () << " (void) const; // get method (read only)" << nl;
-        *os << bt->nested_type_name (bu) << " &" << ub->local_name () <<
-          " (void); // get method (read/write only)\n\n";
-
-      }
-      break;
-    case AST_Decl::NT_except: // type is an exception
-      {
-        // XXXASG: Is this case valid ???
-      }
-      break;
-    case AST_Decl::NT_typedef: // type is a typedef
-      {
-        be_type *temp; // most primitive base type
-        be_typedef *t = be_typedef::narrow_from_decl (bt);
-
-        if (!t)
-          return -1;
-
-        temp = t->primitive_base_type ();
-        // make a recursive call
-        return this->gen_code (t, ub, temp);
-      }
-      //break;  unreachable statement!
-    } // end of switch
-
-  // enclosing union is variable if the member is variable
-  bu->size_type (type->size_type ());
-
-  return 0;
-}
-
-be_state_union_public_ci::be_state_union_public_ci (void)
-{
-}
-
-// generate code for union branch members in client inline.  This involves
-// generating the set/get methods corresponding to the members
-int
-be_state_union_public_ci::gen_code (be_type *bt, be_decl *d, be_type *type)
-{
-  TAO_OutStream *os;   // output stream
-  TAO_NL  nl;          // end line
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-  be_union_branch *ub; // union branch member
-  be_union *bu;        // enclosing union
-
-  os = cg->client_inline (); // get client inline stream
-  ub = be_union_branch::narrow_from_decl (d); // downcast to union branch node
-  if (!ub)
-    return -1;
-
-  bu = be_union::narrow_from_scope (ub->defined_in ());
-  if (bu == NULL)
-    return -1;
-
-  if (!type) // not a recursive call
-    type = bt;
-  else // recursively called thru a typedef. "type" will have the most primitive
-       // base class of the typedef
-    ACE_ASSERT (bt->node_type () == AST_Decl::NT_typedef);
-
-  switch (type->node_type ())
-    {
-    case AST_Decl::NT_pre_defined: // type is predefined type
-    case AST_Decl::NT_enum: // type is an enum
-    case AST_Decl::NT_array: // type is an array
-    case AST_Decl::NT_interface: // type is an obj reference
-      {
-        // set method
-        os->indent (); // start from current indentation
-        *os << "// accessor to set the member" << nl;
-        *os << "ACE_INLINE void" << nl;
-        *os << bu->name () << "::" << ub->local_name () << " (" << bt->name ();
-        if (type->node_type () == AST_Decl::NT_interface)
-          {
-            // if it is an interface node, we use _ptr as a suffix for the type
-            *os << "_ptr";
-          }
-        *os << " val)// set" << nl;
-        *os << "{\n";
-        os->incr_indent ();
-        // set the discriminant to the appropriate label
-        if (ub->label ()->label_kind () == AST_UnionLabel::UL_label)
-          {
-            // valid label
-            *os << "// set the discriminant val" << nl;
-            // check if the case label is a symbol or a literal
-            if (ub->label ()->label_val ()->ec () == AST_Expression::EC_symbol)
-              {
-                *os << "this->disc_ = " << ub->label ()->label_val ()->n ()
-                    << ";" << nl;
-              }
-            else
-              {
-                *os << "this->disc_ = " << ub->label ()->label_val () << ";" <<
-                  nl;
-              }
-            *os << "// set the value" << nl;
-            if (type->node_type () == AST_Decl::NT_interface)
-              {
-                // the private data member is a pointer type
-                *os << "*this->" << ub->local_name () << "_ = val;\n";
-              }
-            else
-              {
-                *os << "this->" << ub->local_name () << "_ = val;\n";
-              }
-          }
-        else
-          {
-            // default label
-            // XXXASG - TODO
-          }
-        os->decr_indent ();
-        *os << "}" << nl;
-
-        // get method
-        *os << "// retrieve the member" << nl;
-        *os << "ACE_INLINE " << bt->name ();
-        if (type->node_type () == AST_Decl::NT_interface)
-          {
-            // for interface type, return a _ptr type
-            *os << "_ptr";
-          }
-        else if (type->node_type () == AST_Decl::NT_array)
-          {
-            // for an array, return a _slice* type
-            *os << "_slice *";
-          }
-        *os << nl;
-        *os << bu->name () << "::" << ub->local_name () <<
-          " (void) const" << nl;
-        *os << "{\n";
-        os->incr_indent ();
-        if (type->node_type () == AST_Decl::NT_interface)
-          {
-            *os << "return *this->" << ub->local_name () << "_;\n";
-          }
-        else
-          {
-            *os << "return this->" << ub->local_name () << "_;\n";
-          }
-        os->decr_indent ();
-        *os << "}\n\n";
-      }
-      break;
-    case AST_Decl::NT_string: // type is a string
-      {
-        // three methods to set the string value
-
-        // (1) set method from char*
-        os->indent (); // start from current indentation
-        *os << "// accessor to set the member" << nl;
-        *os << "ACE_INLINE void" << nl;
-        if (bt->node_type () == AST_Decl::NT_typedef)
-          {
-            *os << bu->name () << "::" << ub->local_name () << " (" << bt->name
-              () << " val)" << nl;
-          }
-        else
-          {
-            *os << bu->name () << "::" << ub->local_name () << " (char *val)"
-                << nl;
-          }
-        *os << "{\n";
-        os->incr_indent ();
-        // set the discriminant to the appropriate label
-        if (ub->label ()->label_kind () == AST_UnionLabel::UL_label)
-          {
-            // valid label
-            *os << "// set the discriminant val" << nl;
-            // check if the case label is a symbol or a literal
-            if (ub->label ()->label_val ()->ec () == AST_Expression::EC_symbol)
-              {
-                *os << "this->disc_ = " << ub->label ()->label_val ()->n ()
-                    << ";" << nl;
-              }
-            else
-              {
-                *os << "this->disc_ = " << ub->label ()->label_val () << ";" <<
-                  nl;
-              }
-            *os << "// set the value" << nl;
-            *os << "if (!this->" << ub->local_name () << "_) // does not exist"
-                << nl ;
-            *os << "\tthis->" << ub->local_name () <<
-              "_ = new CORBA::String_var (val);" << nl;
-            *os << "else" << nl;
-            *os << "\t*this->" << ub->local_name () << "_ = val;\n";
-          }
-        else
-          {
-            // default label
-            // XXXASG - TODO
-          }
-        os->decr_indent ();
-        *os << "}" << nl;
-
-        // (2) set method from const char *
-        *os << "// accessor to set the member" << nl;
-        *os << "ACE_INLINE void" << nl;
-        if (bt->node_type () == AST_Decl::NT_typedef)
-          {
-            *os << bu->name () << "::" << ub->local_name () << " (const " <<
-              bt->name () << " val)" << nl;
-          }
-        else
-          {
-            *os << bu->name () << "::" << ub->local_name () <<
-              " (const char *val)" << nl;
-          }
-        *os << "{\n";
-        os->incr_indent ();
-        // set the discriminant to the appropriate label
-        if (ub->label ()->label_kind () == AST_UnionLabel::UL_label)
-          {
-            // valid label
-            *os << "// set the discriminant val" << nl;
-            // check if the case label is a symbol or a literal
-            if (ub->label ()->label_val ()->ec () == AST_Expression::EC_symbol)
-              {
-                *os << "this->disc_ = " << ub->label ()->label_val ()->n ()
-                    << ";" << nl;
-              }
-            else
-              {
-                *os << "this->disc_ = " << ub->label ()->label_val () << ";" <<
-                  nl;
-              }
-            *os << "// set the value" << nl;
-            *os << "if (!this->" << ub->local_name () << "_) // does not exist"
-                << nl ;
-            *os << "\tthis->" << ub->local_name () <<
-              "_ = new CORBA::String_var (val);" << nl;
-            *os << "else" << nl;
-            *os << "\t*this->" << ub->local_name () << "_ = val;\n";
-          }
-        else
-          {
-            // default label
-            // XXXASG - TODO
-          }
-        os->decr_indent ();
-        *os << "}" << nl;
-
-        // (3) set from const String_var&
-        *os << "// accessor to set the member" << nl;
-        *os << "ACE_INLINE void" << nl;
-        if (bt->node_type () == AST_Decl::NT_typedef)
-          {
-            *os << bu->name () << "::" << ub->local_name () << " (const " <<
-              bt->name () << "_var &val)" << nl;
-          }
-        else
-          {
-            *os << bu->name () << "::" << ub->local_name () <<
-              " (const CORBA::String_var &val)" << nl;
-          }
-        *os << "{\n";
-        os->incr_indent ();
-        // set the discriminant to the appropriate label
-        if (ub->label ()->label_kind () == AST_UnionLabel::UL_label)
-          {
-            // valid label
-            *os << "// set the discriminant val" << nl;
-            // check if the case label is a symbol or a literal
-            if (ub->label ()->label_val ()->ec () == AST_Expression::EC_symbol)
-              {
-                *os << "this->disc_ = " << ub->label ()->label_val ()->n ()
-                    << ";" << nl;
-              }
-            else
-              {
-                *os << "this->disc_ = " << ub->label ()->label_val () << ";" <<
-                  nl;
-              }
-            *os << "// set the value" << nl;
-            *os << "if (!this->" << ub->local_name () << "_) // does not exist"
-                << nl ;
-            *os << "\tthis->" << ub->local_name () <<
-              "_ = new CORBA::String_var (val);" << nl;
-            *os << "else" << nl;
-            *os << "\t*this->" << ub->local_name () << "_ = val;\n";
-          }
-        else
-          {
-            // default label
-            // XXXASG - TODO
-          }
-        os->decr_indent ();
-        *os << "}" << nl;
-
-        // return const char*
-        if (bt->node_type () == AST_Decl::NT_typedef)
-          {
-            *os << "ACE_INLINE " << bt->name () << nl;
-          }
-        else
-          {
-            *os << "ACE_INLINE const char *" << nl;
-          }
-        *os << bu->name () << "::" << ub->local_name () <<
-          " (void) const // get method" << nl;
-        *os << "{\n";
-        os->incr_indent ();
-        *os << "return *this->" << ub->local_name () << "_;\n";
-        os->decr_indent ();
-        *os << "}\n\n";
-      }
-      break;
-    case AST_Decl::NT_sequence: // type is a sequence
-    case AST_Decl::NT_union: // type is a union
-      {
-        os->indent ();
-        // This case has to be handled differently from structs because the data
-        // member is a pointer
-
-        // (1) set from a const
-        *os << "// accessor to set the member" << nl;
-        *os << "ACE_INLINE void" << nl;
-        *os << bu->name () << "::" << ub->local_name () <<
-          " (const " << bt->name () << " &val)" << nl;
-        *os << "{\n";
-        os->incr_indent ();
-        // set the discriminant to the appropriate label
-        if (ub->label ()->label_kind () == AST_UnionLabel::UL_label)
-          {
-            // valid label
-            *os << "// set the discriminant val" << nl;
-            // check if the case label is a symbol or a literal
-            if (ub->label ()->label_val ()->ec () == AST_Expression::EC_symbol)
-              {
-                *os << "this->disc_ = " << ub->label ()->label_val ()->n ()
-                    << ";" << nl;
-              }
-            else
-              {
-                *os << "this->disc_ = " << ub->label ()->label_val () << ";" <<
-                  nl;
-              }
-            *os << "// set the value" << nl;
-            *os << "*this->" << ub->local_name () << "_ = val;\n";
-          }
-        else
-          {
-            // default label
-            // XXXASG - TODO
-          }
-        os->decr_indent ();
-        *os << "}" << nl;
-
-        // readonly get method
-        *os << "// readonly get method " << nl;
-        *os << "ACE_INLINE const " << bt->name () << " &" << nl;
-        *os << bu->name () << "::" << ub->local_name () << " (void) const" << nl;
-        *os << "{\n";
-        os->incr_indent ();
-        *os << "return *this->" << ub->local_name () << "_;\n";
-        os->decr_indent ();
-        *os << "}" << nl;
-
-        // read/write get method
-        *os << "// read/write get method " << nl;
-        *os << "ACE_INLINE " << bt->name () << " &" << nl;
-        *os << bu->name () << "::" << ub->local_name () << " (void)" << nl;
-        *os << "{\n";
-        os->incr_indent ();
-        *os << "return *this->" << ub->local_name () << "_;\n";
-        os->decr_indent ();
-        *os << "}" << nl;
-
-      }
-      break;
-    case AST_Decl::NT_struct: // type is a struct
-      {
-        os->indent ();
-
-        // (1) set from a const
-        *os << "// accessor to set the member" << nl;
-        *os << "ACE_INLINE void" << nl;
-        *os << bu->name () << "::" << ub->local_name () <<
-          " (const " << bt->name () << " &val)" << nl;
-        *os << "{\n";
-        os->incr_indent ();
-        // set the discriminant to the appropriate label
-        if (ub->label ()->label_kind () == AST_UnionLabel::UL_label)
-          {
-            // valid label
-            *os << "// set the discriminant val" << nl;
-            // check if the case label is a symbol or a literal
-            if (ub->label ()->label_val ()->ec () == AST_Expression::EC_symbol)
-              {
-                *os << "this->disc_ = " << ub->label ()->label_val ()->n ()
-                    << ";" << nl;
-              }
-            else
-              {
-                *os << "this->disc_ = " << ub->label ()->label_val () << ";" <<
-                  nl;
-              }
-            *os << "// set the value" << nl;
-            *os << "this->" << ub->local_name () << "_ = val;\n";
-          }
-        else
-          {
-            // default label
-            // XXXASG - TODO
-          }
-        os->decr_indent ();
-        *os << "}" << nl;
-
-        // readonly get method
-        *os << "// readonly get method " << nl;
-        *os << "ACE_INLINE const " << bt->name () << " &" << nl;
-        *os << bu->name () << "::" << ub->local_name () << " (void) const" << nl;
-        *os << "{\n";
-        os->incr_indent ();
-        *os << "return this->" << ub->local_name () << "_;\n";
-        os->decr_indent ();
-        *os << "}" << nl;
-
-        // read/write get method
-        *os << "// read/write get method " << nl;
-        *os << "ACE_INLINE " << bt->name () << " &" << nl;
-        *os << bu->name () << "::" << ub->local_name () << " (void)" << nl;
-        *os << "{\n";
-        os->incr_indent ();
-        *os << "return this->" << ub->local_name () << "_;\n";
-        os->decr_indent ();
-        *os << "}" << nl;
-
-      }
-      break;
-    case AST_Decl::NT_except: // type is an exception
-      {
-        // XXXASG: Is this case valid ???
-      }
-      break;
-    case AST_Decl::NT_typedef: // type is a typedef
-      {
-        be_type *temp; // most primitive base type
-        be_typedef *t = be_typedef::narrow_from_decl (bt);
-
-        if (!t)
-          return -1;
-
-        temp = t->primitive_base_type ();
-        // make a recursive call
-        return this->gen_code (t, ub, temp);
-      }
-      //break;  unreachable statement!
-    } // end of switch
-
-  return 0;
-}
-
-be_state_union_private_ch::be_state_union_private_ch (void)
-{
-}
-
-int
-be_state_union_private_ch::gen_code (be_type *bt, be_decl *d, be_type *type)
-{
-  TAO_OutStream *os; // output stream
-  TAO_NL  nl;        // end line
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-  be_union_branch *ub; // union branch member
-  be_union *bu;      // enclosing union
-
-  // Macro to avoid "warning: unused parameter" type warning.
-  ACE_UNUSED_ARG (nl);
-
-  os = cg->client_header (); // get client header stream
-  ub = be_union_branch::narrow_from_decl (d); // downcast to union branch node
-  if (!ub)
-    return -1;
-
-  bu = be_union::narrow_from_scope (ub->defined_in ());
-  if (bu == NULL)
-    return -1;
-
-  if (!type) // not a recursive call
-    type = bt;
-  else // recursively called thru a typedef. "type" will have the most primitive
-       // base class of the typedef
-    ACE_ASSERT (bt->node_type () == AST_Decl::NT_typedef);
-
-  // generate code based on type. For every case, first downcast to the
-  // appropriate type. If the downcast fails, return error, else proceed. In
-  // some cases, the type itself may need code generation, e.g., anonymous
-  // struct types.
-  switch (type->node_type ())
-    {
-    case AST_Decl::NT_interface: // type is an obj reference
-      {
-        os->indent (); // start from current indentation
-        // C++ does not allow an object declaration inside a union. Hence we
-        // must have a pointer. This changes some of the methods
-        *os << bt->nested_type_name (bu, "_var") << " *" << ub->local_name () <<
-          "_;\n";
-      }
-      break;
-    case AST_Decl::NT_pre_defined: // type is predefined type
-    case AST_Decl::NT_enum: // type is an enum
-      {
-        os->indent (); // start from current indentation
-        *os << bt->nested_type_name (bu) << " " << ub->local_name () <<
-          "_;\n";
-      }
-      break;
-    case AST_Decl::NT_string: // type is a string
-      {
-        os->indent (); // start from current indentation
-        // C++ does not allow an object declaration inside a union. Hence we
-        // must have a pointer. This changes some of the methods
-        if (bt->node_type () == AST_Decl::NT_typedef)
-          {
-            *os << bt->nested_type_name (bu, "_var") << " *" << ub->local_name () <<
-              "_;\n";
-          }
-        else
-          {
-            *os << "CORBA::String_var *" << ub->local_name () << "_;\n";
-          }
-      }
-      break;
-    case AST_Decl::NT_array: // type is an array
-      {
-        os->indent ();
-        *os << bt->nested_type_name (bu, "_slice") << " *" << ub->local_name () <<
-          "_;\n";
-      }
-      break;
-    case AST_Decl::NT_sequence: // type is a sequence
-    case AST_Decl::NT_union: // type is a union
-      {
-        os->indent ();
-        // C++ doesn't allow object instances inside unions, so we need a
-        // pointer
-        *os << bt->nested_type_name (bu) << " *" << ub->local_name () << "_;\n";
-      }
-      break;
-    case AST_Decl::NT_struct: // type is a struct
-      {
-        os->indent ();
-        *os << bt->nested_type_name (bu) << " " << ub->local_name () << "_;\n";
-      }
-      break;
-    case AST_Decl::NT_except: // type is an exception
-      {
-        // XXXASG: Is this case valid ???
-      }
-      break;
-    case AST_Decl::NT_typedef: // type is a typedef
-      {
-        be_type *temp; // most primitive base type
-        be_typedef *t = be_typedef::narrow_from_decl (bt);
-
-        if (!t)
-          return -1;
-
-        temp = t->primitive_base_type ();
-        // make a recursive call
-        return this->gen_code (t, ub, temp);
-      }
-      //break;  unreachable statement!!
-    } // end of switch
-  return 0;
-}
diff --git a/TAO/TAO_IDL/be/be_string.cpp b/TAO/TAO_IDL/be/be_string.cpp
deleted file mode 100644
index 811c83166e8..00000000000
--- a/TAO/TAO_IDL/be/be_string.cpp
+++ /dev/null
@@ -1,162 +0,0 @@
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    be_string.cpp
-//
-// = DESCRIPTION
-//    Extension of class AST_Array that provides additional means for C++
-//    mapping.
-//
-// = AUTHOR
-//    Copyright 1994-1995 by Sun Microsystems, Inc.
-//    and
-//    Aniruddha Gokhale
-//
-// ============================================================================
-
-#include	"idl.h"
-#include	"idl_extern.h"
-#include	"be.h"
-
-/*
- * BE_String
- */
-be_string::be_string (void)
-{
-}
-
-be_string::be_string (AST_Expression *v)
-  : AST_String (v),
-    AST_Decl (AST_Decl::NT_string,
-             new UTL_ScopedName(new Identifier("string", 1, 0, I_FALSE),
-                                NULL),
-             NULL)
-{
-  this->size_type (be_decl::VARIABLE); // we are always variable length
-}
-
-// overriden method
-void
-be_string::compute_tc_name (void)
-{
-  // start with the head as the CORBA namespace
-  this->tc_name_ = new UTL_ScopedName (new Identifier ("CORBA", 1, 0, I_FALSE),
-                                       NULL);
-
-  this->tc_name_->nconc (new UTL_ScopedName (new Identifier ("_tc_string", 1, 0,
-                                                             I_FALSE), NULL));
-}
-
-be_string::be_string (AST_Expression *v, long wide)
-  : AST_String (v, wide),
-    AST_Decl (AST_Decl::NT_string,
-              wide == 1
-              ? new UTL_ScopedName(new Identifier("string",1,0,I_FALSE),
-                                   NULL)
-              : new UTL_ScopedName(new Identifier("wstring_t",
-                                                  1,
-                                                  0,
-                                                  I_FALSE),
-                                   NULL),
-              NULL)
-{
-  this->size_type (be_decl::VARIABLE); // always the case
-}
-
-// Code generation
-
-int
-be_string::gen_client_header (void)
-{
-  TAO_OutStream *ch; // output stream
-  TAO_NL  nl;        // end line
-
-  // retrieve a singleton instance of the code generator
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-
-  ch = cg->client_header ();
-  ch->indent ();
-  *ch << "char *";
-
-  return 0;
-}
-
-int
-be_string::gen_client_stubs (void)
-{
-  return 0;
-}
-
-int
-be_string::gen_server_header (void)
-{
-  return 0;
-}
-
-int
-be_string::gen_server_skeletons (void)
-{
-  return 0;
-}
-
-// Generates the client-side inline information
-int
-be_string::gen_client_inline (void)
-{
-  // nothing to be done
-  return 0;
-}
-
-// Generates the server-side inline
-int
-be_string::gen_server_inline (void)
-{
-  // nothing to be done
-  return 0;
-}
-
-int
-be_string::gen_typecode (void)
-{
-  TAO_OutStream *cs; // output stream
-  TAO_NL  nl;        // end line
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-
-  cs = cg->client_stubs ();
-  cs->indent (); // start from the current indentation level
-  // emit the enumeration
-  *cs << "CORBA::tk_string, " << nl;
-  *cs << this->max_size () << ", // string length" << nl;
-  return 0;
-}
-
-// compute typecode size
-long
-be_string::tc_size (void)
-{
-  // 4 bytes for enumeration, 4 bytes for storing string length
-  return 4 + 4;
-}
-
-int
-be_string::gen_encapsulation (void)
-{
-  return 0;
-}
-
-long
-be_string::tc_encap_len (void)
-{
-  if (this->encap_len_ == -1)
-    {
-      this->encap_len_ = 0; // no encapsulation
-    }
-  return this->encap_len_;
-}
-
-// Narrowing
-IMPL_NARROW_METHODS2 (be_string, AST_String, be_type)
-IMPL_NARROW_FROM_DECL (be_string)
diff --git a/TAO/TAO_IDL/be/be_structure.cpp b/TAO/TAO_IDL/be/be_structure.cpp
deleted file mode 100644
index 4dfe3446dff..00000000000
--- a/TAO/TAO_IDL/be/be_structure.cpp
+++ /dev/null
@@ -1,844 +0,0 @@
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    be_structure.cpp
-//
-// = DESCRIPTION
-//    Extension of class AST_Structure that provides additional means for C++
-//    mapping.
-//
-// = AUTHOR
-//    Copyright 1994-1995 by Sun Microsystems, Inc.
-//    and
-//    Aniruddha Gokhale
-//
-// ============================================================================
-
-#include	"idl.h"
-#include	"idl_extern.h"
-#include	"be.h"
-
-/*
- * BE_Structure
- */
-be_structure::be_structure (void)
-{
-}
-
-be_structure::be_structure (UTL_ScopedName *n, UTL_StrList *p)
-  : AST_Decl (AST_Decl::NT_struct, n, p),
-    UTL_Scope (AST_Decl::NT_struct),
-    member_count_ (-1)
-{
-}
-
-// compute total number of members
-int
-be_structure::compute_member_count (void)
-{
-  UTL_ScopeActiveIterator *si;  // iterator
-  AST_Decl *d;  // temp node
-
-  this->member_count_ = 0;
-
-  // if there are elements in this scope
-  if (this->nmembers () > 0)
-    {
-      // instantiate a scope iterator.
-      si = new UTL_ScopeActiveIterator (this, UTL_Scope::IK_decls);
-
-      while (!(si->is_done ()))
-        {
-          // get the next AST decl node
-          d = si->item ();
-          this->member_count_++;
-          si->next ();
-        } // end of while
-      delete si; // free the iterator object
-    }
-  return 0;
-}
-
-// return the member count
-int
-be_structure::member_count (void)
-{
-  if (this->member_count_ == -1)
-    this->compute_member_count ();
-
-  return this->member_count_;
-}
-
-// ----------------------------------------
-//            CODE GENERATION METHODS
-// ----------------------------------------
-
-// Generates the client-side header information for the structure
-int
-be_structure::gen_client_header (void)
-{
-  TAO_OutStream *ch; // output stream
-  TAO_NL  nl;        // end line
-
-
-  if (!this->cli_hdr_gen_) // not already generated
-    {
-      // retrieve a singleton instance of the code generator
-      TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-      cg->push (TAO_CodeGen::TAO_STRUCT_CH); // set current code gen state
-
-      ch = cg->client_header ();
-      // pass info
-      cg->node (this);
-      cg->outstream (ch);
-
-      ch->indent (); // start from whatever indentation level we were at
-      *ch << "struct " << local_name () << nl;
-      *ch << "{\n";
-      ch->incr_indent (0);
-
-      // generate code for field members
-      if (be_scope::gen_client_header () == -1)
-        {
-          ACE_ERROR ((LM_ERROR, "be_structure::gen_client_header\n"));
-          ACE_ERROR ((LM_ERROR, "code generation for fields failed\n"));
-          return -1;
-        }
-
-      ch->decr_indent ();
-      *ch << "};\n\n";
-
-      // generate var defn
-      this->gen_var_defn ();
-
-      // a class is generated for an out defn only for a variable length struct
-      if (this->size_type () == be_decl::VARIABLE)
-        {
-          this->gen_out_defn ();
-        }
-      else
-        {
-          ch->indent ();
-          *ch << "typedef " << this->local_name () << " &" << this->local_name
-            () << "_out;\n\n";
-        }
-
-      // generate the typecode decl
-      if (this->is_nested ())
-        {
-          // we have a scoped name
-          ch->indent ();
-          *ch << "static CORBA::TypeCode_ptr " << this->tc_name
-            ()->last_component () << ";\n\n";
-        }
-      else
-        {
-          // we are in the ROOT scope
-          ch->indent ();
-          *ch << "extern CORBA::TypeCode_ptr " << this->tc_name
-            ()->last_component () << ";\n\n";
-        }
-      this->cli_hdr_gen_ = I_TRUE;
-      cg->pop (); // pop up the current state
-    }
-  return 0;
-}
-
-// Generates the client-side stubs for the structure
-int
-be_structure::gen_client_stubs (void)
-{
-  TAO_OutStream *cs; // output stream
-  TAO_NL  nl;        // end line
-
-
-  if (!this->cli_stub_gen_)
-    {
-      // retrieve a singleton instance of the code generator
-      TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-      cg->push (TAO_CodeGen::TAO_STRUCT_CS); // set current code gen state
-
-      cs = cg->client_stubs ();
-      // pass info
-      cg->outstream (cs);
-      cg->node (this);
-
-      // generate the typecode information here
-      cs->indent (); // start from current indentation level
-      *cs << "static const CORBA::Long _oc_" << this->flatname () << "[] =" <<
-        nl;
-      *cs << "{\n";
-      cs->incr_indent (0);
-      // note that we just need the parameters here and hence we generate the
-      // encapsulation for the parameters
-      if (this->gen_encapsulation () == -1)
-        {
-          ACE_ERROR ((LM_ERROR, "Error generating encapsulation\n\n"));
-          return -1;
-        }
-      cs->decr_indent ();
-      *cs << "};" << nl;
-
-      *cs << "static CORBA::TypeCode _tc__tc_" << this->flatname () <<
-        " (CORBA::tk_struct, sizeof (_oc_" <<  this->flatname () <<
-        "), (unsigned char *) &_oc_" << this->flatname () <<
-        ", CORBA::B_FALSE);" << nl;
-      *cs << "CORBA::TypeCode_ptr " << this->tc_name () << " = &_tc__tc_" <<
-        this->flatname () << ";\n\n";
-      this->cli_stub_gen_ = I_TRUE;
-      cg->pop ();
-    }
-
-  return 0;
-}
-
-// Generates the server-side header information for the structure
-int
-be_structure::gen_server_header (void)
-{
-  // nothing to be done
-  return 0;
-}
-
-// Generates the server-side skeletons for the structure
-int
-be_structure::gen_server_skeletons (void)
-{
-  // nothing to be done
-  return 0;
-}
-
-// Generates the client-side inline information
-int
-be_structure::gen_client_inline (void)
-{
-  if (!this->cli_inline_gen_)
-    {
-      if (this->gen_var_impl () == -1)
-        {
-          ACE_ERROR ((LM_ERROR, "be_structure: _var impl code gen failed\n"));
-          return -1;
-        }
-      if (this->size_type () == be_decl::VARIABLE && this->gen_out_impl () == -1)
-        {
-          ACE_ERROR ((LM_ERROR, "be_structure: _out impl code gen failed\n"));
-          return -1;
-        }
-      if (be_scope::gen_client_inline () == -1)
-        {
-          ACE_ERROR ((LM_ERROR, "be_structure: code gen failed for scope\n"));
-          return -1;
-        }
-      this->cli_inline_gen_ = I_TRUE;
-    }
-  return 0;
-}
-
-// Generates the server-side inline
-int
-be_structure::gen_server_inline (void)
-{
-  // nothing to be done
-  return 0;
-}
-
-// generate the _var definition for ourself
-int
-be_structure::gen_var_defn (void)
-{
-  TAO_OutStream *ch; // output stream
-  TAO_NL  nl;        // end line
-  char namebuf [NAMEBUFSIZE];  // names
-
-  ACE_OS::memset (namebuf, '\0', NAMEBUFSIZE);
-  ACE_OS::sprintf (namebuf, "%s_var", this->local_name ()->get_string ());
-
-  // retrieve a singleton instance of the code generator
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-
-  ch = cg->client_header ();
-
-  // generate the var definition (always in the client header).
-  // Depending upon the data type, there are some differences which we account
-  // for over here.
-
-  ch->indent (); // start with whatever was our current indent level
-  *ch << "class " << namebuf << nl;
-  *ch << "{" << nl;
-  *ch << "public:\n";
-  ch->incr_indent ();
-  // default constr
-  *ch << namebuf << " (void); // default constructor" << nl;
-  // constr
-  *ch << namebuf << " (" << local_name () << " *);" << nl;
-  // copy constructor
-  *ch << namebuf << " (const " << namebuf <<
-    " &); // copy constructor" << nl;
-  // destructor
-  *ch << "~" << namebuf << " (void); // destructor" << nl;
-  *ch << nl;
-  // assignment operator from a pointer
-  *ch << namebuf << " &operator= (" << local_name () << " *);" << nl;
-  // assignment from _var
-  *ch << namebuf << " &operator= (const " << namebuf << " &);" << nl;
-
-  // arrow operator
-  *ch << local_name () << " *operator-> (void);" << nl;
-  *ch << "const " << local_name () << " *operator-> (void) const;" << nl;
-  *ch << nl;
-
-  // other extra types (cast operators, [] operator, and others)
-  *ch << "operator const " << local_name () << " &() const;" << nl;
-  *ch << "operator " << local_name () << " &();" << nl;
-  *ch << "operator " << local_name () << " &() const;" << nl;
-  *ch << "// in, inout, out, _retn " << nl;
-  // the return types of in, out, inout, and _retn are based on the parameter
-  // passing rules and the base type
-  if (this->size_type () == be_decl::FIXED)
-    {
-      *ch << "const " << local_name () << " &in (void) const;" << nl;
-      *ch << local_name () << " &inout (void);" << nl;
-      *ch << local_name () << " &out (void);" << nl;
-      *ch << local_name () << " _retn (void);" << nl;
-    }
-  else
-    {
-      *ch << "const " << local_name () << " &in (void) const;" << nl;
-      *ch << local_name () << " &inout (void);" << nl;
-      *ch << local_name () << " *&out (void);" << nl;
-      *ch << local_name () << " *_retn (void);" << nl;
-    }
-
-  // generate an additional member function that returns the underlying pointer
-  *ch << local_name () << " *ptr(void) const;\n";
-
-  *ch << "\n";
-  ch->decr_indent ();
-
-  // generate the private section
-  *ch << "private:\n";
-  ch->incr_indent ();
-  *ch << local_name () << " *ptr_;\n";
-  ch->decr_indent ();
-  *ch << "};\n\n";
-
-  return 0;
-}
-
-// implementation of the _var class. All of these get generated in the inline
-// file
-int
-be_structure::gen_var_impl (void)
-{
-  TAO_OutStream *ci; // output stream
-  TAO_NL  nl;        // end line
-  char fname [NAMEBUFSIZE];  // to hold the full and
-  char lname [NAMEBUFSIZE];  // local _var names
-
-  ACE_OS::memset (fname, '\0', NAMEBUFSIZE);
-  ACE_OS::sprintf (fname, "%s_var", this->fullname ());
-
-  ACE_OS::memset (lname, '\0', NAMEBUFSIZE);
-  ACE_OS::sprintf (lname, "%s_var", local_name ()->get_string ());
-
-  // retrieve a singleton instance of the code generator
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-
-  ci = cg->client_inline ();
-  cg->outstream (ci);
-
-  ci->indent (); // start with whatever was our current indent level
-
-  *ci << "// *************************************************************"
-      << nl;
-  *ci << "// Inline operations for class " << fname << nl;
-  *ci << "// *************************************************************\n\n";
-
-  // default constr
-  *ci << "ACE_INLINE" << nl;
-  *ci << fname << "::" << lname <<
-    " (void) // default constructor" << nl;
-  *ci << "\t" << ": ptr_ (0)" << nl;
-  *ci << "{}\n\n";
-
-  // constr from a pointer
-  ci->indent ();
-  *ci << "ACE_INLINE" << nl;
-  *ci << fname << "::" << lname << " (" << name () << " *p)" << nl;
-  *ci << "\t: ptr_ (p)" << nl;
-  *ci << "{}\n\n";
-
-  // copy constructor
-  ci->indent ();
-  *ci << "ACE_INLINE" << nl;
-  *ci << fname << "::" << lname << " (const " << fname <<
-    " &p) // copy constructor" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "if (p.ptr_)" << nl;
-  *ci << "\tthis->ptr_ = new " << this->name () << "(*p.ptr_);" << nl;
-  *ci << "else" << nl;
-  *ci << "\tthis->ptr_ = 0;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  // destructor
-  ci->indent ();
-  *ci << "ACE_INLINE" << nl;
-  *ci << fname << "::~" << lname << " (void) // destructor" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "delete this->ptr_;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  // assignment operator from a pointer
-  ci->indent ();
-  *ci << "ACE_INLINE " << fname << " &" << nl;
-  *ci << fname << "::operator= (" << name () <<
-    " *p)" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "delete this->ptr_;" << nl;
-  *ci << "this->ptr_ = p;" << nl;
-  *ci << "return *this;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  // assignment operator from _var
-  ci->indent ();
-  *ci << "ACE_INLINE " << fname << " &" << nl;
-  *ci << fname << "::operator= (const " << fname <<
-    " &p)" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "if (this != &p)" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "delete this->ptr_;" << nl;
-  *ci << "this->ptr_ = new " << this->name () << " (*p.ptr_);\n";
-  ci->decr_indent ();
-  *ci << "}" << nl;
-  *ci << "return *this;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  // two arrow operators
-  ci->indent ();
-  *ci << "ACE_INLINE const " << this->name () << " *" << nl;
-  *ci << fname << "::operator-> (void) const" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "return this->ptr_;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  ci->indent ();
-  *ci << "ACE_INLINE " << this->name () << " *" << nl;
-  *ci << fname << "::operator-> (void)" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "return this->ptr_;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  // other extra methods - 3 cast operator ()
-  ci->indent ();
-  *ci << "ACE_INLINE " << nl;
-  *ci << fname << "::operator const " << name () <<
-    " &() const // cast" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "return *this->ptr_;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  ci->indent ();
-  *ci << "ACE_INLINE " << nl;
-  *ci << fname << "::operator " << name () << " &() // cast " << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "return *this->ptr_;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  ci->indent ();
-  *ci << "ACE_INLINE " << nl;
-  *ci << fname << "::operator " << name () << " &() const// cast " << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "return *this->ptr_;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  // in, inout, out, and _retn
-  ci->indent ();
-  *ci << "ACE_INLINE const " << name () << " &" << nl;
-  *ci << fname << "::in (void) const" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "return *this->ptr_;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  ci->indent ();
-  *ci << "ACE_INLINE " << name () << " &" << nl;
-  *ci << fname << "::inout (void)" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "return *this->ptr_;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  // the out is handled differently based on our size type
-  ci->indent ();
-  if (this->size_type () == be_decl::VARIABLE)
-    {
-      *ci << "// mapping for variable size " << nl;
-      *ci << "ACE_INLINE " << name () << " *&" << nl;
-      *ci << fname << "::out (void)" << nl;
-      *ci << "{\n";
-      ci->incr_indent ();
-      *ci << "delete this->ptr_;" << nl;
-      *ci << "this->ptr_ = 0;" << nl;
-      *ci << "return this->ptr_;\n";
-      ci->decr_indent ();
-      *ci << "}\n\n";
-
-      ci->indent ();
-      *ci << "ACE_INLINE " << name () << " *" << nl;
-      *ci << fname << "::_retn (void)" << nl;
-      *ci << "{\n";
-      ci->incr_indent ();
-      *ci << this->name () << " *tmp = this->ptr_;" << nl;
-      *ci << "this->ptr_ = 0;" << nl;
-      *ci << "return tmp;\n";
-      ci->decr_indent ();
-      *ci << "}\n\n";
-
-    }
-  else
-    {
-      *ci << "// mapping for fixed size " << nl;
-      *ci << "ACE_INLINE " << name () << " &" << nl;
-      *ci << fname << "::out (void)" << nl;
-      *ci << "{\n";
-      ci->incr_indent ();
-      *ci << "return *this->ptr_;\n";
-      ci->decr_indent ();
-      *ci << "}\n\n";
-
-      ci->indent ();
-      *ci << "ACE_INLINE " << name () << nl;
-      *ci << fname << "::_retn (void)" << nl;
-      *ci << "{\n";
-      ci->incr_indent ();
-      *ci << "return *this->ptr_;\n";
-      ci->decr_indent ();
-      *ci << "}\n\n";
-
-      // the additional ptr () member function
-      ci->indent ();
-      *ci << "ACE_INLINE " << name () << " *" << nl;
-      *ci << fname << "::ptr (void) const" << nl;
-      *ci << "{\n";
-      ci->incr_indent ();
-      *ci << "return this->ptr_;\n";
-      ci->decr_indent ();
-      *ci << "}\n\n";
-
-    }
-
-  return 0;
-}
-
-// generate the _out definition
-int
-be_structure::gen_out_defn (void)
-{
-  TAO_OutStream *ch; // output stream
-  TAO_NL  nl;        // end line
-  char namebuf [NAMEBUFSIZE];  // to hold the _out name
-
-  ACE_OS::memset (namebuf, '\0', NAMEBUFSIZE);
-  ACE_OS::sprintf (namebuf, "%s_out", local_name ()->get_string ());
-
-  // retrieve a singleton instance of the code generator
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-
-  ch = cg->client_header ();
-
-  // generate the out definition (always in the client header)
-  ch->indent (); // start with whatever was our current indent level
-
-  *ch << "class " << namebuf << nl;
-  *ch << "{" << nl;
-  *ch << "public:\n";
-  ch->incr_indent ();
-
-  // No default constructor
-
-  // constructor from a pointer
-  *ch << namebuf << " (" << local_name () << " *&);" << nl;
-  // constructor from a _var &
-  *ch << namebuf << " (" << local_name () << "_var &);" << nl;
-  // constructor from a _out &
-  *ch << namebuf << " (" << namebuf << " &);" << nl;
-  // assignment operator from a _out &
-  *ch << namebuf << " &operator= (" << namebuf << " &);" << nl;
-  // assignment operator from a pointer &, cast operator, ptr fn, operator
-  // -> and any other extra operators
-  // assignment
-  *ch << namebuf << " &operator= (" << local_name () << " *);" << nl;
-  // operator ()
-  *ch << "operator " << local_name () << " *&();" << nl;
-  // ptr fn
-  *ch << local_name () << " *&ptr (void);" << nl;
-  // operator ->
-  *ch << local_name () << " *operator-> (void);" << nl;
-
-  *ch << "\n";
-  ch->decr_indent ();
-  *ch << "private:\n";
-  ch->incr_indent ();
-  *ch << local_name () << " *&ptr_;" << nl;
-  *ch << "// assignment from T_var not allowed" << nl;
-  *ch << "void operator= (const " << local_name () << "_var &);\n";
-
-  ch->decr_indent ();
-  *ch << "};\n\n";
-  return 0;
-}
-
-int
-be_structure::gen_out_impl (void)
-{
-  TAO_OutStream *ci; // output stream
-  TAO_NL  nl;        // end line
-  char fname [NAMEBUFSIZE];  // to hold the full and
-  char lname [NAMEBUFSIZE];  // local _out names
-
-  ACE_OS::memset (fname, '\0', NAMEBUFSIZE);
-  ACE_OS::sprintf (fname, "%s_out", this->fullname ());
-
-  ACE_OS::memset (lname, '\0', NAMEBUFSIZE);
-  ACE_OS::sprintf (lname, "%s_out", local_name ()->get_string ());
-
-  // retrieve a singleton instance of the code generator
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-
-  ci = cg->client_inline ();
-  cg->outstream (ci);
-
-  // generate the var implementation in the inline file
-
-  ci->indent (); // start with whatever was our current indent level
-
-  *ci << "// *************************************************************"
-      << nl;
-  *ci << "// Inline operations for class " << fname << nl;
-  *ci << "// *************************************************************\n\n";
-
-  // constr from a pointer
-  ci->indent ();
-  *ci << "ACE_INLINE" << nl;
-  *ci << fname << "::" << lname << " (" << name () << " *&p)" << nl;
-  *ci << "\t: ptr_ (p)" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "this->ptr_ = 0;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  // constructor from _var &
-  ci->indent ();
-  *ci << "ACE_INLINE" << nl;
-  *ci << fname << "::" << lname << " (" << this->name () <<
-    "_var &p) // constructor from _var" << nl;
-  *ci << "\t: ptr_ (p.out ())" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "delete this->ptr_;" << nl;
-  *ci << "this->ptr_ = 0;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  // copy constructor
-  ci->indent ();
-  *ci << "ACE_INLINE" << nl;
-  *ci << fname << "::" << lname << " (" << fname <<
-    " &p) // copy constructor" << nl;
-  *ci << "\t: ptr_ (p.ptr_)" << nl;
-  *ci << "{}\n\n";
-
-  // assignment operator from _out &
-  ci->indent ();
-  *ci << "ACE_INLINE " << fname << " &" << nl;
-  *ci << fname << "::operator= (" << fname <<
-    " &p)" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "this->ptr_ = p.ptr_;" << nl;
-  *ci << "return *this;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  // assignment from _var is not allowed by a private declaration
-
-  // assignment operator from pointer
-  ci->indent ();
-  *ci << "ACE_INLINE " << fname << " &" << nl;
-  *ci << fname << "::operator= (" << this->name () <<
-    " *p)" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "this->ptr_ = p;" << nl;
-  *ci << "return *this;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  // other extra methods - cast operator ()
-  ci->indent ();
-  *ci << "ACE_INLINE " << nl;
-  *ci << fname << "::operator " << this->name () <<
-    " *&() // cast" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "return this->ptr_;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  // ptr function
-  ci->indent ();
-  *ci << "ACE_INLINE " << this->name () << " *&" << nl;
-  *ci << fname << "::ptr (void) // ptr" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "return this->ptr_;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  // operator ->
-  ci->indent ();
-  *ci << "ACE_INLINE " << this->name () << " *" << nl;
-  *ci << fname << "::operator-> (void)" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "return this->ptr_;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-
-  return 0;
-}
-
-// generate typecode.
-// Typecode for structures comprises the enumerated value followed by the
-// encapsulation of the parameters
-
-int
-be_structure::gen_typecode (void)
-{
-  TAO_OutStream *cs; // output stream
-  TAO_NL  nl;        // end line
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-
-  cs = cg->client_stubs ();
-  cs->indent (); // start from whatever indentation level we were at
-
-  *cs << "CORBA::tk_struct, // typecode kind" << nl;
-  *cs << this->tc_encap_len () << ", // encapsulation length\n";
-  // now emit the encapsulation
-  cs->incr_indent (0);
-  if (this->gen_encapsulation () == -1)
-    {
-      return -1;
-    }
-  cs->decr_indent ();
-  return 0;
-}
-
-// generate encapsulation
-// An encapsulation for ourselves will be necessary when we are part of some
-// other IDL type and a typecode for that other type is being generated. This
-// will comprise our typecode kind. IDL types with parameters will additionally
-// have the encapsulation length and the entire typecode description
-int
-be_structure::gen_encapsulation (void)
-{
-  TAO_OutStream *cs; // output stream
-  TAO_NL  nl;        // end line
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-  long i, arrlen;
-  long *arr;  // an array holding string names converted to array of longs
-
-  cs = cg->client_stubs ();
-  cs->indent (); // start from whatever indentation level we were at
-
-  *cs << "TAO_ENCAP_BYTE_ORDER, // byte order" << nl;
-  // generate repoID
-  *cs << (ACE_OS::strlen (this->repoID ())+1) << ", ";
-  (void)this->tc_name2long (this->repoID (), arr, arrlen);
-  for (i=0; i < arrlen; i++)
-    {
-      cs->print ("0x%x, ", arr[i]);
-    }
-  *cs << " // repository ID = " << this->repoID () << nl;
-  // generate name
-  *cs << (ACE_OS::strlen (this->local_name ()->get_string ())+1) << ", ";
-  (void)this->tc_name2long(this->local_name ()->get_string (), arr, arrlen);
-  for (i=0; i < arrlen; i++)
-    {
-      cs->print ("0x%x, ", arr[i]);
-    }
-  *cs << " // name = " << this->local_name () << nl;
-  // generate the member count
-  *cs << this->member_count () << ", // member count\n";
-  cs->incr_indent (0);
-  // hand over to the scope to generate the typecode for elements
-  if (be_scope::gen_encapsulation () == -1)
-    {
-      ACE_ERROR ((LM_ERROR, "be_structure: cannot generate typecode for members\n"));
-      return -1;
-    }
-  cs->decr_indent (0);
-  return 0;
-}
-
-// compute typecode size
-long
-be_structure::tc_size (void)
-{
-  // 4 bytes for enumeration, 4 bytes for storing encap length val, followed by the
-  // actual encapsulation length
-  return 4 + 4 + this->tc_encap_len ();
-}
-
-// compute encapsulation length
-long
-be_structure::tc_encap_len (void)
-{
-  if (this->encap_len_ == -1) // not computed yet
-    {
-      this->encap_len_ = 4;  // holds the byte order flag
-
-      this->encap_len_ += this->repoID_encap_len (); // repoID
-
-      // do the same thing for the local name
-      this->encap_len_ += this->name_encap_len ();
-
-      this->encap_len_ += 4; // to hold the member count
-
-      // compute encap length for members
-      this->encap_len_ += be_scope::tc_encap_len ();
-    }
-  return this->encap_len_;
-}
-
-// Narrowing
-IMPL_NARROW_METHODS3 (be_structure, AST_Structure, be_scope, be_type)
-IMPL_NARROW_FROM_DECL (be_structure)
-IMPL_NARROW_FROM_SCOPE (be_structure)
diff --git a/TAO/TAO_IDL/be/be_sunsoft.cpp b/TAO/TAO_IDL/be/be_sunsoft.cpp
deleted file mode 100644
index f6bbac39a76..00000000000
--- a/TAO/TAO_IDL/be/be_sunsoft.cpp
+++ /dev/null
@@ -1,108 +0,0 @@
-#include	"idl.h"
-#include	"idl_extern.h"
-#include	"be.h"
-#include        "be_sunsoft.h"
-
-TAO_SunSoft_OutStream::TAO_SunSoft_OutStream (void)
-  : TAO_OutStream ()
-{
-}
-
-TAO_SunSoft_OutStream::~TAO_SunSoft_OutStream (void)
-{
-}
-
-TAO_OutStream & 
-TAO_SunSoft_OutStream::print (Identifier *id)
-{
-  ACE_OS::fprintf (this->fp_, id->get_string ());
-  return *this;
-}
-
-TAO_OutStream & 
-TAO_SunSoft_OutStream::print (UTL_IdList *idl)
-{
-  UTL_IdListActiveIterator	*i = new UTL_IdListActiveIterator (idl);
-  long				first = I_TRUE;
-  long				second = I_FALSE;
-
-  while (!(i->is_done ())) 
-    {
-      if (!first)
-        *this << "::";
-      else if (second)
-        first = second = I_FALSE;
-      // print the identifier
-      *this << i->item ();
-      if (first) 
-        {
-          if (ACE_OS::strcmp (i->item ()->get_string (), "") != 0)
-            // does not start with a ""
-            first = I_FALSE;
-          else
-            second = I_TRUE;
-        }
-      i->next ();
-  }
-  return *this;
-}
-
-TAO_OutStream&
-TAO_SunSoft_OutStream::print (AST_Expression *expr)
-{
-  AST_Expression::AST_ExprValue *ev = expr->ev ();
-
-  if (ev)
-    {
-      switch (ev->et)
-        {
-        case AST_Expression::EV_short:
-          this->TAO_OutStream::print ("%hd", ev->u.sval);
-          break;
-        case AST_Expression::EV_ushort:
-          this->TAO_OutStream::print ("%hu", ev->u.usval);
-          break;
-        case AST_Expression::EV_long:
-          this->TAO_OutStream::print ("%ld", ev->u.lval);
-          break;
-        case AST_Expression::EV_ulong:
-          this->TAO_OutStream::print ("%ld", ev->u.ulval);
-          break;
-        case AST_Expression::EV_longlong:
-          break;
-        case AST_Expression::EV_ulonglong:
-          break;
-        case AST_Expression::EV_float:
-          this->TAO_OutStream::print ("%f", ev->u.fval);
-          break;
-        case AST_Expression::EV_double:
-          this->TAO_OutStream::print ("%f", ev->u.dval);
-          break;
-        case AST_Expression::EV_longdouble:
-          break;
-        case AST_Expression::EV_char:
-          this->TAO_OutStream::print ("'%c'", ev->u.cval);
-          break;
-        case AST_Expression::EV_wchar:
-          break;
-        case AST_Expression::EV_octet:
-          this->TAO_OutStream::print ("%c", ev->u.oval);
-          break;
-        case AST_Expression::EV_bool:
-          this->TAO_OutStream::print ("%ld", ev->u.bval);
-          break;
-        case AST_Expression::EV_string:
-          this->TAO_OutStream::print ("\"%s\"", ev->u.strval->get_string ());
-          break;
-        case AST_Expression::EV_wstring:
-          break;
-        default:
-          break;
-        }
-    }
-  else // 
-    {
-      // XXXASG: need to add code here
-    }
-  return *this;
-}
diff --git a/TAO/TAO_IDL/be/be_type.cpp b/TAO/TAO_IDL/be/be_type.cpp
deleted file mode 100644
index 5c7bcab5cfc..00000000000
--- a/TAO/TAO_IDL/be/be_type.cpp
+++ /dev/null
@@ -1,191 +0,0 @@
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    be_type.cpp
-//
-// = DESCRIPTION
-//    Extension of class AST_Type that provides additional means for C++
-//    mapping.
-//
-// = AUTHOR
-//    Copyright 1994-1995 by Sun Microsystems, Inc.
-//    and
-//    Aniruddha Gokhale
-//
-// ============================================================================
-
-#include	"idl.h"
-#include	"idl_extern.h"
-#include	"be.h"
-
-/*
- * BE_Type
- */
-
-be_type::be_type (void)
-  : tc_name_ (0),
-    type_name_ (0)
-{
-}
-
-be_type::be_type (AST_Decl::NodeType nt, UTL_ScopedName *n, UTL_StrList *p)
-  : AST_Decl (nt, n, p),
-    tc_name_ (0),
-    type_name_ (0)
-{
-}
-
-// compute the typecode name. The idea is to use the fully scoped name,
-// however, prepend a _tc_ to the last component. A slightly different approach
-// is required of the predefined types. Hence this method is overridden for
-// predefined types.
-
-void
-be_type::compute_tc_name (void)
-{
-  static char namebuf [200];
-  UTL_ScopedName *n;
-
-  this->tc_name_ = NULL;
-  ACE_OS::memset (namebuf, '\0', 200);
-  n = this->name ();
-  while (n->tail () != NULL)
-    {
-      if (!this->tc_name_)
-        {
-          // does not exist
-          this->tc_name_ = new UTL_ScopedName (n->head (), NULL);
-        }
-      else
-        {
-          this->tc_name_->nconc (new UTL_ScopedName (n->head (), NULL));
-        }
-      n = (UTL_ScopedName *)n->tail ();
-    }
-  ACE_OS::sprintf (namebuf, "_tc_%s", n->last_component ()->get_string ());
-  if (!this->tc_name_)
-    {
-      // does not exist
-      this->tc_name_ = new UTL_ScopedName (new Identifier (ACE_OS::strdup
-                                                           (namebuf), 1, 0, I_FALSE), NULL);
-    }
-  else
-    {
-      this->tc_name_->nconc (new UTL_ScopedName (new Identifier (ACE_OS::strdup
-                                                                 (namebuf), 1,
-                                                                 0, I_FALSE), NULL));
-    }
-  return;
-}
-
-// retrieve typecode name
-UTL_ScopedName *
-be_type::tc_name (void)
-{
-  if (!this->tc_name_)
-    compute_tc_name ();
-
-  return this->tc_name_;
-}
-
-// return the type name using the ACE_NESTING macro
-char *
-be_type::nested_type_name (be_decl *d, char *suffix)
-{
-  // some compilers do not like generating a fully scoped name for a type that
-  // was defined in the same enclosing scope in which it was defined. For such,
-  // we emit a macro defined in the ACE library.
-  //
-
-  // The tricky part here is that it is not enough to check if the
-  // typename we are using was defined in the current scope. But we
-  // need to ensure that it was not defined in any of our ancestor
-  // scopes as well. If that is the case, then we can generate a fully
-  // scoped name for that type, else we use the ACE_NESTED_CLASS macro
-
-  static char macro [NAMEBUFSIZE];
-  be_decl *t = 0;  // our enclosing scope
-
-  // d : This is the node in whose scope we are generating a declaration
-  // t : This is our enclosing scope (if one exists)
-  //
-
-  ACE_OS::memset (macro, '\0', NAMEBUFSIZE);
-  if (this->is_nested ()) // if we are nested
-    {
-	  // get our enclosing scope
-	  t = be_decl::narrow_from_decl (ScopeAsDecl (this->defined_in ()));
-
-	  // now check if the scope in which we were defined is the same
-	  // as the current scope in which we are used or one of its ancestors
-	  while (d->node_type () != AST_Decl::NT_root) // keep moving up
-                                            	   // the chain
-		{
-		  // now we need to make sure that "t" is not the same as "d" i.e., the
-		  // scope in which we are using ourselves.
-		  if (!ACE_OS::strcmp (t->fullname (), d->fullname ()))
-			{
-			  // we are the same, generate the ACE_NESTED_CLASS macro
-			  ACE_OS::sprintf (macro, "ACE_NESTED_CLASS (");
-			  ACE_OS::strcat (macro, t->fullname ());
-			  ACE_OS::strcat (macro, ",");
-			  ACE_OS::strcat (macro, this->local_name ()->get_string ());
-              if (suffix)
-                {
-                  ACE_OS::strcat (macro, suffix);
-                }
-			  ACE_OS::strcat (macro, ")");
-			  return macro;
-			}
-		  d = be_decl::narrow_from_decl (ScopeAsDecl (d->defined_in ()));
-		}
-	} // end of if is_nested
-
-  // not nested OR not defined in the same scope as "d" or its
-  // ancestors
-  ACE_OS::sprintf (macro, "%s", this->fullname ());
-  if (suffix)
-    {
-      ACE_OS::strcat (macro, suffix);
-    }
-  return macro;
-}
-
-// *****************************
-// CODE GENERATION
-// *****************************
-
-// generate the _var definition for ourself
-int
-be_type::gen_var_defn (void)
-{
-  return 0;
-}
-
-// implementation of the _var class. All of these get generated in the inline
-// file
-int
-be_type::gen_var_impl (void)
-{
-  return 0;
-}
-
-// generate the _out definition
-int
-be_type::gen_out_defn (void)
-{
-  return 0;
-}
-
-int
-be_type::gen_out_impl (void)
-{
-  return 0;
-}
-
-// Narrowing
-IMPL_NARROW_METHODS2 (be_type, AST_Type, be_decl)
-IMPL_NARROW_FROM_DECL (be_type)
diff --git a/TAO/TAO_IDL/be/be_typedef.cpp b/TAO/TAO_IDL/be/be_typedef.cpp
deleted file mode 100644
index e02ecaf0bbc..00000000000
--- a/TAO/TAO_IDL/be/be_typedef.cpp
+++ /dev/null
@@ -1,316 +0,0 @@
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    be_typedef.cpp
-//
-// = DESCRIPTION
-//    Extension of class AST_Typedef that provides additional means for C++
-//    mapping.
-//
-// = AUTHOR
-//    Copyright 1994-1995 by Sun Microsystems, Inc.
-//    and
-//    Aniruddha Gokhale
-//
-// ============================================================================
-
-#include	"idl.h"
-#include	"idl_extern.h"
-#include	"be.h"
-
-be_typedef::be_typedef (void)
-{
-}
-
-be_typedef::be_typedef (AST_Type *bt, UTL_ScopedName *n, UTL_StrList *p)
-  : AST_Typedef (bt, n, p),
-    AST_Decl (AST_Decl::NT_typedef, n, p)
-{
-}
-
-// given a typedef node, traverse the chain of base types until they are no
-// more typedefs, and return that most primitive base type
-be_type *
-be_typedef::primitive_base_type (void)
-{
-  be_type *d;
-
-  d = this;
-  while (d && d->node_type () == AST_Decl::NT_typedef)
-    {
-      be_typedef *temp; // temporary
-
-      temp = be_typedef::narrow_from_decl (d);
-      d = be_type::narrow_from_decl (temp->base_type ());
-    }
-  return d;
-}
-
-int
-be_typedef::gen_client_header (void)
-{
-  be_type *bt;       // type node
-  be_state *s;       // state based code gen object
-  TAO_OutStream *ch; // client header
-
-  if (!this->cli_hdr_gen_) // not already generated
-    {
-      // retrieve a singleton instance of the code generator
-      TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-      ch = cg->client_header ();
-      cg->push (TAO_CodeGen::TAO_TYPEDEF_CH);
-      cg->node (this); // pass ourselves. For typedefs, this is very important,
-                       // because other nodes's code generation may depend on
-                       // whether they were typedefed or not.
-      cg->outstream (cg->client_header ());
-      s = cg->make_state ();
-
-      bt = be_type::narrow_from_decl (this->base_type ());
-      // first generate the mapping for our type. As a side effect, also
-      // generate the mapping for the typedef
-      if (!s || !bt || (s->gen_code (bt, this) == -1))
-        {
-          ACE_ERROR ((LM_ERROR, "be_typedef: error generating code for base type\n"));
-          return -1;
-        }
-
-      // generate the typecode decl for this typedef node
-      if (this->is_nested ())
-        {
-          // we have a scoped name
-          ch->indent ();
-          *ch << "static CORBA::TypeCode_ptr " << this->tc_name
-            ()->last_component () << ";\n\n";
-        }
-      else
-        {
-          // we are in the ROOT scope
-          ch->indent ();
-          *ch << "extern CORBA::TypeCode_ptr " << this->tc_name
-            ()->last_component () << ";\n\n";
-        }
-
-      cg->pop ();
-      this->cli_hdr_gen_ = I_TRUE;
-    }
-  return 0;
-}
-
-int
-be_typedef::gen_client_stubs (void)
-{
-  TAO_OutStream *cs; // output stream
-  TAO_NL  nl;        // end line
-  be_type *bt;
-  be_state *s;       // state based code gen object
-
-  if (!this->cli_stub_gen_)
-    {
-      // retrieve a singleton instance of the code generator
-      TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-      cg->push (TAO_CodeGen::TAO_TYPEDEF_CS); // set current code gen state
-
-      cs = cg->client_stubs ();
-
-      cg->node (this); // pass ourselves. For typedefs, this is very important,
-                       // because other nodes's code generation may depend on
-                       // whether they were typedefed or not.
-
-      s = cg->make_state ();
-
-      bt = be_type::narrow_from_decl (this->base_type ());
-      // first generate the mapping for our type. As a side effect, also
-      // generate the mapping for the typedef
-      if (!s || !bt || (s->gen_code (bt, this) == -1))
-        {
-          ACE_ERROR ((LM_ERROR, "be_typedef: error generating code for base type\n"));
-          return -1;
-        }
-
-      // generate the typecode information here
-      cs->indent (); // start from current indentation level
-      *cs << "static const CORBA::Long _oc_" << this->flatname () << "[] =" <<
-        nl;
-      *cs << "{\n";
-      cs->incr_indent (0);
-      if (this->gen_encapsulation () == -1)
-        {
-          ACE_ERROR ((LM_ERROR, "Error generating typecode\n\n"));
-          return -1;
-        }
-      cs->decr_indent ();
-      *cs << "};" << nl;
-
-      *cs << "static CORBA::TypeCode _tc__tc_" << this->flatname () <<
-        " (CORBA::tk_alias, sizeof (_oc_" <<  this->flatname () <<
-        "), (unsigned char *) &_oc_" << this->flatname () <<
-        ", CORBA::B_FALSE);" << nl;
-      *cs << "CORBA::TypeCode_ptr " << this->tc_name () << " = &_tc__tc_" <<
-        this->flatname () << ";\n\n";
-
-
-      this->cli_stub_gen_ = I_TRUE;
-      cg->pop ();
-    }
-
-  return 0;
-}
-
-// Generates the client-side inline information
-int
-be_typedef::gen_client_inline (void)
-{
-  be_type *bt;       // type node
-  be_state *s;       // state based code gen object
-
-  if (!this->cli_inline_gen_) // not already generated
-    {
-      // retrieve a singleton instance of the code generator
-      TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-      cg->push (TAO_CodeGen::TAO_TYPEDEF_CI);
-      cg->node (this); // pass ourselves
-      cg->outstream (cg->client_inline ());
-      s = cg->make_state ();
-
-      bt = be_type::narrow_from_decl (this->base_type ());
-      // first generate the mapping for our type
-      if (!s || !bt || (s->gen_code (bt, this) == -1))
-        {
-          ACE_ERROR ((LM_ERROR, "be_typedef: error generating code for base type\n"));
-          return -1;
-        }
-
-      cg->pop ();
-      this->cli_inline_gen_ = I_TRUE;
-    }
-  return 0;
-}
-
-int
-be_typedef::gen_server_header (void)
-{
-  return 0;
-}
-
-int
-be_typedef::gen_server_skeletons (void)
-{
-  return 0;
-}
-
-// Generates the server-side inline
-int
-be_typedef::gen_server_inline (void)
-{
-  // nothing to be done
-  return 0;
-}
-
-int
-be_typedef::gen_typecode (void)
-{
-  TAO_OutStream *cs; // output stream
-  TAO_NL  nl;        // end line
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-
-  cs = cg->client_stubs ();
-  cs->indent (); // start from whatever indentation level we were at
-
-  *cs << "CORBA::tk_alias, // typecode kind for typedefs" << nl;
-  *cs << this->tc_encap_len () << ", // encapsulation length\n";
-  // now emit the encapsulation
-  cs->incr_indent (0);
-  if (this->gen_encapsulation () == -1)
-    {
-      return -1;
-    }
-
-  cs->decr_indent (0);
-  return 0;
-}
-
-// generate encapsulation. A typedef is an alias to its base type
-int
-be_typedef::gen_encapsulation  (void)
-{
-  TAO_OutStream *cs; // output stream
-  TAO_NL  nl;        // end line
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-  long i, arrlen;
-  long *arr;  // an array holding string names converted to array of longs
-  be_type *bt; // base type
-
-  cs = cg->client_stubs ();
-  cs->indent (); // start from whatever indentation level we were at
-
-  *cs << "TAO_ENCAP_BYTE_ORDER, // byte order" << nl;
-  // generate repoID
-  *cs << (ACE_OS::strlen (this->repoID ())+1) << ", ";
-  (void)this->tc_name2long (this->repoID (), arr, arrlen);
-  for (i=0; i < arrlen; i++)
-    {
-      cs->print ("0x%x, ", arr[i]);
-    }
-  *cs << " // repository ID = " << this->repoID () << nl;
-
-  // generate name
-  *cs << (ACE_OS::strlen (this->local_name ()->get_string ())+1) << ", ";
-  (void)this->tc_name2long(this->local_name ()->get_string (), arr, arrlen);
-  for (i=0; i < arrlen; i++)
-    {
-      cs->print ("0x%x, ", arr[i]);
-    }
-  *cs << " // name = " << this->local_name () << "\n";
-
-  // generate typecode for the base type
-  bt = be_type::narrow_from_decl (this->base_type ());
-  if (!bt || (bt->gen_typecode () == -1))
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-       "be_typedef::gen_encapsulation failed for base type\n"),
-                        -1);
-    }
-  return 0;
-}
-
-long
-be_typedef::tc_size (void)
-{
-  // 4 bytes for enumeration, 4 bytes for storing encap length val, followed by the
-  // actual encapsulation length
-  return 4 + 4 + this->tc_encap_len ();
-}
-
-long
-be_typedef::tc_encap_len (void)
-{
-  if (this->encap_len_ == -1) // not computed yet
-    {
-      be_type *bt; // base type
-      this->encap_len_ = 4;  // holds the byte order flag
-
-      this->encap_len_ += this->repoID_encap_len (); // repoID
-
-      // do the same thing for the local name
-      this->encap_len_ += this->name_encap_len ();
-
-      // add the encapsulation length of our base type
-      bt = be_type::narrow_from_decl (this->base_type ());
-      if (!bt)
-        {
-          ACE_ERROR ((LM_ERROR,
-              "be_typedef::tc_encap_len - bad base type\n"));
-          return 0;
-        }
-      this->encap_len_ += bt->tc_size ();
-
-    }
-  return this->encap_len_;
-}
-
-// Narrowing
-IMPL_NARROW_METHODS2 (be_typedef, AST_Typedef, be_type)
-IMPL_NARROW_FROM_DECL (be_typedef)
diff --git a/TAO/TAO_IDL/be/be_union.cpp b/TAO/TAO_IDL/be/be_union.cpp
deleted file mode 100644
index e8f0fbe83c1..00000000000
--- a/TAO/TAO_IDL/be/be_union.cpp
+++ /dev/null
@@ -1,1056 +0,0 @@
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    be_union.cpp
-//
-// = DESCRIPTION
-//    Extension of class AST_Union that provides additional means for C++
-//    mapping.
-//
-// = AUTHOR
-//    Copyright 1994-1995 by Sun Microsystems, Inc.
-//    and
-//    Aniruddha Gokhale
-//
-// ============================================================================
-
-#include	"idl.h"
-#include	"idl_extern.h"
-#include	"be.h"
-
-/*
- * BE_Union
- */
-
-be_union::be_union (void)
-{
-}
-
-be_union::be_union (AST_ConcreteType *dt, UTL_ScopedName *n, UTL_StrList *p)
-  : AST_Union (dt, n, p),
-    AST_Structure (AST_Decl::NT_union, n, p),
-    AST_Decl (AST_Decl::NT_union, n, p),
-    UTL_Scope (AST_Decl::NT_union),
-    member_count_ (-1),
-    default_index_ (-2)
-{
-}
-
-// compute total number of members
-int
-be_union::compute_member_count (void)
-{
-  UTL_ScopeActiveIterator *si;  // iterator
-  AST_Decl *d;  // temp node
-
-  this->member_count_ = 0;
-
-  // if there are elements in this scope
-  if (this->nmembers () > 0)
-    {
-      // instantiate a scope iterator.
-      si = new UTL_ScopeActiveIterator (this, UTL_Scope::IK_decls);
-
-      while (!(si->is_done ()))
-        {
-          // get the next AST decl node
-          d = si->item ();
-          this->member_count_++;
-          si->next ();
-        } // end of while
-      delete si; // free the iterator object
-    }
-  return 0;
-}
-
-// compute total number of members
-int
-be_union::compute_default_index (void)
-{
-  UTL_ScopeActiveIterator *si;  // iterator
-  AST_Decl *d;  // temp node
-  be_union_branch *bub; // union branch node
-  int i = 0; // counter
-
-  this->default_index_ = -1;  // if not used at all, this is the value it will
-                              // take
-
-  // if there are elements in this scope
-  if (this->nmembers () > 0)
-    {
-      // instantiate a scope iterator.
-      si = new UTL_ScopeActiveIterator (this, UTL_Scope::IK_decls);
-
-      while (!(si->is_done ()))
-	{
-	  // get the next AST decl node
-	  d = si->item ();
-	  if (!d->imported ())
-	    {
-              bub = be_union_branch::narrow_from_decl (d);
-              if (bub->label ()->label_kind () == AST_UnionLabel::UL_default)
-                this->default_index_ = i; // zero based indexing
-              i++;
-            }
-          si->next ();
-        } // end of while
-      delete si; // free the iterator object
-    }
-  return 0;
-}
-
-// return the member count
-int
-be_union::member_count (void)
-{
-  if (this->member_count_ == -1)
-    this->compute_member_count ();
-
-  return this->member_count_;
-}
-
-// return the default_index
-int
-be_union::default_index (void)
-{
-  if (this->default_index_ == -2)
-    this->compute_default_index ();
-
-  return this->default_index_;
-}
-
-
-// ****************************
-// code generation
-// ****************************
-
-int
-be_union::gen_client_header (void)
-{
-  TAO_OutStream *ch; // output stream
-  TAO_NL  nl;        // end line
-  be_type *bt;       // type node
-  be_state *s;       // code generation state
-
-
-  if (!this->cli_hdr_gen_)
-    {
-      // retrieve a singleton instance of the code generator
-      TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-
-      ch = cg->client_header ();
-      cg->node (this); // pass ourselves
-
-      ch->indent (); // start with the current indentation level
-      *ch << "class " << local_name () << nl;
-      *ch << "{" << nl;
-      *ch << "public:\n";
-      ch->incr_indent ();
-
-      // generate default and copy constructors
-      *ch << local_name () << " (void); // default constructor" << nl;
-      *ch << local_name () << " (const " << local_name () <<
-        " &); // copy constructor" << nl;
-      // generate destructor
-      *ch << "~" << local_name () << " (void); // destructor" << nl;
-      // generate assignment operator
-      *ch << local_name () << " &operator= (const " << local_name () <<
-        " &); // copy constructor\n\n";
-
-      // the discriminant type may have to be defined here if it was an enum
-      // declaration inside of the union statement.
-
-      cg->push (TAO_CodeGen::TAO_UNION_DISCTYPEDEFN_CH); // set current code gen state
-      bt = be_type::narrow_from_decl (this->disc_type ());
-
-      s  = cg->make_state (); // get the code gen object for the current state
-      if (!s || !bt || (s->gen_code (bt, this) == -1))
-        {
-          ACE_ERROR ((LM_ERROR, "be_union::gen_client_header\n"));
-          ACE_ERROR ((LM_ERROR, "Discriminant type generation failure\n"));
-          return -1;
-        }
-      cg->pop ();
-
-      // now generate the public defn for the union branch members
-      cg->push (TAO_CodeGen::TAO_UNION_PUBLIC_CH); // set current code gen state
-
-      if (be_scope::gen_client_header () == -1)
-        {
-          ACE_ERROR ((LM_ERROR, "be_union::gen_client_header\n"));
-          ACE_ERROR ((LM_ERROR, "member generation failure\n"));
-          return -1;
-        }
-      cg->pop ();
-
-      // now generate the private data members of the union
-      cg->push (TAO_CodeGen::TAO_UNION_PRIVATE_CH); // set current code gen state
-      ch->decr_indent ();
-      *ch << "private:\n";
-      ch->incr_indent ();
-      *ch << bt->nested_type_name (this) << " disc_;" << nl; // emit the
-                                           // ACE_NESTED_CLASS macro
-
-      // the members are inside of a union
-      *ch << "union" << nl;
-      *ch << "{\n";
-      ch->incr_indent (0);
-      if (be_scope::gen_client_header () == -1)
-        {
-          ACE_ERROR ((LM_ERROR, "be_union::gen_client_header\n"));
-          ACE_ERROR ((LM_ERROR, "data member generation failure\n"));
-          return -1;
-        }
-      ch->decr_indent ();
-      *ch << "}; // end of union\n\n";
-
-      ch->decr_indent ();
-      *ch << "};\n\n";
-
-      // generate var defn
-      this->gen_var_defn ();
-
-      // a class is generated for an out defn only for a variable length struct
-      if (this->size_type () == be_decl::VARIABLE)
-        {
-          this->gen_out_defn ();
-        }
-      else
-        {
-          ch->indent ();
-          *ch << "typedef " << this->local_name () << " &" << this->local_name
-            () << "_out;\n\n";
-        }
-
-      // Generate the typecode decl
-      // All names in the root scope have length 2 (for the root and
-      // ourself). The children have length greater than 2. Thus, if our name
-      // length is 2 or less, we are outermost and our typecode decl must be
-      // extern, else we are defined static inside the enclosing scope.
-      if (this->is_nested ())
-        {
-          // we have a scoped name
-          ch->indent ();
-          *ch << "static CORBA::TypeCode_ptr " << this->tc_name
-            ()->last_component () << ";\n\n";
-        }
-      else
-        {
-          // we are in the ROOT scope
-          ch->indent ();
-          *ch << "extern CORBA::TypeCode_ptr " << this->tc_name
-            ()->last_component () << ";\n\n";
-        }
-      cg->pop ();
-      this->cli_hdr_gen_ = I_TRUE;
-    }
-  return 0;
- }
-
-int
-be_union::gen_client_stubs (void)
-{
-  TAO_OutStream *cs; // output stream
-  TAO_NL  nl;        // end line
-
-  if (!this->cli_stub_gen_)
-    {
-      // retrieve a singleton instance of the code generator
-      TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-      cg->push (TAO_CodeGen::TAO_UNION_PUBLIC_CS); // set current code gen state
-
-      cs = cg->client_stubs ();
-
-      *cs << "// *************************************************************"
-          << nl;
-      *cs << "// Operations for union " << this->name () << nl;
-      *cs << "// *************************************************************\n\n";
-
-      // generate the copy constructor and the assignment operator here
-      cs->indent ();
-      *cs << "// copy constructor" << nl;
-      *cs << this->name () << "::" << this->local_name () << " (const " <<
-        this->name () << " &u)" << nl;
-      *cs << "{\n";
-      cs->incr_indent ();
-      // first set the discriminant
-      *cs << "this->disc_ = u.disc_;" << nl;
-      // now switch based on the disc value
-      *cs << "switch (this->disc_)" << nl;
-      *cs << "{\n";
-      cs->incr_indent (0);
-      if (be_scope::gen_client_stubs () == -1)
-        {
-          ACE_ERROR ((LM_ERROR, "be_union::gen_client_stubs\n"));
-          ACE_ERROR ((LM_ERROR, "constructor codegen failure\n"));
-          return -1;
-        }
-      cs->decr_indent ();
-      *cs << "}\n";
-      cs->decr_indent ();
-      *cs << "}\n\n";
-
-      cs->indent ();
-      *cs << "// assignment operator" << nl;
-      *cs << this->name () << " &" << nl; // return type
-      *cs << this->name () << "::operator= (const " <<
-        this->name () << " &u)" << nl;
-      *cs << "{\n";
-      cs->incr_indent ();
-      // first set the discriminant
-      *cs << "this->disc_ = u.disc_;" << nl;
-      // now switch based on the disc value
-      *cs << "switch (this->disc_)" << nl;
-      *cs << "{\n";
-      cs->incr_indent (0);
-      if (be_scope::gen_client_stubs () == -1)
-        {
-          ACE_ERROR ((LM_ERROR, "be_union::gen_client_stubs\n"));
-          ACE_ERROR ((LM_ERROR, "assignment op codegen failure\n"));
-          return -1;
-        }
-      cs->decr_indent ();
-      *cs << "}" << nl;
-      *cs << "return *this;\n";
-      cs->decr_indent ();
-      *cs << "}\n\n";
-
-      // generate the typecode information here
-      cs->indent (); // start from current indentation level
-      *cs << "static const CORBA::Long _oc_" << this->flatname () << "[] =" <<
-        nl;
-      *cs << "{\n";
-      cs->incr_indent (0);
-      if (this->gen_encapsulation () == -1)
-        {
-          ACE_ERROR ((LM_ERROR, "be_union:Error generating encapsulation\n\n"));
-          return -1;
-        }
-      cs->decr_indent ();
-      *cs << "};" << nl;
-
-      *cs << "static CORBA::TypeCode _tc__tc_" << this->flatname () <<
-        " (CORBA::tk_union, sizeof (_oc_" <<  this->flatname () <<
-        "), (unsigned char *) &_oc_" << this->flatname () <<
-        ", CORBA::B_FALSE);" << nl;
-      *cs << "CORBA::TypeCode_ptr " << this->tc_name () << " = &_tc__tc_" <<
-        this->flatname () << ";\n\n";
-      this->cli_stub_gen_ = I_TRUE;
-      cg->pop ();
-    }
-  return 0;
-}
-
-int
-be_union::gen_server_header (void)
-{
-  return 0;
-}
-
-int
-be_union::gen_server_skeletons (void)
-{
-  return 0;
-}
-
-// Generates the client-side inline information
-int
-be_union::gen_client_inline (void)
-{
-  TAO_OutStream *ci; // output stream
-  TAO_NL  nl;        // end line
-  be_type *bt;       // type node
-  be_state *s;       // code generation state
-
-
-  if (!this->cli_inline_gen_)
-    {
-      // retrieve a singleton instance of the code generator
-      TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-      ci = cg->client_inline ();
-
-      *ci << "// *************************************************************"
-          << nl;
-      *ci << "// Inline operations for union " << this->name () << nl;
-      *ci << "// *************************************************************\n\n";
-
-      // generate the default constructor and the destructor here
-      ci->indent ();
-      *ci << "// default constructor" << nl;
-      *ci << "ACE_INLINE" << nl;
-      *ci << this->name () << "::" << this->local_name () << " (void)" << nl;
-      *ci << "{" << nl;
-      *ci << "}" << nl << nl;
-
-      *ci << "// destructor" << nl;
-      *ci << "ACE_INLINE" << nl;
-      *ci << this->name () << "::~" << this->local_name () << " (void)" << nl;
-      *ci << "{" << nl;
-      *ci << "}\n\n";
-
-      // the discriminant type may have to be defined here if it was an enum
-      // declaration inside of the union statement.
-
-      cg->push (TAO_CodeGen::TAO_UNION_DISCTYPEDEFN_CI); // set current code gen state
-      bt = be_type::narrow_from_decl (this->disc_type ());
-
-      s  = cg->make_state (); // get the code gen object for the current state
-      if (!s || !bt || (s->gen_code (bt, this) == -1))
-        {
-          ACE_ERROR ((LM_ERROR, "be_union::gen_client_header\n"));
-          ACE_ERROR ((LM_ERROR, "Discriminant type generation failure\n"));
-          return -1;
-        }
-      cg->pop ();
-
-      // now generate the implementation of the access methods
-      cg->push (TAO_CodeGen::TAO_UNION_PUBLIC_CI); // set current code gen state
-      if (be_scope::gen_client_inline () == -1)
-        {
-          ACE_ERROR ((LM_ERROR, "be_union::gen_client_inline\n"));
-          ACE_ERROR ((LM_ERROR, "accessor generation failure\n"));
-          return -1;
-        }
-      cg->pop ();
-
-      if (this->gen_var_impl () == -1)
-        {
-          ACE_ERROR ((LM_ERROR, "be_union: _var impl code gen failed\n"));
-          return -1;
-        }
-      if (this->size_type () == be_decl::VARIABLE && this->gen_out_impl () == -1)
-        {
-          ACE_ERROR ((LM_ERROR, "be_union: _out impl code gen failed\n"));
-          return -1;
-        }
-      this->cli_inline_gen_ = I_TRUE;
-    }
-  return 0;
-}
-
-// Generates the server-side inline
-int
-be_union::gen_server_inline (void)
-{
-  // nothing to be done
-  return 0;
-}
-
-// generate typecode.
-// Typecode for union comprises the enumerated value followed by the
-// encapsulation of the parameters
-
-// generate the _var definition for ourself
-int
-be_union::gen_var_defn (void)
-{
-  TAO_OutStream *ch; // output stream
-  TAO_NL  nl;        // end line
-  char namebuf [NAMEBUFSIZE];  // names
-
-  ACE_OS::memset (namebuf, '\0', NAMEBUFSIZE);
-  ACE_OS::sprintf (namebuf, "%s_var", this->local_name ()->get_string ());
-
-  // retrieve a singleton instance of the code generator
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-
-  ch = cg->client_header ();
-
-  // generate the var definition (always in the client header).
-  // Depending upon the data type, there are some differences which we account
-  // for over here.
-
-  ch->indent (); // start with whatever was our current indent level
-  *ch << "class " << namebuf << nl;
-  *ch << "{" << nl;
-  *ch << "public:\n";
-  ch->incr_indent ();
-  // default constr
-  *ch << namebuf << " (void); // default constructor" << nl;
-  // constr
-  *ch << namebuf << " (" << local_name () << " *);" << nl;
-  // copy constructor
-  *ch << namebuf << " (const " << namebuf <<
-    " &); // copy constructor" << nl;
-  // destructor
-  *ch << "~" << namebuf << " (void); // destructor" << nl;
-  *ch << nl;
-  // assignment operator from a pointer
-  *ch << namebuf << " &operator= (" << local_name () << " *);" << nl;
-  // assignment from _var
-  *ch << namebuf << " &operator= (const " << namebuf << " &);" << nl;
-
-  // arrow operator
-  *ch << local_name () << " *operator-> (void);" << nl;
-  *ch << "const " << local_name () << " *operator-> (void) const;" << nl;
-  *ch << nl;
-
-  // other extra types (cast operators, [] operator, and others)
-  *ch << "operator const " << local_name () << " &() const;" << nl;
-  *ch << "operator " << local_name () << " &();" << nl;
-  *ch << "operator " << local_name () << " &() const;" << nl;
-  *ch << "// in, inout, out, _retn " << nl;
-  // the return types of in, out, inout, and _retn are based on the parameter
-  // passing rules and the base type
-  if (this->size_type () == be_decl::FIXED)
-    {
-      *ch << "const " << local_name () << " &in (void) const;" << nl;
-      *ch << local_name () << " &inout (void);" << nl;
-      *ch << local_name () << " &out (void);" << nl;
-      *ch << local_name () << " _retn (void);" << nl;
-    }
-  else
-    {
-      *ch << "const " << local_name () << " &in (void) const;" << nl;
-      *ch << local_name () << " &inout (void);" << nl;
-      *ch << local_name () << " *&out (void);" << nl;
-      *ch << local_name () << " *_retn (void);" << nl;
-    }
-
-  // generate an additional member function that returns the underlying pointer
-  *ch << local_name () << " *ptr(void) const;\n";
-
-  *ch << "\n";
-  ch->decr_indent ();
-
-  // generate the private section
-  *ch << "private:\n";
-  ch->incr_indent ();
-  *ch << local_name () << " *ptr_;\n";
-  ch->decr_indent ();
-  *ch << "};\n\n";
-
-  return 0;
-}
-
-// implementation of the _var class. All of these get generated in the inline
-// file
-int
-be_union::gen_var_impl (void)
-{
-  TAO_OutStream *ci; // output stream
-  TAO_NL  nl;        // end line
-  char fname [NAMEBUFSIZE];  // to hold the full and
-  char lname [NAMEBUFSIZE];  // local _var names
-
-  ACE_OS::memset (fname, '\0', NAMEBUFSIZE);
-  ACE_OS::sprintf (fname, "%s_var", this->fullname ());
-
-  ACE_OS::memset (lname, '\0', NAMEBUFSIZE);
-  ACE_OS::sprintf (lname, "%s_var", local_name ()->get_string ());
-
-  // retrieve a singleton instance of the code generator
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-
-  ci = cg->client_inline ();
-  cg->outstream (ci);
-
-  ci->indent (); // start with whatever was our current indent level
-
-  *ci << "// *************************************************************"
-      << nl;
-  *ci << "// Inline operations for class " << fname << nl;
-  *ci << "// *************************************************************\n\n";
-
-  // default constr
-  *ci << "ACE_INLINE" << nl;
-  *ci << fname << "::" << lname <<
-    " (void) // default constructor" << nl;
-  *ci << "\t" << ": ptr_ (0)" << nl;
-  *ci << "{}\n\n";
-
-  // constr from a pointer
-  ci->indent ();
-  *ci << "ACE_INLINE" << nl;
-  *ci << fname << "::" << lname << " (" << name () << " *p)" << nl;
-  *ci << "\t: ptr_ (p)" << nl;
-  *ci << "{}\n\n";
-
-  // copy constructor
-  ci->indent ();
-  *ci << "ACE_INLINE" << nl;
-  *ci << fname << "::" << lname << " (const " << fname <<
-    " &p) // copy constructor" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "if (p.ptr_)" << nl;
-  *ci << "\tthis->ptr_ = new " << this->name () << "(*p.ptr_);" << nl;
-  *ci << "else" << nl;
-  *ci << "\tthis->ptr_ = 0;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  // destructor
-  ci->indent ();
-  *ci << "ACE_INLINE" << nl;
-  *ci << fname << "::~" << lname << " (void) // destructor" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "delete this->ptr_;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  // assignment operator from a pointer
-  ci->indent ();
-  *ci << "ACE_INLINE " << fname << " &" << nl;
-  *ci << fname << "::operator= (" << name () <<
-    " *p)" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "delete this->ptr_;" << nl;
-  *ci << "this->ptr_ = p;" << nl;
-  *ci << "return *this;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  // assignment operator from _var
-  ci->indent ();
-  *ci << "ACE_INLINE " << fname << " &" << nl;
-  *ci << fname << "::operator= (const " << fname <<
-    " &p)" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "if (this != &p)" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "delete this->ptr_;" << nl;
-  *ci << "this->ptr_ = new " << this->name () << " (*p.ptr_);\n";
-  ci->decr_indent ();
-  *ci << "}" << nl;
-  *ci << "return *this;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  // two arrow operators
-  ci->indent ();
-  *ci << "ACE_INLINE const " << this->name () << " *" << nl;
-  *ci << fname << "::operator-> (void) const" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "return this->ptr_;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  ci->indent ();
-  *ci << "ACE_INLINE " << this->name () << " *" << nl;
-  *ci << fname << "::operator-> (void)" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "return this->ptr_;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  // other extra methods - 3 cast operator ()
-  ci->indent ();
-  *ci << "ACE_INLINE " << nl;
-  *ci << fname << "::operator const " << name () <<
-    " &() const // cast" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "return *this->ptr_;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  ci->indent ();
-  *ci << "ACE_INLINE " << nl;
-  *ci << fname << "::operator " << name () << " &() // cast " << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "return *this->ptr_;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  ci->indent ();
-  *ci << "ACE_INLINE " << nl;
-  *ci << fname << "::operator " << name () << " &() const// cast " << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "return *this->ptr_;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  // in, inout, out, and _retn
-  ci->indent ();
-  *ci << "ACE_INLINE const " << name () << " &" << nl;
-  *ci << fname << "::in (void) const" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "return *this->ptr_;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  ci->indent ();
-  *ci << "ACE_INLINE " << name () << " &" << nl;
-  *ci << fname << "::inout (void)" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "return *this->ptr_;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  // the out is handled differently based on our size type
-  ci->indent ();
-  if (this->size_type () == be_decl::VARIABLE)
-    {
-      *ci << "// mapping for variable size " << nl;
-      *ci << "ACE_INLINE " << name () << " *&" << nl;
-      *ci << fname << "::out (void)" << nl;
-      *ci << "{\n";
-      ci->incr_indent ();
-      *ci << "delete this->ptr_;" << nl;
-      *ci << "this->ptr_ = 0;" << nl;
-      *ci << "return this->ptr_;\n";
-      ci->decr_indent ();
-      *ci << "}\n\n";
-
-      ci->indent ();
-      *ci << "ACE_INLINE " << name () << " *" << nl;
-      *ci << fname << "::_retn (void)" << nl;
-      *ci << "{\n";
-      ci->incr_indent ();
-      *ci << this->name () << " *tmp = this->ptr_;" << nl;
-      *ci << "this->ptr_ = 0;" << nl;
-      *ci << "return tmp;\n";
-      ci->decr_indent ();
-      *ci << "}\n\n";
-
-    }
-  else
-    {
-      *ci << "// mapping for fixed size " << nl;
-      *ci << "ACE_INLINE " << name () << " &" << nl;
-      *ci << fname << "::out (void)" << nl;
-      *ci << "{\n";
-      ci->incr_indent ();
-      *ci << "return *this->ptr_;\n";
-      ci->decr_indent ();
-      *ci << "}\n\n";
-
-      ci->indent ();
-      *ci << "ACE_INLINE " << name () << nl;
-      *ci << fname << "::_retn (void)" << nl;
-      *ci << "{\n";
-      ci->incr_indent ();
-      *ci << "return *this->ptr_;\n";
-      ci->decr_indent ();
-      *ci << "}\n\n";
-
-      // the additional ptr () member function
-      ci->indent ();
-      *ci << "ACE_INLINE " << name () << " *" << nl;
-      *ci << fname << "::ptr (void) const" << nl;
-      *ci << "{\n";
-      ci->incr_indent ();
-      *ci << "return this->ptr_;\n";
-      ci->decr_indent ();
-      *ci << "}\n\n";
-
-    }
-
-  return 0;
-}
-
-// generate the _out definition
-int
-be_union::gen_out_defn (void)
-{
-  TAO_OutStream *ch; // output stream
-  TAO_NL  nl;        // end line
-  char namebuf [NAMEBUFSIZE];  // to hold the _out name
-
-  ACE_OS::memset (namebuf, '\0', NAMEBUFSIZE);
-  ACE_OS::sprintf (namebuf, "%s_out", local_name ()->get_string ());
-
-  // retrieve a singleton instance of the code generator
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-
-  ch = cg->client_header ();
-
-  // generate the out definition (always in the client header)
-  ch->indent (); // start with whatever was our current indent level
-
-  *ch << "class " << namebuf << nl;
-  *ch << "{" << nl;
-  *ch << "public:\n";
-  ch->incr_indent ();
-
-  // No default constructor
-
-  // constructor from a pointer
-  *ch << namebuf << " (" << local_name () << " *&);" << nl;
-  // constructor from a _var &
-  *ch << namebuf << " (" << local_name () << "_var &);" << nl;
-  // constructor from a _out &
-  *ch << namebuf << " (" << namebuf << " &);" << nl;
-  // assignment operator from a _out &
-  *ch << namebuf << " &operator= (" << namebuf << " &);" << nl;
-  // assignment operator from a pointer &, cast operator, ptr fn, operator
-  // -> and any other extra operators
-  // assignment
-  *ch << namebuf << " &operator= (" << local_name () << " *);" << nl;
-  // operator ()
-  *ch << "operator " << local_name () << " *&();" << nl;
-  // ptr fn
-  *ch << local_name () << " *&ptr (void);" << nl;
-  // operator ->
-  *ch << local_name () << " *operator-> (void);" << nl;
-
-  *ch << "\n";
-  ch->decr_indent ();
-  *ch << "private:\n";
-  ch->incr_indent ();
-  *ch << local_name () << " *&ptr_;" << nl;
-  *ch << "// assignment from T_var not allowed" << nl;
-  *ch << "void operator= (const " << local_name () << "_var &);\n";
-
-  ch->decr_indent ();
-  *ch << "};\n\n";
-  return 0;
-}
-
-int
-be_union::gen_out_impl (void)
-{
-  TAO_OutStream *ci; // output stream
-  TAO_NL  nl;        // end line
-  char fname [NAMEBUFSIZE];  // to hold the full and
-  char lname [NAMEBUFSIZE];  // local _out names
-
-  ACE_OS::memset (fname, '\0', NAMEBUFSIZE);
-  ACE_OS::sprintf (fname, "%s_out", this->fullname ());
-
-  ACE_OS::memset (lname, '\0', NAMEBUFSIZE);
-  ACE_OS::sprintf (lname, "%s_out", local_name ()->get_string ());
-
-  // retrieve a singleton instance of the code generator
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-
-  ci = cg->client_inline ();
-  cg->outstream (ci);
-
-  // generate the var implementation in the inline file
-
-  ci->indent (); // start with whatever was our current indent level
-
-  *ci << "// *************************************************************"
-      << nl;
-  *ci << "// Inline operations for class " << fname << nl;
-  *ci << "// *************************************************************\n\n";
-
-  // constr from a pointer
-  ci->indent ();
-  *ci << "ACE_INLINE" << nl;
-  *ci << fname << "::" << lname << " (" << name () << " *&p)" << nl;
-  *ci << "\t: ptr_ (p)" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "this->ptr_ = 0;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  // constructor from _var &
-  ci->indent ();
-  *ci << "ACE_INLINE" << nl;
-  *ci << fname << "::" << lname << " (" << this->name () <<
-    "_var &p) // constructor from _var" << nl;
-  *ci << "\t: ptr_ (p.out ())" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "delete this->ptr_;" << nl;
-  *ci << "this->ptr_ = 0;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  // copy constructor
-  ci->indent ();
-  *ci << "ACE_INLINE" << nl;
-  *ci << fname << "::" << lname << " (" << fname <<
-    " &p) // copy constructor" << nl;
-  *ci << "\t: ptr_ (p.ptr_)" << nl;
-  *ci << "{}\n\n";
-
-  // assignment operator from _out &
-  ci->indent ();
-  *ci << "ACE_INLINE " << fname << " &" << nl;
-  *ci << fname << "::operator= (" << fname <<
-    " &p)" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "this->ptr_ = p.ptr_;" << nl;
-  *ci << "return *this;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  // assignment from _var is not allowed by a private declaration
-
-  // assignment operator from pointer
-  ci->indent ();
-  *ci << "ACE_INLINE " << fname << " &" << nl;
-  *ci << fname << "::operator= (" << this->name () <<
-    " *p)" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "this->ptr_ = p;" << nl;
-  *ci << "return *this;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  // other extra methods - cast operator ()
-  ci->indent ();
-  *ci << "ACE_INLINE " << nl;
-  *ci << fname << "::operator " << this->name () <<
-    " *&() // cast" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "return this->ptr_;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  // ptr function
-  ci->indent ();
-  *ci << "ACE_INLINE " << this->name () << " *&" << nl;
-  *ci << fname << "::ptr (void) // ptr" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "return this->ptr_;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  // operator ->
-  ci->indent ();
-  *ci << "ACE_INLINE " << this->name () << " *" << nl;
-  *ci << fname << "::operator-> (void)" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "return this->ptr_;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-
-  return 0;
-}
-
-int
-be_union::gen_typecode (void)
-{
-  TAO_OutStream *cs; // output stream
-  TAO_NL  nl;        // end line
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-
-  cs = cg->client_stubs ();
-  cs->indent (); // start from whatever indentation level we were at
-
-  *cs << "CORBA::tk_union, // typecode kind" << nl;
-  *cs << this->tc_encap_len () << ", // encapsulation length\n";
-  // now emit the encapsulation
-  return this->gen_encapsulation ();
-}
-
-// generate encapsulation.
-// An encapsulation for ourselves will be necessary when we are part of some
-// other IDL type and a typecode for that other type is being generated. This
-// will comprise our typecode kind. IDL types with parameters will additionally
-// have the encapsulation length and the entire typecode description
-
-int
-be_union::gen_encapsulation (void)
-{
-  TAO_OutStream *cs; // output stream
-  TAO_NL  nl;        // end line
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-  long i, arrlen;
-  long *arr;  // an array holding string names converted to array of longs
-  be_type *discrim;
-
-  cs = cg->client_stubs ();
-  cs->indent (); // start from whatever indentation level we were at
-
-  *cs << "TAO_ENCAP_BYTE_ORDER, // byte order" << nl;
-  // generate repoID
-  *cs << (ACE_OS::strlen (this->repoID ())+1) << ", ";
-  (void)this->tc_name2long (this->repoID (), arr, arrlen);
-  for (i=0; i < arrlen; i++)
-    {
-      cs->print ("0x%x, ", arr[i]);
-    }
-  *cs << " // repository ID = " << this->repoID () << nl;
-  // generate name
-  *cs << (ACE_OS::strlen (this->local_name ()->get_string ())+1) << ", ";
-  (void)this->tc_name2long(this->local_name ()->get_string (), arr, arrlen);
-  for (i=0; i < arrlen; i++)
-    {
-      cs->print ("0x%x, ", arr[i]);
-    }
-  *cs << " // name = " << this->local_name () << ",\n";
-
-  // generate typecode for discriminant
-  discrim = be_type::narrow_from_decl (this->disc_type ());
-  if (discrim->gen_typecode () == -1)
-    {
-      ACE_ERROR ((LM_ERROR, "be_union: cannot generate typecode for discriminant\n"));
-      return -1;
-    }
-
-  // generate the default used flag
-  cs->indent ();
-  *cs << this->default_index () << ", // default used index" << nl;
-  // generate the member count
-  *cs << this->member_count () << ", // member count\n";
-  cs->incr_indent (0);
-  // hand over to the scope to generate the typecode for elements
-  if (be_scope::gen_encapsulation () == -1)
-    {
-      ACE_ERROR ((LM_ERROR, "be_union: cannot generate code for members\n"));
-      return -1;
-    }
-  cs->decr_indent (0);
-  return 0;
-}
-
-// compute typecode size
-long
-be_union::tc_size (void)
-{
-  // 4 bytes for enumeration, 4 bytes for storing encap length val, followed by the
-  // actual encapsulation length
-  return 4 + 4 + this->tc_encap_len ();
-}
-
-long
-be_union::tc_encap_len (void)
-{
-  if (this->encap_len_ == -1) // not computed yet
-    {
-      long slen;
-      be_type *discrim;
-
-      // Macro to avoid "warning: unused parameter" type warning.
-      ACE_UNUSED_ARG (slen);
-
-      this->encap_len_ = 4;  // holds the byte order flag
-
-      this->encap_len_ += this->repoID_encap_len (); // for repoID
-
-      // do the same thing for the local name
-      this->encap_len_ += this->name_encap_len (); // for name
-
-      // add encapsulation size of discriminant typecode
-      discrim = be_type::narrow_from_decl (this->disc_type ());
-      this->encap_len_ += discrim->tc_size ();
-
-      this->encap_len_ += 4; // to hold the "default used" flag
-      this->encap_len_ += 4; // to hold the member count
-
-      // compute encap length for members
-      this->encap_len_ += be_scope::tc_encap_len ();
-    }
-  return this->encap_len_;
-}
-
-// Narrowing
-IMPL_NARROW_METHODS3 (be_union, AST_Union, be_scope, be_type)
-IMPL_NARROW_FROM_DECL (be_union)
-IMPL_NARROW_FROM_SCOPE (be_union)
diff --git a/TAO/TAO_IDL/be/be_union_branch.cpp b/TAO/TAO_IDL/be/be_union_branch.cpp
deleted file mode 100644
index dc5477e00cf..00000000000
--- a/TAO/TAO_IDL/be/be_union_branch.cpp
+++ /dev/null
@@ -1,207 +0,0 @@
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    be_union_branch.cpp
-//
-// = DESCRIPTION
-//    Extension of class AST_UnionBranch that provides additional means for C++
-//    mapping.
-//
-// = AUTHOR
-//    Copyright 1994-1995 by Sun Microsystems, Inc.
-//    and
-//    Aniruddha Gokhale
-//
-// ============================================================================
-
-#include	"idl.h"
-#include	"idl_extern.h"
-#include	"be.h"
-
-/*
- * BE_UnionBranch
- */
-be_union_branch::be_union_branch (void)
-{
-}
-
-be_union_branch::be_union_branch (AST_UnionLabel *lab, AST_Type *ft,
-                                  UTL_ScopedName *n, UTL_StrList *p)
-  : AST_UnionBranch (lab, ft, n, p),
-    AST_Field (AST_Decl::NT_union_branch, ft, n, p),
-    AST_Decl (AST_Decl::NT_union_branch, n, p)
-{
-#if 0
-  // computes the repoID
-  compute_repoID ();
-
-  // computes the fully scoped name
-  compute_fullname ();
-
-  // compute the flattened fully scoped name
-  compute_flatname ();
-#endif
-}
-
-// ----------------------------------------
-//            CODE GENERATION METHODS
-// ----------------------------------------
-
-// Generates the client-side header information for the union_branch
-int
-be_union_branch::gen_client_header (void)
-{
-  be_type *bt;  // the union_branch type
-  be_state *s;  // state based code gen object
-
-  // retrieve a singleton instance of the code generator
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-
-  bt = be_type::narrow_from_decl (this->field_type ());
-  s   = cg->make_state ();
-  if (!s || !bt || (s->gen_code (bt, this) ==  -1))
-    {
-      ACE_ERROR ((LM_ERROR, "be_union_branch: error generating type\n"));
-      return -1;
-    }
-  return 0;
-}
-
-// Generates the client-side stubs for the union_branch
-int
-be_union_branch::gen_client_stubs (void)
-{
-  TAO_OutStream *cs; // output stream
-  TAO_NL  nl;        // end line
-
-  if (!this->cli_stub_gen_)
-    {
-      // retrieve a singleton instance of the code generator
-      TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-
-      cs = cg->client_stubs ();
-
-      cs->indent ();
-      // generate a case stmt
-      if (this->label ()->label_val ()->ec () == AST_Expression::EC_symbol)
-        {
-          *cs << "case " << this->label ()->label_val ()->n ()  << ":\n";
-        }
-      else
-        {
-          *cs << "case " << this->label ()->label_val () << ":\n";
-        }
-      cs->incr_indent ();
-      *cs << "this->" << this->local_name () << "_ = u." << this->local_name ()
-          << "_;" << nl;
-      *cs << "break;\n";
-      cs->decr_indent (0);
-    }
-  return 0;
-}
-
-// Generates the server-side header information for the union_branch
-int
-be_union_branch::gen_server_header (void)
-{
-  // nothing to be done
-  return 0;
-}
-
-// Generates the server-side skeletons for the union_branch
-int
-be_union_branch::gen_server_skeletons (void)
-{
-  // nothing to be done
-  return 0;
-}
-
-// Generates the client-side inline information
-int
-be_union_branch::gen_client_inline (void)
-{
-  be_type *bt;  // the union_branch type
-  be_state *s;  // state based code gen object
-
-  // retrieve a singleton instance of the code generator
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-
-  bt = be_type::narrow_from_decl (this->field_type ());
-  s = cg->make_state ();
-  if (!s || !bt || (s->gen_code (bt, this) ==  -1))
-    {
-      ACE_ERROR ((LM_ERROR,
-        "be_union_branch: error generating impl of access methods\n"));
-      return -1;
-    }
-  return 0;
-}
-
-// Generates the server-side inline
-int
-be_union_branch::gen_server_inline (void)
-{
-  // nothing to be done
-  return 0;
-}
-
-int
-be_union_branch::gen_encapsulation (void)
-{
-  TAO_OutStream *cs; // output stream
-  TAO_NL  nl;        // end line
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-  be_type *bt;  // our type node
-  long i, arrlen;
-  long *arr;  // an array holding string names converted to array of longs
-
-  cs = cg->client_stubs ();
-  cg->node (this); // pass ourselves in case we are needed
-  cs->indent (); // start from whatever indentation level we were at
-
-  // emit the case label value
-  *cs << this->label ()->label_val ();
-  *cs << ", // union case label (evaluated)" << nl;
-  // emit name
-  *cs << (ACE_OS::strlen (this->local_name ()->get_string ())+1) << ", ";
-  (void)this->tc_name2long(this->local_name ()->get_string (), arr, arrlen);
-  for (i=0; i < arrlen; i++)
-    {
-      cs->print ("0x%x, ", arr[i]);
-    }
-  *cs << " // name = " << this->local_name () << "\n";
-
-  // hand over code generation to our type node
-  bt = be_type::narrow_from_decl (this->field_type ());
-  if (!bt)
-    return -1;
-  return bt->gen_typecode ();
-}
-
-long
-be_union_branch::tc_encap_len (void)
-{
-  if (this->encap_len_ == -1)
-    {
-      be_type *bt;
-
-      this->encap_len_ = 4; // case label;
-      this->encap_len_ += this->name_encap_len (); // for name
-      bt = be_type::narrow_from_decl (this->field_type ());
-      if (!bt)
-        {
-          ACE_ERROR ((LM_ERROR, "be_union_branch: bad field type\n"));
-          return -1;
-        }
-      this->encap_len_ += bt->tc_size (); // note that we add the typecode size
-                                          // of the type
-    }
-  return this->encap_len_;
-}
-
-// Narrowing
-IMPL_NARROW_METHODS2 (be_union_branch, AST_UnionBranch, be_decl)
-IMPL_NARROW_FROM_DECL (be_union_branch)
diff --git a/TAO/TAO_IDL/be/be_union_label.cpp b/TAO/TAO_IDL/be/be_union_label.cpp
deleted file mode 100644
index 54c34769d76..00000000000
--- a/TAO/TAO_IDL/be/be_union_label.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
-#include	"idl.h"
-#include	"idl_extern.h"
-#include	"be.h"
-
-/*
- * BE_UnionLabel
- */
-be_union_label::be_union_label()
-{
-}
-be_union_label::be_union_label(AST_UnionLabel::UnionLabel ul,
-			       AST_Expression *v)
-	      : AST_UnionLabel(ul, v)
-{
-}
-
diff --git a/TAO/TAO_IDL/be_include/be.h b/TAO/TAO_IDL/be_include/be.h
deleted file mode 100644
index b89376d8347..00000000000
--- a/TAO/TAO_IDL/be_include/be.h
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-#ifndef _BE_BE_HH
-#define _BE_BE_HH
-
-// be.h
-//
-
-#if defined (ACE_WIN32)
-#pragma    warning(disable:4250)
-#endif /* ACE_WIN32 */
-
-// ACE includes
-
-#include        "ace/ACE.h"
-#include        "ace/OS.h"
-#include        "ace/Singleton.h"
-#include        "ace/Synch.h"
-#include        "ace/Log_Msg.h"
-
-/*
- * BE includes
- */
-
-#include        "be_decl.h"             // class BE_Decl
-#include        "be_scope.h"            // class BE_Scope
-#include	"be_generator.h"	// BE generator class
-#include        "be_type.h"
-#include	"be_predefined_type.h"  // class BE_PredefinedType
-#include	"be_module.h"		// class BE_Module
-#include	"be_interface.h"	// class BE_Interface
-#include	"be_interface_fwd.h"	// class BE_InterfaceFwd
-#include	"be_structure.h"	// class BE_Structure
-#include	"be_exception.h"	// class BE_Exception
-#include        "be_expression.h"       // class BE_Expr_val
-#include	"be_enum.h"		// class BE_Enum
-#include	"be_operation.h"	// class BE_Operation
-#include	"be_field.h"		// class BE_Field
-#include	"be_argument.h"	        // class BE_Argument
-#include	"be_attribute.h"	// class BE_Attribute
-#include	"be_union.h"		// class BE_Union
-#include	"be_union_branch.h"	// class BE_UnionBranch
-#include	"be_union_label.h"	// class BE_UnionLabel
-#include	"be_constant.h"	        // class BE_Constant
-#include	"be_enum_val.h"	        // class BE_EnumVal
-#include	"be_array.h"		// class BE_Array
-#include	"be_sequence.h"	        // class BE_Sequence
-#include	"be_string.h"		// class BE_String
-#include	"be_typedef.h"	        // class BE_Typedef 
-#include        "be_root.h"             // class BE_Root
-
-#include        "be_helper.h"           // helper functions
-#include        "be_state.h"            // code generation states
-#include        "be_codegen.h"          // code generator
-#include        "be_factory.h"          // factory
-
-#endif           // _BE_BE_HH
diff --git a/TAO/TAO_IDL/be_include/be_argument.h b/TAO/TAO_IDL/be_include/be_argument.h
deleted file mode 100644
index a20676a1c82..00000000000
--- a/TAO/TAO_IDL/be_include/be_argument.h
+++ /dev/null
@@ -1,62 +0,0 @@
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-// 
-// = FILENAME
-//    be_argument.h
-//
-// = DESCRIPTION
-//    Extension of class AST_Argument that provides additional means for C++
-//    mapping.
-//
-// = AUTHOR
-//    Copyright 1994-1995 by Sun Microsystems, Inc.
-//    and 
-//    Aniruddha Gokhale
-// 
-// ============================================================================
-
-#if !defined (BE_ARGUMENT_H)
-#define BE_ARGUMENT_H
-
-/*
- * BE_Argument
- */
-class be_argument : public virtual AST_Argument,
-                    public virtual be_decl
-{
-public:
-  // =Operations
-
-  be_argument (void);
-  // default constructor
-
-  be_argument (AST_Argument::Direction d, AST_Type *ft, UTL_ScopedName *n,
-               UTL_StrList *p);
-  // constructor
-
-  virtual int gen_client_header (void);
-  // generate client header for the argument
-
-  virtual int gen_client_stubs (void);
-  // generate client side stubs for the argument
-
-  virtual int gen_server_header (void);
-  // generate server header for the argument
-
-  virtual int gen_server_skeletons (void);
-  // generate server skeletons for the argument
-
-  virtual int gen_client_inline (void);
-  // Generates the client-side inline for the argument
-
-  virtual int gen_server_inline (void);
-  // Generates the server-side inlines for the argument
-
-  // Narrowing
-  DEF_NARROW_METHODS2 (be_argument, AST_Argument, be_decl);
-  DEF_NARROW_FROM_DECL (be_argument);
-};
-
-#endif
diff --git a/TAO/TAO_IDL/be_include/be_array.h b/TAO/TAO_IDL/be_include/be_array.h
deleted file mode 100644
index d03d20e03fe..00000000000
--- a/TAO/TAO_IDL/be_include/be_array.h
+++ /dev/null
@@ -1,91 +0,0 @@
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    be_array.h
-//
-// = DESCRIPTION
-//    Extension of class AST_Array that provides additional means for C++
-//    mapping.
-//
-// = AUTHOR
-//    Copyright 1994-1995 by Sun Microsystems, Inc.
-//    and
-//    Aniruddha Gokhale
-//
-// ============================================================================
-
-#if !defined (BE_ARRAY_H)
-#define BE_ARRAY_H
-
-/*
- * BE_Array
- */
-class be_array : public virtual AST_Array,
-                 public virtual be_type
-{
-public:
-  // =Operations
-
-  be_array (void);
-  // default constructor
-
-  be_array (UTL_ScopedName *n, unsigned long ndims, UTL_ExprList *dims);
-  // constructor
-
-  virtual int gen_client_header (void);
-  // generate client header for array
-
-  virtual int gen_client_stubs (void);
-  // generate client side stubs for array
-
-  virtual int gen_server_header (void);
-  // generate server header for array
-
-  virtual int gen_server_skeletons (void);
-  // generate server skeletons for array
-
-  virtual int gen_client_inline (void);
-  // Generates the client-side inline for the array
-
-  virtual int gen_server_inline (void);
-  // Generates the server-side inlines for the array
-
-  virtual int gen_var_defn (void);
-  // generate the _var class definition
-
-  virtual int gen_var_impl (void);
-  // generate the implementation for the _var class
-
-  virtual int gen_out_defn (void);
-  // generate the _out class definition
-
-  virtual int gen_out_impl (void);
-  // generate the _out implementation
-
-  virtual int gen_forany_defn (void);
-  // the forany class
-
-  virtual int gen_forany_impl (void);
-  // the forany impl
-
-  virtual int gen_typecode (void);
-  // generate the typecode
-
-  virtual int gen_encapsulation (void);
-  // encapsulation for parameters
-
-  virtual long tc_size (void);
-  // return typecode size
-
-  virtual long tc_encap_len (void);
-  // return length of encapsulation
-
-  // Narrowing
-  DEF_NARROW_METHODS2 (be_array, AST_Array, be_type);
-  DEF_NARROW_FROM_DECL (be_array);
-};
-
-#endif
diff --git a/TAO/TAO_IDL/be_include/be_attribute.h b/TAO/TAO_IDL/be_include/be_attribute.h
deleted file mode 100644
index 2461013a402..00000000000
--- a/TAO/TAO_IDL/be_include/be_attribute.h
+++ /dev/null
@@ -1,61 +0,0 @@
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-// 
-// = FILENAME
-//    be_attribute.h
-//
-// = DESCRIPTION
-//    Extension of class AST_Attribute that provides additional means for C++
-//    mapping.
-//
-// = AUTHOR
-//    Copyright 1994-1995 by Sun Microsystems, Inc.
-//    and 
-//    Aniruddha Gokhale
-// 
-// ============================================================================
-
-#if !defined (BE_ATTRIBUTE_H)
-#define BE_ATTRIBUTE_H
-
-/*
- * BE_Attribute
- */
-class be_attribute : public virtual AST_Attribute,
-                     public virtual be_decl
-{
-public:
-  // =Operations
-
-  be_attribute (void);
-  // default constructor
-
-  be_attribute (idl_bool ro, AST_Type *ft, UTL_ScopedName *n, UTL_StrList *p);
-  // constructor
-
-  virtual int gen_client_header (void);
-  // generate client header for the attribute
-
-  virtual int gen_client_stubs (void);
-  // generate client side stubs for the attribute
-
-  virtual int gen_server_header (void);
-  // generate server header for the attribute
-
-  virtual int gen_server_skeletons (void);
-  // generate server skeletons for the attribute
-
-  virtual int gen_client_inline (void);
-  // Generates the client-side inline for the attribute
-
-  virtual int gen_server_inline (void);
-  // Generates the server-side inlines for the attribute
-
-  // Narrowing
-  DEF_NARROW_METHODS2 (be_attribute, AST_Attribute, be_decl);
-  DEF_NARROW_FROM_DECL (be_attribute);
-};
-
-#endif
diff --git a/TAO/TAO_IDL/be_include/be_codegen.h b/TAO/TAO_IDL/be_include/be_codegen.h
deleted file mode 100644
index c4176c2e93d..00000000000
--- a/TAO/TAO_IDL/be_include/be_codegen.h
+++ /dev/null
@@ -1,342 +0,0 @@
-/* -*- c++ -*- */
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    be_codegen.h
-//
-// = DESCRIPTION
-//   The Code generator class
-//
-// = AUTHOR
-//    Aniruddha Gokhale
-//
-// ============================================================================
-
-#if !defined (TAO_BE_CODEGEN_H)
-#define TAO_BE_CODEGEN_H
-
-#define NAMEBUFSIZE  1024
-// maximum length of static buffers used to store names
-
-class TAO_CodeGen
-{
-  // = TITLE
-  //   TAO_CodeGen
-  //
-  // = DESCRIPTION
-  //   Holds global parameters for the Back End and generates the C++ mapping
-  //
-public:
-
-  // define all the code generation states. The first letter C/S of the suffix stands
-  // for client/server-side and the second letter H/I/S stands for
-  // header/inline/impl file.
-  enum CG_STATE
-  {
-    // initial state
-    TAO_INITIAL,
-
-    // emitting code for root
-    TAO_ROOT_CH,
-    TAO_ROOT_CI,
-    TAO_ROOT_CS,
-    TAO_ROOT_SH,
-    TAO_ROOT_SI,
-    TAO_ROOT_SS,
-
-    // emitting code for the module
-    TAO_MODULE_CH,
-    TAO_MODULE_CI,
-    TAO_MODULE_CS,
-    TAO_MODULE_SH,
-    TAO_MODULE_SI,
-    TAO_MODULE_SS,
-
-    // emitting code for the interface
-    TAO_INTERFACE_CH,
-    TAO_INTERFACE_CI,
-    TAO_INTERFACE_CS,
-    TAO_INTERFACE_SH,
-    TAO_INTERFACE_SI,
-    TAO_INTERFACE_SS,
-
-    // emitting code for the constants
-    TAO_CONSTANT_CH,
-    TAO_CONSTANT_CI,
-    TAO_CONSTANT_CS,
-    TAO_CONSTANT_SH,
-    TAO_CONSTANT_SI,
-    TAO_CONSTANT_SS,
-
-    // emitting code for sequence base type
-    TAO_SEQUENCE_BASE_CH,
-    TAO_SEQUENCE_BASE_CI,
-    TAO_SEQUENCE_BASE_CS,
-    TAO_SEQUENCE_BASE_SH,
-    TAO_SEQUENCE_BASE_SI,
-    TAO_SEQUENCE_BASE_SS,
-
-    // emitting code for sequence body
-    TAO_SEQUENCE_BODY_CH,
-    TAO_SEQUENCE_BODY_CI,
-    TAO_SEQUENCE_BODY_CS,
-    TAO_SEQUENCE_BODY_SH,
-    TAO_SEQUENCE_BODY_SI,
-    TAO_SEQUENCE_BODY_SS,
-
-    // emitting code for the discriminant
-    TAO_UNION_DISCTYPEDEFN_CH,
-    TAO_UNION_DISCTYPEDEFN_CI,
-    TAO_UNION_DISCTYPEDEFN_CS,
-    TAO_UNION_DISCTYPEDEFN_SH,
-    TAO_UNION_DISCTYPEDEFN_SI,
-    TAO_UNION_DISCTYPEDEFN_SS,
-
-    // emitting code for the public members of the union
-    TAO_UNION_PUBLIC_CH,
-    TAO_UNION_PUBLIC_CI,
-    TAO_UNION_PUBLIC_CS,
-    TAO_UNION_PUBLIC_SH,
-    TAO_UNION_PUBLIC_SI,
-    TAO_UNION_PUBLIC_SS,
-
-    // emitting code for private members of the union
-    TAO_UNION_PRIVATE_CH,
-    TAO_UNION_PRIVATE_CI,
-    TAO_UNION_PRIVATE_CS,
-    TAO_UNION_PRIVATE_SH,
-    TAO_UNION_PRIVATE_SI,
-    TAO_UNION_PRIVATE_SS,
-
-    // emitting code for struct and its members
-    TAO_STRUCT_CH,
-    TAO_STRUCT_CI,
-    TAO_STRUCT_CS,
-    TAO_STRUCT_SH,
-    TAO_STRUCT_SI,
-    TAO_STRUCT_SS,
-
-    // emitting code for exceptions
-    TAO_EXCEPTION_CH,
-    TAO_EXCEPTION_CI,
-    TAO_EXCEPTION_CS,
-    TAO_EXCEPTION_SH,
-    TAO_EXCEPTION_SI,
-    TAO_EXCEPTION_SS,
-
-    // emitting code for enums
-    TAO_ENUM_CH,
-    TAO_ENUM_CI,
-    TAO_ENUM_CS,
-    TAO_ENUM_SH,
-    TAO_ENUM_SI,
-    TAO_ENUM_SS,
-
-    // emitting code for array defn
-    TAO_ARRAY_DEFN_CH,
-    TAO_ARRAY_DEFN_CI,
-    TAO_ARRAY_DEFN_CS,
-    TAO_ARRAY_DEFN_SH,
-    TAO_ARRAY_DEFN_SI,
-    TAO_ARRAY_DEFN_SS,
-
-    // emitting code for rest of the array decl
-    TAO_ARRAY_OTHER_CH,
-    TAO_ARRAY_OTHER_CI,
-    TAO_ARRAY_OTHER_CS,
-    TAO_ARRAY_OTHER_SH,
-    TAO_ARRAY_OTHER_SI,
-    TAO_ARRAY_OTHER_SS,
-
-    // emitting code for strings
-    TAO_STRING_CH,
-    TAO_STRING_CI,
-    TAO_STRING_CS,
-    TAO_STRING_SH,
-    TAO_STRING_SI,
-    TAO_STRING_SS,
-
-    // emitting code for an operation.
-    TAO_OPERATION_CH,
-    TAO_OPERATION_CI,
-    TAO_OPERATION_RETURN_TYPE_CS,
-    TAO_OPERATION_RETVAL_DECL_CS,
-    TAO_OPERATION_RETVAL_EXCEPTION_CS,
-    TAO_OPERATION_RETVAL_RETURN_CS,
-    TAO_OPERATION_SH,
-    TAO_OPERATION_SI,
-    TAO_OPERATION_RETVAL_DECL_SS,
-    TAO_OPERATION_RETVAL_ASSIGN_SS,
-    TAO_OPERATION_RESULT_SS,
-
-    // emitting code for arguments of an operation. No distinction between
-    // headers, inclines, stubs.
-    TAO_ARGUMENT_CH,
-    TAO_ARGUMENT_CI,
-    TAO_ARGUMENT_CS,
-    TAO_ARGUMENT_DOCALL_CS,
-    TAO_ARGUMENT_PRE_DOCALL_CS,
-    TAO_ARGUMENT_POST_DOCALL_CS,
-    TAO_ARGUMENT_SH,
-    TAO_ARGUMENT_SI,
-    TAO_ARGUMENT_SS,
-    TAO_ARGUMENT_VARDECL_SS,
-    TAO_ARGUMENT_UPCALL_SS,
-    TAO_ARGUMENT_PRE_UPCALL_SS,
-    TAO_ARGUMENT_POST_UPCALL_SS,
-
-    // emitting code for attributes
-    TAO_ATTRIBUTE_RETURN_TYPE_CH,
-    TAO_ATTRIBUTE_INPARAM_TYPE_CH,
-    TAO_ATTRIBUTE_RETURN_TYPE_CS,
-    TAO_ATTRIBUTE_RETVAL_DECL_CS,
-    TAO_ATTRIBUTE_RETVAL_EXCEPTION_CS,
-    TAO_ATTRIBUTE_RETVAL_RETURN_CS,
-    TAO_ATTRIBUTE_INPARAM_TYPE_CS,
-    TAO_ATTRIBUTE_PRE_DOCALL_CS,
-    TAO_ATTRIBUTE_DOCALL_CS,
-    TAO_ATTRIBUTE_POST_DOCALL_CS,
-    TAO_ATTRIBUTE_RETURN_TYPE_SH,
-    TAO_ATTRIBUTE_INPARAM_TYPE_SH,
-    TAO_ATTRIBUTE_RETVAL_DECL_SS,
-    TAO_ATTRIBUTE_RETVAL_ASSIGN_SS,
-    TAO_ATTRIBUTE_RESULT_SS,
-    TAO_ATTRIBUTE_INPARAM_TYPE_SS,
-    TAO_ATTRIBUTE_PRE_UPCALL_SS,
-    TAO_ATTRIBUTE_UPCALL_SS,
-    TAO_ATTRIBUTE_POST_UPCALL_SS,
-
-    // emitting code for typedefs
-    TAO_TYPEDEF_CH,
-    TAO_TYPEDEF_CI,
-    TAO_TYPEDEF_CS,
-    TAO_TYPEDEF_SH,
-    TAO_TYPEDEF_SI,
-    TAO_TYPEDEF_SS
-  };
-
-  TAO_CodeGen (void);
-  // Constructor
-
-  ~TAO_CodeGen (void);
-  // destructor
-
-  be_state *make_state (void);
-  // factory method returning appropriate subclass of the be_state object
-  // based on the current code generation state
-
-  int gen_cplusplus_mapping (void);
-  // generate the C++ mapping for CORBA IDL
-
-  int client_header (const char *fname);
-  // set the client header stream
-
-  TAO_OutStream *client_header (void);
-  // get the client header stream
-
-  int client_stubs (const char *fname);
-  // set the client stub stream
-
-  TAO_OutStream *client_stubs (void);
-  // get the client stubs stream
-
-  int client_inline (const char *fname);
-  // set the client inline stream
-
-  TAO_OutStream *client_inline (void);
-  // get the client inline stream
-
-  int server_header (const char *fname);
-  // set the server header stream
-
-  TAO_OutStream *server_header (void);
-  // get the server header stream
-
-  int server_skeletons (const char *fname);
-  // set the server skeletons stream
-
-  TAO_OutStream *server_skeletons (void);
-  // get the server skeletons stream
-
-  int server_inline (const char *fname);
-  // set the server inline stream
-
-  TAO_OutStream *server_inline (void);
-  // get the server inline stream
-
-  void outstream (TAO_OutStream *os);
-  // set current out stream
-
-  TAO_OutStream *outstream (void);
-  // retrieve current out stream being used
-
-  int end_client_header (void);
-  // put a last #endif in the client header
-
-  int end_server_header (void);
-  // put a last #endif in the server header
-
-  void push (CG_STATE s);
-  // set the code generation state
-
-  void pop (void);
-  // out of the current state
-
-  void reset (void);
-  // reset the stack to 1
-
-  CG_STATE state (void);
-  // return the current state
-
-  void node (be_decl *n);
-  // pass info
-
-  be_decl *node (void);
-  // retrieve passed info
-
-  const char *upcase (const char *str);
-  // convert input string to all upcase
-
-private:
-  TAO_OutStream *client_header_;
-  // client header stream
-
-  TAO_OutStream *client_stubs_;
-  // client stub file stream
-
-  TAO_OutStream *client_inline_;
-  // client side inline definitions
-
-  TAO_OutStream *server_header_;
-  // server header stream
-
-  TAO_OutStream *server_skeletons_;
-  // server skeleton stream
-
-  TAO_OutStream *server_inline_;
-  // server side inline file
-
-  TAO_OutStream *curr_os_;
-  // currently used out stream
-
-  CG_STATE *state_;
-  // code generation state stack
-
-  int top_;
-  // top of state stack
-
-  int size_;
-  // size of allocated stack
-
-  be_decl *node_;
-  // save current node in this
-};
-
-typedef ACE_Singleton<TAO_CodeGen, ACE_SYNCH_RECURSIVE_MUTEX> TAO_CODEGEN;
-// Singleton instance of the BE code generator
-
-
-#endif // if !defined
diff --git a/TAO/TAO_IDL/be_include/be_constant.h b/TAO/TAO_IDL/be_include/be_constant.h
deleted file mode 100644
index e59426cfc5e..00000000000
--- a/TAO/TAO_IDL/be_include/be_constant.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/* -*- c++ -*- */
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-// 
-// = FILENAME
-//    be_constant.h
-//
-// = DESCRIPTION
-//    Extension of class AST_Constant that provides additional means for C++
-//    mapping.
-//
-// = AUTHOR
-//    Copyright 1994-1995 by Sun Microsystems, Inc.
-//    and 
-//    Aniruddha Gokhale
-// 
-// ============================================================================
-
-#if !defined (BE_CONSTANT_H)
-#define BE_CONSTANT_H
-
-/*
- * BE_Constant
- */
-class be_constant : public virtual AST_Constant , public virtual be_decl
-{
-public:
-  // Operations
-
-  be_constant (void);
-  // constructor
-  
-  be_constant (AST_Expression::ExprType et,
-               AST_Expression *v,
-               UTL_ScopedName *n,
-               UTL_StrList *p);
-  // constructor
-
-  virtual int gen_client_header (void);
-  // Generates the client-side header information for the constant 
-
-  virtual int gen_client_stubs (void);
-  // Generates the client-side stubs for the constant
-
-  virtual int gen_server_header (void);
-  // Generates the server-side header information for the constant 
-
-  virtual int gen_server_skeletons (void);
-  // Generates the server-side skeletons for the constant
-
-  virtual int gen_client_inline (void);
-  // Generates the client-side inline for the constant
-
-  virtual int gen_server_inline (void);
-  // Generates the server-side inlines for the constant
-
-  // Narrowing
-  DEF_NARROW_METHODS2 (be_constant, AST_Constant, be_decl);
-  DEF_NARROW_FROM_DECL (be_constant);
-
-private:
-  char *exprtype_to_string (void);
-  // returns the appropriate type
-};
-
-#endif // if !defined
diff --git a/TAO/TAO_IDL/be_include/be_decl.h b/TAO/TAO_IDL/be_include/be_decl.h
deleted file mode 100644
index b351042b521..00000000000
--- a/TAO/TAO_IDL/be_include/be_decl.h
+++ /dev/null
@@ -1,147 +0,0 @@
-/* -*- c++ -*- */
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    be_decl.h
-//
-// = DESCRIPTION
-//    Extension of the AST_Decl class.
-//
-// = AUTHOR
-//    Copyright 1994-1995 by Sun Microsystems, Inc.
-//    and
-//    Aniruddha Gokhale
-//
-// ============================================================================
-
-#if !defined (TAO_BE_DECL_H)
-#define TAO_BE_DECL_H
-
-/*
- * BE_Decl
- */
-class be_decl : public virtual AST_Decl
-{
-  // = TITLE
-  //   be_decl
-  // = DESCRIPTION
-  //   The back end extension of the AST_Decl class. Provides an abstract
-  //   interface
-  //
-public:
-  enum SIZE_TYPE
-  {
-    FIXED,
-    VARIABLE
-  };
-  // indicates if we are fixed size or variable. Most useful for structs,
-  // unions, and arrays.
-
-  // =Operations
-
-  be_decl (void);
-  // Default constructor
-
-  be_decl (AST_Decl::NodeType type, UTL_ScopedName *n, UTL_StrList *pragmas);
-  // constructor that sets the node type
-
-  ~be_decl (void);
-  // destructor
-
-  virtual int gen_client_header (void) = 0;
-  // Generates the client-side header information for the decl
-
-  virtual int gen_client_stubs (void) = 0;
-  // Generates the client-side stubs for the decl
-
-  virtual int gen_server_header (void) = 0;
-  // Generates the server-side header information for the decl
-
-  virtual int gen_server_skeletons (void) = 0;
-  // Generates the server-side skeletons for the decl
-
-  virtual int gen_client_inline (void) = 0;
-  // Generates the client-side inline for the decl
-
-  virtual int gen_server_inline (void) = 0;
-  // Generates the server-side inlines for the decl
-
-  virtual void size_type (SIZE_TYPE);
-  // set the size type
-
-  virtual SIZE_TYPE size_type (void) const;
-  // return our size type
-
-  const char *repoID (void);
-  // retrieve the repository ID
-
-  const char *fullname (void);
-  // return the stringified full name
-
-  const char *flatname (void);
-  // return the flattened full scoped name
-
-  virtual idl_bool is_nested (void);
-  // determines if we are inside of a nested scope or not
-
-  virtual int gen_encapsulation (void);
-  // encapsulation of parameters
-
-  virtual long tc_encap_len (void);
-  // return length of encapsulation
-
-  // Narrowing
-  DEF_NARROW_METHODS1 (be_decl, AST_Decl);
-  DEF_NARROW_FROM_DECL (be_decl);
-
-protected:
-  // =helper
-
-  virtual void compute_repoID (void);
-  // computes the repoID
-
-  virtual void compute_fullname (void);
-  // computes the fully scoped name
-
-  virtual void compute_flatname (void);
-  // compute the flattened fully scoped name
-
-  virtual int tc_name2long (const char *name, long *&, long &);
-  // name represented as a padded array of longs
-
-  virtual long repoID_encap_len (void);
-  // return encapsulation length required to hold repository ID
-
-  virtual long name_encap_len (void);
-  // return encapsulation length required to hold IDL name
-
-  // variables that indicate if the code generation for that node is already
-  // been done. This way we avoid regenerating same code.
-  idl_bool cli_hdr_gen_;
-  idl_bool cli_stub_gen_;
-  idl_bool cli_inline_gen_;
-  idl_bool srv_hdr_gen_;
-  idl_bool srv_skel_gen_;
-  idl_bool srv_inline_gen_;
-
-  char *fullname_;
-  // our full scoped name
-
-  char *flatname_;
-  // flattened fully scoped name
-
-  char *repoID_;
-  // repository ID
-
-  SIZE_TYPE size_type_;
-  // whether we are fixed or variable size (by default fixed)
-
-  long encap_len_;
-  // encapsulation length - required for typecodes
-
-};
-
-#endif // if !defined
diff --git a/TAO/TAO_IDL/be_include/be_enum.h b/TAO/TAO_IDL/be_include/be_enum.h
deleted file mode 100644
index 9ae63caba05..00000000000
--- a/TAO/TAO_IDL/be_include/be_enum.h
+++ /dev/null
@@ -1,88 +0,0 @@
-/* -*- c++ -*- */
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-// 
-// = FILENAME
-//    be_enum.h
-//
-// = DESCRIPTION
-//    Extension of class AST_Enum that provides additional means for C++
-//    mapping.
-//
-// = AUTHOR
-//    Copyright 1994-1995 by Sun Microsystems, Inc.
-//    and 
-//    Aniruddha Gokhale
-// 
-// ============================================================================
-
-#if !defined (BE_ENUM_H)
-#define BE_ENUM_H
-
-/*
- * BE_Enum
- */
-class be_enum : public virtual AST_Enum,
-                public virtual be_scope,
-                public virtual be_type
-{
-public:
-  // Operations
-
-  be_enum (void);
-  // default constructor
-
-  be_enum (UTL_ScopedName *n, UTL_StrList *p);
-  // constructor
-
-  virtual int gen_client_header (void);
-  // Generates the client-side header information for the enum 
-
-  virtual int gen_client_stubs (void);
-  // Generates the client-side stubs for the enum
-
-  virtual int gen_server_header (void);
-  // Generates the server-side header information for the enum 
-
-  virtual int gen_server_skeletons (void);
-  // Generates the server-side skeletons for the enum
-
-  virtual int gen_client_inline (void);
-  // Generates the client-side inline for the enum
-
-  virtual int gen_server_inline (void);
-  // Generates the server-side inlines for the enum
-
-  virtual int gen_typecode (void);
-  // generate the typecode
-
-  virtual int gen_encapsulation (void);
-  // encapsulation for parameters
-
-  virtual long tc_size (void);
-  // return typecode size
-
-  virtual long tc_encap_len (void);
-  // return length of encapsulation
-
-  virtual int member_count (void);
-  // return the count of members
-
-  // Narrowing
-  DEF_NARROW_METHODS3 (be_enum, AST_Enum, be_scope, be_type);
-  DEF_NARROW_FROM_DECL (be_enum);
-  DEF_NARROW_FROM_SCOPE (be_enum);
-
-private:
-  //=helper
-
-  int compute_member_count (void);
-  // count the number of members
-
-  int member_count_;
-  // number of members
-};
-
-#endif
diff --git a/TAO/TAO_IDL/be_include/be_enum_val.h b/TAO/TAO_IDL/be_include/be_enum_val.h
deleted file mode 100644
index 4a52ea0501f..00000000000
--- a/TAO/TAO_IDL/be_include/be_enum_val.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/* -*- c++ -*- */
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-// 
-// = FILENAME
-//    be_enum_val.h
-//
-// = DESCRIPTION
-//    Extension of class AST_EnumVal that provides additional means for C++
-//    mapping.
-//
-// = AUTHOR
-//    Copyright 1994-1995 by Sun Microsystems, Inc.
-//    and 
-//    Aniruddha Gokhale
-// 
-// ============================================================================
-
-#if !defined (BE_ENUM_VAL_H)
-#define BE_ENUM_VAL_H
-
-/*
- * BE_EnumVal
- */
-class be_enum_val : public virtual AST_EnumVal,
-                    public virtual be_decl
-{
-public:
-  // =Operations
-
-  be_enum_val (void);
-  // default constructor
-
-  be_enum_val (unsigned long v, UTL_ScopedName *n, UTL_StrList *p);
-  // constructor
-
-  virtual int gen_client_header (void);
-  // Generates the client-side header information for the EnumVal 
-
-  virtual int gen_client_stubs (void);
-  // Generates the client-side stubs for the EnumVal
-
-  virtual int gen_server_header (void);
-  // Generates the server-side header information for the EnumVal 
-
-  virtual int gen_server_skeletons (void);
-  // Generates the server-side skeletons for the EnumVal
-
-  virtual int gen_client_inline (void);
-  // Generates the client-side inline for the EnumVal
-
-  virtual int gen_server_inline (void);
-  // Generates the server-side inlines for the EnumVal
-
-  virtual int gen_encapsulation (void);
-  // generate the typecode
-
-  virtual long tc_encap_len (void);
-  // return length of encapsulation
-
-  // Narrowing
-  DEF_NARROW_METHODS2 (be_enum_val, AST_EnumVal, be_decl);
-  DEF_NARROW_FROM_DECL (be_enum_val);
-};
-
-#endif
diff --git a/TAO/TAO_IDL/be_include/be_exception.h b/TAO/TAO_IDL/be_include/be_exception.h
deleted file mode 100644
index d28a35f7389..00000000000
--- a/TAO/TAO_IDL/be_include/be_exception.h
+++ /dev/null
@@ -1,70 +0,0 @@
-#if !defined (BE_EXCEPTION_H)
-#define BE_EXCEPTION_H
-
-/*
- * BE_Exception
- */
-class be_exception : public virtual AST_Exception,
-                     public virtual be_scope,
-                     public virtual be_type
-                       
-{
-public:
-  // Operations
-  be_exception (void);
-  // default constructor
-
-  be_exception (UTL_ScopedName *n, UTL_StrList *p);
-  // constructor
-
-  // =code generation
-
-  virtual int gen_client_header (void);
-  // generate client header
-
-  virtual int gen_client_inline (void);
-  // generate client inline
-
-  virtual int gen_client_stubs (void);
-  // generate client stubs
-
-  virtual int gen_server_header (void);
-  // generate server header
-
-  virtual int gen_server_inline (void);
-  // generate server inline
-
-  virtual int gen_server_skeletons (void);
-  // generate server skeletons
-
-  virtual int gen_typecode (void);
-  // generate the typecode
-
-  virtual int gen_encapsulation (void);
-  // encapsulation for parameters
-
-  virtual long tc_size (void);
-  // return typecode size
-
-  virtual long tc_encap_len (void);
-  // return length of encapsulation
-
-  virtual int member_count (void);
-  // return the count of members
-
-  // Narrowing
-  DEF_NARROW_METHODS3 (be_exception, AST_Exception, be_scope, be_type);
-  DEF_NARROW_FROM_DECL (be_exception);
-  DEF_NARROW_FROM_SCOPE (be_exception);
-
-private:
-  //=helper
-
-  int compute_member_count (void);
-  // count the number of members
-
-  int member_count_;
-  // number of members
-};
-
-#endif // end of if !defined (...)
diff --git a/TAO/TAO_IDL/be_include/be_expression.h b/TAO/TAO_IDL/be_include/be_expression.h
deleted file mode 100644
index ae3d90d2164..00000000000
--- a/TAO/TAO_IDL/be_include/be_expression.h
+++ /dev/null
@@ -1,43 +0,0 @@
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-// 
-// = FILENAME
-//    be_expression.h
-//
-// = DESCRIPTION
-//    Extension of class AST_Expression that provides additional means for C++
-//    mapping.
-//
-// = AUTHOR
-//    Copyright 1994-1995 by Sun Microsystems, Inc.
-//    and 
-//    Aniruddha Gokhale
-// 
-// ============================================================================
-
-#if !defined (BE_EXPRESSION_H)
-#define BE_EXPRESSION_H
-
-/*
- * BE_Expression
- */
-class be_expression : public virtual AST_Expression 
-{
-public:
-  // Operations
-  be_expression (UTL_ScopedName *n);
-  be_expression (AST_Expression *b, AST_Expression::ExprType t);
-  be_expression (AST_Expression::ExprComb c,
-                 AST_Expression *v1,
-                 AST_Expression *v2);
-  be_expression (long l);
-  be_expression (long l, AST_Expression::ExprType t);
-  be_expression (unsigned long l);
-  be_expression (String *s);
-  be_expression (char c);
-  be_expression (double d);
-};
-
-#endif
diff --git a/TAO/TAO_IDL/be_include/be_factory.h b/TAO/TAO_IDL/be_include/be_factory.h
deleted file mode 100644
index a45affafb94..00000000000
--- a/TAO/TAO_IDL/be_include/be_factory.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/* -*- c++ -*- */
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL Backend
-// 
-// = FILENAME
-//    be_factory.h
-//
-// = DESCRIPTION
-//    Defines a factory that returns a specialized output stream object that
-//    understands a specific Front End
-//
-// = AUTHOR
-//    Aniruddha Gokhale
-// 
-// ============================================================================
-
-#if !defined (TAO_BE_FACTORY_H)
-#define TAO_BE_FACTORY_H
-
-class TAO_OutStream_Factory
-{
-  // =TITLE
-  //   TAO_OutStream_Factory
-  // =DESCRIPTION
-  //   factory to produce specialized instances of the output stream objects
-public:
-  enum TAO_OutStream_Type
-  {
-    TAO_SUNSOFT,
-    TAO_FLICK
-  };
-  
-  TAO_OutStream_Factory (void);
-  // constructor
-
-  ~TAO_OutStream_Factory (void);
-  // destructor
-
-  TAO_OutStream *make_outstream (void);
-  // make the specialized out stream class
-
-  int set_stream_type (TAO_OutStream_Type t);
-  // set the stream type
-
-private:
-  TAO_OutStream_Type  strm_type_;
-};
-
-typedef ACE_Singleton<TAO_OutStream_Factory, ACE_SYNCH_RECURSIVE_MUTEX> TAO_OUTSTREAM_FACTORY;
-// Singleton instance of the OutStream factory
-
-#endif // if !defined
-
diff --git a/TAO/TAO_IDL/be_include/be_field.h b/TAO/TAO_IDL/be_include/be_field.h
deleted file mode 100644
index 1da3a2a23a8..00000000000
--- a/TAO/TAO_IDL/be_include/be_field.h
+++ /dev/null
@@ -1,68 +0,0 @@
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-// 
-// = FILENAME
-//    be_field.h
-//
-// = DESCRIPTION
-//    Extension of class AST_Field that provides additional means for C++
-//    mapping.
-//
-// = AUTHOR
-//    Copyright 1994-1995 by Sun Microsystems, Inc.
-//    and 
-//    Aniruddha Gokhale
-// 
-// ============================================================================
-
-#if !defined (BE_FIELD_H)
-#define BE_FIELD_H
-
-/*
- * BE_Field
- */
-class be_field : public virtual AST_Field,
-                 public virtual be_decl
-{
-public:
-  // =Operations
-
-  be_field (void);
-  // default constructor
-
-  be_field (AST_Type *ft, UTL_ScopedName *n, UTL_StrList *p);
-  // constructor
-
-  virtual int gen_client_header (void);
-  // Generates the client-side header information for the field 
-
-  virtual int gen_client_stubs (void);
-  // Generates the client-side stubs for the field
-
-  virtual int gen_server_header (void);
-  // Generates the server-side header information for the field 
-
-  virtual int gen_server_skeletons (void);
-  // Generates the server-side skeletons for the field
-
-  virtual int gen_client_inline (void);
-  // Generates the client-side inline for the field
-
-  virtual int gen_server_inline (void);
-  // Generates the server-side inlines for the field
-
-  virtual int gen_encapsulation (void);
-  // generate the typecode
-
-  virtual long tc_encap_len (void);
-  // return the total byte length of ourselves represented as an encapsulation
-
-  // Narrowing
-  DEF_NARROW_METHODS2 (be_field, AST_Field, be_decl);
-  DEF_NARROW_FROM_DECL (be_field);
-
-};
-
-#endif
diff --git a/TAO/TAO_IDL/be_include/be_generator.h b/TAO/TAO_IDL/be_include/be_generator.h
deleted file mode 100644
index 2b8c91cabfa..00000000000
--- a/TAO/TAO_IDL/be_include/be_generator.h
+++ /dev/null
@@ -1,160 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-#ifndef _BE_GENERATOR_BE_GENERATOR_HH
-#define _BE_GENERATOR_BE_GENERATOR_HH
-
-// be_generator.hh
-//
-// Defines BE class for generator
-//
-// This defines the same protocol as the AST_Generator class but actually
-// is implemented to create nodes of AST classes subclassed in this BE
-
-/*
-** DEPENDENCIES: AST_Generator.h
-**
-** USE: Included from be.h
-*/
-
-class	be_generator : public AST_Generator {
-public:
-  virtual AST_Root	*create_root(UTL_ScopedName *n,
-				     UTL_StrList *p);
-  // Create a node representing a module which is the root of an AST made up of
-  // BE nodes
-
-  // Operations
-  virtual AST_PredefinedType
-    *create_predefined_type(AST_PredefinedType::PredefinedType t,
-			    UTL_ScopedName *n,
-			    UTL_StrList *p);
-
-  virtual AST_Module	*create_module(UTL_ScopedName *n, UTL_StrList *p);
-  virtual AST_Interface	*create_interface(UTL_ScopedName *n,
-					  AST_Interface **ih,
-					  long nih,
-					  UTL_StrList *p);
-  virtual AST_InterfaceFwd *create_interface_fwd(UTL_ScopedName *n,
-						 UTL_StrList *p);
-  virtual AST_Exception	*create_exception(UTL_ScopedName *n, UTL_StrList *p);
-  virtual AST_Structure	*create_structure(UTL_ScopedName *n, UTL_StrList *p);
-  virtual AST_Enum	*create_enum(UTL_ScopedName *n, UTL_StrList *p);
-  virtual AST_Operation	*create_operation(AST_Type *rt,
-					  AST_Operation::Flags fl,
-					  UTL_ScopedName *n,
-					  UTL_StrList *p);
-  virtual AST_Field	*create_field(AST_Type *ft, UTL_ScopedName *n,
-				      UTL_StrList *p);
-  virtual AST_Argument	*create_argument(AST_Argument::Direction d,
-					 AST_Type *ft,
-					 UTL_ScopedName *n,
-					 UTL_StrList *p);
-  virtual AST_Attribute	*create_attribute(idl_bool ro,
-					  AST_Type *ft,
-					  UTL_ScopedName *n,
-					  UTL_StrList *p);
-  virtual AST_Union	*create_union(AST_ConcreteType *dt,
-				      UTL_ScopedName *n,
-				      UTL_StrList *p);
-  virtual AST_UnionBranch *create_union_branch(AST_UnionLabel *lab,
-					       AST_Type *ft,
-					       UTL_ScopedName *n,
-					       UTL_StrList *p);
-  virtual AST_UnionLabel *create_union_label(AST_UnionLabel::UnionLabel ul,
-					     AST_Expression *lv);
-  virtual AST_Constant	*create_constant(AST_Expression::ExprType et,
-					 AST_Expression *ev,
-					 UTL_ScopedName *n,
-					 UTL_StrList *p);
-
-  virtual AST_Expression	*create_expr(UTL_ScopedName *n);
-  virtual AST_Expression	*create_expr(AST_Expression *v,
-					     AST_Expression::ExprType t);
-  virtual AST_Expression	*create_expr(AST_Expression::ExprComb c,
-					     AST_Expression *v1,
-					     AST_Expression *v2);
-  virtual AST_Expression	*create_expr(long v);
-  virtual AST_Expression	*create_expr(long v,
-					     AST_Expression::ExprType t);
-  virtual AST_Expression	*create_expr(unsigned long v);
-  virtual AST_Expression	*create_expr(String *s);
-  virtual AST_Expression	*create_expr(char c);
-  virtual AST_Expression	*create_expr(double d);
-
-  virtual AST_EnumVal	*create_enum_val(unsigned long v,
-					 UTL_ScopedName *n,
-					 UTL_StrList *p);
-  virtual AST_Array	*create_array(UTL_ScopedName *n,
-				      unsigned long ndims,
-				      UTL_ExprList *dims);
-  virtual AST_Sequence	*create_sequence(AST_Expression *v, AST_Type *bt);
-  virtual AST_String	*create_string(AST_Expression *v);
-  virtual AST_String	*create_wstring(AST_Expression *v);
-  virtual AST_Typedef	*create_typedef(AST_Type *bt,
-					UTL_ScopedName *n,
-					UTL_StrList *p);
-};
-
-#endif           // _BE_GENERATOR_BE_GENERATOR_HH
diff --git a/TAO/TAO_IDL/be_include/be_helper.h b/TAO/TAO_IDL/be_include/be_helper.h
deleted file mode 100644
index 32af2898748..00000000000
--- a/TAO/TAO_IDL/be_include/be_helper.h
+++ /dev/null
@@ -1,133 +0,0 @@
-/* -*- c++ -*- */
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    be_helper.h
-//
-// = DESCRIPTION
-//    Defines the abstract class for outputting the C++ mapping. This is a
-//    helper class to the singleton TAO_CodeGen class
-//
-// = AUTHOR
-//    Aniruddha Gokhale
-//
-// ============================================================================
-
-#if !defined (TAO_BE_OUTSTRM_H)
-#define TAO_BE_OUTSTRM_H
-
-// a dummy structure to inform TAO_OutStream's << operator to  put a newline
-// and use the current indentation for the succeeding line
-struct TAO_NL
-{
-public:
-  TAO_NL (void);
-};
-
-class TAO_OutStream
-{
-  // =TITLE
-  // TAO_OutStream
-  // =DESCRIPTION
-  //  Defines an interface by which the backend code generator can print its
-  //  output to the underlying I/O handle. This is a helper class that will be
-  //  used by the TAO_CodeGen class. However, this is an abstract class and
-  //  classes that understand specific front ends must derive from this
-  //  class.
-public:
-
-  // Enumerated type to indicate the stream type
-  enum STREAM_TYPE
-    {
-      TAO_CLI_HDR,
-      TAO_CLI_INL,
-      TAO_CLI_IMPL,
-      TAO_SVR_HDR,
-      TAO_SVR_INL,
-      TAO_SVR_IMPL
-    };
-
-  TAO_OutStream (void);
-  // constructor.
-
-  virtual ~TAO_OutStream (void);
-  // destructor
-
-  int open (const char *fname, TAO_OutStream::STREAM_TYPE st=TAO_OutStream::TAO_CLI_HDR);
-  // open the underlying low-level handle for output
-
-  void stream_type (TAO_OutStream::STREAM_TYPE);
-  // set the stream type
-
-  TAO_OutStream::STREAM_TYPE stream_type (void);
-  // return the stream type
-
-  int incr_indent (unsigned short flag=1);
-  // increment the indentation level and by default actually indent the output
-  // accordingly
-
-  int decr_indent (unsigned short flag=1);
-  // decrease the indentation level and by default actually indent the output
-  // accordingly
-
-  int reset (void);
-  // reset indentation level to 0
-
-  int indent (void);
-  // indent starting next line
-
-  int nl (void);
-  // put a newline and indent on the next line
-
-  int print (const char *format, ...);
-  // "printf" style variable argument print
-
-  int gen_ifdef_macro (const char *flatname, const char *suffix=0);
-  // generate a #if !defined, #defined macro
-
-  int gen_endif (void);
-  // generate an endif statement
-
-  // =overloaded operators
-
-  TAO_OutStream &operator<< (const char *str);
-  // output the char string and return a reference to ourselves
-
-  TAO_OutStream &operator<< (const long num);
-  // output the integer and return a reference to ourselves
-
-  TAO_OutStream &operator<< (const TAO_NL nl);
-  // The following will be provided by specialized classes
-
-  TAO_OutStream &operator<< (Identifier *id);
-  // output an Identifier node
-
-  TAO_OutStream &operator<< (UTL_IdList *idl);
-  // output a scoped name
-
-  TAO_OutStream &operator<< (AST_Expression *expr);
-  // output an AST_Expression node
-
-  // provided by specialized classes
-  virtual TAO_OutStream &print (Identifier *id) = 0;
-
-  virtual TAO_OutStream &print (UTL_IdList *idl) = 0;
-
-  virtual TAO_OutStream &print (AST_Expression *idl) = 0;
-
-protected:
-  FILE *fp_;
-  // the underlying low-level I/O handle
-
-  TAO_OutStream::STREAM_TYPE st_;
-  // stream type
-
-  int indent_level_;
-  // indentation level
-
-};
-
-#endif // if !defined
diff --git a/TAO/TAO_IDL/be_include/be_interface.h b/TAO/TAO_IDL/be_include/be_interface.h
deleted file mode 100644
index 2e997dc0685..00000000000
--- a/TAO/TAO_IDL/be_include/be_interface.h
+++ /dev/null
@@ -1,106 +0,0 @@
-/* -*- c++ -*- */
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    be_interface.h
-//
-// = DESCRIPTION
-//    Extension of class AST_Interface that provides additional means for C++
-//    mapping of an interface.
-//
-// = AUTHOR
-//    Copyright 1994-1995 by Sun Microsystems, Inc.
-//    and
-//    Aniruddha Gokhale
-//
-// ============================================================================
-
-#if !defined (TAO_BE_INTERFACE_H)
-#define TAO_BE_INTERFACE_H
-
-/*
- * BE_Interface
- */
-class be_interface : public virtual AST_Interface,
-                     public virtual be_scope,
-                     public virtual be_type
-{
-  // = TITLE
-  //   The back end extension of the AST_Interface class
-  //
-  // = DESCRIPTION
-  //
-public:
-  // Operations
-  be_interface (void);
-  // Default constructor
-
-  be_interface (UTL_ScopedName *n, AST_Interface **ih, long nih,
-                UTL_StrList *p);
-  // Constructor that sets its scoped name <n>, a list of inherited interfaces
-  // <ih>, the number of inherited interfaces <nih>, and any prgmas <p>
-
-  virtual int gen_client_header (void);
-  // Generates the client-side header information for the interface
-
-  virtual int gen_client_stubs (void);
-  // Generates the client-side stubs for the interface
-
-  virtual int gen_server_header (void);
-  // Generates the server-side header information for the interface
-
-  virtual int gen_server_skeletons (void);
-  // Generates the server-side skeletons for the interface
-
-  virtual int gen_client_inline (void);
-  // Generates the client-side inline for the interface
-
-  virtual int gen_server_inline (void);
-  // Generates the server-side inlines for the interface
-
-  virtual int gen_var_defn (void);
-  // generate the _var class definition
-
-  virtual int gen_var_impl (void);
-  // generate the implementation for the _var class
-
-  virtual int gen_out_defn (void);
-  // generate the _out class definition
-
-  virtual int gen_out_impl (void);
-  // generate the _out implementation
-
-  const char *full_skel_name (void);
-  // retrieve the fully scoped skel class name
-
-  virtual int gen_typecode (void);
-  // generate the typecode
-
-  virtual int gen_encapsulation (void);
-  // encapsulation for parameters
-
-  virtual long tc_size (void);
-  // return typecode size
-
-  virtual long tc_encap_len (void);
-  // return length of encapsulation
-
-  // Narrowing
-  DEF_NARROW_METHODS3 (be_interface, AST_Interface, be_scope, be_type);
-  DEF_NARROW_FROM_DECL (be_interface);
-  DEF_NARROW_FROM_SCOPE (be_interface);
-
-private:
-  void compute_fullskelname (void);
-  // compute the fully scoped skel class name
-
-  // helper methods for the C++ mapping process
-  int gen_operation_table (void);
-
-  char *full_skel_name_;  // fully scoped skeleton name
-};
-
-#endif  // if !defined
diff --git a/TAO/TAO_IDL/be_include/be_interface_fwd.h b/TAO/TAO_IDL/be_include/be_interface_fwd.h
deleted file mode 100644
index 1453bfeb95d..00000000000
--- a/TAO/TAO_IDL/be_include/be_interface_fwd.h
+++ /dev/null
@@ -1,84 +0,0 @@
-/* -*- c++ -*- */
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    be_interface.h
-//
-// = DESCRIPTION
-//    Extension of class AST_Interface_Fwd that provides additional means for C++
-//    mapping of an interface.
-//
-// = AUTHOR
-//    Copyright 1994-1995 by Sun Microsystems, Inc.
-//    and
-//    Aniruddha Gokhale
-//
-// ============================================================================
-
-#if !defined (BE_INTERFACE_FWD_H)
-#define BE_INTERFACE_FWD_H
-
-/*
- * BE_InterfaceFwd
- */
-class be_interface_fwd : public virtual AST_InterfaceFwd,
-                         public virtual be_type
-{
-  // =TITLE
-  //  be_interface_fwd
-  // =DESCRIPTION
-  //  Extensions to the AST_Interface_Fwd class
-public:
-  // Operations
-
-  be_interface_fwd (void);
-  // default constructor
-
-  be_interface_fwd (UTL_ScopedName *n, UTL_StrList *p);
-  // constructor
-
-  virtual int gen_client_header (void);
-  // Generates the client-side header information for the interface
-
-  virtual int gen_client_stubs (void);
-  // Generates the client-side stubs for the interface
-
-  virtual int gen_server_header (void);
-  // Generates the server-side header information for the interface
-
-  virtual int gen_server_skeletons (void);
-  // Generates the server-side skeletons for the interface
-
-  virtual int gen_client_inline (void);
-  // Generates the client-side inline for the interface
-
-  virtual int gen_server_inline (void);
-  // Generates the server-side inlines for the interface
-
-  virtual int gen_var_defn (void);
-  // generate the _var class definition
-
-  virtual int gen_var_impl (void);
-  // generate the implementation for the _var class
-
-  virtual int gen_out_defn (void);
-  // generate the _out class definition
-
-  virtual int gen_out_impl (void);
-  // generate the _out implementation
-
-  virtual int gen_typecode (void);
-  // generate the typecode
-
-  virtual long tc_size (void);
-  // return typecode size
-
-  // Narrowing
-  DEF_NARROW_METHODS2 (be_interface_fwd, AST_InterfaceFwd, be_type);
-  DEF_NARROW_FROM_DECL (be_interface_fwd);
-};
-
-#endif // if !defined
diff --git a/TAO/TAO_IDL/be_include/be_module.h b/TAO/TAO_IDL/be_include/be_module.h
deleted file mode 100644
index b4089e066e5..00000000000
--- a/TAO/TAO_IDL/be_include/be_module.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/* -*- c++ -*- */
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-// 
-// = FILENAME
-//    be_module.h
-//
-// = DESCRIPTION
-//    Extension of class AST_Module that provides additional means for C++
-//    mapping.
-//
-// = AUTHOR
-//    Copyright 1994-1995 by Sun Microsystems, Inc.
-//    and 
-//    Aniruddha Gokhale
-// 
-// ============================================================================
-
-#if !defined (_BE_MODULE_H)
-#define _BE_MODULE_H
-
-/*
- * BE_Module
- */
-
-class be_module : public virtual AST_Module, 
-                  public virtual be_scope,
-                  public virtual be_decl
-{
-public:
-  // =Operations
-
-  be_module (void);
-  // default constructor
-
-  be_module (UTL_ScopedName *n, UTL_StrList *p);
-  // constructor
-
-  virtual int gen_client_header (void);
-  // Generates the client-side header information for the module 
-
-  virtual int gen_client_stubs (void);
-  // Generates the client-side stubs for the module
-
-  virtual int gen_server_header (void);
-  // Generates the server-side header information for the module 
-
-  virtual int gen_server_skeletons (void);
-  // Generates the server-side skeletons for the module
-
-  virtual int gen_client_inline (void);
-  // Generates the client-side inline for the module
-
-  virtual int gen_server_inline (void);
-  // Generates the server-side inlines for the module
-
-  // Narrowing
-  DEF_NARROW_METHODS3 (be_module, AST_Module, be_scope, be_decl);
-  DEF_NARROW_FROM_DECL (be_module);
-  DEF_NARROW_FROM_SCOPE (be_module);
-};
-
-#endif
diff --git a/TAO/TAO_IDL/be_include/be_operation.h b/TAO/TAO_IDL/be_include/be_operation.h
deleted file mode 100644
index 64b449ea758..00000000000
--- a/TAO/TAO_IDL/be_include/be_operation.h
+++ /dev/null
@@ -1,64 +0,0 @@
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-// 
-// = FILENAME
-//    be_operation.h
-//
-// = DESCRIPTION
-//    Extension of class AST_Operation that provides additional means for C++
-//    mapping.
-//
-// = AUTHOR
-//    Copyright 1994-1995 by Sun Microsystems, Inc.
-//    and 
-//    Aniruddha Gokhale
-// 
-// ============================================================================
-
-#if !defined (BE_OPERATION_H)
-#define BE_OPERATION_H
-
-/*
- * BE_Operation
- */
-class be_operation : public virtual AST_Operation,
-                     public virtual be_scope,
-                     public virtual be_decl
-{
-public:
-  // =Operations
-
-  be_operation (void);
-  // default constructor
-
-  be_operation (AST_Type *rt, AST_Operation::Flags fl, UTL_ScopedName *n,
-                UTL_StrList *p);
-  // constructor
-
-  virtual int gen_client_header (void);
-  // generate client header
-
-  virtual int gen_client_stubs (void);
-  // generate client side stubs
-
-  virtual int gen_server_header (void);
-  // generate server header
-
-  virtual int gen_server_skeletons (void);
-  // generate server skeletons
-
-  virtual int gen_client_inline (void);
-  // Generates the client-side inline for the operation
-
-  virtual int gen_server_inline (void);
-  // Generates the server-side inlines for the operation
-
-  // Narrowing
-  DEF_NARROW_METHODS3 (be_operation, AST_Operation, be_scope, be_decl);
-  DEF_NARROW_FROM_DECL (be_operation);
-  DEF_NARROW_FROM_SCOPE (be_operation);
-};
-
-#endif
diff --git a/TAO/TAO_IDL/be_include/be_predefined_type.h b/TAO/TAO_IDL/be_include/be_predefined_type.h
deleted file mode 100644
index b5235968184..00000000000
--- a/TAO/TAO_IDL/be_include/be_predefined_type.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/* -*- c++ -*- */
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    be_predefined_type.h
-//
-// = DESCRIPTION
-//    Extension of class AST_PredefinedType that provides additional means for C++
-//    mapping.
-//
-// = AUTHOR
-//    Copyright 1994-1995 by Sun Microsystems, Inc.
-//    and
-//    Aniruddha Gokhale
-//
-// ============================================================================
-
-#if !defined (_BE_PREDEFINED_TYPE_H)
-#define _BE_PREDEFINED_TYPE_H
-
-// be_classes.hh
-//
-// Defines all classes for dummy BE
-
-/*
- * BE_PredefinedType
- */
-class be_predefined_type : public virtual AST_PredefinedType,
-                           public virtual be_type
-{
-public:
-  // =Operations
-
-  be_predefined_type (void);
-  // default constructor
-
-  be_predefined_type (AST_PredefinedType::PredefinedType t, UTL_ScopedName *n,
-                      UTL_StrList *p);
-  // constructor
-
-  virtual int gen_client_header (void);
-  // Generates the client-side header information for the predefined type
-
-  virtual int gen_client_stubs (void);
-  // Generates the client-side stubs for the predefined type
-
-  virtual int gen_server_header (void);
-  // Generates the server-side header information for the predefined type
-
-  virtual int gen_server_skeletons (void);
-  // Generates the server-side skeletons for the predefined type
-
-  virtual int gen_client_inline (void);
-  // Generates the client-side inline for the predefined type
-
-  virtual int gen_server_inline (void);
-  // Generates the server-side inlines for the predefined type
-
-  virtual int gen_typecode (void);
-  // generate the typecode
-
-  virtual long tc_size (void);
-  // return typecode size
-
-  virtual int gen_encapsulation (void);
-  // encapsulation for parameters
-
-  virtual long tc_encap_len (void);
-  // return length of encapsulation
-
-  // Narrowing
-  DEF_NARROW_METHODS2 (be_predefined_type, AST_PredefinedType, be_type);
-  DEF_NARROW_FROM_DECL (be_predefined_type);
-
-protected:
-  virtual void compute_tc_name (void);
-  // overridden method
-};
-
-#endif
diff --git a/TAO/TAO_IDL/be_include/be_root.h b/TAO/TAO_IDL/be_include/be_root.h
deleted file mode 100644
index f1b16b8e22f..00000000000
--- a/TAO/TAO_IDL/be_include/be_root.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/* -*- c++ -*- */
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-// 
-// = FILENAME
-//    be_root.h
-//
-// = DESCRIPTION
-//    Extension of class AST_Root that provides the backend
-//
-// = AUTHOR
-//    Copyright 1994-1995 by Sun Microsystems, Inc.
-//    and 
-//    Aniruddha Gokhale
-// 
-// ============================================================================
-
-#if !defined (TAO_BE_ROOT_H)
-#define TAO_BE_ROOT_H
-
-class be_root : public virtual AST_Root, 
-                public virtual be_scope,
-                public virtual be_decl
-{
-  // = TITLE
-  //   The back end extension of the AST_Root class
-  //
-  // = DESCRIPTION
-  //
-public:
-  // Operations
-  be_root (void);
-  // Default constructor
-
-  be_root (UTL_ScopedName *n, UTL_StrList *p);
-  // Constructor that sets its scoped name <n>, and any pragmas <p>
-
-  int gen_idl2cplusplus_mapping (void);
-  // generates the IDL to C++ mapping
-
-  virtual int gen_client_header (void);
-  // Generates the client-side header information for the root 
-
-  virtual int gen_client_stubs (void);
-  // Generates the client-side stubs for the root
-
-  virtual int gen_server_header (void);
-  // Generates the server-side header information for the root 
-
-  virtual int gen_server_skeletons (void);
-  // Generates the server-side skeletons for the root
-
-  virtual int gen_client_inline (void);
-  // Generates the client-side inline for the root
-
-  virtual int gen_server_inline (void);
-  // Generates the server-side inlines for the root
-
-  // =Scope management functions that override the AST scope management methods
-  // since the AST methods set the names of the sequences, strings, and arrays
-  // to a fixed value which interferes with our back-end code generation
-  AST_Sequence *fe_add_sequence (AST_Sequence *);
-  AST_String   *fe_add_string (AST_String *);
-  AST_Array    *fe_add_array (AST_Array *);
-
-  // Narrowing
-  DEF_NARROW_METHODS3 (be_root, AST_Root, be_scope, be_decl);
-  DEF_NARROW_FROM_DECL (be_root);
-  DEF_NARROW_FROM_SCOPE (be_root);
-};
-
-#endif
diff --git a/TAO/TAO_IDL/be_include/be_scope.h b/TAO/TAO_IDL/be_include/be_scope.h
deleted file mode 100644
index d515264c238..00000000000
--- a/TAO/TAO_IDL/be_include/be_scope.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/* -*- c++ -*- */
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-// 
-// = FILENAME
-//    be_scope.h
-//
-// = DESCRIPTION
-//    Extension of the UTL_Scope CFE class
-//
-// = AUTHOR
-//    Copyright 1994-1995 by Sun Microsystems, Inc.
-//    and 
-//    Aniruddha Gokhale
-// 
-// ============================================================================
-
-#if !defined (TAO_BE_SCOPE_H)
-#define TAO_BE_SCOPE_H
-
-/*
- * BE_Scope
- */
-class be_scope : public virtual UTL_Scope
-{
-  // = TITLE
-  //   be_scope
-  // = DESCRIPTION
-  //   The back end extension of the UTL_Scope class
-  //
-public:
-  // Operations
-
-  be_scope (void);
-  // Default constructor
-
-  be_scope (AST_Decl::NodeType nt);
-  // constructor that sets the node type
-
-  virtual ~be_scope (void);
-  // destructor
-
-  virtual int gen_client_header (void);
-  // Generates the client-side header information for the scope 
-
-  virtual int gen_client_stubs (void);
-  // Generates the client-side stubs for the scope
-
-  virtual int gen_server_header (void);
-  // Generates the server-side header information for the scope 
-
-  virtual int gen_server_skeletons (void);
-  // Generates the server-side skeletons for the scope
-
-  virtual int gen_client_inline (void);
-  // Generates the client-side inline for the scope
-
-  virtual int gen_server_inline (void);
-  // Generates the server-side inlines for the scope
-
-  virtual int gen_encapsulation (void);
-  // encapsulation for parameters
-
-  virtual long tc_encap_len (void);
-  // return length of encapsulation
-
-  // Narrowing
-  DEF_NARROW_METHODS1 (be_scope, UTL_Scope);
-  DEF_NARROW_FROM_SCOPE (be_scope);
-};
-
-#endif // if !defined
diff --git a/TAO/TAO_IDL/be_include/be_sequence.h b/TAO/TAO_IDL/be_include/be_sequence.h
deleted file mode 100644
index ba95b7f41aa..00000000000
--- a/TAO/TAO_IDL/be_include/be_sequence.h
+++ /dev/null
@@ -1,106 +0,0 @@
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    be_sequence.h
-//
-// = DESCRIPTION
-//    Extension of class AST_Sequence that provides additional means for C++
-//    mapping.
-//
-// = AUTHOR
-//    Copyright 1994-1995 by Sun Microsystems, Inc.
-//    and
-//    Aniruddha Gokhale
-//
-// ============================================================================
-
-#if !defined (BE_SEQUENCE_H)
-#define BE_SEQUENCE_H
-
-/*
- * BE_Sequence
- */
-
-// A sequence in OMG IDL does not define a scoping construct just as a struct
-// or union or an interface do. However, in the C++ mapping, a sequence becomes
-// a class. If the base type of a sequence is another anonymous sequence, then
-// the base type is defined in the scope of this sequence. Hence we define
-// be_sequence to possess the additional characteristics of a scope
-class be_sequence : public virtual AST_Sequence,
-                    public virtual be_scope,
-                    public virtual be_type
-{
-public:
-  // =Operations
-
-  be_sequence (void);
-  // default constructor
-
-  be_sequence (AST_Expression *v, AST_Type *bt);
-  // constructor
-
-  virtual int create_name (void);
-  // create a name for ourselves. If we are typedefed, then we get the name of
-  // the typedef node, else we generate a name for ourselves
-
-  virtual int gen_client_header (void);
-  // Generates the client-side header information for the sequence
-
-  virtual int gen_client_stubs (void);
-  // Generates the client-side stubs for the sequence
-
-  virtual int gen_server_header (void);
-  // Generates the server-side header information for the sequence
-
-  virtual int gen_server_skeletons (void);
-  // Generates the server-side skeletons for the sequence
-
-  virtual int gen_client_inline (void);
-  // Generates the client-side inline for the sequence
-
-  virtual int gen_server_inline (void);
-  // Generates the server-side inlines for the sequence
-
-  virtual int gen_var_defn (void);
-  // generate the _var class definition
-
-  virtual int gen_var_impl (void);
-  // generate the implementation for the _var class
-
-  virtual int gen_out_defn (void);
-  // generate the _out class definition
-
-  virtual int gen_out_impl (void);
-  // generate the _out implementation
-
-  virtual int gen_typecode (void);
-  // generate the typecode
-
-  virtual int gen_encapsulation (void);
-  // encapsulation for parameters
-
-  virtual long tc_size (void);
-  // return typecode size
-
-  virtual long tc_encap_len (void);
-  // return length of encapsulation
-
-  // Narrowing
-  DEF_NARROW_METHODS3 (be_sequence, AST_Sequence, be_scope, be_type);
-  DEF_NARROW_FROM_DECL (be_sequence);
-
-private:
-  void compute_scoped_name (void);
-  // for anonymous sequences, we compute our scoped name
-
-  idl_bool unbounded_;
-  // whether we are bounded or unbounded
-
-  be_sequence *seq_node_;
-  // if we enclose a sequence node
-};
-
-#endif
diff --git a/TAO/TAO_IDL/be_include/be_state.h b/TAO/TAO_IDL/be_include/be_state.h
deleted file mode 100644
index 0a368967ae0..00000000000
--- a/TAO/TAO_IDL/be_include/be_state.h
+++ /dev/null
@@ -1,259 +0,0 @@
-/* -*- c++ -*- */
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-// 
-// = FILENAME
-//    be_state.h
-//
-// = DESCRIPTION
-//   The Code generator state class and its subclasses
-//
-// = AUTHOR
-//    Aniruddha Gokhale
-// 
-// ============================================================================
-
-#if !defined (TAO_BE_STATE_H)
-#define TAO_BE_STATE_H
-
-class be_state
-{
-  // =TITLE
-  // be_state
-  // =DESCRIPTION
-  // Emits code based on current state. This is an abstract base class. The
-  // task of code generation is handled by subclasses.
-public:
-  virtual int gen_code (be_type *bt, be_decl *d, be_type *type=0) = 0;
-  // code generation for node "d" whose type is "bt". The third parameter is
-  // used for recursive invocation involving a typedef
-
-  virtual ~be_state (void);
-  // destructor
-
-protected:
-  be_state (void);
-  // constructor
-};
-
-// ============== subclasses ====================
-
-class be_state_struct_ch: public be_state
-{
-  // =TITLE
-  // be_state_struct_ch
-  // =DESCRIPTION
-  // struct generation in client header
-public:
-  
-  be_state_struct_ch (void);
-  // constructor
-
-  virtual int gen_code (be_type *bt, be_decl *d, be_type *type=0);
-  // code generation for node "d" whose type is "bt". The third parameter is
-  // used for recursive invocation involving a typedef
-};
-typedef ACE_Singleton<be_state_struct_ch, ACE_SYNCH_RECURSIVE_MUTEX> TAO_BE_STATE_STRUCT_CH; 
-
-class be_state_union_disctypedefn_ch: public be_state
-{
-  // =TITLE
-  // be_state_union_disctypedefn_ch
-  // =DESCRIPTION
-  // union discriminant defn generation in client header
-public:
-  
-  be_state_union_disctypedefn_ch (void);
-  // constructor
-
-  virtual int gen_code (be_type *bt, be_decl *d, be_type *type=0);
-  // code generation for node "d" whose type is "bt". The third parameter is
-  // used for recursive invocation involving a typedef
-};
-typedef ACE_Singleton<be_state_union_disctypedefn_ch, ACE_SYNCH_RECURSIVE_MUTEX>
-                                    TAO_BE_STATE_UNION_DISCTYPEDEFN_CH;  
-
-class be_state_union_disctypedefn_ci: public be_state
-{
-  // =TITLE
-  // be_state_union_disctypedefn_ci
-  // =DESCRIPTION
-  // union discriminant defn generation in client inline file
-public:
-  
-  be_state_union_disctypedefn_ci (void);
-  // constructor
-
-  virtual int gen_code (be_type *bt, be_decl *d, be_type *type=0);
-  // code generation for node "d" whose type is "bt". The third parameter is
-  // used for recursive invocation involving a typedef
-};
-typedef ACE_Singleton<be_state_union_disctypedefn_ci, ACE_SYNCH_RECURSIVE_MUTEX>
-                                    TAO_BE_STATE_UNION_DISCTYPEDEFN_CI;  
-
-class be_state_union_public_ch: public be_state
-{
-  // =TITLE
-  // be_state_union_public_ch
-  // =DESCRIPTION
-  // union discriminant defn generation in client header file
-public:
-  
-  be_state_union_public_ch (void);
-  // constructor
-
-  virtual int gen_code (be_type *bt, be_decl *d, be_type *type=0);
-  // code generation for node "d" whose type is "bt". The third parameter is
-  // used for recursive invocation involving a typedef
-};
-typedef ACE_Singleton<be_state_union_public_ch, ACE_SYNCH_RECURSIVE_MUTEX>
-                                    TAO_BE_STATE_UNION_PUBLIC_CH;  
-
-class be_state_union_public_ci: public be_state
-{
-  // =TITLE
-  // be_state_union_public_ci
-  // =DESCRIPTION
-  // union discriminant defn generation in client inline file
-public:
-  
-  be_state_union_public_ci (void);
-  // constructor
-
-  virtual int gen_code (be_type *bt, be_decl *d, be_type *type=0);
-  // code generation for node "d" whose type is "bt". The third parameter is
-  // used for recursive invocation involving a typedef
-};
-typedef ACE_Singleton<be_state_union_public_ci, ACE_SYNCH_RECURSIVE_MUTEX>
-                                    TAO_BE_STATE_UNION_PUBLIC_CI;  
-
-class be_state_union_private_ch: public be_state
-{
-  // =TITLE
-  // be_state_union_private_ch
-  // =DESCRIPTION
-  // union discriminant defn generation in client header file
-public:
-  
-  be_state_union_private_ch (void);
-  // constructor
-
-  virtual int gen_code (be_type *bt, be_decl *d, be_type *type=0);
-  // code generation for node "d" whose type is "bt". The third parameter is
-  // used for recursive invocation involving a typedef
-};
-typedef ACE_Singleton<be_state_union_private_ch, ACE_SYNCH_RECURSIVE_MUTEX>
-                                    TAO_BE_STATE_UNION_PRIVATE_CH;  
-
-class be_state_operation: public be_state
-{
-  // =TITLE
-  // be_state_operation
-  // =DESCRIPTION
-  // operation return type
-public:
-  
-  be_state_operation (void);
-  // constructor
-
-  virtual int gen_code (be_type *bt, be_decl *d, be_type *type=0);
-  // code generation for node "d" whose type is "bt". The third parameter is
-  // used for recursive invocation involving a typedef
-};
-typedef ACE_Singleton<be_state_operation, ACE_SYNCH_RECURSIVE_MUTEX>
-                                    TAO_BE_STATE_OPERATION;
-
-class be_state_argument: public be_state
-{
-  // =TITLE
-  // be_state_argument
-  // =DESCRIPTION
-  // argument return type
-public:
-  
-  be_state_argument (void);
-  // constructor
-
-  virtual int gen_code (be_type *bt, be_decl *d, be_type *type=0);
-  // code generation for node "d" whose type is "bt". The third parameter is
-  // used for recursive invocation involving a typedef
-};
-typedef ACE_Singleton<be_state_argument, ACE_SYNCH_RECURSIVE_MUTEX>
-                                    TAO_BE_STATE_ARGUMENT;
-
-class be_state_typedef: public be_state
-{
-  // =TITLE
-  // be_state_typedef
-  // =DESCRIPTION
-  // typedef code generation
-public:
-  
-  be_state_typedef (void);
-  // constructor
-
-  virtual int gen_code (be_type *bt, be_decl *d, be_type *type=0);
-  // code generation for node "d" whose type is "bt". The third parameter is
-  // used for recursive invocation involving a typedef
-};
-typedef ACE_Singleton<be_state_typedef, ACE_SYNCH_RECURSIVE_MUTEX>
-                                    TAO_BE_STATE_TYPEDEF;
-
-class be_state_array: public be_state
-{
-  // =TITLE
-  // be_state_array
-  // =DESCRIPTION
-  // array code generation
-public:
-  
-  be_state_array (void);
-  // constructor
-
-  virtual int gen_code (be_type *bt, be_decl *d, be_type *type=0);
-  // code generation for node "d" whose type is "bt". The third parameter is
-  // used for recursive invocation involving a typedef
-};
-typedef ACE_Singleton<be_state_array, ACE_SYNCH_RECURSIVE_MUTEX>
-                                    TAO_BE_STATE_ARRAY;
-
-class be_state_sequence: public be_state
-{
-  // =TITLE
-  // be_state_sequence
-  // =DESCRIPTION
-  // sequence code generation
-public:
-  
-  be_state_sequence (void);
-  // constructor
-
-  virtual int gen_code (be_type *bt, be_decl *d, be_type *type=0);
-  // code generation for node "d" whose type is "bt". The third parameter is
-  // used for recursive invocation involving a typedef
-};
-typedef ACE_Singleton<be_state_sequence, ACE_SYNCH_RECURSIVE_MUTEX>
-                                    TAO_BE_STATE_SEQUENCE;
-
-class be_state_attribute : public be_state
-{
-  // =TITLE
-  // be_state_attribute
-  // =DESCRIPTION
-  // attribute code generation
-public:
-  be_state_attribute (void);
-  // constructor
-
-  virtual int gen_code (be_type *bt, be_decl *d, be_type *type=0);
-  // code generation for node "d" whose type is "bt". The third
-  // parameter is used for recursive invocation involving a typedef
-};
-
-typedef ACE_Singleton<be_state_attribute, ACE_SYNCH_RECURSIVE_MUTEX>
-	TAO_BE_STATE_ATTRIBUTE;
-
-#endif /* end of be_state */
-
diff --git a/TAO/TAO_IDL/be_include/be_string.h b/TAO/TAO_IDL/be_include/be_string.h
deleted file mode 100644
index dfde950b1e3..00000000000
--- a/TAO/TAO_IDL/be_include/be_string.h
+++ /dev/null
@@ -1,80 +0,0 @@
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    be_string.h
-//
-// = DESCRIPTION
-//    Extension of class AST_String that provides additional means for C++
-//    mapping.
-//
-// = AUTHOR
-//    Copyright 1994-1995 by Sun Microsystems, Inc.
-//    and
-//    Aniruddha Gokhale
-//
-// ============================================================================
-
-#if !defined (BE_STRING_H)
-#define BE_STRING_H
-
-/*
- * BE_String
- */
-class be_string : public virtual AST_String,
-                  public virtual be_type
-{
-public:
-  // Operations
-
-  be_string (void);
-  //  default constructor
-
-  be_string (AST_Expression *v);
-  // constructor
-
-  be_string (AST_Expression *v, long wide);
-  // constructor
-
-  virtual int gen_client_header (void);
-  // generate client header for string
-
-  virtual int gen_client_stubs (void);
-  // generate client side stubs for string
-
-  virtual int gen_server_header (void);
-  // generate server header for string
-
-  virtual int gen_server_skeletons (void);
-  // generate server skeletons for string
-
-  virtual int gen_client_inline (void);
-  // Generates the client-side inline for the string
-
-  virtual int gen_server_inline (void);
-  // Generates the server-side inlines for the string
-
-  virtual int gen_typecode (void);
-  // generate the typecode
-
-  virtual int gen_encapsulation (void);
-  // encapsulation for parameters
-
-  virtual long tc_size (void);
-  // return typecode size
-
-  virtual long tc_encap_len (void);
-  // return length of encapsulation
-
-  // Narrowing
-  DEF_NARROW_METHODS2 (be_string, AST_String, be_type);
-  DEF_NARROW_FROM_DECL (be_string);
-
-protected:
-  virtual void compute_tc_name (void);
-  // overridden method
-};
-
-#endif
diff --git a/TAO/TAO_IDL/be_include/be_structure.h b/TAO/TAO_IDL/be_include/be_structure.h
deleted file mode 100644
index 295cb69a660..00000000000
--- a/TAO/TAO_IDL/be_include/be_structure.h
+++ /dev/null
@@ -1,100 +0,0 @@
-/* -*- c++ -*- */
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    be_structure.h
-//
-// = DESCRIPTION
-//    Extension of class AST_Structure that provides additional means for C++
-//    mapping.
-//
-// = AUTHOR
-//    Copyright 1994-1995 by Sun Microsystems, Inc.
-//    and
-//    Aniruddha Gokhale
-//
-// ============================================================================
-
-#if !defined (BE_STRUCTURE_H)
-#define BE_STRUCTURE_H
-
-/*
- * BE_Structure
- */
-class be_structure : public virtual AST_Structure,
-                     public virtual be_scope,
-                     public virtual be_type
-{
-public:
-  // =Operations
-
-  be_structure (void);
-  // default constructor
-
-  be_structure (UTL_ScopedName *n, UTL_StrList *p);
-  // constructor
-
-  virtual int gen_client_header (void);
-  // Generates the client-side header information for the struct
-
-  virtual int gen_client_stubs (void);
-  // Generates the client-side stubs for the struct
-
-  virtual int gen_server_header (void);
-  // Generates the server-side header information for the struct
-
-  virtual int gen_server_skeletons (void);
-  // Generates the server-side skeletons for the struct
-
-  virtual int gen_client_inline (void);
-  // Generates the client-side inline for the struct
-
-  virtual int gen_server_inline (void);
-  // Generates the server-side inlines for the struct
-
-  virtual int gen_var_defn (void);
-  // generate the _var class definition
-
-  virtual int gen_var_impl (void);
-  // generate the implementation for the _var class
-
-  virtual int gen_out_defn (void);
-  // generate the _out class definition
-
-  virtual int gen_out_impl (void);
-  // generate the _out implementation
-
-  virtual int gen_typecode (void);
-  // generate the typecode
-
-  virtual int gen_encapsulation (void);
-  // encapsulation for parameters
-
-  virtual long tc_size (void);
-  // return typecode size
-
-  virtual long tc_encap_len (void);
-  // return length of encapsulation
-
-  virtual int member_count (void);
-  // return the count of members
-
-  // Narrowing
-  DEF_NARROW_METHODS3 (be_structure, AST_Structure, be_scope, be_type);
-  DEF_NARROW_FROM_DECL (be_structure);
-  DEF_NARROW_FROM_SCOPE (be_structure);
-
-private:
-  //=helper
-
-  int compute_member_count (void);
-  // count the number of members
-
-  int member_count_;
-  // number of members
-};
-
-#endif
diff --git a/TAO/TAO_IDL/be_include/be_sunsoft.h b/TAO/TAO_IDL/be_include/be_sunsoft.h
deleted file mode 100644
index 7dc6c512fe3..00000000000
--- a/TAO/TAO_IDL/be_include/be_sunsoft.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/* -*- c++ -*- */
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-// 
-// = FILENAME
-//    be_sunsoft.h
-//
-// = DESCRIPTION
-//    SunSoft specific backend output generation
-//
-// = AUTHOR
-//    Aniruddha Gokhale
-// 
-// ============================================================================
-
-#if !defined (TAO_BE_HELPER_H)
-#define TAO_BE_HELPER_H
-
-class TAO_SunSoft_OutStream : public TAO_OutStream
-{
-  // =TITLE
-  //  TAO_SunSoft_OutStream
-  // =DESCRIPTION
-  //  Backend specific to SunSoft AST nodes
-public:
-  TAO_SunSoft_OutStream (void);
-  // constructor
-
-  ~TAO_SunSoft_OutStream (void);
-  // destuctor
-
-  virtual TAO_OutStream &print (Identifier *id);
-  // output the SunSoft IDL Identifier Node
-
-  virtual TAO_OutStream &print (UTL_IdList *idl);
-  // output the SunSoft IDL UTL_IdList Node which is usually used to maintain a
-  // scoped name
-
-  virtual TAO_OutStream &print (AST_Expression *expr);
-  // output the contents of the AST_Expression node
-};
-
-#endif // if !defined
diff --git a/TAO/TAO_IDL/be_include/be_type.h b/TAO/TAO_IDL/be_include/be_type.h
deleted file mode 100644
index a4cc6b5b17c..00000000000
--- a/TAO/TAO_IDL/be_include/be_type.h
+++ /dev/null
@@ -1,95 +0,0 @@
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    be_type.h
-//
-// = DESCRIPTION
-//    Extension of class AST_Type that provides additional means for C++
-//    mapping.
-//
-// = AUTHOR
-//    Copyright 1994-1995 by Sun Microsystems, Inc.
-//    and
-//    Aniruddha Gokhale
-//
-// ============================================================================
-
-#if !defined (BE_TYPE_H)
-#define BE_TYPE_H
-
-/*
- * BE_Type
- */
-class be_type : public virtual AST_Type,
-                public virtual be_decl
-{
-public:
-  // =Operations
-
-  be_type (void);
-  // default constructor
-
-  be_type (AST_Decl::NodeType nt, UTL_ScopedName *n, UTL_StrList *p);
-  // constructor
-
-  virtual int gen_client_header (void) = 0;
-  // Generates the client-side header information for the type
-
-  virtual int gen_client_stubs (void) = 0;
-  // Generates the client-side stubs for the type
-
-  virtual int gen_server_header (void) = 0;
-  // Generates the server-side header information for the type
-
-  virtual int gen_server_skeletons (void) = 0;
-  // Generates the server-side skeletons for the type
-
-  virtual int gen_client_inline (void)  = 0;
-  // Generates the client-side inline for the type
-
-  virtual int gen_server_inline (void) = 0;
-  // Generates the server-side inlines for the type
-
-  virtual int gen_var_defn (void);
-  // generate the _var class definition
-
-  virtual int gen_var_impl (void);
-  // generate the implementation for the _var class
-
-  virtual int gen_out_defn (void);
-  // generate the _out class definition
-
-  virtual int gen_out_impl (void);
-  // generate the _out implementation
-
-  virtual int gen_typecode (void) = 0;
-  // generate the typecode description
-
-  virtual long tc_size (void) = 0;
-  // return typecode size
-
-  UTL_ScopedName *tc_name (void);
-  // return the typecode name
-
-  virtual char *nested_type_name (be_decl *d, char *suffix = 0);
-  // type name of a node used when generating declarations
-
-  // Narrowing
-  DEF_NARROW_METHODS2 (be_type, AST_Type, be_decl);
-  DEF_NARROW_FROM_DECL (be_type);
-
-protected:
-  virtual void compute_tc_name (void);
-  // computes the fully scoped typecode name
-
-  UTL_ScopedName *tc_name_;
-  // typecode name
-
-  char *type_name_;
-  // type name (this uses the ACE NESTED macro)
-};
-
-#endif // end of if !defined
diff --git a/TAO/TAO_IDL/be_include/be_typedef.h b/TAO/TAO_IDL/be_include/be_typedef.h
deleted file mode 100644
index 2d446a81eac..00000000000
--- a/TAO/TAO_IDL/be_include/be_typedef.h
+++ /dev/null
@@ -1,78 +0,0 @@
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-// 
-// = FILENAME
-//    be_typedef.h
-//
-// = DESCRIPTION
-//    Extension of class AST_typedef that provides additional means for C++
-//    mapping.
-//
-// = AUTHOR
-//    Copyright 1994-1995 by Sun Microsystems, Inc.
-//    and 
-//    Aniruddha Gokhale
-// 
-// ============================================================================
-
-#if !defined (BE_TYPEDEF_H)
-#define BE_TYPEDEF_H
-
-/*
- * BE_Typedef
- */
-class be_typedef : public virtual AST_Typedef,
-                   public virtual be_type
-{
-public:
-  // =Operations
-
-  be_typedef (void);
-  // default constructor
-
-  be_typedef (AST_Type *bt, UTL_ScopedName *n, UTL_StrList *p);
-  // constructor
-
-  be_type *primitive_base_type (void);
-  // return the most primitive base type by traversing the chain of typedefed
-  // base types
-
-  virtual int gen_client_header (void);
-  // Generates the client-side header information for the typedef 
-
-  virtual int gen_client_stubs (void);
-  // Generates the client-side stubs for the typedef
-
-  virtual int gen_server_header (void);
-  // Generates the server-side header information for the typedef 
-
-  virtual int gen_server_skeletons (void);
-  // Generates the server-side skeletons for the typedef
-
-  virtual int gen_client_inline (void);
-  // Generates the client-side inline for the typedef
-
-  virtual int gen_server_inline (void);
-  // Generates the server-side inlines for the typedef
-
-  virtual int gen_typecode (void);
-  // generate the typecode
-
-  virtual int gen_encapsulation (void);
-  // encapsulation for parameters
-
-  virtual long tc_size (void);
-  // return typecode size
-
-  virtual long tc_encap_len (void);
-  // return length of encapsulation
-
-  // Narrowing
-  DEF_NARROW_METHODS2 (be_typedef, AST_Typedef, be_type);
-  DEF_NARROW_FROM_DECL (be_typedef);
-
-};
-
-#endif
diff --git a/TAO/TAO_IDL/be_include/be_union.h b/TAO/TAO_IDL/be_include/be_union.h
deleted file mode 100644
index 74bc6d46927..00000000000
--- a/TAO/TAO_IDL/be_include/be_union.h
+++ /dev/null
@@ -1,108 +0,0 @@
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    be_union.h
-//
-// = DESCRIPTION
-//    Extension of class AST_Union that provides additional means for C++
-//    mapping.
-//
-// = AUTHOR
-//    Copyright 1994-1995 by Sun Microsystems, Inc.
-//    and
-//    Aniruddha Gokhale
-//
-// ============================================================================
-
-#if !defined (BE_UNION_H)
-#define BE_UNION_H
-
-/*
- * BE_Union
- */
-class be_union : public virtual AST_Union,
-                 public virtual be_scope,
-                 public virtual be_type
-{
-public:
-  // =Operations
-
-  be_union (void);
-  // default constructor
-
-  be_union(AST_ConcreteType *dt, UTL_ScopedName *n, UTL_StrList *p);
-  // constructor
-
-  virtual int gen_client_header (void);
-  // Generates the client-side header information for the union
-
-  virtual int gen_client_stubs (void);
-  // Generates the client-side stubs for the union
-
-  virtual int gen_server_header (void);
-  // Generates the server-side header information for the union
-
-  virtual int gen_server_skeletons (void);
-  // Generates the server-side skeletons for the union
-
-  virtual int gen_client_inline (void);
-  // Generates the client-side inline for the union
-
-  virtual int gen_server_inline (void);
-  // Generates the server-side inlines for the union
-
-  virtual int gen_var_defn (void);
-  // generate the _var class definition
-
-  virtual int gen_var_impl (void);
-  // generate the implementation for the _var class
-
-  virtual int gen_out_defn (void);
-  // generate the _out class definition
-
-  virtual int gen_out_impl (void);
-  // generate the _out implementation
-
-  virtual int gen_typecode (void);
-  // generate the typecode
-
-  virtual int gen_encapsulation (void);
-  // encapsulation for parameters
-
-  virtual long tc_size (void);
-  // return typecode size
-
-  virtual long tc_encap_len (void);
-  // return length of encapsulation
-
-  virtual int member_count (void);
-  // return the count of members
-
-  virtual int default_index (void);
-  // return the default index used
-
-  // Narrowing
-  DEF_NARROW_METHODS3 (be_union, AST_Union, be_scope, be_type);
-  DEF_NARROW_FROM_DECL(be_union);
-  DEF_NARROW_FROM_SCOPE(be_union);
-
-private:
-  //=helper
-
-  int compute_member_count (void);
-  // count the number of members
-
-  int compute_default_index (void);
-  // count the default index
-
-  int member_count_;
-  // number of members
-
-  int default_index_;
-  // default label index (zero based indexing)
-};
-
-#endif
diff --git a/TAO/TAO_IDL/be_include/be_union_branch.h b/TAO/TAO_IDL/be_include/be_union_branch.h
deleted file mode 100644
index 81e512af36b..00000000000
--- a/TAO/TAO_IDL/be_include/be_union_branch.h
+++ /dev/null
@@ -1,67 +0,0 @@
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-// 
-// = FILENAME
-//    be_union_branch.h
-//
-// = DESCRIPTION
-//    Extension of class AST_UnionBranch that provides additional means for C++
-//    mapping.
-//
-// = AUTHOR
-//    Copyright 1994-1995 by Sun Microsystems, Inc.
-//    and 
-//    Aniruddha Gokhale
-// 
-// ============================================================================
-
-#if !defined (BE_UNION_BRANCH_H)
-#define BE_UNION_BRANCH_H
-
-/*
- * BE_UnionBranch
- */
-class be_union_branch : public virtual AST_UnionBranch,
-                        public virtual be_decl
-{
-public:
-  // Operations
-  be_union_branch (void);
-  // default constructor
-
-  be_union_branch (AST_UnionLabel *lab, AST_Type *ft, UTL_ScopedName *n,
-                   UTL_StrList *p);
-  // constructor
-
-  virtual int gen_client_header (void);
-  // Generates the client-side header information for the union branch
-
-  virtual int gen_client_stubs (void);
-  // Generates the client-side stubs for the union branch
-
-  virtual int gen_server_header (void);
-  // Generates the server-side header information for the union branch
-
-  virtual int gen_server_skeletons (void);
-  // Generates the server-side skeletons for the union branch
-
-  virtual int gen_client_inline (void);
-  // Generates the client-side inline for the union branch
-
-  virtual int gen_server_inline (void);
-  // Generates the server-side inlines for the union branch
-
-  virtual int gen_encapsulation (void);
-  // generate the encapsulation
-
-  virtual long tc_encap_len (void);
-  // return the total byte length of ourselves represented as an encapsulation
-
-  // Narrowing
-  DEF_NARROW_METHODS2 (be_union_branch, AST_UnionBranch, be_decl);
-  DEF_NARROW_FROM_DECL (be_union_branch);
-};
-
-#endif
diff --git a/TAO/TAO_IDL/be_include/be_union_label.h b/TAO/TAO_IDL/be_include/be_union_label.h
deleted file mode 100644
index d52770af90d..00000000000
--- a/TAO/TAO_IDL/be_include/be_union_label.h
+++ /dev/null
@@ -1,14 +0,0 @@
-#if !defined(BE_UNION_LABEL_H)
-#define BE_UNION_LABEL_H
-
-/*
- * BE_UnionLabel
- */
-class	be_union_label : public virtual AST_UnionLabel {
-public:
-  // Operations
-  be_union_label();
-  be_union_label(AST_UnionLabel::UnionLabel ul, AST_Expression *v);
-};
-
-#endif
diff --git a/TAO/TAO_IDL/docs/ANNOUNCEMENT b/TAO/TAO_IDL/docs/ANNOUNCEMENT
deleted file mode 100644
index 870db6f6006..00000000000
--- a/TAO/TAO_IDL/docs/ANNOUNCEMENT
+++ /dev/null
@@ -1,131 +0,0 @@
-WHAT:
-
-SunSoft, Inc., Mountain View, California, has placed the source code to
-Project DOE's Interface Definition Language (IDL) compiler front end
-(CFE) on OMG's file server, making the implementation publicly
-available. This release is identified by the version number 1.3.
-
-Project DOE is SunSoft's corporate-wide development effort to integrate
-distributed object technology into the Solaris O/S.  OMG (Object Management
-Group) is the industry wide body formed to create specifications for
-distributed object technology. It currently has more than 370 members. OMG
-IDL is part of OMG's CORBA 1.1 specification and provides a standardized
-way for defining object interfaces. OMG IDL forms the basis for distributed
-object interactionin Project DOE.
-
-The SunSoft OMG IDL CFE provides a complete framework for building
-CORBA 1.1-compliant preprocessors for OMG IDL.  By using this standard
-implementation, developers of OMG IDL compilers will save many months
-of work and enhance the portability and interoperability of OMG
-IDL-interfaced objects.
-
-The SunSoft OMG IDL CFE allows convenient and fast integration of new back
-ends to the compiler.  The release consists of a front end which converts
-OMG IDL to an intermediate format, a compiler framework driver, an example
-implementation of a compiler back end, and a set of protocols for
-interaction between the front and back ends.  The SunSoft OMG IDL CFE
-parser uses components generated by yacc and lex.
-
-The SunSoft OMG IDL CFE is designed to allow easy extension of OMG IDL
-without impacting existing back-end implementations.  As the CORBA
-specification evolves, any new updates to the IDE CFE will be placed
-by SunSoft on the OMG server.
-
-This release provides a directory with many examples of OMG IDL
-specifications to allow users to become familiar with the process of
-writing OMG IDL code.
-
-For more information send email to idl-cfe@sun.com.
-
-HOW:
-
-The SunSoft OMG IDL CFE is available at no charge through anonymous FTP
-in source form on the OMG file server, omg.org. Please retrieve the
-file OMG_IDL_CFE_1.3.tar.Z from the directory pub/OMG_IDL_CFE_1.3. Please
-let us know who you are if you retrieve the compiler front end using this
-method, by sending email to idl-cfe@sun.com.
-
-You can also retrieve the software by using the OMG mail server program.
-Send email with the subject 'help' to omg_idl@omg.org, and the mail server
-will respond with instructions on how to retrieve the software.
-
-WHEN:
-
-The SunSoft OMG IDL CFE is available now.
-
-CONTACT:
-
-Please let us know who you are if you decide to use this software, and how
-you use it. Please send email to:
-
-     idl-cfe@sun.com
-
-This address can also be used to report problems, bugs, suggestions and
-send general comments.
-
-We ask that if you make extensions or modifications to this source release,
-please make these extensions available to others using the OMG IDL compiler
-front end, by sending the modified sources to the above email address. This
-will help us evaluate your extensions for inclusion in a future version. It
-also ensures your investment in these extensions when new versions of the
-CFE are released.
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
-COPYRIGHT NOTICE:
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
diff --git a/TAO/TAO_IDL/docs/BUG_REPORT b/TAO/TAO_IDL/docs/BUG_REPORT
deleted file mode 100644
index 28c34ae141d..00000000000
--- a/TAO/TAO_IDL/docs/BUG_REPORT
+++ /dev/null
@@ -1,144 +0,0 @@
-OMG IDL COMPILER FRONT END PROBLEM REPORT FORM
--============================================-
-
-Checklist: Did you:
-- include configuration information?
-- include compiler version number (use -V to obtain)?
-- include script of run?
-- include IDL file causing problem?
-- make any changes to the CFE? If so, did you include a diff against
-  original version?
-
-PLEASE SEND THE COMPLETED BUG REPORT TO: idl-cfe@sun.com.
-
-THANK YOU FOR REPORTING THIS PROBLEM! THROUGH YOUR COLLABORATION, SUNSOFT
-WILL BE ABLE TO IMPROVE THE FUNCTIONALITY OF THIS PRODUCT. RECEIPT OF BUG
-REPORTS WILL BE ACKNOWLEDGED BUT NO OBLIGATION IS UNDERTAKEN BY SUNSOFT TO
-CORRECT THE REPORTED PROBLEM. SEE YOUR COPYRIGHT AND LICENSE INFORMATION.
-
-
-CONFIGURATION INFORMATION (describe your hardware platform, operating
-system and which compilers you used to compile the CFE):
-
-
-
-
-
-
-COMPILER VERSION INFORMATION (include output from idl -V here):
-
-
-
-
-
-
-
-PROBLEM DESCRIPTION (describe problem, include script if available):
-
-
-
-
-
-
-
-
-IDL INPUT CAUSING PROBLEM (include IDL input causing problem):
-
-
-
-
-
-
-
-
-
-DID YOU MAKE ANY CHANGES TO THE CFE? [Y] _ [N] _
-IF YES, INCLUDE A DIF OF YOUR VERSION AGAINST ORIGINAL VERSION:
-
-
-
-
-
-
-
-
-
-PROPOSED FIX (if you believe you know the cause of the problem, please
-include a proposed change to the software to correct it):
-
-
-
-
-
-
-
-
-ANY OTHER RELEVANT INPUT (include here any other information you believe
-may be relevant to the resolution of the problem you described):
-
-
-
-
-
-
-PLEASE SEND THIS PROBLEM REPORT TO idl-cfe@sun.com.
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
-COPYRIGHT NOTICE:
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
diff --git a/TAO/TAO_IDL/docs/CHANGES b/TAO/TAO_IDL/docs/CHANGES
deleted file mode 100644
index ae6fca7bcea..00000000000
--- a/TAO/TAO_IDL/docs/CHANGES
+++ /dev/null
@@ -1,122 +0,0 @@
-CHANGES WHICH AFFECT BE WRITERS
--=============================-
-
-INTRODUCTION
-
-This file describes changes that affect BE writers. It contains IMPORTANT
-INFORMATION for BE writers who wish to migrate a BE written to operate with
-release 1.2 to operate with release 1.3. It is likely that not following
-these instructions will result in a compilable but malfunctioning compiler.
-
-AST INHERITANCE CHANGES
-
-The AST has been reorganized so that AST_Union and AST_Exception now
-inherit from AST_Structure. This means that constructors of BE classes
-which inherit from AST_Union or AST_Exception now need to explicitly call
-an initializer for AST_Structure in their init section.
-
-We repeat below the information given in the file WRITING_A_BE, in the
-section entitled "WRITING A BE".
-
-AST_EXCEPTION
-
-The signature for constructors of classes inheriting from AST_Exception
-should now be:
-
-	BE_Exception::BE_Exception(UTL_ScopedName *n,
-				   UTL_StrList *p)
-		    : AST_Decl(AST_Decl::NT_except, n, p),
-		      AST_Structure(AST_Decl::NT_except, n, p),
-		      UTL_Scope(AST_Decl::NT_except)
-
-AST_UNION
-
-The signature for constructors of classes inheriting from AST_Union should
-now be:
-
-	BE_Union::BE_Union(AST_ConcreteType *dt,
-			   UTL_ScopedName *n,
-			   UTL_StrList *p)
-		: AST_Union(dt, n, p),
-		  AST_Structure(AST_Decl::NT_union, n, p),
-		  AST_Decl(AST_Decl::NT_union, n, p),
-		  UTL_Scope(AST_Decl::NT_union)
-
-IDL_BOOL TYPE
-
-To increase portability and reduce dependency of the sources on POSIX
-compliance in targets of ports, IDL now provides its own boolean type which
-is named idl_bool. It provides two truth values, I_TRUE and I_FALSE.
-
-UTL_SCOPEDNAME TYPE
-
-The UTL_ScopedName type is now a list of Identifier nodes; in previous
-releases it used to be a list of String nodes. If your BE constructs scoped
-names this change will prevent recompilation until you modify your
-constructor calls to invoke constructors for Identifier instead of for
-String. The signature of the constructor is:
-
-	Identifier::Identifier(char *, long x=1, long y=0, long z=I_FALSE)
-
-The additional arguments which can be defaulted to the values indicated are
-included for future use.
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
diff --git a/TAO/TAO_IDL/docs/CLI b/TAO/TAO_IDL/docs/CLI
deleted file mode 100644
index a61c2bae365..00000000000
--- a/TAO/TAO_IDL/docs/CLI
+++ /dev/null
@@ -1,187 +0,0 @@
-OMG INTERFACE DEFINITION LANGUAGE COMPILER FRONT END: COMMAND LINE INTERFACE
--==========================================================================-
-
-INTRODUCTION
-
-This document describes general OMG Interface Definition Language compiler
-command line options. Options that are specific to a given back end, object
-adapter or language are not described here. These should be described in a
-document detailing the interface implemented by each specific back end.
-
-OMG INTERFACE DEFINITION LANGUAGE COMMAND LINE OPTIONS
-
-OMG Interface Definition Language compiler options are described below.
-Unless otherwise noted, only one occurrence of each option is allowed.
-The following conventions are used
-
-- Text in '[..]' is optional.
-- Text followed by '*' can be repeated zero or more times.
-- Text followed by '+' can be repeated once or more times.
-- '{' and '}' are used to group text to cause '+' or '*' to apply to
-  the entire grouped text.
-- 'aa|bb' means either 'aa' or 'bb'.
-
-COMMAND LINE SUMMARY
-
-	idl [flag | file-name]*
-
-Flags are command line words that start with a '-'. All other command line
-words are assumed to be file names. If no file names are given, input is
-taken from stdin.
-
-COMMAND LINE FLAGS
-
--A[xyz]	A local escape. This can be used to specify additional options that
-	are specific to a given implementation. More than one -A option is
-	allowed
-
--Dname[=value]
-	Defines name and an optional value to be passed to a compliant C++
-	preprocessor, as if by #define. White space between the -D option
-	and the name is optional. More than one -D option is allowed.
-
--d	If no parse errors were found, prints out a representation of the
-	IDL input to stderr.
-
--E	Runs the C++ preprocessor on the OMG Interface Definition Language
-	input and sends the result to the standard output.
-
--Idirectory
-	Causes directory to be added to the search path for include files.
-	More than one -I option is allowed. This option is processed by a
-	compliant C++ preprocessor.
-
--Uname	Undefines name, as if by #undef. White space between the -U option
-	and the name is optional. More than one -U option is allowed.
-
--V	Causes the version information of the CFE to be displayed. No other
-	work is done, regardless of any other options.
-
--W[b|p][,arg]+
-	Hands off the arguments supplied to a specific portion of the OMG
-	Interface Definition Language compiler:
-
-	- -Wb arguments are handed to the loaded back end
-	- -Wp arguments are handed to a compliant C++ preprocessor
-
--Yp,pathname
-	Specifies an alternate path for finding a C++ compliant
-	preprocessor. Specifiers other than 'p' may be defined in future
-	versions of the CFE. More than one -Y option may appear. The last
-	one specifying each component takes effect.
-
-	This option exists but currently does nothing. Instead, we use the
-	preprocessing facilities provided by invoking CC -E always.
-
--bback_end
-	Causes the CFE to use a different compiler back end than the
-	default one (if dynamic loading is supported). Legal values for
-	this option and the default value are implementation specific.
-
--u	Prints a usage message from the CFE. All possible options are
-	shown. No other work is done regardless of any other options.
-
--v	Causes the CFE to produce informational output as the various
-	phases of the compiler execute.
-
--w	Suppresses IDL compiler warning messages.
-
-
-WHITESPACE
-
-All option arguments may be separated from their option letter by
-whitespace. For example, -D FOO is equivalent to -DFOO.
-
-UNKNOWN OPTIONS
-
-If an unknown option is passed to the CFE, the offending option is
-displayed to the user together with a usage message, and no compilation is
-performed.
-
-PASSING OPTIONS TO COMPILER PHASES
-
-The order in which options appear on the command line is preserved when
-they are passed to various compiler phases.
-
-MUTUALLY EXCLUSIVE OPTION COMBINATIONS
-
-Mutually exclusive or ambiguous option combinations are resolved by using
-the option that appears later on the command line. For example,
-
-    -DFOO -UFOO
-
-has no effect and leaves FOO undefined for the preprocessor.
-
-OPTION SCOPE
-
-All options are in effect for the entire IDL compilation run. If multiple
-IDL source file names are given on the command line, all options apply to
-each file. If different IDL source files require different sets of options
-for successfull compilation, they must be compiled separately.
-
-EXIT STATUS
-
-IDL Compilers exit with status equal to zero for successfull compilations.
-If errors were found by the CFE, the exit status is a count of the errors.
-The exit status for unsuccessfull compilations aborted by BEs is defined by
-each BE.
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
-COPYRIGHT NOTICE:
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
diff --git a/TAO/TAO_IDL/docs/COPYRIGHT b/TAO/TAO_IDL/docs/COPYRIGHT
deleted file mode 100644
index 461ad949518..00000000000
--- a/TAO/TAO_IDL/docs/COPYRIGHT
+++ /dev/null
@@ -1,57 +0,0 @@
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
diff --git a/TAO/TAO_IDL/docs/INSTALL b/TAO/TAO_IDL/docs/INSTALL
deleted file mode 100644
index 6fcaa710042..00000000000
--- a/TAO/TAO_IDL/docs/INSTALL
+++ /dev/null
@@ -1,229 +0,0 @@
-INTERFACE DEFINITION LANGUAGE INSTALLATION GUIDE
--==============================================-
-
-INTRODUCTION
-
-This file describes the installation process for OMG_IDL_CFE version 1.3.
-This file explains how to:
-
-- install the source code
-- modify the sources to customize them for different configurations
-- modify the sources to implement your own back end
-
-TESTED CONFIGURATIONS
-
-This release has been tested and is believed to operate correctly on:
-- SunPro Sparcworks 2.x and 3.0 on SunOS 4.1.x
-- SunPro Sparcworks 2.x and 3.0 on Solaris 2.3
-- g++ 2.5.8 on SunOS 4.1.x
-- g++ 2.5.8 on Solaris 2.3
-
-This is the first release of OMG IDL CFE which is preconfigured to compile
-correctly for Solaris 2.x and with SunPro SparcWorks compilers.
-
-CUSTOMIZATION
-
-The release contains a file idl_make_vars in the current directory, which
-is included in each Makefile. This file defines all the customizable
-variables for the CFE.
-
-OSV should be set to a string denoting the operating system upon which you
-wish to build the CFE. The CFE as shipped is preconfigured to compile
-correctly on Solaris 2.x (OSV=SOLARIS2), and has also been tested on SunOS
-4.1.x (OSV=SUNOS4). It contains code donated by HP which enables it to be
-compiled on Apollo Domain systems (OSV=apollo) and HPUX systems (OSV=hpux),
-but these two configurations have not been tested.
-
-C++ and CCC should be set to identify the C++ compiler you will use to
-compile this release. Their values should be identical. Both are set to
-address differences between various make programs - some predefine CCC,
-others use C++ to denote the C++ compiler. The possible values are CC
-(which uses the Sparcworks compilers on SunOS 4.1 and Solaris 2.3) and g++,
-which uses the installed version of GNU C++.
-
-CCFLAGS should be set to a list of flags to pass to the C++ compiler. As
-shipped, this list is -g. NOTE: We have not extensively tested the release
-with optimization turned on.
-
-CPP_FLAGS should be set to a list of flags to pass to the C++ preprocessor.
-Use this variable to enable or disable specific customizations you make to
-the BE or CFE sources.
-
-YFLAGS should be set to a list of flags to pass to the Yacc program. As
-shipped, the list is -d -t, which causes Yacc to generate y.tab.h and
-y.tab.c files.
-
-LEXFLAGS should be set to a list of flags to pass to the Lex program. As
-shipped, the list -t.
-
-RANLIB should be set to the location of the ranlib program on your system.
-As shipped this is ranlib. If your system has no ranlib you can set this
-variable to ':' or /bin/true. As shipped the variable is preset to
-/bin/true since Solaris 2.x does not use ranlib.
-
-AR should be set to the location of the ar program on your system. As
-shipped this is ar. If your system has a different mechanism for creating
-libraries, you should modify the value of this variable accordingly.
-
-ARFLAGS should be set to the flags to be passed to the ar program. As
-shipped this is 'crv'.
-
-INSTALLATION
-
-a. Disk space requirements
-
-This distribution requires approximately 350 KBytes when compressed. When
-uncompressed, untarred and compiled, approximately 10 MBytes of disk space
-are consumed on a Sun 4.
-
-b. Getting the software
-
-Use anonymous FTP to omg.org and supply your e-mail address as password.
-Change directories to pub/OMG_IDL_CFE_1.3, set bin and get the compressed
-tar file OMG_IDL_CFE_1.3.tar.Z.
-
-The distribution may, in the future, be made available from other archives
-on the Internet. However, omg.org will always have the most up-to-date
-version of this software.
-
-After transferring this file, uncompress it and untar it in a directory of
-your choice.
-
-c. Compiling it
-
-If you are using a Sparcstation running Solaris 2.x and have the SunPro
-Sparcworks compilers installed, you may directly install the software. If
-your hardware or operating system configurations are different, read and
-follow the instructions in the previous section first.
-
-At the root directory of the release, issue
-
-   % make
-
-or
-
-   % make all
-
-This will compile the provided sources and the sources found in the be
-directory. Executing this make target causes 'make all' to be invoked in
-each subdirectory, resulting in building the libraries for each component
-and finally a link step producing an executable IDL compiler.
-
-In order to make only the compiler front end components, without compiling
-the sources found in the be directory and without building an executable,
-issue
-
-  % make libs
-
-This will build the libraries in the ast, fe, util, driver and narrow
-directories. To build only the be, issue
-
-  % make be
-
-To build all libraries without creating an executable, issue
-
-  % make all_libs
-
-To remove all files created by the build process, issue
-
-  % make clean
-
-This will not remove any files created by Yacc and Lex, because you may be
-using the ones provided in the distribution (see below).
-
-d. Yacc and Lex
-
-Some installations may not have a C++ aware Yacc and Lex processor. For
-these installations, we have included the output of yacc and lex in the
-release. If you need to use these files to build the release because you
-don't have access to a C++ capable Yacc or Lex, go to the "fe" directory,
-issue the command:
-
-   % touch lex.yy.cc y.tab.cc y.tab.hh
-
-This will ensure that the processed files appear to be newer than the
-source files they were produced from and will cause "make" to skip their
-production.
-
-NOTE: The files provided in the distribution have been produced on Solaris
-2.3 and may contain OS-specific #include directives. If you intend to use
-these files, you may have to edit them to make them work in your
-environment. The provided files are known to compile cleanly without
-modification with both SunPro Sparcworks compilers and GNU C++ on both
-SunOS 4.1 and Solaris 2.3.  We have not tested the grammar and lexer input
-files with bison or flex.
-
-IMPLEMENTING A BACK END
-
-To implement your own back end, you can start with the provided sources in
-the be directory and modify them. The Makefile understands the 'make all'
-target and will generate libbe.a in the demo_be directory. As set up, the
-variable CPP_FLAGS allows you to place include files either in the current
-directory or in the include directory. Alternatively, you can place your
-include files in a new directory and modify CPP_FLAGS to cause the C++
-preprocessor to search this new directory for referenced include files, by
-adding a new -I directive.
-
-Additional detail on the structure and function of back ends, and on the
-protocol which a back end must implement, are found in the document
-entitled WRITING_A_BE.
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
diff --git a/TAO/TAO_IDL/docs/PROBLEMS b/TAO/TAO_IDL/docs/PROBLEMS
deleted file mode 100644
index 65cfb6a1893..00000000000
--- a/TAO/TAO_IDL/docs/PROBLEMS
+++ /dev/null
@@ -1,132 +0,0 @@
-OMG INTERFACE DEFINITION LANGUAGE COMPILER FRONT END: KNOWN PROBLEMS
--==================================================================-
-
-INTRODUCTION
-
-This file describes what configurations are known to work correctly with
-this release, and what are the known problems with this release as shipped.
-Comments about future possible enhancements do not imply a commitment on
-the part of Sun or any of its subsidiaries to produce these enhancements.
-
-TESTED CONFIGURATIONS
-
-This release has been tested and is known to operate correctly on:
-
-- Sparcstation 2 running SunOS 4.1.2, when compiled with SparcWorks 3.0
-- Sparcstation 10 running Solaris 2.3, when compiled with SparcWorks 3.0.1
-- Sparcstation 10 running Solaris 2.3, when compiled with SparcWorks 4.0
-
-We are aware of a bug in GNU C++ (the latest version we tested was 2.5)
-which causes up-casting (changing the type of an instance from a base class
-to a more derived class, also known as "narrowing") to fail or cause a
-program crash.
-
-PROBLEMS:
-
-This is a list of known problems with the current version of the CFE:
-
-- The following syntax, although legal, is not accepted by the CFE:
-
-  .. sequence <string <10>> ..
-
-  This causes a parse error. The cause of this problem is that the '>>' is
-  read as a right shif operater and not as two '>'s. You can avoid this
-  problem by instead writing
-
-  .. sequence <string <10> > ..
-
-- The following syntax, although legal, is not accepted by the CFE:
-
-  const string foo = "abc" " and" " another" " string";
-
-  Instead, write:
-
-  const string foo = "abc and another string";
-
-- The printout produced by the -d option for dumping the AST is not always
-  perfect. Specifically, dumping of sequences and arrays is deficient.
-
-POSSIBLE FUTURE ENHANCEMENTS:
-
-This is a list of areas in which the code of the CFE may change in future
-releases:
-
-- The current release is restricted in its use of C++ because it must
-  be possible to compile it using C++ 2.1. However, we have also provided
-  files that depend on features which are only present in C++ 3.0, such as
-  templates. If your compiler supports templates and you wish to use them,
-  copy the files in include/utl_tmpl to include, and copy the files in
-  util/utl_tmpl to util. You will also need to make compiler dependent
-  modifications to Makefiles throughout the CFE directory hierarchy to
-  enable the use of templates.
-
-  The code using templates was donated by Steve Vinoski of HP.
-
-  In a future release of the CFE only the template code may be included,
-  and hence users will need to use a C++ 3.0 or higher compiler.
-
-- The UTL_list classes defined in the util directory are rudimentary. More
-  features may be added to make the functionality richer.
-
-- The UTL_String class may be rewritten or replaced by a standard ANSI C++
-  String implementation. Applications will be shielded from this change.
-
-COPYRIGHT:
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
diff --git a/TAO/TAO_IDL/docs/README b/TAO/TAO_IDL/docs/README
deleted file mode 100644
index 6d73554acce..00000000000
--- a/TAO/TAO_IDL/docs/README
+++ /dev/null
@@ -1,233 +0,0 @@
-INTERFACE DEFINITION LANGUAGE COMPILER FRONT END
--==============================================-
-
-INTRODUCTION
-
-Welcome to the publicly available source release of SunSoft's
-implementation of the compiler front end (CFE) for OMG Interface Definition
-Language! This is Release 1.3 of the CFE.
-
-The Interface Definition Language (IDL) implementation is divided into
-three parts:
-
-- A main program for driving the compilation process
-- A parser and attendant utilities
-- One or more back ends (BEs) for taking the processed input and producing
-  output in a target language and target format
-
-WARNINGS
-
-This is a preliminary version. This software is made available AS IS and
-WITH NO GUARANTEES. Please read  the copyright notice attached at the
-bottom of this file.
-
-IMPORTANT NOTICE FOR USERS OF OMG IDL CFE VERSION 1.2.
-
-Please carefully read the file CHANGES to obtain IMPORTANT INFORMATION on
-changes in that may affect the manner in which a BE is constructed. You
-must follow instructions contained in the file CHANGES to obtain a
-functional BE if you are migrating an existing BE from OMG IDL CFE v. 1.2.
-
-TARGET AUDIENCE
-
-Who should use this release?
-
-- You can use this source release to create a stand alone parser for OMG
-  Interface Definition Language. This may be useful to verify the legality
-  of IDL input.
-- Developers of OMG Interface Definition Language compilers should use this
-  release as a basis for writing their back ends, to obtain a common
-  framework for their compiler and to provide portable and uniform
-  parsing of IDL input.
-
-HOW TO OBTAIN THIS SOFTWARE
-
-Please use anonymous FTP to omg.org and supply your e-mail address as the
-password. Then change directories to pub/OMG_IDL_CFE_1.3, set binary transfer
-and get the file OMG_IDL_CFE_1.3.TAR.Z. This file includes copies of all
-individual documentation files in the directory.
-
-Precompiled binaries constructed from the sources in this release will be
-made available shortly, in the directory pub/OMG_IDL_CFE_1.3/bin. These
-binaries are useful for parsing IDL source and for learning about the
-language. Precompiled binaries for Solaris 2.x and for SunOS 4.x will be
-provided.
-
-You can also use the mail server program to retrieve this software. Send
-email with the subject 'help' to omg_idl@omg.org, and the mail server will
-respond with instructions on how to retrieve the software.
-
-Copies of this software may be made available from archives other than
-omg.org. New versions made available by Sun will be placed on omg.org and a
-message will be sent to this newsgroup announcing its availability.
-
-Finally, the SunSoft OMG IDL CFE is also available on magnetic tape for a
-nominal media charge directly from SunSoft. Please refer to part number
-DIDL-100-STP when ordering.
-
-CONTACT POINT
-
-Please let us know who you are if you decide to use this software, and how
-you use it. Please send e-mail to:
-
-     idl-cfe@sun.com
-
-This address can also be used to report problems, bugs, suggestions and
-send general comments.
-
-WHAT IS PROVIDED IN THE RELEASE
-
-Provided in this release are:
-
-- A main program for driving an Interface Definition Language compiler
-- A parser for the Interface Definition Language grammar which builds an
-  internal representation of the input parsed. This internal
-  representation, named an Abstract Syntax Tree (AST), is used as input to
-  a back end
-- Some utility functions used by the parser
-- A demonstration back end (BE) which exercises the front end but produces
-  no translated output
-- Documentation of the public interfaces and of the contract between
-  the compiler front end and a back end
-
-OPERATION
-
-A complete compiler operates in two passes:
-
-- The first pass, provided in this release, parses the IDL input and
-  produces an internal representation, called an Abstract Syntax Tree (AST).
-  This pass also does a complete syntax and semantics check of the input
-  provided to ensure that exactly legal IDL input is accepted. If a syntax
-  or semantic error is discovered, the second pass is not invoked.
-- The second pass, provided by compiler developers, takes the AST and
-  produces output in the language and format of choice. A demonstration
-  back end is provided in the release.
-
-HOW TO USE THIS SOFTWARE
-
-To create a complete compiler from OMG Interface Definition Language to a
-target language, compiler developers will:
-
-- Write a back end (BE) to take the internal representation of the input
-  parsed and translate it to the target language and format. You will
-  probably want to replace the BE directory in this source tree with your
-  own BE directory
-- Link the BE with the sources provided here to produce a complete
-  compiler.
-
-DOCUMENTATION
-
-The OMG Interface Definition Language is fully described in the CORBA
-documentation, Chapter 4. This document may be obtained from OMG.
-
-This release also provides the following documents:
-
-- This README file, describing the release
-- INSTALL, describing installation of the software
-- WRITING_A_BE contains all the information needed to start writing a back
-  end for this distribution
-- CHANGES_IN_AST describes changes that affect migration of BEs written
-  against version 1.2 to version 1.3.
-- CLI, describing the command line interface to the CFE
-- ROADMAP, describing the directory structure for the source code. This
-  file will assist a developer in understanding the structure of the code
-  and navigating it
-- PROBLEMS, describing a list of issues that may be addressed in future
-  releases
-- BUG_REPORT, containing a form for use in reporting bugs and problems
-  with the IDL CFE
-
-ENVIRONMENT
-
-The INSTALL file explains how to customize the software for specific
-platforms. The source distribution expects the following environment:
-
-- Sparcstation 1, 2, or 10 hardware
-- SunPro SparcWorks 3.x or 4.0
-
-As preconfigured, it compiles on Solaris 2.x. It can be reconfigured to
-compile on SunOS 4.x, HPUX or Apollo Domain OS. As far as is known, no use
-is made of Sun Make-specific features, and the Makefiles should be usable
-with other make programs.
-
-This release has been tested and is believed to operate correctly with:
-- SunPro Sparcworks 2.x and 3.0 on SunOS 4.1.x
-- SunPro Sparcworks 2.x and 3.0 on Solaris 2.3
-- g++ 2.5.8 on SunOS 4.1.x
-- g++ 2.5.8 on Solaris 2.3
-
-INSTALLATION
-
-This release is targetted for Sun workstations running Solaris 2.x. The
-process of installing this software is described in detail in the file
-INSTALL in this directory. The INSTALL file also describes how to customize
-the release for your own environment if it is different.
-
-KNOWN PROBLEMS
-
-A list of known deficiencies is provided in the file PROBLEMS in this
-directory. If you find a problem which is not mentioned in it, please
-report it as described below. Please read this file now to be apprised of
-the problems found so far with this release.
-
-COPYRIGHT
-
-This copyright notice appears on all files. Please read it!
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
diff --git a/TAO/TAO_IDL/docs/ROADMAP b/TAO/TAO_IDL/docs/ROADMAP
deleted file mode 100644
index 5da0d83823c..00000000000
--- a/TAO/TAO_IDL/docs/ROADMAP
+++ /dev/null
@@ -1,126 +0,0 @@
-INTERFACE DEFINITION LANGUAGE SOURCE TREE ROADMAP
--===============================================-
-
-INTRODUCTION
-
-This file provides an overview of the directory structure of the sources
-for the compiler front end for OMG Interface Definition Language. This will
-be of use in understanding the source structure and will aid developers of
-BEs.
-
-DIRECTORIES
-
-The following directories are present:
-
-- idl_specs:  Contains many examples of IDL specifications, including the
-	      IDL specifications of several Object Services, and several
-	      files that somewhat exhaustively test features of the IDL
-	      language
-- include:    Contains all include (".hh") files
-- ast:	      Contains implementations for all classes comprising
-	      the AST internal representation of the input parsed
-- fe:	      Contains the Yacc grammar and Lex specification for
-	      the OMG Interface Definition Language, and some utilities
-- driver:     Contains the main program which drives the compilation
-	      process
-- util:	      Contains utility classes used throughout the CFE. These
-	      classes may also be of use in writing a BE
-- narrow:     Contains an implementation of a narrowing mechanism used
-	      in the CFE. Since C++ does not provide compiler support
-	      for narrowing, this is provided as an explicit service
-- demo_be:    Contains a demonstration back end which subclasses all
-	      the AST classes but adds no functionality
-
-NAMING CONVENTIONS
-
-The file names start with two or three characters identifying the component
-to which they belong:
-
-- idl_:	      This is the prefix for all files which contain global
-	      elements of the CFE
-- ast_:	      This is the prefix for all files containing implementations
-	      or definitions of the AST
-- fe_:	      This is the prefix for all files belonging to the parser
-- drv_:	      This is the prefix for all files belonging to the compiler
-	      driver
-- utl_:	      This prefix is used to identify files belonging to the set of
-	      utlities provided with the CFE
-- nr_:	      This prefix identifies files belonging to the narrowing mechanim
-- be_:	      This is the prefix for all files belonging to the back end
-
-All C++ files use the ".cc" extension, and all include files have the ".hh"
-extension. All make files are named Makefile. Each directory contains a
-make file. Lex input files have the ".ll" extension, and Yacc input files
-use the ".yy" extension. All files containing IDL specifications have a
-name ending with the ".idl" suffix.
-
-INCLUDE FILE HIERARCHY
-
-There are two main include files which must be included in all source
-files. These are idl.hh and idl_extern.hh. The idl.hh file includes the
-definitions for all the facilities provided by the CFE. The idl_extern.hh
-file declares globally accessible data and exported application programmer
-interface entry points.
-
-Each component has an include file for its own. Back end writers will want
-to modify be.hh and possibly be_extern.hh.
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
diff --git a/TAO/TAO_IDL/docs/WRITING_A_BE b/TAO/TAO_IDL/docs/WRITING_A_BE
deleted file mode 100644
index 5c3c069f7a1..00000000000
--- a/TAO/TAO_IDL/docs/WRITING_A_BE
+++ /dev/null
@@ -1,1350 +0,0 @@
-OMG INTERFACE DEFINITION LANGUAGE COMPILER FRONT END PROTOCOLS
-==============================================================
-
-INTRODUCTION
-------------
-
-Welcome to the publicly available source release of SunSoft's
-implementation of the compiler front end (CFE) for OMG Interface Definition
-Language!
-
-This document explains how to use the release to create a fully functional
-OMG Interface Definition Language to target language compiler for your
-selected target system configuration. The section OVERVIEW explains this
-document's structure.
-
-CONTEXT
--------
-
-The implementation has three parts:
-
-1. A main program driving the compilation process
-2. A parser and attendant utilities for converting the IDL input into
-   an internal form
-3. One or more back ends which take as input the internal form representing
-   the IDL input, and which produce output in a target language and target
-   format
-
-The release contains components 1 and 2, and a demonstration implementation
-of component 3. To use this release, you
-
-- write a back end which takes the internal representation of the parsed input
-  and translates it to the target language and format. You may replace or
-  modify the demonstration back end provided.
-- link the back end with the provided main program and parser sources
-  to produce a complete compiler.
-
-OVERVIEW
---------
-
-This document does not explain IDL nor does it introduce IDL features. 
-For this information, refer to the OMG CORBA specification, available by
-anonymous FTP from omg.org.
-
-This document does not explain C++, except to demonstrate how it is
-used to construct the CFE. The ARM by Stroustrup and Ellis provides a
-thorough explanation of C++.
-
-This document consists of two independent parts. The first part
-s all CFE supported protocols and the required
-application programmer's interface entry points that a conformant 
-BE must provide. The second part steps through the process of
-constructing a working BE.
-
-The first part describes:
-
-- The compilation process
-- The Abstract Syntax Tree (AST) internal representation of parsed IDL
-  input
-- How access to member data fields is managed
-- How the AST is generated from the IDL input (Generator protocol)
-- How definition scopes are nested and how name lookup works
-- The narrowing mechanism
-- How definition scopes are managed and how nodes are added to scopes
-- How BEs get control during the AST construction process (Add protocol)
-- The inheritance scheme used by the AST and how it affects BEs
-- How errors are handled and reported
-- How the CFE is initialized
-- How the command line arguments are parsed
-- What global variables and functions are provided
-- What API is required to be supported by a BE in order to link
-  with the CFE
-- What files must be included in each BE file
-
-The second part describes
-
-- The API to be supplied by each BE
-- How to subclass from the AST to add BE specific functionality
-- How to subclass from the Generator protocol to create BE specific
-  extended AST nodes
-- How to write constructors for the derived BE classes
-- How to use the Add protocol to store BE specific information
-- How to maintain BE specific information which applies to the entire
-  AST generated from the IDL input
-- How to use data members in your BE
-- How to build a complete compiler
-
-PART I. FEATURES OF THE CFE
--=========================-
-
-THE COMPILATION PROCESS
------------------------
-
-The OMG IDL compiler operates as follows:
-
-- Parses command line arguments. If an option is directed at a
-  BE, an appropriate operation provided by the BE is invoked to process
-  the option.
-- Performs global initialization.
-- Forks a copy of the compiler for each file specified as input.
-- An ANSI-compatible preprocessor preprocesses the IDL input.
-- Parses the file using the CFE parser, and constructs an AST describing the
-  IDL input.
-- Prints the AST for verification, if requested.
-- Invokes the BE to process the AST and produce the output
-  characteristic of that BE.
-
-ABSTRACT SYNTAX TREE
---------------------
-
-The AST (Abstract Syntax Tree) is the primary mechanism for communication
-between a BE and the CFE. It consists of a tree of instances of classes
-defined in the CFE or refinements of those classes as defined in a BE.
-The class hierarchy of the AST closely resembles the structure of the IDL
-syntax. Most AST classes have direct equivalents in IDL constructs.
-
-The UTL_Scope class defines common functionality for definition scope
-management and name lookup. This is explained in a following section.
-UTL_Scope is defined in include/utl_scope.hh and implemented in
-util/utl_scope.cc.
-
-The AST provides the following classes:
-
-AST_Decl	    Base of the AST class hierarchy. Each class in the AST
-		    inherits from AST_Decl. Defined in include/ast_decl.hh
-		    and implemented in ast/ast_decl.cc
-
-AST_Type	    Common base class for all classes which represent IDL
-		    type constructs. Defined in include/ast_type.hh and
-		    implemented in ast/ast_type.cc. Inherits from AST_Decl.
-
-AST_ConcreteType    Common base class for all classes which represent IDL
-		    types other than interfaces. Defined in the file
-		    include/ast_concrete_type.hh and implemented in
-		    ast/ast_concrete_type.cc. Inherits from AST_Type.
-
-AST_PredefinedType  Instances of this class represent all predefined types
-		    such as long, char and so forth. Defined in the file
-		    include/ast_predefined_type.hh and implemented in
-		    ast/ast_predefined_type.cc. Inherits from
-		    AST_ConcreteType.
-
-AST_Module	    Represents the IDL module construct. Defined in the
-		    file include/ast_module.hh and implemented in
-		    ast/ast_module.cc. Inherits from AST_Decl and
-		    UTL_Scope.
-
-AST_Root	    Represents the root of the abstract syntax tree being
-		    constructed. Is a subclass of AST_Module. Can be
-		    subclassed in BEs to store information associated with
-		    the entire AST. Defined in the file include/ast_root.hh
-		    and implemented in ast/ast_root.cc. Inherits from
-		    AST_Module.
-
-AST_Interface	    Represents the IDL interface construct. Defined in
-		    include/ast_interface.hh and implemented in the file
-		    ast/ast_interface.cc. Inherits from AST_Type and
-		    UTL_Scope.
-
-AST_InterfaceFwd    Represents a forward declaration of an IDL interface.
-		    Defined in include/ast_interface_fwd.hh and implemented
-		    in ast/ast_interface_fwd.cc. Inherits from AST_Decl.
-
-AST_Attribute	    Represents an IDL attribute construct. Defined in
-		    include/ast_attribute.hh and implemented in the file
-		    ast/ast_attribute.cc. Inherits from AST_Decl.
-
-AST_Exception	    Represents an IDL exception construct. Defined in
-		    include/ast_exception.hh and implemented in the file
-		    ast/ast_exception.cc. Inherits from AST_Decl.
-
-AST_Structure	    Represents an IDL struct construct. Defined in the file
-		    include/ast_structure.hh and implemented in the file
-		    ast/ast_structure.cc. Inherits from AST_ConcreteType
-		    and UTL_Scope.
-
-AST_Field	    Represents a field in an IDL struct or exception
-		    construct. Defined in include/ast_field.hh and
-		    implemented in ast/ast_field.cc. Inherits from
-		    AST_Decl.
-
-AST_Operation	    Represents an IDL operation construct. Defined in the
-		    file include/ast_operation.hh and implemented in
-		    ast/ast_operation.cc. Inherits from AST_Decl and
-		    UTL_Scope.
-
-AST_Argument	    Represents an argument to an IDL operation construct.
-		    Defined in include/ast_argument.hh and implemented in
-		    ast/ast_argument.cc. Inherits from AST_Field.
-
-AST_Union	    Represents an IDL union construct. Defined in
-		    include/ast_union.hh and implemented in
-		    ast/ast_union.cc. Inherits from AST_ConcreteType and
-		    from UTL_Scope.
-
-AST_UnionBranch	    Represents an individual branch in an IDL union
-		    construct. Defined in include/ast_union_branch.hh and
-		    implemented in ast/ast_union_branch.cc. Inherits from
-		    AST_Field.
-
-AST_UnionLabel	    Represents the label of an individual branch in an IDL
-		    union construct. Defined in include/ast_union_label.hh
-		    and implemented in ast/ast_union_label.cc
-
-AST_Constant	    Represents an IDL constant construct. Defined in
-		    include/ast_constant.hh and implemented in the file
-		    ast/ast_constant.cc. Inherits from AST_Decl.
-
-AST_Enum	    Represents an IDL enum construct. Defined in the file
-		    include/ast_enum.hh and implemented in ast/ast_enum.cc.
-		    Inherits from AST_ConcreteType and UTL_Scope.
-
-AST_EnumVal	    Represents an enumerator in an IDL enum construct.
-		    Defined in include/ast_enum_val.hh and implemented in
-		    ast/ast_enum_val.cc. Inherits from AST_Constant.
-
-AST_Sequence	    Represents an IDL sequence construct. Defined in
-		    include/ast_sequence.hh and implemented in
-		    ast/ast_sequence.cc. Inherits from AST_Decl.
-
-AST_String	    Represents an IDL string construct. Defined in the file
-		    include/ast_string.hh and implemented in
-		    ast/ast_string.cc. Inherits from AST_Decl.
-
-AST_Array	    Represents an array modifier to the type of an IDL
-		    field or typedef declaration. Defined in the file
-		    include/ast_array.hh and implemented in
-		    ast/ast_array.cc. Inherits from AST_Decl.
-
-AST_Typedef	    Represents an IDL typedef construct. Defined in the file
-		    include/ast_typedef.hh and implemented in
-		    ast/ast_typedef.cc. Inherits from AST_Decl.
-
-AST_Expression	    Represents an IDL expression. Defined in the file
-		    include/ast_expression.hh and implemented in
-		    ast/ast_expression.cc.
-
-AST_Root	    A subclass of AST_Module, an instance of this class
-		    is used to represent the distinguished root node of
-		    the AST. Defined in include/ast_root.hh and implemented
-		    in ast/ast_root.cc. Inherits from AST_Module.
-
-
-USING INSTANCE DATA
--------------------
-
-The AST classes define member data fields in addition to defining
-operations on instances. These member data fields are all private, to allow
-only the instance in which they are stored direct access. Other objects
-(including other instances of the same class) can obtain access to the
-member data fields of an instance through accessor functions. These
-accessor functions allow retrieval of the data, and in some cases update
-functions are also provided to store new values.
-
-There are several reasons why this approach is taken. First, it hides the
-actual implementation of the member data fields from outside the class. For
-example, a Thermometer class would not expose whether its temperature
-reading is stored in Farenheit or Celsius units, and it could allow access
-through either unit method.
-
-Second, protecting access to member data in this manner restricts the
-ability to update it to the instance itself, save where update functions
-are explicitly provided. This makes for more reliable implementations,
-since the manipulation of the data is isolated in the class implementation
-itself.
-
-Third, wrapping a function call around access to member data allows such
-access and update operations to be protected in a multithreaded
-environment. While the CFE itself is not multithreaded and the access
-operations as currently defined do no special work to protect against
-mutliple conflicting access operations, this may be changed in a future
-version. Moving the CFE to a multithreaded environment without protecting
-access to member data in this manner would be extremely difficult.
-
-The protocol defined in the CFE is that member data fields are all private
-and have names which start with the prefix "pd_" (denoting Private Data).
-The access functions have names which are the same as the name of the field
-sans the prefix. For example, AST_Decl has a field pd_defined_in and an
-access function defined_in().
-
-The update functions have names starting with "set_" followed by the name
-of the corresponding access function. Thus, AST_Decl defines a function
-set_in_main_file(boolean) which sets the pd_in_main_file data member's
-value to the boolean provided.
-
-GENERATION OF THE AST
----------------------
-
-The CFE generates the abstract syntax tree after parsing IDL
-input. The nodes of the AST are defined by classes introduced in the
-previous section, or by subclasses thereof as defined by each BE. In
-writing the CFE, we were faced with the following problem: how to generate
-the AST containing nodes of the derived classes as defined in each BE
-without knowledge of the types and conventions of these BE classes.
-
-One alternative was to define a naming scheme which predetermines the names
-of each subclass a BE can define. The AST would then be generated by
-calling an appropriate constructor on the BE derived class. This scheme
-suffers from some shortcomings:
-
-- It breaks the modularity of the compiler and imports knowledge about
-  types defined in a BE into the CFE, where this information does not belong.
-- It restricts a compiler to having only one BE loaded at a time because the
-  names of these classes can be in use in only one BE at a time.
-- It requires a BE to provide derived classes for all AST classes, even for
-  those classes where the BE adds no functionality.
-
-The mechanism we chose is different. We define the AST_Generator class
-which has an operation for each constructor defined on each AST class. The
-operation takes arguments appropriate to the constructor, invokes it and
-returns the created AST node, using the type known to the CFE. All such
-operations on the generator are declared virtual. The names of all
-operations start with "create_" and contain the name of the construct.
-Thus, an operation which invokes a constructor of an AST_Module is named
-create_module. AST_Generator is defined in include/ast_generator.hh and
-implemented in ast/ast_generator.cc.
-
-If a BE derives from any AST class, it must also derive from the
-AST_Generator class and redefine the relevant operations to invoke
-constructors of the BE provided class instead of the AST provided class.
-For example, if BE_Module is a subclass of AST_Module in a BE, the BE would
-also define BE_Generator and redefine create_module to call the constructor
-of BE_Module instead of that provided by AST_Module.
-
-During initialization, the CFE causes an instance of the BE derived
-generator to be created and saved. This is explained in the section on
-REQUIRED ENTRY POINTS SUPPLIED BY A BE. During parsing, actions in the Yacc
-grammar invoke operations on the saved instance to create new nodes for the
-AST as it is being built. These operations invoke constructors for BE
-derived classes or for AST provided classes if they were not overridden.
-
-DEFINITION SCOPES
------------------
-
-IDL is a nested scoped language. The scoping rules are defined by the CORBA
-spec and closely follow those of C++.
-
-Scope management is implemented in two classes provided in the utilities
-library, UTL_Scope and UTL_Stack. UTL_Scope manages associations between
-names and AST nodes, and UTL_Stack manages scope nesting and entry and exit
-from definition scopes as the parse is proceeding. UTL_Scope is defined in
-include/utl_scope.hh and implemented in util/utl_scope.cc. UTL_Stack is
-defined in include/utl_stack.hh and implemented in util/utl_stack.cc.
-
-During initialization, the CFE creates an instance of UTL_Stack and saves
-it. During parsing, as definition scopes are entered and exited, AST nodes
-are pushed onto, or popped from, the stack represented by the saved
-instances. Nodes on the stack are stored as instances of UTL_Scope. Section
-THE NARROWING MECHANISM explains how to obtain the real type of a node
-retrieved from the stack.
-
-All definition scopes are linked in a tree rooted in the distinguished AST
-root node. This linkage is implemented by UTL_Scope and AST_Decl. The
-linkage is a permanent record of the scope nesting while the stack is a
-dynamic record which at each instant represents the current state of the
-parse.
-
-The nesting information is used to do name lookup. IDL uses scoped names  
-which are concatenations of definition scope names ending with individual
-construct names. For example, in
-
-	  interface a {
-		    struct b {
-			   long c;
-		    };
-		    const long k = 23;
-		    struct s {
-			   long ar[k];
-		    };
-	   };
-
-the name a::b::c represents the long field in the struct b inside the
-interface a.
-
-Lookup is performed by searching down the linkage chain for the first component
-of the name, then, when found, recursively resolving the remaining
-components in the scope defined by the first component. Lookup is relative
-to the scope of use; in the above example, k could also have been referred to
-as a::k within the struct s.
-
-Nodes are stored in a definition scope as instances of AST_Decl. Thus, name
-lookup returns instances of AST_Decl. The next section, THE NARROWING
-MECHANISM, explains how to obtain the real type of a node retrieved from a
-definition scope.
-
-THE NARROWING MECHANISM
------------------------
-
-Here we give only a cursory explanation of how narrowing works. We
-concentrate on defining the problem and showing how to use our narrowing
-mechanism. The narrowing mechanism is defined in include/idl_narrow.hh.
-
-As explained above, nodes are stored on the scope stack as instances of
-UTL_Scope, and inside definition scopes as instances of AST_Decl. Also,
-nodes are linked in a nesting tree as instances of AST_Decl. Given a node
-retrieved from the stack or a definition scope, one is faced with the task
-of obtaining its real class. C++ does not currently provide an implicit
-mechanism for narrowing to a derived class, so the CFE defines its own
-mechanism. This mechanism requires some work on your part as BE implementor
-and requires some explicit code to be written when it is to be used.
-
-The class AST_Decl defines an enum whose members encode specific AST node
-classes. AST_Decl provides an accessor function, node_type(), which
-retrieves a member of the enum representing the AST type of the node. Thus,
-if an instance of AST_Decl really is an instance of AST_Module, the
-node_type() accessor returns AST_Decl::NT_module.
-
-The class UTL_Scope also provides an accessor function, scope_node_type(),
-which returns a member of the enum encoding the actual type of the node.
-Thus, given an UTL_Scope instance which is really an instance of
-AST_Operation, scope_node_type() would return AST_Decl::NT_op.
-
-Perusing the header files for classes provided by the AST, you will note
-the use of some macros defined in include/idl_narrow.hh. These macros
-define the explicit narrowing mechanism:
-
-DEF_NARROW_METHODSx(<class name>,<parent_x>) for x equal to 0,1,2 or 3,
-defines a narrowing method for the specified class which has 0,1,2 or 3
-immediate base classes from which it inherits. For example, ast_module.hh
-which defines AST_Module contains the following line:
-
-      DEF_NARROW_METHODS2(AST_Module, AST_Decl, UTL_Scope)
-
-This is because AST_Module inherits directly from AST_Decl and UTL_Scope.
-
-DEF_NARROW_FROM_DECL(<class name>) appears in class definitions for classes
-which are derived from AST_Decl and which can be stored in a definition
-scope. This macro declares a static operation narrow_from_decl(AST_Decl *)
-on the class in which it appears. The operation returns the provided
-instance as an instance of <class name> if it can be narrowed, or NULL.
-
-DEF_NARROW_FROM_SCOPE(<class name>) appears in class definitions of classes
-which are derived from UTL_Scope and which can be stored on the scope
-stack. This macro declares a static operation narrow_from_scope(UTL_Scope *) 
-on the class in which it appears. The operation returns the provided
-instance as an instance of <class name> if it can be narrowed, or NULL.
-
-Now look in the files implementing these classes. You will note occurrences
-of the following macros:
-
-IMPL_NARROW_METHODSx(<class name>,<parent_x>) for x equal to 0,1,2 or 3,
-implements a narrowing method for the specified class which has 0,1,2 or 3
-immediate base classes from which it inherits. For example, ast_module.cc
-which implements AST_Module contains the following line:
-
-      IMPL_NARROW_METHODS2(AST_Module, AST_Decl, UTL_Scope)
-
-IMPL_NARROW_FROM_DECL(<class name>) implements a method to narrow from an
-instance of AST_Decl to an instance of <class name> as defined above.
-
-IMPL_NARROW_FROM_SCOPE(<class name>) implements a method to narrow from an
-instance of UTL_Scope to an instance of <class name> as defined above.
-
-To put it all together: In the file ast_module.hh, you will find:
-
-  // Narrowing
-  DEF_NARROW_METHODS2(AST_Module, AST_Decl, UTL_Scope);
-  DEF_NARROW_FROM_DECL(AST_Module);
-  DEF_NARROW_FROM_SCOPE(AST_Module);
-
-In the file ast_module.cc, you will see:
-
-/*
- * Narrowing methods
- */
-IMPL_NARROW_METHODS2(AST_Module, AST_Decl, UTL_Scope)
-IMPL_NARROW_FROM_DECL(AST_Module)
-IMPL_NARROW_FROM_SCOPE(AST_Module)
-
-The CFE uses narrowing internally to obtain the correct type of nodes in
-the AST. The CFE contains many code fragments such as the following:
-
-	  AST_Decl *d = get_an_AST_Decl_from_somewhere();
-	  AST_Module *m;
-	  ...
-	  if (d->node_type() == AST_Decl::NT_module) {
-	    m = AST_Module::narrow(d);
-	    if (m == NULL) {	// Narrow failed
-	      ...
-	    } else {		// Success, do normal processing
-	      ...
-	    }
-	  }
-	  ...
-
-Similar code implements narrowing instances of UTL_Scope to their actual
-types.
-
-In your BE classes which derive from UTL_Scope you must include a line
-defining how to narrow from a scope, so:
-
-	 DEF_NARROW_FROM_SCOPE(<your BE class>)
-
-and similarly for your BE classes which derive from AST_Decl.
-
-The narrowing mechanism is defined only for narrowing from AST_Decl and
-UTL_Scope. If your BE class inherits directly from one or more classes
-which themselves are derived from AST_Decl and/or UTL_Scope, you must
-include a line
-
-	DEF_NARROW_METHODSx(<your class name>,<parent 1>,<parent 2>)
-
-To make this concrete, here is what you'd write in a definition of BE_union
-which inherits from AST_Union:
-
-        DEF_NARROW_METHODS1(BE_Union, AST_Union);
-	DEF_NARROW_FROM_DECL(BE_Union);
-	DEF_NARROW_FROM_SCOPE(BE_Union);
-
-and in the implementation file of BE_Union:
-
-/*
- * Narrowing methods:
- */
-IMPL_NARROW_METHODS1(BE_Union, AST_Union)
-IMPL_NARROW_FROM_DECL(BE_Union)
-IMPL_NARROW_FROM_SCOPE(BE_Union)
-
-Then, in BE code which expects to see an instance of your derived BE_Union
-class, you will write:
-
-	  AST_Decl *d = get_an_AST_Decl_from_somewhere();
-	  BE_Union *u;
-	  ...
-	  if (d->node_type() == AST_Decl::NT_union) {
-	    u = BE_Union::narrow_from_decl(d);
-	    if (u == NULL) {	// Narrow failed
-	      ...
-	    } else {		// Success, do normal processing
-	      ...
-	    }
-	  }
-	  ...
-
-
-SCOPE MANAGEMENT
-----------------
-
-Instances of classes which are derived from UTL_Scope implement definition
-scopes. A definition scope can contain any kind of AST node as long as it
-is derived from AST_Decl. However, specific kinds of definition scopes such
-as interfaces and unions can contain only a restricted subset of all AST
-node types.
-
-UTL_Scope provides operations to add instances of each AST provided class
-to a definition scope. The names of these operations are constructed by
-prepending the string "add_" to the name of the IDL construct. So, to add
-an interface to a definition scope, invoke the operation add_interface.
-The operations are all defined virtual and are intended to be overridden in
-classes derived from UTL_Scope.
-
-If the node was successfully added to the definition scope, the node is
-returned as the result. Otherwise the node is not added to the definition
-scope and NULL is returned.
-
-All add operation implementations in UTL_Scope return NULL. Thus,
-only the operations which implement legal additions to a specific kind of
-definition scope must be overridden in the implementation of that
-definition scope. For example, in AST_Module the add_interface operation is
-overridden to add the provided instance of AST_Interface to the scope and
-to return the provided instance if the addition was successful. Operations
-which were not overridden return NULL to indicate that the addition is
-illegal in this context. For example, in AST_Operation the definition of
-add_interface is not overridden since it is illegal to store an interface
-inside an operation definition scope.
-
-The add operations are invoked in the actions in the Yacc grammar. The
-following fragment is a representative example of code using the add
-operations:
-
-	AST_Constant *d = construct_a_new_constant();
-	...
-	if (current_scope->add_constant(d) == NULL) { // Failed
-	   ...
-	} else {				      // Succeeded
-	  ...
-	}
-
-BE INTERACTION DURING THE PARSING PROCESS
------------------------------------------
-
-The add operations can be overridden in BE derived classes to let the BE
-perform additional house-keeping work during the process of constructing
-the AST. For example, a BE could keep separate lists of interfaces as they
-are being added to a module.
-
-If you override an add operation in your BE, you must invoke the overridden
-operation in the superclass of your derived class to allow the CFE to
-perform its own house-keeping tasks. A good rule is to invoke the operation
-on the superclass before you do your own processing; then, if the
-superclass operation returns NULL, this indicates that the addition failed
-and your own code should immediately return NULL. An example explains this:
-
-AST_Interface *
-BE_Module::add_interface(AST_Interface *i)
-{
-  if (AST_Module::add_interface(i) == NULL)	// Failed, bail out!
-    return NULL;
-  ...	   					// Do your own work here
-  return i;					// Return success indication   
-}
-
-We strongly advise you to only define add operations that override add
-operations provided by the AST classes. Add operations which
-do not override equivalent operations in the AST in effect
-extend the semantics of the language accepted by the compiler. For
-example, the CFE does not have an add_interface operation on
-AST_Operation. If you were to define one in your BE_Operation class,
-the resulting compiler would allow an interface to be
-stored in an operation definition scope. The current CORBA specification
-does not allow this.
-
-AST INHERITANCE SCHEME
-----------------------
-
-The AST classes all use public virtual inheritance to construct the
-inheritance tree. This ensures that a class may appear several times in the
-inheritance tree through different paths and the derived class's instances
-will have only one copy of the inherited class's data.
-
-The use of public virtual inheritance has several important effects on how
-a BE is constructed. We explain those effects below.
-
-First, you must define a default constructor for your BE class, since
-your class may be used as a virtual base class of some other class. In this 
-case the compiler may want to call a default constructor for your class. It
-is a good idea to have a default constructor anyway, even if you do not
-plan to subclass your BE class, since for most C++ compilers this causes
-the code to be smaller. Your default constructor should initialize all
-constant data members. Additionally, it may initialize any non-constant
-data member whose value must be set before the first time the instance is
-used.
-
-Second, the constructor of your BE derived class must explicitly call all
-constructors of virtual base classes which perform useful work. For
-example, if a class in the AST from which your BE class inherits has an
-initializer for a data member, you must call that constructor. This rule is
-discussed in detail in the C++ ARM. An example may help here.
-
-Suppose you define a class BE_attribute which inherits from AST_Attribute.
-Its constructor should be as follows:
-
-    BE_Attribute::BE_Attribute(boolean ro,
-			       AST_Type *ft,
-			       UTL_ScopedName *n,
-			       UTL_StrList *p)
-		: AST_Attribute(ro, ft, n, p),
-		  AST_Field(ft, n, p),
-		  AST_Decl(AST_Decl::NT_attr, n, p)
-    {
-    }
-
-The calls to the constructors of AST_Attribute, AST_Field and AST_Decl are
-needed because these constructors do useful initializations on their
-classes. 
-
-Note that there is some redundancy in the data passed to these
-constructors. We chose to preserve this redundancy since it should be
-possible to create BEs which subclass only some of the classes supplied by
-the AST. This means that the constructors on each class provided by the AST
-should take arguments which are sufficient to construct the instance if
-the AST class is the most derived one.
-
-The code supplied with this release contains a demonstration BE which
-subclasses all the AST provided classes. The constructors for each class
-provided by the BE are found in the file be/be_classes.cc.
-
-INITIALIZATION
---------------
-
-The following steps take place at initialization:
-
-- The global data instance is created, stored in idl_global and filled with
-  default values (in driver/drv_init.cc).
-- The command line arguments are parsed (in driver/drv_args.cc).
-- For each IDL input file, a copy of the compiler process is forked (in
-  driver/drv_fork.cc).
-- The IDL input is preprocessed (in driver/drv_preproc.cc).
-- FE initialization stage 1 is done: the scopes stack is created and stored
-  in the global data variable idl_global->scopes() field (in fe/fe_init.cc).
-- BE_init is called to create the generator instance and the returned
-  instance is stored in the global data variable idl_global->gen() field.
-- FE initialization stage 2 is done: the global scope is created, pushed on
-  the scopes stack and populated with predefined types (in fe/fe_init.cc).
-
-GLOBAL STATE AND ENTRY POINTS
------------------------------
-
-The CFE has one global variable named idl_global, which stores an instance
-of a class IDL_GlobalData as explained below:
-
-The CFE defines a class IDL_GlobalData which defines the global
-information used in a specific run of the compiler. IDL_GlobalData is
-defined in include/idl_global.hh and implemented in the file
-util/utl_global.cc.
-
-Initialization creates an instance of this class and stores it in the value
-of the global variable idl_global. Thus, the individual pieces of
-information stored in the instance are accessible everywhere.
-
-ERROR HANDLING
---------------
-
-All error handling is defined by a class provided by the CFE, UTL_Error.
-This class is defined in include/utl_error.hh and implemented in the file
-util/utl_error.cc. The class provides several methods for reporting
-specific errors as well as generic error reporting methods taking zero to
-three arguments.
-
-The CFE instantiates the class and stores the instance as part of the
-global state, accessible as idl_global->err(). Thus, to cause an error
-report, you would write code similar to the following:
-
-	if (error condition found)
-	   idl_global->err()->specific_error_message(arg1, ..);
-
-or
-
-	if (error condition found)
-	  idl_global->err()->generic_error_message(flag, arg1, ..);
-
-The flag argument is one of the predefined error conditions found in the
-enum at the head of the UTL_Error class definition. The arguments to the
-specific error message routine are defined by the signature of that
-routine. The arguments to a generic error message routine are always
-instances of AST_Decl.
-
-The running count of errors is accessible as idl_global->err_count(). If
-the value returned by this operation is non-zero after the IDL input has
-been parsed, the BE is not invoked.
-
-HANDLING OF COMMAND LINE ARGUMENTS
-----------------------------------
-
-Defined command line arguments are specified in the document CLI, in this
-directory. The CFE calls the required BE API entry point BE_prep_arg to
-process arguments passed within a -Wb flag.
-
-REQUIRED ENTRY POINTS SUPPLIED BY A BE
---------------------------------------
-
-The following API entry points must be supplied by a BE in order to
-successfully link with the CFE:
-
-extern "C" AST_Generator   *BE_init();
-
-       Creates an instance of the generator object and returns it. Note
-       that the global scope is not yet set up and the scopes stack is
-       empty when this routine is called.
-
-extern "C" void		   BE_produce();
-
-       Called by the compiler main program after the IDL input has been
-       successfully parsed and processed. The job of this routine is to
-       carry out the specific function of the BE. The AST is accessible as
-       the value of idl_global->root().
-
-extern "C" void	    	   BE_prep_arg(char *, idl_bool);
-
-       Called to process an argument passed in with a -Wb flag. The boolean
-       will always be FALSE.
-
-extern "C" void	      	   BE_abort();
-
-       Called when the CFE decides to abort the compilation. Can be used in
-       a BE to clean up after itself, e.g. remove temporary files or
-       directories it created while the parse was in progress.
-
-extern "C" void	      	   BE_version();
-
-       Called when a -V argument is processed. This should produce a
-       message for the user identifying the BE that is loaded and its
-       version information.
-
-PART II. WRITING A BACK END
--=========================-
-
-REQUIRED API THAT EACH BE MUST SUPPORT
---------------------------------------
-
-Below are the API entry points that each BE must supply in order to use the
-CFE framework. This is a repeat of the BE API section:
-
-extern "C" AST_Generator   *BE_init();
-
-       Creates an instance of the generator object and returns it. Note
-       that the scopes stack is still not set up at the time this routine
-       is called.
-
-extern "C" void		   BE_produce();
-
-       Called by the compiler main program after the IDL input has been
-       successfully parsed and processed. The job of this routine is to
-       carry out the specific function of the BE. The AST is accessible as
-       the value of idl_global->root().
-
-extern "C" void	    	   BE_prep_arg(char *, boolean);
-
-       Called to process an argument passed in with a -Wb flag. The boolean
-       will always be FALSE.
-
-extern "C" void	      	   BE_abort();
-
-       Called when the CFE decides to abort the compilation. Can be used in
-       a BE to clean up after itself, e.g. remove temporary files or
-       directories it created while the parse was in progress.
-
-extern "C" void	      	   BE_version();
-
-       Called when a -V argument is processed. This should produce a
-       message for the user identifying the BE that is loaded and its
-       version information.
-
-WHAT FILES TO INCLUDE
----------------------
-
-To use the CFE, each implementation file of your BE must include the
-following two header files:
-
-#include  <idl.hh>
-#include  <idl_extern.hh>
-
-Following this, you can include any header files needed by your BE.
-
-HOW TO SUBCLASS THE AST
------------------------
-
-Your BE may subclass from any of the classes provided by the AST. Your
-class should use public virtual inheritance to ensure that only one copy of
-the class's data members is present in each instance. Read the section on
-HOW TO WRITE CONSTRUCTORS to learn about additional considerations that you
-must take into account when writing constructors for your BE classes.
-
-HOW TO SUBCLASS THE GENERATOR TO CREATE BE ENHANCED AST NODES
--------------------------------------------------------------
-
-Your BE subclasses from classes provided by the AST. To ensure that
-instances of these classes are constructed when the AST is built, you must
-also subclass AST_Generator and return an instance of your subclass from
-the call to BE_init.
-
-The AST_Generator class provides operations to create instances of all
-classes defined in the AST. For example, the operation to create an
-AST_Attribute node is as follows:
-
-	AST_Attribute *
-	AST_Generator::create_attribute(...)
-	{
-	  return new AST_Attribute(...);
-	}
-
-In your BE_Generator subclass of AST_Generator, you will override methods
-for creation of nodes of all AST classes which you have subclassed. Thus,
-if your BE has a class BE_Attribute which is a subclass of AST_Attribute,
-your BE_Generator class definition has to override the create_attribute
-method to ensure that instances of BE_Attribute are created.
-
-The definition of the overriden operations should call the constructor of
-the derived class and return the new node as an instance of the inherited
-class. Thus, the implementation of create_attribute is as follows:
-
-	AST_Attribute *
-	BE_Generator::create_attribute(...)
-	{
-	  return new BE_Attribute(...);
-	}
-
-The Yacc grammar actions call create_xxx operations on the generator
-instance stored in the global variable idl_global->gen() field. By storing
-an instance of your derived generator class BE_Generator you ensure that
-instances of the BE classes you defined will be created.
-
-HOW TO WRITE CONSTRUCTORS FOR BE CLASSES
-----------------------------------------
-
-As mentioned above, the AST uses public virtual inheritance to derive the
-AST class hierarchy. This has two important effects on how you write a BE,
-specifically how you write constructors for derived BE classes.
-
-First, you must define a default constructor for your BE class, since
-your class may be used as a virtual base class of some other class. In that
-case the compiler may want to call a default constructor for your class. It
-is a good idea to have a default constructor anyway, even if you do not
-plan to subclass your BE class, since for most C++ compilers this causes
-the code to be smaller. Your default constructor should initialize all
-constant data members. Additionally, it may initialize any non-constant
-data member whose value must be set before the first time the instance is
-used.
-
-Second, the constructor for your BE class must explicitly call all
-constructors of virtual base classes which do some useful work. For
-example, if a class in the AST from which your BE class inherits, directly
-or indirectly, has an initializer for a data member, your BE class's
-constructor must call the AST class's constructor. This is discussed
-extensively in the C++ ARM.
-
-Below is a list showing how to write constructors for subclasses of each
-class provided by the BE. For each AST class we show a definition of a
-constructor for a derived class which calls all neccessary constructors on
-AST classes:
-
-AST_Argument:
-
-	BE_Argument::BE_Argument(AST_Argument::Direction d,
-				 AST_Type *ft,
-				 UTL_ScopedName *n,
-				 UTL_StrList *p)
-		   : AST_Argument(d, ft, n, p),
-		     AST_Field(AST_Decl::NT_argument, ft, n, p),
-		     AST_Decl(AST_Decl::NT_argument, n, p)
-	{
-	}
-
-AST_Array:
-
-	BE_Array::BE_Array(UTL_ScopedName *n,
-			   unsigned long nd,
-			   UTL_ExprList *ds)
-		: AST_Array(n, nd, ds),
-		  AST_Decl(AST_Decl::NT_array, n, NULL)
-
-	{
-	}
-
-AST_Attribute:
-
-	BE_Attribute::BE_Attribute(boolean ro,
-				   AST_Type *ft,
-				   UTL_ScopedName *n,
-				   UTL_StrList *p)
-		    : AST_Attribute(ro, ft, n, p),
-		      AST_Field(AST_Decl::NT_attr, ft, n, p),
-		      AST_Decl(AST_Decl::NT_attr, n, p)
-	{
-	}
-
-AST_ConcreteType:
-
-	BE_ConcreteType::BE_ConcreteType(AST_Decl::NodeType nt,
-					 UTL_ScopedName *n,
-					 UTL_StrList *p)
-		       : AST_Decl(nt, n, p)
-	{
-	}
-
-AST_Constant:
-
-	BE_Constant::BE_Constant(AST_Expression::ExprType t,
-				 AST_Expression *v,
-				 UTL_ScopedName *n,
-				 UTL_StrList *p)
-		   : AST_Constant(t, v, n, p),
-		     AST_Decl(AST_Decl::NT_const, n, p)
-	{
-	}
-
-AST_Decl:
-
-	BE_Decl::BE_Decl(AST_Decl::NodeType nt,
-			 UTL_ScopedName *n,
-			 UTL_StrList *p)
-	       : AST_Decl(nt, n, p)
-	{
-	}
-
-AST_Enum:
-
-	BE_Enum::BE_Enum(UTL_ScopedName *n,
-			 UTL_StrList *p)
-	       : AST_Enum(n, p),
-		 AST_Decl(AST_Decl::NT_enum, n, p),
-		 UTL_Scope(AST_Decl::NT_enum)
-	{
-	}
-
-AST_EnumVal:
-
-	BE_EnumVal::BE_EnumVal(unsigned long v,
-			       UTL_ScopedName *n,
-			       UTL_StrList *p)
-		  : AST_EnumVal(v, n, p),
-		    AST_Constant(AST_Expression::EV_ulong,
-		    		 AST_Decl::NT_enum_val,
-				 new AST_Expression(v),
-				 n,
-				 p),
-		    AST_Decl(AST_Decl::NT_enum_val, n, p)
-	{
-	}
-
-AST_Exception:
-
-	BE_Exception::BE_Exception(UTL_ScopedName *n,
-				   UTL_StrList *p)
-		    : AST_Decl(AST_Decl::NT_except, n, p),
-		      AST_Structure(AST_Decl::NT_except, n, p),
-		      UTL_Scope(AST_Decl::NT_except)
-	{
-	}
-
-AST_Field:
-
-	BE_Field::BE_Field(AST_Type *ft,
-			   UTL_ScopedName *n,
-			   UTL_StrList *p)
-		: AST_Field(ft, n, p),
-		  AST_Decl(AST_Decl::NT_field, n, p)
-	{
-	}
-
-AST_Interface:
-
-	BE_Interface::BE_Interface(UTL_ScopedName *n,
-				   AST_Interface **ih,
-				   long nih,
-				   UTL_StrList *p)
-		    : AST_Interface(n, ih, nih, p),
-		      AST_Decl(AST_Decl::NT_interface, n, p),
-		      UTL_Scope(AST_Decl::NT_interface)
-	{
-	}
-
-AST_InterfaceFwd:
-
-	BE_InterfaceFwd::BE_InterfaceFwd(UTL_ScopedName *n,
-					 UTL_StrList *p)
-		       : AST_InterfaceFwd(n, p),
-			 AST_Decl(AST_Decl::NT_interface_fwd, n, p)
-	{
-	}
-
-AST_Module:
-
-	BE_Module::BE_Module(UTL_ScopedName *n,
-			     UTL_StrList *p)
-		 : AST_Decl(AST_Decl::NT_module, n, p),
-		   UTL_Scope(AST_Decl::NT_module)
-	{
-	}
-
-AST_Operation:
-
-	BE_Operation::BE_Operation(AST_Type *rt,
-				   AST_Operation::Flags fl,
-				   UTL_ScopedName *n,
-				   UTL_StrList *p)
-		    : AST_Operation(rt, fl, n, p),
-		      AST_Decl(AST_Decl::NT_op, n, p),
-		      UTL_Scope(AST_Decl::NT_op)
-	{
-	}
-
-AST_PredefinedType:
-
-	BE_PredefinedType::BE_PredefinedType(
-				AST_PredefinedType::PredefinedType *pt,
-				UTL_ScopedName *n,
-				UTL_StrList *p)
-			 : AST_PredefinedType(pt, n, p),
-			   AST_Decl(AST_Decl::NT_pre_defined, n, p)
-	{
-	}
-
-AST_Root:
-
-	BE_Root::BE_Root(UTL_ScopedName *n, UTL_StrList *p)
-	       : AST_Module(n, p),
-	         AST_Decl(AST_Decl::NT_module, n, p),
-		 UTL_Scope(AST_Decl::NT_module)
-	{
-	}
-
-
-AST_Sequence:
-
-	BE_Sequence::BE_Sequence(AST_Expression *ms, AST_Type *bt)
-		   : AST_Sequence(ms, bt),
-		     AST_Decl(AST_Decl::NT_sequence,
-		     	      new UTL_ScopedName(new String("sequence"), NULL),
-			      NULL)
-	{
-	}
-
-AST_String:
-
-	BE_String::BE_String(AST_Expression *ms)
-		 : AST_String(ms),
-		   AST_Decl(AST_Decl::NT_string,
-		   	    new UTL_ScopedName(new String("string"), NULL),
-			    NULL)
-	{
-	}
-
-AST_Structure:
-
-	BE_Structure::BE_Structure(UTL_ScopedName *n,
-				   UTL_StrList *p)
-		    : AST_Decl(AST_Decl::NT_struct, n, p),
-		      UTL_Scope(AST_Decl::NT_struct)
-	{
-	}
-
-AST_Type:
-
-	BE_Type::BE_Type(AST_Decl::NodeType nt,
-			 UTL_ScopedName *n,
-			 UTL_StrList *p)
-	       : AST_Decl(nt, n, p)
-	{
-	}
-
-AST_Typedef:
-
-	BE_Typedef::BE_Typedef(AST_Type *bt,
-			       UTL_ScopedName *n,
-			       UTL_StrList *p)
-		  : AST_Typedef(bt, n, p),
-		    AST_Decl(AST_Decl::NT_typedef, n, p)
-	{
-	}
-
-AST_Union:
-
-	BE_Union::BE_Union(AST_ConcreteType *dt,
-			   UTL_ScopedName *n,
-			   UTL_StrList *p)
-		: AST_Union(dt, n, p),
-		  AST_Structure(AST_Decl::NT_union, n, p),
-		  AST_Decl(AST_Decl::NT_union, n, p),
-		  UTL_Scope(AST_Decl::NT_union)
-	{
-	}
-
-AST_UnionBranch:
-
-	BE_UnionBranch::BE_UnionBranch(AST_UnionLabel *fl,
-				       AST_Type *ft,
-				       UTL_ScopedName *n,
-				       UTL_StrList *p)
-		      : AST_UnionBranch(fl, ft, n, p),
-		        AST_Field(ft, n, p),
-			AST_Decl(AST_Decl::NT_union_branch, n, p)
-	{
-	}
-
-AST_UnionLabel:
-
-	BE_UnionLabel::BE_UnionLabel(AST_UnionLabel::UnionLabel lk,
-				     AST_Expression *lv)
-		     : AST_UnionLabel(lk, lv)
-	{
-	}
-
-HOW TO USE THE ADD PROTOCOL
----------------------------
-
-As explained the section SCOPE MANAGEMENT, the CFE manages scopes by
-calling type-specific functions to add new nodes to the scope to be
-augmented. These functions can be overridden in your BE classes to do work
-specific to your BE class. For example, in a BE_module class, you might
-override add_interface to do additional work.
-
-The protocol defined by the "add_" functions is that they return NULL to
-indicate failure. They return the node that was added (and which was given
-as an argument) if the operation succeeded. Your functions in your BE class
-should follow the same protocol.
-
-The "add_" functions defined in the BE must call the overridden function in
-the base class defind in the CFE in order for the CFE scope management
-mechanism to work.  Otherwise, the CFE does not get an opportunity to
-augment its scopes with the new node to be added. It is good practice to
-call the overridden "add_" function as the first action in your BE
-function, because the success or failure of the CFE operation indicates
-whether your function should complete its task or abort early.
-
-Here is an example. Suppose you have defined a class BE_module which
-inherits from AST_Module. You may wish to override the add_interface
-function as follows:
-
-	 class BE_Module : public virtual AST_Module
-	 {
-	 	....
-		/*
-		 * ADD protocol
-		 */
-		virtual AST_Interface	*add_interface(AST_Interface *);
-		...
-	};
-
-The implementation of this function would look something like the following:
-
-    AST_Interface *
-    BE_Module::add_interface(AST_Interface *new_in)
-    {
-    	/*
-	 * Check that the CFE operation succeeds. If it returns
-	 * NULL, stop any further work
-	 */
-	if (AST_Module::add_interface(new_in) == NULL)
-	  return NULL;
-	/*
-	 * OK, non-NULL, this means the BE can do its own work here
-	 */
-	...
-	/*
-	 * Finally, don't forget to return the argument to indicate
-	 * success
-	 */
-	return new_in;
-    }	  
-
-HOW TO MAINTAIN BE SPECIFIC INFORMATION
----------------------------------------
-
-The CFE provides a special class AST_Root, a subclass of AST_Module. An
-instance of the AST_Root class is used as the distinguished root of the
-abstract syntax tree built during a parse.
-
-Your BE can subclass BE_Root from AST_Root and override the create_root
-operation in your BE_Generator class derived from AST_Generator. This will
-cause the CFE to create an instance of your BE_Root class as the root of
-the tree being constructed.
-
-You can use the instance of the BE_Root class as a convenient place to
-store information specific to an individual tree. For example, you could
-add operations on the BE_Root class to count how many nodes of each class
-are created.
-
-HOW TO USE MEMBER DATA
-----------------------
-
-As explained above, the AST classes provide access and update functions for
-manipulating data members. Your BE classes must use these functions when
-they require access to data members defined in the AST classes, since the
-data members themselves are private.
-
-It is good practice to follow the same scheme in your BE classes. Make all
-data members private. Prepend the names of all such fields with "pd_".
-Define access functions with names equal to the name of the field without the
-prefix. Define update functions according to need by prepending the name of
-the access function with the prefix "set_".
-
-Using these techniques will allow your BE to enjoy the same benefits that
-are imparted onto the CFE. Your BE will be easier to move to a
-multithreaded environment and its data members will be better protected and
-hidden.
-
-HOW TO BUILD A COMPLETE COMPILER
---------------------------------
-
-We now have all information needed to write a BE and to link it in with the
-CFE, to produce a complete IDL compiler.
-
-The following assumes that your BE will be stored in the "be" directory
-under the "release" directory. See the document ROADMAP for an explanation
-of the directory structure of the source release. If you decide to use a
-different directory to store your BE, you may have to modify the CPP_FLAGS in
-"idl_make_vars" in the top-level directory to allow your BE to find the
-include files it needs. You will also need to modify several targets in
-the Makefile in the top-level directory to correctly compile your BE into a
-library and to correctly link it in with the CFE to produce a complete
-compiler.
-
-You can get started quickly on writing your BE by modifying the sources
-found in the "demo_be" directory. The Makefile supports all the the targets
-that are needed to build a complete system and the maintenance target
-"clean" which assists in keeping the files and directories tidy. The files
-provided in the "demo_be" directory also provide all the API entry points
-that are mandated by this document.
-
-To build a complete compiler, invoke "make" or "make all" in the top-level
-directory. This will compile your BE and all the CFE sources, if this is
-the first invocation. On subsequent invocations this will recompile only
-the modified files. You will rarely if at all modify the CFE sources, so
-the overhead of compiling the CFE is incurred only the first time. To build
-just your BE, you can invoke "make all" or "make" in the "demo_be"
-directory. You can also, from the top-level directory, invoke "make
-demo_be/libbe.a".
-
-HOW TO OBTAIN ASSISTANCE
-------------------------
-
-First, read all the documents provided. If you have unanswered questions,
-mail them to
-
-	idl-cfe@sun.com
-
-Sun does not promise to support the IDL CFE source release in any manner.
-However, we will attempt to answer questions and correct problems as time
-allows.
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
-COPYRIGHT NOTICE
-----------------
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
diff --git a/TAO/TAO_IDL/driver/Makefile b/TAO/TAO_IDL/driver/Makefile
deleted file mode 100644
index 9eb9c4c5675..00000000000
--- a/TAO/TAO_IDL/driver/Makefile
+++ /dev/null
@@ -1,263 +0,0 @@
-#----------------------------------------------------------------------------
-#	$Id$
-#
-#	Makefile for libdrv
-#----------------------------------------------------------------------------
-
-MAKEFILE = Makefile
-LIBNAME  = libdrv
-LIB      = $(LIBNAME).a
-SHLIB    = $(LIBNAME).$(SOEXT)
-IDL_CFE_VERSION	= \"1.3.0\"
-
-# These are components that are sources of
-DRIVER_FILES = \
-		drv_init \
-		drv_private \
-		drv_main \
-		drv_args \
-		drv_fork \
-		drv_link \
-		drv_preproc
-
-FILES	 = $(DRIVER_FILES)
-
-LSRC	= $(addsuffix .cpp,$(FILES))
-LOBJ    = $(addsuffix .o,$(FILES))
-SHOBJ   = $(addsuffix .so,$(FILES))
-
-
-LDLIBS	= -lACE
-LIBS = -lACE
-VLDLIBS = $(LDLIBS:%=%$(VAR))
-
-BUILD	= $(VSHLIB) #$(VLIB)
-
-
-#----------------------------------------------------------------------------
-#	Include macros and targets
-#----------------------------------------------------------------------------
-
-include	$(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-include	$(ACE_ROOT)/include/makeinclude/macros.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.common.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.lib.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.bin.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
-
-#----------------------------------------------------------------------------
-#	Local targets (and local hacks)
-#----------------------------------------------------------------------------
-
-# Need the following. But we should be able to handle this using ACE's functionality
-OSV	= SOLARIS2
-CPPFLAGS += -I../include -I. -DCPP_LOCATION=\"$(CXX)\" -DIDL_CFE_VERSION=$(IDL_CFE_VERSION) -D$(OSV)
-
-$(LOBJS): $(LHDRS)
-
-#----------------------------------------------------------------------------
-#	Dependencies
-#----------------------------------------------------------------------------
-
-# DO NOT DELETE THIS LINE -- g++dep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-
-drv_init.o: drv_init.cpp ../include/idl.h ../include/intlmacros.h \
- ../include/idl_narrow.h ../include/idl_defines.h ../include/idl_fwd.h \
- ../include/idl_bool.h ../include/utl_string.h \
- ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/utl_strlist.h ../include/utl_exprlist.h \
- ../include/ast_generator.h ../include/util.h ../include/utl_stack.h \
- ../include/utl_idlist.h ../include/utl_exceptlist.h \
- ../include/utl_namelist.h ../include/utl_labellist.h \
- ../include/utl_decllist.h ../include/idl_global.h \
- ../include/utl_error.h ../include/utl_indenter.h \
- ../include/idl_extern.h ../include/fe_extern.h ../include/be_extern.h \
- ../include/drv_extern.h ../include/ast_extern.h \
- ../include/nr_extern.h ../include/global_extern.h \
- ../include/drv_private.h ../include/drv_link.h
-drv_private.o: drv_private.cpp ../include/idl.h \
- ../include/intlmacros.h ../include/idl_narrow.h \
- ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \
- ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/utl_strlist.h ../include/utl_exprlist.h \
- ../include/ast_generator.h ../include/util.h ../include/utl_stack.h \
- ../include/utl_idlist.h ../include/utl_exceptlist.h \
- ../include/utl_namelist.h ../include/utl_labellist.h \
- ../include/utl_decllist.h ../include/idl_global.h \
- ../include/utl_error.h ../include/utl_indenter.h \
- ../include/idl_extern.h ../include/fe_extern.h ../include/be_extern.h \
- ../include/drv_extern.h ../include/ast_extern.h \
- ../include/nr_extern.h ../include/global_extern.h \
- ../include/drv_private.h
-drv_main.o: drv_main.cpp ../include/idl.h ../include/intlmacros.h \
- ../include/idl_narrow.h ../include/idl_defines.h ../include/idl_fwd.h \
- ../include/idl_bool.h ../include/utl_string.h \
- ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/utl_strlist.h ../include/utl_exprlist.h \
- ../include/ast_generator.h ../include/util.h ../include/utl_stack.h \
- ../include/utl_idlist.h ../include/utl_exceptlist.h \
- ../include/utl_namelist.h ../include/utl_labellist.h \
- ../include/utl_decllist.h ../include/idl_global.h \
- ../include/utl_error.h ../include/utl_indenter.h \
- ../include/idl_extern.h ../include/fe_extern.h ../include/be_extern.h \
- ../include/drv_extern.h ../include/ast_extern.h \
- ../include/nr_extern.h ../include/global_extern.h \
- ../include/drv_private.h ../include/drv_link.h
-drv_args.o: drv_args.cpp ../include/idl.h ../include/intlmacros.h \
- ../include/idl_narrow.h ../include/idl_defines.h ../include/idl_fwd.h \
- ../include/idl_bool.h ../include/utl_string.h \
- ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/utl_strlist.h ../include/utl_exprlist.h \
- ../include/ast_generator.h ../include/util.h ../include/utl_stack.h \
- ../include/utl_idlist.h ../include/utl_exceptlist.h \
- ../include/utl_namelist.h ../include/utl_labellist.h \
- ../include/utl_decllist.h ../include/idl_global.h \
- ../include/utl_error.h ../include/utl_indenter.h \
- ../include/idl_extern.h ../include/fe_extern.h ../include/be_extern.h \
- ../include/drv_extern.h ../include/ast_extern.h \
- ../include/nr_extern.h ../include/global_extern.h \
- ../include/drv_private.h ../include/drv_link.h
-drv_fork.o: drv_fork.cpp ../include/idl.h ../include/intlmacros.h \
- ../include/idl_narrow.h ../include/idl_defines.h ../include/idl_fwd.h \
- ../include/idl_bool.h ../include/utl_string.h \
- ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/utl_strlist.h ../include/utl_exprlist.h \
- ../include/ast_generator.h ../include/util.h ../include/utl_stack.h \
- ../include/utl_idlist.h ../include/utl_exceptlist.h \
- ../include/utl_namelist.h ../include/utl_labellist.h \
- ../include/utl_decllist.h ../include/idl_global.h \
- ../include/utl_error.h ../include/utl_indenter.h \
- ../include/idl_extern.h ../include/fe_extern.h ../include/be_extern.h \
- ../include/drv_extern.h ../include/ast_extern.h \
- ../include/nr_extern.h ../include/global_extern.h \
- ../include/drv_private.h
-drv_link.o: drv_link.cpp ../include/idl.h ../include/intlmacros.h \
- ../include/idl_narrow.h ../include/idl_defines.h ../include/idl_fwd.h \
- ../include/idl_bool.h ../include/utl_string.h \
- ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/utl_strlist.h ../include/utl_exprlist.h \
- ../include/ast_generator.h ../include/util.h ../include/utl_stack.h \
- ../include/utl_idlist.h ../include/utl_exceptlist.h \
- ../include/utl_namelist.h ../include/utl_labellist.h \
- ../include/utl_decllist.h ../include/idl_global.h \
- ../include/utl_error.h ../include/utl_indenter.h \
- ../include/idl_extern.h ../include/fe_extern.h ../include/be_extern.h \
- ../include/drv_extern.h ../include/ast_extern.h \
- ../include/nr_extern.h ../include/global_extern.h \
- ../include/drv_private.h ../include/drv_link.h
-drv_preproc.o: drv_preproc.cpp ../include/idl.h \
- ../include/intlmacros.h ../include/idl_narrow.h \
- ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \
- ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/utl_strlist.h ../include/utl_exprlist.h \
- ../include/ast_generator.h ../include/util.h ../include/utl_stack.h \
- ../include/utl_idlist.h ../include/utl_exceptlist.h \
- ../include/utl_namelist.h ../include/utl_labellist.h \
- ../include/utl_decllist.h ../include/idl_global.h \
- ../include/utl_error.h ../include/utl_indenter.h \
- ../include/idl_extern.h ../include/fe_extern.h ../include/be_extern.h \
- ../include/drv_extern.h ../include/ast_extern.h \
- ../include/nr_extern.h ../include/global_extern.h \
- ../include/drv_private.h ../include/drv_link.h
-
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/TAO_IDL/driver/drv_args.cpp b/TAO/TAO_IDL/driver/drv_args.cpp
deleted file mode 100644
index bd26d593f4b..00000000000
--- a/TAO/TAO_IDL/driver/drv_args.cpp
+++ /dev/null
@@ -1,271 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-// drv_args.c - Argument parsing for IDL compiler main driver
-
-#include	"idl.h"
-#include	"idl_extern.h"
-
-#include	"drv_private.h"
-#include        "drv_link.h"
-
-#include	<stdio.h> 
-
-/*
- * Push a file into the list of files to be processed
- */
-static void
-DRV_push_file(char *s)
-{
-  DRV_files[DRV_nfiles++] = s;
-}
-
-/*
- * Prepare a CPP argument
- */
-static void
-DRV_prep_cpp_arg(char *s)
-{
-  char *newarg = new char[512];  
-  char *farg;
-
-  newarg[0] = '\0';
-  for (farg = strtok(s, ","); farg != NULL; farg = strtok(NULL, ","))
-    strcat(newarg,farg);
-  DRV_cpp_putarg(newarg);
-}
-
-/*
- * Print a usage message and exit
- */
-void
-DRV_usage()
-{
-  cerr << idl_global->prog_name()
-       << GTDEVEL(": usage: ")
-       << idl_global->prog_name()
-       << GTDEVEL(" [flag | file]*\n");
-  cerr << GTDEVEL("Legal flags:\n");
-  cerr << GTDEVEL(" -A...\t\t\tlocal implementation-specific escape\n");
-  cerr << GTDEVEL(" -Dname[=value]\t\tdefines name for preprocessor\n");
-  cerr << GTDEVEL(" -E\t\t\truns preprocessor only, prints on stdout\n");
-  cerr << GTDEVEL(" -Idir\t\t\tincludes dir in search path for preprocessor\n");
-  cerr << GTDEVEL(" -Uname\t\t\tundefines name for preprocessor\n");
-  cerr << GTDEVEL(" -V\t\t\tprints version info then exits\n");
-  cerr << GTDEVEL(" -W[p|b],arg1,argn\tpasses args to preprocessor or BE\n");
-  cerr << GTDEVEL(" -Yp,path\t\tdefines location of preprocessor\n");
-  cerr << GTDEVEL(" -bback_end\t\tcauses specified back end to be used\n");
-  cerr << GTDEVEL(" -u\t\t\tprints usage message and exits\n");
-  cerr << GTDEVEL(" -v\t\t\ttraces compilation stages\n");
-  cerr << GTDEVEL(" -w\t\t\tsuppresses IDL compiler warning messages\n");
-}
-
-/*
- * Parse arguments on command line
- */
-void
-DRV_parse_args(long ac, char **av)
-{
-  char	*buffer;
-  char	*s;
-  long	i;
-
-  DRV_cpp_init();
-  idl_global->set_prog_name(av[0]);
-  for (i = 1; i < ac; i++) {
-    if (av[i][0] == '-') {
-      switch (av[i][1]) {
-      case 0:
-	DRV_push_file("standard input");
-	break;
-      case 'A':
-	if (av[i][2] == '\0') {
-	  if (i < ac - 1) {
-	    i++;
-	    s = av[i];
-	  } else
-	    exit(99);
-	} else
-	  s = av[i] + 2;
-	strcat(idl_global->local_escapes(), s);
-	strcat(idl_global->local_escapes(), " ");
-	break;
-      case 'D':
-      case 'U':
-      case 'I':
-	if (av[i][2] == '\0') {
-	  if (i < ac - 1) {
-	    buffer = new char[strlen(av[i]) + strlen(av[i + 1]) + 2];
-	    sprintf(buffer, "%s%s", av[i], av[i+1]);
-	    DRV_cpp_putarg(buffer);
-	    i++;
-	  } else {
-	    cerr << GTDEVEL("IDL: missing argument after '")
-		 << av[i] 
-		 << GTDEVEL("' flag\n");
-	    exit(99);
-	  }
-	} else
-	  DRV_cpp_putarg(av[i]);
-	break;
-      case 'E':
-	idl_global->set_compile_flags(idl_global->compile_flags() |
-				      IDL_CF_ONLY_PREPROC);
-	break;
-      case 'V':
-	idl_global->set_compile_flags(idl_global->compile_flags() |
-				      IDL_CF_VERSION);
-	break;
-      case 'W':
-	if (av[i][2] == '\0') {
-	  if (i < ac - 1) {
-	    i++;
-	    s = av[i];
-	  } else {
-	    cerr << GTDEVEL("IDL: missing argument after '")
-		 << av[i]
-		 << GTDEVEL("' flag\n");
-	    exit(99);
-	  }
-        } else
-	  s = av[i] + 2;
-	switch (*s) {
-	default:
-	    cerr << GTDEVEL("IDL: -W must be followed by 'p' or 'b'\n");
-	    exit(99);
-	case 'p':
-	  if (*(s + 1) == ',')
-	    DRV_prep_cpp_arg(s + 2);
-	  break;
-	case 'b':
-	  if (*(s + 1) == ',')
-	    (*DRV_BE_prep_arg)(s + 2, I_TRUE);
-	  break;
-	}
-	break;
-      case 'Y':
-	if (av[i][2] == '\0') {
-	  if (i < ac - 1) {
-	    i++;
-	    s = av[i];
-	  } else {
-	    cerr << GTDEVEL("IDL: missing argument after '")
-		 << av[i]
-		 << GTDEVEL("' flag\n");
-	    exit(99);
-	  }
-        } else
-	  s = av[i] + 2;
-	switch (*s) {
-	case 'p':
-	  if (*(s + 1) == ',') {
-	    idl_global->set_cpp_location(s + 2);
-	    DRV_cpp_new_location(s + 2);
-	  }
-	  break;
-	default:
-	  break;
-	}
-	break;
-      case 'b':
-	if (av[i][2] == '\0') {
-	  if (i < ac - 1) {
-	    i++;
-	    s = av[i];
-	  } else {
-	    cerr << GTDEVEL("IDL: missing argument after '")
-		 << av[i]
-		 << GTDEVEL("' flag\n");
-	    exit(99);
-	  }
-	} else
-	  s = av[i] + 2;
-	idl_global->set_be(s);
-	break;
-      case 'd':
-	idl_global->set_compile_flags(idl_global->compile_flags() |
-				      IDL_CF_DUMP_AST);
-	break;
-      case 'u':
-	idl_global->set_compile_flags(idl_global->compile_flags() |
-				      IDL_CF_ONLY_USAGE);
-	break;
-      case 'v':
-	idl_global->set_compile_flags(idl_global->compile_flags() |
-				      IDL_CF_INFORMATIVE);
-	break;
-      case 'w':
-	idl_global->set_compile_flags(idl_global->compile_flags() |
-				      IDL_CF_NOWARNINGS);
-	break;
-      default:
-	cerr << GTDEVEL("IDL: Illegal option '") << av[i] << "'\n";
-	idl_global->set_compile_flags(idl_global->compile_flags() |
-				      IDL_CF_ONLY_USAGE);
-	break;
-      }
-    } else
-      DRV_push_file(av[i]);
-  }
-}
diff --git a/TAO/TAO_IDL/driver/drv_fork.cpp b/TAO/TAO_IDL/driver/drv_fork.cpp
deleted file mode 100644
index 31398991ce8..00000000000
--- a/TAO/TAO_IDL/driver/drv_fork.cpp
+++ /dev/null
@@ -1,125 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-/*
- * DRV_fork.cc - Fork a process for each file to be processed, wait for
- *		 status from the child process
- */
-
-#include	"idl.h"
-#include	"idl_extern.h"
-
-#include	"drv_private.h"
-
-#include "ace/Process_Manager.h"
-
-/*
- * Fork off a process, wait for it to die
- */
-void
-DRV_fork()
-{
-  // This will not work on NT, but I can hardly think of some way to
-  // make it work.
-  // The idea is to make it compile, and always use the compiler with
-  // just one file, that works because then there is no fork
-  // involved.
-  for (DRV_file_index = 0;
-       DRV_file_index < DRV_nfiles;
-       ++DRV_file_index)
-    {
-      ACE_Process_Options options;
-      options.creation_flags (ACE_Process_Options::NO_EXEC);
-
-      ACE_Process_Manager manager;
-      pid_t child_pid = manager.spawn (options);
-      if (child_pid == 0)
-	{
-	  /*
-	   * OK, do it to this file (in the child)
-	   */
-	  DRV_drive(DRV_files[DRV_file_index]);
-	  ACE_OS::exit(0);
-	}
-
-      if (child_pid == -1)
-	{
-	  cerr << GTDEVEL("IDL: spawn failed\n");
-	  ACE_OS::exit (99);
-	  /*NOTREACHED*/
-	}
-
-      // child_pid is the process id of something at this point.
-      if (manager.wait () == -1)
-	{
-	  cerr << GTDEVEL("IDL: wait failed\n");
-	  ACE_OS::exit (99);
-	  /*NOTREACHED*/
-	}
-    }
-  /*
-   * Now the parent process can exit
-   */
-  exit(0);
-}
diff --git a/TAO/TAO_IDL/driver/drv_init.cpp b/TAO/TAO_IDL/driver/drv_init.cpp
deleted file mode 100644
index df3504b08d8..00000000000
--- a/TAO/TAO_IDL/driver/drv_init.cpp
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-// DRV_init.cc - Initialization for IDL compiler driver program
-
-#include	"idl.h"
-#include	"idl_extern.h"
-
-#include	"drv_private.h"
-#include 	"drv_link.h"
-
-void
-DRV_init()
-{
-  // Initialize global data
-
-  idl_global = new IDL_GlobalData();
-
-  idl_global->set_scopes(NULL);
-  idl_global->set_root(NULL);
-  idl_global->set_gen(NULL);
-  idl_global->set_err((*DRV_FE_new_UTL_Error)());
-  idl_global->set_err_count(0);
-  idl_global->set_indent((*DRV_FE_new_UTL_Indenter)());
-
-  idl_global->set_filename(NULL);
-  idl_global->set_main_filename(NULL);
-  idl_global->set_real_filename(NULL);
-  idl_global->set_stripped_filename(NULL);
-  idl_global->set_import(I_TRUE);
-  idl_global->set_in_main_file(I_FALSE);
-  idl_global->set_lineno(-1);
-
-  idl_global->set_prog_name(NULL);
-
-  idl_global->set_cpp_location(CPP_LOCATION);
-
-  idl_global->set_be("");
-
-  idl_global->set_local_escapes(new char[1024]);
-
-  idl_global->set_pragmas(NULL);
-
-  idl_global->set_compile_flags(0);
-
-  idl_global->set_read_from_stdin(I_FALSE);
-
-  idl_global->set_include_file_names(NULL);
-  idl_global->set_n_include_file_names(0);
-
-  idl_global->set_parse_state(IDL_GlobalData::PS_NoState);
-
-  // Initialize driver private data
-
-  DRV_nfiles = 0;
-  DRV_file_index = 0;  
-}
-
diff --git a/TAO/TAO_IDL/driver/drv_link.cpp b/TAO/TAO_IDL/driver/drv_link.cpp
deleted file mode 100644
index 5d67b8b67a9..00000000000
--- a/TAO/TAO_IDL/driver/drv_link.cpp
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-/*
-** drv_link.cc - routines for programatic linking
-**
-** This file is set up so that you can easily convert the CFE to do
-** dynamic loading of either the front end (parser) or BEs. Since no
-** portable dynamic loading mechanism exists, we have removed the specific
-** one which is in Sunsoft\'s version and which uses Solaris dlopen.
-*/
-
-#include	"idl.h"
-#include	"idl_extern.h"
-
-#include	"drv_private.h"
-#include        "drv_link.h"
-
-DRV_PF_FE_init_stage1   DRV_FE_init_stage1;
-DRV_PF_FE_init_stage2   DRV_FE_init_stage2;
-DRV_PF_FE_yyparse       DRV_FE_yyparse;
-DRV_PF_FE_set_yyin      DRV_FE_set_yyin;
-DRV_PF_FE_new_UTL_Error DRV_FE_new_UTL_Error;
-DRV_PF_FE_new_UTL_Indenter DRV_FE_new_UTL_Indenter;
-DRV_PF_FE_new_UTL_String DRV_FE_new_UTL_String;
-
-DRV_PF_BE_init		DRV_BE_init;
-DRV_PF_BE_produce 	DRV_BE_produce;
-DRV_PF_BE_abort   	DRV_BE_abort;
-DRV_PF_BE_prep_arg	DRV_BE_prep_arg;
-DRV_PF_BE_version	DRV_BE_version;
-
-void
-DRV_FE_open()
-{
-  DRV_FE_init_stage1 = &FE_init_stage1;
-  DRV_FE_init_stage2 = &FE_init_stage2;
-  DRV_FE_yyparse = &FE_yyparse;
-  DRV_FE_set_yyin = &FE_set_yyin;
-  DRV_FE_new_UTL_Error = &FE_new_UTL_Error;
-  DRV_FE_new_UTL_Indenter = &FE_new_UTL_Indenter;
-  DRV_FE_new_UTL_String = &FE_new_UTL_String;
-}
-
-void
-DRV_FE_close()
-{
-  DRV_FE_init_stage1 = 0;
-  DRV_FE_init_stage2 = 0;
-  DRV_FE_yyparse = 0;
-  DRV_FE_set_yyin = 0;
-  DRV_FE_new_UTL_Error = 0;
-  DRV_FE_new_UTL_Indenter = 0;
-  DRV_FE_new_UTL_String = 0;
-}
-
-void
-DRV_BE_open()
-{
-  DRV_BE_init = &BE_init;
-  DRV_BE_produce = &BE_produce;
-  DRV_BE_abort = &BE_abort;
-  DRV_BE_prep_arg = &BE_prep_arg;
-  DRV_BE_version = &BE_version;
-}
-
-void
-DRV_BE_close()
-{
-  DRV_BE_init = 0;
-  DRV_BE_produce = 0;
-  DRV_BE_abort = 0;
-  DRV_BE_prep_arg = 0;
-  DRV_BE_version = 0;
-}
diff --git a/TAO/TAO_IDL/driver/drv_main.cpp b/TAO/TAO_IDL/driver/drv_main.cpp
deleted file mode 100644
index 9cd81643878..00000000000
--- a/TAO/TAO_IDL/driver/drv_main.cpp
+++ /dev/null
@@ -1,256 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-/*
-** drv_main.cc - Main program for IDL compiler driver
-**
-** LOGIC:
-**
-** 1. Initialize compiler driver
-** 2. Parse command line args
-** 3. If more than one file to parse, fork
-** 4. Otherwise, for the single file, invoke DRV_drive
-*/
-
-#include	"idl.h"
-#include	"idl_extern.h"
-
-#include	"drv_private.h"
-#include        "drv_link.h"
-
-static void
-DRV_version()
-{
-  cerr << idl_global->prog_name() 
-       << GTDEVEL(", version ")
-       << IDL_CFE_VERSION 
-       << "\n";
-  (*DRV_BE_version)();
-}
-
-/*
-** Drive the compilation
-**
-** LOGIC:
-**
-** 1. Initialize the CFE, stage 1. This builds the scope stack
-** 2. Initialize the BE. This builds an instance of the generator
-** 3. Initialize the CFE, stage 2. This builds the global scope
-**    and populates it with the predefined types
-** 4. Invoke FE_yyparse
-** 5. Check for errors from FE_yyparse. If any, exit now
-** 6. Check for undefined forward declared interfaces. If any, exit now
-** 7. Check if asked to dump AST. If so, do.
-** 8. Invoke BE.
-*/
-void
-DRV_drive(char *s)
-{
-  char	*fn;
-
-  // Macro to avoid "warning: unused parameter" type warning.
-  ACE_UNUSED_ARG (fn);
-
-  // set the name of the IDL file we are parsing. This is useful to the backend
-  // when it generates C++ headers and files
-  idl_global->idl_src_file(new UTL_String(s));
-  /*
-   * Pass through CPP
-   */
-  if (idl_global->compile_flags() & IDL_CF_INFORMATIVE)
-    cerr << idl_global->prog_name()
-	 << GTDEVEL(": preprocessing ")
-	 << s
-	 << "\n";
-  DRV_pre_proc(s);
-  /*
-   * Initialize FE stage 1
-   */
-  (*DRV_FE_init_stage1)();
-  /*
-   * Initialize BE
-   */
-  idl_global->set_gen((*DRV_BE_init)());
-  /*
-   * Initialize FE stage 2
-   */
-  (*DRV_FE_init_stage2)();
-  /*
-   * Parse
-   */
-  if (idl_global->compile_flags() & IDL_CF_INFORMATIVE)
-    cerr << idl_global->prog_name()
-	 << GTDEVEL(": parsing ")
-	 << s
-	 << "\n";
-  (*DRV_FE_yyparse)();
-  /*
-   * If there were any errors, stop
-   */
-  if (idl_global->err_count() > 0) {
-    cerr << idl_global->prog_name()
-	 << ": "
-	 << s 
-	 << GTDEVEL(": found ");
-    cerr << idl_global->err_count()
-	 << GTDEVEL(" error");
-    cerr << (idl_global->err_count() > 1
-	    ? GTDEVEL("s") : "")
-    	 << "\n";
-    /*
-     * Call BE_abort to allow a BE to clean up after itself
-     */
-    (*DRV_BE_abort)();
-    exit((int) idl_global->err_count());
-  }
-  /*
-   * Dump the code
-   */
-  if ((idl_global->compile_flags() & IDL_CF_INFORMATIVE)
-      && (idl_global->compile_flags() & IDL_CF_DUMP_AST))
-    cerr << idl_global->prog_name()
-	 << GTDEVEL(": dump ")
-	 << s
-	 << "\n";
-  if (idl_global->compile_flags() & IDL_CF_DUMP_AST) {
-    cerr << GTDEVEL("Dump of AST:\n");
-    idl_global->root()->dump(cerr);
-  }
-  /*
-   * Call the main entry point for the BE
-   */
-  if (idl_global->compile_flags() & IDL_CF_INFORMATIVE)
-    cerr << idl_global->prog_name()
-	 << GTDEVEL(": BE processing on ")
-	 << s
-	 << "\n";
-  (*DRV_BE_produce)();
-  /*
-   * Exit cleanly
-   */
-  exit(0);
-}
-
-/*
- * IDL compiler main program. Logic as explained in comment at head
- * of file.
- */
-int
-main(int argc, char **argv)
-{
-  /*
-   * Open front-end library
-   */
-  DRV_FE_open();
-  /*
-   * Initialize driver and global variables
-   */
-  DRV_init();
-  /*
-   * Open back-end library
-   */
-  DRV_BE_open();
-  /*
-   * Parse arguments
-   */
-  DRV_parse_args(argc, argv);
-  /*
-   * If a version message is requested, print it and exit
-   */
-  if (idl_global->compile_flags() & IDL_CF_VERSION) {
-    DRV_version();
-    exit(0);
-  }
-  /*
-   * If a usage message is requested, give it and exit
-   */
-  if (idl_global->compile_flags() & IDL_CF_ONLY_USAGE) {
-    DRV_usage();
-    exit(0);
-  }
-  /*
-   * Fork off a process for each file to process. Fork only if
-   * there is more than one file to process
-   */
-  if (DRV_nfiles > 1) {
-    /*
-     * DRV_fork never returns
-     */
-    DRV_fork();
-  } else {
-    /*
-     * Do the one file we have to parse
-     *
-     * Check if stdin and handle file name appropriately
-     */
-    if (DRV_nfiles == 0) {
-      DRV_files[0] = "standard input";
-    }
-    DRV_file_index = 0;
-    DRV_drive(DRV_files[DRV_file_index]);
-  }
-  exit(0);
-  /* NOTREACHED */
-  return 0;
-}
diff --git a/TAO/TAO_IDL/driver/drv_preproc.cpp b/TAO/TAO_IDL/driver/drv_preproc.cpp
deleted file mode 100644
index 55ad74533f2..00000000000
--- a/TAO/TAO_IDL/driver/drv_preproc.cpp
+++ /dev/null
@@ -1,342 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.
-2550 Garcia Avenue
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-/*
- * DRV_pre_proc.cc - pass an IDL file through the C preprocessor
- */
-
-#include	"idl.h"
-#include	"idl_extern.h"
-
-#include	"drv_private.h"
-#include	"drv_link.h"
-
-#include "ace/Process_Manager.h"
-
-#include	<stdio.h>
-#include	<fcntl.h>
-
-#undef	MAX_ARGLIST
-#define	MAX_ARGLIST	128
-
-static	char	*arglist[MAX_ARGLIST];
-static	long	argcount = 0;
-
-/*
- * Push the new CPP location if we got a -Yp argument
- */
-void
-DRV_cpp_new_location(char *new_loc)
-{
-  arglist[0] = new_loc;
-}
-
-/*
- * Push an argument into the arglist
- */
-void
-DRV_cpp_putarg(char *str)
-{
-  if (argcount >= MAX_ARGLIST) {
-    cerr << idl_global->prog_name()
-         << GTDEVEL(": More than ")
-	 << MAX_ARGLIST
-	 << GTDEVEL(" arguments to preprocessor\n");
-    exit (99);
-  }
-  arglist[argcount++] = str;
-}
-
-/*
- * Initialize the cpp argument list
- */
-void
-DRV_cpp_init()
-{
-  // DRV_cpp_putarg("\\cygnus\\H-i386-cygwin32\\bin\\echo");
-  DRV_cpp_putarg(idl_global->cpp_location());
-  DRV_cpp_putarg("-E");
-  DRV_cpp_putarg("-DIDL");
-  DRV_cpp_putarg("-I.");
-}
-
-/*
- * lines can be 1024 chars long
- */
-#define	LINEBUF_SIZE	1024
-static	char	drv_line[LINEBUF_SIZE + 1];
-
-/*
- * Get a line from stdin
- */
-static long
-DRV_get_line(FILE *f)
-{
-    char	*l = fgets(drv_line, LINEBUF_SIZE, f);
-    long	i;
-
-    if (l == NULL)
-	return I_FALSE;
-    if (*l == '\0' && feof(f))
-	return I_FALSE;
-    if (*l == '\0')
-	return I_TRUE;
-    i = strlen(l) - 1;
-    if (l[i] == '\n')
-	l[i] = '\0';
-    return I_TRUE;
-}
-
-/*
- * Copy from stdin to a file
- */
-static void
-DRV_copy_input(FILE *fin, char *fn)
-{
-  FILE	*f = fopen(fn, "w");
-
-  if (f == NULL) {
-    cerr << idl_global->prog_name()
-	 << GTDEVEL(": cannot open temp file ")
-	 << fn
-	 << GTDEVEL(" for writing\n");
-    exit(99);
-  }
-  if (fin == NULL) {
-      cerr << idl_global->prog_name()
-           << GTDEVEL(": cannot open input file\n");
-      exit(99);
-  }
-  while (DRV_get_line(fin))
-    fprintf(f, "%s\n", drv_line);
-  fclose(f);
-}
-
-/*
- * Strip down a name to the last component, i.e. everything after the last
- * '/' character
- */
-static char *
-DRV_stripped_name(char *fn)
-{
-    char	*n = fn;
-    long	l;
-
-    if (n == NULL)
-	return NULL;
-    l = strlen(n);
-    for (n += l; l > 0 && *n != '/'; l--, n--);
-    if (*n == '/') n++;
-    return n;
-}
-
-/*
- * File names
- */
-static char	tmp_file[128];
-static char	tmp_ifile[128];
-
-/*
- * Pass input through preprocessor
- */
-void
-DRV_pre_proc(char *myfile)
-{
-  long	readfromstdin = I_FALSE;
-  char	catbuf[512];
-
-  // Macro to avoid "warning: unused parameter" type warning.
-  ACE_UNUSED_ARG (readfromstdin);
-
-  const char* tmpdir = getenv("TMP");
-  if (tmpdir != 0)
-    {
-      ACE_OS::strcpy (tmp_file, tmpdir);
-      ACE_OS::strcpy (tmp_ifile, tmpdir);
-    }
-  else
-    {
-      ACE_OS::strcpy (tmp_file, ACE_DIRECTORY_SEPARATOR_STR_A);
-      ACE_OS::strcat (tmp_file, "tmp");
-      ACE_OS::strcpy (tmp_ifile, ACE_DIRECTORY_SEPARATOR_STR_A);
-      ACE_OS::strcat (tmp_ifile, "tmp");
-    }
-
-  ACE_OS::strcat (tmp_file, ACE_DIRECTORY_SEPARATOR_STR_A);
-  ACE_OS::strcat (tmp_file, "idlf_XXXXXX");
-
-  ACE_OS::strcat (tmp_ifile, ACE_DIRECTORY_SEPARATOR_STR_A);
-  ACE_OS::strcat (tmp_ifile, "idli_XXXXXX");
-
-  (void) mktemp (tmp_file); ACE_OS::strcat (tmp_file, ".cc");
-  (void) mktemp (tmp_ifile); ACE_OS::strcat (tmp_ifile, ".cc");
-  if (strcmp(myfile, "standard input") == 0) {
-    idl_global->set_filename((*DRV_FE_new_UTL_String)(tmp_ifile));
-    idl_global->set_main_filename((*DRV_FE_new_UTL_String)(tmp_ifile));
-    idl_global->
-        set_stripped_filename(
-            (*DRV_FE_new_UTL_String)(DRV_stripped_name(tmp_ifile))
-        );
-    idl_global->set_real_filename((*DRV_FE_new_UTL_String)(tmp_ifile));
-    DRV_copy_input(stdin, tmp_ifile);
-    idl_global->set_read_from_stdin(I_TRUE);
-  } else {
-    FILE *fd = fopen(myfile, "r");
-    DRV_copy_input(fd, tmp_ifile);
-    fclose(fd);
-    idl_global->set_read_from_stdin(I_FALSE);
-    idl_global->set_filename((*DRV_FE_new_UTL_String)(myfile));
-    idl_global->set_main_filename((*DRV_FE_new_UTL_String)(myfile));
-    idl_global->
-        set_stripped_filename(
-            (*DRV_FE_new_UTL_String)(DRV_stripped_name(myfile))
-        );
-    idl_global->set_real_filename((*DRV_FE_new_UTL_String)(tmp_ifile));
-  }
-
-  // We use ACE instead of the (low level) fork facilities, this also
-  // work on NT.
-  ACE_Process manager;
-  ACE_Process_Options cpp_options;
-  DRV_cpp_putarg (tmp_ifile);
-  DRV_cpp_putarg (0); // Null terminate the arglist.
-  cpp_options.command_line (arglist);
-  ACE_HANDLE fd = ACE_OS::open(tmp_file, O_WRONLY | O_CREAT | O_TRUNC, 0777);
-  if (fd == ACE_INVALID_HANDLE) {
-    cerr << idl_global->prog_name()
-	 << GTDEVEL(": cannot open temp file ")
-	 << tmp_file << " for writing\n";
-    return;
-  }
-  cpp_options.set_handles (ACE_INVALID_HANDLE, fd);
-  if (manager.spawn (cpp_options) == -1)
-    {
-      cerr << idl_global->prog_name()
-	   << GTDEVEL(": spawn of ")
-	   << arglist[0]
-	   << GTDEVEL(" failed\n");
-      return;
-    }
-
-  // Close the output file on the parent process.
-  if (ACE_OS::close (fd) == -1)
-    {
-      cerr << idl_global->prog_name ()
-	   << GTDEVEL(": cannot close temp file")
-	   << tmp_file << " on parent\n";
-      return;
-    }
-
-  // Remove the null termination and the input file from the arglist,
-  // the next file will the previous args.
-  argcount -= 2;
-
-  if (manager.wait () == -1)
-    {
-      cerr << idl_global->prog_name ()
-	   << GTDEVEL(": wait for child process failed\n");
-      return;
-    }
-  // TODO: Manage problems in the pre-processor, in the previous
-  // version the current process would exit if the pre-processor
-  // returned with error.
-
-
-  FILE * yyin = fopen(tmp_file, "r");
-  if (yyin == NULL) {
-    cerr << idl_global->prog_name()
-	 << GTDEVEL(": Could not open cpp output file ")
-	 << tmp_file
-	 << "\n";
-    exit(99);
-  }
-  (*DRV_FE_set_yyin)((File *) yyin);
-
-  // @@ TODO: This is not protable, cat(1) is a UNIX tool.
-  if (idl_global->compile_flags() & IDL_CF_ONLY_PREPROC) {
-    sprintf(catbuf, "cat < %s", tmp_file);
-    system(catbuf);
-  }
-
-  if (ACE_OS::unlink(tmp_ifile) == -1) {
-    cerr << idl_global->prog_name()
-         << GTDEVEL(": Could not remove cpp input file ")
-	 << tmp_ifile
-	 << "\n";
-    exit(99);
-  }
-#if !defined (ACE_WIN32)
-  // TODO: This unlink fails every time under NT, it seems that you
-  // cannot remove an open file under that OS?
-  if (ACE_OS::unlink(tmp_file) == -1) {
-    cerr << idl_global->prog_name()
-	 << GTDEVEL(": Could not remove cpp output file ")
-	 << tmp_file
-	 << "\n";
-    exit(99);
-  }
-#endif /* !ACE_WIN32 */
-  if (idl_global->compile_flags() & IDL_CF_ONLY_PREPROC)
-    exit(0);
-}
diff --git a/TAO/TAO_IDL/driver/drv_private.cpp b/TAO/TAO_IDL/driver/drv_private.cpp
deleted file mode 100644
index 6160112e818..00000000000
--- a/TAO/TAO_IDL/driver/drv_private.cpp
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-// drv_global.cc - Global variables for IDL compiler driver program
-
-#include	"idl.h"
-#include	"idl_extern.h"
-
-#include	"drv_private.h"
-
-// Storage for file names
-
-#define		NFILES	1024
-
-char		*DRV_files[NFILES];
-long		DRV_nfiles = 0;
-long		DRV_file_index = -1;
-IDL_GlobalData *idl_global = NULL;
diff --git a/TAO/TAO_IDL/fe/Makefile b/TAO/TAO_IDL/fe/Makefile
deleted file mode 100644
index 8d0b70c7b07..00000000000
--- a/TAO/TAO_IDL/fe/Makefile
+++ /dev/null
@@ -1,285 +0,0 @@
-#----------------------------------------------------------------------------
-#	$Id$
-#
-#	Makefile for libfe
-#----------------------------------------------------------------------------
-
-MAKEFILE = Makefile
-LIBNAME  = libfe
-LIB      = $(LIBNAME).a
-SHLIB    = $(LIBNAME).$(SOEXT)
-IDL_CFE_VERSION	= \"1.3.0\"
-
-# These are components that are sources of
-FE_FILES	= \
-		fe_declarator \
-		fe_private \
-		fe_init \
-		fe_extern \
-		fe_interface_header
-
-OTHER_FILES	= \
-		y.tab \
-		lex.yy
-
-FILES	 = $(FE_FILES) $(OTHER_FILES)
-
-LSRC	= $(addsuffix .cpp,$(FILES))
-LHDR	= $(addsuffix .h,$(HDRS))
-LOBJ    = $(addsuffix .o,$(FILES))
-SHOBJ   = $(addsuffix .so,$(FILES))
-
-
-LDLIBS	= -lACE
-LIBS = -lACE
-VLDLIBS = $(LDLIBS:%=%$(VAR))
-
-BUILD	= $(VSHLIB) #$(VLIB)
-
-
-#----------------------------------------------------------------------------
-#	Include macros and targets
-#----------------------------------------------------------------------------
-
-include	$(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-include	$(ACE_ROOT)/include/makeinclude/macros.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.common.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.lib.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.bin.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
-
-#----------------------------------------------------------------------------
-#	Local targets (and local hacks)
-#----------------------------------------------------------------------------
-
-CPPFLAGS += -D_REENTRANT -I../include -I. -DCPP_LOCATION=\"$(CXX)\" -DIDL_CFE_VERSION=$(IDL_CFE_VERSION)
-YACC   = yacc
-LEX	= flex
-YFLAGS	= -t -d
-LFLAGS	= -t
-
-# Create the parser and lexer
-y.tab.h y.tab.cpp: idl.yy
-	@-$(RM) $@
-	$(YACC) $(YFLAGS) idl.yy
-	mv -f y.tab.c y.tab.cpp
-
-lex.yy.cpp: idl.ll y.tab.h
-	$(LEX) $(LFLAGS) idl.ll > $@
-	sed -e "s/unistd/stdio/g" -e "s@#include <@#include /**/ <@" -e "s/ECHO/TAO_ECHO/g" < $@ >> /tmp/$@
-	cp /tmp/$@ $@
-	$(RM) -f /tmp/$@
-
-#----------------------------------------------------------------------------
-#	Dependencies
-#----------------------------------------------------------------------------
-
-# DO NOT DELETE THIS LINE -- g++dep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-
-.obj/fe_declarator.o .shobj/fe_declarator.so: fe_declarator.cpp ../include/idl.h \
- ../include/intlmacros.h ../include/idl_narrow.h \
- ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \
- ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/utl_strlist.h ../include/utl_exprlist.h \
- ../include/ast_generator.h ../include/util.h ../include/utl_stack.h \
- ../include/utl_idlist.h ../include/utl_exceptlist.h \
- ../include/utl_namelist.h ../include/utl_labellist.h \
- ../include/utl_decllist.h ../include/idl_global.h \
- ../include/utl_error.h ../include/utl_indenter.h \
- ../include/idl_extern.h ../include/fe_extern.h ../include/be_extern.h \
- ../include/drv_extern.h ../include/ast_extern.h \
- ../include/nr_extern.h ../include/global_extern.h \
- ../include/fe_private.h ../include/fe_interface_header.h \
- ../include/fe_declarator.h
-.obj/fe_private.o .shobj/fe_private.so: fe_private.cpp ../include/idl.h ../include/intlmacros.h \
- ../include/idl_narrow.h ../include/idl_defines.h ../include/idl_fwd.h \
- ../include/idl_bool.h ../include/utl_string.h \
- ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/utl_strlist.h ../include/utl_exprlist.h \
- ../include/ast_generator.h ../include/util.h ../include/utl_stack.h \
- ../include/utl_idlist.h ../include/utl_exceptlist.h \
- ../include/utl_namelist.h ../include/utl_labellist.h \
- ../include/utl_decllist.h ../include/idl_global.h \
- ../include/utl_error.h ../include/utl_indenter.h \
- ../include/idl_extern.h ../include/fe_extern.h ../include/be_extern.h \
- ../include/drv_extern.h ../include/ast_extern.h \
- ../include/nr_extern.h ../include/global_extern.h \
- ../include/fe_private.h ../include/fe_interface_header.h \
- ../include/fe_declarator.h
-.obj/fe_init.o .shobj/fe_init.so: fe_init.cpp ../include/idl.h ../include/intlmacros.h \
- ../include/idl_narrow.h ../include/idl_defines.h ../include/idl_fwd.h \
- ../include/idl_bool.h ../include/utl_string.h \
- ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/utl_strlist.h ../include/utl_exprlist.h \
- ../include/ast_generator.h ../include/util.h ../include/utl_stack.h \
- ../include/utl_idlist.h ../include/utl_exceptlist.h \
- ../include/utl_namelist.h ../include/utl_labellist.h \
- ../include/utl_decllist.h ../include/idl_global.h \
- ../include/utl_error.h ../include/utl_indenter.h \
- ../include/idl_extern.h ../include/fe_extern.h ../include/be_extern.h \
- ../include/drv_extern.h ../include/ast_extern.h \
- ../include/nr_extern.h ../include/global_extern.h \
- ../include/fe_private.h ../include/fe_interface_header.h \
- ../include/fe_declarator.h
-.obj/fe_extern.o .shobj/fe_extern.so: fe_extern.cpp ../include/idl.h ../include/intlmacros.h \
- ../include/idl_narrow.h ../include/idl_defines.h ../include/idl_fwd.h \
- ../include/idl_bool.h ../include/utl_string.h \
- ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/utl_strlist.h ../include/utl_exprlist.h \
- ../include/ast_generator.h ../include/util.h ../include/utl_stack.h \
- ../include/utl_idlist.h ../include/utl_exceptlist.h \
- ../include/utl_namelist.h ../include/utl_labellist.h \
- ../include/utl_decllist.h ../include/idl_global.h \
- ../include/utl_error.h ../include/utl_indenter.h \
- ../include/idl_extern.h ../include/fe_extern.h ../include/be_extern.h \
- ../include/drv_extern.h ../include/ast_extern.h \
- ../include/nr_extern.h ../include/global_extern.h \
- ../include/fe_private.h ../include/fe_interface_header.h \
- ../include/fe_declarator.h
-.obj/fe_interface_header.o .shobj/fe_interface_header.so: fe_interface_header.cpp ../include/idl.h \
- ../include/intlmacros.h ../include/idl_narrow.h \
- ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \
- ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/utl_strlist.h ../include/utl_exprlist.h \
- ../include/ast_generator.h ../include/util.h ../include/utl_stack.h \
- ../include/utl_idlist.h ../include/utl_exceptlist.h \
- ../include/utl_namelist.h ../include/utl_labellist.h \
- ../include/utl_decllist.h ../include/idl_global.h \
- ../include/utl_error.h ../include/utl_indenter.h \
- ../include/idl_extern.h ../include/fe_extern.h ../include/be_extern.h \
- ../include/drv_extern.h ../include/ast_extern.h \
- ../include/nr_extern.h ../include/global_extern.h \
- ../include/fe_private.h ../include/fe_interface_header.h \
- ../include/fe_declarator.h
-.obj/y.tab.o .shobj/y.tab.so: y.tab.cpp ../include/idl.h ../include/intlmacros.h \
- ../include/idl_narrow.h ../include/idl_defines.h ../include/idl_fwd.h \
- ../include/idl_bool.h ../include/utl_string.h \
- ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/utl_strlist.h ../include/utl_exprlist.h \
- ../include/ast_generator.h ../include/util.h ../include/utl_stack.h \
- ../include/utl_idlist.h ../include/utl_exceptlist.h \
- ../include/utl_namelist.h ../include/utl_labellist.h \
- ../include/utl_decllist.h ../include/idl_global.h \
- ../include/utl_error.h ../include/utl_indenter.h \
- ../include/idl_extern.h ../include/fe_extern.h ../include/be_extern.h \
- ../include/drv_extern.h ../include/ast_extern.h \
- ../include/nr_extern.h ../include/global_extern.h \
- ../include/fe_private.h ../include/fe_interface_header.h \
- ../include/fe_declarator.h
-.obj/lex.yy.o .shobj/lex.yy.so: lex.yy.cpp ../include/idl.h ../include/intlmacros.h \
- ../include/idl_narrow.h ../include/idl_defines.h ../include/idl_fwd.h \
- ../include/idl_bool.h ../include/utl_string.h \
- ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/utl_strlist.h ../include/utl_exprlist.h \
- ../include/ast_generator.h ../include/util.h ../include/utl_stack.h \
- ../include/utl_idlist.h ../include/utl_exceptlist.h \
- ../include/utl_namelist.h ../include/utl_labellist.h \
- ../include/utl_decllist.h ../include/idl_global.h \
- ../include/utl_error.h ../include/utl_indenter.h \
- ../include/idl_extern.h ../include/fe_extern.h ../include/be_extern.h \
- ../include/drv_extern.h ../include/ast_extern.h \
- ../include/nr_extern.h ../include/global_extern.h \
- ../include/fe_private.h ../include/fe_interface_header.h \
- ../include/fe_declarator.h y.tab.h
-
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/TAO_IDL/fe/fe_declarator.cpp b/TAO/TAO_IDL/fe/fe_declarator.cpp
deleted file mode 100644
index 1c802e338e9..00000000000
--- a/TAO/TAO_IDL/fe/fe_declarator.cpp
+++ /dev/null
@@ -1,157 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-/*
- * fe_declarator.cc - Implementation of FE private declaration
- *		      statement class
- *
- * The FE_Declarator class is used to hold together complex declarations
- * until all the components are parsed and before they are composed into
- * an AST_Type node.
- */
-
-#include	"idl.h"
-#include	"idl_extern.h"
-
-#include	"fe_private.h"
-
-/*
- * Constructor(s) and destructor
- */
-
-FE_Declarator::FE_Declarator(UTL_ScopedName *n, DeclaratorType dt,
-			     AST_Decl *cp)
-	     : pd_complex_part(cp),
-	       pd_name(n),
-	       pd_decl_type(dt)
-{
-}
-
-/*
- * Private operations
- */
-
-/*
- * Public operations
- */
-
-// Compose the type of the complex declarator (if any) with the base
-// type supplied in ct
-AST_Type *
-FE_Declarator::compose(AST_Decl *d)
-{
-  AST_Array	*arr;
-  AST_Type	*ct;
-
-  ct = AST_Type::narrow_from_decl(d);
-  if (ct == NULL) {
-    idl_global->err()->not_a_type(d);
-    return NULL;
-  }
-  if (ct->node_type() == AST_Decl::NT_except) {
-    idl_global->err()->not_a_type(d);
-    return NULL;
-  }
-  if (pd_decl_type == FD_simple || pd_complex_part == NULL) {
-    return ct;
-  }
-  if (pd_complex_part->node_type() == AST_Decl::NT_array) {
-    arr = AST_Array::narrow_from_decl(pd_complex_part);
-    arr->set_base_type(ct);
-
-    /*
-     * Add the new array to the types defined in the global scope
-     */
-    idl_global->root()->fe_add_array(arr);
-
-    return arr;
-  }
-  return NULL; // return through this statement should not happen
-}
-
-/*
- * Redefinition of inherited virtual operations
- */
-
-/*
- * Data accessors
- */
-
-AST_Decl *
-FE_Declarator::complex_part()
-{
-  return pd_complex_part;
-}
-
-UTL_ScopedName *
-FE_Declarator::name()
-{
-  return pd_name;
-}
-
-FE_Declarator::DeclaratorType
-FE_Declarator::decl_type()
-{
-  return pd_decl_type;
-}
diff --git a/TAO/TAO_IDL/fe/fe_extern.cpp b/TAO/TAO_IDL/fe/fe_extern.cpp
deleted file mode 100644
index 03e52fbdc5f..00000000000
--- a/TAO/TAO_IDL/fe/fe_extern.cpp
+++ /dev/null
@@ -1,121 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-/*
- * fe_extern.cc - export FE interfaces to driver
- */
-
-#include	"idl.h"
-#include	"idl_extern.h"
-
-#include	"fe_private.h"
-
-#include 	"utl_error.h"
-#include	"utl_indenter.h"
-#include	"utl_string.h"
-
-/*
- * yacc parser interface
- */
-
-extern int yyparse();
-extern FILE * yyin;
-
-int
-FE_yyparse()
-{
-  int result = yyparse();
-  if (idl_global->err_count() == 0) {
-    idl_global->root()->call_add();
-  }
-  return result;
-}
-
-void
-FE_set_yyin(File * f)
-{
-  yyin = (FILE*)f;
-}
-
-/*
- * constructor interfaces 
- */
-
-UTL_Error *
-FE_new_UTL_Error()
-{
-  return new UTL_Error();
-}
-
-UTL_Indenter *
-FE_new_UTL_Indenter()
-{
-  return new UTL_Indenter();
-}
-
-UTL_String *
-FE_new_UTL_String(char * str)
-{
-  return new UTL_String(str);
-}
diff --git a/TAO/TAO_IDL/fe/fe_init.cpp b/TAO/TAO_IDL/fe/fe_init.cpp
deleted file mode 100644
index 16f6b4372d8..00000000000
--- a/TAO/TAO_IDL/fe/fe_init.cpp
+++ /dev/null
@@ -1,367 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-/*
- * fe_init.cc - Initialize the FE
- *
- * The FE initialization is carried out in two stages, with the BE
- * initialization protocol sandwiched between the two stages.
- *
- * The first stage is responsible for creating the scopes stack.
- * The second stage is run after the BE initialization has created
- * and returned an instance of AST_Generator (or a subclass). This
- * instance is used to create the root node for the AST, and to
- * populate it with AST_PredefinedType nodes which represent the
- * predefined IDL types. This AST root is then pushed on the scopes
- * stack as the outermost scope.
- */
-
-#include	"idl.h"
-#include	"idl_extern.h"
-
-#include	"fe_private.h"
-
-/*
- * Create a scoped name
- */
-static UTL_ScopedName *
-create_scoped_name(char *s)
-{
-  return new UTL_ScopedName(new Identifier(s, 1, 0, I_FALSE), NULL);
-}
-
-/*
- * Populate the global scope with all predefined entities
- */
-void
-fe_populate(AST_Module *m)
-{
-  AST_PredefinedType *pdt;
-
-  pdt = idl_global->gen()->create_predefined_type(AST_PredefinedType::PT_long,
-					          create_scoped_name("long"),
-						  NULL);
-  m->fe_add_predefined_type(pdt);
-
-  pdt =
-    idl_global->gen()->create_predefined_type(AST_PredefinedType::PT_ulong,
-					   create_scoped_name("unsigned long"),
-					   NULL);
-  m->fe_add_predefined_type(pdt);
-  pdt =
-    idl_global->gen()
-	->create_predefined_type(AST_PredefinedType::PT_longlong,
-				 create_scoped_name("long long"),
-				 NULL);
-  m->fe_add_predefined_type(pdt);
-  pdt =
-    idl_global->gen()
-	->create_predefined_type(AST_PredefinedType::PT_ulonglong,
-				 create_scoped_name("unsigned long long"),
-				 NULL);
-  m->fe_add_predefined_type(pdt);
-  pdt = idl_global->gen()->create_predefined_type(AST_PredefinedType::PT_short,
-						  create_scoped_name("short"),
-						  NULL);
-  m->fe_add_predefined_type(pdt);
-  pdt =
-   idl_global->gen()->create_predefined_type(AST_PredefinedType::PT_ushort,
-					  create_scoped_name("unsigned short"),
-					  NULL);
-  m->fe_add_predefined_type(pdt);
-  pdt = idl_global->gen()->create_predefined_type(AST_PredefinedType::PT_float,
-						  create_scoped_name("float"),
-					       	  NULL);
-  m->fe_add_predefined_type(pdt);
-  pdt =
-    idl_global->gen()->create_predefined_type(AST_PredefinedType::PT_double,
-					      create_scoped_name("double"),
-					      NULL);
-  m->fe_add_predefined_type(pdt);
-  pdt =
-    idl_global->gen()
-	->create_predefined_type(AST_PredefinedType::PT_longdouble,
-				 create_scoped_name("long double"),
-				 NULL);
-  m->fe_add_predefined_type(pdt);
-  pdt = idl_global->gen()->create_predefined_type(AST_PredefinedType::PT_char,
-						  create_scoped_name("char"),
-						  NULL);
-  m->fe_add_predefined_type(pdt);
-  pdt =
-    idl_global->gen()
-	->create_predefined_type(AST_PredefinedType::PT_wchar,
-				 create_scoped_name("wchar_t"),
-				 NULL);
-  m->fe_add_predefined_type(pdt);
-  pdt = idl_global->gen()->create_predefined_type(AST_PredefinedType::PT_octet,
-						  create_scoped_name("octet"),
-						  NULL);
-  m->fe_add_predefined_type(pdt);
-  pdt = idl_global->gen()->create_predefined_type(AST_PredefinedType::PT_any,
-						  create_scoped_name("any"),
-						  NULL);
-  m->fe_add_predefined_type(pdt);
-  pdt =
-    idl_global->gen()->create_predefined_type(AST_PredefinedType::PT_boolean,
-					      create_scoped_name("boolean"),
-					      NULL);
-  m->fe_add_predefined_type(pdt);
-  pdt = idl_global->gen()->create_predefined_type(AST_PredefinedType::PT_void,
-						  create_scoped_name("void"),
-						  NULL);
-  m->fe_add_predefined_type(pdt);
-  pdt = idl_global->gen()
-		->create_predefined_type(AST_PredefinedType::PT_pseudo,
-					 create_scoped_name("Object"),
-					 NULL);
-  m->fe_add_predefined_type(pdt);
-  pdt = idl_global->gen()
-  		->create_predefined_type(AST_PredefinedType::PT_pseudo,
-					 create_scoped_name("TypeCode"),
-					 NULL);
-  m->fe_add_predefined_type(pdt);
-
-  /*
-   * Add these to make all keywords protected even in different spellings
-   */
-
-  pdt = idl_global->gen()
-  		->create_predefined_type(AST_PredefinedType::PT_pseudo,
-					 create_scoped_name("attribute"),
-					 NULL);
-  m->fe_add_predefined_type(pdt);
-  pdt = idl_global->gen()
-  		->create_predefined_type(AST_PredefinedType::PT_pseudo,
-					 create_scoped_name("case"),
-					 NULL);
-  m->fe_add_predefined_type(pdt);
-  pdt = idl_global->gen()
-  		->create_predefined_type(AST_PredefinedType::PT_pseudo,
-					 create_scoped_name("const"),
-					 NULL);
-  m->fe_add_predefined_type(pdt);
-  pdt = idl_global->gen()
-  		->create_predefined_type(AST_PredefinedType::PT_pseudo,
-					 create_scoped_name("context"),
-					 NULL);
-  m->fe_add_predefined_type(pdt);
-  pdt = idl_global->gen()
-  		->create_predefined_type(AST_PredefinedType::PT_pseudo,
-					 create_scoped_name("default"),
-					 NULL);
-  m->fe_add_predefined_type(pdt);
-  pdt = idl_global->gen()
-  		->create_predefined_type(AST_PredefinedType::PT_pseudo,
-					 create_scoped_name("enum"),
-					 NULL);
-  m->fe_add_predefined_type(pdt);
-  pdt = idl_global->gen()
-  		->create_predefined_type(AST_PredefinedType::PT_pseudo,
-					 create_scoped_name("exception"),
-					 NULL);
-  m->fe_add_predefined_type(pdt);
-  pdt = idl_global->gen()
-  		->create_predefined_type(AST_PredefinedType::PT_pseudo,
-					 create_scoped_name("in"),
-					 NULL);
-  m->fe_add_predefined_type(pdt);
-  pdt = idl_global->gen()
-  		->create_predefined_type(AST_PredefinedType::PT_pseudo,
-					 create_scoped_name("out"),
-					 NULL);
-  m->fe_add_predefined_type(pdt);
-  pdt = idl_global->gen()
-  		->create_predefined_type(AST_PredefinedType::PT_pseudo,
-					 create_scoped_name("inout"),
-					 NULL);
-  m->fe_add_predefined_type(pdt);
-  pdt = idl_global->gen()
-  		->create_predefined_type(AST_PredefinedType::PT_pseudo,
-					 create_scoped_name("interface"),
-					 NULL);
-  m->fe_add_predefined_type(pdt);
-  pdt = idl_global->gen()
-  		->create_predefined_type(AST_PredefinedType::PT_pseudo,
-					 create_scoped_name("module"),
-					 NULL);
-  m->fe_add_predefined_type(pdt);
-  pdt = idl_global->gen()
-  		->create_predefined_type(AST_PredefinedType::PT_pseudo,
-					 create_scoped_name("oneway"),
-					 NULL);
-  m->fe_add_predefined_type(pdt);
-  pdt = idl_global->gen()
-  		->create_predefined_type(AST_PredefinedType::PT_pseudo,
-					 create_scoped_name("raises"),
-					 NULL);
-  m->fe_add_predefined_type(pdt);
-  pdt = idl_global->gen()
-  		->create_predefined_type(AST_PredefinedType::PT_pseudo,
-					 create_scoped_name("readonly"),
-					 NULL);
-  m->fe_add_predefined_type(pdt);
-  pdt = idl_global->gen()
-  		->create_predefined_type(AST_PredefinedType::PT_pseudo,
-					 create_scoped_name("sequence"),
-					 NULL);
-  m->fe_add_predefined_type(pdt);
-  pdt = idl_global->gen()
-  		->create_predefined_type(AST_PredefinedType::PT_pseudo,
-					 create_scoped_name("string"),
-					 NULL);
-  m->fe_add_predefined_type(pdt);
-  pdt = idl_global->gen()
-  		->create_predefined_type(AST_PredefinedType::PT_pseudo,
-					 create_scoped_name("wstring_t"),
-					 NULL);
-  m->fe_add_predefined_type(pdt);
-  pdt = idl_global->gen()
-  		->create_predefined_type(AST_PredefinedType::PT_pseudo,
-					 create_scoped_name("struct"),
-					 NULL);
-  m->fe_add_predefined_type(pdt);
-  pdt = idl_global->gen()
-  		->create_predefined_type(AST_PredefinedType::PT_pseudo,
-					 create_scoped_name("switch"),
-					 NULL);
-  m->fe_add_predefined_type(pdt);
-  pdt = idl_global->gen()
-  		->create_predefined_type(AST_PredefinedType::PT_pseudo,
-					 create_scoped_name("typedef"),
-					 NULL);
-  m->fe_add_predefined_type(pdt);
-  pdt = idl_global->gen()
-  		->create_predefined_type(AST_PredefinedType::PT_pseudo,
-					 create_scoped_name("union"),
-					 NULL);
-  m->fe_add_predefined_type(pdt);
-  pdt = idl_global->gen()
-  		->create_predefined_type(AST_PredefinedType::PT_pseudo,
-					 create_scoped_name("unsigned"),
-					 NULL);
-  m->fe_add_predefined_type(pdt);
-  pdt = idl_global->gen()
-  		->create_predefined_type(AST_PredefinedType::PT_pseudo,
-					 create_scoped_name("TRUE"),
-					 NULL);
-  m->fe_add_predefined_type(pdt);
-  pdt = idl_global->gen()
-  		->create_predefined_type(AST_PredefinedType::PT_pseudo,
-					 create_scoped_name("FALSE"),
-					 NULL);
-  m->fe_add_predefined_type(pdt);
-}
-
-/*
- * Initialization stage 1: create global scopes stack
- */
-void
-FE_init_stage1()
-{
-  idl_global->set_scopes(new UTL_ScopeStack());
-  if (idl_global->scopes() == NULL) {
-    cerr << GTDEVEL("IDL: FE init failed to create scope stack, exiting\n");
-    exit(99);
-  }
-}
-
-/*
- * Initialization stage 2: create global scope and populate it
- */
-void
-FE_init_stage2()
-{
-  AST_Root	*r;
-
-  /*
-   * Check that the BE init created a generator object
-   */
-  if (idl_global->gen() == NULL) {
-    cerr << GTDEVEL("IDL: BE did not initialize idl_global->gen(), exiting\n");
-    exit(99);
-  }
-  /*
-   * Create a global root for the AST. Note that the AST root has no
-   * name
-   */
-  r = idl_global->gen()->create_root(create_scoped_name(""), NULL);
-  idl_global->set_root(r);
-  if (r == NULL) {
-    cerr << GTDEVEL("IDL: FE init failed to create AST root, exiting\n");
-    exit(99);
-  }
-  /*
-   * Push it on the stack
-   */
-  idl_global->scopes()->push(idl_global->root());
-  /*
-   * Populate it with nodes for predefined types
-   */
-  fe_populate(idl_global->root());
-  /*
-   * Set flag to indicate we are processing the main file now
-   */
-  idl_global->set_in_main_file(I_TRUE);
-}
diff --git a/TAO/TAO_IDL/fe/fe_interface_header.cpp b/TAO/TAO_IDL/fe/fe_interface_header.cpp
deleted file mode 100644
index b493bde1969..00000000000
--- a/TAO/TAO_IDL/fe/fe_interface_header.cpp
+++ /dev/null
@@ -1,282 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-/*
- * fe_interface_header.cc - Implements the FE private class FE_InterfaceHeader
- *
- * FE_InterfaceHeader instances are used to store information about an
- * interface header as the interface is being parsed and before the
- * AST_Interface node used to represent this interface is created.
- */
-
-#include	"idl.h"
-#include	"idl_extern.h"
-
-#include	"fe_private.h"
-
-/*
- * Constructor(s) and destructor
- */
-
-FE_InterfaceHeader::FE_InterfaceHeader(UTL_ScopedName *n, UTL_NameList *nl)
-		  : pd_interface_name(n)
-{
-  compile_inheritance(nl);
-}
-
-/*
- * Private operations
- */
-
-// Compute flattened, non-repeating list of inherited interfaces
-
-#undef	INCREMENT
-#define	INCREMENT	512
-
-/*
- * Private storage used to store interfaces seen already in the
- * computation of the unique, flattened inheritance list
- */
-static AST_Interface **iseen = NULL;
-static long	    iallocated = 0;
-static long	    iused = 0;
-
-/*
- * Add an interface to an inheritance spec
- */
-static void
-add_inheritance(AST_Interface *i)
-{
-  long			oiallocated;
-  long			k;
-  AST_Interface	      **oiseen;
-
-  /*
-   * Make sure there's space for one more
-   */
-  if (iallocated == iused) {
-    if (iallocated == 0) {
-      iallocated = INCREMENT;
-      iseen = new AST_Interface *[iallocated];
-    } else {
-      oiallocated = iallocated;
-      oiseen = iseen;
-      iallocated += INCREMENT;
-      iseen = new AST_Interface *[iallocated];
-      for (k = 0; k < iused; k++)
-	iseen[k] = oiseen[k];
-      delete oiseen;
-    }
-  }
-  /*
-   * OK, now insert it
-   */
-  iseen[iused] = i;
-  iused++;
-}
-
-/*
- * Have we already seen this interface?
- */
-static long
-already_seen(AST_Interface *ip)
-{
-  long	i;
-
-  for (i = 0; i < iused; i++) {
-    if (iseen[i] == ip)
-      return I_TRUE;
-  }
-  return I_FALSE;
-}
-
-/*
- * Add this interface to the list of inherited if not already there
- */
-void
-FE_InterfaceHeader::compile_one_inheritance(AST_Interface *i)
-{
-  /*
-   * Check for badly formed interface
-   */
-  if (i == NULL)
-    return;
-  /*
-   * If we've seen it already then don't expand again
-   */
-  if (already_seen(i))
-    return;
-  /*
-   * OK, add i to the list of inherited interfaces
-   */
-  add_inheritance(i);
-}
-
-/*
- * Compute the list of top-level interfaces this one inherits from
- */
-void
-FE_InterfaceHeader::compile_inheritance(UTL_NameList *nl)
-{
-  UTL_NamelistActiveIterator *l = new UTL_NamelistActiveIterator(nl);
-  AST_Decl		       *d;
-  AST_Interface		       *i;
-  long			        k;
-
-  iused = 0;
-  /*
-   * Compute expanded flattened non-repeating list of interfaces
-   * which this one inherits from
-   */
-  while (!(l->is_done())) {
-    /*
-     * Check that scope stack is valid
-     */
-    if (idl_global->scopes()->top() == NULL) {
-      idl_global->err()->lookup_error(l->item());
-      return;
-    }
-    /*
-     * Look it up
-     */
-    d = idl_global->scopes()->top()->lookup_by_name(l->item(), I_TRUE);
-    /*
-     * Not found?
-     */
-    if (d == NULL) {
-      idl_global->err()->lookup_error(l->item());
-      return;
-    }
-    /*
-     * Not an interface?
-     */
-    while(d->node_type() == AST_Decl::NT_typedef) 
-      d = AST_Typedef::narrow_from_decl(d)->base_type();
-    if (d->node_type() != AST_Decl::NT_interface) {
-      idl_global->err()->inheritance_error(pd_interface_name, d);
-      return;
-    }
-    /*
-     * OK, cast to an interface
-     */
-    i = AST_Interface::narrow_from_decl(d);
-    if (i == NULL)
-       idl_global->err()->inheritance_error(pd_interface_name, d);
-    /*
-     * Forward declared interface?
-     */
-    if (!i->is_defined()) {
-      idl_global->err()->inheritance_fwd_error(pd_interface_name, i);
-      return;
-    }
-    /*
-     * OK, see if we have to add this to the list of interfaces
-     * inherited from
-     */
-    compile_one_inheritance(i);
-
-    /*
-     * Next element in header list
-     */
-    l->next();
-  }
-  delete l;
-  /*
-   * OK, install in interface header
-   */
-  pd_inherits = new AST_Interface *[iused];
-  for (k = 0; k < iused; k++)
-    pd_inherits[k] = iseen[k];
-  pd_n_inherits = iused;
-}
-
-/*
- * Public operations
- */
-
-/*
- * Redefinition of inherited virtual operations
- */
-
-/*
- * Data accessors
- */
-
-UTL_ScopedName *
-FE_InterfaceHeader::interface_name()
-{
-  return pd_interface_name;
-}
-
-AST_Interface **
-FE_InterfaceHeader::inherits()
-{
-  return pd_inherits;
-}
-
-long
-FE_InterfaceHeader::n_inherits()
-{
-  return pd_n_inherits;
-}
diff --git a/TAO/TAO_IDL/fe/fe_private.cpp b/TAO/TAO_IDL/fe/fe_private.cpp
deleted file mode 100644
index 30fe3c3cfc0..00000000000
--- a/TAO/TAO_IDL/fe/fe_private.cpp
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-/*
- * fe_private.cc - Declare global data which are private to the FE
- *		   part
- */
-
-#include	"idl.h"
-#include	"idl_extern.h"
-
-#include	"fe_private.h"
-
-/*
- * List of pragmas
- */
-UTL_StrList	*DRV_global_pragmas = NULL;
diff --git a/TAO/TAO_IDL/fe/idl.ll b/TAO/TAO_IDL/fe/idl.ll
deleted file mode 100644
index 9b41d547492..00000000000
--- a/TAO/TAO_IDL/fe/idl.ll
+++ /dev/null
@@ -1,527 +0,0 @@
-
-%{
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-IDL_INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-IDL_ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-IDL_INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-IDL_ANY OBLIGATION ON THE PART OF Sun OR IDL_ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IDL_IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR IDL_ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR IDL_ANY PATENTS BY
-IDL_INTERFACE DEFINITION LANGUAGE CFE OR IDL_ANY PART THEREOF.
-
-IDL_IN NO EVENT WILL SUN OR IDL_ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-IDL_ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.
-2550 Garcia Avenue
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-/*
- * idl.ll - Lexical scanner for IDL 1.1
- */
-
-#include "idl.h"
-#include "idl_extern.h"
-#include "fe_private.h"
-#include "y.tab.h"
-
-static char	idl_escape_reader(char *);
-static double	idl_atof(char *);
-static long	idl_atoi(char *, long);
-static void	idl_parse_line_and_file(char *);
-static void	idl_store_pragma(char *);
-
-#if 0 /* defined (HPUX) */
-// HPUX has yytext typed to unsigned char *. We make sure here that
-// we'll always use char * static char* __yytext = (char*) yytext;
-// NOTE: This will not work under flex(1) were yytext is not a fixed
-// buffer, but a dynamically allocated one. This function should do
-// the trick for us.
-inline char *__yytext()
-{
-  return (char *) yytext;
-}
-#define ace_yytext __yytext()
-#else
-#define ace_yytext yytext
-#endif /* 0 */
-%}
-
-%array
-
-%%
-
-any             return IDL_ANY;
-module		return IDL_MODULE;
-raises		return IDL_RAISES;
-readonly	return IDL_READONLY;
-attribute	return IDL_ATTRIBUTE;
-exception	return IDL_EXCEPTION;
-context		return IDL_CONTEXT;
-interface	return IDL_INTERFACE;
-const		return IDL_CONST;
-typedef		return IDL_TYPEDEF;
-struct		return IDL_STRUCT;
-enum		return IDL_ENUM;
-string		return IDL_STRING;
-wstring_t	return IDL_WSTRING;
-sequence	return IDL_SEQUENCE;
-union		return IDL_UNION;
-switch		return IDL_SWITCH;
-case		return IDL_CASE;
-default		return IDL_DEFAULT;
-float		return IDL_FLOAT;
-double		return IDL_DOUBLE;
-long		return IDL_LONG;
-short		return IDL_SHORT;
-unsigned	return IDL_UNSIGNED;
-char		return IDL_CHAR;
-wchar_t		return IDL_WCHAR;
-boolean		return IDL_BOOLEAN;
-octet		return IDL_OCTET;
-void		return IDL_VOID;
-
-TRUE		return IDL_TRUETOK;
-FALSE		return IDL_FALSETOK;
-
-inout		return IDL_INOUT;
-in		return IDL_IN;
-out		return IDL_OUT;
-oneway		return IDL_ONEWAY;
-
-\<\<		return IDL_LEFT_SHIFT;
-\>\>		return IDL_RIGHT_SHIFT;
-\:\:		{
-		  yylval.strval = "::";
-		  return IDL_SCOPE_DELIMITOR;
-		}
-
-[a-zA-Z][a-zA-Z0-9_]*	{
-    char *z = (char *) malloc(strlen(ace_yytext) + 1);
-    strcpy(z, ace_yytext);
-    yylval.strval = z;
-    return IDENTIFIER;
-}
-
--?[0-9]+"."[0-9]*([eE][+-]?[0-9]+)?[lLfF]?      {
-                  yylval.dval = idl_atof(ace_yytext);
-                  return IDL_FLOATING_PT_LITERAL;
-                }
--?[0-9]+[eE][+-]?[0-9]+[lLfF]?  {
-                  yylval.dval = idl_atof(ace_yytext);
-                  return IDL_FLOATING_PT_LITERAL;
-                }
-
--?[1-9][0-9]*	{
-		  yylval.ival = idl_atoi(ace_yytext, 10);
-		  return IDL_INTEGER_LITERAL;
-	        }
--?0[xX][a-fA-F0-9]+ {
-		  yylval.ival = idl_atoi(ace_yytext, 16);
-		  return IDL_INTEGER_LITERAL;
-	        }
--?0[0-7]*	{
-		  yylval.ival = idl_atoi(ace_yytext, 8);
-		  return IDL_INTEGER_LITERAL;
-	      	}
-
-"\""[^\"]*"\""	{
-		  /* Skip the quotes */
-		  char *tmp = ace_yytext;
-		  tmp[strlen(tmp)-1] = '\0';
-		  yylval.sval = new String(tmp + 1);
-		  return IDL_STRING_LITERAL;
-	      	}
-"'"."'"		{
-		  yylval.cval = ace_yytext [1];
-		  return IDL_CHARACTER_LITERAL;
-	      	}
-"'"\\([0-7]{1,3})"'"	{
-		  // octal character constant
-		  yylval.cval = idl_escape_reader(ace_yytext + 1);
-		  return IDL_CHARACTER_LITERAL;
-		}
-"'"\\."'"	{
-		  yylval.cval = idl_escape_reader(ace_yytext + 1);
-		  return IDL_CHARACTER_LITERAL;
-		}
-^#[ \t]*pragma[ \t].*\n	{/* remember pragma */
-  		  idl_global->set_lineno(idl_global->lineno() + 1);
-		  idl_store_pragma(ace_yytext);
-		}
-^#[ \t]*[0-9]*" ""\""[^\"]*"\""" "[0-9]*\n		{
-		  idl_parse_line_and_file(ace_yytext);
-		}
-^#[ \t]*[0-9]*" ""\""[^\"]*"\""\n		{
-		  idl_parse_line_and_file(ace_yytext);
-		}
-^#line[ \t]*[0-9]*" ""\""[^\"]*"\""\n		{
-		  idl_parse_line_and_file(ace_yytext);
-		}
-^#[ \t]*[0-9]*\n {
-		  idl_parse_line_and_file(ace_yytext);
-	        }
-^#[ \t]*ident.*\n	{
-		  /* ignore cpp ident */
-  		  idl_global->set_lineno(idl_global->lineno() + 1);
-		}
-\/\/.*\n	{
-		  /* ignore comments */
-  		  idl_global->set_lineno(idl_global->lineno() + 1);
-		}
-"/*"		{
-		  for(;;) {
-		    char c = yyinput();
-		    if (c == '*') {
-		      char next = yyinput();
-		      if (next == '/')
-			break;
-		      else
-			yyunput(c, NULL);
-	              if (c == '\n')
-		        idl_global->set_lineno(idl_global->lineno() + 1);
-		    }
-	          }
-	        }
-[ \t]*		;
-\n		{
-  		  idl_global->set_lineno(idl_global->lineno() + 1);
-		}
-.		return ace_yytext [0];
-
-%%
-	/* subroutines */
-
-/*
- * Strip down a name to the last component, i.e. everything after the last
- * '/' character
- */
-static char *
-stripped_name(UTL_String *fn)
-{
-    char	*n = fn->get_string();
-    long	l;
-
-    if (n == NULL)
-	return NULL;
-    l = strlen(n);
-    for (n += l; l > 0 && *n != '/'; l--, n--);
-    if (*n == '/') n++;
-    return n;
-}
-
-/*
- * Parse a #line statement generated by the C preprocessor
- */
-static void
-idl_parse_line_and_file(char *buf)
-{
-  char		*r = buf;
-  char 		*h;
-  UTL_String	*nm;
-
-  /* Skip initial '#' */
-  if (*r != '#') 
-    return;
-  else
-    r++;
-
-  /* Check to see if we're running under the screwy Microsoft scheme */
-  /* of putting #line num instead of #num. */ 
-
-  if (ACE_OS::strncmp (r, "line", 4) == 0)
-    r += 5;
-
-  /* Find line number */
-  while (*r == ' ' || *r == '\t')
-    r++;
-  h = r;
-  for (; *r != '\0' && *r != ' ' && *r != '\t'; r++)
-    continue;
-  *r++ = 0;
-  idl_global->set_lineno(idl_atoi(h, 10));
-
-  /* Find file name, if present */
-  for (; *r != '"'; r++) 
-    if (*r == '\n' || *r == '\0')
-      return;
-
-  h = ++r;
-  for (; *r != '"'; r++)
-    continue;
-  *r = 0;
-  if (*h == '\0')
-    idl_global->set_filename(new String("standard input"));
-  else
-    {
-      long i;
-      long j;
-
-      // Put Microsoft-style pathnames into a canonical form.
-      for (i = 0, j = 0; h[j] != '\0'; i++, j++)
-        {
-          if (h[j] == '\\' && h[j + 1] == '\\')
-            j++;
-
-          h[i] = h[j];
-        }
-      h[i] = '\0';
-      idl_global->set_filename(new String(h));
-    }
-  idl_global->set_in_main_file(
-    (idl_global->filename()->compare(idl_global->real_filename())) ?
-    I_TRUE :
-    I_FALSE
-  );
-  /*
-   * If it's an import file store the stripped name for the BE to use
-   */
-  if (!(idl_global->in_main_file()) && idl_global->import()) {
-    nm = new UTL_String(stripped_name(idl_global->filename()));
-    idl_global->store_include_file_name(nm);
-  }
-}
-
-/*
- * Store a #pragma line into the list of pragmas
- */
-static void
-idl_store_pragma(char *buf)
-{
-  char *cp = buf + 1;
-  while(*cp != 'p')
-    cp++;
-  while(*cp != ' ' && *cp != '\t')
-    cp++;
-  while(*cp == ' ' || *cp == '\t')
-    cp++;
-  char pragma[80];
-  char *pp = pragma;
-  while(*cp != '\n') {
-    *pp++ = *cp++;
-  }
-  *pp = 0;
-  if (strcmp(pragma, "import") == 0) {
-    idl_global->set_import(I_TRUE);
-    return;
-  }
-  if (strcmp(pragma, "include") == 0) {
-    idl_global->set_import(I_FALSE);
-    return;
-  }
-  UTL_StrList *p = idl_global->pragmas();
-  if (p == NULL)
-    idl_global->set_pragmas(new UTL_StrList(new String(buf), NULL));
-  else {
-    p->nconc(new UTL_StrList(new String(buf), NULL));
-    idl_global->set_pragmas(p);
-  }
-}
-
-/*
- * idl_atoi - Convert a string of digits into an integer according to base b
- */
-static long
-idl_atoi(char *s, long b)
-{
-	long	r = 0;
-	long	negative = 0;
-
-	if (*s == '-') {
-	  negative = 1;
-	  s++;
-	}
-	if (b == 8 && *s == '0')
-	  s++;
-	else if (b == 16 && *s == '0' && (*(s + 1) == 'x' || *(s + 1) == 'X'))
-	  s += 2;
-
-	for (; *s; s++)
-	  if (*s <= '9' && *s >= '0')
-	    r = (r * b) + (*s - '0');
-	  else if (b > 10 && *s <= 'f' && *s >= 'a')
-	    r = (r * b) + (*s - 'a' + 10);
-	  else if (b > 10 && *s <= 'F' && *s >= 'A')
-	    r = (r * b) + (*s - 'A' + 10);
-	  else
-	    break;
-
-	if (negative)
-	  r *= -1;
-
-	return r;
-}
-
-/*
- * Convert a string to a float; atof doesn't seem to work, always.
- */
-static double
-idl_atof(char *s)
-{
-	char    *h = s;
-	double	d = 0.0;
-	double	f = 0.0;
-	double	e, k;
-	long	neg = 0, negexp = 0;
-
-	ACE_UNUSED_ARG (f);
-	ACE_UNUSED_ARG (h);
-
-	if (*s == '-') {
-	  neg = 1;
-	  s++;
-	}
-	while (*s >= '0' && *s <= '9') {
-		d = (d * 10) + *s - '0';
-		s++;
-	}
-	if (*s == '.') {
-		s++;
-		e = 10;
-		while (*s >= '0' && *s <= '9') {
-			d += (*s - '0') / (e * 1.0);
-			e *= 10;
-			s++;
-		}
-	}
-	if (*s == 'e' || *s == 'E') {
-		s++;
-		if (*s == '-') {
-			negexp = 1;
-			s++;
-		} else if (*s == '+')
-			s++;
-		e = 0;
-		while (*s >= '0' && *s <= '9') {
-			e = (e * 10) + *s - '0';
-			s++;
-		}
-		if (e > 0) {
-			for (k = 1; e > 0; k *= 10, e--);
-			if (negexp)
-				d /= k;
-			else
-				d *= k;
-		}
-	}
-
-	if (neg) d *= -1.0;
-
-	return d;
-}
-
-/*
- * Convert (some) escaped characters into their ascii values
- */
-static char
-idl_escape_reader(
-    char *str
-)
-{
-    if (str[0] != '\\') {
-	return str[0];
-    }
-
-    switch (str[1]) {
-      case 'n':
-	return '\n';
-      case 't':
-	return '\t';
-      case 'v':
-	return '\v';
-      case 'b':
-	return '\b';
-      case 'r':
-	return '\r';
-      case 'f':
-	return '\f';
-      case 'a':
-	return '\a';
-      case '\\':
-	return '\\';
-      case '\?':
-	return '?';
-      case '\'':
-	return '\'';
-      case '"':
-	return '"';
-      case 'x':
-	{
-	    int i;
-	    // hex value
-	    for (i = 2; str[i] != '\0' && isxdigit(str[i]); i++) {
-		continue;
-	    }
-	    char save = str[i];
-	    str[i] = '\0';
-	    char out = (char)idl_atoi(&str[2], 16);
-	    str[i] = save;
-	    return out;
-	}
-	break;
-      default:
-	// check for octal value
-	if (str[1] >= '0' && str[1] <= '7') {
- 	    int i;
-	    for (i = 1; str[i] >= '0' && str[i] <= '7'; i++) {
-		continue;
-	    }
-	    char save = str[i];
-	    str[i] = '\0';
-	    char out = (char)idl_atoi(&str[1], 8);
-	    str[i] = save;
-	    return out;
-	} else {
-	  return str[1] - 'a';
-	}
-	break;
-    }
-}
diff --git a/TAO/TAO_IDL/fe/idl.yy b/TAO/TAO_IDL/fe/idl.yy
deleted file mode 100644
index 63ef3e24b25..00000000000
--- a/TAO/TAO_IDL/fe/idl.yy
+++ /dev/null
@@ -1,2265 +0,0 @@
-
-
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-IDL_INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-IDL_ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-IDL_INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-IDL_ANY OBLIGATION ON THE PART OF Sun OR IDL_ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IDL_IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR IDL_ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR IDL_ANY PATENTS BY
-IDL_INTERFACE DEFINITION LANGUAGE CFE OR IDL_ANY PART THEREOF.
-
-IDL_IN NO EVENT WILL SUN OR IDL_ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-IDL_ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.
-2550 Garcia Avenue
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-/*
- * idl.yy - YACC grammar for IDL 1.1
- */
-
-/* Declarations */
-
-%{
-#include "idl.h"
-#include "idl_extern.h"
-#include "fe_private.h"
-#include <stdio.h>
-
-#if (defined(apollo) || defined(hpux)) && defined(__cplusplus)
-extern	"C" int yywrap();
-#endif	// (defined(apollo) || defined(hpux)) && defined(__cplusplus)
-
-void yyerror (char *);
-int yylex (void);
-extern "C" int yywrap (void);
-extern char yytext[];
-extern int yyleng;
-#define YYDEBUG_LEXER_TEXT (yytext[yyleng] = '\0', yytext)
-// Force the pretty debugging code to compile.
-#define YYDEBUG 1
-%}
-
-/*
- * Declare the type of values in the grammar
- */
-
-%union {
-  AST_Decl		*dcval;		/* Decl value		*/
-  UTL_StrList		*slval;		/* String list		*/
-  UTL_NameList		*nlval;		/* Name list		*/
-  UTL_ExprList		*elval;		/* Expression list	*/
-  UTL_LabelList		*llval;		/* Label list		*/
-  UTL_DeclList		*dlval;		/* Declaration list	*/
-  FE_InterfaceHeader	*ihval;		/* Interface header	*/
-  AST_Expression	*exval;		/* Expression value	*/
-  AST_UnionLabel	*ulval;		/* Union label		*/
-  AST_Field		*ffval;		/* Field value		*/
-  AST_Expression::ExprType etval;	/* Expression type	*/
-  AST_Argument::Direction dival;	/* Argument direction	*/
-  AST_Operation::Flags	ofval;		/* Operation flags	*/
-  FE_Declarator		*deval;		/* Declarator value	*/
-  idl_bool		bval;		/* Boolean value	*/
-  long			ival;		/* Long value		*/
-  double		dval;		/* Double value		*/
-  float			fval;		/* Float value		*/
-  char			cval;		/* Char value		*/
-
-  String		*sval;		/* String value		*/
-  char			*strval;	/* char * value		*/
-  Identifier		*idval;		/* Identifier		*/
-  UTL_IdList		*idlist;	/* Identifier list	*/
-}
-
-/*
- * Token types: These are returned by the lexer
- */
-
-%token <strval>	IDENTIFIER
-
-%token		IDL_CONST
-%token		IDL_MODULE
-%token		IDL_INTERFACE
-%token		IDL_TYPEDEF
-%token		IDL_LONG
-%token		IDL_SHORT
-%token		IDL_UNSIGNED
-%token		IDL_DOUBLE
-%token		IDL_FLOAT
-%token		IDL_CHAR
-%token		IDL_WCHAR
-%token		IDL_OCTET
-%token		IDL_BOOLEAN
-%token		IDL_ANY
-%token		IDL_STRUCT
-%token		IDL_UNION
-%token		IDL_SWITCH
-%token		IDL_ENUM
-%token		IDL_SEQUENCE
-%token		IDL_STRING
-%token		IDL_WSTRING
-%token		IDL_EXCEPTION
-%token		IDL_CASE
-%token		IDL_DEFAULT
-%token		IDL_READONLY
-%token		IDL_ATTRIBUTE
-%token		IDL_ONEWAY
-%token		IDL_IDEMPOTENT
-%token		IDL_VOID
-%token		IDL_IN
-%token		IDL_OUT
-%token		IDL_INOUT
-%token		IDL_RAISES
-%token		IDL_CONTEXT
-
-%token <ival>	IDL_INTEGER_LITERAL
-%token <sval>	IDL_STRING_LITERAL
-%token <cval>	IDL_CHARACTER_LITERAL
-%token <dval>	IDL_FLOATING_PT_LITERAL
-%token		IDL_TRUETOK
-%token		IDL_FALSETOK
-
-%token <strval>	IDL_SCOPE_DELIMITOR
-%token		IDL_LEFT_SHIFT
-%token		IDL_RIGHT_SHIFT
-
-/*
- * These are production names:
- */
-
-%type <dcval>	type_spec simple_type_spec constructed_type_spec
-%type <dcval>	template_type_spec sequence_type_spec string_type_spec
-%type <dcval>	struct_type enum_type switch_type_spec union_type
-%type <dcval>	array_declarator op_type_spec seq_head wstring_type_spec
-%type <dcval>   param_type_spec
-
-%type <idlist>	scoped_name
-%type <slval>	opt_context at_least_one_string_literal
-%type <slval>	string_literals
-
-%type <nlval>	at_least_one_scoped_name scoped_names inheritance_spec
-%type <nlval>	opt_raises
-
-%type <elval>	at_least_one_array_dim array_dims
-
-%type <llval>	at_least_one_case_label case_labels
-
-%type <dlval>	at_least_one_declarator declarators
-%type <dlval>   at_least_one_simple_declarator simple_declarators
-
-%type <ihval>	interface_header
-
-%type <exval>	expression const_expr or_expr xor_expr and_expr shift_expr
-%type <exval>	add_expr mult_expr unary_expr primary_expr literal
-%type <exval>	positive_int_expr array_dim
-
-%type <ulval>	case_label
-
-%type <ffval>	element_spec
-
-%type <etval>	const_type integer_type char_type boolean_type
-%type <etval>	floating_pt_type any_type signed_int
-%type <etval>	unsigned_int base_type_spec octet_type
-
-%type <dival>	direction
-
-%type <ofval>	opt_op_attribute
-
-%type <deval>	declarator simple_declarator complex_declarator
-
-%type <bval>	opt_readonly
-
-%type <idval>	interface_decl id
-
-%type <ival> type_dcl
-%%
-
-/*
- * Production starts here
- */
-start :	definitions ;
-
-definitions
-	: definition definitions
-	| /* empty */
-	;
-
-definition
-	: type_dcl
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_TypeDeclSeen);
-        }
-	  ';'
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_NoState);
-        }
-	| const_dcl
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_ConstDeclSeen);
-        }
-	  ';'
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_NoState);
-        }
-	| exception
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_ExceptDeclSeen);
-        }
-	  ';'
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_NoState);
-        }
-	| interface_def
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_InterfaceDeclSeen);
-        }
-	  ';'
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_NoState);
-        }
-	| module
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_ModuleDeclSeen);
-        }
-	  ';'
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_NoState);
-        }
-	| error
-	{
-	  idl_global->err()->syntax_error(idl_global->parse_state());
-	}
-	';'
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_NoState);
-	  yyerrok;
-	}
-	;
-
-module	: IDL_MODULE
-	  {
-	    idl_global->set_parse_state(IDL_GlobalData::PS_ModuleSeen);
-	  }
-	  IDENTIFIER
-	  {
-	    UTL_ScopedName 	*n =
-		new UTL_ScopedName(new Identifier($3, 1, 0, I_FALSE), NULL);
-	    AST_Module		*m = NULL;
-	    UTL_Scope		*s = idl_global->scopes()->top_non_null();
-	    UTL_StrList		*p = idl_global->pragmas();
-
-	    idl_global->set_parse_state(IDL_GlobalData::PS_ModuleIDSeen);
-	    /*
-	     * Make a new module and add it to the enclosing scope
-	     */
-	    if (s != NULL) {
-	      m = idl_global->gen()->create_module(n, p);
-	      (void) s->fe_add_module(m);
-	    }
-	    /*
-	     * Push it on the stack
-	     */
-	    idl_global->scopes()->push(m);
-	  }
-          '{'
-	  {
-	    idl_global->set_parse_state(IDL_GlobalData::PS_ModuleSqSeen);
-	  }
-	  definitions
-	  {
-	    idl_global->set_parse_state(IDL_GlobalData::PS_ModuleBodySeen);
-	  }
-	  '}'
-	  {
-	    idl_global->set_parse_state(IDL_GlobalData::PS_ModuleQsSeen);
-	    /*
-	     * Finished with this module - pop it from the scope stack
-	     */
-	    idl_global->scopes()->pop();
-	  }
-	  ;
-
-interface_def
-	: interface
-	| forward
-	;
-
-interface :
-	interface_header
-	{
-	  UTL_Scope     *s = idl_global->scopes()->top_non_null();
-	  AST_Interface *i = NULL;
-	  AST_Decl	*v = NULL;
-	  UTL_StrList   *p = idl_global->pragmas();
-	  AST_Decl	*d = NULL;
-	  AST_Interface *fd = NULL;
-
-	  ACE_UNUSED_ARG (v);
-
-	  /*
-	   * Make a new interface node and add it to its enclosing scope
-	   */
-	  if (s != NULL && $1 != NULL) {
-	    i = idl_global->gen()->create_interface($1->interface_name(),
-						    $1->inherits(),
-						    $1->n_inherits(),
-						    p);
-	    if (i != NULL &&
-		(d = s->lookup_by_name(i->name(), I_FALSE)) != NULL) {
-	      /*
-	       * See if we're defining a forward declared interface.
-	       */
-	      if (d->node_type() == AST_Decl::NT_interface) {
-		/*
-		 * Narrow to an interface
-		 */
-		fd = AST_Interface::narrow_from_decl(d);
-		/*
-		 * Successful?
-		 */
-		if (fd == NULL) {
-		  /*
-		   * Should we give an error here?
-		   */
-		}
-		/*
-		 * If it is a forward declared interface..
-		 */
-		else if (!fd->is_defined()) {
-		  /*
-		   * Check if redefining in same scope
-		   */
-		  if (fd->defined_in() != s) {
-		    idl_global->err()
-		       ->error3(UTL_Error::EIDL_SCOPE_CONFLICT,
-				i,
-				fd,
-				ScopeAsDecl(s));
-		  }
-		  /*
-		   * All OK, do the redefinition
-		   */
-		  else {
-		    fd->set_inherits($1->inherits());
-		    fd->set_n_inherits($1->n_inherits());
-		    /*
-		     * Update place of definition
-		     */
-		    fd->set_imported(idl_global->imported());
-		    fd->set_in_main_file(idl_global->in_main_file());
-		    fd->set_line(idl_global->lineno());
-		    fd->set_file_name(idl_global->filename());
-		    fd->add_pragmas(p);
-		    /*
-		     * Use full definition node
-		     */
-		    delete i;
-		    i = fd;
-		  }
-	        }
-	      }
-	    }
-	    /*
-	     * Add the interface to its definition scope
-	     */
-	    (void) s->fe_add_interface(i);
-	  }
-	  /*
-	   * Push it on the scope stack
-	   */
-	  idl_global->scopes()->push(i);
-        }
-	'{'
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_InterfaceSqSeen);
-	}
-	exports
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_InterfaceBodySeen);
-	}
-	'}'
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_InterfaceQsSeen);
-	  /*
-	   * Done with this interface - pop it off the scopes stack
-	   */
-	  idl_global->scopes()->pop();
-	}
-	;
-
-interface_decl:
-	 IDL_INTERFACE
-	 {
-	   idl_global->set_parse_state(IDL_GlobalData::PS_InterfaceSeen);
-	 }
-	 id
-	 {
-	   idl_global->set_parse_state(IDL_GlobalData::PS_InterfaceIDSeen);
-	   $$ = $3;
-	 }
-	;
-
-interface_header :
-	interface_decl inheritance_spec
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_InheritSpecSeen);
-	  /*
-	   * Create an AST representation of the information in the header
-	   * part of an interface - this representation contains a computed
-	   * list of all interfaces which this interface inherits from,
-	   * recursively
-	   */
-	  $$ = new FE_InterfaceHeader(new UTL_ScopedName($1, NULL), $2);
-	}
-	;
-
-inheritance_spec
-	: ':'
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_InheritColonSeen);
-        }
-	  at_least_one_scoped_name
-	{
-	  $$ = $3;
-	}
-	| /* EMPTY */
-	{
-	  $$ = NULL;
-	}
-	;
-
-exports
-	: exports export
-	| /* EMPTY */
-	;
-
-export
-	: type_dcl
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_TypeDeclSeen);
-        }
-	  ';'
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_NoState);
-        }
-	| const_dcl
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_ConstDeclSeen);
-        }
-	  ';'
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_NoState);
-        }
-	| exception
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_ExceptDeclSeen);
-        }
-	  ';'
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_NoState);
-        }
-	| attribute
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_AttrDeclSeen);
-        }
-	  ';'
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_NoState);
-        }
-	| operation
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_OpDeclSeen);
-        }
-	  ';'
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_NoState);
-        }
-	| error
-	{
-	  idl_global->err()->syntax_error(idl_global->parse_state());
-	}
-	';'
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_NoState);
-	  yyerrok;
-	}
-	;
-
-at_least_one_scoped_name :
-	scoped_name scoped_names
-	{
-	  $$ = new UTL_NameList($1, $2);
-	}
-	;
-
-scoped_names
-	: scoped_names
-	  ','
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_SNListCommaSeen);
-        }
-	  scoped_name
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_ScopedNameSeen);
-
-	  if ($1 == NULL)
-	    $$ = new UTL_NameList($4, NULL);
-	  else {
-	    $1->nconc(new UTL_NameList($4, NULL));
-	    $$ = $1;
-	  }
-	}
-	| /* EMPTY */
-	{
-	  $$ = NULL;
-	}
-	;
-
-scoped_name
-	: id
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_SN_IDSeen);
-
-	  $$ = new UTL_IdList($1, NULL);
-	}
-	| IDL_SCOPE_DELIMITOR
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_ScopeDelimSeen);
-        }
-	  id
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_SN_IDSeen);
-
-	  $$ = new UTL_IdList(new Identifier($1, 1, 0, I_FALSE),
-			      new UTL_IdList($3, NULL));
-	}
-	| scoped_name
-	  IDL_SCOPE_DELIMITOR
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_ScopeDelimSeen);
-        }
-	  id
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_SN_IDSeen);
-
-	  $1->nconc(new UTL_IdList($4, NULL));
-	  $$ = $1;
-	}
-	;
-
-id: IDENTIFIER
-        {
-            $$ = new Identifier($1, 1, 0, I_FALSE);
-        }
-        ;
-
-forward :
-	interface_decl
-	{
-	  UTL_Scope		*s = idl_global->scopes()->top_non_null();
-	  UTL_ScopedName	*n = new UTL_ScopedName($1, NULL);
-	  AST_InterfaceFwd	*f = NULL;
-	  UTL_StrList		*p = idl_global->pragmas();
-
-	  idl_global->set_parse_state(IDL_GlobalData::PS_ForwardDeclSeen);
-	  /*
-	   * Create a node representing a forward declaration of an
-	   * interface. Store it in the enclosing scope
-	   */
-	  if (s != NULL) {
-	    f = idl_global->gen()->create_interface_fwd(n, p);
-	    (void) s->fe_add_interface_fwd(f);
-	  }
-	}
-	;
-
-const_dcl :
-	IDL_CONST
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_ConstSeen);
-        }
-	const_type
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_ConstTypeSeen);
-        }
-	id
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_ConstIDSeen);
-        }
-	'='
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_ConstAssignSeen);
-        }
-	expression
-	{
-	  UTL_ScopedName	*n = new UTL_ScopedName($5, NULL);
-	  UTL_Scope		*s = idl_global->scopes()->top_non_null();
-	  AST_Constant		*c = NULL;
-	  UTL_StrList		*p = idl_global->pragmas();
-	  AST_Decl		*v = NULL;
-
-	  ACE_UNUSED_ARG (v);
-
-	  idl_global->set_parse_state(IDL_GlobalData::PS_ConstExprSeen);
-	  /*
-	   * Create a node representing a constant declaration. Store
-	   * it in the enclosing scope
-	   */
-	  if ($9 != NULL && s != NULL) {
-	    if ($9->coerce($3) == NULL)
-	      idl_global->err()->coercion_error($9, $3);
-	    else {
-	      c =
-		idl_global->gen()->create_constant($3, $9, n, p);
-	      (void) s->fe_add_constant(c);
-	    }
-	  }
-	}
-	;
-
-const_type
-	: integer_type
-	| char_type
-	| octet_type
-	| boolean_type
-	| floating_pt_type
-	| string_type_spec
-	{
-	  $$ = AST_Expression::EV_string;
-	}
-	| wstring_type_spec
-	{
-	  $$ = AST_Expression::EV_wstring;
-        }
-	| scoped_name
-	{
-	  UTL_Scope		*s = idl_global->scopes()->top_non_null();
-	  AST_Decl		*d = NULL;
-	  AST_PredefinedType	*c = NULL;
-	  AST_Typedef		*t = NULL;
-
-	  /*
-	   * If the constant's type is a scoped name, it must resolve
-	   * to a scalar constant type
-	   */
-	  if (s != NULL && (d = s->lookup_by_name($1, I_TRUE)) != NULL) {
-	    /*
-	     * Look through typedefs
-	     */
-	    while (d->node_type() == AST_Decl::NT_typedef) {
-	      t = AST_Typedef::narrow_from_decl(d);
-	      if (t == NULL)
-	        break;
-	      d = t->base_type();
-	    }
-	    if (d == NULL)
-	      $$ = AST_Expression::EV_any;
-	    else if (d->node_type() == AST_Decl::NT_pre_defined) {
-	      c = AST_PredefinedType::narrow_from_decl(d);
-	      if (c != NULL) {
-	         $$ = idl_global->PredefinedTypeToExprType(c->pt());
-	      } else {
-	         $$ = AST_Expression::EV_any;
-	      }
-	    } else
-	      $$ = AST_Expression::EV_any;
-	  } else
-	    $$ = AST_Expression::EV_any;
-	}
-	;
-
-expression : const_expr	;
-
-const_expr : or_expr ;
-
-or_expr : xor_expr
-	| or_expr '|' xor_expr
-	{
-	  $$ = idl_global->gen()->create_expr(AST_Expression::EC_or, $1, $3);
-	}
-	;
-
-xor_expr
-	: and_expr
-	| xor_expr '^' and_expr
-	{
-	  $$ = idl_global->gen()->create_expr(AST_Expression::EC_xor, $1, $3);
-	}
-	;
-
-and_expr
-	: shift_expr
-	| and_expr '&' shift_expr
-	{
-	  $$ = idl_global->gen()->create_expr(AST_Expression::EC_and, $1, $3);
-	}
-	;
-
-shift_expr
-	: add_expr
-	| shift_expr IDL_LEFT_SHIFT add_expr
-	{
-	  $$ = idl_global->gen()->create_expr(AST_Expression::EC_right,$1,$3);
-	}
-	| shift_expr IDL_RIGHT_SHIFT add_expr
-	{
-	  $$ = idl_global->gen()->create_expr(AST_Expression::EC_left,$1,$3);
-	}
-	;
-
-add_expr
-	: mult_expr
-	| add_expr '+' mult_expr
-	{
-	  $$ = idl_global->gen()->create_expr(AST_Expression::EC_add, $1, $3);
-	}
-	| add_expr '-' mult_expr
-	{
-	  $$ = idl_global->gen()->create_expr(AST_Expression::EC_minus,$1,$3);
-	}
-	;
-
-mult_expr
-	: unary_expr
-	| mult_expr '*' unary_expr
-	{
-	  $$ = idl_global->gen()->create_expr(AST_Expression::EC_mul, $1, $3);
-	}
-	| mult_expr '/' unary_expr
-	{
-	  $$ = idl_global->gen()->create_expr(AST_Expression::EC_div, $1, $3);
-	}
-	| mult_expr '%' unary_expr
-	{
-	  $$ = idl_global->gen()->create_expr(AST_Expression::EC_mod, $1, $3);
-	}
-	;
-
-unary_expr
-	: primary_expr
-	| '+' primary_expr
-	{
-	  $$ = idl_global->gen()->create_expr(AST_Expression::EC_u_plus,
-					      $2,
-					      NULL);
-	}
-	| '-' primary_expr
-	{
-	  $$ = idl_global->gen()->create_expr(AST_Expression::EC_u_minus,
-					      $2,
-					      NULL);
-	}
-	| '~' primary_expr
-	{
-	  $$ = idl_global->gen()->create_expr(AST_Expression::EC_bit_neg,
-					      $2,
-					      NULL);
-	}
-	;
-
-primary_expr
-	: scoped_name
-	{
-	  /*
-	   * An expression which is a scoped name is not resolved now,
-	   * but only when it is evaluated (such as when it is assigned
-	   * as a constant value)
-	   */
-	  $$ = idl_global->gen()->create_expr($1);
-	}
-	| literal
-	| '(' const_expr ')'
-	{
-	  $$ = $2;
-	}
-	;
-
-literal
-	: IDL_INTEGER_LITERAL
-	{
-	  $$ = idl_global->gen()->create_expr($1);
-	}
-	| IDL_STRING_LITERAL
-	{
-	  $$ = idl_global->gen()->create_expr($1);
-	}
-	| IDL_CHARACTER_LITERAL
-	{
-	  $$ = idl_global->gen()->create_expr($1);
-	}
-	| IDL_FLOATING_PT_LITERAL
-	{
-	  $$ = idl_global->gen()->create_expr($1);
-	}
-	| IDL_TRUETOK
-	{
-	  $$ = idl_global->gen()->create_expr((idl_bool) I_TRUE,
-					    AST_Expression::EV_bool);
-	}
-	| IDL_FALSETOK
-	{
-	  $$ = idl_global->gen()->create_expr((idl_bool) I_FALSE,
-					    AST_Expression::EV_bool);
-	}
-	;
-
-positive_int_expr :
-	const_expr
-	{
-	    $1->evaluate(AST_Expression::EK_const);
-	    $$ = idl_global->gen()->create_expr($1, AST_Expression::EV_ulong);
-	}
-	;
-
-type_dcl
-	: IDL_TYPEDEF
-	  {
-	    idl_global->set_parse_state(IDL_GlobalData::PS_TypedefSeen);
-	  }
-	  type_declarator {$$ = 0;}
-	| struct_type { $$ = 0;}
-	| union_type  { $$ = 0;}
-	| enum_type   { $$ = 0;}
-	;
-
-type_declarator :
-	type_spec
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_TypeSpecSeen);
-        }
-	at_least_one_declarator
-	{
-	  UTL_Scope		*s = idl_global->scopes()->top_non_null();
-	  UTL_DecllistActiveIterator *l;
-	  FE_Declarator		*d = NULL;
-	  AST_Typedef		*t = NULL;
-	  AST_Decl		*v = NULL;
-	  UTL_StrList		*p = idl_global->pragmas();
-
-      ACE_UNUSED_ARG (v);
-
-	  idl_global->set_parse_state(IDL_GlobalData::PS_DeclaratorsSeen);
-	  /*
-	   * Create a list of type renamings. Add them to the
-	   * enclosing scope
-	   */
-	  if (s != NULL && $1 != NULL && $3 != NULL) {
-	    l = new UTL_DecllistActiveIterator($3);
-	    for (;!(l->is_done()); l->next()) {
-	      d = l->item();
-	      if (d == NULL)
-		      continue;
-          AST_Type * tp = d->compose($1);
-          if (tp == NULL)
-		     continue;
-	      t = idl_global->gen()->create_typedef(tp, d->name(), p);
-	      (void) s->fe_add_typedef(t);
-	    }
-	    delete l;
-	  }
-	}
-	;
-
-type_spec
-	: simple_type_spec
-	| constructed_type_spec
-	;
-
-simple_type_spec
-	: base_type_spec
-	{
-	  $$ = idl_global->scopes()->bottom()->lookup_primitive_type($1);
-	}
-	| template_type_spec
-	| scoped_name
-	{
-	  UTL_Scope	*s = idl_global->scopes()->top_non_null();
-	  AST_Decl	*d = NULL;
-
-	  if (s != NULL)
-	    d = s->lookup_by_name($1, I_TRUE);
-	  if (d == NULL)
-	    idl_global->err()->lookup_error($1);
-	  $$ = d;
-	}
-	;
-
-base_type_spec
-	: integer_type
-	| floating_pt_type
-	| char_type
-	| boolean_type
-	| octet_type
-	| any_type
-	;
-
-template_type_spec
-	: sequence_type_spec
-	| string_type_spec
-	| wstring_type_spec
-	;
-
-constructed_type_spec
-	: struct_type
-	| union_type
-	| enum_type
-	;
-
-at_least_one_declarator :
-	declarator declarators
-	{
-	  $$ = new UTL_DeclList($1, $2);
-	}
-	;
-
-declarators
-	: declarators
-	  ','
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_DeclsCommaSeen);
-        }
-	  declarator
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_DeclsDeclSeen);
-
-	  if ($1 == NULL)
-	    $$ = new UTL_DeclList($4, NULL);
-	  else {
-	    $1->nconc(new UTL_DeclList($4, NULL));
-	    $$ = $1;
-	  }
-	}
-	| /* EMPTY */
-	{
-	  $$ = NULL;
-	}
-	;
-
-declarator
-	: simple_declarator
-	| complex_declarator
-	;
-
-at_least_one_simple_declarator :
-	simple_declarator simple_declarators
-	{
-	  $$ = new UTL_DeclList($1, $2);
-	}
-	;
-
-simple_declarators
-	: simple_declarators
-	  ','
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_DeclsCommaSeen);
-        }
-	  simple_declarator
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_DeclsDeclSeen);
-
-	  if ($1 == NULL)
-	    $$ = new UTL_DeclList($4, NULL);
-	  else {
-	    $1->nconc(new UTL_DeclList($4, NULL));
-	    $$ = $1;
-	  }
-	}
-	| /* EMPTY */
-	{
-	  $$ = NULL;
-	}
-	;
-
-simple_declarator :
-	id
-	{
-	  $$ = new FE_Declarator(new UTL_ScopedName($1, NULL),
-				 FE_Declarator::FD_simple, NULL);
-	}
-	;
-
-complex_declarator :
-	array_declarator
-	{
-	  $$ = new FE_Declarator(new UTL_ScopedName($1->local_name(), NULL),
-				 FE_Declarator::FD_complex,
-				 $1);
-	}
-	;
-
-integer_type
-	: signed_int
-	| unsigned_int
-	;
-
-signed_int
-	: IDL_LONG
-	{
-	  $$ = AST_Expression::EV_long;
-	}
-	| IDL_LONG IDL_LONG
-	{
-	  $$ = AST_Expression::EV_longlong;
-        }
-	| IDL_SHORT
-	{
-	  $$ = AST_Expression::EV_short;
-	}
-	;
-
-unsigned_int
-	: IDL_UNSIGNED IDL_LONG
-	{
-	  $$ = AST_Expression::EV_ulong;
-	}
-	| IDL_UNSIGNED IDL_LONG IDL_LONG
-	{
-	  $$ = AST_Expression::EV_ulonglong;
-        }
-	| IDL_UNSIGNED IDL_SHORT
-	{
-	  $$ = AST_Expression::EV_ushort;
-	}
-	;
-
-floating_pt_type
-	: IDL_DOUBLE
-	{
-	  $$ = AST_Expression::EV_double;
-	}
-	| IDL_FLOAT
-	{
-	  $$ = AST_Expression::EV_float;
-	}
-	| IDL_LONG IDL_DOUBLE
-	{
-	  $$ = AST_Expression::EV_longdouble;
-        }
-	;
-
-char_type
-	: IDL_CHAR
-	{
-	  $$ = AST_Expression::EV_char;
-	}
-	| IDL_WCHAR
-	{
-	  $$ = AST_Expression::EV_wchar;
-        }
-	;
-
-octet_type
-	: IDL_OCTET
-	{
-          $$ = AST_Expression::EV_octet;
-	}
-	;
-
-boolean_type
-	: IDL_BOOLEAN
-	{
-	  $$ = AST_Expression::EV_bool;
-        }
-	;
-
-any_type
-	: IDL_ANY
-	{
-	  $$ = AST_Expression::EV_any;
-	}
-	;
-
-struct_type :
-	IDL_STRUCT
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_StructSeen);
-        }
-	id
-	{
-	  UTL_Scope		*s = idl_global->scopes()->top_non_null();
-	  UTL_ScopedName	*n = new UTL_ScopedName($3, NULL);
-	  AST_Structure		*d = NULL;
-	  UTL_StrList		*p = idl_global->pragmas();
-	  AST_Decl		*v = NULL;
-
-          ACE_UNUSED_ARG (v);
-
-	  idl_global->set_parse_state(IDL_GlobalData::PS_StructIDSeen);
-	  /*
-	   * Create a node representing a struct declaration. Add it
-	   * to the enclosing scope
-	   */
-	  if (s != NULL) {
-	    d = idl_global->gen()->create_structure(n, p);
-	    (void) s->fe_add_structure(d);
-	  }
-	  /*
-	   * Push the scope of the struct on the scopes stack
-	   */
-	  idl_global->scopes()->push(d);
-	}
-	'{'
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_StructSqSeen);
-        }
-	at_least_one_member
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_StructBodySeen);
-        }
-	'}'
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_StructQsSeen);
-	  /*
-	   * Done with this struct. Pop its scope off the scopes stack
-	   */
-	  if (idl_global->scopes()->top() == NULL)
-	    $$ = NULL;
-	  else {
-	    $$ =
-	      AST_Structure::narrow_from_scope(
-				   idl_global->scopes()->top_non_null());
-	    idl_global->scopes()->pop();
-	  }
-	}
-	;
-
-at_least_one_member : member members ;
-
-members
-	: members member
-	| /* EMPTY */
-	;
-
-member	:
-	type_spec
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_MemberTypeSeen);
-        }
-	at_least_one_declarator
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_MemberDeclsSeen);
-        }
-	';'
-	{
-	  UTL_Scope		*s = idl_global->scopes()->top_non_null();
-	  UTL_DecllistActiveIterator *l = NULL;
-	  FE_Declarator		*d = NULL;
-	  AST_Field		*f = NULL;
-	  UTL_StrList		*p = idl_global->pragmas();
-
-	  idl_global->set_parse_state(IDL_GlobalData::PS_MemberDeclsCompleted);
-	  /*
-	   * Check for illegal recursive use of type
-	   */
-	  if ($1 != NULL && AST_illegal_recursive_type($1))
-	    idl_global->err()->error1(UTL_Error::EIDL_RECURSIVE_TYPE, $1);
-	  /*
-	   * Create a node representing a struct or exception member
-	   * Add it to the enclosing scope
-	   */
-	  else if (s != NULL && $1 != NULL && $3 != NULL) {
-	    l = new UTL_DecllistActiveIterator($3);
-	    for (;!(l->is_done()); l->next()) {
-	      d = l->item();
-	      if (d == NULL)
-		continue;
- 	      AST_Type *tp = d->compose($1);
-	      if (tp == NULL)
-		continue;
-	      f = idl_global->gen()->create_field(tp, d->name(), p);
-	      (void) s->fe_add_field(f);
-	    }
-	    delete l;
-	  }
-	}
-	| error
-	{
-	  idl_global->err()->syntax_error(idl_global->parse_state());
-	}
-	';'
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_NoState);
-	  yyerrok;
-	}
-	;
-
-union_type :
-	IDL_UNION
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_UnionSeen);
-        }
-	id
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_UnionIDSeen);
-        }
-	IDL_SWITCH
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_SwitchSeen);
-        }
-	'('
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_SwitchOpenParSeen);
-        }
-	switch_type_spec
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_SwitchTypeSeen);
-        }
-	')'
-	{
-	  UTL_Scope		*s = idl_global->scopes()->top_non_null();
-	  UTL_ScopedName	*n = new UTL_ScopedName($3, NULL);
-	  AST_Union		*u = NULL;
-	  AST_Decl		*v = NULL;
-	  UTL_StrList		*p = idl_global->pragmas();
-
-          ACE_UNUSED_ARG (v);
-
-	  idl_global->set_parse_state(IDL_GlobalData::PS_SwitchCloseParSeen);
-	  /*
-	   * Create a node representing a union. Add it to its enclosing
-	   * scope
-	   */
-	  if ($9 != NULL && s != NULL) {
- 	    AST_ConcreteType    *tp = AST_ConcreteType::narrow_from_decl($9);
-            if (tp == NULL) {
-              idl_global->err()->not_a_type($9);
-            } else {
-	      u = idl_global->gen()->create_union(tp, n, p);
-	      (void) s->fe_add_union(u);
- 	    }
-	  }
-	  /*
-	   * Push the scope of the union on the scopes stack
-	   */
-	  idl_global->scopes()->push(u);
-	}
-	'{'
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_UnionSqSeen);
-        }
-	at_least_one_case_branch
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_UnionBodySeen);
-        }
-	'}'
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_UnionQsSeen);
-	  /*
-	   * Done with this union. Pop its scope from the scopes stack
-	   */
-	  if (idl_global->scopes()->top() == NULL)
-	    $$ = NULL;
-	  else {
-	    $$ =
-	      AST_Union::narrow_from_scope(
-				idl_global->scopes()->top_non_null());
-	    idl_global->scopes()->pop();
-	  }
-	}
-	;
-
-switch_type_spec :
-	integer_type
-	{
-	  $$ = idl_global->scopes()->bottom()->lookup_primitive_type($1);
-	}
-	| char_type
-	{
-	  $$ = idl_global->scopes()->bottom()->lookup_primitive_type($1);
-	}
-	| octet_type
-	{
-	  $$ = idl_global->scopes()->bottom()->lookup_primitive_type($1);
-	}
-	| boolean_type
-	{
-	  $$ = idl_global->scopes()->bottom()->lookup_primitive_type($1);
-	}
-	| enum_type
-	| scoped_name
-	{
-	  UTL_Scope		*s = idl_global->scopes()->top_non_null();
-	  AST_Decl		*d = NULL;
-	  AST_PredefinedType	*p = NULL;
-	  AST_Typedef		*t = NULL;
-	  long			found = I_FALSE;
-
-	  /*
-	   * The discriminator is a scoped name. Try to resolve to
-	   * one of the scalar types or to an enum. Thread through
-	   * typedef's to arrive at the base type at the end of the
-	   * chain
-	   */
-	  if (s != NULL && (d = s->lookup_by_name($1, I_TRUE)) != NULL) {
-	    while (!found) {
-	      switch (d->node_type()) {
-	      case AST_Decl::NT_enum:
-		$$ = d;
-		found = I_TRUE;
-		break;
-	      case AST_Decl::NT_pre_defined:
-		p = AST_PredefinedType::narrow_from_decl(d);
-		if (p != NULL) {
-		  switch (p->pt()) {
-		  case AST_PredefinedType::PT_long:
-		  case AST_PredefinedType::PT_ulong:
-		  case AST_PredefinedType::PT_longlong:
-		  case AST_PredefinedType::PT_ulonglong:
-		  case AST_PredefinedType::PT_short:
-		  case AST_PredefinedType::PT_char:
-		  case AST_PredefinedType::PT_wchar:
-		  case AST_PredefinedType::PT_octet:
-		  case AST_PredefinedType::PT_boolean:
-		    $$ = p;
-		    found = I_TRUE;
-		    break;
-		  default:
-		    $$ = NULL;
-		    found = I_TRUE;
-		    break;
-		  }
-		}
-		break;
-	      case AST_Decl::NT_typedef:
-		t = AST_Typedef::narrow_from_decl(d);
-		if (t != NULL) d = t->base_type();
-		break;
-	      default:
-		$$ = NULL;
-		found = I_TRUE;
-		break;
-	      }
-	    }
-	  } else
-	    $$ = NULL;
-
-	  if ($$ == NULL)
-	    idl_global->err()->lookup_error($1);
-	}
-	;
-
-at_least_one_case_branch : case_branch case_branches ;
-
-case_branches
-	: case_branches case_branch
-	| /* empty */
-	;
-
-case_branch :
-	at_least_one_case_label
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_UnionLabelSeen);
-        }
-	element_spec
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_UnionElemSeen);
-        }
-	';'
-	{
-	  UTL_Scope		*s = idl_global->scopes()->top_non_null();
-	  UTL_LabellistActiveIterator *l = NULL;
-	  AST_UnionLabel	*d = NULL;
-	  AST_UnionBranch	*b = NULL;
-	  AST_Field		*f = $3;
-
-	  idl_global->set_parse_state(IDL_GlobalData::PS_UnionElemCompleted);
-	  /*
-	   * Create several nodes representing branches of a union.
-	   * Add them to the enclosing scope (the union scope)
-	   */
-	  if (s != NULL && $1 != NULL && $3 != NULL) {
-	    l = new UTL_LabellistActiveIterator($1);
-	    for (;!(l->is_done()); l->next()) {
-	      d = l->item();
-	      if (d == NULL)
-		continue;
-	      b = idl_global->gen()->create_union_branch(d,
-						      f->field_type(),
-						      f->name(),
-						      f->pragmas());
-	      (void) s->fe_add_union_branch(b);
-	    }
-	    delete l;
-	  }
-	}
-	| error
-	{
-	  idl_global->err()->syntax_error(idl_global->parse_state());
-	}
-	';'
-
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_NoState);
-	  yyerrok;
-	}
-	;
-
-at_least_one_case_label :
-	case_label case_labels
-	{
-	  $$ = new UTL_LabelList($1, $2);
-	}
-	;
-
-case_labels
-	: case_labels case_label
-	{
-	  if ($1 == NULL)
-	    $$ = new UTL_LabelList($2, NULL);
-	  else {
-	    $1->nconc(new UTL_LabelList($2, NULL));
-	    $$ = $1;
-	  }
-	}
-	| /* EMPTY */
-	{
-	  $$ = NULL;
-	}
-	;
-
-case_label
-	: IDL_DEFAULT
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_DefaultSeen);
-        }
-	  ':'
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_LabelColonSeen);
-
-	  $$ = idl_global->gen()->
-	            create_union_label(AST_UnionLabel::UL_default,
-				       NULL);
-	}
-	| IDL_CASE
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_CaseSeen);
-        }
-	  const_expr
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_LabelExprSeen);
-        }
-	':'
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_LabelColonSeen);
-
-	  $$ = idl_global->gen()->create_union_label(AST_UnionLabel::UL_label,
-						     $3);
-	}
-	;
-
-element_spec :
-	type_spec
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_UnionElemTypeSeen);
-        }
-	declarator
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_UnionElemDeclSeen);
-	  /*
-	   * Check for illegal recursive use of type
-	   */
-	  if ($1 != NULL && AST_illegal_recursive_type($1))
-	    idl_global->err()->error1(UTL_Error::EIDL_RECURSIVE_TYPE, $1);
-	  /*
-	   * Create a field in a union branch
-	   */
-	  else if ($1 == NULL || $3 == NULL)
-	    $$ = NULL;
-	  else {
-	    AST_Type *tp = $3->compose($1);
-	    if (tp == NULL)
-	      $$ = NULL;
- 	    else
-	      $$ = idl_global->gen()->create_field(tp,
-			        		   $3->name(),
-			        		   idl_global->pragmas());
-	  }
-	}
-	;
-
-enum_type :
-	IDL_ENUM
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_EnumSeen);
-        }
-	id
-	{
-	  UTL_Scope		*s = idl_global->scopes()->top_non_null();
-	  UTL_ScopedName	*n = new UTL_ScopedName($3, NULL);
-	  AST_Enum		*e = NULL;
-	  AST_Decl		*v = NULL;
-	  UTL_StrList		*p = idl_global->pragmas();
-
-          ACE_UNUSED_ARG (v);
-
-	  idl_global->set_parse_state(IDL_GlobalData::PS_EnumIDSeen);
-	  /*
-	   * Create a node representing an enum and add it to its
-	   * enclosing scope
-	   */
-	  if (s != NULL) {
-	    e = idl_global->gen()->create_enum(n, p);
-	    /*
-	     * Add it to its defining scope
-	     */
-	    (void) s->fe_add_enum(e);
-	  }
-	  /*
-	   * Push the enum scope on the scopes stack
-	   */
-	  idl_global->scopes()->push(e);
-	}
-	'{'
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_EnumSqSeen);
-        }
-	at_least_one_enumerator
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_EnumBodySeen);
-        }
-	'}'
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_EnumQsSeen);
-	  /*
-	   * Done with this enum. Pop its scope from the scopes stack
-	   */
-	  if (idl_global->scopes()->top() == NULL)
-	    $$ = NULL;
-	  else {
-	    $$ = AST_Enum::narrow_from_scope(idl_global->scopes()->top_non_null());
-	    idl_global->scopes()->pop();
-	  }
-	}
-	;
-
-at_least_one_enumerator : enumerator enumerators ;
-
-enumerators
-	: enumerators
-	  ','
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_EnumCommaSeen);
-        }
-	  enumerator
-	| /* EMPTY */
-	;
-
-enumerator :
-	IDENTIFIER
-	{
-	  UTL_Scope		*s = idl_global->scopes()->top_non_null();
-	  UTL_ScopedName	*n =
-		new UTL_ScopedName(new Identifier($1, 1, 0, I_FALSE), NULL);
-	  AST_EnumVal		*e = NULL;
-	  AST_Enum		*c = NULL;
-	  UTL_StrList		*p = idl_global->pragmas();
-
-	  /*
-	   * Create a node representing one enumerator in an enum
-	   * Add it to the enclosing scope (the enum scope)
-	   */
-	  if (s != NULL && s->scope_node_type() == AST_Decl::NT_enum) {
-	    c = AST_Enum::narrow_from_scope(s);
-	    if (c != NULL)
-	      e = idl_global->gen()->create_enum_val(c->next_enum_val(), n, p);
-	    (void) s->fe_add_enum_val(e);
-	  }
-	}
-	;
-
-sequence_type_spec
-        : seq_head
-	  ','
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_SequenceCommaSeen);
-        }
-	positive_int_expr
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_SequenceExprSeen);
-        }
-	  '>'
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_SequenceQsSeen);
-	  /*
-	   * Remove sequence marker from scopes stack
-	   */
-	  if (idl_global->scopes()->top() == NULL)
-	    idl_global->scopes()->pop();
-	  /*
-	   * Create a node representing a sequence
-	   */
-	  if ($4 == NULL || $4->coerce(AST_Expression::EV_ulong) == NULL) {
-	    idl_global->err()->coercion_error($4, AST_Expression::EV_ulong);
-	    $$ = NULL;
-	  } else if ($1 == NULL) {
-	    $$ = NULL;
-	  } else {
- 	    AST_Type *tp = AST_Type::narrow_from_decl($1);
-	    if (tp == NULL)
-	      $$ = NULL;
-	    else {
-	      $$ = idl_global->gen()->create_sequence($4, tp);
-	      /*
-	       * Add this AST_Sequence to the types defined in the global scope
-	       */
-	      (void) idl_global->root()
-		        ->fe_add_sequence(AST_Sequence::narrow_from_decl($$));
- 	    }
-	  }
-	}
-	| seq_head
-	  '>'
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_SequenceQsSeen);
-	  /*
-	   * Remove sequence marker from scopes stack
-	   */
-	  if (idl_global->scopes()->top() == NULL)
-	    idl_global->scopes()->pop();
-	  /*
-	   * Create a node representing a sequence
-	   */
-	  if ($1 == NULL)
-	    $$ = NULL;
-	  else {
-	    AST_Type *tp = AST_Type::narrow_from_decl($1);
-	    if (tp == NULL)
-	      $$ = NULL;
-            else {
-	      $$ =
-	        idl_global->gen()->create_sequence(
-		  	     idl_global->gen()->create_expr((unsigned long) 0),
-			     tp);
-	      /*
-	       * Add this AST_Sequence to the types defined in the global scope
-	       */
-	      (void) idl_global->root()
-		        ->fe_add_sequence(AST_Sequence::narrow_from_decl($$));
-	    }
-	  }
-	}
-	;
-
-seq_head:
-	IDL_SEQUENCE
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_SequenceSeen);
-	  /*
-	   * Push a sequence marker on scopes stack
-	   */
-	  idl_global->scopes()->push(NULL);
-	}
-	'<'
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_SequenceSqSeen);
-        }
-	simple_type_spec
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_SequenceTypeSeen);
-	  $$ = $5;
-        }
-	;
-
-string_type_spec
-	: string_head
-	  '<'
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_StringSqSeen);
-        }
-	positive_int_expr
-	{
-	   idl_global->set_parse_state(IDL_GlobalData::PS_StringExprSeen);
-        }
-	'>'
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_StringQsSeen);
-	  /*
-	   * Create a node representing a string
-	   */
-	  if ($4 == NULL || $4->coerce(AST_Expression::EV_ulong) == NULL) {
-	    idl_global->err()->coercion_error($4, AST_Expression::EV_ulong);
-	    $$ = NULL;
-	  } else {
-	    $$ = idl_global->gen()->create_string($4);
-	    /*
-	     * Add this AST_String to the types defined in the global scope
-	     */
-	    (void) idl_global->root()
-		      ->fe_add_string(AST_String::narrow_from_decl($$));
-	  }
-	}
-	| string_head
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_StringCompleted);
-	  /*
-	   * Create a node representing a string
-	   */
-	  $$ =
-	    idl_global->gen()->create_string(
-			 idl_global->gen()->create_expr((unsigned long) 0));
-	  /*
-	   * Add this AST_String to the types defined in the global scope
-	   */
-	  (void) idl_global->root()
-                    ->fe_add_string(AST_String::narrow_from_decl($$));
-	}
-	;
-
-string_head:
-	IDL_STRING
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_StringSeen);
-        }
-	;
-
-wstring_type_spec
-	: wstring_head
-	  '<'
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_StringSqSeen);
-        }
-	positive_int_expr
-	{
-	   idl_global->set_parse_state(IDL_GlobalData::PS_StringExprSeen);
-        }
-	'>'
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_StringQsSeen);
-	  /*
-	   * Create a node representing a string
-	   */
-	  if ($4 == NULL || $4->coerce(AST_Expression::EV_ulong) == NULL) {
-	    idl_global->err()->coercion_error($4, AST_Expression::EV_ulong);
-	    $$ = NULL;
-	  } else {
-	    $$ = idl_global->gen()->create_wstring($4);
-	    /*
-	     * Add this AST_String to the types defined in the global scope
-	     */
-	    (void) idl_global->root()
-		      ->fe_add_string(AST_String::narrow_from_decl($$));
-	  }
-	}
-	| wstring_head
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_StringCompleted);
-	  /*
-	   * Create a node representing a string
-	   */
-	  $$ =
-	    idl_global->gen()->create_wstring(
-			 idl_global->gen()->create_expr((unsigned long) 0));
-	  /*
-	   * Add this AST_String to the types defined in the global scope
-	   */
-	  (void) idl_global->root()
-                    ->fe_add_string(AST_String::narrow_from_decl($$));
-	}
-	;
-
-wstring_head:
-	IDL_WSTRING
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_StringSeen);
-        }
-	;
-
-array_declarator :
-	id
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_ArrayIDSeen);
-        }
-	at_least_one_array_dim
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_ArrayCompleted);
-	  /*
-	   * Create a node representing an array
-	   */
-	  if ($3 != NULL) {
-	     $$ = idl_global->gen()->create_array(new UTL_ScopedName($1, NULL),
-						  $3->length(), $3);
-	  }
-	}
-	;
-
-at_least_one_array_dim :
-	array_dim array_dims
-	{
-	  $$ = new UTL_ExprList($1, $2);
-	}
-	;
-
-array_dims
-	: array_dims array_dim
-	{
-	  if ($1 == NULL)
-	    $$ = new UTL_ExprList($2, NULL);
-	  else {
-	    $1->nconc(new UTL_ExprList($2, NULL));
-	    $$ = $1;
-	  }
-	}
-	| /* EMPTY */
-	{
-	  $$ = NULL;
-	}
-	;
-
-array_dim :
-	'['
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_DimSqSeen);
-        }
-	positive_int_expr
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_DimExprSeen);
-        }
-	']'
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_DimQsSeen);
-	  /*
-	   * Array dimensions are expressions which must be coerced to
-	   * positive integers
-	   */
-	  if ($3 == NULL || $3->coerce(AST_Expression::EV_ulong) == NULL) {
-	    idl_global->err()->coercion_error($3, AST_Expression::EV_ulong);
-	    $$ = NULL;
-	  } else
-	    $$ = $3;
-	}
-	;
-
-attribute:
-	opt_readonly
-	IDL_ATTRIBUTE
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_AttrSeen);
-        }
-	param_type_spec
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_AttrTypeSeen);
-        }
-	at_least_one_simple_declarator
-	{
-	  UTL_Scope		*s = idl_global->scopes()->top_non_null();
-	  UTL_DecllistActiveIterator *l = NULL;
-	  AST_Attribute		*a = NULL;
-	  FE_Declarator		*d = NULL;
-	  UTL_StrList		*p = idl_global->pragmas();
-
-	  idl_global->set_parse_state(IDL_GlobalData::PS_AttrCompleted);
-	  /*
-	   * Create nodes representing attributes and add them to the
-	   * enclosing scope
-	   */
-	  if (s != NULL && $4 != NULL && $6 != NULL) {
-	    l = new UTL_DecllistActiveIterator($6);
-	    for (;!(l->is_done()); l->next()) {
-	      d = l->item();
-	      if (d == NULL)
-		continue;
-	      AST_Type *tp = d->compose($4);
- 	      if (tp == NULL)
-	 	continue;
-	      a = idl_global->gen()->create_attribute($1, tp, d->name(), p);
-	      /*
-	       * Add one attribute to the enclosing scope
-	       */
-	      (void) s->fe_add_attribute(a);
-	    }
-	    delete l;
-	  }
-	}
-	;
-
-opt_readonly
-	: IDL_READONLY
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_AttrROSeen);
-	  $$ = I_TRUE;
-	}
-	| /* EMPTY */
-	{
-	  $$ = I_FALSE;
-	}
-	;
-
-exception :
-	IDL_EXCEPTION
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_ExceptSeen);
-	}
-	id
-	{
-	  UTL_Scope		*s = idl_global->scopes()->top_non_null();
-	  UTL_ScopedName	*n = new UTL_ScopedName($3, NULL);
-	  AST_Exception		*e = NULL;
-	  UTL_StrList		*p = idl_global->pragmas();
-	  AST_Decl		*v = NULL;
-
-          ACE_UNUSED_ARG (v);
-
-	  idl_global->set_parse_state(IDL_GlobalData::PS_ExceptIDSeen);
-	  /*
-	   * Create a node representing an exception and add it to
-	   * the enclosing scope
-	   */
-	  if (s != NULL) {
-	    e = idl_global->gen()->create_exception(n, p);
-	    (void) s->fe_add_exception(e);
-	  }
-	  /*
-	   * Push the exception scope on the scope stack
-	   */
-	  idl_global->scopes()->push(e);
-	}
-	'{'
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_ExceptSqSeen);
-        }
-	members
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_ExceptBodySeen);
-        }
-	'}'
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_ExceptQsSeen);
-	  /*
-	   * Done with this exception. Pop its scope from the scope stack
-	   */
-	  idl_global->scopes()->pop();
-	}
-	;
-
-operation :
-	opt_op_attribute
-	op_type_spec
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_OpTypeSeen);
-        }
-	IDENTIFIER
-	{
-	  UTL_Scope		*s = idl_global->scopes()->top_non_null();
-	  UTL_ScopedName	*n =
-		new UTL_ScopedName(new Identifier($4, 1, 0, I_FALSE), NULL);
-	  AST_Operation		*o = NULL;
-	  UTL_StrList		*p = idl_global->pragmas();
-
-	  idl_global->set_parse_state(IDL_GlobalData::PS_OpIDSeen);
-	  /*
-	   * Create a node representing an operation on an interface
-	   * and add it to its enclosing scope
-	   */
-	  if (s != NULL && $2 != NULL) {
-	    AST_Type *tp = AST_Type::narrow_from_decl($2);
-            if (tp == NULL) {
-              idl_global->err()->not_a_type($2);
-            } else if (tp->node_type() == AST_Decl::NT_except) {
-              idl_global->err()->not_a_type($2);
-            } else {
-	      o = idl_global->gen()->create_operation(tp, $1, n, p);
-	      (void) s->fe_add_operation(o);
-	    }
-	  }
-	  /*
-	   * Push the operation scope onto the scopes stack
-	   */
-	  idl_global->scopes()->push(o);
-	}
-	parameter_list
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_OpParsCompleted);
-        }
-	opt_raises
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_OpRaiseCompleted);
-        }
-	opt_context
-	{
-	  UTL_Scope		*s = idl_global->scopes()->top_non_null();
-	  AST_Operation		*o = NULL;
-
-	  idl_global->set_parse_state(IDL_GlobalData::PS_OpCompleted);
-	  /*
-	   * Add exceptions and context to the operation
-	   */
-	  if (s != NULL && s->scope_node_type() == AST_Decl::NT_op) {
-	    o = AST_Operation::narrow_from_scope(s);
-
-	    if ($8 != NULL && o != NULL)
-	      (void) o->fe_add_exceptions($8);
-	    if ($10 != NULL)
-	      (void) o->fe_add_context($10);
-	  }
-	  /*
-	   * Done with this operation. Pop its scope from the scopes stack
-	   */
-	  idl_global->scopes()->pop();
-	}
-	;
-
-opt_op_attribute
-	: IDL_ONEWAY
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_OpAttrSeen);
-	  $$ = AST_Operation::OP_oneway;
-	}
-	| IDL_IDEMPOTENT
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_OpAttrSeen);
-	  $$ = AST_Operation::OP_idempotent;
-	}
-	| /* EMPTY */
-	{
-	  $$ = AST_Operation::OP_noflags;
-	}
-	;
-
-op_type_spec
-	: param_type_spec
-	| IDL_VOID
-	{
-	  $$ =
-	    idl_global->scopes()->bottom()
-	       ->lookup_primitive_type(AST_Expression::EV_void);
-	}
-	;
-
-parameter_list
-	: '('
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_OpSqSeen);
-        }
-	  ')'
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_OpQsSeen);
-        }
-	| '('
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_OpSqSeen);
-        }
-	  at_least_one_parameter
-	  ')'
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_OpQsSeen);
-        }
-	;
-
-at_least_one_parameter : parameter parameters ;
-
-parameters
-	: parameters
-	  ','
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_OpParCommaSeen);
-        }
-	  parameter
-	| /* EMPTY */
-	;
-
-parameter :
-	direction
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_OpParDirSeen);
-        }
-	param_type_spec
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_OpParTypeSeen);
-        }
-	declarator
-	{
-	  UTL_Scope		*s = idl_global->scopes()->top_non_null();
-	  AST_Argument		*a = NULL;
-	  UTL_StrList		*p = idl_global->pragmas();
-
-	  idl_global->set_parse_state(IDL_GlobalData::PS_OpParDeclSeen);
-	  /*
-	   * Create a node representing an argument to an operation
-	   * Add it to the enclosing scope (the operation scope)
-	   */
-	  if ($3 != NULL && $5 != NULL && s != NULL) {
-	    AST_Type *tp = $5->compose($3);
-	    if (tp != NULL) {
-	      a = idl_global->gen()->create_argument($1, tp, $5->name(), p);
-	      (void) s->fe_add_argument(a);
-	    }
-	  }
-	}
-	;
-
-param_type_spec
-        : base_type_spec
-	{
-	  $$ = idl_global->scopes()->bottom()->lookup_primitive_type($1);
-	}
-        | string_type_spec
-        | scoped_name
-	{
-	  UTL_Scope	*s = idl_global->scopes()->top_non_null();
-	  AST_Decl	*d = NULL;
-
-	  if (s != NULL)
-	    d = s->lookup_by_name($1, I_TRUE);
-	  if (d == NULL)
-	    idl_global->err()->lookup_error($1);
-	  $$ = d;
-	}
-	;
-
-direction
-	: IDL_IN
-	{
-	  $$ = AST_Argument::dir_IN;
-	}
-	| IDL_OUT
-	{
-	  $$ = AST_Argument::dir_OUT;
-	}
-	| IDL_INOUT
-	{
-	  $$ = AST_Argument::dir_INOUT;
-	}
-	;
-
-opt_raises
-	: IDL_RAISES
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_OpRaiseSeen);
-        }
-	  '('
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_OpRaiseSqSeen);
-        }
-	  at_least_one_scoped_name
-	  ')'
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_OpRaiseQsSeen);
-	  $$ = $5;
-	}
-	| /* EMPTY */
-	{
-	  $$ = NULL;
-	}
-	;
-
-opt_context
-	: IDL_CONTEXT
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_OpContextSeen);
-        }
-	  '('
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_OpContextSqSeen);
-        }
-	  at_least_one_string_literal
-	  ')'
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_OpContextQsSeen);
-	  $$ = $5;
-	}
-	| /* EMPTY */
-	{
-	  $$ = NULL;
-	}
-	;
-
-at_least_one_string_literal :
-	IDL_STRING_LITERAL string_literals
-	{
-	  $$ = new UTL_StrList($1, $2);
-	}
-	;
-
-string_literals
-	: string_literals
-	  ','
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_OpContextCommaSeen);
-        }
-	  IDL_STRING_LITERAL
-	{
-	  if ($1 == NULL)
-	    $$ = new UTL_StrList($4, NULL);
-	  else {
-	    $1->nconc(new UTL_StrList($4, NULL));
-	    $$ = $1;
-	  }
-	}
-	| /* EMPTY */
-	{
-	  $$ = NULL;
-	}
-	;
-
-%%
-/* programs */
-
-/*
- * ???
- */
-int
-yywrap()
-{
-  return 1;
-}
-
-/*
- * Report an error situation discovered in a production
- *
- * This does not do anything since we report all error situations through
- * idl_global->err() operations
- */
-void
-yyerror(char *)
-{
-}
diff --git a/TAO/TAO_IDL/fe/lex.yy.cpp b/TAO/TAO_IDL/fe/lex.yy.cpp
deleted file mode 100644
index ca89291620e..00000000000
--- a/TAO/TAO_IDL/fe/lex.yy.cpp
+++ /dev/null
@@ -1,2184 +0,0 @@
-/* A lexical scanner generated by flex */
-
-/* Scanner skeleton version:
- * $Header: /home/daffy/u0/vern/flex/flex-2.4.7/RCS/flex.skl,v 1.2 94/08/03 11:13:24 vern Exp $
- */
-
-#define FLEX_SCANNER
-
-#include /**/ <stdio.h>
-
-
-/* cfront 1.2 defines "c_plusplus" instead of "__cplusplus" */
-#ifdef c_plusplus
-#ifndef __cplusplus
-#define __cplusplus
-#endif
-#endif
-
-
-#ifdef __cplusplus
-
-#include /**/ <stdlib.h>
-#include /**/ <stdio.h>
-
-/* Use prototypes in function declarations. */
-#define YY_USE_PROTOS
-
-/* The "const" storage-class-modifier is valid. */
-#define YY_USE_CONST
-
-#else	/* ! __cplusplus */
-
-#ifdef __STDC__
-
-#define YY_USE_PROTOS
-#define YY_USE_CONST
-
-#endif	/* __STDC__ */
-#endif	/* ! __cplusplus */
-
-
-#ifdef __TURBOC__
-#define YY_USE_CONST
-#endif
-
-
-#ifndef YY_USE_CONST
-#ifndef const
-#define const
-#endif
-#endif
-
-
-#ifdef YY_USE_PROTOS
-#define YY_PROTO(proto) proto
-#else
-#define YY_PROTO(proto) ()
-#endif
-
-/* Returned upon end-of-file. */
-#define YY_NULL 0
-
-/* Promotes a possibly negative, possibly signed char to an unsigned
- * integer for use as an array index.  If the signed char is negative,
- * we want to instead treat it as an 8-bit unsigned char, hence the
- * double cast.
- */
-#define YY_SC_TO_UI(c) ((unsigned int) (unsigned char) c)
-
-/* Enter a start condition.  This macro really ought to take a parameter,
- * but we do it the disgusting crufty way forced on us by the ()-less
- * definition of BEGIN.
- */
-#define BEGIN yy_start = 1 + 2 *
-
-/* Translate the current start state into a value that can be later handed
- * to BEGIN to return to the state.
- */
-#define YY_START ((yy_start - 1) / 2)
-
-/* Action number for EOF rule of a given start state. */
-#define YY_STATE_EOF(state) (YY_END_OF_BUFFER + state + 1)
-
-/* Special action meaning "start processing a new file".  Now included
- * only for backward compatibility with previous versions of flex.
- */
-#define YY_NEW_FILE yyrestart( yyin )
-
-#define YY_END_OF_BUFFER_CHAR 0
-
-/* Size of default input buffer. */
-#define YY_BUF_SIZE 16384
-
-typedef struct yy_buffer_state *YY_BUFFER_STATE;
-
-extern int yyleng;
-extern FILE *yyin, *yyout;
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-	extern int yywrap YY_PROTO(( void ));
-#ifdef __cplusplus
-	}
-#endif
-
-#define EOB_ACT_CONTINUE_SCAN 0
-#define EOB_ACT_END_OF_FILE 1
-#define EOB_ACT_LAST_MATCH 2
-
-/* The funky do-while in the following #define is used to turn the definition
- * int a single C statement (which needs a semi-colon terminator).  This
- * avoids problems with code like:
- *
- * 	if ( condition_holds )
- *		yyless( 5 );
- *	else
- *		do_something_else();
- *
- * Prior to using the do-while the compiler would get upset at the
- * "else" because it interpreted the "if" statement as being all
- * done when it reached the ';' after the yyless() call.
- */
-
-/* Return all but the first 'n' matched characters back to the input stream. */
-
-#define yyless(n) \
-	do \
-		{ \
-		/* Undo effects of setting up yytext. */ \
-		*yy_cp = yy_hold_char; \
-		yy_c_buf_p = yy_cp = yy_bp + n - YY_MORE_ADJ; \
-		YY_DO_BEFORE_ACTION; /* set up yytext again */ \
-		} \
-	while ( 0 )
-
-#define unput(c) yyunput( c, yytext_ptr )
-
-
-struct yy_buffer_state
-	{
-	FILE *yy_input_file;
-
-	char *yy_ch_buf;		/* input buffer */
-	char *yy_buf_pos;		/* current position in input buffer */
-
-	/* Size of input buffer in bytes, not including room for EOB
-	 * characters.
-	 */
-	int yy_buf_size;
-
-	/* Number of characters read into yy_ch_buf, not including EOB
-	 * characters.
-	 */
-	int yy_n_chars;
-
-	/* Whether this is an "interactive" input source; if so, and
-	 * if we're using stdio for input, then we want to use getc()
-	 * instead of fread(), to make sure we stop fetching input after
-	 * each newline.
-	 */
-	int yy_is_interactive;
-
-	/* Whether to try to fill the input buffer when we reach the
-	 * end of it.
-	 */
-	int yy_fill_buffer;
-
-	int yy_buffer_status;
-#define YY_BUFFER_NEW 0
-#define YY_BUFFER_NORMAL 1
-	/* When an EOF's been seen but there's still some text to process
-	 * then we mark the buffer as YY_EOF_PENDING, to indicate that we
-	 * shouldn't try reading from the input source any more.  We might
-	 * still have a bunch of tokens to match, though, because of
-	 * possible backing-up.
-	 *
-	 * When we actually see the EOF, we change the status to "new"
-	 * (via yyrestart()), so that the user can continue scanning by
-	 * just pointing yyin at a new input file.
-	 */
-#define YY_BUFFER_EOF_PENDING 2
-	};
-
-static YY_BUFFER_STATE yy_current_buffer = 0;
-
-/* We provide macros for accessing buffer states in case in the
- * future we want to put the buffer states in a more general
- * "scanner state".
- */
-#define YY_CURRENT_BUFFER yy_current_buffer
-
-
-/* yy_hold_char holds the character lost when yytext is formed. */
-static char yy_hold_char;
-
-static int yy_n_chars;		/* number of characters read into yy_ch_buf */
-
-
-int yyleng;
-
-/* Points to current character in buffer. */
-static char *yy_c_buf_p = (char *) 0;
-static int yy_init = 1;		/* whether we need to initialize */
-static int yy_start = 0;	/* start state number */
-
-/* Flag which is used to allow yywrap()'s to do buffer switches
- * instead of setting up a fresh yyin.  A bit of a hack ...
- */
-static int yy_did_buffer_switch_on_eof;
-
-static void yyunput YY_PROTO(( int c, char *buf_ptr ));
-void yyrestart YY_PROTO(( FILE *input_file ));
-void yy_switch_to_buffer YY_PROTO(( YY_BUFFER_STATE new_buffer ));
-void yy_load_buffer_state YY_PROTO(( void ));
-YY_BUFFER_STATE yy_create_buffer YY_PROTO(( FILE *file, int size ));
-void yy_delete_buffer YY_PROTO(( YY_BUFFER_STATE b ));
-void yy_init_buffer YY_PROTO(( YY_BUFFER_STATE b, FILE *file ));
-
-static int yy_start_stack_ptr = 0;
-static int yy_start_stack_depth = 0;
-static int *yy_start_stack = 0;
-static void yy_push_state YY_PROTO(( int new_state ));
-static void yy_pop_state YY_PROTO(( void ));
-static int yy_top_state YY_PROTO(( void ));
-
-static void *yy_flex_alloc YY_PROTO(( unsigned int ));
-static void *yy_flex_realloc YY_PROTO(( void *, unsigned int ));
-static void yy_flex_free YY_PROTO(( void * ));
-
-#define yy_new_buffer yy_create_buffer
-
-#define INITIAL 0
-typedef unsigned char YY_CHAR;
-typedef int yy_state_type;
-FILE *yyin = (FILE *) 0, *yyout = (FILE *) 0;
-extern char yytext[];
-
-
-#ifndef yytext_ptr
-static void yy_flex_strncpy YY_PROTO(( char *, const char *, int ));
-#endif
-
-#ifdef __cplusplus
-static int yyinput YY_PROTO(( void ));
-#else
-static int input YY_PROTO(( void ));
-#endif
-
-static yy_state_type yy_get_previous_state YY_PROTO(( void ));
-static yy_state_type yy_try_NUL_trans YY_PROTO(( yy_state_type current_state ));
-static int yy_get_next_buffer YY_PROTO(( void ));
-static void yy_fatal_error YY_PROTO(( const char msg[] ));
-
-/* Done after the current pattern has been matched and before the
- * corresponding action - sets up yytext.
- */
-#define YY_DO_BEFORE_ACTION \
-	yytext_ptr = yy_bp; \
-	yyleng = yy_cp - yy_bp; \
-	yy_hold_char = *yy_cp; \
-	*yy_cp = '\0'; \
-	if ( yyleng >= YYLMAX ) \
-		YY_FATAL_ERROR( "token too large, exceeds YYLMAX" ); \
-	yy_flex_strncpy( yytext, yytext_ptr, yyleng + 1 ); \
-	yy_c_buf_p = yy_cp;
-
-#define YY_END_OF_BUFFER 61
-static const short int yy_accept[278] =
-    {   0,
-       57,   57,   61,   59,   57,   58,   59,   59,   59,   59,
-       44,   42,   59,   59,   59,   39,   39,   39,   39,   39,
-       39,   39,   39,   39,   39,   39,   39,   39,   39,   39,
-       39,   39,   39,   39,   59,   57,    0,   45,    0,    0,
-       44,   42,   56,    0,   40,   44,    0,    0,    0,   42,
-       38,   36,   37,   39,   39,   39,   39,   39,   39,   39,
-       39,   39,   39,   39,   39,   39,   39,   33,   39,   39,
-       39,   39,   39,   39,   39,   39,   39,   39,   39,   39,
-       39,   39,   39,   39,    0,   53,    0,    0,    0,    0,
-        0,   46,    0,   46,    0,    0,   55,   40,    0,   40,
-
-        0,   41,   43,   39,   39,    1,   39,   39,   39,   39,
-       39,   39,   39,   39,   39,   39,   39,   39,   39,   39,
-       39,   39,   34,   39,   39,   39,   39,   39,   39,   39,
-       39,   39,   39,   39,   39,    0,    0,    0,    0,    0,
-       48,   47,    0,    0,   40,   41,   39,   30,   39,   39,
-       18,   25,   39,   39,   39,   39,   12,   39,   39,   39,
-       39,   22,   39,   39,   39,   39,   39,   39,   39,   39,
-       39,   39,   39,   39,   39,   29,   39,   39,    0,    0,
-        0,    0,    0,   47,    0,   31,   39,   39,    9,   39,
-       39,   39,   39,   20,   32,   39,   39,   28,   39,   39,
-
-       39,   39,   23,   39,   39,   39,   39,   16,   39,   39,
-       39,   51,    0,    0,    0,    0,   39,   39,   39,   39,
-       21,   39,   39,    2,   35,    3,   39,   39,   13,   11,
-       17,   39,   39,   39,   39,   50,    0,    0,    0,    0,
-        0,    0,   39,   27,    7,   19,   39,   39,   39,   39,
-       10,   39,   26,   39,    0,   54,    0,    0,    0,   39,
-       39,   39,    4,   15,   24,   39,    0,    0,    0,    5,
-        6,    8,   14,   52,    0,   49,    0
-    } ;
-
-static const int yy_ec[256] =
-    {   0,
-        1,    1,    1,    1,    1,    1,    1,    1,    2,    3,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    4,    1,    5,    6,    1,    1,    1,    7,    1,
-        1,    8,    9,    1,   10,   11,   12,   13,   14,   14,
-       14,   14,   14,   14,   14,   15,   15,   16,    1,   17,
-        1,   18,    1,    1,   19,   20,   20,   20,   21,   22,
-       23,   23,   23,   23,   23,   24,   23,   23,   23,   23,
-       23,   25,   26,   27,   28,   23,   23,   29,   23,   23,
-        1,   30,    1,    1,   31,    1,   32,   33,   34,   35,
-
-       36,   37,   38,   39,   40,   23,   23,   41,   42,   43,
-       44,   45,   46,   47,   48,   49,   50,   51,   52,   53,
-       54,   23,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1
-    } ;
-
-static const int yy_meta[55] =
-    {   0,
-        1,    1,    2,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    3,    3,    3,    1,    1,    1,    3,    3,
-        3,    3,    4,    4,    4,    4,    4,    4,    4,    1,
-        4,    3,    3,    3,    3,    3,    3,    4,    4,    4,
-        4,    4,    4,    4,    4,    4,    4,    4,    4,    4,
-        4,    4,    4,    4
-    } ;
-
-static const short int yy_base[288] =
-    {   0,
-        0,  439,  444,  446,   53,  446,  438,  412,   45,   53,
-       53,   58,  425,  423,  421,    0,  419,  412,   13,  392,
-       31,   40,   34,  394,  391,  389,  388,   47,   56,   44,
-      377,  387,  385,   51,  105,   96,  423,  446,  420,   88,
-      100,  111,  446,  423,  141,  128,  155,  170,    0,  160,
-      446,  446,  446,    0,  401,  396,  369,  373,  377,  372,
-      387,  375,  380,  366,  365,  380,  369,   42,  369,  376,
-      361,  373,  359,  367,  374,  359,  360,  356,  362,  356,
-       64,  360,  360,  349,  184,  446,  111,  189,  362,  356,
-      348,  446,  387,  386,  120,  389,  446,    0,  196,  446,
-
-      144,  199,    0,  365,  369,    0,  342,  347,  351,  339,
-       82,  353,  351,  341,  346,  349,  330,  343,  340,  327,
-      340,  323,    0,  326,  338,  322,  324,   88,  321,  333,
-      324,  327,  331,  333,  317,  358,  357,  325,  317,  327,
-      446,  446,  187,  202,  213,  446,  337,    0,  317,  320,
-        0,    0,  306,  318,  303,  311,    0,  306,  301,  300,
-      301,    0,  306,  297,  313,  308,  299,  306,  292,  297,
-      305,  304,  302,  293,  297,    0,  287,  293,  327,  157,
-      288,  294,  291,  446,  321,    0,  294,  294,    0,  272,
-      283,  287,  273,    0,    0,  284,  284,    0,  265,  270,
-
-      274,  273,    0,  277,  265,  274,  276,    0,  268,  279,
-      266,  446,  205,  259,  228,  265,  256,  262,  255,  254,
-        0,  262,  269,    0,    0,    0,  237,  238,    0,    0,
-        0,  220,  215,  199,  201,  446,  231,  235,  245,  251,
-      248,  201,  182,    0,    0,    0,  181,  188,  153,  159,
-        0,  155,    0,  158,  169,  446,  162,  146,  101,  112,
-      101,  104,    0,    0,    0,   88,  130,  120,  114,    0,
-        0,    0,    0,  446,  107,  446,  446,  266,  270,  272,
-      276,  280,   75,  284,  288,  292,  296
-    } ;
-
-static const short int yy_def[288] =
-    {   0,
-      277,    1,  277,  277,  277,  277,  278,  279,  277,  277,
-      277,  277,  277,  277,  277,  280,  280,  280,  280,  280,
-      280,  280,  280,  280,  280,  280,  280,  280,  280,  280,
-      280,  280,  280,  280,  277,  277,  278,  277,  277,  281,
-      277,  277,  277,  282,  277,  277,  277,  277,  283,  277,
-      277,  277,  277,  280,  280,  280,  280,  280,  280,  280,
-      280,  280,  280,  280,  280,  280,  280,  280,  280,  280,
-      280,  280,  280,  280,  280,  280,  280,  280,  280,  280,
-      280,  280,  280,  280,  277,  277,   35,  277,  277,  277,
-      277,  277,  277,  277,  277,  282,  277,   45,  277,  277,
-
-      277,  277,  283,  280,  280,  280,  280,  280,  280,  280,
-      280,  280,  280,  280,  280,  280,  280,  280,  280,  280,
-      280,  280,  280,  280,  280,  280,  280,  280,  280,  280,
-      280,  280,  280,  280,  280,  284,  277,  277,  277,  277,
-      277,  277,  277,  277,  277,  277,  280,  280,  280,  280,
-      280,  280,  280,  280,  280,  280,  280,  280,  280,  280,
-      280,  280,  280,  280,  280,  280,  280,  280,  280,  280,
-      280,  280,  280,  280,  280,  280,  280,  280,  284,  277,
-      277,  277,  277,  277,  277,  280,  280,  280,  280,  280,
-      280,  280,  280,  280,  280,  280,  280,  280,  280,  280,
-
-      280,  280,  280,  280,  280,  280,  280,  280,  280,  280,
-      280,  277,  277,  277,  277,  277,  280,  280,  280,  280,
-      280,  280,  280,  280,  280,  280,  280,  280,  280,  280,
-      280,  280,  280,  280,  280,  277,  277,  285,  277,  277,
-      277,  277,  280,  280,  280,  280,  280,  280,  280,  280,
-      280,  280,  280,  280,  285,  277,  286,  277,  277,  280,
-      280,  280,  280,  280,  280,  280,  286,  277,  287,  280,
-      280,  280,  280,  277,  287,  277,    0,  277,  277,  277,
-      277,  277,  277,  277,  277,  277,  277
-    } ;
-
-static const short int yy_nxt[501] =
-    {   0,
-        4,    5,    6,    5,    7,    4,    8,    4,    4,    9,
-        4,   10,   11,   12,   12,   13,   14,   15,   16,   16,
-       16,   17,   16,   16,   16,   16,   18,   16,   16,    4,
-        4,   19,   20,   21,   22,   23,   24,   16,   16,   25,
-       26,   27,   16,   28,   16,   16,   29,   30,   31,   32,
-       33,   34,   16,   16,   36,   57,   36,   41,   42,   42,
-       43,   58,   60,   45,   44,   46,   46,   47,   45,   61,
-       50,   50,   50,   48,   62,   63,   65,  103,   48,   76,
-       71,   49,   77,   64,   83,  117,   66,   74,   48,   72,
-      118,   75,   78,   48,   94,   79,   73,   36,   84,   36,
-
-       95,   95,  269,  131,  269,   49,   85,   86,   87,  276,
-       45,  132,   46,   46,   47,  136,  276,   88,   88,   88,
-       48,   45,  274,   50,   50,   50,  142,  170,   49,  153,
-      154,   48,  143,  143,  268,   48,  273,  171,   45,  272,
-       46,   46,   47,  271,   89,   90,   48,  270,   48,   91,
-      257,  277,   49,   98,   98,   98,  102,  102,  102,  212,
-      213,   99,  100,   48,  100,   45,  268,   47,   47,   47,
-       45,  256,   50,   50,   50,   48,   99,  100,  101,  101,
-       48,  100,  102,  102,  102,   85,   86,   87,  266,  265,
-       48,   86,  137,  184,  264,   48,   88,   88,   88,  185,
-
-      185,   88,   88,   88,  144,  144,  263,  236,  145,  145,
-      145,  102,  102,  102,  145,  145,  145,  237,  237,  237,
-      146,  262,  146,   89,  261,  145,  145,  145,   91,  239,
-      260,  240,  259,  236,  100,  146,  100,  256,  254,  146,
-      241,  241,  241,  237,  237,  237,  239,  253,  240,  100,
-      252,  258,  239,  100,  240,  257,  251,  241,  241,  241,
-      241,  241,  241,  241,  241,  241,   37,   37,   37,   37,
-       39,  250,   39,   39,   54,   54,   93,  249,   93,   93,
-       96,   96,   96,   96,  179,  179,  179,  179,  255,  255,
-      255,  255,  267,  267,  267,  267,  275,  275,  275,  275,
-
-      248,  247,  246,  245,  244,  243,  242,  238,  235,  234,
-      233,  232,  231,  230,  229,  228,  227,  226,  225,  224,
-      223,  222,  221,  220,  219,  218,  217,  184,  216,  215,
-      214,  180,  211,  210,  209,  208,  207,  206,  205,  204,
-      203,  202,  201,  200,  199,  198,  197,  196,  195,  194,
-      193,  192,  191,  190,  189,  188,  187,  186,  183,  182,
-      181,  136,  180,  178,  177,  176,  175,  174,  173,  172,
-      169,  168,  167,  166,  165,  164,  163,  162,  161,  160,
-      159,  158,  157,  156,  155,  152,  151,  150,  149,  148,
-      147,   97,  141,  141,  140,  139,  138,  135,  134,  133,
-
-      130,  129,  128,  127,  126,  125,  124,  123,  122,  121,
-      120,  119,  116,  115,  114,  113,  112,  111,  110,  109,
-      108,  107,  106,  105,  104,   97,   92,   38,   82,   81,
-       80,   70,   69,   68,   67,   59,   56,   55,   53,   52,
-       51,   40,   38,  277,   35,    3,  277,  277,  277,  277,
-      277,  277,  277,  277,  277,  277,  277,  277,  277,  277,
-      277,  277,  277,  277,  277,  277,  277,  277,  277,  277,
-      277,  277,  277,  277,  277,  277,  277,  277,  277,  277,
-      277,  277,  277,  277,  277,  277,  277,  277,  277,  277,
-      277,  277,  277,  277,  277,  277,  277,  277,  277,  277
-
-    } ;
-
-static const short int yy_chk[501] =
-    {   0,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    5,   19,    5,    9,    9,    9,
-       10,   19,   21,   11,   10,   11,   11,   11,   12,   21,
-       12,   12,   12,   11,   21,   22,   23,  283,   12,   30,
-       28,   11,   30,   22,   34,   68,   23,   29,   11,   28,
-       68,   29,   30,   12,   40,   30,   28,   36,   34,   36,
-
-       40,   40,  259,   81,  259,   11,   35,   35,   35,  275,
-       41,   81,   41,   41,   41,   87,  269,   35,   35,   35,
-       41,   42,  268,   42,   42,   42,   95,  128,   41,  111,
-      111,   42,   95,   95,  267,   41,  266,  128,   46,  262,
-       46,   46,   46,  261,   35,   35,   42,  260,   46,   35,
-      258,   87,   41,   45,   45,   45,  101,  101,  101,  180,
-      180,   45,   45,   46,   45,   47,  257,   47,   47,   47,
-       50,  255,   50,   50,   50,   47,   45,   45,   48,   48,
-       50,   45,   48,   48,   48,   85,   85,   85,  254,  252,
-       47,   88,   88,  143,  250,   50,   85,   85,   85,  143,
-
-      143,   88,   88,   88,   99,   99,  249,  213,   99,   99,
-       99,  102,  102,  102,  144,  144,  144,  213,  213,  213,
-      102,  248,  102,   85,  247,  145,  145,  145,   85,  215,
-      243,  215,  242,  237,  145,  102,  145,  238,  235,  102,
-      215,  215,  215,  237,  237,  237,  239,  234,  239,  145,
-      233,  241,  240,  145,  240,  240,  232,  239,  239,  239,
-      241,  241,  241,  240,  240,  240,  278,  278,  278,  278,
-      279,  228,  279,  279,  280,  280,  281,  227,  281,  281,
-      282,  282,  282,  282,  284,  284,  284,  284,  285,  285,
-      285,  285,  286,  286,  286,  286,  287,  287,  287,  287,
-
-      223,  222,  220,  219,  218,  217,  216,  214,  211,  210,
-      209,  207,  206,  205,  204,  202,  201,  200,  199,  197,
-      196,  193,  192,  191,  190,  188,  187,  185,  183,  182,
-      181,  179,  178,  177,  175,  174,  173,  172,  171,  170,
-      169,  168,  167,  166,  165,  164,  163,  161,  160,  159,
-      158,  156,  155,  154,  153,  150,  149,  147,  140,  139,
-      138,  137,  136,  135,  134,  133,  132,  131,  130,  129,
-      127,  126,  125,  124,  122,  121,  120,  119,  118,  117,
-      116,  115,  114,  113,  112,  110,  109,  108,  107,  105,
-      104,   96,   94,   93,   91,   90,   89,   84,   83,   82,
-
-       80,   79,   78,   77,   76,   75,   74,   73,   72,   71,
-       70,   69,   67,   66,   65,   64,   63,   62,   61,   60,
-       59,   58,   57,   56,   55,   44,   39,   37,   33,   32,
-       31,   27,   26,   25,   24,   20,   18,   17,   15,   14,
-       13,    8,    7,    3,    2,  277,  277,  277,  277,  277,
-      277,  277,  277,  277,  277,  277,  277,  277,  277,  277,
-      277,  277,  277,  277,  277,  277,  277,  277,  277,  277,
-      277,  277,  277,  277,  277,  277,  277,  277,  277,  277,
-      277,  277,  277,  277,  277,  277,  277,  277,  277,  277,
-      277,  277,  277,  277,  277,  277,  277,  277,  277,  277
-
-    } ;
-
-static yy_state_type yy_last_accepting_state;
-static char *yy_last_accepting_cpos;
-
-/* The intent behind this definition is that it'll catch
- * any uses of REJECT which flex missed.
- */
-#define REJECT reject_used_but_not_detected
-#define yymore() yymore_used_but_not_detected
-#define YY_MORE_ADJ 0
-#ifndef YYLMAX
-#define YYLMAX 8192
-#endif
-
-char yytext[YYLMAX];
-char *yytext_ptr;
-# line 1 "idl.ll"
-# line 3 "idl.ll"
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-IDL_INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-IDL_ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-IDL_INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-IDL_ANY OBLIGATION ON THE PART OF Sun OR IDL_ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IDL_IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR IDL_ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR IDL_ANY PATENTS BY
-IDL_INTERFACE DEFINITION LANGUAGE CFE OR IDL_ANY PART THEREOF.
-
-IDL_IN NO EVENT WILL SUN OR IDL_ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-IDL_ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.
-2550 Garcia Avenue
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-/*
- * idl.ll - Lexical scanner for IDL 1.1
- */
-
-#include "idl.h"
-#include "idl_extern.h"
-#include "fe_private.h"
-#include "y.tab.h"
-
-static char	idl_escape_reader(char *);
-static double	idl_atof(char *);
-static long	idl_atoi(char *, long);
-static void	idl_parse_line_and_file(char *);
-static void	idl_store_pragma(char *);
-
-#if 0 /* defined (HPUX) */
-// HPUX has yytext typed to unsigned char *. We make sure here that
-// we'll always use char * static char* __yytext = (char*) yytext;
-// NOTE: This will not work under flex(1) were yytext is not a fixed
-// buffer, but a dynamically allocated one. This function should do
-// the trick for us.
-inline char *__yytext()
-{
-  return (char *) yytext;
-}
-#define ace_yytext __yytext()
-#else
-#define ace_yytext yytext
-#endif /* 0 */
-
-/* Macros after this point can all be overridden by user definitions in
- * section 1.
- */
-
-#ifdef YY_MALLOC_DECL
-YY_MALLOC_DECL
-#else
-#if __STDC__
-#ifndef __cplusplus
-#include /**/ <stdlib.h>
-#endif
-#else
-/* Just try to get by without declaring the routines.  This will fail
- * miserably on non-ANSI systems for which sizeof(size_t) != sizeof(int)
- * or sizeof(void*) != sizeof(int).
- */
-#endif
-#endif
-
-/* Amount of stuff to slurp up with each read. */
-#ifndef YY_READ_BUF_SIZE
-#define YY_READ_BUF_SIZE 8192
-#endif
-
-/* Copy whatever the last rule matched to the standard output. */
-
-#ifndef TAO_ECHO
-/* This used to be an fputs(), but since the string might contain NUL's,
- * we now use fwrite().
- */
-#define TAO_ECHO (void) fwrite( yytext, yyleng, 1, yyout )
-#endif
-
-/* Gets input and stuffs it into "buf".  number of characters read, or YY_NULL,
- * is returned in "result".
- */
-#ifndef YY_INPUT
-#define YY_INPUT(buf,result,max_size) \
-	if ( yy_current_buffer->yy_is_interactive ) \
-		{ \
-		int c = getc( yyin ); \
-		result = c == EOF ? 0 : 1; \
-		buf[0] = (char) c; \
-		} \
-	else if ( ((result = fread( buf, 1, max_size, yyin )) == 0) \
-		  && ferror( yyin ) ) \
-		YY_FATAL_ERROR( "input in flex scanner failed" );
-#endif
-
-/* No semi-colon after return; correct usage is to write "yyterminate();" -
- * we don't want an extra ';' after the "return" because that will cause
- * some compilers to complain about unreachable statements.
- */
-#ifndef yyterminate
-#define yyterminate() return YY_NULL
-#endif
-
-/* Number of entries by which start-condition stack grows. */
-#ifndef YY_START_STACK_INCR
-#define YY_START_STACK_INCR 25
-#endif
-
-/* Report a fatal error. */
-#ifndef YY_FATAL_ERROR
-#define YY_FATAL_ERROR(msg) yy_fatal_error( msg )
-#endif
-
-/* Default declaration of generated scanner - a define so the user can
- * easily add parameters.
- */
-#ifndef YY_DECL
-#define YY_DECL int yylex YY_PROTO(( void ))
-#endif
-
-/* Code executed at the beginning of each rule, after yytext and yyleng
- * have been set up.
- */
-#ifndef YY_USER_ACTION
-#define YY_USER_ACTION
-#endif
-
-/* Code executed at the end of each rule. */
-#ifndef YY_BREAK
-#define YY_BREAK break;
-#endif
-
-YY_DECL
-	{
-	register yy_state_type yy_current_state;
-	register char *yy_cp, *yy_bp;
-	register int yy_act;
-
-# line 100 "idl.ll"
-
-
-
-	if ( yy_init )
-		{
-#ifdef YY_USER_INIT
-		YY_USER_INIT;
-#endif
-
-		if ( ! yy_start )
-			yy_start = 1;	/* first start state */
-
-		if ( ! yyin )
-			yyin = stdin;
-
-		if ( ! yyout )
-			yyout = stdout;
-
-		if ( yy_current_buffer )
-			yy_init_buffer( yy_current_buffer, yyin );
-		else
-			yy_current_buffer =
-				yy_create_buffer( yyin, YY_BUF_SIZE );
-
-		yy_load_buffer_state();
-
-		yy_init = 0;
-		}
-
-	while ( 1 )		/* loops until end-of-file is reached */
-		{
-		yy_cp = yy_c_buf_p;
-
-		/* Support of yytext. */
-		*yy_cp = yy_hold_char;
-
-		/* yy_bp points to the position in yy_ch_buf of the start of
-		 * the current run.
-		 */
-		yy_bp = yy_cp;
-
-		yy_current_state = yy_start;
-		if ( yy_bp[-1] == '\n' )
-			++yy_current_state;
-yy_match:
-		do
-			{
-			register YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)];
-			if ( yy_accept[yy_current_state] )
-				{
-				yy_last_accepting_state = yy_current_state;
-				yy_last_accepting_cpos = yy_cp;
-				}
-			while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
-				{
-				yy_current_state = (int) yy_def[yy_current_state];
-				if ( yy_current_state >= 278 )
-					yy_c = yy_meta[(unsigned int) yy_c];
-				}
-			yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
-			++yy_cp;
-			}
-		while ( yy_base[yy_current_state] != 446 );
-
-yy_find_action:
-		yy_act = yy_accept[yy_current_state];
-
-		YY_DO_BEFORE_ACTION;
-
-
-do_action:	/* This label is used only to access EOF actions. */
-
-
-		switch ( yy_act )
-	{ /* beginning of action switch */
-			case 0: /* must back up */
-			/* undo the effects of YY_DO_BEFORE_ACTION */
-			*yy_cp = yy_hold_char;
-			yy_cp = yy_last_accepting_cpos;
-			yy_current_state = yy_last_accepting_state;
-			goto yy_find_action;
-
-case 1:
-YY_USER_ACTION
-# line 102 "idl.ll"
-return IDL_ANY;
-	YY_BREAK
-case 2:
-YY_USER_ACTION
-# line 103 "idl.ll"
-return IDL_MODULE;
-	YY_BREAK
-case 3:
-YY_USER_ACTION
-# line 104 "idl.ll"
-return IDL_RAISES;
-	YY_BREAK
-case 4:
-YY_USER_ACTION
-# line 105 "idl.ll"
-return IDL_READONLY;
-	YY_BREAK
-case 5:
-YY_USER_ACTION
-# line 106 "idl.ll"
-return IDL_ATTRIBUTE;
-	YY_BREAK
-case 6:
-YY_USER_ACTION
-# line 107 "idl.ll"
-return IDL_EXCEPTION;
-	YY_BREAK
-case 7:
-YY_USER_ACTION
-# line 108 "idl.ll"
-return IDL_CONTEXT;
-	YY_BREAK
-case 8:
-YY_USER_ACTION
-# line 109 "idl.ll"
-return IDL_INTERFACE;
-	YY_BREAK
-case 9:
-YY_USER_ACTION
-# line 110 "idl.ll"
-return IDL_CONST;
-	YY_BREAK
-case 10:
-YY_USER_ACTION
-# line 111 "idl.ll"
-return IDL_TYPEDEF;
-	YY_BREAK
-case 11:
-YY_USER_ACTION
-# line 112 "idl.ll"
-return IDL_STRUCT;
-	YY_BREAK
-case 12:
-YY_USER_ACTION
-# line 113 "idl.ll"
-return IDL_ENUM;
-	YY_BREAK
-case 13:
-YY_USER_ACTION
-# line 114 "idl.ll"
-return IDL_STRING;
-	YY_BREAK
-case 14:
-YY_USER_ACTION
-# line 115 "idl.ll"
-return IDL_WSTRING;
-	YY_BREAK
-case 15:
-YY_USER_ACTION
-# line 116 "idl.ll"
-return IDL_SEQUENCE;
-	YY_BREAK
-case 16:
-YY_USER_ACTION
-# line 117 "idl.ll"
-return IDL_UNION;
-	YY_BREAK
-case 17:
-YY_USER_ACTION
-# line 118 "idl.ll"
-return IDL_SWITCH;
-	YY_BREAK
-case 18:
-YY_USER_ACTION
-# line 119 "idl.ll"
-return IDL_CASE;
-	YY_BREAK
-case 19:
-YY_USER_ACTION
-# line 120 "idl.ll"
-return IDL_DEFAULT;
-	YY_BREAK
-case 20:
-YY_USER_ACTION
-# line 121 "idl.ll"
-return IDL_FLOAT;
-	YY_BREAK
-case 21:
-YY_USER_ACTION
-# line 122 "idl.ll"
-return IDL_DOUBLE;
-	YY_BREAK
-case 22:
-YY_USER_ACTION
-# line 123 "idl.ll"
-return IDL_LONG;
-	YY_BREAK
-case 23:
-YY_USER_ACTION
-# line 124 "idl.ll"
-return IDL_SHORT;
-	YY_BREAK
-case 24:
-YY_USER_ACTION
-# line 125 "idl.ll"
-return IDL_UNSIGNED;
-	YY_BREAK
-case 25:
-YY_USER_ACTION
-# line 126 "idl.ll"
-return IDL_CHAR;
-	YY_BREAK
-case 26:
-YY_USER_ACTION
-# line 127 "idl.ll"
-return IDL_WCHAR;
-	YY_BREAK
-case 27:
-YY_USER_ACTION
-# line 128 "idl.ll"
-return IDL_BOOLEAN;
-	YY_BREAK
-case 28:
-YY_USER_ACTION
-# line 129 "idl.ll"
-return IDL_OCTET;
-	YY_BREAK
-case 29:
-YY_USER_ACTION
-# line 130 "idl.ll"
-return IDL_VOID;
-	YY_BREAK
-case 30:
-YY_USER_ACTION
-# line 132 "idl.ll"
-return IDL_TRUETOK;
-	YY_BREAK
-case 31:
-YY_USER_ACTION
-# line 133 "idl.ll"
-return IDL_FALSETOK;
-	YY_BREAK
-case 32:
-YY_USER_ACTION
-# line 135 "idl.ll"
-return IDL_INOUT;
-	YY_BREAK
-case 33:
-YY_USER_ACTION
-# line 136 "idl.ll"
-return IDL_IN;
-	YY_BREAK
-case 34:
-YY_USER_ACTION
-# line 137 "idl.ll"
-return IDL_OUT;
-	YY_BREAK
-case 35:
-YY_USER_ACTION
-# line 138 "idl.ll"
-return IDL_ONEWAY;
-	YY_BREAK
-case 36:
-YY_USER_ACTION
-# line 140 "idl.ll"
-return IDL_LEFT_SHIFT;
-	YY_BREAK
-case 37:
-YY_USER_ACTION
-# line 141 "idl.ll"
-return IDL_RIGHT_SHIFT;
-	YY_BREAK
-case 38:
-YY_USER_ACTION
-# line 142 "idl.ll"
-{
-		  yylval.strval = "::";
-		  return IDL_SCOPE_DELIMITOR;
-		}
-	YY_BREAK
-case 39:
-YY_USER_ACTION
-# line 147 "idl.ll"
-{
-    char *z = (char *) malloc(strlen(ace_yytext) + 1);
-    strcpy(z, ace_yytext);
-    yylval.strval = z;
-    return IDENTIFIER;
-}
-	YY_BREAK
-case 40:
-YY_USER_ACTION
-# line 154 "idl.ll"
-{
-                  yylval.dval = idl_atof(ace_yytext);
-                  return IDL_FLOATING_PT_LITERAL;
-                }
-	YY_BREAK
-case 41:
-YY_USER_ACTION
-# line 158 "idl.ll"
-{
-                  yylval.dval = idl_atof(ace_yytext);
-                  return IDL_FLOATING_PT_LITERAL;
-                }
-	YY_BREAK
-case 42:
-YY_USER_ACTION
-# line 163 "idl.ll"
-{
-		  yylval.ival = idl_atoi(ace_yytext, 10);
-		  return IDL_INTEGER_LITERAL;
-	        }
-	YY_BREAK
-case 43:
-YY_USER_ACTION
-# line 167 "idl.ll"
-{
-		  yylval.ival = idl_atoi(ace_yytext, 16);
-		  return IDL_INTEGER_LITERAL;
-	        }
-	YY_BREAK
-case 44:
-YY_USER_ACTION
-# line 171 "idl.ll"
-{
-		  yylval.ival = idl_atoi(ace_yytext, 8);
-		  return IDL_INTEGER_LITERAL;
-	      	}
-	YY_BREAK
-case 45:
-YY_USER_ACTION
-# line 176 "idl.ll"
-{
-		  /* Skip the quotes */
-		  char *tmp = ace_yytext;
-		  tmp[strlen(tmp)-1] = '\0';
-		  yylval.sval = new String(tmp + 1);
-		  return IDL_STRING_LITERAL;
-	      	}
-	YY_BREAK
-case 46:
-YY_USER_ACTION
-# line 183 "idl.ll"
-{
-		  yylval.cval = ace_yytext [1];
-		  return IDL_CHARACTER_LITERAL;
-	      	}
-	YY_BREAK
-case 47:
-YY_USER_ACTION
-# line 187 "idl.ll"
-{
-		  // octal character constant
-		  yylval.cval = idl_escape_reader(ace_yytext + 1);
-		  return IDL_CHARACTER_LITERAL;
-		}
-	YY_BREAK
-case 48:
-YY_USER_ACTION
-# line 192 "idl.ll"
-{
-		  yylval.cval = idl_escape_reader(ace_yytext + 1);
-		  return IDL_CHARACTER_LITERAL;
-		}
-	YY_BREAK
-case 49:
-YY_USER_ACTION
-# line 196 "idl.ll"
-{/* remember pragma */
-  		  idl_global->set_lineno(idl_global->lineno() + 1);
-		  idl_store_pragma(ace_yytext);
-		}
-	YY_BREAK
-case 50:
-YY_USER_ACTION
-# line 200 "idl.ll"
-{
-		  idl_parse_line_and_file(ace_yytext);
-		}
-	YY_BREAK
-case 51:
-YY_USER_ACTION
-# line 203 "idl.ll"
-{
-		  idl_parse_line_and_file(ace_yytext);
-		}
-	YY_BREAK
-case 52:
-YY_USER_ACTION
-# line 206 "idl.ll"
-{
-		  idl_parse_line_and_file(ace_yytext);
-		}
-	YY_BREAK
-case 53:
-YY_USER_ACTION
-# line 209 "idl.ll"
-{
-		  idl_parse_line_and_file(ace_yytext);
-	        }
-	YY_BREAK
-case 54:
-YY_USER_ACTION
-# line 212 "idl.ll"
-{
-		  /* ignore cpp ident */
-  		  idl_global->set_lineno(idl_global->lineno() + 1);
-		}
-	YY_BREAK
-case 55:
-YY_USER_ACTION
-# line 216 "idl.ll"
-{
-		  /* ignore comments */
-  		  idl_global->set_lineno(idl_global->lineno() + 1);
-		}
-	YY_BREAK
-case 56:
-YY_USER_ACTION
-# line 220 "idl.ll"
-{
-		  for(;;) {
-		    char c = yyinput();
-		    if (c == '*') {
-		      char next = yyinput();
-		      if (next == '/')
-			break;
-		      else
-			yyunput(c, NULL);
-	              if (c == '\n')
-		        idl_global->set_lineno(idl_global->lineno() + 1);
-		    }
-	          }
-	        }
-	YY_BREAK
-case 57:
-YY_USER_ACTION
-# line 234 "idl.ll"
-;
-	YY_BREAK
-case 58:
-YY_USER_ACTION
-# line 235 "idl.ll"
-{
-  		  idl_global->set_lineno(idl_global->lineno() + 1);
-		}
-	YY_BREAK
-case 59:
-YY_USER_ACTION
-# line 238 "idl.ll"
-return ace_yytext [0];
-	YY_BREAK
-case 60:
-YY_USER_ACTION
-# line 240 "idl.ll"
-TAO_ECHO;
-	YY_BREAK
-case YY_STATE_EOF(INITIAL):
-	yyterminate();
-
-	case YY_END_OF_BUFFER:
-		{
-		/* Amount of text matched not including the EOB char. */
-		int yy_amount_of_matched_text = yy_cp - yytext_ptr - 1;
-
-		/* Undo the effects of YY_DO_BEFORE_ACTION. */
-		*yy_cp = yy_hold_char;
-
-		if ( yy_current_buffer->yy_buffer_status == YY_BUFFER_NEW )
-			{
-			/* We're scanning a new file or input source.  It's
-			 * possible that this happened because the user
-			 * just pointed yyin at a new source and called
-			 * yylex().  If so, then we have to assure
-			 * consistency between yy_current_buffer and our
-			 * globals.  Here is the right place to do so, because
-			 * this is the first action (other than possibly a
-			 * back-up) that will match for the new input source.
-			 */
-			yy_n_chars = yy_current_buffer->yy_n_chars;
-			yy_current_buffer->yy_input_file = yyin;
-			yy_current_buffer->yy_buffer_status = YY_BUFFER_NORMAL;
-			}
-
-		/* Note that here we test for yy_c_buf_p "<=" to the position
-		 * of the first EOB in the buffer, since yy_c_buf_p will
-		 * already have been incremented past the NUL character
-		 * (since all states make transitions on EOB to the
-		 * end-of-buffer state).  Contrast this with the test
-		 * in input().
-		 */
-		if ( yy_c_buf_p <= &yy_current_buffer->yy_ch_buf[yy_n_chars] )
-			{ /* This was really a NUL. */
-			yy_state_type yy_next_state;
-
-			yy_c_buf_p = yytext_ptr + yy_amount_of_matched_text;
-
-			yy_current_state = yy_get_previous_state();
-
-			/* Okay, we're now positioned to make the NUL
-			 * transition.  We couldn't have
-			 * yy_get_previous_state() go ahead and do it
-			 * for us because it doesn't know how to deal
-			 * with the possibility of jamming (and we don't
-			 * want to build jamming into it because then it
-			 * will run more slowly).
-			 */
-
-			yy_next_state = yy_try_NUL_trans( yy_current_state );
-
-			yy_bp = yytext_ptr + YY_MORE_ADJ;
-
-			if ( yy_next_state )
-				{
-				/* Consume the NUL. */
-				yy_cp = ++yy_c_buf_p;
-				yy_current_state = yy_next_state;
-				goto yy_match;
-				}
-
-			else
-				{
-							yy_cp = yy_c_buf_p;
-				goto yy_find_action;
-				}
-			}
-
-		else switch ( yy_get_next_buffer() )
-			{
-			case EOB_ACT_END_OF_FILE:
-				{
-				yy_did_buffer_switch_on_eof = 0;
-
-				if ( yywrap() )
-					{
-					/* Note: because we've taken care in
-					 * yy_get_next_buffer() to have set up
-					 * yytext, we can now set up
-					 * yy_c_buf_p so that if some total
-					 * hoser (like flex itself) wants to
-					 * call the scanner after we return the
-					 * YY_NULL, it'll still work - another
-					 * YY_NULL will get returned.
-					 */
-					yy_c_buf_p = yytext_ptr + YY_MORE_ADJ;
-
-					yy_act = YY_STATE_EOF(YY_START);
-					goto do_action;
-					}
-
-				else
-					{
-					if ( ! yy_did_buffer_switch_on_eof )
-						YY_NEW_FILE;
-					}
-				break;
-				}
-
-			case EOB_ACT_CONTINUE_SCAN:
-				yy_c_buf_p =
-					yytext_ptr + yy_amount_of_matched_text;
-
-				yy_current_state = yy_get_previous_state();
-
-				yy_cp = yy_c_buf_p;
-				yy_bp = yytext_ptr + YY_MORE_ADJ;
-				goto yy_match;
-
-			case EOB_ACT_LAST_MATCH:
-				yy_c_buf_p =
-				&yy_current_buffer->yy_ch_buf[yy_n_chars];
-
-				yy_current_state = yy_get_previous_state();
-
-				yy_cp = yy_c_buf_p;
-				yy_bp = yytext_ptr + YY_MORE_ADJ;
-				goto yy_find_action;
-			}
-		break;
-		}
-
-	default:
-		YY_FATAL_ERROR(
-			"fatal flex scanner internal error--no action found" );
-	} /* end of action switch */
-		} /* end of scanning one token */
-	} /* end of yylex */
-
-
-/* yy_get_next_buffer - try to read in a new buffer
- *
- * Returns a code representing an action:
- *	EOB_ACT_LAST_MATCH -
- *	EOB_ACT_CONTINUE_SCAN - continue scanning from current position
- *	EOB_ACT_END_OF_FILE - end of file
- */
-
-static int yy_get_next_buffer()
-	{
-	register char *dest = yy_current_buffer->yy_ch_buf;
-	register char *source = yytext_ptr - 1; /* copy prev. char, too */
-	register int number_to_move, i;
-	int ret_val;
-
-	if ( yy_c_buf_p > &yy_current_buffer->yy_ch_buf[yy_n_chars + 1] )
-		YY_FATAL_ERROR(
-		"fatal flex scanner internal error--end of buffer missed" );
-
-	if ( yy_current_buffer->yy_fill_buffer == 0 )
-		{ /* Don't try to fill the buffer, so this is an EOF. */
-		if ( yy_c_buf_p - yytext_ptr - YY_MORE_ADJ == 1 )
-			{
-			/* We matched a singled characater, the EOB, so
-			 * treat this as a final EOF.
-			 */
-			return EOB_ACT_END_OF_FILE;
-			}
-
-		else
-			{
-			/* We matched some text prior to the EOB, first
-			 * process it.
-			 */
-			return EOB_ACT_LAST_MATCH;
-			}
-		}
-
-	/* Try to read more data. */
-
-	/* First move last chars to start of buffer. */
-	number_to_move = yy_c_buf_p - yytext_ptr;
-
-	for ( i = 0; i < number_to_move; ++i )
-		*(dest++) = *(source++);
-
-	if ( yy_current_buffer->yy_buffer_status == YY_BUFFER_EOF_PENDING )
-		/* don't do the read, it's not guaranteed to return an EOF,
-		 * just force an EOF
-		 */
-		yy_n_chars = 0;
-
-	else
-		{
-		int num_to_read =
-			yy_current_buffer->yy_buf_size - number_to_move - 1;
-
-		while ( num_to_read <= 0 )
-			{ /* Not enough room in the buffer - grow it. */
-#ifdef YY_USES_REJECT
-			YY_FATAL_ERROR(
-"input buffer overflow, can't enlarge buffer because scanner uses REJECT" );
-#else
-
-			/* just a shorter name for the current buffer */
-			YY_BUFFER_STATE b = yy_current_buffer;
-
-			int yy_c_buf_p_offset = yy_c_buf_p - b->yy_ch_buf;
-
-			b->yy_buf_size *= 2;
-			b->yy_ch_buf = (char *)
-				yy_flex_realloc( (void *) b->yy_ch_buf,
-						 b->yy_buf_size );
-
-			if ( ! b->yy_ch_buf )
-				YY_FATAL_ERROR(
-				"fatal error - scanner input buffer overflow" );
-
-			yy_c_buf_p = &b->yy_ch_buf[yy_c_buf_p_offset];
-
-			num_to_read = yy_current_buffer->yy_buf_size -
-						number_to_move - 1;
-#endif
-			}
-
-		if ( num_to_read > YY_READ_BUF_SIZE )
-			num_to_read = YY_READ_BUF_SIZE;
-
-		/* Read in more data. */
-		YY_INPUT( (&yy_current_buffer->yy_ch_buf[number_to_move]),
-			yy_n_chars, num_to_read );
-		}
-
-	if ( yy_n_chars == 0 )
-		{
-		if ( number_to_move - YY_MORE_ADJ == 1 )
-			{
-			ret_val = EOB_ACT_END_OF_FILE;
-			yyrestart( yyin );
-			}
-
-		else
-			{
-			ret_val = EOB_ACT_LAST_MATCH;
-			yy_current_buffer->yy_buffer_status =
-				YY_BUFFER_EOF_PENDING;
-			}
-		}
-
-	else
-		ret_val = EOB_ACT_CONTINUE_SCAN;
-
-	yy_n_chars += number_to_move;
-	yy_current_buffer->yy_ch_buf[yy_n_chars] = YY_END_OF_BUFFER_CHAR;
-	yy_current_buffer->yy_ch_buf[yy_n_chars + 1] = YY_END_OF_BUFFER_CHAR;
-
-	/* yytext begins at the second character in yy_ch_buf; the first
-	 * character is the one which preceded it before reading in the latest
-	 * buffer; it needs to be kept around in case it's a newline, so
-	 * yy_get_previous_state() will have with '^' rules active.
-	 */
-
-	yytext_ptr = &yy_current_buffer->yy_ch_buf[1];
-
-	return ret_val;
-	}
-
-
-/* yy_get_previous_state - get the state just before the EOB char was reached */
-
-static yy_state_type yy_get_previous_state()
-	{
-	register yy_state_type yy_current_state;
-	register char *yy_cp;
-
-	register char *yy_bp = yytext_ptr;
-
-	yy_current_state = yy_start;
-	if ( yy_bp[-1] == '\n' )
-		++yy_current_state;
-
-	for ( yy_cp = yytext_ptr + YY_MORE_ADJ; yy_cp < yy_c_buf_p; ++yy_cp )
-		{
-		register YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1);
-		if ( yy_accept[yy_current_state] )
-			{
-			yy_last_accepting_state = yy_current_state;
-			yy_last_accepting_cpos = yy_cp;
-			}
-		while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
-			{
-			yy_current_state = (int) yy_def[yy_current_state];
-			if ( yy_current_state >= 278 )
-				yy_c = yy_meta[(unsigned int) yy_c];
-			}
-		yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
-		}
-
-	return yy_current_state;
-	}
-
-
-/* yy_try_NUL_trans - try to make a transition on the NUL character
- *
- * synopsis
- *	next_state = yy_try_NUL_trans( current_state );
- */
-
-#ifdef YY_USE_PROTOS
-static yy_state_type yy_try_NUL_trans( yy_state_type yy_current_state )
-#else
-static yy_state_type yy_try_NUL_trans( yy_current_state )
-yy_state_type yy_current_state;
-#endif
-	{
-	register int yy_is_jam;
-	register char *yy_cp = yy_c_buf_p;
-
-	register YY_CHAR yy_c = 1;
-	if ( yy_accept[yy_current_state] )
-		{
-		yy_last_accepting_state = yy_current_state;
-		yy_last_accepting_cpos = yy_cp;
-		}
-	while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
-		{
-		yy_current_state = (int) yy_def[yy_current_state];
-		if ( yy_current_state >= 278 )
-			yy_c = yy_meta[(unsigned int) yy_c];
-		}
-	yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
-	yy_is_jam = (yy_current_state == 277);
-
-	return yy_is_jam ? 0 : yy_current_state;
-	}
-
-
-#ifdef YY_USE_PROTOS
-static void yyunput( int c, register char *yy_bp )
-#else
-static void yyunput( c, yy_bp )
-int c;
-register char *yy_bp;
-#endif
-	{
-	register char *yy_cp = yy_c_buf_p;
-
-	/* undo effects of setting up yytext */
-	*yy_cp = yy_hold_char;
-
-	if ( yy_cp < yy_current_buffer->yy_ch_buf + 2 )
-		{ /* need to shift things up to make room */
-		/* +2 for EOB chars. */
-		register int number_to_move = yy_n_chars + 2;
-		register char *dest = &yy_current_buffer->yy_ch_buf[
-					yy_current_buffer->yy_buf_size + 2];
-		register char *source =
-				&yy_current_buffer->yy_ch_buf[number_to_move];
-
-		while ( source > yy_current_buffer->yy_ch_buf )
-			*--dest = *--source;
-
-		yy_cp += dest - source;
-		yy_bp += dest - source;
-		yy_n_chars = yy_current_buffer->yy_buf_size;
-
-		if ( yy_cp < yy_current_buffer->yy_ch_buf + 2 )
-			YY_FATAL_ERROR( "flex scanner push-back overflow" );
-		}
-
-	if ( yy_cp > yy_bp && yy_cp[-1] == '\n' )
-		yy_cp[-2] = '\n';
-
-	*--yy_cp = (char) c;
-
-
-	/* Note: the formal parameter *must* be called "yy_bp" for this
-	 * macro to now work correctly.
-	 */
-	YY_DO_BEFORE_ACTION; /* set up yytext again */
-	}
-
-
-#ifdef __cplusplus
-static int yyinput()
-#else
-static int input()
-#endif
-	{
-	int c;
-
-	*yy_c_buf_p = yy_hold_char;
-
-	if ( *yy_c_buf_p == YY_END_OF_BUFFER_CHAR )
-		{
-		/* yy_c_buf_p now points to the character we want to return.
-		 * If this occurs *before* the EOB characters, then it's a
-		 * valid NUL; if not, then we've hit the end of the buffer.
-		 */
-		if ( yy_c_buf_p < &yy_current_buffer->yy_ch_buf[yy_n_chars] )
-			/* This was really a NUL. */
-			*yy_c_buf_p = '\0';
-
-		else
-			{ /* need more input */
-			yytext_ptr = yy_c_buf_p;
-			++yy_c_buf_p;
-
-			switch ( yy_get_next_buffer() )
-				{
-				case EOB_ACT_END_OF_FILE:
-					{
-					if ( yywrap() )
-						{
-						yy_c_buf_p =
-						yytext_ptr + YY_MORE_ADJ;
-						return EOF;
-						}
-
-					YY_NEW_FILE;
-#ifdef __cplusplus
-					return yyinput();
-#else
-					return input();
-#endif
-					}
-
-				case EOB_ACT_CONTINUE_SCAN:
-					yy_c_buf_p = yytext_ptr + YY_MORE_ADJ;
-					break;
-
-				case EOB_ACT_LAST_MATCH:
-#ifdef __cplusplus
-					YY_FATAL_ERROR(
-					"unexpected last match in yyinput()" );
-#else
-					YY_FATAL_ERROR(
-					"unexpected last match in input()" );
-#endif
-				}
-			}
-		}
-
-	c = *(unsigned char *) yy_c_buf_p;	/* cast for 8-bit char's */
-	*yy_c_buf_p = '\0';	/* preserve yytext */
-	yy_hold_char = *++yy_c_buf_p;
-
-	return c;
-	}
-
-
-#ifdef YY_USE_PROTOS
-void yyrestart( FILE *input_file )
-#else
-void yyrestart( input_file )
-FILE *input_file;
-#endif
-	{
-	if ( ! yy_current_buffer )
-		yy_current_buffer = yy_create_buffer( yyin, YY_BUF_SIZE );
-
-	yy_init_buffer( yy_current_buffer, input_file );
-	yy_load_buffer_state();
-	}
-
-
-#ifdef YY_USE_PROTOS
-void yy_switch_to_buffer( YY_BUFFER_STATE new_buffer )
-#else
-void yy_switch_to_buffer( new_buffer )
-YY_BUFFER_STATE new_buffer;
-#endif
-	{
-	if ( yy_current_buffer == new_buffer )
-		return;
-
-	if ( yy_current_buffer )
-		{
-		/* Flush out information for old buffer. */
-		*yy_c_buf_p = yy_hold_char;
-		yy_current_buffer->yy_buf_pos = yy_c_buf_p;
-		yy_current_buffer->yy_n_chars = yy_n_chars;
-		}
-
-	yy_current_buffer = new_buffer;
-	yy_load_buffer_state();
-
-	/* We don't actually know whether we did this switch during
-	 * EOF (yywrap()) processing, but the only time this flag
-	 * is looked at is after yywrap() is called, so it's safe
-	 * to go ahead and always set it.
-	 */
-	yy_did_buffer_switch_on_eof = 1;
-	}
-
-
-#ifdef YY_USE_PROTOS
-void yy_load_buffer_state( void )
-#else
-void yy_load_buffer_state()
-#endif
-	{
-	yy_n_chars = yy_current_buffer->yy_n_chars;
-	yytext_ptr = yy_c_buf_p = yy_current_buffer->yy_buf_pos;
-	yyin = yy_current_buffer->yy_input_file;
-	yy_hold_char = *yy_c_buf_p;
-	}
-
-
-#ifdef YY_USE_PROTOS
-YY_BUFFER_STATE yy_create_buffer( FILE *file, int size )
-#else
-YY_BUFFER_STATE yy_create_buffer( file, size )
-FILE *file;
-int size;
-#endif
-	{
-	YY_BUFFER_STATE b;
-
-	b = (YY_BUFFER_STATE) yy_flex_alloc( sizeof( struct yy_buffer_state ) );
-
-	if ( ! b )
-		YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" );
-
-	b->yy_buf_size = size;
-
-	/* yy_ch_buf has to be 2 characters longer than the size given because
-	 * we need to put in 2 end-of-buffer characters.
-	 */
-	b->yy_ch_buf = (char *) yy_flex_alloc( b->yy_buf_size + 2 );
-
-	if ( ! b->yy_ch_buf )
-		YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" );
-
-	yy_init_buffer( b, file );
-
-	return b;
-	}
-
-
-#ifdef YY_USE_PROTOS
-void yy_delete_buffer( YY_BUFFER_STATE b )
-#else
-void yy_delete_buffer( b )
-YY_BUFFER_STATE b;
-#endif
-	{
-	if ( b == yy_current_buffer )
-		yy_current_buffer = (YY_BUFFER_STATE) 0;
-
-	yy_flex_free( (void *) b->yy_ch_buf );
-	yy_flex_free( (void *) b );
-	}
-
-
-#ifdef YY_USE_PROTOS
-void yy_init_buffer( YY_BUFFER_STATE b, FILE *file )
-#else
-void yy_init_buffer( b, file )
-YY_BUFFER_STATE b;
-FILE *file;
-#endif
-	{
-	b->yy_input_file = file;
-
-	/* We put in the '\n' and start reading from [1] so that an
-	 * initial match-at-newline will be true.
-	 */
-
-	b->yy_ch_buf[0] = '\n';
-	b->yy_n_chars = 1;
-
-	/* We always need two end-of-buffer characters.  The first causes
-	 * a transition to the end-of-buffer state.  The second causes
-	 * a jam in that state.
-	 */
-	b->yy_ch_buf[1] = YY_END_OF_BUFFER_CHAR;
-	b->yy_ch_buf[2] = YY_END_OF_BUFFER_CHAR;
-
-	b->yy_buf_pos = &b->yy_ch_buf[1];
-
-	b->yy_is_interactive = file ? isatty( fileno(file) ) : 0;
-
-	b->yy_fill_buffer = 1;
-
-	b->yy_buffer_status = YY_BUFFER_NEW;
-	}
-
-
-#ifdef YY_USE_PROTOS
-static void yy_push_state( int new_state )
-#else
-static void yy_push_state( new_state )
-int new_state;
-#endif
-	{
-	if ( yy_start_stack_ptr >= yy_start_stack_depth )
-		{
-		int new_size;
-
-		yy_start_stack_depth += YY_START_STACK_INCR;
-		new_size = yy_start_stack_depth * sizeof( int );
-
-		if ( ! yy_start_stack )
-			yy_start_stack = (int *) yy_flex_alloc( new_size );
-
-		else
-			yy_start_stack = (int *) yy_flex_realloc(
-					(void *) yy_start_stack, new_size );
-
-		if ( ! yy_start_stack )
-			YY_FATAL_ERROR(
-			"out of memory expanding start-condition stack" );
-		}
-
-	yy_start_stack[yy_start_stack_ptr++] = YY_START;
-
-	BEGIN(new_state);
-	}
-
-
-static void yy_pop_state()
-	{
-	if ( --yy_start_stack_ptr < 0 )
-		YY_FATAL_ERROR( "start-condition stack underflow" );
-
-	BEGIN(yy_start_stack[yy_start_stack_ptr]);
-	}
-
-
-static int yy_top_state()
-	{
-	return yy_start_stack[yy_start_stack_ptr - 1];
-	}
-
-
-#ifdef YY_USE_PROTOS
-static void yy_fatal_error( const char msg[] )
-#else
-static void yy_fatal_error( msg )
-char msg[];
-#endif
-	{
-	(void) fprintf( stderr, "%s\n", msg );
-	exit( 1 );
-	}
-
-
-
-/* Redefine yyless() so it works in section 3 code. */
-
-#undef yyless
-#define yyless(n) \
-	do \
-		{ \
-		/* Undo effects of setting up yytext. */ \
-		yytext[yyleng] = yy_hold_char; \
-		yy_c_buf_p = yytext + n - YY_MORE_ADJ; \
-		yy_hold_char = *yy_c_buf_p; \
-		*yy_c_buf_p = '\0'; \
-		yyleng = n; \
-		} \
-	while ( 0 )
-
-
-/* Internal utility routines. */
-
-#ifndef yytext_ptr
-#ifdef YY_USE_PROTOS
-static void yy_flex_strncpy( char *s1, const char *s2, int n )
-#else
-static void yy_flex_strncpy( s1, s2, n )
-char *s1;
-const char *s2;
-int n;
-#endif
-	{
-	register int i;
-	for ( i = 0; i < n; ++i )
-		s1[i] = s2[i];
-	}
-#endif
-
-
-#ifdef YY_USE_PROTOS
-static void *yy_flex_alloc( unsigned int size )
-#else
-static void *yy_flex_alloc( size )
-unsigned int size;
-#endif
-	{
-	return (void *) malloc( size );
-	}
-
-#ifdef YY_USE_PROTOS
-static void *yy_flex_realloc( void *ptr, unsigned int size )
-#else
-static void *yy_flex_realloc( ptr, size )
-void *ptr;
-unsigned int size;
-#endif
-	{
-	return (void *) realloc( ptr, size );
-	}
-
-#ifdef YY_USE_PROTOS
-static void yy_flex_free( void *ptr )
-#else
-static void yy_flex_free( ptr )
-void *ptr;
-#endif
-	{
-	free( ptr );
-	}
-# line 240 "idl.ll"
-
-	/* subroutines */
-
-/*
- * Strip down a name to the last component, i.e. everything after the last
- * '/' character
- */
-static char *
-stripped_name(UTL_String *fn)
-{
-    char	*n = fn->get_string();
-    long	l;
-
-    if (n == NULL)
-	return NULL;
-    l = strlen(n);
-    for (n += l; l > 0 && *n != '/'; l--, n--);
-    if (*n == '/') n++;
-    return n;
-}
-
-/*
- * Parse a #line statement generated by the C preprocessor
- */
-static void
-idl_parse_line_and_file(char *buf)
-{
-  char		*r = buf;
-  char 		*h;
-  UTL_String	*nm;
-
-  /* Skip initial '#' */
-  if (*r != '#') 
-    return;
-  else
-    r++;
-
-  /* Check to see if we're running under the screwy Microsoft scheme */
-  /* of putting #line num instead of #num. */ 
-
-  if (ACE_OS::strncmp (r, "line", 4) == 0)
-    r += 5;
-
-  /* Find line number */
-  while (*r == ' ' || *r == '\t')
-    r++;
-  h = r;
-  for (; *r != '\0' && *r != ' ' && *r != '\t'; r++)
-    continue;
-  *r++ = 0;
-  idl_global->set_lineno(idl_atoi(h, 10));
-
-  /* Find file name, if present */
-  for (; *r != '"'; r++) 
-    if (*r == '\n' || *r == '\0')
-      return;
-
-  h = ++r;
-  for (; *r != '"'; r++)
-    continue;
-  *r = 0;
-  if (*h == '\0')
-    idl_global->set_filename(new String("standard input"));
-  else
-    {
-      long i;
-      long j;
-
-      // Put Microsoft-style pathnames into a canonical form.
-      for (i = 0, j = 0; h[j] != '\0'; i++, j++)
-        {
-          if (h[j] == '\\' && h[j + 1] == '\\')
-            j++;
-
-          h[i] = h[j];
-        }
-      h[i] = '\0';
-      idl_global->set_filename(new String(h));
-    }
-  idl_global->set_in_main_file(
-    (idl_global->filename()->compare(idl_global->real_filename())) ?
-    I_TRUE :
-    I_FALSE
-  );
-  /*
-   * If it's an import file store the stripped name for the BE to use
-   */
-  if (!(idl_global->in_main_file()) && idl_global->import()) {
-    nm = new UTL_String(stripped_name(idl_global->filename()));
-    idl_global->store_include_file_name(nm);
-  }
-}
-
-/*
- * Store a #pragma line into the list of pragmas
- */
-static void
-idl_store_pragma(char *buf)
-{
-  char *cp = buf + 1;
-  while(*cp != 'p')
-    cp++;
-  while(*cp != ' ' && *cp != '\t')
-    cp++;
-  while(*cp == ' ' || *cp == '\t')
-    cp++;
-  char pragma[80];
-  char *pp = pragma;
-  while(*cp != '\n') {
-    *pp++ = *cp++;
-  }
-  *pp = 0;
-  if (strcmp(pragma, "import") == 0) {
-    idl_global->set_import(I_TRUE);
-    return;
-  }
-  if (strcmp(pragma, "include") == 0) {
-    idl_global->set_import(I_FALSE);
-    return;
-  }
-  UTL_StrList *p = idl_global->pragmas();
-  if (p == NULL)
-    idl_global->set_pragmas(new UTL_StrList(new String(buf), NULL));
-  else {
-    p->nconc(new UTL_StrList(new String(buf), NULL));
-    idl_global->set_pragmas(p);
-  }
-}
-
-/*
- * idl_atoi - Convert a string of digits into an integer according to base b
- */
-static long
-idl_atoi(char *s, long b)
-{
-	long	r = 0;
-	long	negative = 0;
-
-	if (*s == '-') {
-	  negative = 1;
-	  s++;
-	}
-	if (b == 8 && *s == '0')
-	  s++;
-	else if (b == 16 && *s == '0' && (*(s + 1) == 'x' || *(s + 1) == 'X'))
-	  s += 2;
-
-	for (; *s; s++)
-	  if (*s <= '9' && *s >= '0')
-	    r = (r * b) + (*s - '0');
-	  else if (b > 10 && *s <= 'f' && *s >= 'a')
-	    r = (r * b) + (*s - 'a' + 10);
-	  else if (b > 10 && *s <= 'F' && *s >= 'A')
-	    r = (r * b) + (*s - 'A' + 10);
-	  else
-	    break;
-
-	if (negative)
-	  r *= -1;
-
-	return r;
-}
-
-/*
- * Convert a string to a float; atof doesn't seem to work, always.
- */
-static double
-idl_atof(char *s)
-{
-	char    *h = s;
-	double	d = 0.0;
-	double	f = 0.0;
-	double	e, k;
-	long	neg = 0, negexp = 0;
-
-	ACE_UNUSED_ARG (f);
-	ACE_UNUSED_ARG (h);
-
-	if (*s == '-') {
-	  neg = 1;
-	  s++;
-	}
-	while (*s >= '0' && *s <= '9') {
-		d = (d * 10) + *s - '0';
-		s++;
-	}
-	if (*s == '.') {
-		s++;
-		e = 10;
-		while (*s >= '0' && *s <= '9') {
-			d += (*s - '0') / (e * 1.0);
-			e *= 10;
-			s++;
-		}
-	}
-	if (*s == 'e' || *s == 'E') {
-		s++;
-		if (*s == '-') {
-			negexp = 1;
-			s++;
-		} else if (*s == '+')
-			s++;
-		e = 0;
-		while (*s >= '0' && *s <= '9') {
-			e = (e * 10) + *s - '0';
-			s++;
-		}
-		if (e > 0) {
-			for (k = 1; e > 0; k *= 10, e--);
-			if (negexp)
-				d /= k;
-			else
-				d *= k;
-		}
-	}
-
-	if (neg) d *= -1.0;
-
-	return d;
-}
-
-/*
- * Convert (some) escaped characters into their ascii values
- */
-static char
-idl_escape_reader(
-    char *str
-)
-{
-    if (str[0] != '\\') {
-	return str[0];
-    }
-
-    switch (str[1]) {
-      case 'n':
-	return '\n';
-      case 't':
-	return '\t';
-      case 'v':
-	return '\v';
-      case 'b':
-	return '\b';
-      case 'r':
-	return '\r';
-      case 'f':
-	return '\f';
-      case 'a':
-	return '\a';
-      case '\\':
-	return '\\';
-      case '\?':
-	return '?';
-      case '\'':
-	return '\'';
-      case '"':
-	return '"';
-      case 'x':
-	{
-	    int i;
-	    // hex value
-	    for (i = 2; str[i] != '\0' && isxdigit(str[i]); i++) {
-		continue;
-	    }
-	    char save = str[i];
-	    str[i] = '\0';
-	    char out = (char)idl_atoi(&str[2], 16);
-	    str[i] = save;
-	    return out;
-	}
-	break;
-      default:
-	// check for octal value
-	if (str[1] >= '0' && str[1] <= '7') {
- 	    int i;
-	    for (i = 1; str[i] >= '0' && str[i] <= '7'; i++) {
-		continue;
-	    }
-	    char save = str[i];
-	    str[i] = '\0';
-	    char out = (char)idl_atoi(&str[1], 8);
-	    str[i] = save;
-	    return out;
-	} else {
-	  return str[1] - 'a';
-	}
-	break;
-    }
-}
diff --git a/TAO/TAO_IDL/fe/y.tab.cpp b/TAO/TAO_IDL/fe/y.tab.cpp
deleted file mode 100644
index 93e3dbf8b63..00000000000
--- a/TAO/TAO_IDL/fe/y.tab.cpp
+++ /dev/null
@@ -1,3274 +0,0 @@
-
-# line 73 "idl.yy"
-#include "idl.h"
-#include "idl_extern.h"
-#include "fe_private.h"
-#include <stdio.h>
-
-#if (defined(apollo) || defined(hpux)) && defined(__cplusplus)
-extern	"C" int yywrap();
-#endif	// (defined(apollo) || defined(hpux)) && defined(__cplusplus)
-
-void yyerror (char *);
-int yylex (void);
-extern "C" int yywrap (void);
-extern char yytext[];
-extern int yyleng;
-#define YYDEBUG_LEXER_TEXT (yytext[yyleng] = '\0', yytext)
-// Force the pretty debugging code to compile.
-#define YYDEBUG 1
-
-# line 96 "idl.yy"
-typedef union
-#ifdef __cplusplus
-	YYSTYPE
-#endif
- {
-  AST_Decl		*dcval;		/* Decl value		*/
-  UTL_StrList		*slval;		/* String list		*/
-  UTL_NameList		*nlval;		/* Name list		*/
-  UTL_ExprList		*elval;		/* Expression list	*/
-  UTL_LabelList		*llval;		/* Label list		*/
-  UTL_DeclList		*dlval;		/* Declaration list	*/
-  FE_InterfaceHeader	*ihval;		/* Interface header	*/
-  AST_Expression	*exval;		/* Expression value	*/
-  AST_UnionLabel	*ulval;		/* Union label		*/
-  AST_Field		*ffval;		/* Field value		*/
-  AST_Expression::ExprType etval;	/* Expression type	*/
-  AST_Argument::Direction dival;	/* Argument direction	*/
-  AST_Operation::Flags	ofval;		/* Operation flags	*/
-  FE_Declarator		*deval;		/* Declarator value	*/
-  idl_bool		bval;		/* Boolean value	*/
-  long			ival;		/* Long value		*/
-  double		dval;		/* Double value		*/
-  float			fval;		/* Float value		*/
-  char			cval;		/* Char value		*/
-
-  String		*sval;		/* String value		*/
-  char			*strval;	/* char * value		*/
-  Identifier		*idval;		/* Identifier		*/
-  UTL_IdList		*idlist;	/* Identifier list	*/
-} YYSTYPE;
-# define IDENTIFIER 257
-# define IDL_CONST 258
-# define IDL_MODULE 259
-# define IDL_INTERFACE 260
-# define IDL_TYPEDEF 261
-# define IDL_LONG 262
-# define IDL_SHORT 263
-# define IDL_UNSIGNED 264
-# define IDL_DOUBLE 265
-# define IDL_FLOAT 266
-# define IDL_CHAR 267
-# define IDL_WCHAR 268
-# define IDL_OCTET 269
-# define IDL_BOOLEAN 270
-# define IDL_ANY 271
-# define IDL_STRUCT 272
-# define IDL_UNION 273
-# define IDL_SWITCH 274
-# define IDL_ENUM 275
-# define IDL_SEQUENCE 276
-# define IDL_STRING 277
-# define IDL_WSTRING 278
-# define IDL_EXCEPTION 279
-# define IDL_CASE 280
-# define IDL_DEFAULT 281
-# define IDL_READONLY 282
-# define IDL_ATTRIBUTE 283
-# define IDL_ONEWAY 284
-# define IDL_IDEMPOTENT 285
-# define IDL_VOID 286
-# define IDL_IN 287
-# define IDL_OUT 288
-# define IDL_INOUT 289
-# define IDL_RAISES 290
-# define IDL_CONTEXT 291
-# define IDL_INTEGER_LITERAL 292
-# define IDL_STRING_LITERAL 293
-# define IDL_CHARACTER_LITERAL 294
-# define IDL_FLOATING_PT_LITERAL 295
-# define IDL_TRUETOK 296
-# define IDL_FALSETOK 297
-# define IDL_SCOPE_DELIMITOR 298
-# define IDL_LEFT_SHIFT 299
-# define IDL_RIGHT_SHIFT 300
-
-#ifdef __STDC__
-#include <stdlib.h>
-#else
-#include <malloc.h>
-#include <memory.h>
-#endif
-
-// #include <values.h>
-
-#ifdef __cplusplus
-
-#ifndef yyerror
-	void yyerror(const char *);
-#endif
-
-#ifndef yylex
-#ifdef __EXTERN_C__
-	extern "C" { int yylex(void); }
-#else
-	int yylex(void);
-#endif
-#endif
-	int yyparse(void);
-
-#endif
-#define yyclearin yychar = -1
-#define yyerrok yyerrflag = 0
-extern int yychar;
-extern int yyerrflag;
-YYSTYPE yylval;
-YYSTYPE yyval;
-typedef int yytabelem;
-#ifndef YYMAXDEPTH
-#define YYMAXDEPTH 150
-#endif
-#if YYMAXDEPTH > 0
-int yy_yys[YYMAXDEPTH], *yys = yy_yys;
-YYSTYPE yy_yyv[YYMAXDEPTH], *yyv = yy_yyv;
-#else	/* user does initial allocation */
-int *yys;
-YYSTYPE *yyv;
-#endif
-static int yymaxdepth = YYMAXDEPTH;
-# define YYERRCODE 256
-
-# line 2242 "idl.yy"
-
-/* programs */
-
-/*
- * ???
- */
-int
-yywrap()
-{
-  return 1;
-}
-
-/*
- * Report an error situation discovered in a production
- *
- * This does not do anything since we report all error situations through
- * idl_global->err() operations
- */
-void
-yyerror(char *)
-{
-}
-yytabelem yyexca[] ={
--1, 0,
-	0, 3,
-	-2, 0,
--1, 1,
-	0, -1,
-	-2, 0,
--1, 3,
-	0, 3,
-	125, 3,
-	-2, 0,
--1, 23,
-	123, 32,
-	-2, 57,
--1, 131,
-	91, 228,
-	-2, 137,
--1, 146,
-	257, 253,
-	262, 253,
-	263, 253,
-	264, 253,
-	265, 253,
-	266, 253,
-	267, 253,
-	268, 253,
-	269, 253,
-	270, 253,
-	271, 253,
-	277, 253,
-	283, 240,
-	286, 253,
-	298, 253,
-	125, 25,
-	-2, 0,
--1, 178,
-	125, 3,
-	-2, 0,
--1, 219,
-	125, 244,
-	-2, 0,
--1, 266,
-	125, 160,
-	-2, 0,
--1, 317,
-	41, 256,
-	-2, 258,
--1, 355,
-	125, 183,
-	-2, 0,
-	};
-# define YYNPROD 285
-# define YYLAST 524
-yytabelem yyact[]={
-
-    68,   128,   152,   329,   342,   125,    53,   164,    66,   238,
-   345,   224,    83,   227,   223,   129,   107,    74,    84,    85,
-    72,    73,    75,    76,    78,    77,    79,    19,    20,   391,
-    21,    86,    87,    88,    83,    98,   386,   100,   101,   102,
-    55,    97,    95,   105,   350,   166,   326,    50,   161,    83,
-   162,   204,   205,    69,    74,    84,    85,    72,    73,    75,
-    76,    78,    77,    79,    19,    20,   236,    21,    86,    87,
-    88,   144,    83,   166,   344,    69,    63,    74,    84,    85,
-    72,    73,    75,    76,    78,    77,    79,   331,   332,   333,
-    69,    86,    87,    88,   347,   346,   109,   109,   347,   346,
-   110,   115,   116,    62,    61,    59,   138,   131,   127,   134,
-    92,    83,   126,    69,   228,    83,   302,    99,   219,   140,
-    74,    84,    85,    72,    73,    75,    76,    78,    77,    79,
-   158,   163,    58,    13,   150,    87,    13,    93,    91,    90,
-    83,   198,   155,   151,   239,    74,    84,    85,    72,    73,
-    75,    76,    78,    77,    79,   156,    69,    51,     6,   154,
-    87,   365,     5,    57,    12,    83,     4,    12,   299,   214,
-    74,    84,    85,    72,    73,    75,    76,    78,    77,   157,
-   288,    69,   159,    55,    83,    87,    88,    55,   287,   298,
-    84,    85,   262,   286,    75,    76,    78,    77,   240,   242,
-   241,   229,    21,   189,   201,    14,    69,     2,    10,    56,
-    11,    25,   323,    11,   145,   143,   142,   141,   103,    19,
-    20,   202,    21,   309,   199,    69,    15,    55,   260,   192,
-   111,   193,   194,     9,   160,    14,    18,    24,    10,   259,
-   247,   218,   139,   114,   113,   131,   281,   382,   112,    19,
-    20,   280,    21,   369,   310,   290,    15,   277,   276,   275,
-   274,   273,    83,   272,   285,    48,    47,    46,   131,    45,
-    44,    43,   384,   371,    55,    41,   206,   297,   207,    13,
-   173,   174,   389,   352,   210,   240,   242,   241,   301,   208,
-    83,   387,   324,   300,   209,   196,   195,   167,   168,   169,
-   170,   171,   172,    69,   381,   186,   338,   327,   315,   185,
-    12,    13,   311,   184,   258,   373,   351,   317,   225,   203,
-   312,    60,   390,   314,    67,   167,   168,   169,   170,   171,
-   172,    69,   380,   217,   361,   362,   315,   253,   254,   337,
-   364,   266,    12,   340,   363,   249,   294,   240,   242,   241,
-   353,   348,   339,   328,   322,    94,    11,   321,    96,   250,
-   366,   248,   336,   372,    55,   131,   376,   375,   374,   370,
-   126,   368,   222,   295,   293,   292,   289,   320,   316,   131,
-   383,   308,   279,   263,   251,   252,   220,   282,    11,   177,
-   283,   255,   256,   257,   119,    34,   211,   212,   213,   307,
-   278,   303,   296,   246,   149,   216,   137,    82,   215,   136,
-    81,   175,   117,   200,   135,   306,   271,   270,   226,   181,
-   123,    38,   378,   379,   360,   359,   357,   377,   356,   355,
-   354,   341,   334,   318,   305,   269,   180,   122,    37,   268,
-   304,   267,   265,   221,   179,   121,    36,   335,   244,   106,
-    49,    32,   261,   176,   118,    33,   133,   108,   243,   235,
-   234,   188,   233,   187,   232,   231,   230,   183,   104,    42,
-   182,   146,   124,    39,    17,    16,   264,   178,   120,    35,
-    31,    30,     8,    29,     7,    28,    27,    26,     3,     1,
-    23,   190,   130,   191,   330,    71,    70,    64,    89,   367,
-   165,   153,   284,    22,   319,   313,   148,   358,   343,   245,
-   197,   325,    40,   147,   388,   385,   349,    80,   237,   132,
-   291,    65,    54,    52 };
-yytabelem yypact[]={
-
-   -23,-10000000,-10000000,   -23,-10000000,-10000000,-10000000,-10000000,-10000000,-10000000,
--10000000,-10000000,-10000000,-10000000,-10000000,-10000000,-10000000,-10000000,-10000000,-10000000,
--10000000,-10000000,-10000000,   217,-10000000,-10000000,   212,   211,   210,   208,
-   207,   206,  -208,   -92,  -146,  -140,  -146,  -146,  -146,    95,
--10000000,-10000000,  -146,-10000000,-10000000,-10000000,-10000000,-10000000,-10000000,-10000000,
--10000000,-10000000,-10000000,-10000000,-10000000,  -282,-10000000,-10000000,-10000000,-10000000,
--10000000,-10000000,-10000000,-10000000,-10000000,-10000000,-10000000,-10000000,-10000000,-10000000,
--10000000,-10000000,-10000000,-10000000,  -165,-10000000,-10000000,-10000000,-10000000,-10000000,
-   186,   184,   183,-10000000,-10000000,  -161,-10000000,-10000000,-10000000,-10000000,
--10000000,-10000000,-10000000,-10000000,-10000000,-10000000,-10000000,  -282,-10000000,-10000000,
--10000000,-10000000,-10000000,-10000000,  -223,-10000000,  -146,-10000000,  -146,-10000000,
--10000000,-10000000,-10000000,-10000000,-10000000,  -156,-10000000,   182,  -146,    94,
-    93,    92,  -203,    91,-10000000,-10000000,  -282,-10000000,-10000000,-10000000,
--10000000,-10000000,-10000000,  -146,-10000000,     5,     5,     5,-10000000,-10000000,
--10000000,-10000000,-10000000,-10000000,-10000000,-10000000,   -53,   252,   251,   133,
--10000000,-10000000,-10000000,    80,   127,   281,  -248,   233,   247,-10000000,
--10000000,    33,    33,    33,  -282,-10000000,     5,-10000000,-10000000,-10000000,
--10000000,-10000000,-10000000,-10000000,-10000000,  -185,   180,-10000000,   -23,  -245,
-   278,  -143,    76,-10000000,-10000000,-10000000,-10000000,-10000000,-10000000,-10000000,
-  -217,  -142,-10000000,-10000000,-10000000,-10000000,-10000000,-10000000,-10000000,-10000000,
-   178,     5,     5,     5,     5,     5,     5,     5,     5,     5,
-     5,-10000000,-10000000,-10000000,   273,   177,   166,-10000000,-10000000,  -245,
--10000000,-10000000,-10000000,-10000000,-10000000,-10000000,-10000000,-10000000,-10000000,-10000000,
-   204,   202,   201,   200,   199,   198,-10000000,-10000000,-10000000,-10000000,
--10000000,-10000000,  -282,  -223,  -146,   133,     5,-10000000,   127,   281,
-  -248,   233,   233,   247,   247,-10000000,-10000000,-10000000,-10000000,-10000000,
--10000000,     5,-10000000,    68,    63,    55,  -245,  -146,   196,   -73,
-    43,   249,-10000000,-10000000,-10000000,-10000000,-10000000,-10000000,  -117,  -141,
-  -282,-10000000,-10000000,-10000000,-10000000,-10000000,-10000000,-10000000,-10000000,-10000000,
--10000000,-10000000,-10000000,-10000000,-10000000,-10000000,-10000000,  -282,  -166,-10000000,
--10000000,-10000000,-10000000,   130,   195,   271,  -143,  -146,   277,-10000000,
--10000000,-10000000,-10000000,-10000000,-10000000,-10000000,-10000000,-10000000,    89,   248,
-  -244,   266,  -200,-10000000,-10000000,-10000000,-10000000,-10000000,   265,-10000000,
--10000000,-10000000,-10000000,-10000000,  -182,  -146,  -247,   276,-10000000,   239,
-  -117,-10000000,-10000000,-10000000,-10000000,-10000000,-10000000,-10000000,-10000000,-10000000,
--10000000,-10000000,-10000000,-10000000,    36,  -182,  -208,   194,  -186,   215,
-     5,   275,  -223,  -200,  -146,-10000000,-10000000,-10000000,-10000000,-10000000,
--10000000,-10000000,-10000000,-10000000,   263,-10000000,-10000000,   188,  -146,   214,
-  -257,-10000000,-10000000,-10000000,-10000000,   250,-10000000,-10000000,   238,-10000000,
-  -264,-10000000 };
-yytabelem yypgo[]={
-
-     0,    14,   157,   523,   522,   521,     8,   209,   132,   520,
-   163,   519,   518,   517,   324,     9,     7,   516,   515,   514,
-     5,   513,   512,   511,   510,   509,   508,   507,   108,   506,
-   505,   504,   503,   502,     2,   501,   159,   142,   155,   179,
-   130,   182,   234,   500,   143,   141,    10,   499,   498,   105,
-   104,   103,   321,   497,   496,   495,     6,    76,   494,   493,
-     1,    15,   492,   491,   490,     0,   166,   489,   207,   488,
-   487,   162,   486,   158,   485,   484,   483,   482,   481,   480,
-   479,   478,   477,   476,   475,   474,   473,   472,   471,   470,
-   469,   468,   467,   466,   465,   464,   463,   462,   461,   460,
-   459,   458,   457,   456,   455,   454,   453,   452,   451,   450,
-   449,   448,   447,   446,   445,   444,   443,   442,   192,   118,
-   441,   440,   439,   438,   437,   436,   435,   434,   433,   432,
-   431,   430,     4,   429,   428,   427,   426,   425,   424,   423,
-   422,   421,   420,   419,   418,   417,    13,   416,   415,   414,
-   413,   412,   411,   410,   409,   408,   407,   406,   405,   404,
-   403,   401,   400,   399,   395,   394,   389,   383,   382,   381,
-   378,   377,   362,   357,   354,   353,     3,   352,   344,   343,
-   340,   339,   335,   334,   332,   322 };
-yytabelem yyr1[]={
-
-     0,    67,    68,    68,    70,    69,    72,    69,    74,    69,
-    76,    69,    78,    69,    79,    69,    80,    81,    82,    83,
-    77,    75,    75,    86,    87,    89,    84,    90,    64,    32,
-    91,    22,    22,    88,    88,    93,    92,    94,    92,    95,
-    92,    97,    92,    99,    92,   100,    92,    20,   101,    21,
-    21,    16,   102,    16,   103,    16,    65,    85,   104,   105,
-   106,   107,    71,    48,    48,    48,    48,    48,    48,    48,
-    48,    33,    34,    35,    35,    36,    36,    37,    37,    38,
-    38,    38,    39,    39,    39,    40,    40,    40,    40,    41,
-    41,    41,    41,    42,    42,    42,    43,    43,    43,    43,
-    43,    43,    44,   108,    66,    66,    66,    66,   110,   109,
-     1,     1,     2,     2,     2,    56,    56,    56,    56,    56,
-    56,     4,     4,     4,     3,     3,     3,    28,   111,    29,
-    29,    60,    60,    30,   112,    31,    31,    61,    62,    49,
-    49,    54,    54,    54,    55,    55,    55,    52,    52,    52,
-    50,    50,    57,    51,    53,   113,   114,   115,   117,     7,
-   116,   119,   119,   120,   121,   118,   122,   118,   123,   124,
-   125,   126,   127,   128,   129,   131,    10,     9,     9,     9,
-     9,     9,     9,   130,   133,   133,   134,   135,   132,   136,
-   132,    26,    27,    27,   137,    46,   138,   139,    46,   140,
-    47,   141,   142,   143,   145,     8,   144,   148,   147,   147,
-   146,   149,   150,     5,     5,   151,   152,    13,   154,   155,
-     6,     6,   153,   157,   158,    14,    14,   156,   159,    11,
-    24,    25,    25,   160,   161,    45,   162,   163,    96,    63,
-    63,   164,   165,   166,   167,    73,   168,   169,   171,   172,
-    98,    59,    59,    59,    12,    12,   173,   170,   174,   170,
-   175,   178,   177,   177,   179,   180,   176,    15,    15,    15,
-    58,    58,    58,   181,   182,    23,    23,   183,   184,    17,
-    17,    18,   185,    19,    19 };
-yytabelem yyr2[]={
-
-     0,     2,     4,     0,     1,     7,     1,     7,     1,     7,
-     1,     7,     1,     7,     1,     7,     1,     1,     1,     1,
-    19,     2,     2,     1,     1,     1,    15,     1,     7,     5,
-     1,     7,     1,     4,     0,     1,     7,     1,     7,     1,
-     7,     1,     7,     1,     7,     1,     7,     5,     1,     9,
-     1,     3,     1,     7,     1,     9,     3,     3,     1,     1,
-     1,     1,    19,     2,     2,     2,     2,     2,     3,     3,
-     3,     2,     2,     2,     7,     2,     7,     2,     7,     2,
-     7,     7,     2,     7,     7,     2,     7,     7,     7,     2,
-     5,     5,     5,     3,     2,     7,     3,     3,     3,     3,
-     3,     3,     3,     1,     7,     3,     3,     3,     1,     7,
-     2,     2,     3,     2,     3,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     5,     1,     9,
-     1,     2,     2,     5,     1,     9,     1,     3,     3,     2,
-     2,     3,     5,     3,     5,     7,     5,     3,     3,     5,
-     3,     3,     3,     3,     3,     1,     1,     1,     1,    19,
-     4,     4,     0,     1,     1,    11,     1,     7,     1,     1,
-     1,     1,     1,     1,     1,     1,    35,     3,     3,     3,
-     3,     2,     3,     4,     4,     0,     1,     1,    11,     1,
-     7,     5,     5,     1,     1,     7,     1,     1,    11,     1,
-     7,     1,     1,     1,     1,    19,     4,     1,     8,     0,
-     3,     1,     1,    13,     5,     1,     1,    11,     1,     1,
-    13,     3,     3,     1,     1,    13,     3,     3,     1,     7,
-     5,     5,     1,     1,     1,    11,     1,     1,    13,     3,
-     1,     1,     1,     1,     1,    19,     1,     1,     1,     1,
-    21,     3,     3,     1,     2,     3,     1,     7,     1,     9,
-     4,     1,     8,     0,     1,     1,    11,     3,     2,     3,
-     3,     3,     3,     1,     1,    13,     1,     1,     1,    13,
-     1,     5,     1,     9,     1 };
-yytabelem yychk[]={
-
--10000000,   -67,   -68,   -69,   -66,   -71,   -73,   -75,   -77,   256,
-   261,    -7,   -10,    -8,   258,   279,   -84,   -85,   259,   272,
-   273,   275,   -32,   -64,   260,   -68,   -70,   -72,   -74,   -76,
-   -78,   -79,  -108,  -104,  -164,   -80,  -113,  -123,  -141,   -86,
-   -22,    58,   -90,    59,    59,    59,    59,    59,    59,  -109,
-    -1,    -2,    -3,   -56,    -4,   -16,    -7,   -10,    -8,   -49,
-   -52,   -50,   -51,   -57,   -53,    -5,    -6,   -14,   -65,   298,
-   -54,   -55,   265,   266,   262,   267,   268,   270,   269,   271,
-   -13,  -153,  -156,   257,   263,   264,   276,   277,   278,   -48,
-   -49,   -50,   -57,   -51,   -52,    -6,   -14,   -16,   -65,   257,
-   -65,   -65,   -65,   123,   -91,   -65,  -110,   298,  -102,   262,
-   265,    44,    62,    60,    60,   262,   263,  -151,  -105,  -165,
-   -81,  -114,  -124,  -142,   -87,   -20,   -16,   -28,   -60,   -61,
-   -62,   -65,   -11,  -103,   -65,  -149,  -154,  -157,   262,    60,
-   -65,   123,   123,   123,   274,   123,   -88,   -21,   -29,  -159,
-   -65,   -44,   -34,   -35,   -36,   -37,   -38,   -39,   -40,   -41,
-   -42,    43,    45,   126,   -16,   -43,    40,   292,   293,   294,
-   295,   296,   297,   -44,   -44,  -152,  -106,  -166,   -82,  -115,
-  -125,  -143,   -89,   -92,   -66,   -71,   -73,   -96,   -98,   256,
-   -63,   -59,   282,   284,   285,    44,    44,   -24,   -45,    91,
-  -150,   124,    94,    38,   299,   300,    43,    45,    42,    47,
-    37,   -42,   -42,   -42,   -34,  -155,  -158,    -2,    61,  -119,
-   -68,  -116,  -118,    -1,   256,    40,  -144,  -146,   257,   125,
-   -93,   -94,   -95,   -97,   -99,  -100,   283,   -12,   -15,   286,
-   -56,    -6,   -16,  -101,  -111,   -25,  -160,    62,   -36,   -37,
-   -38,   -39,   -39,   -40,   -40,   -41,   -41,   -41,    41,    62,
-    62,  -107,  -118,  -167,   -83,  -117,  -119,  -120,  -122,  -126,
-  -145,  -147,    59,    59,    59,    59,    59,    59,  -162,  -168,
-   -16,   -60,   -45,   -44,   -33,   -34,   125,   125,   125,   -28,
-    59,    -9,   -49,   -50,   -57,   -51,    -8,   -16,   262,   125,
-    44,   -15,   257,  -161,  -121,  -127,  -148,  -163,  -169,    93,
-    59,    41,  -146,   -30,   -61,   -65,  -170,    40,  -128,   -31,
-  -171,  -173,  -174,   123,    44,   -23,   290,    41,  -175,  -176,
-   -58,   287,   288,   289,  -129,  -112,  -172,  -181,    41,  -177,
-  -179,  -130,  -132,   -26,   256,   -46,   281,   280,   -61,   -17,
-   291,    40,    44,   -15,  -131,  -133,  -134,  -136,   -27,  -137,
-  -138,  -183,  -182,  -178,  -180,   125,  -132,   -47,    -1,    59,
-   -46,    58,   -34,    40,   -20,  -176,   -60,  -135,  -140,  -139,
-  -184,    41,    59,   -60,    58,   -18,   293,    41,   -19,    44,
-  -185,   293 };
-yytabelem yydef[]={
-
-    -2,    -2,     1,    -2,     4,     6,     8,    10,    12,    14,
-   103,   105,   106,   107,    58,   241,    21,    22,    16,   155,
-   168,   201,    23,    -2,    27,     2,     0,     0,     0,     0,
-     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-    29,    30,     0,     5,     7,     9,    11,    13,    15,   104,
-   108,   110,   111,   112,   113,   114,   124,   125,   126,   115,
-   116,   117,   118,   119,   120,   121,   122,   123,    51,    52,
-   139,   140,   147,   148,   141,   150,   151,   153,   152,   154,
-     0,   221,   226,    56,   143,     0,   215,   222,   227,    59,
-    63,    64,    65,    66,    67,    68,    69,    70,   242,    17,
-   156,   169,   202,    24,     0,    28,     0,    54,     0,   142,
-   149,   211,   214,   218,   223,   144,   146,     0,     0,     0,
-     0,     0,     0,     0,    34,    31,    50,   109,   130,   131,
-   132,    -2,   138,     0,    53,     0,     0,     0,   145,   216,
-    60,   243,    18,   157,   170,   203,    -2,    47,   127,     0,
-    55,   212,   102,    72,    73,    75,    77,    79,    82,    85,
-    89,     0,     0,     0,    93,    94,     0,    96,    97,    98,
-    99,   100,   101,   219,   224,     0,     0,   162,    -2,     0,
-     0,     0,     0,    33,    35,    37,    39,    41,    43,    45,
-     0,     0,   239,   251,   252,    48,   128,   229,   232,   233,
-     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     0,    90,    91,    92,     0,     0,     0,   217,    61,    -2,
-    19,   158,   162,   163,   166,   171,   204,   209,   210,    26,
-     0,     0,     0,     0,     0,     0,   236,   246,   254,   255,
-   267,   268,   269,     0,     0,   230,     0,   213,    74,    76,
-    78,    80,    81,    83,    84,    86,    87,    88,    95,   220,
-   225,     0,   161,     0,     0,     0,    -2,     0,     0,     0,
-     0,   206,    36,    38,    40,    42,    44,    46,     0,     0,
-    49,   129,   231,   234,    62,    71,   245,    20,   159,   164,
-   167,   172,   177,   178,   179,   180,   181,   182,   141,   205,
-   207,   237,   247,     0,     0,     0,     0,     0,     0,   235,
-   165,   173,   208,   238,   136,   137,   248,    -2,     0,   133,
-   276,     0,     0,   174,   134,   249,   273,   257,     0,   263,
-   264,   270,   271,   272,     0,     0,   280,     0,   259,   260,
-     0,   175,   185,   186,   189,   193,   194,   196,   135,   250,
-   277,   274,   261,   265,     0,    -2,     0,     0,   191,     0,
-     0,     0,     0,     0,     0,   176,   184,   187,   199,   190,
-   192,   195,   197,   278,     0,   262,   266,     0,     0,     0,
-     0,   275,   188,   200,   198,     0,   284,   279,   281,   282,
-     0,   283 };
-typedef struct
-#ifdef __cplusplus
-	yytoktype
-#endif
-{ char *t_name; int t_val; } yytoktype;
-#ifndef YYDEBUG
-#	define YYDEBUG	1	/* allow debugging */
-#endif
-
-#if YYDEBUG
- 
-yytoktype yytoks[] =
-{
-	{"IDENTIFIER",	257},
-	{"IDL_CONST",	258},
-	{"IDL_MODULE",	259},
-	{"IDL_INTERFACE",	260},
-	{"IDL_TYPEDEF",	261},
-	{"IDL_LONG",	262},
-	{"IDL_SHORT",	263},
-	{"IDL_UNSIGNED",	264},
-	{"IDL_DOUBLE",	265},
-	{"IDL_FLOAT",	266},
-	{"IDL_CHAR",	267},
-	{"IDL_WCHAR",	268},
-	{"IDL_OCTET",	269},
-	{"IDL_BOOLEAN",	270},
-	{"IDL_ANY",	271},
-	{"IDL_STRUCT",	272},
-	{"IDL_UNION",	273},
-	{"IDL_SWITCH",	274},
-	{"IDL_ENUM",	275},
-	{"IDL_SEQUENCE",	276},
-	{"IDL_STRING",	277},
-	{"IDL_WSTRING",	278},
-	{"IDL_EXCEPTION",	279},
-	{"IDL_CASE",	280},
-	{"IDL_DEFAULT",	281},
-	{"IDL_READONLY",	282},
-	{"IDL_ATTRIBUTE",	283},
-	{"IDL_ONEWAY",	284},
-	{"IDL_IDEMPOTENT",	285},
-	{"IDL_VOID",	286},
-	{"IDL_IN",	287},
-	{"IDL_OUT",	288},
-	{"IDL_INOUT",	289},
-	{"IDL_RAISES",	290},
-	{"IDL_CONTEXT",	291},
-	{"IDL_INTEGER_LITERAL",	292},
-	{"IDL_STRING_LITERAL",	293},
-	{"IDL_CHARACTER_LITERAL",	294},
-	{"IDL_FLOATING_PT_LITERAL",	295},
-	{"IDL_TRUETOK",	296},
-	{"IDL_FALSETOK",	297},
-	{"IDL_SCOPE_DELIMITOR",	298},
-	{"IDL_LEFT_SHIFT",	299},
-	{"IDL_RIGHT_SHIFT",	300},
-	{"-unknown-",	-1}	/* ends search */
-};
-
-char * yyreds[] =
-{
-	"-no such reduction-",
-	"start : definitions",
-	"definitions : definition definitions",
-	"definitions : /* empty */",
-	"definition : type_dcl",
-	"definition : type_dcl ';'",
-	"definition : const_dcl",
-	"definition : const_dcl ';'",
-	"definition : exception",
-	"definition : exception ';'",
-	"definition : interface_def",
-	"definition : interface_def ';'",
-	"definition : module",
-	"definition : module ';'",
-	"definition : error",
-	"definition : error ';'",
-	"module : IDL_MODULE",
-	"module : IDL_MODULE IDENTIFIER",
-	"module : IDL_MODULE IDENTIFIER '{'",
-	"module : IDL_MODULE IDENTIFIER '{' definitions",
-	"module : IDL_MODULE IDENTIFIER '{' definitions '}'",
-	"interface_def : interface",
-	"interface_def : forward",
-	"interface : interface_header",
-	"interface : interface_header '{'",
-	"interface : interface_header '{' exports",
-	"interface : interface_header '{' exports '}'",
-	"interface_decl : IDL_INTERFACE",
-	"interface_decl : IDL_INTERFACE id",
-	"interface_header : interface_decl inheritance_spec",
-	"inheritance_spec : ':'",
-	"inheritance_spec : ':' at_least_one_scoped_name",
-	"inheritance_spec : /* empty */",
-	"exports : exports export",
-	"exports : /* empty */",
-	"export : type_dcl",
-	"export : type_dcl ';'",
-	"export : const_dcl",
-	"export : const_dcl ';'",
-	"export : exception",
-	"export : exception ';'",
-	"export : attribute",
-	"export : attribute ';'",
-	"export : operation",
-	"export : operation ';'",
-	"export : error",
-	"export : error ';'",
-	"at_least_one_scoped_name : scoped_name scoped_names",
-	"scoped_names : scoped_names ','",
-	"scoped_names : scoped_names ',' scoped_name",
-	"scoped_names : /* empty */",
-	"scoped_name : id",
-	"scoped_name : IDL_SCOPE_DELIMITOR",
-	"scoped_name : IDL_SCOPE_DELIMITOR id",
-	"scoped_name : scoped_name IDL_SCOPE_DELIMITOR",
-	"scoped_name : scoped_name IDL_SCOPE_DELIMITOR id",
-	"id : IDENTIFIER",
-	"forward : interface_decl",
-	"const_dcl : IDL_CONST",
-	"const_dcl : IDL_CONST const_type",
-	"const_dcl : IDL_CONST const_type id",
-	"const_dcl : IDL_CONST const_type id '='",
-	"const_dcl : IDL_CONST const_type id '=' expression",
-	"const_type : integer_type",
-	"const_type : char_type",
-	"const_type : octet_type",
-	"const_type : boolean_type",
-	"const_type : floating_pt_type",
-	"const_type : string_type_spec",
-	"const_type : wstring_type_spec",
-	"const_type : scoped_name",
-	"expression : const_expr",
-	"const_expr : or_expr",
-	"or_expr : xor_expr",
-	"or_expr : or_expr '|' xor_expr",
-	"xor_expr : and_expr",
-	"xor_expr : xor_expr '^' and_expr",
-	"and_expr : shift_expr",
-	"and_expr : and_expr '&' shift_expr",
-	"shift_expr : add_expr",
-	"shift_expr : shift_expr IDL_LEFT_SHIFT add_expr",
-	"shift_expr : shift_expr IDL_RIGHT_SHIFT add_expr",
-	"add_expr : mult_expr",
-	"add_expr : add_expr '+' mult_expr",
-	"add_expr : add_expr '-' mult_expr",
-	"mult_expr : unary_expr",
-	"mult_expr : mult_expr '*' unary_expr",
-	"mult_expr : mult_expr '/' unary_expr",
-	"mult_expr : mult_expr '%' unary_expr",
-	"unary_expr : primary_expr",
-	"unary_expr : '+' primary_expr",
-	"unary_expr : '-' primary_expr",
-	"unary_expr : '~' primary_expr",
-	"primary_expr : scoped_name",
-	"primary_expr : literal",
-	"primary_expr : '(' const_expr ')'",
-	"literal : IDL_INTEGER_LITERAL",
-	"literal : IDL_STRING_LITERAL",
-	"literal : IDL_CHARACTER_LITERAL",
-	"literal : IDL_FLOATING_PT_LITERAL",
-	"literal : IDL_TRUETOK",
-	"literal : IDL_FALSETOK",
-	"positive_int_expr : const_expr",
-	"type_dcl : IDL_TYPEDEF",
-	"type_dcl : IDL_TYPEDEF type_declarator",
-	"type_dcl : struct_type",
-	"type_dcl : union_type",
-	"type_dcl : enum_type",
-	"type_declarator : type_spec",
-	"type_declarator : type_spec at_least_one_declarator",
-	"type_spec : simple_type_spec",
-	"type_spec : constructed_type_spec",
-	"simple_type_spec : base_type_spec",
-	"simple_type_spec : template_type_spec",
-	"simple_type_spec : scoped_name",
-	"base_type_spec : integer_type",
-	"base_type_spec : floating_pt_type",
-	"base_type_spec : char_type",
-	"base_type_spec : boolean_type",
-	"base_type_spec : octet_type",
-	"base_type_spec : any_type",
-	"template_type_spec : sequence_type_spec",
-	"template_type_spec : string_type_spec",
-	"template_type_spec : wstring_type_spec",
-	"constructed_type_spec : struct_type",
-	"constructed_type_spec : union_type",
-	"constructed_type_spec : enum_type",
-	"at_least_one_declarator : declarator declarators",
-	"declarators : declarators ','",
-	"declarators : declarators ',' declarator",
-	"declarators : /* empty */",
-	"declarator : simple_declarator",
-	"declarator : complex_declarator",
-	"at_least_one_simple_declarator : simple_declarator simple_declarators",
-	"simple_declarators : simple_declarators ','",
-	"simple_declarators : simple_declarators ',' simple_declarator",
-	"simple_declarators : /* empty */",
-	"simple_declarator : id",
-	"complex_declarator : array_declarator",
-	"integer_type : signed_int",
-	"integer_type : unsigned_int",
-	"signed_int : IDL_LONG",
-	"signed_int : IDL_LONG IDL_LONG",
-	"signed_int : IDL_SHORT",
-	"unsigned_int : IDL_UNSIGNED IDL_LONG",
-	"unsigned_int : IDL_UNSIGNED IDL_LONG IDL_LONG",
-	"unsigned_int : IDL_UNSIGNED IDL_SHORT",
-	"floating_pt_type : IDL_DOUBLE",
-	"floating_pt_type : IDL_FLOAT",
-	"floating_pt_type : IDL_LONG IDL_DOUBLE",
-	"char_type : IDL_CHAR",
-	"char_type : IDL_WCHAR",
-	"octet_type : IDL_OCTET",
-	"boolean_type : IDL_BOOLEAN",
-	"any_type : IDL_ANY",
-	"struct_type : IDL_STRUCT",
-	"struct_type : IDL_STRUCT id",
-	"struct_type : IDL_STRUCT id '{'",
-	"struct_type : IDL_STRUCT id '{' at_least_one_member",
-	"struct_type : IDL_STRUCT id '{' at_least_one_member '}'",
-	"at_least_one_member : member members",
-	"members : members member",
-	"members : /* empty */",
-	"member : type_spec",
-	"member : type_spec at_least_one_declarator",
-	"member : type_spec at_least_one_declarator ';'",
-	"member : error",
-	"member : error ';'",
-	"union_type : IDL_UNION",
-	"union_type : IDL_UNION id",
-	"union_type : IDL_UNION id IDL_SWITCH",
-	"union_type : IDL_UNION id IDL_SWITCH '('",
-	"union_type : IDL_UNION id IDL_SWITCH '(' switch_type_spec",
-	"union_type : IDL_UNION id IDL_SWITCH '(' switch_type_spec ')'",
-	"union_type : IDL_UNION id IDL_SWITCH '(' switch_type_spec ')' '{'",
-	"union_type : IDL_UNION id IDL_SWITCH '(' switch_type_spec ')' '{' at_least_one_case_branch",
-	"union_type : IDL_UNION id IDL_SWITCH '(' switch_type_spec ')' '{' at_least_one_case_branch '}'",
-	"switch_type_spec : integer_type",
-	"switch_type_spec : char_type",
-	"switch_type_spec : octet_type",
-	"switch_type_spec : boolean_type",
-	"switch_type_spec : enum_type",
-	"switch_type_spec : scoped_name",
-	"at_least_one_case_branch : case_branch case_branches",
-	"case_branches : case_branches case_branch",
-	"case_branches : /* empty */",
-	"case_branch : at_least_one_case_label",
-	"case_branch : at_least_one_case_label element_spec",
-	"case_branch : at_least_one_case_label element_spec ';'",
-	"case_branch : error",
-	"case_branch : error ';'",
-	"at_least_one_case_label : case_label case_labels",
-	"case_labels : case_labels case_label",
-	"case_labels : /* empty */",
-	"case_label : IDL_DEFAULT",
-	"case_label : IDL_DEFAULT ':'",
-	"case_label : IDL_CASE",
-	"case_label : IDL_CASE const_expr",
-	"case_label : IDL_CASE const_expr ':'",
-	"element_spec : type_spec",
-	"element_spec : type_spec declarator",
-	"enum_type : IDL_ENUM",
-	"enum_type : IDL_ENUM id",
-	"enum_type : IDL_ENUM id '{'",
-	"enum_type : IDL_ENUM id '{' at_least_one_enumerator",
-	"enum_type : IDL_ENUM id '{' at_least_one_enumerator '}'",
-	"at_least_one_enumerator : enumerator enumerators",
-	"enumerators : enumerators ','",
-	"enumerators : enumerators ',' enumerator",
-	"enumerators : /* empty */",
-	"enumerator : IDENTIFIER",
-	"sequence_type_spec : seq_head ','",
-	"sequence_type_spec : seq_head ',' positive_int_expr",
-	"sequence_type_spec : seq_head ',' positive_int_expr '>'",
-	"sequence_type_spec : seq_head '>'",
-	"seq_head : IDL_SEQUENCE",
-	"seq_head : IDL_SEQUENCE '<'",
-	"seq_head : IDL_SEQUENCE '<' simple_type_spec",
-	"string_type_spec : string_head '<'",
-	"string_type_spec : string_head '<' positive_int_expr",
-	"string_type_spec : string_head '<' positive_int_expr '>'",
-	"string_type_spec : string_head",
-	"string_head : IDL_STRING",
-	"wstring_type_spec : wstring_head '<'",
-	"wstring_type_spec : wstring_head '<' positive_int_expr",
-	"wstring_type_spec : wstring_head '<' positive_int_expr '>'",
-	"wstring_type_spec : wstring_head",
-	"wstring_head : IDL_WSTRING",
-	"array_declarator : id",
-	"array_declarator : id at_least_one_array_dim",
-	"at_least_one_array_dim : array_dim array_dims",
-	"array_dims : array_dims array_dim",
-	"array_dims : /* empty */",
-	"array_dim : '['",
-	"array_dim : '[' positive_int_expr",
-	"array_dim : '[' positive_int_expr ']'",
-	"attribute : opt_readonly IDL_ATTRIBUTE",
-	"attribute : opt_readonly IDL_ATTRIBUTE param_type_spec",
-	"attribute : opt_readonly IDL_ATTRIBUTE param_type_spec at_least_one_simple_declarator",
-	"opt_readonly : IDL_READONLY",
-	"opt_readonly : /* empty */",
-	"exception : IDL_EXCEPTION",
-	"exception : IDL_EXCEPTION id",
-	"exception : IDL_EXCEPTION id '{'",
-	"exception : IDL_EXCEPTION id '{' members",
-	"exception : IDL_EXCEPTION id '{' members '}'",
-	"operation : opt_op_attribute op_type_spec",
-	"operation : opt_op_attribute op_type_spec IDENTIFIER",
-	"operation : opt_op_attribute op_type_spec IDENTIFIER parameter_list",
-	"operation : opt_op_attribute op_type_spec IDENTIFIER parameter_list opt_raises",
-	"operation : opt_op_attribute op_type_spec IDENTIFIER parameter_list opt_raises opt_context",
-	"opt_op_attribute : IDL_ONEWAY",
-	"opt_op_attribute : IDL_IDEMPOTENT",
-	"opt_op_attribute : /* empty */",
-	"op_type_spec : param_type_spec",
-	"op_type_spec : IDL_VOID",
-	"parameter_list : '('",
-	"parameter_list : '(' ')'",
-	"parameter_list : '('",
-	"parameter_list : '(' at_least_one_parameter ')'",
-	"at_least_one_parameter : parameter parameters",
-	"parameters : parameters ','",
-	"parameters : parameters ',' parameter",
-	"parameters : /* empty */",
-	"parameter : direction",
-	"parameter : direction param_type_spec",
-	"parameter : direction param_type_spec declarator",
-	"param_type_spec : base_type_spec",
-	"param_type_spec : string_type_spec",
-	"param_type_spec : scoped_name",
-	"direction : IDL_IN",
-	"direction : IDL_OUT",
-	"direction : IDL_INOUT",
-	"opt_raises : IDL_RAISES",
-	"opt_raises : IDL_RAISES '('",
-	"opt_raises : IDL_RAISES '(' at_least_one_scoped_name ')'",
-	"opt_raises : /* empty */",
-	"opt_context : IDL_CONTEXT",
-	"opt_context : IDL_CONTEXT '('",
-	"opt_context : IDL_CONTEXT '(' at_least_one_string_literal ')'",
-	"opt_context : /* empty */",
-	"at_least_one_string_literal : IDL_STRING_LITERAL string_literals",
-	"string_literals : string_literals ','",
-	"string_literals : string_literals ',' IDL_STRING_LITERAL",
-	"string_literals : /* empty */",
-};
-#endif /* YYDEBUG */
-# line	1 "/usr/ccs/bin/yaccpar"
-/*
- * Copyright (c) 1993 by Sun Microsystems, Inc.
- */
-
-#if !defined (ACE_WIN32)
-#pragma ident	"@(#)yaccpar	6.12	93/06/07 SMI"
-#endif /* ACE_WIN32 */
-
-/*
-** Skeleton parser driver for yacc output
-*/
-
-/*
-** yacc user known macros and defines
-*/
-#define YYERROR		goto yyerrlab
-#define YYACCEPT	return(0)
-#define YYABORT		return(1)
-#define YYBACKUP( newtoken, newvalue )\
-{\
-	if ( yychar >= 0 || ( yyr2[ yytmp ] >> 1 ) != 1 )\
-	{\
-		yyerror( "syntax error - cannot backup" );\
-		goto yyerrlab;\
-	}\
-	yychar = newtoken;\
-	yystate = *yyps;\
-	yylval = newvalue;\
-	goto yynewstate;\
-}
-#define YYRECOVERING()	(!!yyerrflag)
-#define YYNEW(type)	malloc(sizeof(type) * yynewmax)
-#define YYCOPY(to, from, type) \
-	(type *) memcpy(to, (char *) from, yynewmax * sizeof(type))
-#define YYENLARGE( from, type) \
-	(type *) realloc((char *) from, yynewmax * sizeof(type))
-#ifndef YYDEBUG
-#	define YYDEBUG	1	/* make debugging available */
-#endif
-
-/*
-** user known globals
-*/
-int yydebug;			/* set to 1 to get debugging */
-
-/*
-** driver internal defines
-*/
-#define YYFLAG		(-10000000)
-
-/*
-** global variables used by the parser
-*/
-YYSTYPE *yypv;			/* top of value stack */
-int *yyps;			/* top of state stack */
-
-int yystate;			/* current state */
-int yytmp;			/* extra var (lasts between blocks) */
-
-int yynerrs;			/* number of errors */
-int yyerrflag;			/* error recovery flag */
-int yychar;			/* current input token number */
-
-
-
-#ifdef YYNMBCHARS
-#define YYLEX()		yycvtok(yylex())
-/*
-** yycvtok - return a token if i is a wchar_t value that exceeds 255.
-**	If i<255, i itself is the token.  If i>255 but the neither 
-**	of the 30th or 31st bit is on, i is already a token.
-*/
-#if defined(__STDC__) || defined(__cplusplus)
-int yycvtok(int i)
-#else
-int yycvtok(i) int i;
-#endif
-{
-	int first = 0;
-	int last = YYNMBCHARS - 1;
-	int mid;
-	wchar_t j;
-
-	if(i&0x60000000){/*Must convert to a token. */
-		if( yymbchars[last].character < i ){
-			return i;/*Giving up*/
-		}
-		while ((last>=first)&&(first>=0)) {/*Binary search loop*/
-			mid = (first+last)/2;
-			j = yymbchars[mid].character;
-			if( j==i ){/*Found*/ 
-				return yymbchars[mid].tvalue;
-			}else if( j<i ){
-				first = mid + 1;
-			}else{
-				last = mid -1;
-			}
-		}
-		/*No entry in the table.*/
-		return i;/* Giving up.*/
-	}else{/* i is already a token. */
-		return i;
-	}
-}
-#else/*!YYNMBCHARS*/
-#define YYLEX()		yylex()
-#endif/*!YYNMBCHARS*/
-
-/*
-** yyparse - return 0 if worked, 1 if syntax error not recovered from
-*/
-#if defined(__STDC__) || defined(__cplusplus)
-int yyparse(void)
-#else
-int yyparse()
-#endif
-{
-	register YYSTYPE *yypvt;	/* top of value stack for $vars */
-
-#if defined(__cplusplus) || defined(lint)
-/*
-	hacks to please C++ and lint - goto's inside switch should never be
-	executed; yypvt is set to 0 to avoid "used before set" warning.
-*/
-	static int __yaccpar_lint_hack__ = 0;
-	switch (__yaccpar_lint_hack__)
-	{
-		case 1: goto yyerrlab;
-		case 2: goto yynewstate;
-	}
-	yypvt = 0;
-#endif
-
-	/*
-	** Initialize externals - yyparse may be called more than once
-	*/
-	yypv = &yyv[-1];
-	yyps = &yys[-1];
-	yystate = 0;
-	yytmp = 0;
-	yynerrs = 0;
-	yyerrflag = 0;
-	yychar = -1;
-
-#if YYMAXDEPTH <= 0
-	if (yymaxdepth <= 0)
-	{
-		if ((yymaxdepth = YYEXPAND(0)) <= 0)
-		{
-			yyerror("yacc initialization error");
-			YYABORT;
-		}
-	}
-#endif
-
-	{
-		register YYSTYPE *yy_pv;	/* top of value stack */
-		register int *yy_ps;		/* top of state stack */
-		register int yy_state;		/* current state */
-		register int  yy_n;		/* internal state number info */
-	goto yystack;	/* moved from 6 lines above to here to please C++ */
-
-		/*
-		** get globals into registers.
-		** branch to here only if YYBACKUP was called.
-		*/
-	yynewstate:
-		yy_pv = yypv;
-		yy_ps = yyps;
-		yy_state = yystate;
-		goto yy_newstate;
-
-		/*
-		** get globals into registers.
-		** either we just started, or we just finished a reduction
-		*/
-	yystack:
-		yy_pv = yypv;
-		yy_ps = yyps;
-		yy_state = yystate;
-
-		/*
-		** top of for (;;) loop while no reductions done
-		*/
-	yy_stack:
-		/*
-		** put a state and value onto the stacks
-		*/
-#if YYDEBUG
-		/*
-		** if debugging, look up token value in list of value vs.
-		** name pairs.  0 and negative (-1) are special values.
-		** Note: linear search is used since time is not a real
-		** consideration while debugging.
-		*/
-		if ( yydebug )
-		{
-			register int yy_i;
-
-			printf( "State %d, token ", yy_state );
-			if ( yychar == 0 )
-				printf( "end-of-file\n" );
-			else if ( yychar < 0 )
-				printf( "-none-\n" );
-			else
-			{
-				for ( yy_i = 0; yytoks[yy_i].t_val >= 0;
-					yy_i++ )
-				{
-					if ( yytoks[yy_i].t_val == yychar )
-						break;
-				}
-				printf( "%s\n", yytoks[yy_i].t_name );
-			}
-		}
-#endif /* YYDEBUG */
-		if ( ++yy_ps >= &yys[ yymaxdepth ] )	/* room on stack? */
-		{
-			/*
-			** reallocate and recover.  Note that pointers
-			** have to be reset, or bad things will happen
-			*/
-			int yyps_index = (yy_ps - yys);
-			int yypv_index = (yy_pv - yyv);
-			int yypvt_index = (yypvt - yyv);
-			int yynewmax;
-#ifdef YYEXPAND
-			yynewmax = YYEXPAND(yymaxdepth);
-#else
-			yynewmax = 2 * yymaxdepth;	/* double table size */
-			if (yymaxdepth == YYMAXDEPTH)	/* first time growth */
-			{
-				char *newyys = (char *)YYNEW(int);
-				char *newyyv = (char *)YYNEW(YYSTYPE);
-				if (newyys != 0 && newyyv != 0)
-				{
-					yys = YYCOPY(newyys, yys, int);
-					yyv = YYCOPY(newyyv, yyv, YYSTYPE);
-				}
-				else
-					yynewmax = 0;	/* failed */
-			}
-			else				/* not first time */
-			{
-				yys = YYENLARGE(yys, int);
-				yyv = YYENLARGE(yyv, YYSTYPE);
-				if (yys == 0 || yyv == 0)
-					yynewmax = 0;	/* failed */
-			}
-#endif
-			if (yynewmax <= yymaxdepth)	/* tables not expanded */
-			{
-				yyerror( "yacc stack overflow" );
-				YYABORT;
-			}
-			yymaxdepth = yynewmax;
-
-			yy_ps = yys + yyps_index;
-			yy_pv = yyv + yypv_index;
-			yypvt = yyv + yypvt_index;
-		}
-		*yy_ps = yy_state;
-		*++yy_pv = yyval;
-
-		/*
-		** we have a new state - find out what to do
-		*/
-	yy_newstate:
-		if ( ( yy_n = yypact[ yy_state ] ) <= YYFLAG )
-			goto yydefault;		/* simple state */
-#if YYDEBUG
-		/*
-		** if debugging, need to mark whether new token grabbed
-		*/
-		yytmp = yychar < 0;
-#endif
-		if ( ( yychar < 0 ) && ( ( yychar = YYLEX() ) < 0 ) )
-			yychar = 0;		/* reached EOF */
-#if YYDEBUG
-		if ( yydebug && yytmp )
-		{
-			register int yy_i;
-
-			printf( "Received token " );
-			if ( yychar == 0 )
-				printf( "end-of-file\n" );
-			else if ( yychar < 0 )
-				printf( "-none-\n" );
-			else
-			{
-				for ( yy_i = 0; yytoks[yy_i].t_val >= 0;
-					yy_i++ )
-				{
-					if ( yytoks[yy_i].t_val == yychar )
-						break;
-				}
-				printf( "%s\n", yytoks[yy_i].t_name );
-			}
-		}
-#endif /* YYDEBUG */
-		if ( ( ( yy_n += yychar ) < 0 ) || ( yy_n >= YYLAST ) )
-			goto yydefault;
-		if ( yychk[ yy_n = yyact[ yy_n ] ] == yychar )	/*valid shift*/
-		{
-			yychar = -1;
-			yyval = yylval;
-			yy_state = yy_n;
-			if ( yyerrflag > 0 )
-				yyerrflag--;
-			goto yy_stack;
-		}
-
-	yydefault:
-		if ( ( yy_n = yydef[ yy_state ] ) == -2 )
-		{
-#if YYDEBUG
-			yytmp = yychar < 0;
-#endif
-			if ( ( yychar < 0 ) && ( ( yychar = YYLEX() ) < 0 ) )
-				yychar = 0;		/* reached EOF */
-#if YYDEBUG
-			if ( yydebug && yytmp )
-			{
-				register int yy_i;
-
-				printf( "Received token " );
-				if ( yychar == 0 )
-					printf( "end-of-file\n" );
-				else if ( yychar < 0 )
-					printf( "-none-\n" );
-				else
-				{
-					for ( yy_i = 0;
-						yytoks[yy_i].t_val >= 0;
-						yy_i++ )
-					{
-						if ( yytoks[yy_i].t_val
-							== yychar )
-						{
-							break;
-						}
-					}
-					printf( "%s\n", yytoks[yy_i].t_name );
-				}
-			}
-#endif /* YYDEBUG */
-			/*
-			** look through exception table
-			*/
-			{
-				register int *yyxi = yyexca;
-
-				while ( ( *yyxi != -1 ) ||
-					( yyxi[1] != yy_state ) )
-				{
-					yyxi += 2;
-				}
-				while ( ( *(yyxi += 2) >= 0 ) &&
-					( *yyxi != yychar ) )
-					;
-				if ( ( yy_n = yyxi[1] ) < 0 )
-					YYACCEPT;
-			}
-		}
-
-		/*
-		** check for syntax error
-		*/
-		if ( yy_n == 0 )	/* have an error */
-		{
-			/* no worry about speed here! */
-			switch ( yyerrflag )
-			{
-			case 0:		/* new error */
-				yyerror( "syntax error" );
-				goto skip_init;
-			yyerrlab:
-				/*
-				** get globals into registers.
-				** we have a user generated syntax type error
-				*/
-				yy_pv = yypv;
-				yy_ps = yyps;
-				yy_state = yystate;
-			skip_init:
-				yynerrs++;
-				/* FALLTHRU */
-			case 1:
-			case 2:		/* incompletely recovered error */
-					/* try again... */
-				yyerrflag = 3;
-				/*
-				** find state where "error" is a legal
-				** shift action
-				*/
-				while ( yy_ps >= yys )
-				{
-					yy_n = yypact[ *yy_ps ] + YYERRCODE;
-					if ( yy_n >= 0 && yy_n < YYLAST &&
-						yychk[yyact[yy_n]] == YYERRCODE)					{
-						/*
-						** simulate shift of "error"
-						*/
-						yy_state = yyact[ yy_n ];
-						goto yy_stack;
-					}
-					/*
-					** current state has no shift on
-					** "error", pop stack
-					*/
-#if YYDEBUG
-#	define _POP_ "Error recovery pops state %d, uncovers state %d\n"
-					if ( yydebug )
-						printf( _POP_, *yy_ps,
-							yy_ps[-1] );
-#	undef _POP_
-#endif
-					yy_ps--;
-					yy_pv--;
-				}
-				/*
-				** there is no state on stack with "error" as
-				** a valid shift.  give up.
-				*/
-				YYABORT;
-			case 3:		/* no shift yet; eat a token */
-#if YYDEBUG
-				/*
-				** if debugging, look up token in list of
-				** pairs.  0 and negative shouldn't occur,
-				** but since timing doesn't matter when
-				** debugging, it doesn't hurt to leave the
-				** tests here.
-				*/
-				if ( yydebug )
-				{
-					register int yy_i;
-
-					printf( "Error recovery discards " );
-					if ( yychar == 0 )
-						printf( "token end-of-file\n" );
-					else if ( yychar < 0 )
-						printf( "token -none-\n" );
-					else
-					{
-						for ( yy_i = 0;
-							yytoks[yy_i].t_val >= 0;
-							yy_i++ )
-						{
-							if ( yytoks[yy_i].t_val
-								== yychar )
-							{
-								break;
-							}
-						}
-						printf( "token %s\n",
-							yytoks[yy_i].t_name );
-					}
-				}
-#endif /* YYDEBUG */
-				if ( yychar == 0 )	/* reached EOF. quit */
-					YYABORT;
-				yychar = -1;
-				goto yy_newstate;
-			}
-		}/* end if ( yy_n == 0 ) */
-		/*
-		** reduction by production yy_n
-		** put stack tops, etc. so things right after switch
-		*/
-#if YYDEBUG
-		/*
-		** if debugging, print the string that is the user's
-		** specification of the reduction which is just about
-		** to be done.
-		*/
-		if ( yydebug )
-			printf( "Reduce by (%d) \"%s\"\n",
-				yy_n, yyreds[ yy_n ] );
-#endif
-		yytmp = yy_n;			/* value to switch over */
-		yypvt = yy_pv;			/* $vars top of value stack */
-		/*
-		** Look in goto table for next state
-		** Sorry about using yy_state here as temporary
-		** register variable, but why not, if it works...
-		** If yyr2[ yy_n ] doesn't have the low order bit
-		** set, then there is no action to be done for
-		** this reduction.  So, no saving & unsaving of
-		** registers done.  The only difference between the
-		** code just after the if and the body of the if is
-		** the goto yy_stack in the body.  This way the test
-		** can be made before the choice of what to do is needed.
-		*/
-		{
-			/* length of production doubled with extra bit */
-			register int yy_len = yyr2[ yy_n ];
-
-			if ( !( yy_len & 01 ) )
-			{
-				yy_len >>= 1;
-				yyval = ( yy_pv -= yy_len )[1];	/* $$ = $1 */
-				yy_state = yypgo[ yy_n = yyr1[ yy_n ] ] +
-					*( yy_ps -= yy_len ) + 1;
-				if ( yy_state >= YYLAST ||
-					yychk[ yy_state =
-					yyact[ yy_state ] ] != -yy_n )
-				{
-					yy_state = yyact[ yypgo[ yy_n ] ];
-				}
-				goto yy_stack;
-			}
-			yy_len >>= 1;
-			yyval = ( yy_pv -= yy_len )[1];	/* $$ = $1 */
-			yy_state = yypgo[ yy_n = yyr1[ yy_n ] ] +
-				*( yy_ps -= yy_len ) + 1;
-			if ( yy_state >= YYLAST ||
-				yychk[ yy_state = yyact[ yy_state ] ] != -yy_n )
-			{
-				yy_state = yyact[ yypgo[ yy_n ] ];
-			}
-		}
-					/* save until reenter driver code */
-		yystate = yy_state;
-		yyps = yy_ps;
-		yypv = yy_pv;
-	}
-	/*
-	** code supplied by user is placed in this switch
-	*/
-	switch( yytmp )
-	{
-		
-case 4:
-# line 238 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_TypeDeclSeen);
-        } break;
-case 5:
-# line 242 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_NoState);
-        } break;
-case 6:
-# line 246 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_ConstDeclSeen);
-        } break;
-case 7:
-# line 250 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_NoState);
-        } break;
-case 8:
-# line 254 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_ExceptDeclSeen);
-        } break;
-case 9:
-# line 258 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_NoState);
-        } break;
-case 10:
-# line 262 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_InterfaceDeclSeen);
-        } break;
-case 11:
-# line 266 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_NoState);
-        } break;
-case 12:
-# line 270 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_ModuleDeclSeen);
-        } break;
-case 13:
-# line 274 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_NoState);
-        } break;
-case 14:
-# line 278 "idl.yy"
-{
-	  idl_global->err()->syntax_error(idl_global->parse_state());
-	} break;
-case 15:
-# line 282 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_NoState);
-	  yyerrok;
-	} break;
-case 16:
-# line 289 "idl.yy"
-{
-	    idl_global->set_parse_state(IDL_GlobalData::PS_ModuleSeen);
-	  } break;
-case 17:
-# line 293 "idl.yy"
-{
-	    UTL_ScopedName 	*n =
-		new UTL_ScopedName(new Identifier(yypvt[-0].strval, 1, 0, I_FALSE), NULL);
-	    AST_Module		*m = NULL;
-	    UTL_Scope		*s = idl_global->scopes()->top_non_null();
-	    UTL_StrList		*p = idl_global->pragmas();
-
-	    idl_global->set_parse_state(IDL_GlobalData::PS_ModuleIDSeen);
-	    /*
-	     * Make a new module and add it to the enclosing scope
-	     */
-	    if (s != NULL) {
-	      m = idl_global->gen()->create_module(n, p);
-	      (void) s->fe_add_module(m);
-	    }
-	    /*
-	     * Push it on the stack
-	     */
-	    idl_global->scopes()->push(m);
-	  } break;
-case 18:
-# line 314 "idl.yy"
-{
-	    idl_global->set_parse_state(IDL_GlobalData::PS_ModuleSqSeen);
-	  } break;
-case 19:
-# line 318 "idl.yy"
-{
-	    idl_global->set_parse_state(IDL_GlobalData::PS_ModuleBodySeen);
-	  } break;
-case 20:
-# line 322 "idl.yy"
-{
-	    idl_global->set_parse_state(IDL_GlobalData::PS_ModuleQsSeen);
-	    /*
-	     * Finished with this module - pop it from the scope stack
-	     */
-	    idl_global->scopes()->pop();
-	  } break;
-case 23:
-# line 338 "idl.yy"
-{
-	  UTL_Scope     *s = idl_global->scopes()->top_non_null();
-	  AST_Interface *i = NULL;
-	  AST_Decl	*v = NULL;
-	  UTL_StrList   *p = idl_global->pragmas();
-	  AST_Decl	*d = NULL;
-	  AST_Interface *fd = NULL;
-
-	  ACE_UNUSED_ARG (v);
-
-	  /*
-	   * Make a new interface node and add it to its enclosing scope
-	   */
-	  if (s != NULL && yypvt[-0].ihval != NULL) {
-	    i = idl_global->gen()->create_interface(yypvt[-0].ihval->interface_name(),
-						    yypvt[-0].ihval->inherits(),
-						    yypvt[-0].ihval->n_inherits(),
-						    p);
-	    if (i != NULL &&
-		(d = s->lookup_by_name(i->name(), I_FALSE)) != NULL) {
-	      /*
-	       * See if we're defining a forward declared interface.
-	       */
-	      if (d->node_type() == AST_Decl::NT_interface) {
-		/*
-		 * Narrow to an interface
-		 */
-		fd = AST_Interface::narrow_from_decl(d);
-		/*
-		 * Successful?
-		 */
-		if (fd == NULL) {
-		  /*
-		   * Should we give an error here?
-		   */
-		}
-		/*
-		 * If it is a forward declared interface..
-		 */
-		else if (!fd->is_defined()) {
-		  /*
-		   * Check if redefining in same scope
-		   */
-		  if (fd->defined_in() != s) {
-		    idl_global->err()
-		       ->error3(UTL_Error::EIDL_SCOPE_CONFLICT,
-				i,
-				fd,
-				ScopeAsDecl(s));
-		  }
-		  /*
-		   * All OK, do the redefinition
-		   */
-		  else {
-		    fd->set_inherits(yypvt[-0].ihval->inherits());
-		    fd->set_n_inherits(yypvt[-0].ihval->n_inherits());
-		    /*
-		     * Update place of definition
-		     */
-		    fd->set_imported(idl_global->imported());
-		    fd->set_in_main_file(idl_global->in_main_file());
-		    fd->set_line(idl_global->lineno());
-		    fd->set_file_name(idl_global->filename());
-		    fd->add_pragmas(p);
-		    /*
-		     * Use full definition node
-		     */
-		    delete i;
-		    i = fd;
-		  }
-	        }
-	      }
-	    }
-	    /*
-	     * Add the interface to its definition scope
-	     */
-	    (void) s->fe_add_interface(i);
-	  }
-	  /*
-	   * Push it on the scope stack
-	   */
-	  idl_global->scopes()->push(i);
-        } break;
-case 24:
-# line 422 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_InterfaceSqSeen);
-	} break;
-case 25:
-# line 426 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_InterfaceBodySeen);
-	} break;
-case 26:
-# line 430 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_InterfaceQsSeen);
-	  /*
-	   * Done with this interface - pop it off the scopes stack
-	   */
-	  idl_global->scopes()->pop();
-	} break;
-case 27:
-# line 441 "idl.yy"
-{
-	   idl_global->set_parse_state(IDL_GlobalData::PS_InterfaceSeen);
-	 } break;
-case 28:
-# line 445 "idl.yy"
-{
-	   idl_global->set_parse_state(IDL_GlobalData::PS_InterfaceIDSeen);
-	   yyval.idval = yypvt[-0].idval;
-	 } break;
-case 29:
-# line 453 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_InheritSpecSeen);
-	  /*
-	   * Create an AST representation of the information in the header
-	   * part of an interface - this representation contains a computed
-	   * list of all interfaces which this interface inherits from,
-	   * recursively
-	   */
-	  yyval.ihval = new FE_InterfaceHeader(new UTL_ScopedName(yypvt[-1].idval, NULL), yypvt[-0].nlval);
-	} break;
-case 30:
-# line 467 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_InheritColonSeen);
-        } break;
-case 31:
-# line 471 "idl.yy"
-{
-	  yyval.nlval = yypvt[-0].nlval;
-	} break;
-case 32:
-# line 475 "idl.yy"
-{
-	  yyval.nlval = NULL;
-	} break;
-case 35:
-# line 487 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_TypeDeclSeen);
-        } break;
-case 36:
-# line 491 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_NoState);
-        } break;
-case 37:
-# line 495 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_ConstDeclSeen);
-        } break;
-case 38:
-# line 499 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_NoState);
-        } break;
-case 39:
-# line 503 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_ExceptDeclSeen);
-        } break;
-case 40:
-# line 507 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_NoState);
-        } break;
-case 41:
-# line 511 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_AttrDeclSeen);
-        } break;
-case 42:
-# line 515 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_NoState);
-        } break;
-case 43:
-# line 519 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_OpDeclSeen);
-        } break;
-case 44:
-# line 523 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_NoState);
-        } break;
-case 45:
-# line 527 "idl.yy"
-{
-	  idl_global->err()->syntax_error(idl_global->parse_state());
-	} break;
-case 46:
-# line 531 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_NoState);
-	  yyerrok;
-	} break;
-case 47:
-# line 539 "idl.yy"
-{
-	  yyval.nlval = new UTL_NameList(yypvt[-1].idlist, yypvt[-0].nlval);
-	} break;
-case 48:
-# line 547 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_SNListCommaSeen);
-        } break;
-case 49:
-# line 551 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_ScopedNameSeen);
-
-	  if (yypvt[-3].nlval == NULL)
-	    yyval.nlval = new UTL_NameList(yypvt[-0].idlist, NULL);
-	  else {
-	    yypvt[-3].nlval->nconc(new UTL_NameList(yypvt[-0].idlist, NULL));
-	    yyval.nlval = yypvt[-3].nlval;
-	  }
-	} break;
-case 50:
-# line 562 "idl.yy"
-{
-	  yyval.nlval = NULL;
-	} break;
-case 51:
-# line 569 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_SN_IDSeen);
-
-	  yyval.idlist = new UTL_IdList(yypvt[-0].idval, NULL);
-	} break;
-case 52:
-# line 575 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_ScopeDelimSeen);
-        } break;
-case 53:
-# line 579 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_SN_IDSeen);
-
-	  yyval.idlist = new UTL_IdList(new Identifier(yypvt[-2].strval, 1, 0, I_FALSE),
-			      new UTL_IdList(yypvt[-0].idval, NULL));
-	} break;
-case 54:
-# line 587 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_ScopeDelimSeen);
-        } break;
-case 55:
-# line 591 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_SN_IDSeen);
-
-	  yypvt[-3].idlist->nconc(new UTL_IdList(yypvt[-0].idval, NULL));
-	  yyval.idlist = yypvt[-3].idlist;
-	} break;
-case 56:
-# line 600 "idl.yy"
-{
-            yyval.idval = new Identifier(yypvt[-0].strval, 1, 0, I_FALSE);
-        } break;
-case 57:
-# line 607 "idl.yy"
-{
-	  UTL_Scope		*s = idl_global->scopes()->top_non_null();
-	  UTL_ScopedName	*n = new UTL_ScopedName(yypvt[-0].idval, NULL);
-	  AST_InterfaceFwd	*f = NULL;
-	  UTL_StrList		*p = idl_global->pragmas();
-
-	  idl_global->set_parse_state(IDL_GlobalData::PS_ForwardDeclSeen);
-	  /*
-	   * Create a node representing a forward declaration of an
-	   * interface. Store it in the enclosing scope
-	   */
-	  if (s != NULL) {
-	    f = idl_global->gen()->create_interface_fwd(n, p);
-	    (void) s->fe_add_interface_fwd(f);
-	  }
-	} break;
-case 58:
-# line 627 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_ConstSeen);
-        } break;
-case 59:
-# line 631 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_ConstTypeSeen);
-        } break;
-case 60:
-# line 635 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_ConstIDSeen);
-        } break;
-case 61:
-# line 639 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_ConstAssignSeen);
-        } break;
-case 62:
-# line 643 "idl.yy"
-{
-	  UTL_ScopedName	*n = new UTL_ScopedName(yypvt[-4].idval, NULL);
-	  UTL_Scope		*s = idl_global->scopes()->top_non_null();
-	  AST_Constant		*c = NULL;
-	  UTL_StrList		*p = idl_global->pragmas();
-	  AST_Decl		*v = NULL;
-
-	  ACE_UNUSED_ARG (v);
-
-	  idl_global->set_parse_state(IDL_GlobalData::PS_ConstExprSeen);
-	  /*
-	   * Create a node representing a constant declaration. Store
-	   * it in the enclosing scope
-	   */
-	  if (yypvt[-0].exval != NULL && s != NULL) {
-	    if (yypvt[-0].exval->coerce(yypvt[-6].etval) == NULL)
-	      idl_global->err()->coercion_error(yypvt[-0].exval, yypvt[-6].etval);
-	    else {
-	      c =
-		idl_global->gen()->create_constant(yypvt[-6].etval, yypvt[-0].exval, n, p);
-	      (void) s->fe_add_constant(c);
-	    }
-	  }
-	} break;
-case 68:
-# line 676 "idl.yy"
-{
-	  yyval.etval = AST_Expression::EV_string;
-	} break;
-case 69:
-# line 680 "idl.yy"
-{
-	  yyval.etval = AST_Expression::EV_wstring;
-        } break;
-case 70:
-# line 684 "idl.yy"
-{
-	  UTL_Scope		*s = idl_global->scopes()->top_non_null();
-	  AST_Decl		*d = NULL;
-	  AST_PredefinedType	*c = NULL;
-	  AST_Typedef		*t = NULL;
-
-	  /*
-	   * If the constant's type is a scoped name, it must resolve
-	   * to a scalar constant type
-	   */
-	  if (s != NULL && (d = s->lookup_by_name(yypvt[-0].idlist, I_TRUE)) != NULL) {
-	    /*
-	     * Look through typedefs
-	     */
-	    while (d->node_type() == AST_Decl::NT_typedef) {
-	      t = AST_Typedef::narrow_from_decl(d);
-	      if (t == NULL)
-	        break;
-	      d = t->base_type();
-	    }
-	    if (d == NULL)
-	      yyval.etval = AST_Expression::EV_any;
-	    else if (d->node_type() == AST_Decl::NT_pre_defined) {
-	      c = AST_PredefinedType::narrow_from_decl(d);
-	      if (c != NULL) {
-	         yyval.etval = idl_global->PredefinedTypeToExprType(c->pt());
-	      } else {
-	         yyval.etval = AST_Expression::EV_any;
-	      }
-	    } else
-	      yyval.etval = AST_Expression::EV_any;
-	  } else
-	    yyval.etval = AST_Expression::EV_any;
-	} break;
-case 74:
-# line 726 "idl.yy"
-{
-	  yyval.exval = idl_global->gen()->create_expr(AST_Expression::EC_or, yypvt[-2].exval, yypvt[-0].exval);
-	} break;
-case 76:
-# line 734 "idl.yy"
-{
-	  yyval.exval = idl_global->gen()->create_expr(AST_Expression::EC_xor, yypvt[-2].exval, yypvt[-0].exval);
-	} break;
-case 78:
-# line 742 "idl.yy"
-{
-	  yyval.exval = idl_global->gen()->create_expr(AST_Expression::EC_and, yypvt[-2].exval, yypvt[-0].exval);
-	} break;
-case 80:
-# line 750 "idl.yy"
-{
-	  yyval.exval = idl_global->gen()->create_expr(AST_Expression::EC_right,yypvt[-2].exval,yypvt[-0].exval);
-	} break;
-case 81:
-# line 754 "idl.yy"
-{
-	  yyval.exval = idl_global->gen()->create_expr(AST_Expression::EC_left,yypvt[-2].exval,yypvt[-0].exval);
-	} break;
-case 83:
-# line 762 "idl.yy"
-{
-	  yyval.exval = idl_global->gen()->create_expr(AST_Expression::EC_add, yypvt[-2].exval, yypvt[-0].exval);
-	} break;
-case 84:
-# line 766 "idl.yy"
-{
-	  yyval.exval = idl_global->gen()->create_expr(AST_Expression::EC_minus,yypvt[-2].exval,yypvt[-0].exval);
-	} break;
-case 86:
-# line 774 "idl.yy"
-{
-	  yyval.exval = idl_global->gen()->create_expr(AST_Expression::EC_mul, yypvt[-2].exval, yypvt[-0].exval);
-	} break;
-case 87:
-# line 778 "idl.yy"
-{
-	  yyval.exval = idl_global->gen()->create_expr(AST_Expression::EC_div, yypvt[-2].exval, yypvt[-0].exval);
-	} break;
-case 88:
-# line 782 "idl.yy"
-{
-	  yyval.exval = idl_global->gen()->create_expr(AST_Expression::EC_mod, yypvt[-2].exval, yypvt[-0].exval);
-	} break;
-case 90:
-# line 790 "idl.yy"
-{
-	  yyval.exval = idl_global->gen()->create_expr(AST_Expression::EC_u_plus,
-					      yypvt[-0].exval,
-					      NULL);
-	} break;
-case 91:
-# line 796 "idl.yy"
-{
-	  yyval.exval = idl_global->gen()->create_expr(AST_Expression::EC_u_minus,
-					      yypvt[-0].exval,
-					      NULL);
-	} break;
-case 92:
-# line 802 "idl.yy"
-{
-	  yyval.exval = idl_global->gen()->create_expr(AST_Expression::EC_bit_neg,
-					      yypvt[-0].exval,
-					      NULL);
-	} break;
-case 93:
-# line 811 "idl.yy"
-{
-	  /*
-	   * An expression which is a scoped name is not resolved now,
-	   * but only when it is evaluated (such as when it is assigned
-	   * as a constant value)
-	   */
-	  yyval.exval = idl_global->gen()->create_expr(yypvt[-0].idlist);
-	} break;
-case 95:
-# line 821 "idl.yy"
-{
-	  yyval.exval = yypvt[-1].exval;
-	} break;
-case 96:
-# line 828 "idl.yy"
-{
-	  yyval.exval = idl_global->gen()->create_expr(yypvt[-0].ival);
-	} break;
-case 97:
-# line 832 "idl.yy"
-{
-	  yyval.exval = idl_global->gen()->create_expr(yypvt[-0].sval);
-	} break;
-case 98:
-# line 836 "idl.yy"
-{
-	  yyval.exval = idl_global->gen()->create_expr(yypvt[-0].cval);
-	} break;
-case 99:
-# line 840 "idl.yy"
-{
-	  yyval.exval = idl_global->gen()->create_expr(yypvt[-0].dval);
-	} break;
-case 100:
-# line 844 "idl.yy"
-{
-	  yyval.exval = idl_global->gen()->create_expr((idl_bool) I_TRUE,
-					    AST_Expression::EV_bool);
-	} break;
-case 101:
-# line 849 "idl.yy"
-{
-	  yyval.exval = idl_global->gen()->create_expr((idl_bool) I_FALSE,
-					    AST_Expression::EV_bool);
-	} break;
-case 102:
-# line 857 "idl.yy"
-{
-	    yypvt[-0].exval->evaluate(AST_Expression::EK_const);
-	    yyval.exval = idl_global->gen()->create_expr(yypvt[-0].exval, AST_Expression::EV_ulong);
-	} break;
-case 103:
-# line 865 "idl.yy"
-{
-	    idl_global->set_parse_state(IDL_GlobalData::PS_TypedefSeen);
-	  } break;
-case 104:
-# line 868 "idl.yy"
-{yyval.ival = 0;} break;
-case 105:
-# line 869 "idl.yy"
-{ yyval.ival = 0;} break;
-case 106:
-# line 870 "idl.yy"
-{ yyval.ival = 0;} break;
-case 107:
-# line 871 "idl.yy"
-{ yyval.ival = 0;} break;
-case 108:
-# line 876 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_TypeSpecSeen);
-        } break;
-case 109:
-# line 880 "idl.yy"
-{
-	  UTL_Scope		*s = idl_global->scopes()->top_non_null();
-	  UTL_DecllistActiveIterator *l;
-	  FE_Declarator		*d = NULL;
-	  AST_Typedef		*t = NULL;
-	  AST_Decl		*v = NULL;
-	  UTL_StrList		*p = idl_global->pragmas();
-
-      ACE_UNUSED_ARG (v);
-
-	  idl_global->set_parse_state(IDL_GlobalData::PS_DeclaratorsSeen);
-	  /*
-	   * Create a list of type renamings. Add them to the
-	   * enclosing scope
-	   */
-	  if (s != NULL && yypvt[-2].dcval != NULL && yypvt[-0].dlval != NULL) {
-	    l = new UTL_DecllistActiveIterator(yypvt[-0].dlval);
-	    for (;!(l->is_done()); l->next()) {
-	      d = l->item();
-	      if (d == NULL)
-		      continue;
-          AST_Type * tp = d->compose(yypvt[-2].dcval);
-          if (tp == NULL)
-		     continue;
-	      t = idl_global->gen()->create_typedef(tp, d->name(), p);
-	      (void) s->fe_add_typedef(t);
-	    }
-	    delete l;
-	  }
-	} break;
-case 112:
-# line 919 "idl.yy"
-{
-	  yyval.dcval = idl_global->scopes()->bottom()->lookup_primitive_type(yypvt[-0].etval);
-	} break;
-case 114:
-# line 924 "idl.yy"
-{
-	  UTL_Scope	*s = idl_global->scopes()->top_non_null();
-	  AST_Decl	*d = NULL;
-
-	  if (s != NULL)
-	    d = s->lookup_by_name(yypvt[-0].idlist, I_TRUE);
-	  if (d == NULL)
-	    idl_global->err()->lookup_error(yypvt[-0].idlist);
-	  yyval.dcval = d;
-	} break;
-case 127:
-# line 959 "idl.yy"
-{
-	  yyval.dlval = new UTL_DeclList(yypvt[-1].deval, yypvt[-0].dlval);
-	} break;
-case 128:
-# line 967 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_DeclsCommaSeen);
-        } break;
-case 129:
-# line 971 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_DeclsDeclSeen);
-
-	  if (yypvt[-3].dlval == NULL)
-	    yyval.dlval = new UTL_DeclList(yypvt[-0].deval, NULL);
-	  else {
-	    yypvt[-3].dlval->nconc(new UTL_DeclList(yypvt[-0].deval, NULL));
-	    yyval.dlval = yypvt[-3].dlval;
-	  }
-	} break;
-case 130:
-# line 982 "idl.yy"
-{
-	  yyval.dlval = NULL;
-	} break;
-case 133:
-# line 994 "idl.yy"
-{
-	  yyval.dlval = new UTL_DeclList(yypvt[-1].deval, yypvt[-0].dlval);
-	} break;
-case 134:
-# line 1002 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_DeclsCommaSeen);
-        } break;
-case 135:
-# line 1006 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_DeclsDeclSeen);
-
-	  if (yypvt[-3].dlval == NULL)
-	    yyval.dlval = new UTL_DeclList(yypvt[-0].deval, NULL);
-	  else {
-	    yypvt[-3].dlval->nconc(new UTL_DeclList(yypvt[-0].deval, NULL));
-	    yyval.dlval = yypvt[-3].dlval;
-	  }
-	} break;
-case 136:
-# line 1017 "idl.yy"
-{
-	  yyval.dlval = NULL;
-	} break;
-case 137:
-# line 1024 "idl.yy"
-{
-	  yyval.deval = new FE_Declarator(new UTL_ScopedName(yypvt[-0].idval, NULL),
-				 FE_Declarator::FD_simple, NULL);
-	} break;
-case 138:
-# line 1032 "idl.yy"
-{
-	  yyval.deval = new FE_Declarator(new UTL_ScopedName(yypvt[-0].dcval->local_name(), NULL),
-				 FE_Declarator::FD_complex,
-				 yypvt[-0].dcval);
-	} break;
-case 141:
-# line 1046 "idl.yy"
-{
-	  yyval.etval = AST_Expression::EV_long;
-	} break;
-case 142:
-# line 1050 "idl.yy"
-{
-	  yyval.etval = AST_Expression::EV_longlong;
-        } break;
-case 143:
-# line 1054 "idl.yy"
-{
-	  yyval.etval = AST_Expression::EV_short;
-	} break;
-case 144:
-# line 1061 "idl.yy"
-{
-	  yyval.etval = AST_Expression::EV_ulong;
-	} break;
-case 145:
-# line 1065 "idl.yy"
-{
-	  yyval.etval = AST_Expression::EV_ulonglong;
-        } break;
-case 146:
-# line 1069 "idl.yy"
-{
-	  yyval.etval = AST_Expression::EV_ushort;
-	} break;
-case 147:
-# line 1076 "idl.yy"
-{
-	  yyval.etval = AST_Expression::EV_double;
-	} break;
-case 148:
-# line 1080 "idl.yy"
-{
-	  yyval.etval = AST_Expression::EV_float;
-	} break;
-case 149:
-# line 1084 "idl.yy"
-{
-	  yyval.etval = AST_Expression::EV_longdouble;
-        } break;
-case 150:
-# line 1091 "idl.yy"
-{
-	  yyval.etval = AST_Expression::EV_char;
-	} break;
-case 151:
-# line 1095 "idl.yy"
-{
-	  yyval.etval = AST_Expression::EV_wchar;
-        } break;
-case 152:
-# line 1102 "idl.yy"
-{
-          yyval.etval = AST_Expression::EV_octet;
-	} break;
-case 153:
-# line 1109 "idl.yy"
-{
-	  yyval.etval = AST_Expression::EV_bool;
-        } break;
-case 154:
-# line 1116 "idl.yy"
-{
-	  yyval.etval = AST_Expression::EV_any;
-	} break;
-case 155:
-# line 1123 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_StructSeen);
-        } break;
-case 156:
-# line 1127 "idl.yy"
-{
-	  UTL_Scope		*s = idl_global->scopes()->top_non_null();
-	  UTL_ScopedName	*n = new UTL_ScopedName(yypvt[-0].idval, NULL);
-	  AST_Structure		*d = NULL;
-	  UTL_StrList		*p = idl_global->pragmas();
-	  AST_Decl		*v = NULL;
-
-          ACE_UNUSED_ARG (v);
-
-	  idl_global->set_parse_state(IDL_GlobalData::PS_StructIDSeen);
-	  /*
-	   * Create a node representing a struct declaration. Add it
-	   * to the enclosing scope
-	   */
-	  if (s != NULL) {
-	    d = idl_global->gen()->create_structure(n, p);
-	    (void) s->fe_add_structure(d);
-	  }
-	  /*
-	   * Push the scope of the struct on the scopes stack
-	   */
-	  idl_global->scopes()->push(d);
-	} break;
-case 157:
-# line 1151 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_StructSqSeen);
-        } break;
-case 158:
-# line 1155 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_StructBodySeen);
-        } break;
-case 159:
-# line 1159 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_StructQsSeen);
-	  /*
-	   * Done with this struct. Pop its scope off the scopes stack
-	   */
-	  if (idl_global->scopes()->top() == NULL)
-	    yyval.dcval = NULL;
-	  else {
-	    yyval.dcval =
-	      AST_Structure::narrow_from_scope(
-				   idl_global->scopes()->top_non_null());
-	    idl_global->scopes()->pop();
-	  }
-	} break;
-case 163:
-# line 1184 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_MemberTypeSeen);
-        } break;
-case 164:
-# line 1188 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_MemberDeclsSeen);
-        } break;
-case 165:
-# line 1192 "idl.yy"
-{
-	  UTL_Scope		*s = idl_global->scopes()->top_non_null();
-	  UTL_DecllistActiveIterator *l = NULL;
-	  FE_Declarator		*d = NULL;
-	  AST_Field		*f = NULL;
-	  UTL_StrList		*p = idl_global->pragmas();
-
-	  idl_global->set_parse_state(IDL_GlobalData::PS_MemberDeclsCompleted);
-	  /*
-	   * Check for illegal recursive use of type
-	   */
-	  if (yypvt[-4].dcval != NULL && AST_illegal_recursive_type(yypvt[-4].dcval))
-	    idl_global->err()->error1(UTL_Error::EIDL_RECURSIVE_TYPE, yypvt[-4].dcval);
-	  /*
-	   * Create a node representing a struct or exception member
-	   * Add it to the enclosing scope
-	   */
-	  else if (s != NULL && yypvt[-4].dcval != NULL && yypvt[-2].dlval != NULL) {
-	    l = new UTL_DecllistActiveIterator(yypvt[-2].dlval);
-	    for (;!(l->is_done()); l->next()) {
-	      d = l->item();
-	      if (d == NULL)
-		continue;
- 	      AST_Type *tp = d->compose(yypvt[-4].dcval);
-	      if (tp == NULL)
-		continue;
-	      f = idl_global->gen()->create_field(tp, d->name(), p);
-	      (void) s->fe_add_field(f);
-	    }
-	    delete l;
-	  }
-	} break;
-case 166:
-# line 1225 "idl.yy"
-{
-	  idl_global->err()->syntax_error(idl_global->parse_state());
-	} break;
-case 167:
-# line 1229 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_NoState);
-	  yyerrok;
-	} break;
-case 168:
-# line 1237 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_UnionSeen);
-        } break;
-case 169:
-# line 1241 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_UnionIDSeen);
-        } break;
-case 170:
-# line 1245 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_SwitchSeen);
-        } break;
-case 171:
-# line 1249 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_SwitchOpenParSeen);
-        } break;
-case 172:
-# line 1253 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_SwitchTypeSeen);
-        } break;
-case 173:
-# line 1257 "idl.yy"
-{
-	  UTL_Scope		*s = idl_global->scopes()->top_non_null();
-	  UTL_ScopedName	*n = new UTL_ScopedName(yypvt[-8].idval, NULL);
-	  AST_Union		*u = NULL;
-	  AST_Decl		*v = NULL;
-	  UTL_StrList		*p = idl_global->pragmas();
-
-          ACE_UNUSED_ARG (v);
-
-	  idl_global->set_parse_state(IDL_GlobalData::PS_SwitchCloseParSeen);
-	  /*
-	   * Create a node representing a union. Add it to its enclosing
-	   * scope
-	   */
-	  if (yypvt[-2].dcval != NULL && s != NULL) {
- 	    AST_ConcreteType    *tp = AST_ConcreteType::narrow_from_decl(yypvt[-2].dcval);
-            if (tp == NULL) {
-              idl_global->err()->not_a_type(yypvt[-2].dcval);
-            } else {
-	      u = idl_global->gen()->create_union(tp, n, p);
-	      (void) s->fe_add_union(u);
- 	    }
-	  }
-	  /*
-	   * Push the scope of the union on the scopes stack
-	   */
-	  idl_global->scopes()->push(u);
-	} break;
-case 174:
-# line 1286 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_UnionSqSeen);
-        } break;
-case 175:
-# line 1290 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_UnionBodySeen);
-        } break;
-case 176:
-# line 1294 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_UnionQsSeen);
-	  /*
-	   * Done with this union. Pop its scope from the scopes stack
-	   */
-	  if (idl_global->scopes()->top() == NULL)
-	    yyval.dcval = NULL;
-	  else {
-	    yyval.dcval =
-	      AST_Union::narrow_from_scope(
-				idl_global->scopes()->top_non_null());
-	    idl_global->scopes()->pop();
-	  }
-	} break;
-case 177:
-# line 1312 "idl.yy"
-{
-	  yyval.dcval = idl_global->scopes()->bottom()->lookup_primitive_type(yypvt[-0].etval);
-	} break;
-case 178:
-# line 1316 "idl.yy"
-{
-	  yyval.dcval = idl_global->scopes()->bottom()->lookup_primitive_type(yypvt[-0].etval);
-	} break;
-case 179:
-# line 1320 "idl.yy"
-{
-	  yyval.dcval = idl_global->scopes()->bottom()->lookup_primitive_type(yypvt[-0].etval);
-	} break;
-case 180:
-# line 1324 "idl.yy"
-{
-	  yyval.dcval = idl_global->scopes()->bottom()->lookup_primitive_type(yypvt[-0].etval);
-	} break;
-case 182:
-# line 1329 "idl.yy"
-{
-	  UTL_Scope		*s = idl_global->scopes()->top_non_null();
-	  AST_Decl		*d = NULL;
-	  AST_PredefinedType	*p = NULL;
-	  AST_Typedef		*t = NULL;
-	  long			found = I_FALSE;
-
-	  /*
-	   * The discriminator is a scoped name. Try to resolve to
-	   * one of the scalar types or to an enum. Thread through
-	   * typedef's to arrive at the base type at the end of the
-	   * chain
-	   */
-	  if (s != NULL && (d = s->lookup_by_name(yypvt[-0].idlist, I_TRUE)) != NULL) {
-	    while (!found) {
-	      switch (d->node_type()) {
-	      case AST_Decl::NT_enum:
-		yyval.dcval = d;
-		found = I_TRUE;
-		break;
-	      case AST_Decl::NT_pre_defined:
-		p = AST_PredefinedType::narrow_from_decl(d);
-		if (p != NULL) {
-		  switch (p->pt()) {
-		  case AST_PredefinedType::PT_long:
-		  case AST_PredefinedType::PT_ulong:
-		  case AST_PredefinedType::PT_longlong:
-		  case AST_PredefinedType::PT_ulonglong:
-		  case AST_PredefinedType::PT_short:
-		  case AST_PredefinedType::PT_char:
-		  case AST_PredefinedType::PT_wchar:
-		  case AST_PredefinedType::PT_octet:
-		  case AST_PredefinedType::PT_boolean:
-		    yyval.dcval = p;
-		    found = I_TRUE;
-		    break;
-		  default:
-		    yyval.dcval = NULL;
-		    found = I_TRUE;
-		    break;
-		  }
-		}
-		break;
-	      case AST_Decl::NT_typedef:
-		t = AST_Typedef::narrow_from_decl(d);
-		if (t != NULL) d = t->base_type();
-		break;
-	      default:
-		yyval.dcval = NULL;
-		found = I_TRUE;
-		break;
-	      }
-	    }
-	  } else
-	    yyval.dcval = NULL;
-
-	  if (yyval.dcval == NULL)
-	    idl_global->err()->lookup_error(yypvt[-0].idlist);
-	} break;
-case 186:
-# line 1399 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_UnionLabelSeen);
-        } break;
-case 187:
-# line 1403 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_UnionElemSeen);
-        } break;
-case 188:
-# line 1407 "idl.yy"
-{
-	  UTL_Scope		*s = idl_global->scopes()->top_non_null();
-	  UTL_LabellistActiveIterator *l = NULL;
-	  AST_UnionLabel	*d = NULL;
-	  AST_UnionBranch	*b = NULL;
-	  AST_Field		*f = yypvt[-2].ffval;
-
-	  idl_global->set_parse_state(IDL_GlobalData::PS_UnionElemCompleted);
-	  /*
-	   * Create several nodes representing branches of a union.
-	   * Add them to the enclosing scope (the union scope)
-	   */
-	  if (s != NULL && yypvt[-4].llval != NULL && yypvt[-2].ffval != NULL) {
-	    l = new UTL_LabellistActiveIterator(yypvt[-4].llval);
-	    for (;!(l->is_done()); l->next()) {
-	      d = l->item();
-	      if (d == NULL)
-		continue;
-	      b = idl_global->gen()->create_union_branch(d,
-						      f->field_type(),
-						      f->name(),
-						      f->pragmas());
-	      (void) s->fe_add_union_branch(b);
-	    }
-	    delete l;
-	  }
-	} break;
-case 189:
-# line 1435 "idl.yy"
-{
-	  idl_global->err()->syntax_error(idl_global->parse_state());
-	} break;
-case 190:
-# line 1439 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_NoState);
-	  yyerrok;
-	} break;
-case 191:
-# line 1447 "idl.yy"
-{
-	  yyval.llval = new UTL_LabelList(yypvt[-1].ulval, yypvt[-0].llval);
-	} break;
-case 192:
-# line 1454 "idl.yy"
-{
-	  if (yypvt[-1].llval == NULL)
-	    yyval.llval = new UTL_LabelList(yypvt[-0].ulval, NULL);
-	  else {
-	    yypvt[-1].llval->nconc(new UTL_LabelList(yypvt[-0].ulval, NULL));
-	    yyval.llval = yypvt[-1].llval;
-	  }
-	} break;
-case 193:
-# line 1463 "idl.yy"
-{
-	  yyval.llval = NULL;
-	} break;
-case 194:
-# line 1470 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_DefaultSeen);
-        } break;
-case 195:
-# line 1474 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_LabelColonSeen);
-
-	  yyval.ulval = idl_global->gen()->
-	            create_union_label(AST_UnionLabel::UL_default,
-				       NULL);
-	} break;
-case 196:
-# line 1482 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_CaseSeen);
-        } break;
-case 197:
-# line 1486 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_LabelExprSeen);
-        } break;
-case 198:
-# line 1490 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_LabelColonSeen);
-
-	  yyval.ulval = idl_global->gen()->create_union_label(AST_UnionLabel::UL_label,
-						     yypvt[-2].exval);
-	} break;
-case 199:
-# line 1500 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_UnionElemTypeSeen);
-        } break;
-case 200:
-# line 1504 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_UnionElemDeclSeen);
-	  /*
-	   * Check for illegal recursive use of type
-	   */
-	  if (yypvt[-2].dcval != NULL && AST_illegal_recursive_type(yypvt[-2].dcval))
-	    idl_global->err()->error1(UTL_Error::EIDL_RECURSIVE_TYPE, yypvt[-2].dcval);
-	  /*
-	   * Create a field in a union branch
-	   */
-	  else if (yypvt[-2].dcval == NULL || yypvt[-0].deval == NULL)
-	    yyval.ffval = NULL;
-	  else {
-	    AST_Type *tp = yypvt[-0].deval->compose(yypvt[-2].dcval);
-	    if (tp == NULL)
-	      yyval.ffval = NULL;
- 	    else
-	      yyval.ffval = idl_global->gen()->create_field(tp,
-			        		   yypvt[-0].deval->name(),
-			        		   idl_global->pragmas());
-	  }
-	} break;
-case 201:
-# line 1530 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_EnumSeen);
-        } break;
-case 202:
-# line 1534 "idl.yy"
-{
-	  UTL_Scope		*s = idl_global->scopes()->top_non_null();
-	  UTL_ScopedName	*n = new UTL_ScopedName(yypvt[-0].idval, NULL);
-	  AST_Enum		*e = NULL;
-	  AST_Decl		*v = NULL;
-	  UTL_StrList		*p = idl_global->pragmas();
-
-          ACE_UNUSED_ARG (v);
-
-	  idl_global->set_parse_state(IDL_GlobalData::PS_EnumIDSeen);
-	  /*
-	   * Create a node representing an enum and add it to its
-	   * enclosing scope
-	   */
-	  if (s != NULL) {
-	    e = idl_global->gen()->create_enum(n, p);
-	    /*
-	     * Add it to its defining scope
-	     */
-	    (void) s->fe_add_enum(e);
-	  }
-	  /*
-	   * Push the enum scope on the scopes stack
-	   */
-	  idl_global->scopes()->push(e);
-	} break;
-case 203:
-# line 1561 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_EnumSqSeen);
-        } break;
-case 204:
-# line 1565 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_EnumBodySeen);
-        } break;
-case 205:
-# line 1569 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_EnumQsSeen);
-	  /*
-	   * Done with this enum. Pop its scope from the scopes stack
-	   */
-	  if (idl_global->scopes()->top() == NULL)
-	    yyval.dcval = NULL;
-	  else {
-	    yyval.dcval = AST_Enum::narrow_from_scope(idl_global->scopes()->top_non_null());
-	    idl_global->scopes()->pop();
-	  }
-	} break;
-case 207:
-# line 1588 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_EnumCommaSeen);
-        } break;
-case 210:
-# line 1597 "idl.yy"
-{
-	  UTL_Scope		*s = idl_global->scopes()->top_non_null();
-	  UTL_ScopedName	*n =
-		new UTL_ScopedName(new Identifier(yypvt[-0].strval, 1, 0, I_FALSE), NULL);
-	  AST_EnumVal		*e = NULL;
-	  AST_Enum		*c = NULL;
-	  UTL_StrList		*p = idl_global->pragmas();
-
-	  /*
-	   * Create a node representing one enumerator in an enum
-	   * Add it to the enclosing scope (the enum scope)
-	   */
-	  if (s != NULL && s->scope_node_type() == AST_Decl::NT_enum) {
-	    c = AST_Enum::narrow_from_scope(s);
-	    if (c != NULL)
-	      e = idl_global->gen()->create_enum_val(c->next_enum_val(), n, p);
-	    (void) s->fe_add_enum_val(e);
-	  }
-	} break;
-case 211:
-# line 1621 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_SequenceCommaSeen);
-        } break;
-case 212:
-# line 1625 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_SequenceExprSeen);
-        } break;
-case 213:
-# line 1629 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_SequenceQsSeen);
-	  /*
-	   * Remove sequence marker from scopes stack
-	   */
-	  if (idl_global->scopes()->top() == NULL)
-	    idl_global->scopes()->pop();
-	  /*
-	   * Create a node representing a sequence
-	   */
-	  if (yypvt[-2].exval == NULL || yypvt[-2].exval->coerce(AST_Expression::EV_ulong) == NULL) {
-	    idl_global->err()->coercion_error(yypvt[-2].exval, AST_Expression::EV_ulong);
-	    yyval.dcval = NULL;
-	  } else if (yypvt[-5].dcval == NULL) {
-	    yyval.dcval = NULL;
-	  } else {
- 	    AST_Type *tp = AST_Type::narrow_from_decl(yypvt[-5].dcval);
-	    if (tp == NULL)
-	      yyval.dcval = NULL;
-	    else {
-	      yyval.dcval = idl_global->gen()->create_sequence(yypvt[-2].exval, tp);
-	      /*
-	       * Add this AST_Sequence to the types defined in the global scope
-	       */
-	      (void) idl_global->root()
-		        ->fe_add_sequence(AST_Sequence::narrow_from_decl(yyval.dcval));
- 	    }
-	  }
-	} break;
-case 214:
-# line 1660 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_SequenceQsSeen);
-	  /*
-	   * Remove sequence marker from scopes stack
-	   */
-	  if (idl_global->scopes()->top() == NULL)
-	    idl_global->scopes()->pop();
-	  /*
-	   * Create a node representing a sequence
-	   */
-	  if (yypvt[-1].dcval == NULL)
-	    yyval.dcval = NULL;
-	  else {
-	    AST_Type *tp = AST_Type::narrow_from_decl(yypvt[-1].dcval);
-	    if (tp == NULL)
-	      yyval.dcval = NULL;
-            else {
-	      yyval.dcval =
-	        idl_global->gen()->create_sequence(
-		  	     idl_global->gen()->create_expr((unsigned long) 0),
-			     tp);
-	      /*
-	       * Add this AST_Sequence to the types defined in the global scope
-	       */
-	      (void) idl_global->root()
-		        ->fe_add_sequence(AST_Sequence::narrow_from_decl(yyval.dcval));
-	    }
-	  }
-	} break;
-case 215:
-# line 1693 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_SequenceSeen);
-	  /*
-	   * Push a sequence marker on scopes stack
-	   */
-	  idl_global->scopes()->push(NULL);
-	} break;
-case 216:
-# line 1701 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_SequenceSqSeen);
-        } break;
-case 217:
-# line 1705 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_SequenceTypeSeen);
-	  yyval.dcval = yypvt[-0].dcval;
-        } break;
-case 218:
-# line 1714 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_StringSqSeen);
-        } break;
-case 219:
-# line 1718 "idl.yy"
-{
-	   idl_global->set_parse_state(IDL_GlobalData::PS_StringExprSeen);
-        } break;
-case 220:
-# line 1722 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_StringQsSeen);
-	  /*
-	   * Create a node representing a string
-	   */
-	  if (yypvt[-2].exval == NULL || yypvt[-2].exval->coerce(AST_Expression::EV_ulong) == NULL) {
-	    idl_global->err()->coercion_error(yypvt[-2].exval, AST_Expression::EV_ulong);
-	    yyval.dcval = NULL;
-	  } else {
-	    yyval.dcval = idl_global->gen()->create_string(yypvt[-2].exval);
-	    /*
-	     * Add this AST_String to the types defined in the global scope
-	     */
-	    (void) idl_global->root()
-		      ->fe_add_string(AST_String::narrow_from_decl(yyval.dcval));
-	  }
-	} break;
-case 221:
-# line 1740 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_StringCompleted);
-	  /*
-	   * Create a node representing a string
-	   */
-	  yyval.dcval =
-	    idl_global->gen()->create_string(
-			 idl_global->gen()->create_expr((unsigned long) 0));
-	  /*
-	   * Add this AST_String to the types defined in the global scope
-	   */
-	  (void) idl_global->root()
-                    ->fe_add_string(AST_String::narrow_from_decl(yyval.dcval));
-	} break;
-case 222:
-# line 1758 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_StringSeen);
-        } break;
-case 223:
-# line 1766 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_StringSqSeen);
-        } break;
-case 224:
-# line 1770 "idl.yy"
-{
-	   idl_global->set_parse_state(IDL_GlobalData::PS_StringExprSeen);
-        } break;
-case 225:
-# line 1774 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_StringQsSeen);
-	  /*
-	   * Create a node representing a string
-	   */
-	  if (yypvt[-2].exval == NULL || yypvt[-2].exval->coerce(AST_Expression::EV_ulong) == NULL) {
-	    idl_global->err()->coercion_error(yypvt[-2].exval, AST_Expression::EV_ulong);
-	    yyval.dcval = NULL;
-	  } else {
-	    yyval.dcval = idl_global->gen()->create_wstring(yypvt[-2].exval);
-	    /*
-	     * Add this AST_String to the types defined in the global scope
-	     */
-	    (void) idl_global->root()
-		      ->fe_add_string(AST_String::narrow_from_decl(yyval.dcval));
-	  }
-	} break;
-case 226:
-# line 1792 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_StringCompleted);
-	  /*
-	   * Create a node representing a string
-	   */
-	  yyval.dcval =
-	    idl_global->gen()->create_wstring(
-			 idl_global->gen()->create_expr((unsigned long) 0));
-	  /*
-	   * Add this AST_String to the types defined in the global scope
-	   */
-	  (void) idl_global->root()
-                    ->fe_add_string(AST_String::narrow_from_decl(yyval.dcval));
-	} break;
-case 227:
-# line 1810 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_StringSeen);
-        } break;
-case 228:
-# line 1817 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_ArrayIDSeen);
-        } break;
-case 229:
-# line 1821 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_ArrayCompleted);
-	  /*
-	   * Create a node representing an array
-	   */
-	  if (yypvt[-0].elval != NULL) {
-	     yyval.dcval = idl_global->gen()->create_array(new UTL_ScopedName(yypvt[-2].idval, NULL),
-						  yypvt[-0].elval->length(), yypvt[-0].elval);
-	  }
-	} break;
-case 230:
-# line 1835 "idl.yy"
-{
-	  yyval.elval = new UTL_ExprList(yypvt[-1].exval, yypvt[-0].elval);
-	} break;
-case 231:
-# line 1842 "idl.yy"
-{
-	  if (yypvt[-1].elval == NULL)
-	    yyval.elval = new UTL_ExprList(yypvt[-0].exval, NULL);
-	  else {
-	    yypvt[-1].elval->nconc(new UTL_ExprList(yypvt[-0].exval, NULL));
-	    yyval.elval = yypvt[-1].elval;
-	  }
-	} break;
-case 232:
-# line 1851 "idl.yy"
-{
-	  yyval.elval = NULL;
-	} break;
-case 233:
-# line 1858 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_DimSqSeen);
-        } break;
-case 234:
-# line 1862 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_DimExprSeen);
-        } break;
-case 235:
-# line 1866 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_DimQsSeen);
-	  /*
-	   * Array dimensions are expressions which must be coerced to
-	   * positive integers
-	   */
-	  if (yypvt[-2].exval == NULL || yypvt[-2].exval->coerce(AST_Expression::EV_ulong) == NULL) {
-	    idl_global->err()->coercion_error(yypvt[-2].exval, AST_Expression::EV_ulong);
-	    yyval.exval = NULL;
-	  } else
-	    yyval.exval = yypvt[-2].exval;
-	} break;
-case 236:
-# line 1883 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_AttrSeen);
-        } break;
-case 237:
-# line 1887 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_AttrTypeSeen);
-        } break;
-case 238:
-# line 1891 "idl.yy"
-{
-	  UTL_Scope		*s = idl_global->scopes()->top_non_null();
-	  UTL_DecllistActiveIterator *l = NULL;
-	  AST_Attribute		*a = NULL;
-	  FE_Declarator		*d = NULL;
-	  UTL_StrList		*p = idl_global->pragmas();
-
-	  idl_global->set_parse_state(IDL_GlobalData::PS_AttrCompleted);
-	  /*
-	   * Create nodes representing attributes and add them to the
-	   * enclosing scope
-	   */
-	  if (s != NULL && yypvt[-2].dcval != NULL && yypvt[-0].dlval != NULL) {
-	    l = new UTL_DecllistActiveIterator(yypvt[-0].dlval);
-	    for (;!(l->is_done()); l->next()) {
-	      d = l->item();
-	      if (d == NULL)
-		continue;
-	      AST_Type *tp = d->compose(yypvt[-2].dcval);
- 	      if (tp == NULL)
-	 	continue;
-	      a = idl_global->gen()->create_attribute(yypvt[-5].bval, tp, d->name(), p);
-	      /*
-	       * Add one attribute to the enclosing scope
-	       */
-	      (void) s->fe_add_attribute(a);
-	    }
-	    delete l;
-	  }
-	} break;
-case 239:
-# line 1925 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_AttrROSeen);
-	  yyval.bval = I_TRUE;
-	} break;
-case 240:
-# line 1930 "idl.yy"
-{
-	  yyval.bval = I_FALSE;
-	} break;
-case 241:
-# line 1937 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_ExceptSeen);
-	} break;
-case 242:
-# line 1941 "idl.yy"
-{
-	  UTL_Scope		*s = idl_global->scopes()->top_non_null();
-	  UTL_ScopedName	*n = new UTL_ScopedName(yypvt[-0].idval, NULL);
-	  AST_Exception		*e = NULL;
-	  UTL_StrList		*p = idl_global->pragmas();
-	  AST_Decl		*v = NULL;
-
-          ACE_UNUSED_ARG (v);
-
-	  idl_global->set_parse_state(IDL_GlobalData::PS_ExceptIDSeen);
-	  /*
-	   * Create a node representing an exception and add it to
-	   * the enclosing scope
-	   */
-	  if (s != NULL) {
-	    e = idl_global->gen()->create_exception(n, p);
-	    (void) s->fe_add_exception(e);
-	  }
-	  /*
-	   * Push the exception scope on the scope stack
-	   */
-	  idl_global->scopes()->push(e);
-	} break;
-case 243:
-# line 1965 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_ExceptSqSeen);
-        } break;
-case 244:
-# line 1969 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_ExceptBodySeen);
-        } break;
-case 245:
-# line 1973 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_ExceptQsSeen);
-	  /*
-	   * Done with this exception. Pop its scope from the scope stack
-	   */
-	  idl_global->scopes()->pop();
-	} break;
-case 246:
-# line 1985 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_OpTypeSeen);
-        } break;
-case 247:
-# line 1989 "idl.yy"
-{
-	  UTL_Scope		*s = idl_global->scopes()->top_non_null();
-	  UTL_ScopedName	*n =
-		new UTL_ScopedName(new Identifier(yypvt[-0].strval, 1, 0, I_FALSE), NULL);
-	  AST_Operation		*o = NULL;
-	  UTL_StrList		*p = idl_global->pragmas();
-
-	  idl_global->set_parse_state(IDL_GlobalData::PS_OpIDSeen);
-	  /*
-	   * Create a node representing an operation on an interface
-	   * and add it to its enclosing scope
-	   */
-	  if (s != NULL && yypvt[-2].dcval != NULL) {
-	    AST_Type *tp = AST_Type::narrow_from_decl(yypvt[-2].dcval);
-            if (tp == NULL) {
-              idl_global->err()->not_a_type(yypvt[-2].dcval);
-            } else if (tp->node_type() == AST_Decl::NT_except) {
-              idl_global->err()->not_a_type(yypvt[-2].dcval);
-            } else {
-	      o = idl_global->gen()->create_operation(tp, yypvt[-3].ofval, n, p);
-	      (void) s->fe_add_operation(o);
-	    }
-	  }
-	  /*
-	   * Push the operation scope onto the scopes stack
-	   */
-	  idl_global->scopes()->push(o);
-	} break;
-case 248:
-# line 2018 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_OpParsCompleted);
-        } break;
-case 249:
-# line 2022 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_OpRaiseCompleted);
-        } break;
-case 250:
-# line 2026 "idl.yy"
-{
-	  UTL_Scope		*s = idl_global->scopes()->top_non_null();
-	  AST_Operation		*o = NULL;
-
-	  idl_global->set_parse_state(IDL_GlobalData::PS_OpCompleted);
-	  /*
-	   * Add exceptions and context to the operation
-	   */
-	  if (s != NULL && s->scope_node_type() == AST_Decl::NT_op) {
-	    o = AST_Operation::narrow_from_scope(s);
-
-	    if (yypvt[-2].nlval != NULL && o != NULL)
-	      (void) o->fe_add_exceptions(yypvt[-2].nlval);
-	    if (yypvt[-0].slval != NULL)
-	      (void) o->fe_add_context(yypvt[-0].slval);
-	  }
-	  /*
-	   * Done with this operation. Pop its scope from the scopes stack
-	   */
-	  idl_global->scopes()->pop();
-	} break;
-case 251:
-# line 2051 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_OpAttrSeen);
-	  yyval.ofval = AST_Operation::OP_oneway;
-	} break;
-case 252:
-# line 2056 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_OpAttrSeen);
-	  yyval.ofval = AST_Operation::OP_idempotent;
-	} break;
-case 253:
-# line 2061 "idl.yy"
-{
-	  yyval.ofval = AST_Operation::OP_noflags;
-	} break;
-case 255:
-# line 2069 "idl.yy"
-{
-	  yyval.dcval =
-	    idl_global->scopes()->bottom()
-	       ->lookup_primitive_type(AST_Expression::EV_void);
-	} break;
-case 256:
-# line 2078 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_OpSqSeen);
-        } break;
-case 257:
-# line 2082 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_OpQsSeen);
-        } break;
-case 258:
-# line 2086 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_OpSqSeen);
-        } break;
-case 259:
-# line 2091 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_OpQsSeen);
-        } break;
-case 261:
-# line 2101 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_OpParCommaSeen);
-        } break;
-case 264:
-# line 2110 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_OpParDirSeen);
-        } break;
-case 265:
-# line 2114 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_OpParTypeSeen);
-        } break;
-case 266:
-# line 2118 "idl.yy"
-{
-	  UTL_Scope		*s = idl_global->scopes()->top_non_null();
-	  AST_Argument		*a = NULL;
-	  UTL_StrList		*p = idl_global->pragmas();
-
-	  idl_global->set_parse_state(IDL_GlobalData::PS_OpParDeclSeen);
-	  /*
-	   * Create a node representing an argument to an operation
-	   * Add it to the enclosing scope (the operation scope)
-	   */
-	  if (yypvt[-2].dcval != NULL && yypvt[-0].deval != NULL && s != NULL) {
-	    AST_Type *tp = yypvt[-0].deval->compose(yypvt[-2].dcval);
-	    if (tp != NULL) {
-	      a = idl_global->gen()->create_argument(yypvt[-4].dival, tp, yypvt[-0].deval->name(), p);
-	      (void) s->fe_add_argument(a);
-	    }
-	  }
-	} break;
-case 267:
-# line 2140 "idl.yy"
-{
-	  yyval.dcval = idl_global->scopes()->bottom()->lookup_primitive_type(yypvt[-0].etval);
-	} break;
-case 269:
-# line 2145 "idl.yy"
-{
-	  UTL_Scope	*s = idl_global->scopes()->top_non_null();
-	  AST_Decl	*d = NULL;
-
-	  if (s != NULL)
-	    d = s->lookup_by_name(yypvt[-0].idlist, I_TRUE);
-	  if (d == NULL)
-	    idl_global->err()->lookup_error(yypvt[-0].idlist);
-	  yyval.dcval = d;
-	} break;
-case 270:
-# line 2159 "idl.yy"
-{
-	  yyval.dival = AST_Argument::dir_IN;
-	} break;
-case 271:
-# line 2163 "idl.yy"
-{
-	  yyval.dival = AST_Argument::dir_OUT;
-	} break;
-case 272:
-# line 2167 "idl.yy"
-{
-	  yyval.dival = AST_Argument::dir_INOUT;
-	} break;
-case 273:
-# line 2174 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_OpRaiseSeen);
-        } break;
-case 274:
-# line 2178 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_OpRaiseSqSeen);
-        } break;
-case 275:
-# line 2183 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_OpRaiseQsSeen);
-	  yyval.nlval = yypvt[-1].nlval;
-	} break;
-case 276:
-# line 2188 "idl.yy"
-{
-	  yyval.nlval = NULL;
-	} break;
-case 277:
-# line 2195 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_OpContextSeen);
-        } break;
-case 278:
-# line 2199 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_OpContextSqSeen);
-        } break;
-case 279:
-# line 2204 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_OpContextQsSeen);
-	  yyval.slval = yypvt[-1].slval;
-	} break;
-case 280:
-# line 2209 "idl.yy"
-{
-	  yyval.slval = NULL;
-	} break;
-case 281:
-# line 2216 "idl.yy"
-{
-	  yyval.slval = new UTL_StrList(yypvt[-1].sval, yypvt[-0].slval);
-	} break;
-case 282:
-# line 2224 "idl.yy"
-{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_OpContextCommaSeen);
-        } break;
-case 283:
-# line 2228 "idl.yy"
-{
-	  if (yypvt[-3].slval == NULL)
-	    yyval.slval = new UTL_StrList(yypvt[-0].sval, NULL);
-	  else {
-	    yypvt[-3].slval->nconc(new UTL_StrList(yypvt[-0].sval, NULL));
-	    yyval.slval = yypvt[-3].slval;
-	  }
-	} break;
-case 284:
-# line 2237 "idl.yy"
-{
-	  yyval.slval = NULL;
-	} break;
-# line	532 "/usr/ccs/bin/yaccpar"
-	}
-	goto yystack;		/* reset registers in driver code */
-}
-
diff --git a/TAO/TAO_IDL/fe/y.tab.h b/TAO/TAO_IDL/fe/y.tab.h
deleted file mode 100644
index 7752d999a11..00000000000
--- a/TAO/TAO_IDL/fe/y.tab.h
+++ /dev/null
@@ -1,76 +0,0 @@
-
-typedef union
-#ifdef __cplusplus
-	YYSTYPE
-#endif
- {
-  AST_Decl		*dcval;		/* Decl value		*/
-  UTL_StrList		*slval;		/* String list		*/
-  UTL_NameList		*nlval;		/* Name list		*/
-  UTL_ExprList		*elval;		/* Expression list	*/
-  UTL_LabelList		*llval;		/* Label list		*/
-  UTL_DeclList		*dlval;		/* Declaration list	*/
-  FE_InterfaceHeader	*ihval;		/* Interface header	*/
-  AST_Expression	*exval;		/* Expression value	*/
-  AST_UnionLabel	*ulval;		/* Union label		*/
-  AST_Field		*ffval;		/* Field value		*/
-  AST_Expression::ExprType etval;	/* Expression type	*/
-  AST_Argument::Direction dival;	/* Argument direction	*/
-  AST_Operation::Flags	ofval;		/* Operation flags	*/
-  FE_Declarator		*deval;		/* Declarator value	*/
-  idl_bool		bval;		/* Boolean value	*/
-  long			ival;		/* Long value		*/
-  double		dval;		/* Double value		*/
-  float			fval;		/* Float value		*/
-  char			cval;		/* Char value		*/
-
-  String		*sval;		/* String value		*/
-  char			*strval;	/* char * value		*/
-  Identifier		*idval;		/* Identifier		*/
-  UTL_IdList		*idlist;	/* Identifier list	*/
-} YYSTYPE;
-extern YYSTYPE yylval;
-# define IDENTIFIER 257
-# define IDL_CONST 258
-# define IDL_MODULE 259
-# define IDL_INTERFACE 260
-# define IDL_TYPEDEF 261
-# define IDL_LONG 262
-# define IDL_SHORT 263
-# define IDL_UNSIGNED 264
-# define IDL_DOUBLE 265
-# define IDL_FLOAT 266
-# define IDL_CHAR 267
-# define IDL_WCHAR 268
-# define IDL_OCTET 269
-# define IDL_BOOLEAN 270
-# define IDL_ANY 271
-# define IDL_STRUCT 272
-# define IDL_UNION 273
-# define IDL_SWITCH 274
-# define IDL_ENUM 275
-# define IDL_SEQUENCE 276
-# define IDL_STRING 277
-# define IDL_WSTRING 278
-# define IDL_EXCEPTION 279
-# define IDL_CASE 280
-# define IDL_DEFAULT 281
-# define IDL_READONLY 282
-# define IDL_ATTRIBUTE 283
-# define IDL_ONEWAY 284
-# define IDL_IDEMPOTENT 285
-# define IDL_VOID 286
-# define IDL_IN 287
-# define IDL_OUT 288
-# define IDL_INOUT 289
-# define IDL_RAISES 290
-# define IDL_CONTEXT 291
-# define IDL_INTEGER_LITERAL 292
-# define IDL_STRING_LITERAL 293
-# define IDL_CHARACTER_LITERAL 294
-# define IDL_FLOATING_PT_LITERAL 295
-# define IDL_TRUETOK 296
-# define IDL_FALSETOK 297
-# define IDL_SCOPE_DELIMITOR 298
-# define IDL_LEFT_SHIFT 299
-# define IDL_RIGHT_SHIFT 300
diff --git a/TAO/TAO_IDL/idl_make_vars b/TAO/TAO_IDL/idl_make_vars
deleted file mode 100644
index f061649d004..00000000000
--- a/TAO/TAO_IDL/idl_make_vars
+++ /dev/null
@@ -1,62 +0,0 @@
-# Makefile include file for IDL compiler
-#
-# What OS we're compiling on.
-#
-# As shipped the CFE is preconfigured for SOLARIS 2.x
-# ===================================================
-#
-# Uncomment the next line for SOLARIS 2.x
-OSV		= SOLARIS2
-# Uncomment the next line for SUNOS 4.x
-# OSV		= SUNOS4
-# Uncomment the next line for HPUX
-# OSV		= hpux
-# Uncomment the next line for Apollo Domain
-# OSV		= apollo
-#
-# IDL_CFE_VERSION	Defines what the current IDL CFE version is
-IDL_CFE_VERSION =	\"1.3.0\"
-#
-# Define LEXFLAGS to pass to lex
-LEXFLAGS	= -t
-#
-# Define YFLAGS to pass to yacc
-YFLAGS	 	= -t -d
-#
-# C++			What C++ compiler to use
-#
-# Also define CCC which is used instead of C++ in
-# some versions of make. Make sure they refer to the
-# same executable; if you modify one please also modify
-# the other to be identical.
-#
-# Uncomment these two lines if you're using SunPro Sparcworks C++ compilers
-# (Tested for SunPro Sparcworks 2.x with SunOS 4.x and Solaris 2.x, for
-#  SunPro Sparcworks 3.0 with Solaris 2.x)
-C++		= CC
-CCC		= CC
-# Uncomment these two lines if you're using g++ (tested for SunOS 4.x and
-# Solaris 2.x only, with g++ 2.5.8)
-# C++		= g++
-# CCC		= g++
-#
-# What flags to pass to the C preprocessor
-CPPFLAGS += -I../include -I. -D$(OSV) \
-	    -DCPP_LOCATION=\"$(C++)\" \
-	    -DIDL_CFE_VERSION=$(IDL_CFE_VERSION) \
-#
-# What flags to pass to the CC phase
-CCFLAGS	 += -g
-#
-# What ranlib to use
-#
-# Uncomment the following line for SunOS 4.x and others which have ranlib
-# RANLIB	        = ranlib
-# Uncomment the following line for Solaris 2.x and others which don't have it
-RANLIB		= /bin/true
-#
-# What ar to use
-AR	        = ar
-#
-# What flags to give to ar
-ARFLAGS		= crv
diff --git a/TAO/TAO_IDL/idl_specs/array.idl b/TAO/TAO_IDL/idl_specs/array.idl
deleted file mode 100644
index 2520e9045fd..00000000000
--- a/TAO/TAO_IDL/idl_specs/array.idl
+++ /dev/null
@@ -1,37 +0,0 @@
-typedef sequence<long,10> vec10;
-typedef char str22[22][2];
-typedef boolean boolarray[3][40];
-
-
-struct A {
-    long	a1;
-    char	a2[17];
-    char	a3[10][2];
-//    vec10	a3;
-};
-
-struct B {
-    long	b1;
-    A		b2;
-};
-
-struct C {
-    long	c1;
-    long	c2;
-};
-
-typedef A A_matrix[2][3][4];
-typedef B B_matrix[2][3][4];
-typedef C C_matrix[2][3][4];
-
-typedef A_matrix A_rmatrix[2][3][4][5];
-
-interface A_i {
-    A		op(in A a1, inout A a2, out A a3);
-    str22	op2(in str22 a1, inout str22 a2, out str22 a3);
-    str22       op3(in short a1[3][4], inout short a2[3][4], out short a3[4][4]);
-    A_matrix	op4(in A a1, inout A a2, out A a3);
-    attribute str22 attribute_array;
-    void foo(in any x[3], out any y[4], inout any z[3]);
-};
-
diff --git a/TAO/TAO_IDL/idl_specs/constant.idl b/TAO/TAO_IDL/idl_specs/constant.idl
deleted file mode 100644
index 3570de87ebc..00000000000
--- a/TAO/TAO_IDL/idl_specs/constant.idl
+++ /dev/null
@@ -1,29 +0,0 @@
-const short l = 4;
-
-enum N { zero, un , deux, trois };
-
-exception E {
-	short cause ;
-	};
-
-module M {
-	const short l = 4; 
-
-	enum N { zero, un , deux, trois };
-
-	exception E {
-        short cause ;
-        };
-	
-	interface A {
-	        const short l = 4; 
- 
-	        enum N { zero, un , deux, trois };
- 
-       		 exception E {
-        	short cause ;
-        	};
-	N foo(in N x, out N y, inout N z);
-	};
-};
-
diff --git a/TAO/TAO_IDL/idl_specs/dif2.idl b/TAO/TAO_IDL/idl_specs/dif2.idl
deleted file mode 100644
index c2b23eaf625..00000000000
--- a/TAO/TAO_IDL/idl_specs/dif2.idl
+++ /dev/null
@@ -1,48 +0,0 @@
-/* A test interface for DIF1 */
-
-interface ex1
-{
-	void op0();
-	float op1(in float f, out double d, inout long l);
-	double op2(in double d, out long l, inout short s);
-	long op3(in long l, out short s, inout unsigned long ul);
-	short op4(in short s, out unsigned long ul, inout unsigned short us);
-	unsigned long op5(inout unsigned long ul, in unsigned short us, out char c, in boolean b);
-	unsigned short op6(out unsigned short us, inout char c);
-};
-
-//interface ex3;
-
-interface ex2 : ex1 
-{
-	// operations continued from ex1
-	char op7(in char c, out boolean b, inout octet o);
-	boolean op8(out boolean b, in octet o);
-	octet op9(inout octet o, out string s, in string <10> ls, inout long l);
-	string op10(in string s, out string <10> ls);
-	string <10> op11(inout string <10> ls, out long l);
-	long op12(in long l);
-//	ex3 op13(Environment *ev);
-};
-
-interface ex3 : ex1
-{
-	// attributes
-	readonly attribute float float_attribute;
-	attribute double double_attribute;
-	readonly attribute long long_attribute;
-	attribute short short_attribute;
-	readonly attribute unsigned long unsigned_long_attribute;
-
-};
-
-interface ex4 : ex2, ex3
-{
-	attribute unsigned short unsigned_short_attribute;
-	readonly attribute char char_attribute;
-	attribute boolean boolean_attribute;
-	readonly attribute octet octet_attribute;
-	attribute string string_attribute;
-	readonly attribute string <10> limited_string_attribute;
-	readonly attribute ex4 an_object_attribute;
-};
diff --git a/TAO/TAO_IDL/idl_specs/inherit.idl b/TAO/TAO_IDL/idl_specs/inherit.idl
deleted file mode 100644
index a96fe169570..00000000000
--- a/TAO/TAO_IDL/idl_specs/inherit.idl
+++ /dev/null
@@ -1,17 +0,0 @@
-interface one {
-    void op_one();
-};
-interface two : one {
-    void op_two();
-};
-interface three : one {
-    void op_three();
-};
-interface four : two, three {
-    void op_four();
-};
-
-interface five : four, three, two {
-    void op_five();
-};
-
diff --git a/TAO/TAO_IDL/idl_specs/module.idl b/TAO/TAO_IDL/idl_specs/module.idl
deleted file mode 100644
index 178ad2fb689..00000000000
--- a/TAO/TAO_IDL/idl_specs/module.idl
+++ /dev/null
@@ -1,20 +0,0 @@
-module mod1
-{
-    module mod2
-    {
-	interface ex1
-	{
-	    attribute long	l1;
-	    readonly attribute long l2;
-
-	    long	m1(in long a);
-	};
-
-	interface ex2 : ex1
-	{
-	    attribute long	l3;
-
-	    long	m2(in long a, out long b);
-	};
-    };
-};
diff --git a/TAO/TAO_IDL/idl_specs/primtypes.idl b/TAO/TAO_IDL/idl_specs/primtypes.idl
deleted file mode 100644
index fa5d154f8f2..00000000000
--- a/TAO/TAO_IDL/idl_specs/primtypes.idl
+++ /dev/null
@@ -1,23 +0,0 @@
-interface ex1
-{
-    attribute  long l1;
-    long	m1(in long a);
-    ex1		mtypes(
-	in long a1, inout long a2, out   long a3,
-	in unsigned long b1, inout unsigned long b2, out unsigned long b3,
-	in short c1,inout short c2, out short c3,
-	in unsigned short d1, inout unsigned short d2, out unsigned short d3,
-	in float e1, inout float e2, out float e3,
-	in double f1, inout double f2, out double f3,
-	in char g1,  inout char g2, out char g3
-    );
-		   
-};
-
-interface ex2 : ex1 
-{
-    readonly attribute long l2;
-
-    long	m2(in long a, out long b);
-    void	mv();
-};
diff --git a/TAO/TAO_IDL/idl_specs/sequence.idl b/TAO/TAO_IDL/idl_specs/sequence.idl
deleted file mode 100644
index 4701c987b15..00000000000
--- a/TAO/TAO_IDL/idl_specs/sequence.idl
+++ /dev/null
@@ -1,25 +0,0 @@
-typedef sequence<long,10> vec10;
-typedef sequence<char,20> c20;
-typedef sequence<c20,23> cc23;
-typedef sequence<char,24> c24;
-typedef sequence< sequence<long,10>, 10> c30;
-struct TProgram {
-    string		path;
-    sequence<string>	argv;
-    sequence<string>	envp;
-};
-
-struct foo {
-    long	f1;
-    char	f2;
-};
-
-typedef foo			foo_ar[20];
-typedef sequence<foo> 		f_unbounded;
-typedef sequence<foo_ar>	f_ar_unbounded;
-
-interface TestSeq {
-    attribute	f_unbounded	fattr;
-    typedef sequence<long,10> also_vec10;
-    vec10 op(in also_vec10 a, out vec10 b, inout sequence <long,10> c);
-};
diff --git a/TAO/TAO_IDL/idl_specs/simple.idl b/TAO/TAO_IDL/idl_specs/simple.idl
deleted file mode 100644
index 6538d9410ba..00000000000
--- a/TAO/TAO_IDL/idl_specs/simple.idl
+++ /dev/null
@@ -1,16 +0,0 @@
-typedef sequence<long,10> vec10;
-
-exception simple_error {
-    long reason;
-};
-
-interface simple {
-	long op(in long a, out simple b, inout long c) raises (simple_error);
-};
-
-interface simple2 : simple {
-    exception simple2_error {
-	long	reason2;
-    };
-    long op2(in long a, in simple b, out simple2 c) raises (simple2_error);
-};
diff --git a/TAO/TAO_IDL/idl_specs/simple2.idl b/TAO/TAO_IDL/idl_specs/simple2.idl
deleted file mode 100644
index b26e7ff3230..00000000000
--- a/TAO/TAO_IDL/idl_specs/simple2.idl
+++ /dev/null
@@ -1,26 +0,0 @@
-#include "simple.idl"
-
-
-interface simple3 : simple2 {
-    exception OVERFLOW {
-	long	a;
-	string	msg;
-    };
-    exception UNDERFLOW {
-	long	b;
-	string	msg;
-    };
-    exception BADNUM {
-	vec10	c;
-    };
-    exception USERERROR { 
-	any reason;
-    };
-    long	op3(in long a, out simple3 b, out simple2 c, out simple d)
-                      raises (OVERFLOW, UNDERFLOW, BADNUM);
-    any		op4(in any x, inout any y, out any z)
-               raises(UNDERFLOW);
-
-    oneway void	op5()
-               raises(USERERROR);
-};
diff --git a/TAO/TAO_IDL/idl_specs/struct.idl b/TAO/TAO_IDL/idl_specs/struct.idl
deleted file mode 100644
index 42f215a1a62..00000000000
--- a/TAO/TAO_IDL/idl_specs/struct.idl
+++ /dev/null
@@ -1,52 +0,0 @@
-struct bar {
-	long	b1;
-	long	b2;
-	string<20> b3;
-};
-
-struct bar2 {
-	long	b3;
-	bar	b4;
-};
-
-struct bar3 {
-    long b1;
-    long b2;
-    long b3;
-};
-
-struct bar4 {
-    long b1;
-    bar2 b2;
-    long b3;
-    bar3 b4;
-    long b5;
-};
-
-
-interface foo {
-	long	op(in bar a, out bar2 b);
-};
-interface foo2 : foo {
-    bar	op2(in bar2 a);
-    long op3(in long a, out char b);
-};
-
-
-typedef		unsigned short	Coord;
-
-struct CellPos {
-    Coord	row;      		
-    Coord	col;
-};
-
-struct CellPos2 {
-	unsigned short	row;
-	unsigned short	col;
-};
-
-struct CellPos3 {
-	Coord	row;
-	Coord	col;
-	unsigned short col2;
-};
diff --git a/TAO/TAO_IDL/idl_specs/union.idl b/TAO/TAO_IDL/idl_specs/union.idl
deleted file mode 100644
index 7b6e32b9957..00000000000
--- a/TAO/TAO_IDL/idl_specs/union.idl
+++ /dev/null
@@ -1,26 +0,0 @@
-struct Bar {
-    long	b1;
-    char	b2;
-};
-
-union Foo switch (long) {
-case 1: long x;
-case 2: Bar y;
-default: char z;
-};
-
-
-union Foo2 switch (char) {
-  case 'a': long x;
-  case 'b': Foo y;
-};
-
-interface a {
-	struct astruct {
-		Foo2	a1;
-		Foo	a2;
-		Bar	a3;
-	};
-	Foo2	opA(in astruct b);
-};
-
diff --git a/TAO/TAO_IDL/idl_specs/union2.idl b/TAO/TAO_IDL/idl_specs/union2.idl
deleted file mode 100644
index 94a355facdf..00000000000
--- a/TAO/TAO_IDL/idl_specs/union2.idl
+++ /dev/null
@@ -1,21 +0,0 @@
-enum FooDisc {
-	FOO1,
-	FOO2
-};
-union Foo switch (FooDisc) {
-case FOO1: long x;
-case FOO2: string y;
-default: char z;
-};
-
-
-struct Bar {
-    enum BarDisc {
-	BAR1,
-	BAR2
-    } kind;
-    union Foo switch (BarDisc) {
-      case BAR1: long x;
-      case BAR2: long y;
-    } addr;
-};
diff --git a/TAO/TAO_IDL/include/ast.h b/TAO/TAO_IDL/include/ast.h
deleted file mode 100644
index e3672b2625f..00000000000
--- a/TAO/TAO_IDL/include/ast.h
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-#ifndef _AST_AST_HH
-#define _AST_AST_HH
-
-// ast.h
-//
-// Defines the classes which constitute the agreement between the CFE
-// and BEs.
-
-/*
-** DEPENDENCIES: NONE
-**
-** USE: Included from idl.hh
-*/
-
-#include	"utl_scoped_name.h"	// Define UTL_ScopedName
-
-#include	"ast_decl.h"		// class AST_Decl
-
-#include	"ast_expression.h"	// class AST_Expression
-
-#include	"utl_scope.h"		// class UTL_Scope
-
-#include	"ast_type.h"		// class AST_Type
-#include	"ast_concrete_type.h"	// class AST_ConcreteType
-#include	"ast_predefined_type.h"// class AST_PredefinedType
-#include	"ast_module.h"		// class AST_Module
-#include	"ast_root.h"		// class AST_Root
-#include	"ast_interface.h"	// class AST_Interface
-#include	"ast_interface_fwd.h"	// class AST_InterfaceFwd
-#include	"ast_structure.h"	// class AST_Structure
-#include	"ast_exception.h"	// class AST_Exception
-#include	"ast_enum.h"		// class AST_Enum
-#include	"ast_operation.h"	// class AST_Operation
-#include	"ast_field.h"		// class AST_Field
-#include	"ast_argument.h"	// class AST_Argument
-#include	"ast_attribute.h"	// class AST_Attribute
-#include	"ast_union.h"		// class AST_Union
-#include	"ast_union_branch.h"	// class AST_UnionBranch
-#include	"ast_union_label.h"	// class AST_UnionLabel
-#include	"ast_constant.h"	// class AST_Constant
-#include	"ast_enum_val.h"	// class AST_EnumVal
-#include	"ast_array.h"		// class AST_Array
-#include	"ast_sequence.h"	// class AST_Sequence
-#include	"ast_string.h"		// class AST_String
-#include	"ast_typedef.h"	// class AST_Typedef 
-
-#include	"utl_list.h"		// class UTL_List
-#include	"utl_strlist.h"	// class UTL_StrList
-#include	"utl_exprlist.h"	// class UTL_ExprList
-
-#include	"ast_generator.h"	// class AST_Generator
-
-#endif           // _AST_AST_HH
diff --git a/TAO/TAO_IDL/include/ast_argument.h b/TAO/TAO_IDL/include/ast_argument.h
deleted file mode 100644
index c0cbb18cebb..00000000000
--- a/TAO/TAO_IDL/include/ast_argument.h
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-#ifndef _AST_ARGUMENT_AST_ARGUMENT_HH
-#define _AST_ARGUMENT_AST_ARGUMENT_HH
-
-// Representation of argument to operation:
-//
-// An argument is a field with a direction attached
-
-/*
-** DEPENDENCIES: ast_field.hh, utl_scoped_name.hh, ast_type.hh
-**		 utl_strlist.hh, ast_decl.hh
-**
-** USE: Included from ast.hh
-*/
-
-#include	"idl_fwd.h"
-#include	"idl_narrow.h"
-#include	"ast_field.h"
-
-
-class AST_Argument : public virtual AST_Field
-{
-public:
-  // Define enum with values denoting argument passing directions
-  enum Direction {dir_IN, dir_OUT, dir_INOUT};
-
-  // Operations
-
-  // Constructor(s)
-  AST_Argument();
-  AST_Argument(Direction direction, AST_Type *ft, UTL_ScopedName *n,
-	       UTL_StrList *p);
-  virtual ~AST_Argument() {}
-
-  // Data Accessors
-  Direction direction();
-
-  // Narrowing
-  DEF_NARROW_METHODS1(AST_Argument, AST_Field);
-  DEF_NARROW_FROM_DECL(AST_Argument);
-
-  // AST Dumping
-  virtual void		dump(ostream &o);
-
-private:
-  // Data
-  const Direction	pd_direction;	// Argument direction
-};
-
-#endif           // _AST_ARGUMENT_AST_ARGUMENT_HH
diff --git a/TAO/TAO_IDL/include/ast_array.h b/TAO/TAO_IDL/include/ast_array.h
deleted file mode 100644
index 0d3fb69b9f1..00000000000
--- a/TAO/TAO_IDL/include/ast_array.h
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-#ifndef _AST_ARRAY_AST_ARRAY_HH
-#define _AST_ARRAY_AST_ARRAY_HH
-
-// Representation of array declaration:
-//
-// An array is a combination of a list of dimensions and a base type
-
-/*
-** DEPENDENCIES: ast_concrete_type.hh, utl_exprlist.hh, ast_type.hh,
-**		 ast_decl.hh
-**
-** USE: Included from ast.hh
-*/
-
-class	AST_Array : public virtual AST_ConcreteType {
-public:
-  // Operations
-
-  // Constructor(s)
-  AST_Array();
-  AST_Array(UTL_ScopedName *n, unsigned long ndims, UTL_ExprList *dims);
-  virtual ~AST_Array() {}
-
-  // Data Accessors
-  unsigned long n_dims();
-  AST_Expression **dims();
-  void		   set_dims(AST_Expression **, unsigned long);
-  AST_Type	  *base_type();
-  void		   set_base_type(AST_Type *nbt);
-
-  // Narrowing
-  DEF_NARROW_METHODS1(AST_Array, AST_ConcreteType);
-  DEF_NARROW_FROM_DECL(AST_Array);
-
-  // AST Dumping
-  virtual void			dump(ostream &o);
-
-private:
-  // Data
-  unsigned long			pd_n_dims;	// How many dimensions?
-  AST_Expression		**pd_dims;	// Their expressions
-  AST_Type			*pd_base_type;	// Base type of array
-
-  // Operations
-
-  // Compute how many dimensions
-  AST_Expression	       **compute_dims(UTL_ExprList *dims,
-					     unsigned long ndims);
-};
-
-#endif           // _AST_ARRAY_AST_ARRAY_HH
diff --git a/TAO/TAO_IDL/include/ast_attribute.h b/TAO/TAO_IDL/include/ast_attribute.h
deleted file mode 100644
index a18706bd0f7..00000000000
--- a/TAO/TAO_IDL/include/ast_attribute.h
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.
-2550 Garcia Avenue
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-#ifndef _AST_ATTRIBUTE_AST_ATTRIBUTE_HH
-#define _AST_ATTRIBUTE_AST_ATTRIBUTE_HH
-
-// Representation of attribute declaration:
-//
-// An attribute is a field with a readonly property
-
-/*
-** DEPENDENCIES: ast_field.hh, ast_type.hh, utl_scoped_name.hh,
-**		 utl_strlist.hh, ast_decl.hh
-**
-** USE: Included from ast.h
-*/
-
-class	AST_Attribute : public virtual AST_Field
-{
-public:
-  // Operations
-
-  // Constructor(s)
-  AST_Attribute();
-  AST_Attribute(idl_bool readonly,
-		AST_Type *ft,
-		UTL_ScopedName *n,
-		UTL_StrList *p);
-  virtual ~AST_Attribute() {}
-
-  // Data Accessors
-  idl_bool readonly();
-
-  // Narrowing
-  DEF_NARROW_METHODS1(AST_Attribute, AST_Field);
-  DEF_NARROW_FROM_DECL(AST_Attribute);
-
-  // AST Dumping
-  virtual void			dump(ostream &o);
-
-private:
-  // Data
-  const idl_bool		pd_readonly;	// Is attribute read-only?
-};
-
-#endif           // _AST_ATTRIBUTE_AST_ATTRIBUTE_HH
diff --git a/TAO/TAO_IDL/include/ast_concrete_type.h b/TAO/TAO_IDL/include/ast_concrete_type.h
deleted file mode 100644
index 6c527afaca7..00000000000
--- a/TAO/TAO_IDL/include/ast_concrete_type.h
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-#ifndef _AST_CONCRETE_TYPE_AST_CONCRETE_TYPE_HH
-#define _AST_CONCRETE_TYPE_AST_CONCRETE_TYPE_HH
-
-// Class for all concrete types
-//
-// This is useful to group together IDL types other than objects
-
-/*
-** DEPENDENCIES: ast_type.hh, ast_decl.hh, utl_scoped_name.hh, utl_strlist.hh
-**
-** USE: Included from ast.hh
-*/
-
-class	AST_ConcreteType : public virtual AST_Type
-{
-public:
-  // Operations
-
-  // Constructor(s)
-  AST_ConcreteType();
-  AST_ConcreteType(AST_Decl::NodeType nt, UTL_ScopedName *n, UTL_StrList *p);
-  virtual ~AST_ConcreteType() {}
-
-  // Narrowing
-  DEF_NARROW_METHODS1(AST_ConcreteType, AST_Type);
-  DEF_NARROW_FROM_DECL(AST_ConcreteType);
-};
-
-#endif           // _AST_CONCRETE_TYPE_AST_CONCRETE_TYPE_HH
diff --git a/TAO/TAO_IDL/include/ast_constant.h b/TAO/TAO_IDL/include/ast_constant.h
deleted file mode 100644
index 90db723d429..00000000000
--- a/TAO/TAO_IDL/include/ast_constant.h
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-#ifndef _AST_CONSTANT_AST_CONSTANT_HH
-#define _AST_CONSTANT_AST_CONSTANT_HH
-
-// Representation of constant declaration:
-//
-// NOTE: Part of the job of the constructor is to convert
-// the AST_Constant_val it received to the type denoted by
-// the ConstantType it received.
-//
-// NOTE: There are two constructors here, one that gets a NodeType
-// parameter. This constructor is used from AST_EnumVal, which is
-// just a glorified AST_Constant
-
-/*
-** DEPENDENCIES: ast_decl.hh, ast_expression.hh, utl_scoped_name.hh,
-**		 utl_strlist.hh
-**
-** USE: Included from ast.hh
-*/
-
-class	AST_Constant : public virtual AST_Decl
-{
-public:
-  // Operations
-
-  // Constructor(s)
-  AST_Constant();
-  AST_Constant(AST_Expression::ExprType et, AST_Decl::NodeType nt,
-	       AST_Expression *ev, UTL_ScopedName *n, UTL_StrList *p);
-  AST_Constant(AST_Expression::ExprType et, AST_Expression *ev,
-	       UTL_ScopedName *n, UTL_StrList *p);
-  virtual ~AST_Constant() {}
-
-  // Data Accessors
-  AST_Expression *constant_value();
-  AST_Expression::ExprType et();
-
-  // Narrowing
-  DEF_NARROW_METHODS1(AST_Constant, AST_Decl);
-  DEF_NARROW_FROM_DECL(AST_Constant);
-
-  // AST Dumping
-  virtual void			dump(ostream &o);
-
-private:
-  // Data
-  AST_Expression		*pd_constant_value;	// The value
-  AST_Expression::ExprType	pd_et;			// Its expr type
-};
-
-#endif           // _AST_CONSTANT_AST_CONSTANT_HH
diff --git a/TAO/TAO_IDL/include/ast_decl.h b/TAO/TAO_IDL/include/ast_decl.h
deleted file mode 100644
index 26509ab6508..00000000000
--- a/TAO/TAO_IDL/include/ast_decl.h
+++ /dev/null
@@ -1,186 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-#ifndef _AST_DECL_AST_DECL_HH
-#define _AST_DECL_AST_DECL_HH
-
-// Rock bottom of AST class hierarchy
-//
-// This class is inherited by all classes which represent named entities
-// in IDL. It implements the line and file recording mechanism and also
-// records the type of the node. This may be useful for BEs to be able
-// to distinguish the real type of a node given only a superclass.
-
-/*
-** DEPENDENCIES: utl_scope.hh, utl_scoped_name.hh, utl_strlist.hh
-**
-** USE: Included from ast.hh
-*/
-
-#include	"ace/stdcpp.h"
-#include	"idl_fwd.h"
-#include	"idl_narrow.h"
-#include	"idl_bool.h"
-#include	"utl_scoped_name.h"
-#include	"utl_string.h"
-
-// This class is needed (only for g++) to get around a bug in g++ which
-// causes virtual operations to not be looked up correctly if an operation
-// is defined in more than one virtual public base class. This class makes
-// the hierarchy rooted in a single class, thereby eliminating the situation
-// that causes the bug to appear
-
-class	COMMON_Base
-{
-  public:
-        // Narrowing
-    DEF_NARROW_METHODS0(COMMON_Base);
-};
-
-class	AST_Decl : public virtual COMMON_Base
-{
-public:
-  // Enum defining the different kinds of AST nodes
-  enum NodeType {
-        NT_module				// Denotes a module
-      , NT_root					// Denotes the root of AST
-      , NT_interface				// Denotes an interface
-      , NT_interface_fwd			// Fwd declared interface
-      , NT_const				// Denotes a constant
-      , NT_except				// Denotes an exception
-      , NT_attr					// Denotes an attribute
-      , NT_op					// Denotes an operation
-      , NT_argument				// Denotes an op. argument
-      , NT_union				// Denotes a union
-      , NT_union_branch				// Denotes a union branch
-      , NT_struct				// Denotes a structure
-      , NT_field				// Denotes a field in structure
-      , NT_enum					// Denotes an enumeration
-      , NT_enum_val				// Denotes an enum. value
-      , NT_string				// Denotes an IDL string
-      , NT_array				// Denotes an IDL array
-      , NT_sequence				// Denotes an IDL sequence
-      , NT_typedef				// Denotes a typedef
-      , NT_pre_defined				// Denotes a predefined type
-  };
-
-  // Operations
-
-  // Constructor(s)
-  AST_Decl();
-  AST_Decl(NodeType type, UTL_ScopedName *n, UTL_StrList *pragmas);
-  virtual ~AST_Decl() {}
-
-  // Data Accessors
-  idl_bool imported();
-  void set_imported(idl_bool is_it);
-  idl_bool in_main_file();
-  void set_in_main_file(idl_bool is_it);
-  UTL_Scope *defined_in();
-  void set_defined_in(UTL_Scope *);
-  NodeType node_type();
-  long line();
-  void set_line(long l);
-  String *file_name();
-  void set_file_name(String *s);
-  UTL_ScopedName *name();
-  void set_name(UTL_ScopedName *n);
-  Identifier *local_name();
-  void add_pragmas(UTL_StrList *p);
-  UTL_StrList *pragmas();
-  idl_bool added();
-  void set_added(idl_bool is_it);
-
-  // Narrowing
-  DEF_NARROW_METHODS0(AST_Decl);
-  DEF_NARROW_FROM_DECL(AST_Decl);
-
-  // AST Dumping
-  virtual void			dump(ostream &o);
-
-  // Other operations
-
-  // Return TRUE if "this" has "s" as an ancestor
-  idl_bool			has_ancestor(AST_Decl *s);
-
-private:
-  // Data
-  idl_bool			pd_imported;    // Imported?
-  idl_bool			pd_in_main_file; // Defined in main file?
-  UTL_Scope			*pd_defined_in;	// Scope
-  NodeType			pd_node_type;	// What kind of node
-  long				pd_line;	// Line defined in
-  String			*pd_file_name;	// What file defined in
-  UTL_ScopedName		*pd_name;	// As given
-  Identifier			*pd_local_name;	// Name in scope
-  UTL_StrList			*pd_pragmas;	// Pragmas
-  idl_bool			pd_added;	// already added
-
-  // Operations
-
-  // Compute the full name of an AST node
-  void				compute_full_name(UTL_ScopedName *n);
-};
-
-#endif           // _AST_DECL_AST_DECL_HH
diff --git a/TAO/TAO_IDL/include/ast_enum.h b/TAO/TAO_IDL/include/ast_enum.h
deleted file mode 100644
index cf6941386c5..00000000000
--- a/TAO/TAO_IDL/include/ast_enum.h
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-#ifndef _AST_ENUM_AST_ENUM_HH
-#define _AST_ENUM_AST_ENUM_HH
-
-// Representation of enum:
-
-/*
-** DEPENDENCIES: ast_concrete_type.hh, utl_scope.hh, ast_enum_val.hh,
-**		 utl_scoped_name.hh, utl_strlist.hh, ast_expression.hh,
-**
-** USE: Included from ast.hh
-*/
-
-class	AST_Enum : public virtual AST_ConcreteType, public virtual UTL_Scope
-{
-public:
-  // Operations
-
-  // Constructor(s)
-  AST_Enum();
-  AST_Enum(UTL_ScopedName *n, UTL_StrList *p);
-  virtual ~AST_Enum() {}
-
-  // Narrowing
-  DEF_NARROW_METHODS2(AST_Enum, AST_ConcreteType, UTL_Scope);
-  DEF_NARROW_FROM_DECL(AST_Enum);
-  DEF_NARROW_FROM_SCOPE(AST_Enum);
-
-  // AST Dumping
-  virtual void			dump(ostream &);
-
-  // Other operations
-
-  // Look up an AST_EnumVal by value
-  virtual AST_EnumVal		*lookup_by_value(const AST_Expression *v);
-
-  // Get value to be assigned to next enumerator
-  virtual unsigned long		next_enum_val();
-
-private:
-  // Data
-  unsigned long			pd_enum_counter;	// Value for next
-							// enumerator
-  // Scope management
-  friend int yyparse();
-  virtual AST_EnumVal		*fe_add_enum_val(AST_EnumVal	*v);
-
-};
-
-#endif           // _AST_ENUM_AST_ENUM_HH
diff --git a/TAO/TAO_IDL/include/ast_enum_val.h b/TAO/TAO_IDL/include/ast_enum_val.h
deleted file mode 100644
index 902b5ad04c4..00000000000
--- a/TAO/TAO_IDL/include/ast_enum_val.h
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-#ifndef _AST_ENUM_VAL_AST_ENUM_VAL_HH
-#define _AST_ENUM_VAL_AST_ENUM_VAL_HH
-
-// Representation of enumerator in enum:
-//
-// An enumerator is a constant of type unsigned long
-
-/*
-** DEPENDENCIES: ast_constant.hh, utl_scoped_name.hh, utl_strlist.hh,
-**		 ast_decl.hh
-**
-** USE: Included from ast.hh
-*/
-
-class	AST_EnumVal : public virtual AST_Constant
-{
-public:
-  // Operations
-
-  // Constructor(s)
-  AST_EnumVal();
-  AST_EnumVal(unsigned long v, UTL_ScopedName *n, UTL_StrList *p);
-  virtual ~AST_EnumVal() {}
-
-  // Narrowing
-  DEF_NARROW_METHODS1(AST_EnumVal, AST_Constant);
-  DEF_NARROW_FROM_DECL(AST_EnumVal);
-
-  // AST Dumping
-  virtual void			dump(ostream &);
-};
-
-#endif           // _AST_ENUM_VAL_AST_ENUM_VAL_HH
diff --git a/TAO/TAO_IDL/include/ast_exception.h b/TAO/TAO_IDL/include/ast_exception.h
deleted file mode 100644
index a1bf98fd8e9..00000000000
--- a/TAO/TAO_IDL/include/ast_exception.h
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-#ifndef _AST_EXCEPTION_AST_EXCEPTION_HH
-#define _AST_EXCEPTION_AST_EXCEPTION_HH
-
-// Representation of exception
-//
-// NOTE: An exception is not a type according to the CORBAS 1.1
-//
-// NOTE: add(AST_ConcreteType *) is defined here because an exception
-// can contain locally defined types in addition to fields.
-//
-// NOTE: add(AST_EnumValue *) is defined here because enums can
-// be defined manifest locally; the constants defined in these
-// enums are inserted in the enclosing scope. It is unlikely that
-// a BE writer will need to overload this function in AST_Exception.
-
-/*
-** DEPENDENCIES: ast_decl.hh, ast_structure.hh, utl_scope.hh, utl_strlist.hh
-**
-** USE: Included from ast.hh
-*/
-
-class	AST_Exception : public virtual AST_Structure
-{
-public:
-  // Operations
-
-  // Constructor(s)
-  AST_Exception();
-  AST_Exception(UTL_ScopedName *n, UTL_StrList *p);
-  virtual ~AST_Exception() {}
-
-  // Narrowing
-  DEF_NARROW_METHODS1(AST_Exception, AST_Structure);
-  DEF_NARROW_FROM_DECL(AST_Exception);
-  DEF_NARROW_FROM_SCOPE(AST_Exception);
-
-  // AST Dumping
-  virtual void			dump(ostream &o);
-
-private:
-  friend int yyparse();
-  // Scope Management Protocol
-
-  virtual AST_Field		*fe_add_field(AST_Field		*f);
-  virtual AST_Union		*fe_add_union(AST_Union		*u);
-  virtual AST_Structure		*fe_add_structure(AST_Structure	*s);
-  virtual AST_Enum		*fe_add_enum(AST_Enum		*e);
-  virtual AST_EnumVal		*fe_add_enum_val(AST_EnumVal	*v);
-
-};
-
-#endif           // _AST_EXCEPTION_AST_EXCEPTION_HH
diff --git a/TAO/TAO_IDL/include/ast_expression.h b/TAO/TAO_IDL/include/ast_expression.h
deleted file mode 100644
index 6d284bd1a77..00000000000
--- a/TAO/TAO_IDL/include/ast_expression.h
+++ /dev/null
@@ -1,229 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-#ifndef _AST_EXPRESSION_AST_EXPRESSION_HH
-#define _AST_EXPRESSION_AST_EXPRESSION_HH
-
-// Representation of expression values
-
-/*
-** DEPENDENCIES: NONE
-**
-** USE: Included from ast.hh
-*/
-
-// An expression (and maybe its value, if computed)
-class	AST_Expression {
-public:
-  // Enum to define all the different operators to combine expressions
-  enum ExprComb {
-      EC_add		// '+'
-    , EC_minus		// '-'
-    , EC_mul		// '*'
-    , EC_div		// '/'
-    , EC_mod		// '%'
-    , EC_or		// '|'
-    , EC_xor		// '^'
-    , EC_and		// '&'
-    , EC_left		// '<<'
-    , EC_right		// '>>'
-    , EC_u_plus		// unary '+'
-    , EC_u_minus	// unary '-'
-    , EC_bit_neg	// '~'
-    , EC_none		// No operator (missing)
-    , EC_symbol		// a symbol (function or constant name)
-  };
-  
-  // Enum to define the different kinds of evaluation possible
-  // Extend this for more kinds of evaluation as required
-  enum EvalKind {
-      EK_const			// Must evaluate to constant
-    , EK_positive_int		// Must evaluate to positive integer
-  };
-
-  // Enum to define expression type
-  enum ExprType {
-      EV_short			// Expression value is short
-    , EV_ushort			// Expression value is unsigned short
-    , EV_long			// Expression value is long
-    , EV_ulong			// Expression value is unsigned long
-    , EV_longlong		// Expression value is long long
-    , EV_ulonglong		// Expression value is unsigned long long
-    , EV_float			// Expression value is 32-bit float
-    , EV_double			// Expression value is 64-bit float
-    , EV_longdouble		// Expression value is 128-bit float
-    , EV_char			// Expression value is char
-    , EV_wchar			// Expression value is wide char	
-    , EV_octet			// Expression value is unsigned char
-    , EV_bool			// Expression value is boolean
-    , EV_string			// Expression value is char *
-    , EV_wstring		// Expression value is wchar_t *
-    , EV_any			// Expression value is any of above
-    , EV_void			// Expression value is void (absent)
-    , EV_none			// Expression value is missing
-  };
-
-  // Structure to descrive value of constant expression and its type
-  struct AST_ExprValue {
-    union {
-      short		sval;	// Contains short expression value
-      unsigned short	usval;	// Contains unsigned short expr value
-      long		lval;	// Contains long expression value
-      unsigned long	ulval;	// Contains unsigned long expr value
-      unsigned long	bval;	// Contains boolean expression value
-      float		fval;	// Contains 32-bit float expr value
-      double		dval;	// Contains 64-bit float expr value
-      char		cval;	// Contains char expression value
-      unsigned char	oval;	// Contains unsigned char expr value
-      String	        *strval; // Contains String * expr value
-      unsigned long	eval;	// Contains enumeration value
-    } u;
-    ExprType et;
-  };
-
-  // Operations
-
-  // Constructor(s)
-  AST_Expression(AST_Expression *v, ExprType t);
-
-  AST_Expression(ExprComb c, AST_Expression *v1, AST_Expression *v2);
-
-  AST_Expression(short		s);
-  AST_Expression(unsigned short	us);
-  AST_Expression(long		l);
-  AST_Expression(long		l, ExprType t);
-  AST_Expression(unsigned long	ul);
-  AST_Expression(float		f);
-  AST_Expression(double		d);
-  AST_Expression(char		c);
-  AST_Expression(unsigned char	uc);
-  AST_Expression(String		*s);
-  AST_Expression(UTL_ScopedName	*n);
-  virtual ~AST_Expression () {}
-
-  // Data Accessors
-  UTL_Scope *defined_in();
-  void set_defined_in(UTL_Scope *d);
-  long line();
-  void set_line(long l);
-  String *file_name();
-  void set_file_name(String *f);
-  ExprComb ec();
-  void set_ec(ExprComb new_ec);
-  AST_ExprValue	*ev();
-  void set_ev(AST_ExprValue *new_ev);
-  AST_Expression *v1();
-  void set_v1(AST_Expression *e);
-  AST_Expression *v2();
-  void set_v2(AST_Expression *e);
-  UTL_ScopedName *n();
-  void set_n(UTL_ScopedName *new_n);
-
-  // AST Dumping
-  virtual void			dump(ostream &o);
-
-  // Other operations
-
-  // Evaluation and value coercion
-  virtual AST_ExprValue		*eval(EvalKind ek);
-  virtual AST_ExprValue		*coerce(ExprType t);
-
-  // Evaluate then store value inside this AST_Expression
-  virtual void			evaluate(EvalKind ek);
-
-  // Compare to AST_Expressions
-  virtual long			operator==(AST_Expression *vc);
-  virtual long			compare(AST_Expression *vc);
-
-protected:
-  // Evaluate different sets of operators
-  virtual AST_ExprValue	*eval_bin_op(EvalKind ek);
-  virtual AST_ExprValue	*eval_bit_op(EvalKind ek);
-  virtual AST_ExprValue	*eval_un_op(EvalKind ek);
-  virtual AST_ExprValue	*eval_symbol(EvalKind ek);
-
-private:
-  // Data
-  UTL_Scope			*pd_defined_in;	// Scope
-  long				pd_line;	// Line defined in
-  String			*pd_file_name;	// What file defined in
-
-  ExprComb			pd_ec;		// What combinator
-  AST_ExprValue			*pd_ev;		// computed value
-  AST_Expression		*pd_v1;		// 1st sub-expression
-  AST_Expression		*pd_v2;		// 2nd sub-expression
-  UTL_ScopedName		*pd_n;		// symbolic name (if any)
-
-  // Operations
-
-  // Fill out the lineno, filename and definition scope details
-  void				fill_definition_details();
-
-  // Internal evaluation
-  virtual AST_ExprValue *eval_internal(EvalKind ek);
-};
-
-#endif           // _AST_EXPR_VAL_AST_EXPR_VAL_HH
-
-
diff --git a/TAO/TAO_IDL/include/ast_extern.h b/TAO/TAO_IDL/include/ast_extern.h
deleted file mode 100644
index 74ea518bef5..00000000000
--- a/TAO/TAO_IDL/include/ast_extern.h
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-#ifndef _AST_EXTERN_AST_EXTERN_HH
-#define _AST_EXTERN_AST_EXTERN_HH
-
-// ast_extern.hh
-//
-// Declares all global functions for the AST
-
-/*
-** DEPENDENCIES: none
-**
-** USE: Included from idl_extern.hh
-*/
-
-// Functions:
-
-// Two functions are provided for storing AST nodes representing fwd
-// declared interfaces, and for checking the stored nodes after parsing
-// the entire AST. The check ensures that for each fwd declared interface
-// the full definition was also seen.
-
-extern void	AST_record_fwd_interface(AST_InterfaceFwd *i);
-extern void	AST_check_fwd_interface();
-
-extern idl_bool	AST_illegal_recursive_type(AST_Decl *t);
-
-#endif           // _AST_EXTERN_AST_EXTERN_HH
-
diff --git a/TAO/TAO_IDL/include/ast_field.h b/TAO/TAO_IDL/include/ast_field.h
deleted file mode 100644
index 39e80f5c6ec..00000000000
--- a/TAO/TAO_IDL/include/ast_field.h
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-#ifndef _AST_FIELD_AST_FIELD_HH
-#define _AST_FIELD_AST_FIELD_HH
-
-// Representation of a generic field
-//
-// Used as member in structures, exceptions and unions, and as a base
-// type for attributes and arguments to operations
-//
-// NOTE: There are two constructors here, the first is used when field
-// is used directly inside a structure, the second when it is used as
-// the base type for attributes and operations.
-
-/*
-** DEPENDENCIES: ast_decl.hh, ast_type.hh, utl_scoped_name.hh, utl_strlist.hh
-**
-** USE: Included from ast.hh
-*/
-
-#include	"idl_fwd.h"
-#include	"idl_narrow.h"
-#include	"ast_decl.h"
-
-
-class	AST_Field : public virtual AST_Decl
-{
-public:
-  // Operations
-
-  // Constructor(s)
-  AST_Field();
-  AST_Field(AST_Type *field_type,
-	    UTL_ScopedName *n, UTL_StrList *p);
-  AST_Field(AST_Decl::NodeType nt, AST_Type *field_type,
-	    UTL_ScopedName *n, UTL_StrList *p);
-  virtual ~AST_Field() {}
-
-  // Data Accessors
-  AST_Type *field_type();
-
-  // Narrowing
-  DEF_NARROW_METHODS1(AST_Field, AST_Decl);
-  DEF_NARROW_FROM_DECL(AST_Field);
-
-  // AST Dumping
-  virtual void			dump(ostream &o);
-
-private:
-  // Data
-  AST_Type			*pd_field_type;	// Base type for field
-
-};
-
-#endif           // _AST_FIELD_AST_FIELD_HH
diff --git a/TAO/TAO_IDL/include/ast_generator.h b/TAO/TAO_IDL/include/ast_generator.h
deleted file mode 100644
index c9154fc366d..00000000000
--- a/TAO/TAO_IDL/include/ast_generator.h
+++ /dev/null
@@ -1,212 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-#ifndef _AST_GENERATOR_AST_GENERATOR_HH
-#define _AST_GENERATOR_AST_GENERATOR_HH
-
-// ast_generator.h
-//
-// Defines base class for generators
-
-/*
-** DEPENDENCIES: ast_predefined_type.hh utl_scoped_name.hh utl_strlist.hh
-**		 ast_module.hh ast_root.hh ast_interface.hh
-**		 ast_interface_fwd.hh ast_exception.hh ast_structure.hh
-**		 ast_enum.hh ast_operation.hh ast_type.hh ast_field.hh
-**		 ast_argument.hh ast_attribute.hh ast_union.hh
-**		 ast_concrete_type.hh ast_union_branch.hh ast_union_label.hh
-**		 ast_expression.hh ast_enum_val.hh ast_array.hh
-**		 ast_sequence.hh ast_string.hh ast_typedef.hh
-**
-** USE: Included from ast.hh
-*/
-
-class	AST_Generator
-{
-public:
-  // Operations
-
-  // Create a node representing a predefined type
-  virtual AST_PredefinedType
-    *create_predefined_type(AST_PredefinedType::PredefinedType t,
-			    UTL_ScopedName *n,
-			    UTL_StrList *p);
-
-  // Create a node representing a module
-  virtual AST_Module	*create_module(UTL_ScopedName *n,
-				       UTL_StrList *p);
-
-  // Create a node representing a module which is the root of an AST
-  virtual AST_Root	*create_root(UTL_ScopedName *n,
-				     UTL_StrList *p);
-
-  // Create a node representing an interface
-  virtual AST_Interface	*create_interface(UTL_ScopedName *n,
-					  AST_Interface **ih,
-					  long nih,
-					  UTL_StrList *p);
-
-  // Create a node representing a forward declaration of an interface
-  virtual AST_InterfaceFwd *create_interface_fwd(UTL_ScopedName *n,
-						 UTL_StrList *p);
-
-  // Create a node representing an exception
-  virtual AST_Exception	*create_exception(UTL_ScopedName *n,
-					  UTL_StrList *p);
-
-  // Create a node representing a structure
-  virtual AST_Structure	*create_structure(UTL_ScopedName *n,
-					  UTL_StrList *p);
-
-  // Create a node representing an enum
-  virtual AST_Enum	*create_enum(UTL_ScopedName *n,
-				     UTL_StrList *p);
-
-  // Create a node representing an operation on an interface
-  virtual AST_Operation	*create_operation(AST_Type *rt,
-					  AST_Operation::Flags fl,
-					  UTL_ScopedName *n,
-					  UTL_StrList *p);
-
-  // Create a node representing a field in a structure, exception or
-  // union
-  virtual AST_Field	*create_field(AST_Type *ft,
-				      UTL_ScopedName *n,
-				      UTL_StrList *p);
-
-  // Create a node representing an argument to an operation
-  virtual AST_Argument	*create_argument(AST_Argument::Direction d,
-					 AST_Type *ft,
-					 UTL_ScopedName *n,
-					 UTL_StrList *p);
-
-  // Create a node representing an attribute
-  virtual AST_Attribute	*create_attribute(idl_bool ro,
-					  AST_Type *ft,
-					  UTL_ScopedName *n,
-					  UTL_StrList *p);
-
-  // Create a node representing a union
-  virtual AST_Union	*create_union(AST_ConcreteType *dt,
-				      UTL_ScopedName *n,
-				      UTL_StrList *p);
-
-  // Create a node representing one branch in a union
-  virtual AST_UnionBranch *create_union_branch(AST_UnionLabel *lab,
-					       AST_Type *ft,
-					       UTL_ScopedName *n,
-					       UTL_StrList *p);
-
-  // Create a node representing a label on a union branch
-  virtual AST_UnionLabel *create_union_label(AST_UnionLabel::UnionLabel ul,
-					     AST_Expression *lv);
-
-  // Create a node representing a constant
-  virtual AST_Constant	*create_constant(AST_Expression::ExprType et,
-					 AST_Expression *ev,
-					 UTL_ScopedName *n,
-					 UTL_StrList *p);
-
-  // Create various kinds of nodes representing expressions
-  virtual AST_Expression	*create_expr(UTL_ScopedName *n);
-  virtual AST_Expression	*create_expr(AST_Expression *v,
-					     AST_Expression::ExprType t);
-  virtual AST_Expression	*create_expr(AST_Expression::ExprComb c,
-					     AST_Expression *v1,
-					     AST_Expression *v2);
-  virtual AST_Expression	*create_expr(long v);
-  virtual AST_Expression	*create_expr(long v,
-					     AST_Expression::ExprType t);
-  virtual AST_Expression	*create_expr(unsigned long v);
-  virtual AST_Expression	*create_expr(String *s);
-  virtual AST_Expression	*create_expr(char c);
-  virtual AST_Expression	*create_expr(double d);
-
-  // Create a node representing an enumerator
-  virtual AST_EnumVal	*create_enum_val(unsigned long v,
-					 UTL_ScopedName *n,
-					 UTL_StrList *p);
-
-  // Create a node representing an array type
-  virtual AST_Array	*create_array(UTL_ScopedName *n,
-				      unsigned long ndims,
-				      UTL_ExprList *dims);
-
-  // Create a node representing a sequence type
-  virtual AST_Sequence	*create_sequence(AST_Expression *v,
-					 AST_Type *bt);
-
-  // Create a node representing a string type
-  virtual AST_String	*create_string(AST_Expression *v);
-
-  // Create a node representing a wide string type
-  virtual AST_String	*create_wstring(AST_Expression *v);
-
-  // Create a node representing a type renaming (typedef)
-  virtual AST_Typedef	*create_typedef(AST_Type *bt,
-					UTL_ScopedName *n,
-					UTL_StrList *p);
-};
-
-#endif           // _AST_GENERATOR_AST_GENERATOR_HH
diff --git a/TAO/TAO_IDL/include/ast_interface.h b/TAO/TAO_IDL/include/ast_interface.h
deleted file mode 100644
index fe8c96e8b3b..00000000000
--- a/TAO/TAO_IDL/include/ast_interface.h
+++ /dev/null
@@ -1,144 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-#ifndef _AST_INTERFACE_AST_INTERFACE_HH
-#define _AST_INTERFACE_AST_INTERFACE_HH
-
-// Representation of interface:
-//
-// NOTE: add(AST_EnumValue *) is defined here because enums can
-// be defined manifest locally; the constants defined in these
-// enums are inserted in the enclosing scope.
-
-/*
-** DEPENDENCIES: ast_type.hh, utl_scope.hh, ast_decl.hh, utl_strlist.hh
-**
-** USE: Included from ast.hh
-*/
-
-#include	"idl_fwd.h"
-#include	"idl_narrow.h"
-#include	"ast_type.h"
-#include	"utl_scope.h"
-#include	"ast_decl.h"
-
-
-class	AST_Interface : public virtual AST_Type, public virtual UTL_Scope
-{
-public:
-  // Operations
-
-  // Constructor(s)
-  AST_Interface();
-  AST_Interface(UTL_ScopedName *n,
-		AST_Interface **ih,
-		long nih,
-		UTL_StrList *p);
-  virtual ~AST_Interface() {}
-
-  // Data Accessors
-  AST_Interface	**inherits();
-  void set_inherits(AST_Interface **i);
-  long n_inherits();
-  void set_n_inherits(long i);
-
-  // Is this interface defined? This predicate returns FALSE when an
-  // interface was forward declared but not defined yet, and TRUE in
-  // all other cases.
-  idl_bool is_defined()
-  {
-    return (pd_n_inherits < 0) ? I_FALSE : I_TRUE;
-  }
-
-  // Narrowing
-  DEF_NARROW_METHODS2(AST_Interface, AST_Type, UTL_Scope);
-  DEF_NARROW_FROM_DECL(AST_Interface);
-  DEF_NARROW_FROM_SCOPE(AST_Interface);
-
-  // AST Dumping
-  virtual void			dump(ostream &o);
-
-private:
-  // Data
-  AST_Interface			**pd_inherits;	// Inherited interfaces
-						// This is an array of pointers
-						// to the inherited interfaces
-  long				pd_n_inherits;	// How many of them?
-
-  // Scope Management Protocol
-  friend int yyparse();
-
-  virtual AST_Constant		*fe_add_constant(AST_Constant	*c);
-  virtual AST_Exception		*fe_add_exception(AST_Exception	*e);
-  virtual AST_Attribute		*fe_add_attribute(AST_Attribute	*a);
-  virtual AST_Operation		*fe_add_operation(AST_Operation	*o);
-  virtual AST_Union		*fe_add_union(AST_Union		*u);
-  virtual AST_Structure		*fe_add_structure(AST_Structure	*s);
-  virtual AST_Enum		*fe_add_enum(AST_Enum		*e);
-  virtual AST_EnumVal		*fe_add_enum_val(AST_EnumVal	*v);
-  virtual AST_Typedef		*fe_add_typedef(AST_Typedef	*t);
-
-};
-
-#endif           // _AST_INTERFACE_AST_INTERFACE_HH
diff --git a/TAO/TAO_IDL/include/ast_interface_fwd.h b/TAO/TAO_IDL/include/ast_interface_fwd.h
deleted file mode 100644
index 8dddc51d916..00000000000
--- a/TAO/TAO_IDL/include/ast_interface_fwd.h
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-#ifndef _AST_INTERFACE_FWD_AST_INTERFACE_FWD_HH
-#define _AST_INTERFACE_FWD_AST_INTERFACE_FWD_HH
-
-// Representation of a forward interface declaration
-
-/*
-** DEPENDENCIES: ast_decl.hh, ast_interface.hh, utl_scoped_name.hh,
-**		 utl_strlist.hh
-**
-** USE: Included from ast.hh
-*/
-
-class	AST_InterfaceFwd : public virtual AST_Type
-{
-public:
-  // Operations
-
-  // Constructor(s)
-  AST_InterfaceFwd();
-  AST_InterfaceFwd(UTL_ScopedName *n, UTL_StrList *p);
-  virtual ~AST_InterfaceFwd() {}
-
-  // Data Accessors
-  AST_Interface	*full_definition();
-  void set_full_definition(AST_Interface *nfd);
-
-  // Narrowing
-  DEF_NARROW_METHODS1(AST_InterfaceFwd, AST_Type);
-  DEF_NARROW_FROM_DECL(AST_InterfaceFwd);
-
-  // AST Dumping
-  virtual void		dump(ostream &);
-
-private:
-  // Data
-  AST_Interface		*pd_full_definition;	// The interface this is a
-						// forward declaration of
-};
-
-#endif           // _AST_INTERFACE_FWD_AST_INTERFACE_FWD_HH
diff --git a/TAO/TAO_IDL/include/ast_module.h b/TAO/TAO_IDL/include/ast_module.h
deleted file mode 100644
index 305d47dd4fa..00000000000
--- a/TAO/TAO_IDL/include/ast_module.h
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-#ifndef _AST_MODULE_AST_MODULE_HH
-#define _AST_MODULE_AST_MODULE_HH
-
-// Representation of module
-//
-// NOTE: add(AST_EnumValue *) is defined here because enums can
-// be defined manifest locally; the constants defined in these
-// enums are inserted in the enclosing scope.
-
-/*
-** DEPENDENCIES: ast_decl.hh, utl_scope.hh, utl_scoped_name.hh, utl_strlist.hh
-**
-** USE: Included from ast.hh
-*/
-
-class	AST_Module : public virtual AST_Decl, public virtual UTL_Scope
-{
-public:
-  // Operations
-
-  // Constructor(s)
-  AST_Module();
-  AST_Module(UTL_ScopedName *n, UTL_StrList *p);
-  virtual ~AST_Module() {}
-
-  // Narrowing
-  DEF_NARROW_METHODS2(AST_Module, AST_Decl, UTL_Scope);
-  DEF_NARROW_FROM_DECL(AST_Module);
-  DEF_NARROW_FROM_SCOPE(AST_Module);
-
-  // AST Dumping
-  virtual void			dump(ostream &o);
-
-private:
-  friend void fe_populate(AST_Module *m);
-  friend int yyparse();
-
-  // Scope Management Protocol
-
-  virtual AST_PredefinedType	*fe_add_predefined_type(AST_PredefinedType *t);
-  virtual AST_Module		*fe_add_module(AST_Module		*m);
-  virtual AST_Interface		*fe_add_interface(AST_Interface		*i);
-  virtual AST_InterfaceFwd	*fe_add_interface_fwd(AST_InterfaceFwd	*i);
-  virtual AST_Constant		*fe_add_constant(AST_Constant		*c);
-  virtual AST_Exception		*fe_add_exception(AST_Exception		*e);
-  virtual AST_Union		*fe_add_union(AST_Union			*u);
-  virtual AST_Structure		*fe_add_structure(AST_Structure		*s);
-  virtual AST_Enum		*fe_add_enum(AST_Enum			*e);
-  virtual AST_EnumVal		*fe_add_enum_val(AST_EnumVal		*v);
-  virtual AST_Typedef		*fe_add_typedef(AST_Typedef		*t);
-
-};
-
-#endif           // _AST_MODULE_AST_MODULE_HH
diff --git a/TAO/TAO_IDL/include/ast_operation.h b/TAO/TAO_IDL/include/ast_operation.h
deleted file mode 100644
index dc197a7bf17..00000000000
--- a/TAO/TAO_IDL/include/ast_operation.h
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-#ifndef _AST_OPERATION_AST_OPERATION_HH
-#define _AST_OPERATION_AST_OPERATION_HH
-
-// Representation of operation declaration:
-
-/*
-** DEPENDENCIES: ast_decl.hh, utl_scope.hh, ast_type.hh, utl_strlist.hh,
-**		 utl_exceptlist.hh, utl_scoped_name.hh
-**
-** USE: included from ast.hh
-*/
-
-#include	"idl_fwd.h"
-#include	"idl_narrow.h"
-#include	"utl_list.h"
-#include	"ast_decl.h"
-#include	"utl_scope.h"
-#include	"utl_scoped_name.h"
-
-
-class	AST_Operation : public virtual AST_Decl, public virtual UTL_Scope
-{
-public:
-  // Define enum with flags for operation attributes
-  enum Flags {
-       OP_noflags		// No flags present
-     , OP_oneway		// Operation is oneway
-     , OP_idempotent		// Operation is idempotent
-  };
-
-  // Operations
-
-  // Constructor(s)
-  AST_Operation();
-  AST_Operation(AST_Type *return_type,
-		Flags flags,
-		UTL_ScopedName *n,
-		UTL_StrList *p);
-  virtual ~AST_Operation() {}
-
-  // Data Accessors
-  AST_Type *return_type();
-  Flags flags();
-  UTL_StrList *context();
-  UTL_ExceptList *exceptions();
-  
-  // Narrowing
-  DEF_NARROW_METHODS2(AST_Operation, AST_Decl, UTL_Scope);
-  DEF_NARROW_FROM_DECL(AST_Operation);
-  DEF_NARROW_FROM_SCOPE(AST_Operation);
-
-  // AST Dumping
-  virtual void			dump(ostream &o);
-
-private:
-  // Data
-  AST_Type			*pd_return_type;	// Return type
-  Flags				pd_flags;		// Operation flags
-  UTL_StrList			*pd_context;		// Context
-  UTL_ExceptList		*pd_exceptions;		// Exceptions raised
-
-  // Scope Management Protocol
-  friend int yyparse();
-
-  virtual AST_Argument		*fe_add_argument(AST_Argument	*a);
-  virtual UTL_StrList		*fe_add_context(UTL_StrList 	*c);	
-							// Add context
-  virtual UTL_NameList		*fe_add_exceptions(UTL_NameList *e);
-							// exceptions
-
-};
-
-#endif           // _AST_OPERATION_AST_OPERATION_HH
diff --git a/TAO/TAO_IDL/include/ast_predefined_type.h b/TAO/TAO_IDL/include/ast_predefined_type.h
deleted file mode 100644
index 1be12f4c4bc..00000000000
--- a/TAO/TAO_IDL/include/ast_predefined_type.h
+++ /dev/null
@@ -1,125 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-#ifndef _AST_PREDEFINED_TYPE_AST_PREDEFINED_TYPE_HH
-#define _AST_PREDEFINED_TYPE_AST_PREDEFINED_TYPE_HH
-
-// Representation of predefined types:
-//
-// Instances of this class are inserted into the global context by
-// the front end before the start of parsing.
-
-/*
-** DEPENDENCIES: ast_concrete_type.hh, utl_scoped_name.hh, utl_strlist.hh,
-**		 ast_decl.hh
-**
-** USE: Included from ast.hh
-*/
-
-class	AST_PredefinedType : public virtual AST_ConcreteType
-{
-public:
-  // Enum for all the different predefined types
-  enum PredefinedType {
-        PT_long		// Predefined type "long"
-      , PT_ulong	// Predefined type "unsigned long"
-      , PT_longlong	// Predefined type "long long"
-      , PT_ulonglong	// Predefined type "unsigned long long"
-      , PT_short	// Predefined type "short"
-      , PT_ushort	// Predefined type "unsigned short"
-      , PT_float	// Predefined type "float"
-      , PT_double	// Predefined type "double"
-      , PT_longdouble	// Predefined type "long double"
-      , PT_char		// Predefined type "char"
-      , PT_wchar	// Predefined type "wchar_t"
-      , PT_boolean	// Predefined type "boolean"
-      , PT_octet	// Predefined type "octet"
-      , PT_any		// Predefined type "any"
-      , PT_void		// Predefined type "void"
-      , PT_pseudo	// Predefined type for pseudo objects
-  };
-
-  // Operations
-
-  // Constructor(s)
-  AST_PredefinedType();
-  AST_PredefinedType(PredefinedType t, UTL_ScopedName *n, UTL_StrList *p);
-  virtual ~AST_PredefinedType() {}
-
-  // Data Accessors
-  PredefinedType	pt();
-
-  // Narrowing
-  DEF_NARROW_METHODS1(AST_PredefinedType, AST_ConcreteType);
-  DEF_NARROW_FROM_DECL(AST_PredefinedType);
-
-  // AST Dumping
-  virtual void		dump(ostream &o);
-
-private:
-  // Data
-  const PredefinedType	pd_pt;		// The specific predefined type
-};  
-
-#endif           // _AST_PREDEFINED_TYPE_AST_PREDEFINED_TYPE_HH
diff --git a/TAO/TAO_IDL/include/ast_root.h b/TAO/TAO_IDL/include/ast_root.h
deleted file mode 100644
index 765043aac97..00000000000
--- a/TAO/TAO_IDL/include/ast_root.h
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-#ifndef _AST_ROOT_AST_ROOT_HH
-#define _AST_ROOT_AST_ROOT_HH
-
-// Representation of root of AST
-
-/*
-** DEPENDENCIES: ast_module.hh, utl_scoped_name.hh, utl_strlist.hh
-**
-** USE: Included from ast.hh
-*/
-
-class	AST_Root : public virtual AST_Module
-{
-public:
-  // Operations
-
-  // Constructor(s)
-  AST_Root();
-  AST_Root(UTL_ScopedName *n, UTL_StrList *p);
-  virtual ~AST_Root() {}
-
-  // Narrowing
-  DEF_NARROW_METHODS1(AST_Root, AST_Module);
-  DEF_NARROW_FROM_DECL(AST_Root);
-  DEF_NARROW_FROM_SCOPE(AST_Root);
-
-  // AST Dumping
-  virtual void			dump(ostream &o);
-
-private:
-  friend class FE_Declarator;
-  friend int yyparse();
-  // Add protocol
-
-  virtual AST_Sequence		*fe_add_sequence(AST_Sequence		*s);
-  virtual AST_String		*fe_add_string(AST_String		*s);
-  virtual AST_Array		*fe_add_array(AST_Array			*a);
-
-};
-
-#endif           // _AST_ROOT_AST_ROOT_HH
diff --git a/TAO/TAO_IDL/include/ast_sequence.h b/TAO/TAO_IDL/include/ast_sequence.h
deleted file mode 100644
index d3864e9f982..00000000000
--- a/TAO/TAO_IDL/include/ast_sequence.h
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-#ifndef _AST_SEQUENCE_AST_SEQUENCE_HH
-#define _AST_SEQUENCE_AST_SEQUENCE_HH
-
-// Representation of sequence declaration:
-//
-// A sequence is a combination of a maximum size and a base type
-
-/*
-** DEPENDENCIES: ast_concrete_type.hh, ast_type.hh, ast_decl.hh,
-**		 ast_expression.hh
-**
-** USE: Included from ast.hh
-*/
-
-class	AST_Sequence : public virtual AST_ConcreteType
-{
-public:
-  // Operations
-
-  // Constructor(s)
-  AST_Sequence();
-  AST_Sequence(AST_Expression *max_size, AST_Type *bt);
-  virtual ~AST_Sequence() {}
-
-  // Data Accessors
-  AST_Expression *max_size();
-  AST_Type *base_type();
-
-  // Narrowing
-  DEF_NARROW_METHODS1(AST_Sequence, AST_ConcreteType);
-  DEF_NARROW_FROM_DECL(AST_Sequence);
-
-  // AST Dumping
-  virtual void			dump(ostream &o);
-
-private:
-  // Data
-  AST_Expression		*pd_max_size;	// Maximum sequence size
-  AST_Type			*pd_base_type;	// Sequence base type
-};
-
-#endif           // _AST_SEQUENCE_AST_SEQUENCE_HH
diff --git a/TAO/TAO_IDL/include/ast_string.h b/TAO/TAO_IDL/include/ast_string.h
deleted file mode 100644
index 4bdfbb7734e..00000000000
--- a/TAO/TAO_IDL/include/ast_string.h
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-#ifndef _AST_STRING_AST_STRING_HH
-#define _AST_STRING_AST_STRING_HH
-
-// Representation of string declaration
-//
-// A string type is represented by a maximum size
-
-/*
-** DEPENDENCIES: ast_concrete_type.hh, ast_decl.hh, ast_expression.hh
-**
-** USE: Included from ast.hh
-*/
-
-class	AST_String : public virtual AST_ConcreteType
-{
-public:
-  // Operations
-
-  // Constructor(s)
-  AST_String();
-  AST_String(AST_Expression *max_size);
-  AST_String(AST_Expression *max_size, long wide);
-  virtual ~AST_String() {}
-
-  // Data Accessors
-  AST_Expression *max_size();
-  long		 width();
-
-  // Narrowing
-  DEF_NARROW_METHODS1(AST_String, AST_ConcreteType);
-  DEF_NARROW_FROM_DECL(AST_String);
-
-  // AST Dumping
-  virtual void			dump(ostream &o);
-
-private:
-  // Data
-  AST_Expression		*pd_max_size;	// String maximum size
-  long				pd_width;	// Width of string
-};
-
-#endif           // _AST_STRING_AST_STRING_HH
diff --git a/TAO/TAO_IDL/include/ast_structure.h b/TAO/TAO_IDL/include/ast_structure.h
deleted file mode 100644
index f20eb0eb3a8..00000000000
--- a/TAO/TAO_IDL/include/ast_structure.h
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-#ifndef _AST_STRUCTURE_AST_STRUCTURE_HH
-#define _AST_STRUCTURE_AST_STRUCTURE_HH
-
-// Representation of structure:
-//
-// NOTE: add(AST_ConcreteType *) is defined here because a structure
-// can contain locally defined types in addition to fields.
-//
-// NOTE: add(AST_EnumValue *) is defined here because enums can
-// be defined manifest locally; the constants defined in these
-// enums are inserted in the enclosing scope. It is unlikely that
-// a BE writer will need to overload this function in AST_Structure.
-
-/*
-** DEPENDENCIES: ast_concrete_type.hh, utl_scope.hh, utl_scoped_name.hh,
-**		 utl_strlist.hh
-**
-** USE: Included from ast.hh
-*/
-
-class	AST_Structure : public virtual AST_ConcreteType,
-			public virtual UTL_Scope
-{
-public:
-  // Operations
-
-  // Constructor(s)
-  AST_Structure();
-  AST_Structure(UTL_ScopedName *n, UTL_StrList *p);
-  AST_Structure(AST_Decl::NodeType nt, UTL_ScopedName *n, UTL_StrList *p);
-  virtual ~AST_Structure() {}
-
-  // Narrowing
-  DEF_NARROW_METHODS2(AST_Structure, AST_ConcreteType, UTL_Scope);
-  DEF_NARROW_FROM_DECL(AST_Structure);
-  DEF_NARROW_FROM_SCOPE(AST_Structure);
-
-  // AST Dumping
-  virtual void		dump(ostream &o);
-
-private:
-  friend int yyparse();
-  // Scope Management Protocol
-
-  virtual AST_Union	*fe_add_union(AST_Union		*u);
-  virtual AST_Structure	*fe_add_structure(AST_Structure	*s);
-  virtual AST_Field	*fe_add_field(AST_Field		*f);
-  virtual AST_Enum	*fe_add_enum(AST_Enum		*e);
-  virtual AST_EnumVal	*fe_add_enum_val(AST_EnumVal	*v);
-};
-
-#endif           // _AST_STRUCTURE_AST_STRUCTURE_HH
diff --git a/TAO/TAO_IDL/include/ast_type.h b/TAO/TAO_IDL/include/ast_type.h
deleted file mode 100644
index ca9a5e0498c..00000000000
--- a/TAO/TAO_IDL/include/ast_type.h
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-#ifndef _AST_TYPE_AST_TYPE_HH
-#define _AST_TYPE_AST_TYPE_HH
-
-// Class for all IDL types
-//
-// This is useful wherever any IDL type defining construct can appear
-// such as the base type for a typedef or array
-
-/*
-** DEPENDENCIES: ast_decl.hh, utl_scoped_name.hh, utl_strlist.hh
-**
-** USE: Included from ast.hh
-*/
-
-#include	"idl_fwd.h"
-#include	"idl_narrow.h"
-#include	"ast_decl.h"
-
-
-class	AST_Type : public virtual AST_Decl
-{
-public:
-  // Operations
-
-  // Constructor(s)
-  AST_Type();
-  AST_Type(AST_Decl::NodeType nt, UTL_ScopedName *n, UTL_StrList *p);
-  virtual ~AST_Type() {}
-
-  // Narrowing
-  DEF_NARROW_METHODS1(AST_Type, AST_Decl);
-  DEF_NARROW_FROM_DECL(AST_Type);
-};
-
-#endif           // _AST_TYPE_AST_TYPE_HH
diff --git a/TAO/TAO_IDL/include/ast_typedef.h b/TAO/TAO_IDL/include/ast_typedef.h
deleted file mode 100644
index 1abb09aa935..00000000000
--- a/TAO/TAO_IDL/include/ast_typedef.h
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-#ifndef _AST_TYPEDEF_AST_TYPEDEF_HH
-#define _AST_TYPEDEF_AST_TYPEDEF_HH
-
-// Representation of typedef declaration
-//
-// A typedef declaration is a renaming of a base type
-
-/*
-** DEPENDENCIES: ast_decl.hh, ast_type.hh, utl_scoped_name.hh, utl_strlist.hh
-**
-** USE: Included from ast.hh
-*/
-
-class	AST_Typedef : public virtual AST_Type
-{
-public:
-  // Operations
-
-  // Constructor(s)
-  AST_Typedef();
-  AST_Typedef(AST_Type *base_type, UTL_ScopedName *n, UTL_StrList *p);
-  virtual ~AST_Typedef() {}
-
-  // Data Accessors
-  AST_Type *base_type();
-
-  // Narrowing
-  DEF_NARROW_METHODS1(AST_Typedef, AST_Type);
-  DEF_NARROW_FROM_DECL(AST_Typedef);
-
-  // AST Dumping
-  virtual void		dump(ostream &o);
-
-private:
-  // Data
-  AST_Type		*pd_base_type;	// typedef base type
-};
-
-#endif           // _AST_TYPEDEF_AST_TYPEDEF_HH
diff --git a/TAO/TAO_IDL/include/ast_union.h b/TAO/TAO_IDL/include/ast_union.h
deleted file mode 100644
index eab7ec51985..00000000000
--- a/TAO/TAO_IDL/include/ast_union.h
+++ /dev/null
@@ -1,141 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-#ifndef _AST_UNION_AST_UNION_HH
-#define _AST_UNION_AST_UNION_HH
-
-// Representation of union declaration:
-//
-// NOTE: add(AST_ConcreteType *) is defined here because a union
-// can contain locally defined types in addition to fields.
-//
-// NOTE: add(AST_EnumValue *) is defined here because enums can
-// be defined manifest locally; the constants defined in these
-// enums are inserted in the enclosing scope. It is unlikely that
-// a BE writer will need to overload this function in AST_Union.
-
-/*
-** DEPENDENCIES: ast_concrete_type.hh, utl_scope.hh, ast_union_branch.hh,
-**		 ast_union_label.hh, utl_scoped_name.hh, utl_strlist.hh
-**
-** USE: Included from ast.hh
-*/
-
-class	AST_Union : public virtual AST_Structure
-{
-public:
-  // Operations
-
-  // Constructor(s)
-  AST_Union();
-  AST_Union(AST_ConcreteType *disc_type, UTL_ScopedName *n, UTL_StrList *p);
-  virtual ~AST_Union() {}
-
-  // Data Accessors
-  AST_ConcreteType *disc_type();
-  AST_Expression::ExprType udisc_type();
-
-  // Narrowing
-  DEF_NARROW_METHODS1(AST_Union, AST_Structure);
-  DEF_NARROW_FROM_DECL(AST_Union);
-  DEF_NARROW_FROM_SCOPE(AST_Union);
-
-  // AST Dumping
-  virtual void			dump(ostream &);
-
-private:
-  // Data
-  AST_ConcreteType		*pd_disc_type;	// Discriminator type
-  AST_Expression::ExprType	pd_udisc_type;	// Its expression type
-  /* Convention: udisc_type == EV_any denotes an enum value */
-
-  // Operations
-
-  // Look up a branch by node pointer
-  AST_UnionBranch		*lookup_branch(AST_UnionBranch *branch);
-
-  // Look up the branch with the "default" label
-  AST_UnionBranch		*lookup_default();
-
-  // Look up a branch given a branch with a label. This is used to
-  // check for duplicate labels
-  AST_UnionBranch		*lookup_label(AST_UnionBranch *b);
-
-  // Look up a union branch given an enumerator. This is used to
-  // check for duplicate enum labels
-  AST_UnionBranch		*lookup_enum(AST_UnionBranch *b);
-
-private:
-  friend int yyparse();
-  // Scope Management Protocol
-
-  virtual AST_Union		*fe_add_union(AST_Union			*u);
-  virtual AST_UnionBranch	*fe_add_union_branch(AST_UnionBranch	*b);
-  virtual AST_Structure		*fe_add_structure(AST_Structure		*s);
-  virtual AST_Enum		*fe_add_enum(AST_Enum			*e);
-  virtual AST_EnumVal		*fe_add_enum_val(AST_EnumVal		*v);
-
-};
-
-#endif           // _AST_UNION_AST_UNION_HH
diff --git a/TAO/TAO_IDL/include/ast_union_branch.h b/TAO/TAO_IDL/include/ast_union_branch.h
deleted file mode 100644
index e2de5aa8b7e..00000000000
--- a/TAO/TAO_IDL/include/ast_union_branch.h
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-#ifndef _AST_UNION_BRANCH_AST_UNION_BRAN_HH
-#define _AST_UNION_BRANCH_AST_UNION_BRAN_HH
-
-// Representation of union branch declaration:
-//
-// A branch of a union is a field with a label
-
-/*
-** DEPEndencies: ast_field.hh, ast_union_label.hh, ast_type.hh,
-**		 utl_scoped_name.hh, utl_strlist.h, ast_decl.h
-**
-** USE: Included from ast.hh
-*/
-
-class	AST_UnionBranch : public virtual AST_Field
-{
-public:
-  // Operations
-
-  // Constructor(s)
-  AST_UnionBranch();
-  AST_UnionBranch(AST_UnionLabel *label,
-		  AST_Type *ft,
-		  UTL_ScopedName *n,
-		  UTL_StrList *p);
-  virtual ~AST_UnionBranch() {}
-
-  // Data Accessors
-  AST_UnionLabel *label();
-
-  // Narrowing
-  DEF_NARROW_METHODS1(AST_UnionBranch, AST_Field);
-  DEF_NARROW_FROM_DECL(AST_UnionBranch);
-
-  // AST Dumping
-  virtual void			dump(ostream &o);
-
-private:
-  // Data
-  AST_UnionLabel		*pd_label;	// Label of this branch
-};
-
-#endif           // _AST_UNION_BRANCH_AST_UNION_BRAN_HH
diff --git a/TAO/TAO_IDL/include/ast_union_label.h b/TAO/TAO_IDL/include/ast_union_label.h
deleted file mode 100644
index 587ddb1c911..00000000000
--- a/TAO/TAO_IDL/include/ast_union_label.h
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-#ifndef _AST_UNION_LABEL_AST_UNION_LABEL_HH
-#define _AST_UNION_LABEL_AST_UNION_LABEL_HH
-
-// AST_UnionLabel.h
-//
-// Defines labels for unions
-
-/*
-** DEPENDENCIES: ast_expression.hh
-**
-** USE: included from ast.hh
-*/
-
-class	AST_UnionLabel
-{
-public:
-  // Define kind of label
-  enum UnionLabel {
-        UL_default		// Label is "default"
-      , UL_label		// Regular label
-  };
-
-  // Operations
-
-  // Constructor(s)
-  AST_UnionLabel();
-  AST_UnionLabel(UnionLabel lk, AST_Expression *lv);
-  virtual ~AST_UnionLabel() {}
-
-  // Data Accessors
-  UnionLabel label_kind();
-  AST_Expression *label_val();
-
-  // AST Dumping
-  virtual void			dump(ostream &o);
-
-private:
-  // Data
-  UnionLabel			pd_label_kind;	// Label kind
-  AST_Expression		*pd_label_val;	// Label expression
-
-};
-
-#endif           // _AST_UNION_LABEL_AST_UNION_LABEL_HH
diff --git a/TAO/TAO_IDL/include/be_extern.h b/TAO/TAO_IDL/include/be_extern.h
deleted file mode 100644
index c8e5f0530fe..00000000000
--- a/TAO/TAO_IDL/include/be_extern.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-#ifndef _BE_EXTERN_BE_EXTERN_HH
-#define _BE_EXTERN_BE_EXTERN_HH
-
-// be_extern.h - Defines the BE part of the BE<->FE protocol
-
-// Functions:
-
-extern "C" AST_Generator	*BE_init();
-
-extern "C" void			BE_produce();
-extern "C" void			BE_abort();
-extern "C" void			BE_prep_arg(char *, idl_bool);
-
-extern "C" void			BE_version();
-
-#endif           // _BE_EXTERN_BE_EXTERN_HH
diff --git a/TAO/TAO_IDL/include/drv_extern.h b/TAO/TAO_IDL/include/drv_extern.h
deleted file mode 100644
index 8f5d6651f91..00000000000
--- a/TAO/TAO_IDL/include/drv_extern.h
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-#ifndef _DRV_EXTERN_DRV_EXTERN_HH
-#define _DRV_EXTERN_DRV_EXTERN_HH
-
-// drv_extern.h - External functions for the IDL compiler driver program
-
-// Functions
-
-extern void		DRV_init();
-extern void		DRV_parse_args(long, char **);
-extern void		DRV_usage();
-
-extern void	        DRV_pre_proc(char *myfile);
-
-extern void		DRV_cpp_init();
-extern void		DRV_cpp_putarg(char *str);
-extern void		DRV_cpp_new_location(char *new_loc);
-
-extern void		DRV_fork();
-
-#endif           // _DRV_EXTERN_DRV_EXTERN_HH
diff --git a/TAO/TAO_IDL/include/drv_link.h b/TAO/TAO_IDL/include/drv_link.h
deleted file mode 100644
index daea5b77b88..00000000000
--- a/TAO/TAO_IDL/include/drv_link.h
+++ /dev/null
@@ -1,122 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-#ifndef _DRV_LINK_DRV_LINK_HH
-#define _DRV_LINK_DRV_LINK_HH
-
-// drv_link.hh - Define data and functions which are used to 
-//		 link in the back end functions
-
-/*
- * Front end interface
- */
-
-class File;
-typedef void (* DRV_PF_FE_init_stage1)();
-typedef void (* DRV_PF_FE_init_stage2)();
-typedef int  (* DRV_PF_FE_yyparse)();
-typedef void (* DRV_PF_FE_set_yyin)(File *);
-
-class UTL_Error;
-class UTL_Indenter;
-class UTL_String;
-typedef UTL_Error * (* DRV_PF_FE_new_UTL_Error)();
-typedef UTL_Indenter * (* DRV_PF_FE_new_UTL_Indenter)();
-typedef UTL_String * (* DRV_PF_FE_new_UTL_String)(char *);
-
-extern DRV_PF_FE_init_stage1	DRV_FE_init_stage1;
-extern DRV_PF_FE_init_stage2	DRV_FE_init_stage2;
-extern DRV_PF_FE_yyparse	DRV_FE_yyparse;
-extern DRV_PF_FE_set_yyin	DRV_FE_set_yyin;
-
-extern DRV_PF_FE_new_UTL_Error	DRV_FE_new_UTL_Error;
-extern DRV_PF_FE_new_UTL_Indenter DRV_FE_new_UTL_Indenter;
-extern DRV_PF_FE_new_UTL_String	DRV_FE_new_UTL_String;
-
-/* 
- * Back end interface
- */
-
-class AST_Generator;
-typedef AST_Generator * (* DRV_PF_BE_init)();
-typedef void (* DRV_PF_BE_produce)();
-typedef void (* DRV_PF_BE_abort)();
-typedef void (* DRV_PF_BE_prep_arg)(char *, idl_bool);
-typedef void (* DRV_PF_BE_version)();
-
-extern DRV_PF_BE_init		DRV_BE_init;
-extern DRV_PF_BE_produce 	DRV_BE_produce;
-extern DRV_PF_BE_abort   	DRV_BE_abort;
-extern DRV_PF_BE_prep_arg	DRV_BE_prep_arg;
-extern DRV_PF_BE_version	DRV_BE_version;
-
-// Functions
-
-extern void DRV_FE_open();
-extern void DRV_FE_close();
-
-extern void DRV_BE_open();
-extern void DRV_BE_close();
-
-#endif	// _DRV_LINK_DRV_LINK_HH
diff --git a/TAO/TAO_IDL/include/drv_private.h b/TAO/TAO_IDL/include/drv_private.h
deleted file mode 100644
index caa74747db7..00000000000
--- a/TAO/TAO_IDL/include/drv_private.h
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-#ifndef _DRV_PRIVATE_DRV_PRIVATE_HH
-#define _DRV_PRIVATE_DRV_PRIVATE_HH
-
-// drv_private.hh - Define data and functions which are private to
-//		    the DRV but which must be accessible througout the DRV
-
-// Data
-
-extern char		*DRV_files[];	// All files to be processed
-extern long		DRV_nfiles;	// How many are there?
-extern long		DRV_file_index;	// What's the file I am responsible
-					// for?
-
-// Functions
-extern	void		DRV_drive(char *);// Compiler driver for single file
-
-#endif	// _DRV_PRIVATE_DRV_PRIVATE_HH
diff --git a/TAO/TAO_IDL/include/fe_declarator.h b/TAO/TAO_IDL/include/fe_declarator.h
deleted file mode 100644
index dee81ffe035..00000000000
--- a/TAO/TAO_IDL/include/fe_declarator.h
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-#ifndef _FE_DECLARATOR_FE_DECLARATOR_HH
-#define _FE_DECLARATOR_FE_DECLARATOR_HH
-
-// FE_Declarator.h
-//
-// FE internal class for storing interim declaration statements
-
-/*
-** DEPENDENCIES: utl_scoped_name.hh, ast_decl.hh
-**
-** USE: Included from fe.hh
-*/
-
-class	FE_Declarator
-{
-public:
-  // Enum to denote types of declarators
-  enum DeclaratorType {
-        FD_simple		// Simple declarator
-      , FD_complex		// Complex declarator (complex_part field used)
-  };
-
-  // Operations
-
-  // Constructor(s)
-  FE_Declarator(UTL_ScopedName *n, DeclaratorType dt, AST_Decl *cp);
-  virtual ~FE_Declarator() {}
-
-  // Data Accessors
-  AST_Decl *complex_part();
-  UTL_ScopedName *name();
-  DeclaratorType decl_type();
-
-  // Other Operations
-
-  // Compose an FE_Declarator into an AST_Type once all the needed information
-  // is available
-  AST_Type		*compose(AST_Decl* tc);
-
-private:
-  // Data
-  AST_Decl		*pd_complex_part;	// If a complex declarator
-  UTL_ScopedName	*pd_name;		// The name if complex
-  DeclaratorType	pd_decl_type;		// Whether complex or simple
-};
-
-#endif           // _FE_DECLARATOR_FE_DECLARATOR_HH
diff --git a/TAO/TAO_IDL/include/fe_extern.h b/TAO/TAO_IDL/include/fe_extern.h
deleted file mode 100644
index 816081f1323..00000000000
--- a/TAO/TAO_IDL/include/fe_extern.h
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-#ifndef _FE_EXTERN_FE_EXTERN_HH
-#define _FE_EXTERN_FE_EXTERN_HH
-
-// fe_extern.hh
-//
-// Declares all global functions for the FE
-
-/*
-** DEPENDENCIES: none
-**
-** USE: Included from idl_extern.hh
-*/
-
-// Functions:
-
-// Initialization:
-//
-// FE initialization is done in two stages, with the BE initialization
-// occurring in between. The first stage is responsible for creating
-// the sope stack. The BE initialization creates the generator object
-// which is then used in the second stage to create the global scope
-// and to populate it with nodes for the predefined types
-
-extern "C" void			FE_init_stage1();	// Initialize stage 1
-extern "C" void			FE_init_stage2();	// Initialize stage 2
-
-// Interface to Yacc parser
-
-class File;
-extern "C" int			FE_yyparse();		// Invode yyparse
-extern "C" void			FE_set_yyin(File *);	// Set yyin
-
-// Interface to constructors for objects need by the driver
-
-class UTL_Error;
-class UTL_Indenter;
-class UTL_String;
-
-extern "C" UTL_Error *		FE_new_UTL_Error();
-extern "C" UTL_Indenter *	FE_new_UTL_Indenter();
-extern "C" UTL_String *  	FE_new_UTL_String(char *);
-
-#endif           // _FE_EXTERN_FE_EXTERN_HH
diff --git a/TAO/TAO_IDL/include/fe_interface_header.h b/TAO/TAO_IDL/include/fe_interface_header.h
deleted file mode 100644
index b75164780a8..00000000000
--- a/TAO/TAO_IDL/include/fe_interface_header.h
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-#ifndef _FE_INTERFACE_HEADER_FE_INTERFACE_HH
-#define _FE_INTERFACE_HEADER_FE_INTERFACE_HH
-
-// FE_InterfaceHeader
-//
-// Internal class for FE to describe interface headers
-
-/*
-** DEPENDENCIES: utl_scoped_name.hh, ast_interface.hh, utl_scope.hh,
-**		 ast_decl.hh
-**
-** USE: Included from fe.hh
-*/
-
-class	FE_InterfaceHeader
-{
-public:
-  // Operations
-
-  // Constructor(s)
-  FE_InterfaceHeader(UTL_ScopedName *n, UTL_NameList *l);
-  virtual ~FE_InterfaceHeader() {}
-
-  // Data Accessors
-  UTL_ScopedName *interface_name();
-  AST_Interface **inherits();
-  long n_inherits();
-
-private:
-  // Data
-  UTL_ScopedName	*pd_interface_name;	// Interface name
-  AST_Interface		**pd_inherits;		// Inherited interfaces
-  long			pd_n_inherits;		// How many
-
-  // Operations
-
-  // Compile the flattened unique list of interfaces which this
-  // interface inherits from
-  void			compile_one_inheritance(AST_Interface *i);
-  void			compile_inheritance(UTL_NameList *l);
-};
-
-#endif           // _FE_INTERFACE_HEADER_FE_INTERFACE_HH
diff --git a/TAO/TAO_IDL/include/fe_private.h b/TAO/TAO_IDL/include/fe_private.h
deleted file mode 100644
index d90e19907bd..00000000000
--- a/TAO/TAO_IDL/include/fe_private.h
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-#ifndef _FE_FE_HH
-#define _FE_FE_HH
-
-// fe_private.hh - Defines data which is private to the FE but
-//		   which must be accessible throughout the FE
-
-/*
-** DEPENDENCIES: NONE
-**
-** USE: Included from source files
-*/
-
-/*
- * FE includes
- */
-
-#include	"fe_interface_header.h"// class FE_InterfaceHeader
-#include	"fe_declarator.h"	// class FE_Declarator
-
-/*
- * FE Operations
- */
-
-#endif           // _FE_FE_HH
diff --git a/TAO/TAO_IDL/include/global_extern.h b/TAO/TAO_IDL/include/global_extern.h
deleted file mode 100644
index 3ff7bf93dfd..00000000000
--- a/TAO/TAO_IDL/include/global_extern.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-#ifndef _GLOBAL_EXTERN_GLOBAL_EXTERN_HH
-#define _GLOBAL_EXTERN_GLOBAL_EXTERN_HH
-
-// global_extern.hh - Global data for the IDL compiler
-
-extern	IDL_GlobalData	*idl_global;	// Contains all "global" data
-
-// Global functions for the IDL compiler
-
-// Return TRUE when the name of this AST_Decl can be reused in
-// a definition in this scope
-extern	idl_bool	can_be_redefined(AST_Decl *);
-
-#endif           // _GLOBAL_EXTERN_GLOBAL_EXTERN_HH
diff --git a/TAO/TAO_IDL/include/idl.h b/TAO/TAO_IDL/include/idl.h
deleted file mode 100644
index ea50cca6c61..00000000000
--- a/TAO/TAO_IDL/include/idl.h
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-#ifndef _IDL_IDL_HH
-#define _IDL_IDL_HH
-
-// idl.hh
-//
-// Main include file for IDL compiler. Includes the rest of the
-// files defining the different units of the compiler
-
-#include        "ace/ACE.h"             // Most important ACE include file
-
-#include	"intlmacros.h"		// Define macros for intl'ion
-
-#include	<stdlib.h>		// POSIX standard defns
-#include	<ctype.h>		// External functions
-
-#include	"ace/stdcpp.h"		// Standard IO library
-
-#include	<sys/types.h>		// POSIX standard types
-
-#include	"idl_narrow.h"		// IDL Narrowing mechanism
-
-#include	"idl_defines.h"	// Constants for IDL compiler
-#include	"idl_fwd.h"		// Forward decls of classes
-
-#include	"idl_bool.h"		// Defines boolean for IDL
-
-#include	"utl_string.h"		// Defines utility string class
-#include	"utl_identifier.h"	// Defines utility identifier class
-#include	"ast.h"		// AST classes
-#include	"util.h"		// Utility classes
-
-#endif           // _IDL_IDL_HH
diff --git a/TAO/TAO_IDL/include/idl_bool.h b/TAO/TAO_IDL/include/idl_bool.h
deleted file mode 100644
index dd53d968732..00000000000
--- a/TAO/TAO_IDL/include/idl_bool.h
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-#ifndef _IDL_BOOL_IDL_BOOL_HH
-#define _IDL_BOOL_IDL_BOOL_HH
-
-/*
- * idl_bool.hh - Boolean definitions for IDL CFE
- *
- * This is interim. When porting to a new platform, this file will be
- * modified to incorporate definitions for the boolean type suitable
- * for the new platform.
- */
-
-/*
-** DEPENDENCIES: NONE
-**
-** USE: Included from idl.hh
-*/
-
-#ifndef	I_TRUE
-#define I_TRUE	1
-#endif
-
-#ifndef	I_FALSE
-#define I_FALSE	0
-#endif
-
-typedef		long		idl_bool;
-
-#endif           // _IDL_BOOL_IDL_BOOL_HH
diff --git a/TAO/TAO_IDL/include/idl_defines.h b/TAO/TAO_IDL/include/idl_defines.h
deleted file mode 100644
index b4a4857d3f2..00000000000
--- a/TAO/TAO_IDL/include/idl_defines.h
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-#ifndef _IDL_DEFINES_IDL_DEFINES_HH
-#define _IDL_DEFINES_IDL_DEFINES_HH
-
-/*
- * idl_defines.hh - Defines global compiler flags
- */
-
-// This cannot be an enum since more than one value may be active at
-// a given time, hence bitflags are #define'd instead
-     
-#define	IDL_CF_VERSION		(1 << 0)
-#define	IDL_CF_DUMP_AST		(1 << 1)
-#define	IDL_CF_ONLY_PREPROC	(1 << 2)
-#define	IDL_CF_ONLY_USAGE	(1 << 3)
-#define	IDL_CF_INFORMATIVE	(1 << 4)
-#define	IDL_CF_NOWARNINGS	(1 << 5)
-
-#endif	// _IDL_DEFINES_IDL_DEFINES_HH
diff --git a/TAO/TAO_IDL/include/idl_extern.h b/TAO/TAO_IDL/include/idl_extern.h
deleted file mode 100644
index efa7f328950..00000000000
--- a/TAO/TAO_IDL/include/idl_extern.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-#ifndef _IDL_EXTERN_IDL_EXTERN_HH
-#define _IDL_EXTERN_IDL_EXTERN_HH
-
-// idl_extern.hh
-//
-// Global variables and functions for IDL compiler
-
-#include	"fe_extern.h"		// External API of FE
-#include	"be_extern.h"		// External API of BE
-#include	"drv_extern.h"		// External API of DRV
-#include	"ast_extern.h"		// External API of AST
-#include	"nr_extern.h"		// External API of NR
-#include	"global_extern.h"	// Global data
-
-#endif           // _IDL_EXTERN_IDL_EXTERN_HH
diff --git a/TAO/TAO_IDL/include/idl_fwd.h b/TAO/TAO_IDL/include/idl_fwd.h
deleted file mode 100644
index e0719c1a171..00000000000
--- a/TAO/TAO_IDL/include/idl_fwd.h
+++ /dev/null
@@ -1,145 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-#ifndef _IDL_FWD_IDL_FWD_HH
-#define _IDL_FWD_IDL_FWD_HH
-
-// idl_fwd.hh
-//
-// Forward declaration of all class names in CFE-BEs contract
-
-/*
-** DEPENDENCIES: NONE
-**
-** USE: Included from idl.hh
-*/
-
-// Class for global data representation:
-
-class	IDL_GlobalData;			// Global data is stored in an
-					// instance of this
-
-// Classes for utility of the IDL compiler:
-
-class	UTL_ScopeStack;			// Stack of scopes
-class	UTL_Scope;			// A definition scope (mixin)
-
-class	UTL_LongList;			// List of longs
-class	UTL_StrList;			// List of strings
-class	UTL_StrlistActiveIterator;	// Active iterator for list of strings
-class	UTL_IdList;			// List of identifiers
-class	UTL_IdListActiveIterator;	// Active iterator for list of id's
-class	UTL_ExceptList;			// List of exceptions
-class	UTL_NameList;			// List of scoped names
-class	UTL_ExprList;			// List of expressions
-class	UTL_InterfList;			// List of interfaces
-class	UTL_LabelList;			// List of union branch labels
-class	UTL_DeclList;			// List of declarators
-class	UTL_String;			// String class
-class	UTL_Identifier;			// Identifier class
-
-class	UTL_Error;			// Error class
-class	UTL_Indenter;			// Indenter class
-
-// Classes for utility of the FE. These classes are used only
-// by the FE but their forward declaration is needed because lists
-// of them are constructed by classes in UTL
-
-class	FE_InterfaceHeader;		// Interface header
-class	FE_Declarator;			// Declarator
-
-// Generator class for the AST
-
-class	AST_Generator;			// Generate nodes of various types
-
-// Classes for AST:
-
-class	AST_Decl;			// The rock bottom base class
-
-class	AST_PredefinedType;		// A predefined type
-class	AST_Type;			// An IDL type
-class	AST_ConcreteType;		// An IDL concrete type
-class	AST_Module;			// A module
-class	AST_Root;			// The root of an AST (a module)
-class	AST_Interface;			// An interface
-class	AST_InterfaceFwd;		// A forward interface decl
-class	AST_Constant;			// A constant declaration
-class	AST_Expression;			// Value of an expression
-class	AST_Exception;			// An exception declaration
-class	AST_Attribute;			// An attribute declaration
-class	AST_Operation;			// An operation declaration
-class	AST_Argument;			// An argument to an operation
-class	AST_Union;			// A union declaration
-class	AST_UnionBranch;		// A branch in a union
-class	AST_UnionLabel;			// A union branch label
-class	AST_Structure;			// A structure declaration
-class	AST_Field;			// A field in a structure or union
-class	AST_Enum;			// An enum declaration
-class	AST_EnumVal;			// An enumerator in an enum
-class	AST_Sequence;			// A sequence declaration
-class	AST_String;			// A string declaration
-class	AST_Array;			// An array declaration
-class	AST_Typedef;			// A typedef declaration
-
-#endif           // _IDL_FWD_IDL_FWD_HH
diff --git a/TAO/TAO_IDL/include/idl_global.h b/TAO/TAO_IDL/include/idl_global.h
deleted file mode 100644
index 04079024263..00000000000
--- a/TAO/TAO_IDL/include/idl_global.h
+++ /dev/null
@@ -1,348 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-#ifndef _IDL_IDL_GLOBAL_HH
-#define _IDL_IDL_GLOBAL_HH
-
-// idl_global.hh
-//
-// Defines a class containing all global data for the compiler.
-// Can be subclassed in BEs to store more data
-
-class IDL_GlobalData
-{
-public:
-  // Types
-
-  // The ParseState type encodes the state of the Yacc parser so that
-  // better error messages can be produced, and for use by BEs in situations
-  // where context sensitive behavior is required
-  enum ParseState {
-      PS_NoState		// No state
-    , PS_TypeDeclSeen		// Seen complete typedef declaration
-    , PS_ConstDeclSeen		// Seen complete const declaration
-    , PS_ExceptDeclSeen		// Seen complete exception declaration
-    , PS_InterfaceDeclSeen	// Seen complete interface declaration
-    , PS_ModuleDeclSeen		// Seen complete module declaration
-    , PS_AttrDeclSeen		// Seen complete attribute declaration
-    , PS_OpDeclSeen		// Seen complete operation declaration	
-    , PS_ModuleSeen		// Seen a MODULE keyword
-    , PS_ModuleIDSeen		// Seen the module ID
-    , PS_ModuleSqSeen		// '{' seen for module
-    , PS_ModuleQsSeen		// '}' seen for module
-    , PS_ModuleBodySeen		// Seen complete module body
-    , PS_InterfaceSeen		// Seen an INTERFACE keyword
-    , PS_InterfaceIDSeen	// Seen the interface ID
-    , PS_InheritSpecSeen	// Seen a complete inheritance spec
-    , PS_ForwardDeclSeen	// Forward interface decl seen
-    , PS_InterfaceSqSeen	// '{' seen for interface
-    , PS_InterfaceQsSeen	// '}' seen for interface
-    , PS_InterfaceBodySeen	// Seen an interface body
-    , PS_InheritColonSeen	// Seen ':' in inheritance list
-    , PS_SNListCommaSeen	// Seen ',' in list of scoped names
-    , PS_ScopedNameSeen		// Seen a complete scoped name
-    , PS_SN_IDSeen		// Seen an identifier as part of a scoped name
-    , PS_ScopeDelimSeen		// Seen a scope delim as party of a scoped name
-    , PS_ConstSeen		// Seen a CONST keyword
-    , PS_ConstTypeSeen		// Parsed the type of a constant
-    , PS_ConstIDSeen		// Seen the constant ID
-    , PS_ConstAssignSeen	// Seen the '='
-    , PS_ConstExprSeen		// Seen the constant value expression
-    , PS_TypedefSeen		// Seen a TYPEDEF keyword
-    , PS_TypeSpecSeen		// Seen a complete type specification
-    , PS_DeclaratorsSeen	// Seen a complete list of declarators
-    , PS_StructSeen		// Seen a STRUCT keyword
-    , PS_StructIDSeen		// Seen the struct ID
-    , PS_StructSqSeen		// '{' seen for struct
-    , PS_StructQsSeen		// '}' seen for struct
-    , PS_StructBodySeen		// Seen complete body of struct decl
-    , PS_MemberTypeSeen		// Seen type of struct or except member
-    , PS_MemberDeclsSeen	// Seen decls of struct or except members
-    , PS_MemberDeclsCompleted	// Completed one struct or except member to ';'
-    , PS_UnionSeen		// Seen a UNION keyword
-    , PS_UnionIDSeen		// Seen the union ID
-    , PS_SwitchSeen		// Seen the SWITCH keyword
-    , PS_SwitchOpenParSeen	// Seen the switch open par.
-    , PS_SwitchTypeSeen		// Seen the switch type spec
-    , PS_SwitchCloseParSeen	// Seen the switch close par.
-    , PS_UnionSqSeen		// '{' seen for union
-    , PS_UnionQsSeen		// '}' seen for union
-    , PS_DefaultSeen		// Seen DEFAULT keyword
-    , PS_UnionLabelSeen		// Seen label of union element
-    , PS_LabelColonSeen		// Seen ':' of union branch label
-    , PS_LabelExprSeen		// Seen expression of union branch label
-    , PS_UnionElemSeen		// Seen a union element
-    , PS_UnionElemCompleted	// Completed one union member up to ';'
-    , PS_CaseSeen		// Seen a CASE keyword
-    , PS_UnionElemTypeSeen	// Seen type spec for union element
-    , PS_UnionElemDeclSeen	// Seen declarator for union element
-    , PS_UnionBodySeen		// Seen completed union body
-    , PS_EnumSeen		// Seen an ENUM keyword
-    , PS_EnumIDSeen		// Seen the enum ID
-    , PS_EnumSqSeen		// Seen '{' for enum
-    , PS_EnumQsSeen		// Seen '}' for enum
-    , PS_EnumBodySeen		// Seen complete enum body
-    , PS_EnumCommaSeen		// Seen ',' in list of enumerators
-    , PS_SequenceSeen		// Seen a SEQUENCE keyword
-    , PS_SequenceSqSeen		// Seen '<' for sequence
-    , PS_SequenceQsSeen		// Seen '>' for sequence
-    , PS_SequenceTypeSeen	// Seen type decl for sequence
-    , PS_SequenceCommaSeen	// Seen comma for sequence
-    , PS_SequenceExprSeen	// Seen size expression for sequence
-    , PS_StringSeen		// Seen a STRING keyword
-    , PS_StringSqSeen		// Seen '<' for string
-    , PS_StringQsSeen		// Seen '>' for string
-    , PS_StringExprSeen		// Seen size expression for string
-    , PS_StringCompleted	// Seen a string decl without size spec
-    , PS_ArrayIDSeen		// Seen array ID
-    , PS_ArrayCompleted		// Seen completed array declaration
-    , PS_DimSqSeen		// Seen '[' for array dimension
-    , PS_DimQsSeen		// Seen ']' for array dimension
-    , PS_DimExprSeen		// Seen size expression for array dimension
-    , PS_AttrROSeen		// Seen READONLY keyword
-    , PS_AttrSeen		// Seen ATTRIBUTE keyword
-    , PS_AttrTypeSeen		// Seen type decl for attribute
-    , PS_AttrDeclsSeen		// Seen declarators for attribute
-    , PS_AttrCompleted		// Seen complete attribute declaration
-    , PS_ExceptSeen		// Seen EXCEPTION keyword
-    , PS_ExceptIDSeen		// Seen exception identifier
-    , PS_ExceptSqSeen		// Seen '{' for exception
-    , PS_ExceptQsSeen		// Seen '}' for exception
-    , PS_ExceptBodySeen		// Seen complete exception body
-    , PS_OpAttrSeen		// Seen operation attribute
-    , PS_OpTypeSeen		// Seen operation return type
-    , PS_OpIDSeen		// Seen operation ID
-    , PS_OpParsCompleted	// Completed operation param list
-    , PS_OpRaiseCompleted	// Completed operation except list
-    , PS_OpContextCompleted	// Completed operation context spec
-    , PS_OpCompleted		// Completed operation statement
-    , PS_OpSqSeen		// Seen '(' for operation
-    , PS_OpQsSeen		// Seen ')' for operation
-    , PS_OpParCommaSeen		// Seen ',' in list of op params
-    , PS_OpParDirSeen		// Seen parameter direction
-    , PS_OpParTypeSeen		// Seen parameter type
-    , PS_OpParDeclSeen		// Seen parameter declaration
-    , PS_OpRaiseSeen		// Seen RAISES keyword
-    , PS_OpRaiseSqSeen		// Seen '(' for RAISES
-    , PS_OpRaiseQsSeen		// Seen ')' for RAISES
-    , PS_OpContextSeen		// Seen CONTEXT keyword
-    , PS_OpContextSqSeen	// Seen '(' for CONTEXT
-    , PS_OpContextQsSeen	// Seen ')' for CONTEXT
-    , PS_OpContextCommaSeen	// Seen ',' for CONTEXT
-    , PS_DeclsCommaSeen		// Seen ',' in declarators list
-    , PS_DeclsDeclSeen		// Seen complete decl in decls list
-  };
-
-  // Constructor
-  IDL_GlobalData();
-  virtual ~IDL_GlobalData() {}
-
-  // Operations
-  virtual UTL_ScopeStack	*scopes();		// Scopes stack
-  virtual void			set_scopes(UTL_ScopeStack *);
-							// Set it
-
-  virtual AST_Root		*root();		// Root of AST
-  virtual void			set_root(AST_Root *);	// Set it
-
-  virtual AST_Generator		*gen();			// Generator
-  virtual void			set_gen(AST_Generator *);// Set it
-
-  virtual UTL_Error		*err();			// Error reporter
-  virtual void			set_err(UTL_Error *);	// Set it
-
-  virtual long			err_count();		// How many errors?
-  virtual void			set_err_count(long);	// Set it
-
-  virtual long			lineno();		// Where in file?
-  virtual void			set_lineno(long);	// Set it
-
-  virtual String		*filename();		// What file?
-  virtual void			set_filename(String *);	// Set it
-
-  virtual String		*main_filename();	// What's the main
-							// file name?
-  virtual void			set_main_filename(String *);
-							// Set it
-
-  virtual String		*real_filename();	// What's the real
-							// file name?
-  virtual void			set_real_filename(String *);
-			                                // Set it
-  
-  virtual String		*stripped_filename();	// Stripped filename
-  virtual void			set_stripped_filename(String *);
-							// Set it
-
-  virtual idl_bool		imported();		// Are we imported?
-  virtual idl_bool		import();		// Is import on?
-  virtual void			set_import(idl_bool);	// Set it
-
-  virtual idl_bool		in_main_file();		// Are we?
-  virtual void			set_in_main_file(idl_bool);	// Set it
-
-  virtual char			*prog_name();		// Invoked as..
-  virtual void			set_prog_name(char *);	// Set it
-
-  virtual char			*cpp_location();	// Where's CPP?
-  virtual void			set_cpp_location(char *);// Set it
-
-  virtual long			compile_flags();	// What flags are on?
-  virtual void			set_compile_flags(long);// Turn some on or off
-
-  virtual char			*be();			// Get BE to use
-  virtual void			set_be(char *);		// Set it
-
-  virtual char			*local_escapes();	// Get local escapes
-  virtual void			set_local_escapes(char *);// Set it
-
-  virtual UTL_Indenter		*indent();		// Get indenter
-  virtual void			set_indent(UTL_Indenter *);
-							// Set it
-
-  virtual UTL_StrList		*pragmas();		// Get pragmas
-  virtual void			set_pragmas(UTL_StrList *);// Set it
-
-  virtual idl_bool		read_from_stdin();	// Reading from stdin?
-  virtual void			set_read_from_stdin(idl_bool); // Set it
-
-  virtual void			store_include_file_name(String *);
-
-  virtual String	      **include_file_names();	// Array of file names
-  virtual void			set_include_file_names(String **); // Set it
-
-  virtual unsigned long		n_include_file_names();	// How many
-  virtual void			set_n_include_file_names(unsigned long n);
-
-  virtual ParseState		parse_state();		// What state we're in
-  virtual void			set_parse_state(ParseState s); // Set it
-
-  // Convert from a predefined type to an expression type
-  virtual AST_Expression::ExprType
-				PredefinedTypeToExprType(
-				  AST_PredefinedType::PredefinedType
-				);
-
-  /**************** Added to serve the back end *************/
-  virtual String                *idl_src_file();
-  // returns the IDL source file being copiled
-
-  virtual void                  idl_src_file(String *);
-  // set the source IDL file that is being parsed
-
-  // helper functions that generate the file names for the C++ mapping
-  // generated code
-  static const char  *be_get_client_hdr_fname ();
-  static const char  *be_get_client_stub_fname ();
-  static const char  *be_get_client_inline_fname ();
-  static const char  *be_get_server_hdr_fname ();
-  static const char  *be_get_server_skeleton_fname ();
-  static const char  *be_get_server_inline_fname ();
-
-  // Helper functions: obtain the names of each generated file given
-  // the IDL file name. 
-  static const char *be_get_client_hdr (String *idl_file_name);
-  static const char *be_get_client_stub (String *idl_file_name);
-  static const char *be_get_client_inline (String *idl_file_name);
-  static const char *be_get_server_hdr (String *idl_file_name);
-  static const char *be_get_server_skeleton (String *idl_file_name);
-  static const char *be_get_server_inline (String *idl_file_name);
-
-private:
-  // Data
-  UTL_ScopeStack		*pd_scopes;		// Store scopes stack
-  AST_Root			*pd_root;		// Store AST root
-  AST_Generator			*pd_gen;		// Store generator
-  UTL_Error			*pd_err;		// Error object
-  long				pd_err_count;		// Count of errors
-  long				pd_lineno;		// What line #
-  String			*pd_filename;		// What file
-  String			*pd_main_filename;	// What main filename
-  String			*pd_real_filename;	// What real filename
-  String			*pd_stripped_filename;	// Stripped filename
-  idl_bool			pd_import;		// Is import on?
-  idl_bool			pd_in_main_file;	// Are we in it?
-  char				*pd_prog_name;		// Argv[0]
-  char				*pd_cpp_location;	// Where to find CPP
-  long				pd_compile_flags;	// Compile flags
-  char				*pd_be;			// BE name to use
-  char				*pd_local_escapes;	// Trapdoor argument
-  UTL_Indenter			*pd_indent;		// Indent object
-  UTL_StrList			*pd_pragmas;		// List of pragmas
-							// as its being built
-  idl_bool			pd_read_from_stdin;	// Reading from stdin?
-  String			**pd_include_file_names;// Array of file names
-  unsigned long			pd_n_include_file_names;// How many
-  unsigned long			pd_n_alloced_file_names;// How many alloced
-
-  ParseState			pd_parse_state;		// Parse state we're in
-
-  // Operations
-  long				seen_include_file_before(String *);
-							// Seen this include
-							// before?
-  String                        *pd_idl_src_file;       // IDL source file
-};
-
-#endif	//_IDL_IDL_GLOBAL_HH
diff --git a/TAO/TAO_IDL/include/idl_narrow.h b/TAO/TAO_IDL/include/idl_narrow.h
deleted file mode 100644
index c2d9e3a8370..00000000000
--- a/TAO/TAO_IDL/include/idl_narrow.h
+++ /dev/null
@@ -1,262 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-#ifndef	_IDL_NARROW_IDL_NARROW_HH
-#define	_IDL_NARROW_IDL_NARROW_HH
-
-// idl_narrow.hh
-//
-// Implement IDL narrowing mechanism. Not intended to be read by humans..
-//
-// Logic:
-//
-// The DEF_xxx macros are used in class declarations.
-// The IMPL_xxx macros are used in class implementations.
-//
-// The DEF_xxx macros come in two flavors. The first one, DEF_NARROW_METHODSn,
-// defines the narrowing mechanism. It declares a static class function whose
-// address is used as the class identifier. Then, it declares a narrow op
-// with an implementation suitable for narrowing from exactly 'n' superclasses.
-// The names of the superclass types are given as arguments. The second flavor
-// implements specific narrowing mechanisms from AST_decl and from UTL_scope.
-// These macros are named DEF_NARROW_FROM_DECL and DEF_NARROW_FROM_SCOPE
-// respectively.
-//
-// The IMPL_xxx macros also come in two flavors, corresponding to the two
-// flavors of DEF_xxx macros. The IMPL_NARROW_METHODSn macros implement the
-// narrowing mechanism for classes which must be narrowed from 'n' ancestors.
-// The IMPL_NARROW_FROM_DECL and IMPL_NARROW_FROM_SCOPE macros implement
-// the narrowing mechanisms for narrowing from instances of AST_decl and
-// UTL_scope.
-//
-// IMPL_NARROW_METHODSn where n is 0,1,2 and 3 are provided.
-// DEF_NARROW_METHODSn where n is 0,1,2 and 3 are provided.
-
-extern	char	*type_id_to_string(long);
-
-#define DEF_NARROW_METHODS0(TYPE)\
-static	int	type_id(); \
-virtual	void	*narrow(long type_const)
-
-
-#define IMPL_NARROW_METHODS0(TYPE)\
-int \
-TYPE::type_id()\
-{\
-  return 0;\
-}\
-void	* \
-TYPE::narrow(long type_const) {\
-  void	*rval = NULL; \
-  if (type_const == (long)&TYPE::type_id) \
-    rval = this; \
-  return rval; \
-}
-
-#define DEF_NARROW_METHODS1(TYPE,PARENT) \
-static	int	type_id(); \
-virtual	void	*narrow(long type_const)
-
-
-#define IMPL_NARROW_METHODS1(TYPE,PARENT) \
-int \
-TYPE::type_id() \
-{\
-   return 0;\
-}\
-void	* \
-TYPE::narrow(long type_const) {\
-  void	*rval = NULL; \
-  if (type_const == (long)&TYPE::type_id) \
-    rval = this; \
-  if (rval == NULL) \
-    rval = PARENT::narrow(type_const);\
-  return rval;\
-}
-
-#define DEF_NARROW_METHODS2(TYPE,PARENT1,PARENT2) \
-static	int	type_id(); \
-virtual	void	*narrow(long type_const)
-
-
-#define IMPL_NARROW_METHODS2(TYPE,PARENT1,PARENT2) \
-int \
-TYPE::type_id() \
-{\
-   return 0;\
-}\
-void	* \
-TYPE::narrow(long type_const) { \
-  void *rval = NULL; \
-  if (type_const == (long)&TYPE::type_id) \
-    rval = this; \
-  if (rval == NULL) \
-    rval = PARENT1::narrow(type_const);\
-  if (rval == NULL) \
-    rval = PARENT2::narrow(type_const);\
-  return rval;\
-}
-
-#define DEF_NARROW_METHODS3(TYPE,PARENT1,PARENT2,PARENT3) \
-static	int	type_id(); \
-virtual	void	*narrow(long type_const)
-
-
-#define IMPL_NARROW_METHODS3(TYPE,PARENT1,PARENT2,PARENT3) \
-int \
-TYPE::type_id() \
-{\
-   return 0;\
-}\
-void	* \
-TYPE::narrow(long type_const) {\
-  void *rval = NULL; \
-  if (type_const == (long)&TYPE::type_id) \
-    rval = this; \
-  if (rval == NULL) \
-    rval = PARENT1::narrow(type_const);\
-  if (rval == NULL) \
-    rval = PARENT2::narrow(type_const);\
-  if (rval == NULL) \
-    rval = PARENT3::narrow(type_const);\
-  return rval;\
-}
-
-#define DEF_NARROW_METHODS4(TYPE,PARENT1,PARENT2,PARENT3,PARENT4) \
-static	int	type_id(); \
-virtual	void	*narrow(long type_const)
-
-
-#define IMPL_NARROW_METHODS4(TYPE,PARENT1,PARENT2,PARENT3,PARENT4) \
-int \
-TYPE::type_id() \
-{\
-   return 0;\
-}\
-void	* \
-TYPE::narrow(long type_const) {\
-  void *rval = NULL; \
-  if (type_const == (long)&TYPE::type_id) \
-    rval = this; \
-  if (rval == NULL) \
-    rval = PARENT1::narrow(type_const);\
-  if (rval == NULL) \
-    rval = PARENT2::narrow(type_const);\
-  if (rval == NULL) \
-    rval = PARENT3::narrow(type_const);\
-  if (rval == NULL) \
-    rval = PARENT4::narrow(type_const);\
-  return rval;\
-}
-
-#define DEF_NARROW_METHODS5(TYPE,PARENT1,PARENT2,PARENT3,PARENT4,PARENT5) \
-static	int	type_id(); \
-virtual	void	*narrow(long type_const)
-
-
-#define IMPL_NARROW_METHODS5(TYPE,PARENT1,PARENT2,PARENT3,PARENT4,PARENT5) \
-int \
-TYPE::type_id() \
-{\
-   return 0;\
-}\
-void	* \
-TYPE::narrow(long type_const) {\
-  void *rval = NULL; \
-  if (type_const == (long)&TYPE::type_id) \
-    rval = this; \
-  if (rval == NULL) \
-    rval = PARENT1::narrow(type_const);\
-  if (rval == NULL) \
-    rval = PARENT2::narrow(type_const);\
-  if (rval == NULL) \
-    rval = PARENT3::narrow(type_const);\
-  if (rval == NULL) \
-    rval = PARENT4::narrow(type_const);\
-  if (rval == NULL) \
-    rval = PARENT5::narrow(type_const);\
-  return rval;\
-}
-
-#define DEF_NARROW_FROM_DECL(TYPE)\
-static	TYPE *narrow_from_decl(AST_Decl *t)
-
-
-#define IMPL_NARROW_FROM_DECL(TYPE)\
-TYPE * \
-TYPE::narrow_from_decl(AST_Decl *t) { \
-   return (TYPE *)t->narrow((long)&TYPE::type_id);\
-}
-
-#define DEF_NARROW_FROM_SCOPE(TYPE)\
-static	TYPE *narrow_from_scope(UTL_Scope *t)
-
-
-#define IMPL_NARROW_FROM_SCOPE(TYPE)\
-TYPE * \
-TYPE::narrow_from_scope(UTL_Scope *t) { \
-    return (TYPE *)t->narrow((long)&TYPE::type_id);\
-}
-
-#endif	// _IDL_NARROW_IDL_NARROW_HH
diff --git a/TAO/TAO_IDL/include/intlmacros.h b/TAO/TAO_IDL/include/intlmacros.h
deleted file mode 100644
index 5a2da162932..00000000000
--- a/TAO/TAO_IDL/include/intlmacros.h
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-#ifndef	_IDL_INTLMACROS_HH
-#define _IDL_INTLMACROS_HH
-
-// intlmacros.hh
-//
-// Define macros which conditionalize string internationalization
-
-#ifndef	DOMF_TEXT_DEVEL_DOMAIN
-#define	DOMF_TEXT_DEVEL_DOMAIN	"SUNW_DOE_DOMF_DEVEL"
-#endif	// DOMF_TEXT_DEVEL_DOMAIN
-
-#define	GTDEVEL(s)		s
-
-#if defined(__STDC__)
-#define CONV(p) #p
-#define MKSTR(p) CONV(p)
-#else
-#define MKSTR(p) "p"
-#endif
-
-#endif	// _IDL_INTLMACROS_HH
diff --git a/TAO/TAO_IDL/include/nr_extern.h b/TAO/TAO_IDL/include/nr_extern.h
deleted file mode 100644
index 2da18cd4c80..00000000000
--- a/TAO/TAO_IDL/include/nr_extern.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-#ifndef _NR_EXTERN_NR_EXTERN_HH
-#define _NR_EXTERN_NR_EXTERN_HH
-
-// nr_extern.hh - Defines entry points provided by narrowing
-
-// Convert between an UTL_Scope and an AST_Decl
-extern	AST_Decl	*ScopeAsDecl(UTL_Scope *s);
-extern	UTL_Scope	*DeclAsScope(AST_Decl *d);
-
-#endif	// _NR_EXTERN_NR_EXTERN_HH
diff --git a/TAO/TAO_IDL/include/util.h b/TAO/TAO_IDL/include/util.h
deleted file mode 100644
index 6b218006c8e..00000000000
--- a/TAO/TAO_IDL/include/util.h
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-#ifndef _UTIL_UTIL_HH
-#define _UTIL_UTIL_HH
-
-// util.hh - Includes commonly used things defined in the util directory
-
-#include	"utl_stack.h"		// class fe_stack
-#include	"utl_exprlist.h"	// class UTL_ExprList
-#include	"utl_strlist.h"	// class UTL_StrList
-#include	"utl_idlist.h"		// class UTL_IdList
-#include	"utl_exceptlist.h"	// class UTL_ExceptList
-#include	"utl_namelist.h"	// class UTL_NameList
-#include	"utl_labellist.h"	// class UTL_LabelList
-#include	"utl_decllist.h"	// class UTL_DeclList
-
-#include	"idl_global.h"		// Class IDL_GlobalData
-
-#include	"utl_error.h"		// class UTL_Error
-
-#include	"utl_indenter.h"	// class UTL_Indenter
-
-#endif           // _UTIL_UTIL_HH
diff --git a/TAO/TAO_IDL/include/utl_decllist.h b/TAO/TAO_IDL/include/utl_decllist.h
deleted file mode 100644
index 9a0a37298bb..00000000000
--- a/TAO/TAO_IDL/include/utl_decllist.h
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-#ifndef _UTL_DECLLIST_UTL_DECLLIST_HH
-#define _UTL_DECLLIST_UTL_DECLLIST_HH
-
-// utl_decllist.hh
-//
-// List of FE_Declarator nodes
-
-// NOTE: This list class only works correctly because we use single public
-//       inheritance, as opposed to multiple inheritance or public virtual.
-//	 It relies on a type-unsafe cast from UTL_List to subclasses, which
-//	 will cease to operate correctly if you use either multiple or
-//	 public virtual inheritance.
-//
-//	 For portability reasons we have decided to provide both this and
-//	 an implementation of the list classes in terms of templates. If
-//	 your compiler supports templates, please use the files in the
-//	 include/utl_tmpl and util/utl_tmpl directories instead of the
-//	 files by the same names in the include and util directories.
-
-/*
-** DEPENDENCIES: utl_list.hh, fe_declarator.hh
-**
-** USE: Included from util.hh
-*/
-
-class	UTL_DeclList : public UTL_List
-{
-public:
-  // Operations
-
-  // Constructor(s)
-  UTL_DeclList(FE_Declarator *s, UTL_DeclList *cdr);
-
-  // Get element
-  FE_Declarator		*head();
-
-private:
-  // Data
-  FE_Declarator		*pd_car_data;	// The element this list stores
-};
-
-// Active iterator fooor UTL_DeclList
-class	UTL_DecllistActiveIterator : public UTL_ListActiveIterator
-{
-public:
-  // Operations
-
-  // Constructor(s)
-  UTL_DecllistActiveIterator(UTL_DeclList *s);
-
-  // Get current item
-  FE_Declarator		*item();
-};
-
-#endif           // _UTL_DECLLIST_UTL_DECLLIST_HH
diff --git a/TAO/TAO_IDL/include/utl_err.h b/TAO/TAO_IDL/include/utl_err.h
deleted file mode 100644
index 0873ae758a1..00000000000
--- a/TAO/TAO_IDL/include/utl_err.h
+++ /dev/null
@@ -1,181 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-#ifndef _UTL_ERROR_UTL_ERROR_HH
-#define _UTL_ERROR_UTL_ERROR_HH
-
-// utl_error.hh
-//
-// Defines error codes and error handling class for UTL
-// This will change as a result of internationalization
-
-/*
-** DEPENDENCIES: ast.hh
-**
-** USE: Included from util.hh
-*/
-
-class	UTL_Error
-{
-public:
-  enum ErrorCode {
-    EIDL_SYNTAX_ERROR,		// Syntax error in IDL input
-				// More details will be gleaned from examining
-				// idl_global->parse_state()
-    EIDL_REDEF,			// Redefinition
-    EIDL_REDEF_SCOPE,		// Redefinition inside defining scope
-    EIDL_DEF_USE,		// Definition after use
-    EIDL_MULTIPLE_BRANCH,	// More than one union branch with this
-				// label
-    EIDL_COERCION_FAILURE,	// Coercion failure
-    EIDL_SCOPE_CONFLICT,	// Between fwd declare and full declare
-    EIDL_ONEWAY_CONFLICT,	// Between op decl and argument direction
-    EIDL_DISC_TYPE,		// Illegal discriminator type in union
-    EIDL_LABEL_TYPE,		// Mismatch with discriminator type in union
-    EIDL_ILLEGAL_ADD,		// Illegal add action
-    EIDL_ILLEGAL_USE,		// Illegal type used in expression
-    EIDL_ILLEGAL_RAISES,	// Error in "raises" clause
-    EIDL_ILLEGAL_CONTEXT,	// Error in "context" clause
-    EIDL_CANT_INHERIT,		// Cannot inherit from non-interface
-    EIDL_LOOKUP_ERROR,		// Identifier not found
-    EIDL_INHERIT_FWD_ERROR,	// Cannot inherit from fwd decl interface
-    EIDL_CONSTANT_EXPECTED,	// We got something else..
-    EIDL_NAME_CASE_ERROR,	// Spelling differences found
-    EIDL_ENUM_VAL_EXPECTED,	// Expected an enumerator
-    EIDL_ENUM_VAL_NOT_FOUND,	// Didnt find an enumerator with that name
-    EIDL_EVAL_ERROR,		// Error in evaluating expression
-    EIDL_AMBIGUOUS,		// Ambiguous name definition
-    EIDL_DECL_NOT_DEFINED,	// Forward declared but never defined
-    EIDL_FWD_DECL_LOOKUP,	// Tried to lookup in fwd declared intf
-    EIDL_RECURSIVE_TYPE,	// Illegal recursive use of type
-    EIDL_NONVOID_ONEWAY,	// Non-void return type in oneway operation
-    EIDL_NOT_A_TYPE,		// Not a type
-    EIDL_BACK_END,		// Back end error
-    EIDL_OK			// No error
-  };
-
-  // Operations
-
-  // Report errors with varying numbers of arguments
-  void	error0(ErrorCode e);
-  void	error1(ErrorCode e, AST_Decl *t);
-  void	error2(ErrorCode e, AST_Decl *t1, AST_Decl *t2);
-  void	error3(ErrorCode e, AST_Decl *t1, AST_Decl *t2, AST_Decl *t3);
-
-  // Report a syntax error in IDL input
-  void	syntax_error(IDL_GlobalData::ParseState ps);
-
-  // Report a name being used with different spellings
-  void	name_case_error(char *n, char *t);
-
-  // Report an unsuccesful coercion attempt
-  void	coercion_error(AST_Expression *v, AST_Expression::ExprType t);
-
-  // Report a failed name lookup attempt
-  void	lookup_error(UTL_ScopedName *n);
-
-  // Report an attempt to use a forward declared interface which
-  // hasn't been defined yet in an inheritance spec
-  void	inheritance_fwd_error(UTL_ScopedName *n, AST_Interface *f);
-
-  // Report an attempt to inherit from something other than an interface
-  void	inheritance_error(UTL_ScopedName *n, AST_Decl *d);
-
-  // Report an error while evaluating an expression (division by zero, etc.)
-  void	eval_error(AST_Expression *d);
-
-  // Report a situation where a constant was expected but we got
-  // something else instead. This most likely is a case where a union
-  // label did not evaluate to a constant
-  void	constant_expected(UTL_ScopedName *n, AST_Decl *d);
-
-  // Report a situation where an enumerator was expected but we got
-  // something else instead. This occurs when a union with an enum
-  // discriminator is being parsed and one of the branch labels is
-  // not an enumerator in that enum
-  void	enum_val_expected(AST_Union *t, AST_UnionLabel *l);
-
-  // Report a failed enumerator lookup in an enum
-  void	enum_val_lookup_failure(AST_Union *t, AST_Enum *e, UTL_ScopedName *n);
-
-  // Report an ambiguous name definition
-  void	ambiguous(UTL_Scope *s, AST_Decl *l, AST_Decl *d);
-
-  // Report a forward declared interface which was never defined
-  void	fwd_decl_not_defined(AST_Interface *d);
-
-  // Report attempt to lookup in forward declared interface
-  void	fwd_decl_lookup(AST_Interface *d, UTL_ScopedName *n);
-
-  // Report a redefinition in scope
-  void	redefinition_in_scope(AST_Decl *t, AST_Decl *s);
-
-  // Report not a type error
-  void	not_a_type(AST_Decl *d);
-
-  // Report back-end error
-  void  back_end(long lineno, String *s);
-};
-
-#endif           // _UTL_ERROR_UTL_ERROR_HH
diff --git a/TAO/TAO_IDL/include/utl_error.h b/TAO/TAO_IDL/include/utl_error.h
deleted file mode 100644
index 0873ae758a1..00000000000
--- a/TAO/TAO_IDL/include/utl_error.h
+++ /dev/null
@@ -1,181 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-#ifndef _UTL_ERROR_UTL_ERROR_HH
-#define _UTL_ERROR_UTL_ERROR_HH
-
-// utl_error.hh
-//
-// Defines error codes and error handling class for UTL
-// This will change as a result of internationalization
-
-/*
-** DEPENDENCIES: ast.hh
-**
-** USE: Included from util.hh
-*/
-
-class	UTL_Error
-{
-public:
-  enum ErrorCode {
-    EIDL_SYNTAX_ERROR,		// Syntax error in IDL input
-				// More details will be gleaned from examining
-				// idl_global->parse_state()
-    EIDL_REDEF,			// Redefinition
-    EIDL_REDEF_SCOPE,		// Redefinition inside defining scope
-    EIDL_DEF_USE,		// Definition after use
-    EIDL_MULTIPLE_BRANCH,	// More than one union branch with this
-				// label
-    EIDL_COERCION_FAILURE,	// Coercion failure
-    EIDL_SCOPE_CONFLICT,	// Between fwd declare and full declare
-    EIDL_ONEWAY_CONFLICT,	// Between op decl and argument direction
-    EIDL_DISC_TYPE,		// Illegal discriminator type in union
-    EIDL_LABEL_TYPE,		// Mismatch with discriminator type in union
-    EIDL_ILLEGAL_ADD,		// Illegal add action
-    EIDL_ILLEGAL_USE,		// Illegal type used in expression
-    EIDL_ILLEGAL_RAISES,	// Error in "raises" clause
-    EIDL_ILLEGAL_CONTEXT,	// Error in "context" clause
-    EIDL_CANT_INHERIT,		// Cannot inherit from non-interface
-    EIDL_LOOKUP_ERROR,		// Identifier not found
-    EIDL_INHERIT_FWD_ERROR,	// Cannot inherit from fwd decl interface
-    EIDL_CONSTANT_EXPECTED,	// We got something else..
-    EIDL_NAME_CASE_ERROR,	// Spelling differences found
-    EIDL_ENUM_VAL_EXPECTED,	// Expected an enumerator
-    EIDL_ENUM_VAL_NOT_FOUND,	// Didnt find an enumerator with that name
-    EIDL_EVAL_ERROR,		// Error in evaluating expression
-    EIDL_AMBIGUOUS,		// Ambiguous name definition
-    EIDL_DECL_NOT_DEFINED,	// Forward declared but never defined
-    EIDL_FWD_DECL_LOOKUP,	// Tried to lookup in fwd declared intf
-    EIDL_RECURSIVE_TYPE,	// Illegal recursive use of type
-    EIDL_NONVOID_ONEWAY,	// Non-void return type in oneway operation
-    EIDL_NOT_A_TYPE,		// Not a type
-    EIDL_BACK_END,		// Back end error
-    EIDL_OK			// No error
-  };
-
-  // Operations
-
-  // Report errors with varying numbers of arguments
-  void	error0(ErrorCode e);
-  void	error1(ErrorCode e, AST_Decl *t);
-  void	error2(ErrorCode e, AST_Decl *t1, AST_Decl *t2);
-  void	error3(ErrorCode e, AST_Decl *t1, AST_Decl *t2, AST_Decl *t3);
-
-  // Report a syntax error in IDL input
-  void	syntax_error(IDL_GlobalData::ParseState ps);
-
-  // Report a name being used with different spellings
-  void	name_case_error(char *n, char *t);
-
-  // Report an unsuccesful coercion attempt
-  void	coercion_error(AST_Expression *v, AST_Expression::ExprType t);
-
-  // Report a failed name lookup attempt
-  void	lookup_error(UTL_ScopedName *n);
-
-  // Report an attempt to use a forward declared interface which
-  // hasn't been defined yet in an inheritance spec
-  void	inheritance_fwd_error(UTL_ScopedName *n, AST_Interface *f);
-
-  // Report an attempt to inherit from something other than an interface
-  void	inheritance_error(UTL_ScopedName *n, AST_Decl *d);
-
-  // Report an error while evaluating an expression (division by zero, etc.)
-  void	eval_error(AST_Expression *d);
-
-  // Report a situation where a constant was expected but we got
-  // something else instead. This most likely is a case where a union
-  // label did not evaluate to a constant
-  void	constant_expected(UTL_ScopedName *n, AST_Decl *d);
-
-  // Report a situation where an enumerator was expected but we got
-  // something else instead. This occurs when a union with an enum
-  // discriminator is being parsed and one of the branch labels is
-  // not an enumerator in that enum
-  void	enum_val_expected(AST_Union *t, AST_UnionLabel *l);
-
-  // Report a failed enumerator lookup in an enum
-  void	enum_val_lookup_failure(AST_Union *t, AST_Enum *e, UTL_ScopedName *n);
-
-  // Report an ambiguous name definition
-  void	ambiguous(UTL_Scope *s, AST_Decl *l, AST_Decl *d);
-
-  // Report a forward declared interface which was never defined
-  void	fwd_decl_not_defined(AST_Interface *d);
-
-  // Report attempt to lookup in forward declared interface
-  void	fwd_decl_lookup(AST_Interface *d, UTL_ScopedName *n);
-
-  // Report a redefinition in scope
-  void	redefinition_in_scope(AST_Decl *t, AST_Decl *s);
-
-  // Report not a type error
-  void	not_a_type(AST_Decl *d);
-
-  // Report back-end error
-  void  back_end(long lineno, String *s);
-};
-
-#endif           // _UTL_ERROR_UTL_ERROR_HH
diff --git a/TAO/TAO_IDL/include/utl_exceptlist.h b/TAO/TAO_IDL/include/utl_exceptlist.h
deleted file mode 100644
index c3c14ccf714..00000000000
--- a/TAO/TAO_IDL/include/utl_exceptlist.h
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-#ifndef _UTL_EXCEPTLIST_UTL_EXCEPTLIST_HH
-#define _UTL_EXCEPTLIST_UTL_EXCEPTLIST_HH
-
-// utl_exceptlist.hh
-//
-// List of AST_Exception nodes
-
-// NOTE: This list class only works correctly because we use single public
-//       inheritance, as opposed to multiple inheritance or public virtual.
-//	 It relies on a type-unsafe cast from UTL_List to subclasses, which
-//	 will cease to operate correctly if you use either multiple or
-//	 public virtual inheritance.
-//
-//	 For portability reasons we have decided to provide both this and
-//	 an implementation of the list classes in terms of templates. If
-//	 your compiler supports templates, please use the files in the
-//	 include/utl_tmpl and util/utl_tmpl directories instead of the
-//	 files by the same names in the include and util directories.
-
-/*
-** DEPENDENCIES: utl_list.hh, ast_exception.hh
-**
-** USE: Included from util.hh
-*/
-
-class	UTL_ExceptList : public UTL_List
-{
-public:
-  // Operations
-
-  // Constructor(s)
-  UTL_ExceptList(AST_Exception *s, UTL_ExceptList *cdr);
-
-  // Get list item
-  AST_Exception		*head();
-
-private:
-  // Data
-  AST_Exception		*pd_car_data;	// Item of this list
-};
-
-// Active iterator for UTL_ExceptList
-class	UTL_ExceptlistActiveIterator : public UTL_ListActiveIterator
-{
-public:
-  // Operations
-
-  // Constructor(s)
-  UTL_ExceptlistActiveIterator(UTL_ExceptList *s);
-
-  // Get current item
-  AST_Exception		*item();
-};
-
-#endif           // _UTL_EXCEPTLIST_UTL_EXCEPTLIST_HH
diff --git a/TAO/TAO_IDL/include/utl_exprlist.h b/TAO/TAO_IDL/include/utl_exprlist.h
deleted file mode 100644
index 3e4f7c7079e..00000000000
--- a/TAO/TAO_IDL/include/utl_exprlist.h
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-#ifndef _UTL_EXPRLIST_UTL_EXPRLIST_HH
-#define _UTL_EXPRLIST_UTL_EXPRLIST_HH
-
-// utl_exprlist.hh
-//
-// List of strings
-
-// NOTE: This list class only works correctly because we use single public
-//       inheritance, as opposed to multiple inheritance or public virtual.
-//	 It relies on a type-unsafe cast from UTL_List to subclasses, which
-//	 will cease to operate correctly if you use either multiple or
-//	 public virtual inheritance.
-//
-//	 For portability reasons we have decided to provide both this and
-//	 an implementation of the list classes in terms of templates. If
-//	 your compiler supports templates, please use the files in the
-//	 include/utl_tmpl and util/utl_tmpl directories instead of the
-//	 files by the same names in the include and util directories.
-
-/*
-** DEPENDENCIES: ast_expression.hh, utl_list.hh
-**
-** USE: Included from util.hh
-*/
-
-class	UTL_ExprList : public UTL_List
-{
-public:
-  // Operations
-
-  // Constructor(s)
-  UTL_ExprList(AST_Expression *s, UTL_ExprList *cdr);
-
-  // Get list item
-  AST_Expression		*head();
-
-private:
-  // Data
-  AST_Expression		*pd_car_data;	// List item
-};
-
-// Active iterator for UTL_ExprList
-class	UTL_ExprlistActiveIterator : public UTL_ListActiveIterator
-{
-public:
-  // Operations
-
-  // Constructor(s)
-  UTL_ExprlistActiveIterator(UTL_ExprList *s);
-
-  // Get current item
-  AST_Expression		*item();
-};
-
-#endif           // _UTL_EXPRLIST_UTL_EXPRLIST_HH
diff --git a/TAO/TAO_IDL/include/utl_identifier.h b/TAO/TAO_IDL/include/utl_identifier.h
deleted file mode 100644
index 4b38c449340..00000000000
--- a/TAO/TAO_IDL/include/utl_identifier.h
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-#ifndef	_UTL_IDENTIFIER_UTL_IDENTIFIER_HH
-#define	_UTL_IDENTIFIER_UTL_IDENTIFIER_HH
-
-// utl_identifier.hh
-//
-// Identifier
-
-/*
-** DEPENDENCIES: utl_string.hh
-**
-** USE: Included from util.hh
-*/
-
-#include	"ace/stdcpp.h"
-#include	"idl_fwd.h"
-#include	"utl_string.h"
-
-class Identifier 
-{
-public:
-  Identifier ();
-  // Default Constructor(s)
-  
-  Identifier (char *s, long x=1, long y=0, long z=I_FALSE);
-  // constructor
-
-  virtual ~Identifier ();
-  // destructor
-  
-  // =Operations
-
-  char	*get_string ();
-  // get the underlying string
-
-  long	compare (Identifier *other);
-  // compare with other Identifier
-  
-  // =Dumping
-
-  virtual void	dump (ostream &o);
-  // dump to an ostream
-
-  private:
-    // Storage for data
-    char	*pv_string;
-};
-
-#endif		// _UTL_IDENTIFIER_UTL_IDENTIFIER_HH
diff --git a/TAO/TAO_IDL/include/utl_idlist.h b/TAO/TAO_IDL/include/utl_idlist.h
deleted file mode 100644
index b867a18523a..00000000000
--- a/TAO/TAO_IDL/include/utl_idlist.h
+++ /dev/null
@@ -1,146 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-#ifndef	_UTL_IDLIST_UTL_IDLIST_HH
-#define	_UTL_IDLIST_UTL_IDLIST_HH
-
-// utl_idlist.hh
-//
-// List of Identifiers
-
-// NOTE: This list class only works correctly because we use single public
-//       inheritance, as opposed to multiple inheritance or public virtual.
-//	 It relies on a type-unsafe cast from UTL_List to subclasses, which
-//	 will cease to operate correctly if you use either multiple or
-//	 public virtual inheritance.
-//
-//	 For portability reasons we have decided to provide both this and
-//	 an implementation of the list classes in terms of templates. If
-//	 your compiler supports templates, please use the files in the
-//	 include/utl_tmpl and util/utl_tmpl directories instead of the
-//	 files by the same names in the include and util directories.
-
-/*
-** DEPENDENCIES: utl_list.hh, utl_identifier.hh
-**
-** USE: Included from util.hh
-*/
-
-#include	"ace/stdcpp.h"
-#include	"idl_fwd.h"
-#include	"utl_list.h"
-#include	"utl_identifier.h"
-#include	"utl_string.h"
-
-class UTL_IdList : public UTL_List
-{
-  // =TITLE
-  //  UTL_IdList
-  // =DESCRIPTION
-  //  Used to maintain a list of identifiers. The primary usage of this class
-  //  is to maintain a scoped name.
-public:
-  UTL_IdList (Identifier *car, UTL_IdList *cdr);
-  // Constructor(s)
-  
-  virtual ~UTL_IdList() {}
-  // destructor
-
-  // =AST Dumping
-  
-  virtual void dump (ostream &o);
-  // dump to ostream
-
-  // Other operations
-  
-  UTL_List *copy ();
-  // Copy the list
-  
-  Identifier *head ();
-  // get element
-  
-  Identifier  *last_component ();
-  // Get last element in this list
-private:
-  Identifier *pd_car_data;
-};
-
-// Active iterator for UTL_IdList
-
-class	UTL_IdListActiveIterator :
-	public UTL_ListActiveIterator
-{
-  // =TITLE
-  //  UTL_IdListActiveIterator
-  // =DESCRIPTION
-  //  Iterator for the IDList
-public:
-  UTL_IdListActiveIterator (UTL_IdList *s);
-  // Constructor(s)
-  
-  Identifier *item ();
-  // retrieves the next item
-};
-
-#endif		// _UTL_IDLIST_UTL_IDLIST_HH
diff --git a/TAO/TAO_IDL/include/utl_indenter.h b/TAO/TAO_IDL/include/utl_indenter.h
deleted file mode 100644
index 17a1a509e1e..00000000000
--- a/TAO/TAO_IDL/include/utl_indenter.h
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-#ifndef _UTL_INDENTER_UTL_INDENTER_HH
-#define _UTL_INDENTER_UTL_INDENTER_HH
-
-// UTL indenter:
-//
-// Utility class for control of indentation level during dumping
-// May also be useful for BEs that want to produce nicely formatted
-// output
-
-/*
-** DEPENDENCIES: NONE
-**
-** USE: in CFE in dumping the AST
-*/
-
-class UTL_Indenter
-{
-  // =TITLE
-  //  UTL_Indenter
-  // =DESCRIPTION
-  //  useful in generating indented output
-public:
-  // Operations
-
-  UTL_Indenter();		// constructor
-  // Constructor(s)
-
-  virtual ~UTL_Indenter() {}
-  // destructor
-
-  void reset();			
-  // Reset indentation level to 0
-
-  void increase();		
-  // Increase indentation level
-
-  void decrease();		
-  // Decrease indentation level
-
-  void skip_to (ostream &o);	
-  // Skip to indentation level stop
-
-  void skip_to (FILE *fp);
-  // skip to indentation level stop
-
-private:
-  // Data
-  long				pd_indent_level;	// How far to indent
-};
-
-#endif           // _UTL_INDENTER_UTL_INDENTER_HH
diff --git a/TAO/TAO_IDL/include/utl_labellist.h b/TAO/TAO_IDL/include/utl_labellist.h
deleted file mode 100644
index e78a04ec372..00000000000
--- a/TAO/TAO_IDL/include/utl_labellist.h
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-#ifndef _UTL_LABELLIST_UTL_LABELLIST_HH
-#define _UTL_LABELLIST_UTL_LABELLIST_HH
-
-// utl_labellist.hh
-//
-// List of AST_UnionBranch nodes
-
-// NOTE: This list class only works correctly because we use single public
-//       inheritance, as opposed to multiple inheritance or public virtual.
-//	 It relies on a type-unsafe cast from UTL_List to subclasses, which
-//	 will cease to operate correctly if you use either multiple or
-//	 public virtual inheritance.
-//
-//	 For portability reasons we have decided to provide both this and
-//	 an implementation of the list classes in terms of templates. If
-//	 your compiler supports templates, please use the files in the
-//	 include/utl_tmpl and util/utl_tmpl directories instead of the
-//	 files by the same names in the include and util directories.
-
-/*
-** DEPENDENCIES: utl_list.hh, ast_union_label.hh
-**
-** USE: Included from util.hh
-*/
-
-class	UTL_LabelList : public UTL_List
-{
-public:
-  // Operations
-
-  // Constructor(s)
-  UTL_LabelList(AST_UnionLabel *s, UTL_LabelList *cdr);
-
-  // Get list item
-  AST_UnionLabel	*head();
-
-private:
-  // Data
-  AST_UnionLabel	*pd_car_data;	// List item
-};
-
-// Active iterator for UTL_LabelList
-class	UTL_LabellistActiveIterator : public UTL_ListActiveIterator
-{
-public:
-  // Operations
-
-  // Constructor(s)
-  UTL_LabellistActiveIterator(UTL_LabelList *source);
-
-  // Get current item
-  AST_UnionLabel	*item();
-};
-
-#endif           // _UTL_LABELLIST_UTL_LABELLIST_HH
diff --git a/TAO/TAO_IDL/include/utl_list.h b/TAO/TAO_IDL/include/utl_list.h
deleted file mode 100644
index 017b9be1a18..00000000000
--- a/TAO/TAO_IDL/include/utl_list.h
+++ /dev/null
@@ -1,148 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-#ifndef _UTL_LIST_UTL_LIST_HH
-#define _UTL_LIST_UTL_LIST_HH
-
-// utl_list.hh
-//
-// General single-linked lists
-
-/*
-** DEPENDENCIES: NONE
-**
-** USE: Included from util.hh
-*/
-
-// NOTE: This list class only works correctly because we use single public
-//       inheritance, as opposed to multiple inheritance or public virtual.
-//	 It relies on a type-unsafe cast from UTL_List to subclasses, which
-//	 will cease to operate correctly if you use either multiple or
-//	 public virtual inheritance.
-//
-//	 For portability reasons we have decided to provide both this and
-//	 an implementation of the list classes in terms of templates. If
-//	 your compiler supports templates, please use the files in the
-//	 include/utl_tmpl and util/utl_tmpl directories instead of the
-//	 files by the same names in the include and util directories.
-
-// Forward declare active iterator for UTL_List
-class	UTL_ListActiveIterator;
-
-class	UTL_List
-{
-public:
-  // Operations
-
-  // Constructor(s)
-  UTL_List(UTL_List *c);
-
-  // Smash last cdr pointer in "this" with l
-  void			nconc(UTL_List *l);
-
-  // Copy the list starting at "this"
-  virtual UTL_List	*copy();
-
-  // Get next list
-  UTL_List		*tail();
-
-  // Set next list
-  void			set_tail(UTL_List *l);
-
-  // How long is this list?
-  long			length();
-
-private:
-  // Data
-  UTL_List		*pd_cdr_data;	// The next list
-
-  // Operations
-  long			list_length(long n); // How long is it?
-
-  // Friend class
-  friend class		UTL_ListActiveIterator; // Friend class
-
-};
-
-// Active iterator for lists
-class	UTL_ListActiveIterator
-{
-public:
-  // Operations
-
-  // Constructor(s)
-  UTL_ListActiveIterator(UTL_List *s);	
-
-  // Get next list
-  virtual void		next();
-
-  // Are we at the end of this list?
-  virtual long		is_done();
-
-protected:
-  // Data
-  UTL_List		*source;		// On what to iterate?
-};
-
-#endif           // _UTL_LIST_UTL_LIST_HH
diff --git a/TAO/TAO_IDL/include/utl_namelist.h b/TAO/TAO_IDL/include/utl_namelist.h
deleted file mode 100644
index d7f0d8eb526..00000000000
--- a/TAO/TAO_IDL/include/utl_namelist.h
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-#ifndef _UTL_NAMELIST_UTL_NAMELIST_HH
-#define _UTL_NAMELIST_UTL_NAMELIST_HH
-
-// utl_namelist.hh
-//
-// List of UTL_ScopedName nodes
-
-// NOTE: This list class only works correctly because we use single public
-//       inheritance, as opposed to multiple inheritance or public virtual.
-//	 It relies on a type-unsafe cast from UTL_List to subclasses, which
-//	 will cease to operate correctly if you use either multiple or
-//	 public virtual inheritance.
-//
-//	 For portability reasons we have decided to provide both this and
-//	 an implementation of the list classes in terms of templates. If
-//	 your compiler supports templates, please use the files in the
-//	 include/utl_tmpl and util/utl_tmpl directories instead of the
-//	 files by the same names in the include and util directories.
-
-/*
-** DEPENDENCIES: utl_list.hh, utl_scoped_name.hh
-**
-** USE: Included from util.hh
-*/
-
-class	UTL_NameList : public UTL_List
-{
-public:
-  // Operations
-
-  // Constructor(s)
-  UTL_NameList(UTL_ScopedName *s, UTL_NameList *cdr);
-
-  // Get list item
-  UTL_ScopedName	*head();
-
-private:
-  // Data
-  UTL_ScopedName	*pd_car_data;	// List item
-};
-
-// Active iterator for UTL_NameList
-class	UTL_NamelistActiveIterator : public UTL_ListActiveIterator
-{
-public:
-  // Operations
-
-  // Constructor(s)
-  UTL_NamelistActiveIterator(UTL_NameList *source);
-
-  // Get current item
-  UTL_ScopedName	*item();
-};
-
-#endif           // _UTL_NAMELIST_UTL_NAMELIST_HH
diff --git a/TAO/TAO_IDL/include/utl_scope.h b/TAO/TAO_IDL/include/utl_scope.h
deleted file mode 100644
index 7f14206fdbf..00000000000
--- a/TAO/TAO_IDL/include/utl_scope.h
+++ /dev/null
@@ -1,288 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-#ifndef _UTL_SCOPE_UTL_SCOPE_HH
-#define _UTL_SCOPE_UTL_SCOPE_HH
-
-// UTL_Scope - Provide scoping mechanism
-//
-// This is the base class for name scoping. Each entity which can
-// be directly contained in a naming scope has an add() function
-// defined for it. The functions defined on the base scoping class
-// all return FALSE. Each subclass of UTL_Scope should
-// define its own add() functions for those types which are legal
-// in that context. Then, for those types for which no local functions
-// have been defined the function on the base class will be called to
-// return FALSE.
-//
-// The "AST_" classes may redefine add() functions to implement any
-// name binding mechanisms needed for their own functionality. It is
-// the responsibility of those functions then to call the add()
-// function defined in the parent "AST_" class.
-
-/*
-** DEPENDENCIES: ast_decl.hh, utl_scoped_name.hh
-**
-** USE: Included from ast.hh
-*/
-
-#include	"idl_fwd.h"
-#include	"idl_narrow.h"
-#include	"ast_decl.h"
-#include	"ast_expression.h"
-#include	"utl_scoped_name.h"
-
-// Forward declaration of active iterator for UTL_Scope
-class UTL_ScopeActiveIterator;
-
-class	UTL_Scope : public virtual COMMON_Base
-{
-public:
-  // Enum to denote the kind of iteration desired
-  enum ScopeIterationKind {
-      IK_both		// Iterate through both decls and local types
-    , IK_decls		// Iterate only through decls
-    , IK_localtypes	// Iterate only through local types
-  };
-
-  // Operations
-
-  // Constructor(s)
-  UTL_Scope();
-  UTL_Scope(AST_Decl::NodeType nt);
-  virtual ~UTL_Scope() {}
-
-  // Scope Management Protocol
-  virtual AST_PredefinedType	*add_predefined_type(AST_PredefinedType	*t);
-  virtual AST_Module		*add_module(AST_Module			*m);
-  virtual AST_Interface		*add_interface(AST_Interface		*i);
-  virtual AST_InterfaceFwd	*add_interface_fwd(AST_InterfaceFwd	*i);
-  virtual AST_Constant		*add_constant(AST_Constant		*c);
-  virtual AST_Exception		*add_exception(AST_Exception		*e);
-  virtual AST_Attribute		*add_attribute(AST_Attribute		*a);
-  virtual AST_Operation		*add_operation(AST_Operation		*o);
-  virtual AST_Argument		*add_argument(AST_Argument		*a);
-  virtual AST_Union		*add_union(AST_Union			*u);
-  virtual AST_UnionBranch	*add_union_branch(AST_UnionBranch	*b);
-  virtual AST_Structure		*add_structure(AST_Structure		*s);
-  virtual AST_Field		*add_field(AST_Field			*f);
-  virtual AST_Enum		*add_enum(AST_Enum			*e);
-  virtual AST_EnumVal		*add_enum_val(AST_EnumVal		*v);
-  virtual AST_Typedef		*add_typedef(AST_Typedef		*t);
-  virtual UTL_StrList		*add_context(UTL_StrList		*c);
-  virtual UTL_NameList		*add_exceptions(UTL_NameList		*e);
-  virtual AST_Sequence		*add_sequence(AST_Sequence		*s);
-  virtual AST_String		*add_string(AST_String			*s);
-  virtual AST_Array		*add_array(AST_Array			*a);
-
-  // Call back end add_XXX functions for this scope
-  virtual AST_Decl 		*call_add();
-
-  // Data Accessors
-  AST_Decl::NodeType scope_node_type()
-  {
-    return pd_scope_node_type;
-  }
-
-  // Narrowing
-  DEF_NARROW_METHODS0(UTL_Scope);
-  DEF_NARROW_FROM_SCOPE(UTL_Scope);
-
-  // AST Dumping
-  virtual void			dump(ostream &o);
-
-  // Other Operations
-
-  // Name Lookup Mechanism
-  virtual AST_Decl		*lookup_by_name(UTL_ScopedName *,
-						idl_bool treat_as_ref);
-
-  // Look up the Identifier * specified only in the local scope
-  virtual AST_Decl		*lookup_by_name_local(Identifier *,
-						      idl_bool treat_as_ref);
-
-  // Look up a predefined type by its ExprType
-  virtual AST_Decl
-    *lookup_primitive_type(AST_Expression::ExprType);
-
-  // How many entries are used?
-  virtual unsigned long		nmembers();
-
-protected:
-  // UTL_Scope protected addition protocol. This protocol is
-  // used from sub-classes of UTL_Scope to insert nodes directly
-  // into the specified node table (either decls or local_types)
-  // Additionally, UTL_Scope also maintains a record of what nodes
-  // defined elsewhere were referenced in this scope
-
-  // Add to decls. Node represents a local declaration
-  void				add_to_scope(AST_Decl *e);
-
-  // Add to local types. Node represents a local manifest type
-  void				add_to_local_types(AST_Decl *e);
-
-  // Add to referenced nodes set.
-  void				add_to_referenced(AST_Decl *e,
-						  idl_bool recursive);
-
-  // Has this node been referenced here already?
-  idl_bool			referenced(AST_Decl *e);
-
-  // Look up a scoped name in the inherited interfaces of an
-  // interface
-  virtual AST_Decl		*look_in_inherited(UTL_ScopedName *,
-						   idl_bool treat_as_ref);
-protected:
-  // Operations
-
-  // Lookup based on the local name
-  virtual AST_Decl		*lookup_for_add(AST_Decl *d,
-						idl_bool treat_as_ref);
-
-private:
-  // Data
-
-  // What type is this node? This is a cache of the information
-  // in AST_Decl
-  const	AST_Decl::NodeType	pd_scope_node_type;
-
-  // Storage for declarations in this scope:
-  AST_Decl			**pd_decls;		// Store declarations
-  long				pd_decls_allocated;	// How many allocated?
-  long				pd_decls_used;		// How many used?
-
-  // Storage for local manifest types in this scope:
-  AST_Decl			**pd_local_types;	// Store types
-  long				pd_locals_allocated;	// How many allocated?
-  long				pd_locals_used;		// How many used?
-
-  // Storage for referenced nodes in this scope:
-  AST_Decl			**pd_referenced;	// Store references
-  long				pd_referenced_allocated;// How many allocated?
-  long				pd_referenced_used;	// How many used?
-
-  // Friend class UTL_ScopeActiveIterator defines active iterator for
-  // UTL_Scope. Definition follows below.
-  friend class			UTL_ScopeActiveIterator;
-
-private:
-  friend int yyparse();
-  friend class AST_Enum;
-
-  // Scope Management Protocol
-  virtual AST_PredefinedType	*fe_add_predefined_type(AST_PredefinedType *t);
-  virtual AST_Module		*fe_add_module(AST_Module		*m);
-  virtual AST_Interface		*fe_add_interface(AST_Interface		*i);
-  virtual AST_InterfaceFwd	*fe_add_interface_fwd(AST_InterfaceFwd	*i);
-  virtual AST_Constant		*fe_add_constant(AST_Constant		*c);
-  virtual AST_Exception		*fe_add_exception(AST_Exception		*e);
-  virtual AST_Attribute		*fe_add_attribute(AST_Attribute		*a);
-  virtual AST_Operation		*fe_add_operation(AST_Operation		*o);
-  virtual AST_Argument		*fe_add_argument(AST_Argument		*a);
-  virtual AST_Union		*fe_add_union(AST_Union			*u);
-  virtual AST_UnionBranch	*fe_add_union_branch(AST_UnionBranch	*b);
-  virtual AST_Structure		*fe_add_structure(AST_Structure		*s);
-  virtual AST_Field		*fe_add_field(AST_Field			*f);
-  virtual AST_Enum		*fe_add_enum(AST_Enum			*e);
-  virtual AST_EnumVal		*fe_add_enum_val(AST_EnumVal		*v);
-  virtual AST_Typedef		*fe_add_typedef(AST_Typedef		*t);
-  virtual UTL_StrList		*fe_add_context(UTL_StrList		*c);
-  virtual UTL_NameList		*fe_add_exceptions(UTL_NameList		*e);
-  virtual AST_Sequence		*fe_add_sequence(AST_Sequence		*s);
-  virtual AST_String		*fe_add_string(AST_String		*s);
-  virtual AST_Array		*fe_add_array(AST_Array			*a);
-};
-
-// Active iterator for a UTL_Scope node
-class UTL_ScopeActiveIterator {
-public:
-  // Operations
-
-  // Constructor(s)
-  UTL_ScopeActiveIterator(UTL_Scope *s, UTL_Scope::ScopeIterationKind ik);
-
-  // Advance to next item
-  virtual void			next();
-
-  // Get current item
-  virtual AST_Decl		*item();
-
-  // Have we iterated over entire scope?
-  virtual idl_bool		is_done();
-
-  // What kind of iterator is this?
-  virtual UTL_Scope::ScopeIterationKind	iteration_kind();
-
-  // What stage are we in with this iterator?
-  virtual UTL_Scope::ScopeIterationKind	iteration_stage();
-
-private:
-  // Data
-  UTL_Scope			*iter_source;	// Scope to iterate over
-  UTL_Scope::ScopeIterationKind	ik;		// What kind of iteration
-  UTL_Scope::ScopeIterationKind	stage;		// What stage
-  long				il;		// What location in stage
-};
-
-#endif           // _UTL_SCOPE_UTL_SCOPE_HH
diff --git a/TAO/TAO_IDL/include/utl_scoped_name.h b/TAO/TAO_IDL/include/utl_scoped_name.h
deleted file mode 100644
index 5ca4d9c247f..00000000000
--- a/TAO/TAO_IDL/include/utl_scoped_name.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-#ifndef _AST_SCOPED_NAME_AST_SCOPED_NAME_HH
-#define _AST_SCOPED_NAME_AST_SCOPED_NAME_HH
-
-// Define UTL_ScopedName as a list of strings
-
-/*
-** DEPENDENCIES: utl_strlist.hh
-**
-** USE: Included from ast.hh
-*/
-
-typedef UTL_IdList			UTL_ScopedName;
-
-typedef UTL_IdListActiveIterator	UTL_ScopedNameActiveIterator;
-
-#endif           // _AST_SCOPED_NAME_AST_SCOPED_NAME_HH
diff --git a/TAO/TAO_IDL/include/utl_stack.h b/TAO/TAO_IDL/include/utl_stack.h
deleted file mode 100644
index 7e343c17fc4..00000000000
--- a/TAO/TAO_IDL/include/utl_stack.h
+++ /dev/null
@@ -1,148 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-#ifndef _UTL_STACK_UTL_STACK_HH
-#define _UTL_STACK_UTL_STACK_HH
-
-// utl_stack.hh - Defines the UTL_ScopeStack class - a stack of scopes
-//
-// UTL_ScopeStack implements scope nesting
-
-/*
-** DEPENDENCIES: utl_scope.hh
-**
-** USE: Included from util.hh
-*/
-
-// Forward declaration of active iterator for UTL_ScopeStack
-class	UTL_ScopeStackActiveIterator;
-
-class	UTL_ScopeStack
-{
-public:
-  // Operations
-
-  // Constructor and destructor
-  UTL_ScopeStack();
-  virtual ~UTL_ScopeStack();
-
-  // Return top element
-  virtual UTL_Scope		*top();
-
-  // Pop top element
-  virtual void			pop();
-
-  // Clear entire stack
-  virtual void			clear();
-
-  // Push an element on the stack and return stack
-  virtual UTL_ScopeStack	*push(UTL_Scope *el);
-
-  // How deep is the stack now?
-  virtual unsigned long		depth();
-
-  // Return bottom element
-  virtual UTL_Scope		*bottom();
-
-  // Return (top - 1) element
-  virtual UTL_Scope		*next_to_top();
-
-  // return topmost non-NULL element
-  virtual UTL_Scope		*top_non_null();
-
-private:
-  // Data
-  UTL_Scope			**pd_stack_data;	// Store scopes stack
-  unsigned long			pd_stack_data_nalloced;	// How many allocated?
-  unsigned long			pd_stack_top;		// How many used?
-
-  // Friend active iterator class for UTL_ScopeStack
-  friend class			UTL_ScopeStackActiveIterator;
-};
-
-// Active iterator for UTL_ScopeStack
-class	UTL_ScopeStackActiveIterator
-{
-public:
-  // Operations
-
-  // Constructor
-  UTL_ScopeStackActiveIterator(UTL_ScopeStack *s);
-
-  // Advance to next element
-  virtual void			next();
-
-  // Get current item
-  virtual UTL_Scope		*item();
-
-  // Is the iteration finished?
-  virtual long			is_done();
-
-private:
-  // Data
-  UTL_ScopeStack		*source;	// On what to iterate?
-  long				il;		// Where are we in iteration?
-};
-
-#endif           // _UTL_STACK_UTL_STACK_HH
diff --git a/TAO/TAO_IDL/include/utl_string.h b/TAO/TAO_IDL/include/utl_string.h
deleted file mode 100644
index 35f4fae171f..00000000000
--- a/TAO/TAO_IDL/include/utl_string.h
+++ /dev/null
@@ -1,141 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-#ifndef _STRING_STRING_HH
-#define _STRING_STRING_HH
-
-// utl_string.hh - contains a quick and dirty TEMPORARY string implementation
-
-/*
-** DEPENDENCIES: NONE
-**
-** USE: Included from util.hh
-*/
-
-#ifndef String
-#define String	UTL_String
-#endif	// String
-
-class	UTL_String
-{
-  // =TITLE
-  //  UTL_String
-  // =DESCRIPTION
-  //  string class to store identifiers
-public:
-  // =Operations
-
-  UTL_String (void);
-  // default constructor
-
-  UTL_String (char *str);
-  // construct from a char *
-
-  UTL_String (unsigned long maxlen);
-  // constructor with an initial string length
-
-  UTL_String (UTL_String *s);
-  // construct using a pointer to UTL_String
-
-  virtual ~UTL_String (void) {}
-  // destructor 
-
-  // =AST Dumping
-
-  virtual void dump (ostream &o);
-  // dump to the ostream
-
-  // =Other Operations
-
-  char *get_string (void);
-  // Get contents of utl_string
-
-  char *get_canonical_rep (void);
-  // Get canonical representation. This is (implemented as) the all upper
-  // case corresponding string
-
-  virtual long compare (UTL_String *s);
-  // Compare two String *
-
-private:
-  // Data
-  char		*p_str;		
-  // Storage for characters
-
-  char		*c_str;		
-  // Canonicalized string
-
-  unsigned long	len;		
-  // How long is string
-
-  unsigned long alloced;	
-  // How much allocated
-
-  // =Private helper operations
-
-  void canonicalize (void);	
-  // Compute canonical representation
-};
-
-#endif           // _STRING_STRING_HH
diff --git a/TAO/TAO_IDL/include/utl_strlist.h b/TAO/TAO_IDL/include/utl_strlist.h
deleted file mode 100644
index 2dac6ce3de6..00000000000
--- a/TAO/TAO_IDL/include/utl_strlist.h
+++ /dev/null
@@ -1,133 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-#ifndef _UTL_STRLIST_UTL_STRLIST_HH
-#define _UTL_STRLIST_UTL_STRLIST_HH
-
-// utl_strlist.hh
-//
-// List of String nodes
-
-// NOTE: This list class only works correctly because we use single public
-//       inheritance, as opposed to multiple inheritance or public virtual.
-//	 It relies on a type-unsafe cast from UTL_List to subclasses, which
-//	 will cease to operate correctly if you use either multiple or
-//	 public virtual inheritance.
-//
-//	 For portability reasons we have decided to provide both this and
-//	 an implementation of the list classes in terms of templates. If
-//	 your compiler supports templates, please use the files in the
-//	 include/utl_tmpl and util/utl_tmpl directories instead of the
-//	 files by the same names in the include and util directories.
-
-/*
-** DEPENDENCIES: utl_list.hh, utl_string.hh
-**
-** USE: Included from util.hh
-*/
-
-class	UTL_StrList : public UTL_List
-{
-public:
-  // Operations
-
-  // Constructor(s)
-  UTL_StrList(String *s, UTL_StrList *cdr);
-
-  // AST Dumping
-  virtual void		dump(ostream &o);
-
-  // Other Operations
-
-  // Copy a list of strings
-  virtual UTL_List	*copy();
-
-  // Get list element
-  String		*head();
-
-  // Set the list element
-  void			set_head(String *);
-
-  // Get last element in this list
-  String		*last_component();
-
-private:
-  // Data
-  String		*pd_car_data;	// The list item
-};
-
-// Active iterator for  UTL_StrList
-class	UTL_StrlistActiveIterator : public UTL_ListActiveIterator
-{
-public:
-  // Operations
-
-  // Constructor(s)
-  UTL_StrlistActiveIterator(UTL_StrList *s);
-
-  // Get current item
-  String		*item();
-};
-
-#endif           // _UTL_STRLIST_UTL_STRLIST_HH
diff --git a/TAO/TAO_IDL/include/utl_tmpl/utl_decllist.h b/TAO/TAO_IDL/include/utl_tmpl/utl_decllist.h
deleted file mode 100644
index 5e5892d4d7f..00000000000
--- a/TAO/TAO_IDL/include/utl_tmpl/utl_decllist.h
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- *======================================================================
- *
- *Copyright 1992 Sun Microsystems, Inc.
- *
- *The Interface Definition Language Compiler Front End (CFE) is made
- *available for use provided that this legend is included on all media and
- *documentation and as a part of the software program in whole or part.
- *Users may copy and extend functionality (but may not remove
- *functionality) of the Interface Definition Language CFE without charge,
- *but are not authorized to license or distribute it to anyone else except
- *as part of a product or program developed by the user or with the express
- *written consent of Sun Microsystems, Inc.
- *
- *The names of Sun Microsystems, Inc. and any of its subsidiaries may not
- *be used in advertising or publicity pertaining to distribution of
- *Interface Definition Language CFE as permitted herein.
- *
- *The Interface Definition Language CFE may not be exported outside the
- *United States without first obtaining the appropriate government
- *approvals.
- *
- *INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES
- *OF ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND
- *FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A
- *COURSE OF DEALING, USAGE OR TRADE PRACTICE.
- *
- *Interface Definition Language CFE is provided with no support and
- *without any obligation on the part of Sun Microsystems, Inc. or any of
- *its subsidiaries or affiliates to assist in its use, correction,
- *modification or enhancement.
- *
- *SUN MICROSYSTEMS, INC. OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL
- *HAVE NO LIABILITY WITH RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE
- *SECRETS OR ANY PATENTS BY INTERFACE DEFINITION LANGUAGE CFE OR ANY PART
- *THEREOF.
- *
- *IN NO EVENT WILL SUN MICROSYSTEMS, INC. OR ANY OF ITS SUBSIDIARIES OR
- *AFFILIATES BE LIABLE FOR ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL,
- *INDIRECT AND CONSEQUENTIAL DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE
- *POSSIBILITY OF SUCH DAMAGES.
- *
- *SunSoft, Inc.  
- *2550 Garcia Avenue 
- *Mountain View, California  94043
- *
- *
- *
- *
- *======================================================================
- */
-
-#ifndef _UTL_DECLLIST_UTL_DECLLIST_HH
-#define _UTL_DECLLIST_UTL_DECLLIST_HH
-
-// utl_decllist.hh
-//
-// List of FE_Declarator nodes
-
-/*
-** DEPENDENCIES: utl_list.hh, fe_declarator.hh
-**
-** USE: Included from util.hh
-*/
-
-#include	"ace/stdcpp.h"
-#include	"idl_fwd.h"
-#include	"utl_list.h"
-#include	"utl_idlist.h"
-#include	"utl_scoped_name.h"
-#include	"utl_identifier.h"
-#include	"utl_string.h"
-#include	"fe_declarator.h"
-
-
-class	UTL_DeclList : public UTL_List<UTL_DeclList, FE_Declarator>
-{
-public:
-  // Operations
-
-  // Constructor(s)
-  UTL_DeclList(FE_Declarator *s, UTL_DeclList *cdr);
-  virtual ~UTL_DeclList() {}
-};
-
-// Active iterator for UTL_DeclList
-class	UTL_DecllistActiveIterator :
-    public UTL_ListActiveIterator<UTL_DeclList, FE_Declarator>
-{
-public:
-  // Operations
-
-  // Constructor(s)
-  UTL_DecllistActiveIterator(UTL_DeclList *s);
-  virtual ~UTL_DecllistActiveIterator() {}
-};
-
-#endif           // _UTL_DECLLIST_UTL_DECLLIST_HH
diff --git a/TAO/TAO_IDL/include/utl_tmpl/utl_exceptlist.h b/TAO/TAO_IDL/include/utl_tmpl/utl_exceptlist.h
deleted file mode 100644
index b4bacad5510..00000000000
--- a/TAO/TAO_IDL/include/utl_tmpl/utl_exceptlist.h
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- *======================================================================
- *
- *Copyright 1992 Sun Microsystems, Inc.
- *
- *The Interface Definition Language Compiler Front End (CFE) is made
- *available for use provided that this legend is included on all media and
- *documentation and as a part of the software program in whole or part.
- *Users may copy and extend functionality (but may not remove
- *functionality) of the Interface Definition Language CFE without charge,
- *but are not authorized to license or distribute it to anyone else except
- *as part of a product or program developed by the user or with the express
- *written consent of Sun Microsystems, Inc.
- *
- *The names of Sun Microsystems, Inc. and any of its subsidiaries may not
- *be used in advertising or publicity pertaining to distribution of
- *Interface Definition Language CFE as permitted herein.
- *
- *The Interface Definition Language CFE may not be exported outside the
- *United States without first obtaining the appropriate government
- *approvals.
- *
- *INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES
- *OF ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND
- *FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A
- *COURSE OF DEALING, USAGE OR TRADE PRACTICE.
- *
- *Interface Definition Language CFE is provided with no support and
- *without any obligation on the part of Sun Microsystems, Inc. or any of
- *its subsidiaries or affiliates to assist in its use, correction,
- *modification or enhancement.
- *
- *SUN MICROSYSTEMS, INC. OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL
- *HAVE NO LIABILITY WITH RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE
- *SECRETS OR ANY PATENTS BY INTERFACE DEFINITION LANGUAGE CFE OR ANY PART
- *THEREOF.
- *
- *IN NO EVENT WILL SUN MICROSYSTEMS, INC. OR ANY OF ITS SUBSIDIARIES OR
- *AFFILIATES BE LIABLE FOR ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL,
- *INDIRECT AND CONSEQUENTIAL DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE
- *POSSIBILITY OF SUCH DAMAGES.
- *
- *SunSoft, Inc.  
- *2550 Garcia Avenue 
- *Mountain View, California  94043
- *
- *
- *
- *
- *======================================================================
- */
-
-#ifndef _UTL_EXCEPTLIST_UTL_EXCEPTLIST_HH
-#define _UTL_EXCEPTLIST_UTL_EXCEPTLIST_HH
-
-// utl_exceptlist.hh
-//
-// List of AST_Exception nodes
-
-/*
-** DEPENDENCIES: utl_list.hh, ast_exception.hh
-**
-** USE: Included from util.hh
-*/
-
-#include	"ace/stdcpp.h"
-#include	"idl_fwd.h"
-#include	"utl_list.h"
-#include	"utl_strlist.h"
-#include	"utl_idlist.h"
-#include	"utl_scoped_name.h"
-#include	"utl_identifier.h"
-#include	"utl_string.h"
-#include	"ast_expression.h"
-#include	"idl_bool.h"
-#include	"utl_scope.h"
-#include	"ast_decl.h"
-#include	"ast_type.h"
-#include	"ast_concrete_type.h"
-#include	"ast_structure.h"
-#include	"ast_exception.h"
-
-
-class	UTL_ExceptList : public UTL_List<UTL_ExceptList, AST_Exception>
-{
-public:
-  // Operations
-
-  // Constructor(s)
-  UTL_ExceptList(AST_Exception *s, UTL_ExceptList *cdr);
-  virtual ~UTL_ExceptList() {}
-};
-
-// Active iterator for UTL_ExceptList
-class	UTL_ExceptlistActiveIterator :
-    public UTL_ListActiveIterator<UTL_ExceptList, AST_Exception>
-{
-public:
-  // Operations
-
-  // Constructor(s)
-  UTL_ExceptlistActiveIterator(UTL_ExceptList *s);
-  virtual ~UTL_ExceptlistActiveIterator() {}
-};
-
-#endif           // _UTL_EXCEPTLIST_UTL_EXCEPTLIST_HH
diff --git a/TAO/TAO_IDL/include/utl_tmpl/utl_exprlist.h b/TAO/TAO_IDL/include/utl_tmpl/utl_exprlist.h
deleted file mode 100644
index 155f2bf43d0..00000000000
--- a/TAO/TAO_IDL/include/utl_tmpl/utl_exprlist.h
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- *======================================================================
- *
- *Copyright 1992 Sun Microsystems, Inc.
- *
- *The Interface Definition Language Compiler Front End (CFE) is made
- *available for use provided that this legend is included on all media and
- *documentation and as a part of the software program in whole or part.
- *Users may copy and extend functionality (but may not remove
- *functionality) of the Interface Definition Language CFE without charge,
- *but are not authorized to license or distribute it to anyone else except
- *as part of a product or program developed by the user or with the express
- *written consent of Sun Microsystems, Inc.
- *
- *The names of Sun Microsystems, Inc. and any of its subsidiaries may not
- *be used in advertising or publicity pertaining to distribution of
- *Interface Definition Language CFE as permitted herein.
- *
- *The Interface Definition Language CFE may not be exported outside the
- *United States without first obtaining the appropriate government
- *approvals.
- *
- *INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES
- *OF ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND
- *FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A
- *COURSE OF DEALING, USAGE OR TRADE PRACTICE.
- *
- *Interface Definition Language CFE is provided with no support and
- *without any obligation on the part of Sun Microsystems, Inc. or any of
- *its subsidiaries or affiliates to assist in its use, correction,
- *modification or enhancement.
- *
- *SUN MICROSYSTEMS, INC. OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL
- *HAVE NO LIABILITY WITH RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE
- *SECRETS OR ANY PATENTS BY INTERFACE DEFINITION LANGUAGE CFE OR ANY PART
- *THEREOF.
- *
- *IN NO EVENT WILL SUN MICROSYSTEMS, INC. OR ANY OF ITS SUBSIDIARIES OR
- *AFFILIATES BE LIABLE FOR ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL,
- *INDIRECT AND CONSEQUENTIAL DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE
- *POSSIBILITY OF SUCH DAMAGES.
- *
- *SunSoft, Inc.  
- *2550 Garcia Avenue 
- *Mountain View, California  94043
- *
- *
- *
- *
- *======================================================================
- */
-
-#ifndef _UTL_EXPRLIST_UTL_EXPRLIST_HH
-#define _UTL_EXPRLIST_UTL_EXPRLIST_HH
-
-// utl_exprlist.hh
-//
-// List of strings
-
-/*
-** DEPENDENCIES: ast_expression.hh, utl_list.hh
-**
-** USE: Included from util.hh
-*/
-
-#include	"ace/stdcpp.h"
-#include	"idl_fwd.h"
-#include	"utl_list.h"
-#include	"utl_strlist.h"
-#include	"utl_idlist.h"
-#include	"utl_scoped_name.h"
-#include	"utl_identifier.h"
-#include	"utl_string.h"
-#include	"ast_expression.h"
-
-
-class	UTL_ExprList : public UTL_List<UTL_ExprList, AST_Expression>
-{
-public:
-  // Operations
-
-  // Constructor(s)
-  UTL_ExprList(AST_Expression *s, UTL_ExprList *cdr);
-  virtual ~UTL_ExprList() {}
-};
-
-// Active iterator for UTL_ExprList
-class	UTL_ExprlistActiveIterator :
-    public UTL_ListActiveIterator<UTL_ExprList, AST_Expression>
-{
-public:
-  // Operations
-
-  // Constructor(s)
-  UTL_ExprlistActiveIterator(UTL_ExprList *s);
-  virtual ~UTL_ExprlistActiveIterator() {}
-};
-
-#endif           // _UTL_EXPRLIST_UTL_EXPRLIST_HH
diff --git a/TAO/TAO_IDL/include/utl_tmpl/utl_idlist.h b/TAO/TAO_IDL/include/utl_tmpl/utl_idlist.h
deleted file mode 100644
index 081149fe0e1..00000000000
--- a/TAO/TAO_IDL/include/utl_tmpl/utl_idlist.h
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- *======================================================================
- *
- *Copyright 1992 Sun Microsystems, Inc.
- *
- *The Interface Definition Language Compiler Front End (CFE) is made
- *available for use provided that this legend is included on all media and
- *documentation and as a part of the software program in whole or part.
- *Users may copy and extend functionality (but may not remove
- *functionality) of the Interface Definition Language CFE without charge,
- *but are not authorized to license or distribute it to anyone else except
- *as part of a product or program developed by the user or with the express
- *written consent of Sun Microsystems, Inc.
- *
- *The names of Sun Microsystems, Inc. and any of its subsidiaries may not
- *be used in advertising or publicity pertaining to distribution of
- *Interface Definition Language CFE as permitted herein.
- *
- *The Interface Definition Language CFE may not be exported outside the
- *United States without first obtaining the appropriate government
- *approvals.
- *
- *INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES
- *OF ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND
- *FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A
- *COURSE OF DEALING, USAGE OR TRADE PRACTICE.
- *
- *Interface Definition Language CFE is provided with no support and
- *without any obligation on the part of Sun Microsystems, Inc. or any of
- *its subsidiaries or affiliates to assist in its use, correction,
- *modification or enhancement.
- *
- *SUN MICROSYSTEMS, INC. OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL
- *HAVE NO LIABILITY WITH RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE
- *SECRETS OR ANY PATENTS BY INTERFACE DEFINITION LANGUAGE CFE OR ANY PART
- *THEREOF.
- *
- *IN NO EVENT WILL SUN MICROSYSTEMS, INC. OR ANY OF ITS SUBSIDIARIES OR
- *AFFILIATES BE LIABLE FOR ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL,
- *INDIRECT AND CONSEQUENTIAL DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE
- *POSSIBILITY OF SUCH DAMAGES.
- *
- *SunSoft, Inc.  
- *2550 Garcia Avenue 
- *Mountain View, California  94043
- *
- *
- *
- *
- *======================================================================
- */
-
-#ifndef	_UTL_IDLIST_UTL_IDLIST_HH
-#define	_UTL_IDLIST_UTL_IDLIST_HH
-
-// utl_idlist.hh
-//
-// List of Identifiers
-
-/*
-** DEPENDENCIES: utl_list.hh, utl_identifier.hh
-**
-** USE: Included from util.hh
-*/
-
-#include	"ace/stdcpp.h"
-#include	"idl_fwd.h"
-#include	"utl_list.h"
-#include	"utl_identifier.h"
-#include	"utl_string.h"
-
-class	UTL_IdList : public UTL_List<UTL_IdList, Identifier>
-{
-  public:
-    // Constructor(s)
-    UTL_IdList(Identifier *car, UTL_IdList *cdr);
-    virtual ~UTL_IdList() {}
-
-    // AST Dumping
-    virtual void	dump(ostream &o);
-
-    // Other operations
-
-    // Get last element in this list
-    Identifier		*last_component();
-};
-
-// Active iterator for UTL_IdList
-
-class	UTL_IdListActiveIterator :
-	public UTL_ListActiveIterator<UTL_IdList, Identifier>
-{
-  public:
-    // Constructor(s)
-    UTL_IdListActiveIterator(UTL_IdList *s);
-};
-
-#endif		// _UTL_IDLIST_UTL_IDLIST_HH
diff --git a/TAO/TAO_IDL/include/utl_tmpl/utl_labellist.h b/TAO/TAO_IDL/include/utl_tmpl/utl_labellist.h
deleted file mode 100644
index 80b7146780d..00000000000
--- a/TAO/TAO_IDL/include/utl_tmpl/utl_labellist.h
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- *======================================================================
- *
- *Copyright 1992 Sun Microsystems, Inc.
- *
- *The Interface Definition Language Compiler Front End (CFE) is made
- *available for use provided that this legend is included on all media and
- *documentation and as a part of the software program in whole or part.
- *Users may copy and extend functionality (but may not remove
- *functionality) of the Interface Definition Language CFE without charge,
- *but are not authorized to license or distribute it to anyone else except
- *as part of a product or program developed by the user or with the express
- *written consent of Sun Microsystems, Inc.
- *
- *The names of Sun Microsystems, Inc. and any of its subsidiaries may not
- *be used in advertising or publicity pertaining to distribution of
- *Interface Definition Language CFE as permitted herein.
- *
- *The Interface Definition Language CFE may not be exported outside the
- *United States without first obtaining the appropriate government
- *approvals.
- *
- *INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES
- *OF ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND
- *FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A
- *COURSE OF DEALING, USAGE OR TRADE PRACTICE.
- *
- *Interface Definition Language CFE is provided with no support and
- *without any obligation on the part of Sun Microsystems, Inc. or any of
- *its subsidiaries or affiliates to assist in its use, correction,
- *modification or enhancement.
- *
- *SUN MICROSYSTEMS, INC. OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL
- *HAVE NO LIABILITY WITH RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE
- *SECRETS OR ANY PATENTS BY INTERFACE DEFINITION LANGUAGE CFE OR ANY PART
- *THEREOF.
- *
- *IN NO EVENT WILL SUN MICROSYSTEMS, INC. OR ANY OF ITS SUBSIDIARIES OR
- *AFFILIATES BE LIABLE FOR ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL,
- *INDIRECT AND CONSEQUENTIAL DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE
- *POSSIBILITY OF SUCH DAMAGES.
- *
- *SunSoft, Inc.  
- *2550 Garcia Avenue 
- *Mountain View, California  94043
- *
- *
- *
- *
- *======================================================================
- */
-
-#ifndef _UTL_LABELLIST_UTL_LABELLIST_HH
-#define _UTL_LABELLIST_UTL_LABELLIST_HH
-
-// utl_labellist.hh
-//
-// List of AST_UnionBranch nodes
-
-/*
-** DEPENDENCIES: utl_list.hh, ast_union_label.hh
-**
-** USE: Included from util.hh
-*/
-
-#include	"ace/stdcpp.h"
-#include	"idl_fwd.h"
-#include	"utl_list.h"
-#include	"ast_union_label.h"
-
-
-class	UTL_LabelList : public UTL_List<UTL_LabelList, AST_UnionLabel>
-{
-public:
-  // Operations
-
-  // Constructor(s)
-  UTL_LabelList(AST_UnionLabel *s, UTL_LabelList *cdr);
-  virtual ~UTL_LabelList() {}
-};
-
-// Active iterator for UTL_LabelList
-class	UTL_LabellistActiveIterator :
-    public UTL_ListActiveIterator<UTL_LabelList, AST_UnionLabel>
-{
-public:
-  // Operations
-
-  // Constructor(s)
-  UTL_LabellistActiveIterator(UTL_LabelList *source);
-  virtual ~UTL_LabellistActiveIterator() {}
-};
-
-#endif           // _UTL_LABELLIST_UTL_LABELLIST_HH
diff --git a/TAO/TAO_IDL/include/utl_tmpl/utl_list.h b/TAO/TAO_IDL/include/utl_tmpl/utl_list.h
deleted file mode 100644
index 420b360c6a4..00000000000
--- a/TAO/TAO_IDL/include/utl_tmpl/utl_list.h
+++ /dev/null
@@ -1,138 +0,0 @@
-/*
- *======================================================================
- *
- *Copyright 1992 Sun Microsystems, Inc.
- *
- *The Interface Definition Language Compiler Front End (CFE) is made
- *available for use provided that this legend is included on all media and
- *documentation and as a part of the software program in whole or part.
- *Users may copy and extend functionality (but may not remove
- *functionality) of the Interface Definition Language CFE without charge,
- *but are not authorized to license or distribute it to anyone else except
- *as part of a product or program developed by the user or with the express
- *written consent of Sun Microsystems, Inc.
- *
- *The names of Sun Microsystems, Inc. and any of its subsidiaries may not
- *be used in advertising or publicity pertaining to distribution of
- *Interface Definition Language CFE as permitted herein.
- *
- *The Interface Definition Language CFE may not be exported outside the
- *United States without first obtaining the appropriate government
- *approvals.
- *
- *INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES
- *OF ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND
- *FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A
- *COURSE OF DEALING, USAGE OR TRADE PRACTICE.
- *
- *Interface Definition Language CFE is provided with no support and
- *without any obligation on the part of Sun Microsystems, Inc. or any of
- *its subsidiaries or affiliates to assist in its use, correction,
- *modification or enhancement.
- *
- *SUN MICROSYSTEMS, INC. OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL
- *HAVE NO LIABILITY WITH RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE
- *SECRETS OR ANY PATENTS BY INTERFACE DEFINITION LANGUAGE CFE OR ANY PART
- *THEREOF.
- *
- *IN NO EVENT WILL SUN MICROSYSTEMS, INC. OR ANY OF ITS SUBSIDIARIES OR
- *AFFILIATES BE LIABLE FOR ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL,
- *INDIRECT AND CONSEQUENTIAL DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE
- *POSSIBILITY OF SUCH DAMAGES.
- *
- *SunSoft, Inc.  
- *2550 Garcia Avenue 
- *Mountain View, California  94043
- *
- *
- *
- *
- *======================================================================
- */
-
-#ifndef _UTL_LIST_UTL_LIST_HH
-#define _UTL_LIST_UTL_LIST_HH
-
-// utl_list.hh
-//
-// General single-linked lists
-
-/*
-** DEPENDENCIES: NONE
-**
-** USE: Included from util.hh
-*/
-
-// Forward declare active iterator for UTL_List
-template<class L, class T> class UTL_ListActiveIterator;
-
-template<class L, class T>
-class	UTL_List
-{
-public:
-  // Operations
-
-  // Constructor(s)
-  UTL_List(T *c, L *l);
-  virtual ~UTL_List() {}
-
-  // Smash last cdr pointer in "this" with l
-  void			nconc(L *l);
-
-  // Copy the list starting at "this"
-  L			*copy();
-
-  // Get list element
-  T			*head();
-
-  // Get next list
-  L			*tail();
-
-  // Set the list element
-  void			set_head(T *t);
-
-  // Set next list
-  void			set_tail(L *l);
-
-  // How long is this list?
-  long			length();
-
-private:
-  // Data
-  T			*pd_car_data;	// The next list
-  L			*pd_cdr_data;	// The next list
-
-  // Operations
-  long			list_length(long n); // How long is it?
-
-  // Friend class
-  friend class		UTL_ListActiveIterator<L, T>; // Friend class
-
-};
-
-// Active iterator for lists
-template<class L, class T>
-class	UTL_ListActiveIterator
-{
-public:
-  // Operations
-
-  // Constructor(s)
-  UTL_ListActiveIterator(UTL_List<L, T> *s);	
-  virtual ~UTL_ListActiveIterator() {}
-
-  // Get current item
-  T			*item();
-
-  // Get next list
-  virtual void		next();
-
-  // Are we at the end of this list?
-  virtual long		is_done();
-
-protected:
-  // Data
-  UTL_List<L, T>		*source;		// On what to iterate?
-};
-
-#endif           // _UTL_LIST_UTL_LIST_HH
diff --git a/TAO/TAO_IDL/include/utl_tmpl/utl_namelist.h b/TAO/TAO_IDL/include/utl_tmpl/utl_namelist.h
deleted file mode 100644
index 8668568e983..00000000000
--- a/TAO/TAO_IDL/include/utl_tmpl/utl_namelist.h
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- *======================================================================
- *
- *Copyright 1992 Sun Microsystems, Inc.
- *
- *The Interface Definition Language Compiler Front End (CFE) is made
- *available for use provided that this legend is included on all media and
- *documentation and as a part of the software program in whole or part.
- *Users may copy and extend functionality (but may not remove
- *functionality) of the Interface Definition Language CFE without charge,
- *but are not authorized to license or distribute it to anyone else except
- *as part of a product or program developed by the user or with the express
- *written consent of Sun Microsystems, Inc.
- *
- *The names of Sun Microsystems, Inc. and any of its subsidiaries may not
- *be used in advertising or publicity pertaining to distribution of
- *Interface Definition Language CFE as permitted herein.
- *
- *The Interface Definition Language CFE may not be exported outside the
- *United States without first obtaining the appropriate government
- *approvals.
- *
- *INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES
- *OF ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND
- *FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A
- *COURSE OF DEALING, USAGE OR TRADE PRACTICE.
- *
- *Interface Definition Language CFE is provided with no support and
- *without any obligation on the part of Sun Microsystems, Inc. or any of
- *its subsidiaries or affiliates to assist in its use, correction,
- *modification or enhancement.
- *
- *SUN MICROSYSTEMS, INC. OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL
- *HAVE NO LIABILITY WITH RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE
- *SECRETS OR ANY PATENTS BY INTERFACE DEFINITION LANGUAGE CFE OR ANY PART
- *THEREOF.
- *
- *IN NO EVENT WILL SUN MICROSYSTEMS, INC. OR ANY OF ITS SUBSIDIARIES OR
- *AFFILIATES BE LIABLE FOR ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL,
- *INDIRECT AND CONSEQUENTIAL DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE
- *POSSIBILITY OF SUCH DAMAGES.
- *
- *SunSoft, Inc.  
- *2550 Garcia Avenue 
- *Mountain View, California  94043
- *
- *
- *
- *
- *======================================================================
- */
-
-#ifndef _UTL_NAMELIST_UTL_NAMELIST_HH
-#define _UTL_NAMELIST_UTL_NAMELIST_HH
-
-// utl_namelist.hh
-//
-// List of UTL_ScopedName nodes
-
-/*
-** DEPENDENCIES: utl_list.hh, utl_scoped_name.hh
-**
-** USE: Included from util.hh
-*/
-
-#include	"ace/stdcpp.h"
-#include	"idl_fwd.h"
-#include	"utl_list.h"
-#include	"utl_idlist.h"
-#include	"utl_scoped_name.h"
-#include	"utl_identifier.h"
-#include	"utl_string.h"
-
-class	UTL_NameList : public UTL_List<UTL_NameList, UTL_ScopedName>
-{
-public:
-  // Operations
-
-  // Constructor(s)
-  UTL_NameList(UTL_ScopedName *s, UTL_NameList *cdr);
-  virtual ~UTL_NameList() {}
-};
-
-// Active iterator for UTL_NameList
-class	UTL_NamelistActiveIterator :
-    public UTL_ListActiveIterator<UTL_NameList, UTL_ScopedName>
-{
-public:
-  // Operations
-
-  // Constructor(s)
-  UTL_NamelistActiveIterator(UTL_NameList *source);
-  virtual ~UTL_NamelistActiveIterator() {}
-};
-
-#endif           // _UTL_NAMELIST_UTL_NAMELIST_HH
diff --git a/TAO/TAO_IDL/include/utl_tmpl/utl_strlist.h b/TAO/TAO_IDL/include/utl_tmpl/utl_strlist.h
deleted file mode 100644
index fca9cdb6442..00000000000
--- a/TAO/TAO_IDL/include/utl_tmpl/utl_strlist.h
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- *======================================================================
- *
- *Copyright 1992 Sun Microsystems, Inc.
- *
- *The Interface Definition Language Compiler Front End (CFE) is made
- *available for use provided that this legend is included on all media and
- *documentation and as a part of the software program in whole or part.
- *Users may copy and extend functionality (but may not remove
- *functionality) of the Interface Definition Language CFE without charge,
- *but are not authorized to license or distribute it to anyone else except
- *as part of a product or program developed by the user or with the express
- *written consent of Sun Microsystems, Inc.
- *
- *The names of Sun Microsystems, Inc. and any of its subsidiaries may not
- *be used in advertising or publicity pertaining to distribution of
- *Interface Definition Language CFE as permitted herein.
- *
- *The Interface Definition Language CFE may not be exported outside the
- *United States without first obtaining the appropriate government
- *approvals.
- *
- *INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES
- *OF ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND
- *FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A
- *COURSE OF DEALING, USAGE OR TRADE PRACTICE.
- *
- *Interface Definition Language CFE is provided with no support and
- *without any obligation on the part of Sun Microsystems, Inc. or any of
- *its subsidiaries or affiliates to assist in its use, correction,
- *modification or enhancement.
- *
- *SUN MICROSYSTEMS, INC. OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL
- *HAVE NO LIABILITY WITH RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE
- *SECRETS OR ANY PATENTS BY INTERFACE DEFINITION LANGUAGE CFE OR ANY PART
- *THEREOF.
- *
- *IN NO EVENT WILL SUN MICROSYSTEMS, INC. OR ANY OF ITS SUBSIDIARIES OR
- *AFFILIATES BE LIABLE FOR ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL,
- *INDIRECT AND CONSEQUENTIAL DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE
- *POSSIBILITY OF SUCH DAMAGES.
- *
- *SunSoft, Inc.  
- *2550 Garcia Avenue 
- *Mountain View, California  94043
- *
- *
- *
- *
- *======================================================================
- */
-
-#ifndef _UTL_STRLIST_UTL_STRLIST_HH
-#define _UTL_STRLIST_UTL_STRLIST_HH
-
-// utl_strlist.hh
-//
-// List of String nodes
-
-/*
-** DEPENDENCIES: utl_list.hh, utl_string.hh
-**
-** USE: Included from util.hh
-*/
-
-#include	"ace/stdcpp.h"
-#include	"idl_fwd.h"
-#include	"utl_list.h"
-#include	"utl_string.h"
-
-
-class	UTL_StrList : public UTL_List<UTL_StrList, String>
-{
-public:
-  // Operations
-
-  // Constructor(s)
-  UTL_StrList(String *s, UTL_StrList *cdr);
-  virtual ~UTL_StrList() {}
-
-  // AST Dumping
-  virtual void		dump(ostream &o);
-
-  // Other Operations
-
-  // Get last element in this list
-  String		*last_component();
-};
-
-// Active iterator for  UTL_StrList
-class	UTL_StrlistActiveIterator :
-    public UTL_ListActiveIterator<UTL_StrList, String>
-{
-public:
-  // Operations
-
-  // Constructor(s)
-  UTL_StrlistActiveIterator(UTL_StrList *s);
-  virtual ~UTL_StrlistActiveIterator() {}
-};
-
-#endif           // _UTL_STRLIST_UTL_STRLIST_HH
diff --git a/TAO/TAO_IDL/narrow/Makefile b/TAO/TAO_IDL/narrow/Makefile
deleted file mode 100644
index 355acb6a0e4..00000000000
--- a/TAO/TAO_IDL/narrow/Makefile
+++ /dev/null
@@ -1,84 +0,0 @@
-#----------------------------------------------------------------------------
-#	$Id$
-#
-#	Makefile for libast
-#----------------------------------------------------------------------------
-
-MAKEFILE = Makefile
-LIBNAME  = libnarrow
-LIB      = $(LIBNAME).a
-SHLIB    = $(LIBNAME).$(SOEXT)
-IDL_CFE_VERSION	= \"1.3.0\"
-
-# These are components that are sources of
-NARROW_FILES	= \
-		narrow
-
-FILES	 = $(NARROW_FILES)
-
-LSRC	= $(addsuffix .cpp,$(FILES))
-LOBJ    = $(addsuffix .o,$(FILES))
-SHOBJ   = $(addsuffix .so,$(FILES))
-
-
-LDLIBS	= -lACE
-LIBS = -lACE
-VLDLIBS = $(LDLIBS:%=%$(VAR))
-
-BUILD	= $(VSHLIB) #$(VLIB)
-
-
-#----------------------------------------------------------------------------
-#	Include macros and targets
-#----------------------------------------------------------------------------
-
-include	$(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-include	$(ACE_ROOT)/include/makeinclude/macros.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.common.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.lib.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.bin.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
-
-#----------------------------------------------------------------------------
-#	Local targets (and local hacks)
-#----------------------------------------------------------------------------
-
-CPPFLAGS += -I../include -I. -DCPP_LOCATION=\"$(CXX)\" -DIDL_CFE_VERSION=$(IDL_CFE_VERSION)
-
-#----------------------------------------------------------------------------
-#	Dependencies
-#----------------------------------------------------------------------------
-
-# DO NOT DELETE THIS LINE -- g++dep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-
-.obj/narrow.o .shobj/narrow.so: narrow.cpp ../include/idl.h ../include/intlmacros.h \
- ../include/idl_narrow.h ../include/idl_defines.h ../include/idl_fwd.h \
- ../include/idl_bool.h ../include/utl_string.h \
- ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/utl_strlist.h ../include/utl_exprlist.h \
- ../include/ast_generator.h ../include/util.h ../include/utl_stack.h \
- ../include/utl_idlist.h ../include/utl_exceptlist.h \
- ../include/utl_namelist.h ../include/utl_labellist.h \
- ../include/utl_decllist.h ../include/idl_global.h \
- ../include/utl_error.h ../include/utl_indenter.h \
- ../include/idl_extern.h ../include/fe_extern.h ../include/be_extern.h \
- ../include/drv_extern.h ../include/ast_extern.h \
- ../include/nr_extern.h ../include/global_extern.h
-
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/TAO_IDL/narrow/narrow.cpp b/TAO/TAO_IDL/narrow/narrow.cpp
deleted file mode 100644
index 7b5d9b391cd..00000000000
--- a/TAO/TAO_IDL/narrow/narrow.cpp
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-#include	"idl.h"
-#include	"idl_extern.h"
-
-// Narrowing functions for AST
-
-/*
- * Convert a UTL_Scope node into an AST_Decl node if possible
- */
-AST_Decl *
-ScopeAsDecl(UTL_Scope *s)
-{
-  if (s == NULL) return NULL;
-
-  switch (s->scope_node_type()) {
-  case AST_Decl::NT_module:
-    return AST_Module::narrow_from_scope(s);
-  case AST_Decl::NT_root:
-    return AST_Root::narrow_from_scope(s);
-  case AST_Decl::NT_interface:
-    return AST_Interface::narrow_from_scope(s);
-  case AST_Decl::NT_op:
-    return AST_Operation::narrow_from_scope(s);
-  case AST_Decl::NT_except:
-    return AST_Exception::narrow_from_scope(s);
-  case AST_Decl::NT_union:
-    return AST_Union::narrow_from_scope(s);
-  case AST_Decl::NT_struct:
-    return AST_Structure::narrow_from_scope(s);
-  case AST_Decl::NT_enum:
-    return AST_Enum::narrow_from_scope(s);
-  default:
-    return NULL;
-  }
-}
-
-/*
- * Convert an AST_Decl to a UTL_Scope if possible
- */
-UTL_Scope *
-DeclAsScope(AST_Decl *d)
-{
-   if (d == NULL) return NULL;
-
-   switch (d->node_type()) {
-   case AST_Decl::NT_interface_fwd:
-      /*
-       * Resolve forward declared interface by looking at full_definition()
-       * field and iterating
-       */
-      d = (AST_InterfaceFwd::narrow_from_decl(d))->full_definition();
-      /*
-       * Fall through
-       */
-   case AST_Decl::NT_interface:
-      return AST_Interface::narrow_from_decl(d);
-   case AST_Decl::NT_module:
-      return AST_Module::narrow_from_decl(d);
-   case AST_Decl::NT_root:
-      return AST_Root::narrow_from_decl(d);
-   case AST_Decl::NT_except:
-      return AST_Exception::narrow_from_decl(d);
-   case AST_Decl::NT_union:
-      return AST_Union::narrow_from_decl(d);
-   case AST_Decl::NT_struct:
-      return AST_Structure::narrow_from_decl(d);
-   case AST_Decl::NT_enum:
-      return AST_Enum::narrow_from_decl(d);
-   case AST_Decl::NT_op:
-      return AST_Operation::narrow_from_decl(d);
-   default:
-      return NULL;
-   }
-}
diff --git a/TAO/TAO_IDL/tao_idl.dsp b/TAO/TAO_IDL/tao_idl.dsp
deleted file mode 100644
index c4df19be19b..00000000000
--- a/TAO/TAO_IDL/tao_idl.dsp
+++ /dev/null
@@ -1,874 +0,0 @@
-# Microsoft Developer Studio Project File - Name="tao_idl" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 5.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Console Application" 0x0103

-

-CFG=tao_idl - Win32 Debug

-!MESSAGE This is not a valid makefile. To build this project using NMAKE,

-!MESSAGE use the Export Makefile command and run

-!MESSAGE 

-!MESSAGE NMAKE /f "tao_idl.mak".

-!MESSAGE 

-!MESSAGE You can specify a configuration when running NMAKE

-!MESSAGE by defining the macro CFG on the command line. For example:

-!MESSAGE 

-!MESSAGE NMAKE /f "tao_idl.mak" CFG="tao_idl - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "tao_idl - Win32 Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "tao_idl - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE 

-

-# Begin Project

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

-

-!IF  "$(CFG)" == "tao_idl - Win32 Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Release"

-# PROP BASE Intermediate_Dir "Release"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir ""

-# PROP Intermediate_Dir "Release"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "include" /I "be_include" /I "..\.." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D IDL_CFE_VERSION=\"1.3.0\" /YX /FD /D CPP_LOCATION="\"\\Program Files\\DevStudio\\Vc\\bin\\Cl\"" /c

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 /libpath:"../../ace"

-

-!ELSEIF  "$(CFG)" == "tao_idl - Win32 Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Debug"

-# PROP BASE Intermediate_Dir "Debug"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir ""

-# PROP Intermediate_Dir "Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "include" /I "be_include" /I "..\.." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D IDL_CFE_VERSION=\"1.3.0\" /YX /FD /D CPP_LOCATION="\"\\Program Files\\DevStudio\\Vc\\bin\\Cl\"" /c

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\ace"

-# SUBTRACT LINK32 /pdb:none

-

-!ENDIF 

-

-# Begin Target

-

-# Name "tao_idl - Win32 Release"

-# Name "tao_idl - Win32 Debug"

-# Begin Group "Source Files"

-

-# PROP Default_Filter ".cpp"

-# Begin Source File

-

-SOURCE=.\ast\ast_argument.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\ast\ast_array.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\ast\ast_attribute.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\ast\ast_check.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\ast\ast_concrete_type.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\ast\ast_constant.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\ast\ast_decl.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\ast\ast_enum.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\ast\ast_enum_val.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\ast\ast_exception.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\ast\ast_expression.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\ast\ast_field.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\ast\ast_generator.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\ast\ast_interface.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\ast\ast_interface_fwd.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\ast\ast_module.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\ast\ast_operation.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\ast\ast_predefined_type.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\ast\ast_recursive.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\ast\ast_redef.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\ast\ast_root.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\ast\ast_sequence.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\ast\ast_string.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\ast\ast_structure.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\ast\ast_type.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\ast\ast_typedef.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\ast\ast_union.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\ast\ast_union_branch.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\ast\ast_union_label.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\be\be_args.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\be\be_argument.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\be\be_array.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\be\be_attribute.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\be\be_codegen.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\be\be_constant.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\be\be_decl.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\be\be_enum.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\be\be_enum_val.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\be\be_exception.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\be\be_expression.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\be\be_factory.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\be\be_field.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\be\be_generator.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\be\be_helper.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\be\be_init.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\be\be_interface.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\be\be_interface_fwd.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\be\be_module.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\be\be_operation.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\be\be_predefined_type.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\be\be_produce.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\be\be_root.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\be\be_scope.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\be\be_sequence.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\be\be_state.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\be\be_state_argument.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\be\be_state_array.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\be\be_state_attribute.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\be\be_state_operation.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\be\be_state_sequence.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\be\be_state_structure.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\be\be_state_typedef.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\be\be_state_union.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\be\be_string.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\be\be_structure.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\be\be_sunsoft.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\be\be_type.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\be\be_typedef.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\be\be_union.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\be\be_union_branch.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\be\be_union_label.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\driver\drv_args.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\driver\drv_fork.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\driver\drv_init.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\driver\drv_link.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\driver\drv_main.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\driver\drv_preproc.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\driver\drv_private.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\fe\fe_declarator.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\fe\fe_extern.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\fe\fe_init.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\fe\fe_interface_header.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\fe\fe_private.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\fe\lex.yy.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\narrow\narrow.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\util\utl_decllist.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\util\utl_error.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\util\utl_exceptlist.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\util\utl_exprlist.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\util\utl_global.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\util\utl_identifier.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\util\utl_idlist.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\util\utl_indenter.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\util\utl_labellist.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\util\utl_list.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\util\utl_namelist.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\util\utl_scope.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\util\utl_stack.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\util\utl_string.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\util\utl_strlist.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\fe\y.tab.cpp

-# End Source File

-# End Group

-# Begin Group "Header Files"

-

-# PROP Default_Filter ".h"

-# Begin Source File

-

-SOURCE=.\include\ast.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\ast_argument.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\ast_array.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\ast_attribute.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\ast_concrete_type.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\ast_constant.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\ast_decl.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\ast_enum.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\ast_enum_val.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\ast_exception.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\ast_expression.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\ast_extern.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\ast_field.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\ast_generator.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\ast_interface.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\ast_interface_fwd.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\ast_module.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\ast_operation.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\ast_predefined_type.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\ast_root.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\ast_sequence.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\ast_string.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\ast_structure.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\ast_type.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\ast_typedef.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\ast_union.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\ast_union_branch.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\ast_union_label.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\be_include\be.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\be_include\be_argument.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\be_include\be_array.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\be_include\be_attribute.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\be_include\be_codegen.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\be_include\be_constant.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\be_include\be_decl.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\be_include\be_enum.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\be_include\be_enum_val.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\be_include\be_exception.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\be_include\be_expression.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\be_extern.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\be_include\be_factory.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\be_include\be_field.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\be_include\be_generator.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\be_include\be_helper.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\be_include\be_interface.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\be_include\be_interface_fwd.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\be_include\be_module.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\be_include\be_operation.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\be_include\be_predefined_type.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\be_include\be_root.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\be_include\be_scope.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\be_include\be_sequence.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\be_include\be_state.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\be_include\be_string.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\be_include\be_structure.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\be_include\be_sunsoft.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\be_include\be_type.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\be_include\be_typedef.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\be_include\be_union.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\be_include\be_union_branch.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\be_include\be_union_label.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\drv_extern.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\drv_link.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\drv_private.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\fe_declarator.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\fe_extern.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\fe_interface_header.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\fe_private.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\global_extern.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\idl.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\idl_bool.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\idl_defines.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\idl_extern.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\idl_fwd.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\idl_global.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\idl_narrow.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\intlmacros.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\util.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\utl_decllist.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\utl_error.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\utl_exceptlist.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\utl_exprlist.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\utl_identifier.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\utl_idlist.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\utl_indenter.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\utl_labellist.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\utl_list.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\utl_namelist.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\utl_scope.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\utl_scoped_name.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\utl_stack.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\utl_string.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\utl_strlist.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\fe\y.tab.h

-# End Source File

-# End Group

-# End Target

-# End Project

diff --git a/TAO/TAO_IDL/tao_idl.dsw b/TAO/TAO_IDL/tao_idl.dsw
deleted file mode 100644
index 6951f0b2106..00000000000
--- a/TAO/TAO_IDL/tao_idl.dsw
+++ /dev/null
@@ -1,29 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 5.00

-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!

-

-###############################################################################

-

-Project: "tao_idl"=.\tao_idl.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Global:

-

-Package=<5>

-{{{

-}}}

-

-Package=<3>

-{{{

-}}}

-

-###############################################################################

-

diff --git a/TAO/TAO_IDL/util/Makefile b/TAO/TAO_IDL/util/Makefile
deleted file mode 100644
index 8734478fbe2..00000000000
--- a/TAO/TAO_IDL/util/Makefile
+++ /dev/null
@@ -1,479 +0,0 @@
-#----------------------------------------------------------------------------
-#	$Id$
-#
-#	Makefile for libutil
-#----------------------------------------------------------------------------
-
-MAKEFILE = Makefile
-LIBNAME  = libtao_idl_util
-LIB      = $(LIBNAME).a
-SHLIB    = $(LIBNAME).$(SOEXT)
-IDL_CFE_VERSION	= \"1.3.0\"
-
-# These are components that are sources of
-
-UTIL_FILES	= \
-		utl_scope \
-		utl_stack \
-		utl_string \
-		utl_decllist \
-		utl_labellist \
-		utl_namelist \
-		utl_exceptlist \
-		utl_strlist \
-		utl_list \
-		utl_exprlist \
-		utl_error \
-		utl_indenter \
-		utl_identifier \
-		utl_idlist \
-		utl_global
-
-FILES	 = $(UTIL_FILES)
-
-LSRC	= $(addsuffix .cpp,$(FILES))
-LOBJ    = $(addsuffix .o,$(FILES))
-SHOBJ   = $(addsuffix .so,$(FILES))
-
-
-LDLIBS	= -lACE
-LIBS = -lACE
-VLDLIBS = $(LDLIBS:%=%$(VAR))
-
-BUILD	= $(VSHLIB) #$(VLIB)
-
-
-#----------------------------------------------------------------------------
-#	Include macros and targets
-#----------------------------------------------------------------------------
-
-include	$(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-include	$(ACE_ROOT)/include/makeinclude/macros.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.common.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.lib.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.bin.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
-
-#----------------------------------------------------------------------------
-#	Local targets (and local hacks)
-#----------------------------------------------------------------------------
-
-CPPFLAGS += -I../include -I. -DCPP_LOCATION=\"$(CXX)\" -DIDL_CFE_VERSION=$(IDL_CFE_VERSION)
-
-$(LOBJS): $(LHDRS)
-
-#----------------------------------------------------------------------------
-#	Dependencies
-#----------------------------------------------------------------------------
-
-# DO NOT DELETE THIS LINE -- g++dep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-
-.obj/utl_scope.o .shobj/utl_scope.so: utl_scope.cpp ../include/idl.h ../include/intlmacros.h \
- ../include/idl_narrow.h ../include/idl_defines.h ../include/idl_fwd.h \
- ../include/idl_bool.h ../include/utl_string.h \
- ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/utl_strlist.h ../include/utl_exprlist.h \
- ../include/ast_generator.h ../include/util.h ../include/utl_stack.h \
- ../include/utl_idlist.h ../include/utl_exceptlist.h \
- ../include/utl_namelist.h ../include/utl_labellist.h \
- ../include/utl_decllist.h ../include/idl_global.h \
- ../include/utl_error.h ../include/utl_indenter.h \
- ../include/idl_extern.h ../include/fe_extern.h ../include/be_extern.h \
- ../include/drv_extern.h ../include/ast_extern.h \
- ../include/nr_extern.h ../include/global_extern.h
-.obj/utl_stack.o .shobj/utl_stack.so: utl_stack.cpp ../include/idl.h ../include/intlmacros.h \
- ../include/idl_narrow.h ../include/idl_defines.h ../include/idl_fwd.h \
- ../include/idl_bool.h ../include/utl_string.h \
- ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/utl_strlist.h ../include/utl_exprlist.h \
- ../include/ast_generator.h ../include/util.h ../include/utl_stack.h \
- ../include/utl_idlist.h ../include/utl_exceptlist.h \
- ../include/utl_namelist.h ../include/utl_labellist.h \
- ../include/utl_decllist.h ../include/idl_global.h \
- ../include/utl_error.h ../include/utl_indenter.h \
- ../include/idl_extern.h ../include/fe_extern.h ../include/be_extern.h \
- ../include/drv_extern.h ../include/ast_extern.h \
- ../include/nr_extern.h ../include/global_extern.h
-.obj/utl_string.o .shobj/utl_string.so: utl_string.cpp ../include/idl.h ../include/intlmacros.h \
- ../include/idl_narrow.h ../include/idl_defines.h ../include/idl_fwd.h \
- ../include/idl_bool.h ../include/utl_string.h \
- ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/utl_strlist.h ../include/utl_exprlist.h \
- ../include/ast_generator.h ../include/util.h ../include/utl_stack.h \
- ../include/utl_idlist.h ../include/utl_exceptlist.h \
- ../include/utl_namelist.h ../include/utl_labellist.h \
- ../include/utl_decllist.h ../include/idl_global.h \
- ../include/utl_error.h ../include/utl_indenter.h \
- ../include/idl_extern.h ../include/fe_extern.h ../include/be_extern.h \
- ../include/drv_extern.h ../include/ast_extern.h \
- ../include/nr_extern.h ../include/global_extern.h
-.obj/utl_decllist.o .shobj/utl_decllist.so: utl_decllist.cpp ../include/idl.h \
- ../include/intlmacros.h ../include/idl_narrow.h \
- ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \
- ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/utl_strlist.h ../include/utl_exprlist.h \
- ../include/ast_generator.h ../include/util.h ../include/utl_stack.h \
- ../include/utl_idlist.h ../include/utl_exceptlist.h \
- ../include/utl_namelist.h ../include/utl_labellist.h \
- ../include/utl_decllist.h ../include/idl_global.h \
- ../include/utl_error.h ../include/utl_indenter.h \
- ../include/idl_extern.h ../include/fe_extern.h ../include/be_extern.h \
- ../include/drv_extern.h ../include/ast_extern.h \
- ../include/nr_extern.h ../include/global_extern.h
-.obj/utl_labellist.o .shobj/utl_labellist.so: utl_labellist.cpp ../include/idl.h \
- ../include/intlmacros.h ../include/idl_narrow.h \
- ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \
- ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/utl_strlist.h ../include/utl_exprlist.h \
- ../include/ast_generator.h ../include/util.h ../include/utl_stack.h \
- ../include/utl_idlist.h ../include/utl_exceptlist.h \
- ../include/utl_namelist.h ../include/utl_labellist.h \
- ../include/utl_decllist.h ../include/idl_global.h \
- ../include/utl_error.h ../include/utl_indenter.h \
- ../include/idl_extern.h ../include/fe_extern.h ../include/be_extern.h \
- ../include/drv_extern.h ../include/ast_extern.h \
- ../include/nr_extern.h ../include/global_extern.h
-.obj/utl_namelist.o .shobj/utl_namelist.so: utl_namelist.cpp ../include/idl.h \
- ../include/intlmacros.h ../include/idl_narrow.h \
- ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \
- ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/utl_strlist.h ../include/utl_exprlist.h \
- ../include/ast_generator.h ../include/util.h ../include/utl_stack.h \
- ../include/utl_idlist.h ../include/utl_exceptlist.h \
- ../include/utl_namelist.h ../include/utl_labellist.h \
- ../include/utl_decllist.h ../include/idl_global.h \
- ../include/utl_error.h ../include/utl_indenter.h \
- ../include/idl_extern.h ../include/fe_extern.h ../include/be_extern.h \
- ../include/drv_extern.h ../include/ast_extern.h \
- ../include/nr_extern.h ../include/global_extern.h
-.obj/utl_exceptlist.o .shobj/utl_exceptlist.so: utl_exceptlist.cpp ../include/idl.h \
- ../include/intlmacros.h ../include/idl_narrow.h \
- ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \
- ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/utl_strlist.h ../include/utl_exprlist.h \
- ../include/ast_generator.h ../include/util.h ../include/utl_stack.h \
- ../include/utl_idlist.h ../include/utl_exceptlist.h \
- ../include/utl_namelist.h ../include/utl_labellist.h \
- ../include/utl_decllist.h ../include/idl_global.h \
- ../include/utl_error.h ../include/utl_indenter.h \
- ../include/idl_extern.h ../include/fe_extern.h ../include/be_extern.h \
- ../include/drv_extern.h ../include/ast_extern.h \
- ../include/nr_extern.h ../include/global_extern.h
-.obj/utl_strlist.o .shobj/utl_strlist.so: utl_strlist.cpp ../include/idl.h \
- ../include/intlmacros.h ../include/idl_narrow.h \
- ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \
- ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/utl_strlist.h ../include/utl_exprlist.h \
- ../include/ast_generator.h ../include/util.h ../include/utl_stack.h \
- ../include/utl_idlist.h ../include/utl_exceptlist.h \
- ../include/utl_namelist.h ../include/utl_labellist.h \
- ../include/utl_decllist.h ../include/idl_global.h \
- ../include/utl_error.h ../include/utl_indenter.h \
- ../include/idl_extern.h ../include/fe_extern.h ../include/be_extern.h \
- ../include/drv_extern.h ../include/ast_extern.h \
- ../include/nr_extern.h ../include/global_extern.h
-.obj/utl_list.o .shobj/utl_list.so: utl_list.cpp ../include/idl.h ../include/intlmacros.h \
- ../include/idl_narrow.h ../include/idl_defines.h ../include/idl_fwd.h \
- ../include/idl_bool.h ../include/utl_string.h \
- ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/utl_strlist.h ../include/utl_exprlist.h \
- ../include/ast_generator.h ../include/util.h ../include/utl_stack.h \
- ../include/utl_idlist.h ../include/utl_exceptlist.h \
- ../include/utl_namelist.h ../include/utl_labellist.h \
- ../include/utl_decllist.h ../include/idl_global.h \
- ../include/utl_error.h ../include/utl_indenter.h \
- ../include/idl_extern.h ../include/fe_extern.h ../include/be_extern.h \
- ../include/drv_extern.h ../include/ast_extern.h \
- ../include/nr_extern.h ../include/global_extern.h
-.obj/utl_exprlist.o .shobj/utl_exprlist.so: utl_exprlist.cpp ../include/idl.h \
- ../include/intlmacros.h ../include/idl_narrow.h \
- ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \
- ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/utl_strlist.h ../include/utl_exprlist.h \
- ../include/ast_generator.h ../include/util.h ../include/utl_stack.h \
- ../include/utl_idlist.h ../include/utl_exceptlist.h \
- ../include/utl_namelist.h ../include/utl_labellist.h \
- ../include/utl_decllist.h ../include/idl_global.h \
- ../include/utl_error.h ../include/utl_indenter.h \
- ../include/idl_extern.h ../include/fe_extern.h ../include/be_extern.h \
- ../include/drv_extern.h ../include/ast_extern.h \
- ../include/nr_extern.h ../include/global_extern.h
-.obj/utl_error.o .shobj/utl_error.so: utl_error.cpp ../include/idl.h ../include/intlmacros.h \
- ../include/idl_narrow.h ../include/idl_defines.h ../include/idl_fwd.h \
- ../include/idl_bool.h ../include/utl_string.h \
- ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/utl_strlist.h ../include/utl_exprlist.h \
- ../include/ast_generator.h ../include/util.h ../include/utl_stack.h \
- ../include/utl_idlist.h ../include/utl_exceptlist.h \
- ../include/utl_namelist.h ../include/utl_labellist.h \
- ../include/utl_decllist.h ../include/idl_global.h \
- ../include/utl_error.h ../include/utl_indenter.h \
- ../include/idl_extern.h ../include/fe_extern.h ../include/be_extern.h \
- ../include/drv_extern.h ../include/ast_extern.h \
- ../include/nr_extern.h ../include/global_extern.h
-.obj/utl_indenter.o .shobj/utl_indenter.so: utl_indenter.cpp ../include/idl.h \
- ../include/intlmacros.h ../include/idl_narrow.h \
- ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \
- ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/utl_strlist.h ../include/utl_exprlist.h \
- ../include/ast_generator.h ../include/util.h ../include/utl_stack.h \
- ../include/utl_idlist.h ../include/utl_exceptlist.h \
- ../include/utl_namelist.h ../include/utl_labellist.h \
- ../include/utl_decllist.h ../include/idl_global.h \
- ../include/utl_error.h ../include/utl_indenter.h \
- ../include/idl_extern.h ../include/fe_extern.h ../include/be_extern.h \
- ../include/drv_extern.h ../include/ast_extern.h \
- ../include/nr_extern.h ../include/global_extern.h
-.obj/utl_identifier.o .shobj/utl_identifier.so: utl_identifier.cpp ../include/idl.h \
- ../include/intlmacros.h ../include/idl_narrow.h \
- ../include/idl_defines.h ../include/idl_fwd.h ../include/idl_bool.h \
- ../include/utl_string.h ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/utl_strlist.h ../include/utl_exprlist.h \
- ../include/ast_generator.h ../include/util.h ../include/utl_stack.h \
- ../include/utl_idlist.h ../include/utl_exceptlist.h \
- ../include/utl_namelist.h ../include/utl_labellist.h \
- ../include/utl_decllist.h ../include/idl_global.h \
- ../include/utl_error.h ../include/utl_indenter.h \
- ../include/idl_extern.h ../include/fe_extern.h ../include/be_extern.h \
- ../include/drv_extern.h ../include/ast_extern.h \
- ../include/nr_extern.h ../include/global_extern.h
-.obj/utl_idlist.o .shobj/utl_idlist.so: utl_idlist.cpp ../include/idl.h ../include/intlmacros.h \
- ../include/idl_narrow.h ../include/idl_defines.h ../include/idl_fwd.h \
- ../include/idl_bool.h ../include/utl_string.h \
- ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/utl_strlist.h ../include/utl_exprlist.h \
- ../include/ast_generator.h ../include/util.h ../include/utl_stack.h \
- ../include/utl_idlist.h ../include/utl_exceptlist.h \
- ../include/utl_namelist.h ../include/utl_labellist.h \
- ../include/utl_decllist.h ../include/idl_global.h \
- ../include/utl_error.h ../include/utl_indenter.h \
- ../include/idl_extern.h ../include/fe_extern.h ../include/be_extern.h \
- ../include/drv_extern.h ../include/ast_extern.h \
- ../include/nr_extern.h ../include/global_extern.h
-.obj/utl_global.o .shobj/utl_global.so: utl_global.cpp ../include/idl.h ../include/intlmacros.h \
- ../include/idl_narrow.h ../include/idl_defines.h ../include/idl_fwd.h \
- ../include/idl_bool.h ../include/utl_string.h \
- ../include/utl_identifier.h ../include/ast.h \
- ../include/utl_scoped_name.h ../include/ast_decl.h \
- ../include/ast_expression.h ../include/utl_scope.h \
- ../include/ast_type.h ../include/ast_concrete_type.h \
- ../include/ast_predefined_type.h ../include/ast_module.h \
- ../include/ast_root.h ../include/ast_interface.h \
- ../include/ast_interface_fwd.h ../include/ast_structure.h \
- ../include/ast_exception.h ../include/ast_enum.h \
- ../include/ast_operation.h ../include/utl_list.h \
- ../include/ast_field.h ../include/ast_argument.h \
- ../include/ast_attribute.h ../include/ast_union.h \
- ../include/ast_union_branch.h ../include/ast_union_label.h \
- ../include/ast_constant.h ../include/ast_enum_val.h \
- ../include/ast_array.h ../include/ast_sequence.h \
- ../include/ast_string.h ../include/ast_typedef.h \
- ../include/utl_strlist.h ../include/utl_exprlist.h \
- ../include/ast_generator.h ../include/util.h ../include/utl_stack.h \
- ../include/utl_idlist.h ../include/utl_exceptlist.h \
- ../include/utl_namelist.h ../include/utl_labellist.h \
- ../include/utl_decllist.h ../include/idl_global.h \
- ../include/utl_error.h ../include/utl_indenter.h \
- ../include/idl_extern.h ../include/fe_extern.h ../include/be_extern.h \
- ../include/drv_extern.h ../include/ast_extern.h \
- ../include/nr_extern.h ../include/global_extern.h
-
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/TAO_IDL/util/utl_decllist.cpp b/TAO/TAO_IDL/util/utl_decllist.cpp
deleted file mode 100644
index 0c666d34b72..00000000000
--- a/TAO/TAO_IDL/util/utl_decllist.cpp
+++ /dev/null
@@ -1,145 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-// utl_decllist.cc
-//
-// Implementation of a list of declarators
-
-// NOTE: This list class only works correctly because we use single public
-//       inheritance, as opposed to multiple inheritance or public virtual.
-//	 It relies on a type-unsafe cast from UTL_List to subclasses, which
-//	 will cease to operate correctly if you use either multiple or
-//	 public virtual inheritance.
-//
-//	 For portability reasons we have decided to provide both this and
-//	 an implementation of the list classes in terms of templates. If
-//	 your compiler supports templates, please use the files in the
-//	 include/utl_tmpl and util/utl_tmpl directories instead of the
-//	 files by the same names in the include and util directories.
-
-#include	"idl.h"
-#include	"idl_extern.h"
-
-/*
- * Constructor(s)
- */
-
-UTL_DeclList::UTL_DeclList(FE_Declarator *s, UTL_DeclList *cdr)
-	    : pd_car_data(s),
-	      UTL_List(cdr)
-{
-}
-
-/*
- * Private operations
- */
-
-/*
- * Public operations
- */
-
-// Get list item
-FE_Declarator *
-UTL_DeclList::head()
-{
-  return pd_car_data;
-}
-
-/*
- * Redefinition of inherited virtual operations
- */
-
-// UTL_DeclList active iterator
-
-/*
- * Constructor
- */
-
-UTL_DecllistActiveIterator::UTL_DecllistActiveIterator(UTL_DeclList *s)
-			    : UTL_ListActiveIterator(s)
-{
-}
-
-/*
- * Private operations
- */
-
-/*
- * Public operations
- */
-
-// Get current item
-FE_Declarator *
-UTL_DecllistActiveIterator::item()
-{
-  if (source == NULL)
-    return NULL;
-
-  return ((UTL_DeclList *) source)->head();
-}
-
-/*
- * Redefined inherited operations
- */
-
diff --git a/TAO/TAO_IDL/util/utl_err.cpp b/TAO/TAO_IDL/util/utl_err.cpp
deleted file mode 100644
index bbc38947132..00000000000
--- a/TAO/TAO_IDL/util/utl_err.cpp
+++ /dev/null
@@ -1,700 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.
-2550 Garcia Avenue
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-// utl_error.cc - Implementation of error reporting object for IDL
-//		  compiler program
-
-#include	"idl.h"
-#include	"idl_extern.h"
-
-/*
- * Helper functions to do:
- *
- * - Convert an error code to an error string
- * - Print out an error message header
- * - Convert an ExprType to a string
- */
-
-// Convert an error code into a char *
-static char *
-error_string(UTL_Error::ErrorCode c)
-{
-  switch (c) {
-  case UTL_Error::EIDL_OK:
-    return GTDEVEL("all is fine ");
-  case UTL_Error::EIDL_SYNTAX_ERROR:
-    return "";
-  case UTL_Error::EIDL_REDEF:
-    return GTDEVEL("illegal redefinition ");
-  case UTL_Error::EIDL_DEF_USE:
-    return GTDEVEL("redefinition after use, ");
-  case UTL_Error::EIDL_MULTIPLE_BRANCH:
-    return GTDEVEL("union with duplicate branch label ");
-  case UTL_Error::EIDL_COERCION_FAILURE:
-    return GTDEVEL("coercion failure ");
-  case UTL_Error::EIDL_SCOPE_CONFLICT:
-    return GTDEVEL("definition scope is different than fwd declare scope, ");
-  case UTL_Error::EIDL_ONEWAY_CONFLICT:
-    return GTDEVEL("oneway operation with OUT or INOUT parameters, ");
-  case UTL_Error::EIDL_DISC_TYPE:
-    return GTDEVEL("union with illegal discriminator type, ");
-  case UTL_Error::EIDL_LABEL_TYPE:
-    return GTDEVEL("label type incompatible with union discriminator type, ");
-  case UTL_Error::EIDL_ILLEGAL_ADD:
-    return GTDEVEL("illegal add operation, ");
-  case UTL_Error::EIDL_ILLEGAL_USE:
-    return GTDEVEL("illegal type used in expression, ");
-  case UTL_Error::EIDL_ILLEGAL_RAISES:
-    return GTDEVEL("error in raises(..) clause, ");
-  case UTL_Error::EIDL_ILLEGAL_CONTEXT:
-    return GTDEVEL("error in context(..) clause, ");
-  case UTL_Error::EIDL_CANT_INHERIT:
-    return GTDEVEL("cannot inherit from ");
-  case UTL_Error::EIDL_LOOKUP_ERROR:
-    return GTDEVEL("error in lookup of symbol: ");
-  case UTL_Error::EIDL_INHERIT_FWD_ERROR:
-    /* More intelligible message printed by error routine */
-    return "";
-  case UTL_Error::EIDL_CONSTANT_EXPECTED:
-    return GTDEVEL("constant expected: ");
-  case UTL_Error::EIDL_EVAL_ERROR:
-    return GTDEVEL("expression evaluation error: ");
-  case UTL_Error::EIDL_NAME_CASE_ERROR:
-    return GTDEVEL("identifier used with two differing spellings: ");
-  case UTL_Error::EIDL_ENUM_VAL_EXPECTED:
-    return GTDEVEL("enumerator expected: ");
-  case UTL_Error::EIDL_ENUM_VAL_NOT_FOUND:
-    return GTDEVEL("enumerator by this name not defined: ");
-  case UTL_Error::EIDL_AMBIGUOUS:
-    return GTDEVEL("ambiguous definition: ");
-  case UTL_Error::EIDL_DECL_NOT_DEFINED:
-    return GTDEVEL("forward declared but never defined: ");
-  case UTL_Error::EIDL_FWD_DECL_LOOKUP:
-    /* More intelligible message printed by error routine */
-    return "";
-  case UTL_Error::EIDL_RECURSIVE_TYPE:
-    return GTDEVEL("illegal recursive use of type: ");
-  case UTL_Error::EIDL_NONVOID_ONEWAY:
-    return GTDEVEL("non-void return type in oneway operation: ");
-  case UTL_Error::EIDL_REDEF_SCOPE:
-    return GTDEVEL("redefinition inside defining scope: ");
-  case UTL_Error::EIDL_NOT_A_TYPE:
-    return GTDEVEL("specified symbol is not a type: ");
-  case UTL_Error::EIDL_BACK_END:
-    return GTDEVEL("back end: ");
-  }
-  return NULL;
-}
-
-// Print out an error message header on cerr
-static void
-idl_error_header(UTL_Error::ErrorCode c, long lineno, String *s)
-{
-  cerr << idl_global->prog_name()
-       << ": \""
-       << (idl_global->read_from_stdin() ? "standard input" : s->get_string())
-       << GTDEVEL("\", line ")
-       << ((lineno == -1) ? idl_global->lineno() : lineno)
-       << ": "
-       << error_string(c);
-}
-
-// Convert the type of an AST_Expression to a char *
-static char *
-exprtype_to_string(AST_Expression::ExprType t)
-{
-  switch (t) {
-  case AST_Expression::EV_short:
-    return "short";
-  case AST_Expression::EV_ushort:
-    return "unsigned short";
-  case AST_Expression::EV_long:
-    return "long";
-  case AST_Expression::EV_ulong:
-    return "unsigned long";
-  case AST_Expression::EV_float:
-    return "float";
-  case AST_Expression::EV_double:
-    return "double";
-  case AST_Expression::EV_char:
-    return "char";
-  case AST_Expression::EV_octet:
-    return "octet";
-  case AST_Expression::EV_bool:
-    return "boolean";
-  case AST_Expression::EV_string:
-    return "string";
-  case AST_Expression::EV_any:
-    return "any";
-  case AST_Expression::EV_void:
-    return "void";
-  case AST_Expression::EV_none:
-    return "none";
-  case AST_Expression::EV_longlong:
-  case AST_Expression::EV_ulonglong:
-  case AST_Expression::EV_longdouble:
-  case AST_Expression::EV_wchar:
-  case AST_Expression::EV_wstring:
-    return NULL;
-  }
-  return NULL;
-}
-
-/*
- * Convert a parse state into a possible error message
- */
-static char *
-parse_state_to_error_message(IDL_GlobalData::ParseState ps)
-{
-  switch (ps) {
-  case IDL_GlobalData::PS_NoState:
-    return GTDEVEL("Statement can not be parsed");
-  case IDL_GlobalData::PS_TypeDeclSeen:
-    return GTDEVEL("Malformed typedef declaration");
-  case IDL_GlobalData::PS_ConstDeclSeen:
-    return GTDEVEL("Malformed const declaration");
-  case IDL_GlobalData::PS_ExceptDeclSeen:
-    return
-      GTDEVEL("Malformed exception declaration");
-  case IDL_GlobalData::PS_InterfaceDeclSeen:
-    return
-      GTDEVEL("Malformed interface declaration");
-  case IDL_GlobalData::PS_ModuleDeclSeen:
-    return GTDEVEL("Malformed module declaration");
-  case IDL_GlobalData::PS_AttrDeclSeen:
-    return
-      GTDEVEL("Malformed attribute declaration");
-  case IDL_GlobalData::PS_OpDeclSeen:
-    return
-      GTDEVEL("Malformed operation declaration");
-  case IDL_GlobalData::PS_ModuleSeen:
-    return GTDEVEL("Missing module identifier following MODULE keyword");
-  case IDL_GlobalData::PS_ModuleIDSeen:
-    return GTDEVEL("Missing '{' or illegal syntax following module identifier");
-  case IDL_GlobalData::PS_ModuleSqSeen:
-    return GTDEVEL("Illegal syntax following module '{' opener");
-  case IDL_GlobalData::PS_ModuleQsSeen:
-    return GTDEVEL("Illegal syntax following module '}' closer");
-  case IDL_GlobalData::PS_ModuleBodySeen:
-    return GTDEVEL("Illegal syntax following module body statement(s)");
-  case IDL_GlobalData::PS_InterfaceSeen:
-    return GTDEVEL("Missing interface identifier following INTERFACE keyword");
-  case IDL_GlobalData::PS_InterfaceIDSeen:
-    return GTDEVEL("Illegal syntax following interface identifier");
-  case IDL_GlobalData::PS_InheritSpecSeen:
-    return GTDEVEL("Missing '{' or illegal syntax following inheritance spec");
-  case IDL_GlobalData::PS_ForwardDeclSeen:
-    return GTDEVEL("Missing ';' following forward interface declaration");
-  case IDL_GlobalData::PS_InterfaceSqSeen:
-    return GTDEVEL("Illegal syntax following interface '{' opener");
-  case IDL_GlobalData::PS_InterfaceQsSeen:
-    return GTDEVEL("Illegal syntax following interface '}' closer");
-  case IDL_GlobalData::PS_InterfaceBodySeen:
-    return GTDEVEL("Illegal syntax following interface body statement(s)");
-  case IDL_GlobalData::PS_InheritColonSeen:
-    return GTDEVEL("Illegal syntax following ':' starting inheritance list");
-  case IDL_GlobalData::PS_SNListCommaSeen:
-    return GTDEVEL("Found illegal scoped name in scoped name list");
-  case IDL_GlobalData::PS_ScopedNameSeen:
-    return GTDEVEL("Missing ',' following scoped name in scoped name list");
-  case IDL_GlobalData::PS_SN_IDSeen:
-    return GTDEVEL("Illegal component in scoped name");
-  case IDL_GlobalData::PS_ScopeDelimSeen:
-    return GTDEVEL("Illegal component in scoped name following '::'");
-  case IDL_GlobalData::PS_ConstSeen:
-    return GTDEVEL("Missing type or illegal syntax following CONST keyword");
-  case IDL_GlobalData::PS_ConstTypeSeen:
-    return GTDEVEL("Missing identifier or illegal syntax following const type");
-  case IDL_GlobalData::PS_ConstIDSeen:
-    return GTDEVEL("Missing '=' or illegal syntax after const identifier");
-  case IDL_GlobalData::PS_ConstAssignSeen:
-    return GTDEVEL("Missing value expr or illegal syntax following '='");
-  case IDL_GlobalData::PS_ConstExprSeen:
-    return GTDEVEL("Missing ';' or illegal syntax following value expr in const");
-  case IDL_GlobalData::PS_TypedefSeen:
-    return GTDEVEL("Missing type or illegal syntax following TYPEDEF keyword");
-  case IDL_GlobalData::PS_TypeSpecSeen:
-    return GTDEVEL("Missing declarators or illegal syntax following type spec");
-  case IDL_GlobalData::PS_DeclaratorsSeen:
-    return GTDEVEL("Illegal syntax following declarators in TYPEDEF declaration");
-  case IDL_GlobalData::PS_StructSeen:
-    return GTDEVEL("Missing struct identifier following STRUCT keyword");
-  case IDL_GlobalData::PS_StructIDSeen:
-    return GTDEVEL("Missing '{' or illegal syntax following struct identifier");
-  case IDL_GlobalData::PS_StructSqSeen:
-    return GTDEVEL("Illegal syntax following struct '{' opener");
-  case IDL_GlobalData::PS_StructQsSeen:
-    return GTDEVEL("Illegal syntax following struct '}' closer");
-  case IDL_GlobalData::PS_StructBodySeen:
-    return GTDEVEL("Illegal syntax following struct body statement(s)");
-  case IDL_GlobalData::PS_MemberTypeSeen:
-    return GTDEVEL("Illegal syntax of missing identifier following member type");
-  case IDL_GlobalData::PS_MemberDeclsSeen:
-    return GTDEVEL("Illegal syntax following member declarator(s)");
-  case IDL_GlobalData::PS_MemberDeclsCompleted:
-    return GTDEVEL("Missing ',' between member decls of same type(?)");
-  case IDL_GlobalData::PS_UnionSeen:
-    return GTDEVEL("Missing identifier following UNION keyword");
-  case IDL_GlobalData::PS_UnionIDSeen:
-    return GTDEVEL("Illegal syntax following union identifier");
-  case IDL_GlobalData::PS_SwitchSeen:
-    return GTDEVEL("Illegal syntax following SWITCH keyword");
-  case IDL_GlobalData::PS_SwitchOpenParSeen:
-    return GTDEVEL("Illegal syntax following '(' in switch in union");
-  case IDL_GlobalData::PS_SwitchTypeSeen:
-    return GTDEVEL("Illegal syntax following type decl in switch in union");
-  case IDL_GlobalData::PS_SwitchCloseParSeen:
-    return GTDEVEL("Missing union '{' opener");
-  case IDL_GlobalData::PS_UnionSqSeen:
-    return GTDEVEL("Illegal syntax following union '{' opener");
-  case IDL_GlobalData::PS_UnionQsSeen:
-    return GTDEVEL("Illegal syntax following union '}' closer");
-  case IDL_GlobalData::PS_DefaultSeen:
-    return GTDEVEL("Illegal syntax or missing ':' following DEFAULT keyword");
-  case IDL_GlobalData::PS_UnionLabelSeen:
-    return GTDEVEL("Illegal syntax following branch label in union");
-  case IDL_GlobalData::PS_LabelColonSeen:
-    return GTDEVEL("Illegal syntax following ':' in branch label in union");
-  case IDL_GlobalData::PS_LabelExprSeen:
-    return GTDEVEL("Illegal syntax following label expression in union");
-  case IDL_GlobalData::PS_UnionElemSeen:
-  case IDL_GlobalData::PS_UnionElemCompleted:
-    return GTDEVEL("Illegal syntax following union element");
-  case IDL_GlobalData::PS_CaseSeen:
-    return GTDEVEL("Illegal syntax following CASE keyword in union");
-  case IDL_GlobalData::PS_UnionElemTypeSeen:
-    return GTDEVEL("Illegal syntax following type decl in union element");
-  case IDL_GlobalData::PS_UnionElemDeclSeen:
-    return GTDEVEL("Illegal syntax following declarator in union element");
-  case IDL_GlobalData::PS_UnionBodySeen:
-    return GTDEVEL("Illegal syntax following union body statement(s)");
-  case IDL_GlobalData::PS_EnumSeen:
-    return GTDEVEL("Illegal syntax or missing identifier following ENUM keyword");
-  case IDL_GlobalData::PS_EnumIDSeen:
-    return GTDEVEL("Illegal syntax or missing '{' following enum identifier");
-  case IDL_GlobalData::PS_EnumSqSeen:
-    return GTDEVEL("Illegal syntax following enum '{' opener");
-  case IDL_GlobalData::PS_EnumQsSeen:
-    return GTDEVEL("Illegal syntax following enum '}' closer");
-  case IDL_GlobalData::PS_EnumBodySeen:
-    return GTDEVEL("Illegal syntax following enum body statement(s)");
-  case IDL_GlobalData::PS_EnumCommaSeen:
-    return GTDEVEL("Illegal syntax or missing identifier following ',' in enum");
-  case IDL_GlobalData::PS_SequenceSeen:
-    return GTDEVEL("Illegal syntax or missing '<' following SEQUENCE keyword");
-  case IDL_GlobalData::PS_SequenceSqSeen:
-    return GTDEVEL("Illegal syntax or missing type following '<' in sequence");
-  case IDL_GlobalData::PS_SequenceQsSeen:
-    return GTDEVEL("Illegal syntax following '>' in sequence");
-  case IDL_GlobalData::PS_SequenceTypeSeen:
-    return GTDEVEL("Illegal syntax following sequence type declaration");
-  case IDL_GlobalData::PS_SequenceCommaSeen:
-    return
-      GTDEVEL("Illegal syntax of missing size expr following ',' in sequence");
-  case IDL_GlobalData::PS_SequenceExprSeen:
-    return
-      GTDEVEL("Illegal syntax or missing '>' following size expr in sequence");
-  case IDL_GlobalData::PS_StringSeen:
-    return GTDEVEL("Illegal syntax or missing '<' following STRING keyword");
-  case IDL_GlobalData::PS_StringSqSeen:
-    return GTDEVEL("Illegal syntax or missing size expr following '<' in string");
-  case IDL_GlobalData::PS_StringQsSeen:
-    return GTDEVEL("Illegal syntax following '>' in string");
-  case IDL_GlobalData::PS_StringExprSeen:
-    return GTDEVEL("Illegal syntax or missing '>' after size expr in string");
-  case IDL_GlobalData::PS_StringCompleted:
-    return GTDEVEL("Illegal syntax after string declaration");
-  case IDL_GlobalData::PS_ArrayIDSeen:
-    return GTDEVEL("Illegal syntax or missing dimensions after array identifier");
-  case IDL_GlobalData::PS_ArrayCompleted:
-    return GTDEVEL("Illegal syntax after array declaration");
-  case IDL_GlobalData::PS_DimSqSeen:
-    return
-    GTDEVEL("Illegal syntax or missing size expr after '[' in array declaration");
-  case IDL_GlobalData::PS_DimQsSeen:
-    return GTDEVEL("Illegal syntax after ']' in array declaration");
-  case IDL_GlobalData::PS_DimExprSeen:
-    return
-    GTDEVEL("Illegal syntax or missing ']' after size expr in array declaration");
-  case IDL_GlobalData::PS_AttrROSeen:
-    return GTDEVEL("Illegal syntax after READONLY keyword");
-  case IDL_GlobalData::PS_AttrSeen:
-    return GTDEVEL("Illegal syntax after ATTRIBUTE keyword");
-  case IDL_GlobalData::PS_AttrTypeSeen:
-    return GTDEVEL("Illegal syntax after type in attribute declaration");
-  case IDL_GlobalData::PS_AttrDeclsSeen:
-    return GTDEVEL("Illegal syntax after attribute declarators");
-  case IDL_GlobalData::PS_AttrCompleted:
-    return GTDEVEL("Illegal syntax after attribute declaration");
-  case IDL_GlobalData::PS_ExceptSeen:
-    return
-      GTDEVEL("Illegal syntax or missing identifier after EXCEPTION keyword");
-  case IDL_GlobalData::PS_ExceptIDSeen:
-    return GTDEVEL("Illegal syntax or missing '{' after exception identifier");
-  case IDL_GlobalData::PS_ExceptSqSeen:
-    return GTDEVEL("Illegal syntax after exception '{' opener");
-  case IDL_GlobalData::PS_ExceptQsSeen:
-    return GTDEVEL("Illegal syntax after exception '}' closer");
-  case IDL_GlobalData::PS_ExceptBodySeen:
-    return GTDEVEL("Illegal syntax after exception body statement(s)");
-  case IDL_GlobalData::PS_OpAttrSeen:
-    return GTDEVEL("Illegal syntax or missing type after operation attribute");
-  case IDL_GlobalData::PS_OpTypeSeen:
-    return GTDEVEL("Illegal syntax or missing identifier after operation type");
-  case IDL_GlobalData::PS_OpIDSeen:
-    return GTDEVEL("Illegal syntax or missing '(' after operation identifier");
-  case IDL_GlobalData::PS_OpParsCompleted:
-    return GTDEVEL("Illegal syntax after operation parameter list");
-  case IDL_GlobalData::PS_OpRaiseCompleted:
-    return
-      GTDEVEL("Illegal syntax after optional RAISES in operation declaration");
-  case IDL_GlobalData::PS_OpContextCompleted:
-    return
-      GTDEVEL("Illegal syntax after optional CONTEXT in operation declaration");
-  case IDL_GlobalData::PS_OpCompleted:
-    return GTDEVEL("Illegal syntax after operation declaration");
-  case IDL_GlobalData::PS_OpSqSeen:
-    return GTDEVEL("Illegal syntax after operation parameter list '(' opener");
-  case IDL_GlobalData::PS_OpQsSeen:
-    return GTDEVEL("Illegal syntax after operation parameter list ')' closer");
-  case IDL_GlobalData::PS_OpParCommaSeen:
-    return
-      GTDEVEL("Illegal syntax or missing direction in parameter declaration");
-  case IDL_GlobalData::PS_OpParDirSeen:
-    return GTDEVEL("Illegal syntax or missing type in parameter declaration");
-  case IDL_GlobalData::PS_OpParTypeSeen:
-    return
-      GTDEVEL("Illegal syntax or missing declarator in parameter declaration");
-  case IDL_GlobalData::PS_OpParDeclSeen:
-    return GTDEVEL("Illegal syntax following parameter declarator");
-  case IDL_GlobalData::PS_OpRaiseSeen:
-    return GTDEVEL("Illegal syntax or missing '(' after RAISES keyword");
-  case IDL_GlobalData::PS_OpRaiseSqSeen:
-    return GTDEVEL("Illegal syntax after RAISES '(' opener");
-  case IDL_GlobalData::PS_OpRaiseQsSeen:
-    return GTDEVEL("Illegal syntax after RAISES ')' closer");
-  case IDL_GlobalData::PS_OpContextSeen:
-    return GTDEVEL("Illegal syntax or missing '(' after CONTEXT keyword");
-  case IDL_GlobalData::PS_OpContextSqSeen:
-    return GTDEVEL("Illegal syntax after CONTEXT '(' opener");
-  case IDL_GlobalData::PS_OpContextQsSeen:
-    return GTDEVEL("Illegal syntax after CONTEXT ')' closer");
-  case IDL_GlobalData::PS_OpContextCommaSeen:
-    return
-      GTDEVEL("Illegal syntax after ',' in CONTEXT in operation declaration");
-  case IDL_GlobalData::PS_DeclsCommaSeen:
-    return GTDEVEL("Illegal syntax after ',' in declarators list");
-  case IDL_GlobalData::PS_DeclsDeclSeen:
-    return GTDEVEL("Illegal syntax after declarator in declarators list");
-
-  default:
-    return GTDEVEL("Some syntax error");
-  }
-}
-/*
- * Public methods
- */
-
-// Report error messages with various numbers of arguments
-
-void
-UTL_Error::syntax_error(IDL_GlobalData::ParseState ps)
-{
-  idl_error_header(EIDL_SYNTAX_ERROR,
-		   idl_global->lineno(),
-		   idl_global->filename());
-  cerr << parse_state_to_error_message(ps) << "\n";
-  idl_global->set_err_count(idl_global->err_count() + 1);
-}
-
-void
-UTL_Error::error0(UTL_Error::ErrorCode c)
-{
-  idl_error_header(c, idl_global->lineno(), idl_global->filename());
-  cerr << "\n";
-  idl_global->set_err_count(idl_global->err_count() + 1);
-}
-
-void
-UTL_Error::error1(UTL_Error::ErrorCode c, AST_Decl *d)
-{
-  idl_error_header(c, d->line(), d->file_name());
-  d->name()->dump(cerr); cerr << "\n";
-  idl_global->set_err_count(idl_global->err_count() + 1);
-}
-
-void
-UTL_Error::error2(UTL_Error::ErrorCode c, AST_Decl *d1, AST_Decl *d2)
-{
-  idl_error_header(c, d1->line(), d1->file_name());
-  d1->name()->dump(cerr); cerr << ", ";
-  d2->name()->dump(cerr); cerr << "\n";
-  idl_global->set_err_count(idl_global->err_count() + 1);
-}
-
-void
-UTL_Error::error3(UTL_Error::ErrorCode c,
-		  AST_Decl *d1,
-		  AST_Decl *d2,
-		  AST_Decl *d3)
-{
-  idl_error_header(c, d1->line(), d1->file_name());
-  d1->name()->dump(cerr); cerr << ", ";
-  d2->name()->dump(cerr); cerr << ", ";
-  d3->name()->dump(cerr); cerr << "\n";
-  idl_global->set_err_count(idl_global->err_count() + 1);
-}
-
-// Report a failed coercion attempt
-void
-UTL_Error::coercion_error(AST_Expression *v, AST_Expression::ExprType t)
-{
-  idl_error_header(EIDL_COERCION_FAILURE, v->line(), v->file_name());
-  v->dump(cerr);
-  cerr << GTDEVEL(" to ") << exprtype_to_string(t) << "\n";
-  idl_global->set_err_count(idl_global->err_count() + 1);
-}
-
-// Report a failed name lookup attempt
-void
-UTL_Error::lookup_error(UTL_ScopedName *n)
-{
-  idl_error_header(EIDL_LOOKUP_ERROR,
-		   idl_global->lineno(),
-		   idl_global->filename());
-  n->dump(cerr);
-  cerr << "\n";
-  idl_global->set_err_count(idl_global->err_count() + 1);
-}
-
-// Report an attempt to inherit from an interface which was only
-// declared forward but not yet defined
-void
-UTL_Error::inheritance_fwd_error(UTL_ScopedName *n, AST_Interface *f)
-{
-  idl_error_header(EIDL_INHERIT_FWD_ERROR, f->line(), f->file_name());
-  cerr << "interface ";
-  n->dump(cerr);
-  cerr << GTDEVEL(" cannot inherit from forward declared interface ");
-  f->local_name()->dump(cerr);
-  cerr << "\n";
-  idl_global->set_err_count(idl_global->err_count() + 1);
-}
-
-// Report an attempt to inherit from something other than an interface
-void
-UTL_Error::inheritance_error(UTL_ScopedName *n, AST_Decl *d)
-{
-  idl_error_header(EIDL_CANT_INHERIT, d->line(), d->file_name());
-  cerr << " interface ";
-  n->dump(cerr);
-  cerr << GTDEVEL(" attempts to inherit from ");
-  d->dump(cerr);
-  cerr << "\n";
-  idl_global->set_err_count(idl_global->err_count() + 1);
-}
-
-// Report an error while evaluating an expression
-void
-UTL_Error::eval_error(AST_Expression *v)
-{
-  idl_error_header(EIDL_EVAL_ERROR, v->line(), v->file_name());
-  v->dump(cerr);
-  cerr << "\n";
-  idl_global->set_err_count(idl_global->err_count() + 1);
-}
-
-// Report a situation where a constant was expected but we
-// got something else. This may occur in a union when a label
-// evaluates to a non-constant
-void
-UTL_Error::constant_expected(UTL_ScopedName *n, AST_Decl *d)
-{
-  idl_error_header(EIDL_CONSTANT_EXPECTED, d->line(), d->file_name());
-  n->dump(cerr);
-  cerr << GTDEVEL(" bound to ");
-  d->dump(cerr);
-  cerr << "\n";
-  idl_global->set_err_count(idl_global->err_count() + 1);
-}
-
-// Report a situation where an enumerator was expected but we
-// got something else. This may occur in a union with an enum
-// discriminator where a label did not evaluate to a constant
-// enumerator
-void
-UTL_Error::enum_val_expected(AST_Union *u, AST_UnionLabel *l)
-{
-  idl_error_header(EIDL_ENUM_VAL_EXPECTED, u->line(), u->file_name());
-  cerr << " union " << u->local_name()->get_string() << ", ";
-  l->dump(cerr);
-  cerr << "\n";
-  idl_global->set_err_count(idl_global->err_count() + 1);
-}
-
-// Report a situation where an enumerator was received but we
-// could not find it (by name) in an enum. This occurs when
-// a union with an enum discriminator is being parsed, and a
-// label evaluates to an enumerator which is not a member of
-// the enum discriminator type
-void
-UTL_Error::enum_val_lookup_failure(AST_Union *u,
-				AST_Enum *e,
-				UTL_ScopedName *n)
-{
-  idl_error_header(EIDL_ENUM_VAL_NOT_FOUND, u->line(), u->file_name());
-  cerr << " union " << u->local_name()->get_string() << ", ";
-  cerr << " enum " << e->local_name()->get_string() << ", ";
-  cerr << " enumerator ";
-  n->dump(cerr);
-  cerr << "\n";
-  idl_global->set_err_count(idl_global->err_count() + 1);
-}
-
-// Report two or more spellings for an identifier
-void
-UTL_Error::name_case_error(char *b, char *n)
-{
-  idl_error_header(EIDL_NAME_CASE_ERROR,
-		   idl_global->lineno(),
-		   idl_global->filename());
-  cerr << "\"" << b << GTDEVEL("\" and ") << "\"" << n << "\"\n";
-  idl_global->set_err_count(idl_global->err_count() + 1);
-}
-
-// Report an ambiguous definition of a name
-void
-UTL_Error::ambiguous(UTL_Scope *s, AST_Decl *l, AST_Decl *d)
-{
-  idl_error_header(EIDL_AMBIGUOUS, d->line(), d->file_name());
-  cerr << GTDEVEL(" scope: ")
-       << (ScopeAsDecl(s))->local_name()->get_string()
-       << ", ";
-  cerr << GTDEVEL(" collision: ");
-  d->name()->dump(cerr);
-  cerr << " vs. ";
-  l->name()->dump(cerr);
-  cerr << "\n";
-  idl_global->set_err_count(idl_global->err_count() + 1);
-}
-
-// Report a forward declared interface which was never defined
-void
-UTL_Error::fwd_decl_not_defined(AST_Interface *d)
-{
-  idl_error_header(EIDL_DECL_NOT_DEFINED, d->line(), d->file_name());
-  cerr << "interface ";
-  d->local_name()->dump(cerr);
-  cerr << "\n";
-  idl_global->set_err_count(idl_global->err_count() + 1);
-}
-
-// Report lookup in undefined forward declared but undefined interface
-void
-UTL_Error::fwd_decl_lookup(AST_Interface *d, UTL_ScopedName *n)
-{
-  idl_error_header(EIDL_FWD_DECL_LOOKUP,
-		   idl_global->lineno(),
-		   idl_global->filename());
-  cerr << GTDEVEL("trying to look up ");
-  n->dump(cerr);
-  cerr << GTDEVEL(" in undefined forward declared interface ");
-  d->local_name()->dump(cerr);
-  cerr << "\n";
-  idl_global->set_err_count(idl_global->err_count() + 1);
-}
-
-// Report a redefinition inside its own scope
-void
-UTL_Error::redefinition_in_scope(AST_Decl *d, AST_Decl *s)
-{
-  idl_error_header(EIDL_REDEF_SCOPE, d->line(), d->file_name());
-  d->name()->dump(cerr);
-  cerr << ", ";
-  s->name()->dump(cerr);
-  cerr << "\n";
-  idl_global->set_err_count(idl_global->err_count() + 1);
-}
-
-// Report not a type error
-void
-UTL_Error::not_a_type(AST_Decl *d)
-{
-  idl_error_header(EIDL_NOT_A_TYPE,
-		   idl_global->lineno(),
-		   idl_global->filename());
-  if (d == NULL || d->name() == NULL)
-    cerr << GTDEVEL("unknown symbol");
-  else
-    d->name()->dump(cerr);
-  cerr << "\n";
-  idl_global->set_err_count(idl_global->err_count() + 1);
-}
-
-void
-UTL_Error::back_end(long lineno, String *s)
-{
-  idl_error_header(EIDL_BACK_END, lineno, s);
-  idl_global->set_err_count(idl_global->err_count() + 1);
-}
diff --git a/TAO/TAO_IDL/util/utl_error.cpp b/TAO/TAO_IDL/util/utl_error.cpp
deleted file mode 100644
index bbc38947132..00000000000
--- a/TAO/TAO_IDL/util/utl_error.cpp
+++ /dev/null
@@ -1,700 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.
-2550 Garcia Avenue
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-// utl_error.cc - Implementation of error reporting object for IDL
-//		  compiler program
-
-#include	"idl.h"
-#include	"idl_extern.h"
-
-/*
- * Helper functions to do:
- *
- * - Convert an error code to an error string
- * - Print out an error message header
- * - Convert an ExprType to a string
- */
-
-// Convert an error code into a char *
-static char *
-error_string(UTL_Error::ErrorCode c)
-{
-  switch (c) {
-  case UTL_Error::EIDL_OK:
-    return GTDEVEL("all is fine ");
-  case UTL_Error::EIDL_SYNTAX_ERROR:
-    return "";
-  case UTL_Error::EIDL_REDEF:
-    return GTDEVEL("illegal redefinition ");
-  case UTL_Error::EIDL_DEF_USE:
-    return GTDEVEL("redefinition after use, ");
-  case UTL_Error::EIDL_MULTIPLE_BRANCH:
-    return GTDEVEL("union with duplicate branch label ");
-  case UTL_Error::EIDL_COERCION_FAILURE:
-    return GTDEVEL("coercion failure ");
-  case UTL_Error::EIDL_SCOPE_CONFLICT:
-    return GTDEVEL("definition scope is different than fwd declare scope, ");
-  case UTL_Error::EIDL_ONEWAY_CONFLICT:
-    return GTDEVEL("oneway operation with OUT or INOUT parameters, ");
-  case UTL_Error::EIDL_DISC_TYPE:
-    return GTDEVEL("union with illegal discriminator type, ");
-  case UTL_Error::EIDL_LABEL_TYPE:
-    return GTDEVEL("label type incompatible with union discriminator type, ");
-  case UTL_Error::EIDL_ILLEGAL_ADD:
-    return GTDEVEL("illegal add operation, ");
-  case UTL_Error::EIDL_ILLEGAL_USE:
-    return GTDEVEL("illegal type used in expression, ");
-  case UTL_Error::EIDL_ILLEGAL_RAISES:
-    return GTDEVEL("error in raises(..) clause, ");
-  case UTL_Error::EIDL_ILLEGAL_CONTEXT:
-    return GTDEVEL("error in context(..) clause, ");
-  case UTL_Error::EIDL_CANT_INHERIT:
-    return GTDEVEL("cannot inherit from ");
-  case UTL_Error::EIDL_LOOKUP_ERROR:
-    return GTDEVEL("error in lookup of symbol: ");
-  case UTL_Error::EIDL_INHERIT_FWD_ERROR:
-    /* More intelligible message printed by error routine */
-    return "";
-  case UTL_Error::EIDL_CONSTANT_EXPECTED:
-    return GTDEVEL("constant expected: ");
-  case UTL_Error::EIDL_EVAL_ERROR:
-    return GTDEVEL("expression evaluation error: ");
-  case UTL_Error::EIDL_NAME_CASE_ERROR:
-    return GTDEVEL("identifier used with two differing spellings: ");
-  case UTL_Error::EIDL_ENUM_VAL_EXPECTED:
-    return GTDEVEL("enumerator expected: ");
-  case UTL_Error::EIDL_ENUM_VAL_NOT_FOUND:
-    return GTDEVEL("enumerator by this name not defined: ");
-  case UTL_Error::EIDL_AMBIGUOUS:
-    return GTDEVEL("ambiguous definition: ");
-  case UTL_Error::EIDL_DECL_NOT_DEFINED:
-    return GTDEVEL("forward declared but never defined: ");
-  case UTL_Error::EIDL_FWD_DECL_LOOKUP:
-    /* More intelligible message printed by error routine */
-    return "";
-  case UTL_Error::EIDL_RECURSIVE_TYPE:
-    return GTDEVEL("illegal recursive use of type: ");
-  case UTL_Error::EIDL_NONVOID_ONEWAY:
-    return GTDEVEL("non-void return type in oneway operation: ");
-  case UTL_Error::EIDL_REDEF_SCOPE:
-    return GTDEVEL("redefinition inside defining scope: ");
-  case UTL_Error::EIDL_NOT_A_TYPE:
-    return GTDEVEL("specified symbol is not a type: ");
-  case UTL_Error::EIDL_BACK_END:
-    return GTDEVEL("back end: ");
-  }
-  return NULL;
-}
-
-// Print out an error message header on cerr
-static void
-idl_error_header(UTL_Error::ErrorCode c, long lineno, String *s)
-{
-  cerr << idl_global->prog_name()
-       << ": \""
-       << (idl_global->read_from_stdin() ? "standard input" : s->get_string())
-       << GTDEVEL("\", line ")
-       << ((lineno == -1) ? idl_global->lineno() : lineno)
-       << ": "
-       << error_string(c);
-}
-
-// Convert the type of an AST_Expression to a char *
-static char *
-exprtype_to_string(AST_Expression::ExprType t)
-{
-  switch (t) {
-  case AST_Expression::EV_short:
-    return "short";
-  case AST_Expression::EV_ushort:
-    return "unsigned short";
-  case AST_Expression::EV_long:
-    return "long";
-  case AST_Expression::EV_ulong:
-    return "unsigned long";
-  case AST_Expression::EV_float:
-    return "float";
-  case AST_Expression::EV_double:
-    return "double";
-  case AST_Expression::EV_char:
-    return "char";
-  case AST_Expression::EV_octet:
-    return "octet";
-  case AST_Expression::EV_bool:
-    return "boolean";
-  case AST_Expression::EV_string:
-    return "string";
-  case AST_Expression::EV_any:
-    return "any";
-  case AST_Expression::EV_void:
-    return "void";
-  case AST_Expression::EV_none:
-    return "none";
-  case AST_Expression::EV_longlong:
-  case AST_Expression::EV_ulonglong:
-  case AST_Expression::EV_longdouble:
-  case AST_Expression::EV_wchar:
-  case AST_Expression::EV_wstring:
-    return NULL;
-  }
-  return NULL;
-}
-
-/*
- * Convert a parse state into a possible error message
- */
-static char *
-parse_state_to_error_message(IDL_GlobalData::ParseState ps)
-{
-  switch (ps) {
-  case IDL_GlobalData::PS_NoState:
-    return GTDEVEL("Statement can not be parsed");
-  case IDL_GlobalData::PS_TypeDeclSeen:
-    return GTDEVEL("Malformed typedef declaration");
-  case IDL_GlobalData::PS_ConstDeclSeen:
-    return GTDEVEL("Malformed const declaration");
-  case IDL_GlobalData::PS_ExceptDeclSeen:
-    return
-      GTDEVEL("Malformed exception declaration");
-  case IDL_GlobalData::PS_InterfaceDeclSeen:
-    return
-      GTDEVEL("Malformed interface declaration");
-  case IDL_GlobalData::PS_ModuleDeclSeen:
-    return GTDEVEL("Malformed module declaration");
-  case IDL_GlobalData::PS_AttrDeclSeen:
-    return
-      GTDEVEL("Malformed attribute declaration");
-  case IDL_GlobalData::PS_OpDeclSeen:
-    return
-      GTDEVEL("Malformed operation declaration");
-  case IDL_GlobalData::PS_ModuleSeen:
-    return GTDEVEL("Missing module identifier following MODULE keyword");
-  case IDL_GlobalData::PS_ModuleIDSeen:
-    return GTDEVEL("Missing '{' or illegal syntax following module identifier");
-  case IDL_GlobalData::PS_ModuleSqSeen:
-    return GTDEVEL("Illegal syntax following module '{' opener");
-  case IDL_GlobalData::PS_ModuleQsSeen:
-    return GTDEVEL("Illegal syntax following module '}' closer");
-  case IDL_GlobalData::PS_ModuleBodySeen:
-    return GTDEVEL("Illegal syntax following module body statement(s)");
-  case IDL_GlobalData::PS_InterfaceSeen:
-    return GTDEVEL("Missing interface identifier following INTERFACE keyword");
-  case IDL_GlobalData::PS_InterfaceIDSeen:
-    return GTDEVEL("Illegal syntax following interface identifier");
-  case IDL_GlobalData::PS_InheritSpecSeen:
-    return GTDEVEL("Missing '{' or illegal syntax following inheritance spec");
-  case IDL_GlobalData::PS_ForwardDeclSeen:
-    return GTDEVEL("Missing ';' following forward interface declaration");
-  case IDL_GlobalData::PS_InterfaceSqSeen:
-    return GTDEVEL("Illegal syntax following interface '{' opener");
-  case IDL_GlobalData::PS_InterfaceQsSeen:
-    return GTDEVEL("Illegal syntax following interface '}' closer");
-  case IDL_GlobalData::PS_InterfaceBodySeen:
-    return GTDEVEL("Illegal syntax following interface body statement(s)");
-  case IDL_GlobalData::PS_InheritColonSeen:
-    return GTDEVEL("Illegal syntax following ':' starting inheritance list");
-  case IDL_GlobalData::PS_SNListCommaSeen:
-    return GTDEVEL("Found illegal scoped name in scoped name list");
-  case IDL_GlobalData::PS_ScopedNameSeen:
-    return GTDEVEL("Missing ',' following scoped name in scoped name list");
-  case IDL_GlobalData::PS_SN_IDSeen:
-    return GTDEVEL("Illegal component in scoped name");
-  case IDL_GlobalData::PS_ScopeDelimSeen:
-    return GTDEVEL("Illegal component in scoped name following '::'");
-  case IDL_GlobalData::PS_ConstSeen:
-    return GTDEVEL("Missing type or illegal syntax following CONST keyword");
-  case IDL_GlobalData::PS_ConstTypeSeen:
-    return GTDEVEL("Missing identifier or illegal syntax following const type");
-  case IDL_GlobalData::PS_ConstIDSeen:
-    return GTDEVEL("Missing '=' or illegal syntax after const identifier");
-  case IDL_GlobalData::PS_ConstAssignSeen:
-    return GTDEVEL("Missing value expr or illegal syntax following '='");
-  case IDL_GlobalData::PS_ConstExprSeen:
-    return GTDEVEL("Missing ';' or illegal syntax following value expr in const");
-  case IDL_GlobalData::PS_TypedefSeen:
-    return GTDEVEL("Missing type or illegal syntax following TYPEDEF keyword");
-  case IDL_GlobalData::PS_TypeSpecSeen:
-    return GTDEVEL("Missing declarators or illegal syntax following type spec");
-  case IDL_GlobalData::PS_DeclaratorsSeen:
-    return GTDEVEL("Illegal syntax following declarators in TYPEDEF declaration");
-  case IDL_GlobalData::PS_StructSeen:
-    return GTDEVEL("Missing struct identifier following STRUCT keyword");
-  case IDL_GlobalData::PS_StructIDSeen:
-    return GTDEVEL("Missing '{' or illegal syntax following struct identifier");
-  case IDL_GlobalData::PS_StructSqSeen:
-    return GTDEVEL("Illegal syntax following struct '{' opener");
-  case IDL_GlobalData::PS_StructQsSeen:
-    return GTDEVEL("Illegal syntax following struct '}' closer");
-  case IDL_GlobalData::PS_StructBodySeen:
-    return GTDEVEL("Illegal syntax following struct body statement(s)");
-  case IDL_GlobalData::PS_MemberTypeSeen:
-    return GTDEVEL("Illegal syntax of missing identifier following member type");
-  case IDL_GlobalData::PS_MemberDeclsSeen:
-    return GTDEVEL("Illegal syntax following member declarator(s)");
-  case IDL_GlobalData::PS_MemberDeclsCompleted:
-    return GTDEVEL("Missing ',' between member decls of same type(?)");
-  case IDL_GlobalData::PS_UnionSeen:
-    return GTDEVEL("Missing identifier following UNION keyword");
-  case IDL_GlobalData::PS_UnionIDSeen:
-    return GTDEVEL("Illegal syntax following union identifier");
-  case IDL_GlobalData::PS_SwitchSeen:
-    return GTDEVEL("Illegal syntax following SWITCH keyword");
-  case IDL_GlobalData::PS_SwitchOpenParSeen:
-    return GTDEVEL("Illegal syntax following '(' in switch in union");
-  case IDL_GlobalData::PS_SwitchTypeSeen:
-    return GTDEVEL("Illegal syntax following type decl in switch in union");
-  case IDL_GlobalData::PS_SwitchCloseParSeen:
-    return GTDEVEL("Missing union '{' opener");
-  case IDL_GlobalData::PS_UnionSqSeen:
-    return GTDEVEL("Illegal syntax following union '{' opener");
-  case IDL_GlobalData::PS_UnionQsSeen:
-    return GTDEVEL("Illegal syntax following union '}' closer");
-  case IDL_GlobalData::PS_DefaultSeen:
-    return GTDEVEL("Illegal syntax or missing ':' following DEFAULT keyword");
-  case IDL_GlobalData::PS_UnionLabelSeen:
-    return GTDEVEL("Illegal syntax following branch label in union");
-  case IDL_GlobalData::PS_LabelColonSeen:
-    return GTDEVEL("Illegal syntax following ':' in branch label in union");
-  case IDL_GlobalData::PS_LabelExprSeen:
-    return GTDEVEL("Illegal syntax following label expression in union");
-  case IDL_GlobalData::PS_UnionElemSeen:
-  case IDL_GlobalData::PS_UnionElemCompleted:
-    return GTDEVEL("Illegal syntax following union element");
-  case IDL_GlobalData::PS_CaseSeen:
-    return GTDEVEL("Illegal syntax following CASE keyword in union");
-  case IDL_GlobalData::PS_UnionElemTypeSeen:
-    return GTDEVEL("Illegal syntax following type decl in union element");
-  case IDL_GlobalData::PS_UnionElemDeclSeen:
-    return GTDEVEL("Illegal syntax following declarator in union element");
-  case IDL_GlobalData::PS_UnionBodySeen:
-    return GTDEVEL("Illegal syntax following union body statement(s)");
-  case IDL_GlobalData::PS_EnumSeen:
-    return GTDEVEL("Illegal syntax or missing identifier following ENUM keyword");
-  case IDL_GlobalData::PS_EnumIDSeen:
-    return GTDEVEL("Illegal syntax or missing '{' following enum identifier");
-  case IDL_GlobalData::PS_EnumSqSeen:
-    return GTDEVEL("Illegal syntax following enum '{' opener");
-  case IDL_GlobalData::PS_EnumQsSeen:
-    return GTDEVEL("Illegal syntax following enum '}' closer");
-  case IDL_GlobalData::PS_EnumBodySeen:
-    return GTDEVEL("Illegal syntax following enum body statement(s)");
-  case IDL_GlobalData::PS_EnumCommaSeen:
-    return GTDEVEL("Illegal syntax or missing identifier following ',' in enum");
-  case IDL_GlobalData::PS_SequenceSeen:
-    return GTDEVEL("Illegal syntax or missing '<' following SEQUENCE keyword");
-  case IDL_GlobalData::PS_SequenceSqSeen:
-    return GTDEVEL("Illegal syntax or missing type following '<' in sequence");
-  case IDL_GlobalData::PS_SequenceQsSeen:
-    return GTDEVEL("Illegal syntax following '>' in sequence");
-  case IDL_GlobalData::PS_SequenceTypeSeen:
-    return GTDEVEL("Illegal syntax following sequence type declaration");
-  case IDL_GlobalData::PS_SequenceCommaSeen:
-    return
-      GTDEVEL("Illegal syntax of missing size expr following ',' in sequence");
-  case IDL_GlobalData::PS_SequenceExprSeen:
-    return
-      GTDEVEL("Illegal syntax or missing '>' following size expr in sequence");
-  case IDL_GlobalData::PS_StringSeen:
-    return GTDEVEL("Illegal syntax or missing '<' following STRING keyword");
-  case IDL_GlobalData::PS_StringSqSeen:
-    return GTDEVEL("Illegal syntax or missing size expr following '<' in string");
-  case IDL_GlobalData::PS_StringQsSeen:
-    return GTDEVEL("Illegal syntax following '>' in string");
-  case IDL_GlobalData::PS_StringExprSeen:
-    return GTDEVEL("Illegal syntax or missing '>' after size expr in string");
-  case IDL_GlobalData::PS_StringCompleted:
-    return GTDEVEL("Illegal syntax after string declaration");
-  case IDL_GlobalData::PS_ArrayIDSeen:
-    return GTDEVEL("Illegal syntax or missing dimensions after array identifier");
-  case IDL_GlobalData::PS_ArrayCompleted:
-    return GTDEVEL("Illegal syntax after array declaration");
-  case IDL_GlobalData::PS_DimSqSeen:
-    return
-    GTDEVEL("Illegal syntax or missing size expr after '[' in array declaration");
-  case IDL_GlobalData::PS_DimQsSeen:
-    return GTDEVEL("Illegal syntax after ']' in array declaration");
-  case IDL_GlobalData::PS_DimExprSeen:
-    return
-    GTDEVEL("Illegal syntax or missing ']' after size expr in array declaration");
-  case IDL_GlobalData::PS_AttrROSeen:
-    return GTDEVEL("Illegal syntax after READONLY keyword");
-  case IDL_GlobalData::PS_AttrSeen:
-    return GTDEVEL("Illegal syntax after ATTRIBUTE keyword");
-  case IDL_GlobalData::PS_AttrTypeSeen:
-    return GTDEVEL("Illegal syntax after type in attribute declaration");
-  case IDL_GlobalData::PS_AttrDeclsSeen:
-    return GTDEVEL("Illegal syntax after attribute declarators");
-  case IDL_GlobalData::PS_AttrCompleted:
-    return GTDEVEL("Illegal syntax after attribute declaration");
-  case IDL_GlobalData::PS_ExceptSeen:
-    return
-      GTDEVEL("Illegal syntax or missing identifier after EXCEPTION keyword");
-  case IDL_GlobalData::PS_ExceptIDSeen:
-    return GTDEVEL("Illegal syntax or missing '{' after exception identifier");
-  case IDL_GlobalData::PS_ExceptSqSeen:
-    return GTDEVEL("Illegal syntax after exception '{' opener");
-  case IDL_GlobalData::PS_ExceptQsSeen:
-    return GTDEVEL("Illegal syntax after exception '}' closer");
-  case IDL_GlobalData::PS_ExceptBodySeen:
-    return GTDEVEL("Illegal syntax after exception body statement(s)");
-  case IDL_GlobalData::PS_OpAttrSeen:
-    return GTDEVEL("Illegal syntax or missing type after operation attribute");
-  case IDL_GlobalData::PS_OpTypeSeen:
-    return GTDEVEL("Illegal syntax or missing identifier after operation type");
-  case IDL_GlobalData::PS_OpIDSeen:
-    return GTDEVEL("Illegal syntax or missing '(' after operation identifier");
-  case IDL_GlobalData::PS_OpParsCompleted:
-    return GTDEVEL("Illegal syntax after operation parameter list");
-  case IDL_GlobalData::PS_OpRaiseCompleted:
-    return
-      GTDEVEL("Illegal syntax after optional RAISES in operation declaration");
-  case IDL_GlobalData::PS_OpContextCompleted:
-    return
-      GTDEVEL("Illegal syntax after optional CONTEXT in operation declaration");
-  case IDL_GlobalData::PS_OpCompleted:
-    return GTDEVEL("Illegal syntax after operation declaration");
-  case IDL_GlobalData::PS_OpSqSeen:
-    return GTDEVEL("Illegal syntax after operation parameter list '(' opener");
-  case IDL_GlobalData::PS_OpQsSeen:
-    return GTDEVEL("Illegal syntax after operation parameter list ')' closer");
-  case IDL_GlobalData::PS_OpParCommaSeen:
-    return
-      GTDEVEL("Illegal syntax or missing direction in parameter declaration");
-  case IDL_GlobalData::PS_OpParDirSeen:
-    return GTDEVEL("Illegal syntax or missing type in parameter declaration");
-  case IDL_GlobalData::PS_OpParTypeSeen:
-    return
-      GTDEVEL("Illegal syntax or missing declarator in parameter declaration");
-  case IDL_GlobalData::PS_OpParDeclSeen:
-    return GTDEVEL("Illegal syntax following parameter declarator");
-  case IDL_GlobalData::PS_OpRaiseSeen:
-    return GTDEVEL("Illegal syntax or missing '(' after RAISES keyword");
-  case IDL_GlobalData::PS_OpRaiseSqSeen:
-    return GTDEVEL("Illegal syntax after RAISES '(' opener");
-  case IDL_GlobalData::PS_OpRaiseQsSeen:
-    return GTDEVEL("Illegal syntax after RAISES ')' closer");
-  case IDL_GlobalData::PS_OpContextSeen:
-    return GTDEVEL("Illegal syntax or missing '(' after CONTEXT keyword");
-  case IDL_GlobalData::PS_OpContextSqSeen:
-    return GTDEVEL("Illegal syntax after CONTEXT '(' opener");
-  case IDL_GlobalData::PS_OpContextQsSeen:
-    return GTDEVEL("Illegal syntax after CONTEXT ')' closer");
-  case IDL_GlobalData::PS_OpContextCommaSeen:
-    return
-      GTDEVEL("Illegal syntax after ',' in CONTEXT in operation declaration");
-  case IDL_GlobalData::PS_DeclsCommaSeen:
-    return GTDEVEL("Illegal syntax after ',' in declarators list");
-  case IDL_GlobalData::PS_DeclsDeclSeen:
-    return GTDEVEL("Illegal syntax after declarator in declarators list");
-
-  default:
-    return GTDEVEL("Some syntax error");
-  }
-}
-/*
- * Public methods
- */
-
-// Report error messages with various numbers of arguments
-
-void
-UTL_Error::syntax_error(IDL_GlobalData::ParseState ps)
-{
-  idl_error_header(EIDL_SYNTAX_ERROR,
-		   idl_global->lineno(),
-		   idl_global->filename());
-  cerr << parse_state_to_error_message(ps) << "\n";
-  idl_global->set_err_count(idl_global->err_count() + 1);
-}
-
-void
-UTL_Error::error0(UTL_Error::ErrorCode c)
-{
-  idl_error_header(c, idl_global->lineno(), idl_global->filename());
-  cerr << "\n";
-  idl_global->set_err_count(idl_global->err_count() + 1);
-}
-
-void
-UTL_Error::error1(UTL_Error::ErrorCode c, AST_Decl *d)
-{
-  idl_error_header(c, d->line(), d->file_name());
-  d->name()->dump(cerr); cerr << "\n";
-  idl_global->set_err_count(idl_global->err_count() + 1);
-}
-
-void
-UTL_Error::error2(UTL_Error::ErrorCode c, AST_Decl *d1, AST_Decl *d2)
-{
-  idl_error_header(c, d1->line(), d1->file_name());
-  d1->name()->dump(cerr); cerr << ", ";
-  d2->name()->dump(cerr); cerr << "\n";
-  idl_global->set_err_count(idl_global->err_count() + 1);
-}
-
-void
-UTL_Error::error3(UTL_Error::ErrorCode c,
-		  AST_Decl *d1,
-		  AST_Decl *d2,
-		  AST_Decl *d3)
-{
-  idl_error_header(c, d1->line(), d1->file_name());
-  d1->name()->dump(cerr); cerr << ", ";
-  d2->name()->dump(cerr); cerr << ", ";
-  d3->name()->dump(cerr); cerr << "\n";
-  idl_global->set_err_count(idl_global->err_count() + 1);
-}
-
-// Report a failed coercion attempt
-void
-UTL_Error::coercion_error(AST_Expression *v, AST_Expression::ExprType t)
-{
-  idl_error_header(EIDL_COERCION_FAILURE, v->line(), v->file_name());
-  v->dump(cerr);
-  cerr << GTDEVEL(" to ") << exprtype_to_string(t) << "\n";
-  idl_global->set_err_count(idl_global->err_count() + 1);
-}
-
-// Report a failed name lookup attempt
-void
-UTL_Error::lookup_error(UTL_ScopedName *n)
-{
-  idl_error_header(EIDL_LOOKUP_ERROR,
-		   idl_global->lineno(),
-		   idl_global->filename());
-  n->dump(cerr);
-  cerr << "\n";
-  idl_global->set_err_count(idl_global->err_count() + 1);
-}
-
-// Report an attempt to inherit from an interface which was only
-// declared forward but not yet defined
-void
-UTL_Error::inheritance_fwd_error(UTL_ScopedName *n, AST_Interface *f)
-{
-  idl_error_header(EIDL_INHERIT_FWD_ERROR, f->line(), f->file_name());
-  cerr << "interface ";
-  n->dump(cerr);
-  cerr << GTDEVEL(" cannot inherit from forward declared interface ");
-  f->local_name()->dump(cerr);
-  cerr << "\n";
-  idl_global->set_err_count(idl_global->err_count() + 1);
-}
-
-// Report an attempt to inherit from something other than an interface
-void
-UTL_Error::inheritance_error(UTL_ScopedName *n, AST_Decl *d)
-{
-  idl_error_header(EIDL_CANT_INHERIT, d->line(), d->file_name());
-  cerr << " interface ";
-  n->dump(cerr);
-  cerr << GTDEVEL(" attempts to inherit from ");
-  d->dump(cerr);
-  cerr << "\n";
-  idl_global->set_err_count(idl_global->err_count() + 1);
-}
-
-// Report an error while evaluating an expression
-void
-UTL_Error::eval_error(AST_Expression *v)
-{
-  idl_error_header(EIDL_EVAL_ERROR, v->line(), v->file_name());
-  v->dump(cerr);
-  cerr << "\n";
-  idl_global->set_err_count(idl_global->err_count() + 1);
-}
-
-// Report a situation where a constant was expected but we
-// got something else. This may occur in a union when a label
-// evaluates to a non-constant
-void
-UTL_Error::constant_expected(UTL_ScopedName *n, AST_Decl *d)
-{
-  idl_error_header(EIDL_CONSTANT_EXPECTED, d->line(), d->file_name());
-  n->dump(cerr);
-  cerr << GTDEVEL(" bound to ");
-  d->dump(cerr);
-  cerr << "\n";
-  idl_global->set_err_count(idl_global->err_count() + 1);
-}
-
-// Report a situation where an enumerator was expected but we
-// got something else. This may occur in a union with an enum
-// discriminator where a label did not evaluate to a constant
-// enumerator
-void
-UTL_Error::enum_val_expected(AST_Union *u, AST_UnionLabel *l)
-{
-  idl_error_header(EIDL_ENUM_VAL_EXPECTED, u->line(), u->file_name());
-  cerr << " union " << u->local_name()->get_string() << ", ";
-  l->dump(cerr);
-  cerr << "\n";
-  idl_global->set_err_count(idl_global->err_count() + 1);
-}
-
-// Report a situation where an enumerator was received but we
-// could not find it (by name) in an enum. This occurs when
-// a union with an enum discriminator is being parsed, and a
-// label evaluates to an enumerator which is not a member of
-// the enum discriminator type
-void
-UTL_Error::enum_val_lookup_failure(AST_Union *u,
-				AST_Enum *e,
-				UTL_ScopedName *n)
-{
-  idl_error_header(EIDL_ENUM_VAL_NOT_FOUND, u->line(), u->file_name());
-  cerr << " union " << u->local_name()->get_string() << ", ";
-  cerr << " enum " << e->local_name()->get_string() << ", ";
-  cerr << " enumerator ";
-  n->dump(cerr);
-  cerr << "\n";
-  idl_global->set_err_count(idl_global->err_count() + 1);
-}
-
-// Report two or more spellings for an identifier
-void
-UTL_Error::name_case_error(char *b, char *n)
-{
-  idl_error_header(EIDL_NAME_CASE_ERROR,
-		   idl_global->lineno(),
-		   idl_global->filename());
-  cerr << "\"" << b << GTDEVEL("\" and ") << "\"" << n << "\"\n";
-  idl_global->set_err_count(idl_global->err_count() + 1);
-}
-
-// Report an ambiguous definition of a name
-void
-UTL_Error::ambiguous(UTL_Scope *s, AST_Decl *l, AST_Decl *d)
-{
-  idl_error_header(EIDL_AMBIGUOUS, d->line(), d->file_name());
-  cerr << GTDEVEL(" scope: ")
-       << (ScopeAsDecl(s))->local_name()->get_string()
-       << ", ";
-  cerr << GTDEVEL(" collision: ");
-  d->name()->dump(cerr);
-  cerr << " vs. ";
-  l->name()->dump(cerr);
-  cerr << "\n";
-  idl_global->set_err_count(idl_global->err_count() + 1);
-}
-
-// Report a forward declared interface which was never defined
-void
-UTL_Error::fwd_decl_not_defined(AST_Interface *d)
-{
-  idl_error_header(EIDL_DECL_NOT_DEFINED, d->line(), d->file_name());
-  cerr << "interface ";
-  d->local_name()->dump(cerr);
-  cerr << "\n";
-  idl_global->set_err_count(idl_global->err_count() + 1);
-}
-
-// Report lookup in undefined forward declared but undefined interface
-void
-UTL_Error::fwd_decl_lookup(AST_Interface *d, UTL_ScopedName *n)
-{
-  idl_error_header(EIDL_FWD_DECL_LOOKUP,
-		   idl_global->lineno(),
-		   idl_global->filename());
-  cerr << GTDEVEL("trying to look up ");
-  n->dump(cerr);
-  cerr << GTDEVEL(" in undefined forward declared interface ");
-  d->local_name()->dump(cerr);
-  cerr << "\n";
-  idl_global->set_err_count(idl_global->err_count() + 1);
-}
-
-// Report a redefinition inside its own scope
-void
-UTL_Error::redefinition_in_scope(AST_Decl *d, AST_Decl *s)
-{
-  idl_error_header(EIDL_REDEF_SCOPE, d->line(), d->file_name());
-  d->name()->dump(cerr);
-  cerr << ", ";
-  s->name()->dump(cerr);
-  cerr << "\n";
-  idl_global->set_err_count(idl_global->err_count() + 1);
-}
-
-// Report not a type error
-void
-UTL_Error::not_a_type(AST_Decl *d)
-{
-  idl_error_header(EIDL_NOT_A_TYPE,
-		   idl_global->lineno(),
-		   idl_global->filename());
-  if (d == NULL || d->name() == NULL)
-    cerr << GTDEVEL("unknown symbol");
-  else
-    d->name()->dump(cerr);
-  cerr << "\n";
-  idl_global->set_err_count(idl_global->err_count() + 1);
-}
-
-void
-UTL_Error::back_end(long lineno, String *s)
-{
-  idl_error_header(EIDL_BACK_END, lineno, s);
-  idl_global->set_err_count(idl_global->err_count() + 1);
-}
diff --git a/TAO/TAO_IDL/util/utl_exceptlist.cpp b/TAO/TAO_IDL/util/utl_exceptlist.cpp
deleted file mode 100644
index 630085708a6..00000000000
--- a/TAO/TAO_IDL/util/utl_exceptlist.cpp
+++ /dev/null
@@ -1,143 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-// utl_exceptlist.cc
-//
-// Implementation of a list of exceptions
-
-// NOTE: This list class only works correctly because we use single public
-//       inheritance, as opposed to multiple inheritance or public virtual.
-//	 It relies on a type-unsafe cast from UTL_List to subclasses, which
-//	 will cease to operate correctly if you use either multiple or
-//	 public virtual inheritance.
-//
-//	 For portability reasons we have decided to provide both this and
-//	 an implementation of the list classes in terms of templates. If
-//	 your compiler supports templates, please use the files in the
-//	 include/utl_tmpl and util/utl_tmpl directories instead of the
-//	 files by the same names in the include and util directories.
-
-#include	"idl.h"
-#include	"idl_extern.h"
-
-/*
- * Constructor(s)
- */
-
-UTL_ExceptList::UTL_ExceptList(AST_Exception *s, UTL_ExceptList *cdr)
-	      : pd_car_data(s),
-		UTL_List(cdr)
-{
-}
-
-/*
- * Private operations
- */
-
-/*
- * Public operations
- */
-
-// Get list item
-AST_Exception *
-UTL_ExceptList::head()
-{
-  return pd_car_data;
-}
-
-/*
- * Redefinition of inherited virtual operations
- */
-
-// UTL_ExceptList active iterator
-
-/*
- * Constructor
- */
-
-UTL_ExceptlistActiveIterator::UTL_ExceptlistActiveIterator(UTL_ExceptList *s)
-			    : UTL_ListActiveIterator(s)
-{
-}
-
-/*
- * Private operations
- */
-
-/*
- * Public operations
- */
-
-// Get current item
-AST_Exception *
-UTL_ExceptlistActiveIterator::item()
-{
-  if (source == NULL)
-    return NULL;
-  return ((UTL_ExceptList *) source)->head();
-}
-
-/*
- * Redefinition of inherited virtual operations
- */
diff --git a/TAO/TAO_IDL/util/utl_exprlist.cpp b/TAO/TAO_IDL/util/utl_exprlist.cpp
deleted file mode 100644
index f94c1864d8f..00000000000
--- a/TAO/TAO_IDL/util/utl_exprlist.cpp
+++ /dev/null
@@ -1,143 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-// utl_exprlist.cc
-//
-// Implementation of a list of strings
-
-// NOTE: This list class only works correctly because we use single public
-//       inheritance, as opposed to multiple inheritance or public virtual.
-//	 It relies on a type-unsafe cast from UTL_List to subclasses, which
-//	 will cease to operate correctly if you use either multiple or
-//	 public virtual inheritance.
-//
-//	 For portability reasons we have decided to provide both this and
-//	 an implementation of the list classes in terms of templates. If
-//	 your compiler supports templates, please use the files in the
-//	 include/utl_tmpl and util/utl_tmpl directories instead of the
-//	 files by the same names in the include and util directories.
-
-#include	"idl.h"
-#include	"idl_extern.h"
-
-/*
- * Constructor(s)
- */
-
-UTL_ExprList::UTL_ExprList(AST_Expression *s, UTL_ExprList *cdr)
-	    : pd_car_data(s),
-	      UTL_List(cdr)
-{
-}
-
-/*
- * Private operations
- */
-
-/*
- * Public operations
- */
-
-// Get list item
-AST_Expression *
-UTL_ExprList::head()
-{
-  return pd_car_data;
-}
-
-/*
- * Redefinition of inherited virtual operations
- */
-
-// UTL_ExprList active iterator
-
-/*
- * Constructor
- */
-
-UTL_ExprlistActiveIterator::UTL_ExprlistActiveIterator(UTL_ExprList *s)
-			  : UTL_ListActiveIterator(s)
-{
-}
-
-/*
- * Private operations
- */
-
-/*
- * Public operations
- */
-
-// Get current item
-AST_Expression *
-UTL_ExprlistActiveIterator::item()
-{
-  if (source == NULL)
-    return NULL;
-  return ((UTL_ExprList *) source)->head();
-}
-
-/*
- * Redefinition of inherited virtual operations
- */
diff --git a/TAO/TAO_IDL/util/utl_global.cpp b/TAO/TAO_IDL/util/utl_global.cpp
deleted file mode 100644
index 6f222261322..00000000000
--- a/TAO/TAO_IDL/util/utl_global.cpp
+++ /dev/null
@@ -1,577 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-// utl_global.cc - Implementation of class IDL_GlobalData
-//
-
-#include	"idl.h"
-#include	"idl_extern.h"
-
-// Define an increment for the size of the array used to store names of
-// included files
-#undef		INCREMENT
-#define		INCREMENT	64
-
-IDL_GlobalData::IDL_GlobalData()
-    : pd_scopes(NULL),
-      pd_root(NULL),
-      pd_gen(NULL),
-      pd_err(NULL),
-      pd_err_count(0),
-      pd_lineno(0),
-      pd_filename(NULL),
-      pd_main_filename(NULL),
-      pd_real_filename(NULL),
-      pd_in_main_file(I_FALSE),
-      pd_prog_name(NULL),
-      pd_cpp_location(NULL),
-      pd_compile_flags(0),
-      pd_be(NULL),
-      pd_local_escapes(NULL),
-      pd_indent(NULL),
-      pd_pragmas(NULL),
-      pd_read_from_stdin(I_FALSE),
-      pd_include_file_names(NULL),
-      pd_n_include_file_names(0),
-      pd_n_alloced_file_names(0),
-      pd_parse_state(PS_NoState)
-{
-  // empty
-}
-
-// Get or set scopes stack
-UTL_ScopeStack *
-IDL_GlobalData::scopes()
-{
-  return pd_scopes;
-}
-void
-IDL_GlobalData::set_scopes(UTL_ScopeStack *s)
-{
-  pd_scopes = s;
-}
-
-// Get or set root of AST
-AST_Root *
-IDL_GlobalData::root()
-{
-  return pd_root;
-}
-void
-IDL_GlobalData::set_root(AST_Root *r)
-{
-  pd_root = r;
-}
-
-// Get or set generator object
-AST_Generator *
-IDL_GlobalData::gen()
-{
-  return pd_gen;
-}
-void
-IDL_GlobalData::set_gen(AST_Generator *g)
-{
-  pd_gen = g;
-}
-
-// Get or set error object
-UTL_Error *
-IDL_GlobalData::err()
-{
-  return pd_err;
-}
-void
-IDL_GlobalData::set_err(UTL_Error *e)
-{
-  pd_err = e;
-}
-
-// Get or set error count
-long
-IDL_GlobalData::err_count()
-{
-  return pd_err_count;
-}
-void
-IDL_GlobalData::set_err_count(long c)
-{
-  pd_err_count = c;
-}
-
-// Get or set line number
-long
-IDL_GlobalData::lineno()
-{
-  return pd_lineno;
-}
-void
-IDL_GlobalData::set_lineno(long n)
-{
-  pd_lineno = n;
-}
-
-// Get or set file name being read now
-String *
-IDL_GlobalData::filename()
-{
-  return pd_filename;
-}
-void
-IDL_GlobalData::set_filename(String *f)
-{
-  pd_filename = f;
-}
-
-// Get or set main file name
-String *
-IDL_GlobalData::main_filename()
-{
-  return pd_main_filename;
-}
-void
-IDL_GlobalData::set_main_filename(String *n)
-{
-  pd_main_filename = n;
-}
-
-// Get or set real file name
-String *
-IDL_GlobalData::real_filename()
-{
-  return pd_real_filename;
-}
-void
-IDL_GlobalData::set_real_filename(String *n)
-{
-  pd_real_filename = n;
-}
-
-// Get or set indicator whether import is on
-idl_bool
-IDL_GlobalData::imported()
-{
-  return pd_in_main_file ? I_FALSE : pd_import;
-}
-idl_bool
-IDL_GlobalData::import()
-{
-  return pd_import;
-}
-void
-IDL_GlobalData::set_import(idl_bool is_in)
-{
-  pd_import = is_in;
-}
-
-// Get or set indicator whether we're reading the main file now
-idl_bool
-IDL_GlobalData::in_main_file()
-{
-  return pd_in_main_file;
-}
-void
-IDL_GlobalData::set_in_main_file(idl_bool is_in)
-{
-  pd_in_main_file = is_in;
-}
-
-// Get or set stripped file name
-String *
-IDL_GlobalData::stripped_filename()
-{
-  return pd_stripped_filename;
-}
-void
-IDL_GlobalData::set_stripped_filename(String *nm)
-{
-  pd_stripped_filename = nm;
-}
-
-// Get or set cache value for argv[0]
-char *
-IDL_GlobalData::prog_name()
-{
-  return pd_prog_name;
-}
-void
-IDL_GlobalData::set_prog_name(char *pn)
-{
-  pd_prog_name = pn;
-}
-
-// Get or set location to find C preprocessor
-char *
-IDL_GlobalData::cpp_location()
-{
-  return pd_cpp_location;
-}
-void
-IDL_GlobalData::set_cpp_location(char *l)
-{
-  pd_cpp_location = l;
-}
-
-// Get or set IDL compiler flags
-long
-IDL_GlobalData::compile_flags()
-{
-  return pd_compile_flags;
-}
-void
-IDL_GlobalData::set_compile_flags(long cf)
-{
-  pd_compile_flags = cf;
-}
-
-// Get or set BE to be used
-char *
-IDL_GlobalData::be()
-{
-  return pd_be;
-}
-void
-IDL_GlobalData::set_be(char *nbe)
-{
-  pd_be = nbe;
-}
-
-// Get or set local escapes string. This provides additional mechanism
-// to pass information to a BE.
-char *
-IDL_GlobalData::local_escapes()
-{
-  return pd_local_escapes;
-}
-void
-IDL_GlobalData::set_local_escapes(char *e)
-{
-  pd_local_escapes = e;
-}
-
-// Get or set indent object
-UTL_Indenter *
-IDL_GlobalData::indent()
-{
-  return pd_indent;
-}
-void
-IDL_GlobalData::set_indent(UTL_Indenter *i)
-{
-  pd_indent = i;
-}
-
-// Get or set list of pragmas being parsed
-UTL_StrList *
-IDL_GlobalData::pragmas()
-{
-  UTL_StrList *p = pd_pragmas;
-
-  pd_pragmas = NULL;
-  return p;
-}
-void
-IDL_GlobalData::set_pragmas(UTL_StrList *p)
-{
-  pd_pragmas = p;
-}
-
-// Get or set indicator whether we're reading from stdin
-idl_bool
-IDL_GlobalData::read_from_stdin()
-{
-  return pd_read_from_stdin;
-}
-void
-IDL_GlobalData::set_read_from_stdin(idl_bool r)
-{
-  pd_read_from_stdin = r;
-}
-
-// Have we seen this include file name before?
-long
-IDL_GlobalData::seen_include_file_before(String *n)
-{
-  unsigned long i;
-
-  for (i = 0; i < pd_n_include_file_names; i++)
-    if (n->compare(pd_include_file_names[i]))
-      return I_TRUE;
-  return I_FALSE;
-}
-
-// Store a name of an #include file
-void
-IDL_GlobalData::store_include_file_name(String *n)
-{
-  String	**o_include_file_names;
-  unsigned long	  o_n_alloced_file_names,
-		  i;
-
-  /*
-   * Check if we need to store it at all or whether we've seen it already
-   */
-  if (seen_include_file_before(n))
-    return;
-  /*
-   * OK, need to store. Make sure there's space for one more string
-   */
-  if (pd_n_include_file_names == pd_n_alloced_file_names) {
-    if (pd_n_alloced_file_names == 0) {
-      pd_n_alloced_file_names = INCREMENT;
-      pd_include_file_names = new String *[pd_n_alloced_file_names];
-    } else {
-      o_include_file_names = pd_include_file_names;
-      o_n_alloced_file_names = pd_n_alloced_file_names;
-      pd_n_alloced_file_names += INCREMENT;
-      pd_include_file_names = new String *[pd_n_alloced_file_names];
-      for (i = 0; i < o_n_alloced_file_names; i++)
-        pd_include_file_names[i] = o_include_file_names[i];
-      delete [] o_include_file_names;
-    }
-  }
-  /*
-   * Store it
-   */
-  pd_include_file_names[pd_n_include_file_names++] = n;
-}
-
-void
-IDL_GlobalData::set_include_file_names(String **ns)
-{
-  pd_include_file_names = ns;
-}
-
-String **
-IDL_GlobalData::include_file_names()
-{
-  return pd_include_file_names;
-}
-
-void
-IDL_GlobalData::set_n_include_file_names(unsigned long n)
-{
-  pd_n_include_file_names = n;
-}
-
-unsigned long
-IDL_GlobalData::n_include_file_names()
-{
-  return pd_n_include_file_names;
-}
-
-void
-IDL_GlobalData::set_parse_state(ParseState ps)
-{
-  pd_parse_state = ps;
-}
-
-IDL_GlobalData::ParseState
-IDL_GlobalData::parse_state()
-{
-  return pd_parse_state;
-}
-
-/*
- * Convert a PredefinedType to an ExprType
- */
-AST_Expression::ExprType
-IDL_GlobalData::PredefinedTypeToExprType(AST_PredefinedType::PredefinedType pt)
-{
-  switch (pt) {
-  case AST_PredefinedType::PT_long:
-    return AST_Expression::EV_long;
-  case AST_PredefinedType::PT_ulong:
-    return AST_Expression::EV_ulong;
-  case AST_PredefinedType::PT_short:
-    return AST_Expression::EV_short;
-  case AST_PredefinedType::PT_ushort:
-    return AST_Expression::EV_ushort;
-  case AST_PredefinedType::PT_float:
-    return AST_Expression::EV_float;
-  case AST_PredefinedType::PT_double:
-    return AST_Expression::EV_double;
-  case AST_PredefinedType::PT_char:
-    return AST_Expression::EV_char;
-  case AST_PredefinedType::PT_octet:
-    return AST_Expression::EV_octet;
-  case AST_PredefinedType::PT_boolean:
-    return AST_Expression::EV_bool;
-  default:
-    return AST_Expression::EV_any;
-  }
-}
-
-// returns the IDL source file being copiled
-String* IDL_GlobalData::idl_src_file()
-{
-  return this->pd_idl_src_file;
-}
-
-// set the source IDL file that is being parsed
-void IDL_GlobalData::idl_src_file(String *s)
-{
-  this->pd_idl_src_file = s;
-}
-
-/************ Helper functions **************/
-static const char*
-be_change_idl_file_extension (String* idl_file,
-			      const char *new_extension)
-{
-  // @@ This shouldn't happen anyway; but a better error handling
-  // mechanism is needed.
-  if (idl_file == 0 || new_extension == 0)
-    {
-      return 0;
-    }
-
-  static char fname[MAXNAMELEN];
-  ACE_OS::memset (fname, 0, MAXNAMELEN);
-
-  const char* string = idl_file->get_string ();
-
-  // get the base part of the filename
-  const char *base = ACE_OS::strstr (string, ".idl");
-
-  if (base == 0)
-    return 0;
-
-  ACE_OS::strncpy (fname, string, base - string);
-  ACE_OS::strcat (fname, new_extension);
-  return fname;
-}
-
-const char *
-IDL_GlobalData::be_get_client_hdr (String *idl_file_name)
-{
-  return be_change_idl_file_extension (idl_file_name, "C.h");
-}
-
-const char *
-IDL_GlobalData::be_get_client_stub (String *idl_file_name)
-{
-  return be_change_idl_file_extension (idl_file_name, "C.cpp");
-}
-
-const char *
-IDL_GlobalData::be_get_client_inline (String *idl_file_name)
-{
-  return be_change_idl_file_extension (idl_file_name, "C.i");
-}
-
-const char *
-IDL_GlobalData::be_get_server_hdr (String *idl_file_name)
-{
-  return be_change_idl_file_extension (idl_file_name, "S.h");
-}
-
-const char *
-IDL_GlobalData::be_get_server_skeleton (String *idl_file_name)
-{
-  return be_change_idl_file_extension (idl_file_name, "S.cpp");
-}
-
-const char *
-IDL_GlobalData::be_get_server_inline (String *idl_file_name)
-{
-  return be_change_idl_file_extension (idl_file_name, "S.i");
-}
-
-const char *
-IDL_GlobalData::be_get_client_hdr_fname ()
-{
-  return be_get_client_hdr (idl_global->idl_src_file ());
-}
-
-const char * 
-IDL_GlobalData::be_get_client_stub_fname ()
-{
-  return be_get_client_stub (idl_global->idl_src_file ());
-}
-
-const char * 
-IDL_GlobalData::be_get_client_inline_fname ()
-{
-  return be_get_client_inline (idl_global->idl_src_file ());
-}
-
-const char * 
-IDL_GlobalData::be_get_server_hdr_fname ()
-{
-  return be_get_server_hdr (idl_global->idl_src_file ());
-}
-
-const char * 
-IDL_GlobalData::be_get_server_skeleton_fname ()
-{
-  return be_get_server_skeleton (idl_global->idl_src_file ());
-}
-
-const char * 
-IDL_GlobalData::be_get_server_inline_fname ()
-{
-  return be_get_server_inline (idl_global->idl_src_file ());
-}
-
diff --git a/TAO/TAO_IDL/util/utl_identifier.cpp b/TAO/TAO_IDL/util/utl_identifier.cpp
deleted file mode 100644
index 458fcc20c5c..00000000000
--- a/TAO/TAO_IDL/util/utl_identifier.cpp
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-// utl_identifier - Implementation of identifiers
-
-#include	"idl.h"
-#include	"idl_extern.h"
-
-/*
- * Constructors
- */
-
-Identifier::Identifier ()
-  : pv_string (NULL)
-{
-}
-
-Identifier::Identifier (char *s, long, long, long)
-  : pv_string (ACE_OS::strdup (s))
-{
-}
-
-Identifier::~Identifier () 
-{
-  delete pv_string;
-}
-
-// Operations
-
-char *
-Identifier::get_string ()
-{
-  return pv_string;
-}
-
-// Compare two Identifier *
-long
-Identifier::compare (Identifier *o)
-{
-  if (o == NULL) return I_FALSE;
-  if (pv_string == NULL || o->get_string() == NULL)
-    return I_FALSE;
-  return (ACE_OS::strcmp (pv_string, o->get_string ()) == 0) ? I_TRUE : I_FALSE;
-}
-
-// Dumping
-
-void
-Identifier::dump (ostream &o)
-{
-  if (pv_string == NULL) return;
-
-  o << get_string();
-}
-
diff --git a/TAO/TAO_IDL/util/utl_idlist.cpp b/TAO/TAO_IDL/util/utl_idlist.cpp
deleted file mode 100644
index bf143f06d5f..00000000000
--- a/TAO/TAO_IDL/util/utl_idlist.cpp
+++ /dev/null
@@ -1,187 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-// utl_idlist.cc
-//
-// Implementation of a list of utl_string nodes
-
-// NOTE: This list class only works correctly because we use single public
-//       inheritance, as opposed to multiple inheritance or public virtual.
-//	 It relies on a type-unsafe cast from UTL_List to subclasses, which
-//	 will cease to operate correctly if you use either multiple or
-//	 public virtual inheritance.
-//
-//	 For portability reasons we have decided to provide both this and
-//	 an implementation of the list classes in terms of templates. If
-//	 your compiler supports templates, please use the files in the
-//	 include/utl_tmpl and util/utl_tmpl directories instead of the
-//	 files by the same names in the include and util directories.
-
-#include	"idl.h"
-#include	"idl_extern.h"
-
-/*
- * Constructor(s)
- */
-
-UTL_IdList::UTL_IdList (Identifier *s, UTL_IdList *cdr)
-  : pd_car_data (s),
-    UTL_List ((UTL_List *) cdr)
-{
-}
-
-/*
- * Private operations
- */
-
-/*
- * Public operations
- */
-
-// Copy a list
-UTL_List *
-UTL_IdList::copy ()
-{
-  if (tail () == NULL)
-    return (UTL_List *) new UTL_IdList (head (), NULL);
-  return (UTL_List *) new UTL_IdList (head (), (UTL_IdList *) tail ()->copy ());
-}
-
-// Get list item
-Identifier *
-UTL_IdList::head ()
-{
-    return pd_car_data;
-}
-
-// Get last item of this list
-Identifier *
-UTL_IdList::last_component ()
-{
-  if (tail()== NULL)
-    return head ();
-  return ((UTL_IdList *) tail ())->last_component ();
-}
-
-// AST Dumping
-void
-UTL_IdList::dump (ostream &o)
-{
-  UTL_IdListActiveIterator	*i = new UTL_IdListActiveIterator (this);
-  long				first = I_TRUE;
-  long				second = I_FALSE;
-
-  while (!(i->is_done ())) 
-    {
-      if (!first)
-        o << "::";
-      else if (second)
-        first = second = I_FALSE;
-      i->item ()->dump (o);
-      if (first) 
-        {
-          if (ACE_OS::strcmp (i->item ()->get_string (), "::") != 0)
-            first = I_FALSE;
-          else
-            second = I_TRUE;
-        }
-      i->next ();
-    }
-}
-
-/*
- * Redefinition of inherited virtual operations
- */
-
-// UTL_IdList active iterator
-
-/*
- * Constructor
- */
-
-UTL_IdListActiveIterator::UTL_IdListActiveIterator (UTL_IdList *s)
-    : UTL_ListActiveIterator (s)
-{
-}
-
-/*
- * Private operations
- */
-
-/*
- * Public operations
- */
-
-// Get current item
-Identifier *
-UTL_IdListActiveIterator::item ()
-{
-    if (source == NULL)
-        return NULL;
-    return ((UTL_IdList *) source)->head ();
-}
-
-/*
- * Redefinition of inherited virtual operations
- */
diff --git a/TAO/TAO_IDL/util/utl_indenter.cpp b/TAO/TAO_IDL/util/utl_indenter.cpp
deleted file mode 100644
index 0ebbdf7899d..00000000000
--- a/TAO/TAO_IDL/util/utl_indenter.cpp
+++ /dev/null
@@ -1,131 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-// utl_indenter.cc - Implementation of indenter for dumping IDL AST
-//
-
-#include	"idl.h"
-#include	"idl_extern.h"
-
-/*
- * Constructors
- */
-UTL_Indenter::UTL_Indenter ()
-  : pd_indent_level (0)
-{
-}
-
-/*
- * Private operations
- */
-
-/*
- * Public operations
- */
-
-// Reset indentation level
-void
-UTL_Indenter::reset ()
-{
-  pd_indent_level = 0;
-}
-
-// Increase indentation level
-void
-UTL_Indenter::increase ()
-{
-  pd_indent_level++;
-}
-
-// Decrease indentation level
-void
-UTL_Indenter::decrease ()
-{
-  if (pd_indent_level > 0)
-    pd_indent_level--;
-}
-
-// Produce white space to indent to current indentation level on ostream o
-void
-UTL_Indenter::skip_to (ostream &o)
-{
-  long i;
-
-  for (i = 0; i < pd_indent_level; i++)
-    o << "  ";
-}
-
-// Produce white space to indent to current indentation level on ostream o
-void
-UTL_Indenter::skip_to (FILE *fp)
-{
-  long i;
-
-  for (i = 0; i < pd_indent_level; i++)
-    ACE_OS::fprintf (fp, "  ");
-}
-
-/*
- * Redefined virtual operations
- */
diff --git a/TAO/TAO_IDL/util/utl_labellist.cpp b/TAO/TAO_IDL/util/utl_labellist.cpp
deleted file mode 100644
index a88f95d4c17..00000000000
--- a/TAO/TAO_IDL/util/utl_labellist.cpp
+++ /dev/null
@@ -1,143 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-// utl_labellist.cc
-//
-// Implementation of a list of scoped names
-
-// NOTE: This list class only works correctly because we use single public
-//       inheritance, as opposed to multiple inheritance or public virtual.
-//	 It relies on a type-unsafe cast from UTL_List to subclasses, which
-//	 will cease to operate correctly if you use either multiple or
-//	 public virtual inheritance.
-//
-//	 For portability reasons we have decided to provide both this and
-//	 an implementation of the list classes in terms of templates. If
-//	 your compiler supports templates, please use the files in the
-//	 include/utl_tmpl and util/utl_tmpl directories instead of the
-//	 files by the same names in the include and util directories.
-
-#include	"idl.h"
-#include	"idl_extern.h"
-
-/*
- * Constructor(s)
- */
-
-UTL_LabelList::UTL_LabelList(AST_UnionLabel *s, UTL_LabelList *cdr)
-	     : pd_car_data(s),
-	       UTL_List(cdr)
-{
-}
-
-/*
- * Private operations
- */
-
-/*
- * Public operations
- */
-
-// Get list item
-AST_UnionLabel *
-UTL_LabelList::head()
-{
-  return pd_car_data;
-}
-
-/*
- * Redefinition of inherited virtual operations
- */
-
-// UTL_LabelList active iterator
-
-/*
- * Constructor
- */
-
-UTL_LabellistActiveIterator::UTL_LabellistActiveIterator(UTL_LabelList *s)
-			   : UTL_ListActiveIterator(s)
-{
-}
-
-/*
- * Private operations
- */
-
-/*
- * Public operations
- */
-
-// Get current item
-AST_UnionLabel *
-UTL_LabellistActiveIterator::item()
-{
-  if (source == NULL)
-    return NULL;
-  return ((UTL_LabelList *) source)->head();
-}
-
-/*
- * Redefinition of inherited virtual operations
- */
diff --git a/TAO/TAO_IDL/util/utl_list.cpp b/TAO/TAO_IDL/util/utl_list.cpp
deleted file mode 100644
index b6eb1dd16f4..00000000000
--- a/TAO/TAO_IDL/util/utl_list.cpp
+++ /dev/null
@@ -1,195 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-// utl_list.cc
-//
-// Implementation of generic single-linked lists
-
-// NOTE: This list class only works correctly because we use single public
-//       inheritance, as opposed to multiple inheritance or public virtual.
-//	 It relies on a type-unsafe cast from UTL_List to subclasses, which
-//	 will cease to operate correctly if you use either multiple or
-//	 public virtual inheritance.
-//
-//	 For portability reasons we have decided to provide both this and
-//	 an implementation of the list classes in terms of templates. If
-//	 your compiler supports templates, please use the files in the
-//	 include/utl_tmpl and util/utl_tmpl directories instead of the
-//	 files by the same names in the include and util directories.
-
-#include	"idl.h"
-#include	"idl_extern.h"
-
-/*
- * Constructor(s)
- */
-
-UTL_List::UTL_List(UTL_List *c)
-	: pd_cdr_data(c) 
-{
-}
-
-/*
- * Private operations
- */
-
-// Compute list length
-long
-UTL_List::list_length(long n)
-{
-  if (pd_cdr_data == NULL)
-    return n;
-  else
-    return pd_cdr_data->list_length(n+1);
-}
-
-/*
- * Public operations
- */
-
-// Smash last cdr with l
-void
-UTL_List::nconc(UTL_List *l)
-{
-  if (pd_cdr_data == NULL)
-    pd_cdr_data = l;
-  else
-    pd_cdr_data->nconc(l);
-}
-
-/*
- * Override this operation to copy lists of other types
- */
-// Copy a list
-UTL_List *
-UTL_List::copy()
-{
-  if (pd_cdr_data == NULL)
-    return new UTL_List(NULL);
-  return new UTL_List(pd_cdr_data->copy());
-}
-
-// Get next list
-UTL_List *
-UTL_List::tail()
-{
-  return pd_cdr_data;
-}
-
-// Set next list
-void
-UTL_List::set_tail(UTL_List *l)
-{
-  pd_cdr_data = l;
-}
-
-// Compute list length
-long
-UTL_List::length()
-{
-  return list_length(1);
-}
-
-/*
- * Redefinition of inherited virtual operations
- */
-
-// UTL_List active iterator
-
-/*
- * Constructor
- */
-
-UTL_ListActiveIterator::UTL_ListActiveIterator(UTL_List *s)
-		      : source(s)
-{
-}
-
-/*
- * Private operations
- */
-
-/*
- * Public operations
- */
-
-// Is iterator done?
-long
-UTL_ListActiveIterator::is_done()
-{
-  return (source == NULL) ? I_TRUE : I_FALSE;
-}
-
-// Advance to next item
-void
-UTL_ListActiveIterator::next()
-{
-  if (source != NULL)
-    source = source->tail();
-}
-
-/*
- * Redefinition of inherited operations
- */
-
diff --git a/TAO/TAO_IDL/util/utl_namelist.cpp b/TAO/TAO_IDL/util/utl_namelist.cpp
deleted file mode 100644
index 6a7ee74819c..00000000000
--- a/TAO/TAO_IDL/util/utl_namelist.cpp
+++ /dev/null
@@ -1,143 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-// utl_namelist.cc
-//
-// Implementation of a list of scoped names
-
-// NOTE: This list class only works correctly because we use single public
-//       inheritance, as opposed to multiple inheritance or public virtual.
-//	 It relies on a type-unsafe cast from UTL_List to subclasses, which
-//	 will cease to operate correctly if you use either multiple or
-//	 public virtual inheritance.
-//
-//	 For portability reasons we have decided to provide both this and
-//	 an implementation of the list classes in terms of templates. If
-//	 your compiler supports templates, please use the files in the
-//	 include/utl_tmpl and util/utl_tmpl directories instead of the
-//	 files by the same names in the include and util directories.
-
-#include	"idl.h"
-#include	"idl_extern.h"
-
-/*
- * Constructor(s)
- */
-
-UTL_NameList::UTL_NameList(UTL_ScopedName *s, UTL_NameList *cdr)
-	    : pd_car_data(s),
-	      UTL_List(cdr)
-{
-}
-
-/*
- * Private operations
- */
-
-/*
- * Public operations
- */
-
-// Get list item
-UTL_ScopedName *
-UTL_NameList::head()
-{
-  return pd_car_data;
-}
-
-/*
- * Redefinition of inherited virtual operations
- */
-
-// UTL_NameList active iterator
-
-/*
- * Constructor
- */
-
-UTL_NamelistActiveIterator::UTL_NamelistActiveIterator(UTL_NameList *s)
-			    : UTL_ListActiveIterator(s)
-{
-}
-
-/*
- * Private operations
- */
-
-/*
- * Public operations
- */
-
-// Get current item
-UTL_ScopedName *
-UTL_NamelistActiveIterator::item()
-{
-  if (source == NULL)
-    return NULL;
-  return ((UTL_NameList *) source)->head();
-}
-
-/*
- * Redefinition of inherited virtual operations
- */
diff --git a/TAO/TAO_IDL/util/utl_scope.cpp b/TAO/TAO_IDL/util/utl_scope.cpp
deleted file mode 100644
index f9d6e21ebb5..00000000000
--- a/TAO/TAO_IDL/util/utl_scope.cpp
+++ /dev/null
@@ -1,1189 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-/*
- * utl_scope.cc - Implementation of class UTL_Scope
- */
-
-#include	"idl.h"
-#include	"idl_extern.h"
-
-#undef	INCREMENT
-#define	INCREMENT	64
-
-/*
- * Static functions
- */
-static Identifier	*_global_scope_name = NULL;
-static Identifier	*_global_scope_root_name = NULL;
-
-/*
- * Determines if a name is global
- */
-static long
-is_global_name(Identifier *i)
-{
-  long comp_result = 0;
-  char *s;
-
-  if (i == NULL) return comp_result;
-  s = i->get_string();
-
-  if (_global_scope_name == NULL)
-    _global_scope_name = new Identifier("::", 1, 0, I_FALSE);
-
-  if (_global_scope_root_name == NULL)
-    _global_scope_root_name = new Identifier("", 1, 0, I_FALSE);
-
-  comp_result = i->compare(_global_scope_name);
-  if (!comp_result)
-    comp_result = i->compare(_global_scope_root_name);
-
-  return comp_result;
-}
-
-/*
- * Helper function for lookup_by_name. Iterates doing local lookups of
- * subsequent components of a scoped name
- */
-static AST_Decl *
-iter_lookup_by_name_local(AST_Decl *d, UTL_ScopedName *e,
-			  idl_bool treat_as_ref)
-{
-  Identifier			*s;
-  AST_Typedef			*td;
-  UTL_IdListActiveIterator	*i;
-  UTL_Scope			*sc;
-
-  i = new UTL_IdListActiveIterator(e);
-  for (i->next(); !(i->is_done()); ) {
-    s = i->item();
-    /*
-     * Update iterator before loop. This is needed for the check for
-     * typedef, since we only want to look at the base type if there
-     * actually are more components of the name to resolve.
-     */
-    i->next();
-    /*
-     * Next component in name was not found
-     */
-    if (d == NULL) {
-      return NULL;
-    }
-    /*
-     * If this is a typedef and we're not done, we should get the
-     * base type to get the scope it defines (if any)
-     */
-    if (!(i->is_done())) {
-      while (d != NULL && d->node_type() == AST_Decl::NT_typedef) {
-        td = AST_Typedef::narrow_from_decl(d);
-	if (td == NULL)
-	  return NULL;
-	d = td->base_type();
-      }
-      if (d == NULL)
-        return NULL;
-    }
-    /*
-     * Try to convert the AST_Decl to a UTL_Scope
-     */
-    sc = DeclAsScope(d);
-    if (sc == NULL)
-      return NULL;
-    /*
-     * Look up the next element
-     */
-    d = sc->lookup_by_name_local(s, treat_as_ref);
-  }
-  /*
-   * OK, done with the loop
-   */
-  return d;
-}
-
-/*
- * Constructor(s)
- */
-UTL_Scope::UTL_Scope()
-	 : pd_scope_node_type(AST_Decl::NT_module),
-	   pd_decls(NULL),
-	   pd_decls_allocated(0),
-	   pd_decls_used(0),
-	   pd_local_types(NULL),
-	   pd_locals_allocated(0),
-	   pd_locals_used(0),
-	   pd_referenced(NULL),
-	   pd_referenced_allocated(0),
-	   pd_referenced_used(0)
-{
-}
-
-UTL_Scope::UTL_Scope(AST_Decl::NodeType nt)
-	 : pd_scope_node_type(nt),
-	   pd_decls(NULL),
-	   pd_decls_allocated(0),
-	   pd_decls_used(0),
-	   pd_local_types(NULL),
-	   pd_locals_allocated(0),
-	   pd_locals_used(0),
-	   pd_referenced(NULL),
-	   pd_referenced_allocated(0),
-	   pd_referenced_used(0)
-{
-};
-
-/*
- * Private operations
- */
-
-static 
-AST_Decl * add_type(AST_Type *type)
-{
-  AST_Decl * result = 0;
-  UTL_Scope * scope = 0;
-  switch (type->node_type()) {
-    case AST_Decl::NT_array:
-      result =
-        idl_global->root()->add_array(AST_Array::narrow_from_decl(type));
-      break;
-    case AST_Decl::NT_enum:
-      result = type->defined_in()->add_enum(AST_Enum::narrow_from_decl(type));
-      scope = AST_Enum::narrow_from_decl(type); 
-      break;
-    case AST_Decl::NT_sequence:
-      result =
-	idl_global->root()->add_sequence(AST_Sequence::narrow_from_decl(type));
-      break;
-    case AST_Decl::NT_string:
-      result = 
-	idl_global->root()->add_string(AST_String::narrow_from_decl(type));
-      break;
-    case AST_Decl::NT_struct:
-      result = 
-        type->defined_in()->
-          add_structure(AST_Structure::narrow_from_decl(type));
-      scope = AST_Structure::narrow_from_decl(type);
-      break;
-    case AST_Decl::NT_union:
-      result =
-	type->defined_in()->add_union(AST_Union::narrow_from_decl(type));
-      scope = AST_Union::narrow_from_decl(type);
-      break;
-    default:
-      // for non-complex types, like predefined types
-      // no additional add needed, assume everything is ok
-      result = (AST_Decl *) 1;
-      break;
-  }
-  if (scope)
-    result = scope->call_add();
-  return result; 
-}
-
-/*
- * Protected operations
- */
-
-/*
- * Special version of lookup which only looks at the local name instead of
- * the fully scoped name, when doing lookups. This version is intended to
- * be used only by the CFE add_xxx functions
- */
-AST_Decl *
-UTL_Scope::lookup_for_add(AST_Decl *d, idl_bool treat_as_ref)
-{
-  if (d == NULL)
-    return NULL;
-  return lookup_by_name_local(d->local_name(), treat_as_ref);
-}
-
-/*
- * Public operations
- */
-
-// Narrowing
-IMPL_NARROW_METHODS0(UTL_Scope)
-IMPL_NARROW_FROM_SCOPE(UTL_Scope)
-
-// Scope Management Protocol
-//
-// All members of the protocol defined in UTL_Scope simply return the node
-// and don't do a thing. These members are simply dummies to retain
-// compatibility with pre-two-pass compiler back-ends.
-
-AST_PredefinedType *UTL_Scope::add_predefined_type(AST_PredefinedType *p)
-{
-  if (p == NULL) return NULL;
-  p->set_added(I_TRUE);
-  return p;
-}
-
-AST_Module *UTL_Scope::add_module(AST_Module *m)
-{
-  if (m == NULL) return NULL;
-  m->set_added(I_TRUE);
-  return m;
-}
-
-AST_Interface *UTL_Scope::add_interface(AST_Interface *i)
-{
-  if (i == NULL) return NULL;
-  i->set_added(I_TRUE);
-  return i;
-}
-
-AST_InterfaceFwd *UTL_Scope::add_interface_fwd(AST_InterfaceFwd *i)
-{
-  if (i == NULL) return NULL;
-  i->set_added(I_TRUE);
-  return i;
-}
-
-AST_Exception *UTL_Scope::add_exception(AST_Exception *e)
-{
-  if (e == NULL) return NULL;
-  e->set_added(I_TRUE);
-  return e;
-}
-
-AST_Constant *UTL_Scope::add_constant(AST_Constant *c)
-{
-  if (c == NULL) return NULL;
-  c->set_added(I_TRUE);
-  return c;
-}
-
-UTL_StrList *UTL_Scope::add_context(UTL_StrList *c)
-{
-  return c;
-}
-
-UTL_NameList *UTL_Scope::add_exceptions(UTL_NameList *e)
-{
-  return e;
-}
-
-AST_Attribute *UTL_Scope::add_attribute(AST_Attribute *a)
-{
-  if (a == NULL) return NULL;
-  a->set_added(I_TRUE);
-  if (!a->field_type()->added()) {
-    return add_type(a->field_type()) ? a : 0 ;
-  } else
-    return a;
-}
-
-AST_Operation *UTL_Scope::add_operation(AST_Operation *o)
-{
-  if (o == NULL) return NULL;
-  o->set_added(I_TRUE);
-  if (!o->return_type()->added()) {
-    return add_type(o->return_type()) ? o : 0 ;
-  } else
-    return o;
-}
-
-AST_Argument *UTL_Scope::add_argument(AST_Argument *a)
-{
-  if (a == NULL) return NULL;
-  a->set_added(I_TRUE);
-  if (!a->field_type()->added()) {
-    return add_type(a->field_type()) ? a : 0 ;
-  } else
-    return a;
-}
-
-AST_Union *UTL_Scope::add_union(AST_Union *u)
-{
-  if (u == NULL) return NULL;
-  u->set_added(I_TRUE);
-  return u;
-}
-
-AST_UnionBranch *UTL_Scope::add_union_branch(AST_UnionBranch *u)
-{
-  if (u == NULL) return NULL;
-  u->set_added(I_TRUE);
-  if (!u->field_type()->added()) {
-    return add_type(u->field_type()) ? u : 0 ;
-  } else 
-    return u;
-}
-
-AST_Structure *UTL_Scope::add_structure(AST_Structure *s)
-{
-  if (s == NULL) return NULL;
-  s->set_added(I_TRUE);
-  return s;
-}
-
-AST_Field *UTL_Scope::add_field(AST_Field *f)
-{
-  if (f == NULL) return NULL;
-  f->set_added(I_TRUE);
-  if (!f->field_type()->added()) {
-    return add_type(f->field_type()) ? f : 0 ;
-  } else
-    return f;
-}
-
-AST_Enum *UTL_Scope::add_enum(AST_Enum *e)
-{
-  if (e == NULL) return NULL;
-  e->set_added(I_TRUE);
-  return e;
-}
-
-AST_EnumVal *UTL_Scope::add_enum_val(AST_EnumVal *e)
-{
-  if (e == NULL) return NULL;
-  e->set_added(I_TRUE);
-  return e;
-}
-
-AST_Typedef *UTL_Scope::add_typedef(AST_Typedef *t)
-{
-  if (t == NULL) return NULL;
-  t->set_added(I_TRUE);
-  if (!t->base_type()->added()) {
-    return add_type(t->base_type()) ? t : 0 ;
-  } else 
-    return t;
-}
-
-AST_Sequence *UTL_Scope::add_sequence(AST_Sequence *s)
-{
-  if (s == NULL) return NULL;
-  s->set_added(I_TRUE);
-  if (!s->base_type()->added()) {
-    return add_type(s->base_type()) ? s : 0 ;
-  } else
-    return s;
-}
-
-AST_String *UTL_Scope::add_string(AST_String *s)
-{
-  if (s == NULL) return NULL;
-  s->set_added(I_TRUE);
-  return s;
-}
-
-AST_Array *UTL_Scope::add_array(AST_Array *a)
-{
-  if (a == NULL) return NULL;
-  a->set_added(I_TRUE);
-  if (!a->base_type()->added()) {
-    return add_type(a->base_type()) ? a : 0 ;
-  } else 
-    return a;
-}
-
-// Protected Front End Scope Management Protocol
-//
-// All members of the protocol defined in UTL_Scope simply return NULL
-// and don't do a thing. This ensures that runtime errors will discover
-// operations which should have been redefined to allow certain kinds of
-// AST nodes to appear in a given context
-
-AST_PredefinedType *UTL_Scope::fe_add_predefined_type(AST_PredefinedType *)
-{
-  return NULL;
-}
-
-AST_Module *UTL_Scope::fe_add_module(AST_Module *)
-{
-  return NULL;
-}
-
-AST_Interface *UTL_Scope::fe_add_interface(AST_Interface *)
-{
-  return NULL;
-}
-
-AST_InterfaceFwd *UTL_Scope::fe_add_interface_fwd(AST_InterfaceFwd *)
-{
-  return NULL;
-}
-
-AST_Exception *UTL_Scope::fe_add_exception(AST_Exception *)
-{
-  return NULL;
-}
-
-AST_Constant *UTL_Scope::fe_add_constant(AST_Constant *)
-{
-  return NULL;
-}
-
-UTL_StrList *UTL_Scope::fe_add_context(UTL_StrList *)
-{
-  return NULL;
-}
-
-UTL_NameList *UTL_Scope::fe_add_exceptions(UTL_NameList *)
-{
-  return NULL;
-}
-
-AST_Attribute *UTL_Scope::fe_add_attribute(AST_Attribute *)
-{
-  return NULL;
-}
-
-AST_Operation *UTL_Scope::fe_add_operation(AST_Operation *)
-{
-  return NULL;
-}
-
-AST_Argument *UTL_Scope::fe_add_argument(AST_Argument *)
-{
-  return NULL;
-}
-
-AST_Union *UTL_Scope::fe_add_union(AST_Union *)
-{
-  return NULL;
-}
-
-AST_UnionBranch *UTL_Scope::fe_add_union_branch(AST_UnionBranch *)
-{
-  return NULL;
-}
-
-AST_Structure *UTL_Scope::fe_add_structure(AST_Structure *)
-{
-  return NULL;
-}
-
-AST_Field *UTL_Scope::fe_add_field(AST_Field *)
-{
-  return NULL;
-}
-
-AST_Enum *UTL_Scope::fe_add_enum(AST_Enum *)
-{
-  return NULL;
-}
-
-AST_EnumVal *UTL_Scope::fe_add_enum_val(AST_EnumVal *)
-{
-  return NULL;
-}
-
-AST_Typedef *UTL_Scope::fe_add_typedef(AST_Typedef *)
-{
-  return NULL;
-}
-
-AST_Sequence *UTL_Scope::fe_add_sequence(AST_Sequence *)
-{
-  return NULL;
-}
-
-AST_String *UTL_Scope::fe_add_string(AST_String *)
-{
-  return NULL;
-}
-
-AST_Array *UTL_Scope::fe_add_array(AST_Array *)
-{
-  return NULL;
-}
-
-// This is the second pass of the front end
-// It calls the public add protocol on everything in scope.
-// It calls the add_xx functions of the most derived AST_Node.
-
-AST_Decl *UTL_Scope::call_add()
-{
-  AST_Decl 		*result = NULL;
-  AST_Decl 		*decl;
-
-  UTL_ScopeActiveIterator *i;
-  UTL_Scope *scope;
-
-  i = new UTL_ScopeActiveIterator(this, UTL_Scope::IK_decls);
-  while(!(i->is_done())) {
-    decl = i->item();
-    scope = 0;
-    switch (decl->node_type()) {
-      case AST_Decl::NT_argument: 
-        result = add_argument(AST_Argument::narrow_from_decl(decl));
-  	break;
-      case AST_Decl::NT_array:
-    	result = add_array(AST_Array::narrow_from_decl(decl));
-	break;
-      case AST_Decl::NT_attr: 
-        result = add_attribute(AST_Attribute::narrow_from_decl(decl));
-	break;
-      case AST_Decl::NT_const:
-        result = add_constant(AST_Constant::narrow_from_decl(decl));
-	break;
-      case AST_Decl::NT_enum:
-        scope = AST_Enum::narrow_from_decl(decl);
-        result = add_enum(AST_Enum::narrow_from_decl(decl));
-	break;
-      case AST_Decl::NT_enum_val:
-        result = add_enum_val(AST_EnumVal::narrow_from_decl(decl)); 
-	break;
-      case AST_Decl::NT_except:
-        scope = AST_Exception::narrow_from_decl(decl);
-        result = add_exception(AST_Exception::narrow_from_decl(decl));
-	break;
-      case AST_Decl::NT_field:
-        result = add_field(AST_Field::narrow_from_decl(decl));
-	break;
-      case AST_Decl::NT_interface:
-        scope = AST_Interface::narrow_from_decl(decl);
-        result = add_interface(AST_Interface::narrow_from_decl(decl));
-	break;
-      case AST_Decl::NT_interface_fwd:
-        result = add_interface_fwd(AST_InterfaceFwd::narrow_from_decl(decl));
-	break;
-      case AST_Decl::NT_module:
-      	scope = AST_Module::narrow_from_decl(decl);
-  	result = add_module(AST_Module::narrow_from_decl(decl)); 
-  	break;
-      case AST_Decl::NT_op:
-	result = add_operation(AST_Operation::narrow_from_decl(decl));
-        scope = AST_Operation::narrow_from_decl(decl);
-	break;
-      case AST_Decl::NT_pre_defined:
-        result =
-	  add_predefined_type(AST_PredefinedType::narrow_from_decl(decl));
- 	break;
-      case AST_Decl::NT_sequence:
-        result = add_sequence(AST_Sequence::narrow_from_decl(decl));
- 	break;
-      case AST_Decl::NT_string:
-        result = add_string(AST_String::narrow_from_decl(decl));
-	break;
-      case AST_Decl::NT_struct:
-        result = add_structure(AST_Structure::narrow_from_decl(decl));
-        scope = AST_Structure::narrow_from_decl(decl);
-  	break;
-      case AST_Decl::NT_typedef:
-        result = add_typedef(AST_Typedef::narrow_from_decl(decl));
-	break;
-      case AST_Decl::NT_union:
-        result = add_union(AST_Union::narrow_from_decl(decl));
-        scope = AST_Union::narrow_from_decl(decl);
-	break;
-      case AST_Decl::NT_union_branch:
-        result = add_union_branch(AST_UnionBranch::narrow_from_decl(decl));
-	break;
-      default:
-        return NULL;
-    }
-    if (scope)
-      scope->call_add();
-    i->next();
-  }
-  return result;
-}
-
-// Private lookup mechanism
-
-/*
- * Lookup the node for a primitive (built in) type
- */
-AST_Decl *
-UTL_Scope::lookup_primitive_type(AST_Expression::ExprType et)
-{
-  AST_Decl		   *as_decl;
-  UTL_Scope		   *ancestor;
-  AST_PredefinedType	   *t;
-  UTL_ScopeActiveIterator *i;
-  AST_PredefinedType::PredefinedType pdt;
-
-  as_decl = ScopeAsDecl(this);
-  if (as_decl == NULL)
-    return NULL;
-  ancestor = as_decl->defined_in();
-  if (ancestor != NULL)
-    return ancestor->lookup_primitive_type(et);
-
-  switch (et) {
-  case AST_Expression::EV_short:
-    pdt = AST_PredefinedType::PT_short;
-    break;
-  case AST_Expression::EV_ushort:
-    pdt = AST_PredefinedType::PT_ushort;
-    break;
-  case AST_Expression::EV_long:
-    pdt = AST_PredefinedType::PT_long;
-    break;
-  case AST_Expression::EV_ulong:
-    pdt = AST_PredefinedType::PT_ulong;
-    break;
-  case AST_Expression::EV_longlong:
-    pdt = AST_PredefinedType::PT_longlong;
-    break;
-  case AST_Expression::EV_ulonglong:
-    pdt = AST_PredefinedType::PT_ulonglong;
-    break;
-  case AST_Expression::EV_float:
-    pdt = AST_PredefinedType::PT_float;
-    break;
-  case AST_Expression::EV_double:
-    pdt = AST_PredefinedType::PT_double;
-    break;
-  case AST_Expression::EV_longdouble:
-    pdt = AST_PredefinedType::PT_longdouble;
-    break;
-  case AST_Expression::EV_char:
-    pdt = AST_PredefinedType::PT_char;
-    break;
-  case AST_Expression::EV_wchar:
-    pdt = AST_PredefinedType::PT_wchar;
-    break;
-  case AST_Expression::EV_octet:
-    pdt = AST_PredefinedType::PT_octet;
-    break;
-  case AST_Expression::EV_bool:
-    pdt = AST_PredefinedType::PT_boolean;
-    break;
-  case AST_Expression::EV_any:
-    pdt = AST_PredefinedType::PT_any;
-    break;
-  case AST_Expression::EV_void:
-    pdt = AST_PredefinedType::PT_void;
-    break;
-  case AST_Expression::EV_string:
-  case AST_Expression::EV_wstring:
-  case AST_Expression::EV_none:
-  default:
-    return NULL;
-  }
-  i = new UTL_ScopeActiveIterator(this, UTL_Scope::IK_decls);
-  while (!(i->is_done())) {
-    as_decl = i->item();
-    if (as_decl->node_type() == AST_Decl::NT_pre_defined) {
-      t = AST_PredefinedType::narrow_from_decl(as_decl);
-      if (t == NULL) {
-        i->next();
-        continue;
-      }
-      if (t->pt() == pdt) {
-	delete i;
-	return t;
-      }
-    }
-    i->next();
-  }
-  delete i;
-  return NULL;
-}
-
-/*
- * Look through inherited interfaces
- */
-AST_Decl *
-UTL_Scope::look_in_inherited(UTL_ScopedName *e, idl_bool treat_as_ref)
-{
-  AST_Decl		*d = NULL;
-  AST_Interface		*i = AST_Interface::narrow_from_scope(this);
-  AST_Interface		**is;
-  long			nis;
-
-  /*
-   * This scope is not an interface..
-   */
-  if (i == NULL)
-    return NULL;
-  /*
-   * Can't look in an interface which was not yet defined
-   */
-  if (!i->is_defined()) {
-    idl_global->err()->fwd_decl_lookup(i, e);
-    return NULL;
-  }
-  /*
-   * OK, loop through inherited interfaces. Stop when you find it
-   */
-  for (nis = i->n_inherits(), is = i->inherits(); nis > 0; nis--, is++) {
-    d = (*is)->lookup_by_name(e, treat_as_ref);
-    if (d != NULL)
-      return d;
-  }
-  /*
-   * Not found
-   */
-  return NULL;
-}    
-
-/*
- * Look up a String * in local scope only
- */
-AST_Decl *
-UTL_Scope::lookup_by_name_local(Identifier *e, idl_bool)
-{
-  UTL_ScopeActiveIterator *i = new UTL_ScopeActiveIterator(this,
-							   UTL_Scope::IK_both);
-  AST_Decl		  *d;
-  AST_InterfaceFwd	  *fwd;
-
-  /*
-   * Iterate over this scope
-   */
-  while (!(i->is_done())) {
-    d = i->item();
-    if (d->local_name() != NULL && d->local_name()->compare(e)) {
-      delete i;
-      /*
-       * Special case for forward declared interfaces. Look through the
-       * forward declaration and retrieve the full definition
-       */
-      if (d->node_type() == AST_Decl::NT_interface_fwd) {
-        fwd = AST_InterfaceFwd::narrow_from_decl(d);
-	if (fwd == NULL)
-	  d = NULL;
-	else
-	  d = fwd->full_definition();
-      }
-      return d;
-    }
-    i->next();
-  }
-  /*
-   * OK, not found, return NULL
-   */
-  return NULL;
-}
-
-/*
- * Implements lookup by name for scoped names
- */
-AST_Decl *
-UTL_Scope::lookup_by_name(UTL_ScopedName *e, idl_bool treat_as_ref)
-{
-  AST_Decl		     *d;
-  UTL_Scope		     *t = NULL;
-
-  /*
-   * Empty name? error
-   */
-  if (e == NULL) {
-    return NULL;
-  }
-  /*
-   * If name starts with "::" or "" start look up in global scope
-   */
-  if (is_global_name(e->head())) {
-    /*
-     * Get parent scope
-     */
-    d = ScopeAsDecl(this);
-    if (d == NULL)
-      return NULL;
-    t = d->defined_in();
-    /*
-     * If this is the global scope..
-     */
-    if (t == NULL) {
-      /*
-       * Look up tail of name starting here
-       */
-      d = lookup_by_name((UTL_ScopedName *) e->tail(), treat_as_ref);
-      /*
-       * Now return whatever we have
-       */
-      return d;
-    }
-    /*
-     * OK, not global scope yet, so simply iterate with parent scope
-     */
-    d = t->lookup_by_name(e, treat_as_ref);
-    /*
-     * If treat_as_ref is true and d is not NULL, add d to
-     * set of nodes referenced here
-     */
-    if (treat_as_ref && d != NULL)
-      add_to_referenced(d, I_FALSE);
-    /*
-     * Now return what we have
-     */
-    return d;
-  }
-  /*
-   * The name does not start with "::"
-   *
-   * Is name defined here?
-   */
-  d = lookup_by_name_local(e->head(), treat_as_ref);
-  if (d == NULL) {
-    /*
-     * OK, not found. Go down parent scope chain.
-     */
-    d = ScopeAsDecl(this);
-    if (d != NULL) {
-      t = d->defined_in();
-      if (t == NULL)
-	d = NULL;
-      else
-	d = t->lookup_by_name(e, treat_as_ref);
-    }
-    /*
-     * Special case for scope which is an interface. We have to look
-     * in the inherited interfaces as well..
-     */
-    if (d == NULL) {
-      if (pd_scope_node_type == AST_Decl::NT_interface)
-	d = look_in_inherited(e, treat_as_ref);
-    }
-    /*
-     * If treat_as_ref is true and d is not NULL, add d to
-     * set of nodes referenced here
-     */
-    if (treat_as_ref && d != NULL)
-      add_to_referenced(d, I_FALSE);
-    /*
-     * OK, now return whatever we found
-     */
-    return d;
-  }
-  /*
-   * OK, start of name is defined. Now loop doing local lookups
-   * of subsequent elements of the name
-   */
-  d = iter_lookup_by_name_local(d, e, treat_as_ref);
-  /*
-   * If treat_as_ref is true and d is not NULL, add d to set
-   * of nodes referenced here.
-   */
-  if (treat_as_ref && d != NULL)
-    add_to_referenced(d, I_FALSE);
-  /*
-   * All OK, name fully resolved
-   */
-  return d;
-}
-
-// Add a node to set of nodes referenced in this scope
-void
-UTL_Scope::add_to_referenced(AST_Decl *e, idl_bool recursive)
-{
-  UTL_Scope	*s;
-  AST_Decl	**tmp;
-  AST_Interface *itf;
-  long		oreferenced_allocated;
-  long		i;
-
-  if (e == NULL) return;
-  
-  // Special case for forward declared interfaces in the
-  // scope in which they're defined. Cannot add before full
-  // definition is seen
-  if (e->node_type() == AST_Decl::NT_interface) {
-    itf = AST_Interface::narrow_from_decl(e);
-    if (itf != NULL && itf->defined_in() == this && !itf->is_defined())
-      return;
-  }
-  // Only insert if it is not there already
-  if (referenced(e))
-    return;
-
-  // Make sure there's space for one more
-  if (pd_referenced_allocated == pd_referenced_used) {
-
-    oreferenced_allocated	= pd_referenced_allocated;
-    pd_referenced_allocated	+= INCREMENT;
-    tmp				= new AST_Decl *[pd_referenced_allocated];
-
-    for (i = 0; i < oreferenced_allocated; i++)
-      tmp[i] = pd_referenced[i];
-
-    delete []pd_referenced;
-
-    pd_referenced = tmp;
-  }
-
-  // Insert new reference
-  pd_referenced[pd_referenced_used++] = e;
-
-  // Now, if recursive is specified and "this" is not a common ancestor
-  // of the referencing scope and the scope of definition of "e" then
-  // add "e" to the set of referenced nodes in the parent of "this"
-  if (recursive && !(e->has_ancestor(ScopeAsDecl(this)))) {
-    s = e->defined_in();
-    if (s != NULL)
-      s->add_to_referenced(e, recursive);
-  }
-}
-  
-// Add a node to set of nodes declared in this scope
-void
-UTL_Scope::add_to_scope(AST_Decl *e)
-{
-  AST_Decl	**tmp;
-  long		odecls_allocated;
-  long		i;
-
-  if (e == NULL) return;
-  
-  // Make sure there's space for one more
-  if (pd_decls_allocated == pd_decls_used) {
-
-    odecls_allocated	= pd_decls_allocated;
-    pd_decls_allocated	+= INCREMENT;
-    tmp			= new AST_Decl *[pd_decls_allocated];
-
-    for (i = 0; i < odecls_allocated; i++)
-      tmp[i] = pd_decls[i];
-
-    delete []pd_decls;
-
-    pd_decls = tmp;
-  }
-
-  // Insert new decl
-  pd_decls[pd_decls_used++] = e;
-}
-
-// Add a node to set of nodes representing manifest types defined in this scope
-void
-UTL_Scope::add_to_local_types(AST_Decl *e)
-{
-  AST_Decl	**tmp;
-  long		olocals_allocated;
-  long		i;
-
-  if (e == NULL) return;
-
-  // Make sure there's space for one more
-  if (pd_locals_allocated == pd_locals_used) {
-
-    olocals_allocated	= pd_locals_allocated;
-    pd_locals_allocated 	+= INCREMENT;
-    tmp			= new AST_Decl *[pd_locals_allocated];
-
-    for (i = 0; i < olocals_allocated; i++)
-      tmp[i] = pd_local_types[i];
-
-    delete []pd_local_types;
-
-    pd_local_types = tmp;
-  }
-
-  // Insert new decl
-  pd_local_types[pd_locals_used++] = e;
-}
-
-// Has this node been referenced here before?
-idl_bool
-UTL_Scope::referenced(AST_Decl *e)
-{
-  long		i = pd_referenced_used;
-  AST_Decl	**tmp = pd_referenced;
-
-  for (; i > 0; i--, tmp++)
-    if (*tmp == e)	// Same node?
-      return I_TRUE;
-
-  return I_FALSE;		// Not found
-}
-
-/*
- * Redefinition of inherited virtual operations
- */
-
-// AST Dumping
-void
-UTL_Scope::dump(ostream &o)
-{
-  UTL_ScopeActiveIterator	*i;
-  AST_Decl			*d;
-
-  if (idl_global->indent() == NULL)
-    idl_global->set_indent(new UTL_Indenter());
-
-  idl_global->indent()->increase();
-
-  if (pd_locals_used > 0) {
-    i = new UTL_ScopeActiveIterator(this, UTL_Scope::IK_localtypes);
-
-    o << GTDEVEL("\n/* Locally defined types: */\n");
-    while (!(i->is_done())) {
-      d = i->item();
-      if (!d->imported()) {
-	idl_global->indent()->skip_to(o);
-	d->dump(o);
-	o << "\n";
-      }
-      i->next();
-    }
-    delete i;
-  }
-
-  if (pd_decls_used > 0) {
-    i = new UTL_ScopeActiveIterator(this, UTL_Scope::IK_decls);
-
-    o << GTDEVEL("\n/* Declarations: */\n");
-    while (!(i->is_done())) {
-      d = i->item();
-      if (!d->imported()) {
-	idl_global->indent()->skip_to(o);
-	d->dump(o);
-	o << ";\n";
-      }
-      i->next();
-    }
-    delete i;
-  }
-
-  idl_global->indent()->decrease();
-}
-
-// How many entries are defined?
-unsigned long
-UTL_Scope::nmembers()
-{
-   return pd_decls_used;
-}
-
-// UTL_SCOPE_ACTIVE_ITERATOR
-
-/*
- * Constructor
- */
-
-UTL_ScopeActiveIterator::UTL_ScopeActiveIterator(
-				       UTL_Scope *s,
-				       UTL_Scope::ScopeIterationKind i)
-			: iter_source(s),
-			  ik(i),
-			  stage(i == UTL_Scope::IK_both
-				? UTL_Scope::IK_decls
-				: i),
-			  il(0)
-{
-}
-
-/*
- * Private operations
- */
-
-/*
- * Public operations
- */
-
-// Advance to next iterm
-void
-UTL_ScopeActiveIterator::next()
-{
-  il++;
-}
-
-// Get current item
-AST_Decl	*
-UTL_ScopeActiveIterator::item()
-{
-  if (is_done())
-    return NULL;
-  if (stage == UTL_Scope::IK_decls)
-    return iter_source->pd_decls[il];
-  if (stage == UTL_Scope::IK_localtypes)
-    return iter_source->pd_local_types[il];
-
-  return NULL;
-}
-
-// Is this iteration done?
-idl_bool
-UTL_ScopeActiveIterator::is_done()
-{
-  long	limit;
-
-  limit = (stage == UTL_Scope::IK_decls) 
-    ? iter_source->pd_decls_used 
-    : iter_source->pd_locals_used;
-
-  for (;;) {
-    if (il < limit)				// Last element?
-      return I_FALSE;
-    if (stage == UTL_Scope::IK_localtypes)	// Already done local types?
-      return I_TRUE;
-    if (ik == UTL_Scope::IK_decls)		// Only want decls?
-      return I_TRUE;
-
-    // Switch to next stage
-    stage = UTL_Scope::IK_localtypes;
-    il = 0;
-    limit = iter_source->pd_locals_used;
-  }
-}
-
-// What kind of iterator is this?
-UTL_Scope::ScopeIterationKind
-UTL_ScopeActiveIterator::iteration_kind()
-{
-  return ik;
-}
-
-// And where are we in the iteration?
-UTL_Scope::ScopeIterationKind
-UTL_ScopeActiveIterator::iteration_stage()
-{
-  return stage;
-}
diff --git a/TAO/TAO_IDL/util/utl_stack.cpp b/TAO/TAO_IDL/util/utl_stack.cpp
deleted file mode 100644
index 5c6ef85cbd2..00000000000
--- a/TAO/TAO_IDL/util/utl_stack.cpp
+++ /dev/null
@@ -1,255 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-/*
- * utl_stack.cc - Implementation of class UTL_ScopeStack
- */
-
-#include	"idl.h"
-#include	"idl_extern.h"
-
-// Class UTL_ScopeStack
-
-#undef	INCREMENT
-#define	INCREMENT	64
-
-/*
- * Constructor(s) and destructor
- */
-
-UTL_ScopeStack::UTL_ScopeStack()
-  : pd_stack_data(new UTL_Scope *[INCREMENT]),
-    pd_stack_data_nalloced(INCREMENT),
-    pd_stack_top(0)
-{
-}
-
-UTL_ScopeStack::~UTL_ScopeStack()
-{
-  if (pd_stack_data != NULL)
-    delete pd_stack_data;
-}
-
-/*
- * Private operations
- */
-
-/*
- * Public operations
- */
-
-// Push an element on the stack
-UTL_ScopeStack *
-UTL_ScopeStack::push(UTL_Scope *el)
-{
-  UTL_Scope	**tmp;
-  AST_Decl	*d = ScopeAsDecl(el);
-  long		ostack_data_nalloced;
-  long		i;
-
-  // Macro to avoid "warning: unused parameter" type warning.
-  ACE_UNUSED_ARG (d);
-
-  // Make sure there's space for one more
-  if (pd_stack_data_nalloced == pd_stack_top) {
-    ostack_data_nalloced = pd_stack_data_nalloced;
-    pd_stack_data_nalloced += INCREMENT;
-    tmp			 = new UTL_Scope *[pd_stack_data_nalloced];
-
-    for (i = 0; i < ostack_data_nalloced; i++)
-      tmp[i] = pd_stack_data[i];
-
-    delete []pd_stack_data;
-    pd_stack_data = tmp;
-  }
-
-  // Insert new scope
-  pd_stack_data[pd_stack_top++] = el;
-
-  return this;
-}
-
-// Pop an element from the stack
-void
-UTL_ScopeStack::pop()
-{
-  UTL_Scope	*s;
-
-  if (pd_stack_top <= 0)
-    return;
-  s = pd_stack_data[--pd_stack_top];
-}
-
-// Return top element on stack
-UTL_Scope *
-UTL_ScopeStack::top()
-{
-  if (pd_stack_top <= 0)
-    return NULL;
-  return pd_stack_data[pd_stack_top - 1];
-}
-
-// Return bottom element on stack
-UTL_Scope *
-UTL_ScopeStack::bottom()
-{
-  if (pd_stack_top == 0)
-    return NULL;
-  return pd_stack_data[0];
-}
-
-// Clear entire stack
-void
-UTL_ScopeStack::clear()
-{
-  pd_stack_top = 0;
-}
-
-// How deep is the stack?
-unsigned long
-UTL_ScopeStack::depth()
-{
-  return pd_stack_top;
-}
-
-// Return (top - 1) element on stack
-UTL_Scope *
-UTL_ScopeStack::next_to_top()
-{
-  UTL_Scope	*tmp, *retval;
-
-  if (depth() < 2)
-    return NULL;
-
-  tmp = top();		// Save top
-  (void) pop();		// Pop it
-  retval = top();	// Get next one down
-  (void) push(tmp);	// Push top back
-  return retval;	// Return next one down
-}
-
-// Return topmost non-NULL element
-UTL_Scope *
-UTL_ScopeStack::top_non_null()
-{
-  long		i;
-
-  for (i = pd_stack_top - 1; i >= 0; i--)
-    if (pd_stack_data[i] != NULL)
-      return pd_stack_data[i];
-  return NULL;
-}
-
-/*
- * Redefinition of inherited virtual operations
- */
-
-// Class UTL_ScopeStackActiveIterator
-
-/*
- * Constructor(s)
- */
-
-UTL_ScopeStackActiveIterator::UTL_ScopeStackActiveIterator(UTL_ScopeStack *s)
-			    : source(s),
-			      il(s->pd_stack_top - 1)
-{
-}
-
-/*
- * Private operations
- */
-
-/*
- * Public operations
- */
-
-// Advance to next item
-void
-UTL_ScopeStackActiveIterator::next()
-{
-  il--;
-}
-
-// Get current item
-UTL_Scope *
-UTL_ScopeStackActiveIterator::item()
-{
-  if (il >= 0)
-    return source->pd_stack_data[il];
-  return NULL;
-}
-
-// Is this iteration done?
-long
-UTL_ScopeStackActiveIterator::is_done()
-{
-  if (il >= 0)
-    return I_FALSE;
-  return I_TRUE;
-}
-
-/*
- * Redefinition of inherited virtual operations
- */
diff --git a/TAO/TAO_IDL/util/utl_string.cpp b/TAO/TAO_IDL/util/utl_string.cpp
deleted file mode 100644
index 10cc46830a7..00000000000
--- a/TAO/TAO_IDL/util/utl_string.cpp
+++ /dev/null
@@ -1,210 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-// utl_string.cc - Implementation of quick and dirty TEMPORARY String
-//		   for IDL compiler
-
-#include	"idl.h"
-#include	"idl_extern.h"
-
-/*
- * Constructors
- */
-
-UTL_String::UTL_String (void) 
-  : p_str (NULL), 
-    len (0), 
-    alloced (0) 
-{
-}
-
-UTL_String::UTL_String (char *str)
-{
-  if (str == NULL) 
-    {
-      len = alloced = 0;
-      p_str = c_str = NULL;
-    } 
-  else 
-    {
-      len = ACE_OS::strlen (str);
-      alloced = len + 1;
-      p_str = new char [alloced];
-      c_str = new char [alloced];
-      ACE_OS::strcpy (p_str, str);
-      canonicalize ();
-    }
-}
-
-UTL_String::UTL_String (unsigned long maxlen)
-{
-  len = maxlen;
-  alloced = maxlen + 1;
-  p_str = new char [alloced];
-  c_str = new char [alloced];
-  p_str[0] = '\0';
-  c_str[0] = '\0';
-}
-
-UTL_String::UTL_String (UTL_String *s)
-{
-  char	*b;
-
-  if (s == NULL) 
-    {
-     p_str = c_str = NULL;
-     alloced = len = 0;
-    } 
-  else 
-    {
-      b = s->get_string ();
-      if (b == NULL) 
-        {
-          p_str = c_str = NULL;
-          alloced = len = 0;
-        } 
-      else 
-        {
-          len = ACE_OS::strlen (b);
-          alloced = len + 1;
-          p_str = new char [alloced];
-          c_str = new char [alloced];
-          ACE_OS::strcpy (p_str, b);
-          canonicalize ();
-        }
-    }
-}
-
-/*
- * Private operations
- */
-
-// Compute a canonical form for this string. This is (implemented as)
-// a corresponding string with all upper case characters where the
-// original has lower case characters, identical characters otherwise.
-void
-UTL_String::canonicalize (void)
-{
-  unsigned long	i;
-
-  for (i = 0; i < len; i++)
-    c_str[i] = isalpha (p_str[i]) ? toupper (p_str[i]) : p_str[i];
-
-  c_str[i] = '\0';
-}
-
-/*
- * Public operations
- */
-
-// Compare two String *
-long
-UTL_String::compare (UTL_String *s)
-{
-  char	*s_c_str;
-  long	result;
-
-  if (c_str == NULL || s == NULL || (s_c_str = s->get_canonical_rep ()) == NULL)
-    result = I_FALSE;
-  else
-    result = (ACE_OS::strcmp (c_str, s_c_str) == 0) ? I_TRUE : I_FALSE;
-
-  /*
-   * Check that the names are typed consistently
-   */
-  if (result == I_TRUE && ACE_OS::strcmp (p_str, s->get_string ()) != 0)
-    idl_global->err ()->name_case_error (p_str, s->get_string ());
-
-  return result;
-}
-
-// Get the char * from a String
-char *
-UTL_String::get_string (void)
-{
-  return p_str;
-}
-
-// Get the canonical representation from a String
-char *
-UTL_String::get_canonical_rep (void)
-{
-  if (c_str == NULL) 
-    {
-      c_str = new char [alloced];
-      canonicalize ();
-    }
-  return c_str;
-}
-
-/*
- * Redefined virtual operations
- */
-
-// AST Dumping
-void
-UTL_String::dump (ostream &o)
-{
-  o << p_str;
-}
diff --git a/TAO/TAO_IDL/util/utl_strlist.cpp b/TAO/TAO_IDL/util/utl_strlist.cpp
deleted file mode 100644
index 3ca63c59490..00000000000
--- a/TAO/TAO_IDL/util/utl_strlist.cpp
+++ /dev/null
@@ -1,194 +0,0 @@
-/*
-
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
-States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the following
-license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and copyright
-notice on all media and documentation and the software program in which
-this product is incorporated in whole or part. You may copy and extend
-functionality (but may not remove functionality) of the Interface
-Definition Language CFE without charge, but you are not authorized to
-license or distribute it to anyone else except as part of a product or
-program developed by you or with the express written consent of Sun
-Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to comply
-with this license.  Upon termination, you shall destroy or return all code
-and documentation for the Interface Definition Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
-ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
-FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
-DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
-ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
-TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
-RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
-INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
-ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
-DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
-52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
-
- */
-
-// utl_strlist.cc
-//
-// Implementation of a list of utl_string nodes
-
-// NOTE: This list class only works correctly because we use single public
-//       inheritance, as opposed to multiple inheritance or public virtual.
-//	 It relies on a type-unsafe cast from UTL_List to subclasses, which
-//	 will cease to operate correctly if you use either multiple or
-//	 public virtual inheritance.
-//
-//	 For portability reasons we have decided to provide both this and
-//	 an implementation of the list classes in terms of templates. If
-//	 your compiler supports templates, please use the files in the
-//	 include/utl_tmpl and util/utl_tmpl directories instead of the
-//	 files by the same names in the include and util directories.
-
-#include	"idl.h"
-#include	"idl_extern.h"
-
-/*
- * Constructor(s)
- */
-
-UTL_StrList::UTL_StrList(String *s, UTL_StrList *cdr)
-	   : pd_car_data(s),
-	     UTL_List(cdr)
-{
-}
-
-/*
- * Private operations
- */
-
-/*
- * Public operations
- */
-
-// Get list item
-String *
-UTL_StrList::head()
-{
-  return pd_car_data;
-}
-
-// Set list item
-void
-UTL_StrList::set_head(String *s)
-{
-  pd_car_data = s;
-}
-
-// Get last item of this list
-String *
-UTL_StrList::last_component()
-{
-  if (tail() == NULL)
-    return pd_car_data;
-  return ((UTL_StrList *) tail())->last_component();
-}
-
-// Copy a list
-UTL_List *
-UTL_StrList::copy()
-{
-  if (tail() == NULL)
-    return new UTL_StrList(head(), NULL);
-  return new UTL_StrList(head(), (UTL_StrList *) tail()->copy());
-}
-
-// AST Dumping
-void
-UTL_StrList::dump(ostream &o)
-{
-  char			      *s;
-  UTL_StrlistActiveIterator *i = new UTL_StrlistActiveIterator(this);
-  idl_bool		       first = I_TRUE;
-  idl_bool		       second = I_FALSE;
-
-  while (!(i->is_done())) {
-    if (!first)
-      o << "::";
-    else if (second)
-      first = second = I_FALSE;
-    s = i->item()->get_string();
-    o << s;
-    if (first) {
-      if (strcmp(s, "::") != 0)
-	first = I_FALSE;
-      else
-	second = I_TRUE;
-    }
-    i->next();
-  }
-}
-
-/*
- * Redefinition of inherited virtual operations
- */
-
-// UTL_StrList active iterator
-
-/*
- * Constructor
- */
-
-UTL_StrlistActiveIterator::UTL_StrlistActiveIterator(UTL_StrList *s)
-			   : UTL_ListActiveIterator(s)
-{
-}
-
-/*
- * Private operations
- */
-
-/*
- * Public operations
- */
-
-// Get current item
-String *
-UTL_StrlistActiveIterator::item()
-{
-  if (source == NULL)
-    return NULL;
-  return ((UTL_StrList *) source)->head();
-}
-
-/*
- * Redefinition of inherited virtual operations
- */
diff --git a/TAO/TAO_IDL/util/utl_tmpl/utl_decllist.cpp b/TAO/TAO_IDL/util/utl_tmpl/utl_decllist.cpp
deleted file mode 100644
index 2652f24a7c7..00000000000
--- a/TAO/TAO_IDL/util/utl_tmpl/utl_decllist.cpp
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- *======================================================================
- *
- *Copyright 1992 Sun Microsystems, Inc.
- *
- *The Interface Definition Language Compiler Front End (CFE) is made
- *available for use provided that this legend is included on all media and
- *documentation and as a part of the software program in whole or part.
- *Users may copy and extend functionality (but may not remove
- *functionality) of the Interface Definition Language CFE without charge,
- *but are not authorized to license or distribute it to anyone else except
- *as part of a product or program developed by the user or with the express
- *written consent of Sun Microsystems, Inc.
- *
- *The names of Sun Microsystems, Inc. and any of its subsidiaries may not
- *be used in advertising or publicity pertaining to distribution of
- *Interface Definition Language CFE as permitted herein.
- *
- *The Interface Definition Language CFE may not be exported outside the
- *United States without first obtaining the appropriate government
- *approvals.
- *
- *INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES
- *OF ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND
- *FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A
- *COURSE OF DEALING, USAGE OR TRADE PRACTICE.
- *
- *Interface Definition Language CFE is provided with no support and
- *without any obligation on the part of Sun Microsystems, Inc. or any of
- *its subsidiaries or affiliates to assist in its use, correction,
- *modification or enhancement.
- *
- *SUN MICROSYSTEMS, INC. OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL
- *HAVE NO LIABILITY WITH RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE
- *SECRETS OR ANY PATENTS BY INTERFACE DEFINITION LANGUAGE CFE OR ANY PART
- *THEREOF.
- *
- *IN NO EVENT WILL SUN MICROSYSTEMS, INC. OR ANY OF ITS SUBSIDIARIES OR
- *AFFILIATES BE LIABLE FOR ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL,
- *INDIRECT AND CONSEQUENTIAL DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE
- *POSSIBILITY OF SUCH DAMAGES.
- *
- *SunSoft, Inc.  
- *2550 Garcia Avenue 
- *Mountain View, California  94043
- *
- *
- *
- *
- *======================================================================
- */
-
-// utl_decllist.cc
-//
-// Implementation of a list of declarators
-
-#include	<idl.hh>
-#include	<idl_extern.hh>
-
-/*
- * Constructor(s)
- */
-
-UTL_DeclList::UTL_DeclList(FE_Declarator *s, UTL_DeclList *cdr)
-	    : UTL_List<UTL_DeclList, FE_Declarator>(s, cdr)
-{
-}
-
-/*
- * Private operations
- */
-
-/*
- * Public operations
- */
-
-/*
- * Redefinition of inherited virtual operations
- */
-
-// UTL_DeclList active iterator
-
-/*
- * Constructor
- */
-
-UTL_DecllistActiveIterator::UTL_DecllistActiveIterator(UTL_DeclList *s)
-		    : UTL_ListActiveIterator<UTL_DeclList, FE_Declarator>(s)
-{
-}
-
-/*
- * Private operations
- */
-
-/*
- * Public operations
- */
-
-/*
- * Redefined inherited operations
- */
-
diff --git a/TAO/TAO_IDL/util/utl_tmpl/utl_exceptlist.cpp b/TAO/TAO_IDL/util/utl_tmpl/utl_exceptlist.cpp
deleted file mode 100644
index 323c316756a..00000000000
--- a/TAO/TAO_IDL/util/utl_tmpl/utl_exceptlist.cpp
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- *======================================================================
- *
- *Copyright 1992 Sun Microsystems, Inc.
- *
- *The Interface Definition Language Compiler Front End (CFE) is made
- *available for use provided that this legend is included on all media and
- *documentation and as a part of the software program in whole or part.
- *Users may copy and extend functionality (but may not remove
- *functionality) of the Interface Definition Language CFE without charge,
- *but are not authorized to license or distribute it to anyone else except
- *as part of a product or program developed by the user or with the express
- *written consent of Sun Microsystems, Inc.
- *
- *The names of Sun Microsystems, Inc. and any of its subsidiaries may not
- *be used in advertising or publicity pertaining to distribution of
- *Interface Definition Language CFE as permitted herein.
- *
- *The Interface Definition Language CFE may not be exported outside the
- *United States without first obtaining the appropriate government
- *approvals.
- *
- *INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES
- *OF ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND
- *FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A
- *COURSE OF DEALING, USAGE OR TRADE PRACTICE.
- *
- *Interface Definition Language CFE is provided with no support and
- *without any obligation on the part of Sun Microsystems, Inc. or any of
- *its subsidiaries or affiliates to assist in its use, correction,
- *modification or enhancement.
- *
- *SUN MICROSYSTEMS, INC. OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL
- *HAVE NO LIABILITY WITH RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE
- *SECRETS OR ANY PATENTS BY INTERFACE DEFINITION LANGUAGE CFE OR ANY PART
- *THEREOF.
- *
- *IN NO EVENT WILL SUN MICROSYSTEMS, INC. OR ANY OF ITS SUBSIDIARIES OR
- *AFFILIATES BE LIABLE FOR ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL,
- *INDIRECT AND CONSEQUENTIAL DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE
- *POSSIBILITY OF SUCH DAMAGES.
- *
- *SunSoft, Inc.  
- *2550 Garcia Avenue 
- *Mountain View, California  94043
- *
- *
- *
- *
- *======================================================================
- */
-
-// utl_exceptlist.cc
-//
-// Implementation of a list of exceptions
-
-#include	<idl.hh>
-#include	<idl_extern.hh>
-
-/*
- * Constructor(s)
- */
-
-UTL_ExceptList::UTL_ExceptList(AST_Exception *s, UTL_ExceptList *cdr)
-	      : UTL_List<UTL_ExceptList, AST_Exception>(s, cdr)
-{
-}
-
-/*
- * Private operations
- */
-
-/*
- * Public operations
- */
-
-/*
- * Redefinition of inherited virtual operations
- */
-
-// UTL_ExceptList active iterator
-
-/*
- * Constructor
- */
-
-UTL_ExceptlistActiveIterator::UTL_ExceptlistActiveIterator(UTL_ExceptList *s)
-		: UTL_ListActiveIterator<UTL_ExceptList, AST_Exception>(s)
-{
-}
-
-/*
- * Private operations
- */
-
-/*
- * Public operations
- */
-
-/*
- * Redefinition of inherited virtual operations
- */
diff --git a/TAO/TAO_IDL/util/utl_tmpl/utl_exprlist.cpp b/TAO/TAO_IDL/util/utl_tmpl/utl_exprlist.cpp
deleted file mode 100644
index 333f2506774..00000000000
--- a/TAO/TAO_IDL/util/utl_tmpl/utl_exprlist.cpp
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- *======================================================================
- *
- *Copyright 1992 Sun Microsystems, Inc.
- *
- *The Interface Definition Language Compiler Front End (CFE) is made
- *available for use provided that this legend is included on all media and
- *documentation and as a part of the software program in whole or part.
- *Users may copy and extend functionality (but may not remove
- *functionality) of the Interface Definition Language CFE without charge,
- *but are not authorized to license or distribute it to anyone else except
- *as part of a product or program developed by the user or with the express
- *written consent of Sun Microsystems, Inc.
- *
- *The names of Sun Microsystems, Inc. and any of its subsidiaries may not
- *be used in advertising or publicity pertaining to distribution of
- *Interface Definition Language CFE as permitted herein.
- *
- *The Interface Definition Language CFE may not be exported outside the
- *United States without first obtaining the appropriate government
- *approvals.
- *
- *INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES
- *OF ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND
- *FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A
- *COURSE OF DEALING, USAGE OR TRADE PRACTICE.
- *
- *Interface Definition Language CFE is provided with no support and
- *without any obligation on the part of Sun Microsystems, Inc. or any of
- *its subsidiaries or affiliates to assist in its use, correction,
- *modification or enhancement.
- *
- *SUN MICROSYSTEMS, INC. OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL
- *HAVE NO LIABILITY WITH RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE
- *SECRETS OR ANY PATENTS BY INTERFACE DEFINITION LANGUAGE CFE OR ANY PART
- *THEREOF.
- *
- *IN NO EVENT WILL SUN MICROSYSTEMS, INC. OR ANY OF ITS SUBSIDIARIES OR
- *AFFILIATES BE LIABLE FOR ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL,
- *INDIRECT AND CONSEQUENTIAL DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE
- *POSSIBILITY OF SUCH DAMAGES.
- *
- *SunSoft, Inc.  
- *2550 Garcia Avenue 
- *Mountain View, California  94043
- *
- *
- *
- *
- *======================================================================
- */
-
-// utl_exprlist.cc
-//
-// Implementation of a list of strings
-
-#include	<idl.hh>
-#include	<idl_extern.hh>
-
-/*
- * Constructor(s)
- */
-
-UTL_ExprList::UTL_ExprList(AST_Expression *s, UTL_ExprList *cdr)
-	    : UTL_List<UTL_ExprList, AST_Expression>(s, cdr)
-{
-}
-
-/*
- * Private operations
- */
-
-/*
- * Public operations
- */
-
-/*
- * Redefinition of inherited virtual operations
- */
-
-// UTL_ExprList active iterator
-
-/*
- * Constructor
- */
-
-UTL_ExprlistActiveIterator::UTL_ExprlistActiveIterator(UTL_ExprList *s)
-		  : UTL_ListActiveIterator<UTL_ExprList, AST_Expression>(s)
-{
-}
-
-/*
- * Private operations
- */
-
-/*
- * Public operations
- */
-
-/*
- * Redefinition of inherited virtual operations
- */
diff --git a/TAO/TAO_IDL/util/utl_tmpl/utl_idlist.cpp b/TAO/TAO_IDL/util/utl_tmpl/utl_idlist.cpp
deleted file mode 100644
index e4f0b0a8291..00000000000
--- a/TAO/TAO_IDL/util/utl_tmpl/utl_idlist.cpp
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
- *======================================================================
- *
- *Copyright 1992 Sun Microsystems, Inc.
- *
- *The Interface Definition Language Compiler Front End (CFE) is made
- *available for use provided that this legend is included on all media and
- *documentation and as a part of the software program in whole or part.
- *Users may copy and extend functionality (but may not remove
- *functionality) of the Interface Definition Language CFE without charge,
- *but are not authorized to license or distribute it to anyone else except
- *as part of a product or program developed by the user or with the express
- *written consent of Sun Microsystems, Inc.
- *
- *The names of Sun Microsystems, Inc. and any of its subsidiaries may not
- *be used in advertising or publicity pertaining to distribution of
- *Interface Definition Language CFE as permitted herein.
- *
- *The Interface Definition Language CFE may not be exported outside the
- *United States without first obtaining the appropriate government
- *approvals.
- *
- *INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES
- *OF ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND
- *FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A
- *COURSE OF DEALING, USAGE OR TRADE PRACTICE.
- *
- *Interface Definition Language CFE is provided with no support and
- *without any obligation on the part of Sun Microsystems, Inc. or any of
- *its subsidiaries or affiliates to assist in its use, correction,
- *modification or enhancement.
- *
- *SUN MICROSYSTEMS, INC. OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL
- *HAVE NO LIABILITY WITH RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE
- *SECRETS OR ANY PATENTS BY INTERFACE DEFINITION LANGUAGE CFE OR ANY PART
- *THEREOF.
- *
- *IN NO EVENT WILL SUN MICROSYSTEMS, INC. OR ANY OF ITS SUBSIDIARIES OR
- *AFFILIATES BE LIABLE FOR ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL,
- *INDIRECT AND CONSEQUENTIAL DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE
- *POSSIBILITY OF SUCH DAMAGES.
- *
- *SunSoft, Inc.  
- *2550 Garcia Avenue 
- *Mountain View, California  94043
- *
- *
- *
- *
- *======================================================================
- */
-
-// utl_idlist.cc
-//
-// Implementation of a list of utl_string nodes
-
-#include	<idl.hh>
-#include	<idl_extern.hh>
-
-/*
- * Constructor(s)
- */
-
-UTL_IdList::UTL_IdList(Identifier *s, UTL_IdList *cdr)
-	  : UTL_List<UTL_IdList, Identifier>(s, cdr)
-{
-}
-
-/*
- * Private operations
- */
-
-/*
- * Public operations
- */
-
-// Get last item of this list
-Identifier *
-UTL_IdList::last_component()
-{
-  if (tail() == NULL)
-    return head();
-  return tail()->last_component();
-}
-
-// AST Dumping
-void
-UTL_IdList::dump(ostream &o)
-{
-  UTL_IdListActiveIterator	*i = new UTL_IdListActiveIterator(this);
-  long				first = I_TRUE;
-  long				second = I_FALSE;
-
-  while (!(i->is_done())) {
-    if (!first)
-      o << "::";
-    else if (second)
-      first = second = I_FALSE;
-    i->item()->dump(o);
-    if (first) {
-      if (strcmp(i->item()->get_string(), "::") != 0)
-	first = I_FALSE;
-      else
-	second = I_TRUE;
-    }
-    i->next();
-  }
-}
-
-/*
- * Redefinition of inherited virtual operations
- */
-
-// UTL_IdList active iterator
-
-/*
- * Constructor
- */
-
-UTL_IdListActiveIterator::UTL_IdListActiveIterator(UTL_IdList *s)
-			: UTL_ListActiveIterator<UTL_IdList, Identifier>(s)
-{
-}
-
-/*
- * Private operations
- */
-
-/*
- * Public operations
- */
-
-/*
- * Redefinition of inherited virtual operations
- */
diff --git a/TAO/TAO_IDL/util/utl_tmpl/utl_labellist.cpp b/TAO/TAO_IDL/util/utl_tmpl/utl_labellist.cpp
deleted file mode 100644
index 9d285e036f5..00000000000
--- a/TAO/TAO_IDL/util/utl_tmpl/utl_labellist.cpp
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- *======================================================================
- *
- *Copyright 1992 Sun Microsystems, Inc.
- *
- *The Interface Definition Language Compiler Front End (CFE) is made
- *available for use provided that this legend is included on all media and
- *documentation and as a part of the software program in whole or part.
- *Users may copy and extend functionality (but may not remove
- *functionality) of the Interface Definition Language CFE without charge,
- *but are not authorized to license or distribute it to anyone else except
- *as part of a product or program developed by the user or with the express
- *written consent of Sun Microsystems, Inc.
- *
- *The names of Sun Microsystems, Inc. and any of its subsidiaries may not
- *be used in advertising or publicity pertaining to distribution of
- *Interface Definition Language CFE as permitted herein.
- *
- *The Interface Definition Language CFE may not be exported outside the
- *United States without first obtaining the appropriate government
- *approvals.
- *
- *INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES
- *OF ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND
- *FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A
- *COURSE OF DEALING, USAGE OR TRADE PRACTICE.
- *
- *Interface Definition Language CFE is provided with no support and
- *without any obligation on the part of Sun Microsystems, Inc. or any of
- *its subsidiaries or affiliates to assist in its use, correction,
- *modification or enhancement.
- *
- *SUN MICROSYSTEMS, INC. OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL
- *HAVE NO LIABILITY WITH RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE
- *SECRETS OR ANY PATENTS BY INTERFACE DEFINITION LANGUAGE CFE OR ANY PART
- *THEREOF.
- *
- *IN NO EVENT WILL SUN MICROSYSTEMS, INC. OR ANY OF ITS SUBSIDIARIES OR
- *AFFILIATES BE LIABLE FOR ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL,
- *INDIRECT AND CONSEQUENTIAL DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE
- *POSSIBILITY OF SUCH DAMAGES.
- *
- *SunSoft, Inc.  
- *2550 Garcia Avenue 
- *Mountain View, California  94043
- *
- *
- *
- *
- *======================================================================
- */
-
-// utl_labellist.cc
-//
-// Implementation of a list of scoped names
-
-#include	<idl.hh>
-#include	<idl_extern.hh>
-
-/*
- * Constructor(s)
- */
-
-UTL_LabelList::UTL_LabelList(AST_UnionLabel *s, UTL_LabelList *cdr)
-	     : UTL_List<UTL_LabelList, AST_UnionLabel>(s, cdr)
-{
-}
-
-/*
- * Private operations
- */
-
-/*
- * Public operations
- */
-
-/*
- * Redefinition of inherited virtual operations
- */
-
-// UTL_LabelList active iterator
-
-/*
- * Constructor
- */
-
-UTL_LabellistActiveIterator::UTL_LabellistActiveIterator(UTL_LabelList *s)
-		   : UTL_ListActiveIterator<UTL_LabelList, AST_UnionLabel>(s)
-{
-}
-
-/*
- * Private operations
- */
-
-/*
- * Public operations
- */
-
-/*
- * Redefinition of inherited virtual operations
- */
diff --git a/TAO/TAO_IDL/util/utl_tmpl/utl_list.cpp b/TAO/TAO_IDL/util/utl_tmpl/utl_list.cpp
deleted file mode 100644
index 61effde260e..00000000000
--- a/TAO/TAO_IDL/util/utl_tmpl/utl_list.cpp
+++ /dev/null
@@ -1,209 +0,0 @@
-/*
- *======================================================================
- *
- *Copyright 1992 Sun Microsystems, Inc.
- *
- *The Interface Definition Language Compiler Front End (CFE) is made
- *available for use provided that this legend is included on all media and
- *documentation and as a part of the software program in whole or part.
- *Users may copy and extend functionality (but may not remove
- *functionality) of the Interface Definition Language CFE without charge,
- *but are not authorized to license or distribute it to anyone else except
- *as part of a product or program developed by the user or with the express
- *written consent of Sun Microsystems, Inc.
- *
- *The names of Sun Microsystems, Inc. and any of its subsidiaries may not
- *be used in advertising or publicity pertaining to distribution of
- *Interface Definition Language CFE as permitted herein.
- *
- *The Interface Definition Language CFE may not be exported outside the
- *United States without first obtaining the appropriate government
- *approvals.
- *
- *INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES
- *OF ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND
- *FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A
- *COURSE OF DEALING, USAGE OR TRADE PRACTICE.
- *
- *Interface Definition Language CFE is provided with no support and
- *without any obligation on the part of Sun Microsystems, Inc. or any of
- *its subsidiaries or affiliates to assist in its use, correction,
- *modification or enhancement.
- *
- *SUN MICROSYSTEMS, INC. OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL
- *HAVE NO LIABILITY WITH RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE
- *SECRETS OR ANY PATENTS BY INTERFACE DEFINITION LANGUAGE CFE OR ANY PART
- *THEREOF.
- *
- *IN NO EVENT WILL SUN MICROSYSTEMS, INC. OR ANY OF ITS SUBSIDIARIES OR
- *AFFILIATES BE LIABLE FOR ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL,
- *INDIRECT AND CONSEQUENTIAL DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE
- *POSSIBILITY OF SUCH DAMAGES.
- *
- *SunSoft, Inc.  
- *2550 Garcia Avenue 
- *Mountain View, California  94043
- *
- *
- *
- *
- *======================================================================
- */
-
-// utl_list.cc
-//
-// Implementation of generic single-linked lists
-
-#include	<stddef.h>
-#include	<utl_list.hh>
-#include	<idl_bool.hh>
-
-/*
- * Constructor(s)
- */
-
-template<class L, class T>
-UTL_List<L, T>::UTL_List(T *c, L *l)
-	: pd_car_data(c),
-	  pd_cdr_data(l) 
-{
-}
-
-/*
- * Private operations
- */
-
-// Compute list length
-template<class L, class T>
-long
-UTL_List<L, T>::list_length(long n)
-{
-  if (pd_cdr_data == NULL)
-    return n;
-  else
-    return pd_cdr_data->list_length(n+1);
-}
-
-/*
- * Public operations
- */
-
-// Smash last cdr with l
-template<class L, class T>
-void
-UTL_List<L, T>::nconc(L *l)
-{
-  if (pd_cdr_data == NULL)
-    pd_cdr_data = l;
-  else
-    pd_cdr_data->nconc(l);
-}
-
-/*
- * Override this operation to copy lists of other types
- */
-// Copy a list
-template<class L, class T>
-L *
-UTL_List<L, T>::copy()
-{
-  if (pd_cdr_data == NULL)
-    return new L(head(), NULL);
-  return new L(head(), pd_cdr_data->copy());
-}
-
-// Get list item
-template<class L, class T>
-T *
-UTL_List<L, T>::head()
-{
-  return pd_car_data;
-}
-
-// Get next list
-template<class L, class T>
-L *
-UTL_List<L, T>::tail()
-{
-  return pd_cdr_data;
-}
-
-// Set list item
-template<class L, class T>
-void
-UTL_List<L, T>::set_head(T *s)
-{
-  pd_car_data = s;
-}
-
-// Set next list
-template<class L, class T>
-void
-UTL_List<L, T>::set_tail(L *l)
-{
-  pd_cdr_data = l;
-}
-
-// Compute list length
-template<class L, class T>
-long
-UTL_List<L, T>::length()
-{
-  return list_length(1);
-}
-
-/*
- * Redefinition of inherited virtual operations
- */
-
-// UTL_List active iterator
-
-/*
- * Constructor
- */
-
-template<class L, class T>
-UTL_ListActiveIterator<L, T>::UTL_ListActiveIterator(UTL_List<L, T> *s)
-		      : source(s)
-{
-}
-
-/*
- * Private operations
- */
-
-/*
- * Public operations
- */
-
-// Is iterator done?
-template<class L, class T>
-long
-UTL_ListActiveIterator<L, T>::is_done()
-{
-  return (source == NULL) ? I_TRUE : I_FALSE;
-}
-
-// Get current item
-template<class L, class T>
-T *
-UTL_ListActiveIterator<L, T>::item()
-{
-  if (source == NULL)
-    return NULL;
-  return source->head();
-}
-
-// Advance to next item
-template<class L, class T>
-void
-UTL_ListActiveIterator<L, T>::next()
-{
-  if (source != NULL)
-    source = source->tail();
-}
-
-/*
- * Redefinition of inherited operations
- */
-
diff --git a/TAO/TAO_IDL/util/utl_tmpl/utl_namelist.cpp b/TAO/TAO_IDL/util/utl_tmpl/utl_namelist.cpp
deleted file mode 100644
index 0a5f97d3147..00000000000
--- a/TAO/TAO_IDL/util/utl_tmpl/utl_namelist.cpp
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- *======================================================================
- *
- *Copyright 1992 Sun Microsystems, Inc.
- *
- *The Interface Definition Language Compiler Front End (CFE) is made
- *available for use provided that this legend is included on all media and
- *documentation and as a part of the software program in whole or part.
- *Users may copy and extend functionality (but may not remove
- *functionality) of the Interface Definition Language CFE without charge,
- *but are not authorized to license or distribute it to anyone else except
- *as part of a product or program developed by the user or with the express
- *written consent of Sun Microsystems, Inc.
- *
- *The names of Sun Microsystems, Inc. and any of its subsidiaries may not
- *be used in advertising or publicity pertaining to distribution of
- *Interface Definition Language CFE as permitted herein.
- *
- *The Interface Definition Language CFE may not be exported outside the
- *United States without first obtaining the appropriate government
- *approvals.
- *
- *INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES
- *OF ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND
- *FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A
- *COURSE OF DEALING, USAGE OR TRADE PRACTICE.
- *
- *Interface Definition Language CFE is provided with no support and
- *without any obligation on the part of Sun Microsystems, Inc. or any of
- *its subsidiaries or affiliates to assist in its use, correction,
- *modification or enhancement.
- *
- *SUN MICROSYSTEMS, INC. OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL
- *HAVE NO LIABILITY WITH RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE
- *SECRETS OR ANY PATENTS BY INTERFACE DEFINITION LANGUAGE CFE OR ANY PART
- *THEREOF.
- *
- *IN NO EVENT WILL SUN MICROSYSTEMS, INC. OR ANY OF ITS SUBSIDIARIES OR
- *AFFILIATES BE LIABLE FOR ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL,
- *INDIRECT AND CONSEQUENTIAL DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE
- *POSSIBILITY OF SUCH DAMAGES.
- *
- *SunSoft, Inc.  
- *2550 Garcia Avenue 
- *Mountain View, California  94043
- *
- *
- *
- *
- *======================================================================
- */
-
-// utl_namelist.cc
-//
-// Implementation of a list of scoped names
-
-#include	<idl.hh>
-#include	<idl_extern.hh>
-
-typedef UTL_List<UTL_NameList, UTL_ScopedName> _dummy_;
-
-/*
- * Constructor(s)
- */
-
-UTL_NameList::UTL_NameList(UTL_ScopedName *s, UTL_NameList *cdr)
-	    : UTL_List<UTL_NameList, UTL_ScopedName>(s, cdr)
-{
-}
-
-/*
- * Private operations
- */
-
-/*
- * Public operations
- */
-
-/*
- * Redefinition of inherited virtual operations
- */
-
-// UTL_NameList active iterator
-
-/*
- * Constructor
- */
-
-UTL_NamelistActiveIterator::UTL_NamelistActiveIterator(UTL_NameList *s)
-		    : UTL_ListActiveIterator<UTL_NameList, UTL_ScopedName>(s)
-{
-}
-
-/*
- * Private operations
- */
-
-/*
- * Public operations
- */
-
-/*
- * Redefinition of inherited virtual operations
- */
diff --git a/TAO/TAO_IDL/util/utl_tmpl/utl_strlist.cpp b/TAO/TAO_IDL/util/utl_tmpl/utl_strlist.cpp
deleted file mode 100644
index 3311b089d79..00000000000
--- a/TAO/TAO_IDL/util/utl_tmpl/utl_strlist.cpp
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- *======================================================================
- *
- *Copyright 1992 Sun Microsystems, Inc.
- *
- *The Interface Definition Language Compiler Front End (CFE) is made
- *available for use provided that this legend is included on all media and
- *documentation and as a part of the software program in whole or part.
- *Users may copy and extend functionality (but may not remove
- *functionality) of the Interface Definition Language CFE without charge,
- *but are not authorized to license or distribute it to anyone else except
- *as part of a product or program developed by the user or with the express
- *written consent of Sun Microsystems, Inc.
- *
- *The names of Sun Microsystems, Inc. and any of its subsidiaries may not
- *be used in advertising or publicity pertaining to distribution of
- *Interface Definition Language CFE as permitted herein.
- *
- *The Interface Definition Language CFE may not be exported outside the
- *United States without first obtaining the appropriate government
- *approvals.
- *
- *INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES
- *OF ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND
- *FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A
- *COURSE OF DEALING, USAGE OR TRADE PRACTICE.
- *
- *Interface Definition Language CFE is provided with no support and
- *without any obligation on the part of Sun Microsystems, Inc. or any of
- *its subsidiaries or affiliates to assist in its use, correction,
- *modification or enhancement.
- *
- *SUN MICROSYSTEMS, INC. OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL
- *HAVE NO LIABILITY WITH RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE
- *SECRETS OR ANY PATENTS BY INTERFACE DEFINITION LANGUAGE CFE OR ANY PART
- *THEREOF.
- *
- *IN NO EVENT WILL SUN MICROSYSTEMS, INC. OR ANY OF ITS SUBSIDIARIES OR
- *AFFILIATES BE LIABLE FOR ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL,
- *INDIRECT AND CONSEQUENTIAL DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE
- *POSSIBILITY OF SUCH DAMAGES.
- *
- *SunSoft, Inc.  
- *2550 Garcia Avenue 
- *Mountain View, California  94043
- *
- *
- *
- *
- *======================================================================
- */
-
-// utl_strlist.cc
-//
-// Implementation of a list of utl_string nodes
-
-#include	<idl.hh>
-#include	<idl_extern.hh>
-
-/*
- * Constructor(s)
- */
-
-UTL_StrList::UTL_StrList(String *s, UTL_StrList *cdr)
-	   : UTL_List<UTL_StrList, String>(s, cdr)
-{
-}
-
-/*
- * Private operations
- */
-
-/*
- * Public operations
- */
-
-// Get last item of this list
-String *
-UTL_StrList::last_component()
-{
-  if (tail() == NULL)
-    return head();
-  return tail()->last_component();
-}
-
-// AST Dumping
-void
-UTL_StrList::dump(ostream &o)
-{
-  char			      *s;
-  UTL_StrlistActiveIterator *i = new UTL_StrlistActiveIterator(this);
-  long			       first = I_TRUE;
-  long			       second = I_FALSE;
-
-  while (!(i->is_done())) {
-    if (!first)
-      o << "::";
-    else if (second)
-      first = second = I_FALSE;
-    s = i->item()->get_string();
-    o << s;
-    if (first) {
-      if (strcmp(s, "::") != 0)
-	first = I_FALSE;
-      else
-	second = I_TRUE;
-    }
-    i->next();
-  }
-}
-
-/*
- * Redefinition of inherited virtual operations
- */
-
-// UTL_StrList active iterator
-
-/*
- * Constructor
- */
-
-UTL_StrlistActiveIterator::UTL_StrlistActiveIterator(UTL_StrList *s)
-			   : UTL_ListActiveIterator<UTL_StrList, String>(s)
-{
-}
-
-/*
- * Private operations
- */
-
-/*
- * Public operations
- */
-
-/*
- * Redefinition of inherited virtual operations
- */
diff --git a/TAO/VERSION b/TAO/VERSION
deleted file mode 100644
index 59b9324fce9..00000000000
--- a/TAO/VERSION
+++ /dev/null
@@ -1,5 +0,0 @@
-This is TAO version 0.0.40, released Fri Nov 21 13:22:39 1997.
-
-If you have any problems with TAO, please send email to Douglas
-C. Schmidt (schmidt@cs.wustl.edu) and Chris Cleeland
-(cleeland@cs.wustl.edu).
diff --git a/TAO/docs/DIFFERENCES b/TAO/docs/DIFFERENCES
deleted file mode 100644
index 0a8dd343d4d..00000000000
--- a/TAO/docs/DIFFERENCES
+++ /dev/null
@@ -1,360 +0,0 @@
-@(#)DIFFERENCES	1.1 95/09/13
-
-[ NOTE that the CORBA 2.0 specifications have now been published, but are
-not yet sufficiently available that this document can usefully just list
-any differences between that specification and this software.  As a rule,
-there are no differences between this software and CORBA 2.0 in areas
-where CORBA 2.0 has specified an interface. ]
-
-
-This document summarizes known differences between what is implemented in
-this software and currently available OMG specifications.  As a rule, these
-establish compatibility with revised specifications that are currently being
-prepared for publication. However, in some cases the differences resolve
-problems that are currently being addressed by ORB taskforces.  When those
-revised CORBA specifications are published, this document will be updated to
-reflect any remaining differences from them.
-
-The reason for those changes is that different specifications were adopted
-at the same time and there were in some cases subtle differences which need
-to be resolved.  Minor errata have also been fixed.  None of these changes
-are substantial, with the exception of the TypeCode interpreter API which
-was added to the C++ mapping.
-
-Also, note that the goal of this software is fidelity to the IIOP, so that
-issues relating (in particular) to the C++ language mapping or other OMG
-specifications were judged to be of less importance at this time.
-
-
-DIFFERENCES from IIOP in UNO Spec (95-3-10)
--------------------------------------------
-Some changes to the original specification (94-9-32) for the IIOP protocol
-were found to be necessary; most related to the subsequently adopted Interface
-Repository (IFR) specification (94-11-7).  Others resulted from correction
-of minor editorial errors, and experience gained as multiple teams implement
-to that specification.
-
-The bulk of those changes have been incorporated into the 95-3-10 document,
-but these few have not.
-
-
-CDR TYPECODE INDIRECTION
-
-An additional constraint on the use of typecode indirection has been
-identified.  Specifically, the typecode to which an indirection points
-be "self-sufficient", and may not point "outside of itself" for any
-further indirections.  For example, always indirections occur within
-encapsulations, so it's OK for the indirection to point anywhere in
-that encapsulation, or at the encoded TCKind enum value immediately
-before the encapsulation's length.  For typecode encapsulations nested
-inside other typecode encapsulations, the indirection may point no
-further than the outermost encapsulation.
-
-Also, when an indirection points to another typecode, the byte order
-of that other typecode must be deduced from the encoded value found
-there.  This is straightforward for encoded TCKind values, all of which
-fit into a single byte:  if the first byte of the word is zero, then
-the encoding is big-endian, else it's little-endian.
-
-Indirecting to another indirection is not allowed, since the byte order
-of the encoded offset can't consistently be deduced.
-
-
-MISCELLANY
-
-The type GIOP::Version is assumed to be identical to IIOP::Version.
-As part of the editorial separation of GIOP from its Internet version
-IIOP, this typedef was accidentally omitted.
-
-This implementation of IIOP supports the OMG-IDL Primitive Data Types as
-defined in Appendix A of 94-9-32, but with TCKind numbers following the new
-tk_exception and tk_alias codes.  (That is, rather than using range 21-25,
-these TCKind values are in the range 23-27.)
-
-These data types are currently the topic of an RFP in process in the OMG,
-and are not currently defined as part of a current OMG specification. 
-Clients and servers using these extended data types are relying on CORBA
-extensions that are not yet standardized; and should be prepared to change.
-
-
-CORBA 2.0/CORE Differences
---------------------------
-As of this writing, the new CORBA 2.0/CORE document has not yet been made
-available.  This is a modification of the CORBA 1.2 document, with the
-addition of (mandatory) extensions from the UNO (94-9-32) specification:
-notably DSI and some new object reference operations.  This summarizes
-differences between the as-yet-unpublished CORBA 2.0/CORE document and
-the original text in the UNO specification.
-
-
-DYNAMIC SKELETON INTERFACE
-
-Since the new "tk_except" typecodes now include the exception ID (this is
-the repository ID describing the exception's type) the "exception" operation
-used to report an exception through a ServerRequest no longer includes the
-exception ID.
-
-Since the OperationDef entries for attributes are no longer found in the
-interface repositories, the ServerRequest convenience operation to return
-this has been removed.  Application programs (such as bridges) must compare
-the operation name string with the prefixes "_get_" and "_set_" to see if
-any given operation applies to an attribute.  If an operation is one of the
-two for which an OMG-IDL "attribute" declaration is shorthand, then the
-application must search the interface repository for that attribute.
-
-(There are in fact three categories of operations on which an object adapter
-and implementation collaborate to handle:  user defined operations, user
-defined attributes, and operations defined by CORBA such as "is_a" and
-"get_implementation".  Some object adapters, like the BOA, handle this last
-category directly, rather than exposing it to applications.)
-
-The "non_existent" objref operation accidentally used attribute syntax; this
-has been corrected.  All operations on CORBA::Object references now use
-normal operation syntax in their (pseudo) IDL definitions, and are uniformly
-prefixed with underscores as part of their C++ mapping.
-
-
-DIFFERENCES from IDL C++ Mapping (94-9-14)
-------------------------------------------
-There are four basic ways in which the IIOP framework does not comply
-with the OMG's IDL C++ mapping specification, beyond the use of the CORBA2
-module/namespace rather than the CORBA module/namespace.  (CORBA2 is used
-so that this software can be linked with existing ORBs, which should be
-using the CORBA module/namespace already.)
-
-These ways are beyond the portability-derived use of the "class" construct
-(instead of the C++ namespace construct), and the use of CORBA2::Environment
-(rather than C++ exceptions), both of which are accomodated by the mapping:
-
-    (1) This framework does not attempt to be complete.
-    
-	Completeness is not required to implement the Internet IOP,
-	so time was not spent in providing a complete mapping.
-
-    (2) In some cases the API provided is not the one in the mapping.
-	For example CORBA2::Environment is not always passed in all
-	operations.  This was done to promote ease of implementation
-	and coding.
-
-    (3) Implementation details are generally exposed.
-
-	This isn't so much a noncompliance issue (it's not specified
-	that such details must be hidden) as an issue of allowing
-	noncompliant applications.  The effort required to actively
-	prevent use of implementation details by higher level code
-	would be nontrivial, and could slow down IIOP code, so no
-	time was applied to hiding such details.
-
-	(However, note that when the software was modified to use COM,
-	standard C++ techniques were used to hide most such details.)
-
-    (4) The C++ mapping needs completion in some areas.
-
-	Notably, 94-9-14 does not satisfy requirements to provide
-	support for for all data types in an "Any" or exception without
-	needing any precompiled data type support routines.  The
-	TypeCode interpreter addresses this issue.
-
-	Some additional operations were not adopted at the time 94-9-14
-	was defined; both 94-9-32 and 94-11-7 added new ORB interfaces
-	which are not found in the initial C++ mapping document.
-
-With respect to this fourth issue, descriptions of the API extensions
-used is provided later in this file.  The additional CORBA operations
-are not described since their mapping is straightforward if it isn't given
-in those documents.
-
-
-ACCESS TO ALL DATA IN "ANY" AND EXCEPTIONS
-
-The "void *" value in an "Any", and any "CORBA2::Exception *" value, may
-always be passed to the TypeCode interpreter (see next).  This allows access
-to all data held within an "Any" and an Exception.  The "void *" value in an
-Any with an exception TypeCode is of type CORBA2::Exception *".  Due to
-the way CORBA is specified, it is not possible to tell whether an "Any"
-holding an exception denotes a user or standard (system-defined) exception
-except by exhaustive comparison against exception IDs.
-
-Also, _all_ legal OMG-IDL data types may be held in an "Any", and may be
-manipulated using the TypeCode interpreter.  This satisfies a language
-mapping requirement that DII (and DSI) be able to manipulate all OMG-IDL
-data types without requiring compiler generated support for them.
-
-
-TYPECODE INTERPRETER
-
-In any given C/C++ execution environment there is a binary standard for how
-data is represented.  While that standard will differ between execution
-environments, there are a very limited number of ways in which those
-representations differ.  Those differences are encapsulated only in the
-TypeCode interpreter, so that portable applications using the dynamic
-typing infrastructure in the ORB can completely ignore how it's done in
-any particular environment.
-
-The APIs in this software distribution have been suggested for adoption as
-part of the OMG specification suite.  The two APIs are nonstatic member
-functions in the C++ mapping's TypeCode pseudo-object, and are augmented
-by a single new enumeration type.
-
-    unsigned long	size() 
-
-	This returns the size of an instance of the type that is
-	described by the TypeCode.
-	
-	For example, when invoked on the typecode constant CORBA::_tc_Short,
-	the value returned is sizeof(CORBA::Short); and when invoked on the
-	typecode for a structure, it is the size of that structure (including
-	any internal and tail padding needed).  When invoked on a sequence
-	typecode, it returns a value that does not include the size for
-	any embedded buffer.
-    
-    enum traverse_status {TRAVERSE_STOP, TRAVERSE_CONTINUE };
-	
-	This is a data type used in the traverse() member function.
-	It allows data type traversal to be terminated early for
-	non-exceptional conditions, and eliminates the confusion
-	that some similar APIs have created when they use a single
-	boolean value (does TRUE mean to stop, or to continue?).
-
-    traverse_status	traverse (
-			    const void	*value1;
-			    const void	*value2
-			    traverse_status	visit (
-				    TypeCode_ptr	tc,
-				    const void		*visit_value1,
-				    const void		*visit_value2,
-				    void		*visit_context
-				),
-			    void	*context
-			);
-
-	(In the current language mapping, CORBA2::Environment references
-	are passed as the final parameter to the 'traverse' and 'visit'
-	routines for use when reporting exceptions.)
-
-	The pointers "value1" and "value2" point to instances of the
-	data type described by the typecode (or are null pointers).
-
-	For each constituent of that data type (e.g. structure member)
-	the visit() routine is called once.   The constituent's type
-	is described by "tc"; "visit_value1" points to the constituent
-	of that type in "value1" (assuming the traverse routine was
-	not passed a null pointer) and similarly for "visit_value2".
-	The "visit_context" parameter is the context parameter passed
-	to the traverse() routine, and can point to whatever data is
-	needed by the visit() routine.
-
-	Members are traversed in first-to-last order, as defined in the
-	IDL specification for the data type.  So for example, the
-	visit routine for a structure could print out each element
-	on a IO stream passed through the context parameter, perhaps in
-	a neatly formatted form intended for human consumption.
-
-	The visit() function may choose to recursively traverse() each
-	element.  So for example if "tc->kind()" in a visit routine
-	returned CORBA::tk_struct, the contents of that struct would
-	be ignored unless the visit routine invoked traverse() using
-	the typecode and values passed to it.
-
-	If the visit() routine returns TRAVERSE_CONTINUE, succeeding
-	constituents of the data type are visited in turn; if it
-	returns TRAVERSE_STOP, the traverse() routine returns that
-	value to its caller.  Of course, if a visit() routine calls
-	traverse() itself, it may choose to ignore TRAVERSE_STOP.
-
-The traverse() routine is a powerful tool.  It is used in the IIOP code
-itself in several ways; look at such use for tutorial details.  You could
-implement data value comparison and "debug" data dumping as simple exercises
-in the use of these APIs.
-
-The "marshaling interpreter" (marshal.cc) uses it to encode and decode
-values according to the IIOP protocol specification.  The "Any" code
-(any.cc) uses traverse() both to free embedded pointers, and to make "deep"
-copies of any data structure given its TypeCode.
-
-Only that "deep copy" visit routine uses "value2" as anything other than a
-null pointer; it allows efficient construction of "deep copies" without
-needing extra space for temporary values or coroutine stacks.  (A general
-purpose two-value comparison could also use "value2".)  Most uses of the API
-only manipulate a single data value at a time; no realistic need has yet
-been seen for manipulating more than two data values at once.
-
-With respect to the OMG C and C++ mappings, it is clear that this style API
-must be provided for the C mapping, but some people have noted that a
-"purer" object oriented style API could also be provided in C++.  That style
-would use another internal visit routine, performing the requisite "switch"
-over the fixed number of TCKind values, and then make a virtual function
-call to an instance of a C++ class whose private state was the "context" and
-whose member functions matched the arms of the switch.
-
-
-MEMORY ALLOCATION
-
-In order to dynamically manipulate instances of arbitrary data types,
-applications need to be able to allocate and free memory.  The OMG C++
-mapping only says how to do this for data types which have static C++
-interfaces defined, which is clearly inadequate for using constructed
-types with the DII/DSI/Any family of interfaces.
-
-This infrastructure requires the standard "malloc" and "free" primitives to
-be used, and cast to the appropriate type.  Data allocated using malloc
-will normally be sized according to TypeCode::size(), and then be stored
-inside an Any.  When the Any is deleted, if the ORB deallocates the memory
-it always uses "free" (including for any nested pointers, and correctly
-handling cases such as arrays and sequences).
-
-Note that to support implementations where C and C++ language bindings
-share the same ORB infrastructure, this solution is inadequate.  This is
-because the C binding's CORBA_free() interface would have no way to
-determine the type of the data being freed.  Instead, typed allocation
-APIs will need to be used even when using the dynamically typed CORBA
-subsystem ... a TypeCode::malloc() routine would suffice, if it returned
-memory that was internally tagged with that TypeCode.  In such a case,
-the CORBA_free() routine could use that TypeCode to "deep free" data as
-required, and C++ "new" and "delete" operators would need to know about
-the internal tagging for all those data types.  Such tagged allocation
-would need to be used for all data that was to be freed by the ORB.
-
-(Having the C mapping require use of "typed free" routines, instead of the
-CORBA_free interface, is sufficient to eliminate this problem.)
-
-
-PASSING EXCEPTIONS THROUGH THE DII
-
-The C++ mapping's Dynamic Invocation Interface (DII) has key omissions
-in that it doesn't say how to access to user-defined exception values,
-and implicitly requires ORBs either to pass "excess" data on the wire
-or else to consult an interface repository to deal with exceptions or
-(deprecated) "context" strings.
-
-This software changes the DII specification in two ways to support the
-requirement for DII users to be able to see user-defined exceptions, yet
-not to violate the OMG-IDL type model by reporting illegal exceptions:
-
-    * The Object::_create_request() member function, through which DII
-      users provide all the information included in an IDL operation's
-      signature, has an additional parameter.
-
-      That parameter is a sequence of exception typecodes, describing
-      the user-defined exceptions that the operation can return.  (The
-      standard exceptions defined in CORBA may always be returned.)
-      When any other exception is returned, the client's ORB reports that
-      the object's type definition has been violated by the server's ORB.
-
-    * The TypeCode interpreter (see above) may be used to examine all
-      exception values reported through a CORBA::Environment.  A new
-      Exception::id() operation may be used to determine which typecode
-      should be used.
-
-Note that a number of portability and specification problems have been
-identified in the current C++ mapping for DII, e.g. for details of memory
-management.  Later versions of this code may attempt to closely comply
-with an improved mapping for DII, to the extent that the interpretation
-used here differs from that more unambiguous specification.
-
-Since there is no efficient way to distinguish typecodes for user defined
-exceptions from ones for system-defined ("standard") exceptions (comparing
-the exception ID against all the system defined ones is inefficient :-)
-a new enum type "ExceptionType" is defined.  (An analogous type is already
-defined for the C language mapping.)  This is used to report exceptions
-through DII and DSI.
diff --git a/TAO/docs/HISTORY b/TAO/docs/HISTORY
deleted file mode 100644
index d97a8e35b2e..00000000000
--- a/TAO/docs/HISTORY
+++ /dev/null
@@ -1,44 +0,0 @@
-@(#)HISTORY	1.1 95/09/13
-
-Mmmmmmmm DD, 1995 -- RELEASE 1.3:
----------------------------------
-Release 1.3 includes bugfixes, and support for the COM binary interface
-model, both on UNIX and on MS-Windows platforms.  The source tree has
-been considerably restructured, with the goal of enabling addition of
-other components at both the binary and source levels.
-
-
-September 1, 1995 -- RELEASE 1.2:
----------------------------------
-Release 1.2 includes fixes for problems noted in the recent multivendor
-interoperability testing at Object World, and as reported by other users on
-the Internet.  The most notable of these is that in some cases, when using
-multiple connections to IIOP servers and clients, the connection management
-code previously would get confused about which connection was which.  (One
-consequence of fixing this is that an old test has been removed.)  Also,
-there was no simple way to use Solaris 2.4 threads; see the Makefile for
-details.  A few other minor features were added to facilitate use of this
-code for more than just protocol testing.
-
-
-June 28, 1995 -- RELEASE 1.1:
------------------------------
-Release 1.1 includes support for several new platforms.  Particular thanks
-go to the team at APM, which contributed the bulk of the new "autoconf"
-support (substantially enhancing portability), support for DEC Alpha and
-HP 9000 platforms, runtime initialization of the size and alignment table
-used to drive the typecode interpreter, and more; see README.apm for details.
-
-Release 1.1 includes POSIX.1c threading support; on platforms which provide
-POSIX.1c threads, applications will be able to take advantage of them.
-
-Union and indirection support has been added to the TypeCode interpreter,
-and more typecode utility APIs have been implemented.  Various bugfixes and
-cleanup have also been provided.  Unfinished stubs for the COS Naming service
-are included; these rely on C++ exception support.
-
-
-March 21, 1995 -- RELEASE 1.0:
-------------------------------
-The original release ran on a set of UNIX platforms (including Solaris,
-SunOS, Linux, and NEXTSTEP) as well as with 16-bit and 32-bit MS-Windows.
diff --git a/TAO/docs/Options.html b/TAO/docs/Options.html
deleted file mode 100644
index 4a5aa57361e..00000000000
--- a/TAO/docs/Options.html
+++ /dev/null
@@ -1,177 +0,0 @@
-<HTML>
-<HEAD>
-  <META NAME="GENERATOR" CONTENT="Adobe PageMill 2.0 Mac">
-  <TITLE>Options for TAO Components</TITLE>
-</HEAD>
-<BODY>
-
-<H1 ALIGN=CENTER>Options for TAO Components</H1>
-
-<H2>Overview</H2>
-<blockquote>
-<P>Certain components in TAO such as the ORB Core or object adapter
-can be tuned by users by providing value for options to them.  These
-options are commonly specified as strings (<EM>e.g.</EM>, passed on
-the command-line) and are passed to component initialization methods
-for consumption.</P>
-
-<P><EM>Programmer's Note:</EM> the internal structure for these
-options is the traditional <CODE>argc</CODE>/<CODE>argv</CODE> vector
-of strings style popularized by C and Unix.  By convention, an
-initialization method will <b>NOT</b> consume, <EM>i.e.</EM> ,remove
-from the vector, any options that it recognizes.  Rather, it will
-leave those options intact, and it will also simply ignore any options
-is does not recognize as its own.</P>
-</blockquote>
-
-<H2>Types of Options</H2>
-
-<H2>Roadmap</H2>
-
-<blockquote>
-<P>The following components can be tuned via options:</P>
-
-<UL>
-  <LI><A HREF="#ORB"><CODE>CORBA::ORB</CODE></A>
-  <LI><A HREF="#POA"><CODE>CORBA::POA</CODE></A>
-  <LI><A HREF="#ResourceFactory"><CODE>TAO_Resource_Factory</CODE></A>
-  <LI><A HREF="#DefaultServer"><CODE>TAO_Default_Server_Strategy_Factory</CODE></A>
-  <LI><A HREF="#DefaultClient" TARGET="_top"><CODE>TAO_Default_Client_Strategy_Factory</CODE></A>
-</UL>
-</blockquote>
-
-<H2>Options</H2>
-
-<blockquote>
-<H3><CODE>CORBA::ORB</CODE><A NAME="ORB"></A></H3>
-
-<P><TABLE BORDER="2" WIDTH="100%" HEIGHT="96" CELLSPACING="2" CELLPADDING=
-"0">
-<TR>
-<TH WIDTH="43%" HEIGHT="17">Option</TH>
-<TH WIDTH="57%">Description</TH></TR>
-<TR>
-<TD HEIGHT="30"><CODE>-ORBsvcconf</CODE> <EM>config file name</EM></TD>
-<TD>Specifies the name of the file from which it will read dynamic service configuration
-directives <EM>ala</EM> ACE's Service Configurator.</TD></TR>
-<TR>
-<TD HEIGHT="17"><CODE>-ORBdaemon</CODE></TD>
-<TD>Specifies that the ORB should <I>daemonize</I> itself.</TD></TR>
-<TR>
-<TD HEIGHT="17"><CODE>-ORBdebug</CODE></TD>
-<TD>Turns on the output of debugging messages within ACE's Service Configurator
-componentry.</TD></TR>
-<TR>
-<TD><CODE>-ORBhost</CODE> <EM>hostname</EM></TD>
-<TD>Tells the Object Adapter to listen for requests on the interface associated
-with the host named <I><EM>hostname</EM></I>.</TD></TR>
-<TR>
-<TD><CODE>-ORBport</CODE> <EM>portspec</EM></TD>
-<TD>Tells the Object Adapter to listen for requests on the port specified by
-<I><EM>portspec</EM></I>, which can be a name as found in <TT>/etc/services</TT>
-or a number. The default is <TT>10013</TT>.</TD></TR>
-<TR>
-<TD><CODE>-ORBobjrefstyle</CODE> <EM>which</EM></TD>
-<TD>Specifies the user-visible style of object references. The range of values
-is <CODE>IOR</CODE>, which is the traditional nonsensical object reference,
-or <CODE>URL</CODE>, which looks more like a URL.</TD></TR>
-<TR>
-<TD><CODE>-ORBobjdemux</CODE> <EM>demux_method</EM></TD>
-<TD>Specifies the method used to demultiplex to an object. The range of values
-is <CODE>dynamic</CODE>, <CODE>linear</CODE>, <CODE>active</CODE>, or <CODE>user</CODE>.</TD></TR>
-<TR>
-<TD><CODE>-ORBtablesize</CODE> <EM>object table size</EM></TD>
-<TD>Specifies the size of the object table as a positive, non-zero integer.
-If not specified, the default is <TT>64</TT>.</TD></TR>
-<TR>
-<TD><CODE>-ORBrcvsock</CODE> <EM>receive buffer size</EM></TD>
-<TD>Specify the size of the socket receive buffer as a positive, non-zero integer.
-If not specified, the system-dependent default is used.</TD></TR>
-<TR>
-<TD><CODE>-ORBsndsock</CODE> <EM>send buffer size</EM></TD>
-<TD>Specify the size of the socket send buffer as a positive, non-zero integer.
-If not specified, the system-dependent default is used.</TD></TR>
-<TR>
-<TD><CODE>-OAthread</CODE></TD>
-<TD>Specify a thread-per-connection concurrency policy be utilized in processing
-requests.</TD></TR>
-<TR>
-<TD><CODE>-ORBnameserviceport</CODE> <EM>portspec</EM></TD>
-<TD>Specifies which port the Naming Service is listening on.</TD></TR>
-<TR>
-<TD><CODE>-ORBnameserviceior</CODE> <EM>ior</EM></TD>
-<TD>Specifies the IOR for the Naming Service.</TD></TR>
-</TABLE>
-</P>
-
-<H3><CODE>CORBA::POA</CODE><A NAME="POA"></A></H3>
-
-<P><TABLE BORDER="2" CELLSPACING="2" CELLPADDING="0" WIDTH="100%">
-<TR>
-<TH WIDTH="43%">Option</TH>
-<TH WIDTH="55%">Description</TH></TR>
-<TR>
-<TD><CODE>-OAid</CODE> <EM>OA Identifier</EM></TD>
-<TD>Associates <I><EM>OA Identifier</EM></I> with the Object Adapter.</TD></TR>
-</TABLE>
-</P>
-
-<H3><CODE>TAO_Resource_Factory</CODE><A NAME="ResourceFactory"></A></H3>
-
-<P><TABLE BORDER="2" CELLSPACING="2" CELLPADDING="0" WIDTH="100%" HEIGHT=
-"186">
-<TR>
-<TH WIDTH="43%" HEIGHT="17">Option</TH>
-<TH WIDTH="55%">Description</TH></TR>
-<TR>
-<TD HEIGHT="43"><CODE>-ORBresources</CODE> <EM>which</EM></TD>
-<TD>Specify whether each thread uses a global 
-(<em>which</em> = <code>global</code>) or a thread-specific
-(<em>which</em> = <code>tss</code>) instance for the resources it returns.</TD></TR>
-</TABLE>
-</P>
-
-<H3><CODE>TAO_Default_Server_Strategy_Factory</CODE><A NAME="DefaultServer"></A></H3>
-
-<P><TABLE BORDER="2" CELLSPACING="2" CELLPADDING="0" WIDTH="100%" HEIGHT=
-"186">
-<TR>
-<TH WIDTH="43%" HEIGHT="17">Option</TH>
-<TH WIDTH="55%">Description</TH></TR>
-<TR>
-<TD HEIGHT="43"><CODE>-ORBthreadflags</CODE> <EM>thread flags</EM></TD>
-<TD>Specify the flags used for thread creation. Flags can be any logical-OR
-combination of <CODE>THR_DETACHED</CODE>, <CODE>THR_BOUND</CODE>, <CODE>THR_NEW_LWP</CODE>,
-<CODE>THE_SUSPENDED</CODE>.</TD></TR>
-<TR>
-<TD HEIGHT="30"><CODE>-ORBtablesize</CODE> <EM>object table size</EM></TD>
-<TD>Specify the size of the object table. If not specified, the default value
-is 64.</TD></TR>
-<TR>
-<TD HEIGHT="17"><CODE>-ORBconcurrency</CODE> <EM>which</EM></TD>
-<TD>Specify which concurrency strategy to use.  Range of values is <code>reactive</code>
-for a purely Reactor-driven concurrency strategy or
-<code>thread-per-connection</code> for creating a new thread to service each connection.</TD></TR>
-<TR>
-<TD HEIGHT="43"><CODE>-ORBdemuxstrategy</CODE> <EM>demultiplexing strategy</EM></TD>
-<TD>Specify the demultiplexing lookup strategy. The <EM>demultiplexing strategy</EM>
-can be one of <CODE>dynamic</CODE>, <CODE>linear</CODE>, <CODE>active</CODE>,
-or <CODE>user</CODE>.</TD></TR>
-</TABLE>
-</P>
-
-<H3><CODE>TAO_Default_Client_Strategy_Factory</CODE><A NAME="DefaultClient"></A></H3>
-
-<BLOCKQUOTE>
-  <P>There are currently no options for the <CODE>TAO_Default_Client_Strategy_Factory</CODE>.</P>
-</BLOCKQUOTE>
-</blockquote>
-
-<P><HR ALIGN=LEFT></P>
-
-<ADDRESS><A HREF="mailto:cleeland@cs.wustl.edu">Chris Cleeland</A></ADDRESS>
-
-<P><!-- Created: Fri Aug 29 10:06:40 CDT 1997 --><!-- hhmts start -->Last
-modified: Wed Sep 3 16:35:23 CDT 1997 <!-- hhmts end -->
-</BODY>
-</HTML>
diff --git a/TAO/docs/REFERENCES b/TAO/docs/REFERENCES
deleted file mode 100644
index a44ef31c16e..00000000000
--- a/TAO/docs/REFERENCES
+++ /dev/null
@@ -1,91 +0,0 @@
-@(#)REFERENCES	1.2 95/11/08
-
-REFERENCES
-==========
-Most of the relevant references here are to OMG documents, however there
-are a few external references of some note:
-
-    *	http://www.uci.agh.edu.pl/research/cs/TOCOOS/COPERNICUS.html
-
-
-OMG REFERENCES
---------------
-As of this writing, OMG is in the process of publishing new versions of the
-base CORBA specifications, merging specifications as needed into single
-documents and splitting out the C mapping from the CORBA/CORE specification.
-
-This software has made every effort to track both the base documents and the
-agreed corrections and revisions.  Since those documents have not yet been
-published, there will inevitably be areas in which it does not reflect the
-versions yet to be published.  See the "DIFFERENCES" file for information
-about where this software differs from these current base documents:
-
-* CORBA 2.0/Interoperability:  Universal Networked Objects (UNO), OMG
-  TC Document 95-3-10.  This includes the mandatory IIOP and bridging
-  support, as well as the optional DCE-CIOP protocol.
-
-* CORBA 1.2 specification, OMG TC Document 93-12-43.  This is the
-  base document on which the CORBA 2.0 CORE specifications build.
-
-* Universal Networked Objects (UNO), OMG TC Document 94-9-32.  Until
-  the CORBA 2.0/CORE document is published, replacing the CORBA 1.2,
-  initialisation, and IFR specifications, you must use this earlier
-  version of UNO to see (only!) the specification for DSI and several
-  other CORBA CORE extensions (for bridging) adopted by the OMG.
-  [ NOTE: use the IIOP specification in 95-3-10, not the one here;
-  95-3-10 has changes required by the IFR specification, 95-11-7. ]
-
-* Initialisation, OMG TC Document 94-10-24.  This defines the portable
-  APIs for initialising ORBs.
-
-* Interface Repository, OMG TC Document 94-11-7.  This updates the
-  CORBA specifications above and is referenced by the UNO document.
-
-* IDL C++ Language Mapping Specification, OMG TC Document 94-9-14.
-  This defines the mapping of CORBA 1.2, including OMG-IDL, onto C++.
-
-There are a few inconsistencies between these documents, which are in the
-process of being resolved.  The inconsistencies arose because different
-groups worked on different parts of the system, at different times and
-with some different goals.  Contact the various revision committees to
-find out how these differences are being resolved:
-
-    - interop@omg.org ... the interop revision task force (RTF)
-    - cxx_revision@omg.org ... the C++ RTF
-    - orb_revision@omg.org ... the general ORB RTF
-
-Also, note that these ORB specifications correspond to only the lowest levels
-of OMG's Object Management Architecture.  In particular, the "Object Services"
-define object interfaces for naming, events, persistence, relationships,
-lifecycle, externalization, transactions, and concurrency control.  Also,
-"Common Facilities" objects will address such things as compound document
-architecture.  If you intend to develop software based on ORBs, these
-specifications are likely to be of interest.  The OMA is available in
-technical bookstores:
-    
-    Richard Soley (ed.), Object Management Architecture Guide,
-    Second Edition, John Wiley & Sons, New York, 1992.
-
-
-ACQUIRING REFERENCE DOCUMENTS
------------------------------
-To acquire those reference documents, use the OMG document server through
-Internet email.  Send a message to "server@omg.org", with content lines
-such as
-
-    send help
-
-to get directions about how to use the server, or 
-
-    send docs/95-3-10.ps
-
-to get a PostScript copy of any particular document.  (OMG specifications
-are available only in PostScript.)
-
-The OMG document server is maintained for use by OMG members, but is also
-available for general Internet access.  Only members will be supported in
-the case of problems.
-
-To find out more about the OMG, send email to "omg@omg.org", or look
-at the Web page at "http://www.omg.org".
-
diff --git a/TAO/docs/components.html b/TAO/docs/components.html
deleted file mode 100644
index ae31ed258f6..00000000000
--- a/TAO/docs/components.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<HTML>
-  <HEAD>
-    <META NAME="GENERATOR" CONTENT="Adobe PageMill 2.0 Mac">
-    <TITLE>TAO Component Documentation</TITLE>
-  </HEAD>
-  <BODY>
-
-    <H1 ALIGN=CENTER>Component Documentation</H1>
-
-    <P>The following documentation is available on certain TAO components:</P>
-
-    <UL>
-      <LI><A HREF="Options.html">Options</A> &shy; describes the
-	options available to tune various components within TAO.  This
-	can be done by a user, and not a programmer.</li>
-
-      <li><a href="configurations.html">Configuration</a> &shy;
-      describes how to mix and match component <a
-      href="options.html">options</a> in order to achieve different
-      effects on how TAO processes requests.  For example, you might
-      look in here to get an idea on how to configure TAO to process
-      each request in a separate thread, or to process each connection
-      in a separate thread, <em>etc.</em></li>
-
-    </UL>
-  </BODY>
-</HTML>
diff --git a/TAO/docs/configurations.html b/TAO/docs/configurations.html
deleted file mode 100644
index 288be71d330..00000000000
--- a/TAO/docs/configurations.html
+++ /dev/null
@@ -1,177 +0,0 @@
-<HTML>
-  <HEAD>
-    <META NAME="GENERATOR" CONTENT="Adobe PageMill 2.0 Mac">
-    <TITLE>Configuring TAO's Components</TITLE>
-  </HEAD>
-  <BODY>
-
-    <H1 ALIGN=CENTER>Configuring TAO's Components</H1>
-
-    <H2>Overview</H2>
-    <blockquote>
-      <p>As described in the <a href="Options.html">options</a>
-	documentation, various components in TAO can be "tuned" by specifying
-	options for those components.  Here we present some examples of how to
-	combine these options to achieve certain effects on ORB operations.</P>
-    </blockquote>
-
-    <H2>Where Are Options Specified?</H2>
-    <blockquote>
-      <p>TAO configures itself using the ACE Service Configurator
-      framework.  Thus, options are specified in the familiar
-      <code>svc.conf</code> file (if you want to use a different file
-      name, use the <a
-      href="Options.html#svcfonf"><code>-ORBsvcconf</code></a>
-      option</p>
-    </blockquote>
-
-
-    <H2>Roadmap</H2>
-    
-    <blockquote>
-      <P>Details for the following configurations are provided.</P>
-
-      <UL>
-	<LI><A HREF="#"><CODE>CORBA::ORB</CODE></A>
-	<LI><A HREF="#"><CODE>CORBA::POA</CODE></A>
-	<LI><A HREF="#"><CODE>TAO_Resource_Factory</CODE></A>
-	<LI><A HREF="#"><CODE>TAO_Default_Server_Strategy_Factory</CODE></A>
-	<LI><A HREF="#"><CODE>TAO_Default_Client_Strategy_Factory</CODE></A>
-      </UL>
-    </blockquote>
-
-    <H2>Options</H2>
-
-    <blockquote>
-      <H3><CODE>CORBA::ORB</CODE><A NAME="ORB"></A></H3>
-
-<P><TABLE BORDER="2" WIDTH="100%" HEIGHT="96" CELLSPACING="2" CELLPADDING=
-"0">
-<TR>
-<TH WIDTH="43%" HEIGHT="17">Option</TH>
-<TH WIDTH="57%">Description</TH></TR>
-<TR>
-<TD HEIGHT="30"><CODE>-ORBsvcconf</CODE> <EM>config file name</EM></TD>
-<TD>Specifies the name of the file from which it will read dynamic service configuration
-directives <EM>ala</EM> ACE's Service Configurator.</TD></TR>
-<TR>
-<TD HEIGHT="17"><CODE>-ORBdaemon</CODE></TD>
-<TD>Specifies that the ORB should <I>daemonize</I> itself.</TD></TR>
-<TR>
-<TD HEIGHT="17"><CODE>-ORBdebug</CODE></TD>
-<TD>Turns on the output of debugging messages within ACE's Service Configurator
-componentry.</TD></TR>
-<TR>
-<TD><CODE>-ORBhost</CODE> <EM>hostname</EM></TD>
-<TD>Tells the Object Adapter to listen for requests on the interface associated
-with the host named <I><EM>hostname</EM></I>.</TD></TR>
-<TR>
-<TD><CODE>-ORBport</CODE> <EM>portspec</EM></TD>
-<TD>Tells the Object Adapter to listen for requests on the port specified by
-<I><EM>portspec</EM></I>, which can be a name as found in <TT>/etc/services</TT>
-or a number. The default is <TT>10013</TT>.</TD></TR>
-<TR>
-<TD><CODE>-ORBobjrefstyle</CODE> <EM>which</EM></TD>
-<TD>Specifies the user-visible style of object references. The range of values
-is <CODE>IOR</CODE>, which is the traditional nonsensical object reference,
-or <CODE>URL</CODE>, which looks more like a URL.</TD></TR>
-<TR>
-<TD><CODE>-ORBobjdemux</CODE> <EM>demux_method</EM></TD>
-<TD>Specifies the method used to demultiplex to an object. The range of values
-is <CODE>dynamic</CODE>, <CODE>linear</CODE>, <CODE>active</CODE>, or <CODE>user</CODE>.</TD></TR>
-<TR>
-<TD><CODE>-ORBtablesize</CODE> <EM>object table size</EM></TD>
-<TD>Specifies the size of the object table as a positive, non-zero integer.
-If not specified, the default is <TT>64</TT>.</TD></TR>
-<TR>
-<TD><CODE>-ORBrcvsock</CODE> <EM>receive buffer size</EM></TD>
-<TD>Specify the size of the socket receive buffer as a positive, non-zero integer.
-If not specified, the system-dependent default is used.</TD></TR>
-<TR>
-<TD><CODE>-ORBsndsock</CODE> <EM>send buffer size</EM></TD>
-<TD>Specify the size of the socket send buffer as a positive, non-zero integer.
-If not specified, the system-dependent default is used.</TD></TR>
-<TR>
-<TD><CODE>-OAthread</CODE></TD>
-<TD>Specify a thread-per-connection concurrency policy be utilized in processing
-requests.</TD></TR>
-<TR>
-<TD><CODE>-ORBnameserviceport</CODE> <EM>portspec</EM></TD>
-<TD>Specifies which port the Naming Service is listening on.</TD></TR>
-<TR>
-<TD><CODE>-ORBnameserviceior</CODE> <EM>ior</EM></TD>
-<TD>Specifies the IOR for the Naming Service.</TD></TR>
-</TABLE>
-</P>
-
-<H3><CODE>CORBA::POA</CODE><A NAME="POA"></A></H3>
-
-<P><TABLE BORDER="2" CELLSPACING="2" CELLPADDING="0" WIDTH="100%">
-<TR>
-<TH WIDTH="43%">Option</TH>
-<TH WIDTH="55%">Description</TH></TR>
-<TR>
-<TD><CODE>-OAid</CODE> <EM>OA Identifier</EM></TD>
-<TD>Associates <I><EM>OA Identifier</EM></I> with the Object Adapter.</TD></TR>
-</TABLE>
-</P>
-
-<H3><CODE>TAO_Resource_Factory</CODE><A NAME="ResourceFactory"></A></H3>
-
-<P><TABLE BORDER="2" CELLSPACING="2" CELLPADDING="0" WIDTH="100%" HEIGHT=
-"186">
-<TR>
-<TH WIDTH="43%" HEIGHT="17">Option</TH>
-<TH WIDTH="55%">Description</TH></TR>
-<TR>
-<TD HEIGHT="43"><CODE>-ORBresources</CODE> <EM>which</EM></TD>
-<TD>Specify whether each thread uses a global 
-(<em>which</em> = <code>global</code>) or a thread-specific
-(<em>which</em> = <code>tss</code>) instance for the resources it returns.</TD></TR>
-</TABLE>
-</P>
-
-<H3><CODE>TAO_Default_Server_Strategy_Factory</CODE><A NAME="DefaultServer"></A></H3>
-
-<P><TABLE BORDER="2" CELLSPACING="2" CELLPADDING="0" WIDTH="100%" HEIGHT=
-"186">
-<TR>
-<TH WIDTH="43%" HEIGHT="17">Option</TH>
-<TH WIDTH="55%">Description</TH></TR>
-<TR>
-<TD HEIGHT="43"><CODE>-ORBthreadflags</CODE> <EM>thread flags</EM></TD>
-<TD>Specify the flags used for thread creation. Flags can be any logical-OR
-combination of <CODE>THR_DETACHED</CODE>, <CODE>THR_BOUND</CODE>, <CODE>THR_NEW_LWP</CODE>,
-<CODE>THE_SUSPENDED</CODE>.</TD></TR>
-<TR>
-<TD HEIGHT="30"><CODE>-ORBtablesize</CODE> <EM>object table size</EM></TD>
-<TD>Specify the size of the object table. If not specified, the default value
-is 64.</TD></TR>
-<TR>
-<TD HEIGHT="17"><CODE>-ORBconcurrency</CODE> <EM>which</EM></TD>
-<TD>Specify which concurrency strategy to use.  Range of values is <code>reactive</code>
-for a purely Reactor-driven concurrency strategy or
-<code>thread-per-connection</code> for creating a new thread to service each connection.</TD></TR>
-<TR>
-<TD HEIGHT="43"><CODE>-ORBdemuxstrategy</CODE> <EM>demultiplexing strategy</EM></TD>
-<TD>Specify the demultiplexing lookup strategy. The <EM>demultiplexing strategy</EM>
-can be one of <CODE>dynamic</CODE>, <CODE>linear</CODE>, <CODE>active</CODE>,
-or <CODE>user</CODE>.</TD></TR>
-</TABLE>
-</P>
-
-<H3><CODE>TAO_Default_Client_Strategy_Factory</CODE><A NAME="DefaultClient"></A></H3>
-
-<BLOCKQUOTE>
-  <P>There are currently no options for the <CODE>TAO_Default_Client_Strategy_Factory</CODE>.</P>
-</BLOCKQUOTE>
-</blockquote>
-
-<P><HR ALIGN=LEFT></P>
-
-<ADDRESS><A HREF="mailto:cleeland@cs.wustl.edu">Chris Cleeland</A></ADDRESS>
-
-<P><!-- Created: Fri Aug 29 10:06:40 CDT 1997 --><!-- hhmts start -->Last
-modified: Wed Sep 3 16:35:23 CDT 1997 <!-- hhmts end -->
-</BODY>
-</HTML>
diff --git a/TAO/docs/index.html b/TAO/docs/index.html
deleted file mode 100644
index a7bf0dfe2bc..00000000000
--- a/TAO/docs/index.html
+++ /dev/null
@@ -1,18 +0,0 @@
-<HTML>
-<HEAD>
-  <META NAME="GENERATOR" CONTENT="Adobe PageMill 2.0 Mac">
-  <TITLE>TAO Documentation</TITLE>
-</HEAD>
-<BODY>
-
-<H1 ALIGN=CENTER>TAO Documentation</H1>
-
-<P>This is a guide to various pieces of documentation on The ACE ORB (TAO).</P>
-
-<UL>
-  <LI>Background
-  <LI><A HREF="releasenotes.html">In this release</A>
-  <LI><A HREF="components.html" TARGET="_top">Components</A>
-</UL>
-</BODY>
-</HTML>
diff --git a/TAO/docs/releasenotes.html b/TAO/docs/releasenotes.html
deleted file mode 100644
index 21854918af1..00000000000
--- a/TAO/docs/releasenotes.html
+++ /dev/null
@@ -1,26 +0,0 @@
-<HTML>
-<HEAD>
-    <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
-    <META NAME="GENERATOR" CONTENT="Mozilla/4.03 [en] (X11; I; Linux 2.0.30_SMP i686) [Netscape]">
-    <META HTTP-EQUIV="Refresh" CONTENT="1;URL=releasenotes/index.html">
-    <TITLE>TAO Release Information and TODO List</TITLE>
-</HEAD>
-<BODY TEXT="#000000" BGCOLOR="#FFFFFF" LINK="#000FFF" VLINK="#FF0F0F">
-<!-- $Id$ -->
-<CENTER>
-<H2>
-Release Information for The ACE ORB (TAO)</H2></CENTER>
-
-<CENTER>
-<H3>
-Version 0.0.12</H3></CENTER>
-
-<CENTER>
-<H3>
-17-October-1997</H3></CENTER>
-
-<HR>
-
-This document has moved <a href="http://www.cs.wustl.edu/~schmidt/ACE_wrappers/TAO/docs/releasenotes/index.html">here</a>.
-
-</HTML>
diff --git a/TAO/docs/releasenotes/index.html b/TAO/docs/releasenotes/index.html
deleted file mode 100644
index 0f7d36a9969..00000000000
--- a/TAO/docs/releasenotes/index.html
+++ /dev/null
@@ -1,344 +0,0 @@
-<HTML>
-<HEAD>
-   <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
-   <META NAME="GENERATOR" CONTENT="Mozilla/4.03 [en] (X11; I; Linux 2.0.30_SMP i686) [Netscape]">
-   <TITLE>TAO Release Information and TODO List</TITLE>
-</HEAD>
-<BODY TEXT="#000000" BGCOLOR="#FFFFFF">
-<!-- $Id$ -->
-<CENTER>
-<HR>
-<H3>
-Release Information for The ACE ORB (TAO)</H3></CENTER>
-
-Information is available on the following topics related to the <A
-HREF="http://www.cs.wustl.edu/~schmidt/ACE_wrappers/TAO/VERSION">current release</A> of
-<A HREF="TAO.html">TAO</A>:
-
-<UL>
-<LI>
-
-<A HREF="orbcore.html">ORB &amp; ORB Core</A></LI>
-
-<LI>
-<A HREF="#idl">IDL Compiler</A></LI>
-
-<LI>
-<A HREF="#eventchannel">Event Channel</A></LI>
-
-<LI>
-<A HREF="#apps">Test &amp; Example Applications</A></LI>
-
-<LI>
-<A HREF="#poa">Portable Object Adapter</A></LI>
-
-<LI>
-<A HREF="#nservices">CORBA Naming Service</A></LI>
-<LI>
-<A HREF="#tservices">CORBA Trader Service</A></LI>
-
-<LI>
-<A HREF="#ace">ORB-related ACE Changes</A></LI>
-</UL>
-
-<!--#include virtual="/~schmidt/ACE_wrappers/TAO/docs/releasenotes/orbcore.html" -->
-
-    <HR>
-
-    <H3><A NAME="idl"></A>IDL Compiler</H3>
-    Point of contact: <A HREF="mailto:gokhale@cs.wustl.edu">Aniruddha Gokhale</A>
-
-    <P> Current status: (As of Nov 25th, 1997.)
-    <UL>
-      <LI> Generated code closely follows the C++ Mapping specified in
-          the POA Specification (ORBOS/97-05-15). </LI>
-
-      <LI> Many IDL constructs supported including primitive types,
-          typedefs, sequences, structures, and unions. </LI>
-
-      <LI> Generates C++ stubs and skeletons that use TAO's <A
-          HREF="http://www.cs.wustl.edu/~schmidt/HICSS-97.ps.gz">interpretive IIOP protocol
-          engine</A>.  </LI>
-
-      <LI> Include files are handled properly. So are the definitions
-          used inside the include files that are used in the currently
-          parsed files. </LI>
-
-      <LI> The problems arising due to public virtual inheritance when
-          casting from an interface class to CORBA::Object_ptr has
-          been solved. We do this casting inside the stubs/skeletons
-          rather than first converting an interface class pointer to a
-          void*, storing it in an Any, and casting it to
-          CORBA::Object_ptr in the encode/decode methods. The casting
-          inside the stubs/skeletons work because the compiler has
-          knowledge of both types. </LI>
-
-      <LI> IN, INOUT, and OUT object reference parameters are now
-          supported properly. We think the same approach should work
-          for sequences, structs, and unions. </LI>
-
-      <LI> Support for attributes completed and is currently undergoing
-          testing </LI>
-
-      <LI> The latest success story is that the compiler
-          generates correct code for COSS Naming service and it
-          runs properly. Correct code also gets generated for the
-          Event Channel program </LI>
-    </UL>
-
-  <P> Known bugs:
-  <UL>
-	<LI>Works for <I>most</I> IDL constructs. Some of the known
-            bugs/incomplete tasks are:
-            <UL>
-              <LI> Problems when interfaces use single or multiple
-                  inheritance. The problem is with the demultiplexing
-                  code. </LI>
-
-              <LI>
-                  Sequences of strings and object references still
-                  pose problems </LI>
-
-              <LI>
-                  TypeCode generation for multidimensional arrays and
-                  indirected typecodes is still a problem. </LI>
-
-              <LI>
-                  Exceptions are not well-supported. TAO does not use
-                  C++ Exceptions. Instead we use the alternative
-                  mapping that uses CORBA::Environment. </LI>
-
-              <LI> Unions with default cases yet to be handled  </LI>
-
-              <LI> The <<= and >>= operators for user-defined types
-                  are not generated yet. </LI>
-
-              <LI> Deal with names in the IDL definition that are C++
-                  keywords. </LI>
-
-            </UL>
-        </LI>
-      </UL>
-
-      Future work:
-      <UL>
-
-	<LI>Improve IDL compiler to support complete IDL-to-C++ mapping.</LI>
-
-	<LI>Fix bugs in the SunSoft IDL front-end we've
-            uncovered. These primarily include support for Unions.</LI>
-
-        <LI>Add command line options to TAO IDL. These options will
-            decide what strategy to use for operation name
-            demultiplexing. Another option may decide whether to use
-            the interpretive IIOP engine or generate compiled
-            stubs/skeletons. </LI>
-
-	<LI>Use <A
-	HREF="http://www.cs.utah.edu/projects/flux/flick/">Flick</A>
-	(from the University of Utah) to generate compiled stubs.</LI>
-
-	<LI>Goal is to measure the code size of the interpretive stubs
-	generated by TAO IDL compiler <I>vs</I> code size of compiled
-	stubs. Then compare the performance of each. We want to prove
-	the thesis that TAO IDL compiler generated interpretive stubs
-	have a small code size, yet are comparable in performance (or
-	slightly less) than compiled stubs. Hence, it will be useful
-	for small distributed equipment such as handsets, PDAs,
-	etc.</LI>
-
-	<LI>In doing the above, improvements to the IIOP protocol
-	engine in terms of size/performance/determinism will be
-	made.</LI>
-      </UL>
-
-<HR>
-<H3>
-<A NAME="eventchannel"></A>Real-time Event Channel</H3>
-Point of contact: <A HREF="mailto:coryan@cs.wustl.edu">Carlos O'Ryan</A>
-
-<P>Current status:
-<UL>
-<LI>
-The current Event Channel is running under Orbix, fully distributed, the
-main test has three processes, one runs the EC itself, one a Supplier and
-yet another a Consumer.</LI>
-
-<LI>
-The configuration runs can be done even on the distributed scenario, using
-the Real-time "Scheduling Service", which now has an IDL interface.</LI>
-
-<LI>
-At run-time (no config runs) there is no need to use the Real-time Scheduling
-Service, a faster, collocated implementation for the service is available.
-Obviously the information is generated on the config runs and linked into
-the program.</LI>
-
-<LI>
-We are using an implementation of the standard <A HREF="#naming">Naming
-Service</A> for Orbix.</LI>
-</UL>
-Future work:
-<UL>
-<LI>
-Port to TAO (once IDL compiler is available and stable).</LI>
-
-<LI>
-The Scheduling Service is completely independant of the EC and the configuration
-of suppliers or consumers. I think it would be convenient to have a library
-and binaries for it, including a tool to dump the results in a C++ compilable
-form.</LI>
-</UL>
-
-<HR>
-<H3>
-<A NAME="apps"></A>Test &amp; Example Applications</H3>
-Point of contact: <A HREF="mailto:sumedh@cs.wustl.edu">Sumedh Mungee</A>
-
-<P>Current status:
-
-<P>The TAO test application is meant to serve as a starting point for real-time
-tests on the TAO system. It comprises the following parts:
-<UL>
-<LI>
-
-<I>Server.</I> The server creates multiple CORBA objects (servants),
-each with different real-time priorities. This priority is implemented
-by using real-time thread support provided by the operating
-system. Thus, requests sent to a high-priority servant are handled by
-a high-priority real-time thread, and those sent to a lower priority
-servant are handled by correspondingly lower priority threads. <P>
-
-<LI>
-<I>Client.</I> The client component binds to the servants, and sends a
-stream of CORBA requests to the servants. It measures the response time,
-i.e. the time taken for the request to complete successfully. In particular,
-it measures the time taken for requests sent to the high priority servant
-to complete. The volume of lower priority requests is configurable. The
-client is thus able to measure the performance of the high-priority servant
-in the presence of competition from several lower-priority servants.</LI>
-</UL>
-Clearly, if the ORB endsystem handles the priorities of the various requests
-correctly, increasing the volume of lower priority requests should not
-affect the performance seen by the higher priority requests. The application
-thus serves as a tool to measure and confirm this behavior.
-
-<P>Future work:
-<UL>
-<LI>
-Study the impacts of scheduling &amp; concurrency strategies on performance.</LI>
-
-<LI>
-Evolve into a testbed for discovering sources of performance non-determinism
-&amp; priority inversion.</LI>
-</UL>
-
-<HR>
-<H3>
-<A NAME="poa"></A>Portable Object Adapter</H3>
-Point of contact: <A HREF="mailto:irfan@cs.wustl.edu">Irfan Pyarali</A>
-
-<P>Current Status:
-<UL>
-<LI>
-The POA is not integrated into this release, though we've begun migrating
-TAO's OA to use POA method names.</LI>
-</UL>
-Critical work:
-
-<UL>
-<LI>
-Re-generate win32 project files with new file names.</LI>
-
-<LI>
-Add resolve_initial_references() to resolve the "RootPOA" entry.</LI>
-</UL>
-
-Future work:
-<UL>
-<LI>
-Mostly compliant with the <A HREF="http://siesta.cs.wustl.edu/~cleeland/tao/POA.pdf">ORB
-Portability Specifications [orbos/97-05-15]</A> published by OMG.</LI>
-
-<LI>
-Provide extensions of the specification to ensure real-time delivery of
-messages.</LI>
-</UL>
-
-<HR>
-<H3>
-<A NAME="nservices"></A>CORBA Naming Service</H3>
-Point of contact: <A HREF="mailto:sergio@cs.wustl.edu">Sergio
-Flores-Gaitan</A> and <A HREF="mailto:marina@cs.wustl.edu">Marina
-Spivak</A><P>
-
-<P>Current status:
-<UL>
-<LI>
-This implementation works with TAO.</LI>
-</UL>
-
-<!--#include virtual="/~schmidt/ACE_wrappers/TAO/docs/releasenotes/trader.html" -->
-<HR>
-<H3>
-<A NAME="ace"></A>ORB-related ACE Changes</H3>
-Points of contact: <A HREF="mailto:cleeland@cs.wustl.edu">Chris Cleeland</A> and <A HREF="mailto:irfan@cs.wustl.edu">Irfan Pyrarli</A>
-
-    <P>Recently Completed Work:
-    <UL>
-      <li>Added special declaration to OS.h for <code>inet_ntoa</code>
-      and other functions because VxWorks doesn't provide full
-      argument prototypes for these library functions.</li>
-
-      <li>The current caching connector behaves properly in the face
-      of a non-blocking connect request.  The "fix" is simply to not
-      support non-blocking connects through the cache.  When the
-      <code>connect()</code> fails with <code>EWOULDBLOCK</code>,
-      morph the error to -1 and clean up the request.</li>
-
-      <li> Service handlers obtained from the caching connector are
-      now cleaned up.  The application needs to be able to signal that
-      it's not using it any longer, and, when the application encounters
-      an error, needs to effectively close down that connection for good
-      so that a new connection can be initiated. <br>
-
-      Added the ability for a Svc_Handler to
-      recycle itself.  idle() can be called when the Svc_Handler is
-      done serving a particular connection and can how be recycled.
-      The Svc_Handler now also has a pointer to a recycler that is
-      responsible for managing the connections.  The recycler is
-      usually a Cached_Connector. <br>
-
-      Added new class ACE_Recycling_Strategy.
-      It defines the interface (and default implementation) for
-      specifying a recycling strategy for a Svc_Handler.  This
-      strategy acts as a consular to the Svc_Handler, preparing it for
-      the tough times ahead when the Svc_Handler will be recycled. <br>
-
-      Added new class ACE_NOOP_Concurrency_Strategy.  It implements
-      a no-op activation strategy in order to avoid calling open on
-      a recycled svc_handler multiple times. <br>
-
-      ACE_Cached_Connect_Strategy now
-      implements the ACE_Connection_Recycling_Strategy interface.
-      This allows Svc_Handlers to cache themselves with
-      ACE_Cached_Connect_Strategy when they become idle.  It also
-      allows them to purge themselves from the connection cache when
-      the Svc_Handlers close down. <br>
-
-      Also added ~ACE_Cached_Connect_Strategy that will cleanup up the
-      connection cache.  </li>
-
-
-    </UL>
-
-    <P>Future work:
-
-      <blockquote>
-      <em>None currently scheduled.</em>
-      </blockquote>
-
-</BODY>
-<hr><P>
-<!--#include virtual="/~schmidt/cgi-sig.html" -->
-</HTML>
diff --git a/TAO/docs/releasenotes/orbcore.html b/TAO/docs/releasenotes/orbcore.html
deleted file mode 100644
index 7b9bb610870..00000000000
--- a/TAO/docs/releasenotes/orbcore.html
+++ /dev/null
@@ -1,246 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
-
-<html>
-  <head>
-    <title>ORB & ORB Core Status</title>
-  </head>
-
-    <HR>
-    <H3><A NAME="orb"></A>ORB &amp; ORB Core</H3>
-    Point of contact: <A HREF="mailto:cleeland@cs.wustl.edu">Chris Cleeland</A>
-
-<P>Current status:
-
-      <UL>
-	<LI>
-	  Provides dynamically linked wholesale assignment of ORB
-	  strategies for communication, concurrency, demultiplexing,
-	  scheduling, and dispatching using the ACE Service
-	  Configurator framework.</LI>
-
-	<LI>
-	  Supports several concurrency models out of the box:
-	  Reactive, Thread-per-Connection, and ORB-per-thread. The
-	  ORB-per-thread design is optimized for real-time I/O
-	  subsystems.</LI>
-      </UL>
-
-      Recently Completed Work:
-
-    <UL>
-      <li>Placed an optimization in IIOP::Profile that should speed up
-      invocations on the client side rather substantially.  This was
-      done by caching an instance of <code>ACE_INET_Addr</code> in the
-      private portion of <code>Profile</code> because the cost of
-      constructing one for every invocation (in
-      <code>TAO_GIOP_Invocation::start</code>) was simply
-      enormous--the construction was something like 100 cycles on
-      Solaris.  This is all because deep down this ends up calling
-      <code>gethostbyname()</code>, which can be very costly.  Of
-      course, this is platform-dependent, so the improvements may not
-      be as great on a different platform.</li>
-
-      <li>Got rid of need to have compile in TSS ORB Core
-      (<code>-DTAO_HAS_TSS_ORBCORE</code>).  This is accomplished by
-      having a Resource Factory (<code>TAO_Resource_Factory</code>)
-      singleton which the ORB Core consults in order to get pointers
-      to resources.  The Resource Factory can be configured to return
-      pointers from thread-specific storage, or process-global
-      storage.  By doing this, the ORB Core is shielded from ever
-      having to know whether or not its resources are global or
-      not.</li>
-
-	<li>Made all command-line like options look like the
-	standard-professed options, i.e., <b>-ORBxxx</b> or
-	<b>-OAxxxx</b>.</li>
-
-	<li>Moved ORB option parsing into
-	<code>TAO_ORB_Core::init()</code> rather than in
-	<code>ORB_init()</code>.</li>
-
-	<li>Define <code>_FAR</code> for all cases as an interim fix
-	for LynxOS.</li>
-
-	<li>Fixed TAO so that the default port of 5001 is defined in
-	<code>orb_core.h</code> config header somewhere rather than in
-	<code>orbobj.cpp</code>, and use <b>MAXHOSTNAMELEN</b> ACE
-	constant for the hostname buffer.</li>
-
-	<li>Eliminated need for <code>CORBA::Object</code> to keep a
-	pointer to its orb sitting around anywhere.</li>
-
-	<LI>Tested <code>CORBA_ORB::shutdown()</code> as a manner in
-	which a thread of control can request that
-	<code>CORBA_ORB::run()</code> should return and no longer
-	service requests.  It only honors a
-	<em>wait_for_completion</em> argument of <b>FALSE</b> right
-	now because we haven't fully explored the issues which
-	surround doing all the completion.</li>
-
-	<li>Fixed bugs reported by Steven Wohlever, David Miron,
-	Manojkumar Acharya.</li>
-
-	<li>Created a brief section in <a
-	href="../../TAO-Install.html"><code>$TAO_ROOT/TAO-Install.html</code></a>
-	that <em>briefly</em> documents installation on Unix
-	platforms.  There is also a brief section which documents
-	issues that apply across ALL platforms, such as the fact that
-	TAO and its application will likely not work well if your ACE
-	is linked through Orbix, VisiBroker, or another ORB.  <a
-	href="../../ChangeLog">ChangeLog</a> discovery attribution for
-	this should go to <em>Steve Wohlever
-	&lt;wohlever@mitre.org&gt;</em>.</li>
-
-	<LI>Implemented <code>CORBA_ORB::shutdown()</code> as a manner
-	in which a thread of control can request that
-	<code>CORBA_ORB::run()</code> should return and no longer
-	service requests.</li>
-
-	<LI>Validated movement of Strategy Connector into
-	ORB&nbsp;Core.</LI>
-
-	<li>Debated details of <code>Svc_Handler</code> modifications
-	with Irfan.</li>
-
-	<li>Tested and commited <code>Connector::connect_n</code> changes
-	to ACE</code>.</li>
-
-	<li>ACE & TAO compiling cleanly using Sun's CC on Solaris and
-	G++ on Linux.  Also, the ACE tests run properly.</li>
-
-	<li>Use <code>truss</code> to verify for <a
-	href="mailto:PAUL.G.WEHLAGE@cdev.com">Paul Wehlage</a> that
-	TAO really uses <code>select</code> vs. <code>recv</code> for
-	<b>-R</b> vs. <b>-T</b>.</li>
-
-	<li>Renamed <code>boa.*</code> to <code>poa.*</code>.</li>
-
-	<LI>Renamed following files:&nbsp;Orb_Core.*&nbsp;->orb_core.*
-	&amp;&nbsp;orbobj.* -> corba_orb.*.</LI>
-
-	<LI>The lock used in <code>giop.cpp:626</code> originally
-	appeared in the IIOP-1.4 code base.  Its purpose was to
-	protect access to the <code>fwd_profile</code> data member.
-	The original features are available, but they are currently
-	not used because none of our concurrency models present a
-	thread-unsafe condition.  The <a
-	href="../../ChangeLog">ChangeLog</a> presents more details on
-	the subject.</li>
-
-	<li>Fixed problems seen by <a
-	href="mailto:brian.r.mendel@boeing.com">Brian Mendel</a> of
-	Boeing where the Cubit server application was crashing in
-	<code>TAO_OA_Connection_Handler::handle_message</code> when it
-	was trying to call <code>CORBA::POA::handle_request</code>
-	through a NULL <code>root_poa</code> pointer.  The NULL
-	pointer resulted from the inadvertent use of the
-	Thread-per-Connection concurrency model, which is currently
-	incompatible with the ORB-per-thread model.  It was not caught
-	because the change is normally done in configuration files
-	parsed by the Service Configurator, and VxWorks requires
-	special code in that area which was not tested until Boeing
-	got hold of the code.</li>
-
-	<li>Clean up build under g++.  All 'function used before
-	declared inline' warnings have been eliminated.  Also, all
-	other warnings (except for one that is nearly unavoidable)
-	have been eliminated.
-	</li>
-
-	<LI>Removed BOA and ROA names from the ORB.</LI>
-
-	<LI>Changed <code>CORBA_ORB::open()</code> to return an error
-	status (first cut at this already there--needs to be checked
-	out).</LI>
-
-	<LI>Added README file to multiCubit test.</li>
-        </UL>
-
-      Ongoing Work:
-
-      <UL>
-	<LI>Verify ACE & TAO on Linux.</LI>
-
-	<LI>Use Purify to eliminate straggling problems.</LI>
-
-        </UL>
-
-      Current Work:
-
-        <UL>
-	<LI>Clean up the internals and analyze for performance bottlenecks using Quantify.</LI>
-
-	<LI>
-	  <p>
-	    Verify that, in the ORB-per-thread concurrency model, it's
-	    possible to have a factory in each thread that creates a
-	    client and returns an object reference to that client
-	    within that thread.  This is different from the model that
-	    Sumedh originally had where the factory was trying to turn
-	    out a client in a separate thread/ORB combination.</p>
-	  <p>
-	    There is no application which attempts this at the moment,
-	    so both a client and a server will need to be
-	    manufactured.  Using existing Cubit-like examples (that
-	    poor app is so weary) should reduce development time to a
-	    couple of hours.</p>
-	  <p>
-	    The real strategy/solution is to make
-	    <code>CORBA::Object</code> not keep a pointer to its orb
-	    sitting around anywhere.  It should only get it when it
-	    needs it.  This should not be difficult to change.</p>
-	</LI>
-        </UL>
-
-      Critical Work:
-
-        <UL>
-	<LI>Add pre-cached connection on client side.  Clients will
-	pass in a comma-separated list of <em>host:port</em>
-	destinations using the <code>CORBA::ORB_init()</code>
-	interface.</LI>
-
-	<LI>Support new concurrency models, e.g.,
-	Thread-per-Request.</LI>
-
-        </UL>
-
-      Future work:
-      <UL>
-      <li>Make argument parsing with the orb consume the arguments it parses.</li>
-
-	<li>Remove <code>_FAR</code> from all code.</li>
-
-        <li>Update ORB Patterns paper to reflect the latest TAO has to
-        offer.  Specifically, sections on the Abstract Factory and
-        Concurrency strategies need to be updated, and the entire
-        paper needs to be reviewed for accuracy w.r.t the current
-        TAO.</li>
-
-	<li>Make the section in <a
-	href="../../TAO-Install.html"><code>$TAO_ROOT/TAO-Install.html</code></a>
-	that documents installation on Unix platforms more complete.
-	</li>
-
-	<li>Improve the <code>Service Configurator</code> service
-	entry faking on VxWorks.</li>
-
-	<LI>Integrate the <A HREF="#poa">POA</A> implementation.</LI>
-
-	<LI>Add support for <TT>resolve_initial_references</TT> using
-	ACE support for UDP broadcast.</LI>
-
-	<LI>Assist in porting higher level services (e.g., <A
-	HREF="#eventchannel">Event Channel</A>) to TAO.</LI>
-
-	<li>Compile and verify ACE and TAO on Linux using the Kuck and
-	Associates, Inc. (KAI) compiler tools.</li>
-
-    <LI> Remove the CORBA_SEQUENCE structure which is not a true C++
-        mapping of sequences. This will affect the code that uses
-        OctetSequences and TC_opaque. </LI>
-
-      </UL>
-
-  </body>
-</html>
diff --git a/TAO/docs/releasenotes/trader.html b/TAO/docs/releasenotes/trader.html
deleted file mode 100644
index ac3b09fc26f..00000000000
--- a/TAO/docs/releasenotes/trader.html
+++ /dev/null
@@ -1,31 +0,0 @@
-<HR>
-<H3><A NAME="tservices"></A>CORBA Trader Service</H3>
-Point of contact: <A HREF="mailto:sbw1@cs.wustl.edu">Seth Widoff</A> and <A HREF="mailto:marina@cs.wustl.edu">Marina Spivak</a><P>
-
-<P>Current status:
-
-<ul>
-<li> Lookup Interface </li>
-<li> Constraint Interpreter (for constraint based lookup)</li>
-<li> Register Interface </li>
-<li> Offer Iterator, Offer Id Iterator </li>
-<li> Abstract Interfaces </li>
-<li> Service Type Repository </li> 
-<li> Admin Interface</li>
-<li> Support for Dynamic Property Evaluation</li>
-</ul>
-
-<P>Future work:
-
-<ul>
-<li>Utilization of Service Type Repository by Register and Lookup  <br>
-    to provide full type checking</li>
-<li>Port to NT</li>
-<li>Port to TAO</li> 
-<li>Link Interface </li>
-</ul>
-
-Complete design information on the TAO Trader service is available <A
-HREF="http://www.cs.wustl.edu/~marina/Trader_status.html">online</A>.
-
-</ul>
diff --git a/TAO/local/ChangeLog b/TAO/local/ChangeLog
deleted file mode 100644
index 6e70e93fb68..00000000000
--- a/TAO/local/ChangeLog
+++ /dev/null
@@ -1,107 +0,0 @@
-Mon Nov 24 20:53:03 1997  Carlos O'Ryan  <coryan@macarena.cs.wustl.edu>
-
-	* bin/Event_Service/Event_Channel.h: 
-	* bin/Event_Service/Event_Channel.cpp: 
-	  Removed the forward_event support, since this is MDA/Boeing
-	  propietary.
-
-Thu Nov 20 22:07:36 1997  David L. Levine  <levine@cs.wustl.edu>
-
-        * local/bin/Scheduling_Service/Scheduler_Generic.*:
-          added ACE_Scheduler_Generic.  It's a drop-in
-          replacement for ACE_Scheduler_Internal that assigns
-          the same priority and subpriority to all tasks.
-
-Wed Nov 19 14:53:25 1997  David L. Levine  <levine@cs.wustl.edu>
-
-        * local/bin/Scheduling_Service/Scheduler.cpp: #include
-          Scheduler.h instead of Scheduler_Internal.h.
-          (export): changed loop index from u_int to int to avoid
-          signed/unsigned comparison.
-
-Tue Nov 18 13:26:32 1997  Carlos O'Ryan  <coryan@macarena.cs.wustl.edu>
-
-	* tests/Latency.cpp:
-	  Added minimal code to measure round trip delays through the EC.
-
-Mon Nov 17 18:44:29 1997  Carlos O'Ryan  <coryan@macarena.cs.wustl.edu>
-
-	* tests/Latency.h:
-	* tests/Latency.cpp:
-	  Added small classes to implement the Supplier and Consumer
-	  personalities of Latency_Supplier; they delegate on it to do the
-	  job.
-	  The QoS for the Consumer personality of Latency_Supplier was
-	  wrong.
-
-Sun Nov 16 00:11:28 1997  Carlos O'Ryan  <coryan@macarena.cs.wustl.edu>
-
-	* README:
-	* Makefile:
-	  This directory should hold the propietary code of Boeing. It
-	  even holds its own ChangeLog to keep the profile *very* low.
-	  IT MUST NOT BE DISTRIBUTED IN THE RELEASES.
-
-	* bin/Makefile:
-	  This directory contains the Services (Event and Schedule).
-
-	* bin/Scheduling_Service/Makefile:
-	* bin/Scheduling_Service/.cvsignore:
-	* bin/Scheduling_Service/svc.conf:
-	* bin/Scheduling_Service/Config_Scheduler.cpp:
-	* bin/Scheduling_Service/Config_Scheduler.h:
-	* bin/Scheduling_Service/Config_Scheduler.i:
-	* bin/Scheduling_Service/Scheduler.cpp:
-	* bin/Scheduling_Service/Scheduler.h:
-	* bin/Scheduling_Service/Scheduler.i:
-	* bin/Scheduling_Service/Scheduler_Internal.cpp:
-	* bin/Scheduling_Service/Scheduler_Internal.h:
-	* bin/Scheduling_Service/Scheduler_Internal.i:
-	* bin/Scheduling_Service/dump_schedule.cpp:
-	* bin/Scheduling_Service/schedule_service.cpp:
-	  This is the implementation of the Scheduling Service.
-	  The dump utility is also here, in the future we may want to move
-	  it.
-
-	* bin/Event_Service/Makefile:
-	* bin/Event_Service/BCU.cpp:
-	* bin/Event_Service/BCU.h:
-	* bin/Event_Service/CORBA_Utils_T.cpp:
-	* bin/Event_Service/CORBA_Utils_T.h:
-	* bin/Event_Service/CORBA_Utils_T.i:
-	* bin/Event_Service/Channel_Clients.i:
-	* bin/Event_Service/Channel_Clients_T.i:
-	* bin/Event_Service/Debug_Macros.h:
-	* bin/Event_Service/Dispatching_Modules.cpp:
-	* bin/Event_Service/Dispatching_Modules.h:
-	* bin/Event_Service/Dispatching_Modules.i:
-	* bin/Event_Service/Event_Channel.cpp:
-	* bin/Event_Service/Event_Channel.h:
-	* bin/Event_Service/Event_Channel.i:
-	* bin/Event_Service/Event_Service.cpp:
-	* bin/Event_Service/Fast_Reactor.h:
-	* bin/Event_Service/GPlot_File.cpp:
-	* bin/Event_Service/GPlot_File.h:
-	* bin/Event_Service/GPlot_File.i:
-	* bin/Event_Service/Local_ESTypes.cpp:
-	* bin/Event_Service/Local_ESTypes.h:
-	* bin/Event_Service/Local_ESTypes.i:
-	* bin/Event_Service/Memory_Pools.cpp:
-	* bin/Event_Service/Memory_Pools.h:
-	* bin/Event_Service/Memory_Pools.i:
-	* bin/Event_Service/RT_Task.cpp:
-	* bin/Event_Service/RT_Task.h:
-	* bin/Event_Service/RT_Task.i:
-	* bin/Event_Service/ReactorTask.cpp:
-	* bin/Event_Service/ReactorTask.h:
-	* bin/Event_Service/Task_Manager.cpp:
-	* bin/Event_Service/Task_Manager.h:
-	* bin/Event_Service/Task_Manager.i:
-	  Implements the Event Service.
-
-	* tests/Makefile:
-	* tests/Latency.cpp:
-	* tests/Latency.h:
-	* tests/Utilization.cpp:
-	* tests/Utilization.h:
-	  Simple tests for the Event Service.
diff --git a/TAO/local/Makefile b/TAO/local/Makefile
deleted file mode 100644
index 658bbefe555..00000000000
--- a/TAO/local/Makefile
+++ /dev/null
@@ -1,23 +0,0 @@
-#----------------------------------------------------------------------------
-#
-# $Id$
-#
-#----------------------------------------------------------------------------
-
-#----------------------------------------------------------------------------
-#	Local macros
-#----------------------------------------------------------------------------
-
-DIRS  =	bin \
-	tests
-
-#----------------------------------------------------------------------------
-#	Include macros and targets
-#----------------------------------------------------------------------------
-
-include	$(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-include	$(ACE_ROOT)/include/makeinclude/macros.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.common.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.nested.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.nolocal.GNU
-
diff --git a/TAO/local/README b/TAO/local/README
deleted file mode 100644
index f556fcac4da..00000000000
--- a/TAO/local/README
+++ /dev/null
@@ -1,2 +0,0 @@
-This directory should contain the non-distributable code for TAO, such
-as the Boeing propietary stuff.
diff --git a/TAO/local/bin/Event_Service/BCU.cpp b/TAO/local/bin/Event_Service/BCU.cpp
deleted file mode 100644
index 862f6240cdc..00000000000
--- a/TAO/local/bin/Event_Service/BCU.cpp
+++ /dev/null
@@ -1,31 +0,0 @@
-// $Id$
-
-#include "BCU.h"
-#include "ace/ACE.h"
-
-
-u_long
-ACE_BCU (u_long n)
-{
-  const u_long ACE_BCU_PRIME_NUMBER = 9619;
-
-  u_long retval = 0;
-
-  while (n-- > 0)
-    retval = ACE::is_prime (ACE_BCU_PRIME_NUMBER, 2, ACE_BCU_PRIME_NUMBER / 2);
-
-  return retval;
-}
-
-
-u_long
-ACE_BCU (u_long number,
-         u_long n)
-{
-  u_long retval = 0;
-
-  while (n-- > 0)
-    retval = ACE::is_prime (number, 2, number);
-
-  return retval;
-}
diff --git a/TAO/local/bin/Event_Service/BCU.h b/TAO/local/bin/Event_Service/BCU.h
deleted file mode 100644
index 9eaf5fdf96b..00000000000
--- a/TAO/local/bin/Event_Service/BCU.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-//
-// ============================================================================
-//
-// = LIBRARY
-//    ace ORB
-// 
-// = FILENAME
-//    Benchmark Computation Units
-//
-// = AUTHOR
-//    David Levine and Tim Harrison (harrison@cs.wustl.edu)
-//
-// = DESCRIPTION
-//
-//    Times how long it takes to generate each of the first N prime
-//    numbers.
-// ============================================================================
-
-#if !defined (ACE_BCU_H)
-#define ACE_BCU_H
-
-#include "ace/OS.h"
-
-
-u_long ACE_BCU (u_long n);
-// Check if a specific, hardcoded number is prime (via ACE::is_prime) <n>
-// times.
-
-
-u_long ACE_BCU (u_long number, u_long n);
-// Check if <number> is prime (via ACE::is_prime ()) <n> times.
-
-#endif /* ACE_BCU_H */
diff --git a/TAO/local/bin/Event_Service/CORBA_Utils_T.cpp b/TAO/local/bin/Event_Service/CORBA_Utils_T.cpp
deleted file mode 100644
index f603421eaaa..00000000000
--- a/TAO/local/bin/Event_Service/CORBA_Utils_T.cpp
+++ /dev/null
@@ -1,349 +0,0 @@
-// $Id$
-
-#if !defined (ACE_CORBA_UTILS_C)
-#define ACE_CORBA_UTILS_C
-
-#include "CORBA_Utils_T.h"
-#include "ace/Log_Msg.h"
-
-#if !defined (__ACE_INLINE__)
-#include "CORBA_Utils_T.i"
-#endif /* __ACE_INLINE__ */
-
-template <class TYPE>
-ACE_CORBA_Sequence<TYPE>::ACE_CORBA_Sequence (const ACE_CORBA_Sequence<TYPE> &source)
-  : maximum_ (0),
-    length_ (0),
-    buffer_ (0),
-    release_ (0)
-{
-  (*this) = source;
-}
-
-template <class TYPE>
-ACE_CORBA_Sequence<TYPE>::ACE_CORBA_Sequence (void)
-  : maximum_ (0),
-    length_ (0),
-    buffer_ (0),
-    release_ (0)
-{
-}
-
-template <class TYPE>
-ACE_CORBA_Sequence<TYPE>::~ACE_CORBA_Sequence (void)
-{
-  if (release_)
-    {
-      this->delete_array (buffer_, maximum_);
-    }
-}
-
-template <class TYPE>
-ACE_CORBA_Sequence<TYPE>::ACE_CORBA_Sequence (CORBA::ULong max)
-  : maximum_ (max),
-    length_ (0),
-    buffer_ (0),
-
-    release_ (0)
-{
-  if (maximum_ > 0)
-    {
-      buffer_ = this->new_array (maximum_);
-      release_ = 1;
-    }
-}
-
-template <class TYPE> TYPE *
-ACE_CORBA_Sequence<TYPE>::new_array (size_t len)
-{
-  return new TYPE[len];
-}
-
-template <class TYPE> void
-ACE_CORBA_Sequence<TYPE>::delete_array (TYPE *buf, size_t)
-{
-  delete [] buf;
-}
-
-template <class TYPE>
-ACE_CORBA_Sequence<TYPE>::ACE_CORBA_Sequence (CORBA::ULong max, 
-					      CORBA::ULong length, 
-					      TYPE* data,
-					      CORBA::Boolean release)
-  : maximum_ (max),
-    length_ (length),
-    buffer_ (data),
-    release_ (release)
-{
-  if ((buffer_ == 0) && (max > 0))
-    {
-      // @@ What should we do here?
-      errno = ENOMEM;
-      ACE_ERROR ((LM_ERROR, "No memory.\n"));
-    }
-}
-
-// @@ This makes a deep copy, dig?
-template <class TYPE> ACE_CORBA_Sequence<TYPE> &
-ACE_CORBA_Sequence<TYPE>::operator= (const ACE_CORBA_Sequence<TYPE> &source)
-{
-  if (source.length () > 0)
-    {
-      // If our buffer is too small, release it and allocate one just big
-      // enough.  If buffer_ == 0, this works fine.
-      if (this->maximum () < source.length ())
-	{
-	  if (release_)
-	    {
-	      this->delete_array (buffer_, maximum_);
-	    }
-	  maximum_ = source.length ();
-	  buffer_ = this->new_array (maximum_);
-	  release_ = 1;
-	}
-
-      // Copy each of the items from the source.
-      for (CORBA::ULong index=0; index < source.length (); index++)
-	(*this)[index] = source[index];
-
-      this->length (source.length ());
-    }
-
-  return *this;
-}
-
-template <class TYPE> void
-ACE_CORBA_Sequence<TYPE>::length (CORBA::ULong len)
-{
-  if (len > maximum_)
-    {
-      // Allocate the space that we need.
-      TYPE* tmp = this->new_array (len);
-      // Copy over the old sequence.
-      for (int i = 0; i < maximum_; ++i)
-	{
-	  tmp[i] = buffer_[i];
-	}
-      if (release_)
-	{
-	  this->delete_array (buffer_, maximum_);
-	}
-      buffer_ = tmp;
-      release_ = 1;
-      maximum_ = len;
-      // The destructor of -old- will release the old buffer_ if
-      // necessary.
-    }
-
-  length_ = len;
-}
-
-
-// g++ can't handle these operator [] functions if they're inline
-template <class TYPE> TYPE&
-ACE_CORBA_Sequence<TYPE>::operator [] (CORBA::ULong i)
-{
-  // @@ Should we do bounds checking?
-  if (i >= maximum_)
-    {
-      ACE_ERROR ((LM_ERROR, "Trying to write past maximum.\n"));
-      return buffer_[maximum_ - 1];
-    }
-  else
-    return buffer_[i];
-}
-
-template <class TYPE> const TYPE&
-ACE_CORBA_Sequence<TYPE>::operator [] (CORBA::ULong i) const
-{
-  if (i >= length_)
-    {
-      ACE_ERROR ((LM_ERROR, "Trying to read past length.\n"));
-      return buffer_[length_ - 1];
-    }
-    
-  return buffer_[i];
-}
-
-// ********************
-
-/*
-template <class TYPE> void 
-dump (const ACE_CORBA_Sequence<TYPE> &seq)
-{
-  for (CORBA::ULong index=0; index < seq.length (); index++)
-    dump (seq[index]);
-}
-*/
-
-/*
-template <class TYPE> ACE_INLINE void
-operator += (ACE_CORBA_Sequence<TYPE> &seq,
-	     const TYPE &item)
-{
-  CORBA::ULong length = seq.length ();
-  seq.length (length + 1);
-  seq[length] = item;
-}
-*/
-
-template <class TYPE> ACE_INLINE void
-operator += (ACE_CORBA_Sequence<TYPE> &dest,
-	     const ACE_CORBA_Sequence<TYPE> &source)
-{
-  int old_length = dest.length ();
-  int new_length = old_length + source.length ();
-  dest.length (new_length);
-
-  int difference = new_length - old_length;
-  
-  for (int x=0; x < difference; x++)
-    dest[old_length + x] = source[x];
-}
-
-/*
-template <class TYPE> ACE_INLINE void
-remove_item (TYPE &seq, CORBA::ULong index)
-{
-  int new_length = seq.length () - 1;
-
-  // Shift the set back one, starting at <index>.
-  for (int x = index; x < new_length; x++)
-    seq[x] = seq[x+1];
-
-  // Set the new length.
-  seq.length (new_length);
-}
-*/
-
-// ************************************************************
-// ************************************************************
-// ************************************************************
-
-template<class TYPE>
-ACE_CORBA_var<TYPE>::ACE_CORBA_var (const ACE_CORBA_var<TYPE> &source)
-{
-  if (source.me_ != 0)
-    me_ = (TYPE *) source.me_->_duplicate ();
-  // CORBA::duplicate (source.me_);
-}
-
-template<class TYPE>  
-ACE_CORBA_var<TYPE>::ACE_CORBA_var (void)
-  : me_ (0)
-{
-}
-
-template<class TYPE>
-ACE_CORBA_var<TYPE>::ACE_CORBA_var (TYPE *source)
-{
-  me_ = (TYPE *) source->_duplicate ();
-  // CORBA::duplicate (source);
-}
-
-template<class TYPE>
-ACE_CORBA_var<TYPE>::~ACE_CORBA_var (void)
-{
-  if (me_ != 0)
-    me_->_release ();
-  //CORBA::release (me_);
-}
-
-template<class TYPE> ACE_CORBA_var<TYPE> &
-ACE_CORBA_var<TYPE>::operator= (TYPE *source)
-{
-  if (me_ != source &&
-      me_ != 0)
-    me_->_release ();
-  //CORBA::release (me_);
-
-  me_ = (TYPE *) source->_duplicate ();
-  // CORBA::duplicate (source);
-  return *this;
-}
-
-template<class TYPE> ACE_CORBA_var<TYPE> & 
-ACE_CORBA_var<TYPE>::operator= (const ACE_CORBA_var<TYPE> &source)
-{
-  if (me_ != source.me_ &&
-      me_ != 0)
-    me_->_release ();
-  // CORBA::release (me_);
-
-  me_ = (TYPE *) source.me_->_duplicate ();
-  // CORBA::duplicate (source.me_);
-  return *this;
-}
-
-template<class TYPE> TYPE *
-ACE_CORBA_var<TYPE>::operator->(void)
-{
-  return me_;
-}
-
-template<class TYPE>
-ACE_CORBA_var<TYPE>::operator TYPE *(void) const
-{
-  return me_;
-}
-
-/*
-template<class TYPE>
-ACE_CORBA_var<TYPE>::operator TYPE *&(void)
-{
-  return me_;
-}
-*/
-
-template<class TYPE>
-ACE_CORBA_var<TYPE>::operator TYPE &(void) const
-{
-  return *me_;
-}
-
-// ************************************************************
-// ************************************************************
-
-/*
-ACE_CORBA_Object_Ref<IMPL>::ACE_CORBA_Object_Ref (void)
-  : impl_ (0)
-{
-}
-
-ACE_CORBA_Object_Ref<IMPL>::ACE_CORBA_Object_Ref (IMPL *impl)
-  : impl_ (impl)
-{
-}
-
-ACE_CORBA_Object_Ref<IMPL>::~ACE_CORBA_Object_Ref (void)
-  : impl_ (0)
-{
-}
-
-ACE_CORBA_Object_Ref<IMPL> &
-ACE_CORBA_Object_Ref<IMPL>::operator= (const ACE_CORBA_Object_Ref<IMPL> &source)
-{
-  return *this;
-}
-
-IMPL *
-ACE_CORBA_Object_Ref<IMPL>::operator->(void)
-{
-  return impl_;
-}
-
-IMPL *
-ACE_CORBA_Object_Ref<IMPL>::operator IMPL *(void)
-{
-  return impl_;
-}
-
-ACE_CORBA_Object_Ref<IMPL> *
-ACE_CORBA_Object_Ref<IMPL>::_duplicate (ACE_CORBA_Object_Ref<IMPL> *source)
-{
-  source->ref_count_++;
-  return source;
-}
-
-*/
-#endif /* ACE_CORBA_UTILS_C */
diff --git a/TAO/local/bin/Event_Service/CORBA_Utils_T.h b/TAO/local/bin/Event_Service/CORBA_Utils_T.h
deleted file mode 100644
index 8abf180d9e1..00000000000
--- a/TAO/local/bin/Event_Service/CORBA_Utils_T.h
+++ /dev/null
@@ -1,236 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-//
-// ============================================================================
-//
-// = LIBRARY
-//    ace_orb
-// 
-// = FILENAME
-//    CORBA_Utilities.h
-//
-// = AUTHORS
-//    Tim Harrison.
-//
-// = NOTE
-//   This class is a bit ackward when using a real ORB, but we cannot
-//   easily remove it since some of the types are used in the
-//   implementation of the EC. TODO
-// 
-// ============================================================================
-
-#if !defined (ACE_CORBA_UTILS_H)
-#define ACE_CORBA_UTILS_H
-
-#include "ace/Time_Value.h"
-#include "tao/corba.h"
-
-template <class TYPE>
-class ACE_CORBA_Sequence// : public CORBA::Object
-// = TITLE
-//
-// = DESCRIPTION
-{
-public:
-
-  ACE_CORBA_Sequence (const ACE_CORBA_Sequence<TYPE> &source);
-  // Copy construction.
-
-  ACE_CORBA_Sequence (CORBA::ULong max);
-  ACE_CORBA_Sequence (CORBA::ULong max, 
-		      CORBA::ULong length, 
-		      TYPE* data, 
-		      CORBA::Boolean release = 0);
-  ACE_CORBA_Sequence (void);
-
-  virtual ~ACE_CORBA_Sequence (void);
-
-  ACE_CORBA_Sequence<TYPE> &operator= (const ACE_CORBA_Sequence<TYPE> &);
-
-  // static TYPE* allocbuf(CORBA::ULong nelems);
-  // static void freebuf(TYPE* data);
-
-  CORBA::ULong maximum (void) const;
-  CORBA::ULong length (void) const;
-  void length (CORBA::ULong len);
-
-  TYPE& operator [] (CORBA::ULong IT_i);
-
-  const TYPE& operator [] (CORBA::ULong IT_i) const;
-
-  virtual TYPE *new_array (size_t len);
-  // Allocates TYPE[len].  This facilitates template methods through
-  // template specialization to allow the use of different memory
-  // pools.
-
-  virtual void delete_array (TYPE *buf, size_t len);
-  // delete [] <buf>.
-
-protected:
-  CORBA::ULong maximum_;
-  CORBA::ULong length_;
-  TYPE* buffer_;
-  unsigned char release_;
-};
-
-// Utility for debugging sequences.
-//template <class TYPE>
-//void dump (const ACE_CORBA_Sequence<TYPE> &seq);
-
-// Utility for appending single items.  Increases the length of <set>
-// and adds <event> to the end of <set>.
-template <class TYPE> void
-operator += (ACE_CORBA_Sequence<TYPE> &seq,
-	     const TYPE &item)
-{
-  CORBA::ULong length = seq.length ();
-  seq.length (length + 1);
-  seq[length] = item;
-}
-
-// Utility for appending sequences.
-template <class TYPE> void
-operator += (ACE_CORBA_Sequence<TYPE> &dest, 
-	     const ACE_CORBA_Sequence<TYPE> &source);
-
-template <class TYPE> void
-remove_item (TYPE &seq, CORBA::ULong index)
-{
-  int new_length = seq.length () - 1;
-
-  // Shift the set back one, starting at <index>.
-  for (int x = index; x < new_length; x++)
-    seq[x] = seq[x+1];
-
-  // Set the new length.
-  seq.length (new_length);
-}
-// Removes seq[index] by moving everything after <index> back and
-// decrementing the length.
-
-// ************************************************************
-
-template <class TYPE>
-class ACE_CORBA_var
-// = TITLE
-//
-// = DESCRIPTION
-{
-public:
-  ACE_CORBA_var (const ACE_CORBA_var<TYPE> &source);
-  ACE_CORBA_var (void);
-  ACE_CORBA_var (TYPE *source);
-  ~ACE_CORBA_var (void);
-  ACE_CORBA_var<TYPE> &operator= (TYPE *source);
-  ACE_CORBA_var<TYPE> &operator= (const ACE_CORBA_var<TYPE> &source);
-  TYPE *operator->(void);
-  operator TYPE *(void) const;
-  //  operator TYPE *&(void);
-  operator TYPE &(void) const;
-private:
-  TYPE *me_;
-};
-
-// ************************************************************
-
-/*
-template <class IMPL>
-class ACE_CORBA_Object_Ref : public CORBA::Object
-// = TITLE
-//    ACE CORBA Object Reference
-//
-// = DESCRIPTION
-//    A wrapper for making CORBA Object References.  For a single
-//    address space ORB, this points directly to the IMPL
-//    class.  This is supposed to look like a pointer to
-//    IMPL with an additional static _duplicate method.
-{
-public:
-  // ACE_CORBA_Object_Ref (ACE_CORBA_Object_Ref<IMPL> &obj);
-  ACE_CORBA_Object_Ref (void);
-  ACE_CORBA_Object_Ref (IMPL *impl);
-  ~ACE_CORBA_Object_Ref (void);
-  //  ACE_CORBA_Object_Ref<IMPL> &operator= (IMPL *source);
-  ACE_CORBA_Object_Ref<IMPL> &operator= 
-    (const ACE_CORBA_Object_Ref<IMPL> &source);
-  
-  IMPL *operator->(void);
-  // A distributed ORB would require that the CORBA Object Reference
-  // implement all IMPL interfaces, marshall the parameters,
-  // and transmit over IIOP.  For this single address space ORB, we'll
-  // just delegate method calls to the IMPL directly.
-
-  operator IMPL *(void) const;
-  // operator IMPL *&(void);
-  // operator IMPL &(void) const;
-
-  static ACE_CORBA_Object_Ref<IMPL> *_duplicate 
-    (ACE_CORBA_Object_Ref<IMPL> *source);
-
-private:
-  IMPL *impl_;
-};
-*/
-
-// ************************************************************
-
-template <class ITEM, size_t SIZE>
-class ACE_ES_Simple_Array
-// = TITLE
-//    Simple Array
-//
-// = DESCRIPTION
-//    Wraps ITEM[SIZE] with insert and an iterator.  There is no
-//    remove.  It allows duplicates.  It is truly very simple.
-{
- public:
-  ACE_ES_Simple_Array (void);
-  int insert (const ITEM &copy_me);
-  size_t size (void);
-  ITEM *data (void);
- protected:
-  ITEM data_[SIZE];
-  size_t size_;
-};
-
-template <class ITEM>
-class ACE_ES_Array_Iterator
-// = TITLE
-//    Simple Iterator
-//
-// = DESCRIPTION
-//    Iterates through an array of ITEMs.
-{
-public:
-  ACE_ES_Array_Iterator (ITEM *data, size_t size);
-
-  int next (ITEM *&next_item);
-  // Returns 0 when all items have been seen, else 1.  Sets
-  // <next_item> to point at the next ITEM.
-
-  int advance (void);
-  // Move forward by one element in the Stack.  Returns 0 when all the
-  // items in the Stack have been seen, else 1.
-
-  int done (void) const;
-  // Returns 1 when all items have been seen, else 0.
-
-private:
-  ITEM *data_;
-  size_t size_;
-  size_t index_;
-};
-
-#if defined (__ACE_INLINE__)
-#include "CORBA_Utils_T.i"
-#endif /* __ACE_INLINE__ */
-
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "CORBA_Utils_T.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("CORBA_Utils_T.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
-#endif /* ACE_CORBA_UTILS_H */
diff --git a/TAO/local/bin/Event_Service/CORBA_Utils_T.i b/TAO/local/bin/Event_Service/CORBA_Utils_T.i
deleted file mode 100644
index b31b093baf2..00000000000
--- a/TAO/local/bin/Event_Service/CORBA_Utils_T.i
+++ /dev/null
@@ -1,70 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-template <class TYPE> ACE_INLINE CORBA::ULong
-ACE_CORBA_Sequence<TYPE>::maximum (void) const
-{
-  return maximum_;
-}
-
-template <class TYPE> ACE_INLINE CORBA::ULong
-ACE_CORBA_Sequence<TYPE>::length() const
-{
-  return length_;
-}
-
-
-// ************************************************************
-
-template <class ITEM, size_t SIZE> ACE_INLINE
-ACE_ES_Simple_Array<ITEM, SIZE>::ACE_ES_Simple_Array (void) :
-  size_ (0)
-{
-}
-
-template <class ITEM, size_t SIZE> ACE_INLINE int
-ACE_ES_Simple_Array<ITEM, SIZE>::insert (const ITEM &copy_me)
-{
-  if (size_ >= SIZE)
-    return -1;
-
-  data_[size_++] = copy_me;
-  return 0;
-}
-
-template <class ITEM, size_t SIZE> ACE_INLINE size_t
-ACE_ES_Simple_Array<ITEM, SIZE>::size (void)
-{
-  return size_;
-}
-
-template <class ITEM, size_t SIZE> ACE_INLINE ITEM *
-ACE_ES_Simple_Array<ITEM, SIZE>::data (void)
-{
-  return data_;
-}
-
-// ************************************************************
-
-template <class ITEM> ACE_INLINE
-ACE_ES_Array_Iterator<ITEM>::ACE_ES_Array_Iterator (ITEM *data, size_t size) :
-  data_ (data),
-  size_ (size),
-  index_ (0)
-{
-}
-
-template <class ITEM> ACE_INLINE int
-ACE_ES_Array_Iterator<ITEM>::next (ITEM *&next_item)
-{
-  next_item = &data_[index_];
-  return index_ < (size_ - 1);
-}
-
-template <class ITEM> ACE_INLINE int
-ACE_ES_Array_Iterator<ITEM>::advance (void)
-{
-  index_++;
-  return index_ < size_;
-}
-
diff --git a/TAO/local/bin/Event_Service/Channel_Clients.i b/TAO/local/bin/Event_Service/Channel_Clients.i
deleted file mode 100644
index 6318deb79a0..00000000000
--- a/TAO/local/bin/Event_Service/Channel_Clients.i
+++ /dev/null
@@ -1,2 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
diff --git a/TAO/local/bin/Event_Service/Channel_Clients_T.i b/TAO/local/bin/Event_Service/Channel_Clients_T.i
deleted file mode 100644
index f7c0760fd86..00000000000
--- a/TAO/local/bin/Event_Service/Channel_Clients_T.i
+++ /dev/null
@@ -1,35 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-template <class TARGET> ACE_INLINE
-ACE_PushConsumer_Adapter<TARGET>::ACE_PushConsumer_Adapter (TARGET *target)
-  : target_ (target)
-{
-}
-
-template <class TARGET> ACE_INLINE void
-ACE_PushConsumer_Adapter<TARGET>::push (const RtecEventComm::EventSet& events,
-					CORBA::Environment &_env)
-{
-  target_->_push (events, _env);
-}
-
-template <class TARGET> ACE_INLINE void
-ACE_PushConsumer_Adapter<TARGET>::disconnect_push_consumer (CORBA::Environment &_env)
-{
-  target_->_disconnect_push_consumer (_env);
-}
-
-// ************************************************************
-
-template <class TARGET> ACE_INLINE
-ACE_PushSupplier_Adapter<TARGET>::ACE_PushSupplier_Adapter (TARGET *target)
-  : target_ (target)
-{
-}
-
-template <class TARGET> ACE_INLINE void
-ACE_PushSupplier_Adapter<TARGET>::disconnect_push_supplier (CORBA::Environment &_env)
-{
-  target_->_disconnect_push_supplier (_env);
-}
diff --git a/TAO/local/bin/Event_Service/Debug_Macros.h b/TAO/local/bin/Event_Service/Debug_Macros.h
deleted file mode 100644
index 8db3d169082..00000000000
--- a/TAO/local/bin/Event_Service/Debug_Macros.h
+++ /dev/null
@@ -1,11 +0,0 @@
-
-#if defined (ACE_ES_NOLOGGING)
-#define ACE_ES_DEBUG(X)
-#define ACE_ES_DEBUG_ST(X)
-#else
-#define ACE_ES_DEBUG(X) \
-  do { \
-      ACE_Log_Msg::instance ()->log X; \
-  } while (0)
-#define ACE_ES_DEBUG_ST(X) X
-#endif /* ACE_ES_NOLOGGING */
diff --git a/TAO/local/bin/Event_Service/Dispatching_Modules.cpp b/TAO/local/bin/Event_Service/Dispatching_Modules.cpp
deleted file mode 100644
index 13d8cbe0d46..00000000000
--- a/TAO/local/bin/Event_Service/Dispatching_Modules.cpp
+++ /dev/null
@@ -1,603 +0,0 @@
-// $Id$
-
-#include "ace/Sched_Params.h"
-#include "Memory_Pools.h"
-#include "Scheduler_Factory.h"
-
-#include "Dispatching_Modules.h"
-
-#if !defined (__ACE_INLINE__)
-#include "Dispatching_Modules.i"
-#endif /* __ACE_INLINE__ */
-
-typedef ACE_EventChannel::DISPATCH_ERROR DISPATCH_ERROR;
-typedef ACE_EventChannel::SYNCHRONIZATION_ERROR SYNC_ERROR;
-typedef ACE_EventChannel::QOS_ERROR QOS_ERROR;
-
-// ************************************************************
-
-void
-ACE_ES_Dispatch_Request::make_copy (RtecEventComm::EventSet &dest) const
-{
-  if (use_single_event_)
-    {
-      dest.length (1);
-      dest[0] = single_event_;
-    }
-  else
-    {
-      dest.length (event_set_.length ());
-
-      for (CORBA::ULong index=0; index < event_set_.length (); index++)
-	{
-	  RtecEventComm::Event &dest_event = dest[index];
-	  ACE_ES_Event_Container_var &source_event_var = ((ACE_ES_Event_Container_var &) event_set_[index]);
-	  dest_event = *(source_event_var.operator->());
-	}
-    }
-}
-
-int
-ACE_ES_Dispatch_Request::execute (u_long &command_action)
-{
-  ACE_TIMEPROBE ("dispatch (dequeue) the event");
-
-  return dispatching_module_->dispatch_event (this, command_action);
-}
-
-#if 0
-void *
-ACE_ES_Dispatch_Request::operator new (size_t nbytes)
-{
-  if (nbytes > sizeof (ACE_ES_Dispatch_Request))
-    {
-      ACE_ERROR ((LM_ERROR, "nbytes = %d, sizeof (ACE_ES_Dispatch_Request_Chunk) = %d.\n",
-		  sizeof (ACE_ES_Dispatch_Request)));
-      ACE_ASSERT (nbytes <= sizeof (ACE_ES_Dispatch_Request));
-    }
-
-  return ACE_ES_Memory_Pools::new_Dispatch_Request ();
-}
-
-void 
-ACE_ES_Dispatch_Request::operator delete (void *mem)
-{
-  ACE_ES_Memory_Pools::delete_Dispatch_Request (mem);
-}
-#endif /* 0 */
-
-// ************************************************************
-
-ACE_ES_Priority_Dispatching::ACE_ES_Priority_Dispatching (ACE_EventChannel *channel,
-							  int threads_per_queue)
-  : ACE_ES_Dispatching_Base (channel),
-    notification_strategy_ (this),
-    highest_priority_ (0),
-    shutdown_ (0),
-    threads_per_queue_ (threads_per_queue)
-{
-  // If we're single threaded, then we need to use the notification strategy.
-  if ((threads_per_queue_ == 0) &&
-      (notification_strategy_.open () == -1))
-    ACE_ERROR ((LM_ERROR, "%p.\n", "ACE_ES_Priority_Dispatching"));
-
-  // Initialize the queues.
-  for (int x=0; x < ACE_Scheduler_MAX_PRIORITIES; x++)
-    {
-      queues_[x] = 0;
-      delete_me_queues_[x] = 0;
-    }
-
-  this->initialize_queues ();
-}
-
-ACE_ES_Priority_Dispatching::~ACE_ES_Priority_Dispatching (void)
-{
-  // Delete the queues.
-  for (int x=0; x < ACE_Scheduler_MAX_PRIORITIES; x++)
-    delete delete_me_queues_[x];
-}
-
-
-void
-ACE_ES_Priority_Dispatching::initialize_queues (void)
-{
-  for (int x=0; x < ACE_Scheduler_MAX_PRIORITIES; x++)
-    {
-      RtecScheduler::Period tv = ACE_Scheduler_Rates[x];
-      queues_[x] = new ACE_ES_Dispatch_Queue (this, &notification_strategy_); 
-      if (queues_[x] == 0 ||
-	  queues_[x]->open_queue (tv, threads_per_queue_) == -1)
-	{
-	  ACE_ERROR ((LM_ERROR, "%p.\n", "ACE_ES_Priority_Dispatching::initialize_queues"));
-	  return;
-	}
-
-      queue_count_[x] = 1;
-    }
-
-  highest_priority_ = ACE_Scheduler_MAX_PRIORITIES - 1;
-}
-
-void 
-ACE_ES_Priority_Dispatching::connected (ACE_Push_Consumer_Proxy *consumer, 
-					CORBA::Environment &_env)
-{
-  down_->connected (consumer, _env);
-
-  // This code does dynamic allocation of channel dispatch threads.
-  // It requires that consumer's priorities are known at connection
-  // time and that threads can request priorities from the scheduler
-  // at run-time.  These are both antithetical to static scheduling.
-  // The constructor now allocates a thread per rate group.
-#if 0
-  // We have to tell the lower portions of the channel about the
-  // consumer first.  This is so that any changes to the consumer's
-  // qos will take effect when we get the dispatch priority.
-  down_->connected (consumer, _env);
-
-  RtecScheduler::OS_Priority priority = 
-    ACE_Scheduler::instance ().preemption_priority (consumer->qos ().rt_info_);
-
-  {
-    ACE_ES_GUARD ace_mon (lock_);
-  
-    // If a queue has not been created for the consumer's priority,
-    // create one.
-    if (queues_[priority] == 0)
-      {
-	// Allocate a new dispatch queue.
-	queues_[priority] = new ACE_ES_Dispatch_Queue (this, &notification_strategy_);
-	if (queues_[priority] == 0)
-	  ACE_THROW (CORBA::NO_MEMORY (0, CORBA::COMPLETED_NO, 
-					  "ACE_ES_Priority_Dispatching::connected"));
-
-	// Initialize the dispatch queue corresponding to the
-	// consumer's priority.  With a full implementation of the
-	// run-time scheduler, the dispatch queue can find it's
-	// scheduling qos online.  However, we pass the rate in case
-	// one is not found.  The rate can be used to obtain the
-	// proper priority.  If threads_per_queue_ == 0, then these
-	// queues will be passive.  Otherwise, they will be active.
-	// This switches us between MT_ORB and ST_ORB.  If we're
-	// single-threaded, this registers us with the ReactorEx using
-	// our notification_strategy_.  If we're multi-threaded, this
-	// spawns the threads.
-	if (queues_[priority]->open_queue (priority,
-					   threads_per_queue_) == -1)
-	  ACE_THROW (DISPATCH_ERROR (0, CORBA::COMPLETED_NO,
-				     "ACE_ES_Priority_Dispatching::connected:"
-				     "queue open failed.\n"));
-
-	// When this goes down to 0, we will shutdown the queue.
-	queue_count_[priority] = 1;
-
-	// Keep track of this to optimize handle_signal.
-	if (priority > highest_priority_)
-	  highest_priority_ = priority;
-
-	ACE_DEBUG ((LM_DEBUG, "Created queue priority = %d.\n", priority));
-      }
-    else
-      queue_count_[priority]++;
-  }
-#endif
-}
-
-void 
-ACE_ES_Priority_Dispatching::disconnected (ACE_Push_Consumer_Proxy *consumer)
-{
-  // We'll not dynamically close down queues.
-  ACE_UNUSED_ARG (consumer);
-
-#if 0
-  RtecScheduler::OS_Priority priority = 
-    ACE_Scheduler::instance ().preemption_priority (consumer->qos ().rt_info_);
-
-  {
-    ACE_ES_GUARD ace_mon (lock_);
-
-    // If there are no more users of this queue, then we *could* shut
-    // it down.  However, we will not.
-    if (--queue_count_[priority] <= 0)
-      {
-	ACE_DEBUG ((LM_DEBUG, "(%t) unused dispatch queue priority = %d, "
-		    "is_empty = %d.\n",
-		    priority, queues_[priority]->msg_queue ()->is_empty ()));
-      
-	queues_[priority]->shutdown_task ();
-      }
-  }
-#endif
-}
-
-// @@ This method could have a bypass optimization.
-// <request> has been dynamically allocated by the filtering module.
-void
-ACE_ES_Priority_Dispatching::push (ACE_ES_Dispatch_Request *request,
-				   CORBA::Environment &_env)
-{
-  ACE_TIMEPROBE ("  push_source_type: Correlation Module");
-
-  RtecScheduler::OS_Priority thread_priority;
-  RtecScheduler::Sub_Priority subpriority;
-  RtecScheduler::Preemption_Priority preemption_priority;
-
-  if (request->rt_info () != 0)
-    {
-      ACE_Scheduler_Factory::server ()->priority
-	(request->rt_info (),
-	 thread_priority,
-	 subpriority,
-	 preemption_priority,
-	 _env);
-      if (_env.exception ())
-	{
-	  return;
-	}
-    }
-  else
-    {
-      thread_priority =
-	ACE_Sched_Params::priority_min (ACE_SCHED_FIFO,
-					ACE_SCOPE_PROCESS);
-      subpriority = ACE_Scheduler_MIN_SUB_PRIORITY;
-      preemption_priority = ACE_Scheduler_MIN_PREEMPTION_PRIORITY;
-    }
-  
-  // If it's a request to forward an event, it needs a reference to us
-  // to call dispatch_event.
-  request->set (this, preemption_priority, subpriority);
-
-  // Make sure that a queue exists for this priority.
-  if (queues_[preemption_priority] == 0)
-    {
-      ACE_ERROR ((LM_ERROR, "Push to closed queue %d, dropping event.\n", preemption_priority));
-      return;
-#if 0
-      ACE_THROW (SYNC_ERROR (0, CORBA::COMPLETED_NO, "ACE_ES_Priority_Dispatching::push"));
-#endif /* 0 */
-    }
-
-  // Enqueue the request.  If we're multi-threaded, this request is a
-  // command object that will be called by the threads in the queue,
-  // or will be dequeued by this->handle_signal if we're
-  // single-threaded.
-  if (queues_[preemption_priority]->try_put (request) == -1)
-    {
-      if (ACE_ES_Dispatch_Request::release (request) != 0)
-	ACE_ERROR ((LM_ERROR, "ACE_ES_Priority_Dispatching::push"
-		    " release failed.\n"));
-      if (errno != EPIPE)
-	{
-	  ACE_THROW (CORBA::NO_MEMORY (CORBA::COMPLETED_NO));
-	  // @@ Orbix parameters
-	  // 0, CORBA::COMPLETED_NO, 
-	  // "ACE_ES_Priority_Dispatching::push enqueue failed"));
-	}
-      else
-	{
-	  ACE_DEBUG ((LM_DEBUG,
-		      "Request rejected from closed queue %d.\n",
-		      preemption_priority));
-	}
-    }
-}
-
-// Start at highest priority queue checking for queued events
-// continuing to lowest priority queue.  If an event is ever found,
-// dispatch it and then start back at the highest priority queue
-// again.
-int 
-ACE_ES_Priority_Dispatching::handle_signal (int, siginfo_t *, ucontext_t *)
-{
-  int done;
-
-  do
-    {
-      done = 1;
-      for (int x = 0; x <= highest_priority_; x++)
-	{
-	  // If the queue is not empty, dispatch the request and then
-	  // start the for loop from the beginning.
-	  if ((queues_[x] != 0) && (!queues_[x]->msg_queue ()->is_empty ()))
-	    {
-	      // Dequeue and service the request.
-	      queues_[x]->svc_one ();
-
-	      // Exit the for loop and start over.
-	      done = 0;
-	      break;
-	    }
-
-	  // If we get through the whole for loop without dispatching
-	  // anything, then we're done.
-	}
-    }
-  while (!done);
-
-
-  return 0;
-}
-
-// This is only for the non-win32 single-threaded implementation.
-int 
-ACE_ES_Priority_Dispatching::handle_input (ACE_HANDLE)
-{
-  return this->handle_signal (0, 0, 0);
-}
-
-// Shutdown each queue.  When each queue exits, they will call back
-// this->dispatch_queue_closed which allows us to free up resources.
-// When the last queue has closed, we'll delete ourselves.
-void
-ACE_ES_Priority_Dispatching::shutdown (void)
-{
-  if (shutdown_)
-    return;
- 
-  ACE_DEBUG ((LM_DEBUG, "(%t) ACE_ES_Priority_Dispatching "
-	      "module shutting down.\n"));
- 
-  shutdown_ = 1;
-
-  // If we're single threaded, then we need to shut down the
-  // notification strategy so it can remove itself from the reactor.
-  if (threads_per_queue_ == 0)
-    notification_strategy_.shutdown ();
-
-  // Whether these are active or not, they must be shut down.
-  for (int x = 0; x <= highest_priority_; x++)
-    if (queues_[x] != 0)
-      {
-	ACE_DEBUG ((LM_DEBUG, "shutting down dispatch queue %d.\n", x));
-	queues_[x]->shutdown_task ();
-      }
-}
-
-// This gets called every time a Dispatch Queue closes down.  We
-// search for <queue> and delete it.  If we have been told to delete
-// ourself, after the last queue has been deleted, we delete
-// ourselves.
-void
-ACE_ES_Priority_Dispatching::dispatch_queue_closed (ACE_ES_Dispatch_Queue *queue)
-{
-  ACE_ES_GUARD ace_mon (lock_);
-
-  // Find the queue.
-  for (int x = 0; x <= highest_priority_; x++)
-    {
-      if (queues_[x] == queue)
-	{
-	  ACE_DEBUG ((LM_DEBUG, "(%t) Dispatch queue %d is closed.\n", x));
-
-	  // Store the queue for deleting in this object's destructor.
-	  delete_me_queues_[x] = queues_[x];
-	  queues_[x] = 0;
-
-	  // Reset highest_priority_.
-	  if (x == highest_priority_)
-	    {
-	      while ((--highest_priority_ >= 0) &&
-		     (queues_[highest_priority_] == 0));
-
-	      if (highest_priority_ < 0)
-		{
-		  ACE_DEBUG ((LM_DEBUG, "Dispatching module shut down.\n"));
-		  up_->shutdown ();
-		  return;
-		}
-	    }
-
-	  // If we found the queue, we can exit the for loop.
-	  break;
-	}
-    }
-}
-
-/*
-ACE_HANDLE  
-ACE_ES_Priority_Dispatching::get_handle (void) const
-{
-  ACE_ES_Priority_Dispatching *fake_this = (ACE_ES_Priority_Dispatching *) this;
-  return fake_this->notification_strategy_.get_handle ();
-}
-*/
-
-// ************************************************************
-
-ACE_ES_Dispatch_Queue::ACE_ES_Dispatch_Queue (ACE_ES_Dispatching_Base *dispatching_module,
-					      ACE_ES_Notification_Strategy *notification_strategy)
-  : dispatching_module_ (dispatching_module),
-    notification_strategy_ (notification_strategy)
-{
-}
-
-int
-ACE_ES_Dispatch_Queue::open_queue (RtecScheduler::Period &period,
-				   int threads)
-{
-  // First set up the correct message queue according to whether the
-  // dispatch queue will be active or not.
-
-  // If there are no threads specified, we'll register with the
-  // reactor to be called back when someone queues a message.
-  if (threads == 0)
-    {
-      // Allocate a message queue that notifies a reactor when events
-      // arrive via the msg_queue call.  If that succeeds, set the
-      // notification strategy in our message queue via the open call.
-      if (this->msg_queue () == 0 ||
-	  this->msg_queue ()->open (ACE_ES_QUEUE::DEFAULT_HWM,
-				    ACE_ES_QUEUE::DEFAULT_LWM,
-				    notification_strategy_) == -1)
-	ACE_ERROR_RETURN ((LM_ERROR, "%p msg_queue.open failed.\n",
-			   "ACE_ES_Dispatch_Queue::open_queue"), -1);
-    }
-  else
-    {
-      // Allocate a message queue that does not notify.
-      ACE_ES_MQ *mq = new ACE_ES_MQ;
-      if (mq == 0)
-	ACE_ERROR_RETURN ((LM_ERROR, "%p.\n",
-			   "ACE_ES_Dispatch_Queue::open_queue"), -1);
-      else
-	{
-	  // This deletes previous message queue.
-	  this->msg_queue (mq);
-	  // Set this so that the destructor of ACE_Task deletes our
-	  // message queue.  Note, this must be after the call to
-	  // msg_queue.
-	  delete_msg_queue_ = 1;
-	}
-    }
-
-  // Create a name for ourselves using the priority.
-  char temp[64];
-  ACE_OS::sprintf (temp, "ACE_ES_Dispatch_Queue-%u", period);
-
-  // Open the task.  This will query the scheduler for our qos
-  // structure.  It will also synch_threads if it succeeds.
-  int result = this->open_task (temp);
-
-  switch (result)
-    {
-    case -1:
-      // Error.
-      ACE_ERROR_RETURN ((LM_ERROR, "%p.\n",
- 			 "ACE_ES_Dispatch_Queue::open_queue"), -1);
-    case 0:
-      ACE_TRY
-	{// @@ TODO: Handle exceptions...
-	  ACE_Scheduler_Factory::server()->set(rt_info_,
-					       0, 0, 0, 0,
-					       RtecScheduler::VERY_LOW,
-					       RtecScheduler::NO_QUANTUM,
-					       1, ACE_TRY_ENV);
-	  ACE_CHECK_ENV;
-	}
-      ACE_CATCHANY
-	{
-	  ACE_ERROR_RETURN ((LM_ERROR,
-			     "ACE_ES_Display_Queue::exception"), -1);
-	}
-      ACE_ENDTRY;
-    case 1:
-      // Found.
-      break;
-    }
-
-  // Spawn threads.
-  return this->synch_threads (threads);
-}
-
-// This is called back by ACE_RT_Task when all the threads have
-// exited.  We're going to forward this event to the dispatching
-// module so it can clean up any resources.
-void
-ACE_ES_Dispatch_Queue::threads_closed (void)
-{
-  dispatching_module_->dispatch_queue_closed (this);
-}
-
-// ************************************************************
-
-ACE_ES_EFD_Dispatching::ACE_ES_EFD_Dispatching (ACE_EventChannel *channel)
-  : ACE_ES_Dispatching_Base (channel)
-{
-}
-
-void
-ACE_ES_EFD_Dispatching::push (ACE_ES_Dispatch_Request *request,
-			      CORBA::Environment &)
-{
-  // If it's a request to forward an event, it needs a reference to us
-  // to call dispatch_event.
-  request->set (this, 0, ACE_Scheduler_MIN_SUB_PRIORITY);
-
-  u_long command_action = ACE_RT_Task_Command::RELEASE;
-
-  // This may be a request to delete a push consumer proxy, so we
-  // should execute it instead of just forwarding it.
-  request->execute (command_action);
-
-  switch (command_action)
-    {
-    case ACE_RT_Task_Command::RELEASE:
-      // Free the request.
-      if (ACE_ES_Dispatch_Request::release (request) != 0)
-	ACE_ERROR ((LM_ERROR, "ACE_ES_EFD_Dispatching::push"
-		    " release failed.\n"));
-      break;
-
-    default:
-      ACE_ERROR ((LM_ERROR, "ACE_ES_EFD_Dispatching::push: unknown command action.\n"));
-    }
-}
-
-// ************************************************************
-
-ACE_ES_RTU_Dispatching::ACE_ES_RTU_Dispatching (ACE_EventChannel *channel)
-  : ACE_ES_Priority_Dispatching (channel, 0)
-{
-}
-
-// We're called from a dispatch queue, so we can not release the request.
-int 
-ACE_ES_RTU_Dispatching::dispatch_event (ACE_ES_Dispatch_Request *request,
-					u_long &command_action)
-{
-  // Store the priority of the task currently running.
-  channel_->rtu_manager ()->priority (request->priority ());
-
-  ACE_TRY
-    {
-      // Forward the request.
-      up_->push (request, ACE_TRY_ENV);
-      ACE_CHECK_ENV;
-    }
-  ACE_CATCHANY
-    {
-      ACE_ERROR ((LM_ERROR, "ACE_ES_RTU_Dispatching::dispatch_event unknown exception.\n"));
-    }
-  ACE_ENDTRY;
-
-  // Reset the priority.
-  channel_->rtu_manager ()->priority (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO, ACE_SCOPE_PROCESS));
-
-  // If the task was preempted, enqueue the request on the head of the
-  // dispatch queue.
-  if (channel_->rtu_manager ()->not_done ())
-    command_action = ACE_RT_Task_Command::UNGETQ;
-  else
-    // We're done with it.
-    command_action = ACE_RT_Task_Command::RELEASE;
-
-  return 0;
-}
-
-void
-ACE_ES_RTU_Dispatching::push (ACE_ES_Dispatch_Request *request,
-			      CORBA::Environment &_env)
-{
-  // First enqueue the message in the proper queue.
-  ACE_ES_Priority_Dispatching::push (request, _env);
-
-  // If the current event is higher priority (lower value) than the
-  // current running task, then tell the task to preempt itself.
-  int request_priority = request->priority ();
-  int running_priority = channel_->rtu_manager ()->priority ();
-  if (request_priority < running_priority)
-    channel_->rtu_manager ()->should_preempt (1);
-  return;
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_CORBA_Sequence<ACE_CORBA_var<ACE_ES_Event_Container> >;
-template void operator+=(ACE_CORBA_Sequence<ACE_CORBA_var<ACE_ES_Event_Container> > &, ACE_CORBA_var<ACE_ES_Event_Container> const &);
-
-#if defined(ACE_ES_LACKS_ORB)
-template class ACE_CORBA_Sequence<ACE_ES_Event>;
-#endif /* ACE_ES_LACKS_ORB */
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/local/bin/Event_Service/Dispatching_Modules.h b/TAO/local/bin/Event_Service/Dispatching_Modules.h
deleted file mode 100644
index 31ce297788b..00000000000
--- a/TAO/local/bin/Event_Service/Dispatching_Modules.h
+++ /dev/null
@@ -1,484 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-//
-// ============================================================================
-//
-// = LIBRARY
-//    orbsvcs
-// 
-// = FILENAME
-//    Dispatching_Module
-//
-// = AUTHOR
-//    Tim Harrison (harrison@cs.wustl.edu)
-//
-// = DESCRIPTION
-//    This file holds the different Event Service dispatching
-//    mechanisms.  These include null-dispatching (EFD),
-//    single-threaded with (RTU) and without preemption (LAME), and a
-//    multithreaded implementation.
-//
-// ============================================================================
-
-#ifndef ACE_DISPATCHING_MODULES_H
-#define ACE_DISPATCHING_MODULES_H
-
-#include "ReactorTask.h"
-#include "Event_Channel.h"
-
-// ************************************************************
-
-// Forward declarations.
-class ACE_ES_Dispatch_Queue;
-class ACE_ES_Dispatch_Request;
-
-// ************************************************************
-
-// Forward declarations.
-class ACE_ES_Consumer_Module;
-
-class ACE_ES_Dispatching_Base : public ACE_Event_Handler
-// = TITLE
-//    Event Service Dispatch Module base class
-//
-// = DESCRIPTION
-//    We inherit from ACE_Event_Handler so that we can be called back
-//    by the ReactorEx when requests are queued.  The virtual
-//    dispatch_event method allows ACE_ES_Dispatch_Requests to call
-//    back the dispatching module when acting as command objects. When
-//    this implementation is used by the Event Channel it forwards all
-//    dispatch calls without any queuing.  Therefore, it can be
-//    used to build an EFD.  It is also inherited by the Priority
-//    Dispatching module.
-{
-public:
-  ACE_ES_Dispatching_Base (ACE_EventChannel *channel);
-  // Default construction.
-
-  virtual void open (ACE_ES_Consumer_Module *up,
-		     ACE_ES_Correlation_Module *down);
-  // Link to adjacent modules.
-
-  virtual void connected (ACE_Push_Consumer_Proxy *consumer,
-			  CORBA::Environment &);
-  // Forward down_.
-
-  virtual void disconnecting (ACE_Push_Consumer_Proxy *consumer,
-			      CORBA::Environment &);
-  // Forward down_.
-
-  virtual void disconnected (ACE_Push_Consumer_Proxy *consumer);
-  // Release any unneeded dispatching resources.
-
-  // = Not needed.
-  // void connected (ACE_Push_Supplier_Proxy *supplier);
-  // void disconnecting (ACE_Push_Supplier_Proxy *supplier);
-
-  virtual void push (ACE_ES_Dispatch_Request *request,
-		     CORBA::Environment &) = 0;
-  // Forward up_.
-
-  virtual int dispatch_event (ACE_ES_Dispatch_Request *request,
-			      u_long &command_action);
-  // Called by ACE_ES_Dispatch_Requests when dequeued by RT_Tasks.
-
-  virtual void dispatch_queue_closed (ACE_ES_Dispatch_Queue *q);
-  // Called when all the threads of a <q> have exited.
-
-  virtual void shutdown (void);
-  // This is called by the Event Channel.  This will attempt to shut
-  // down all of its threads gracefully.  Wish it luck.
-
-protected:
-  ACE_EventChannel *channel_;
-  // Dat der channel.
-
-  ACE_ES_MUTEX lock_;
-  // To synchronize thr_count_.
-
-  int thr_count_;
-  // The total number of threads in the Dispatching Module.  This will
-  // be the sum of all the Dispatch Queue threads.
-
-  ACE_ES_Consumer_Module *up_;
-  // Next module up.
-
-  ACE_ES_Correlation_Module *down_;
-  // Next module down.
-};
-
-// ************************************************************
-
-class ACE_ES_Dispatch_Request : public ACE_RT_Task_Command
-// = TITLE
-//    ACE Event Service Dispatch Request
-//
-// = DESCRIPTION
-//    Encapsulates a consumer and the events that will be sent to the
-//    consumer.  Right now, this class keeps a single_event_ that can
-//    be used when only one event is sent to the consumer.  Since this
-//    is frequently the case (except for correlations), this
-//    optimization reduces the amount of dynamic memory allocation is
-//    necessary.  This class is also a GOF Command object since it can
-//    be dequeued by an RT_Task to call back the dispatching module
-//    for request dispatching.
-{
-public:
-  typedef ACE_CORBA_Sequence<ACE_ES_Event_Container_var> Event_Set;
-
-  ACE_ES_Dispatch_Request (void);
-  // Default construction.
-  
-  virtual ~ACE_ES_Dispatch_Request (void);
-  // Default destruction.
-  
-  ACE_ES_Dispatch_Request (ACE_Push_Consumer_Proxy *consumer, 
-			   RtecScheduler::handle_t rt_info);
-  // All the events must be added after construction to the
-  // event_set.
-
-  ACE_ES_Dispatch_Request (ACE_Push_Consumer_Proxy *consumer, 
-			   const Event_Set &event_set,
-			   RtecScheduler::handle_t rt_info);
-  // Set consumer_ to <consumer> and copy <event_set> to event_set_.
-  // <rt_info> describes the method receiving this dispatch.
-
-  ACE_ES_Dispatch_Request (ACE_Push_Consumer_Proxy *consumer,
-			   const RtecEventComm::Time &time,
-			   RtecScheduler::handle_t rt_info);
-  // Set consumer_ to <consumer> and sets single_event_.time_ to
-  // <time>.  Sets use_single_event_ to 1.  <rt_info> describes the
-  // method receiving this dispatch.
-
-  ACE_ES_Dispatch_Request (ACE_Push_Consumer_Proxy *consumer,
-			   ACE_ES_Event_Container *event,
-			   RtecScheduler::handle_t rt_info);
-  // Sets consumer_ and the first slot of event_set_.  We use the
-  // event_set_ instead of the single_event_ so that we can just carry
-  // around the pointer to <event>.  <rt_info> describes the method
-  // receiving this dispatch.
-
-  RtecScheduler::handle_t rt_info (void);
-  // Description of the method receiving this request.
-
-  void set (ACE_ES_Dispatching_Base *dispatching_module,
-	    RtecScheduler::OS_Priority priority,
-	    RtecScheduler::Sub_Priority sub_priority);
-  // For multi-threaded implementations, <dispatching_module> is
-  // called back when a request is dequeued.  <priority> is the
-  // dispatch priority of the event.  <sub_priority> is the enqueue
-  // priority of the event and will be forwarded to
-  // ACE_Message_Block.
-
-  ACE_Push_Consumer_Proxy *consumer (void) const;
-  // Consumer accessor.
-
-  const Event_Set &event_set (void) const;
-  // If accessed, make_copy will use event_set_.
-
-  Event_Set &event_set (void);
-  // If accessed, make_copy will use event_set_.
-
-  CORBA::ULong number_of_events (void) const;
-  // Returns 1 if we're using single_event, or event_set_.size ().
-
-  void make_copy (RtecEventComm::EventSet &dest) const;
-  // Copy single_event or event_set into <dest>.
-
-  virtual int execute (u_long &command_action);
-  // Calls dispatching_module_->dispatch_event.
-
-  RtecScheduler::OS_Priority priority (void);
-  // Priority accessor.
-
-#if 0
-  // @@ This cannot be done: the object would be allocated using this
-  // class operator new, but it will be removed using the
-  // ACE_Message_Block operator delete!
-  void *operator new (size_t nbytes);
-  // Allocates memory from a thread-specific memory pool.
-
-  void operator delete (void *);
-  // Returns memory to a thread-specific memory pool.
-#endif
-
-protected:
-  RtecScheduler::OS_Priority priority_;
-
-  RtecScheduler::handle_t rt_info_;
-  // Describes the method receiving this dispatch.
-
-  ACE_ES_Dispatching_Base *dispatching_module_;
-  // The dispatching module called back when we're dequeued by a
-  // thread.
-
-  int use_single_event_;
-  // Is true if we're using a single event.  Is 0 is we're using
-  // event_set_.
-
-  ACE_Push_Consumer_Proxy *consumer_;
-  // The final destination for single_event_ or event_set_.
-
-  ACE_ES_Event_Container single_event_;
-  // This is used for single event dispatches.
-
-  Event_Set event_set_;
-  // This is used for event sets that need to be dispatched.
-};
-
-// ************************************************************
-
-#if defined (ACE_WIN32)
-class ACE_ES_ReactorEx_NS : public ACE_Notification_Strategy
-// = TITLE 
-//     Event Service ReactorEx Notification Strategy
-//
-// = DESCRIPTION
-//     Integrates the ACE_Message_Queue notification to signal a
-//     handle that will wake up the ACE_ES_Priority_Dispatching
-//     module.  This is used in place of the
-//     ACE_ReactorEx_Notification_Strategy to avoid any queueing by
-//     the ReactorEx::notify mechanism.
-{
-public:
-  ACE_ES_ReactorEx_NS (ACE_Event_Handler *eh);
-  // Stores away <eh> for when this->open is called.
-
-  int open (void);
-  // Registers eh_ with the ReactorEx to be notified when this->notify
-  // is called.
-
-  void shutdown (void);
-  // Removes self from the reactor.
-
-  // = These result in eh_->handle_signal getting called.  eh_ should
-  // point to a dispatching module.
-  virtual int notify (void);
-  virtual int notify (ACE_Event_Handler *,
-		      ACE_Reactor_Mask mask);
-
-  //  ACE_HANDLE get_handle (void);
-  // Returns event_.handle ().
-
-private:
-  ACE_Auto_Event event_;
-  // Registered with the ReactorEx.
-};
-
-typedef ACE_ES_ReactorEx_NS ACE_ES_Notification_Strategy;
-
-#else // *******************************************************
-
-class ACE_ES_Reactor_NS : public ACE_Reactor_Notification_Strategy
-// = TITLE 
-//     Event Service Reactor Notification Strategy
-//
-// = DESCRIPTION
-//     Maps to the ACE_Reactor_Notification_Strategy interface.  This
-//     version is for non WIN32 platforms.
-{
-public:
-  ACE_ES_Reactor_NS (ACE_Event_Handler *eh);
-  // Calls ACE_Reactor_Notification_Strategy with the ORB's reactor
-  // and signal mask.
-
-  int open (void);
-  // Does nothing.
-
-  void shutdown (void);
-  // Does nothing.
-};
-
-typedef ACE_ES_Reactor_NS ACE_ES_Notification_Strategy;
-
-#endif /* ACE_WIN32 */
-
-// ************************************************************
-
-class ACE_ES_MQ : public ACE_ES_QUEUE
-// = TITLE
-//    Event Service Message Queue
-{
-  virtual int notify (void) { return 0;}
-  // Does nothing.
-};
-
-// ************************************************************
-
-class ACE_ES_Dispatch_Queue : public ACE_RT_Task
-// = TITLE
-//    Event Service Dispatch Queue
-//
-// = DESCRIPTION
-//    An encapsulation of a dispatch queue.  By inheriting from
-//    ACE_RT_Task, we can make this zero-threaded or multi-threaded.
-{
-public:
-  ACE_ES_Dispatch_Queue (ACE_ES_Dispatching_Base *dispatching_module,
-			 ACE_ES_Notification_Strategy *notification_strategy);
-  // Stores <dispatching_module> for this->threads_closed.  Stores
-  // away <notification_strategy> for this->synch_threads.
-
-  int open_queue (RtecScheduler::Period &period,
-		  int threads);
-  // This is a hack to get the channel to work with the new
-  // scheduler.
-
-#if 0
-  int open_queue (RtecScheduler::OS_Priority priority,
-		  int threads);
-  // Creates a name from the <priority> and tries to find a scheduling
-  // qos structure.  If one is not found, but created, qos_ is set
-  // with default values.  Either way, if qos_->thread_ > 0, it calls
-  // this->synch_threads.  Otherwise, our message queue will use
-  // notification_strategy_.  This will cause the ReactorEx to call
-  // back the dispatching_module_ when requests are queued on our
-  // message queue.  Returns 0 on success, -1 on failure.
-#endif
-
-  virtual void threads_closed (void);
-  // Called when every thread has exited.  This will call
-  // dispatching_module_->dispatch_queue_closed.
-
-private:
-  ACE_ES_Dispatching_Base *dispatching_module_;
-  // Used in threads_closed.
-
-  ACE_ES_Notification_Strategy *notification_strategy_;
-  // Notifies the Dispatching Module when a request has been queued on
-  // our message queue.
-};
-
-// ************************************************************
-
-class ACE_ES_Priority_Dispatching : public ACE_ES_Dispatching_Base
-// = TITLE
-//    Event Service Priority Dispatching Module
-//
-// = DESCRIPTION
-//    Inherits from ACE_Event_Handler to utilitize the
-//    ACE_Message_Queue notification strategy.  This implementation
-//    does priority dispatching without preemption.
-{
-public:
-  ACE_ES_Priority_Dispatching (ACE_EventChannel *channel,
-			       int threads_per_queue);
-  // Store <channel>.  Spawns <threads_per_queue> thread for each
-  // dispatch queue.  If != 0, then the channel is an MT_CHANNEL.  If
-  // == 0, then the channel is an ST_CHANNEL.
-
-  ~ACE_ES_Priority_Dispatching (void);
-  // Delete queues.
-
-  void connected (ACE_Push_Consumer_Proxy *consumer,
-		  CORBA::Environment &);
-  // Allocate any needed dispatching resources for this consumers
-  // priority.
-
-  void disconnected (ACE_Push_Consumer_Proxy *consumer);
-  // Release unneeded dispatch queues.
-
-  // = Not needed.
-  // void connected (ACE_Push_Supplier_Proxy *supplier);
-  // void disconnecting (ACE_Push_Supplier_Proxy *supplier);
-
-  virtual void push (ACE_ES_Dispatch_Request *request,
-		     CORBA::Environment &);
-  // Enqueues the request on the appropriate Dispatch Queue.
-
-  virtual void shutdown (void);
-  // Closes all queues "asynchronously."  When all queues are closed,
-  // deletes them all and then deletes itself.
-
-  virtual void dispatch_queue_closed (ACE_ES_Dispatch_Queue *q);
-  // Called when all the threads of a <q> have exited.  Deletes <q>.
-
-  //  virtual ACE_HANDLE get_handle (void) const;
-  // Get the I/O handle.
-
-protected:
-  virtual int handle_signal (int signum, siginfo_t * = 0, ucontext_t * = 0);
-  // Called when input has arrived on a message queue.  This is used
-  // for single-threaded implementations.
-
-  virtual int handle_input (ACE_HANDLE);
-  // For single-threaded implementations on non-win32 platforms that
-  // use the ACE_Reactor_Notification_Strategy.  This just forwards
-  // all calls to this->handle_signal ().
-
-  ACE_ES_Notification_Strategy notification_strategy_;
-  // Shared between all dispatch queues.
-
-  void initialize_queues (void);
-  // This is a hack to create a queue for each of the 4 rate groups.
-
-  ACE_ES_Dispatch_Queue *queues_[ACE_Scheduler_MAX_PRIORITIES];
-  // Pointers to dispatch queues.
-
-  ACE_ES_Dispatch_Queue *delete_me_queues_[ACE_Scheduler_MAX_PRIORITIES];
-  // Pointers to dispatch queues that want to die.
-
-  int queue_count_[ACE_Scheduler_MAX_PRIORITIES];
-  // The number of consumers using each queue.
-
-  int highest_priority_;
-  // The highest priority queue in queues_.  This allows us to
-  // optimize the handle_signal method.
-
-  int shutdown_;
-  // Make sure to only shutdown the dispatching module once.
-
-  int threads_per_queue_;
-  // The number of threads to spawn for each dispatch queue.
-};
-
-// ************************************************************
-
-class ACE_ES_EFD_Dispatching : public ACE_ES_Dispatching_Base
-// = TITLE
-//    Event Service EFD Dispatching Module
-//
-// = DESCRIPTION
-//    Implements a zero-threaded dispatcher with no preemption.
-{
-public:
-  ACE_ES_EFD_Dispatching (ACE_EventChannel *channel);
-  // Acquires the proper qos structure and passes <channel> onto to
-  // the dispatching base constructor.
-
-  virtual void push (ACE_ES_Dispatch_Request *request,
-		     CORBA::Environment &);
-  // Forward up_.
-};
-
-// ************************************************************
-
-class ACE_ES_RTU_Dispatching : public ACE_ES_Priority_Dispatching
-// = TITLE
-//    Event Service RTU Dispatching Module
-//
-// = DESCRIPTION
-//    Implements a single-threaded dispatcher with delayed preemption.
-{
-public:
-  ACE_ES_RTU_Dispatching (ACE_EventChannel *channel);
-  // Store <channel>.  
-
-  virtual int dispatch_event (ACE_ES_Dispatch_Request *request,
-			      u_long &command_action);
-  // Called by ACE_Dispatch_Queues and handle_signal when an event
-  // needs to be dequeued.  Implements an RTU-like delayed preemption
-  // policy.
-
-  virtual void push (ACE_ES_Dispatch_Request *request,
-		     CORBA::Environment &);
-  // Calls ACE_ES_Priority_Dispatching::push and then checks if
-  // preemption is necessary.
-};
-
-#if defined (__ACE_INLINE__)
-#include "Dispatching_Modules.i"
-#endif /* __ACE_INLINE__ */
-#endif /* ACE_DISPATCHING_MODULES_H */
-
-
diff --git a/TAO/local/bin/Event_Service/Dispatching_Modules.i b/TAO/local/bin/Event_Service/Dispatching_Modules.i
deleted file mode 100644
index 8c75b08aab1..00000000000
--- a/TAO/local/bin/Event_Service/Dispatching_Modules.i
+++ /dev/null
@@ -1,267 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-ACE_INLINE
-ACE_ES_Dispatch_Request::ACE_ES_Dispatch_Request (void) :
-  priority_ (0),
-  rt_info_ (0),
-  dispatching_module_ (0),
-  use_single_event_ (0),
-  consumer_ (0),
-  single_event_ (),
-  event_set_ ()
-{
-}
-
-ACE_INLINE
-ACE_ES_Dispatch_Request::~ACE_ES_Dispatch_Request (void)
-{
-}
-
-ACE_INLINE
-ACE_ES_Dispatch_Request::ACE_ES_Dispatch_Request (ACE_Push_Consumer_Proxy *consumer, 
-						  RtecScheduler::handle_t rt_info) :
-  priority_ (0),
-  rt_info_ (rt_info),
-  dispatching_module_ (0),
-  use_single_event_ (0),
-  consumer_ (consumer),
-  single_event_ (),
-  event_set_ ()
-{
-}
-
-ACE_INLINE
-ACE_ES_Dispatch_Request::ACE_ES_Dispatch_Request (ACE_Push_Consumer_Proxy *consumer,
-						  const Event_Set &event_set,
-						  RtecScheduler::handle_t rt_info) :
-  priority_ (0),
-  rt_info_ (rt_info),
-  dispatching_module_ (0),
-  use_single_event_ (0),
-  consumer_ (consumer),
-  single_event_ (),
-  event_set_ (event_set)
-{
-}
-
-ACE_INLINE
-ACE_ES_Dispatch_Request::ACE_ES_Dispatch_Request (ACE_Push_Consumer_Proxy *consumer,
-						  ACE_ES_Event_Container *event,
-						  RtecScheduler::handle_t rt_info) :
-  priority_ (0),
-  rt_info_ (rt_info),
-  dispatching_module_ (0),
-  use_single_event_ (0),
-  consumer_ (consumer),
-  single_event_ (),
-  event_set_ ()
-{
-  event_set_ += event;
-}
-
-ACE_INLINE
-ACE_ES_Dispatch_Request::ACE_ES_Dispatch_Request (ACE_Push_Consumer_Proxy *consumer,
-						  const RtecEventComm::Time &time,
-						  RtecScheduler::handle_t rt_info) :
-  priority_ (0),
-  rt_info_ (rt_info),
-  dispatching_module_ (0),
-  use_single_event_ (1),
-  consumer_ (consumer),
-  single_event_ (),
-  event_set_ ()
-{
-  single_event_.time_ = time;
-  single_event_.type_ = ACE_ES_EVENT_TIMEOUT;
-}
-
-ACE_INLINE void
-ACE_ES_Dispatch_Request::set (ACE_ES_Dispatching_Base *dispatching_module,
-			      RtecScheduler::OS_Priority preemption_priority,
-			      RtecScheduler::Sub_Priority sub_priority)
-{
-  dispatching_module_ = dispatching_module;
-  priority_ = preemption_priority;
-  ACE_Message_Block::msg_priority (sub_priority);
-}
-
-ACE_INLINE ACE_Push_Consumer_Proxy *
-ACE_ES_Dispatch_Request::consumer (void) const
-{
-  return consumer_;
-}
-
-ACE_INLINE const ACE_ES_Dispatch_Request::Event_Set &
-ACE_ES_Dispatch_Request::event_set (void) const
-{
-  return event_set_;
-}
-
-ACE_INLINE ACE_ES_Dispatch_Request::Event_Set &
-ACE_ES_Dispatch_Request::event_set (void)
-{
-  return event_set_;
-}
-
-ACE_INLINE CORBA::ULong
-ACE_ES_Dispatch_Request::number_of_events (void) const
-{
-  if (use_single_event_)
-    return 1;
-  else
-    return event_set_.length ();
-}
-
-ACE_INLINE RtecScheduler::OS_Priority
-ACE_ES_Dispatch_Request::priority (void)
-{
-  return priority_;
-}
-
-ACE_INLINE RtecScheduler::handle_t
-ACE_ES_Dispatch_Request::rt_info (void)
-{
-  return rt_info_;
-}
-
-// ************************************************************
-
-ACE_INLINE
-ACE_ES_Dispatching_Base::ACE_ES_Dispatching_Base (ACE_EventChannel *channel)
-  : channel_ (channel),
-    thr_count_ (0),
-    up_ (0),
-    down_ (0)
-{
-}
-
-ACE_INLINE void
-ACE_ES_Dispatching_Base::open (ACE_ES_Consumer_Module *up,
-			       ACE_ES_Correlation_Module *down)
-{
-  up_ = up;
-  down_ = down;
-  // 1 == 2.
-}
-
-ACE_INLINE void 
-ACE_ES_Dispatching_Base::connected (ACE_Push_Consumer_Proxy *consumer,
-				    CORBA::Environment &_env)
-{
-  down_->connected (consumer, _env);
-}
-
-ACE_INLINE void 
-ACE_ES_Dispatching_Base::disconnected (ACE_Push_Consumer_Proxy *consumer)
-{
-  // Do nothing.
-  ACE_UNUSED_ARG (consumer);
-}
-
-ACE_INLINE void
-ACE_ES_Dispatching_Base::disconnecting (ACE_Push_Consumer_Proxy *consumer,
-					CORBA::Environment &_env)
-{
-  down_->disconnecting (consumer, _env);
-}
-
-ACE_INLINE void
-ACE_ES_Dispatching_Base::dispatch_queue_closed (ACE_ES_Dispatch_Queue *q)
-{
-  ACE_UNUSED_ARG (q);
-}
-
-// Just forward the request.  This is basically a hook for the RTU
-// stuff. 
-ACE_INLINE int
-ACE_ES_Dispatching_Base::dispatch_event (ACE_ES_Dispatch_Request *request,
-					 u_long &command_action)
-{
-  ACE_TIMEPROBE ("decode the event");
-
-  ACE_TRY
-    {
-      // Forward the request.
-      up_->push (request, ACE_TRY_ENV);
-      ACE_CHECK_ENV;
-    }
-  ACE_CATCHANY
-    {
-      ACE_ERROR ((LM_ERROR, "ACE_ES_Dispatching_Base::dispatch_event unknown exception.\n"));
-    }
-  ACE_ENDTRY;
-
-  // Tell our caller to release the request.
-  command_action = ACE_RT_Task_Command::RELEASE;
-
-  // Return zero so our calling thread does not exit.
-  return 0;
-}
-
-ACE_INLINE void
-ACE_ES_Dispatching_Base::shutdown (void)
-{
-  ACE_DEBUG ((LM_DEBUG, "(%t) ACE_ES_Dispatching_Base module shutting down.\n"));
-}
-
-// ************************************************************
-
-#if defined (ACE_WIN32)
-ACE_INLINE
-ACE_ES_ReactorEx_NS::ACE_ES_ReactorEx_NS (ACE_Event_Handler *eh)
-  : ACE_Notification_Strategy (eh, ACE_Event_Handler::NULL_MASK)
-{
-}
-
-ACE_INLINE int
-ACE_ES_ReactorEx_NS::open (void)
-{
-  return ACE_Task_Manager::instance ()->
-    GetReactorTask (0)->get_reactor ().register_handler (eh_, event_.handle ());
-}
-
-ACE_INLINE void
-ACE_ES_ReactorEx_NS::shutdown (void)
-{
-  ACE_Task_Manager::instance ()->GetReactorTask (0)->
-    get_reactor ().remove_handler (eh_, ACE_Event_Handler::DONT_CALL);
-}
-
-ACE_INLINE int 
-ACE_ES_ReactorEx_NS::notify (void)
-{
-  return event_.signal ();
-}
-
-ACE_INLINE int 
-ACE_ES_ReactorEx_NS::notify (ACE_Event_Handler *eh,
-			       ACE_Reactor_Mask mask)
-{
-  return event_.signal ();
-}
-
-#else /* !defined (ACE_WIN32) */
-// This class is only necessary on non-win32 platforms.
-ACE_INLINE
-ACE_ES_Reactor_NS::ACE_ES_Reactor_NS (ACE_Event_Handler *eh)
-  : ACE_Reactor_Notification_Strategy (&(ACE_Task_Manager::instance ()->
-				       GetReactorTask (0)->get_reactor ()),
-				       eh, ACE_Event_Handler::READ_MASK)
-{
-}
-
-ACE_INLINE int
-ACE_ES_Reactor_NS::open (void)
-{
-  return 0;
-}
-
-ACE_INLINE void
-ACE_ES_Reactor_NS::shutdown (void)
-{
-}
-
-#endif /* ACE_WIN32 */
-
-// ************************************************************
diff --git a/TAO/local/bin/Event_Service/Event_Channel.cpp b/TAO/local/bin/Event_Service/Event_Channel.cpp
deleted file mode 100644
index 47919109f66..00000000000
--- a/TAO/local/bin/Event_Service/Event_Channel.cpp
+++ /dev/null
@@ -1,2853 +0,0 @@
-// $Id$
-
-
-#include "ace/Service_Config.h"
-
-#include "Dispatching_Modules.h"
-#include "Memory_Pools.h"
-#include "Scheduler_Factory.h"
-#include "Event_Utilities.h"
-#include "Event_Channel.h"
-
-// These are to save space.
-#define WRITE_GUARD ACE_ES_WRITE_GUARD
-#define READ_GUARD ACE_ES_READ_GUARD
-
-#if !defined (__ACE_INLINE__)
-#include "Event_Channel.i"
-#endif /* __ACE_INLINE__ */
-
-// ************************************************************
-
-static RtecScheduler::OS_Priority
-Preemption_Priority (RtecScheduler::handle_t rtinfo)
-{
-  RtecScheduler::OS_Priority thread_priority;
-  RtecScheduler::Sub_Priority subpriority;
-  RtecScheduler::Preemption_Priority preemption_priority;
-
-  ACE_TRY
-    {
-      ACE_Scheduler_Factory::server ()->priority
-	(rtinfo,
-	 thread_priority,
-	 subpriority,
-	 preemption_priority,
-	 ACE_TRY_ENV);
-      ACE_CHECK_ENV
-    }
-  ACE_CATCH (RtecScheduler::UNKNOWN_TASK, ex_ut)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR, "UNKNOWN_TASK %p.\n", 
-			 "Preemption_Priority"), 0);
-    }
-  ACE_CATCHANY
-    {
-      ACE_ERROR_RETURN ((LM_ERROR, "Unexpected exception %p.\n", 
-			 "Preemption_Priority"), 0);
-
-    }
-  ACE_ENDTRY;
-  return preemption_priority;
-}
-
-static RtecScheduler::OS_Priority
-IntervalToPriority (RtecScheduler::Time interval)
-{
-  for (int x=0; x < ACE_Scheduler_MAX_PRIORITIES; x++)
-    if (interval <= ACE_Scheduler_Rates[x])
-      return x;
-
-  return ACE_Scheduler_MIN_PREEMPTION_PRIORITY;
-}
-
-// ************************************************************
-
-class Shutdown_Consumer : public ACE_ES_Dispatch_Request
-// = TITLE
-//    Shutdown Consumer command
-//
-// = DESCRIPTION
-//    This command object is sent through the system when a consumer
-//    disconnects.  When the Dispatching Module dequeues this request,
-//    it calls execute which execute calls back to the Consumer
-//    Module.  At that point, the Consumer Module can tell the rest of
-//    the system that the consumer has disconnected and delete the
-//    consumer proxy.  This allows all events queued for the consumer
-//    to be flushed to the consumer proxy (which will drop them).
-//    Events can be queued in the ReactorEx (in a dispatch set), or in
-//    the Dispatching Module.
-{
-public:
-  // When executed, tells <consumer_module> that <consumer> has shut
-  // down.
-  Shutdown_Consumer (ACE_ES_Consumer_Module *consumer_module,
-		     ACE_Push_Consumer_Proxy *consumer)
-    : consumer_module_ (consumer_module)
-    {
-      consumer_ = consumer;
-
-      // Set rt_info_ to the lowest priority rt_info in consumer_.
-      // This is so the dispatching module can query us as a dispatch
-      // request to get the appropriate preemption priority.
-      ACE_ES_Dependency_Iterator iter (consumer->qos ().dependencies);
-      while (iter.advance_dependency () == 0)
-	{
-	  RtecEventComm::EventType &type = (*iter).event_.type_;
-	  if (type != ACE_ES_GLOBAL_DESIGNATOR &&
-	      type != ACE_ES_CONJUNCTION_DESIGNATOR &&
-	      type != ACE_ES_DISJUNCTION_DESIGNATOR)
-	    {
-	      if (rt_info_ == 0 ||
-		  ::Preemption_Priority ((*iter).rt_info) <
-		  ::Preemption_Priority (rt_info_))
-		rt_info_ = (*iter).rt_info;
-	    }
-	}
-    }
-
-  // Report to the consumer module that consumer_ has shutdown.
-  virtual int execute (u_long &command_action)
-    {
-      consumer_module_->shutdown_request (this);
-      command_action = ACE_RT_Task_Command::RELEASE;
-      return 0;
-    }
-
-  void *operator new (size_t /* nbytes */)
-    { return ::new char[sizeof (Shutdown_Consumer)]; }
-
-  void operator delete (void *buf)
-    { ::delete [] buf; }
-
-  // The module that we report to.
-  ACE_ES_Consumer_Module *consumer_module_;
-};
-
-// ************************************************************
-
-class Shutdown_Channel : public ACE_ES_Dispatch_Request
-{
-public:
-  Shutdown_Channel (ACE_EventChannel *channel) :
-    channel_ (channel) {}
-
-  // Report to the consumer module that consumer_ has shutdown.
-  virtual int execute (u_long &command_action)
-    {
-#if 0
-      channel_->destroy_i ();
-#endif
-      command_action = ACE_RT_Task_Command::RELEASE;
-      return 0;
-    }
-
-  void *operator new (size_t /* nbytes */)
-    { return ::new char[sizeof (Shutdown_Channel)]; }
-
-  void operator delete (void *buf)
-    { ::delete [] buf; }
-
-  ACE_EventChannel *channel_;
-};
-
-// ************************************************************
-
-class ACE_ES_Priority_Timer : public ACE_Event_Handler
-// = TITLE
-//    Event Service Timer
-//
-// = DESCRIPTION
-//    Manages a thread per priority, each of which sits on its own
-//    ReactorEx dispatching the timers for its given priority.
-{
-public:
-  ACE_ES_Priority_Timer (void);
-  // Default construction.
-
-  int connected (RtecScheduler::handle_t rt_info);
-  // This allows the Priority Timer to prespawn threads.  Returns 0 on
-  // success, -1 on failure.
-
-  int schedule_timer (RtecScheduler::handle_t rt_info,
-		      const ACE_ES_Timer_ACT *act,
-		      RtecScheduler::OS_Priority preemption_priority,
-		      RtecScheduler::Time delta,
-		      RtecScheduler::Time interval = 0);
-  // Schedule a timer at the appropriate priority for <preemption_priority>.
-  // Returns the preemption priority used on success, -1 on failure.
-
-  int cancel_timer (RtecScheduler::OS_Priority preemption_priority, 
-		    int id, ACE_ES_Timer_ACT *&act);
-  // Cancel the timer associated with the priority of
-  // <preemption_priority> and <id>.  <act> is filled in with the
-  // Timer_ACT used when scheduling the timer.  Returns 0 on success,
-  // -1 on failure.
-
-private:
-  virtual int handle_timeout (const ACE_Time_Value &tv,
-			      const void *act);
-  // Casts <act> to ACE_ES_Timer_ACT and calls execute.
-};
-
-// ************************************************************
-
-class Flush_Queue_ACT : public ACE_ES_Timer_ACT
-// = TITLE
-//    Flush Queue Asynchronous Completion Token
-//
-// = DESCRIPTION
-//    Carries a single dispatch request through the ReactorEx.
-//    Deletes itself when execute is called.
-{
-public:
-  Flush_Queue_ACT (ACE_ES_Dispatch_Request *request,
-		   ACE_ES_Dispatching_Module *dispatching_module) :
-    request_ (request),
-    dispatching_module_ (dispatching_module) { }
-  
-  virtual void execute (void)
-    {
-      ACE_TRY
-	{
-	  ACE_ES_Dispatch_Request *request = request_;
-	  dispatching_module_->push (request, ACE_TRY_ENV);
-	  ACE_CHECK_ENV;
-	  delete this;
-	}
-      ACE_CATCHANY
-	{
-	  ACE_ERROR ((LM_ERROR, "(%t) Flush_Queue_ACT::execute: "
-		      "Unknown exception..\n"));
-	}
-      ACE_ENDTRY;
-    }
-
-  ACE_ES_Dispatch_Request *request_;
-  ACE_ES_Dispatching_Module *dispatching_module_;
-};
-
-// ************************************************************
-
-// Since this class is *defined* in the cpp file, the INLINE
-// definitions must also be in the cpp file.   The should go here
-// before any use of these methods.
-
-ACE_INLINE int 
-ACE_ES_Priority_Timer::schedule_timer (RtecScheduler::handle_t rt_info,
-				       const ACE_ES_Timer_ACT *act,
-				       RtecScheduler::OS_Priority preemption_priority,
-				       RtecScheduler::Time delta,
-				       RtecScheduler::Time interval)
-{
-  if (rt_info != 0)
-    {
-      // Add the timer to the task's dependency list.
-      RtecScheduler::handle_t timer_rtinfo =
-	ACE_Task_Manager::instance()->GetReactorTask (preemption_priority)->rt_info ();
-
-      ACE_TRY
-	{
-	  ACE_Scheduler_Factory::server()->add_dependency
-	    (rt_info, timer_rtinfo, 1, ACE_TRY_ENV);
-	  ACE_CHECK_ENV;
-
-	  ACE_DEBUG ((LM_ERROR, "ACE_ES_Priority_Timer::schedule_timer - "
-		      "add_dependency (%d,%d,%d)\n",
-		      rt_info, timer_rtinfo, 1));
-	}
-      ACE_CATCHANY
-	{
-	  ACE_ERROR ((LM_ERROR, "add dependency failed"));
-	}
-      ACE_ENDTRY;
-    }
-
-  // @@ We're losing resolution here.
-  ACE_Time_Value tv_delta;
-  tv_delta.usec (delta / 10);
-  if (tv_delta.usec () == 0)
-    tv_delta.usec (1);
-		  
-  ACE_Time_Value tv_interval;
-  if (interval > 0)
-    {
-      tv_interval.usec (interval / 10);
-      if (tv_interval.usec () == 0)
-	tv_interval.usec (1);
-    }
-
-  return ACE_Task_Manager::instance()->
-    GetReactorTask (preemption_priority)->
-    get_reactor ().schedule_timer (this,
-				   (void *) act,
-				   tv_delta, tv_interval);
-}
-
-ACE_INLINE int
-ACE_ES_Priority_Timer::cancel_timer (RtecScheduler::OS_Priority preemption_priority, 
-				     int id, ACE_ES_Timer_ACT *&act)
-{
-  const void *vp;
-
-  int result = ACE_Task_Manager::instance()->
-    GetReactorTask (preemption_priority)->
-    get_reactor ().cancel_timer (id, &vp);
-
-  if (result == 0)
-    {
-      ACE_ERROR ((LM_ERROR, "ACE_ES_Priority_Timer::cancel_timer: "
-		  "Tried to cancel nonexistent timer.\n"));
-      act = 0;
-    }
-  else
-    act = (ACE_ES_Timer_ACT *) vp;
-
-  return result;
-}
-
-// ************************************************************
-
-ACE_ES_Event_Container::ACE_ES_Event_Container (void) :
-  //  ACE_ES_Event (),
-  ref_count_ (1)
-{
-}
-
-ACE_ES_Event_Container::~ACE_ES_Event_Container (void)
-{
-}
-
-ACE_ES_Event_Container::ACE_ES_Event_Container (const ACE_ES_Event_Container &ec)
- : RtecEventComm_Event (ec),
-   ref_count_ (1)
-{
-}
-
-ACE_ES_Event_Container::ACE_ES_Event_Container (const RtecEventComm_Event &e)
-  : RtecEventComm_Event (e),
-    ref_count_ (1)
-{
-}
-
-ACE_ES_Event_Container *
-ACE_ES_Event_Container::_duplicate (void)
-{
-  ref_count_++;
-  return this;
-}
-
-void
-ACE_ES_Event_Container::_release (void)
-{
-  if (--ref_count_ == 0)
-    delete this;
-}
-
-int 
-ACE_ES_Event_Container::operator== (const ACE_ES_Event_Container &event)
-{
-  RtecEventComm::Event &event1 = (RtecEventComm::Event &) *this;
-  RtecEventComm::Event &event2 = (RtecEventComm::Event &) event;
-  return event1 == event2;
-}
-
-void *
-ACE_ES_Event_Container::operator new (size_t nbytes)
-{
-  ACE_ASSERT (nbytes <= sizeof (ACE_ES_Event_Container));
-  return ACE_ES_Memory_Pools::new_Event_Container ();
-}
-
-void 
-ACE_ES_Event_Container::operator delete (void *mem)
-{
-  ACE_ES_Memory_Pools::delete_Event_Container (mem);
-}
-
-void
-ACE_ES_Event_Container::dump (void)
-{
-  ::dump_event ((RtecEventComm::Event &) *this);
-}
-
-// ************************************************************
-
-ACE_Push_Supplier_Proxy::ACE_Push_Supplier_Proxy (ACE_ES_Supplier_Module *sm)
-  : supplier_module_ (sm),
-    me_ (this),
-    push_supplier_ (0)
-{
-}
-
-void 
-ACE_Push_Supplier_Proxy::connect_push_supplier (RtecEventComm::PushSupplier_ptr push_supplier,
-						const RtecEventChannelAdmin::SupplierQOS &qos,
-						CORBA::Environment &_env)
-{
-  if (this->connected ())
-    ACE_THROW (RtecEventChannelAdmin::AlreadyConnected);
-
-  push_supplier_ =
-    RtecEventComm::PushSupplier::_duplicate(push_supplier);
-
-  // ACE_SupplierQOS_Factory::debug (qos);
-
-  // Copy by value.
-  qos_ = qos;
-
-  // ACE_SupplierQOS_Factory::debug (qos_);
-
-  // @@ TODO: The SupplierQOS should have a more reasonable interface to
-  // obtain the supplier_id(), BTW, a callback to push_supplier will
-  // not work: it usually results in some form of dead-lock.
-  source_id_ = qos_.publications_[0].event_.source_;
-  
-  supplier_module_->connected (this, _env);
-}
-
-void 
-ACE_Push_Supplier_Proxy::push (const RtecEventComm::EventSet &event,
-			       CORBA::Environment &_env)
-{
-  if (!this->connected ())
-    ACE_THROW (RtecEventComm::Disconnected);
-
-  supplier_module_->push (this, event, _env);
-}
-
-void 
-ACE_Push_Supplier_Proxy::disconnect_push_consumer (CORBA::Environment &_env)
-{
-  if (this->connected ())
-    {
-      push_supplier_ = 0;
-      supplier_module_->disconnecting (this, _env);
-    }
-}
-
-void 
-ACE_Push_Supplier_Proxy::shutdown (void)
-{
-  ACE_TRY
-    {
-      push_supplier_->disconnect_push_supplier (ACE_TRY_ENV);
-      ACE_CHECK_ENV;
-    }
-  ACE_CATCHANY
-    {
-      ACE_ERROR ((LM_ERROR, "ACE_Push_Supplier_Proxy::shutdown failed.\n"));
-    }
-  ACE_ENDTRY;
-}
-
-// ************************************************************
-
-ACE_Push_Consumer_Proxy::ACE_Push_Consumer_Proxy (ACE_ES_Consumer_Module *cm)
-  : me_ (this),
-    push_consumer_ (0),
-    consumer_module_ (cm)
-{
-}
-
-ACE_Push_Consumer_Proxy::~ACE_Push_Consumer_Proxy (void)
-{
-}
-
-
-void 
-ACE_Push_Consumer_Proxy::connect_push_consumer (RtecEventComm::PushConsumer_ptr push_consumer,
-						const RtecEventChannelAdmin::ConsumerQOS &qos,
-						CORBA::Environment &_env)
-{
-  if (this->connected ())
-    ACE_THROW (RtecEventChannelAdmin::AlreadyConnected);
-
-  push_consumer_ =
-    RtecEventComm::PushConsumer::_duplicate(push_consumer);
-  // @@ TODO Find out why are two duplicates needed...
-  RtecEventComm::PushConsumer::_duplicate(push_consumer);
-
-  // ACE_ConsumerQOS_Factory::debug (qos);
-
-  // Copy by value.
-  qos_ = qos;
-
-  // ACE_ConsumerQOS_Factory::debug (qos_);
-
-  consumer_module_->connected (this, _env);
-}
-
-void 
-ACE_Push_Consumer_Proxy::disconnect_push_supplier (CORBA::Environment &_env)
-{
-  consumer_module_->disconnecting (this, _env);
-  push_consumer_ = 0;
-}
-
-void 
-ACE_Push_Consumer_Proxy::suspend (CORBA::Environment &)
-{
-  correlation_.suspend ();
-}
-
-void 
-ACE_Push_Consumer_Proxy::resume (CORBA::Environment &)
-{
-  correlation_.resume ();
-}
-
-void 
-ACE_Push_Consumer_Proxy::shutdown (void)
-{
-  ACE_TRY
-    {
-      push_consumer_->disconnect_push_consumer (ACE_TRY_ENV);
-      ACE_CHECK_ENV;
-    }
-  ACE_CATCHANY
-    {
-      ACE_ERROR ((LM_ERROR, "ACE_Push_Consumer_Proxy::shutdown failed.\n"));
-    }
-  ACE_ENDTRY;
-}
-
-// ************************************************************
-
-ACE_EventChannel::ACE_EventChannel (u_long type)
-  : POA_RtecEventChannelAdmin::EventChannel ("EventChannel"),
-    rtu_manager_ (0),
-    type_ (type),
-    state_ (INITIAL_STATE),
-    me_ (this),
-    destroyed_ (0)
-{
-  consumer_module_ = new ACE_ES_Consumer_Module (this);
-  // RtecEventChannelAdmin::ConsumerAdmin_duplicate(consumer_module_);
-
-#if defined(ACE_ES_LACKS_ORB)
-  UPSSingleProcessorOrb_startup(type,
-				dispatching_module,
-				rtu_active,
-				rtu_manager);
-#else
-  ACE_NEW(dispatching_module_,
-	  ACE_ES_Priority_Dispatching(this, THREADS_PER_DISPATCH_QUEUE));
-#endif
-
-  correlation_module_ = new ACE_ES_Correlation_Module (this);
-  subscription_module_ = new ACE_ES_Subscription_Module (this);
-  supplier_module_ = new ACE_ES_Supplier_Module (this);
-  timer_ = new ACE_ES_Priority_Timer;
-
-  consumer_module_->open (dispatching_module_);
-  dispatching_module_->open (consumer_module_, correlation_module_);
-  correlation_module_->open (dispatching_module_, subscription_module_);
-  subscription_module_->open (correlation_module_, supplier_module_);
-  supplier_module_->open (subscription_module_);
-}
-
-ACE_EventChannel::~ACE_EventChannel (void)
-{
-  ACE_DEBUG ((LM_DEBUG, "(%t) ACE_EventChannel deleting all modules.\n"));
-
-  ACE_TRY
-    {
-      this->destroy (ACE_TRY_ENV);
-      ACE_CHECK_ENV;
-    }
-  ACE_CATCHANY
-    {
-      ACE_ERROR ((LM_ERROR, "%p.\n", "ACE_EventChannel::~ACE_EventChannel"));
-    }
-  ACE_ENDTRY;
-  // @@ TODO: Shouldn't we use _release() instead?
-  delete rtu_manager_;
-  delete consumer_module_;
-  delete dispatching_module_;
-  delete correlation_module_;
-  delete subscription_module_;
-  delete supplier_module_;
-  delete timer_;
-}
-
-void
-ACE_EventChannel::destroy (CORBA::Environment &_env)
-{
-  ACE_UNUSED_ARG (_env);
-
-  ACE_ES_GUARD ace_mon (lock_);
-  if (ace_mon.locked () == 0)
-    ACE_ERROR ((LM_ERROR, "ACE_EventChannel::destroy"));
-
-  if (destroyed_ != 0)
-    return;
-
-  destroyed_ = 1;
-  ACE_DEBUG ((LM_DEBUG, "(%t) Event Channel shutting down.\n"));
-
-  // Send a shutdown message through the modules.
-  supplier_module_->shutdown ();
-
-#if 0
-  // Flush all messages in the channel.
-  Shutdown_Channel *sc = new Shutdown_Channel (this);
-  if (sc == 0)
-    ACE_THROW (CORBA::NO_MEMORY (CORBA::COMPLETED_NO));
-  // @@ TODO: Orbix parameters
-  // (0, CORBA::COMPLETED_NO, "ACE_EventChannel::destroy"));
-
-  // Create a wrapper around the dispatch request.
-  Flush_Queue_ACT *act = new Flush_Queue_ACT (sc, dispatching_module_);
-  if (act == 0)
-    ACE_THROW (CORBA::NO_MEMORY (CORBA::COMPLETED_NO));
-  // @@ TODO Orbix parameters
-  // (0, CORBA::COMPLETED_NO, "ACE_EventChannel::destroy"));
-
-  // Set a 100ns timer.
-  if (this->timer ()->schedule_timer (0, // no rt-info
-				      act,
-				      ACE_Scheduler_MIN_PREEMPTION_PRIORITY,
-				      100, // 10 usec delta
-				      0) == -1) // no interval
-    {
-      ACE_ERROR ((LM_ERROR, "%p queue_request failed.\n", "ACE_ES_Consumer_Module"));
-      delete sc;
-      delete act;
-    }
-#endif
-}
-
-void
-ACE_EventChannel::shutdown (void)
-{
-  // @@ TODO: Find a portable way to shutdown the ORB, on Orbix we have
-  // to call deactive_impl () on a CORBA::POA is that the portable
-  // way?
-  // With TAO we need access to the ORB (to call shutdown() on it).
-}
-
-void
-ACE_EventChannel::report_connect (u_long event)
-{
-  ACE_ES_GUARD ace_mon (lock_);
-  if (ace_mon.locked () == 0)
-    ACE_ERROR ((LM_ERROR, "ACE_EventChannel::report_connect"));
-
-  ACE_CLR_BITS (state_, event);
-}
-
-void
-ACE_EventChannel::report_disconnect (u_long event)
-{
-  ACE_ES_GUARD ace_mon (lock_);
-  if (ace_mon.locked () == 0)
-    ACE_ERROR ((LM_ERROR, "ACE_EventChannel::report_disconnect"));
-
-  ACE_SET_BITS (state_, event);
-  if (state_ == SHUTDOWN)
-    ACE_DEBUG ((LM_DEBUG, "(%t) Event Channel has no consumers or suppliers.\n"));
-}
-
-// ************************************************************
-
-ACE_ES_Subscription_Info::~ACE_ES_Subscription_Info (void)
-{
-  Subscriber_Map_Iterator iter (type_subscribers_);
-
-  // Delete all type collections.
-  for (Subscriber_Map_Entry *temp = 0;
-       iter.next (temp) != 0;
-       iter.advance ())
-    {
-      delete temp->int_id_;
-    }
-}
-
-/*
-void
-ACE_ES_Subscription_Info::Type_Subscribers::operator=
-(const ACE_ES_Subscription_Info::Type_Subscribers &rhs)
-{
-  ACE_ES_Subscription_Info::Subscriber_Set_Iterator iter (rhs.subscribers_);
-
-  for (ACE_ES_Consumer_Rep **consumer = 0;
-       iter.next (consumer) != 0;
-       iter.advance ())
-    {
-      if (subscribers_.insert (consumer) != 0)
-	ACE_ERROR ((LM_ERROR, "%p insert failed.\n",
-		    "ACE_ES_Subscription_Info::Type_Subscribers::operator="));
-    }
-
-  // Pointer copy.
-  dependency_info_ = rhs.dependency_info_;
-}
-*/
-
-// Remove <consumer> from the consumer set in <type_map> set
-// corresponding to <type>.
-int
-ACE_ES_Subscription_Info::remove (Subscriber_Map &type_map,
-				  ACE_ES_Consumer_Rep *consumer,
-				  RtecEventComm::EventType type)
-{
-  Type_Subscribers *subscribers;
-
-  // Find the type set within the type collection.
-  if (type_map.find (type, subscribers) == -1)
-    // type_map does not contain the type.
-    return -1;
-
-  // Remove the consumer from the type set.
-  if (subscribers->consumers_.remove (consumer) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "%p remove failed.\n",
-		       "ACE_ES_Subscriber_Info::remove"), -1);
-  // @@ Should probably remove the supplier from the consumers caller
-  // list.
-
-  // If the set is empty, remove it from the type collection.
-  if (subscribers->consumers_.size () == 0)
-    {
-      Type_Subscribers *removed_subscribers;
-      if (type_map.unbind (type, removed_subscribers) == -1)
-	ACE_ERROR_RETURN ((LM_ERROR, "%p unbind failed.\n",
-			   "ACE_ES_Subscriber_Info::remove"), -1);
-
-      // Sanity check.
-      if (removed_subscribers != subscribers)
-	ACE_ERROR_RETURN ((LM_ERROR, "ACE_ES_Subscriber_Info::remove: "
-			   "removed wrong set!\n"), -1);
-
-      // Free up the set removed.
-      delete removed_subscribers;
-    }
-
-  return 0;
-}
-
-
-int
-ACE_ES_Subscription_Info::remove (SourceID_Map &source_subscribers,
-				  ACE_ES_Consumer_Rep *consumer,
-				  RtecEventComm::EventSourceID sid)
-{
-  Subscriber_Set *subscribers;
-
-  // Find the subscribers of <sid>.
-  if (source_subscribers.find (sid, subscribers) == -1)
-    // does not contain the <sid>.
-    return -1;
-
-  // Remove the consumer from the subscriber set.
-  if (subscribers->remove (consumer) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "%p remove failed.\n",
-		       "ACE_ES_Subscriber_Info::remove"), -1);
-  // @@ Should probably remove the supplier from the consumers caller
-  // list.
-
-  // If the set is empty, remove it from the type collection.
-  if (subscribers->size () == 0)
-    {
-      Subscriber_Set *removed_subscribers;
-      if (source_subscribers.unbind (sid, removed_subscribers) == -1)
-	ACE_ERROR_RETURN ((LM_ERROR, "%p unbind failed.\n",
-			   "ACE_ES_Subscriber_Info::remove"), -1);
-
-      // Sanity check.
-      if (removed_subscribers != subscribers)
-	ACE_ERROR_RETURN ((LM_ERROR, "ACE_ES_Subscriber_Info::remove: "
-			   "removed wrong set!\n"), -1);
-
-      // Free up the set removed.
-      delete removed_subscribers;
-    }
-
-  return 0;
-}
-
-
-void
-ACE_ES_Subscription_Info::append_subscribers (Subscriber_Set &dest,
-					      Subscriber_Set &src)
-{
-  Subscriber_Set_Iterator src_iter (src);
-
-  // Iterate through the source set.  Add each source proxy to the
-  // destination set.
-  for (ACE_ES_Consumer_Rep **proxy = 0;
-       src_iter.next (proxy) != 0;
-       src_iter.advance ())
-    {
-      if (dest.insert (*proxy) == -1)
-	ACE_ERROR ((LM_ERROR, "%p: insert failed.\n", "append_subscribers"));
-    }
-}
-
-int
-ACE_ES_Subscription_Info::insert_or_allocate (SourceID_Map &sid_map,
-					      ACE_ES_Consumer_Rep *consumer,
-					      RtecEventComm::EventSourceID sid)
-{
-  Subscriber_Set *subscribers;
-  
-  if (sid_map.find (sid, subscribers) == -1)
-    {
-      // If the correct type set does not exist, make one with a null
-      // dependency info (since there is no supplier of this event).
-      subscribers = new Subscriber_Set;
-      
-      if (sid_map.bind (sid, subscribers) == -1)
-	{
-	  ACE_ERROR ((LM_ERROR, "%p bind failed.\n",
-		      "ACE_ES_Subscription_Info::insert_or_allocate"));
-	  delete subscribers;
-	  return -1;
-	}
-    }
-
-  // 0 and 1 are success for insert.
-  return subscribers->insert (consumer) == -1 ? -1 : 0;
-}
-
-int
-ACE_ES_Subscription_Info::insert_or_allocate (Subscriber_Map &type_map,
-					      ACE_ES_Consumer_Rep *consumer,
-					      RtecEventComm::EventType type)
-{
-  Type_Subscribers *subscribers;
-  
-  if (type_map.find (type, subscribers) == -1)
-    {
-      // If the correct type set does not exist, make one with a null
-      // dependency info (since there is no supplier of this event).
-      subscribers = new Type_Subscribers (0);
-      
-      if (type_map.bind (type, subscribers) == -1)
-	{
-	  ACE_ERROR ((LM_ERROR, "%p bind failed.\n",
-		      "ACE_ES_Subscription_Info::insert_or_allocate"));
-	  delete subscribers;
-	  return -1;
-	}
-    }
-
-  return subscribers->consumers_.insert (consumer);
-}
-
-int
-ACE_ES_Subscription_Info::insert_or_fail (Subscriber_Map &type_map,
-					  ACE_ES_Consumer_Rep *consumer,
-					  RtecEventComm::EventType type,
-					  RtecScheduler::Dependency_Info *&dependency)
-{
-  Type_Subscribers *subscribers;
-
-  // Get the subscriber set for <type>.
-  if (type_map.find (type, subscribers) == -1)
-    return -1;
-
-  // Pass back the description of the method generating <type>.
-  dependency = subscribers->dependency_info_;
-
-  // Insert the new consumer into the subscriber set.
-  return subscribers->consumers_.insert (consumer);
-}
-
-// ************************************************************
-
-typedef ACE_EventChannel::SYNCHRONIZATION_ERROR SYNC_ERROR;
-typedef ACE_EventChannel::QOS_ERROR QOS_ERROR;
-typedef ACE_EventChannel::SUBSCRIPTION_ERROR SUBSCRIPTION_ERROR;
-typedef ACE_EventChannel::CORRELATION_ERROR CORRELATION_ERROR;
-
-// ************************************************************
-
-ACE_ES_Consumer_Module::ACE_ES_Consumer_Module (ACE_EventChannel* channel)
-  :  lock_ (),
-     all_consumers_ (),
-     channel_ (channel),
-     me_ (this),
-     down_ (0)
-{
-}
-
-void
-ACE_ES_Consumer_Module::open (ACE_ES_Dispatching_Module *down)
-{
-  down_ = down;
-}
-
-void
-ACE_ES_Consumer_Module::connected (ACE_Push_Consumer_Proxy *consumer,
-				   CORBA::Environment &_env)
-{
-  channel_->report_connect (ACE_EventChannel::CONSUMER);
-  down_->connected (consumer, _env);
-}
-
-void
-ACE_ES_Consumer_Module::shutdown_request (ACE_ES_Dispatch_Request *request)
-{
-  Shutdown_Consumer *sc = (Shutdown_Consumer *) request;
-  
-  // Tell everyone else that the consumer is disconnected.  This means
-  // that *nothing* is left in the system for the consumer, so
-  // everyone can free up any resources.
-  down_->disconnected (sc->consumer ());
-
-  ACE_DEBUG ((LM_DEBUG, "Deleting proxy for %s.\n", 
-	      ::ACE_ES_Consumer_Name (sc->consumer ()->qos ())));
-
-  // Delete the consumer proxy.
-  delete sc->consumer ();
-
-  ACE_ES_GUARD ace_mon (lock_);
-  if (ace_mon.locked () == 0)
-    return;
-    
-  // Tell the channel that we may need to shut down.
-  if (all_consumers_.size () <= 0)
-    {
-      ACE_DEBUG ((LM_DEBUG, "(%t) No more consumers connected.\n"));
-      channel_->report_disconnect (ACE_EventChannel::CONSUMER);
-    }
-}
-
-void
-ACE_ES_Consumer_Module::shutdown (void)
-{
-  Consumers copy;
-
-  {
-    ACE_ES_GUARD ace_mon (lock_);
-    if (ace_mon.locked () == 0)
-      goto DONE;
-
-    if (all_consumers_.size () == 0)
-      goto DONE;
-
-    // Make a copy so that the consumers can disconnect without the
-    // lock being held.
-    copy = all_consumers_;
-  }
-
-  // This scope is just to thwart the compiler.  It was complaining
-  // about the above goto's bypassing variable initializations.  Yadda
-  // yadda.
-  {
-    Consumer_Iterator iter (copy);
-
-    CORBA::Environment env;
-
-    for (ACE_Push_Consumer_Proxy **proxy = 0;
-	 iter.next (proxy) != 0;
-	 iter.advance ())
-      {
-	(*proxy)->shutdown ();
-	CORBA::release (*proxy);
-	// Shouldn't this be _release ()
-
-	// Remove the consumer from our list.
-	{
-	  ACE_ES_GUARD ace_mon (lock_);
-	  if (ace_mon.locked () == 0)
-	    ACE_ERROR ((LM_ERROR, "%p Failed to acquire lock.\n", "ACE_ES_Consumer_Module::shutdown"));
-    
-	  if (all_consumers_.remove (*proxy) == -1)
-	    ACE_ERROR ((LM_ERROR, "%p Failed to remove consumer.\n", "ACE_ES_Consumer_Module::shutdown"));
-	}
-      }
-  }
-
-DONE:
-  channel_->shutdown ();
-}
-
-void
-ACE_ES_Consumer_Module::disconnecting (ACE_Push_Consumer_Proxy *consumer,
-				       CORBA::Environment &_env)
-{
-  {
-    ACE_ES_GUARD ace_mon (lock_);
-    if (ace_mon.locked () == 0)
-      ACE_THROW (SYNC_ERROR);
-    // @@ TODO Orbix parameters
-    // (0, CORBA::COMPLETED_NO, "ACE_ES_Consumer_Module::disconnected"));
-    
-    if (all_consumers_.remove (consumer) == -1)
-      return;
-  }
-
-  // Tell everyone else that the consumer is disconnecting.  This
-  // allows them to remove the consumer from any subscription lists
-  // etc.  However, messages may still be queued in the ReactorEx or
-  // in the Dispatching Module for this consumer, so no queues or
-  // proxies can be deleted just yet.
-  down_->disconnecting (consumer, _env);
-
-  // Send a shutdown message through the system.  When this is
-  // dispatched, the consumer proxy will be deleted.  <request> is
-  // queued in the Priority_Timer at <priority> level.  It will be
-  // scheduled for dispatching in 1 nanosecond.  This gives components
-  // a hook into the first queueing point in the channel.
-
-  // Create a shutdown message.  When this is dispatched, it will
-  // delete the proxy.
-  Shutdown_Consumer *sc = new Shutdown_Consumer (this, consumer);
-  if (sc == 0)
-    ACE_THROW (CORBA::NO_MEMORY (CORBA::COMPLETED_NO));
-  // @@ TODO Orbix parameters:
-  // (0, CORBA::COMPLETED_NO, "ACE_ES_Consumer_Module::disconnected"));
-
-  // Create a wrapper around the dispatch request.
-  Flush_Queue_ACT *act = new Flush_Queue_ACT (sc, channel_->dispatching_module_);
-  if (act == 0)
-    ACE_THROW (CORBA::NO_MEMORY (CORBA::COMPLETED_NO));
-  // @@ TODO Orbix parameters:
-  // (0, CORBA::COMPLETED_NO, "ACE_ES_Consumer_Module::disconnecting"));
-
-  ACE_DEBUG ((LM_DEBUG, "(%t) initiating consumer disconnect for %s.\n",
-		 ::ACE_ES_Consumer_Name (consumer->qos ())));;
-
-  // Set a 100ns timer.
-  if (channel_->timer ()->schedule_timer (0, // no rt_info
-					  act,
-					  // ::Preemption_Priority (consumer->qos ().rt_info_),
-					  ACE_Scheduler_MIN_PREEMPTION_PRIORITY,
-					  100, 0) == -1)
-    {
-      ACE_ERROR ((LM_ERROR, "%p queue_request failed.\n", "ACE_ES_Consumer_Module"));
-      delete sc;
-      delete act;
-    }
-}
-
-// This method executes in the same thread of control that will hand
-// the event set to the consumer (or it's proxy).  A network proxy may
-// copy the event set to the network buffer.  An active client may
-// copy the event set to be queued.  Or a same address-space consumer
-// can read the set we allocated off the stack.
-void
-ACE_ES_Consumer_Module::push (const ACE_ES_Dispatch_Request *request,
-			      CORBA::Environment &_env)
-{
-  // We'll create a temporary event set with the size of the incoming
-  // request.
-  RtecEventComm::EventSet event_set (request->number_of_events ());
-  request->make_copy (event_set);
-
-  // Forward the event set.
-  request->consumer ()->push (event_set, _env);
-}
-
-RtecEventChannelAdmin::ProxyPushSupplier_ptr
-ACE_ES_Consumer_Module::obtain_push_supplier (CORBA::Environment &_env)
-{
-  ACE_Push_Consumer_Proxy *new_consumer = new ACE_Push_Consumer_Proxy (this);
-
-  // Get a new supplier proxy object.
-  if (new_consumer == 0)
-    {
-      ACE_ERROR ((LM_ERROR, "ACE_EventChannel"
-		  "::obtain_push_supplier failed.\n"));
-      ACE_THROW_RETURN (CORBA::NO_MEMORY (CORBA::COMPLETED_NO), 0);
-      // @@ TODO Orbix parameters:
-      // (0, CORBA::COMPLETED_NO, "ACE_ES_Consumer_Module::obtain_push_supplier"));
-    }
-
-  {
-    ACE_ES_GUARD ace_mon (lock_);
-    if (ace_mon.locked () == 0)
-      {
-	delete new_consumer;
-	ACE_THROW_RETURN (SYNC_ERROR, 0);
-	// @@ TODO Orbix parameters:
-	// (0, CORBA::COMPLETED_NO, 
-	//  "ACE_ES_Consumer_Module::obtain_push_supplier"), 0);
-      }
-
-    if (all_consumers_.insert (new_consumer) == -1)
-      ACE_ERROR ((LM_ERROR, "ACE_ES_Consumer_Module insert failed.\n"));
-  }
-
-  // Return the CORBA object reference to the new supplier proxy.
-  return new_consumer->get_ref ();
-}
-
-// ************************************************************
-
-ACE_ES_Correlation_Module::ACE_ES_Correlation_Module (ACE_EventChannel *channel)
-  : channel_ (channel),
-    up_ (0),
-    subscription_module_ (0)
-{
-}
-
-void
-ACE_ES_Correlation_Module::open (ACE_ES_Dispatching_Module *up,
-				 ACE_ES_Subscription_Module *sm)
-{
-  up_ = up;
-  subscription_module_ = sm;
-}
-
-void
-ACE_ES_Correlation_Module::connected (ACE_Push_Consumer_Proxy *consumer,
-				      CORBA::Environment &_env)
-{
-  // Initialize the consumer correlation filter.
-  if (consumer->correlation ().connected (consumer, this) == -1)
-    ACE_THROW (CORRELATION_ERROR);
-  // @@ TODO Orbix parameters:
-  // (0, CORBA::COMPLETED_NO, "ACE_ES_Correlation_Module::connected"));
-}
-
-void
-ACE_ES_Correlation_Module::disconnecting (ACE_Push_Consumer_Proxy *consumer,
-					  CORBA::Environment &)
-{
-  if (consumer->correlation ().disconnecting () == -1)
-    ACE_ERROR ((LM_ERROR, "ACE_ES_Correlation_Module::disconnecting failed.\n"));
-}
-
-int
-ACE_ES_Correlation_Module::subscribe (ACE_ES_Consumer_Rep *consumer)
-{
-  return subscription_module_->subscribe (consumer);
-}
-
-/*
-int
-ACE_ES_Correlation_Module::unsubscribe (ACE_ES_Consumer_Rep *cr)
-{
-  return subscription_module_->unsubscribe (cr);
-}
-*/
-
-void
-ACE_ES_Correlation_Module::push (ACE_ES_Consumer_Rep *consumer,
-				 ACE_ES_Event_Container *event,
-				 CORBA::Environment &_env)
-{
-  ACE_TIMEPROBE ("enter ACE_ES_Correlation_Module::push");
-  ACE_ES_Dispatch_Request *request = 
-    consumer->correlation ()->push (consumer, event);
-  ACE_TIMEPROBE ("  pushed to Correlation_Module");
-
-  // If request == 0, then the event was queued for later.  Otherwise,
-  // we need to push the event now.
-  if (request != 0)
-    up_->push (request, _env);
-
-  ACE_TIMEPROBE ("  push_source_type: Dispatch Module enqueuing");
-}
-
-// Must check consumer->qos ().use_timeout () before calling this.
-// This method is supposed properly schedule a timer with respect to
-// the consumer's priority AND the correlation that should receive the
-// timeout event.
-int
-ACE_ES_Correlation_Module::schedule_timeout (ACE_ES_Consumer_Rep_Timeout *consumer)
-{
-  RtecEventComm::Time &interval = consumer->dependency ()->event_.time_;
-  RtecEventComm::Time &delay = consumer->dependency ()->event_.time_;
-
-  // Store the preemption priority so we can cancel the correct timer.
-  // The priority values may change during the process lifetime (e.g.,
-  // after the scheduler has been run).
-  consumer->preemption_priority (::IntervalToPriority (interval));
-
-  // Register the timer.
-  int id = channel_->timer ()->schedule_timer (consumer->dependency ()->rt_info,
-					       consumer,
-					       consumer->preemption_priority (),
-					       delay, interval);
-
-  // Store the timer id for canceling.
-  consumer->timer_id (id);
-
-  if (id == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "%p schedule timer failed.\n", 
-		       "ACE_ES_Correlation_Module::schedule_timeout"), -1);
-
-  return 0;
-}
-
-// Must check consumer->qos ().timeout_ before calling this.
-int
-ACE_ES_Correlation_Module::cancel_timeout (ACE_ES_Consumer_Rep_Timeout *consumer)
-{
-  // Cancel the timer from the Priority Timer.
-  ACE_ES_Timer_ACT *act;
-  channel_->timer ()->cancel_timer (consumer->preemption_priority (),
-				    consumer->timer_id (),
-				    act);
-
-  ACE_ASSERT (consumer == act);
-
-  // Free up the Timer ACT.
-  //  delete act;
-
-  return 0;
-}
-
-
-int
-ACE_ES_Correlation_Module::reschedule_timeout (ACE_ES_Consumer_Rep_Timeout *consumer)
-{
-  if (this->cancel_timeout (consumer) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "%p.\n", "ACE_ES_Disjunction_Group::reschedule_deadline"), -1);
-  else
-    {
-      RtecEventComm::Time &interval = consumer->dependency ()->event_.time_;
-      RtecEventComm::Time &delay = consumer->dependency ()->event_.time_;
-
-      // Store the preemption priority so we can cancel the correct timer.
-      // The priority values may change during the process lifetime (e.g.,
-      // after the scheduler has been run).
-      consumer->preemption_priority (::IntervalToPriority (interval));
-
-      // Register the timer.
-      int id = channel_->timer ()->schedule_timer (0, // Do not pass an RT_Info.
-						   consumer,
-						   consumer->preemption_priority (),
-						   delay, interval);
-
-      // Store the timer id for canceling.
-      consumer->timer_id (id);
-
-      if (id == -1)
-	ACE_ERROR_RETURN ((LM_ERROR, "%p schedule timer failed.\n", 
-			   "ACE_ES_Correlation_Module::reschedule_timeout"), -1);
-
-      return 0;
-    }
-}
-
-void
-ACE_ES_Correlation_Module::shutdown (void)
-{
-  // Perhaps this should call disconnecting on all the consumers?
-  // We'll opt to just forward this message for now.
-  up_->shutdown ();
-}
-
-// ************************************************************
-
-ACE_ES_Consumer_Correlation::ACE_ES_Consumer_Correlation (void) :
-  correlation_module_ (0),
-  type_id_index_ (0),
-  channel_ (0),
-  forwarding_rt_info_ (0),
-  qos_ (),
-  pending_events_ (0),
-  lock_ (),
-  consumer_ (0),
-  pending_flags_ (0),
-  consumer_reps_ (0),
-  n_consumer_reps_ (0),
-  timer_reps_ (0),
-  n_timer_reps_ (0),
-  conjunction_groups_ (0),
-  n_conjunction_groups_ (0),
-  disjunction_groups_ (0),
-  n_disjunction_groups_ (0),
-  connected_ (0)
-{
-}
-
-ACE_ES_Consumer_Correlation::~ACE_ES_Consumer_Correlation (void)
-{
-  delete [] timer_reps_;
-  for (int cr = 0; cr < n_consumer_reps_; cr++)
-    consumer_reps_[cr]->_release ();
-  delete [] consumer_reps_;
-  delete [] conjunction_groups_;
-  delete [] disjunction_groups_;
-  delete [] pending_events_;
-}
-
-void
-ACE_ES_Consumer_Correlation::disconnect_push_supplier (CORBA::Environment &)
-{
-  connected_ = 0;
-}
-
-int
-ACE_ES_Consumer_Correlation::allocate_correlation_resources (ACE_ES_Dependency_Iterator &iter)
-{
-  n_conjunction_groups_ = iter.n_conjunctions ();
-  if (n_conjunction_groups_ > 0)
-    {
-      conjunction_groups_ = new ACE_ES_Conjunction_Group[n_conjunction_groups_];
-      if (conjunction_groups_ == 0)
-	ACE_ERROR_RETURN ((LM_ERROR, "%p.\n", "ACE_ES_Consumer_Correlation::connected"), -1);
-      for (int n=0; n < n_conjunction_groups_; n++)
-	conjunction_groups_[n].set_correlation_module (correlation_module_);
-    }
-
-  n_disjunction_groups_ = iter.n_disjunctions ();
-  if (n_disjunction_groups_ > 0)
-    {
-      disjunction_groups_ = new ACE_ES_Disjunction_Group[n_disjunction_groups_];
-      if (disjunction_groups_ == 0)
-	ACE_ERROR_RETURN ((LM_ERROR, "%p.\n", "ACE_ES_Consumer_Correlation::connected"), -1);
-      for (int n=0; n < n_disjunction_groups_; n++)
-	disjunction_groups_[n].set_correlation_module (correlation_module_);
-    }
-
-  n_consumer_reps_ = iter.n_events ();
-  if (n_consumer_reps_ > 0)
-    {
-      // This allocates more than is needed if there are repeats:
-      // (A+B)|(B+C).  We allocate these individually so that they can
-      // be deleted individually.
-
-      typedef ACE_ES_Consumer_Rep *reparray;
-      consumer_reps_ = new reparray[n_consumer_reps_];
-
-      for (int cr = 0; cr < n_consumer_reps_; cr++)
-	{
-	  consumer_reps_[cr] = new ACE_ES_Consumer_Rep;
-	  if (consumer_reps_[cr] == 0)
-	    ACE_ERROR_RETURN ((LM_ERROR, "%p.\n", "ACE_ES_Consumer_Correlation::connected"), -1);
-	}
-    }
-
-  n_timer_reps_ = iter.n_timeouts ();
-  if (n_timer_reps_ > 0)
-    {
-      timer_reps_ = new ACE_ES_Consumer_Rep_Timeout[n_timer_reps_];
-      if (timer_reps_ == 0)
-	ACE_ERROR_RETURN ((LM_ERROR, "%p.\n", "ACE_ES_Consumer_Correlation::connected"), -1);
-    }
-
-  // This allocates more than is needed.
-  pending_events_ = new Event_Set[n_consumer_reps_ + n_timer_reps_];
-  if (pending_events_ == 0)
-    ACE_ERROR_RETURN ((LM_ERROR, "%p.\n", "ACE_ES_Consumer_Correlation::connected"), -1);
-
-  return 0;
-}
-
-// We don't need synchronization until after we've been connected and
-// subscribed to events.
-int
-ACE_ES_Consumer_Correlation::connected (ACE_Push_Consumer_Proxy *consumer,
-					ACE_ES_Correlation_Module *correlation_module)
-{
-  correlation_module_ = correlation_module;
-  consumer_ = consumer;
-
-  //  for (CORBA_Types::ULong index=0; index < consumer->qos ().dependencies_.length (); index++)
-  //    consumer->qos ().dependencies_[index].event_.dump ();
-
-  ACE_ES_Dependency_Iterator iter (consumer->qos ().dependencies);
-  iter.parse ();
-  if (this->allocate_correlation_resources (iter) == -1)
-    return -1;
-
-
-  int cgroup_index = -1;
-  int dgroup_index = -1;
-  int crep_index = 0;
-  int trep_index = 0;
-  RtecEventComm::EventType group_type = 0;
-
-  while (iter.advance_dependency () == 0)
-    {
-      // Keep track of how many conjunction and disjunction groups are
-      // registered.  Update the index pointers so that the helper
-      // functions can update the appropriate group objects.
-      switch ((*iter).event_.type_)
-	{
-	case ACE_ES_CONJUNCTION_DESIGNATOR:
-	  cgroup_index++;
-	  ACE_ASSERT (cgroup_index < n_conjunction_groups_);
-	  group_type = ACE_ES_CONJUNCTION_DESIGNATOR;
-	  continue;
-
-	case ACE_ES_DISJUNCTION_DESIGNATOR:
-	  dgroup_index++;
-	  ACE_ASSERT (dgroup_index < n_disjunction_groups_);
-	  group_type = ACE_ES_DISJUNCTION_DESIGNATOR;
-	  continue;
-
-	case ACE_ES_GLOBAL_DESIGNATOR:
-	  group_type = ACE_ES_GLOBAL_DESIGNATOR;
-	  continue;
-
-	  // These Delegate to the appropriate registration method.
-#if 0
-	  // @@ TODO rt_info_ is a handle_t now, does checking against
-	  // 0  still make sense?
-	  // Check for a null rt_info.
-	  if ((*iter).rt_info_ == 0)
-	    {
-	      ACE_ERROR ((LM_ERROR, "Found a ConsumerQOS::dependencies[].rt_info_ == 0.\n"));
-	      continue;
-	    }
-#endif /* 0 */
-
-	case ACE_ES_EVENT_TIMEOUT:
-	  // For backwards compatibility.
-	case ACE_ES_EVENT_DEADLINE_TIMEOUT:
-	  if (this->register_deadline_timeout (*iter,
-					       group_type,
-					       cgroup_index,
-					       dgroup_index,
-					       trep_index) == -1)
-	    return -1;
-	  break;
-
-	case ACE_ES_EVENT_INTERVAL_TIMEOUT:
-	  if (this->register_interval_timeout (*iter,
-					       group_type,
-					       cgroup_index,
-					       dgroup_index,
-					       trep_index) == -1)
-	    return -1;
-	  break;
-
-	case ACE_ES_EVENT_ACT:
-	  // Store the ACT in the current conjunction or disjunction
-	  // group.
-	  switch (group_type)
-	    {
-	    case ACE_ES_CONJUNCTION_DESIGNATOR:
-	      conjunction_groups_[cgroup_index].set_act ((*iter).event_);
-	      break;
-	    case ACE_ES_DISJUNCTION_DESIGNATOR:
-	      disjunction_groups_[cgroup_index].set_act ((*iter).event_);
-	      break;
-	    case ACE_ES_GLOBAL_DESIGNATOR:
-	    default:
-	      ACE_ERROR ((LM_ERROR, "Warning: ACTs not implemented for Global.\n"));
-	    }
-	  break;
-
-	default:
-	  // Non-timer event subscription.
-	  if (this->register_event (*iter, 
-				    group_type,
-				    cgroup_index,
-				    dgroup_index,
-				    crep_index) == -1)
-	    return -1;
-	  break;
-	}
-    }
-
-  // We may not use all of the consumer reps if there are repeats:
-  // (A+B)|(B+C).  Must update n_consumer_reps_ so we don't try to
-  // unsubscribe a blank rep during disconnect.
-  if (crep_index < n_consumer_reps_)
-    n_consumer_reps_ = crep_index;
-
-  return 0;
-}
-
-int
-ACE_ES_Consumer_Correlation::register_deadline_timeout (RtecEventChannelAdmin::Dependency &dependency,
-							RtecEventComm::EventType group_type,
-							int cgindex,
-							int dgindex,
-							int &trep_index)
-{
-  // new_timeout will be returned as an ACT.  When executed, it will
-  // forward *iter.event_ to the consumer.
-  ACE_ES_Consumer_Rep_Timeout *new_timeout = &timer_reps_[trep_index++];
-  new_timeout->init (this, dependency);
-  new_timeout->correlation_type (ACE_ES_Consumer_Rep::DEADLINE_TIMEOUT);
-  // Deadline timers do not need type ids.
-
-  switch (group_type)
-    {
-    case ACE_ES_CONJUNCTION_DESIGNATOR:
-      // Reps keep pointers back to the groups that they're deadlines for.
-      new_timeout->add_disjunction_group (conjunction_groups_[cgindex]);
-      // Groups keep references to the deadline timers for rescheduling.
-      if (conjunction_groups_[cgindex].set_deadline_timeout (new_timeout) == -1)
-	return -1;
-      break;
-
-    case ACE_ES_DISJUNCTION_DESIGNATOR:
-      new_timeout->add_disjunction_group (disjunction_groups_[dgindex]);
-      if (disjunction_groups_[dgindex].set_deadline_timeout (new_timeout) == -1)
-	return -1;
-      break;
-
-    case ACE_ES_GLOBAL_DESIGNATOR:
-      ACE_ERROR_RETURN ((LM_ERROR, "No global deadline timeouts, yet!\n"), -1);
-    }
-
-  return 0;
-}
-
-int
-ACE_ES_Consumer_Correlation::register_interval_timeout (RtecEventChannelAdmin::Dependency &dependency,
-							RtecEventComm::EventType group_type,
-							int cgindex,
-							int /* dgindex */,
-							int &trep_index)
-{
-  // new_timeout will be returned as an ACT.  When executed, it will
-  // forward *iter.event_ to the consumer.
-  ACE_ES_Consumer_Rep_Timeout *new_timeout = &timer_reps_[trep_index++];
-  new_timeout->init (this, dependency);
-  new_timeout->type_id (this->new_type_id ());
-
-  switch (group_type)
-    {
-    case ACE_ES_CONJUNCTION_DESIGNATOR:
-      // If it's a conjunction, then we need to perform correlations
-      // on the timeout.
-      new_timeout->correlation_type (ACE_ES_Consumer_Rep::CORRELATE);
-      conjunction_groups_[cgindex].add_type (new_timeout->type_id ());
-      break;
-
-    case ACE_ES_DISJUNCTION_DESIGNATOR:
-    case ACE_ES_GLOBAL_DESIGNATOR:
-      new_timeout->correlation_type (ACE_ES_Consumer_Rep::NO_CORRELATION);
-      break;
-    }
-
-  // Schedule the timeout.
-  if (correlation_module_->schedule_timeout (new_timeout) == -1)
-    return -1;
-  else
-    return 0;
-}
-
-// Search <creps> for a rep matching <dependency>.  If one is not
-// found, allocate one.  All returned reps should have the appropriate
-// type_id set.
-ACE_ES_Consumer_Rep *
-ACE_ES_Consumer_Correlation::get_consumer_rep (RtecEventChannelAdmin::Dependency &dependency,
-					       int &crep_index)
-{
-  ACE_ES_Consumer_Rep *rep = 0;
-  
-  // Step through all existing consumer reps.
-  for (int x=0; x < crep_index; x++)
-    {
-      // If <dependency> matches any previously subscribed consumer
-      // reps, we'll reuse it.
-      if (consumer_reps_[x]->dependency ()->event_.type_ == dependency.event_.type_
-#if defined(ACE_ES_LACKS_ORB)
-	  && consumer_reps_[x]->dependency ()->event_.source_ ==
-	  dependency.event_.source_
-#endif /* ACE_ES_LACKS_ORB */
-)
-	{
-	  rep = consumer_reps_[x];
-	  break;
-	}
-    }
-
-  // Check if we didn't find it.
-  if (rep == 0)
-    {
-      if (crep_index >= n_consumer_reps_)
-	ACE_ERROR_RETURN ((LM_ERROR, "Too many event registrations.\n"), 0);
-      // Allocate a new rep and set its type id.
-      rep = consumer_reps_[crep_index];
-      crep_index++;
-      rep->init (this, dependency);
-      rep->type_id (this->new_type_id ());
-    }
-
-  return rep;
-}
-
-int
-ACE_ES_Consumer_Correlation::new_type_id (void)
-{
-  int type_id = type_id_index_;
-  if (++type_id_index_ >= ACE_ES_MAX_SUBSCRIPTIONS)
-    ACE_ERROR_RETURN ((LM_ERROR, "ACE_ES_MAX_SUBSCRIPTIONS exceeded.\n"),0);
-  else
-    return type_id;
-}
-
-int
-ACE_ES_Consumer_Correlation::register_event (RtecEventChannelAdmin::Dependency &dependency,
-					     RtecEventComm::EventType group_type,
-					     int cgindex,
-					     int dgindex,
-					     int &crep_index)
-{
-  // These are stored in the subscription module data structures.
-  ACE_ES_Consumer_Rep *consumer_rep = this->get_consumer_rep (dependency, crep_index);
-
-  if (consumer_rep == 0)
-    ACE_ERROR_RETURN ((LM_ERROR, "%p.\n",
-		       "ACE_ES_Consumer_Correlation::register_event"), -1);
-
-  // If we're forwarding, then subscriptions should affect the
-  // forwarding rt_info, not the consumer's rt_info.  Ok, this might
-  // be dangerous since the consumer rep can be shared between many
-  // correlation groups.
-  if (forwarding_rt_info_ != 0)
-    consumer_rep->dependency ()->rt_info = forwarding_rt_info_;
-
-  switch (group_type)
-    {
-    case ACE_ES_CONJUNCTION_DESIGNATOR:
-      // If it's a conjunction, then we need to perform correlations
-      // on the object.  Otherwise, NO_CORRELATION is set by default.
-      consumer_rep->correlation_type (ACE_ES_Consumer_Rep::CORRELATE);
-      conjunction_groups_[cgindex].add_type (consumer_rep->type_id ());
-      break;
-
-    case ACE_ES_DISJUNCTION_DESIGNATOR:
-      consumer_rep->add_disjunction_group (disjunction_groups_[dgindex]);
-      break;
-
-    case ACE_ES_GLOBAL_DESIGNATOR:
-      ACE_ERROR ((LM_ERROR, "ACE_ES_Consumer_Correlation::register_event: "
-		  "ACE_ES_GLOBAL_DESIGNATOR not implemented.\n"));
-      break;
-    }
-
-  // Subscribe the consumer_rep to the suppliers.
-  if (correlation_module_->subscribe (consumer_rep) == -1)
-    return -1;
-  else
-    return 0;
-}
-
-int
-ACE_ES_Consumer_Correlation::disconnecting (void)
-{
-  // If we were forwarding events, disconnect as a supplier.
-  if (connected_)
-    {
-      CORBA::Environment env;
-      channel_->disconnect_push_consumer (env);
-      if (env.exception () != 0)
-	ACE_ERROR ((LM_ERROR, "ACE_ES_Consumer_Correlation::disconnecting failed.\n"));
-    }  
-
-  for (int x=0; x < n_timer_reps_; x++)
-    correlation_module_->cancel_timeout (&timer_reps_[x]);
-  
-  for (int y=0; y < n_consumer_reps_; y++)
-    if (consumer_reps_[y] != 0)
-      consumer_reps_[y]->disconnect ();
-
-  return 0;
-}
-
-ACE_ES_Dispatch_Request *
-ACE_ES_Consumer_Correlation::push (ACE_ES_Consumer_Rep *cr,
-				   ACE_ES_Event_Container *event)
-{
-  ACE_TIMEPROBE ("  ACE_ES_Consumer_Correlation::push, enter");
-
-  // Check if this event needs any correlating, or if it should just
-  // be forwarded real fast-like.
-  switch (cr->correlation_type ())
-    {
-    case ACE_ES_Consumer_Rep::NO_CORRELATION:
-      {
-	// Calls reschedule on all disjunction groups it belongs to.
-	cr->reschedule_deadlines ();
-
-	ACE_TIMEPROBE ("  ACE_ES_Consumer_Correlation::push, determine NO CORRELATION");
-	ACE_ES_Dispatch_Request *request = 
-	  new ACE_ES_Dispatch_Request (consumer_, event, cr->dependency ()->rt_info);
-	ACE_TIMEPROBE ("  ACE_ES_Consumer_Correlation::push, NO_CORR: alloc");
-	
-	if (request == 0)
-	  ACE_ERROR_RETURN ((LM_ERROR, "%p.\n",
-			     "ACE_ES_Consumer_Correlation::push"), 0);
-
-	return request;
-      }
-
-    case ACE_ES_Consumer_Rep::CORRELATE:
-      return this->correlate (cr, event);
-
-    case ACE_ES_Consumer_Rep::DEADLINE_TIMEOUT:
-      {
-	ACE_ES_Dispatch_Request *request = 
-	  new ACE_ES_Dispatch_Request (consumer_, cr->dependency ()->rt_info);
-
-	if (request == 0)
-	  ACE_ERROR_RETURN ((LM_ERROR, "%p.\n",
-			     "ACE_ES_Consumer_Correlation::push"), 0);
-
-	// Add the deadline timeout to the outbox.
-	request->event_set () += event;
-
-	// Add any pending events to the outbox.
-	cr->top_group ()->add_events (&(request->event_set ()),
-				      pending_events_, pending_flags_);
-	
-	return request;
-      }
-
-    default:
-      ACE_ERROR_RETURN ((LM_ERROR, "ACE_ES_Consumer_Correlation::push:"
-			 " unknown correlation type\n"), 0);
-    }
-}
-
-// @@ If we're just event forwarding, then no pending_events_ need to
-// be kept!  I'll add this optimization later.
-ACE_ES_Dispatch_Request *
-ACE_ES_Consumer_Correlation::correlate (ACE_ES_Consumer_Rep *cr,
-					ACE_ES_Event_Container *event)
-{
-   // If the consumer has specified correlation criteria, then we must
-   // first acquire the mutex.
-   ACE_ES_GUARD ace_mon (lock_);
-   if (ace_mon.locked () == 0)
-     ACE_ERROR_RETURN ((LM_ERROR, "%p.\n",
-			"ACE_ES_Consumer_Correlation::push"), 0);
-
-   // Add the new event to the pending events.
-   pending_events_[cr->type_id ()] += event;
-
-   // Set the bit corresponding to the arrived event.
-   // This should be pending_flags_->event_arrived (index);
-   ACE_SET_BITS (pending_flags_, ACE_INT2BIT[cr->type_id ()]);
-
-   ACE_ES_Dispatch_Request *request = 0;
-   Event_Set *outbox = 0;
-   // Since add_events changes pending_flags_, we need to keep this
-   // for all iterations through the conjunction groups.
-   u_long freeze_pending_flags = pending_flags_;
-
-   for (int x=0; x < n_conjunction_groups_; x++)
-     {
-       if (conjunction_groups_[x].should_forward (freeze_pending_flags))
-	 {
-	   // If there is a deadline timer for this conjunction group,
-	   // this will reschedule them.
-	   conjunction_groups_[x].reschedule_deadline ();
-
-	   // First time in, allocate the new dispatch request.
-	   if (request == 0)
-	     {
-	       request =
-		 new ACE_ES_Dispatch_Request (consumer_,
-					      cr->dependency ()->rt_info);
-	       if (request == 0)
-		 ACE_ERROR_RETURN ((LM_ERROR, "%p.\n",
-				    "ACE_ES_Consumer_Correlation::correlate"), 0);
-	       outbox = &(request->event_set ());
-	     }
-
-	   // Add each of the pending events for this correlation to
-	   // the outgoing dispatch request.  If outbox == 0, then
-	   // this will just clear any pending events.
-	   conjunction_groups_[x].add_events (outbox,
-					      pending_events_,
-					      pending_flags_);
-	 }
-     }
-
-   return request;
-}
-
-
-// ************************************************************
-
-ACE_ES_Consumer_Rep::~ACE_ES_Consumer_Rep (void)
-{
-}
-
-void
-ACE_ES_Consumer_Rep::execute (void)
-{
-  ACE_ERROR ((LM_ERROR, "Warning!  ACE_ES_Consumer_Rep::execute called.\n"));
-}
-
-// ************************************************************
-
-void
-ACE_ES_Consumer_Rep_Timeout::execute (void)
-{
-  if (this->receiving_events ())
-    {
-      CORBA::Environment __env;
-      ACE_Time_Value tv = ACE_OS::gettimeofday ();
-      timeout_event_->time_ = tv.sec () * 10000000 + tv.usec () * 10;
-      correlation_->correlation_module_->push (this, timeout_event_, __env);
-      if (__env.exception () != 0)
-	ACE_ERROR ((LM_ERROR, "ACE_ES_Consumer_Rep_Timeout::execute: unexpected exception.\n"));
-    }
-}
-
-// ************************************************************
-
-ACE_ES_Subscription_Module::ACE_ES_Subscription_Module (ACE_EventChannel *channel)
-  : channel_ (channel),
-    up_ (0),
-    down_ (0)
-{
-}
-
-void
-ACE_ES_Subscription_Module::open (ACE_ES_Correlation_Module *up,
-				  ACE_ES_Supplier_Module *down)
-{
-  // Brilliant.
-  up_ = up;
-  down_ = down;
-}
-
-ACE_ES_Subscription_Module::~ACE_ES_Subscription_Module (void)
-{
-}
-
-// When a supplier connects, we step through each of its
-// publications.  For each event type published, we allocate a set in
-// the suppliers type collection.  Then we build a subscribers list
-// starting with any consumers having a type-based subscription in the
-// global type collection.
-void
-ACE_ES_Subscription_Module::connected (ACE_Push_Supplier_Proxy *supplier,
-				       CORBA::Environment &_env)
-{
-  RtecEventComm::EventSourceID sid = 0;
-  // We will record the source_id for later usage. 
- {
-    ACE_ES_WGUARD ace_mon (lock_);
-    if (ace_mon.locked () == 0)
-      ACE_THROW (SYNC_ERROR);
-    // @@ TODO: Orbix parameters
-    // (0, CORBA::COMPLETED_NO, "ACE_ES_Subscription_Module::connected"));
-    
-    if (all_suppliers_.insert (supplier) == -1)
-      ACE_ERROR ((LM_ERROR, "ACE_ES_Subscription_Module insert failed.\n"));
-
-    // For every type that this supplier generates, bind a new
-    // Type_Subscribers to the type in the supplier proxy's type
-    // collection.
-    RtecEventChannelAdmin::PublicationSet &publications = supplier->qos ().publications_;
-
-    sid = publications[0].event_.source_; 
-    for (CORBA::ULong index=0; index < publications.length (); index++)
-      {
-	// Check to make sure an RT_Info was specified.
-#if 0
-	// @@ TODO: We should check if rt_info is a valid handle_t.
-	if (publications[index].dependency_info_.rt_info.value() == 0)
-	  {
-	    ACE_ERROR ((LM_ERROR, "Found a SupplierQOS::dependency_info_.rt_info_ == 0\n"));
-	    continue;
-	  }
-#endif 
-
-	RtecEventComm::EventType &event_type = publications[index].event_.type_;
-	
-	// Check to make sure a type was specified.
-	if (event_type == ACE_ES_EVENT_ANY)
-	  {
-	    ACE_ERROR ((LM_ERROR, "ACE_ES_Subscription_Module::connected: "
-			"source is publishing ACE_ES_EVENT_ANY.\n"));
-	    continue;
-	  }
-
-	// Make a new set for the proxy.  Include the dependency
-	// info describing the RT_Method that generates this event.
-	// This object will hold all the consumers that subscribe to
-	// this publication.
-	ACE_ES_Subscription_Info::Type_Subscribers *new_subscribers =
-	  new ACE_ES_Subscription_Info::Type_Subscribers (&(publications[index].dependency_info_));
-
-	if (new_subscribers == 0)
-	  {
-	    ACE_ERROR ((LM_ERROR, "%p.\n", "ACE_ES_Subscription_Module::connected"));
-	    return;
-	  }
-	  
-	// Check the global type collection for consumers that register
-	// before suppliers.
-	ACE_ES_Subscription_Info::Type_Subscribers *existing_subscribers;
-	if (type_subscribers_.find (event_type, existing_subscribers) == 0)
-	  {
-	    // Iterate through existing subscribers.
-	    ACE_ES_Subscription_Info::Subscriber_Set_Iterator iter (existing_subscribers->consumers_);
-
-	    for (ACE_ES_Consumer_Rep **proxy = 0;
-		 iter.next (proxy) != 0;
-		 iter.advance ())
-	      {
-		// Each existing subscriber will get appended to the
-		// new subscribers list.  Dependencies are updated.
-
-		// @@ TODO: Handle exceptions.
-		ACE_Scheduler_Factory::server()->add_dependency
-		  ((*proxy)->dependency()->rt_info,
-		   new_subscribers->dependency_info_->rt_info,
-		   new_subscribers->dependency_info_->number_of_calls,
-		   _env);
-		ACE_DEBUG ((LM_ERROR, "%p - add_dependency (%d,%d,%d)\n",
-			    "ACE_ES_Priority_Timer::schedule_timer",
-			    (*proxy)->dependency()->rt_info,
-			    new_subscribers->dependency_info_->rt_info,
-			    new_subscribers->dependency_info_->number_of_calls));
-		if (_env.exception () != 0)
-		  return;
-		// @@ TODO use the ACE_TRY macros.
-
-		if (new_subscribers->consumers_.insert (*proxy) == -1)
-		  {
-		    ACE_ERROR ((LM_ERROR,
-				"%p: add_dependency/insert failed.\n",
-				"ACE_ES_Subscription_Module::connected"));
-		    continue;
-		  }
-	      }
-	  }
-
-	// Put the new subscribers for this event type in the supplier
-	// proxy's type map.
-	if (supplier->subscription_info ().type_subscribers_.
-	    bind (event_type, new_subscribers) != 0)
-	  {
-	    // This may occur with a double bind, I think.
-	    ACE_ERROR ((LM_ERROR, "%p can't initialize type.\n",
-			"ACE_ES_Subscription_Module::connected"));
-	    delete new_subscribers;
-	    continue;
-	  }
-      }
-  } // release lock
-
-  // Reregister any consumers that tried to subscribe before this
-  // supplier connected.
-  // NOTE: We used to call back the supplier here (using
-  // supplier->source_id()), this is ineffective and leads to all kind
-  // of dead-locks (the supplier is blocked and waiting for us).
-  // We use the information on the publications to get the source_id.
-  this->reregister_consumers (sid);
-}
-
-// Step through each of the source_subscribers looking for consumers
-// that registered for <source> before <source> connected.
-void
-ACE_ES_Subscription_Module::reregister_consumers (RtecEventComm::EventSourceID source_id)
-{
-  ACE_ES_Subscription_Info::Subscriber_Set *subscribers = 0;
-  if (source_subscribers_.find (source_id, subscribers) == -1)
-    // Not found.
-    return;
-
-  ACE_ES_Subscription_Info::Subscriber_Set_Iterator iter (*subscribers);
-
-  // Try to reregister all consumers.
-  for (ACE_ES_Consumer_Rep **consumer = 0;
-       iter.next (consumer) != 0;
-       iter.advance ())
-    if (this->subscribe (*consumer) == -1)
-      ACE_ERROR ((LM_ERROR, "%p.\n" "ACE_ES_Subscription_Module::reregister_consumers"));
-}
-
-
-void
-ACE_ES_Subscription_Module::disconnecting (ACE_Push_Supplier_Proxy *supplier,
-					   CORBA::Environment &_env)
-{
-  ACE_ES_WGUARD ace_mon (lock_);
-  if (ace_mon.locked () == 0)
-    ACE_THROW (SYNC_ERROR);
-  // @@ TODO: Orbix parameters
-  // (0, CORBA::COMPLETED_NO, "ACE_ES_Subscription_Module::disconnected"));
-    
-  if (all_suppliers_.remove (supplier) == -1)
-    ACE_THROW (SUBSCRIPTION_ERROR);
-  // @@ TODO: Orbix parameters.
-  // (0, CORBA::COMPLETED_NO, "ACE_ES_Subscription_Module remove failed"));
-
-  // Remove all consumers from the supplier's source-based subscription lists.
-  ACE_ES_Subscription_Info::Subscriber_Set_Iterator source_iterator 
-    (supplier->subscription_info ().source_subscribers_);
-
-  for (ACE_ES_Consumer_Rep **consumer;
-       source_iterator.next (consumer) != 0;
-       source_iterator.advance ())
-    (*consumer)->_release ();
-  
-  // Get the subscriber list for each type.
-  ACE_ES_Subscription_Info::Subscriber_Map_Iterator type_map_iterator
-    (supplier->subscription_info ().type_subscribers_);
-
-  for (ACE_ES_Subscription_Info::Subscriber_Map_Entry *entry;
-       type_map_iterator.next (entry) != 0;
-       type_map_iterator.advance ())
-    {
-      // Remove all consumers from the supplier's source-based subscription lists.
-      ACE_ES_Subscription_Info::Subscriber_Set_Iterator type_iterator 
-	(entry->int_id_->consumers_);
-
-      for (ACE_ES_Consumer_Rep **c;
-	   type_iterator.next (c) != 0;
-	   type_iterator.advance ())
-	(*c)->_release ();
-    }
-}
-
-int
-ACE_ES_Subscription_Module::subscribe_all (ACE_ES_Consumer_Rep *)
-{
-  ACE_ERROR_RETURN ((LM_ERROR, "Consumer tried to register for all"
-		     "events!  This is not implemented.\n"), -1);
-}
-
-int
-ACE_ES_Subscription_Module::subscribe_source (ACE_ES_Consumer_Rep *consumer, 
-					      RtecEventComm::EventSourceID source)
-{
-  // Step through all Supplier Proxies looking for a match to
-  // -supplier-.  Add the -consumer- to the correct supplier proxy.
-  Supplier_Iterator iter (all_suppliers_);
-
-  int success = -1;
-
-  for (ACE_Push_Supplier_Proxy **proxy = 0;
-       iter.next (proxy) != 0;
-       iter.advance ())
-    {
-      // Operator == checks if <proxy> is a proxy for <supplier>.
-      if ((**proxy) == source)
-	{
-	  ACE_ES_WGUARD mon ((*proxy)->subscription_info ().lock_);
-
-	  ACE_ES_Subscription_Info::Subscriber_Set &set =
-	    (*proxy)->subscription_info ().source_subscribers_;
-
-	  // Insert the consumer to the supplier's subscription set for
-	  // the type.
-	  int insert_result = set.insert (consumer);
-	  switch (insert_result)
-	    {
-	    case -1:
-	      // Error.
-	      ACE_ERROR_RETURN ((LM_ERROR, "%p.\n", 
-				 "Subscription Module::subscribe_source"), -1);
-	    case 0:
-	    default:
-	      {
-		// Increment the consumer rep's reference count.
-		consumer->_duplicate ();
-		// Success.
-		// Add each of the supplier's dependency infos to the
-		// consumer's dependency list.
-		ACE_ES_Subscription_Info::Subscriber_Map_Iterator iter2 
-		  ((*proxy)->subscription_info ().type_subscribers_);
-
-		// Delete all type collections.
-		for (ACE_ES_Subscription_Info::Subscriber_Map_Entry *temp = 0;
-		     iter2.next (temp) != 0;
-		     iter2.advance ())
-		  {
-		    ACE_TRY
-		      {
-			ACE_Scheduler_Factory::server()->add_dependency
-			  (consumer->dependency()->rt_info,
-			   temp->int_id_->dependency_info_->rt_info,
-			   temp->int_id_->dependency_info_->number_of_calls,
-			   ACE_TRY_ENV);
-			ACE_DEBUG ((LM_ERROR,
-				    "%p - add_dependency (%d,%d,%d)\n",
-				    "ACE_ES_Priority_Timer::subscribe_source",
-				    consumer->dependency()->rt_info,
-				    temp->int_id_->dependency_info_->rt_info,
-				    temp->int_id_->dependency_info_->number_of_calls));
-		      }
-		    ACE_CATCHANY
-		      {
-			return -1;
-		      }
-		    ACE_ENDTRY;
-		  }
-	      }
-
-	    case 1:
-	      // Already there.
-	      success = 0;
-	      break;
-	    }
-	}
-    }
-
-  // Add the consumer to the global source subscribers list.
-  if (success == -1)
-    return ACE_ES_Subscription_Info::insert_or_allocate (source_subscribers_,
-							 consumer,
-							 source);
-  else
-    return success;
-}
-
-// Step through all Supplier Proxies.  For each proxy, if it generates
-// <type>, add <consumer> to its subscription info.
-int
-ACE_ES_Subscription_Module::subscribe_type (ACE_ES_Consumer_Rep *consumer,
-					    RtecEventComm::EventType type)
-{
-  // First insert <consumer> into the global type collection set
-  // corresponding to <type>.  The type collection will only be used
-  // when suppliers register late.
-  if (ACE_ES_Subscription_Info::insert_or_allocate (type_subscribers_,
-						    consumer, type) == -1)
-    return -1;
-
-  consumer->_duplicate ();
-
-  Supplier_Iterator iter (all_suppliers_);
-
-  for (ACE_Push_Supplier_Proxy **proxy = 0;
-       iter.next (proxy) != 0;
-       iter.advance ())
-    {
-      ACE_ES_WGUARD mon ((*proxy)->subscription_info ().lock_);
-      // Insert the consumer to the supplier's subscription set for
-      // the type.  If the supplier does not publish this type, the
-      // operation will fail.  If this succeeds, dependency_info will
-      // be added to the consumer.
-      RtecScheduler::Dependency_Info *dependency_info;
-      if (ACE_ES_Subscription_Info::insert_or_fail 
-	  ((*proxy)->subscription_info ().type_subscribers_,
-	   consumer, type, dependency_info) == 0)
-	{
-	  consumer->_duplicate ();
-	  // Success.  Add the supplier dependency info to the
-	  // consumer's dependency list.
-	  // @@ TODO handle exceptions.
-	  ACE_TRY
-	    {
-	      ACE_Scheduler_Factory::server()->add_dependency
-		(consumer->dependency ()->rt_info,
-		 dependency_info->rt_info,
-		 dependency_info->number_of_calls,
-		 ACE_TRY_ENV);
-	      ACE_DEBUG ((LM_ERROR, "%p - add_dependency (%d,%d,%d)\n",
-			  "ACE_ES_Priority_Timer::schedule_timer - ",
-			  consumer->dependency ()->rt_info,
-			  dependency_info->rt_info,
-			  dependency_info->number_of_calls));
-	      ACE_CHECK_ENV;
-	    }
-	  ACE_CATCHANY
-	    {
-	      ACE_ERROR ((LM_ERROR, "Subscription_Module::subscribe_type:"
-			  " add_dependency failed.\n"));
-	      return -1;
-	    }
-	  ACE_ENDTRY;
-	}
-    }
-
-  return 0;
-}
-
-int
-ACE_ES_Subscription_Module::subscribe_source_type (ACE_ES_Consumer_Rep *consumer,
-						   RtecEventComm::EventSourceID source,
-						   RtecEventComm::EventType type)
-{
-  // Step through all Supplier Proxies looking for a match to
-  // <supplier>.  Once we find one, find the correct set for the
-  // specified type.  Add the <consumer> to that set.
-  Supplier_Iterator iter (all_suppliers_);
-
-  int success = -1;
-
-  for (ACE_Push_Supplier_Proxy **proxy = 0;
-       iter.next (proxy) != 0;
-       iter.advance ())
-    {
-      ACE_ES_WGUARD mon ((*proxy)->subscription_info ().lock_);
-
-      if ((**proxy) == source)
-	{
-	  // Insert the consumer to the supplier's subscription set for
-	  // the type.
-	  RtecScheduler::Dependency_Info *dependency_info;
-	  int insert_result = ACE_ES_Subscription_Info::insert_or_fail 
-	    ((*proxy)->subscription_info().type_subscribers_,
-	     consumer, type, dependency_info);
-
-	  switch (insert_result)
-	    {
-	    case -1:
-	      // Error.
-	      ACE_ERROR_RETURN ((LM_ERROR, "%p.\n", 
-				 "Subscription Module::subscribe_source_type"), -1);
-	    case 0:
-	    default:
-	      {
-		// Success.
-		// Add the supplier to the consumer's dependency list.
-		// @@ TODO handle exceptions.
-		ACE_TRY
-		  {
-		    ACE_Scheduler_Factory::server()->add_dependency
-		      (consumer->dependency ()->rt_info,
-		       dependency_info->rt_info,
-		       dependency_info->number_of_calls,
-		       ACE_TRY_ENV);
-		    ACE_DEBUG ((LM_ERROR, "%p - add_dependency (%d,%d,%d)\n",
-				"ACE_Subscription_Module::subscribe_source_type - ",
-				consumer->dependency ()->rt_info,
-				dependency_info->rt_info,
-				dependency_info->number_of_calls));
-		    ACE_CHECK_ENV;
-		  }
-		ACE_CATCHANY
-		  {
-		    ACE_ERROR_RETURN ((LM_ERROR, "Subscription_Module::subscribe_source_type:"
-				       " add_dependency failed.\n"),
-				      -1);
-		  }
-		ACE_ENDTRY;
-		consumer->_duplicate ();
-	      }
-	      /* FALLTHROUGH */
-	    case 1:
-	      success = 0;
-
-	      // Already there.
-	      break;
-	    }
-
-	}
-    }
-
-  if (success == -1)
-    // If we failed to find a source, insert this consumer in the
-    // global source subscriber list.
-    {
-      if (ACE_ES_Subscription_Info::insert_or_allocate (source_subscribers_,
-							   consumer,
-							   source) == 0)
-	{
-	  consumer->_duplicate ();
-	  return 0;
-	}
-      else
-	return -1;
-    }
-  else
-    return success;
-}
-
-// <consumer> contains information for one type of subscription.
-// Delegate to the appropriate method for subscription.
-int
-ACE_ES_Subscription_Module::subscribe (ACE_ES_Consumer_Rep *consumer)
-{
-  // We could have finer granularity by putting RGUARDs in some of the
-  // subscribe methods.
-  ACE_ES_WGUARD ace_mon (lock_);
-  if (ace_mon.locked () == 0)
-    ACE_ERROR_RETURN ((LM_ERROR, "%p.\n",
-		       "ACE_ES_Subscription_Module::subscribe"), -1);
-
-  int result = 0;
-  RtecEventComm::Event &event = consumer->dependency ()->event_;
-
-  if (event.source_ == 0)
-    // Not source-based subscription.
-    {
-      if (event.type_ == ACE_ES_EVENT_ANY)
-	result = this->subscribe_all (consumer);
-      else
-	result = this->subscribe_type (consumer, event.type_);
-    }
-  else
-    // Source-based subscription.
-    {
-      if (event.type_ == ACE_ES_EVENT_ANY)
-	result = this->subscribe_source (consumer, event.source_);
-      else
-	result = this->subscribe_source_type (consumer, event.source_, event.type_);
-    }
-
-  return result;
-}
-
-int
-ACE_ES_Subscription_Module::unsubscribe (ACE_ES_Consumer_Rep *consumer)
-{
-  // We could have finer granularity by putting RGUARDs in some of the
-  // unsubscribe methods.
-  ACE_ES_WGUARD ace_mon (lock_);
-  if (ace_mon.locked () == 0)
-    ACE_ERROR_RETURN ((LM_ERROR, "%p.\n",
-		       "ACE_ES_Subscription_Module::unsubscribe"), -1);
-
-  RtecEventComm::Event &event = consumer->dependency ()->event_;
-
-  if (event.type_ != ACE_ES_EVENT_ANY)
-    {
-      // Remove the consumer from the global type-based subscription list.
-      if (ACE_ES_Subscription_Info::remove (type_subscribers_,
-					    consumer, event.type_) == 0)
-	consumer->_release ();
-    }
-  else
-    // Remove the consumer from the global source-based subscription list.
-    if (ACE_ES_Subscription_Info::remove (source_subscribers_,
-					  consumer, event.source_) == 0)
-      consumer->_release ();
-
-  return 0;
-
-  /*
-
-    This old code manually removed the consumer from the subscription
-    lists.  Now we do lazy removal.
-
-  int result = 0;
-
-  if (CORBA::is_nil (event.source_))
-    {
-      if (event.type_ == ACE_ES_EVENT_ANY)
-	result = this->unsubscribe_all (consumer);
-      else
-	result = this->unsubscribe_type (consumer, event.type_);
-    }
-  else
-    {
-      if (event.type_ == ACE_ES_EVENT_ANY)
-	result = this->unsubscribe_source (consumer, event.source_);
-      else
-	result = this->unsubscribe_source_type (consumer, event.source_, event.type_);
-    }
-  return result;
-    */
-}
-
-int
-ACE_ES_Subscription_Module::unsubscribe_all (ACE_ES_Consumer_Rep *)
-{
-  return 0;
-}
-
-int
-ACE_ES_Subscription_Module::unsubscribe_type (ACE_ES_Consumer_Rep *consumer,
-					      RtecEventComm::EventType type)
-{
-  // Step through all Supplier Proxies trying to remove the
-  // consumer-type pair.  ACE_ES_Subscription_Info::remove will fail
-  // if the supplier does not generate <type>, but that's ok.
-  Supplier_Iterator iter (all_suppliers_);
-
-  for (ACE_Push_Supplier_Proxy **proxy = 0;
-       iter.next (proxy) != 0;
-       iter.advance ())
-    {
-      ACE_ES_WGUARD mon ((*proxy)->subscription_info ().lock_);
-
-      // This remove will be harmless if the supplier does not
-      // generate <type>.
-      ACE_ES_Subscription_Info::remove ((*proxy)->subscription_info ().type_subscribers_,
-					consumer, type);
-    }
-
-  return 0;
-}
-
-int
-ACE_ES_Subscription_Module::unsubscribe_source (ACE_ES_Consumer_Rep *consumer,
-						RtecEventComm::EventSourceID source)
-{
-  Supplier_Iterator iter (all_suppliers_);
-
-  for (ACE_Push_Supplier_Proxy **proxy = 0;
-       iter.next (proxy) != 0;
-       iter.advance ())
-    {
-      ACE_ES_WGUARD mon ((*proxy)->subscription_info ().lock_);
-
-      if ((**proxy) == source)
-	{
-	  ACE_ES_Subscription_Info::Subscriber_Set &set =
-	    (*proxy)->subscription_info ().source_subscribers_;
-	  if (set.remove (consumer) == -1)
-	    ACE_ERROR_RETURN ((LM_ERROR, "%p.\n",
-			       "Subscription Module::unsubscribe_source"), -1);
-	}
-    }
-
-  return 0;
-}
-
-int
-ACE_ES_Subscription_Module::unsubscribe_source_type (ACE_ES_Consumer_Rep *consumer,
-						     RtecEventComm::EventSourceID source,
-						     RtecEventComm::EventType type)
-
-{
-  Supplier_Iterator iter (all_suppliers_);
-
-  // Step through all supplier proxies looking for a match to the
-  // consumer's event.source_.  This is the same as unsubscribe_type,
-  // only we can check the source first.
-  for (ACE_Push_Supplier_Proxy **proxy = 0;
-       iter.next (proxy) != 0;
-       iter.advance ())
-    // If the proxy matches the source id we're looking for, try to
-    // remove <consumer> from the proxy's <event.type_> set.
-    if ((**proxy) == source)
-      {
-	ACE_ES_WGUARD mon ((*proxy)->subscription_info ().lock_);
-
-	// Continue in spite of errors.
-	ACE_ES_Subscription_Info::remove ((*proxy)->subscription_info ().type_subscribers_,
-					  consumer, type);
-      }
-
-  return 0;
-}
-
-void
-ACE_ES_Subscription_Module::push (ACE_Push_Supplier_Proxy *source,
-				  ACE_ES_Event_Container *event,
-				  CORBA::Environment &)
-{
-  ACE_TIMEPROBE ("deliver to Subscription Module");
-  // These are all inline function calls.
-  if (this->push_source (source, event) == -1)
-    return;
-	
-  ACE_TIMEPROBE ("  push_source_type");
-
-  if (this->push_source_type (source, event) == -1)
-    return;
-}
-
-void
-ACE_ES_Subscription_Module::shutdown (void)
-{
-  ACE_ES_WGUARD ace_mon (lock_);
-  if (ace_mon.locked () == 0)
-    ACE_ERROR ((LM_ERROR, "%p.\n",
-		"ACE_ES_Subscription_Module::unsubscribe"));
-
-  // Remove all type_subscribers_ and source_subscribers_.
-
-  ACE_ES_Subscription_Info::Subscriber_Map_Iterator type_iter (type_subscribers_);
-  for (ACE_ES_Subscription_Info::Subscriber_Map_Entry *entry;
-       type_iter.next (entry) != 0;
-       type_iter.advance ())
-    {
-      ACE_ES_Subscription_Info::Subscriber_Set_Iterator ts_iter (entry->int_id_->consumers_);
-
-      for (ACE_ES_Consumer_Rep **consumer = 0;
-	   ts_iter.next (consumer) != 0;
-	   ts_iter.advance ())
-	(*consumer)->_release ();
-
-      delete entry->int_id_;
-    }
-
-  ACE_ES_Subscription_Info::SourceID_Map_Iterator source_iter (source_subscribers_);
-
-  for (ACE_ES_Subscription_Info::SourceID_Map_Entry *entry2;
-       source_iter.next (entry2) != 0;
-       source_iter.advance ())
-    {
-      ACE_ES_Subscription_Info::Subscriber_Set_Iterator ss_iter (*entry2->int_id_);
-
-      for (ACE_ES_Consumer_Rep **consumer = 0;
-	   ss_iter.next (consumer) != 0;
-	   ss_iter.advance ())
-	(*consumer)->_release ();
-
-      delete entry2->int_id_;
-    }
-
-  // We don't need to do anything to all_suppliers_ since the supplier
-  // module should have disconnected all suppliers.  To be more
-  // independent from the supplier module, this method should iterate
-  // through all suppliers and call this->disconnecting.
-  up_->shutdown ();
-}
-
-// ************************************************************
-
-ACE_ES_Supplier_Module::ACE_ES_Supplier_Module (ACE_EventChannel *channel) :
-  all_suppliers_ (),
-  lock_ (),
-  me_ (this),
-  up_ (0),
-  channel_ (channel)
-{
-}
-
-void
-ACE_ES_Supplier_Module::open (ACE_ES_Subscription_Module *up)
-{
-  // There is the theory of the Mobius, a twist, in the fabric of
-  // space, where time becomes a loop, where time becomes a loop.
-  up_ = up;
-}
-
-void
-ACE_ES_Supplier_Module::connected (ACE_Push_Supplier_Proxy *supplier,
-				   CORBA::Environment &_env)
-{
-  channel_->report_connect (ACE_EventChannel::SUPPLIER);
-  up_->connected (supplier, _env);
-}
-
-void
-ACE_ES_Supplier_Module::disconnecting (ACE_Push_Supplier_Proxy *supplier,
-				       CORBA::Environment &_env)
-{
-  ACE_ES_GUARD ace_mon (lock_);
-  if (ace_mon.locked () == 0)
-    ACE_THROW (SYNC_ERROR);
-  // @@ TODO Orbix parameters:
-  // (0, CORBA::COMPLETED_NO, "ACE_ES_Supplier_Module::disconnected"));
-    
-  if (all_suppliers_.remove (supplier) == -1)
-    ACE_THROW (SUBSCRIPTION_ERROR);
-  // @@ TODO Orbix parameters:
-  // (0, CORBA::COMPLETED_NO, "ACE_ES_Supplier_Module remove failed"));
-
-  up_->disconnecting (supplier, _env);
-
-  if (all_suppliers_.size () <= 0)
-    {
-      ACE_DEBUG ((LM_DEBUG, "(%t) No more suppliers connected.\n"));
-      channel_->report_disconnect (ACE_EventChannel::SUPPLIER);
-    }
-
-  CORBA::release (supplier);
-}
-
-void
-ACE_ES_Supplier_Module::shutdown (void)
-{
-  Suppliers copy;
-
-  {
-    ACE_ES_GUARD ace_mon (lock_);
-    if (ace_mon.locked () == 0)
-      return;
-
-    copy = all_suppliers_;
-  }
-
-  if (copy.size () > 0)
-    {
-      Supplier_Iterator iter (copy);
-
-      CORBA::Environment env;
-
-      for (ACE_Push_Supplier_Proxy **proxy = 0;
-	   iter.next (proxy) != 0;
-	   iter.advance ())
-	{
-	  (*proxy)->shutdown ();
-	  this->disconnecting (*proxy, env);
-	}
-    }
-
-  up_->shutdown ();
-}
-
-RtecEventChannelAdmin::ProxyPushConsumer_ptr 
-ACE_ES_Supplier_Module::obtain_push_consumer (CORBA::Environment &_env)
-{
-  ACE_Push_Supplier_Proxy *new_supplier = new ACE_Push_Supplier_Proxy (this);
-
-  if (new_supplier == 0)
-    ACE_THROW_RETURN (CORBA::NO_MEMORY (CORBA::COMPLETED_NO), 0);
-  // @@ TODO Orbix parameters:
-  // (0, CORBA::COMPLETED_NO, "ACE_ES_Supplier_Module::obtain_push_consumer"));
-
-  {
-    ACE_ES_GUARD ace_mon (lock_);
-    if (ace_mon.locked () == 0)
-      {
-	delete new_supplier;
-	ACE_THROW_RETURN (SYNC_ERROR, 0);
-	// @@ TODO Orbix parameters:
-	// (0, CORBA::COMPLETED_NO, 
-	// "ACE_ES_Supplier_Module::obtain_push_consumer"), 0);
-      }
-    
-    if (all_suppliers_.insert (new_supplier) == -1)
-      ACE_ERROR ((LM_ERROR, "ACE_ES_Supplier_Module insert failed.\n"));
-  }
-
-  return new_supplier->get_ref ();
-}
-
-void
-ACE_ES_Supplier_Module::push (ACE_Push_Supplier_Proxy *proxy,
-			      const RtecEventComm::EventSet &event,
-			      CORBA::Environment &_env)
-{
-  ACE_TRY
-    {
-      for (int i = 0; i < event.length(); ++i)
-	{
-	  ACE_ES_Event_Container *temp =
-	    new ACE_ES_Event_Container (event[i]);
-	  //RtecEventComm::Event *temp = new RtecEventComm::Event (event);
-
-	  if (temp == 0)
-	    ACE_THROW (CORBA::NO_MEMORY (CORBA::COMPLETED_NO));
-	  // @@ TODO Orbix parameters:
-	  // (0, CORBA::COMPLETED_NO,
-	  //  "ACE_ES_Supplier_Module::obtain_push_consumer"));
-
-	  // This will guarantee that release gets called when we exit
-	  // the scope. 
-	  ACE_ES_Event_Container_var event_copy (temp);
-	  temp->_release ();
-	  ACE_TIMEPROBE ("deliver to Supplier Module (thru Supplier Proxy)");
-	  up_->push (proxy, event_copy, ACE_TRY_ENV);
-	  ACE_CHECK_ENV;
-	}
-    }
-  ACE_CATCH (RtecEventComm::Disconnected, d)
-    {
-      ACE_ERROR ((LM_ERROR, "%p Disconnected.\n", 
-		  "ACE_ES_Supplier_Module::push"));
-      ACE_RETHROW;
-    }
-  ACE_CATCH (RtecEventChannelAdmin::TypeError, t)
-    {
-      ACE_ERROR ((LM_ERROR, "%p Type Error.\n", 
-		  "ACE_ES_Supplier_Module::push"));
-      ACE_RETHROW;
-    }
-  ACE_CATCH (CORBA::NO_MEMORY, e)
-    {
-      ACE_ERROR ((LM_ERROR, "%p No Memory.\n", 
-		  "ACE_ES_Supplier_Module::push"));
-      ACE_RETHROW;
-    }
-  ACE_CATCH (CORBA::SystemException, e)
-    {
-      ACE_ERROR ((LM_ERROR, "%p CORBA System Exception.\n", 
-		  "ACE_ES_Supplier_Module::push"));
-      ACE_RETHROW;
-    }
-  ACE_CATCHANY
-    {
-      ACE_ERROR ((LM_ERROR, "ACE_ES_Supplier_Module::push: "
-		  "Unknown exception.\n"));
-      ACE_RETHROW;
-    }
-  ACE_ENDTRY;
-}
-
-// ************************************************************
-
-ACE_ES_Priority_Timer::ACE_ES_Priority_Timer (void)
-{
-}
-
-int
-ACE_ES_Priority_Timer::connected (RtecScheduler::handle_t rt_info)
-{
-  RtecScheduler::OS_Priority thread_priority;
-  RtecScheduler::Sub_Priority subpriority;
-  RtecScheduler::Preemption_Priority preemption_priority;
-
-  ACE_TRY
-    {
-      ACE_Scheduler_Factory::server ()->priority
-	(rt_info, thread_priority,
-	 subpriority, preemption_priority, ACE_TRY_ENV);
-      ACE_CHECK_ENV;
-#if 0  
-      ACE_ERROR_RETURN ((LM_ERROR, "%p RtecScheduler::Scheduler::priority failed.\n",
-			 "ACE_ES_Priority_Timer::connected"), -1);
-#endif /* 0 */
-    }
-  ACE_CATCHANY
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-			 "%p RtecScheduler::Scheduler::priority failed.\n",
-			 "ACE_ES_Priority_Timer::connected"), -1);
-    }
-  ACE_ENDTRY;
-
-  // Just make sure the ORB allocates resources for this priority.
-  if (ACE_Task_Manager::instance()->GetReactorTask (preemption_priority) == 0)
-    ACE_ERROR_RETURN ((LM_ERROR, "%p.\n",
-		       "ACE_ES_Priority_Timer::connected"), -1);
-
-  return 0;
-}
-
-int
-ACE_ES_Priority_Timer::handle_timeout (const ACE_Time_Value &,
-				       const void *vp)
-{
-  ACE_ES_Timer_ACT *act = (ACE_ES_Timer_ACT *) vp;
-
-  if (act == 0)
-    ACE_ERROR_RETURN ((LM_ERROR, "ACE_ES_Priority_Timer::handle_timeout: "
-		       "received act == 0!!!.\n"), 0);
-
-  act->execute ();
-
-  return 0;
-}
-
-ACE_Timeprobe *ACE_Timeprobe::instance_ = 0;
-
-ACE_Timeprobe &
-ACE_Timeprobe::instance ()
-{
-  if (instance_ == 0)
-    {
-      // if this allocation fails, we're in big trouble . . .
-      ACE_NEW_RETURN (instance_, ACE_Timeprobe (), *instance_);
-    }
-
-  return *instance_;
-}
-
-void
-ACE_Timeprobe::timeprobe (const char *id)
-{
-  timeprobes [current_slot_].time_ = ACE_OS::gethrtime ();
-  timeprobes [current_slot_].id_ = id;
-
-  ++current_slot_;
-
-  ACE_ASSERT (current_slot_ < SLOTS);
-}
-
-void
-ACE_Timeprobe::print_times () const
-{
-  ACE_OS::printf ("\nACE_Timeprobe; %u timeprobes were recorded:\n",
-                  current_slot_ > 1  ?  current_slot_ - 1
-                                     :  0);
-
-  if (current_slot_ > 0)
-    {
-      for (u_int i = 1; i < current_slot_; ++i)
-        {
-	  ACE_hrtime_t elapsed = timeprobes [i].time_ - timeprobes [i-1].time_;
-          ACE_OS::printf ("\"%-55s\"%10.3f usec\n",
-                          timeprobes [i].id_,
-                          (double) (elapsed / 1000) /* nanosec/microsec */);
-        }
-
-      ACE_hrtime_t elapsed2 = timeprobes [current_slot_ - 1].time_ -
-                              timeprobes [0].time_;
-
-      // print the total time
-      ACE_OS::printf (
-        "                                                          =========\n"
-        "                                                    total"
-        "%10.3f usec\n",
-        (double) (elapsed2 / 1000) /* nanoseconds/microsecond */);
-    }
-}
-
-// ************************************************************
-
-const char *
-ACE_ES_Consumer_Name (const RtecEventChannelAdmin::ConsumerQOS &qos)
-{
-  // The first dependency should designate a correlation group.
-
-  ACE_TRY
-    {
-      RtecScheduler::RT_Info* rt_info = ACE_Scheduler_Factory::server ()->get
-	(qos.dependencies[1].rt_info, ACE_TRY_ENV);
-      ACE_TRY_ENV;
-
-      return rt_info->entry_point;
-    }
-  ACE_CATCHANY
-    {
-      return "no-name";
-    }
-  ACE_ENDTRY;
-  ACE_NOTREACHED (return "no-name");
-}
-
-// ************************************************************
-
-void 
-dump_event (const RtecEventComm::Event &event)
-{
-  ACE_DEBUG ((LM_DEBUG, "source_ = %d "
-	      "type_ = %d "
-	      "time_ = %u.\n",
-	      (void*)event.source_,
-	      event.type_,
-	      // The divide-by-1 is for ACE_U_LongLong support.
-	      event.time_ / 1));
-}
-
-// ************************************************************
-
-#if defined(ACE_ES_LACKS_ORB)
-void
-dump_sequence (const ACE_CORBA_Sequence<ACE_ES_Event> &seq)
-{
-  for (CORBA::ULong index=0; index < seq.length (); index++)
-    ::dump_event (seq[index]);
-}
-#endif /* ACE_ES_LACKS_ORB */
-
-// ************************************************************
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-#if defined (ACE_ES_LACKS_ORB)
-//template class ACE_CORBA_Sequence<RtecEventComm::Event>;
-// template class ACE_CORBA_Sequence<RtecEventComm::Event_var>;
-template class ACE_CORBA_Sequence<RtecEventChannelAdmin::Dependency>;
-template class ACE_CORBA_Sequence<ACE_ES_Publication>;
-// For ACE_ES_Event_Container_var.
-template class ACE_CORBA_var<ACE_ES_Event_Container>;
-
-// Used in Event_Channel.cpp.
-template void operator+=(ACE_CORBA_Sequence<ACE_ES_Event> &,
-			 ACE_ES_Event const &);
-#endif /* ACE_ES_LACKS_ORB */
-
-template class ACE_Map_Entry<ACE_ES_Subscription_Info::EXT, ACE_ES_Subscription_Info::INT>;
-template class ACE_Map_Entry<ACE_ES_Subscription_Info::sEXT, ACE_ES_Subscription_Info::sINT>;
-template class ACE_Map_Iterator<ACE_ES_Subscription_Info::EXT, ACE_ES_Subscription_Info::INT, ACE_ES_Subscription_Info::SYNCH>;
-template class ACE_Map_Iterator<ACE_ES_Subscription_Info::sEXT, ACE_ES_Subscription_Info::sINT, ACE_ES_Subscription_Info::SYNCH>;
-template class ACE_Map_Manager<ACE_ES_Subscription_Info::EXT, ACE_ES_Subscription_Info::INT, ACE_ES_Subscription_Info::SYNCH>;
-template class ACE_Map_Manager<ACE_ES_Subscription_Info::sEXT, ACE_ES_Subscription_Info::sINT, ACE_ES_Subscription_Info::SYNCH>;
-template class ACE_Node<ACE_ES_Consumer_Rep *>;
-template class ACE_Node<ACE_Push_Consumer_Proxy *>;
-template class ACE_Node<ACE_Push_Supplier_Proxy *>;
-template class ACE_Unbounded_Set<ACE_ES_Consumer_Rep *>;
-template class ACE_Unbounded_Set<ACE_Push_Consumer_Proxy *>;
-template class ACE_Unbounded_Set<ACE_Push_Supplier_Proxy *>;
-template class ACE_Unbounded_Set_Iterator<ACE_ES_Consumer_Rep *>;
-template class ACE_Unbounded_Set_Iterator<ACE_Push_Consumer_Proxy *>;
-template class ACE_Unbounded_Set_Iterator<ACE_Push_Supplier_Proxy *>;
-
-// For ACE_ES_Event_Container_Allocator.
-template class ACE_Cached_Allocator<ACE_ES_Event_Container_Chunk, ACE_Null_Mutex>;
-template class ACE_Cached_Allocator<ACE_ES_Dispatch_Request_Chunk, ACE_Null_Mutex>;
-template class ACE_Cached_Mem_Pool_Node<ACE_ES_Event_Container_Chunk>;
-template class ACE_Cached_Mem_Pool_Node<ACE_ES_Dispatch_Request_Chunk>;
-template class ACE_Locked_Free_List<ACE_Cached_Mem_Pool_Node<ACE_ES_Event_Container_Chunk>, ACE_Null_Mutex>;
-template class ACE_Locked_Free_List<ACE_Cached_Mem_Pool_Node<ACE_ES_Dispatch_Request_Chunk>, ACE_Null_Mutex>;
-template class ACE_Free_List<ACE_Cached_Mem_Pool_Node<ACE_ES_Event_Container_Chunk> >;
-template class ACE_Free_List<ACE_Cached_Mem_Pool_Node<ACE_ES_Dispatch_Request_Chunk> >;
-
-template class ACE_ES_Array_Iterator<ACE_ES_Consumer_Rep *>;
-template class ACE_ES_Simple_Array<ACE_ES_Consumer_Rep *, 100>;
-
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/local/bin/Event_Service/Event_Channel.h b/TAO/local/bin/Event_Service/Event_Channel.h
deleted file mode 100644
index fbf680c2c0a..00000000000
--- a/TAO/local/bin/Event_Service/Event_Channel.h
+++ /dev/null
@@ -1,1360 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-//
-// ============================================================================
-//
-// = LIBRARY
-//    ace ORB
-// 
-// = FILENAME
-//    Event_Channel
-//
-// = AUTHOR
-//    Tim Harrison (harrison@cs.wustl.edu)
-//
-// = DESCRIPTION
-//    ACE implementation of COSS Event Services For more detailed
-//    information, see http://www.cs.wustl.edu/~mda/event.html.  
-//
-// =  NAMING CONVENTIONS
-//    Some of the naming might be confusing.  For instance
-//    ACE_Push_Consumer_Proxy "is-a" ProxyPushSupplier.  To the
-//    channel, ACE_Push_Consumer_Proxy is a proxy to push consumers.
-//    To a push consumer, ACE_Push_Consumer_Proxy is a proxy to push
-//    suppliers.  I chose to name classes relative to the Event
-//    Channel.
-//
-// ============================================================================
-
-#ifndef ACE_EVENT_CHANNEL_H
-#define ACE_EVENT_CHANNEL_H
-
-#include "ace/Containers.h"
-#include "ace/Map_Manager.h"
-
-#include "Local_ESTypes.h"
-#include "CORBA_Utils_T.h"
-#include "Task_Manager.h"
-#include "ReactorTask.h"
-
-//ACE_INLINE void operator += (ACE_CORBA_Sequence<RtecEventComm::Event_var> &dest,
-//				 RtecEventComm::Event *item);
-
-ACE_INLINE int operator == (const RtecEventComm::Event &event1, 
-			    const RtecEventComm::Event &event2);
-// This operation could be part of the classes, but in order to stay
-// CORBA compliant, we're adding them as global operators.
-
-// ************************************************************
-
-class ACE_ES_Event_Container : public RtecEventComm_Event
-// = TITLE
-//    Event Container
-//
-// = DESCRIPTION
-//    Basically an ACE_ES_Event with reference counting and
-//    thread-specific memory allocation.
-{
-public:
-  ACE_ES_Event_Container (void);
-  // Default construction.
-
-  ~ACE_ES_Event_Container (void);
-  // Destruction.
-
-  ACE_ES_Event_Container (const ACE_ES_Event_Container &);
-  // Copy construction.
-
-  ACE_ES_Event_Container (const RtecEventComm::Event &);
-  // Construction with an event.
-
-  ACE_ES_Event_Container *_duplicate (void);
-  // Increments ref_count_ and returns this.
-
-  void _release (void);
-  // Decrements ref_count_ and deletes if 0.
-
-  int operator== (const ACE_ES_Event_Container &event);
-  // Returns 1 if the two are "equal," 0 otherwise.  Determines
-  // equality using source_ and type_ only.  A 0 source_ is a wildcard
-  // (always equal).  A type_ of ACE_ES_EVENT_ANY is also a wildcard.
-
-  void *operator new (size_t nbytes);
-  // Allocates memory from a thread-specific memory pool.
-
-  void operator delete (void *);
-  // Returns memory to a thread-specific memory pool.
-
-  void dump (void);
-
-private:
-  int ref_count_;
-};
-
-typedef ACE_CORBA_var<ACE_ES_Event_Container> ACE_ES_Event_Container_var;
-
-ACE_INLINE void operator += (ACE_CORBA_Sequence<ACE_ES_Event_Container_var> &dest,
-			     ACE_ES_Event_Container *item);
-
-#if defined(ACE_ES_LACKS_ORB)
-// Utility for debugging sequences.
-ACE_Svc_Export void dump_sequence (const ACE_CORBA_Sequence<RtecEventComm::Event> &seq);
-#endif /* ACE_ES_LACKS_ORB */
-
-// Utility for debugging events.
-void dump_event (const RtecEventComm::Event &event);
-
-// ************************************************************
-
-class ACE_RTU_Manager
-// = TITLE
-//   ACE RTU Manager
-//   
-// = DESCRIPTION
-{
-public:
-  ACE_RTU_Manager (int active);
-  // If <active> == 0, everything returns 0.  If <active> != 0, RTUs
-  // galore.
-
-  int should_preempt (void);
-  // Returns 1 if the current task should preempt itself.  Otherwise,
-  // returns 0.  Resets should_preempt to zero.
-
-  void should_preempt (int s);
-  // Called by the dispatching module when the current task should
-  // preempt itself.
-
-  void not_done (int nd);
-  // If <nd> != 0, the current running task will be enqueued at the
-  // head of its dispatch tail.
-
-  int not_done (void);
-  // Returns 1 if the current task needs to be dispatched again.
-  // Resets not_done_ to 0;
-
-  // = Get/set the priority of the current running task.
-  RtecScheduler::OS_Priority priority (void);
-  void priority (RtecScheduler::OS_Priority priority);
-
-private:
-  int active_;
-  int should_preempt_;
-  int not_done_;
-  RtecScheduler::OS_Priority priority_;
-};
-
-// ************************************************************
-
-// Chesire cat.
-class ACE_ES_Priority_Timer;
-// Forward declarations.
-class ACE_ES_Consumer_Module;
-class ACE_ES_Correlation_Module;
-class ACE_ES_Subscription_Module;
-class ACE_ES_Supplier_Module;
-// This forward decl and typedef allow us to remove inheritence later
-// on without changing any code.
-class ACE_ES_Dispatching_Base;
-typedef ACE_ES_Dispatching_Base ACE_ES_Dispatching_Module;
-
-// ec..
-class ACE_EventChannel : public RtecEventChannelAdmin_EventChannelBOAImpl
-// = TITLE
-//   ACE Event Channel.
-//   
-// = DESCRIPTION
-//   Implementation of COSS Event Channel.  For more detailed
-//   information, see http://www.cs.wustl.edu/~mda/event.html.
-{
-public:
-  enum { INITIAL_STATE = 0,
-	 CONSUMER = 1, SUPPLIER = 2, 
-	 SHUTDOWN = CONSUMER | SUPPLIER };
-
-  ACE_EventChannel (u_long type = ACE_DEFAULT_EVENT_CHANNEL_TYPE);
-  // Construction of the given <type>.  Check the **_CHANNEL
-  // enumerations defined below.
-
-  virtual ~ACE_EventChannel (void);
-  // Calls destroy.
-
-  // = Accessor methods to Event Channel objects.  The Event Channel
-  // acts as a sort of service repository of object references.  All
-  // objects in the Event Service come to this interface to obtain
-  // object references during initialization.
-
-  virtual RtecEventChannelAdmin::ConsumerAdmin_ptr for_consumers (CORBA::Environment &);
-  // Consumer administration factory method.
-
-  virtual RtecEventChannelAdmin::SupplierAdmin_ptr for_suppliers (CORBA::Environment &);
-  // Supplier administration factory method.
-
-  virtual void destroy (CORBA::Environment &);
-  // Explicitly shut down the channel.
-
-  RtecEventChannelAdmin::EventChannel_ptr get_ref (void);
-  // Allow transformations to RtecEventChannelAdmin::EventChannel.
-
-  ACE_RTU_Manager *rtu_manager (void);
-  // Returns a reference to the RTU manager.
-
-  ACE_ES_Priority_Timer *timer (void);
-  // Timer accessor.
-
-  // = These should be private.
-  ACE_ES_Consumer_Module *consumer_module_;
-  ACE_ES_Dispatching_Module *dispatching_module_;
-  ACE_ES_Correlation_Module *correlation_module_;
-  ACE_ES_Subscription_Module *subscription_module_;
-  ACE_ES_Supplier_Module *supplier_module_;
-
-  ACE_ES_Priority_Timer *timer_;
-
-  void report_connect (u_long);
-  // Consumer or supplier connected.
-
-  void report_disconnect (u_long);
-  // Consumer or supplier disconnected.
-
-  void shutdown (void);
-  // Do not call this.  The last module has shut down.
-
-private:
-  ACE_RTU_Manager *rtu_manager_;
-  // The RTU manager dude!
-
-  u_long type_;
-  // Can be any **_CHANNEL. (well, except NO_CHANNEL).
-
-  u_long state_;
-  // Can be INITIAL_STATE, NO_CONSUMERS, NO_SUPPLIERS, or SHUTDOWN.
-
-  ACE_ES_MUTEX lock_;
-  // Used to lock shared state.
-
-  RtecEventChannelAdmin::EventChannel_ptr me_;
-  // CORBA reference to self.
-
-  int destroyed_;
-  // Ensures this->destory is executed only once.
-};
-
-// ************************************************************
-
-class ACE_ES_Dependency_Iterator
-// = TITLE 
-//    ConsumerQOS Iterator
-//
-// = DESCRIPTION
-//    This is used by the Event Channel to parse ConsumerDependency objects.
-{
-public:
-  ACE_ES_Dependency_Iterator (RtecEventChannelAdmin::DependencySet &rep);
-  // Construct and iterator for <rep>.
-
-  int advance_dependency (void);
-  // Returns 0 if the advance succeeded.  Returns -1 if there are no
-  // more dependencies in the group.
-  
-  int parse (void);
-  // Cache values for n_** methods.
-
-  int n_conjunctions (void);
-  // Returns the number of conjunction groups in the dependency set.
-
-  int n_disjunctions (void);
-  // Returns the number of disjunction groups in the dependency set.
-
-  int n_timeouts (void);
-  // Returns the number of timeouts registered.
-
-  int n_events (void);
-  // Returns the number of events registered.
-
-  RtecEventChannelAdmin::Dependency &operator *(void);
-  // Accessor to the current ConsumerDependency pointed to by the
-  // iterator.
-
-  RtecScheduler::handle_t first_rt_info (void);
-  // Returns the first RT_Info in the dependencies.
-
-protected:
-  RtecScheduler::handle_t rt_info_;
-  // The first rt_info in the dependencies.
-
-  RtecEventChannelAdmin::DependencySet &rep_;
-  // Reference to the dependency array.
-
-  int index_;
-  // Index into rep_.
-
-  RtecEventComm::EventType group_type_;
-  // The type of the current correlation group.
-
-  int n_conjunctions_;
-  // Number of conjunction groups.
-
-  int n_disjunctions_;
-  // Number of disjunction groups.
-
-  int n_timeouts_;
-  // Number of timeouts registered.
-
-  int n_events_;
-  // Number of events registered.
-};
-
-// ************************************************************
-
-class ACE_ES_Timer_ACT
-// = TITLE
-//    Timer Asynchronous Completion Token
-//
-// = DESCRIPTION
-//    Implements Command pattern with timers.
-{
-public:
-  virtual void execute (void) = 0;
-};
-
-// ************************************************************
-// Forward decl.
-class ACE_ES_Consumer_Rep_Timeout;
-
-class ACE_ES_Disjunction_Group
-// = TITLE
-//    Disjunction Group
-//
-// = DESCRIPTION
-//    Represents a disjunction group, such as (A|B|C).
-{
-public:
-  ACE_ES_Disjunction_Group (void);
-  // Default construction.
-
-  void set_correlation_module (ACE_ES_Correlation_Module *cm);
-  // <cm> is needed for rescheduling deadlines.
-
-  void reschedule_deadline (void);
-  // If deadline_timer_rep_ is set, it is cancelled and rescheduled.
-
-  int set_deadline_timeout (ACE_ES_Consumer_Rep_Timeout *cr);
-  // Set the group's reference to the deadline timer.  Returns 0 on
-  // success, -1 on failure.
-
-  typedef ACE_CORBA_Sequence<ACE_ES_Event_Container_var> Event_Set;
-  
-  virtual void add_events (Event_Set *outbox,
-			   Event_Set *pending_events,
-			   u_long &pending_flags);
-  // Does nothing.  This is the only virtual method in this little
-  // heirarchy with the conjunction group.
-
-  void set_act (RtecEventComm::Event &act);
-  // Set the ACT for this group.
-
-protected:
-  ACE_ES_Event_Container_var act_;
-  // To be sent with this group.
-
-private:
-  ACE_ES_Consumer_Rep_Timeout *deadline_timer_rep_;
-  // The disjunction group keeps a reference to the deadline timer.
-
-  ACE_ES_Correlation_Module *correlation_module_;
-  // Used for cancelling and scheduling deadline_timer_rep_.
-};
-
-// ************************************************************
-
-class ACE_ES_Conjunction_Group : public ACE_ES_Disjunction_Group
-// = TITLE
-//    Conjunction Group
-//
-// = DESCRIPTION
-//    Represents a conjunction group, such as (A+B+C).
-{
-public:
-  ACE_ES_Conjunction_Group (void);
-  // Default construction.
-
-  int add_type (int type_id);
-  // Set the <type_id>th bit in the forward_value_.
-
-  int should_forward (u_long pending_flags);
-  // Returns 1 if this conjunction group's dependencies have been
-  // satisfied.  Returns 0 otherwise.
-
-  typedef ACE_CORBA_Sequence<ACE_ES_Event_Container_var> Event_Set;
-  
-  virtual void add_events (Event_Set *outbox,
-			   Event_Set *pending_events,
-			   u_long &pending_flags);
-  // For each bit set in forward_value_, the corresponding events in
-  // <pending_events> is added to <outbox>.  Each bit set in
-  // <forward_value_> is cleared in <pending_flags>.  If <oubox> == 0,
-  // then add_events just clears the pending events and flags.
-
-private:
-  u_long forward_value_;
-};
-
-// ************************************************************
-
-// Forward decl.
-class ACE_ES_Consumer_Correlation;
-
-class ACE_ES_Consumer_Rep : public ACE_ES_Timer_ACT
-// = TITLE
-//    Consumer Representation.
-//
-// = DESCRIPTION
-//    These are stored in the subscription module.  They store
-//    information that allows optimized correlations.  It represents
-//    the consumer that will handle *one* type of event.  This
-//    probably shouldn't inherit from ACE_ES_Timer_ACT since it's used
-//    only by ACE_ES_Consumer_Rep_Timeout.  However, this allows me to
-//    minimize dynamic allocation.
-{
-public:
-  ACE_ES_Consumer_Rep (void);
-  // Default construction.
-
-  void init (ACE_ES_Consumer_Correlation *correlation,
-	     RtecEventChannelAdmin::Dependency &dep);
-  // <dep> describes the event subscribed to and the method handling
-  // the event.   <correlation> is the parent correlation object.
-
-  virtual ~ACE_ES_Consumer_Rep (void);
-  // Virtual destruction.
-
-  RtecEventChannelAdmin::Dependency *dependency (void);
-  // The event subscribed to and the method that will handle this
-  // event.
-
-  int type_id (void);
-  // Get the correlation group index of this consumer rep's event
-  // type.
-
-  void type_id (int);
-  // Set the correlation group index of this consumer rep's event
-  // type.
-
-  enum Correlation_Type 
-  { 
-    NO_CORRELATION,
-    CORRELATE,
-    DEADLINE_TIMEOUT,
-    GLOBAL_DEADLINE
-  };
-
-  u_long correlation_type (void);
-  // If this returns 0, then the event associated with this consumer
-  // should be forwarded without running any correlations.
-
-  void correlation_type (u_long ct);
-  // Set whether the event should be correlated.  <ct> is a
-  // Correlation_Type.
-
-  int add_disjunction_group (ACE_ES_Disjunction_Group &);
-  // Add a disjunction group.
-
-  ACE_ES_Disjunction_Group *top_group (void);
-  // Returns the first disjunction group added via
-  // this->add_disjunction_group.
-
-  void reschedule_deadlines (void);
-  // Calls reschedule_deadline on all disjunction groups added through
-  // this->add_disjunction_group. 
-
-  int receiving_events (void);
-  // Returns 1 if events should be sent to this consumer.  Returns 0
-  // if they should not (suspended or disconnected).
-
-  void suspend (void);
-  // Stop forwarding events to the calling consumer.
-
-  void resume (void);
-  // Resume forwarding events to the calling consumer.
-
-  ACE_ES_Consumer_Correlation *correlation (void);
-  // Returns the Consumer_Correlation object for the target consumer.
-
-  void disconnect (void);
-  // Schedules the consumer rep to be removed from all subscription
-  // lists.
-
-  int disconnected (void);
-  // Returns 1 if the consumer rep should be removed from all
-  // subscription lists.
-
-  void _duplicate (void);
-  // Increments ref_count_.
-
-  void _release (void);
-  // Decrements ref_count_ and deletes this if 0.
-
-protected:
-  int disconnected_;
-  // Whether the rep should be removed from all subscription lists.
-
-  virtual void execute (void);
-  // This is called when timeouts occur.  This implementation prints
-  // out an error message (since it really shouldn't be implemented in
-  // this class).
-
-  int suspended_;
-  // Whether events should be dropped or forwarded.
-
-  u_long correlation_type_;
-  // Whether any correlating should be done for this event.
-
-  RtecEventChannelAdmin::Dependency *dependency_;
-  // Event subscribed to.
-
-  ACE_ES_Consumer_Correlation *correlation_;
-  // The target consumer of events.
-
-  int type_id_;
-  // Correlation group index of event_->type_.
-
-  ACE_ES_Disjunction_Group *disjunction_group_;
-  // This should be a set.  We'll just have room for one now.
-
-  ACE_Atomic_Op<ACE_ES_MUTEX, int> ref_count_;
-  // Lock for reference count.
-};
-
-class ACE_ES_Consumer_Rep_Timeout : public ACE_ES_Consumer_Rep
-// = TITLE
-//    Consumer Representation.
-//
-// = DESCRIPTION
-//    These are stored in the subscription module.  They store
-//    information that allows optimized correlations.  It represents
-//    the consumer that will handle *one* type of event.
-{
-public:
-  ACE_ES_Consumer_Rep_Timeout (void);
-  // Default construction.
-  
-  void init (ACE_ES_Consumer_Correlation *correlation,
-	     RtecEventChannelAdmin::Dependency &dep);
-  // <dep> describes the event subscribed to and the method handling
-  // the event.   <correlation> is the parent correlation object.
-
-  // = Get/set timer returned from the reactor.
-  int timer_id (void);
-  void timer_id (int);
-  
-  // = Get/set preemption priority.
-  RtecScheduler::OS_Priority preemption_priority (void);
-  void preemption_priority (RtecScheduler::OS_Priority pp);
-
-protected:
-  virtual void execute (void);
-  // This is called when timeouts occur.  Calls correlation_->
-
-  int timer_id_;
-  // For cancelling timers.
-
-  RtecScheduler::OS_Priority preemption_priority_;
-  // Store the preemption priority so we can cancel the correct timer.
-  // The priority values may change during the life.
-
-  ACE_ES_Event_Container_var timeout_event_;
-};
-
-// ************************************************************
-
-class ACE_ES_Subscription_Info
-// = TITLE
-//    Event Service Subscription Info
-//
-// = DESCRIPTION
-//    Contains information on all consumers subscribed to a supplier.
-//    Each Push_Supplier_Proxy has an instance of this class.  This
-//    should really be defined in Channel_Modules.h, but I want to
-//    have an instance of it in each ACE_Push_Supplier_Proxy.  This
-//    allows us to reduce the amount of dynamic memory allocation.
-{
-public:
-  ~ACE_ES_Subscription_Info (void);
-  // Free up dynamic resources.
-
-  typedef ACE_Unbounded_Set_Iterator<ACE_ES_Consumer_Rep *> Subscriber_Set_Iterator;
-  typedef ACE_Unbounded_Set<ACE_ES_Consumer_Rep *> Subscriber_Set;
-
-  class Type_Subscribers
-    // = DESCRIPTION
-    //    There is one of these for each event type generated by the
-    //    supplier.  It contains the subscribers and the
-    //    dependency_info_ describing the method that generates this
-    //    event type.
-  {
-  public:
-    Type_Subscribers (RtecScheduler::Dependency_Info *d)
-      : dependency_info_ (d) {}
-    // Construction requires a dependency info describing the method
-    // that generates events for the consumers_.  We use a pointer so
-    // that a null can be passed in this->insert_or_allocate.
-
-    // void operator= (const Subscriber_Set &);
-    // Copy.
-
-    Subscriber_Set consumers_;
-    // All the consumers that have registered for this event.
-
-    RtecScheduler::Dependency_Info *dependency_info_;
-    // Description of the method that generates this event.
-  };
-
-  typedef RtecEventComm::EventType EXT;
-  typedef Type_Subscribers *INT;
-  typedef ACE_Null_Mutex SYNCH;
-  typedef ACE_Map_Manager<EXT, INT, SYNCH> Subscriber_Map;
-  typedef ACE_Map_Iterator<EXT, INT, SYNCH> Subscriber_Map_Iterator;
-  typedef ACE_Map_Entry<EXT, INT> Subscriber_Map_Entry;
-
-  Subscriber_Set source_subscribers_;
-  // Source-based subscribers.
-
-  Subscriber_Map type_subscribers_;
-  // Type-based subscribers.
-
-  // = These are just typedefs for source-based subscriptions.
-  typedef RtecEventComm::EventSourceID sEXT;
-  typedef Subscriber_Set *sINT;
-  typedef ACE_Map_Manager<sEXT, sINT, SYNCH> SourceID_Map;
-  typedef ACE_Map_Iterator<sEXT, sINT, SYNCH> SourceID_Map_Iterator;
-  typedef ACE_Map_Entry<sEXT, sINT> SourceID_Map_Entry;
-
-  ACE_ES_RW_LOCK lock_;
-  // Serializes writes to source_subscribers_ and type_subscribers_.
-
-  static int insert_or_allocate (SourceID_Map &source_subscribers,
-				 ACE_ES_Consumer_Rep *consumer,
-				 RtecEventComm::EventSourceID sid);
-  // <source_subscribers> contains a mapping of source id to consumer
-  // list.  Insert <consumer> into the list of consumers subscribed to
-  // <sid>.  Allocate a list for <sid> if necessary.
-
-  static int insert_or_allocate (Subscriber_Map &type_subscribers,
-				 ACE_ES_Consumer_Rep *consumer,
-				 RtecEventComm::EventType type);
-  // Add <consumer> to the set of consumers bound to <type> in
-  // <type_subscribers>.  If there is consumer set for <type>, one is
-  // allocated.  Returns -1 on failure, 0 otherwise.
-
-  static int insert_or_fail (Subscriber_Map &type_subscribers,
-			     ACE_ES_Consumer_Rep *consumer,
-			     RtecEventComm::EventType type,
-			     RtecScheduler::Dependency_Info *&dependency);
-  // Add <consumer> to the set of consumers bound to <type> in
-  // <type_subscribers>.  If there is consumer set for <type>, the
-  // operation fails.  Returns -1 on failure, 0 otherwise.
-
-  static int remove (Subscriber_Map &type_map,
-		     ACE_ES_Consumer_Rep *consumer,
-		     RtecEventComm::EventType type);
-  // Remove <consumer> from the consumer set in <type_map> set
-  // corresponding to <type>.
-
-  static int remove (SourceID_Map &source_subscribers,
-		     ACE_ES_Consumer_Rep *consumer,
-		     RtecEventComm::EventSourceID sid);
-  // Remove <consumer> from the consumer set in the
-  // <source_subscribers> set corresponding to <sid>.
-
-  static void append_subscribers (Subscriber_Set &dest,
-				  Subscriber_Set &src);
-  // Insert all elements of <src> into <dest>.
-};
-
-// ************************************************************
-
-// Forward declarations.
-class ACE_ES_Dispatch_Request;
-class ACE_Push_Consumer_Proxy;
-
-class ACE_ES_Consumer_Correlation : public RtecEventComm_PushSupplierBOAImpl
-// = TITLE
-//    Event Service Consumer_Correlation
-//
-// = DESCRIPTION
-//    There is one Consumer Correlation object per call to
-//    connect_push_consumer.  It handles all the consumer's
-//    correlation dependencies including timeouts.  This is also a
-//    PushSupplier to support event forwarding.
-{
-public:
-  ACE_ES_Consumer_Correlation (void);
-  // Default construction.
-
-  virtual ~ACE_ES_Consumer_Correlation (void);
-  // Deletes lock_.
-
-  int connected (ACE_Push_Consumer_Proxy *consumer, 
-		 ACE_ES_Correlation_Module *correlation_module);
-  // Initialization.  <correlation_module> is stored for delegating
-  // channel operations.  <consumer> is stored to access the consumers
-  // qos and filterin data.  Returns 0 on success, -1 on failure.
-
-  int disconnecting (void);
-  // Shutdown.
-
-  ACE_ES_Dispatch_Request *push (ACE_ES_Consumer_Rep *consumer,
-				 ACE_ES_Event_Container *event);
-  // Takes <event> and adds it to the correlation.  Returns the
-  // dispatch request that should be forwarded.
-
-  void suspend (void);
-  // Stop forwarding events to the calling consumer.
-
-  void resume (void);
-  // Resume forwarding events to the calling consumer.
-
-  ACE_ES_Correlation_Module *correlation_module_;
-  // Pointer back to the main correlation module.  This is public so
-  // that ACE_ES_Consumer_Rep_Timeout::execute can access it.
-
-  typedef ACE_CORBA_Sequence<ACE_ES_Event_Container_var> Event_Set;
-  
-private:
-  virtual void disconnect_push_supplier (CORBA::Environment &);
-  // Called when the channel disconnects us.
-
-  int allocate_correlation_resources (ACE_ES_Dependency_Iterator &iter);
-  // Dynamically allocates structures needed for correlations.  0 on
-  // success, -1 on failure.
-
-  ACE_ES_Dispatch_Request * correlate (ACE_ES_Consumer_Rep *cr, 
-				       ACE_ES_Event_Container *event);
-  // Helper function for this->push.
-  
-  // = Registration helper functions.
-  int register_deadline_timeout (RtecEventChannelAdmin::Dependency &dependency,
-				 RtecEventComm::EventType group_type,
-				 int cgindex,
-				 int dgindex,
-				 int &trep_index);
-  int register_interval_timeout (RtecEventChannelAdmin::Dependency &dependency,
-				 RtecEventComm::EventType group_type,
-				 int cgindex,
-				 int dgindex,
-				 int &trep_index);
-  int register_event (RtecEventChannelAdmin::Dependency &dependency,
-		      RtecEventComm::EventType group_type,
-		      int cgindex,
-		      int dgindex,
-		      int &crep_index);
-  
-  ACE_ES_Consumer_Rep *get_consumer_rep (RtecEventChannelAdmin::Dependency &dependency,
-					  int &crep_index);
-  int new_type_id (void);
-
-  int type_id_index_;
-
-  RtecEventChannelAdmin::ProxyPushConsumer_ptr channel_;
-  // For event forwarding.
-
-  RtecScheduler::handle_t forwarding_rt_info_;
-  // Ties together the suppliers and the consumers of the forward
-  // event.
-
-  RtecEventChannelAdmin::SupplierQOS qos_;
-  // Supplier QOS specifications.
-
-  // Events waiting to be forwarded.
-  Event_Set *pending_events_;
-
-  // Used to synchronize pending_events_ and by the correlation module.
-  ACE_ES_MUTEX lock_;
-  // Used to lock shared state.
-
-  ACE_Push_Consumer_Proxy *consumer_;
-
-  u_long pending_flags_;
-  // A bit is set for each dependency satisfied.
-
-  ACE_ES_Consumer_Rep **consumer_reps_;
-  // Array of consumer rep pointers.
-  int n_consumer_reps_;
-  ACE_ES_Consumer_Rep_Timeout *timer_reps_;
-  int n_timer_reps_;
-
-  ACE_ES_Conjunction_Group *conjunction_groups_;
-  int n_conjunction_groups_;
-  ACE_ES_Disjunction_Group *disjunction_groups_;
-  int n_disjunction_groups_;
-
-  int connected_;
-  // True when we're connected to the channel for forwarding.
-};
-
-// ************************************************************
-
-class ACE_ES_ACT
-// = TITLE
-//    Event Service ACT
-//
-// = DESCRIPTION
-//    
-{
-public:
-  ACE_ES_ACT (void);
-  int has_act_;
-  RtecEventComm::Event act_;
-};
-
-// ************************************************************
-
-// Forward declarations.
-class ACE_ES_Dispatch_Request;
-
-class ACE_ES_Consumer_Module : public RtecEventChannelAdmin_ConsumerAdminBOAImpl
-// = TITLE
-//    Event Service Consumer Module
-//
-// = DESCRIPTION
-//    ProxyPushSupplier factory.
-{
-public:
-  ACE_ES_Consumer_Module (ACE_EventChannel *channel);
-  // Default construction.
-
-  void open (ACE_ES_Dispatching_Module *down);
-  // Link to the next module.
-
-  virtual RtecEventChannelAdmin::ProxyPushSupplier_ptr obtain_push_supplier (CORBA::Environment &);
-  // Factory method for push consumer proxies.
-
-  void connected (ACE_Push_Consumer_Proxy *consumer,
-		  CORBA::Environment &);
-  // Register the consumer with the Event Service.  This handles all
-  // the details regarding Correlation_Module and Subscription_Module.
-
-  void disconnecting (ACE_Push_Consumer_Proxy *consumer,
-		      CORBA::Environment &);
-  // Unregister the consumer from the Event Service.
-
-  void push (const ACE_ES_Dispatch_Request *request,
-	     CORBA::Environment &);
-
-  RtecEventChannelAdmin::ConsumerAdmin_ptr get_ref (void);
-  // Allow transformations to RtecEventChannelAdmin::ConsumerAdmin.
-
-  void shutdown_request (ACE_ES_Dispatch_Request *request);
-  // This is called by Shutdown_Consumer command objects when a
-  // consumer proxy is ready to be deleted.
-
-  void shutdown (void);
-  // Actively disconnect from all consumers.
-
-private:
-  typedef ACE_Unbounded_Set_Iterator<ACE_Push_Consumer_Proxy *> Consumer_Iterator;
-  typedef ACE_Unbounded_Set<ACE_Push_Consumer_Proxy *> Consumers;
-
-  ACE_ES_MUTEX lock_;
-  // Protects access to all_consumers_.
-
-  Consumers all_consumers_;
-
-  ACE_EventChannel *channel_;
-  // Used to test for shutdown.
-
-  RtecEventChannelAdmin::ConsumerAdmin_ptr me_;
-
-  ACE_ES_Dispatching_Module *down_;
-  // Next module down.
-};
-
-// ************************************************************
-
-// Forward declaration.
-class ACE_ES_Subscription_Module;
-
-class ACE_ES_Correlation_Module
-// = TITLE
-//    Event Service Correlation Module
-//
-// = DESCRIPTION
-//    
-{
-public:
-  ACE_ES_Correlation_Module (ACE_EventChannel *channel);
-  // Default construction.
-
-  void open (ACE_ES_Dispatching_Module *up,
-	     ACE_ES_Subscription_Module *down);
-  // Link to adjacent modules.
-
-  void connected (ACE_Push_Consumer_Proxy *consumer,
-		  CORBA::Environment &);
-  // Create the consumers filter object.
-
-  void disconnecting (ACE_Push_Consumer_Proxy *consumer,
-		      CORBA::Environment &);
-  // Release the consumers filter object.
-
-  void push (ACE_ES_Consumer_Rep *consumer,
-	     ACE_ES_Event_Container *event,
-	     CORBA::Environment &);
-  // Take in an event and its subscriber.  Apply consumer-specific
-  // filters to each event and forward any dispatch requests to the
-  // Dispatching Module.
-
-  // = These are called by ACE_ES_Consumer_Reps.
-
-  int subscribe (ACE_ES_Consumer_Rep *consumer);
-  // Forwards to the subscription module.
-
-  //int unsubscribe (ACE_ES_Consumer_Rep *consumer);
-  // Forwards to the subscription module.
-
-  int schedule_timeout (ACE_ES_Consumer_Rep_Timeout *consumer);
-  // Schedule consumer timeout.  Return 0 on success, -1 on failure.
-
-  int cancel_timeout (ACE_ES_Consumer_Rep_Timeout *consumer);
-  // Cancel consumer timeout.  Return 0 on success, -1 on failure.
-
-  int reschedule_timeout (ACE_ES_Consumer_Rep_Timeout *consumer);
-  // Reschedule consumer timeout.  Return 0 on success, -1 on failure.
-
-  ACE_EventChannel *channel_;
-  // The master channel.  This is public so that Consumer_Correlation
-  // objects can access it.
-
-  void shutdown (void);
-  // Does nothing.
-
-private:
-  ACE_ES_Dispatching_Module *up_;
-  // Next module up.
-
-  ACE_ES_Subscription_Module *subscription_module_;
-  // Next module down.
-};
-
-// ************************************************************
-
-// Forward declaration.
-class ACE_ES_Supplier_Module;
-class ACE_Push_Supplier_Proxy;
-
-class ACE_ES_Subscription_Module
-// = TITLE
-//    Event Service Subscription Module
-//
-// = DESCRIPTION
-// 
-// = SYNCHRONIZATION
-//    This is currently implemented with very coarse-grain
-//    synchronization.  Basically, there is a single readers/writer
-//    lock.  All operations acquire the writer lock to change any
-//    subscription record.  All operations acquire a reader lock to
-//    read any subscription record.  This is fine for normal
-//    operations (which are *all* read operations).  However, the
-//    initialization and shutdown periods might benefit from the
-//    potential increase in concurrency if we used finer grain locks
-//    (e.g., lock-per-source).
-{
-public:
-  ACE_ES_Subscription_Module (ACE_EventChannel *channel);
-  // Default construction.
-
-  void open (ACE_ES_Correlation_Module *up,
-	     ACE_ES_Supplier_Module *down);
-  // Link to the adjacent modules.
-
-  ~ACE_ES_Subscription_Module (void);
-  // Deletes the lock_.
-
-  int subscribe (ACE_ES_Consumer_Rep *consumer);
-  // Register a new consumer.  Calls into <consumer> to figure out the
-  // subscription options.  Returns 0 on success, -1 on failure.
-
-  int unsubscribe (ACE_ES_Consumer_Rep *consumer);
-  // Removes the -consumer- from any subscription lists.
-
-  void connected (ACE_Push_Supplier_Proxy *supplier,
-		  CORBA::Environment &);
-  void disconnecting (ACE_Push_Supplier_Proxy *supplier,
-		      CORBA::Environment &);
-
-  void push (ACE_Push_Supplier_Proxy *source,
-	     ACE_ES_Event_Container *event,
-	     CORBA::Environment &);
-  // Takes in a set of events and pushes subscriber sets to the
-  // Correlation Module.
-
-  // void push (ACE_Push_Supplier_Proxy *source,
-  // const RtecEventComm::Event event);
-  // This doesn't need one of these since it will never be called.
-
-  void shutdown (void);
-  // Unsubscribes all consumers from the suppliers.
-
-private:
-  void reregister_consumers (RtecEventComm::EventSourceID source_id);
-  // Reregister any consumers that registered for <source_id> before
-  // it actually connected to the channel.
-
-  ACE_EventChannel *channel_;
-  // The channel of all channels.
-
-  /*
-  typedef ACE_ES_Subscription_Info::Subscriber_Set INT;
-  typedef ACE_Null_Mutex SYNCH;
-  typedef ACE_Map_Manager<EXT, INT, SYNCH> Source_Collection;
-  typedef ACE_Map_Iterator<EXT, INT, SYNCH> Source_Collection_Iterator;
-  typedef ACE_Map_Entry<EXT, INT> Source_Collection_Entry;
-  Source_Collection source_subscription_info_;
-  // Source-only subscribers.
-  */
-
-  // = Subscribe helper methods.  Returns 0 on success, -1 on failure.
-
-  int subscribe_all (ACE_ES_Consumer_Rep *consumer);
-
-  int subscribe_type (ACE_ES_Consumer_Rep *consumer,
-		      RtecEventComm::EventType type);
-
-  int subscribe_source (ACE_ES_Consumer_Rep *consumer,
-			RtecEventComm::EventSourceID source);
-
-  int subscribe_source_type (ACE_ES_Consumer_Rep *consumer,
-			     RtecEventComm::EventSourceID source,
-			     RtecEventComm::EventType type);
-
-  int unsubscribe_all (ACE_ES_Consumer_Rep *consumer);
-
-  int unsubscribe_type (ACE_ES_Consumer_Rep *consumer,
-			RtecEventComm::EventType type);
-
-  int unsubscribe_source (ACE_ES_Consumer_Rep *consumer,
-			  RtecEventComm::EventSourceID source);
-
-  int unsubscribe_source_type (ACE_ES_Consumer_Rep *consumer,
-			       RtecEventComm::EventSourceID source,
-			       RtecEventComm::EventType type);
-
-  // = Push helper methods.
-
-  int push_source (ACE_Push_Supplier_Proxy *source,
-		    ACE_ES_Event_Container *event);
-  // Push <event> to all consumers subscribed to all events from
-  // <source>.  Returns 0 on success, -1 on failure.
-
-  int push_source_type (ACE_Push_Supplier_Proxy *source,
-			 ACE_ES_Event_Container *event);
-  // Push <event> to all consumers subscribed to <event>.type_ from
-  // <source>.  Returns 0 on success, -1 on failure.
-
-  void push_all (ACE_ES_Event_Container *event,
-		 CORBA::Environment &);
-  // Push <event> to all_suppliers_.
-
-  ACE_ES_Correlation_Module *up_;
-  // Next module up stream.
-
-  ACE_ES_Supplier_Module *down_;
-  // Next module down stream.
-
-  typedef ACE_Unbounded_Set_Iterator<ACE_Push_Supplier_Proxy *> Supplier_Iterator;
-  typedef ACE_Unbounded_Set<ACE_Push_Supplier_Proxy *> Suppliers;
-
-  Suppliers all_suppliers_;
-  // All suppliers.
-
-  ACE_ES_Subscription_Info::Subscriber_Map type_subscribers_;
-  // Type-based subscribers.
-
-  ACE_ES_Subscription_Info::SourceID_Map source_subscribers_;
-  // Source-based subscribers.
-
-  ACE_ES_RW_LOCK lock_;
-  // Protects access to all_suppliers_ and type_suppliers_;
-};
-
-// ************************************************************
-
-class ACE_ES_Supplier_Module : public RtecEventChannelAdmin_SupplierAdminBOAImpl
-// = TITLE
-//    Event Service Supplier Proxy Module
-//
-// = DESCRIPTION
-//    ProxyPushConsumer factory.
-{
-public:
-  ACE_ES_Supplier_Module (ACE_EventChannel *channel);
-  // Default construction.
-
-  void open (ACE_ES_Subscription_Module *up);
-  // Associate the module to a channel.
-
-  virtual RtecEventChannelAdmin::ProxyPushConsumer_ptr obtain_push_consumer (CORBA::Environment &);
-  // Factory method for push supplier proxies.
-
-  void push (ACE_Push_Supplier_Proxy *proxy,
-	     const RtecEventComm::EventSet &event,
-	     CORBA::Environment &);
-  // The supplier module acts on behalf of the supplier proxy to
-  // forward events through the channel.
-
-  void connected (ACE_Push_Supplier_Proxy *supplier,
-		  CORBA::Environment &);
-  // Register the consumer with the Event Service.  This handles all
-  // the details regarding Correlation_Module and Subscription_Module.
-
-  void disconnecting (ACE_Push_Supplier_Proxy *supplier,
-		      CORBA::Environment &);
-  // Unregister the consumer from the Event Service.
-
-  RtecEventChannelAdmin::SupplierAdmin_ptr get_ref (void);
-  // Allow transformations to RtecEventComm::PushConsumer.
-
-  void shutdown (void);
-  // Actively disconnect from all suppliers.
-
-private:
-  typedef ACE_Unbounded_Set_Iterator<ACE_Push_Supplier_Proxy *> Supplier_Iterator;
-  typedef ACE_Unbounded_Set<ACE_Push_Supplier_Proxy *> Suppliers;
-
-  Suppliers all_suppliers_;
-  // All suppliers.
-
-  ACE_ES_MUTEX lock_;
-  // Protects access to all_suppliers_ and type_suppliers_;
-
-  RtecEventChannelAdmin::SupplierAdmin_ptr me_;
-
-  ACE_ES_Subscription_Module *up_;
-
-  ACE_EventChannel *channel_;
-  // Used to test for shutdown.
-};
-
-// ************************************************************
-
-// Forward declarations.
-class ACE_EventChannel;
-
-// = Event Channel interfaces.
-
-class ACE_Push_Supplier_Proxy : public RtecEventChannelAdmin_ProxyPushConsumerBOAImpl
-// = TITLE
-//    Push Supplier Proxy.
-//
-// = DESCRIPTION
-//    To the channel, this is a proxy to suppliers.  To suppliers, it
-//    exports a PushConsumer interface.  It is a
-//    RtecEventChannelAdmin::ProxyPushConsumer.  Suppliers use this
-//    interface to connect to the channel, push events to consumers,
-//    and to disconnect from the channel.
-{
-public:
-  ACE_Push_Supplier_Proxy (ACE_ES_Supplier_Module *supplier_module);
-  // Must be created with an owning supplier admin.
-
-  // = Operations public to suppliers.
-
-  virtual void connect_push_supplier (RtecEventComm::PushSupplier_ptr push_supplier,
-				      const RtecEventChannelAdmin::SupplierQOS& qos,
-				      CORBA::Environment &);
-  // Suppliers connect via this interface.  <push_supplier> is a
-  // reference to the supplier.  <qos> represents the publish types of
-  // the supplier.
-
-  virtual void push (const RtecEventComm::EventSet &event,
-		     CORBA::Environment &);
-  // Data arriving from a PushSupplier that must be sent to
-  // consumers.  This is the entry point of all events.
-
-  virtual void disconnect_push_consumer (CORBA::Environment &);
-  // Disconnect the supplier from the channel.
-
-  // = Operations for the Event Channel.
-
-  RtecEventChannelAdmin::ProxyPushConsumer_ptr get_ref (void);
-  // Allow transformations to RtecEventChannelAdmin::ProxyPushConsumer.
-
-  int connected (void);
-  // Returns 1 if the proxy has been connected to a "remote" client.
-
-  void shutdown (void);
-  // Actively disconnect from the supplier.
-
-  // This is a hook so that the Subscription Module can associate
-  // state with supplier proxies.
-  ACE_ES_Subscription_Info &subscription_info (void);
-
-  RtecEventChannelAdmin::SupplierQOS &qos (void);
-  // Filtering criteria.
-
-  int operator== (const RtecEventComm::EventSourceID rhs);
-  // Is this object a proxy for -rhs-.  Simple pointer comparison for now.
-
-  RtecEventComm::EventSourceID source_id (void);
-  // Returns underlying supplier object ref.
-
-private:
-  RtecEventChannelAdmin::SupplierQOS qos_;
-  // Reference to the supplier's qos params.
-
-  ACE_ES_Subscription_Info subscription_info_;
-
-  ACE_ES_Supplier_Module *supplier_module_;
-
-  RtecEventComm::EventSourceID source_id_;
-  // We keep a proxy of the Supplier source_id_;
-  
-  RtecEventChannelAdmin::ProxyPushConsumer_ptr me_;
-  // CORBA reference to self.
-
-  RtecEventComm::PushSupplier_ptr push_supplier_;
-  // CORBA reference to remote push supplier.
-};
-
-// ************************************************************
-
-class ACE_Push_Consumer_Proxy : public RtecEventChannelAdmin_ProxyPushSupplierBOAImpl
-// = TITLE
-//     Push Consumer Proxy.
-//
-// = DESCRIPTION
-//     This is the channels proxy to a push consumer.  It implements
-//     the RtecEventChannelAdmin::ProxyPushSupplier IDL interface.
-//     Consumers use this interface to connect and disconnect from the
-//     channel.
-{
-public:
-  ACE_Push_Consumer_Proxy (ACE_ES_Consumer_Module *cm);
-  // Must be created with an consumer admin.
-
-  virtual ~ACE_Push_Consumer_Proxy (void);
-  // Default destruction
-
-  // = Interfaces exported to consumers.
-
-  virtual void connect_push_consumer (RtecEventComm::PushConsumer_ptr push_consumer,
-				      const RtecEventChannelAdmin::ConsumerQOS& qos,
-				      CORBA::Environment &);
-  // A push consumer is connecting.  <push_consumer> is a reference to
-  // the consumer.  <qos> is the subscription types for the consumer.
-
-  virtual void disconnect_push_supplier (CORBA::Environment &);
-  // The consumer is disconnecting.
-
-  virtual void suspend (CORBA::Environment &);
-  // Stop forwarding events to the calling consumer.
-
-  virtual void resume (CORBA::Environment &);
-  // Resume forwarding events to the calling consumer.
-
-  // = Event Channel operations.
-
-  void push (const RtecEventComm::EventSet &events,
-	     CORBA::Environment &);
-  // Push <events> to push_consumer_.
-
-  int connected (void);
-  // Returns 1 if the proxy has been connected to a "remote" client.
-
-  void shutdown (void);
-  // Actively disconnect from the consumer.
-
-  RtecEventChannelAdmin::ProxyPushSupplier_ptr get_ref (void);
-  // Allow transformations to RtecEventChannelAdmin::ProxyPushSupplier.
-
-  ACE_ES_Consumer_Correlation &correlation (void);
-  // Access the consumer-specific Consumer_Correlation.
-
-  RtecEventChannelAdmin::ConsumerQOS &qos (void);
-  // Filtering criteria.
-
-private:
-  RtecEventChannelAdmin::ConsumerQOS qos_;
-  // A reference to the consumers Quality of Service parameters.
-
-  ACE_ES_Consumer_Correlation correlation_;
-  // A hook so that the Correlation Module can associate correlation
-  // information with the consumer.
-
-  RtecEventChannelAdmin::ProxyPushSupplier_ptr me_;
-  // CORBA reference to self.
-  
-  RtecEventComm::PushConsumer_ptr push_consumer_;
-  // Reference to our push consumer.
-  
-  ACE_ES_Consumer_Module *consumer_module_;
-  // TODO: Maybe this should be a _var or _duplicate/_release should
-  // be used
-};
-
-// ************************************************************
-
-// Helper function that returns
-// qos.dependencies_[0].rt_info_->entry_point or "no-name".
-const char *
-ACE_ES_Consumer_Name (const RtecEventChannelAdmin::ConsumerQOS &qos);
-
-class ACE_Timeprobe
-{
-public:
-  static ACE_Timeprobe &instance ();
-
-  void timeprobe (const char *id);
-
-  void print_times () const;
-
-  void reset();
-
-  void destroy ();
-
-private:
-  static ACE_Timeprobe *instance_;
-
-  enum { SLOTS = 1024 };
-
-  u_int current_slot_;
-
-  typedef struct timeprobe_info {
-      const char *id_;
-      ACE_hrtime_t time_;
-  } timeprobe_t;
-  timeprobe_t timeprobes [SLOTS];
-
-  ACE_Timeprobe ();
-  ~ACE_Timeprobe ();
-
-  friend class null_friend_to_avoid_compiler_warning_about_no_friends;
-
-  ACE_Timeprobe (const ACE_Timeprobe &); // not implemented
-};
-
-// ************************************************************
-
-typedef ACE_ES_Simple_Array <ACE_ES_Consumer_Rep *,
-  ACE_ES_MAX_CONSUMERS_PER_SUPPLIER> ACE_ES_CRSet;
-
-typedef ACE_ES_Array_Iterator <ACE_ES_Consumer_Rep *> ACE_ES_CRSet_Iterator;
-
-#if defined (ACE_ENABLE_TIMEPROBES)
-#  define ACE_TIMEPROBE_RESET ACE_Timeprobe::instance ().reset ()
-#  define ACE_TIMEPROBE(id) ACE_Timeprobe::instance ().timeprobe (id)
-#  define ACE_TIMEPROBE_PRINT ACE_Timeprobe::instance ().print_times ()
-#  define ACE_TIMEPROBE_FINI ACE_Timeprobe::instance ().destroy ()
-#else
-#  define ACE_TIMEPROBE_RESET
-#  define ACE_TIMEPROBE(id)
-#  define ACE_TIMEPROBE_PRINT
-#  define ACE_TIMEPROBE_FINI
-#endif /* ACE_ENABLE_TIMEPROBES */
-
-#if defined (__ACE_INLINE__)
-#include "Event_Channel.i"
-#endif /* __ACE_INLINE__ */
-#endif /* ACE_EVENT_CHANNEL_H */
-
diff --git a/TAO/local/bin/Event_Service/Event_Channel.i b/TAO/local/bin/Event_Service/Event_Channel.i
deleted file mode 100644
index c452ab1ce2a..00000000000
--- a/TAO/local/bin/Event_Service/Event_Channel.i
+++ /dev/null
@@ -1,914 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-const unsigned int ACE_INT2BIT[32] =
-{
-  1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 2048, 4096, 8192,
-  16384, 32768, 65536, 131072, 262144, 524288, 1048576, 2097152,
-  4194304, 8388608, 16777216, 33554432, 67108864, 134217728,
-  268435456, 536870912, 1073741824, 2147483648,
-};
-
-// **************************************************
-
-ACE_INLINE RtecEventChannelAdmin::ProxyPushConsumer_ptr
-ACE_Push_Supplier_Proxy::get_ref (void)
-{
-  return RtecEventChannelAdmin::ProxyPushConsumer::_duplicate(me_);
-}
-
-ACE_INLINE int
-ACE_Push_Supplier_Proxy::connected (void)
-{
-  return !CORBA::is_nil((CORBA::Object*) push_supplier_);
-}
-
-ACE_INLINE ACE_ES_Subscription_Info &
-ACE_Push_Supplier_Proxy::subscription_info (void)
-{
-  return subscription_info_;
-}
-
-ACE_INLINE RtecEventChannelAdmin::SupplierQOS &
-ACE_Push_Supplier_Proxy::qos (void)
-{
-  return qos_;
-}
-
-ACE_INLINE int
-ACE_Push_Supplier_Proxy::operator== (const RtecEventComm::EventSourceID rhs)
-{
-  // Pointer comparison is fine for now.
-  return (source_id_ == rhs);
-}
-
-ACE_INLINE RtecEventComm::EventSourceID
-ACE_Push_Supplier_Proxy::source_id (void)
-{
-  return source_id_;
-}
-
-// **************************************************
-
-ACE_INLINE RtecEventChannelAdmin::ProxyPushSupplier_ptr
-ACE_Push_Consumer_Proxy::get_ref (void)
-{
-  return RtecEventChannelAdmin::ProxyPushSupplier::_duplicate(me_);
-}
-
-ACE_INLINE RtecEventChannelAdmin::ConsumerQOS &
-ACE_Push_Consumer_Proxy::qos (void)
-{
-  return qos_;
-}
-
-ACE_INLINE int
-ACE_Push_Consumer_Proxy::connected (void)
-{
-  return !CORBA::is_nil(push_consumer_);
-}
-
-ACE_INLINE void
-ACE_Push_Consumer_Proxy::push (const RtecEventComm::EventSet &events,
-			       CORBA::Environment &_env)
-{
-  ACE_TIMEPROBE ("deliver event to consumer proxy");
-
-  if (push_consumer_ == 0)
-    {
-      ACE_DEBUG ((LM_DEBUG, "Push to disconnected consumer %s: ",
-		  ::ACE_ES_Consumer_Name (this->qos ())));
-      // ACE_ES_DEBUG_ST (::dump_sequence (events));
-      return;
-    }
-
-  ACE_TRY
-    {
-      push_consumer_->push (events, ACE_TRY_ENV);
-      ACE_CHECK_ENV;
-    }
-  ACE_CATCH (RtecEventComm::Disconnected, d)
-    {
-      ACE_ERROR ((LM_ERROR, "consumer disconnected.\n"));
-      ACE_RETHROW;
-    }
-  ACE_CATCH (CORBA::SystemException, se)
-    {
-      ACE_ERROR ((LM_ERROR, "system exception.\n"));
-      ACE_RETHROW;
-    }
-  ACE_ENDTRY;
-}
-
-ACE_INLINE ACE_ES_Consumer_Correlation &
-ACE_Push_Consumer_Proxy::correlation (void)
-{
-  return correlation_;
-}
-
-ACE_INLINE RtecEventChannelAdmin::ConsumerAdmin_ptr
-ACE_ES_Consumer_Module::get_ref (void)
-{
-  return RtecEventChannelAdmin::ConsumerAdmin::_duplicate(me_);
-}
-
-ACE_INLINE RtecEventChannelAdmin::SupplierAdmin_ptr
-ACE_ES_Supplier_Module::get_ref (void)
-{
-  return RtecEventChannelAdmin::SupplierAdmin::_duplicate(me_);
-}
-
-// **************************************************
-
-ACE_INLINE RtecEventChannelAdmin::EventChannel_ptr 
-ACE_EventChannel::get_ref (void)
-{
-  return RtecEventChannelAdmin::EventChannel::_duplicate(me_);
-}
-
-ACE_INLINE RtecEventChannelAdmin::SupplierAdmin_ptr
-ACE_EventChannel::for_suppliers (CORBA::Environment &) 
-{
-  return supplier_module_->get_ref ();
-}
-
-ACE_INLINE RtecEventChannelAdmin::ConsumerAdmin_ptr
-ACE_EventChannel::for_consumers (CORBA::Environment &)
-{
-  return consumer_module_->get_ref ();
-}
-
-ACE_INLINE ACE_ES_Priority_Timer *
-ACE_EventChannel::timer (void)
-{
-  return timer_;
-}
-
-// ************************************************************
-
-// Makes a temporary Event_var and appends it to the <dest>.
-ACE_INLINE void
-operator += (ACE_CORBA_Sequence<ACE_ES_Event_Container_var> &dest,
-	     ACE_ES_Event_Container *item)
-{
-  int length = dest.length ();
-  dest.length (length + 1);
-  dest[length] = item;
-}
-
-/*
-// Makes a temporary Event_var and appends it to the <dest>.
-ACE_INLINE void
-operator += (ACE_CORBA_Sequence<RtecEventComm::Event_var> &dest,
-	     RtecEventComm::Event *item)
-{
-  //  RtecEventComm::Event_var event (item);
-  int length = dest.length ();
-  dest.length (length + 1);
-  dest[length] = item;
-}
-*/
-
-ACE_INLINE int
-operator == (const RtecEventComm::Event &event1,
-	     const RtecEventComm::Event &event2)
-{
-  // Check if the sources are equal.  0 is a wildcard.
-  if ((event1.source_ != 0) && (event2.source_ != 0)
-      && (event1.source_ != event2.source_))
-    return 0;
-
-  // Check if the types are equal.  ACE_ES_EVENT_ANY is a wildcard.
-  if ((event1.type_ != ACE_ES_EVENT_ANY) &&
-      (event2.type_ != ACE_ES_EVENT_ANY) &&
-      (event1.type_ != event2.type_))
-    return 0;
-
-  return 1;
-}
-
-// ************************************************************
-
-ACE_INLINE
-ACE_ES_ACT::ACE_ES_ACT (void)
-  : has_act_ (0)
-{
-}
-
-// ************************************************************
-
-ACE_INLINE
-ACE_ES_Disjunction_Group::ACE_ES_Disjunction_Group (void) :
-  act_ (),
-  deadline_timer_rep_ (0),
-  correlation_module_ (0)
-{
-}
-
-ACE_INLINE void
-ACE_ES_Disjunction_Group::set_correlation_module (ACE_ES_Correlation_Module *cm)
-{
-  correlation_module_ = cm;
-}
-
-ACE_INLINE void
-ACE_ES_Disjunction_Group::reschedule_deadline (void)
-{
-  if (deadline_timer_rep_ != 0)
-    {
-      if (correlation_module_->reschedule_timeout (deadline_timer_rep_) == -1)
-	ACE_ERROR ((LM_ERROR, "%p.\n", "ACE_ES_Disjunction_Group::reschedule_deadline"));
-    }
-}
-
-ACE_INLINE int
-ACE_ES_Disjunction_Group::set_deadline_timeout (ACE_ES_Consumer_Rep_Timeout *cr)
-{
-  deadline_timer_rep_ = cr;
-  // Schedule the timeout.
-  if (correlation_module_->schedule_timeout (deadline_timer_rep_) == -1)
-    return -1;
-  else
-    return 0;
-}
-
-ACE_INLINE void
-ACE_ES_Disjunction_Group::add_events (Event_Set *outbox,
-				      Event_Set *pending_events,
-				      u_long &pending_flags)
-{
-  ACE_UNUSED_ARG (pending_events);
-  ACE_UNUSED_ARG (pending_flags);
-
-  // Append the act.
-  if (act_ != 0)
-    *outbox += act_;
-}
-
-ACE_INLINE void
-ACE_ES_Disjunction_Group::set_act (RtecEventComm::Event &act)
-{
-  ACE_ES_Event_Container *temp = new ACE_ES_Event_Container (act);
-  if (temp == 0)
-    {
-      ACE_ERROR ((LM_ERROR, "%p.\n", "ACE_ES_Disjunction_Group::set_act"));
-      return;
-    }
-
-  act_ = temp;
-  temp->_release ();
-}
-
-// ************************************************************
-
-ACE_INLINE
-ACE_ES_Consumer_Rep::ACE_ES_Consumer_Rep (void) :
-  disconnected_ (0),
-  suspended_ (0),
-  correlation_type_ (ACE_ES_Consumer_Rep::NO_CORRELATION),
-  dependency_ (0),
-  correlation_ (0),
-  type_id_ (0),
-  disjunction_group_ (0),
-  ref_count_ (1)
-{
-}
-
-ACE_INLINE void
-ACE_ES_Consumer_Rep::init (ACE_ES_Consumer_Correlation *correlation,
-			   RtecEventChannelAdmin::Dependency& dependency)
-{
-  dependency_ = &dependency;
-  correlation_ = correlation;
-}
-
-ACE_INLINE RtecEventChannelAdmin::Dependency*
-ACE_ES_Consumer_Rep::dependency (void)
-{
-  return dependency_;
-}
-
-ACE_INLINE int
-ACE_ES_Consumer_Rep::type_id (void)
-{
-  return type_id_;
-}
-
-ACE_INLINE void
-ACE_ES_Consumer_Rep::type_id (int id)
-{
-  type_id_ = id;
-}
-
-ACE_INLINE ACE_ES_Consumer_Correlation *
-ACE_ES_Consumer_Rep::correlation (void)
-{
-  return correlation_;
-}
-
-ACE_INLINE u_long
-ACE_ES_Consumer_Rep::correlation_type (void)
-{
-  return correlation_type_;
-}
-
-ACE_INLINE void
-ACE_ES_Consumer_Rep::correlation_type (u_long ct)
-{
-  correlation_type_ = ct;
-}
-
-ACE_INLINE int
-ACE_ES_Consumer_Rep::add_disjunction_group (ACE_ES_Disjunction_Group &dg)
-{
-  if (disjunction_group_ != 0)
-    ACE_ERROR ((LM_ERROR, "ACE_ES_Consumer_Rep::add_disjunction_group: "
-		"disjunction_group already set!\n"));
-  disjunction_group_ = &dg;
-  return 0;
-}
-
-ACE_INLINE ACE_ES_Disjunction_Group *
-ACE_ES_Consumer_Rep::top_group (void)
-{
-  return disjunction_group_;
-}
-
-ACE_INLINE void
-ACE_ES_Consumer_Rep::reschedule_deadlines (void)
-{
-  if (disjunction_group_ != 0)
-    disjunction_group_->reschedule_deadline ();
-}
-
-ACE_INLINE int
-ACE_ES_Consumer_Rep::receiving_events (void)
-{
-  return suspended_ == 0 && disconnected_ == 0;
-}
-
-ACE_INLINE void
-ACE_ES_Consumer_Rep::suspend (void)
-{
-  suspended_ = 1;
-}
-
-ACE_INLINE void 
-ACE_ES_Consumer_Rep::resume (void)
-{
-  suspended_ = 0;
-}
-
-ACE_INLINE void
-ACE_ES_Consumer_Rep::_duplicate (void)
-{
-  // This is atomic.
-  ref_count_++;
-}
-
-ACE_INLINE void
-ACE_ES_Consumer_Rep::_release (void)
-{
-  // This is atomic.  rc is because we want to avoid Atomic_Op's
-  // operator==.  Don't change this code unless you think you're more
-  // studly than ACE_Atomic_Op.
-  int rc = --ref_count_;
-
-  if (rc == 0)
-    delete this;
-}
-
-ACE_INLINE int
-ACE_ES_Consumer_Rep::disconnected (void)
-{
-  return disconnected_;
-}
-
-ACE_INLINE void
-ACE_ES_Consumer_Rep::disconnect (void)
-{
-  disconnected_ = 1;
-}
-
-// ************************************************************
-
-// Forward <events> to all consumers subscribed to <source> only.
-ACE_INLINE int
-ACE_ES_Subscription_Module::push_source (ACE_Push_Supplier_Proxy *source,
-					 ACE_ES_Event_Container *event)
-{
-  // If there are now source-based subscribers for this supplier,
-  // return.
-  if (source->subscription_info ().source_subscribers_.size () == 0)
-    return 0;
-
-  ACE_ES_Subscription_Info::Subscriber_Set &set =
-    source->subscription_info ().source_subscribers_;
-
-  // List of consumers that need to be disconnected.
-  ACE_ES_CRSet disconnect_list;
-
-  {
-    // Acquire a read lock.
-    ACE_ES_RGUARD ace_mon (source->subscription_info ().lock_);
-    if (ace_mon.locked () == 0)
-      ACE_ERROR_RETURN ((LM_ERROR, "ACE_ES_Subscription_Module::push_source.\n"), -1);
-
-    ACE_ES_Subscription_Info::Subscriber_Set_Iterator iter (set);
-
-    ACE_TRY
-      {
-	// Iterate through all subscribers.
-	for (ACE_ES_Consumer_Rep **consumer = 0;
-	     iter.next (consumer) != 0;
-	     iter.advance ())
-	  {
-	    // Only push the event if the consumer is not suspended
-	    // and not disconnected.
-	    if ((*consumer)->receiving_events ())
-	      {
-		up_->push (*consumer, event, ACE_TRY_ENV);
-		ACE_CHECK_ENV;
-	      }
-	    // If the consumer has disconnected, schedule it for
-	    // disconnection.  We can not modify our list now.  It
-	    // would mess up the iterator.
-	    if ((*consumer)->disconnected ())
-	      disconnect_list.insert (*consumer);
-	  }
-      }
-    ACE_CATCHANY
-      {
-	return -1;
-      }
-    ACE_ENDTRY;
-
-    // Release the read lock.
-  }
-
-  // If there are consumers scheduled for disconnect, acquire a write
-  // lock and disconnect them.
-  if (disconnect_list.size () != 0)
-    {
-      ACE_ES_WGUARD ace_mon (source->subscription_info ().lock_);
-      if (ace_mon.locked () == 0)
-	ACE_ERROR_RETURN ((LM_ERROR, "ACE_ES_Subscription_Module::push_source.\n"), -1);
-
-      ACE_ES_CRSet_Iterator iter (disconnect_list.data (), disconnect_list.size ());
-
-      // Iterate through the disconnecting consumers.
-      for (ACE_ES_Consumer_Rep **consumer = 0;
-	   iter.next (consumer) != 0;
-	   iter.advance ())
-	{
-	  // Remove the consumer from subscriber list.
-	  if (set.remove (*consumer) == -1)
-	    ACE_ERROR ((LM_ERROR, "%p remove failed.\n",
-			"ACE_ES_Subscription_Module::push_source.\n"));
-	  else
-	    // Decrement the consumer rep's reference count.
-	    (*consumer)->_release ();
-	}
-    }
-
-  return 0;
-}
-
-// 1. figure out why we're going through the subscription module, instead of just passing through.
-// 2. where is lock_?  Is there only one per module!?
-
-ACE_INLINE int
-ACE_ES_Subscription_Module::push_source_type (ACE_Push_Supplier_Proxy *source,
-					      ACE_ES_Event_Container *event)
-{
-  // Step through each event in the set.  For each event type, find
-  // the corresponding set in the type collection.  Push the single
-  // event to each consumer in the set.
-
-  ACE_ES_Subscription_Info::Subscriber_Map &supplier_map =
-    source->subscription_info ().type_subscribers_;
-
-  ACE_ES_CRSet disconnect_list;
-
-  ACE_ES_Subscription_Info::Subscriber_Set *set;
-
-  {
-    ACE_ES_RGUARD ace_mon (source->subscription_info ().lock_);
-    if (ace_mon.locked () == 0)
-    {
-      ACE_TIMEPROBE ("  push_source_type");
-      ACE_ERROR_RETURN ((LM_ERROR, "ACE_ES_Subscription_Module::push_source_type.\n"), -1);
-    }
-
-    ACE_ES_Subscription_Info::Type_Subscribers *subscribers;
-
-    if (supplier_map.current_size () == 0)
-    {
-      ACE_TIMEPROBE ("  push_source_type");
-      return 0;
-    }
-
-    if (supplier_map.find (event->type_, subscribers) == -1)
-      {
-	ACE_DEBUG ((LM_ERROR, "ACE_ES_Subscription_Module::push_source_type"
-		    " Warning: event type %d not registered.\n", event->type_));
-        ACE_TIMEPROBE ("  push_source_type");
-	return 0; // continue anyway
-      }
-
-    if (subscribers->consumers_.size () == 0)
-    {
-      ACE_TIMEPROBE ("  push_source_type");
-      return 0;
-    }
-
-    set = &subscribers->consumers_;
-
-    // We've found the set of consumers subscribed to this type
-    // of event from this supplier.  Forward the event to each.
-    ACE_ES_Subscription_Info::Subscriber_Set_Iterator iter (*set);
-
-    ACE_TRY
-      {
-	for (ACE_ES_Consumer_Rep **consumer = 0;
-	     iter.next (consumer) != 0;
-	     iter.advance ())
-	  {
-	    if ((*consumer)->receiving_events ())
-	      {
-		up_->push (*consumer, event, ACE_TRY_ENV);
-		ACE_CHECK_ENV;
-	      }
-	    if ((*consumer)->disconnected ())
-	      disconnect_list.insert (*consumer);
-	  }
-      }
-    ACE_CATCHANY
-      {
-	ACE_TIMEPROBE ("  push_source_type");
-	return -1;
-      }
-    ACE_ENDTRY;
-  }
-
-  if (disconnect_list.size () != 0)
-    // Acquire a write lock and remove all disconnected consumers.
-    {
-      ACE_ES_WGUARD ace_mon (source->subscription_info ().lock_);
-      if (ace_mon.locked () == 0)
-	ACE_ERROR_RETURN ((LM_ERROR, "ACE_ES_Subscription_Module::push_source.\n"), -1);
-
-      ACE_ES_CRSet_Iterator iter (disconnect_list.data (), disconnect_list.size ());
-
-      for (ACE_ES_Consumer_Rep **consumer = 0;
-	   iter.next (consumer) != 0;
-	   iter.advance ())
-	{
-	  if (set->remove (*consumer) == -1)
-	    ACE_ERROR ((LM_ERROR, "%p remove failed.\n", 
-			"ACE_ES_Subscription_Module::push_source.\n"));
-	  else
-	    (*consumer)->_release ();
-	}
-    }
-
-  ACE_TIMEPROBE ("  push_source_type");
-  return 0;
-}
-
-// ************************************************************
-
-ACE_INLINE ACE_RTU_Manager *
-ACE_EventChannel::rtu_manager (void)
-{
-  return rtu_manager_;
-}
-
-ACE_INLINE 
-ACE_RTU_Manager::ACE_RTU_Manager (int active)
-  : active_ (active),
-    should_preempt_ (0),
-    not_done_ (0),
-    priority_ (ACE_Scheduler_MIN_PREEMPTION_PRIORITY)
-{
-}
-
-ACE_INLINE int
-ACE_RTU_Manager::should_preempt (void)
-{
-  if (!active_)
-    return 0;
-  else
-    {
-      // Expire any timers.  Am I evil for putting this here?
-      ACE_Time_Value tv;
-      if (ACE_Task_Manager::instance ()->
-	  GetReactorTask (0)->get_reactor ().handle_events (&tv) == -1)
-	ACE_ERROR ((LM_ERROR, "%p.\n",
-		    "ACE_RTU_Manager::should_preempt"));
-
-      int should_preempt = should_preempt_;
-      should_preempt_ = 0;
-      return should_preempt;
-    }
-}
-
-ACE_INLINE void
-ACE_RTU_Manager::should_preempt (int s)
-{
-  should_preempt_ = s;
-}
-
-ACE_INLINE int
-ACE_RTU_Manager::not_done (void)
-{
-  int not_done = not_done_;
-  not_done_ = 0;
-  return not_done;
-}
-
-ACE_INLINE void
-ACE_RTU_Manager::not_done (int nd)
-{
-  not_done_ = nd;
-}
-
-ACE_INLINE RtecScheduler::OS_Priority
-ACE_RTU_Manager::priority (void)
-{
-  return priority_;
-}
-
-ACE_INLINE void
-ACE_RTU_Manager::priority (RtecScheduler::OS_Priority p)
-{
-  priority_ = p;
-}
-
-// ************************************************************
-
-ACE_INLINE
-ACE_ES_Consumer_Rep_Timeout::ACE_ES_Consumer_Rep_Timeout (void) :
-  timer_id_ (0),
-  preemption_priority_ (ACE_Scheduler_MIN_PREEMPTION_PRIORITY),
-  timeout_event_ ()
-{
-}
-
-ACE_INLINE void
-ACE_ES_Consumer_Rep_Timeout::init (ACE_ES_Consumer_Correlation *correlation,
-				   RtecEventChannelAdmin::Dependency &dep)
-{
-  ACE_ES_Event_Container *temp = new ACE_ES_Event_Container (dep.event_);
-  if (temp == 0)
-    {
-      ACE_ERROR ((LM_ERROR, "%p.\n", "ACE_ES_Consumer_Rep_Timeout::init"));
-      return;
-    }
-
-  timeout_event_ = temp;
-  temp->_release ();
-
-  ACE_ES_Consumer_Rep::init (correlation, dep);
-}
-
-ACE_INLINE int
-ACE_ES_Consumer_Rep_Timeout::timer_id (void)
-{
-  return timer_id_;
-}
-
-ACE_INLINE void
-ACE_ES_Consumer_Rep_Timeout::timer_id (int id)
-{
-  timer_id_ = id;
-}
-
-ACE_INLINE RtecScheduler::OS_Priority 
-ACE_ES_Consumer_Rep_Timeout::preemption_priority (void)
-{
-  return preemption_priority_;
-}
-
-ACE_INLINE void
-ACE_ES_Consumer_Rep_Timeout::preemption_priority (RtecScheduler::OS_Priority p)
-{
-  preemption_priority_ = p;
-}
-
-// ************************************************************
-
-ACE_INLINE void
-ACE_ES_Consumer_Correlation::suspend (void)
-{
-  for (int x=0; x < n_timer_reps_; x++)
-    timer_reps_[x].suspend ();
-  
-  for (int y=0; y < n_consumer_reps_; y++)
-    consumer_reps_[y]->suspend ();
-}
-
-ACE_INLINE void 
-ACE_ES_Consumer_Correlation::resume (void)
-{
-  for (int x=0; x < n_timer_reps_; x++)
-    timer_reps_[x].resume ();
-  
-  for (int y=0; y < n_consumer_reps_; y++)
-    consumer_reps_[y]->resume ();
-}
-
-// ************************************************************
-
-ACE_INLINE
-ACE_ES_Dependency_Iterator::ACE_ES_Dependency_Iterator (RtecEventChannelAdmin::DependencySet &rep) :
-  rt_info_ (0),
-  rep_ (rep),
-  index_ (-1),
-  n_conjunctions_ (0),
-  n_disjunctions_ (0),
-  n_timeouts_ (0),
-  n_events_ (0)
-{
-}
-
-ACE_INLINE int
-ACE_ES_Dependency_Iterator::advance_dependency (void)
-{
-  index_++;
-  if ((CORBA::ULong) index_ >= rep_.length ())
-    return -1;
-  else
-    return 0;
-}
-
-ACE_INLINE RtecEventChannelAdmin::Dependency &
-ACE_ES_Dependency_Iterator::operator *(void)
-{
-  return rep_[index_];
-}
-
-ACE_INLINE int
-ACE_ES_Dependency_Iterator::parse (void)
-{
-  for (CORBA::ULong x = 0; x < rep_.length (); x++)
-    {
-      if (rt_info_ == 0)
-	rt_info_ = rep_[x].rt_info;
-	
-      switch (rep_[x].event_.type_)
-	{
-	case ACE_ES_CONJUNCTION_DESIGNATOR:
-	  n_conjunctions_++;
-	  break;
-
-	case ACE_ES_DISJUNCTION_DESIGNATOR:
-	  n_disjunctions_++;
-	  break;
-
-	case ACE_ES_EVENT_TIMEOUT:
-	case ACE_ES_EVENT_INTERVAL_TIMEOUT:
-	case ACE_ES_EVENT_DEADLINE_TIMEOUT:
-	  n_timeouts_++;
-	  break;
-
-	default:
-	  n_events_++;
-	  break;
-	}
-    }
-
-  return 0;
-}
-
-ACE_INLINE int
-ACE_ES_Dependency_Iterator::n_conjunctions (void)
-{
-  return n_conjunctions_;
-}
-
-ACE_INLINE int
-ACE_ES_Dependency_Iterator::n_disjunctions (void)
-{
-  return n_disjunctions_;
-}
-
-ACE_INLINE int
-ACE_ES_Dependency_Iterator::n_timeouts (void)
-{
-  return n_timeouts_;
-}
-
-ACE_INLINE int
-ACE_ES_Dependency_Iterator::n_events (void)
-{
-  return n_events_;
-}
-
-ACE_INLINE RtecScheduler::handle_t
-ACE_ES_Dependency_Iterator::first_rt_info (void)
-{
-  return rt_info_;
-}
-
-// ************************************************************
-
-ACE_INLINE
-ACE_Timeprobe::ACE_Timeprobe ()
-  : current_slot_ (0)
-{
-}
-
-ACE_INLINE
-ACE_Timeprobe::~ACE_Timeprobe ()
-{
-}
-
-ACE_INLINE void
-ACE_Timeprobe::destroy ()
-{
-  delete instance_;
-  instance_ = 0;
-}
-
-ACE_INLINE void
-ACE_Timeprobe::reset()
-{
-  current_slot_ = 0;
-}
-
-// ************************************************************
-
-ACE_INLINE
-ACE_ES_Conjunction_Group::ACE_ES_Conjunction_Group (void) :
-  forward_value_ (0)
-{
-}
-
-ACE_INLINE int
-ACE_ES_Conjunction_Group::add_type (int type_id)
-{
-  ACE_SET_BITS (forward_value_, ACE_INT2BIT[type_id]);
-  return 0;
-}
-
-/*
-  // Set length bits.
-  for (int x=0; x < length; x++)
-  {
-  forward_value_ <<= 1;
-  forward_value_ |= 1;
-  }
-  */
-
-ACE_INLINE int
-ACE_ES_Conjunction_Group::should_forward (u_long pending_flags)
-{
-  if ((forward_value_ & pending_flags) == forward_value_)
-    return 1;
-  else
-    return 0;
-}
-
-ACE_INLINE void
-ACE_ES_Conjunction_Group::add_events (Event_Set *outbox,
-				      Event_Set *pending_events,
-				      u_long &pending_flags)
-{
-  // Append the act first.
-  if (act_ != 0)
-    *outbox += act_;
-
-  u_long fv = forward_value_;
-  int x = 0;
-  while (fv > 0)
-    {
-      // If this type_id is part of the correlation, then append each
-      // event pending to the outbox.
-      if (ACE_BIT_ENABLED (forward_value_, ACE_INT2BIT[x]))
-	{
-	  // Step through each of the pending events.
-	  Event_Set &pending = pending_events[x];
-	  for (CORBA::ULong y=0; y < pending.length (); y++)
-	    {
-	      // Add the pending event to the outbox.
-	      if (outbox != 0)
-		*outbox += pending[y];
-	      // Remove the event from the pending events array.
-	      pending[y] = 0;
-	    }
-
-	  // Reset the array length.
-	  pending.length (0);
-	  // Since we just emptied the events for this type, clear the
-	  // x^th bit in pending flags.
-	  ACE_CLR_BITS (pending_flags, ACE_INT2BIT[x]);
-	  // Clear the x^th bit in fv.
-	  ACE_CLR_BITS (fv, ACE_INT2BIT[x]);
-	}
-
-      x++;
-    }
-}
-
-// ************************************************************
diff --git a/TAO/local/bin/Event_Service/Event_Service.cpp b/TAO/local/bin/Event_Service/Event_Service.cpp
deleted file mode 100644
index 7ce9a0a91d1..00000000000
--- a/TAO/local/bin/Event_Service/Event_Service.cpp
+++ /dev/null
@@ -1,82 +0,0 @@
-//
-// $Id$
-//
-
-#include "ace/Get_Opt.h"
-#include "tao/corba.h"
-
-#include "CosNamingC.h"
-#include "Scheduler_Factory.h"
-#include "Event_Channel.h"
-#include "Event_Utilities.h"
-
-
-
-int main (int argc, char *argv[])
-{
-  ACE_TRY
-    {
-      // Initialize ORB.
-      CORBA::ORB_ptr orb = 
-	CORBA::ORB_init (argc, argv, "internet", ACE_TRY_ENV);
-      ACE_CHECK_ENV;
-
-      CORBA::POA_ptr poa =
-	orb->POA_init(argc, argv, "POA");
-      if (poa == 0)
-	{
-	  ACE_ERROR_RETURN ((LM_ERROR,
-			     " (%P|%t) Unable to initialize the POA.\n"),
-			    1);
-	}
-
-#if 0
-      CORBA::Object_ptr objref =
-	orb->resolve_initial_references ("NameService");
-      ACE_CHECK_ENV;
-
-      CosNaming::NamingContext_var naming_context = 
-        CosNaming::NamingContext::_narrow (objref, ACE_TRY_ENV);
-      ACE_CHECK_ENV;
-
-      ACE_DEBUG ((LM_DEBUG, "got reference to NameService\n"));
-
-      ACE_Scheduler_Factory::use_config (naming_context);
-#else
-      ACE_Scheduler_Factory::use_config (orb);
-#endif
-
-      // Register Event_Service with Naming Service.
-      ACE_EventChannel* ec;
-      ACE_NEW_RETURN (ec, ACE_EventChannel, -1);
-      CORBA::Object::_duplicate(ec);
-      ACE_CHECK_ENV;
-
-      CORBA::String str =
-	orb->object_to_string (ec, ACE_TRY_ENV);
-      ACE_OS::puts ((char *) str);
-
-#if 0
-      // @@ TODO: Should this be done automatically by the Event_Channel
-      // constructor?
-      CosNaming::Name channel_name (1);
-      channel_name[0].id = CORBA::string_dup ("EventService");
-      channel_name.length (1);
-      naming_context->bind (channel_name, ec, ACE_TRY_ENV);
-      ACE_CHECK_ENV;
-#endif
-
-      orb->run ();
-
-      CORBA::release (ec);
-      ACE_CHECK_ENV;
-    }
-  ACE_CATCHANY
-    {
-      ACE_TRY_ENV.print_exception ("EC");
-    }
-  ACE_ENDTRY;
-
-
-  return 0;
-}
diff --git a/TAO/local/bin/Event_Service/Fast_Reactor.h b/TAO/local/bin/Event_Service/Fast_Reactor.h
deleted file mode 100644
index d8af39b4f1d..00000000000
--- a/TAO/local/bin/Event_Service/Fast_Reactor.h
+++ /dev/null
@@ -1,49 +0,0 @@
-//
-// $Id$
-//
-#if !defined (FAST_REACTOR_H)
-#define FAST_REACTOR_H
-
-#if defined (ACE_OLD_STYLE_REACTOR)
-# if defined (ACE_WIN32)
-#   include "ace/ReactorEx.h"
-#   define ACE_ES_FAST_REACTOR_BASE ACE_ReactorEx 
-# else 
-#   include "ace/Reactor.h"
-#   define ACE_ES_FAST_REACTOR_BASE ACE_Reactor 
-# endif /* ACE_WIN32 */
-#else
-# if defined (ACE_WIN32)
-#   include "ace/WFMO_Reactor.h"
-#   define ACE_ES_FAST_REACTOR_BASE ACE_WFMO_Reactor
-# else 
-#   include "ace/Select_Reactor.h"
-#   define ACE_ES_FAST_REACTOR_BASE ACE_Select_Reactor 
-# endif /* ACE_WIN32 */
-#endif /* ACE_OLD_STYLE_REACTOR */
-//## end module.includes
-
-class ACE_ES_Fast_Reactor : public ACE_ES_FAST_REACTOR_BASE
-{
-public:
-  virtual int handle_events (ACE_Time_Value *max_wait_time = 0)
-  {
-    ACE_Time_Value timer_buf (0) ;
-    ACE_Time_Value *this_timeout = &timer_buf ;
-
-    if (this->timer_queue_->calculate_timeout (max_wait_time,
-					       this_timeout) == 0) 
-      {
-	ACE_Time_Value t (0, 500000);
-	ACE_OS::select (0, 0, 0, 0, &t);
-      }
-    else
-      {
-	ACE_OS::select (0, 0, 0, 0, this_timeout);
-      }
-
-    return this->timer_queue_->expire () == -1 ? -1 : 0;
-  }
-};
-
-#endif /* FAST_REACTOR_H */
diff --git a/TAO/local/bin/Event_Service/GPlot_File.cpp b/TAO/local/bin/Event_Service/GPlot_File.cpp
deleted file mode 100644
index 2f985e5d47c..00000000000
--- a/TAO/local/bin/Event_Service/GPlot_File.cpp
+++ /dev/null
@@ -1,171 +0,0 @@
-// $Id$
-//
-// ============================================================================
-//
-// = FILENAME
-//    GPlot_File.cpp
-//
-// = AUTHOR
-//    Tim Harrison
-// 
-// ============================================================================
-
-#include "GPlot_File.h"
-
-#if !defined (__ACE_INLINE__)
-#include "GPlot_File.i"
-#endif /* __ACE_INLINE__ */
-
-int
-ACE_GPlot_File::open (const char *filename)
-{
-  ACE_OS::strcpy (filename_, filename);
-
-  FILE *read_file = ACE_OS::fopen (filename_, "r");
-
-  long entry;
-  char *value;
-  ACE_NEW_RETURN (value, char [32], -1);
-
-  if (read_file > 0)
-    {
-      int result;
-      do
-	{
-	  result = fscanf (read_file,
-			   "%ld\t%s\n",
-			   &entry,
-			   value);
-
-	  //if ((result == -1) && (ACE_OS::last_error () != 0))
-	  //ACE_ERROR_RETURN ((LM_ERROR, "%p.\n", "ACE_GPlot_File::open"), -1);
-
-	  if (result > 0)
-	    // Success.
-	    map_.bind (entry, value);
-	  else if (result != EOF)
-	    // Error.
-	    {
-	      ACE_OS::fclose (read_file);
-	      ACE_ERROR_RETURN 
-		((LM_ERROR, "Error reading GPlot file %s.\n", filename_), -1);
-	    }
-	} while (result != EOF);
-
-      fclose (read_file);
-    }
-
-  write_file_ = ACE_OS::fopen (filename_, "w");
-  if (write_file_ == 0)
-    ACE_ERROR_RETURN ((LM_ERROR, "%p: can't open\n", filename_), -1);
-
-  closed_ = 0;
-
-  return 0;
-}
-
-
-void
-ACE_GPlot_File::close (void)
-{
-  if (closed_ == 0)
-    {
-      closed_ = 1;
-      GPLOT_ITERATOR iterator ((GPLOT_MAP &) map_);
-      for (GPLOT_ENTRY *entry; iterator.next (entry); iterator.advance ())
-        {
-	  ACE_OS::fprintf (write_file_, "%ld\t%s\n",
-			   entry->ext_id_, entry->int_id_);
-          delete [] entry->int_id_;
-        }
-
-      ACE_OS::fclose (write_file_);
-    }
-}
-
-
-void
-ACE_GPlot_File::dump (void)
-{
-  GPLOT_ITERATOR iterator ((GPLOT_MAP &) map_);
-  for (GPLOT_ENTRY *entry; iterator.next (entry); iterator.advance ())
-    {
-      if (entry->int_id_ != 0)
-	ACE_DEBUG ((LM_DEBUG, "%d\t%s\n", entry->ext_id_, entry->int_id_));
-      else
-	{
-	  ACE_ERROR ((LM_ERROR, "Value for entry %d is null.\n",
-		      entry->ext_id_));
-	  return;
-	}
-    }
-}
-
-
-int
-ACE_GPlot_File::get (long entry, long &value)
-{
-  char *val;
-
-  if (map_.find (entry, val) == -1)
-    return -1;
-  else
-    {
-      ::sscanf (val, "%ld", &value);
-      return 0;
-    }
-}
-
-
-int
-ACE_GPlot_File::get (long entry, float &value)
-{
-  char *val;
-
-  if (map_.find (entry, val) == -1)
-    return -1;
-  else
-    {
-      ::sscanf (val, "%f", &value);
-      return 0;
-    }
-}
-
-
-void
-ACE_GPlot_File::set (long entry, long value)
-{
-  long old_entry;
-  char *val;
-  char *old_value;
-
-  ACE_NEW (val, char [32]);
-
-  ::sprintf (val, "%ld", value);
-  map_.rebind (entry, val, old_entry, old_value);
-
-  delete [] old_value;
-}
-
-
-void
-ACE_GPlot_File::set (long entry, float value)
-{
-  long old_entry;
-  char *val;
-  char *old_value;
-
-  ACE_NEW (val, char [32]);
-
-  ::sprintf (val, "%f", value);
-  map_.rebind (entry, val, old_entry, old_value);
-
-  delete [] old_value;
-}
-
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Map_Entry<long, char *>;
-template class ACE_Map_Iterator<long, char *, ACE_Null_Mutex>;
-template class ACE_Map_Manager<long, char *, ACE_Null_Mutex>;
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/local/bin/Event_Service/GPlot_File.h b/TAO/local/bin/Event_Service/GPlot_File.h
deleted file mode 100644
index dc6040d0ed7..00000000000
--- a/TAO/local/bin/Event_Service/GPlot_File.h
+++ /dev/null
@@ -1,96 +0,0 @@
-// $Id$
-//
-// ============================================================================
-//
-// = FILENAME
-//    GPlot_File.h
-//
-// = AUTHOR
-//    Tim Harrison
-// 
-// ============================================================================
-
-#if !defined (ACE_GPlot_File_H)
-#define ACE_GPlot_File_H
-
-#include "ace/Map_Manager.h"
-#include "ace/Synch.h"
-
-class ACE_GPlot_File
-// = TITLE
-//    Reads and writes files in GPlot format.
-//
-// = DESCRIPTION
-//    Gplot formats are as follows:
-//      entry   value
-//      entry   value
-//      entry   value
-//	  ...
-//    They represent x,y pairs to be graphed by GPlot.  entry's are
-//    type long.  value's are type long or float.
-{
-public:
-  ACE_GPlot_File (void);
-  // Construction.
-
-  ~ACE_GPlot_File (void);
-  // Destruction.  Calls this->close.
-
-  int open (const char *filename);
-  // If the file does not exist, create it. If the file exists open
-  // the file and read all the entries into map_.  Returns 0 on
-  // success, -1 on failure.
-
-  void close (void);
-  // Close the file and sync all the contents.
-
-  int get (long entry, long &value);
-  // Get the entry at this value.  Returns 0 if a value was found.
-  // Returns -1 if no value has been set for <entry>.
-
-  int get (long entry, float &value);
-  // Get the entry at this value.  Returns 0 if a value was found.
-  // Returns -1 if no value has been set for <entry>.
-
-  void set (long entry, long value);
-  // Set the entry at this value.
-
-  void set (long entry, float value);
-  // Set the entry at this value.
-
-  void set_greatest (long entry, long value);
-  // Compare <value> with the value at <entry>.  Store the largest.
-
-  void set_greatest (long entry, float value);
-  // Compare <value> with the value at <entry>.  Store the largest.
-
-  void set_least (long entry, long value);
-  // Compare <value> with the value at <entry>.  Store the smallest.
-
-  void set_least (long entry, float value);
-  // Compare <value> with the value at <entry>.  Store the smallest.
-
-  void dump (void);
-  // Dump state of the object.
-
-private:
-  // = map_ stores all values.  It is sync'ed to file when this->close
-  // is called.
-  typedef ACE_Map_Entry <long, char *> GPLOT_ENTRY;
-  typedef ACE_Map_Iterator <long, char *, ACE_Null_Mutex> GPLOT_ITERATOR;
-  typedef ACE_Map_Manager<long, char *, ACE_Null_Mutex> GPLOT_MAP;
-  GPLOT_MAP map_;
-
-  char filename_[BUFSIZ];
-  FILE *write_file_;
-
-  int closed_;
-  // Only close once.
-};
-
-#if defined (__ACE_INLINE__)
-#include "GPlot_File.i"
-#endif /* __ACE_INLINE__ */
-
-
-#endif /* ACE_GPlot_File_H */
diff --git a/TAO/local/bin/Event_Service/GPlot_File.i b/TAO/local/bin/Event_Service/GPlot_File.i
deleted file mode 100644
index ab9f235dc39..00000000000
--- a/TAO/local/bin/Event_Service/GPlot_File.i
+++ /dev/null
@@ -1,70 +0,0 @@
-// $Id$
-
-ACE_INLINE
-ACE_GPlot_File::ACE_GPlot_File (void)
-  : closed_ (1)
-{
-}
-
-
-ACE_INLINE
-ACE_GPlot_File::~ACE_GPlot_File (void)
-{
-  this->close ();
-}
-
-
-ACE_INLINE
-void
-ACE_GPlot_File::set_greatest (long entry, long value)
-{
-  long old_value;
-
-  // If there was no previous value, or the <value> is greater than
-  // the previous value, set a new value.
-  if (this->get (entry, old_value) == -1 ||
-      value > old_value)
-    this->set (entry, value);
-}
-
-
-ACE_INLINE
-void
-ACE_GPlot_File::set_greatest (long entry, float value)
-{
-  float old_value;
-
-  // If there was no previous value, or the <value> is greater than
-  // the previous value, set a new value.
-  if (this->get (entry, old_value) == -1 ||
-      value > old_value)
-    this->set (entry, value);
-}
-
-
-ACE_INLINE
-void
-ACE_GPlot_File::set_least (long entry, long value)
-{
-  long old_value;
-
-  // If there was no previous value, or the <value> is less than
-  // the previous value, set a new value.
-  if (this->get (entry, old_value) == -1 ||
-      value < old_value)
-    this->set (entry, value);
-}
-
-
-ACE_INLINE
-void
-ACE_GPlot_File::set_least (long entry, float value)
-{
-  float old_value;
-
-  // If there was no previous value, or the <value> is less than
-  // the previous value, set a new value.
-  if (this->get (entry, old_value) == -1 ||
-      value < old_value)
-    this->set (entry, value);
-}
diff --git a/TAO/local/bin/Event_Service/Local_ESTypes.cpp b/TAO/local/bin/Event_Service/Local_ESTypes.cpp
deleted file mode 100644
index ebfd367dc9a..00000000000
--- a/TAO/local/bin/Event_Service/Local_ESTypes.cpp
+++ /dev/null
@@ -1,9 +0,0 @@
-//
-// $Id$
-//
-
-#include "Local_ESTypes.h"
-
-#if !defined (__ACE_INLINE__)
-#include "Local_ESTypes.i"
-#endif /* __ACE_INLINE__ */
diff --git a/TAO/local/bin/Event_Service/Local_ESTypes.h b/TAO/local/bin/Event_Service/Local_ESTypes.h
deleted file mode 100644
index 3acea23d8d7..00000000000
--- a/TAO/local/bin/Event_Service/Local_ESTypes.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-//
-// ============================================================================
-//
-// = LIBRARY
-//    ORB Services
-// 
-// = FILENAME
-//    Local_ESTypes.h
-//
-// = AUTHOR
-//    Tim Harrison (harrison@cs.wustl.edu)
-//
-// = DESCRIPTION
-//    Manual types that would otherwise be defined/implemented via an
-//    IDL compiler.
-//    NOTE: the file is obsolecent, we have TAO now, but we keep it
-//    to speed up the porting.
-//
-// ============================================================================
-
-#ifndef ACE_LOCAL_ESTYPES_H
-#define ACE_LOCAL_ESTYPES_H
-
-#include <tao/corba.h>
-
-#include "Event_Service_Constants.h"
-
-#include "CosNamingC.h"
-#include "RtecSchedulerC.h"
-#include "RtecSchedulerS.h"
-#include "RtecEventCommC.h"
-#include "RtecEventCommS.h"
-#include "RtecEventChannelAdminC.h"
-#include "RtecEventChannelAdminS.h"
-
-#define ACE_DEFAULT_EVENT_CHANNEL_TYPE 0
-
-// These are to help MSVC++ 4.2 deal with inheritence of nested types.
-// Not needed for Sun C++ or MSVC++ 5.0.
-
-// @@ NOTE: TAO uses the POA mapping instead of the old BOA, but all the
-// code still uses the BOA name for the skeleton classes, to speed up
-// porting we keep to old names.
-
-typedef RtecEventComm::Event RtecEventComm_Event;
-typedef POA_RtecScheduler::Scheduler RtecScheduler_SchedulerBOAImpl;
-typedef POA_RtecEventChannelAdmin::EventChannel RtecEventChannelAdmin_EventChannelBOAImpl;
-typedef POA_RtecEventComm::PushSupplier RtecEventComm_PushSupplierBOAImpl;
-typedef POA_RtecEventChannelAdmin::ConsumerAdmin RtecEventChannelAdmin_ConsumerAdminBOAImpl;
-typedef POA_RtecEventChannelAdmin::SupplierAdmin RtecEventChannelAdmin_SupplierAdminBOAImpl;
-typedef POA_RtecEventChannelAdmin::ProxyPushConsumer RtecEventChannelAdmin_ProxyPushConsumerBOAImpl;
-typedef POA_RtecEventChannelAdmin::ProxyPushSupplier RtecEventChannelAdmin_ProxyPushSupplierBOAImpl;
-typedef POA_RtecEventComm::PushConsumer RtecEventComm_PushConsumerBOAImpl;
-typedef POA_RtecEventComm::PushSupplier RtecEventComm_PushSupplierBOAImpl;
-
-#if defined (__ACE_INLINE__)
-#include "Local_ESTypes.i"
-#endif /* __ACE_INLINE__ */
-
-#endif /* ACE_LOCAL_ESTYPES_H */
diff --git a/TAO/local/bin/Event_Service/Local_ESTypes.i b/TAO/local/bin/Event_Service/Local_ESTypes.i
deleted file mode 100644
index 8f8ef4cfe2d..00000000000
--- a/TAO/local/bin/Event_Service/Local_ESTypes.i
+++ /dev/null
@@ -1,5 +0,0 @@
-/* -*- C++ -*- */
-//
-// $Id$
-//
-
diff --git a/TAO/local/bin/Event_Service/Makefile b/TAO/local/bin/Event_Service/Makefile
deleted file mode 100644
index e91f278121a..00000000000
--- a/TAO/local/bin/Event_Service/Makefile
+++ /dev/null
@@ -1,1226 +0,0 @@
-#
-# $Id$
-#
-
-BIN = Event_Service
-BUILD = $(BIN)
-
-LSRC = 	\
-	Event_Service.cpp \
-	BCU.cpp \
-	CORBA_Utils_T.cpp \
-	Dispatching_Modules.cpp \
-	Event_Channel.cpp \
-	GPlot_File.cpp \
-	Local_ESTypes.cpp \
-	Memory_Pools.cpp \
-	RT_Task.cpp \
-	ReactorTask.cpp \
-	Task_Manager.cpp \
-
-ES_OBJS=$(LSRC:.cpp=.o)
-
-LDLIBS = -lorbsvcs -lTAO
-
-#----------------------------------------------------------------------------
-#	Include macros and targets
-#----------------------------------------------------------------------------
-
-include	$(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-include	$(ACE_ROOT)/include/makeinclude/macros.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.common.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
-#include	$(ACE_ROOT)/include/makeinclude/rules.bin.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
-
-ifndef TAO_ROOT
-TAO_ROOT = $(ACE_ROOT)/TAO
-endif
-TSS_ORB_FLAG = #-DTAO_HAS_TSS_ORBCORE
-DCFLAGS = -g
-LDFLAGS += -L$(TAO_ROOT)/orbsvcs/lib -L$(TAO_ROOT)/tao
-CPPFLAGS += -I$(TAO_ROOT)/orbsvcs/lib -I$(TAO_ROOT) -I$(TAO_ROOT)/tao/compat $(TSS_ORB_FLAG)#-H
-
-Event_Service: $(addprefix $(VDIR),$(ES_OBJS))
-	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS)
-
-#----------------------------------------------------------------------------
-#	Dependencies
-#----------------------------------------------------------------------------
-
-# DO NOT DELETE THIS LINE -- g++dep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-
-.obj/Event_Service.o .shobj/Event_Service.: Event_Service.cpp \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/stdcpp.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Get_Opt.i \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/Task_T.i \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Svc_Handler.i \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(TAO_ROOT)/tao/orbconf.h \
- $(TAO_ROOT)/tao/orb.h \
- $(TAO_ROOT)/tao/corbacom.h \
- $(TAO_ROOT)/tao/object.h \
- $(TAO_ROOT)/tao/align.h \
- $(TAO_ROOT)/tao/sequence.h \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/any.h \
- $(TAO_ROOT)/tao/poa.h \
- $(TAO_ROOT)/tao/tao_internals.h \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/client_factory.h \
- $(TAO_ROOT)/tao/server_factory.h \
- $(TAO_ROOT)/tao/default_client.h \
- $(TAO_ROOT)/tao/default_server.h \
- $(TAO_ROOT)/tao/except.h \
- $(TAO_ROOT)/tao/orbobj.h \
- $(TAO_ROOT)/tao/nvlist.h \
- $(TAO_ROOT)/tao/principa.h \
- $(TAO_ROOT)/tao/request.h \
- $(TAO_ROOT)/tao/svrrqst.h \
- $(TAO_ROOT)/tao/typecode.h \
- $(TAO_ROOT)/tao/marshal.h \
- $(TAO_ROOT)/tao/cdr.h \
- $(TAO_ROOT)/tao/stub.h \
- $(TAO_ROOT)/tao/connect.h \
- $(TAO_ROOT)/tao/orb_core.h \
- $(TAO_ROOT)/tao/objtable.h \
- $(TAO_ROOT)/tao/optable.h \
- $(TAO_ROOT)/tao/debug.h \
- $(TAO_ROOT)/tao/managed_types.h \
- $(TAO_ROOT)/tao/iiopobj.h \
- $(TAO_ROOT)/tao/iioporb.h \
- $(TAO_ROOT)/tao/giop.h \
- $(TAO_ROOT)/tao/orb_core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(TAO_ROOT)/tao/corbacom.i \
- $(TAO_ROOT)/tao/sequence.i \
- $(TAO_ROOT)/tao/typecode.i \
- $(TAO_ROOT)/tao/any.i \
- $(TAO_ROOT)/tao/cdr.i \
- $(TAO_ROOT)/tao/stub.i \
- $(TAO_ROOT)/tao/object.i \
- $(TAO_ROOT)/tao/orbobj.i \
- $(TAO_ROOT)/tao/marshal.i \
- $(TAO_ROOT)/tao/poa.i \
- $(TAO_ROOT)/tao/giop.i \
- $(TAO_ROOT)/tao/iioporb.i \
- $(TAO_ROOT)/tao/iiopobj.i \
- $(TAO_ROOT)/tao/managed_types.i \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/server_factory.i \
- $(TAO_ROOT)/tao/default_client.i \
- $(TAO_ROOT)/tao/default_server.i \
- $(TAO_ROOT)/tao/connect.i \
- $(TAO_ROOT)/tao/singletons.h \
- $(TAO_ROOT)/orbsvcs/lib/CosNamingC.h \
- $(TAO_ROOT)/orbsvcs/lib/CosNamingC.i \
- $(TAO_ROOT)/orbsvcs/lib/Scheduler_Factory.h \
- $(TAO_ROOT)/orbsvcs/lib/RtecSchedulerC.h \
- $(TAO_ROOT)/orbsvcs/lib/RtecSchedulerC.i \
- $(TAO_ROOT)/orbsvcs/lib/Scheduler_Factory.i \
- Event_Channel.h Local_ESTypes.h \
- $(TAO_ROOT)/orbsvcs/lib/Event_Service_Constants.h \
- $(TAO_ROOT)/orbsvcs/lib/RtecSchedulerS.h \
- $(TAO_ROOT)/orbsvcs/lib/RtecSchedulerS.i \
- $(TAO_ROOT)/orbsvcs/lib/RtecEventCommC.h \
- $(TAO_ROOT)/orbsvcs/lib/RtecEventCommC.i \
- $(TAO_ROOT)/orbsvcs/lib/RtecEventCommS.h \
- $(TAO_ROOT)/orbsvcs/lib/RtecEventCommS.i \
- $(TAO_ROOT)/orbsvcs/lib/RtecEventChannelAdminC.h \
- $(TAO_ROOT)/orbsvcs/lib/RtecEventChannelAdminC.i \
- $(TAO_ROOT)/orbsvcs/lib/RtecEventChannelAdminS.h \
- $(TAO_ROOT)/orbsvcs/lib/RtecEventChannelAdminS.i \
- Local_ESTypes.i CORBA_Utils_T.h CORBA_Utils_T.i Task_Manager.h \
- RT_Task.h RT_Task.i Task_Manager.i ReactorTask.h Fast_Reactor.h \
- $(ACE_ROOT)/ace/Select_Reactor.h \
- $(ACE_ROOT)/ace/Token.h \
- $(ACE_ROOT)/ace/Token.i \
- $(ACE_ROOT)/ace/Pipe.h \
- $(ACE_ROOT)/ace/Pipe.i \
- $(ACE_ROOT)/ace/Select_Reactor.i \
- $(ACE_ROOT)/ace/Timer_Heap.h \
- $(ACE_ROOT)/ace/Timer_Heap_T.h \
- $(ACE_ROOT)/ace/Timer_List.h \
- $(ACE_ROOT)/ace/Timer_List_T.h \
- Event_Channel.i \
- $(TAO_ROOT)/orbsvcs/lib/Event_Utilities.h \
- $(TAO_ROOT)/orbsvcs/lib/Event_Utilities.i
-.obj/BCU.o .shobj/BCU.: BCU.cpp BCU.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/stdcpp.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i
-.obj/CORBA_Utils_T.o .shobj/CORBA_Utils_T.: CORBA_Utils_T.cpp CORBA_Utils_T.h \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/stdcpp.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/Task_T.i \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Svc_Handler.i \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(TAO_ROOT)/tao/orbconf.h \
- $(TAO_ROOT)/tao/orb.h \
- $(TAO_ROOT)/tao/corbacom.h \
- $(TAO_ROOT)/tao/object.h \
- $(TAO_ROOT)/tao/align.h \
- $(TAO_ROOT)/tao/sequence.h \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/any.h \
- $(TAO_ROOT)/tao/poa.h \
- $(TAO_ROOT)/tao/tao_internals.h \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/client_factory.h \
- $(TAO_ROOT)/tao/server_factory.h \
- $(TAO_ROOT)/tao/default_client.h \
- $(TAO_ROOT)/tao/default_server.h \
- $(TAO_ROOT)/tao/except.h \
- $(TAO_ROOT)/tao/orbobj.h \
- $(TAO_ROOT)/tao/nvlist.h \
- $(TAO_ROOT)/tao/principa.h \
- $(TAO_ROOT)/tao/request.h \
- $(TAO_ROOT)/tao/svrrqst.h \
- $(TAO_ROOT)/tao/typecode.h \
- $(TAO_ROOT)/tao/marshal.h \
- $(TAO_ROOT)/tao/cdr.h \
- $(TAO_ROOT)/tao/stub.h \
- $(TAO_ROOT)/tao/connect.h \
- $(TAO_ROOT)/tao/orb_core.h \
- $(TAO_ROOT)/tao/objtable.h \
- $(TAO_ROOT)/tao/optable.h \
- $(TAO_ROOT)/tao/debug.h \
- $(TAO_ROOT)/tao/managed_types.h \
- $(TAO_ROOT)/tao/iiopobj.h \
- $(TAO_ROOT)/tao/iioporb.h \
- $(TAO_ROOT)/tao/giop.h \
- $(TAO_ROOT)/tao/orb_core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(TAO_ROOT)/tao/corbacom.i \
- $(TAO_ROOT)/tao/sequence.i \
- $(TAO_ROOT)/tao/typecode.i \
- $(TAO_ROOT)/tao/any.i \
- $(TAO_ROOT)/tao/cdr.i \
- $(TAO_ROOT)/tao/stub.i \
- $(TAO_ROOT)/tao/object.i \
- $(TAO_ROOT)/tao/orbobj.i \
- $(TAO_ROOT)/tao/marshal.i \
- $(TAO_ROOT)/tao/poa.i \
- $(TAO_ROOT)/tao/giop.i \
- $(TAO_ROOT)/tao/iioporb.i \
- $(TAO_ROOT)/tao/iiopobj.i \
- $(TAO_ROOT)/tao/managed_types.i \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/server_factory.i \
- $(TAO_ROOT)/tao/default_client.i \
- $(TAO_ROOT)/tao/default_server.i \
- $(TAO_ROOT)/tao/connect.i \
- $(TAO_ROOT)/tao/singletons.h \
- CORBA_Utils_T.i
-.obj/Dispatching_Modules.o .shobj/Dispatching_Modules.: Dispatching_Modules.cpp \
- $(ACE_ROOT)/ace/Sched_Params.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/stdcpp.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Sched_Params.i \
- Memory_Pools.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- Event_Channel.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- Local_ESTypes.h \
- $(TAO_ROOT)/orbsvcs/lib/Event_Service_Constants.h \
- $(TAO_ROOT)/orbsvcs/lib/CosNamingC.h \
- $(TAO_ROOT)/orbsvcs/lib/CosNamingC.i \
- $(TAO_ROOT)/orbsvcs/lib/RtecSchedulerC.h \
- $(TAO_ROOT)/orbsvcs/lib/RtecSchedulerC.i \
- $(TAO_ROOT)/orbsvcs/lib/RtecSchedulerS.h \
- $(TAO_ROOT)/orbsvcs/lib/RtecSchedulerS.i \
- $(TAO_ROOT)/orbsvcs/lib/RtecEventCommC.h \
- $(TAO_ROOT)/orbsvcs/lib/RtecEventCommC.i \
- $(TAO_ROOT)/orbsvcs/lib/RtecEventCommS.h \
- $(TAO_ROOT)/orbsvcs/lib/RtecEventCommS.i \
- $(TAO_ROOT)/orbsvcs/lib/RtecEventChannelAdminC.h \
- $(TAO_ROOT)/orbsvcs/lib/RtecEventChannelAdminC.i \
- $(TAO_ROOT)/orbsvcs/lib/RtecEventChannelAdminS.h \
- $(TAO_ROOT)/orbsvcs/lib/RtecEventChannelAdminS.i \
- Local_ESTypes.i CORBA_Utils_T.h CORBA_Utils_T.i Task_Manager.h \
- RT_Task.h RT_Task.i Task_Manager.i ReactorTask.h Fast_Reactor.h \
- $(ACE_ROOT)/ace/Select_Reactor.h \
- $(ACE_ROOT)/ace/Token.h \
- $(ACE_ROOT)/ace/Token.i \
- $(ACE_ROOT)/ace/Pipe.h \
- $(ACE_ROOT)/ace/Pipe.i \
- $(ACE_ROOT)/ace/Select_Reactor.i \
- $(ACE_ROOT)/ace/Timer_Heap.h \
- $(ACE_ROOT)/ace/Timer_Heap_T.h \
- $(ACE_ROOT)/ace/Timer_List.h \
- $(ACE_ROOT)/ace/Timer_List_T.h \
- Event_Channel.i Dispatching_Modules.h Dispatching_Modules.i \
- Memory_Pools.i \
- $(TAO_ROOT)/orbsvcs/lib/Scheduler_Factory.h \
- $(TAO_ROOT)/orbsvcs/lib/Scheduler_Factory.i
-.obj/Event_Channel.o .shobj/Event_Channel.: Event_Channel.cpp \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/stdcpp.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- Dispatching_Modules.h ReactorTask.h Fast_Reactor.h \
- $(ACE_ROOT)/ace/Select_Reactor.h \
- $(ACE_ROOT)/ace/Token.h \
- $(ACE_ROOT)/ace/Token.i \
- $(ACE_ROOT)/ace/Pipe.h \
- $(ACE_ROOT)/ace/Pipe.i \
- $(ACE_ROOT)/ace/Select_Reactor.i \
- $(ACE_ROOT)/ace/Timer_Heap.h \
- $(ACE_ROOT)/ace/Timer_Heap_T.h \
- $(ACE_ROOT)/ace/Timer_List.h \
- $(ACE_ROOT)/ace/Timer_List_T.h \
- Local_ESTypes.h \
- $(TAO_ROOT)/orbsvcs/lib/Event_Service_Constants.h \
- $(TAO_ROOT)/orbsvcs/lib/CosNamingC.h \
- $(TAO_ROOT)/orbsvcs/lib/CosNamingC.i \
- $(TAO_ROOT)/orbsvcs/lib/RtecSchedulerC.h \
- $(TAO_ROOT)/orbsvcs/lib/RtecSchedulerC.i \
- $(TAO_ROOT)/orbsvcs/lib/RtecSchedulerS.h \
- $(TAO_ROOT)/orbsvcs/lib/RtecSchedulerS.i \
- $(TAO_ROOT)/orbsvcs/lib/RtecEventCommC.h \
- $(TAO_ROOT)/orbsvcs/lib/RtecEventCommC.i \
- $(TAO_ROOT)/orbsvcs/lib/RtecEventCommS.h \
- $(TAO_ROOT)/orbsvcs/lib/RtecEventCommS.i \
- $(TAO_ROOT)/orbsvcs/lib/RtecEventChannelAdminC.h \
- $(TAO_ROOT)/orbsvcs/lib/RtecEventChannelAdminC.i \
- $(TAO_ROOT)/orbsvcs/lib/RtecEventChannelAdminS.h \
- $(TAO_ROOT)/orbsvcs/lib/RtecEventChannelAdminS.i \
- Local_ESTypes.i RT_Task.h RT_Task.i Event_Channel.h CORBA_Utils_T.h \
- CORBA_Utils_T.i Task_Manager.h Task_Manager.i Event_Channel.i \
- Dispatching_Modules.i Memory_Pools.h Memory_Pools.i \
- $(TAO_ROOT)/orbsvcs/lib/Scheduler_Factory.h \
- $(TAO_ROOT)/orbsvcs/lib/Scheduler_Factory.i \
- $(TAO_ROOT)/orbsvcs/lib/Event_Utilities.h \
- $(TAO_ROOT)/orbsvcs/lib/Event_Utilities.i
-.obj/GPlot_File.o .shobj/GPlot_File.: GPlot_File.cpp GPlot_File.h \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/stdcpp.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- GPlot_File.i
-.obj/Local_ESTypes.o .shobj/Local_ESTypes.: Local_ESTypes.cpp Local_ESTypes.h \
- $(TAO_ROOT)/orbsvcs/lib/Event_Service_Constants.h \
- $(TAO_ROOT)/orbsvcs/lib/CosNamingC.h \
- $(TAO_ROOT)/orbsvcs/lib/CosNamingC.i \
- $(TAO_ROOT)/orbsvcs/lib/RtecSchedulerC.h \
- $(TAO_ROOT)/orbsvcs/lib/RtecSchedulerC.i \
- $(TAO_ROOT)/orbsvcs/lib/RtecSchedulerS.h \
- $(TAO_ROOT)/orbsvcs/lib/RtecSchedulerS.i \
- $(TAO_ROOT)/orbsvcs/lib/RtecEventCommC.h \
- $(TAO_ROOT)/orbsvcs/lib/RtecEventCommC.i \
- $(TAO_ROOT)/orbsvcs/lib/RtecEventCommS.h \
- $(TAO_ROOT)/orbsvcs/lib/RtecEventCommS.i \
- $(TAO_ROOT)/orbsvcs/lib/RtecEventChannelAdminC.h \
- $(TAO_ROOT)/orbsvcs/lib/RtecEventChannelAdminC.i \
- $(TAO_ROOT)/orbsvcs/lib/RtecEventChannelAdminS.h \
- $(TAO_ROOT)/orbsvcs/lib/RtecEventChannelAdminS.i \
- Local_ESTypes.i
-.obj/Memory_Pools.o .shobj/Memory_Pools.: Memory_Pools.cpp Memory_Pools.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/stdcpp.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- Event_Channel.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- Local_ESTypes.h \
- $(TAO_ROOT)/orbsvcs/lib/Event_Service_Constants.h \
- $(TAO_ROOT)/orbsvcs/lib/CosNamingC.h \
- $(TAO_ROOT)/orbsvcs/lib/CosNamingC.i \
- $(TAO_ROOT)/orbsvcs/lib/RtecSchedulerC.h \
- $(TAO_ROOT)/orbsvcs/lib/RtecSchedulerC.i \
- $(TAO_ROOT)/orbsvcs/lib/RtecSchedulerS.h \
- $(TAO_ROOT)/orbsvcs/lib/RtecSchedulerS.i \
- $(TAO_ROOT)/orbsvcs/lib/RtecEventCommC.h \
- $(TAO_ROOT)/orbsvcs/lib/RtecEventCommC.i \
- $(TAO_ROOT)/orbsvcs/lib/RtecEventCommS.h \
- $(TAO_ROOT)/orbsvcs/lib/RtecEventCommS.i \
- $(TAO_ROOT)/orbsvcs/lib/RtecEventChannelAdminC.h \
- $(TAO_ROOT)/orbsvcs/lib/RtecEventChannelAdminC.i \
- $(TAO_ROOT)/orbsvcs/lib/RtecEventChannelAdminS.h \
- $(TAO_ROOT)/orbsvcs/lib/RtecEventChannelAdminS.i \
- Local_ESTypes.i CORBA_Utils_T.h CORBA_Utils_T.i Task_Manager.h \
- RT_Task.h RT_Task.i Task_Manager.i ReactorTask.h Fast_Reactor.h \
- $(ACE_ROOT)/ace/Select_Reactor.h \
- $(ACE_ROOT)/ace/Token.h \
- $(ACE_ROOT)/ace/Token.i \
- $(ACE_ROOT)/ace/Pipe.h \
- $(ACE_ROOT)/ace/Pipe.i \
- $(ACE_ROOT)/ace/Select_Reactor.i \
- $(ACE_ROOT)/ace/Timer_Heap.h \
- $(ACE_ROOT)/ace/Timer_Heap_T.h \
- $(ACE_ROOT)/ace/Timer_List.h \
- $(ACE_ROOT)/ace/Timer_List_T.h \
- Event_Channel.i Dispatching_Modules.h Dispatching_Modules.i \
- Memory_Pools.i
-.obj/RT_Task.o .shobj/RT_Task.: RT_Task.cpp RT_Task.h \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/stdcpp.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/Task_T.i \
- $(TAO_ROOT)/orbsvcs/lib/RtecSchedulerC.h \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Svc_Handler.i \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(TAO_ROOT)/tao/orbconf.h \
- $(TAO_ROOT)/tao/orb.h \
- $(TAO_ROOT)/tao/corbacom.h \
- $(TAO_ROOT)/tao/object.h \
- $(TAO_ROOT)/tao/align.h \
- $(TAO_ROOT)/tao/sequence.h \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/any.h \
- $(TAO_ROOT)/tao/poa.h \
- $(TAO_ROOT)/tao/tao_internals.h \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/client_factory.h \
- $(TAO_ROOT)/tao/server_factory.h \
- $(TAO_ROOT)/tao/default_client.h \
- $(TAO_ROOT)/tao/default_server.h \
- $(TAO_ROOT)/tao/except.h \
- $(TAO_ROOT)/tao/orbobj.h \
- $(TAO_ROOT)/tao/nvlist.h \
- $(TAO_ROOT)/tao/principa.h \
- $(TAO_ROOT)/tao/request.h \
- $(TAO_ROOT)/tao/svrrqst.h \
- $(TAO_ROOT)/tao/typecode.h \
- $(TAO_ROOT)/tao/marshal.h \
- $(TAO_ROOT)/tao/cdr.h \
- $(TAO_ROOT)/tao/stub.h \
- $(TAO_ROOT)/tao/connect.h \
- $(TAO_ROOT)/tao/orb_core.h \
- $(TAO_ROOT)/tao/objtable.h \
- $(TAO_ROOT)/tao/optable.h \
- $(TAO_ROOT)/tao/debug.h \
- $(TAO_ROOT)/tao/managed_types.h \
- $(TAO_ROOT)/tao/iiopobj.h \
- $(TAO_ROOT)/tao/iioporb.h \
- $(TAO_ROOT)/tao/giop.h \
- $(TAO_ROOT)/tao/orb_core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(TAO_ROOT)/tao/corbacom.i \
- $(TAO_ROOT)/tao/sequence.i \
- $(TAO_ROOT)/tao/typecode.i \
- $(TAO_ROOT)/tao/any.i \
- $(TAO_ROOT)/tao/cdr.i \
- $(TAO_ROOT)/tao/stub.i \
- $(TAO_ROOT)/tao/object.i \
- $(TAO_ROOT)/tao/orbobj.i \
- $(TAO_ROOT)/tao/marshal.i \
- $(TAO_ROOT)/tao/poa.i \
- $(TAO_ROOT)/tao/giop.i \
- $(TAO_ROOT)/tao/iioporb.i \
- $(TAO_ROOT)/tao/iiopobj.i \
- $(TAO_ROOT)/tao/managed_types.i \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/server_factory.i \
- $(TAO_ROOT)/tao/default_client.i \
- $(TAO_ROOT)/tao/default_server.i \
- $(TAO_ROOT)/tao/connect.i \
- $(TAO_ROOT)/tao/singletons.h \
- $(TAO_ROOT)/orbsvcs/lib/RtecSchedulerC.i \
- RT_Task.i Debug_Macros.h Event_Channel.h Local_ESTypes.h \
- $(TAO_ROOT)/orbsvcs/lib/Event_Service_Constants.h \
- $(TAO_ROOT)/orbsvcs/lib/CosNamingC.h \
- $(TAO_ROOT)/orbsvcs/lib/CosNamingC.i \
- $(TAO_ROOT)/orbsvcs/lib/RtecSchedulerS.h \
- $(TAO_ROOT)/orbsvcs/lib/RtecSchedulerS.i \
- $(TAO_ROOT)/orbsvcs/lib/RtecEventCommC.h \
- $(TAO_ROOT)/orbsvcs/lib/RtecEventCommC.i \
- $(TAO_ROOT)/orbsvcs/lib/RtecEventCommS.h \
- $(TAO_ROOT)/orbsvcs/lib/RtecEventCommS.i \
- $(TAO_ROOT)/orbsvcs/lib/RtecEventChannelAdminC.h \
- $(TAO_ROOT)/orbsvcs/lib/RtecEventChannelAdminC.i \
- $(TAO_ROOT)/orbsvcs/lib/RtecEventChannelAdminS.h \
- $(TAO_ROOT)/orbsvcs/lib/RtecEventChannelAdminS.i \
- Local_ESTypes.i CORBA_Utils_T.h CORBA_Utils_T.i Task_Manager.h \
- Task_Manager.i ReactorTask.h Fast_Reactor.h \
- $(ACE_ROOT)/ace/Select_Reactor.h \
- $(ACE_ROOT)/ace/Token.h \
- $(ACE_ROOT)/ace/Token.i \
- $(ACE_ROOT)/ace/Pipe.h \
- $(ACE_ROOT)/ace/Pipe.i \
- $(ACE_ROOT)/ace/Select_Reactor.i \
- $(ACE_ROOT)/ace/Timer_Heap.h \
- $(ACE_ROOT)/ace/Timer_Heap_T.h \
- $(ACE_ROOT)/ace/Timer_List.h \
- $(ACE_ROOT)/ace/Timer_List_T.h \
- Event_Channel.i Memory_Pools.h Dispatching_Modules.h \
- Dispatching_Modules.i Memory_Pools.i \
- $(TAO_ROOT)/orbsvcs/lib/Scheduler_Factory.h \
- $(TAO_ROOT)/orbsvcs/lib/Scheduler_Factory.i
-.obj/ReactorTask.o .shobj/ReactorTask.: ReactorTask.cpp \
- $(ACE_ROOT)/ace/High_Res_Timer.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/stdcpp.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/High_Res_Timer.i \
- $(TAO_ROOT)/orbsvcs/lib/Scheduler_Factory.h \
- $(TAO_ROOT)/orbsvcs/lib/RtecSchedulerC.h \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/Task_T.i \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Svc_Handler.i \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(TAO_ROOT)/tao/orbconf.h \
- $(TAO_ROOT)/tao/orb.h \
- $(TAO_ROOT)/tao/corbacom.h \
- $(TAO_ROOT)/tao/object.h \
- $(TAO_ROOT)/tao/align.h \
- $(TAO_ROOT)/tao/sequence.h \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/any.h \
- $(TAO_ROOT)/tao/poa.h \
- $(TAO_ROOT)/tao/tao_internals.h \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/client_factory.h \
- $(TAO_ROOT)/tao/server_factory.h \
- $(TAO_ROOT)/tao/default_client.h \
- $(TAO_ROOT)/tao/default_server.h \
- $(TAO_ROOT)/tao/except.h \
- $(TAO_ROOT)/tao/orbobj.h \
- $(TAO_ROOT)/tao/nvlist.h \
- $(TAO_ROOT)/tao/principa.h \
- $(TAO_ROOT)/tao/request.h \
- $(TAO_ROOT)/tao/svrrqst.h \
- $(TAO_ROOT)/tao/typecode.h \
- $(TAO_ROOT)/tao/marshal.h \
- $(TAO_ROOT)/tao/cdr.h \
- $(TAO_ROOT)/tao/stub.h \
- $(TAO_ROOT)/tao/connect.h \
- $(TAO_ROOT)/tao/orb_core.h \
- $(TAO_ROOT)/tao/objtable.h \
- $(TAO_ROOT)/tao/optable.h \
- $(TAO_ROOT)/tao/debug.h \
- $(TAO_ROOT)/tao/managed_types.h \
- $(TAO_ROOT)/tao/iiopobj.h \
- $(TAO_ROOT)/tao/iioporb.h \
- $(TAO_ROOT)/tao/giop.h \
- $(TAO_ROOT)/tao/orb_core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(TAO_ROOT)/tao/corbacom.i \
- $(TAO_ROOT)/tao/sequence.i \
- $(TAO_ROOT)/tao/typecode.i \
- $(TAO_ROOT)/tao/any.i \
- $(TAO_ROOT)/tao/cdr.i \
- $(TAO_ROOT)/tao/stub.i \
- $(TAO_ROOT)/tao/object.i \
- $(TAO_ROOT)/tao/orbobj.i \
- $(TAO_ROOT)/tao/marshal.i \
- $(TAO_ROOT)/tao/poa.i \
- $(TAO_ROOT)/tao/giop.i \
- $(TAO_ROOT)/tao/iioporb.i \
- $(TAO_ROOT)/tao/iiopobj.i \
- $(TAO_ROOT)/tao/managed_types.i \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/server_factory.i \
- $(TAO_ROOT)/tao/default_client.i \
- $(TAO_ROOT)/tao/default_server.i \
- $(TAO_ROOT)/tao/connect.i \
- $(TAO_ROOT)/tao/singletons.h \
- $(TAO_ROOT)/orbsvcs/lib/RtecSchedulerC.i \
- $(TAO_ROOT)/orbsvcs/lib/CosNamingC.h \
- $(TAO_ROOT)/orbsvcs/lib/CosNamingC.i \
- $(TAO_ROOT)/orbsvcs/lib/Scheduler_Factory.i \
- ReactorTask.h Fast_Reactor.h \
- $(ACE_ROOT)/ace/Select_Reactor.h \
- $(ACE_ROOT)/ace/Token.h \
- $(ACE_ROOT)/ace/Token.i \
- $(ACE_ROOT)/ace/Pipe.h \
- $(ACE_ROOT)/ace/Pipe.i \
- $(ACE_ROOT)/ace/Select_Reactor.i \
- $(ACE_ROOT)/ace/Timer_Heap.h \
- $(ACE_ROOT)/ace/Timer_Heap_T.h \
- $(ACE_ROOT)/ace/Timer_List.h \
- $(ACE_ROOT)/ace/Timer_List_T.h \
- Local_ESTypes.h \
- $(TAO_ROOT)/orbsvcs/lib/Event_Service_Constants.h \
- $(TAO_ROOT)/orbsvcs/lib/RtecSchedulerS.h \
- $(TAO_ROOT)/orbsvcs/lib/RtecSchedulerS.i \
- $(TAO_ROOT)/orbsvcs/lib/RtecEventCommC.h \
- $(TAO_ROOT)/orbsvcs/lib/RtecEventCommC.i \
- $(TAO_ROOT)/orbsvcs/lib/RtecEventCommS.h \
- $(TAO_ROOT)/orbsvcs/lib/RtecEventCommS.i \
- $(TAO_ROOT)/orbsvcs/lib/RtecEventChannelAdminC.h \
- $(TAO_ROOT)/orbsvcs/lib/RtecEventChannelAdminC.i \
- $(TAO_ROOT)/orbsvcs/lib/RtecEventChannelAdminS.h \
- $(TAO_ROOT)/orbsvcs/lib/RtecEventChannelAdminS.i \
- Local_ESTypes.i RT_Task.h RT_Task.i
-.obj/Task_Manager.o .shobj/Task_Manager.: Task_Manager.cpp Task_Manager.h \
- $(TAO_ROOT)/orbsvcs/lib/Event_Service_Constants.h \
- RT_Task.h \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/Task_T.i \
- $(TAO_ROOT)/orbsvcs/lib/RtecSchedulerC.h \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Svc_Handler.i \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(TAO_ROOT)/tao/orbconf.h \
- $(TAO_ROOT)/tao/orb.h \
- $(TAO_ROOT)/tao/corbacom.h \
- $(TAO_ROOT)/tao/object.h \
- $(TAO_ROOT)/tao/align.h \
- $(TAO_ROOT)/tao/sequence.h \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/any.h \
- $(TAO_ROOT)/tao/poa.h \
- $(TAO_ROOT)/tao/tao_internals.h \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/client_factory.h \
- $(TAO_ROOT)/tao/server_factory.h \
- $(TAO_ROOT)/tao/default_client.h \
- $(TAO_ROOT)/tao/default_server.h \
- $(TAO_ROOT)/tao/except.h \
- $(TAO_ROOT)/tao/orbobj.h \
- $(TAO_ROOT)/tao/nvlist.h \
- $(TAO_ROOT)/tao/principa.h \
- $(TAO_ROOT)/tao/request.h \
- $(TAO_ROOT)/tao/svrrqst.h \
- $(TAO_ROOT)/tao/typecode.h \
- $(TAO_ROOT)/tao/marshal.h \
- $(TAO_ROOT)/tao/cdr.h \
- $(TAO_ROOT)/tao/stub.h \
- $(TAO_ROOT)/tao/connect.h \
- $(TAO_ROOT)/tao/orb_core.h \
- $(TAO_ROOT)/tao/objtable.h \
- $(TAO_ROOT)/tao/optable.h \
- $(TAO_ROOT)/tao/debug.h \
- $(TAO_ROOT)/tao/managed_types.h \
- $(TAO_ROOT)/tao/iiopobj.h \
- $(TAO_ROOT)/tao/iioporb.h \
- $(TAO_ROOT)/tao/giop.h \
- $(TAO_ROOT)/tao/orb_core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(TAO_ROOT)/tao/corbacom.i \
- $(TAO_ROOT)/tao/sequence.i \
- $(TAO_ROOT)/tao/typecode.i \
- $(TAO_ROOT)/tao/any.i \
- $(TAO_ROOT)/tao/cdr.i \
- $(TAO_ROOT)/tao/stub.i \
- $(TAO_ROOT)/tao/object.i \
- $(TAO_ROOT)/tao/orbobj.i \
- $(TAO_ROOT)/tao/marshal.i \
- $(TAO_ROOT)/tao/poa.i \
- $(TAO_ROOT)/tao/giop.i \
- $(TAO_ROOT)/tao/iioporb.i \
- $(TAO_ROOT)/tao/iiopobj.i \
- $(TAO_ROOT)/tao/managed_types.i \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/server_factory.i \
- $(TAO_ROOT)/tao/default_client.i \
- $(TAO_ROOT)/tao/default_server.i \
- $(TAO_ROOT)/tao/connect.i \
- $(TAO_ROOT)/tao/singletons.h \
- $(TAO_ROOT)/orbsvcs/lib/RtecSchedulerC.i \
- RT_Task.i Task_Manager.i ReactorTask.h Fast_Reactor.h \
- $(ACE_ROOT)/ace/Select_Reactor.h \
- $(ACE_ROOT)/ace/Token.h \
- $(ACE_ROOT)/ace/Token.i \
- $(ACE_ROOT)/ace/Pipe.h \
- $(ACE_ROOT)/ace/Pipe.i \
- $(ACE_ROOT)/ace/Select_Reactor.i \
- $(ACE_ROOT)/ace/Timer_Heap.h \
- $(ACE_ROOT)/ace/Timer_Heap_T.h \
- $(ACE_ROOT)/ace/Timer_List.h \
- $(ACE_ROOT)/ace/Timer_List_T.h \
- Local_ESTypes.h \
- $(TAO_ROOT)/orbsvcs/lib/CosNamingC.h \
- $(TAO_ROOT)/orbsvcs/lib/CosNamingC.i \
- $(TAO_ROOT)/orbsvcs/lib/RtecSchedulerS.h \
- $(TAO_ROOT)/orbsvcs/lib/RtecSchedulerS.i \
- $(TAO_ROOT)/orbsvcs/lib/RtecEventCommC.h \
- $(TAO_ROOT)/orbsvcs/lib/RtecEventCommC.i \
- $(TAO_ROOT)/orbsvcs/lib/RtecEventCommS.h \
- $(TAO_ROOT)/orbsvcs/lib/RtecEventCommS.i \
- $(TAO_ROOT)/orbsvcs/lib/RtecEventChannelAdminC.h \
- $(TAO_ROOT)/orbsvcs/lib/RtecEventChannelAdminC.i \
- $(TAO_ROOT)/orbsvcs/lib/RtecEventChannelAdminS.h \
- $(TAO_ROOT)/orbsvcs/lib/RtecEventChannelAdminS.i \
- Local_ESTypes.i
-
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/local/bin/Event_Service/Memory_Pools.cpp b/TAO/local/bin/Event_Service/Memory_Pools.cpp
deleted file mode 100644
index 3cbcd71d8b5..00000000000
--- a/TAO/local/bin/Event_Service/Memory_Pools.cpp
+++ /dev/null
@@ -1,33 +0,0 @@
-// $Id$
-
-#include "Memory_Pools.h"
-#include "Event_Channel.h"
-
-#if !defined (__ACE_INLINE__)
-#include "Memory_Pools.i"
-#endif /* __ACE_INLINE__ */
-
-ACE_TSS<ACE_ES_Dispatch_Request_Allocator> ACE_ES_Memory_Pools::Dispatch_Request_;
-ACE_TSS<ACE_ES_Event_Container_Allocator> ACE_ES_Memory_Pools::Event_Container_;
-ACE_TSS<ACE_ES_Event_Allocator> ACE_ES_Memory_Pools::Event_;
-
-// ************************************************************
-
-int
-ACE_ES_Memory_Pools::thr_init (void)
-{
-  // Allocate the memory pool for this thread.
-  Event_Container_.ts_object ();
-  Dispatch_Request_.ts_object ();
-  Event_.ts_object ();
-  return 0;
-}
-
-// ************************************************************
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-// For ACE_ES_Memory_Pools.
-template class ACE_TSS<ACE_ES_Event_Container_Allocator>;
-template class ACE_TSS<ACE_ES_Dispatch_Request_Allocator>;
-template class ACE_TSS<ACE_Malloc<ACE_Local_Memory_Pool, ACE_Local_Memory_Pool_Options, ACE_MEMORY_POOL_MUTEX> >;
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/local/bin/Event_Service/Memory_Pools.h b/TAO/local/bin/Event_Service/Memory_Pools.h
deleted file mode 100644
index cc8a23f6767..00000000000
--- a/TAO/local/bin/Event_Service/Memory_Pools.h
+++ /dev/null
@@ -1,104 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-//
-// ============================================================================
-//
-// = LIBRARY
-//    ORB Services
-// 
-// = FILENAME
-//    Memory_Pools
-//
-// = AUTHOR
-//    Tim Harrison (harrison@cs.wustl.edu)
-//
-// ============================================================================
-
-#ifndef ACE_MEMORY_POOLS_H
-#define ACE_MEMORY_POOLS_H
-
-#include "ace/Synch.h"
-#include "Event_Channel.h"
-#include "Dispatching_Modules.h"
-
-// ************************************************************
-
-#if defined (ACE_HAS_THREAD_SPECIFIC_STORAGE) || defined (ACE_HAS_TSS_EMULATION)
-  typedef ACE_Null_Mutex ACE_MEMORY_POOL_MUTEX;
-#else
-  // Use the same object for each thread.  Therefore, we have to use
-  // real synchronization.
-  typedef ACE_Thread_Mutex ACE_MEMORY_POOL_MUTEX;
-#endif /* ACE_HAS_THREAD_SPECIFIC_STORAGE || ACE_HAS_TSS_EMULATION */
-
-typedef char ACE_ES_Dispatch_Request_Chunk[sizeof (ACE_ES_Dispatch_Request)];
-
-typedef ACE_Cached_Allocator<ACE_ES_Dispatch_Request_Chunk, ACE_MEMORY_POOL_MUTEX> _ACE_Dispatch_Request_Allocator;
-
-class ACE_ES_Dispatch_Request_Allocator : public _ACE_Dispatch_Request_Allocator
-// = TITLE
-//     Dispatch Request Allocator
-//
-// = DESCRIPTION
-//     This just sets the size of the Event Container memory pool.
-{
-public:
-  ACE_ES_Dispatch_Request_Allocator (void) :
-    _ACE_Dispatch_Request_Allocator (ACE_ES_DISPATCH_REQUEST_MEMORY_POOL) {}
-};
-
-// ************************************************************
-
-typedef char ACE_ES_Event_Container_Chunk[sizeof (ACE_ES_Event_Container)];
-
-typedef ACE_Cached_Allocator<ACE_ES_Event_Container_Chunk, ACE_MEMORY_POOL_MUTEX> _ACE_Event_Container_Allocator;
-
-class ACE_ES_Event_Container_Allocator : public _ACE_Event_Container_Allocator
-// = TITLE
-//     Event Container Allocator
-//
-// = DESCRIPTION
-//     This just sets the size of the Event Container memory pool.
-{
-public:
-  ACE_ES_Event_Container_Allocator (void) :
-    _ACE_Event_Container_Allocator (ACE_ES_EVENT_CONTAINER_MEMORY_POOL) {}
-};
-
-// ************************************************************
-
-typedef char ACE_ES_Event_Chunk[sizeof (RtecEventComm::Event)];
-
-typedef ACE_Malloc<ACE_LOCAL_MEMORY_POOL, ACE_MEMORY_POOL_MUTEX> ACE_ES_Event_Allocator;
-//typedef ACE_Cached_Allocator<ACE_ES_Event_Chunk, ACE_MEMORY_POOL_MUTEX> _ACE_Event_Allocator;
-
-class ACE_ES_Memory_Pools
-// = TITLE
-//     Event Service Memory Pools.
-//
-// = DESCRIPTION
-//     These have to be static in order to be accessed by operator
-//     news, right?
-{
-public:
-  static int thr_init (void);
-  // This can be called by every thread that will access these memory
-  // pools to preallocate the thread specific allocators.  It is not
-  // mandatory.
-
-  static void *new_Event_Container (void);
-  static void delete_Event_Container (void *);
-  static void *new_Dispatch_Request (void);
-  static void delete_Dispatch_Request (void *);
-  static void *new_Event (size_t);
-  static void delete_Event (void *);
-
-  static ACE_TSS<ACE_ES_Dispatch_Request_Allocator> Dispatch_Request_;
-  static ACE_TSS<ACE_ES_Event_Container_Allocator> Event_Container_;
-  static ACE_TSS<ACE_ES_Event_Allocator> Event_;
-};
-
-#if defined (__ACE_INLINE__)
-#include "Memory_Pools.i"
-#endif /* __ACE_INLINE__ */
-#endif /* ACE_MEMORY_POOLS_H */
diff --git a/TAO/local/bin/Event_Service/Memory_Pools.i b/TAO/local/bin/Event_Service/Memory_Pools.i
deleted file mode 100644
index 3f6e3b26223..00000000000
--- a/TAO/local/bin/Event_Service/Memory_Pools.i
+++ /dev/null
@@ -1,54 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-ACE_INLINE void *
-ACE_ES_Memory_Pools::new_Event_Container (void)
-{
-  return Event_Container_->malloc (sizeof (ACE_ES_Event_Container));
-}
-
-ACE_INLINE void
-ACE_ES_Memory_Pools::delete_Event_Container (void *mem)
-{
-  Event_Container_->free (mem);
-}
-
-ACE_INLINE void *
-ACE_ES_Memory_Pools::new_Dispatch_Request (void)
-{
-  return Dispatch_Request_->malloc (sizeof (ACE_ES_Dispatch_Request));
-}
-
-ACE_INLINE void
-ACE_ES_Memory_Pools::delete_Dispatch_Request (void *mem)
-{
-  Dispatch_Request_->free (mem);
-}
-
-#define USE_MEM_POOLS 1
-
-ACE_INLINE void *
-ACE_ES_Memory_Pools::new_Event (size_t len)
-{
-#if USE_MEM_POOLS
-  const u_int ev_size = sizeof (RtecEventComm::Event);
-  const u_int size = (ev_size % ACE_MALLOC_ALIGN) ?
-      ((ev_size / ACE_MALLOC_ALIGN) + 1) * ACE_MALLOC_ALIGN : ev_size;
-
-  char *const addr = (char *) Event_->malloc (len * size);
-#else
-  char *const addr = new char[len * sizeof (ACE_ES_Event)];
-#endif
-
-  return addr;
-}
-
-ACE_INLINE void
-ACE_ES_Memory_Pools::delete_Event (void *mem)
-{
-#if USE_MEM_POOLS
-  Event_->free (mem);
-#else
-  delete [] mem;
-#endif
-}
diff --git a/TAO/local/bin/Event_Service/RT_Task.cpp b/TAO/local/bin/Event_Service/RT_Task.cpp
deleted file mode 100644
index 79a7adeb47d..00000000000
--- a/TAO/local/bin/Event_Service/RT_Task.cpp
+++ /dev/null
@@ -1,357 +0,0 @@
-// $Id$
-
-#include "RT_Task.h"
-#include "Debug_Macros.h"
-#include "Event_Channel.h"
-#include "Memory_Pools.h"
-#include "Scheduler_Factory.h"
-
-#if !defined (__ACE_INLINE__)
-#include "RT_Task.i"
-#endif /* __ACE_INLINE__ */
-
-class ACE_RT_Task_Shutdown : public ACE_RT_Task_Command
-// = TITLE
-//    Flush Queue Command.
-//
-// = DESCRIPTION
-//    This command object will call close on task_.  This is used by
-//    single-threaded tasks to flush any queued messages.
-{
-public:
-  ACE_RT_Task_Shutdown (ACE_ES_TASK *task)
-    : task_ (task) {}
-
-  virtual int execute (u_long &command_action);
-
-  ACE_ES_TASK *task_;
-};
-
-int 
-ACE_RT_Task_Shutdown::execute (u_long &command_action)
-{
-  ACE_UNUSED_ARG (command_action);
-
-  if (task_ == 0)
-    return 1;
-  else
-    {
-      task_->close (0);
-      return 0;
-    }
-}
-
-// ************************************************************
-// ************************************************************
-
-ACE_RT_Task::ACE_RT_Task (void)
-  : closed_ (0)
-{
-}
-
-ACE_RT_Task::~ACE_RT_Task (void)
-{
-  msg_queue_->deactivate ();
-}
-
-int
-ACE_RT_Task::svc (void)
-{
-  int done = 0;
-
-  ACE_hthread_t self;
-  ACE_OS::thr_self (self);
-
-  int priority;
-  if (ACE_OS::thr_getprio (self, priority) == 0)
-    ACE_DEBUG ((LM_DEBUG, "(%t) new thread priority = %d.\n", priority));
-
-  // Initialize channel thread-specific data.
-  ACE_ES_Memory_Pools::thr_init ();
-
-  done = this->svc_hook (priority);
-
-  while (!done)
-    {
-      done = this->svc_one ();
-    }
-
-  ACE_DEBUG ((LM_DEBUG, "(%t) thread exiting.\n"));
-  return 0;
-}
-
-int
-ACE_RT_Task::svc_hook (RtecScheduler::OS_Priority)
-{
-  return 0;
-}
-
-int
-ACE_RT_Task::svc_one (void)
-{
-  // Dequeue the command.
-  ACE_Message_Block *mb;
-
-  if (this->getq (mb) == -1)
-    {
-      if (ACE_OS::last_error () == ESHUTDOWN)
-	return 1;
-      else
-	// We'll continue in spite of this error.
-	ACE_ERROR ((LM_ERROR, "%p (%t) getq error.\n", "ACE_RT_Task::svc_one"));
-    }
-
-  // Execute the command.
-  ACE_RT_Task_Command *command = (ACE_RT_Task_Command *) mb;
-
-  int result;
-  u_long command_action = ACE_RT_Task_Command::RELEASE;
-
-  // @@ Put exception handling around this!
-  result = command->execute (command_action);
-
-  switch (command_action)
-    {
-    case ACE_RT_Task_Command::RELEASE:
-      // Free the message block.
-      if (ACE_RT_Task_Command::release (command) != 0)
-	ACE_ERROR ((LM_ERROR, "ACE_RT_Task::svc_one: "
-		    "ACE_RT_Task_Command::release returned != 0!\n"));
-      break;
-
-    case ACE_RT_Task_Command::UNGETQ:
-      this->ungetq (command);
-      break;
-    }
-
-  return result;
-}
-
-// A thread has exited.
-int
-ACE_RT_Task::close (u_long)
-{
-  // If we're the last one out, call threads_closed.
-  if (thr_count_ == 0)
-    this->threads_closed ();
-
-  return 0;
-}
-
-// All threads have exited.
-void
-ACE_RT_Task::threads_closed (void)
-{
-}
-
-int
-ACE_RT_Task::open_task (const char* name)
-{
-  const char *tempname = name;
-  char tempbuffer[64];
-  if (tempname == 0)
-    {
-      ACE_OS::sprintf (tempbuffer, "unnamed task %d", (long) this);
-      tempname = tempbuffer;
-    }
-
-  ACE_TRY
-    {
-      rt_info_ = 
-	ACE_Scheduler_Factory::server()->create (tempname,
-						 ACE_TRY_ENV);
-      ACE_CHECK_ENV;
-      // @@ TODO: We do no initialization of the new rt_info, the
-      // caller does, this is (IMnsHO) very error prone.
-    }
-  ACE_CATCH (RtecScheduler::DUPLICATE_NAME, dn_ex)
-    {
-      // @@ TODO: Its already registered, IMHO this should at least
-      // report a warning, but I'll stick to the previous code.
-      // ACE_ERROR_RETURN ((LM_WARNING,
-      // "RT_Info for %s was already createn",
-      // tempname), 0);
-      return 0;
-    }
-  ACE_ENDTRY;
-
-  return 0;
-}
-
-int
-ACE_RT_Task::try_put (ACE_Message_Block *mb)
-{
-  if (!closed_)
-    {
-      return this->msg_queue ()->enqueue_prio (mb);
-    }
-  else
-    {
-      errno = EPIPE;
-      return -1;
-    }
-}
-
-// The point of this method is to spawn or shutdown threads depending
-// on any differences between the task's RT_Info::threads_ and how
-// many threads are actually running.
-int
-ACE_RT_Task::synch_threads (size_t threads)
-{
-  if (threads > this->thr_count ())
-    // Add threads.
-    {
-      RtecScheduler::OS_Priority thread_priority;
-      RtecScheduler::Sub_Priority subpriority;
-      RtecScheduler::Preemption_Priority preemption_priority;
-      
-      ACE_TRY
-	{
-	  // @@ TODO handle exceptions
-	  ACE_Scheduler_Factory::server ()->priority
-	    (rt_info_,
-	     thread_priority,
-	     subpriority,
-	     preemption_priority, ACE_TRY_ENV);
-	  ACE_CHECK_ENV;
-
-	  ACE_DEBUG ((LM_DEBUG, "(%t) spawning %d threads at os thread"
-		      " priority %d.\n",
-		      threads - this->thr_count (),
-		      thread_priority));
-
-	  // This is here so that the constructor does not call it.  The
-	  // ORB has an instance of one of these.
-	  this->thr_mgr (ACE_Task_Manager::instance ()->ThrMgr ());
-	  
-	  // Add the difference.
-	  if (this->activate (THR_BOUND,
-			      threads - this->thr_count (),
-			      1, // Force it to spawn more threads
-			      thread_priority) == -1)
-	    {
-	      ACE_DEBUG ((LM_ERROR,
-			  "(%t) thread spawn FAILED, errno is %d!!!!\n",
-			  errno));
-	    }
-	  
-	}
-      ACE_CATCHANY
-	{
-	  ACE_ERROR_RETURN ((LM_ERROR, "priority failed\n"), -1);
-	}
-      ACE_ENDTRY;
-
-    }
-  else
-    // Remove threads.
-    {
-      // kill_threads has to be off the stack in case the last thread
-      // deletes this RT_Task.
-      int kill_threads = this->thr_count () - threads;
-
-      for (int x = kill_threads ; x > 0; x--)
-	{
-	  // Create a new shutdown command with a task pointer of 0.
-	  ACE_RT_Task_Shutdown *te = new ACE_RT_Task_Shutdown (0);
-
-	  if (te == 0)
-	    return -1;
-
-	  ACE_DEBUG ((LM_DEBUG, "(%t) enqueueing thread exit.\n"));
-	  if (this->putq (te) == -1)
-	    {
-	      ACE_ERROR ((LM_ERROR, "%p putq failed.\n", 
-			  "ACE_RT_Task::synch_threads"));
-	      if (ACE_RT_Task_Shutdown::release (te) != 0)
-		ACE_ERROR ((LM_ERROR, "ACE_RT_Task::synch_threads: "
-			    "ACE_RT_Task_Shutdown::release returned != 0!\n"));
-	      return -1;
-	    }
-	}
-    }
-
-  return 0;
-}
-
-
-// If we are not active, we will flush the queue and then call
-// this->close.  Otherwise, we will send shutdown messages to each
-// thread.  ~ACE_Task_Exit will call this->close when each thread
-// exits.
-int
-ACE_RT_Task::shutdown_task (void)
-{
-  // Be sure to only execute this once, and only if we're active.
-  if (closed_)
-    return 0;
-
-  // This will keep any messages from entering the queue.
-  closed_ = 1;
-
-  if (thr_count_ > 0)
-    return this->synch_threads (0);
-  else
-    {
-      // Create a new flush queue command.  We're passive, so pass in
-      // a reference to the task for which close will be called.
-      ACE_RT_Task_Shutdown *fq = new ACE_RT_Task_Shutdown (this);
-
-      if (fq == 0)
-	{
-	  ACE_ERROR ((LM_ERROR, "%p.\n", "ACE_RT_Task::shutdown_threads"));
-	  return -1;
-	}
-
-      // Enqueue the command.
-      ACE_DEBUG ((LM_DEBUG, "(%t) enqueueing task shutdown.\n"));
-      if (this->putq (fq) == -1)
-	{
-	  ACE_ERROR ((LM_ERROR, "%p putq failed.\n", 
-		      "ACE_RT_Task::shutdown_task"));
-	  if (ACE_RT_Task_Shutdown::release (fq) != 0)
-	    ACE_ERROR ((LM_ERROR, "ACE_RT_Task::shutdown_task: "
-			"ACE_RT_Task_Shutdown::release returned != 0!\n"));
-	  return -1;
-	}
-    }
-
-  return 0;
-}
-
-// ************************************************************
-
-ACE_RT_Thread_Manager::ACE_RT_Thread_Manager (void)
-  : flags_ (0)
-{
-}
-
-void
-ACE_RT_Thread_Manager::suspend_spawns (void)
-{
-  flags_ |= THR_SUSPENDED;
-}
-
-void
-ACE_RT_Thread_Manager::unsuspend_spawns (void)
-{
-  flags_ = 0;
-  this->resume_all ();
-}
-
-int 
-ACE_RT_Thread_Manager::spawn_i (ACE_THR_FUNC func,
-				void *args, 
-				long flags, 
-				ACE_thread_t *t_id, 
-				ACE_hthread_t *t_handle,
-				long priority,
-				int grp_id,
-				void *stack, 
-				size_t stack_size,
-				ACE_Task_Base *task)
-{
-  flags |= flags_;
-  return ACE_Thread_Manager::spawn_i (func, args, flags, t_id, t_handle, 
-				      priority, grp_id, stack, stack_size, task);
-}
diff --git a/TAO/local/bin/Event_Service/RT_Task.h b/TAO/local/bin/Event_Service/RT_Task.h
deleted file mode 100644
index 5a8f8d2445e..00000000000
--- a/TAO/local/bin/Event_Service/RT_Task.h
+++ /dev/null
@@ -1,179 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-//
-// ============================================================================
-//
-// = LIBRARY
-//    ace
-// 
-// = FILENAME
-//    RT_Task
-//
-// = AUTHOR
-//    Tim Harrison (harrison@cs.wustl.edu)
-//
-// = DESCRIPTION
-//    Wrapper on top of ACE Task that integrates an Active Object with
-//    the COFP Scheduler and Event Service.
-//
-// ============================================================================
-
-#ifndef ACE_RT_TASK_H
-#define ACE_RT_TASK_H
-
-#include "ace/Task.h"
-
-#include "RtecSchedulerC.h"
-
-class ACE_RT_Thread_Manager : public ACE_Thread_Manager
-// = TITLE
-//   
-// = DESCRIPTION
-{
-public:
-  ACE_RT_Thread_Manager (void);
-  // Default construction.
-
-  void suspend_spawns (void);
-  // Any threads spawned will be suspended until unsuspend_spawns is
-  // called.
-
-  void unsuspend_spawns (void);
-  // Resumes all threads.
-
-protected:
-  virtual int spawn_i (ACE_THR_FUNC func, 
-		       void *args, 
-		       long flags, 
-		       ACE_thread_t * = 0, 
-		       ACE_hthread_t *t_handle = 0,
-		       long priority = 0,
-		       int grp_id = -1,
-		       void *stack = 0, 
-		       size_t stack_size = 0,
-		       ACE_Task_Base *task = 0);
-
-  int flags_;
-};
-
-// ************************************************************
-
-class ACE_RT_Task_Command : public ACE_Message_Block
-// = TITLE
-//   
-// = DESCRIPTION
-{
-public:
-  virtual ~ACE_RT_Task_Command (void) {}
-  // Guarantees that derived destructors get called.
-
-  enum { RELEASE, UNGETQ };
-
-  virtual int execute (u_long &command_action) = 0;
-  // Execute the command.  Returning 1 will make the calling thread
-  // exit.  Returning 0 will allow the thread to continue dispatching
-  // commands.  If <command_action> returns as RELEASE, the command
-  // will be released.  If <command_action> == UNGETQ, then the
-  // command will be requeued and dispatched again.
-};
-
-// ************************************************************
-
-// In Synch_T.h:
-// #define ACE_MT_SYNCH ACE_Thread_Mutex,ACE_Condition_Thread_Mutex
-
-typedef ACE_Task<ACE_MT_SYNCH> ACE_ES_TASK;
-typedef ACE_Message_Queue<ACE_MT_SYNCH> ACE_ES_QUEUE;
-
-class ACE_RT_Task : public ACE_ES_TASK
-// = TITLE
-//   ACE Real-Time Task
-//   
-// = DESCRIPTION
-//    Real-Time Active Object that integrates with a global scheduler
-//    and Event Service.  For now, none of the management methods are
-//    synchronized.  If it turns out that multiple threads will be
-//    calling the management methods, then we can add
-//    synchronization.  For the most part, RT_Task threads should be
-//    dequeueing commands from the message queue.  Only one thread
-//    should be calling any management methods.
-{
-  friend ACE_RT_Thread_Manager;
-public:
-  ACE_RT_Task (void);
-  // Default construction.
-
-  ~ACE_RT_Task (void);
-  // Deactivates the queue.
-
-  // = Management methods.
-
-  int open_task (const char* name = 0);
-  // <name> is used to look up our qos info from the scheduler.  If
-  // <name> == 0, then we create a "unique" name and ask the scheduler
-  // for a new qos structure.  If we find an existing qos structure,
-  // calls this->synch_threads and returns 1.  If a qos structure is not
-  // found, but created returns 0 and does not call synch_threads.
-  // Returns -1 on failure.
-
-  int try_put (ACE_Message_Block *mb);
-  // Enqueue a request.  Returns 0 on success, -1 on failure.  If the
-  // task is shutdown, -1 is returned with errno == EPIPE.
-
-  int shutdown_task (void);
-  // If active, shutdown all running thread.  Since this is
-  // accomplished via queued shutdown messages, this has the effect of
-  // flushing the queue.  Once all threads exit, threads_closed will
-  // be called.  If this is a passive object, then the queue will be
-  // flushed and threads_closed will be called.
-
-  int synch_threads (size_t threads);
-  // Compare <threads> with what is actually running.  If there are
-  // any differences, update this RT_Task.  This may involve spawning
-  // more threads or changing thread priorities, etc.  This can be
-  // used to close all threads by sending a 0.
-
-  RtecScheduler::handle_t rt_info (void);
-  // QOS accessor.  The behavior of the task can be changed by setting
-  // this and then calling this->synch_threads.
-
-  virtual void threads_closed (void);
-  // Called when every thread has exited.  This hook allows
-  // applications to specify semantics when all threads have exited.
-  // For instance, the Dispatching Module uses this hook to delete
-  // itself when an application is shutting down.
-
-  virtual int svc_hook (RtecScheduler::OS_Priority priority);
-  // This is called the first time the thread is spawned.  <priority>
-  // is the priority of the current thread.  If this returns != 1
-  // (e.g., 0), the event loop will execute (calling this->svc_one).
-  // If this returns 1, the event loop will not execute.
-
-  virtual int svc_one (void);
-  // Call this->getq once and execute the command.  Returns the result
-  // of command->execute ().
-
-protected:
-  RtecScheduler::handle_t rt_info_;
-  // Scheduling characteristics of this active object.
-
-  int closed_;
-  // Set to 1 when this->shutdown_threads or this->close_queue is
-  // called.  Keeps us from enqueuing more that one shutdown message.
-
-  virtual int svc (void);
-  // Run by each thread spawned.  Each thread dequeues
-  // ACE_RT_Task_Commands and executes them.
-
-  virtual int close (u_long flags = 0);
-  // Called each time a thread exits.
-
-  void close_all_threads (void);
-  // Enqueues shutdown message for every thread in the task.
-};
-
-#if defined (__ACE_INLINE__)
-#include "RT_Task.i"
-#endif /* __ACE_INLINE__ */
-
-#endif /* ACE_RT_TASK_H */
diff --git a/TAO/local/bin/Event_Service/RT_Task.i b/TAO/local/bin/Event_Service/RT_Task.i
deleted file mode 100644
index b6b21d50494..00000000000
--- a/TAO/local/bin/Event_Service/RT_Task.i
+++ /dev/null
@@ -1,8 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-ACE_INLINE RtecScheduler::handle_t
-ACE_RT_Task::rt_info (void)
-{
-  return rt_info_;
-}
diff --git a/TAO/local/bin/Event_Service/ReactorTask.cpp b/TAO/local/bin/Event_Service/ReactorTask.cpp
deleted file mode 100644
index 4200eeaa933..00000000000
--- a/TAO/local/bin/Event_Service/ReactorTask.cpp
+++ /dev/null
@@ -1,107 +0,0 @@
-//
-// $Id$
-//
-#include "ace/High_Res_Timer.h"
-
-#include "Scheduler_Factory.h"
-#include "ReactorTask.h"
-
-ACE_ES_Reactor_Task::ACE_ES_Reactor_Task() :
-  //  reactor_ (0, &timer_queue_),
-  done_ (0)
-{
-  // Change the timer mechanism used by the reactor and the timer
-  // queue.
-#if defined (VXWORKS)
-  timer_queue_.gettimeofday (ACE_OS::gettimeofday);
-#else
-  timer_queue_.gettimeofday (ACE_High_Res_Timer::gettimeofday);
-#endif /* VXWORKS */
-}
-
-ACE_ES_Reactor_Task::~ACE_ES_Reactor_Task (void)
-{
-}
-
-int
-ACE_ES_Reactor_Task::svc_hook(RtecScheduler::OS_Priority)
-{
-  // Make ourselves owner of the reactor.
-  reactor_.owner (ACE_Thread::self());
-  return 0;
-}
-
-int
-ACE_ES_Reactor_Task::open_reactor (RtecScheduler::Period &period)
-{
-  // Create a name for ourself using the priority.
-  char temp[64];
-  ACE_OS::sprintf (temp, "Reactor_Task-%u", period);
-
-  // Open the task.  This will query the scheduler for our qos
-  // structure.
-  int result = this->open_task (temp);
-
-  switch (result)
-    {
-    case -1:
-      // Error.
-      ACE_ERROR ((LM_ERROR, "(%t) Scheduler could not find operation %s.\n",
-                  temp));
-      return -1;
-
-    case 0:
-      // @@ TODO handle exceptions
-      {
-	ACE_TRY
-	  {
-	    ACE_Scheduler_Factory::server()->set(rt_info_,
-						 0, 0, 0, period,
-						 RtecScheduler::VERY_LOW,
-						 RtecScheduler::NO_QUANTUM,
-						 1, ACE_TRY_ENV);
-	    ACE_CHECK_ENV;
-	  }
-	ACE_CATCHANY
-	  {
-	    ACE_ERROR_RETURN ((LM_ERROR, "set failed\n"), -1);
-	  }
-	ACE_ENDTRY;
-      }
-      break;
-
-    case 1:
-      // Found.
-      break;
-    }
-
-  return this->synch_threads (1);
-}
-
-int ACE_ES_Reactor_Task::svc_one()
-{
-  if (reactor_.handle_events() == -1)
-    ACE_ERROR ((LM_ERROR, "(%t) %p.\n", "ACE_ES_Reactor_Task::svc"));
-
-  if (done_)
-    ACE_DEBUG ((LM_DEBUG, "(%t) Timer Task is done.\n"));
-
-  return done_;
-}
-
-void ACE_ES_Reactor_Task::threads_closed()
-{
-  delete this;
-}
-
-void ACE_ES_Reactor_Task::shutdown_task()
-{
-  done_ = 1;
-  reactor_.notify();
-}
-
-ACE_ES_Reactor_Task::Reactor& 
-ACE_ES_Reactor_Task::get_reactor()
-{
-  return reactor_;
-}
diff --git a/TAO/local/bin/Event_Service/ReactorTask.h b/TAO/local/bin/Event_Service/ReactorTask.h
deleted file mode 100644
index 61a5a93c6ae..00000000000
--- a/TAO/local/bin/Event_Service/ReactorTask.h
+++ /dev/null
@@ -1,77 +0,0 @@
-// $Id$
-
-#if !defined ACE_ReactorTask_H
-#define ACE_ReactorTask_H
-
-// BBM, moved this here from UPSingleProcessorOrb.h
-//## begin module.includes preserve=yes
-#include "Fast_Reactor.h"
-#if defined (ACE_OLD_STYLE_REACTOR)
-# define ACE_ORB_REACTOR ACE_ES_Fast_Reactor
-#endif /* ACE_OLD_STYLE_REACTOR */
-//## end module.includes
-
-// Added these.
-#include "ace/Timer_Heap.h"
-#include "ace/Timer_List.h"
-
-#include "Local_ESTypes.h"
-#include "RT_Task.h"
-
-class ACE_ES_Reactor_Task : public ACE_RT_Task
-// = TITLE
-//    Event Service Timer Task
-//
-// = DESCRIPTION
-//    An active object that dispatches timers from its own ReactorEx.
-{
-public:
-  // BBM, added this.
-#if defined (ACE_OLD_STYLE_REACTOR)
-  typedef ACE_ORB_REACTOR Reactor;
-#else
-  typedef ACE_Reactor Reactor;
-#endif /* ACE_OLD_STYLE_REACTOR */
-
-  ACE_ES_Reactor_Task();
-  // Default construction.
-
-  ~ACE_ES_Reactor_Task();
-  // Destruction.
-
-  virtual int svc_hook(RtecScheduler::OS_Priority);
-  // Assume ownership of the reactor_.
-
-  // Brian, this is new.
-  int open_reactor (RtecScheduler::Period &period);
-  // This is a hack for now.
-
-  virtual int svc_one();
-  // Calls reactor_.handle_events until done_ is set.
-
-  void shutdown_task();
-  // Sets done_ and notifies the reactor_.
-
-  Reactor &get_reactor();
-  // ReactorEx accessor.
-
-  virtual void threads_closed();
-  // Deletes this.
-
-private:
-  ACE_Timer_List timer_queue_;
-  // The timer storage mechanism used by reactor_.
-
-#if !defined (ACE_OLD_STYLE_REACTOR)
-  ACE_ES_Fast_Reactor fast_reactor_;
-  // The timer dispatch mechanism.
-#endif /* ! ACE_OLD_STYLE_REACTOR */
-
-  Reactor reactor_;
-  // "Public" handle to fast_reactor_.
-
-  sig_atomic_t done_;
-  // When set, end the event loop.
-};
-
-#endif /* ACE_ReactorTask_H */
diff --git a/TAO/local/bin/Event_Service/Task_Manager.cpp b/TAO/local/bin/Event_Service/Task_Manager.cpp
deleted file mode 100644
index e90ee3682da..00000000000
--- a/TAO/local/bin/Event_Service/Task_Manager.cpp
+++ /dev/null
@@ -1,37 +0,0 @@
-// $Id$
-
-#include "Task_Manager.h"
-#include "ReactorTask.h"
-
-#if ! defined (__ACE_INLINE__)
-#include "Task_Manager.i"
-#endif /* __ACE_INLINE__ */
-
-ACE_Task_Manager::ACE_Task_Manager()
-{
-  for (int x=0; x < ACE_Scheduler_MAX_PRIORITIES; x++)
-    {
-      reactorTasks[x] = 0;
-    }
-}
-
-void ACE_Task_Manager::initialize()
-{
-  for (int x=0; x < ACE_Scheduler_MAX_PRIORITIES; x++)
-    {
-      RtecScheduler::Period tv = ACE_Scheduler_Rates[x];
-      reactorTasks[x] = new ReactorTask;
-      if (reactorTasks[x] == 0 ||
-	  reactorTasks[x]->open_reactor (tv) == -1)
-	{
-	  ACE_ERROR ((LM_ERROR, "%p.\n", "ACE_ORB::initialize_reactors"));
-	  return;
-	}
-    }
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Singleton<ACE_Task_Manager,ACE_SYNCH_MUTEX>;
-#elif defined(ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate class ACE_Singleton<ACE_Task_Manager,ACE_SYNCH_MUTEX>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/local/bin/Event_Service/Task_Manager.h b/TAO/local/bin/Event_Service/Task_Manager.h
deleted file mode 100644
index d87693d024b..00000000000
--- a/TAO/local/bin/Event_Service/Task_Manager.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/* -*- C++ -*- */
-//
-// $Id$
-//
-
-#if !defined(TASK_MANAGER_H)
-#define TASK_MANAGER_H
-
-#include <ace/ACE.h>
-#include <ace/Singleton.h>
-#include "Event_Service_Constants.h"
-#include "RT_Task.h"
-
-class ACE_ES_Reactor_Task;
-
-class ACE_Task_Manager 
-// = TITLE
-//   Singleton class for the pool of ACE_ReactorTask.
-//
-// = DESCRIPTION
-//   The EventChannel uses a pool of ACE_ReactorTask to handle the
-//   dispatching of Events. In real-time multi-threaded enviroments
-//   this maps to a different thread per priority.
-//   This class offers a centralized access point to those tasks and
-//   some related services.
-//
-{
-public:
-  typedef ACE_ES_Reactor_Task ReactorTask;
-
-  static ACE_Task_Manager* instance();
-  // Returns the singleton.
-
-  ReactorTask* GetReactorTask(RtecScheduler::OS_Priority priority);
-  // Obtain the ReactorTask for the given priority.
-  // The Task must have been created already.
-
-  ACE_RT_Thread_Manager* ThrMgr();
-  // Returns a global ThreadManager for the Task pool.
-
-private:
-  friend class ACE_Singleton<ACE_Task_Manager,ACE_SYNCH_MUTEX>;
-  ACE_Task_Manager();
-
-  void initialize();
-
-private:
-  ReactorTask *reactorTasks[ACE_Scheduler_MAX_PRIORITIES];
-  ACE_RT_Thread_Manager thr_mgr;
-};
-
-#if defined (__ACE_INLINE__)
-#include "Task_Manager.i"
-#endif /* __ACE_INLINE__ */
-
-#endif /* TASK_MANAGER_H */
diff --git a/TAO/local/bin/Event_Service/Task_Manager.i b/TAO/local/bin/Event_Service/Task_Manager.i
deleted file mode 100644
index 35abcc0268c..00000000000
--- a/TAO/local/bin/Event_Service/Task_Manager.i
+++ /dev/null
@@ -1,30 +0,0 @@
-//
-// $Id$
-//
-
-ACE_INLINE ACE_Task_Manager::ReactorTask*
-ACE_Task_Manager::GetReactorTask(RtecScheduler::OS_Priority priority)
-{
-  if (reactorTasks[priority] == 0)
-    {
-      initialize();
-      //ACE_ERROR_RETURN ((LM_ERROR,
-      //"%p no reactor task for priority %d.\n", 
-      //"ACE_Task_Manager::GetReactor",
-      //priority), 0);
-   }
-   
-  return reactorTasks[priority];
-}
-
-ACE_INLINE ACE_RT_Thread_Manager* ACE_Task_Manager::ThrMgr()
-{
-  return &thr_mgr;
-}
-
-ACE_INLINE ACE_Task_Manager* ACE_Task_Manager::instance()
-{
-  return ACE_Singleton<ACE_Task_Manager,ACE_SYNCH_MUTEX>::instance();
-}
-
-
diff --git a/TAO/local/bin/Makefile b/TAO/local/bin/Makefile
deleted file mode 100644
index 08a276608b0..00000000000
--- a/TAO/local/bin/Makefile
+++ /dev/null
@@ -1,23 +0,0 @@
-#----------------------------------------------------------------------------
-#
-# $Id$
-#
-#----------------------------------------------------------------------------
-
-#----------------------------------------------------------------------------
-#	Local macros
-#----------------------------------------------------------------------------
-
-DIRS  =	Event_Service \
-	Scheduling_Service
-
-#----------------------------------------------------------------------------
-#	Include macros and targets
-#----------------------------------------------------------------------------
-
-include	$(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-include	$(ACE_ROOT)/include/makeinclude/macros.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.common.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.nested.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.nolocal.GNU
-
diff --git a/TAO/local/bin/Scheduling_Service/.cvsignore b/TAO/local/bin/Scheduling_Service/.cvsignore
deleted file mode 100644
index ffbc428cd7f..00000000000
--- a/TAO/local/bin/Scheduling_Service/.cvsignore
+++ /dev/null
@@ -1,3 +0,0 @@
-schedule_service
-dump_schedule
-
diff --git a/TAO/local/bin/Scheduling_Service/Config_Scheduler.cpp b/TAO/local/bin/Scheduling_Service/Config_Scheduler.cpp
deleted file mode 100644
index d9862e1138c..00000000000
--- a/TAO/local/bin/Scheduling_Service/Config_Scheduler.cpp
+++ /dev/null
@@ -1,255 +0,0 @@
-// ============================================================================
-//
-// $Id$
-//
-// ============================================================================
-
-#include "Scheduler_Internal.h"
-#include "Config_Scheduler.h"
-
-#if defined (__ACE_INLINE__)
-#include "Config_Scheduler.i"
-#endif /* __ACE_INLINE__ */
-
-ACE_Config_Scheduler::ACE_Config_Scheduler (void)
-  : POA_RtecScheduler::Scheduler ("Scheduler_Internal"),
-    impl(new Scheduler_Internal)
-{
-  impl->output_level (10);
-}
-
-ACE_Config_Scheduler::~ACE_Config_Scheduler (void)
-{
-  delete impl;
-}
-
-RtecScheduler::handle_t
-ACE_Config_Scheduler::create (const char * entry_point,
-			      CORBA::Environment &_env)
-     ACE_THROW_SPEC ((CORBA::SystemException,
-		      RtecScheduler::DUPLICATE_NAME))
-{
-  typedef RtecScheduler::RT_Info* RT_Info_ptr;
-
-  RtecScheduler::RT_Info** rt_info;
-  ACE_NEW_RETURN (rt_info, RT_Info_ptr[1], -1);
-
-  ACE_NEW_RETURN (rt_info[0], RtecScheduler::RT_Info, -1);
-
-  rt_info[0]->entry_point = CORBA::string_dup(entry_point);
-  rt_info[0]->handle = -1;
-  rt_info[0]->worst_case_execution_time = 0;
-  rt_info[0]->typical_execution_time = 0;
-  rt_info[0]->cached_execution_time = 0;
-  rt_info[0]->period = 0;
-  rt_info[0]->importance = RtecScheduler::VERY_LOW;
-  rt_info[0]->quantum = RtecScheduler::NO_QUANTUM;
-  rt_info[0]->threads = 0;
-  rt_info[0]->priority = 0;
-  rt_info[0]->subpriority = 0;
-  rt_info[0]->preemption_priority = 0;
-  
-  RtecScheduler::handle_t handle = -1;
-  switch (impl->register_task (rt_info, 1, handle))
-    {
-    case ACE_Scheduler::SUCCEEDED:
-      break;
-    case ACE_Scheduler::ST_VIRTUAL_MEMORY_EXHAUSTED:
-    case ACE_Scheduler::ST_TASK_ALREADY_REGISTERED:
-    default:
-      delete rt_info[0];
-      delete[] rt_info;
-      ACE_ERROR ((LM_ERROR,
-		  "Config_Scheduler::create - register_task failed\n"));
-      // TODO: throw something.
-      break;
-    }
-  return handle;
-}
-
-RtecScheduler::handle_t
-ACE_Config_Scheduler::lookup (const char * entry_point,
-			      CORBA::Environment &_env)
-    ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  RtecScheduler::RT_Info* rt_info = 0;
-  switch (impl->get_rt_info (entry_point, rt_info))
-    {
-    case ACE_Scheduler::SUCCEEDED:
-      return rt_info->handle;
-      break;
-    case ACE_Scheduler::FAILED:
-    case ACE_Scheduler::ST_UNKNOWN_TASK:
-    default:
-      ACE_ERROR ((LM_ERROR,
-		  "Config_Scheduler::lookup - get_rt_info failed\n"));
-      // TODO: throw something.
-      break;
-    }
-  return -1;
-}
-
-RtecScheduler::RT_Info*
-ACE_Config_Scheduler::get (RtecScheduler::handle_t handle,
-			   CORBA::Environment &_env)
-     ACE_THROW_SPEC((CORBA::SystemException,
-		     RtecScheduler::UNKNOWN_TASK))
-{
-  RtecScheduler::RT_Info* rt_info = 0;
-  switch (impl->lookup_rt_info (handle, rt_info))
-    {
-    case ACE_Scheduler::SUCCEEDED:
-      {
-	// IDL memory managment semantics require the we return a copy
-	RtecScheduler::RT_Info* copy;
-	ACE_NEW_RETURN (copy, RtecScheduler::RT_Info (*rt_info), 0);
-	return copy;
-      }
-      break;
-    case ACE_Scheduler::FAILED:
-    case ACE_Scheduler::ST_UNKNOWN_TASK:
-    default:
-      ACE_ERROR ((LM_ERROR,
-		  "Config_Scheduler::get - lookup_rt_info failed\n"));
-      // TODO: throw something.
-      break;
-    }
-  return 0;
-}
-
-void ACE_Config_Scheduler::set (RtecScheduler::handle_t handle,
-				RtecScheduler::Time time,
-				RtecScheduler::Time typical_time,
-				RtecScheduler::Time cached_time,
-				RtecScheduler::Period period,
-				RtecScheduler::Importance importance,
-				RtecScheduler::Quantum quantum,
-				CORBA::Long threads,
-				CORBA::Environment &_env)
-     ACE_THROW_SPEC ((CORBA::SystemException,
-		      RtecScheduler::UNKNOWN_TASK))
-{
-  RtecScheduler::RT_Info* rt_info = 0;
-  switch (impl->lookup_rt_info (handle, rt_info))
-    {
-    case ACE_Scheduler::SUCCEEDED:
-      rt_info->worst_case_execution_time = time;
-      rt_info->typical_execution_time = typical_time;
-      rt_info->cached_execution_time = cached_time;
-      rt_info->period = period;
-      rt_info->importance = importance;
-      rt_info->quantum = quantum;
-      rt_info->threads = threads;
-      break;
-    case ACE_Scheduler::FAILED:
-    case ACE_Scheduler::ST_UNKNOWN_TASK:
-    default:
-      ACE_ERROR ((LM_ERROR,
-		  "Config_Scheduler::set - lookup_rt_info failed\n"));
-      // TODO: throw something.
-      break;
-    }
-}
-
-void ACE_Config_Scheduler::priority (RtecScheduler::handle_t handle,
-				     RtecScheduler::OS_Priority& priority,
-				     RtecScheduler::Sub_Priority& subpriority,
-				     RtecScheduler::Preemption_Priority& p_priority,
-				     CORBA::Environment &_env)
-     ACE_THROW_SPEC ((CORBA::SystemException,
-		      RtecScheduler::UNKNOWN_TASK,
-		      RtecScheduler::NOT_SCHEDULED))
-{
-  if (impl->priority (handle, priority, subpriority, p_priority) == -1)
-    {
-      ACE_ERROR ((LM_ERROR,
-		  "Config_Scheduler::priority - priority failed\n"));
-      // TODO: throw something.
-    }
-}
-           
-void ACE_Config_Scheduler::entry_point_priority (const char * entry_point,
-						 RtecScheduler::OS_Priority& priority,
-						 RtecScheduler::Sub_Priority& subpriority,
-						 RtecScheduler::Preemption_Priority& p_priority,
-						 CORBA::Environment &_env)
-     ACE_THROW_SPEC((CORBA::SystemException,
-		     RtecScheduler::UNKNOWN_TASK,
-		     RtecScheduler::NOT_SCHEDULED))
-{
-  this->priority (lookup (entry_point, _env),
-		  priority, subpriority, p_priority,
-		  _env);
-}
-
-void ACE_Config_Scheduler::add_dependency (RtecScheduler::handle_t handle,
-					   RtecScheduler::handle_t dependency,
-					   CORBA::Long number_of_calls,
-					   CORBA::Environment &_env)
-     ACE_THROW_SPEC ((CORBA::SystemException,
-		      RtecScheduler::UNKNOWN_TASK))
-{
-  RtecScheduler::RT_Info* rt_info = 0;
-  switch (impl->lookup_rt_info (handle, rt_info))
-    {
-    case ACE_Scheduler::SUCCEEDED:
-      {
-	RtecScheduler::Dependency_Info dep;
-	dep.rt_info = dependency;
-	dep.number_of_calls = number_of_calls;
-	ACE_Scheduler::add_dependency(rt_info, dep);
-      }
-      break;
-    case ACE_Scheduler::FAILED:
-    case ACE_Scheduler::ST_UNKNOWN_TASK:
-    default:
-      ACE_ERROR ((LM_ERROR,
-		  "cannot find %d to add dependency", handle));
-      // TODO: throw something.
-      break;
-    }
-}
-
-void ACE_Config_Scheduler::compute_scheduling (CORBA::Long minimum_priority,
-					       CORBA::Long maximum_priority,
-					       RtecScheduler::RT_Info_Set_out infos,
-					       CORBA::Environment &_env)
-     ACE_THROW_SPEC ((CORBA::SystemException,
-		      RtecScheduler::UTILIZATION_BOUND_EXCEEDED,
-		      RtecScheduler::INSUFFICIENT_THREAD_PRIORITY_LEVELS,
-		      RtecScheduler::TASK_COUNT_MISMATCH))
-{
-  impl->init (minimum_priority, maximum_priority);
-  if (impl->schedule () != ACE_Scheduler::SUCCEEDED)
-    {
-      // TODO: throw something.
-      ACE_ERROR ((LM_ERROR, "schedule failed\n"));
-      return;
-    }
-  if (infos == 0)
-    {
-      infos = new RtecScheduler::RT_Info_Set(impl->tasks ());
-    }
-  infos->length (impl->tasks ());
-  for (RtecScheduler::handle_t handle = 1;
-       handle <= impl->tasks ();
-       ++handle)
-    {
-      RtecScheduler::RT_Info* rt_info = 0;
-      switch (impl->lookup_rt_info (handle, rt_info))
-	{
-	case ACE_Scheduler::SUCCEEDED:
-	  // We know that handles start at 1.
-	  infos[handle - 1] = *rt_info;
-	  break;
-	case ACE_Scheduler::FAILED:
-	case ACE_Scheduler::ST_UNKNOWN_TASK:
-	default:
-	  ACE_ERROR ((LM_ERROR,
-		      "Config_Scheduler::schedule - lookup_rt_info failed\n"));
-	  // TODO: throw something.
-	  break;
-	}
-    }
-  ACE_DEBUG ((LM_DEBUG, "schedule prepared\n"));
-}
diff --git a/TAO/local/bin/Scheduling_Service/Config_Scheduler.h b/TAO/local/bin/Scheduling_Service/Config_Scheduler.h
deleted file mode 100644
index 7da2739d2ec..00000000000
--- a/TAO/local/bin/Scheduling_Service/Config_Scheduler.h
+++ /dev/null
@@ -1,94 +0,0 @@
-// ============================================================================
-//
-// $Id$
-//
-// ============================================================================
-
-#ifndef ACE_CONFIG_SCHEDULER_H
-#define ACE_CONFIG_SCHEDULER_H
-
-#include <ace/OS.h>
-
-#include "RtecSchedulerS.h"
-#include "Event_Service_Constants.h"
-
-class ACE_Config_Scheduler
-: public POA_RtecScheduler::Scheduler
-  // = TITLE
-  //   A (local) implementation for the RtecScheduler::Scheduler service.
-  //
-  // = DESCRIPTION
-  //   This class implements a servant for the
-  //   RtecScheduler::Scheduler service, using the Scheduler classes
-  //   distributed with the EC.
-{
-public:
-  ACE_Config_Scheduler (void);
-  virtual ~ACE_Config_Scheduler (void);
-
-  virtual RtecScheduler::handle_t create (const char * entry_point,
-					  CORBA::Environment &_env)
-    ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::DUPLICATE_NAME));
-
-  virtual RtecScheduler::handle_t lookup (const char * entry_point,
-					  CORBA::Environment &_env)
-    ACE_THROW_SPEC((CORBA::SystemException));
-
-  virtual RtecScheduler::RT_Info* get (RtecScheduler::handle_t handle,
-				       CORBA::Environment &_env)
-    ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::UNKNOWN_TASK));
-
-  virtual void set (RtecScheduler::handle_t handle,
-		    RtecScheduler::Time time,
-		    RtecScheduler::Time typical_time,
-		    RtecScheduler::Time cached_time,
-		    RtecScheduler::Period period,
-		    RtecScheduler::Importance importance,
-		    RtecScheduler::Quantum quantum,
-		    CORBA::Long threads,
-		    CORBA::Environment &_env)
-    ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::UNKNOWN_TASK));
-
-  virtual void priority (RtecScheduler::handle_t handle,
-			 RtecScheduler::OS_Priority& priority,
-			 RtecScheduler::Sub_Priority& subpriority,
-			 RtecScheduler::Preemption_Priority& p_priority,
-			 CORBA::Environment &_env)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-		     RtecScheduler::UNKNOWN_TASK,
-		     RtecScheduler::NOT_SCHEDULED));
-           
-  virtual void entry_point_priority (const char * entry_point,
-				     RtecScheduler::OS_Priority& priority,
-				     RtecScheduler::Sub_Priority& subpriority,
-				     RtecScheduler::Preemption_Priority& p_priority,
-				     CORBA::Environment &_env)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-		     RtecScheduler::UNKNOWN_TASK,
-		     RtecScheduler::NOT_SCHEDULED));
-
-  virtual void add_dependency (RtecScheduler::handle_t handle,
-			       RtecScheduler::handle_t dependency,
-			       CORBA::Long number_of_calls,
-			       CORBA::Environment &_env)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-		     RtecScheduler::UNKNOWN_TASK));
-
-  virtual void compute_scheduling (CORBA::Long minimum_priority,
-				   CORBA::Long maximum_priority,
-				   RtecScheduler::RT_Info_Set_out infos,
-				   CORBA::Environment &_env)
-    ACE_THROW_SPEC((CORBA::SystemException,
-		    RtecScheduler::UTILIZATION_BOUND_EXCEEDED,
-		    RtecScheduler::INSUFFICIENT_THREAD_PRIORITY_LEVELS,
-		    RtecScheduler::TASK_COUNT_MISMATCH));
-
-private:
-  class ACE_Scheduler* impl;
-};
-
-#if defined (__ACE_INLINE__)
-#include "Config_Scheduler.i"
-#endif /* __ACE_INLINE__ */
-
-#endif /* ACE_CONFIG_SCHEDULER_H */
diff --git a/TAO/local/bin/Scheduling_Service/Config_Scheduler.i b/TAO/local/bin/Scheduling_Service/Config_Scheduler.i
deleted file mode 100644
index a21ea7f9897..00000000000
--- a/TAO/local/bin/Scheduling_Service/Config_Scheduler.i
+++ /dev/null
@@ -1,5 +0,0 @@
-// ============================================================================
-//
-// $Id$
-//
-// ============================================================================
diff --git a/TAO/local/bin/Scheduling_Service/Makefile b/TAO/local/bin/Scheduling_Service/Makefile
deleted file mode 100644
index cb31ad2deab..00000000000
--- a/TAO/local/bin/Scheduling_Service/Makefile
+++ /dev/null
@@ -1,752 +0,0 @@
-#
-# $Id$
-#
-
-BIN = schedule_service dump_schedule
-BUILD = $(BIN)
-
-SCHEDULE_SRCS = \
-	schedule_service.cpp \
-	Config_Scheduler.cpp \
-	Scheduler.cpp \
-	Scheduler_Internal.cpp
-DUMP_SRCS = \
-	dump_schedule.cpp
-
-LSRC = 	$(SCHEDULE_SRCS) \
-	$(DUMP_SRCS)
-
-SCHEDULE_OBJS=$(SCHEDULE_SRCS:.cpp=.o)
-DUMP_OBJS=$(DUMP_SRCS:.cpp=.o)
-
-LDLIBS     =  -lorbsvcs -lTAO
-VLDLIBS = $(LDLIBS:%=%$(VAR))
-
-#----------------------------------------------------------------------------
-#	Include macros and targets
-#----------------------------------------------------------------------------
-
-include	$(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-include	$(ACE_ROOT)/include/makeinclude/macros.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.common.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
-#include	$(ACE_ROOT)/include/makeinclude/rules.bin.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
-
-ifndef TAO_ROOT
-TAO_ROOT = $(ACE_ROOT)/TAO
-endif
-TSS_ORB_FLAG = #-DTAO_HAS_TSS_ORBCORE
-DCFLAGS = -g
-LDFLAGS += -L$(TAO_ROOT)/orbsvcs/lib -L$(TAO_ROOT)/tao
-CPPFLAGS += -I$(TAO_ROOT)/orbsvcs/lib -I$(TAO_ROOT) -I$(TAO_ROOT)/tao/compat $(TSS_ORB_FLAG)#-H
-
-schedule_service: $(addprefix $(VDIR),$(SCHEDULE_OBJS))
-	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS)
-
-dump_schedule: $(addprefix $(VDIR),$(DUMP_OBJS))
-	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS)
-
-
-#----------------------------------------------------------------------------
-#	Dependencies
-#----------------------------------------------------------------------------
-
-# DO NOT DELETE THIS LINE -- g++dep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-
-.obj/schedule_service.o .shobj/schedule_service.: schedule_service.cpp \
- $(ACE_ROOT)/ace/CORBA_Handler.h \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/stdcpp.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Pipe.h \
- $(ACE_ROOT)/ace/Pipe.i \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/Task_T.i \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Svc_Handler.i \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(TAO_ROOT)/tao/orbconf.h \
- $(TAO_ROOT)/tao/orb.h \
- $(TAO_ROOT)/tao/corbacom.h \
- $(TAO_ROOT)/tao/object.h \
- $(TAO_ROOT)/tao/align.h \
- $(TAO_ROOT)/tao/sequence.h \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/any.h \
- $(TAO_ROOT)/tao/poa.h \
- $(TAO_ROOT)/tao/tao_internals.h \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/client_factory.h \
- $(TAO_ROOT)/tao/server_factory.h \
- $(TAO_ROOT)/tao/default_client.h \
- $(TAO_ROOT)/tao/default_server.h \
- $(TAO_ROOT)/tao/except.h \
- $(TAO_ROOT)/tao/orbobj.h \
- $(TAO_ROOT)/tao/nvlist.h \
- $(TAO_ROOT)/tao/principa.h \
- $(TAO_ROOT)/tao/request.h \
- $(TAO_ROOT)/tao/svrrqst.h \
- $(TAO_ROOT)/tao/typecode.h \
- $(TAO_ROOT)/tao/marshal.h \
- $(TAO_ROOT)/tao/cdr.h \
- $(TAO_ROOT)/tao/stub.h \
- $(TAO_ROOT)/tao/connect.h \
- $(TAO_ROOT)/tao/orb_core.h \
- $(TAO_ROOT)/tao/objtable.h \
- $(TAO_ROOT)/tao/optable.h \
- $(TAO_ROOT)/tao/debug.h \
- $(TAO_ROOT)/tao/iiopobj.h \
- $(TAO_ROOT)/tao/iioporb.h \
- $(TAO_ROOT)/tao/giop.h \
- $(TAO_ROOT)/tao/orb_core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(TAO_ROOT)/tao/corbacom.i \
- $(TAO_ROOT)/tao/sequence.i \
- $(TAO_ROOT)/tao/typecode.i \
- $(TAO_ROOT)/tao/any.i \
- $(TAO_ROOT)/tao/cdr.i \
- $(TAO_ROOT)/tao/stub.i \
- $(TAO_ROOT)/tao/object.i \
- $(TAO_ROOT)/tao/orbobj.i \
- $(TAO_ROOT)/tao/marshal.i \
- $(TAO_ROOT)/tao/poa.i \
- $(TAO_ROOT)/tao/giop.i \
- $(TAO_ROOT)/tao/iioporb.i \
- $(TAO_ROOT)/tao/iiopobj.i \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/server_factory.i \
- $(TAO_ROOT)/tao/default_client.i \
- $(TAO_ROOT)/tao/default_server.i \
- $(TAO_ROOT)/tao/connect.i \
- $(TAO_ROOT)/tao/singletons.h \
- $(TAO_ROOT)/orbsvcs/lib/CosNamingC.h \
- $(TAO_ROOT)/orbsvcs/lib/CosNamingC.i \
- Config_Scheduler.h \
- $(TAO_ROOT)/orbsvcs/lib/RtecSchedulerS.h \
- $(TAO_ROOT)/orbsvcs/lib/RtecSchedulerC.h \
- $(TAO_ROOT)/orbsvcs/lib/RtecSchedulerC.i \
- $(TAO_ROOT)/orbsvcs/lib/RtecSchedulerS.i \
- $(TAO_ROOT)/orbsvcs/lib/Event_Service_Constants.h \
- Config_Scheduler.i
-.obj/Config_Scheduler.o .shobj/Config_Scheduler.: Config_Scheduler.cpp Scheduler_Internal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/stdcpp.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Containers.i \
- Scheduler.h \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(TAO_ROOT)/orbsvcs/lib/RtecSchedulerC.h \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/Task_T.i \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Svc_Handler.i \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(TAO_ROOT)/tao/orbconf.h \
- $(TAO_ROOT)/tao/orb.h \
- $(TAO_ROOT)/tao/corbacom.h \
- $(TAO_ROOT)/tao/object.h \
- $(TAO_ROOT)/tao/align.h \
- $(TAO_ROOT)/tao/sequence.h \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/any.h \
- $(TAO_ROOT)/tao/poa.h \
- $(TAO_ROOT)/tao/tao_internals.h \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/client_factory.h \
- $(TAO_ROOT)/tao/server_factory.h \
- $(TAO_ROOT)/tao/default_client.h \
- $(TAO_ROOT)/tao/default_server.h \
- $(TAO_ROOT)/tao/except.h \
- $(TAO_ROOT)/tao/orbobj.h \
- $(TAO_ROOT)/tao/nvlist.h \
- $(TAO_ROOT)/tao/principa.h \
- $(TAO_ROOT)/tao/request.h \
- $(TAO_ROOT)/tao/svrrqst.h \
- $(TAO_ROOT)/tao/typecode.h \
- $(TAO_ROOT)/tao/marshal.h \
- $(TAO_ROOT)/tao/cdr.h \
- $(TAO_ROOT)/tao/stub.h \
- $(TAO_ROOT)/tao/connect.h \
- $(TAO_ROOT)/tao/orb_core.h \
- $(TAO_ROOT)/tao/objtable.h \
- $(TAO_ROOT)/tao/optable.h \
- $(TAO_ROOT)/tao/debug.h \
- $(TAO_ROOT)/tao/iiopobj.h \
- $(TAO_ROOT)/tao/iioporb.h \
- $(TAO_ROOT)/tao/giop.h \
- $(TAO_ROOT)/tao/orb_core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(TAO_ROOT)/tao/corbacom.i \
- $(TAO_ROOT)/tao/sequence.i \
- $(TAO_ROOT)/tao/typecode.i \
- $(TAO_ROOT)/tao/any.i \
- $(TAO_ROOT)/tao/cdr.i \
- $(TAO_ROOT)/tao/stub.i \
- $(TAO_ROOT)/tao/object.i \
- $(TAO_ROOT)/tao/orbobj.i \
- $(TAO_ROOT)/tao/marshal.i \
- $(TAO_ROOT)/tao/poa.i \
- $(TAO_ROOT)/tao/giop.i \
- $(TAO_ROOT)/tao/iioporb.i \
- $(TAO_ROOT)/tao/iiopobj.i \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/server_factory.i \
- $(TAO_ROOT)/tao/default_client.i \
- $(TAO_ROOT)/tao/default_server.i \
- $(TAO_ROOT)/tao/connect.i \
- $(TAO_ROOT)/tao/singletons.h \
- $(TAO_ROOT)/orbsvcs/lib/RtecSchedulerC.i \
- $(TAO_ROOT)/orbsvcs/lib/Event_Service_Constants.h \
- Scheduler.i Scheduler_Internal.i Config_Scheduler.h \
- $(TAO_ROOT)/orbsvcs/lib/RtecSchedulerS.h \
- $(TAO_ROOT)/orbsvcs/lib/RtecSchedulerS.i \
- Config_Scheduler.i
-.obj/Scheduler.o .shobj/Scheduler.: Scheduler.cpp \
- $(ACE_ROOT)/ace/Sched_Params.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/stdcpp.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Sched_Params.i \
- Scheduler_Internal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- Scheduler.h \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(TAO_ROOT)/orbsvcs/lib/RtecSchedulerC.h \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/Task_T.i \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Svc_Handler.i \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(TAO_ROOT)/tao/orbconf.h \
- $(TAO_ROOT)/tao/orb.h \
- $(TAO_ROOT)/tao/corbacom.h \
- $(TAO_ROOT)/tao/object.h \
- $(TAO_ROOT)/tao/align.h \
- $(TAO_ROOT)/tao/sequence.h \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/any.h \
- $(TAO_ROOT)/tao/poa.h \
- $(TAO_ROOT)/tao/tao_internals.h \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/client_factory.h \
- $(TAO_ROOT)/tao/server_factory.h \
- $(TAO_ROOT)/tao/default_client.h \
- $(TAO_ROOT)/tao/default_server.h \
- $(TAO_ROOT)/tao/except.h \
- $(TAO_ROOT)/tao/orbobj.h \
- $(TAO_ROOT)/tao/nvlist.h \
- $(TAO_ROOT)/tao/principa.h \
- $(TAO_ROOT)/tao/request.h \
- $(TAO_ROOT)/tao/svrrqst.h \
- $(TAO_ROOT)/tao/typecode.h \
- $(TAO_ROOT)/tao/marshal.h \
- $(TAO_ROOT)/tao/cdr.h \
- $(TAO_ROOT)/tao/stub.h \
- $(TAO_ROOT)/tao/connect.h \
- $(TAO_ROOT)/tao/orb_core.h \
- $(TAO_ROOT)/tao/objtable.h \
- $(TAO_ROOT)/tao/optable.h \
- $(TAO_ROOT)/tao/debug.h \
- $(TAO_ROOT)/tao/iiopobj.h \
- $(TAO_ROOT)/tao/iioporb.h \
- $(TAO_ROOT)/tao/giop.h \
- $(TAO_ROOT)/tao/orb_core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(TAO_ROOT)/tao/corbacom.i \
- $(TAO_ROOT)/tao/sequence.i \
- $(TAO_ROOT)/tao/typecode.i \
- $(TAO_ROOT)/tao/any.i \
- $(TAO_ROOT)/tao/cdr.i \
- $(TAO_ROOT)/tao/stub.i \
- $(TAO_ROOT)/tao/object.i \
- $(TAO_ROOT)/tao/orbobj.i \
- $(TAO_ROOT)/tao/marshal.i \
- $(TAO_ROOT)/tao/poa.i \
- $(TAO_ROOT)/tao/giop.i \
- $(TAO_ROOT)/tao/iioporb.i \
- $(TAO_ROOT)/tao/iiopobj.i \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/server_factory.i \
- $(TAO_ROOT)/tao/default_client.i \
- $(TAO_ROOT)/tao/default_server.i \
- $(TAO_ROOT)/tao/connect.i \
- $(TAO_ROOT)/tao/singletons.h \
- $(TAO_ROOT)/orbsvcs/lib/RtecSchedulerC.i \
- $(TAO_ROOT)/orbsvcs/lib/Event_Service_Constants.h \
- Scheduler.i Scheduler_Internal.i
-.obj/Scheduler_Internal.o .shobj/Scheduler_Internal.: Scheduler_Internal.cpp \
- \
- \
- $(ACE_ROOT)/ace/Sched_Params.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/stdcpp.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Sched_Params.i \
- Scheduler_Internal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- Scheduler.h \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(TAO_ROOT)/orbsvcs/lib/RtecSchedulerC.h \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/Task_T.i \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Svc_Handler.i \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(TAO_ROOT)/tao/orbconf.h \
- $(TAO_ROOT)/tao/orb.h \
- $(TAO_ROOT)/tao/corbacom.h \
- $(TAO_ROOT)/tao/object.h \
- $(TAO_ROOT)/tao/align.h \
- $(TAO_ROOT)/tao/sequence.h \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/any.h \
- $(TAO_ROOT)/tao/poa.h \
- $(TAO_ROOT)/tao/tao_internals.h \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/client_factory.h \
- $(TAO_ROOT)/tao/server_factory.h \
- $(TAO_ROOT)/tao/default_client.h \
- $(TAO_ROOT)/tao/default_server.h \
- $(TAO_ROOT)/tao/except.h \
- $(TAO_ROOT)/tao/orbobj.h \
- $(TAO_ROOT)/tao/nvlist.h \
- $(TAO_ROOT)/tao/principa.h \
- $(TAO_ROOT)/tao/request.h \
- $(TAO_ROOT)/tao/svrrqst.h \
- $(TAO_ROOT)/tao/typecode.h \
- $(TAO_ROOT)/tao/marshal.h \
- $(TAO_ROOT)/tao/cdr.h \
- $(TAO_ROOT)/tao/stub.h \
- $(TAO_ROOT)/tao/connect.h \
- $(TAO_ROOT)/tao/orb_core.h \
- $(TAO_ROOT)/tao/objtable.h \
- $(TAO_ROOT)/tao/optable.h \
- $(TAO_ROOT)/tao/debug.h \
- $(TAO_ROOT)/tao/iiopobj.h \
- $(TAO_ROOT)/tao/iioporb.h \
- $(TAO_ROOT)/tao/giop.h \
- $(TAO_ROOT)/tao/orb_core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(TAO_ROOT)/tao/corbacom.i \
- $(TAO_ROOT)/tao/sequence.i \
- $(TAO_ROOT)/tao/typecode.i \
- $(TAO_ROOT)/tao/any.i \
- $(TAO_ROOT)/tao/cdr.i \
- $(TAO_ROOT)/tao/stub.i \
- $(TAO_ROOT)/tao/object.i \
- $(TAO_ROOT)/tao/orbobj.i \
- $(TAO_ROOT)/tao/marshal.i \
- $(TAO_ROOT)/tao/poa.i \
- $(TAO_ROOT)/tao/giop.i \
- $(TAO_ROOT)/tao/iioporb.i \
- $(TAO_ROOT)/tao/iiopobj.i \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/server_factory.i \
- $(TAO_ROOT)/tao/default_client.i \
- $(TAO_ROOT)/tao/default_server.i \
- $(TAO_ROOT)/tao/connect.i \
- $(TAO_ROOT)/tao/singletons.h \
- $(TAO_ROOT)/orbsvcs/lib/RtecSchedulerC.i \
- $(TAO_ROOT)/orbsvcs/lib/Event_Service_Constants.h \
- Scheduler.i Scheduler_Internal.i
-.obj/dump_schedule.o .shobj/dump_schedule.: dump_schedule.cpp \
- $(TAO_ROOT)/orbsvcs/lib/CosNamingC.h \
- $(TAO_ROOT)/orbsvcs/lib/CosNamingC.i \
- $(TAO_ROOT)/orbsvcs/lib/Scheduler_Factory.h \
- $(TAO_ROOT)/orbsvcs/lib/RtecSchedulerC.h \
- $(TAO_ROOT)/orbsvcs/lib/RtecSchedulerC.i \
- $(TAO_ROOT)/orbsvcs/lib/Scheduler_Factory.i
-
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/local/bin/Scheduling_Service/Scheduler.cpp b/TAO/local/bin/Scheduling_Service/Scheduler.cpp
deleted file mode 100644
index b71e0679469..00000000000
--- a/TAO/local/bin/Scheduling_Service/Scheduler.cpp
+++ /dev/null
@@ -1,291 +0,0 @@
-// $Id$
-//
-// ============================================================================
-//
-// = LIBRARY
-//    sched
-//
-// = FILENAME
-//    Scheduler.cpp
-//
-// = CREATION DATE
-//    23 January 1997
-//
-// = AUTHOR
-//    David Levine
-//
-// ============================================================================
-
-#include "ace/Sched_Params.h"
-#include "Scheduler.h"
-
-#if ! defined (__ACE_INLINE__)
-#include "Scheduler.i"
-#endif /* __ACE_INLINE__ */
-
-///////////////////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////////
-// class Scheduler static members
-///////////////////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////////
-
-const ACE_Scheduler::mode_t ACE_Scheduler::CURRENT_MODE = 0xFFFFFFFF;
-
-ACE_Scheduler *ACE_Scheduler::instance_ = 0;
-
-
-///////////////////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////////
-// class ACE_Scheduler static functions
-///////////////////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////////
-
-void
-ACE_Scheduler::output (FILE *file, const status_t status)
-{
-  switch (status)
-  {
-    case NOT_SCHEDULED :
-      ACE_OS::fprintf (file, "NOT_SCHEDULED");
-      break;
-    case SUCCEEDED :
-      ACE_OS::fprintf (file, "SUCCEEDED");
-      break;
-    case ST_TASK_ALREADY_REGISTERED :
-      ACE_OS::fprintf (file, "TASK_ALREADY_REGISTERED");
-      break;
-    case ST_VIRTUAL_MEMORY_EXHAUSTED :
-      ACE_OS::fprintf (file, "VIRTUAL_MEMORY_EXHAUSTED");
-      break;
-    case ST_UNKNOWN_TASK :
-      ACE_OS::fprintf (file, "UNKNOWN_TASK");
-      break;
-    case INVALID_MODE :
-      ACE_OS::fprintf (file, "INVALID_MODE");
-      break;
-    case MODE_COUNT_MISMATCH :
-      ACE_OS::fprintf (file, "MODE_COUNT_MISMATCH");
-      break;
-    case TASK_COUNT_MISMATCH :
-      ACE_OS::fprintf (file, "TASK_COUNT_MISMATCH");
-      break;
-    case INVALID_PRIORITY :
-      ACE_OS::fprintf (file, "INVALID_PRIORITY");
-      break;
-
-    // The following are only used during scheduling (in the case of
-    // off-line scheduling, they are only used prior to runtime).
-    // To save a little code space (280 bytes on g++ 2.7.2/Solaris 2.5.1),
-    // we could conditionally compile them so that they're not in the
-    // runtime version.
-    case ST_UTILIZATION_BOUND_EXCEEDED :
-      ACE_OS::fprintf (file, "UTILIZATION_BOUND_EXCEEDED");
-      break;
-    case ST_INSUFFICIENT_THREAD_PRIORITY_LEVELS :
-      ACE_OS::fprintf (file, "INSUFFICIENT_THREAD_PRIORITY_LEVELS");
-      break;
-    case ST_CYCLE_IN_DEPENDENCIES :
-      ACE_OS::fprintf (file, "CYCLE_IN_DEPENDENCIES");
-      break;
-    case UNABLE_TO_OPEN_SCHEDULE_FILE :
-      ACE_OS::fprintf (file, "UNABLE_TO_OPEN_SCHEDULE_FILE");
-      break;
-    case UNABLE_TO_WRITE_SCHEDULE_FILE :
-      ACE_OS::fprintf (file, "UNABLE_TO_WRITE_SCHEDULE_FILE");
-      break;
-    // End of config-only status values.
-
-    default:
-      ACE_OS::fprintf (file, "UNKNOWN STATUS: %d", status);
-  }
-}
-
-
-///////////////////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////////
-// class ACE_Scheduler member functions
-///////////////////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////////
-
-ACE_Scheduler::ACE_Scheduler () :
-  minimum_priority_queue_ (0),  // Could initialize this to -1, but it's
-                                // unsigned and we don't really need to
-                                // distinguish between no queues and one
-                                // queue.
-  modes_ (0),
-  tasks_ (0),
-  threads_ (0),
-  mode_ (0),
-  status_ (NOT_SCHEDULED),
-  output_level_ (0)
-{
-}
-
-
-ACE_Scheduler::~ACE_Scheduler ()
-{
-}
-
-
-// ************************************************************
-
-ACE_Scheduler::status_t
-ACE_Scheduler::get_rt_info (Object_Name name,
-                        RT_Info* &rtinfo)
-{
-  handle_t handle;
-
-  // This makes a copy.  We can optimize this with our own string
-  // class.
-  ACE_CString lookup (name);
-  // Search the map for the <name>.  If found, return the RT_Info.
-  RT_Info **info_array = 0;
-  if (info_collection_.find (lookup, info_array) >= 0)
-    {
-      rtinfo = info_array[0];
-      // If we find it, return.
-      return SUCCEEDED;
-    }
-  else
-    // Otherwise, make one, bind it, and register it.
-    {
-      rtinfo = new RT_Info;
-      rtinfo->entry_point = name;
-      // Create and array (size one) of RT_Info*
-      info_array = new RT_Info*[1];
-      info_array[0] = rtinfo;
-      // Bind the rtinfo to the name.
-      if (info_collection_.bind (lookup, info_array) != 0)
-	{
-	  delete rtinfo;
-	  delete info_array;
-	  rtinfo = 0;
-	  return FAILED; // Error!
-	}
-      else
-	{
-	  // Register the array.
-	  status_t result = this->register_task (info_array, 1, handle);
-	  if (result == SUCCEEDED)
-	    {
-	      rtinfo->handle = handle;
-	      return ST_UNKNOWN_TASK; // Didn't find it, but made one!
-	    }
-	  else
-	    {
-	      rtinfo->handle = 0;
-	      return FAILED;
-	    }
-	}
-    }
-}
-
-
-
-int ACE_Scheduler::number_of_dependencies(RT_Info* rt_info)
-{
-  return rt_info->dependencies.length();
-}
-
-int ACE_Scheduler::number_of_dependencies(RT_Info& rt_info)
-{
-  return rt_info.dependencies.length();
-}
-
-int ACE_Scheduler::add_dependency(RT_Info* rt_info,
-			      const Dependency_Info& d)
-{
-  ACE_DEBUG ((LM_DEBUG, "adding dependecy to: %s\n",
-	      (const char*)rt_info->entry_point));
-  RtecScheduler::Dependency_Set& set = rt_info->dependencies;
-  int l = set.length();
-  set.length(l + 1);
-  set[l] = d;
-  return 0;
-}
-
-void ACE_Scheduler::export(RT_Info* info, FILE* file)
-{
-  export(*info, file);
-}
-
-void ACE_Scheduler::export(RT_Info& info, FILE* file)
-{
-  // The divide-by-1 is for ACE_U_LongLong support.
-  (void) ACE_OS::fprintf (file,
-                          "%s\n%d\n%ld\n%ld\n%ld\n%ld\n%d\n%ld\n%u\n"
-                          "# begin dependencies\n%d\n",
-                          (const char*)info.entry_point,
-                          info.handle,
-                          info.worst_case_execution_time / 1,
-                          info.typical_execution_time / 1,
-                          info.cached_execution_time / 1,
-                          info.period,
-                          info.importance,
-                          info.quantum / 1,
-                          info.threads,
-                          number_of_dependencies(info));
-
-  for (int i = 0; i < number_of_dependencies(info); ++i)
-    {
-      RT_Info tmp;
-      // TODO: info.dependencies [i].rt_info >>= &tmp;
-      (void) ACE_OS::fprintf (file, "%s, %d\n",
-                              (const char*)tmp.entry_point,
-                              info.dependencies[i].number_of_calls);
-
-    }
-
-  (void) ACE_OS::fprintf (file, "# end dependencies\n%d\n%d\n\n",
-                          info.priority,
-                          info.subpriority);
-
-
-}
-
-
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Lock_Adapter<ACE_Null_Mutex>;
-template class ACE_Map_Entry<ACE_CString, ACE_Scheduler::RT_Info **>;
-
-#if defined (ACE_HAS_THREADS)
-  template class ACE_Lock_Adapter<ACE_RW_Thread_Mutex>;
-  template class ACE_Lock_Adapter<ACE_Thread_Mutex>;
-  template class ACE_Map_Manager<ACE_CString,
-				 ACE_Scheduler::RT_Info **,
-                                 ACE_Thread_Mutex>;
-  template class ACE_Map_Iterator<ACE_CString, ACE_Scheduler::RT_Info **,
-                                  ACE_Thread_Mutex>;
-  template class ACE_Read_Guard<ACE_Thread_Mutex>;
-  template class ACE_Write_Guard<ACE_Thread_Mutex>;
-#else
-  template class ACE_Map_Manager<ACE_CString, RT_Info **,
-                                 ACE_Null_Mutex>;
-  template class ACE_Map_Iterator<ACE_CString, RT_Info **,
-                                  ACE_Null_Mutex>;
-  template class ACE_Read_Guard<ACE_Null_Mutex>;
-  template class ACE_Write_Guard<ACE_Null_Mutex>;
-#endif /* ACE_HAS_THREADS */
-#elif defined(ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate class ACE_Lock_Adapter<ACE_Null_Mutex>
-#pragma instantiate class ACE_Map_Entry<ACE_CString, RT_Info **>
-#pragma instantiate class ACE_Singleton<ACE_Scheduler::TaskManager>
-
-#if defined (ACE_HAS_THREADS)
-#pragma instantiate class ACE_Lock_Adapter<ACE_RW_Thread_Mutex>
-#pragma instantiate class ACE_Lock_Adapter<ACE_Thread_Mutex>
-#pragma instantiate class ACE_Map_Manager<ACE_CString, RT_Info **, ACE_Thread_Mutex>
-#pragma instantiate class ACE_Map_Iterator<ACE_CString, RT_Info **, ACE_Thread_Mutex>
-#pragma instantiate class ACE_Read_Guard<ACE_Thread_Mutex>
-#pragma instantiate class ACE_Write_Guard<ACE_Thread_Mutex>
-#else
-#pragma instantiate class ACE_Map_Manager<ACE_CString, RT_Info **, ACE_Null_Mutex>
-#pragma instantiate class ACE_Map_Iterator<ACE_CString, RT_Info **, ACE_Null_Mutex>
-#pragma instantiate class ACE_Read_Guard<ACE_Null_Mutex>
-#pragma instantiate class ACE_Write_Guard<ACE_Null_Mutex>
-#endif /* ACE_HAS_THREADS */
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-// EOF
diff --git a/TAO/local/bin/Scheduling_Service/Scheduler.h b/TAO/local/bin/Scheduling_Service/Scheduler.h
deleted file mode 100644
index c24d9f91f44..00000000000
--- a/TAO/local/bin/Scheduling_Service/Scheduler.h
+++ /dev/null
@@ -1,278 +0,0 @@
-/* -*- C++ -*- */
-//
-// $Id$
-//
-// ============================================================================
-//
-// = LIBRARY
-//    sched
-//
-// = FILENAME
-//    Scheduler.h
-//
-// = CREATION DATE
-//    23 January 1997
-//
-// = AUTHOR
-//    David Levine
-//
-// ============================================================================
-
-#if ! defined (SCHEDULER_H)
-#define SCHEDULER_H
-
-#include "ace/ACE.h"
-#include "ace/Map_Manager.h"
-#include "ace/Message_Block.h"
-#include "ace/Synch.h"
-#include "ace/SString.h"
-
-#include "RtecSchedulerC.h"
-#include "Event_Service_Constants.h"
-
-class ACE_Scheduler
-  // = TITLE
-  //    Thread scheduler interface.
-  //
-  // = DESCRIPTION
-  //    This virtual base class is the interface to either an off-line
-  //    scheduler, or to the necessary on-line component of the Scheduler.
-{
-public:
-  typedef u_int mode_t;
-
-  typedef RtecScheduler::handle_t handle_t;
-  typedef RtecScheduler::Dependency_Info Dependency_Info;
-  typedef RtecScheduler::Preemption_Priority Preemption_Priority;
-  typedef RtecScheduler::OS_Priority OS_Thread_Priority;
-  typedef RtecScheduler::Sub_Priority Sub_Priority;
-  typedef RtecScheduler::RT_Info RT_Info;
-  // Map some types to simplify re-use.
-
-  typedef const char *Object_Name;
-  // Objects are named by unique strings.
-
-  static const mode_t CURRENT_MODE;
-
-  enum status_t {
-    // The following are used both by the runtime Scheduler and during
-    // scheduling.
-    NOT_SCHEDULED = -1        // the schedule () method has not been called yet
-    , FAILED = -1
-    , SUCCEEDED
-    , ST_UNKNOWN_TASK
-    , ST_TASK_ALREADY_REGISTERED
-    , ST_VIRTUAL_MEMORY_EXHAUSTED
-
-    // The following are only used by the runtime Scheduler.
-    , INVALID_MODE
-    , MODE_COUNT_MISMATCH     // only used by schedule ()
-    , TASK_COUNT_MISMATCH     // only used by schedule ()
-    , INVALID_PRIORITY        // only used by schedule (): mismatch of
-                              // (off-line, maybe) Scheduler output to
-                              // the runtime Scheduler component.
-
-    // The following are only used during scheduling (in the case of
-    // off-line scheduling, they are only used prior to runtime).
-    , ST_UTILIZATION_BOUND_EXCEEDED
-    , ST_INSUFFICIENT_THREAD_PRIORITY_LEVELS
-    , ST_CYCLE_IN_DEPENDENCIES
-    , UNABLE_TO_OPEN_SCHEDULE_FILE
-    , UNABLE_TO_WRITE_SCHEDULE_FILE
-  };
-
-  virtual ~ACE_Scheduler ();
-
-  // = Utility function for outputting the textual representation of a
-  //   status_t value to a FILE.
-  static void output (FILE *, const status_t);
-
-  // = Initialize the scheduler.
-  virtual void init (const int minimum_priority,
-                     const int maximum_priority,
-                     const char *runtime_filename = 0,
-                     const char *rt_info_filename = 0,
-                     const char *timeline_filename = 0) = 0;
-  // The minimum and maximum priority are the OS-specific priorities that
-  // are used when creating the schedule (assigning priorities).  The
-  // minimum_priority is the priority value of the lowest priority.
-  // It may be numerically higher than the maximum_priority, on OS's such
-  // as VxWorks that use lower values to indicate higher priorities.
-  //
-  // When Scheduler::schedule is called, the schedule is output to the
-  // file named by "runtime_filename" if it is non-zero.
-  // This file is compilable; it is linked into the runtime executable
-  // to provide priorities to the runtime scheduling component.
-  // If the "rt_info_filename" is non-zero, the RT_Info for
-  // every task is exported to it.  It is not used at runtime.
-  // If the "timeline_filename" is non-zero, the timeline output
-  // file is created.  It is not used at runtime.
-  //
-  // The runtime scheduling component ignores these filenames.  It just
-  // uses the priorities that were linked in to the executable, after
-  // converting them to platform-specific values.
-
-  // = Registers a task.
-  virtual status_t register_task (RT_Info *[],
-                                  const u_int number_of_modes,
-                                  handle_t &handle) = 0;
-  // If the Task registration succeeds, this function returns SUCCEEDED
-  // and sets "handle" to a unique identifier for the task.
-  // Otherwise, it returns either VIRTUAL_MEMORY_EXHAUSTED or
-  // TASK_ALREADY_REGISTERED sets the handle to 0.  (A task may
-  // only be registered once.)
-  // The RT_Info * array is indexed by mode; there must be one element for
-  // each mode, as specified by number_of_modes.  If a task does not
-  // run in a mode, then its entry in the array for that mode must
-  // be 0.
-
-  virtual status_t get_rt_info (Object_Name name,
-                                RT_Info* &rtinfo);
-  // Tries to find the RT_Info corresponding to <name> in the RT_Info
-  // database.  Returns SUCCEEDED if <name> was found and <rtinfo> was
-  // set.  Returns UNKNOWN_TASK if <name> was not found, but <rtinfo>
-  // was set to a newly allocated RT_Info.  In this UNKNOWN_TASK case,
-  // the task must call RT_Info::set to fill in execution properties.
-  // In the SUCCEEDED and UNKNOWN_TASK cases, this->register_task
-  // (rtinfo, 0, handle) is called.  Returns FAILED if an error
-  // occurs.
-  // 
-  // One motivation for allocating RT_Info's from within the Scheduler
-  // is to allow RT_Infos to persist after the tasks that use them.
-  // For instance, we may want to call this->schedule right before the
-  // application exits a configuration run.  If the tasks have been
-  // deleted (deleting their RT_Infos with them), this->schedule will
-  // fail.
-
-  virtual status_t lookup_rt_info (handle_t handle,
-				   RT_Info* &rtinfo) = 0;
-  // Obtains an RT_Info based on its "handle".
-
-  // = Computes the schedule.
-  virtual status_t schedule (void) = 0;
-  // This actually generates the files.
-
-  // = Access a thread priority.
-  virtual int priority (const handle_t handle,
-                        OS_Thread_Priority &priority,
-                        Sub_Priority &subpriority,
-                        Preemption_Priority &preemption_prio,
-                        const mode_t = CURRENT_MODE) const = 0;
-  // Defines "priority" as the priority that was assigned to the Task that
-  // was assigned "handle", for the specified mode.  Defines "subpriority"
-  // as the relative ordering (due to dependencies) within the priority.
-  // Returns 0 on success, or -1 if an invalid mode or handle are supplied.
-  // Queue numbers are platform-independent priority values, ranging from
-  // a highest priority value of 0 to the lowest priority value, which is
-  // returned by "minimum_priority_queue ()".
-
-  // = Access the platform-independent priority value of the lowest-priority
-  //   thread.
-  u_int minimum_priority_queue () const { return minimum_priority_queue_; }
-  // This is intended for use by the Event Channel, so it can determine the
-  // number of priority dispatch queues to create.
-
-  // = Access the number of modes.
-  u_int modes () const { return modes_; }
-
-  // = Access the number of tasks.
-  u_int tasks () const { return tasks_; }
-
-  // = Access the number of threads.
-  u_int threads () const { return threads_; }
-
-  // = Access the current mode.
-  mode_t mode () const { return mode_; }
-
-  // = Set the current mode.
-  void mode (const mode_t mode) { mode_ = mode; }
-
-  // = Access the current scheduler status.
-  status_t status () const { return status_; }
-
-  // = Access the current output (debugging) level.
-  u_int output_level () const { return output_level_; }
-  // Default is 0; set to 1 to print out schedule, by task.  Set
-  // to higher than one for debugging info.
-
-  // = Set the scheduler output (debugging) level.
-  void output_level (const u_int level) { output_level_ = level; }
-  // the only supported levels are 0 (quiet), 1 (verbose) and 2
-  // (debug)
-
-  static int add_dependency(RT_Info* rt_info,
-			    const Dependency_Info& d);
-
-  static int number_of_dependencies(RT_Info* rt_info);
-  static int number_of_dependencies(RT_Info& rt_info);
-
-  static void export(RT_Info*, FILE* file);
-  static void export(RT_Info&, FILE* file);
-
-protected:
-  ACE_Scheduler ();
-
-  // = Set the minimum priority value.
-  void minimum_priority_queue (const u_int minimum_priority_queue_number)
-    { minimum_priority_queue_ = minimum_priority_queue_number; }
-
-  // = Set the number of modes.
-  void modes (const u_int modes) { modes_ = modes; }
-
-  // = Set the number of tasks.
-  void tasks (const u_int tasks) { tasks_ = tasks; }
-
-  // = Set the number of threads.
-  void threads (const u_int threads) { threads_ = threads; }
-
-  // = Set the current scheduler status.
-  void status (const status_t new_status) { status_ = new_status; }
-
-private:
-  typedef ACE_CString EXT;
-  typedef RT_Info **INT;
-
-#if defined (ACE_HAS_THREADS)
-  typedef ACE_Thread_Mutex SYNCH;
-#else
-  typedef ACE_Null_Mutex SYNCH;
-#endif /* ACE_HAS_THREADS */
-
-  typedef ACE_Map_Manager<EXT, INT, SYNCH> Info_Collection;
-  typedef ACE_Map_Iterator<EXT, INT, SYNCH> Info_Collection_Iterator;
-  typedef ACE_Map_Entry<EXT, INT> Info_Collection_Entry;
-
-  Info_Collection info_collection_;
-  // A binding of name to rt_info.  This is the mapping for every
-  // rt_info in the process.
-
-  static ACE_Scheduler *instance_;
-
-  u_int minimum_priority_queue_;
-  // The platform-independent priority value of the Event Channel's
-  // minimum priority dispatch queue.  The value of the maximum priority
-  // dispatch queue is always 0.
-
-  u_int modes_;
-  u_int tasks_;
-  u_int threads_;
-
-  mode_t mode_;
-  status_t status_;
-  u_int output_level_;
-
-  // the following functions are not implememented
-  ACE_UNIMPLEMENTED_FUNC(ACE_Scheduler (const ACE_Scheduler &))
-  ACE_UNIMPLEMENTED_FUNC(ACE_Scheduler &operator= (const ACE_Scheduler &))
-};
-
-typedef ACE_Scheduler Scheduler;
-
-#if defined (__ACE_INLINE__)
-#include "Scheduler.i"
-#endif /* __ACE_INLINE__ */
-
-#endif /* SCHEDULER_H */
-
-
-// EOF
diff --git a/TAO/local/bin/Scheduling_Service/Scheduler.i b/TAO/local/bin/Scheduling_Service/Scheduler.i
deleted file mode 100644
index 57875ae26d1..00000000000
--- a/TAO/local/bin/Scheduling_Service/Scheduler.i
+++ /dev/null
@@ -1,20 +0,0 @@
-// $Id$
-//
-// ============================================================================
-//
-// = LIBRARY
-//    sched
-//
-// = FILENAME
-//    Scheduler.i
-//
-// = CREATION DATE
-//    23 January 1997
-//
-// = AUTHOR
-//    David Levine
-//
-// ============================================================================
-
-// EOF
-
diff --git a/TAO/local/bin/Scheduling_Service/Scheduler_Generic.cpp b/TAO/local/bin/Scheduling_Service/Scheduler_Generic.cpp
deleted file mode 100644
index 67f87d30cba..00000000000
--- a/TAO/local/bin/Scheduling_Service/Scheduler_Generic.cpp
+++ /dev/null
@@ -1,528 +0,0 @@
-// $Id$
-//
-// ============================================================================
-//
-// = LIBRARY
-//    sched
-//
-// = FILENAME
-//    Scheduler_Generic.cpp
-//
-// = CREATION DATE
-//    19 November 1997
-//
-// = AUTHOR
-//    David Levine
-//
-// ============================================================================
-
-#include "ace/Sched_Params.h"
-
-#include "Scheduler_Generic.h"
-
-#if ! defined (__ACE_INLINE__)
-#include "Scheduler_Generic.i"
-#endif /* __ACE_INLINE__ */
-
-
-///////////////////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////////
-// static functions
-///////////////////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////////
-
-// Structure for storing the RT_Info information for each task, per mode.
-struct Mode_Entry
-{
-  RtecScheduler::RT_Info *rt_info_;
-  u_long start_time_; // microseconds
-  u_long stop_time_;  // microseconds
-
-  Mode_Entry() :
-    rt_info_ (0),
-    start_time_ (0),
-    stop_time_ (0)
-  {
-  }
-
-  Mode_Entry(RtecScheduler::RT_Info *const rt_info,
-             const u_long start_time = 0,
-             const u_long stop_time = 0) :
-    rt_info_ (rt_info),
-    start_time_ (start_time),
-    stop_time_ (stop_time)
-  {
-  }
-
-  ~Mode_Entry () {}
-
-  Mode_Entry &operator= (const Mode_Entry &entry)
-  {
-    if (this != &entry)
-      {
-        rt_info_ = entry.rt_info_;
-        start_time_ = entry.start_time_;
-        stop_time_ = entry.stop_time_;
-      }
-
-    return *this;
-  }
-};
-
-
-///////////////////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////////
-// class Scheduler_Generic member functions
-///////////////////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////////
-
-Scheduler_Generic::Scheduler_Generic () :
-  Scheduler (),
-  handles_ (0),
-  // Set the minimum priority to that for the current platform.  This
-  // shouldn't be necessary, but UPSingleProcessorOrb::initialize_reactors
-  // creates threads before the Event Channel calls Scheduler::init ().
-  minimum_priority_ (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO,
-                                                     ACE_SCOPE_THREAD)),
-  increasing_priority_ (-1),
-  task_entries_ ()
-{
-}
-
-
-Scheduler_Generic::~Scheduler_Generic ()
-{
-  reset ();
-}
-
-
-void
-Scheduler_Generic::reset ()
-{
-}
-
-Scheduler::status_t
-Scheduler_Generic::lookup_rt_info (handle_t handle,
-                                   RT_Info*& rtinfo)
-{
-  if (handle < 0 || (size_t) handle > task_entries_.size ())
-    {
-      return ST_UNKNOWN_TASK;
-    }
-  RT_Info*** entry;
-  ACE_Unbounded_Set_Iterator <RT_Info **> i (task_entries_);
-  while (i.next (entry) != 0)
-    {
-      i.advance ();
-      RT_Info** array = *entry;
-      if (array[0]->handle == handle)
-        {
-          rtinfo = array[0];
-          return SUCCEEDED;
-        }
-    }
-
-  return ST_UNKNOWN_TASK;
-}
-
-
-Scheduler::status_t
-Scheduler_Generic::register_task (RT_Info *rt_info [],
-                                   const u_int number_of_modes,
-                                   handle_t &handle)
-{
-  status_t ret;
-
-  // try to store the new task's information . . .
-  switch (task_entries_.insert (rt_info))
-    {
-      case 0 : // successfully inserted
-        {
-          rt_info [0]->handle = (handle = ++handles_);
-
-          // assigned the same handle to the RT_Info for each of its modes
-          for (u_int i = 1; i < number_of_modes; ++i)
-            {
-              if (rt_info [i] != 0)
-                rt_info [i]->handle = handle;
-            }
-
-          if (number_of_modes > modes ())
-            {
-              modes (number_of_modes);
-            }
-
-          ret = SUCCEEDED;
-
-          if (output_level () >= 5)
-            {
-              ACE_OS::printf ("registered task \"%s\" with RT_Info starting "
-                                "at %X\n",
-                              (const char*)rt_info[0]->entry_point,
-                              (void *) rt_info[0]);
-            }
-        }
-        break;
-
-      case 1 : // the entry had already been inserted
-        handle = 0;
-        ret = ST_TASK_ALREADY_REGISTERED;
-        break;
-
-      default :
-        // case -1 : insert failed, probably because virtual memory exhaused
-        handle = 0;
-        ret = ST_VIRTUAL_MEMORY_EXHAUSTED;
-        break;
-    }
-
-  return ret;
-}
-
-
-void
-Scheduler_Generic::init (const int minimum_priority,
-                          const int maximum_priority,
-                          const char *runtime_filename,
-                          const char *rt_info_filename,
-                          const char *timeline_filename)
-{
-  minimum_priority_ = minimum_priority;
-  maximum_priority_ = maximum_priority;
-  runtime_filename_ = runtime_filename;
-  rt_info_filename_ = rt_info_filename;
-  timeline_filename_ = timeline_filename;
-}
-
-
-Scheduler::status_t
-Scheduler_Generic::schedule (void)
-{
-  ACE_Guard<LOCK> ace_mon (lock_);
-
-  // here goes . . .
-
-  increasing_priority_ = maximum_priority_ >= minimum_priority_;
-
-  status_t status = NOT_SCHEDULED;
-
-  // store number of tasks, based on registrations
-  tasks (task_entries_.size ());
-
-  if (output_level () > 0)
-    {
-      print_schedule ();
-    }
-
-  if (runtime_filename_ != 0  &&
-      (status == SUCCEEDED || status == ST_UTILIZATION_BOUND_EXCEEDED))
-    {
-      status = store_schedule (runtime_filename_);
-    }
-
-  if ((status == SUCCEEDED || status == ST_UTILIZATION_BOUND_EXCEEDED)  &&  rt_info_filename_)
-    {
-      status = store_rt_info (rt_info_filename_);
-    }
-
-  // If there was a failure, (try to) remove the output files.
-  if (! (status == SUCCEEDED || status == ST_UTILIZATION_BOUND_EXCEEDED))
-    {
-      if (runtime_filename_ && unlink ((char *) runtime_filename_)
-          &&  errno != ENOENT)
-        {
-          ACE_OS::perror ("Scheduler_Generic::schedule (); "
-                          "unable to remove schedule file");
-        }
-      if (rt_info_filename_  &&  unlink ((char *) rt_info_filename_)  &&
-          errno != ENOENT)
-        {
-          ACE_OS::perror ("Scheduler_Generic::schedule (); "
-                          "unable to remove rt_info file");
-        }
-    }
-
-  return status;
-}
-
-
-int
-Scheduler_Generic::priority (const handle_t handle,
-                             OS_Thread_Priority &priority,
-                             Sub_Priority &subpriority,
-                             Preemption_Priority &preemption_prio,
-                             const mode_t requested_mode) const
-{
-  ACE_UNUSED_ARG (handle);
-  ACE_UNUSED_ARG (requested_mode);
-
-  priority = minimum_priority_;
-  subpriority = ACE_Scheduler_MIN_SUB_PRIORITY;
-  preemption_prio = ACE_Scheduler_MAX_PREEMPTION_PRIORITY;
-
-  if (output_level () >= 3)
-    {
-      ACE_OS::printf ("preemption_prio %d: min %d, pri %d, min_pri %d\n",
-                      preemption_prio, minimum_priority_queue (),
-                      priority, minimum_priority_);
-    }
-
-  return 0;
-}
-
-
-void
-Scheduler_Generic::print_schedule ()
-{
-}
-
-
-Scheduler::status_t
-Scheduler_Generic::store_schedule (const char *filename)
-{
-  u_int i;
-  RT_Info ***entry;
-  FILE *const file = ACE_OS::fopen (filename, "w");
-
-  if (file)
-    {
-      ACE_OS::fprintf (file, "\
-// Automatically generated \"%s\"\n\
-\n\
-#include \"Scheduler_Runtime.h\"\n\
-\n\
-static const unsigned int MODES = %u;\n\
-static const unsigned int TASKS = %u;\n\
-static const unsigned int THREADS = %u;\n\
-static const unsigned int MINIMUM_PRIORITY_QUEUE = %u;\n\
-\n\
-int\n\
-Scheduler_Runtime_registered_tasks_ [TASKS] = { 0 };\n\
-\n\
-const char *\n\
-Scheduler_Runtime_task_names_ [TASKS] =\n\
-  {\n\
-",                     filename,
-                       modes (),
-                       tasks (),
-                       threads (),
-                       minimum_priority_queue ());
-
-      ACE_Unbounded_Set_Iterator <RT_Info **>
-        task_entries_i (task_entries_);
-      i = 0;
-      while (task_entries_i.next (entry) != 0)
-        {
-          task_entries_i.advance ();
-          ACE_OS::fprintf (file, "    \"%s\"%s\n",
-                           (const char*) (*entry) [0]->entry_point,
-                           ++i == tasks ()  ?  ""  :  ",");
-        }
-
-      ACE_OS::fprintf (file, "\
-  };\n\
-\n\
-int\n\
-Scheduler_Runtime_priorities_ [MODES][TASKS][3] =\n\
-  {\n\
-");
-
-      for (i = 0; i < modes (); ++i)
-        {
-          ACE_OS::fprintf (file, "    { /* mode %u */\n", i);
-
-          ACE_Unbounded_Set_Iterator <RT_Info **>
-            task_entries_i (task_entries_);
-          u_int j = 0;
-          while (task_entries_i.next (entry) != 0)
-            {
-              task_entries_i.advance ();
-
-              RtecScheduler::OS_Priority priority;
-              RtecScheduler::Sub_Priority subpriority;
-              RtecScheduler::Preemption_Priority preemption_prio;
-              this->priority (0, priority, subpriority, preemption_prio, j);
-
-              ACE_OS::fprintf (file, "    \"%s\"%s\n",
-                               (const char*) (*entry) [0]->entry_point,
-                               j + 1 == tasks ()  ?  ""  :  ",");
-
-              ACE_OS::fprintf (file, "      { %d, %d, %u }%s\n",
-                               priority,
-                               subpriority,
-                               preemption_prio,
-                               ++j == tasks ()  ?  ""  :  ",");
-            }
-          ACE_OS::fprintf (file, "    }%s /* end mode %u */\n",
-                           i == modes () - 1  ?  ""  :  ",", i);
-        }
-
-      ACE_OS::fprintf (file, "\
-  };\n\
-\n\
-unsigned int\n\
-Scheduler_Runtime::modes ()\n\
-{\n\
-  return MODES;\n\
-}\n\
-\n\
-unsigned int\n\
-Scheduler_Runtime::tasks ()\n\
-{\n\
-  return TASKS;\n\
-}\n\
-\n\
-unsigned int\n\
-Scheduler_Runtime::threads ()\n\
-{\n\
-  return THREADS;\n\
-}\n\
-\n\
-unsigned int\n\
-Scheduler_Runtime::minimum_priority_queue ()\n\
-{\n\
-  return MINIMUM_PRIORITY_QUEUE;\n\
-}\n\
-\n\
-const char *\n\
-Scheduler_Runtime::task_name (const unsigned int handle)\n\
-{\n\
-  return Scheduler_Runtime_task_names_ [handle - 1];\n\
-}\n\
-\n\
-int\n\
-Scheduler_Runtime::priority (const unsigned int mode,\n\
-                                        const unsigned int handle)\n\
-{\n\
-  return Scheduler_Runtime_priorities_ [mode][handle - 1][0];\n\
-}\n\
-\n\
-int\n\
-Scheduler_Runtime::subpriority (const unsigned int mode,\n\
-                                           const unsigned int handle)\n\
-{\n\
-  return Scheduler_Runtime_priorities_ [mode][handle - 1][1];\n\
-}\n\
-\n\
-int\n\
-Scheduler_Runtime::preemption_prio (const unsigned int mode,\n\
-                                            const unsigned int handle)\n\
-{\n\
-  return Scheduler_Runtime_priorities_ [mode][handle - 1][2];\n\
-}\n\
-\n\
-unsigned int\n\
-Scheduler_Runtime::config ()\n\
-{\n\
-  return 0;\n\
-}\n\
-\n\
-unsigned int\n\
-Scheduler_Runtime::find (const char *operation_name)\n\
-{\n\
-  for (unsigned int i = 0; i < TASKS; ++i)\n\
-    if (! ACE_OS::strcmp (operation_name,\n\
-                          Scheduler_Runtime_task_names_ [i]))\n\
-      return i + 1;\n\
-\n\
-  return 0;\n\
-}\n\
-\n\
-unsigned int\n\
-Scheduler_Runtime::register_task (const unsigned int task)\n\
-{\n\
-  if (Scheduler_Runtime_registered_tasks_ [task - 1] == 1)\n\
-    {\n\
-      return 0;\n\
-    }\n\
-  else\n\
-    {\n\
-      Scheduler_Runtime_registered_tasks_ [task - 1] = 1;\n\
-      return task;\n\
-    }\n\
-}\n\
-\n\
-");
-
-      if (ACE_OS::fprintf (file, "// EOF\n") > 0  &&
-          ACE_OS::fclose (file) == 0)
-        {
-          return SUCCEEDED;
-        }
-      else
-        {
-          return UNABLE_TO_WRITE_SCHEDULE_FILE;
-        }
-    }
-  else
-    {
-      return UNABLE_TO_OPEN_SCHEDULE_FILE;
-    }
-}
-
-
-Scheduler::status_t
-Scheduler_Generic::store_rt_info (const char *filename)
-{
-  FILE *file = ACE_OS::fopen (filename, "w");
-  if (file)
-    {
-      const time_t now = ACE_OS::time (0);
-
-      (void) ACE_OS::fprintf (file,
-                              "# RT_Info provided for \"%s\" %s"
-                              "# Version 1.1\n"
-                              "# Format for each entry:\n"
-                              "#   entry name\n"
-                              "#   handle\n"
-                              "#   worst case execution time\n"
-                              "#   typical execution time\n"
-                              "#   cached execution time\n"
-                              "#   period\n"
-                              "#   importance\n"
-                              "#   quantum\n"
-                              "# begin dependencies\n"
-                              "#   number of dependencies\n"
-                              "#   entry name, number of calls "
-                                "(one of these lines per dependency, if any)\n"
-                              "# end dependencies\n"
-                              "#   priority\n"
-                              "#   order within priority\n\n"
-                              "%u modes\n%u operations\n\n",
-                              filename, ACE_OS::ctime (&now),
-                              modes (), tasks ());
-
-      RT_Info ***entry;
-      ACE_Unbounded_Set_Iterator <RT_Info **>
-        task_entries_i (task_entries_);
-      while (task_entries_i.next (entry) != 0)
-        {
-          task_entries_i.advance ();
-          export ((*entry) [0], file);
-        }
-    }
-  else
-    {
-      return UNABLE_TO_OPEN_SCHEDULE_FILE;
-    }
-
-  if (ACE_OS::fprintf (file, "\n# end of file\n", 1) > 0  &&
-      ACE_OS::fclose (file) == 0)
-    {
-      return SUCCEEDED;
-    }
-  else
-    {
-      return UNABLE_TO_WRITE_SCHEDULE_FILE;
-    }
-}
-
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Node<RtecScheduler::RT_Info **>;
-template class ACE_Unbounded_Set<RtecScheduler::RT_Info **>;
-template class ACE_Unbounded_Set_Iterator<RtecScheduler::RT_Info **>;
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-
-// EOF
diff --git a/TAO/local/bin/Scheduling_Service/Scheduler_Generic.h b/TAO/local/bin/Scheduling_Service/Scheduler_Generic.h
deleted file mode 100644
index 37c09f6b12d..00000000000
--- a/TAO/local/bin/Scheduling_Service/Scheduler_Generic.h
+++ /dev/null
@@ -1,135 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-//
-// ============================================================================
-//
-// = LIBRARY
-//    sched
-//
-// = FILENAME
-//    Scheduler_Generic.h
-//
-// = CREATION DATE
-//    19 November 1997
-//
-// = AUTHOR
-//    David Levine
-//
-// ============================================================================
-
-#if ! defined (SCHEDULER_INTERNAL_H)
-#define SCHEDULER_INTERNAL_H
-
-#include "Scheduler.h"
-
-class Scheduler_Generic : public ACE_Scheduler
-  // = TITLE
-  //    Implementation of an off-line scheduler.
-  //
-  // = DESCRIPTION
-  //    Schedules tasks, assigning the same priority to all of them.
-{
-public:
-  Scheduler_Generic ();
-  virtual ~Scheduler_Generic ();
-
-  // = Initialize the scheduler.
-  virtual void init (const int minimum_priority,
-                     const int maximum_priority,
-                     const char *runtime_filename = 0,
-                     const char *rt_info_filename = 0,
-                     const char *timeline_filename = 0);
-
-  // = Registers a task.
-  virtual status_t register_task (RT_Info *[],
-                                  const u_int number_of_modes,
-                                  handle_t &handle);
-
-  virtual status_t lookup_rt_info (handle_t handle,
-                                   RT_Info* &rtinfo);
-  // Obtains an RT_Info based on its "handle".
-
-  // = Computes the schedule.
-  virtual status_t schedule (void);
-
-  // = Access a thread priority.
-  virtual int priority (const handle_t handle,
-                        OS_Thread_Priority &priority,
-                        Sub_Priority &subpriority,
-                        Preemption_Priority &preemption_prio,
-                        const mode_t = CURRENT_MODE) const;
-  // Defines "priority" as the priority that was assigned to the Task that
-  // was assigned "handle", for the specified mode.  Defines "subpriority"
-  // as the relative ordering (due to dependencies) within the priority.
-  // Returns 0 on success, or 1 if an invalid mode or handle are supplied.
-
-private:
-  u_int handles_;
-  // The number of task handles dispensed so far.
-
-  int minimum_priority_;
-  // The minimum priority value that the application specified (in
-  // its call to init ()).
-
-  int maximum_priority_;
-  // The maximum priority value that the application specified (in
-  // its call to init ()).
-
-  const char *runtime_filename_;
-  // Destination file of Scheduler output from the configuration run.
-
-  const char *rt_info_filename_;
-  // Destination file of all rt_info data from the configuration run.
-
-  const char *timeline_filename_;
-  // The destination of the timeline.
-
-  int increasing_priority_;
-  // Set to 1 if priority values increase with increasing priority,
-  // such as on Solaris and Win32, or 0 if they decrease, such as on
-  // VxWorks.
-
-  ACE_Unbounded_Set <RT_Info **> task_entries_;
-  // Collection of known tasks.
-
-#if defined (ACE_HAS_THREADS)
-  typedef ACE_Recursive_Thread_Mutex LOCK;
-#else
-  typedef ACE_Null_Mutex LOCK;
-#endif /* ACE_HAS_THREADS */
-
-  LOCK lock_;
-  // This protects access to the scheduler during configuration runs.
-
-
-  ///////////////////////////////////////
-  // member functions for internal use //
-  ///////////////////////////////////////
-
-  void reset ();
-  // Prepare for another schedule computation, but do not
-  // disturb the "output" (priorities that have already been assigned).
-
-  void print_schedule ();
-  // Display the schedule, task-by-task.
-
-  status_t store_schedule (const char *filename);
-  // Store the schedule in the named file.
-
-  status_t store_rt_info (const char *filename);
-  // Export all RT_Info to the named file.
-
-  ACE_UNIMPLEMENTED_FUNC (Scheduler_Generic (const Scheduler_Generic &))
-  ACE_UNIMPLEMENTED_FUNC (Scheduler_Generic &operator= (
-    const Scheduler_Generic &))
-};
-
-
-#if defined (__ACE_INLINE__)
-#include "Scheduler_Generic.i"
-#endif /* __ACE_INLINE__ */
-
-#endif /* SCHEDULER_INTERNAL_H */
-
-
-// EOF
diff --git a/TAO/local/bin/Scheduling_Service/Scheduler_Generic.i b/TAO/local/bin/Scheduling_Service/Scheduler_Generic.i
deleted file mode 100644
index 71e3695dc35..00000000000
--- a/TAO/local/bin/Scheduling_Service/Scheduler_Generic.i
+++ /dev/null
@@ -1,21 +0,0 @@
-// $Id$
-//
-// ============================================================================
-//
-// = LIBRARY
-//    sched
-//
-// = FILENAME
-//    Scheduler_Generic.i
-//
-// = CREATION DATE
-//    23 January 1997
-//
-// = AUTHOR
-//    David Levine
-//
-// ============================================================================
-
-
-// EOF
-
diff --git a/TAO/local/bin/Scheduling_Service/Scheduler_Internal.cpp b/TAO/local/bin/Scheduling_Service/Scheduler_Internal.cpp
deleted file mode 100644
index e112ab50c9f..00000000000
--- a/TAO/local/bin/Scheduling_Service/Scheduler_Internal.cpp
+++ /dev/null
@@ -1,2332 +0,0 @@
-// $Id$
-//
-// ============================================================================
-//
-// = LIBRARY
-//    sched
-//
-// = FILENAME
-//    Scheduler_Internal.cpp
-//
-// = CREATION DATE
-//    23 January 1997
-//
-// = AUTHOR
-//    David Levine
-//
-// ============================================================================
-
-#include "math.h"   // for ::pow ()
-#include "float.h"  // for DBL_EPSILON
-
-#include "ace/Sched_Params.h"
-
-#include "Scheduler_Internal.h"
-
-#if ! defined (__ACE_INLINE__)
-#include "Scheduler_Internal.i"
-#endif /* __ACE_INLINE__ */
-
-
-///////////////////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////////
-// static functions
-///////////////////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////////
-
-// Structure for storing the RT_Info information for each task, per mode.
-struct Mode_Entry
-{
-  RtecScheduler::RT_Info *rt_info_;
-  u_long start_time_; // microseconds
-  u_long stop_time_;  // microseconds
-
-  Mode_Entry() :
-    rt_info_ (0),
-    start_time_ (0),
-    stop_time_ (0)
-  {
-  }
-
-  Mode_Entry(RtecScheduler::RT_Info *const rt_info,
-             const u_long start_time = 0,
-             const u_long stop_time = 0) :
-    rt_info_ (rt_info),
-    start_time_ (start_time),
-    stop_time_ (stop_time)
-  {
-  }
-
-  ~Mode_Entry () {}
-
-  Mode_Entry &operator= (const Mode_Entry &entry)
-  {
-    if (this != &entry)
-      {
-        rt_info_ = entry.rt_info_;
-        start_time_ = entry.start_time_;
-        stop_time_ = entry.stop_time_;
-      }
-
-    return *this;
-  }
-};
-
-
-// "Add" an RT_Info to another.
-static RtecScheduler::RT_Info&
-operator+= (RtecScheduler::RT_Info *rt_info1,
-	    const RtecScheduler::RT_Info &rt_info2)
-{
-  rt_info1->worst_case_execution_time = (rt_info1->worst_case_execution_time
-					 + rt_info2.worst_case_execution_time);
-  rt_info1->typical_execution_time = (rt_info1->typical_execution_time
-				      + rt_info2.typical_execution_time);
-  rt_info1->cached_execution_time = (rt_info1->cached_execution_time
-				     + rt_info2.cached_execution_time);
-
-  if ((rt_info1->period > rt_info2.period && rt_info2.period > 0)
-      || rt_info1->period <= 0)
-    {
-      rt_info1->period = rt_info2.period;
-    }
-
-  return *rt_info1;
-}
-
-
-// Sort the threads into the sorted_rt_info array,
-// by decreasing (non-increasing, actually) period.
-// Returns the number of tasks in the input set.
-static
-void
-sort (Scheduler_Internal::Thread_Map &threads,
-      u_long number_of_threads,
-      Mode_Entry sorted_rt_info [],
-      u_int output_level)
-{
-  u_int tasks = 0;
-
-  ACE_OS::memset (sorted_rt_info, 0, (size_t) number_of_threads);
-
-  // Iterate over each of the RT_Info entries that we know about,
-  // sorting the entries by decreasing (non-increasing) period.
-  Scheduler_Internal::Thread_Map_Entry *entry;
-  Scheduler_Internal::Thread_Map_Iterator i (threads);
-  while (i.next (entry))
-  {
-    i.advance ();
-    RtecScheduler::RT_Info &rt_info = *entry->int_id_;
-    const RtecScheduler::Time entry_time = rt_info.worst_case_execution_time;
-    const RtecScheduler::Period entry_period = rt_info.period;
-
-    if (output_level >= 1)
-      {
-        ACE_OS::printf ("Thread \"%s\"; utilization is %g and period is %ld"
-                        " usec (%g Hz)\n",
-                        (const char*)rt_info.entry_point,
-                        entry_period > 0
-#if defined (ACE_WIN32) || defined (ACE_HAS_LONGLONG_T)
-                          ? (double) entry_time / entry_period
-#else
-                          ? (double) entry_time.lo () / entry_period
-#endif /* ACE_WIN32 || ACE_HAS_LONGLONG_T */
-                          : 0,
-                        entry_period / 10 /* usec/100 ns */,
-                        entry_period > 0
-                          ? 1.0e7 /* 1/100 ns */ / entry_period
-                          : 0.0);
-      }
-
-    // Use selection sort to sort entries by period.  It's O (n^2), but n
-    // shouldn't be very big.
-    u_int j;
-    for (j = 0; j < tasks; ++j)
-      {
-        if (entry_period > sorted_rt_info [j].rt_info_->period)
-          {
-            // Found a smaller period:  since we are sorting by decreasing
-            // period, need to insert the current period here.
-
-            if (output_level >= 2)
-              {
-                ACE_OS::printf ("insert task before task %u with period %ld\n",
-                                j + 1,
-                                sorted_rt_info [j].rt_info_->period /
-                                  10 /* usec/100 ns */);
-              }
-
-            // insert this entry into the sort list here
-            for (u_int k = tasks; k > j; --k)
-              {
-                sorted_rt_info [k] = sorted_rt_info [k - 1];
-              }
-            sorted_rt_info [j].rt_info_ = &rt_info;
-
-            break;
-          }
-      }
-    if (j >= tasks)
-      {
-        // The entry does not have a lower period than any that we've
-        // already seen, so append it to the end of the sorted RT_Info array.
-        if (output_level >= 2)
-          {
-            ACE_OS::printf ("insert task with period %ld at end of sorted "
-                              "array\n",
-                            entry_period / 10 /* usec/100 ns */);
-          }
-        sorted_rt_info [j].rt_info_ = &rt_info;
-      }
-
-    ++tasks;
-  }
-}
-
-
-// Check for harmonically related periods by comparing this entry's period
-// with that of each of the other entries for integral division.
-// As a side effect, figures out the frame_size, in microsec.
-static
-int
-harmonically_related_periods (Mode_Entry const sorted_rt_info [],
-                              const u_int number_of_tasks,
-                              u_long &frame_size)
-{
-  int harmonically_related = 1;
-  u_int i;
-
-  if (number_of_tasks > 0)
-    {
-      // start frame_size with the longest period
-
-      for (i = 0; i < number_of_tasks; ++i)
-      frame_size = (u_long) (sorted_rt_info [0].rt_info_->period /
-                               10 /* microsec/100 ns */);
-    }
-
-  for (i = 0; i < number_of_tasks - 1; ++i)
-    {
-      // Skip over groups of array entries with the same period.
-      while (i > 0  &&  i < number_of_tasks - 1  &&
-             sorted_rt_info [i].rt_info_->period ==
-             sorted_rt_info [i - 1].rt_info_->period)
-        {
-          ++i;
-        }
-
-      // Compare the current RT_Info entry, at location i in the
-      // sorted array, to each of the remoining (with higher array index)
-      // entries.
-      for (u_int j = i + 1; j < number_of_tasks; ++j)
-        {
-          // if the period is 0, skip the task
-          if (sorted_rt_info [j].rt_info_->period <= 0)
-            break;
-
-          // Assumes that the sorted_rt_info array is in decreasing
-          // (non-increasing) order.
-          double quotient = (double) sorted_rt_info [i].rt_info_->period /
-                                     sorted_rt_info [j].rt_info_->period;
-
-          if (quotient - (long) quotient > DBL_EPSILON)
-            {
-              harmonically_related = 0;
-
-              // and add another factor to the frame_size
-              frame_size *= (u_long) (sorted_rt_info [i].rt_info_->period /
-                                        10 /* microseconds/100 ns */);
-            }
-        }
-    }
-
-  return harmonically_related;
-}
-
-
-///////////////////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////////
-// class Scheduler_Internal member functions
-///////////////////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////////
-
-Scheduler_Internal::Scheduler_Internal () :
-  Scheduler (),
-  handles_ (0),
-  // Set the minimum priority to that for the current platform.  This
-  // shouldn't be necessary, but UPSingleProcessorOrb::initialize_reactors
-  // creates threads before the Event Channel calls Scheduler::init ().
-  minimum_priority_ (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO,
-                                                     ACE_SCOPE_THREAD)),
-  increasing_priority_ (-1),
-  task_entries_ (),
-  ordered_info_ (0),
-  visited_ (0),
-  dependencies_ (0),
-  roots_ (0),
-  frame_size_ (0),
-  thread_info_ (0),
-  leaf_info_ (0),
-  timeline_ (0)
-{
-}
-
-
-Scheduler_Internal::~Scheduler_Internal ()
-{
-  reset ();
-
-  delete [] timeline_;
-  timeline_ = 0;
-
-  for (u_int current_mode = 0; current_mode < modes (); ++current_mode)
-    {
-      // Iterate over each of the thread_info_ entries and delete them.
-      Thread_Map_Entry *entry;
-      Thread_Map_Iterator i (thread_info_ [current_mode]);
-      while (i.next (entry))
-      {
-        i.advance ();
-        thread_info_ [current_mode].unbind (entry->ext_id_);
-        delete entry->int_id_;
-      }
-    }
-
-  for (u_int task = 0; task < tasks (); ++task)
-    {
-      delete [] ordered_info_ [task];
-    }
-
-  delete [] thread_info_;
-  thread_info_ = 0;
-
-  delete [] ordered_info_;
-  ordered_info_ = 0;
-
-  delete [] frame_size_;
-  frame_size_ = 0;
-}
-
-
-void
-Scheduler_Internal::reset ()
-{
-  delete dependencies_;
-  dependencies_ = 0;
-
-  delete roots_;
-  roots_ = 0;
-
-  delete leaf_info_;
-  leaf_info_ = 0;
-}
-
-Scheduler::status_t
-Scheduler_Internal::lookup_rt_info (handle_t handle,
-				    RT_Info*& rtinfo)
-{
-  if (handle < 0 || handle > task_entries_.size ())
-    {
-      return ST_UNKNOWN_TASK;
-    }
-  RT_Info*** entry;
-  ACE_Unbounded_Set_Iterator <RT_Info **> i (task_entries_);
-  while (i.next (entry) != 0)
-    {
-      i.advance ();
-      RT_Info** array = *entry;
-      if (array[0]->handle == handle)
-	{
-	  rtinfo = array[0];
-	  return SUCCEEDED;
-	}
-    }
-       
-  return ST_UNKNOWN_TASK;
-}
-     
-
-Scheduler::status_t
-Scheduler_Internal::register_task (RT_Info *rt_info [],
-                                   const u_int number_of_modes,
-                                   handle_t &handle)
-{
-  status_t ret;
-
-  // try to store the new task's information . . .
-  switch (task_entries_.insert (rt_info))
-    {
-      case 0 : // successfully inserted
-        {
-          rt_info [0]->handle = (handle = ++handles_);
-
-          // assigned the same handle to the RT_Info for each of its modes
-          for (u_int i = 1; i < number_of_modes; ++i)
-            {
-              if (rt_info [i] != 0)
-		rt_info [i]->handle = handle;
-            }
-
-          if (number_of_modes > modes ())
-            {
-              modes (number_of_modes);
-            }
-
-          ret = SUCCEEDED;
-
-          if (output_level () >= 5)
-            {
-              ACE_OS::printf ("registered task \"%s\" with RT_Info starting "
-                                "at %X\n",
-                              (const char*)rt_info[0]->entry_point,
-                              (void *) rt_info[0]);
-            }
-        }
-	break;
-
-      case 1 : // the entry had already been inserted
-        handle = 0;
-        ret = ST_TASK_ALREADY_REGISTERED;
-        break;
-
-      default :
-        // case -1 : insert failed, probably because virtual memory exhaused
-        handle = 0;
-        ret = ST_VIRTUAL_MEMORY_EXHAUSTED;
-        break;
-    }
-
-  return ret;
-}
-
-
-void
-Scheduler_Internal::init (const int minimum_priority,
-                          const int maximum_priority,
-                          const char *runtime_filename,
-                          const char *rt_info_filename,
-                          const char *timeline_filename)
-{
-  minimum_priority_ = minimum_priority;
-  maximum_priority_ = maximum_priority;
-  runtime_filename_ = runtime_filename;
-  rt_info_filename_ = rt_info_filename;
-  timeline_filename_ = timeline_filename;
-}
-
-
-Scheduler::status_t
-Scheduler_Internal::schedule (void)
-{
-  ACE_Guard<LOCK> ace_mon (lock_);
-
-  // here goes . . .
-
-  increasing_priority_ = maximum_priority_ >= minimum_priority_;
-
-  status_t status = NOT_SCHEDULED;
-
-  // store number of tasks, based on registrations
-  tasks (task_entries_.size ());
-
-  // allocate tables . . .
-  ACE_NEW_RETURN (ordered_info_, RT_Info **[tasks ()],
-                  ST_VIRTUAL_MEMORY_EXHAUSTED);
-  for (u_int task = 0; task < tasks (); ++task)
-    {
-      ACE_NEW_RETURN (ordered_info_ [task], RT_Info *[modes ()],
-                      ST_VIRTUAL_MEMORY_EXHAUSTED);
-      ACE_OS::memset (ordered_info_ [task], 0,
-                      sizeof (RT_Info *) * modes ());
-    }
-
-  ACE_NEW_RETURN (thread_info_, Thread_Map [modes ()],
-                  ST_VIRTUAL_MEMORY_EXHAUSTED);
-
-  ACE_NEW_RETURN (frame_size_, u_long [modes ()],
-		  ST_VIRTUAL_MEMORY_EXHAUSTED);
-
-  // set up timeline structure
-  if (timeline_filename_ != 0)
-    {
-      ACE_NEW_RETURN (timeline_,
-                      ACE_Unbounded_Queue <Timeline_Entry> [modes()],
-                      ST_VIRTUAL_MEMORY_EXHAUSTED);
-    }
-
-  for (u_int current_mode = 0; current_mode < modes (); ++current_mode)
-    {
-      // set the current mode
-      mode (current_mode);
-
-      status_t mode_status = NOT_SCHEDULED;
-
-      // Identify threads and store information in convenient form for later
-      // use.
-      if ((mode_status = identify_threads ()) != SUCCEEDED)
-        {
-          return mode_status;  // should only happen if virtual memory exceeded
-        }
-
-      // Traverse task dependencies to aggregate thread parameters.
-      if ((mode_status = aggregate_thread_parameters ()) != SUCCEEDED)
-        {
-          return mode_status;  // should only happen if virtual memory exceeded
-        }
-
-      // only RMS is currently supported
-      if ((mode_status = schedule_rms (minimum_priority_,
-                                       maximum_priority_)) == SUCCEEDED)
-        {
-          if (status == NOT_SCHEDULED) status = SUCCEEDED;
-        }
-      else
-        {
-          status = mode_status;
-        }
-    }
-
-  if (output_level () > 0)
-    {
-      print_schedule ();
-    }
-
-  if (runtime_filename_ != 0  &&
-      (status == SUCCEEDED || status == ST_UTILIZATION_BOUND_EXCEEDED))
-    {
-      status = store_schedule (runtime_filename_);
-    }
-
-  if (timeline_filename_ != 0  &&
-      (status == SUCCEEDED || status == ST_UTILIZATION_BOUND_EXCEEDED))
-    {
-      status = create_timelines (timeline_filename_);
-    }
-
-  if ((status == SUCCEEDED || status == ST_UTILIZATION_BOUND_EXCEEDED)  &&  rt_info_filename_)
-    {
-      status = store_rt_info (rt_info_filename_);
-    }
-
-  // If there was a failure, (try to) remove the output files.
-  if (! (status == SUCCEEDED || status == ST_UTILIZATION_BOUND_EXCEEDED))
-    {
-      if (runtime_filename_ && unlink ((char *) runtime_filename_)
-	  &&  errno != ENOENT)
-        {
-          ACE_OS::perror ("Scheduler_Internal::schedule (); "
-                          "unable to remove schedule file");
-        }
-      if (rt_info_filename_  &&  unlink ((char *) rt_info_filename_)  &&
-          errno != ENOENT)
-        {
-          ACE_OS::perror ("Scheduler_Internal::schedule (); "
-                          "unable to remove rt_info file");
-        }
-    }
-
-  return status;
-}
-
-
-Scheduler::status_t
-Scheduler_Internal::update_dependencies (RT_Info &rt_info,
-                                         Sub_Priority subpriority)
-{
-  u_int i = 0;
-
-  // Detect cycles in the dependency graph by storing (the address of)
-  // each RT_Info instance as it is visited.  Then, on every visit,
-  // check to see if the instance had already been visited.  Flag it,
-  // if so (and stop the recursion :-).
-
-  if (output_level () >= 4)
-    {
-      ACE_OS::printf ("update_dependencies; visiting \"%s\"",
-                      (const char*)rt_info.entry_point);
-    }
-
-  switch (visited_->insert (&rt_info))
-    {
-      case -1 :
-        return ST_VIRTUAL_MEMORY_EXHAUSTED;
-      case 0 :
-        // successfully inserted
-        break;
-      case 1 :
-      default :
-        // oops, had already visited this rt_info!
-#if 0 /* Ignore, it seems to work well without this check */
-        return CYCLE_IN_DEPENDENCIES;
-#else
-        break;
-#endif /* 0 */
-    }
-
-  Scheduler::status_t ret = NOT_SCHEDULED;
-
-  if (rt_info.priority == -1)
-    {
-      // Just updating the subpriority.
-
-      int *ordered_deps = 0;
-      int *marked = 0;
-
-      // Sort the dependencies by importance, lowest first.
-      ACE_NEW_RETURN (ordered_deps, int [number_of_dependencies (rt_info)],
-                      ST_VIRTUAL_MEMORY_EXHAUSTED);
-      ACE_NEW_RETURN (marked, int [number_of_dependencies (rt_info)],
-                      ST_VIRTUAL_MEMORY_EXHAUSTED);
-      for (i = 0; i < number_of_dependencies (rt_info); ++i)
-        {
-          ordered_deps [i] = -1;
-          marked [i] = 0;
-        }
-
-      for (i = 0; i < number_of_dependencies (rt_info); ++i)
-        {
-          Sub_Priority current_importance = 0x7FFF;
-          int current_importance_dep = -1;
-
-          // Find the unmarked dependent with the lowest importances.
-          for (u_int j = 0; j < number_of_dependencies (rt_info); ++j)
-            {
-              ACE_ASSERT (rt_info.dependencies[j].rt_info != -1);
-	      RT_Info* info;
-	      this->lookup_rt_info (rt_info.handle, info);
-              if (! marked [j]  &&
-                  info->importance <= current_importance)
-                {
-                  current_importance = info->importance;
-                  current_importance_dep = j;
-                }
-            }
-
-          ACE_ASSERT (current_importance_dep != -1);
-          ordered_deps [i] = current_importance_dep;
-          marked [current_importance_dep] = 1;
-        }
-
-      if (output_level () >= 5)
-        {
-          ACE_OS::printf ("\"%s\" has %d dependencies\n",
-                          (const char*)rt_info.entry_point,
-                          number_of_dependencies(rt_info));
-          for (i = 0; i < number_of_dependencies(rt_info); ++i)
-            {
-	      RT_Info* info;
-	      this->lookup_rt_info (rt_info.dependencies[ordered_deps[i]].rt_info, info);
-              ACE_OS::printf ("ordered dependency %d: \"%s\" (importance: %d)\n",
-                              i,
-                              (const char*)info->entry_point,
-			      info->importance);
-            }
-        }
-
-      // Traverse the dependent tasks, in order of importance.
-      for (i = 0; i < number_of_dependencies (rt_info); ++i)
-        {
-	  RT_Info* dep_info;
-	  this->lookup_rt_info (rt_info.dependencies[ordered_deps[i]].rt_info,
-				dep_info);
-          if (i > 0)
-	    {
-	      RT_Info* previous_info;
-	      this->lookup_rt_info (rt_info.dependencies[ordered_deps [i-1]].rt_info,
-				    previous_info);
-	      if (previous_info->importance < dep_info->importance)
-		{
-		  // Increment subpriority based on increased importance
-		  // of this dependent.
-		  ++subpriority;
-		}
-	    }
-
-              if (output_level () >= 4)
-                {
-		  ACE_OS::printf ("update_dependencies (); "
-				  "incremented subpriority to %u\n",
-				  subpriority);
-		}
-
-          dep_info->subpriority = subpriority;
-          if (output_level () >= 4)
-            {
-                ACE_OS::printf ("update_dependencies (); "
-                                  "set subpriority of \"%s\"o %u\n",
-                                (const char*)dep_info->entry_point,
-                                subpriority);
-            }
-
-          // Recurse until all dependent tasks have been visited.
-          if (output_level () >= 4)
-            {
-              ACE_OS::printf ("update_dependencies (); "
-                                "calling recursively for dependent \"%s\"\n",
-                              (const char*)dep_info->entry_point);
-            }
-
-          if ((ret = update_dependencies (*dep_info,
-                                          subpriority + 1)) != NOT_SCHEDULED)
-            {
-              break;
-            }
-	}
-
-      delete [] ordered_deps;
-      delete [] marked;
-    }
-  else
-    {
-      for (i = 0; i < number_of_dependencies (rt_info); ++i)
-        {
-	  RT_Info* info;
-          this->lookup_rt_info (rt_info.dependencies[i].rt_info, info);
-	  info->priority = rt_info.priority;
-          if (output_level () >= 4)
-            {
-                ACE_OS::printf ("update_dependencies (); "
-				"set priority of \"%s\" to %d "
-				"(its subpriority is %u)\n", 
-                                (const char*)info->entry_point,
-                                info->priority,
-                                info->subpriority);
-            }
-
-          if (output_level () >= 4)
-            {
-              ACE_OS::printf ("update_dependencies (); "
-			      "calling recursively for dependent \"%s\"\n",
-                              (const char*)info->entry_point);
-            }
-
-          // Recurse until all dependent tasks have been visited.
-          if ((ret = update_dependencies (*info,
-                                          0 /* not used when 
-                                               setting priorities */)) !=
-              NOT_SCHEDULED)
-            {
-              break;
-            }
-        }
-    }
-
-  return ret;
-}
-
-
-Scheduler::status_t
-Scheduler_Internal::schedule_rms (const int minimum_priority,
-                                  const int maximum_priority)
-{
-  double utilization = 0.0;
-  u_int i;
-
-  // Allocate an array for the sorted RT_Info.
-  Mode_Entry *sorted_rt_info;
-  ACE_NEW_RETURN (sorted_rt_info, Mode_Entry [threads ()],
-                  ST_VIRTUAL_MEMORY_EXHAUSTED);
-
-  // Sort the threads' thread info entries by period.
-  sort (thread_info_ [mode ()], threads (), sorted_rt_info, output_level ());
-
-  // Load priorities by walking the sorted rt_info_array, incrementing
-  // current_priority for each new period (rate).  For threads af the same
-  // rate, assign subpriorities based on 1) data dependencies and
-  // 2) importance.  Also, calculate CPU utilization on the fly.
-  ACE_Sched_Priority current_priority = minimum_priority;
-  for (i = 0; i < threads (); ++i)
-    {
-      RT_Info &rt_info = *sorted_rt_info [i].rt_info_;
-	  const RtecScheduler::Time entry_time = rt_info.worst_case_execution_time;
-      const RtecScheduler::Period entry_period = rt_info.period;
-
-      if (entry_period > DBL_EPSILON)
-        {
-#if defined (ACE_WIN32) || defined (ACE_HAS_LONGLONG_T)
-          utilization += (double) entry_time / entry_period;
-#else
-          utilization += (double) entry_time.lo () / entry_period;
-#endif /* ACE_WIN32 || ACE_HAS_LONGLONG_T */
-        }
-
-      if (i != 0  &&  output_level () >= 3)
-        {
-	  
-          ACE_OS::printf ("entry_period: %d (\"%s\"), "
-                          "previous thread period: %d\n",
-                          entry_period,
-                          (const char*)sorted_rt_info [i].rt_info_->entry_point,
-                          sorted_rt_info [i - 1].rt_info_->period);
-        }
-
-      // If i == 0, we're at the starting point:  there are no other threads
-      // to compare to.
-      if (i != 0  &&  entry_period != sorted_rt_info [i - 1].rt_info_->period)
-        {
-          // If the period of this task is the same as the period of the
-          // previous task (the threads are sorted by period), then assign
-          // it the same ("current") priority.  Otherwise, assign a higher
-          // priority (which may have a lower value), via "current_priority".
-          if (current_priority == maximum_priority)
-            {
-              status (ST_INSUFFICIENT_THREAD_PRIORITY_LEVELS);
-            }
-          else
-            {
-              if (output_level () >= 3)
-                {
-                  ACE_OS::printf ("will advance current_priority from its "
-                                  "current %d for period of %d\n",
-                                  current_priority, entry_period);
-                }
-
-              if (increasing_priority_)
-                {
-                  // This assumes that the target and host are the
-                  // same platform!  It's hear to deal with the
-                  // non-contiguous OS priorities of Win32 platforms.
-                  current_priority =
-		    ACE_Sched_Params::next_priority (ACE_SCHED_FIFO,
-						     current_priority,
-						     ACE_SCOPE_PROCESS);
-                }
-              else
-                {
-                  // This assumes that the OS priorities on the target
-                  // are contiguous, e.g., 255, 254, 253, 252, etc.,
-                  // from low to high priority.  The only target we
-                  // use with decreasing priorities, VxWorks, does have
-                  // contiguous OS priorities.
-                  --current_priority;
-                }
-            }
-        }
-
-      if (output_level () >= 3)
-        {
-          ACE_OS::printf ("thread %s, set priority to %d\n",
-                          (const char*)rt_info.entry_point,
-			  current_priority);
-        }
-
-      rt_info.priority  = current_priority;
-
-      // There should only be one dependency for each
-      // RT_Info instance in the (sorted) thread_info_ array.
-      if (number_of_dependencies (rt_info) != 1)
-	{
-	  ACE_ERROR ((LM_ERROR,
-		      "On '%s' deps count should be 1, it is %d\n",
-		      (const char*)rt_info.entry_point,
-		      number_of_dependencies(rt_info)));
-	}
-
-      // . . . and it should have a valid RT_Info pointer.
-      ACE_ASSERT (rt_info.dependencies[0].rt_info != -1);
-      RT_Info* tmp;
-      this->lookup_rt_info (rt_info.dependencies[0].rt_info, tmp);
-      tmp->priority  = current_priority;
-    }
-
-
-  // Set the priority of every task.
-  ACE_Bounded_Set_Iterator <RT_Info *> root_i (*roots_);
-  RT_Info **root;
-  while (root_i.next (root) != 0)
-    {
-      root_i.advance ();
-      if (output_level () >= 4)
-        {
-          ACE_OS::printf ("ROOT: %s\n",
-			  (const char*)(*root)->entry_point);
-        }
-
-      RT_Info *leaf = 0;
-      leaf_info_->find ((const char*)(*root)->entry_point, leaf);
-      ACE_ASSERT (leaf != 0);
-
-      if (output_level () >= 4)
-        {
-          ACE_OS::printf ("found leaf_info entry %s\n",
-                          (const char*)leaf->entry_point);
-        }
-
-      // Find the highest priority leaf corresponding to each root.
-      // ???? should do that!
-
-      (*root)->priority = leaf->priority;
-
-      // Update the priority of all dependent tasks.
-      // update_dependencies () is recursive, so set up the visited_
-      // structure outside of it.
-      ACE_NEW_RETURN (visited_,
-                      ACE_Bounded_Set <const RT_Info *> (tasks ()),
-                      ST_VIRTUAL_MEMORY_EXHAUSTED);
-
-      if (status () == NOT_SCHEDULED  /* first mode */  ||
-          status () == SUCCEEDED      /* subsequent modes */ )
-        {
-          if (output_level () >= 4)
-            {
-              ACE_OS::printf ("update_dependencies (); call for "
-                                "root %s to set priorities\n",
-                              (const char*)(*root)->entry_point);
-            }
-
-          status (update_dependencies (**root, 0 /* not used when
-                                                    setting priorities */));
-        }
-
-      delete visited_;
-      visited_ = 0;
-    }
-
-  // Set minimum_priority, the priority value of the lowest priority
-  // (highest numbered) dispatch queue.  This is global, over all modes,
-  // so don't overwrite a smaller value.
-  if (increasing_priority_)
-    {
-      if (current_priority - minimum_priority >
-            (int) minimum_priority_queue ())
-        {
-          if (output_level () >= 3)
-            {
-              ACE_OS::printf ("set minimum_priority_queue to %d = "
-                              " %d - %d\n",
-                              current_priority - minimum_priority,
-                              current_priority, minimum_priority);
-            }
-          minimum_priority_queue (current_priority - minimum_priority);
-        }
-    }
-  else
-    {
-      if (minimum_priority - current_priority >
-            (int) minimum_priority_queue ())
-        {
-          if (output_level () >= 3)
-            {
-              ACE_OS::printf ("set minimum_priority_queue to %d = "
-                              " %d - %d\n",
-                              current_priority - minimum_priority,
-                              current_priority, minimum_priority);
-            }
-          minimum_priority_queue (minimum_priority - current_priority);
-        }
-    }
-
-  // Load RT_Info pointers into ordered_info_ array for efficient lookup.
-  RT_Info ***entry;
-  ACE_Unbounded_Set_Iterator <RT_Info **> task_entries_i (task_entries_);
-  while (task_entries_i.next (entry) != 0)
-  {
-    task_entries_i.advance ();
-    if ((*entry) [mode ()] != 0)
-      {
-        // This mode has a non-zero RT_Info pointer.
-        ordered_info_ [(*entry) [mode ()]->handle - 1][mode ()] =
-          (*entry) [mode ()];
-      }
-    // else, just leave the ordered_info_ entry for this [task][mode] at 0.
-  }
-
-  const u_int harmonically_related =
-    harmonically_related_periods (sorted_rt_info,
-                                  threads (),
-                                  frame_size_ [mode ()]);
-
-  if (timeline_filename_ != 0)
-    {
-      status_t timeline_status;
-      if ((timeline_status = generate_timeline (sorted_rt_info,
-                                                threads (),
-                                                frame_size_ [mode ()],
-                                                timeline_ [mode()])) !=
-          SUCCEEDED)
-        {
-          status (timeline_status);
-        }
-    }
-
-  delete [] sorted_rt_info;
-  sorted_rt_info = 0;
-
-  // Calculate the utilization bound, based on whether or not the
-  // task periods are harmonically related.
-  double utilization_bound;
-
-  if (harmonically_related)
-    {
-      utilization_bound = 1.0;
-    }
-  else
-    {
-      utilization_bound = threads () * (::pow ((double) 2, 1./threads ()) - 1);
-    }
-
-  // Don't overwrite status if an error had already been noted.
-  if (status () == NOT_SCHEDULED)
-    {
-      // Compare the total utilization to the utilization bound
-      // to determine whether or not the threads are schedulable.
-      status (utilization <= utilization_bound
-	      ?  SUCCEEDED
-	      :  ST_UTILIZATION_BOUND_EXCEEDED);
-    }
-
-  // ???? if utilization bound is exceeeded, then should try all
-  // possible task phasings (RT test)
-
-  if (output_level () >= 1)
-    {
-      ACE_OS::printf ("mode %u:  utilization bound: %g; "
-                        "total CPU utilization: %g: ",
-                      mode (),
-                      utilization_bound,
-                      utilization);
-      Scheduler::output (stdout, status ());
-      ACE_OS::printf ("\n\n");
-    }
-
-  return status ();
-}
-
-
-u_int
-Scheduler_Internal::find_number_of_threads (mode_t mode)
-{
-  u_int number_of_threads = 0;
-
-  // Quickly traverse RT_Info's to determine number of
-  // threads, so that the thread_ array can be allocated below.
-  RT_Info ***entry;
-  ACE_Unbounded_Set_Iterator <RT_Info **> task_entries_i (task_entries_);
-  while (task_entries_i.next (entry) != 0)
-  {
-    task_entries_i.advance ();
-    RT_Info *rt_info = (*entry) [mode];
-
-    // This test misses thread delineators that are 0 in a particular
-    // mode.
-    if (rt_info != 0  &&
-        (rt_info->threads > 0 ||
-         (number_of_dependencies (rt_info) == 0
-	  && rt_info->period > 0)))
-      {
-        // This mode's RT_Info instance either has more than 0
-        // "internal" threads, or delineates a thread because it
-        // has no dependencies and has a non-zero period.
-	int nt = rt_info->threads > 0 ?  rt_info->threads : 1;
-        number_of_threads += nt;
-	if (output_level () >= 2)
-	  {
-	    ACE_OS::printf ("find_number_of_threads (): mode %u; entry %s; "
-                            "added %u threads\n",
-			    mode,
-			    (const char*)rt_info->entry_point,
-			    nt);
-	  }
-      }
-  }
-
-  if (output_level () >= 1)
-    {
-      ACE_OS::printf ("find_number_of_threads (): mode %u; "
-                        "identified %lu threads\n",
-                      mode, number_of_threads);
-    }
-
-  return number_of_threads;
-}
-
-
-Scheduler::status_t
-Scheduler_Internal::find_thread_delineators (mode_t mode)
-{
-  ACE_NEW_RETURN (dependencies_,
-                  ACE_Bounded_Set <const RT_Info *> (tasks ()),
-                  ST_VIRTUAL_MEMORY_EXHAUSTED);
-
-  // Fill in the thread_ array.  While doing this, load the
-  // dependencies set also.
-  RT_Info ***entry;
-  ACE_Unbounded_Set_Iterator <RT_Info **> task_entries_i (task_entries_);
-  while (task_entries_i.next (entry) != 0)
-  {
-    task_entries_i.advance ();
-    RT_Info *rt_info = (*entry) [mode];
-
-    if (rt_info != 0)
-      {
-        if ((rt_info->threads > 0 ||
-             (number_of_dependencies (rt_info) == 0 &&
-              rt_info->period > 0)))
-          {
-            // This mode's RT_Info instance either has more than 0
-            // "internal" threads, or delineates a thread because it
-            // has no dependencies and has a non-zero period.
-
-            if (output_level () >= 5)
-              {
-                ACE_OS::printf ("find_thread_delineators (); %s is a leaf and"
-                                " has %u threads\n",
-                                (const char*)rt_info->entry_point,
-				rt_info->threads);
-              }
-
-#if 1
-	    // TODO: This seems to break several invariants on the
-	    // RT_Info collection, I must talk to David about it.
-
-            // Add one thread for non-active objects, and the number of
-            // threads otherwise.
-            for (u_int i = 0;
-                 i < (rt_info->threads > 0 ? rt_info->threads : 1);
-                 ++i)
-              {
-                RT_Info *thread_info;
-                // Set "name" of thread to be that of its root RT_Info.
-                ACE_NEW_RETURN (thread_info, RT_Info,
-                                ST_VIRTUAL_MEMORY_EXHAUSTED);
-		thread_info->entry_point = rt_info->entry_point;
-		thread_info->threads = 0;
-		thread_info->period = 0;
-		Dependency_Info tmp;
-		tmp.number_of_calls = 0;
-		tmp.rt_info  = rt_info->handle;
-                Scheduler::add_dependency (thread_info, tmp);
-
-                if (output_level () >= 4)
-                  {
-                    ACE_OS::printf ("bind thread delineator %s\n",
-                                    (const char*)thread_info->entry_point);
-                  }
-
-                thread_info_ [mode].bind ((const char*)rt_info->entry_point,
-                                          thread_info);
-              }
-#endif
-          }
-
-        for (u_int dep = 0;
-             dep < number_of_dependencies (rt_info);
-             ++dep)
-          {
-	    RT_Info* info;
-	    this->lookup_rt_info (rt_info->dependencies[dep].rt_info, info);
-            if (output_level () >= 4)
-              {
-                ACE_OS::printf ("insert dependency %s\n",
-                                (const char*)info->entry_point);
-
-              }
-            if (dependencies_->insert (info) == -1)
-              {
-		return ST_VIRTUAL_MEMORY_EXHAUSTED;
-	      }
-          }
-
-      }
-  }
-
-  return SUCCEEDED;
-}
-
-
-Scheduler::status_t
-Scheduler_Internal::find_dependency_chain_roots (mode_t mode)
-{
-  ACE_NEW_RETURN (roots_,
-                  ACE_Bounded_Set <RT_Info *> (tasks ()),
-                  ST_VIRTUAL_MEMORY_EXHAUSTED);
-
-  // Now do the fun traversal through all RT_Infos to look for roots of
-  // dependency trees.  From each of those roots, traverse the dependency
-  // tree back to each leaf, which is one of the thread delineators that
-  // was found earlier.
-  RT_Info ***entry;
-  ACE_Unbounded_Set_Iterator <RT_Info **> task_entries_i (task_entries_);
-  while (task_entries_i.next (entry) != 0)
-  {
-    task_entries_i.advance ();
-    RT_Info *rt_info = (*entry) [mode];
-
-    if (rt_info != 0  &&  dependencies_->find (rt_info) == -1)
-      {
-        if (output_level () >= 5)
-          {
-            ACE_OS::printf ("\"%s\" is not a dependent task (it is a "
-                              "dependency-chain root); it has "
-                              "%u dependencies\n",
-                            (const char*)rt_info->entry_point,
-                            number_of_dependencies (rt_info));
-          }
-
-        if (output_level () >= 4)
-          {
-            ACE_OS::printf ("insert root %s\n",
-                            (const char*)rt_info->entry_point);
-          }
-        roots_->insert (rt_info);
-      }
-  }
-
-  return SUCCEEDED;
-}
-
-
-Scheduler::status_t
-Scheduler_Internal::find_dependency_chain_leaves ()
-{
-  RT_Info **root;
-  ACE_Map_Manager <RT_Info *, Sub_Priority, ACE_Null_Mutex>
-    root_subpriorities;
-
-  // Search through all of the dependency chain roots and assign
-  // subpriorities to them.  In effect, this sorts the roots by
-  // importance.
-
-  Sub_Priority current_subpriority = 0;
-  ACE_Bounded_Set_Iterator <RT_Info *> roots_i1 (*roots_);
-  while (roots_i1.next (root) != 0)
-  {
-    roots_i1.advance ();
-    RT_Info *rt_info = *root;
-
-    if (rt_info == 0) continue; // The task does not run in this mode.
-
-    // If we've seen the root already, ignore it.  Otherwise,
-    // consider it a candidate as the lowest-importance root.
-    RT_Info **min_importance_root;
-	RtecScheduler::Importance root_importance;
-    if (root_subpriorities.find (*root) == -1)
-      {
-        if (output_level () >= 6)
-          {
-            ACE_OS::printf ("find_dependency_chain_leaves (); root \"%s\" "
-                              "has not yet been visited\n",
-                            rt_info  ?  (const char*)rt_info->entry_point  :  "NULL");
-          }
-        min_importance_root = root;
-        root_importance = (*root)->importance;
-      }
-    else
-      {
-        if (output_level () >= 6)
-          {
-            ACE_OS::printf ("find_dependency_chain_leaves (); root \"%s\" "
-                              "has already been visited\n",
-                            rt_info  ?  (const char*)rt_info->entry_point :  "NULL");
-          }
-        min_importance_root = 0;
-        root_importance = (RtecScheduler::Importance) 0xFFFFFFFF;
-      }
-
-    RT_Info **root2;
-    ACE_Bounded_Set_Iterator <RT_Info *> roots_i2 (*roots_);
-    while (roots_i2.next (root2) != 0)
-    {
-      roots_i2.advance ();
-      if (root2 == root  ||  *root2 == 0) continue;
-
-	  RtecScheduler::Importance root2_importance = (*root2)->importance;
-
-      if ((min_importance_root == 0  ||
-           root2_importance < root_importance)  &&
-          root_subpriorities.find (*root2) == -1)
-        {
-          min_importance_root = root2;
-          root_importance = root2_importance;
-        }
-    }
-
-    // At this point, min_importance_root contains the root with
-    // the lowest importance, among all those that we haven't visited yet.
-    if (output_level () >= 6)
-      {
-        ACE_OS::printf ("lowest importance root is \"%s\"\n",
-                        (const char*)(*min_importance_root)->entry_point);
-      }
-
-    int result;
-    if ((result = root_subpriorities.bind (*min_importance_root,
-                                           current_subpriority++)) != 0)
-      {
-        ACE_OS::fprintf (stderr,
-                         "Scheduler_Internal::find_dependency_chain_leaves ();"
-                         "bind of %s to %d failed with result %d!!!!\n",
-                         (const char*)(*min_importance_root)->entry_point,
-                         current_subpriority,
-                         result);
-        return ST_VIRTUAL_MEMORY_EXHAUSTED;
-      }
-    else
-      {
-        if (output_level () >= 6)
-          {
-            ACE_OS::fprintf (stderr,
-                         "Scheduler_Internal::find_dependency_chain_leaves ();"
-                         "bind of \"%s\" to %d succeeded.\n",
-			 (const char*)(*min_importance_root)->entry_point,
-                         current_subpriority);
-          }
-
-        Sub_Priority subp;
-        root_subpriorities.find (*min_importance_root, subp);
-        (*min_importance_root)->subpriority = subp;
-        if (output_level () >= 4)
-          {
-            ACE_OS::printf ("\"%s\" assigned subpriority %d\n\n",
-                            (const char*)(*min_importance_root)->entry_point,
-                            subp);
-          }
-      }
-  }
-
-  size_t roots = root_subpriorities.current_size ();
-  if (output_level () >= 4)
-    {
-      ACE_OS::printf ("%u roots\n", roots);
-    }
-
-  // Sort the roots by importance, least first.
-  u_int i;
-  RT_Info **sorted_root;
-  ACE_NEW_RETURN (sorted_root, RT_Info *[roots], ST_VIRTUAL_MEMORY_EXHAUSTED);
-
-  RT_Info **visited_root;
-  ACE_NEW_RETURN (visited_root,
-                  RT_Info *[roots],
-                  ST_VIRTUAL_MEMORY_EXHAUSTED);
-  u_int next_visited_root = 0;
-  for (i = 0; i < roots; ++i)
-    {
-      visited_root[i] = 0;
-    }
-
-  Sub_Priority min_subp;
-  RT_Info *min_subp_root = 0;
-  for (i = 0; i < roots; ++i)
-    {
-      min_subp = 0x7FFF;
-
-      ACE_Bounded_Set_Iterator <RT_Info *> roots_i3 (*roots_);
-      while (roots_i3.next (root) != 0)
-      {
-        roots_i3.advance ();
-        RT_Info *rt_info = *root;
-
-        if (output_level () >= 6)
-          {
-            ACE_OS::printf ("find_dependency_chain_leaves (); "
-                              "sorted root \"%s\"\n",
-                            rt_info  ?  (const char*)rt_info->entry_point  :  "NULL");
-          }
-
-        if (rt_info == 0) continue; // The task does not run in this mode.
-        u_int next_root = 0;
-        for (u_int j = 0; j < roots; ++j)
-          {
-            if (visited_root[j] == rt_info) next_root = 1;
-          }
-        if (next_root == 1) continue;
-
-        if (min_subp > rt_info->subpriority)
-          {
-            min_subp = rt_info->subpriority;
-            min_subp_root = rt_info;
-          }
-      }
-
-      sorted_root[i] = min_subp_root;
-      visited_root[next_visited_root++] = min_subp_root;
-    }
-
-  delete [] visited_root;
-
-  // Now do the fun traversal from each root of a dependency chain.
-  // From each of those roots, traverse the dependency chain back to
-  // each leaf, which is one of the thread delineators that was found earlier.
-  for (i = 0; i < roots; ++i)
-  {
-    if (sorted_root[i] == 0) break;
-
-    RT_Info *rt_info = sorted_root[i];
-
-    if (rt_info == 0) continue; // The task does not run in this mode.
-
-    // Update the subpriority of this task:  set it to the minimum
-    // subpriority if it hadn't already been set.
-    if (rt_info->subpriority < 0)
-      {
-        if (output_level () >= 4)
-          {
-            ACE_OS::printf ("find_dependency_chain_leaves (); "
-                            "set subpriority of %s to %u\n",
-                            (const char*)rt_info->entry_point,
-                            ACE_Scheduler_MIN_SUB_PRIORITY);
-          }
-        rt_info->subpriority = ACE_Scheduler_MIN_SUB_PRIORITY;
-      }
-
-    // Update the subpriority of all dependent tasks.
-    // update_dependencies () is recursive, so set up the visited_
-    // structure outside of it.
-    ACE_NEW_RETURN (visited_,
-                    ACE_Bounded_Set <const RT_Info *> (tasks ()),
-                    ST_VIRTUAL_MEMORY_EXHAUSTED);
-
-    if (status () == NOT_SCHEDULED  /* first mode */  ||
-        status () == SUCCEEDED      /* subsequent modes */ )
-      {
-        Sub_Priority subp;
-        root_subpriorities.find (rt_info, subp);
-
-        if (output_level () >= 4)
-          {
-            ACE_OS::printf ("update_dependencies (); call for "
-                              "root %s to set subpriorities, starting with "
-                            "%d\n",
-                            (const char*)rt_info->entry_point,
-                            subp);
-          }
-
-        status (update_dependencies (*rt_info, subp));
-      }
-
-    delete visited_;
-    visited_ = 0;
-  }
-
-  delete [] sorted_root;
-
-  return SUCCEEDED;
-}
-
-
-Scheduler::status_t
-Scheduler_Internal::identify_threads ()
-{
-  status_t temp_status;
-
-  reset ();
-
-  // Figure out how many threads there are in this mode.
-  threads (find_number_of_threads (mode ()));
-
-  // Find and store the thread delineators:  they have no dependencies
-  // and have a specified rate, or they have internal threads of their own.
-  if ((temp_status = find_thread_delineators (mode ())) != SUCCEEDED)
-    {
-      return temp_status;
-    }
-
-  // Find and store dependency-chain roots.
-  if ((temp_status = find_dependency_chain_roots (mode ())) != SUCCEEDED)
-    {
-      return temp_status;
-    }
-
-  // Find and store dependency-chain leaves.
-  if ((temp_status = find_dependency_chain_leaves ()) != SUCCEEDED)
-    {
-      return temp_status;
-    }
-
-  return SUCCEEDED;
-}
-
-
-Scheduler::status_t
-Scheduler_Internal::aggregate_thread_parameters ()
-{
-  ACE_NEW_RETURN (leaf_info_, Thread_Map (),
-		  ST_VIRTUAL_MEMORY_EXHAUSTED);
-
-  ACE_Bounded_Set_Iterator <RT_Info *> roots_i (*roots_);
-  RT_Info **root;
-  while (roots_i.next (root))
-    {
-      roots_i.advance ();
-      if (*root != 0)
-        {
-          RT_Info &rt_info = **root;
-
-          if (output_level () >= 4)
-            {
-              ACE_OS::printf ("root: %s\n", (const char*)rt_info.entry_point);
-            }
-
-          RT_Info leaf_info (rt_info);
-          RT_Info *leaf = &rt_info;
-
-          for (u_int i = 0; i < number_of_dependencies (rt_info); ++i)
-            {
-	      RT_Info* info;
-	      this->lookup_rt_info(rt_info.dependencies[i].rt_info, info);
-              leaf =
-              &calculate_thread_properties (leaf_info,
-                                            *info,
-                                            rt_info.dependencies[i].
-                                              number_of_calls);
-               if (output_level () >= 4)
-                {
-                  ACE_OS::printf ("reached leaf %s\n",
-				  (const char*)leaf->entry_point);
-                }
-            }
-
-          if (output_level () >= 4)
-            {
-              ACE_OS::printf ("root %s maps to leaf %s\n",
-                              (const char*)rt_info.entry_point,
-                              (const char*)leaf->entry_point);
-            }
-          leaf_info_->bind ((const char*)rt_info.entry_point, leaf);
-
-          RT_Info *thread_info = 0;
-          thread_info_ [mode ()].find ((const char*)leaf->entry_point,
-				       thread_info);
-          if (thread_info == 0)
-            {
-              ACE_ERROR ((LM_ERROR,
-                          "Task \"%s\" depends on a thread identified "
-                            "by \"%s\", which does not \n"
-                            "have a period or internal threads.  "
-                            "Is that dependency backwards?\n",
-                          (const char*)rt_info.entry_point,
-                          (const char*)leaf->entry_point));
-            }
-          ACE_ASSERT (thread_info != 0);
-
-          if (output_level () >= 4)
-            {
-              ACE_OS::printf ("found thread_info entry %s\n",
-                              (const char*)thread_info->entry_point);
-            }
-
-          // Add the dependency chain's aggregate parameters to that
-          // of the thread.
-          (void) operator+= (thread_info, leaf_info);
-        }
-    }
-
-  return SUCCEEDED;
-}
-
-
-RtecScheduler::RT_Info &
-Scheduler_Internal::calculate_thread_properties (RT_Info &thread_info,
-                                                 RT_Info &rt_info,
-                                                 const u_int number_of_calls)
-{
-  u_int i;
-
-  for (i = 0; i < number_of_calls; ++i)
-    {
-      (void) operator+= (&thread_info, rt_info);
-    }
-
-  if (output_level () >= 4)
-    {
-      ACE_OS::printf ("calculate_thread_properties (); "
-                      "time: %ld, period: %ld usec\n",
-#if defined (ACE_WIN32) || defined (ACE_HAS_LONGLONG_T)
-                      thread_info.worst_case_execution_time,
-#else
-                      thread_info.time.lo (),
-#endif /* ACE_WIN32 || ACE_HAS_LONGLONG_T */
-                      thread_info.period / 10 /* usec/100 ns */);
-    }
-
-  if (number_of_dependencies (rt_info) == 0)
-    {
-      if (output_level () >= 4)
-        {
-          ACE_OS::printf ("calculate_thread_properties (); "
-                          "reached leaf %s\n",
-			  (const char*)rt_info.entry_point);
-        }
-      return rt_info;
-    }
-
-#if 0
-  for (i = 0; i < number_of_dependencies (rt_info); ++i )
-    {
-      // TODO:
-      if (rt_info.dependencies[i].rt_info.value() != 0)
-        {
-	  RT_Info info;
-	  rt_info.dependencies[i].rt_info >>= &info;
-          if (output_level () >= 4)
-            {
-              ACE_OS::printf ("calculate_thread_properties (): recurse on "
-                              "dependency %s\n",
-			      (const char*)info.entry_point);
-            }
-
-	  RT_Info& ret = 
-	    calculate_thread_properties (thread_info,
-					 info,
-					 rt_info.dependencies[i].
-                                         number_of_calls);
-          return ret;
-        }
-    }
-#endif /* 0 */
-
-  ACE_ASSERT (! "should never reach this!");  // should never get here!
-  return rt_info;  // to avoid compilation warning
-}
-
-
-int
-Scheduler_Internal::priority (const handle_t handle,
-			      OS_Thread_Priority &priority,
-			      Sub_Priority &subpriority,
-			      Preemption_Priority &preemption_prio,
-                              const mode_t requested_mode) const
-{
-  // Casting away the const.
-  ACE_Guard<LOCK> ace_mon (((Scheduler_Internal *) this)->lock_);
-
-  const mode_t lookup_mode = requested_mode == CURRENT_MODE
-                               ?  mode ()
-                               :  requested_mode;
-
-  if (!ordered_info_)
-    {
-      priority = minimum_priority_;
-      subpriority = ACE_Scheduler_MIN_SUB_PRIORITY;
-      preemption_prio = ACE_Scheduler_MAX_PREEMPTION_PRIORITY;
-      return 0;
-    }
-  else if (lookup_mode < modes ()  &&  handle <= handles_  &&
-           ordered_info_ [handle - 1][lookup_mode] != 0)
-    {
-      priority = ordered_info_ [handle - 1][lookup_mode]->priority;
-      subpriority = ordered_info_ [handle - 1][lookup_mode]->subpriority;
-
-      if (increasing_priority_)
-        {
-#if defined (ACE_WIN32)
-          // Find the queue_number by iterating over the OS thread priorities.
-          // This allows proper handling of non-contiguous OS priorities.
-          // It would be more efficient to store the queue number in the
-          // RT_Info instead of computing it here every time.  This is only
-          // intended for off-line scheduling, though, so it's not critical.
-	  // TODO: // ???? Hard-code knowledge of 5 dispatch queues!!
-          preemption_prio = 4; 
-          for (ACE_Sched_Priority p =
-                 ACE_Sched_Params::priority_min (ACE_SCHED_FIFO,
-                                                 ACE_SCOPE_PROCESS);
-               priority > p;
-               p = ACE_Sched_Params::next_priority (ACE_SCHED_FIFO,
-                                                    p,
-                                                    ACE_SCOPE_PROCESS))
-            {
-              --preemption_prio;
-            }
-#else  /* ! ACE_WIN32 */
-          // E.g., Solaris, which has contiguous priorities.
-          preemption_prio = minimum_priority_queue () -
-                           (priority - minimum_priority_);
-#endif /* ! ACE_WIN32 */
-        }
-      else
-        {
-          // Assume VxWorks, which has contiguous priorities.
-          preemption_prio = minimum_priority_queue () -
-                         (minimum_priority_ - priority);
-        }
-
-      // TODO: This should be updated when priority and subpriority
-      // are set, but I don't know when that happens :(
-      ordered_info_ [handle - 1][lookup_mode]->preemption_priority = 
-	preemption_prio;
-	
-      if (output_level () >= 3)
-        {
-          ACE_OS::printf ("preemption_prio %d: min %d, pri %d, min_pri %d\n",
-                          preemption_prio, minimum_priority_queue (),
-                          priority, minimum_priority_);
-        }
-
-      return 0;
-    } else {
-      return -1;
-    }
-}
-
-
-void
-Scheduler_Internal::print_schedule ()
-{
-  for (mode_t m = 0; m < modes (); ++m)
-    {
-      ACE_OS::printf ("\nMode %u:\n", m);
-      ACE_OS::printf ("Task   Priority Subpri- CPU Time  Period  Rate "
-                      "Utilization Name\n"
-                      "                 ority  microsec microsec  Hz\n"
-                      "----   -------- ------- -------- -------- ---- "
-                      "----------- ----\n");
-
-      // at 1 and incrementing by 1.
-      for (u_int task = 1; task <= tasks (); ++task)
-        {
-          RtecScheduler::OS_Priority prio;
-		  RtecScheduler::Sub_Priority subpriority;
-		  RtecScheduler::Preemption_Priority preemption_prio;
-          if (priority (task,
-                        prio,
-                        subpriority,
-                        preemption_prio,
-                        m) == -1)
-            {
-              ACE_OS::printf ("%3u        --     --          --   "
-                                "    --   --        --   %s\n",
-                              task, 
-			      (const char*)ordered_info_[task-1][m]->entry_point);
-            }
-          else
-            {
-#if defined (ACE_WIN32) || defined (ACE_HAS_LONGLONG_T)
-                const u_long t =
-		  (u_long) ordered_info_ [task-1][m]->worst_case_execution_time /
-                             10 /* microsec/100 ns */;
-#else
-                const u_long t = ordered_info_ [task-1][m]->time.lo () /
-                             10 /* microsec/100 ns */;
-#endif /* ACE_WIN32 || ACE_HAS_LONGLONG_T */
-
-              ACE_OS::printf ("%3u    %6d %6d    %8lu"
-                                "%9lu%5lu    %6.4f   %s\n",
-                              task, prio, subpriority, t,
-                              (u_long) (ordered_info_ [task-1][m]->period /
-                                        10 /* microsec/100 ns */),
-                              ordered_info_ [task-1][m]->period > 0
-                                ?  (u_long) (1.0e7 /
-                                               ordered_info_ [task-1][m]->
-                                                 period)
-                                :  0L,
-                              ordered_info_ [task-1][m]->period > 0
-                                ?  (double) t /
-                                     ordered_info_ [task-1][m]->period
-                                :  0.0,
-                              (const char*)ordered_info_[task-1][m]->entry_point);
-            }
-        }
-    }
-}
-
-
-Scheduler::status_t
-Scheduler_Internal::store_schedule (const char *filename)
-{
-  u_int i;
-  FILE *const file = ACE_OS::fopen (filename, "w");
-
-  if (file)
-    {
-      ACE_OS::fprintf (file, "\
-// Automatically generated \"%s\"\n\
-\n\
-#include \"Scheduler_Runtime.h\"\n\
-\n\
-static const unsigned int MODES = %u;\n\
-static const unsigned int TASKS = %u;\n\
-static const unsigned int THREADS = %u;\n\
-static const unsigned int MINIMUM_PRIORITY_QUEUE = %u;\n\
-\n\
-int\n\
-Scheduler_Runtime_registered_tasks_ [TASKS] = { 0 };\n\
-\n\
-const char *\n\
-Scheduler_Runtime_task_names_ [TASKS] =\n\
-  {\n\
-",                     filename,
-                       modes (),
-                       tasks (),
-                       threads (),
-                       minimum_priority_queue ());
-
-      for (i = 0; i < tasks (); ++i)
-        {
-          ACE_OS::fprintf (file, "    \"%s\"%s\n",
-                           (const char*)ordered_info_ [i][0]->entry_point,
-                           i == tasks () - 1  ?  ""  :  ",");
-        }
-
-      ACE_OS::fprintf (file, "\
-  };\n\
-\n\
-int\n\
-Scheduler_Runtime_priorities_ [MODES][TASKS][3] =\n\
-  {\n\
-");
-
-      for (i = 0; i < modes (); ++i)
-        {
-          ACE_OS::fprintf (file, "    { /* mode %u */\n", i);
-          for (u_int j = 0; j < tasks (); ++j)
-            {
-			  RtecScheduler::OS_Priority priority;
-			  RtecScheduler::Sub_Priority subpriority;
-			  RtecScheduler::Preemption_Priority preemption_prio;
-              if (ordered_info_ [j][i] == 0)
-                {
-                  // This task doesn't run in this mode.
-                  priority = increasing_priority_ ? minimum_priority_ - 1
-                                                  : minimum_priority_ + 1;
-                  subpriority = -1;
-                  preemption_prio = minimum_priority_queue () + 1;
-                }
-              else
-                {
-                  this->priority (j+1, priority, subpriority, preemption_prio, i);
-                }
-
-              ACE_OS::fprintf (file, "      { %d, %d, %u }%s\n",
-                               priority,
-                               subpriority,
-                               preemption_prio,
-                               j == tasks () - 1  ?  ""  :  ",");
-            }
-          ACE_OS::fprintf (file, "    }%s /* end mode %u */\n",
-                           i == modes () - 1  ?  ""  :  ",", i);
-        }
-
-      ACE_OS::fprintf (file, "\
-  };\n\
-\n\
-unsigned int\n\
-Scheduler_Runtime::modes ()\n\
-{\n\
-  return MODES;\n\
-}\n\
-\n\
-unsigned int\n\
-Scheduler_Runtime::tasks ()\n\
-{\n\
-  return TASKS;\n\
-}\n\
-\n\
-unsigned int\n\
-Scheduler_Runtime::threads ()\n\
-{\n\
-  return THREADS;\n\
-}\n\
-\n\
-unsigned int\n\
-Scheduler_Runtime::minimum_priority_queue ()\n\
-{\n\
-  return MINIMUM_PRIORITY_QUEUE;\n\
-}\n\
-\n\
-const char *\n\
-Scheduler_Runtime::task_name (const unsigned int handle)\n\
-{\n\
-  return Scheduler_Runtime_task_names_ [handle - 1];\n\
-}\n\
-\n\
-int\n\
-Scheduler_Runtime::priority (const unsigned int mode,\n\
-                                        const unsigned int handle)\n\
-{\n\
-  return Scheduler_Runtime_priorities_ [mode][handle - 1][0];\n\
-}\n\
-\n\
-int\n\
-Scheduler_Runtime::subpriority (const unsigned int mode,\n\
-                                           const unsigned int handle)\n\
-{\n\
-  return Scheduler_Runtime_priorities_ [mode][handle - 1][1];\n\
-}\n\
-\n\
-int\n\
-Scheduler_Runtime::preemption_prio (const unsigned int mode,\n\
-                                            const unsigned int handle)\n\
-{\n\
-  return Scheduler_Runtime_priorities_ [mode][handle - 1][2];\n\
-}\n\
-\n\
-unsigned int\n\
-Scheduler_Runtime::config ()\n\
-{\n\
-  return 0;\n\
-}\n\
-\n\
-unsigned int\n\
-Scheduler_Runtime::find (const char *operation_name)\n\
-{\n\
-  for (unsigned int i = 0; i < TASKS; ++i)\n\
-    if (! ACE_OS::strcmp (operation_name,\n\
-                          Scheduler_Runtime_task_names_ [i]))\n\
-      return i + 1;\n\
-\n\
-  return 0;\n\
-}\n\
-\n\
-unsigned int\n\
-Scheduler_Runtime::register_task (const unsigned int task)\n\
-{\n\
-  if (Scheduler_Runtime_registered_tasks_ [task - 1] == 1)\n\
-    {\n\
-      return 0;\n\
-    }\n\
-  else\n\
-    {\n\
-      Scheduler_Runtime_registered_tasks_ [task - 1] = 1;\n\
-      return task;\n\
-    }\n\
-}\n\
-\n\
-");
-
-      if (ACE_OS::fprintf (file, "// EOF\n") > 0  &&
-          ACE_OS::fclose (file) == 0)
-        {
-          return SUCCEEDED;
-        }
-      else
-        {
-          return UNABLE_TO_WRITE_SCHEDULE_FILE;
-        }
-    }
-  else
-    {
-      return UNABLE_TO_OPEN_SCHEDULE_FILE;
-    }
-}
-
-
-Scheduler::status_t
-Scheduler_Internal::store_rt_info (const char *filename)
-{
-  FILE *file = ACE_OS::fopen (filename, "w");
-  if (file)
-    {
-      const time_t now = ACE_OS::time (0);
-
-      (void) ACE_OS::fprintf (file,
-                              "# RT_Info provided for \"%s\" %s"
-                              "# Version 1.1\n"
-                              "# Format for each entry:\n"
-                              "#   entry name\n"
-                              "#   handle\n"
-                              "#   worst case execution time\n"
-                              "#   typical execution time\n"
-                              "#   cached execution time\n"
-                              "#   period\n"
-                              "#   importance\n"
-                              "#   quantum\n"
-                              "# begin dependencies\n"
-                              "#   number of dependencies\n"
-                              "#   entry name, number of calls "
-                                "(one of these lines per dependency, if any)\n"
-                              "# end dependencies\n"
-                              "#   priority\n"
-                              "#   order within priority\n\n"
-                              "%u modes\n%u operations\n\n",
-                              filename, ACE_OS::ctime (&now),
-                              modes (), tasks ());
-
-      RT_Info ***entry;
-      ACE_Unbounded_Set_Iterator <RT_Info **>
-        task_entries_i (task_entries_);
-      while (task_entries_i.next (entry) != 0)
-        {
-          task_entries_i.advance ();
-          export( (*entry) [0], file);
-        }
-    }
-  else
-    {
-      return UNABLE_TO_OPEN_SCHEDULE_FILE;
-    }
-
-  if (ACE_OS::fprintf (file, "\n# end of file\n", 1) > 0  &&
-      ACE_OS::fclose (file) == 0)
-    {
-      return SUCCEEDED;
-    }
-  else
-    {
-      return UNABLE_TO_WRITE_SCHEDULE_FILE;
-    }
-}
-
-
-// This implementation is incredibly ugly, but it sometimes works.  The
-// timeline viewer accepts start/stop pairs by task, and figures out the
-// preemption.  So, it's not necessary to figure out the preemptions.
-Scheduler::status_t
-Scheduler_Internal::generate_timeline (
-  Mode_Entry const sorted_rt_info [],
-  const u_int number_of_tasks,
-  u_long frame_size,
-  ACE_Unbounded_Queue <Timeline_Entry> &jobs)
-{
-  if (number_of_tasks > 0)
-    {
-      u_long start = 0;
-      u_long stop = 0;
-      u_int i;
-      u_long *next_start;
-      u_long *leftover;
-
-      ACE_NEW_RETURN (next_start, u_long [number_of_tasks],
-                      ST_VIRTUAL_MEMORY_EXHAUSTED);
-      ACE_NEW_RETURN (leftover, u_long [number_of_tasks],
-                      ST_VIRTUAL_MEMORY_EXHAUSTED);
-
-      for (i = 0; i < number_of_tasks; ++i)
-        {
-          next_start [i] = 0;
-          leftover [i] = 0;
-        }
-
-      while (stop <= frame_size)
-        {
-          for (i = number_of_tasks; i > 0; --i)
-            {
-              u_long execution_time = 0;  // microseconds
-
-              if (start < next_start [i - 1])
-                {
-                  if (leftover [i - 1] == 0)
-                    {
-                      // Not at this task's next start period, and it
-                      // has no leftover work in it's current period,
-                      // so move on to the next task.
-
-                      if (output_level () >= 3)
-                        {
-                          ACE_OS::printf ("      continue for task %lu\n",
-                            sorted_rt_info [i - 1].rt_info_->handle);
-                        }
-
-                      continue;
-                    }
-                  else
-                    {
-                      if (output_level () >= 3)
-                        {
-                          ACE_OS::printf ("      leftover for task %lu\n",
-                            sorted_rt_info [i - 1].rt_info_->handle);
-                        }
-
-                      execution_time = leftover [i - 1];
-                      leftover [i - 1] = 0;
-                    }
-                }
-              else
-                {
-                  if (output_level () >= 3)
-                    {
-                      ACE_OS::printf ("      task %s reached next start of"
-                                        " %lu (at %lu)\n",
-                                      (const char*)sorted_rt_info [i - 1].rt_info_->
-                                        entry_point,
-                                      next_start [i - 1],
-                                      start);
-                    }
-
-                  execution_time = (u_long)
-                    (sorted_rt_info [i - 1].rt_info_->worst_case_execution_time /
-                     10 /* us/100 ns */);
-
-                  next_start [i - 1] +=
-                    (u_long) (sorted_rt_info [i - 1].rt_info_->period /
-                              10 /* usec/100 ns */);
-
-                  if (output_level () >= 3)
-                    {
-                      ACE_OS::printf ("    loaded next_start of %lu with "
-                                        "%lu\n",
-                                      sorted_rt_info [i - 1].rt_info_->
-                                        handle,
-                                      next_start [i - 1]);
-                    }
-                }
-
-              if (output_level () >= 3)
-                {
-                  ACE_OS::printf ("    handle:  %d, "
-                                    " execution_time: %lu, "
-                                    " leftover: %lu\n",
-                                  sorted_rt_info [i - 1].rt_info_->handle,
-                                  execution_time,
-                                  leftover [i - 1]);
-                }
-
-              // Look for a start time of a higher priority task that
-              // is before this one can finish.
-              int will_finish = 1;
-              for (u_int j = number_of_tasks; j > i; --j)
-                {
-                  // Skip over groups of array entries with the same period.
-                  if (j < number_of_tasks  &&
-                      sorted_rt_info [j - 1].rt_info_->period ==
-                      sorted_rt_info [j].rt_info_->period)
-                    {
-                      break;
-                    }
-
-                  if (next_start [j - 1] > 0  &&
-                      next_start [j - 1] <= start + execution_time)
-                    {
-                      leftover [i - 1] = execution_time -
-                                         (next_start [j - 1] - start);
-                      execution_time = next_start [j - 1] - start;
-                      will_finish = 0;
-                      if (output_level () >= 3)
-                        {
-                          ACE_OS::printf ("    handle:  %d, "
-                                          " execution_time: %lu, "
-                                          " leftover: %lu\n",
-                                          sorted_rt_info [i - 1].rt_info_->
-                                            handle,
-                                          execution_time,
-                                          leftover [i - 1]);
-                        }
-                    }
-
-                  if (output_level () >= 2)
-                    {
-                      ACE_OS::printf ("    period:  %ld, time: %lu usec, "
-                                      " period ratio: %lu, "
-                                      " execution_time: %lu usec\n",
-                                      sorted_rt_info [j-1].rt_info_->
-                                        period / 10 /* usec/100 ns */,
-                                      (u_long) (sorted_rt_info [j-1].rt_info_->
-				      worst_case_execution_time / 10 /* usec/100 ns */),
-                                      sorted_rt_info [j-1].rt_info_->period
-                                          > 0
-                                        ? (u_long) (sorted_rt_info [i-1].
-                                                      rt_info_->period /
-                                                    sorted_rt_info [j-1].
-                                                    rt_info_->period)
-                                        : 0,
-                                      execution_time / 10 /* usec/100 ns */);
-                    }
-                }
-
-              if (output_level () >= 3)
-                {
-                  ACE_OS::printf ("  period:  %ld usec, time: %lu usec, "
-                                  " execution_time: %lu usec\n",
-                                  sorted_rt_info [i - 1].rt_info_->
-                                    period / 10 /* usec/100 ns */,
-                                  (u_long) (sorted_rt_info [i - 1].rt_info_->
-				   worst_case_execution_time / 10 /* usec/100 ns */),
-                                  execution_time / 10 /* usec/100 ns */);
-                }
-
-              jobs.enqueue_head (Timeline_Entry (sorted_rt_info [i - 1].rt_info_->
-                                              handle,
-                                            sorted_rt_info [i - 1].rt_info_->
-                                              entry_point,
-                                            start,
-                                            stop = start + execution_time,
-                                            next_start [i - 1]));
-              start = stop;
-
-              if (! will_finish)
-                {
-                  // don't bother to visit any other tasks:  restart
-                  // with the highest priority task
-                  break;
-                }
-            }
-
-          // figure out next start time based on periods only
-          u_long min_start = 0xFFFFFFFF;
-          for (i = 0; i < number_of_tasks; ++i)
-            {
-              if (min_start > next_start [i]) min_start = next_start [i];
-            }
-          start = min_start;
-
-          // if any tasks haven't finished the current period processing,
-          // let them try to finish by overwriting "start" with "stop"
-          for (i = 0; i < number_of_tasks; ++i)
-            {
-              if (leftover [i] > 0)
-                {
-                  start = stop;
-                  break;
-                }
-            }
-        }
-
-      delete [] next_start;
-      next_start = 0;
-      delete [] leftover;
-      leftover = 0;
-    }
-
-  return SUCCEEDED;
-}
-
-
-Scheduler::status_t
-Scheduler_Internal::create_timelines (const char *filename)
-{
-  // Store each mode's timeline in a different file.  Append the
-  // mode identifier to filename.
-  char full_filename [MAXPATHLEN];
-  ACE_OS::strcpy (full_filename, filename);
-  char *filename_extension = full_filename + ACE_OS::strlen (filename);
-  if (filename_extension == 0)
-    {
-      return UNABLE_TO_OPEN_SCHEDULE_FILE;
-    }
-
-  status_t status = SUCCEEDED;
-
-  for (u_int mode = 0;
-       (status == SUCCEEDED || status == ST_UTILIZATION_BOUND_EXCEEDED)  &&
-         mode < modes ();
-       ++mode)
-    {
-      char mode_id[128];
-      ACE_OS::sprintf (mode_id, "-mode_%d.timeline", mode + 1);
-      ACE_OS::strcpy (filename_extension, mode_id);
-
-      FILE *const file = ACE_OS::fopen (full_filename, "w");
-      if (file)
-        {
-          u_int i;
-
-          // count the number of tasks in this mode with non-null RT_Info
-          u_int nonnull_tasks = 0;
-          for (i = 0; i < tasks (); ++i)
-            {
-              if (ordered_info_ [i][mode] != 0)
-                {
-                  ++nonnull_tasks;
-                }
-            }
-          ACE_OS::fprintf (file, "%u\n", nonnull_tasks); /* number_of_tasks */
-
-
-          ACE_OS::fprintf (file, "%lu\n",                /* frame_size */
-                           frame_size_ [mode]);
-          ACE_OS::fprintf (file, "0 %lu\n",              /* start stop_times */
-                           frame_size_ [mode]);
-
-          ACE_Bounded_Set <u_int> emitted_tasks (nonnull_tasks);
-          u_int max_priority = 0x7FFFFFFF;
-          for (i = 0; i < tasks (); ++i)
-            {
-              u_int highest_priority = 0x7FFFFFFF;  /* corresponds to lowest
-                                                       queue number */
-              u_int highest_priority_task = 0xFFFFFFFF;
-
-              for (u_int j = 0; j < tasks (); ++j)
-                {
-                  if (ordered_info_ [j][mode] != 0)
-                    {
-					  RtecScheduler::OS_Priority priority;
-					  RtecScheduler::Sub_Priority subpriority;
-					  RtecScheduler::Preemption_Priority preemption_prio;
-                      this->priority (j+1, priority, subpriority, preemption_prio,
-                                      mode);
-
-                      if (i == 0)
-                        {
-                          if (max_priority > preemption_prio)
-                            {
-                              max_priority = preemption_prio;
-                            }
-                        }
-
-                      if (! emitted_tasks.find (j)  &&
-                          highest_priority > preemption_prio)
-                        {
-                          highest_priority = preemption_prio;
-                          highest_priority_task = j;
-                        }
-                    }
-                }
-
-              /* task_name priority */
-              if (highest_priority_task < 0xFFFFFFFF)
-                {
-                  ACE_OS::fprintf (file, "%s %d\n",
-                    /* task name */
-		    (const char*)ordered_info_ [highest_priority_task][mode]->
-                      entry_point,
-                    /* queue number */
-                    minimum_priority_queue () -
-                      (increasing_priority_
-                         ?  ordered_info_ [highest_priority_task][mode]->
-                              priority -
-                            minimum_priority_
-                         :  minimum_priority_ -
-                            ordered_info_ [highest_priority_task][mode]->
-                              priority));
-
-                  emitted_tasks.insert (highest_priority_task);
-                }
-            }
-
-          const u_int timeline_entries = (u_int) timeline_ [mode].size ();
-          for (i = 0; i < timeline_entries; ++i)
-            {
-              Timeline_Entry entry;
-              if (! timeline_ [mode].dequeue_head (entry))
-                {
-                  ACE_OS::fprintf (file, "%s %d %s\n%s %d %d\n",
-                                   entry.entry_point_,
-                                   entry.start_,
-                                   "", /* label */
-                                   entry.entry_point_,
-                                   entry.stop_,
-                                   entry.next_start_);
-                }
-            }
-
-          if (ACE_OS::fclose (file) != 0)
-            {
-              status = UNABLE_TO_WRITE_SCHEDULE_FILE;
-            }
-        }
-      else
-        {
-          status = UNABLE_TO_OPEN_SCHEDULE_FILE;
-        }
-    }
-
-  return status;
-}
-
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Bounded_Set<RtecScheduler::RT_Info *>;
-template class ACE_Bounded_Set<const RtecScheduler::RT_Info *>;
-template class ACE_Bounded_Set<u_int>;
-template class ACE_Bounded_Set_Iterator<RtecScheduler::RT_Info *>;
-template class ACE_Node<Scheduler_Internal::Timeline_Entry>;
-template class ACE_Node<RtecScheduler::RT_Info **>;
-template class ACE_Unbounded_Queue<Scheduler_Internal::Timeline_Entry>;
-template class ACE_Unbounded_Queue_Iterator<
-  Scheduler_Internal::Timeline_Entry>;
-template class ACE_Unbounded_Set<RtecScheduler::RT_Info **>;
-template class ACE_Unbounded_Set_Iterator<RtecScheduler::RT_Info **>;
-
-template class ACE_Map_Entry <RtecScheduler::RT_Info *, Scheduler::Sub_Priority>;
-template class ACE_Map_Manager <RtecScheduler::RT_Info *, Scheduler::Sub_Priority,
-                                ACE_Null_Mutex>;
-
-#if defined (ACE_HAS_THREADS)
-  template class ACE_Map_Entry<ACE_CString, RtecScheduler::RT_Info *>;
-  template class ACE_Map_Manager<ACE_CString, RtecScheduler::RT_Info *, ACE_Null_Mutex>;
-  template class ACE_Map_Iterator<ACE_CString, RtecScheduler::RT_Info *, ACE_Null_Mutex>;
-#endif /* ACE_HAS_THREADS */
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-
-// EOF
diff --git a/TAO/local/bin/Scheduling_Service/Scheduler_Internal.h b/TAO/local/bin/Scheduling_Service/Scheduler_Internal.h
deleted file mode 100644
index 45bd2060110..00000000000
--- a/TAO/local/bin/Scheduling_Service/Scheduler_Internal.h
+++ /dev/null
@@ -1,252 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-//
-// ============================================================================
-//
-// = LIBRARY
-//    sched
-//
-// = FILENAME
-//    Scheduler_Internal.h
-//
-// = CREATION DATE
-//    23 January 1997
-//
-// = AUTHOR
-//    David Levine
-//
-// ============================================================================
-
-#if ! defined (SCHEDULER_INTERNAL_H)
-#define SCHEDULER_INTERNAL_H
-
-#include "ace/Containers.h"
-#include "ace/ACE.h"
-
-#include "Scheduler.h"
-
-struct Mode_Entry;  // for internal use only
-
-class Scheduler_Internal : public ACE_Scheduler
-  // = TITLE
-  //    Implementation of an off-line scheduler.
-  //
-  // = DESCRIPTION
-  //    Schedules tasks using rate-monotonic scheduling.
-{
-public:
-  Scheduler_Internal ();
-  virtual ~Scheduler_Internal ();
-
-  // = Initialize the scheduler.
-  virtual void init (const int minimum_priority,
-                     const int maximum_priority,
-                     const char *runtime_filename = 0,
-                     const char *rt_info_filename = 0,
-                     const char *timeline_filename = 0);
-
-  // = Registers a task.
-  virtual status_t register_task (RT_Info *[],
-                                  const u_int number_of_modes,
-                                  handle_t &handle);
-
-  virtual status_t lookup_rt_info (handle_t handle,
-				   RT_Info* &rtinfo);
-  // Obtains an RT_Info based on its "handle".
-
-  // = Computes the schedule.
-  virtual status_t schedule (void);
-
-  // = Access a thread priority.
-  virtual int priority (const handle_t handle,
-                        OS_Thread_Priority &priority,
-                        Sub_Priority &subpriority,
-                        Preemption_Priority &preemption_prio,
-                        const mode_t = CURRENT_MODE) const;
-  // Defines "priority" as the priority that was assigned to the Task that
-  // was assigned "handle", for the specified mode.  Defines "subpriority"
-  // as the relative ordering (due to dependencies) within the priority.
-  // Returns 0 on success, or 1 if an invalid mode or handle are supplied.
-
-  typedef ACE_Map_Entry <ACE_CString, RT_Info *> Thread_Map_Entry;
-  typedef ACE_Map_Manager <ACE_CString, RT_Info *, ACE_Null_Mutex>
-      Thread_Map;
-  typedef ACE_Map_Iterator <ACE_CString, RT_Info *, ACE_Null_Mutex>
-      Thread_Map_Iterator;
-
-private:
-  u_int handles_;
-  // The number of task handles dispensed so far.
-
-  int minimum_priority_;
-  // The minimum priority value that the application specified (in
-  // its call to init ()).
-
-  int maximum_priority_;
-  // The maximum priority value that the application specified (in
-  // its call to init ()).
-
-  const char *runtime_filename_;
-  // Destination file of Scheduler output from the configuration run.
-
-  const char *rt_info_filename_;
-  // Destination file of all rt_info data from the configuration run.
-
-  const char *timeline_filename_;
-  // The destination of the timeline.
-
-  int increasing_priority_;
-  // Set to 1 if priority values increase with increasing priority,
-  // such as on Solaris and Win32, or 0 if they decrease, such as on
-  // VxWorks.
-
-  ACE_Unbounded_Set <RT_Info **> task_entries_;
-  // Collection of known tasks.
-
-  RT_Info ***ordered_info_;
-  // An ordered array of pointers to the RT_Info pointers stored
-  // in task_entries_.  It is index by [handle][mode].  This permits
-  // efficient retrieval by get_priority ().
-
-  ACE_Bounded_Set <const RT_Info *> *visited_;
-  // When updating dependencies, use this set to keep track of
-  // visited RT_Info instances in order to detect cycles in the
-  // dependency graph.  It is dynamically allocated/deallocated so that
-  // it doesn't have to be "cleaned out" manually for each mode.
-
-  ACE_Bounded_Set <RT_Info *> *leaves_;
-  // For 1) storing aggregate thread execution parameters during
-  //        traversal of dependency chains, and
-  //     2) assigning priorities to all tasks.
-
-  ACE_Bounded_Set <const RT_Info *> *dependencies_;
-  // Collection of RT_Info's that are dependent tasks, for efficient
-  // identification of dependency-chain roots.
-
-  ACE_Bounded_Set <RT_Info *> *roots_;
-  // Collection of RT_Info's that are roots of dependency chains.
-
-  status_t update_dependencies (RT_Info &, Sub_Priority subpriority);
-  // For each of this task's dependencies (transitively), increment its
-  // subpriority.  The higher subpriorities indicate that the dependent
-  // tasks should run before this task.
-
-  u_long *frame_size_; /* millisec */
-  // For creating timelines (array indexed by mode).
-
-  Thread_Map *thread_info_;
-  // Collection of known threads, dynamically allocated because
-  // it is reused for each mode.  It consists of a amp of RT_Info
-  // instances, keyed by entry_point, that aggregate the info for the
-  // entire thread.  Each instance has one dependency:  the root
-  // RT_Info instance of the thread.
-  // *thread_info_ is an array, indexed by mode.
-
-  Thread_Map *leaf_info_;
-  // Mapping from roots of dependency chains to their leaves.
-
-public:  // for template specialization
-  struct Timeline_Entry
-  {
-    u_long handle_;
-    const char *entry_point_;
-    u_long start_;  // microseconds
-    u_long stop_;   // microseconds
-    u_long next_start_;
-
-    Timeline_Entry (const u_long handle = 0,
-                    const char *entry_point = 0,
-                    const u_long start = 0,
-                    const u_long stop = 0,
-                    const u_long next_start = 0)
-      : handle_ (handle),
-        entry_point_ (entry_point),
-        start_ (start),
-        stop_ (stop),
-        next_start_ (next_start) {}
-  };
-private:
-#if defined (ACE_HAS_THREADS)
-  typedef ACE_Recursive_Thread_Mutex LOCK;
-#else
-  typedef ACE_Null_Mutex LOCK;
-#endif /* ACE_HAS_THREADS */
-
-  LOCK lock_;
-  // This protects access to the scheduler during configuration runs.
-
-  ACE_Unbounded_Queue <Timeline_Entry> *timeline_;
-  // For storing timelines.
-
-
-  ///////////////////////////////////////
-  // member functions for internal use //
-  ///////////////////////////////////////
-
-  void reset ();
-  // Prepare for another schedule computation, but do not
-  // disturb the "output" (priorities that have already been assigned).
-
-  status_t schedule_rms (const int minimum_priority,
-                         const int maximum_priority);
-  // Computes the schedule using Rate Monotonic Scheduling.
-
-  RT_Info &calculate_thread_properties (RT_Info &thread_info,
-					RT_Info &rt_info,
-					const u_int number_of_calls);
-  // Computes the execution time, etc., of the thread, identified by
-  // rt_info, and store it in thread_info, by recursively traversing
-  // the RT_Info call chain.  Returns the root node.
-
-  void print_schedule ();
-  // Display the schedule, task-by-task.
-
-  status_t store_schedule (const char *filename);
-  // Store the schedule in the named file.
-
-  status_t store_rt_info (const char *filename);
-  // Export all RT_Info to the named file.
-
-  status_t identify_threads ();
-  // Assembles RT_Tasks into threads.
-
-  status_t aggregate_thread_parameters ();
-  // Stores the aggregated thread parameters at each leaf (thread delineator)
-  // in the tread_info_ array.
-
-  u_int find_number_of_threads (mode_t mode);
-  // Counts the number of threads in a mode based on the task dependencies.
-
-  status_t find_thread_delineators (mode_t mode);
-  // Find and store the thread delineators:  they have no dependencies
-  // and have a specified rate, or they have internal threads of their own.
-
-  status_t find_dependency_chain_roots (mode_t mode);
-  // Find and store the roots of dependency chains.
-
-  status_t find_dependency_chain_leaves ();
-  // Find and store the leaves of dependency chains.
-
-  status_t generate_timeline (
-    Mode_Entry const sorted_rt_info [],
-    const u_int number_of_tasks,
-    u_long frame_size,
-    ACE_Unbounded_Queue <Timeline_Entry> &jobs);
-
-  status_t create_timelines (const char *filename);
-  // Create a timeline for each mode.
-
-  // the following functions are not implememented
-  Scheduler_Internal (const Scheduler_Internal &);
-  Scheduler_Internal &operator= (const Scheduler_Internal &);
-};
-
-
-#if defined (__ACE_INLINE__)
-#include "Scheduler_Internal.i"
-#endif /* __ACE_INLINE__ */
-
-#endif /* SCHEDULER_INTERNAL_H */
-
-
-// EOF
diff --git a/TAO/local/bin/Scheduling_Service/Scheduler_Internal.i b/TAO/local/bin/Scheduling_Service/Scheduler_Internal.i
deleted file mode 100644
index 91ee5915070..00000000000
--- a/TAO/local/bin/Scheduling_Service/Scheduler_Internal.i
+++ /dev/null
@@ -1,21 +0,0 @@
-// $Id$
-//
-// ============================================================================
-//
-// = LIBRARY
-//    sched
-//
-// = FILENAME
-//    Scheduler_Internal.i
-//
-// = CREATION DATE
-//    23 January 1997
-//
-// = AUTHOR
-//    David Levine
-//
-// ============================================================================
-
-
-// EOF
-
diff --git a/TAO/local/bin/Scheduling_Service/dump_schedule.cpp b/TAO/local/bin/Scheduling_Service/dump_schedule.cpp
deleted file mode 100644
index 01fed0eed6f..00000000000
--- a/TAO/local/bin/Scheduling_Service/dump_schedule.cpp
+++ /dev/null
@@ -1,67 +0,0 @@
-//
-// $Id$
-//
-
-#include "ace/Sched_Params.h"
-#include "ace/Get_Opt.h"
-#include "tao/corba.h"
-
-#include "CosNamingC.h"
-#include "Scheduler_Factory.h"
-
-// This program dumps the results of one scheduling in a C++ file.
-
-
-
-int main (int argc, char *argv[])
-{
-  ACE_TRY
-    {
-      // Initialize ORB.
-      CORBA::ORB_ptr orb = 
-	CORBA::ORB_init (argc, argv, "dump_schedule", ACE_TRY_ENV);
-      ACE_CHECK_ENV;
-
-      CORBA::POA_ptr poa =
-	orb->POA_init(argc, argv, "POA");
-      if (poa == 0)
-	{
-	  ACE_ERROR_RETURN ((LM_ERROR,
-			     " (%P|%t) Unable to initialize the POA.\n"),
-			    1);
-	}
-
-#if 0
-      CORBA::Object_ptr objref =
-	orb->resolve_initial_references ("NameService");
-      ACE_CHECK_ENV;
-      CosNaming::NamingContext_var naming_context = 
-        CosNaming::NamingContext::_narrow (objref, ACE_TRY_ENV);
-      ACE_CHECK_ENV;
-
-      ACE_Scheduler_Factory::use_config (naming_context);
-#else
-      ACE_Scheduler_Factory::use_config (orb);
-#endif /* 0 */
-
-      RtecScheduler::RT_Info_Set* infos;
-      ACE_Scheduler_Factory::server ()->compute_scheduling
-	(ACE_Sched_Params::priority_min (ACE_SCHED_FIFO,
-					 ACE_SCOPE_THREAD),
-	 ACE_Sched_Params::priority_max (ACE_SCHED_FIFO,
-					 ACE_SCOPE_THREAD),
-	 infos, ACE_TRY_ENV);
-      ACE_CHECK_ENV;
-
-      ACE_Scheduler_Factory::dump_schedule (*infos,
-					    "Scheduler_Runtime.cpp");
-      delete infos;
-    }
-  ACE_CATCH (CORBA::SystemException, sys_ex)
-    {
-      ACE_TRY_ENV.print_exception ("SYS_EX");
-    }
-  ACE_ENDTRY;
-
-  return 0;
-}
diff --git a/TAO/local/bin/Scheduling_Service/schedule_service.cpp b/TAO/local/bin/Scheduling_Service/schedule_service.cpp
deleted file mode 100644
index 8be94d60c93..00000000000
--- a/TAO/local/bin/Scheduling_Service/schedule_service.cpp
+++ /dev/null
@@ -1,71 +0,0 @@
-//
-// $Id$
-//
-
-#include "tao/corba.h"
-
-#include "CosNamingC.h"
-#include "Config_Scheduler.h"
-
-int main (int argc, char *argv[])
-{
-  ACE_TRY
-    {
-      // Initialize ORB.
-      CORBA::ORB_ptr orb = 
-	CORBA::ORB_init (argc, argv, "internet", ACE_TRY_ENV);
-      ACE_CHECK_ENV;
-
-      CORBA::POA_ptr poa =
-	orb->POA_init(argc, argv, "POA");
-      if (poa == 0)
-	{
-	  ACE_ERROR_RETURN ((LM_ERROR,
-			     " (%P|%t) Unable to initialize the POA.\n"),
-			    1);
-	}
-
-#if 0
-      CORBA::Object_ptr objref =
-	orb->resolve_initial_references ("NameService");
-      ACE_CHECK_ENV;
-
-      CosNaming::NamingContext_var naming_context = 
-        CosNaming::NamingContext::_narrow (objref, ACE_TRY_ENV);
-      ACE_CHECK_ENV;
-#endif
-
-      // Create an Scheduling service servant...
-      RtecScheduler::Scheduler_ptr scheduler = new ACE_Config_Scheduler;
-      // CORBA::Object::_duplicate(scheduler);
-      ACE_CHECK_ENV;
-
-      CORBA::String str =
-	orb->object_to_string (scheduler, ACE_TRY_ENV);
-      ACE_OS::puts ((char *) str);
-
-#if 0
-      // Register the servant with the Naming Context....
-      CosNaming::Name schedule_name (1);
-      schedule_name[0].id = CORBA::string_dup ("ScheduleService");
-      schedule_name.length (1);
-      naming_context->bind (schedule_name, scheduler, ACE_TRY_ENV);
-      ACE_CHECK_ENV;
-#endif
-
-      ACE_DEBUG ((LM_DEBUG, "running scheduling service\n"));
-      if (orb->run () == -1)
-	{
-	  ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "run"), 1);
-	}
-
-      CORBA::release (scheduler);
-    }
-  ACE_CATCHANY
-    {
-      ACE_TRY_ENV.print_exception ("schedule_service");
-    }
-  ACE_ENDTRY;
-
-  return 0;
-}
diff --git a/TAO/local/bin/Scheduling_Service/svc.conf b/TAO/local/bin/Scheduling_Service/svc.conf
deleted file mode 100644
index 43c6a486c92..00000000000
--- a/TAO/local/bin/Scheduling_Service/svc.conf
+++ /dev/null
@@ -1,49 +0,0 @@
-# $Id$
-#
-# This file contains a sample ACE_Service_Config configuration
-# file specifying the strategy factories utilized by an application
-# using TAO.  There are currently only two possible factories:
-# Client_Strategy_Factory and Server_Strategy_Factory.  These names
-# must be used as the second argument to their corresponding line,
-# because that's what the ORB uses to find the desired factory.
-#
-# Note that there are two unordinary characteristics of the way *this*
-# file is set up:
-#   - both client and server strategies are specified in the same
-#     file, which would only make sense for co-located clients & servers
-#   - both of the factories are actually sourced out of libTAO.so
-#     (TAO.DLL on Win32), and they would normally be in a separate
-#     dll from the TAO ORB Core.
-#
-# The options which can be passed to the Resource Factory are:
-#
-#   -ORBresources <which>
-#       where <which> can be 'global' to specify globally-held resources,
-#       or 'tss' to specify thread-specific resources.
-#
-# The options which can be passed to the Client are:
-#     <none currently>
-#
-# The options which can be passed to the Server are:
-#
-#   -ORBconcurrency <which>
-#       where <which> can be 'thread-per-connection' to specify
-#       use of the ACE_Threaded_Strategy concurrency strategy,
-#       or 'reactive' to specify use of the ACE_Reactive_Strategy
-#       concurrency strategy.
-#
-#   -ORBthreadflags  <flags>
-#       specifies the default thread flags to use, where <flags> is a
-#       logical OR'ing of the flags THR_DETACHED, THR_BOUND, THR_NEW_LWP,
-#       THR_SUSPENDED, or THR_DAEMON.  Note that not every flag may be valid
-#       on every platform.
-#
-#   -ORBdemuxstrategy <which>
-#       where <which> can be one of 'dynamic', 'linear', 'active', or 'user',
-#       and specifies the type of object lookup strategy used internally.
-#   -ORBtablesize <unsigned>
-#       specifies the size of the object table
-#
-dynamic Resource_Factory Service_Object * TAO:_make_TAO_Resource_Factory() "-ORBresources global"
-dynamic Client_Strategy_Factory Service_Object * TAO:_make_TAO_Default_Client_Strategy_Factory()
-dynamic Server_Strategy_Factory Service_Object * TAO:_make_TAO_Default_Server_Strategy_Factory() "-ORBconcurrency reactive -ORBdemuxstrategy dynamic -ORBtablesize 128"
diff --git a/TAO/local/tests/Latency.cpp b/TAO/local/tests/Latency.cpp
deleted file mode 100644
index b6f26665a66..00000000000
--- a/TAO/local/tests/Latency.cpp
+++ /dev/null
@@ -1,845 +0,0 @@
-// $Id$
-
-#include <limits.h>
-#if defined (quantify)
-  #include <quantify.h>
-#endif /* quantify */
-
-#include "ace/Get_Opt.h"
-#include "ace/Sched_Params.h"
-#include "ace/Profile_Timer.h"
-
-#include "Event_Utilities.h"
-#include "Event_Service_Constants.h"
-#include "Scheduler_Factory.h"
-#include "RtecEventChannelAdminC.h"
-#include "Latency.h"
-
-static const char usage [] = "[-? |\n"
-"            [-c <consumers> [4]]\n"
-"            [-d directly connect all consumers/suppliers\n"
-"            [-j to collect jitter statistics]\n"
-"            [-m <count> of messages to send [10]]\n"
-"            [-s <suppliers>, [1]]\n"
-"            [-t <timeout interval>, msec [250]]]";
-
-// Configuration parameters.
-static u_int consumers = 1;
-static u_int suppliers = 1;
-static u_int total_messages = 1000;
-static int measure_jitter = 0;
-static u_int timeout_interval = 250; // msec
-
-static int short_circuit_EC = 0;
-static int shutting_down = 0;
-
-// This is global to allow the Supplier to short ciruit the EC
-// and talk directly to consumers.  For testing only :-)
-static Latency_Consumer **consumer;
-
-// This is a global timer to obtain some performance results.
-ACE_Profile_Timer global_profile_timer;
-
-// ************************************************************
-
-Latency_Consumer::Latency_Consumer (const int measure_jitter)
-  : measure_jitter_ (measure_jitter),
-    min_latency_ (INT_MAX),
-    max_latency_ (INT_MIN),
-    total_latency_ (0),
-    total_pushes_ (0)
-{
-}
-
-int
-Latency_Consumer::open_consumer (RtecEventChannelAdmin::EventChannel_ptr ec,
-				 const char *my_name)
-{
-  entry_point (my_name); 
-  ACE_TRY
-    {
-      RtecScheduler::Scheduler_ptr server =
-	ACE_Scheduler_Factory::server ();
-
-      rt_info_ = 
-	server->create (my_name, ACE_TRY_ENV);
-      server->set (rt_info_,
-		   1, 1, 1, 0,
-		   RtecScheduler::VERY_LOW,
-		   RtecScheduler::NO_QUANTUM, 1,
-		   ACE_TRY_ENV);
-
-      // Create the event that we're registering for.
-      ACE_ConsumerQOS_Factory dependencies;
-      dependencies.start_disjunction_group ();
-      dependencies.insert_type (ACE_ES_EVENT_NOTIFICATION, rt_info_);
-      dependencies.insert_type (ACE_ES_EVENT_SHUTDOWN, rt_info_);
-
-      this->channel_admin_ = ec;
-
-      // = Connect as a consumer.
-      consumer_admin_ = 
-	RtecEventChannelAdmin::ConsumerAdmin::_duplicate(channel_admin_->for_consumers (ACE_TRY_ENV));
-      ACE_CHECK_ENV;
-      suppliers_ =
-	RtecEventChannelAdmin::ProxyPushSupplier::_duplicate(consumer_admin_->obtain_push_supplier (ACE_TRY_ENV));
-      ACE_CHECK_ENV;
-      suppliers_->connect_push_consumer (this,
-                                         dependencies.get_ConsumerQOS (),
-                                         ACE_TRY_ENV);
-      ACE_CHECK_ENV;
-    }
-  ACE_CATCH (const ACE_EventChannel::SUBSCRIPTION_ERROR, se)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "Latency_Consumer::open: "
-			 "subscribe failed.\n"), -1);
-    }
-  ACE_CATCHANY
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "Latency_Consumer::open: "
-			 "unexpected exception.\n"), -1);
-    }
-  ACE_ENDTRY;
-
-  return 0;
-}
-
-void
-Latency_Consumer::disconnect_push_consumer (CORBA::Environment &)
-{
-  ACE_DEBUG ((LM_DEBUG, "Consumer received disconnect from channel.\n"));
-}
-
-void 
-Latency_Consumer::push (const RtecEventComm::EventSet &events,
-                        CORBA::Environment &)
-{
-  ACE_DEBUG ((LM_DEBUG, "Latency_Consumer:push - "));
-  // @@ ACE_TIMEPROBE ("push event to consumer");
-  
-  global_profile_timer.stop ();
-  ACE_Profile_Timer::ACE_Elapsed_Time et;
-  if (global_profile_timer.elapsed_time (et) == -1)
-    {
-      ACE_ERROR ((LM_ERROR, "failure while measuring time\n"));
-    }
-  else
-    {
-      ACE_DEBUG ((LM_DEBUG,
-		  "RAW_TIME (real/user/system): %f %f %f", 
-		  et.real_time, et.user_time, et.system_time));
-    }
-
-  if (events.length () == 0)
-    {
-      ACE_DEBUG ((LM_DEBUG, "no events\n"));
-      return;
-    }
-  ACE_DEBUG ((LM_DEBUG, "%d event(s)\n", events.length ()));
-
-#if defined (quantify)
-  // If measuring jitter, just Quantify the supplier-consumer path.
-  if (measure_jitter)
-    {
-      quantify_stop_recording_data ();
-    }
-#endif /* quantify */
-
-  for (int i = 0; i < events.length (); ++i)
-    {
-      if (events[i].type_ == ACE_ES_EVENT_SHUTDOWN)
-	{
-	  ACE_DEBUG ((LM_DEBUG, "Latency Consumer: received shutdown event\n"));
-	  this->shutdown ();
-	}
-      else
-	{
-	  if (measure_jitter_)
-	    {
-	      const ACE_hrtime_t now = ACE_OS::gethrtime ();
-	      // Note: the division by 1 provides transparent support of
-	      // ACE_U_LongLong.
-	      ACE_Time_Value latency (now / 1000000000,
-				      (now / 1 % 1000000000) / 1000);
-	      latency -= ACE_Time_Value (events[0].time_ / 1000000000,
-					 (events[0].time_ / 1 % 1000000000) / 1000);
-
-	      if (! shutting_down)
-		{
-		  if (min_latency_ > latency) min_latency_ = latency;
-		  if (max_latency_ < latency) max_latency_ = latency;
-		  total_latency_ += latency;
-		  ++total_pushes_;
-		}
-	    }
-	}
-
-      // @@ ACE_TIMEPROBE_PRINT;
-    }
-}
-
-void
-Latency_Consumer::shutdown (void)
-{
-  ACE_DEBUG ((LM_DEBUG, "(%t) %s shutting down.\n", entry_point ()));
-
-  ACE_TRY
-    {
-      // Disconnect from the push supplier.
-      suppliers_->disconnect_push_supplier (ACE_TRY_ENV);
-      ACE_CHECK_ENV;
-
-      CORBA::release (suppliers_);
-
-      // @@ TODO: Do this portably (keeping the ORB_ptr returned from
-      // ORB_init)
-      TAO_ORB_Core_instance ()->orb ()->shutdown ();
-      ACE_DEBUG ((LM_DEBUG, "@@ we should shutdown here!!!\n"));
-      ACE_CHECK_ENV;
-    }
-  ACE_CATCHANY
-    {
-      ACE_ERROR ((LM_ERROR,
-                 "(%t) %s Latency_Consumer::shutdown: unexpected exception.\n",
-		  entry_point ()));
-    }
-  ACE_ENDTRY;
-}
-
-
-void
-Latency_Consumer::print_stats () /* const */
-{
-  if (measure_jitter_)
-    {
-      ACE_DEBUG ((LM_TRACE,
-                  "%s: minimum, maximum, average event latency (msec): "
-                    "%5.3f, %5.3f, %5.3f\n",
-                  entry_point (),
-                  (min_latency_.sec () * 1000000.0 + min_latency_.usec ()) /
-                    1000.0,
-                  (max_latency_.sec () * 1000000.0 + max_latency_.usec ()) /
-                    1000.0,
-                  (total_latency_.sec () * 1000000.0 +
-                   total_latency_.usec ()) / total_pushes_ / 1000.0));
-    }
-}
-
-
-// ************************************************************
-
-Latency_Supplier::Supplier::Supplier (Latency_Supplier* impl)
-  :  impl_ (impl)
-{
-}
-
-void Latency_Supplier::Supplier::disconnect_push_supplier
-  (CORBA::Environment &_env)
-{
-  this->impl_->disconnect_push_supplier (_env);
-}
-
-Latency_Supplier::Consumer::Consumer (Latency_Supplier* impl)
-  :  impl_ (impl)
-{
-}
-
-void Latency_Supplier::Consumer::disconnect_push_consumer
-  (CORBA::Environment &_env)
-{
-  this->impl_->disconnect_push_consumer (_env);
-}
-
-void Latency_Supplier::Consumer::push
-  (const RtecEventComm::EventSet &events,
-   CORBA::Environment &_env)
-{
-  this->impl_->push (events, _env);
-}
-
-// ************************************************************
-
-Latency_Supplier::Latency_Supplier (const u_int total_messages,
-				    CORBA::Long supplier_id,
-                                    const int timestamp)
-  : total_messages_ (total_messages),
-    supplier_id_ (supplier_id),
-    timestamp_ (timestamp),
-    total_sent_ (0),
-    master_ (0),
-    supplier_ (new Supplier (this)),
-    consumer_ (new Consumer (this))
-{
-  CORBA::Object::_duplicate (this->supplier_);
-  CORBA::Object::_duplicate (this->consumer_);
-}
-
-Latency_Supplier::~Latency_Supplier (void)
-{
-  CORBA::release (this->supplier_);
-  CORBA::release (this->consumer_);
-}
-
-int
-Latency_Supplier::open_supplier (RtecEventChannelAdmin::EventChannel_ptr ec,
-				 const char *name, int master)
-{
-  this->entry_point (name); 
-  master_ = master;
-  ACE_TRY
-    {
-      RtecScheduler::Scheduler_ptr server =
-	ACE_Scheduler_Factory::server ();
-
-      rt_info_ = 
-	server->create (name, ACE_TRY_ENV);
-      
-      server->set (rt_info_, 1, 1, 1, timeout_interval * 10000,
-		   RtecScheduler::VERY_LOW,
-		   RtecScheduler::NO_QUANTUM, 1,
-		   ACE_TRY_ENV);
-
-#if 0
-      SUPPLIER_NS::RegisterService
-        (entry_point (),
-         //      ACE_Naming::NOBJECT, 
-         NOBJECT, this);
-#endif /* 0 */
-
-      ACE_SupplierQOS_Factory publications;
-      publications.insert (supplier_id_,
-			   ACE_ES_EVENT_NOTIFICATION,
-			   rt_info_, 1);
-      publications.insert (supplier_id_,
-			   ACE_ES_EVENT_SHUTDOWN,
-			   rt_info_, 1);
-
-      this->channel_admin_ = ec;
-
-      // = Connect as a supplier.
-      supplier_admin_ =
-	RtecEventChannelAdmin::SupplierAdmin::_duplicate(channel_admin_->for_suppliers (ACE_TRY_ENV));
-      ACE_CHECK_ENV;
-      consumers_ =
-	RtecEventChannelAdmin::ProxyPushConsumer::_duplicate(supplier_admin_->obtain_push_consumer (ACE_TRY_ENV));
-      ACE_CHECK_ENV;
-
-      consumers_->connect_push_supplier (this->supplier_,
-                                         publications.get_SupplierQOS (),
-                                         ACE_TRY_ENV);
-      ACE_CHECK_ENV;
-    }
-  ACE_CATCHANY
-    {
-      ACE_TRY_ENV.print_exception ("Latency_Supplier::open");
-      return -1;
-    }
-  ACE_ENDTRY;
-
-  return 0;
-}
-
-void
-Latency_Supplier::disconnect_push_consumer (CORBA::Environment &)
-{
-  ACE_DEBUG ((LM_DEBUG, "Supplier-consumer received disconnect from channel.\n"));
-}
-
-void
-Latency_Supplier::disconnect_push_supplier (CORBA::Environment &)
-{
-  ACE_DEBUG ((LM_DEBUG, "Supplier received disconnect from channel.\n"));
-}
-
-int
-Latency_Supplier::start_generating_events (void)
-{
-  const ACE_hrtime_t now = ACE_OS::gethrtime ();
-  test_start_time_.set (now / 1000000000, (now / 1 % 1000000000) / 1000);
-
-  ACE_TRY
-    {
-      ACE_ConsumerQOS_Factory dependencies;
-      dependencies.start_disjunction_group ();
-      dependencies.insert_time (ACE_ES_EVENT_INTERVAL_TIMEOUT,
-				timeout_interval * 10000, 
-				rt_info_);
-      if (!master_)
-	dependencies.insert_type (ACE_ES_EVENT_SHUTDOWN, rt_info_);
-
-      // = Connect as a consumer.
-      consumer_admin_ = 
-	RtecEventChannelAdmin::ConsumerAdmin::_duplicate(channel_admin_->for_consumers (ACE_TRY_ENV));
-      ACE_CHECK_ENV;
-      suppliers_ =
-	RtecEventChannelAdmin::ProxyPushSupplier::_duplicate(consumer_admin_->obtain_push_supplier (ACE_TRY_ENV));
-      ACE_CHECK_ENV;
-
-      suppliers_->connect_push_consumer (this->consumer_,
-                                         dependencies.get_ConsumerQOS (),
-                                         ACE_TRY_ENV);
-      ACE_CHECK_ENV;
-    }
-  ACE_CATCHANY
-    {
-      ACE_ERROR_RETURN ((LM_ERROR, 
-                         "Latency_Supplier::generate_events:"
-                         " unexpected exception.\n"), -1);
-    }
-  ACE_ENDTRY;
-
-  return 0;
-}
-
-void 
-Latency_Supplier::push (const RtecEventComm::EventSet &events,
-			CORBA::Environment & _env)
-{
-  ACE_DEBUG ((LM_DEBUG, "Latency_Supplier::push - "));
-  
-  if (events.length () == 0)
-    {
-      ACE_DEBUG ((LM_DEBUG, "no events\n"));
-      return;
-    }
-
-  ACE_DEBUG ((LM_DEBUG, "%d event(s)\n", events.length ()));
-
-  for (int i = 0; i < events.length (); ++i)
-    {
-      if (!master_ && events[i].type_ == ACE_ES_EVENT_SHUTDOWN)
-	{
-	  ACE_DEBUG ((LM_DEBUG, "Latency Supplier: received shutdown event\n"));
-	  this->shutdown ();
-	}
-      else if (events[i].type_ == ACE_ES_EVENT_INTERVAL_TIMEOUT)
-	{
-	  // Create the event to send.
-	  RtecEventComm::Event event;
-	  event.source_ = supplier_id_;
-	  event.type_ = ACE_ES_EVENT_NOTIFICATION;
-	  ++total_sent_;
-
-	  if (timestamp_)
-	    {
-	      const ACE_hrtime_t now = ACE_OS::gethrtime ();
-	      // @@ David, time_ is now a long.  I'm not sure if this
-	      // calculation correct now.
-	      // event.time_.set (now / 1000000000, (now % 1000000000) / 1000);
-	      event.time_ = now;
-	    }
-
-	  // @@ ACE_TIMEPROBE_RESET;
-	  // @@ ACE_TIMEPROBE ("start with new event in Supplier");
-
-	  ACE_TRY
-	    {
-	      if (short_circuit_EC)
-		{
-		  for (u_int cons = 0; cons < consumers; ++cons)
-		    {
-		      global_profile_timer.start ();
-		      // This constructor is fast.
-		      const RtecEventComm::EventSet es (1, 1, &event);
-		      consumer [cons]->push (es, ACE_TRY_ENV);
-		    }
-		}
-	      else
-		{
-#if defined (quantify)
-		  // If measuring jitter, just Quantify the supplier-consumer path.
-		  if (measure_jitter)
-		    {
-		      quantify_start_recording_data ();
-		    }
-#endif /* quantify */
-
-		  // @@ ACE_TIMEPROBE ("time to read high-res clock and "
-		  // @@ "compare an int with 0");
-		  global_profile_timer.start ();
-
-		  RtecEventComm::EventSet events (1);
-		  events.length (1);
-		  events[0] = event;
-		  consumers_->push (events, ACE_TRY_ENV);
-		}
-	      ACE_CHECK_ENV;
-	    } 
-	  ACE_CATCH (RtecEventComm::Disconnected, d)
-	    {
-	      ACE_ERROR ((LM_ERROR, "(%t) Latency_Supplier::push: disconnected.\n"));
-	    }
-	  ACE_CATCHANY
-	    {
-	      ACE_ERROR ((LM_ERROR, "(%t) %s Latency_Supplier::push:"
-			  " unexpected exception.\n",
-			  entry_point ()));
-	    }
-	  ACE_ENDTRY;
-
-	  // Check if we're done.
-	  if (master_ && (total_sent_ >= total_messages_))
-	this->shutdown ();
-	}
-      else
-	{
-	  ACE_ERROR ((LM_ERROR, "(%t) %s received unexpected events: ", 
-		      entry_point ()));
-	  // ::dump_sequence (events);
-	  return;
-	}
-    }
-}
-
-void
-Latency_Supplier::shutdown (void)
-{
-  shutting_down = 1;
-
-  #if defined (quantify)
-    // Need to stop recording here even if testing for jitter, because
-    // recording is still probably enabled.
-    quantify_stop_recording_data ();
-    if (! measure_jitter)
-      {
-        ACE_DEBUG ((LM_DEBUG, "(%t) stopped Quantify recording\n"));
-      }
-  #endif /* quantify */
-
-  const ACE_hrtime_t now = ACE_OS::gethrtime ();
-  test_stop_time_.set (now / 1000000000, (now / 1 % 1000000000) / 1000);
-
-  static int total_iterations = 1;
-  if (--total_iterations > 0)
-    {
-      total_sent_ = 0;
-      return;
-    }
-
-  ACE_TRY
-    {
-      if (master_)
-	{
-	  // Create the shutdown message.
-	  RtecEventComm::Event event;
-	  event.source_ = supplier_id_;
-	  event.type_ = ACE_ES_EVENT_SHUTDOWN;
-
-	  // Push the shutdown event.
-	  RtecEventComm::EventSet events (1);
-	  events.length (1);
-	  events[0] = event;
-	  consumers_->push (events, ACE_TRY_ENV);
-	  ACE_CHECK_ENV;
-	}
-
-      // Disconnect from the channel.
-      consumers_->disconnect_push_consumer (ACE_TRY_ENV);
-      ACE_CHECK_ENV;
-
-      // Disconnect from the push supplier.
-      suppliers_->disconnect_push_supplier (ACE_TRY_ENV);
-      ACE_CHECK_ENV;
-
-      if (master_)
-	channel_admin_->destroy (ACE_TRY_ENV);
-      ACE_CHECK_ENV;
-    }
-  ACE_CATCHANY
-    {
-      ACE_ERROR ((LM_ERROR, "(%t) %s Latency_Supplier::shutdown:"
-                  " unexpected exception.\n",
-                  entry_point ()));
-      ACE_TRY_ENV.print_exception ("Latency_Supplier::shutdown");
-    }
-  ACE_ENDTRY;
-}
-
-
-void
-Latency_Supplier::print_stats () /* const */
-{
-  ACE_Time_Value test_elapsed_time (test_stop_time_ - test_start_time_);
-  const u_int elapsed = test_elapsed_time.sec () * 1000000 +
-                        test_elapsed_time.usec ();  // usec
-
-  ACE_DEBUG ((LM_TRACE,
-              "%s: delivered %u events to %u consumer(s) in %u msec;\n"
-                "        per-event average was %8.3f msec.\n",
-              entry_point (),
-              total_sent_,
-              consumers / suppliers + consumers % suppliers,
-              elapsed / 1000,
-              (double) elapsed / total_sent_ / 1000.0));
-}
-
-
-///////////////////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////////
-// function get_options
-///////////////////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////////
-static
-unsigned int
-get_options (int argc, char *argv [])
-{
-  ACE_Get_Opt get_opt (argc, argv, "Oc:djm:s:t:?");
-  int opt;
-  int temp;
-
-  while ((opt = get_opt ()) != EOF)
-  {
-    switch (opt) {
-    case 'c':
-      if ((temp = ACE_OS::atoi (get_opt.optarg)) > 0)
-        {
-          consumers = (u_int) temp;
-        }
-      else
-        {
-          cerr << argv [0] << ": number of consumers must be > 0" << endl;
-          return 1;
-        }
-      break;
-    case 'd':
-      short_circuit_EC = 1;
-      break;
-    case 'j':
-      measure_jitter = 1;
-      break;
-    case 'm':
-      if ((temp = ACE_OS::atoi (get_opt.optarg)) > 0)
-        {
-          total_messages = (u_int) temp;
-        }
-      else
-        {
-          cerr << argv [0] << ": count must be > 0" << endl;
-          return 1;
-        }
-      break;
-    case 's':
-      if ((temp = ACE_OS::atoi (get_opt.optarg)) > 0)
-        {
-          suppliers = (u_int) temp;
-        }
-      else
-        {
-          cerr << argv [0] << ": number of suppliers must be > 0" << endl;
-          return 1;
-        }
-      break;
-    case 't':
-      if (ACE_OS::atoi (get_opt.optarg) >= 0)
-        {
-          timeout_interval = ACE_OS::atoi (get_opt.optarg);
-        }
-      else
-        {
-          cerr << argv [0] << ": count must be >= 0" << endl;
-          return 1;
-        }
-      break;
-    case 'O':
-      // Ignore -O options those are used by the ORB....
-      break;
-    case '?':
-      cout << "usage: " << argv [0] << " " << usage << endl;
-      ACE_OS::exit (0);
-      break;
-    default:
-      cerr << argv [0] << ": unknown arg, " << (char) opt << endl;
-      cerr << "usage: " << argv [0] << " " << usage << endl;
-      return 1;
-    }
-  }
-
-  switch (argc - get_opt.optind) {
-  case 0:
-    // OK
-    break;
-  default:
-    cerr << argv [0] << ": too many arguments" << endl;
-    cerr << "usage: " << argv [0] << " " << usage << endl;
-    return 1;
-  }
-
-  return 0;
-}
-
-#if 0
-// ************************************************************
-// This function tells the scheduler to generate a schedule.  It will
-// only call it once, so this function can be called multiple times.
-static void
-Generate_Schedule (void)
-{
-  static int once = 0;
-  static ACE_Thread_Mutex m;
-
-  if (once == 0)
-    {
-      ACE_Guard<ACE_Thread_Mutex> ace_mon (m);
-
-      // Double-check.
-      if (once == 0)
-	{
-	  once = 1;
-	  ACE_Scheduler::status_t result = ACE_Scheduler::instance ().schedule ();
-
-	  if (result != ACE_Scheduler::SUCCEEDED)
-	    ACE_ERROR ((LM_ERROR, "ACE_Scheduler::schedule failed.\n"));
-	  else
-            {
-              if (Scheduler_Runtime::config ())
-                {
-	          ACE_DEBUG ((LM_ERROR, "ACE_Scheduler::schedule succeeded.\n"));
-                }
-            }
-	}
-    }
-}
-#endif /* 0 */
-
-///////////////////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////////
-// function main
-///////////////////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////////
-int
-main (int argc, char *argv [])
-{
-  if (ACE_OS::sched_params (
-        ACE_Sched_Params (
-          ACE_SCHED_FIFO,
-          ACE_Sched_Params::priority_min (ACE_SCHED_FIFO),
-          ACE_SCOPE_PROCESS)) != 0)
-    {
-      if (ACE_OS::last_error () == EPERM)
-        {
-          ACE_DEBUG ((LM_MAX, "Latency: user is not superuser, "
-                              "so remain in time-sharing class\n"));
-        }
-      else
-        {
-          ACE_DEBUG ((LM_ERROR, "%p\n", "Latency"));
-          ACE_OS::exit (-1);
-        }
-    }
-
-  u_int i;
-
-  ACE_TRY
-    {
-      // Initialize ORB.
-      CORBA::ORB_ptr orb = 
-	CORBA::ORB_init (argc, argv, "internet", ACE_TRY_ENV);
-      ACE_CHECK_ENV;
-
-      CORBA::POA_ptr poa =
-	orb->POA_init(argc, argv, "POA");
-
-      if (get_options (argc, argv))
-	ACE_OS::exit (-1);
-
-
-
-#if 0
-      CORBA::Object_ptr objref =
-	orb->resolve_initial_references ("NameService");
-      ACE_CHECK_ENV;
-      CosNaming::NamingContext_var naming_context = 
-        CosNaming::NamingContext::_narrow (objref, ACE_TRY_ENV);
-      ACE_CHECK_ENV;
-
-      ACE_Scheduler_Factory::use_config (naming_context);
-#else
-      ACE_Scheduler_Factory::use_config (orb);
-#endif /* 0 */
-
-      // Allocate the timeprobe instance now, so we don't measure
-      // the cost of doing it later.
-      // @@ ACE_TIMEPROBE_RESET;
-
-      RtecEventChannelAdmin::EventChannel_var ec =
-	RtecEventChannelAdmin::EventChannel::_narrow
-	  (orb->resolve_initial_references ("EventService"),
-	   ACE_TRY_ENV);
-      ACE_CHECK_ENV;
-
-      // Create supplier(s).
-      Latency_Supplier **supplier;
-      ACE_NEW_RETURN (supplier, Latency_Supplier *[suppliers], -1);
-      for (i = 0; i < suppliers; ++i)
-	{
-	  ACE_NEW_RETURN (supplier [i],
-			  Latency_Supplier (total_messages, measure_jitter),
-			  -1);
-	  char supplier_name [BUFSIZ];
-	  sprintf (supplier_name, "supplier-%d", i+1);
-	  if (supplier [i]->open_supplier (ec,
-					   supplier_name,
-					   int (i == 0)) == -1)
-	    ACE_ERROR_RETURN ((LM_ERROR, "Supplier open failed.\n"), -1);
-	}
-
-      // Create consumers.
-      ACE_NEW_RETURN (consumer, Latency_Consumer *[consumers], -1);
-      for (i = 0; i < consumers; ++i)
-	{
-	  ACE_NEW_RETURN (consumer [i], Latency_Consumer (measure_jitter), -1);
-	  RtecEventComm::PushConsumer::_duplicate (consumer[i]);
-	  char buf [BUFSIZ];
-	  sprintf (buf, "consumer-%d", i+1);
-
-	  if (consumer [i]->open_consumer (ec, buf) == -1)
-	    ACE_ERROR_RETURN ((LM_ERROR, "Someone was feeling introverted.\n"),
-			      -1);
-	}
-
-  #if defined (quantify)
-      if (! measure_jitter)
-	{
-	  ACE_DEBUG ((LM_DEBUG, "(%t) start Quantify recording\n"));
-	  quantify_start_recording_data ();
-	}
-  #endif /* quantify */
-
-      // Tell supplier(s) to generate events.
-      for (i = 0; i < suppliers; ++i)
-	{
-	  if (supplier [i]->start_generating_events () == -1)
-	    ACE_ERROR_RETURN ((LM_ERROR, "generate_events failed.\n"), -1);
-	}
-
-      orb->run ();
-
-      for (i = 0; i < suppliers; ++i)
-	{
-	  supplier [i]->print_stats ();
-	  delete supplier[i];
-	  ACE_CHECK_ENV;
-	}
-      delete [] supplier;
-
-      for (i = 0; i < consumers; ++i)
-	{
-	  consumer [i]->print_stats ();
-	  CORBA::release (consumer [i]);
-	  ACE_CHECK_ENV;
-	}
-      delete [] consumer;
-
-      // @@ ACE_TIMEPROBE_FINI;
-    }
-  ACE_CATCH (CORBA::SystemException, sys_ex)
-    {
-      ACE_TRY_ENV.print_exception ("SYS_EX");
-    }
-  ACE_ENDTRY;
-
-
-  return 0;
-}
diff --git a/TAO/local/tests/Latency.h b/TAO/local/tests/Latency.h
deleted file mode 100644
index 3cdef705d0b..00000000000
--- a/TAO/local/tests/Latency.h
+++ /dev/null
@@ -1,234 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-//
-// ============================================================================
-//
-// = LIBRARY
-//    ACE Event Service Benchmarks
-// 
-// = FILENAME
-//    Latency.h
-//
-// = AUTHOR
-//    David Levine (levine@cs.wustl.edu) and
-//    Tim Harrison (harrison@cs.wustl.edu)
-//
-// = DESCRIPTION
-//
-// ============================================================================
-
-#if !defined (LATENCY_H)
-#define LATENCY_H
-
-#include "ace/SString.h"
-#include "RtecEventChannelAdminC.h"
-#include "RtecEventCommS.h"
-
-class Latency_Consumer : public POA_RtecEventComm::PushConsumer
-// = TITLE
-//    Latency Consumer
-//
-// = DESCRIPTION
-//    Simple example of a consumer that registers for supplier
-//    notifications.
-{
-public:
-  Latency_Consumer (const int measure_jitter = 0);
-  // Construction.  The default of not measuring jitter provides
-  // a "null" push routine, for measuring aggregate timing.
-
-  int open_consumer (RtecEventChannelAdmin::EventChannel_ptr ec,
-		     const char *my_name);
-  // Uses the name server to obtain a reference to the <supplier_name>
-  // and registers with channel to receive notifications from the
-  // supplier.  Also registers to receive shutdown messages from the
-  // supplier.  Stores <my_name> for printing out messages.  Returns 0
-  // on success, -1 on failure.
-
-  virtual void disconnect_push_consumer (CORBA::Environment &);
-  // The channel is disconnecting.
-
-  void entry_point (const char*);
-  const char *entry_point () const;
-
-  void print_stats () /* const */;
-  // Print timing statistics.
-
-// (not protected to allow short-circuiting) protected:
-  virtual void push (const RtecEventComm::EventSet &events,
-		     CORBA::Environment &);
-  // If the <events>[0] is a notification, prints out the data from
-  // the supplier.  If its a shutdown message, the consumer
-  // disconnects from the channel.
-
-protected:
-  void shutdown (void);
-  // Disconnect from the Event Service.
-
-  // = Event channel adminstration references.
-  RtecEventChannelAdmin::EventChannel_var channel_admin_;
-  RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin_;
-  RtecEventChannelAdmin::ProxyPushSupplier_ptr suppliers_;
-
-private:
-  RtecScheduler::handle_t rt_info_;
-
-  int measure_jitter_;
-
-  ACE_Time_Value min_latency_;
-  ACE_Time_Value max_latency_;
-  ACE_Time_Value total_latency_;
-  u_long total_pushes_;
-  // Registers and counters for keeping track of latency statistics.
-
-  ACE_CString entry_point_;
-};
-
-// ************************************************************
-
-class Latency_Supplier
-// = TITLE
-//    Latency Supplier
-//
-// = DESCRIPTION
-//    Generates event nofications and a shutdown message.
-{
-public:
-
-  //
-  // This class provides IS-A Consumer and Supplier of events. But
-  // inheritance from two skeleton classes is non-complaint (or at
-  // least won't work with TAO). We use smaller implementation classes
-  // that delegate on Latency_Supplier to do the job.
-  //
-  class Supplier : public POA_RtecEventComm::PushSupplier {
-  public:
-    virtual void disconnect_push_supplier (CORBA::Environment &);
-    // The channel is disconnecting.
-
-  private:
-    Supplier (Latency_Supplier* impl);
-    friend class Latency_Supplier;
-
-  private:
-    Latency_Supplier* impl_;
-  };
-
-  class Consumer : public POA_RtecEventComm::PushConsumer {
-  public:
-    virtual void push (const RtecEventComm::EventSet &events,
-		       CORBA::Environment &);
-    // The channel pushed some events to us.
-
-    virtual void disconnect_push_consumer (CORBA::Environment &);
-    // The channel is disconnecting.
-
-  private:
-    Consumer (Latency_Supplier* impl);
-    friend class Latency_Supplier;
-
-  private:
-    Latency_Supplier* impl_;
-  };
-
-  Latency_Supplier (const u_int total_messages,
-		    CORBA::Long supplier_id,
-                    const int timestamp = 0);
-  // Construction.  Requires the total number of messages to be
-  // sent.  If the timestamp flag is enabled, then events are
-  // timestamped, e.g., for use in measuring jitter.
-
-  ~Latency_Supplier (void);
-  
-  int open_supplier (RtecEventChannelAdmin::EventChannel_ptr event_channel,
-		     const char *name, int master);
-  // Registers with the name server under the given <name>.  Also
-  // connects to the Event Channel as a supplier of notifications and
-  // shutdown messages.  If <master> != 0, then the supplier will
-  // destroy the channel upon shutting down. Returns 0 on success, -1
-  // on failure.
-
-  virtual void disconnect_push_supplier (CORBA::Environment &);
-  // The channel is disconnecting.
-
-  virtual void disconnect_push_consumer (CORBA::Environment &);
-  // The channel is disconnecting.
-
-  virtual void push (const RtecEventComm::EventSet &events,
-		     CORBA::Environment &);
-  // Takes a timestamp and then pushes event_ to all consumers, either
-  // directly, or via a channel.
-
-  int start_generating_events (void);
-  // Called when the supplier should start generating events.
-  // Registers with the Event Channel to receive timeouts every .25
-  // seconds.  Will generate some number of events and then send a
-  // shutdown message.  Returns 0 on success, -1 on failure.
-
-  void entry_point (const char *);
-  const char *entry_point () const;
-
-  void print_stats () /* const */;
-  // Print timing statistics.
-
-protected:
-
-  void shutdown (void);
-  // Disconnect from the Event Service.
-
-  // = Event Channel adminstration references.
-  RtecEventChannelAdmin::EventChannel_var channel_admin_;
-  RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin_;
-  RtecEventChannelAdmin::ProxyPushConsumer_var consumers_;
-  RtecEventChannelAdmin::SupplierAdmin_var supplier_admin_;
-  RtecEventChannelAdmin::ProxyPushSupplier_var suppliers_;
-
-private:
-  RtecScheduler::handle_t rt_info_;
-
-  u_int total_messages_;
-  // How many events to push before ending the test.
-
-  CORBA::Long supplier_id_;
-  // Our supplier ID.
-
-  int timestamp_;
-  // Flag indicating whether or not to timestamp outgoing events.
-
-  u_int total_sent_;
-  // How many events we've pushed.
-
-  ACE_Time_Value test_start_time_;
-  ACE_Time_Value test_stop_time_;
-  // Start/stop times, marking the time period when events are
-  // sent to consumers.
-
-  int master_;
-
-  ACE_CString entry_point_;
-
-  Supplier* supplier_;
-  Consumer* consumer_;
-};
-
-void Latency_Consumer::entry_point(const char* s)
-{
-  entry_point_ = s;
-}
-
-const char* Latency_Consumer::entry_point (void) const
-{
-  return entry_point_.fast_rep ();
-}
-
-void Latency_Supplier::entry_point(const char* s)
-{
-  entry_point_ = s;
-}
-
-const char* Latency_Supplier::entry_point (void) const
-{
-  return entry_point_.fast_rep ();
-}
-
-#endif /* LATENCY_H */
diff --git a/TAO/local/tests/Makefile b/TAO/local/tests/Makefile
deleted file mode 100644
index dc0bdba09a9..00000000000
--- a/TAO/local/tests/Makefile
+++ /dev/null
@@ -1,262 +0,0 @@
-#
-# $Id$
-#
-
-BIN = Latency # This is not compiling (yet) Utilization
-
-BUILD = $(BIN)
-
-LATENCY_SRCS= \
-	Latency.cpp
-UTILIZATION_SRCS= \
-	Utilization.cpp
-
-LSRC= \
-	$(LATENCY_SRCS) \
-	$(UTILIZATION_SRCS)
-
-LATENCY_OBJS = $(LATENCY_SRCS:.cpp=.o)
-UTILIZATION_OBJS = $(UTILIZATION_SRCS:.cpp=.o)
-
-LDLIBS= -lorbsvcs -lTAO
-
-#----------------------------------------------------------------------------
-#	Include macros and targets
-#----------------------------------------------------------------------------
-
-include	$(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-include	$(ACE_ROOT)/include/makeinclude/macros.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.common.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
-
-#### compiler-specific options
-ifeq ($(CXX),g++)
-  CCFLAGS += -pedantic
-else
-ifeq ($(CXX),CC)
-endif
-endif
-
-ifdef quantify
-  CCFLAGS += -Dquantify
-  CPPFLAGS += -I/pkg/purify/quantify-2.1-solaris2
-endif # quantify
-
-#### Local rules and variables...
-
-ifndef TAO_ROOT
-TAO_ROOT = $(ACE_ROOT)/TAO
-endif
-TSS_ORB_FLAG = #-DTAO_HAS_TSS_ORBCORE
-DCFLAGS = -g
-LDFLAGS += -L$(TAO_ROOT)/orbsvcs/lib -L$(TAO_ROOT)/tao
-CPPFLAGS += -I$(TAO_ROOT)/orbsvcs/lib -I$(TAO_ROOT) -I$(TAO_ROOT)/tao/compat $(TSS_ORB_FLAG)#-H
-
-# Leave the scheduler output out if this is a config run.
-ifneq ($(config),1)
-LATENCY_CONFIG_OBJS=Latency_Scheduler_Runtime.o
-UTILIZATION_CONFIG_OBJS=Latency_UTILIZATION_Runtime.o
-endif # config
-
-ifeq ($(probe),1)
-    CCFLAGS += -DACE_ENABLE_TIMEPROBES
-endif # probe
-
-Latency: $(addprefix $(VDIR),$(LATENCY_OBJS) $(LATENCY_CONFIG_OBJS))
-	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS)
-
-Utilization: $(addprefix $(VDIR),$(UTILIZATION_OBJS) $(UTILIZATION_CONFIG_OBJS))
-	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS)
-
-#----------------------------------------------------------------------------
-#	Dependencies
-#----------------------------------------------------------------------------
-
-# DO NOT DELETE THIS LINE -- g++dep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-
-.obj/Latency.o .shobj/Latency.: Latency.cpp \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/stdcpp.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Get_Opt.i \
- $(ACE_ROOT)/ace/Sched_Params.h \
- $(ACE_ROOT)/ace/Sched_Params.i \
- $(TAO_ROOT)/orbsvcs/lib/Event_Utilities.h \
- $(TAO_ROOT)/orbsvcs/lib/RtecEventChannelAdminC.h \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/Task_T.i \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Svc_Handler.i \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(TAO_ROOT)/tao/orbconf.h \
- $(TAO_ROOT)/tao/orb.h \
- $(TAO_ROOT)/tao/corbacom.h \
- $(TAO_ROOT)/tao/object.h \
- $(TAO_ROOT)/tao/align.h \
- $(TAO_ROOT)/tao/sequence.h \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/any.h \
- $(TAO_ROOT)/tao/poa.h \
- $(TAO_ROOT)/tao/tao_internals.h \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/client_factory.h \
- $(TAO_ROOT)/tao/server_factory.h \
- $(TAO_ROOT)/tao/default_client.h \
- $(TAO_ROOT)/tao/default_server.h \
- $(TAO_ROOT)/tao/except.h \
- $(TAO_ROOT)/tao/orbobj.h \
- $(TAO_ROOT)/tao/nvlist.h \
- $(TAO_ROOT)/tao/principa.h \
- $(TAO_ROOT)/tao/request.h \
- $(TAO_ROOT)/tao/svrrqst.h \
- $(TAO_ROOT)/tao/typecode.h \
- $(TAO_ROOT)/tao/marshal.h \
- $(TAO_ROOT)/tao/cdr.h \
- $(TAO_ROOT)/tao/stub.h \
- $(TAO_ROOT)/tao/connect.h \
- $(TAO_ROOT)/tao/orb_core.h \
- $(TAO_ROOT)/tao/objtable.h \
- $(TAO_ROOT)/tao/optable.h \
- $(TAO_ROOT)/tao/debug.h \
- $(TAO_ROOT)/tao/managed_types.h \
- $(TAO_ROOT)/tao/iiopobj.h \
- $(TAO_ROOT)/tao/iioporb.h \
- $(TAO_ROOT)/tao/giop.h \
- $(TAO_ROOT)/tao/orb_core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(TAO_ROOT)/tao/corbacom.i \
- $(TAO_ROOT)/tao/sequence.i \
- $(TAO_ROOT)/tao/typecode.i \
- $(TAO_ROOT)/tao/any.i \
- $(TAO_ROOT)/tao/cdr.i \
- $(TAO_ROOT)/tao/stub.i \
- $(TAO_ROOT)/tao/object.i \
- $(TAO_ROOT)/tao/orbobj.i \
- $(TAO_ROOT)/tao/marshal.i \
- $(TAO_ROOT)/tao/poa.i \
- $(TAO_ROOT)/tao/giop.i \
- $(TAO_ROOT)/tao/iioporb.i \
- $(TAO_ROOT)/tao/iiopobj.i \
- $(TAO_ROOT)/tao/managed_types.i \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/server_factory.i \
- $(TAO_ROOT)/tao/default_client.i \
- $(TAO_ROOT)/tao/default_server.i \
- $(TAO_ROOT)/tao/connect.i \
- $(TAO_ROOT)/tao/singletons.h \
- $(TAO_ROOT)/orbsvcs/lib/RtecEventCommC.h \
- $(TAO_ROOT)/orbsvcs/lib/RtecEventCommC.i \
- $(TAO_ROOT)/orbsvcs/lib/RtecSchedulerC.h \
- $(TAO_ROOT)/orbsvcs/lib/RtecSchedulerC.i \
- $(TAO_ROOT)/orbsvcs/lib/RtecEventChannelAdminC.i \
- $(TAO_ROOT)/orbsvcs/lib/Event_Service_Constants.h \
- $(TAO_ROOT)/orbsvcs/lib/Event_Utilities.i \
- $(TAO_ROOT)/orbsvcs/lib/Scheduler_Factory.h \
- $(TAO_ROOT)/orbsvcs/lib/CosNamingC.h \
- $(TAO_ROOT)/orbsvcs/lib/CosNamingC.i \
- $(TAO_ROOT)/orbsvcs/lib/Scheduler_Factory.i \
- Latency.h \
- $(TAO_ROOT)/orbsvcs/lib/RtecEventCommS.h \
- $(TAO_ROOT)/orbsvcs/lib/RtecEventCommS.i
-
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/local/tests/Utilization.cpp b/TAO/local/tests/Utilization.cpp
deleted file mode 100644
index 0b99257d5b4..00000000000
--- a/TAO/local/tests/Utilization.cpp
+++ /dev/null
@@ -1,871 +0,0 @@
-// $Id$
-
-#if defined (quantify)
-  #include <quantify.h>
-#endif /* quantify */
-#include <limits.h>
-
-#include "ace/Get_Opt.h"
-#include "ace/Sched_Params.h"
-
-#include "Event_Service_Constants.h"
-#include "Event_Utilities.h"
-#include "Utilization.h"
-
-static const char usage [] = "[-? |\n"
-                         "            [-c <consumers> [1]]\n"
-                         "            [-d directly connect all consumers/suppliers\n"
-                         "            [-j to collect jitter statistics]\n"
-                         "            [-m <count> of messages to send [10]]\n"
-                         "            [-s <suppliers>, [1]]\n"
-                         "            [-t <timeout interval>, msec [100]]]";
-
-// Configuration parameters.
-static u_int consumers = 1;
-static u_int suppliers = 1;
-static u_int total_messages = 10;
-static int measure_jitter = 0;
-static u_int timeout_interval = 100; // msec
-
-static int short_circuit_EC = 0;
-static int shutting_down = 0;
-
-// This is global to allow the Supplier to short ciruit the EC
-// and talk directly to consumers.  For testing only :-)
-static Utilization_Consumer **consumer;
-
-// Hold the Scavenger up until we're ready to run . . .
-ACE_Barrier start_scavenger (2);
-u_int started_scavenger = 0;
-
-// ************************************************************
-
-Utilization_Consumer::Utilization_Consumer (const int measure_jitter)
-  : measure_jitter_ (measure_jitter),
-    iterations_ (0),
-    min_utilization_ (INT_MAX),
-    max_utilization_ (INT_MIN),
-    total_utilization_ (0),
-    total_pushes_ (0)
-{
-}
-
-int
-Utilization_Consumer::open_consumer (const char *my_name, const char *)
-{
-  // We look up name for our qos requirements.
-  ACE_Scheduler::status_t result =
-    ACE_Scheduler::instance ().get_rt_info (my_name, rt_info_);
-
-  switch (result)
-    {
-    case ACE_Scheduler::SUCCEEDED :
-      // Found.
-      break;
-
-    case ACE_Scheduler::UNKNOWN_TASK :
-      rt_info_->set ((timeout_interval - 1) * 10000 /* 100 ns/msec */,
-                     (timeout_interval - 1) * 10000 /* 100 ns/msec */,
-                     (timeout_interval - 1) * 10000 /* 100 ns/msec */,
-                     0);
-
-      // Not found, but created.  We'll leave it blank for now.
-      break;
-
-    case ACE_Scheduler::FAILED :
-    default :
-      // Error.
-      ACE_ERROR_RETURN ((LM_ERROR, "Utilization_Consumer: get_rt_info failed.\n"), -1);
-    }
-
-  ACE_TRY
-    {
-      // Look up the event service in the name server.
-      channel_admin_ = EVENT_CHANNEL_NS::BindService ("Event Service");
-      if (channel_admin_ == 0)
-        {
-          ACE_ERROR ((LM_ERROR, "%p bind failed.\n", "Utilization_Consumer::open"));
-          return -1;
-        }
-
-      // Create the event that we're registering for.
-      ACE_ConsumerQOS_Factory dependencies;
-      dependencies.start_disjunction_group ();
-      dependencies.insert (ACE_ES_EVENT_NOTIFICATION, rt_info_);
-      dependencies.insert (ACE_ES_EVENT_SHUTDOWN, rt_info_);
-
-      // = Connect as a consumer.
-      consumer_admin_ = channel_admin_->for_consumers (ACE_TRY_ENV);
-      ACE_CHECK_ENV;
-      suppliers_ = consumer_admin_->obtain_push_supplier (ACE_TRY_ENV);
-      ACE_CHECK_ENV;
-      suppliers_->connect_push_consumer (this,
-                                         dependencies.get_ConsumerQOS (),
-                                         ACE_TRY_ENV);
-      ACE_CHECK_ENV;
-    }
-  ACE_CATCH (const ACE_EventChannel::SUBSCRIPTION_ERROR, se)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "Utilization_Consumer::open: subscribe failed.\n"), -1);
-    }
-  ACE_CATCHANY
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "Utilization_Consumer::open: unexpected exception.\n"), -1);
-    }
-  ACE_ENDTRY;
-
-  return 0;
-}
-
-void
-Utilization_Consumer::disconnect_push_consumer (CORBA::Environment &)
-{
-  ACE_DEBUG ((LM_DEBUG, "Consumer received disconnect from channel.\n"));
-}
-
-void 
-Utilization_Consumer::push (const CosEventComm::EventSet &events,
-                        CORBA::Environment &)
-{
-  ACE_TIMEPROBE ("push event to consumer");
-
-  #if defined (quantify)
-    // If measuring jitter, just Quantify the supplier-consumer path.
-    if (measure_jitter)
-      {
-        quantify_stop_recording_data ();
-      }
-  #endif /* quantify */
-
-  if (events[0].type_ == ACE_ES_EVENT_SHUTDOWN)
-    this->shutdown ();
-  else
-    {
-      if (measure_jitter_)
-        {
-          const ACE_hrtime_t now = ACE_OS::gethrtime ();
-          // Note: the division by 1 provides transparent support of
-          // ACE_U_LongLong.
-          ACE_Time_Value utilization (now / 1000000000,
-                                  (now / 1 % 1000000000) / 1000);
-          utilization -= ACE_Time_Value (events[0].time_ / 1000000000,
-                                     (events[0].time_ / 1 % 1000000000) / 1000);
-
-          if (! shutting_down)
-            {
-              if (min_utilization_ > utilization) min_utilization_ = utilization;
-              if (max_utilization_ < utilization) max_utilization_ = utilization;
-              total_utilization_ += utilization;
-              ++total_pushes_;
-            }
-        }
-
-      ACE_TIMEPROBE_PRINT;
-
-      // Chew up almost the entire timeout interval on the CPU.
-      u_long n = 1279ul;  /* takes about 40.2 usecs on a 167 MHz Ultra2 */
-
-      for (u_int i = 0; i < (timeout_interval * 1000 / 40.2); ++i)
-        {
-          ACE::is_prime (n,
-                         2ul /* min_factor */,
-                         n/2 /* max_factor */);
-          iterations_ += 1;      // ACE_U_LongLong doesn't have ++
-        }
-    }
-}
-
-void
-Utilization_Consumer::shutdown (void)
-{
-  ACE_DEBUG ((LM_DEBUG, "(%t) %s shutting down.\n", entry_point ()));
-
-  ACE_TRY
-    {
-      // Disconnect from the push supplier.
-      suppliers_->disconnect_push_supplier (ACE_TRY_ENV);
-      ACE_CHECK_ENV;
-    }
-  ACE_CATCHANY
-    {
-      ACE_ERROR ((LM_ERROR,
-                 "(%t) %s Utilization_Consumer::shutdown: unexpected exception.\n",
-                 entry_point ()));
-    }
-  ACE_ENDTRY;
-}
-
-
-void
-Utilization_Consumer::print_stats () /* const */
-{
-  if (measure_jitter_)
-    {
-      ACE_DEBUG ((LM_TRACE,
-                  "%s: minimum, maximum, average event utilization (msec): "
-                    "%5.3f, %5.3f, %5.3f\n",
-                  entry_point (),
-                  (min_utilization_.sec () * 1000000.0 + min_utilization_.usec ()) /
-                    1000.0,
-                  (max_utilization_.sec () * 1000000.0 + max_utilization_.usec ()) /
-                    1000.0,
-                  (total_utilization_.sec () * 1000000.0 +
-                   total_utilization_.usec ()) / total_pushes_ / 1000.0));
-    }
-  ACE_OS::fprintf (stderr, "Consumer processed %llu iterations\n",
-                   iterations_ / 1ul);
-}
-
-
-// ************************************************************
-
-Utilization_Supplier::Utilization_Supplier (const u_int total_messages,
-                                    const int timestamp)
-  : total_messages_ (total_messages),
-    timestamp_ (timestamp),
-    total_sent_ (0),
-    master_ (0)
-{
-}
-
-int
-Utilization_Supplier::open_supplier (const char *name, int master)
-{
-  master_ = master;
-
-  // We look up name for our qos requirements.
-  ACE_Scheduler::status_t result =
-    ACE_Scheduler::instance ().get_rt_info (name, rt_info_);
-
-  switch (result)
-    {
-    case ACE_Scheduler::SUCCEEDED :
-      // Found.
-      break;
-
-    case ACE_Scheduler::UNKNOWN_TASK :
-      // Not found, but created.  We want to be notified 4 times a second.
-      rt_info_->set (1,1,1, timeout_interval * 10000 /* 100 ns/msec */,
-		     ACE_Scheduler::RT_Info::VERY_LOW,
-		     ACE_Scheduler::RT_Info::NO_QUANTUM);
-      break;
-
-    case ACE_Scheduler::FAILED :
-    default :
-      // Error.
-      ACE_ERROR_RETURN ((LM_ERROR, "Utilization_Supplier: get_rt_info failed.\n"), -1);
-    }
-
-  ACE_TRY
-    {
-      SUPPLIER_NS::RegisterService
-        (entry_point (),
-         //      ACE_Naming::NOBJECT, 
-         NOBJECT, this);
-
-      // Look up the event service in the name server.
-      channel_admin_ = EVENT_CHANNEL_NS::BindService ("Event Service");
-      if (channel_admin_ == 0)
-        ACE_ERROR_RETURN ((LM_ERROR, "%p bind failed.\n",
-                           "Utilization_Supplier::open"), -1);
-
-      ACE_SupplierQOS_Factory publications;
-      publications.insert (ACE_ES_EVENT_NOTIFICATION, rt_info_, 1);
-      publications.insert (ACE_ES_EVENT_SHUTDOWN, rt_info_, 1);
-
-      // = Connect as a supplier.
-      supplier_admin_ = channel_admin_->for_suppliers (ACE_TRY_ENV);
-      ACE_CHECK_ENV;
-      consumers_ = supplier_admin_->obtain_push_consumer (ACE_TRY_ENV);
-      ACE_CHECK_ENV;
-      consumers_->connect_push_supplier (this,
-                                         publications.get_SupplierQOS (),
-                                         ACE_TRY_ENV);
-      ACE_CHECK_ENV;
-    }
-  ACE_CATCH (const ACE_EventChannel::SUBSCRIPTION_ERROR, se)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "Utilization_Supplier::open: subscribe failed.\n"), -1);
-    }
-  ACE_CATCHANY
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "Utilization_Supplier::open: unexpected exception.\n"), -1);
-    }
-  ACE_ENDTRY;
-
-  return 0;
-}
-
-void
-Utilization_Supplier::disconnect_push_consumer (CORBA::Environment &)
-{
-  ACE_DEBUG ((LM_DEBUG, "Supplier-consumer received disconnect from channel.\n"));
-}
-
-void
-Utilization_Supplier::disconnect_push_supplier (CORBA::Environment &)
-{
-  ACE_DEBUG ((LM_DEBUG, "Supplier received disconnect from channel.\n"));
-}
-
-int
-Utilization_Supplier::start_generating_events (void)
-{
-  const ACE_hrtime_t now = ACE_OS::gethrtime ();
-  test_start_time_.set (now / 1000000000, (now / 1 % 1000000000) / 1000);
-
-  ACE_TRY
-    {
-      ACE_ConsumerQOS_Factory dependencies;
-      dependencies.start_disjunction_group ();
-      dependencies.insert (ACE_ES_EVENT_INTERVAL_TIMEOUT,
-			   timeout_interval * 10000 /* 100 ns/msec */,
-			   rt_info_);
-      if (!master_)
-	dependencies.insert (ACE_ES_EVENT_SHUTDOWN, rt_info_);
-
-      // = Connect as a consumer.
-      consumer_admin_ = channel_admin_->for_consumers (ACE_TRY_ENV);
-      ACE_CHECK_ENV;
-      suppliers_ = consumer_admin_->obtain_push_supplier (ACE_TRY_ENV);
-      ACE_CHECK_ENV;
-      suppliers_->connect_push_consumer (this,
-                                         dependencies.get_ConsumerQOS (),
-                                         ACE_TRY_ENV);
-      ACE_CHECK_ENV;
-    }
-  ACE_CATCHANY
-    {
-      ACE_ERROR_RETURN ((LM_ERROR, 
-                         "Utilization_Supplier::generate_events:"
-                         " unexpected exception.\n"), -1);
-    }
-  ACE_ENDTRY;
-
-  return 0;
-}
-
-void 
-Utilization_Supplier::push (const CosEventComm::EventSet &events,
-			CORBA::Environment &)
-{
-  if (!master_ && events[0].type_ == ACE_ES_EVENT_SHUTDOWN)
-    this->shutdown ();
-  else if (events[0].type_ == ACE_ES_EVENT_INTERVAL_TIMEOUT)
-    {
-      // Create the event to send.
-      CosEventComm::Event event;
-      event.source_ = this;
-      event.type_ = ACE_ES_EVENT_NOTIFICATION;
-      ++total_sent_;
-
-      if ( ! started_scavenger )
-        {
-          started_scavenger = 1;
-
-          // Start the Scavenger.
-          start_scavenger.wait ();
-        }
-
-      if (timestamp_)
-	{
-	  const ACE_hrtime_t now = ACE_OS::gethrtime ();
-	  // David, time_ is now a long.  I'm not sure if this calculation correct now.
-	  //event.time_.set (now / 1000000000, (now % 1000000000) / 1000);
-	  event.time_ = now;
-	}
-
-      ACE_TIMEPROBE_RESET;
-      ACE_TIMEPROBE ("start with new event in Supplier");
-
-      ACE_TRY
-	{
-	  if (short_circuit_EC)
-	    {
-	      for (u_int cons = 0; cons < consumers; ++cons)
-		{
-		  // This constructor is fast.
-		  const CosEventComm::EventSet es (1, 1, &event);
-		  consumer [cons]->push (es, ACE_TRY_ENV);
-		}
-	    }
-	  else
-	    {
-#if defined (quantify)
-	      // If measuring jitter, just Quantify the supplier-consumer path.
-	      if (measure_jitter)
-		{
-		  quantify_start_recording_data ();
-		}
-#endif /* quantify */
-
-	      ACE_TIMEPROBE ("time to read high-res clock and "
-			     "compare an int with 0");
-	      consumers_->push (event, ACE_TRY_ENV);
-	    }
-	  ACE_CHECK_ENV;
-	} 
-      ACE_CATCH (CosEventComm::Disconnected, d)
-	{
-	  ACE_ERROR ((LM_ERROR, "(%t) Utilization_Supplier::push: disconnected.\n"));
-	}
-      ACE_CATCHANY
-	{
-	  ACE_ERROR ((LM_ERROR, "(%t) %s Utilization_Supplier::push:"
-		      " unexpected exception.\n",
-		      entry_point ()));
-	}
-      ACE_ENDTRY;
-
-      // Check if we're done.
-      if (master_ && (total_sent_ >= total_messages_))
-	this->shutdown ();
-    }
-  else
-    {
-      ACE_ERROR ((LM_ERROR, "(%t) %s received unexpected events: ", 
-                  entry_point ()));
-      ::dump_sequence (events);
-      return;
-    }
-}
-
-void
-Utilization_Supplier::shutdown (void)
-{
-  shutting_down = 1;
-
-  #if defined (quantify)
-    // Need to stop recording here even if testing for jitter, because
-    // recording is still probably enabled.
-    quantify_stop_recording_data ();
-    if (! measure_jitter)
-      {
-        ACE_DEBUG ((LM_DEBUG, "(%t) stopped Quantify recording\n"));
-      }
-  #endif /* quantify */
-
-  const ACE_hrtime_t now = ACE_OS::gethrtime ();
-  test_stop_time_.set (now / 1000000000, (now / 1 % 1000000000) / 1000);
-
-  static int total_iterations = 1;
-  if (--total_iterations > 0)
-    {
-      total_sent_ = 0;
-      return;
-    }
-
-  ACE_TRY
-    {
-      if (master_)
-	{
-	  // Create the shutdown message.
-	  CosEventComm::Event event;
-	  event.source_ = this;
-	  event.type_ = ACE_ES_EVENT_SHUTDOWN;
-
-	  // Push the shutdown event.
-	  consumers_->push (event, ACE_TRY_ENV);
-	  ACE_CHECK_ENV;
-	}
-
-      // Disconnect from the channel.
-      consumers_->disconnect_push_consumer (ACE_TRY_ENV);
-      ACE_CHECK_ENV;
-
-      // Disconnect from the push supplier.
-      suppliers_->disconnect_push_supplier (ACE_TRY_ENV);
-      ACE_CHECK_ENV;
-
-      if (master_)
-	channel_admin_->destroy (ACE_TRY_ENV);
-      ACE_CHECK_ENV;
-    }
-  ACE_CATCHANY
-    {
-      ACE_ERROR ((LM_ERROR, "(%t) %s Utilization_Supplier::shutdown:"
-                  " unexpected exception.\n",
-                  entry_point ()));
-    }
-  ACE_ENDTRY;
-}
-
-
-void
-Utilization_Supplier::print_stats () /* const */
-{
-  ACE_Time_Value test_elapsed_time (test_stop_time_ - test_start_time_);
-  const u_int elapsed = test_elapsed_time.sec () * 1000000 +
-                        test_elapsed_time.usec ();  // usec
-
-  ACE_DEBUG ((LM_TRACE,
-              "%s: delivered %u events to %u consumer(s) in %u msec;\n"
-                "        per-event average was %8.3f msec.\n",
-              entry_point (),
-              total_sent_,
-              consumers / suppliers + consumers % suppliers,
-              elapsed / 1000,
-              (double) elapsed / total_sent_ / 1000.0));
-}
-
-
-///////////////////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////////
-// class Scavenger
-///////////////////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////////
-Scavenger::Scavenger (const int priority)
-  : ACE_Task<ACE_NULL_SYNCH> (ACE_Thread_Manager::instance ()),
-    priority_ (priority),
-    iterations_ (0)
-{
-}
-
-Scavenger::~Scavenger ()
-{
-}
-
-int
-Scavenger::open (void *arg)
-{
-  ACE_UNUSED_ARG (arg);
-
-  long flags = THR_BOUND | THR_SCHED_FIFO;
-
-  // Become an active object.
-  if (this->activate (flags, 1, 0, this->priority_) == -1)
-    {
-      ACE_DEBUG ((LM_ERROR,
-                  "(%t) task activation at priority %d failed, exiting\n%a",
-                  priority_, -1));
-    }
-
-  return 0;
-}
-
-int
-Scavenger::svc (void)
-{
-  // Make sure that its thread has the proper priority.
-  ACE_hthread_t thr_handle;
-  ACE_Thread::self (thr_handle);
-  int prio;
-
-  if (ACE_Thread::getprio (thr_handle, prio) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "getprio failed"), -1);
-    }
-
-  ACE_DEBUG ((LM_DEBUG, "(%t) SCAVENGER prio = %d, priority_ = %d\n", 
-	      prio, this->priority_));
-
-  if (this->priority_ != prio)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR, "improper priority: %d\n", prio), -1);
-    }
-
-  // Wait here until the Consumer is running.
-  start_scavenger.wait ();
-
-  for (u_long i = 0;
-       ! shutting_down &&
-         i < timeout_interval * 1000 / 40.2 * total_messages * 3;
-       ++i)
-    {
-      u_long n = 1279ul;  /* takes about 40.2 usecs */
-      ACE::is_prime (n,
-                     2ul /* min_factor */,
-                     n/2 /* max_factor */);
-
-      iterations_ += 1;      // ACE_U_LongLong doesn't have ++
-    }
-
-  if (! shutting_down)
-    {
-      ACE_OS::fprintf (stderr, "Scavenger timed out!!!!\n");
-    }
-
-  return 0;
-}
-
-void
-Scavenger::print_status ()
-{
-  ACE_OS::fprintf (stderr, "Scavenger processed %llu iterations\n",
-                   iterations_ / 1ul);
-}
-
-
-///////////////////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////////
-// function get_options
-///////////////////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////////
-static
-unsigned int
-get_options (int argc, char *argv [])
-{
-  ACE_Get_Opt get_opt (argc, argv, "c:djm:s:t:?");
-  int opt;
-  int temp;
-
-  while ((opt = get_opt ()) != EOF)
-  {
-    switch (opt) {
-    case 'c':
-      if ((temp = ACE_OS::atoi (get_opt.optarg)) > 0)
-        {
-          consumers = (u_int) temp;
-        }
-      else
-        {
-          cerr << argv [0] << ": number of consumers must be > 0" << endl;
-          return 1;
-        }
-      break;
-    case 'd':
-      short_circuit_EC = 1;
-      break;
-    case 'j':
-      measure_jitter = 1;
-      break;
-    case 'm':
-      if ((temp = ACE_OS::atoi (get_opt.optarg)) > 0)
-        {
-          total_messages = (u_int) temp;
-        }
-      else
-        {
-          cerr << argv [0] << ": count must be > 0" << endl;
-          return 1;
-        }
-      break;
-    case 's':
-      if ((temp = ACE_OS::atoi (get_opt.optarg)) > 0)
-        {
-          suppliers = (u_int) temp;
-        }
-      else
-        {
-          cerr << argv [0] << ": number of suppliers must be > 0" << endl;
-          return 1;
-        }
-      break;
-    case 't':
-      if (ACE_OS::atoi (get_opt.optarg) >= 0)
-        {
-          timeout_interval = ACE_OS::atoi (get_opt.optarg);
-        }
-      else
-        {
-          cerr << argv [0] << ": count must be >= 0" << endl;
-          return 1;
-        }
-      break;
-    case '?':
-      cout << "usage: " << argv [0] << " " << usage << endl;
-      ACE_OS::exit (0);
-      break;
-    default:
-      cerr << argv [0] << ": unknown arg, " << (char) opt << endl;
-      cerr << "usage: " << argv [0] << " " << usage << endl;
-      return 1;
-    }
-  }
-
-  switch (argc - get_opt.optind) {
-  case 0:
-    // OK
-    break;
-  default:
-    cerr << argv [0] << ": too many arguments" << endl;
-    cerr << "usage: " << argv [0] << " " << usage << endl;
-    return 1;
-  }
-
-  return 0;
-}
-
-// ************************************************************
-// This function tells the scheduler to generate a schedule.  It will
-// only call it once, so this function can be called multiple times.
-static void
-Generate_Schedule (void)
-{
-  static int once = 0;
-  static ACE_Thread_Mutex m;
-
-  if (once == 0)
-    {
-      ACE_Guard<ACE_Thread_Mutex> ace_mon (m);
-
-      // Double-check.
-      if (once == 0)
-	{
-	  once = 1;
-	  ACE_Scheduler::status_t result = ACE_Scheduler::instance ().schedule ();
-
-	  if (result != ACE_Scheduler::SUCCEEDED)
-	    ACE_ERROR ((LM_ERROR, "ACE_Scheduler::schedule failed.\n"));
-	  else
-            {
-              if (Scheduler_Runtime::config ())
-                {
-	          ACE_DEBUG ((LM_ERROR, "ACE_Scheduler::schedule succeeded.\n"));
-                }
-            }
-	}
-    }
-}
-
-///////////////////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////////
-// function main
-///////////////////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////////
-int
-main (int argc, char *argv [])
-{
-  int min_priority = ACE_Sched_Params::priority_min (ACE_SCHED_FIFO,
-                                                     ACE_SCOPE_THREAD);
-
-  Scavenger scavenger (min_priority);
-
-  if (ACE_OS::sched_params (
-        ACE_Sched_Params (
-          ACE_SCHED_FIFO,
-          ACE_Sched_Params::next_priority (ACE_SCHED_FIFO,
-                                           min_priority,
-                                           ACE_SCOPE_PROCESS),
-          ACE_SCOPE_PROCESS)) != 0)
-    {
-      if (ACE_OS::last_error () == EPERM)
-        {
-          ACE_DEBUG ((LM_MAX, "Utilization: user is not superuser, "
-                              "so remain in time-sharing class\n"));
-        }
-      else
-        {
-          ACE_DEBUG ((LM_ERROR, "%p\n", "Utilization"));
-          ACE_OS::exit (-1);
-        }
-    }
-
-  u_int i;
-
-  if (get_options (argc, argv)) ACE_OS::exit (-1);
-
-  ACE_Scheduler::instance ().output_level (1);
-
-  // Allocate the timeprobe instance now, so we don't measure
-  // the cost of doing it later.
-  ACE_TIMEPROBE_RESET;
-
-  // Set the scheduler output name.
-  char *orb_argv[3] = { "main", "Scheduler_Utilization_Runtime.cpp", 0 };
-  int orb_argc = 3;
-
-  // Initialize ORB.
-  UPSingleProcessorOrb::ORB_init (orb_argc, orb_argv, "the_ORB");
-
-  // Register Event Service with Naming Service.
-  CosEventChannelAdmin::EventChannel_ptr ec;
-  ACE_NEW_RETURN (ec, ACE_EventChannel, -1);
-
-  EVENT_CHANNEL_NS::RegisterService ("Event Service", NOBJECT, ec);
-
-  // Create supplier(s).
-  Utilization_Supplier **supplier;
-  ACE_NEW_RETURN (supplier, Utilization_Supplier *[suppliers], -1);
-  for (i = 0; i < suppliers; ++i)
-   {
-     ACE_NEW_RETURN (supplier [i],
-                     Utilization_Supplier (total_messages, measure_jitter),
-                     -1);
-      char supplier_name [BUFSIZ];
-      sprintf (supplier_name, "supplier-%d", i+1);
-      if (supplier [i]->open_supplier (supplier_name, int (i == 0)) == -1)
-        ACE_ERROR_RETURN ((LM_ERROR, "Supplier open failed.\n"), -1);
-   }
-
-  // Create consumers.
-  ACE_NEW_RETURN (consumer, Utilization_Consumer *[consumers], -1);
-  for (i = 0; i < consumers; ++i)
-    {
-      ACE_NEW_RETURN (consumer [i], Utilization_Consumer (measure_jitter), -1);
-      char buf [BUFSIZ];
-      sprintf (buf, "consumer-%d", i+1);
-
-      if ((consumer [i]->open_consumer (buf,
-                               supplier [i % suppliers]->entry_point ()) ==
-           -1))
-        ACE_ERROR_RETURN ((LM_ERROR, "Someone was feeling introverted.\n"),
-                          -1);
-    }
-
-  #if defined (quantify)
-    if (! measure_jitter)
-      {
-        ACE_DEBUG ((LM_DEBUG, "(%t) start Quantify recording\n"));
-        quantify_start_recording_data ();
-      }
-  #endif /* quantify */
-
-  // Tell supplier(s) to generate events.
-  for (i = 0; i < suppliers; ++i)
-    {
-      if (supplier [i]->start_generating_events () == -1)
-        ACE_ERROR_RETURN ((LM_ERROR, "generate_events failed.\n"), -1);
-    }
-
-
-  scavenger.open ();
-
-  ACE_OS::sleep (1);
-
-  // Enter the main event loop.
-  UPSingleProcessorOrb::Instance ()->impl_is_ready ();
-
-  scavenger.print_status ();
-
-  // Graceful ORB shutdown.
-  UPSingleProcessorOrb::Instance ()->Close ();
-
-  ::Generate_Schedule ();
-
-  for (i = 0; i < suppliers; ++i)
-    {
-      supplier [i]->print_stats ();
-      delete supplier [i];
-    }
-  delete [] supplier;
-
-  for (i = 0; i < consumers; ++i)
-    {
-      consumer [i]->print_stats ();
-      delete consumer [i];
-    }
-  delete [] consumer;
-
-  delete ec;
-
-  ACE_TIMEPROBE_FINI;
-
-  return 0;
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-# if ! defined (__ACE_INLINE__)
-    template class UUORB_UtilitiesT<ACE_AbstractEventChannel>;
-    template class UUORB_UtilitiesT<ACE_AbstractPushSupplier>;
-# endif /* ! __ACE_INLINE_ */
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# if ! defined (__ACE_INLINE__)
-#   pragma instantiate UUORB_UtilitiesT<ACE_AbstractEventChannel>
-#   pragma instantiate UUORB_UtilitiesT<ACE_AbstractPushSupplier>
-# endif /* ! __ACE_INLINE_ */
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/local/tests/Utilization.h b/TAO/local/tests/Utilization.h
deleted file mode 100644
index b1394a1c975..00000000000
--- a/TAO/local/tests/Utilization.h
+++ /dev/null
@@ -1,182 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-//
-// ============================================================================
-//
-// = LIBRARY
-//    ACE Event Service Benchmarks
-// 
-// = FILENAME
-//    Utilization.h
-//
-// = AUTHOR
-//    David Levine (levine@cs.wustl.edu) and
-//    Tim Harrison (harrison@cs.wustl.edu)
-//
-// = DESCRIPTION
-//
-// ============================================================================
-
-#if !defined (UTILIZATION_H)
-#define UTILIZATION_H
-
-#include "RtecEvenCommS.h"
-
-class Utilization_Consumer : public POA_RtecEventComm::PushConsumer
-// = TITLE
-//    Utilization Consumer
-//
-// = DESCRIPTION
-//    Simple example of a consumer that registers for supplier
-//    notifications.
-{
-public:
-  Utilization_Consumer (const int measure_jitter = 0);
-  // Construction.  The default of not measuring jitter provides
-  // a "null" push routine, for measuring aggregate timing.
-
-  int open_consumer (const char *my_name, const char *supplier_name);
-  // Uses the name server to obtain a reference to the <supplier_name>
-  // and registers with channel to receive notifications from the
-  // supplier.  Also registers to receive shutdown messages from the
-  // supplier.  Stores <my_name> for printing out messages.  Returns 0
-  // on success, -1 on failure.
-
-  virtual void disconnect_push_consumer (CORBA::Environment &);
-  // The channel is disconnecting.
-
-  const char *entry_point () /* const */ { return rt_info_->entry_point (); }
-
-  void print_stats () /* const */;
-  // Print timing statistics.
-
-// (not protected to allow short-circuiting) protected:
-  virtual void push (const RtecEventComm::EventSet &events,
-		     CORBA::Environment &);
-  // If the <events>[0] is a notification, prints out the data from
-  // the supplier.  If its a shutdown message, the consumer
-  // disconnects from the channel.
-
-protected:
-  void shutdown (void);
-  // Disconnect from the Event Service.
-
-  // = Event channel adminstration references.
-  RtecEventChannelAdmin::EventChannel_ptr channel_admin_;
-  RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin_;
-  RtecEventChannelAdmin::ProxyPushSupplier_ptr suppliers_;
-
-private:
-  ACE_Scheduler::RT_Info* rt_info_;
-
-  int measure_jitter_;
-
-  ACE_hrtime_t iterations_;
-  ACE_Time_Value min_utilization_;
-  ACE_Time_Value max_utilization_;
-  ACE_Time_Value total_utilization_;
-  u_long total_pushes_;
-  // Registers and counters for keeping track of utilization statistics.
-};
-
-// ************************************************************
-
-class Utilization_Supplier : public POA_RtecEventComm::PushSupplier, public POA_RtecEventComm::PushConsumer
-// = TITLE
-//    Utilization Supplier
-//
-// = DESCRIPTION
-//    Generates event nofications and a shutdown message.
-{
-public:
-  Utilization_Supplier (const u_int total_messages,
-                    const int timestamp = 0);
-  // Construction.  Requires the total number of messages to be
-  // sent.  If the timestamp flag is enabled, then events are
-  // timestamped, e.g., for use in measuring jitter.
-  
-  int open_supplier (const char *name, int master);
-  // Registers with the name server under the given <name>.  Also
-  // connects to the Event Channel as a supplier of notifications and
-  // shutdown messages.  If <master> != 0, then the supplier will
-  // destroy the channel upon shutting down. Returns 0 on success, -1
-  // on failure.
-
-  virtual void disconnect_push_supplier (CORBA::Environment &);
-  // The channel is disconnecting.
-
-  virtual void disconnect_push_consumer (CORBA::Environment &);
-  // The channel is disconnecting.
-
-  int start_generating_events (void);
-  // Called when the supplier should start generating events.
-  // Registers with the Event Channel to receive timeouts every .25
-  // seconds.  Will generate some number of events and then send a
-  // shutdown message.  Returns 0 on success, -1 on failure.
-
-  const char *entry_point () /* const */ { return rt_info_->entry_point (); }
-
-  void print_stats () /* const */;
-  // Print timing statistics.
-
-protected:
-  void push (const RtecEventComm::EventSet &events,
-	     CORBA::Environment &);
-  // Takes a timestamp and then pushes event_ to all consumers, either
-  // directly, or via a channel.
-
-  void shutdown (void);
-  // Disconnect from the Event Service.
-
-  // = Event Channel adminstration references.
-  RtecEventChannelAdmin::EventChannel_ptr channel_admin_;
-  RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin_;
-  RtecEventChannelAdmin::ProxyPushConsumer_ptr consumers_;
-  RtecEventChannelAdmin::SupplierAdmin_ptr supplier_admin_;
-  RtecEventChannelAdmin::ProxyPushSupplier_ptr suppliers_;
-
-private:
-  ACE_Scheduler::RT_Info_ptr rt_info_;
-
-  u_int total_messages_;
-  // How many events to push before ending the test.
-
-  int timestamp_;
-  // Flag indicating whether or not to timestamp outgoing events.
-
-  u_int total_sent_;
-  // How many events we've pushed.
-
-  ACE_Time_Value test_start_time_;
-  ACE_Time_Value test_stop_time_;
-  // Start/stop times, marking the time period when events are
-  // sent to consumers.
-
-  int master_;
-};
-
-
-class Scavenger : public ACE_Task<ACE_NULL_SYNCH>
-// = TITLE
-//    Scavenger
-//
-// = DESCRIPTION
-//    Soaks up all unused CPU cycles.
-{
-public:
-  Scavenger (const int priority);
-  virtual ~Scavenger ();
-
-  int open (void *);
-  int svc (void);
-  void print_status ();
-
-private:
-  int priority_;
-  ACE_hrtime_t iterations_;
-
-  // not implemented . . .
-  Scavenger ();
-};
-
-#endif /* UTILIZATION_H */
diff --git a/TAO/orbsvcs/Makefile b/TAO/orbsvcs/Makefile
deleted file mode 100644
index b7b989aa0f4..00000000000
--- a/TAO/orbsvcs/Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
-#----------------------------------------------------------------------------
-#
-# $Id$
-#
-#----------------------------------------------------------------------------
-
-#----------------------------------------------------------------------------
-#	Local macros
-#----------------------------------------------------------------------------
-
-DIRS  =	lib \
-	bin \
-	tests
-
-#----------------------------------------------------------------------------
-#	Include macros and targets
-#----------------------------------------------------------------------------
-
-include	$(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-include	$(ACE_ROOT)/include/makeinclude/macros.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.common.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.nested.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.nolocal.GNU
-
diff --git a/TAO/orbsvcs/bin/Makefile b/TAO/orbsvcs/bin/Makefile
deleted file mode 100644
index e84d47d9556..00000000000
--- a/TAO/orbsvcs/bin/Makefile
+++ /dev/null
@@ -1,22 +0,0 @@
-#----------------------------------------------------------------------------
-#
-# $Id$
-#
-#----------------------------------------------------------------------------
-
-#----------------------------------------------------------------------------
-#	Local macros
-#----------------------------------------------------------------------------
-
-DIRS  =	Naming_Service
-
-#----------------------------------------------------------------------------
-#	Include macros and targets
-#----------------------------------------------------------------------------
-
-include	$(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-include	$(ACE_ROOT)/include/makeinclude/macros.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.common.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.nested.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.nolocal.GNU
-
diff --git a/TAO/orbsvcs/bin/Naming_Service/CosNaming_i.cpp b/TAO/orbsvcs/bin/Naming_Service/CosNaming_i.cpp
deleted file mode 100644
index ec07e685a33..00000000000
--- a/TAO/orbsvcs/bin/Naming_Service/CosNaming_i.cpp
+++ /dev/null
@@ -1,618 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    cos
-// 
-// = FILENAME
-//   CosNaming_i.cpp
-//
-// = AUTHOR
-//    Marina Spivak <marina@cs.wustl.edu> &
-//    Sergio Flores-Gaitan <sergio@cs.wustl.edu>
-// 
-// ============================================================================
-
-#include "CosNaming_i.h"
-
-NS_NamingContext::NS_NamingContext (void)
-  :POA_CosNaming::NamingContext ("naming_context")
-{
-  if (context_.open (NS_MAP_SIZE) == -1)
-    ACE_ERROR ((LM_ERROR, "%p\n", "NS_NamingContext"));
-  // deal with fault
-}
-
-NS_NamingContext::~NS_NamingContext (void)
-{
-}
-
-CosNaming::NamingContext_ptr 
-NS_NamingContext::get_context (const CosNaming::Name &name)
-{
-  // create compound name to be resolved
-  // (<name> - last component)
-  CORBA::Environment IT_env;
-  CORBA::ULong len = name.length ();
-  CosNaming::Name comp_name (name);
-  comp_name.length (len - 1);
-  
-  // resolve
-  CORBA::Object_ptr cont_ref;
-
-  cont_ref = resolve (comp_name, IT_env);
-
-  // Deal with exceptions in resolve: basicly, add the last component
-  // of the name to <rest_of_name> and rethrow.
-  if (IT_env.exception () != 0)
-    {
-      IT_env.print_exception ("NS_NamingContext::get_context");
-      return 0;
-    } 
-  
-  // Reference to a context from <resolve> cannot be nil because
-  // cannot <bind> to a nil object.
-   
-  // Try narrowing object reference to a context type.
-  CosNaming::NamingContext_ptr c;
-  c = CosNaming::NamingContext::_narrow (cont_ref, IT_env);
-  if (IT_env.exception () != 0)
-    {
-      IT_env.print_exception ("NS_NamingContext::get_context - _narrow");
-      return 0;
-    }
-
-  CosNaming::Name rest;
-  rest.length (2);
-  rest[0] = name[len - 2];
-  rest[1] = name[len - 1];
-   
-  if (CORBA::is_nil (c))
-    {
-      CosNaming::Name rest;
-      rest.length (2);
-      rest[0] = name[len - 2];
-      rest[1] = name[len - 1];
-    }
-  return c;
-}
-
-void 
-NS_NamingContext::bind (const CosNaming::Name& n, 
-			CORBA::Object_ptr obj, 
-			CORBA::Environment &IT_env) 
-{
-  IT_env.clear ();
-
-  // get the length of the name
-  CORBA::ULong len = n.length ();   
-
-  // Check for invalid name.
-  if (len == 0) 
-    {
-      IT_env.clear ();
-      IT_env.exception (new CORBA::UNKNOWN (CORBA::COMPLETED_NO));
-      //      IT_env.exception (new ACE_NESTED_CLASS (CosNaming,NamingContext)::InvalidName);
-      return;
-    }
-    /* @@ *///    throw CosNaming::NamingContext::InvalidName ();
-
-  // If we received compound name, resolve it to get the context in
-  // which the binding should take place, then perform the binding on
-  // target context.
-  if (len > 1) 
-    {
-      CosNaming::NamingContext_var cont = get_context (n);
-      CosNaming::Name simple_name;
-      simple_name.length (1);
-      simple_name[0] = n[len - 1];
-      cont->bind (simple_name, obj, IT_env);
-    }
-
-  // If we received a simple name, we need to bind it in this context.
- else 
-    {
-      NS_IntId entry (obj);
-      NS_ExtId name (n[0].id, n[0].kind);
-
-      // Try binding the name.
-      if (context_.bind (name, entry) == -1)
-	{
-	  IT_env.clear ();
-      IT_env.exception (new CORBA::UNKNOWN (CORBA::COMPLETED_NO));
-      //	  IT_env.exception (new ACE_NESTED_CLASS (CosNaming,NamingContext)::AlreadyBound);
-	  return;
-	}
-        /**///	throw CosNaming::NamingContext::AlreadyBound ();
-      // May need to add case dealing with -1. (Maybe throw cannot
-      // proceed).
-    }
-}
-
-void 
-NS_NamingContext::rebind (const CosNaming::Name& n, 
-			  CORBA::Object_ptr obj, 
-			  CORBA::Environment &IT_env)    
-{ 
-  // get the length of the name
-  CORBA::ULong len = n.length ();
-
-  // check for invalid name.
-  if (len == 0)
-    {
-      IT_env.clear ();
-      IT_env.exception (new CORBA::UNKNOWN (CORBA::COMPLETED_NO));
-      //      IT_env.exception (new ACE_NESTED_CLASS (CosNaming,NamingContext)::InvalidName);
-      return;
-    }
-    /* @@ *///    throw CosNaming::NamingContext::InvalidName ();
-
-  // If we received compound name, resolve it to get the context in
-  // which the rebinding should take place, then perform the rebinding
-  // on target context.
-  if (len > 1) 
-    {
-      CosNaming::NamingContext_var cont = get_context (n);
-      CosNaming::Name simple_name;
-      simple_name.length (1);
-      simple_name[0] = n[len - 1];
-      cont->rebind (simple_name, obj, IT_env);
-    }
-  // If we received a simple name, we need to rebind it in this context.
-  else 
-    {
-      NS_IntId entry (obj);
-      NS_ExtId name (n[0].id, n[0].kind);
-      NS_IntId oldentry;
-      NS_ExtId oldname;
-      
-      // Try rebinding the name.
-      if (context_.rebind (name, entry, oldname, oldentry) == -1)
-	;
-	// Deal with consequences.
-    }
-}
-
-void
-NS_NamingContext::bind_context (const CosNaming::Name &n, 
-				CosNaming::NamingContext_ptr nc, 
-				CORBA::Environment &IT_env) 
-{
-  // Get the length of the name.
-  CORBA::ULong len = n.length ();
-
-  // Check for invalid name.
-  if (len == 0)
-    {
-      IT_env.clear ();
-      IT_env.exception (new CORBA::UNKNOWN (CORBA::COMPLETED_NO));
-      //      IT_env.exception (new ACE_NESTED_CLASS (CosNaming,NamingContext)::InvalidName);
-      return;
-    }
-    /* @@ *///    throw CosNaming::NamingContext::InvalidName ();
-
-  // If we received compound name, resolve it to get the context in
-  // which the binding should take place, then perform the binding on
-  // target context.
-  if (len > 1) 
-    {
-      CosNaming::NamingContext_var cont = get_context (n);
-      CosNaming::Name simple_name;
-      simple_name.length (1);
-      simple_name[0] = n[len - 1];
-      cont->bind_context (simple_name, nc, IT_env);
-    }
-
-  // If we received a simple name, we need to bind it in this context.
-  else 
-    {
-      CosNaming::NameComponent comp = n[0];
-      NS_IntId entry (nc, CosNaming::ncontext);
-      NS_ExtId name (n[0].id, n[0].kind);
-
-      // Try binding the name.
-      if (context_.bind (name, entry) == 1)
-	{
-	  IT_env.clear ();
-      IT_env.exception (new CORBA::UNKNOWN (CORBA::COMPLETED_NO));
-      //	  IT_env.exception (new ACE_NESTED_CLASS (CosNaming,NamingContext)::AlreadyBound);
-	  return;
-	}
-	/* @@ *///	throw CosNaming::NamingContext::AlreadyBound ();
-      // May need to add case dealing with -1.
-    }
-}
-
-void 
-NS_NamingContext::rebind_context (const CosNaming::Name &n, 
-				  CosNaming::NamingContext_ptr nc, 
-				  CORBA::Environment &IT_env) 
-{
-  // Get the length of the name.
-  CORBA::ULong len = n.length ();
-
-  // Check for invalid name.
-  if (len == 0)
-    {
-      IT_env.clear ();
-      IT_env.exception (new CORBA::UNKNOWN (CORBA::COMPLETED_NO));
-      //      IT_env.exception (new ACE_NESTED_CLASS (CosNaming,NamingContext)::InvalidName);
-      return;
-    }
-    /* @@ *///    throw CosNaming::NamingContext::InvalidName ();
-
-  // If we received compound name, resolve it to get the context in
-  // which the rebinding should take place, then perform the rebinding
-  // on target context.
-  if (len > 1) 
-    {
-      CosNaming::NamingContext_var cont = get_context (n);
-      CosNaming::Name simple_name;
-      simple_name.length (1);
-      simple_name[0] = n[len - 1];
-      cont->rebind_context (simple_name, nc, IT_env);
-    }
-
-  // if we received a simple name, we need to rebind it in this context.
-  else 
-    {
-      CosNaming::NameComponent comp = n[0];
-      NS_IntId entry (nc, CosNaming::ncontext);
-      NS_ExtId name (n[0].id, n[0].kind);
-      NS_IntId oldentry;
-      NS_ExtId oldname;
-      
-      // try rebinding the name.
-      if (context_.rebind (name, entry, oldname, oldentry) < 0);
-	// deal with consequences
-    }
-}
-    
-CORBA::Object_ptr 
-NS_NamingContext::resolve (const CosNaming::Name& n, 
-				       CORBA::Environment &IT_env) 
-{
-  // get the length of the name
-  CORBA::ULong len = n.length ();
-
-  // check for invalid name.
-  if (len == 0)
-    {
-      IT_env.clear ();
-      //      IT_env.exception (new ACE_NESTED_CLASS (CosNaming,NamingContext)::InvalidName);
-      IT_env.exception (new CORBA::UNKNOWN (CORBA::COMPLETED_NO));
-      return 0;
-    }
-  /* @@ *////    throw CosNaming::NamingContext::InvalidName ();
-  
-  // resolve the first component of the name
-  NS_ExtId name (n[0].id, n[0].kind);
-  NS_IntId entry;
-  if (context_.find (name, entry) == -1) 
-    {
-      IT_env.clear ();
-      //      IT_env.exception (new ACE_NESTED_CLASS (CosNaming,NamingContext)::NotFound (CosNaming::NamingContext::not_object, n));
-      IT_env.exception (new CORBA::UNKNOWN (CORBA::COMPLETED_NO));
-      return 0;
-    }
-  /* @@ *///    throw CosNaming::NamingContext::NotFound (CosNaming::NamingContext::not_object, n);
-  
-  CORBA::Object_ptr item = entry.ref_;
-
-  // if the name we have to resolve is a compound name
-  // we need to recursively resolve it.
-  if (len > 1)
-    {
-      CosNaming::NamingContext_var cont;
-      if (entry.type_ == CosNaming::ncontext)
-	{
-	  cont = CosNaming::NamingContext::_narrow (item, IT_env);
-	  if (IT_env.exception () != 0)
-	    {
-	      IT_env.print_exception ("NS_NamingContext::resolve");
-	      return 0;
-	    }
-	}
-      else
-	{
-	  IT_env.clear ();
-      IT_env.exception (new CORBA::UNKNOWN (CORBA::COMPLETED_NO));
-      //	  IT_env.exception (new ACE_NESTED_CLASS (CosNaming,NamingContext)::NotFound (CosNaming::NamingContext::not_context, n));
-	  return 0;
-	}
-      /* @@ *///	throw CosNaming::NamingContext::NotFound (CosNaming::NamingContext::not_context, n);
-      
-      CosNaming::Name rest_of_name;
-      rest_of_name.length (len - 1);
-      for (CORBA::ULong i = 1; i < len; i++)
-	rest_of_name[i-1] = n[i];
-
-      return (cont->resolve (rest_of_name, IT_env));
-    }
-
-  // if the name we had to resolve was simple, we just need
-  // to return the result.
-  return (item->_duplicate (item));
-}
-
-void 
-NS_NamingContext::unbind (const CosNaming::Name& n, 
-			  CORBA::Environment &IT_env) 
-{
-  // if (do_operation (n, CORBA::_nil (), NS_NamingContext::unbind) == 0)
-
-  // get the length of the name
-  CORBA::ULong len = n.length ();
-
-  // check for invalid name.
-  if (len == 0)
-    {
-      IT_env.clear ();
-      IT_env.exception (new CORBA::UNKNOWN (CORBA::COMPLETED_NO));
-      //      IT_env.exception (new ACE_NESTED_CLASS (CosNaming,NamingContext)::InvalidName);
-      return;
-    }
-    /* @@ *////    throw CosNaming::NamingContext::InvalidName ();
-
-  // If we received compound name, resolve it to get the context in
-  // which the unbinding should take place, then perform the unbinding
-  // on target context.
-  if (len > 1) 
-    {
-      CosNaming::NamingContext_var cont = get_context (n);
-      CosNaming::Name simple_name;
-      simple_name.length (1);
-      simple_name[0] = n[len - 1];
-      cont->unbind (simple_name, IT_env);
-    }
-  else
-  // If we received a simple name, we need to unbind it in this
-  // context.
-    {
-      NS_ExtId name (n[0].id, n[0].kind);
-      // try unbinding the name.
-      if (context_.unbind (name) == -1)
-	{
-	  IT_env.clear ();
-      IT_env.exception (new CORBA::UNKNOWN (CORBA::COMPLETED_NO));
-      //	  IT_env.exception (new ACE_NESTED_CLASS (CosNaming,NamingContext)::NotFound (CosNaming::NamingContext::not_object, n));
-	  return;
-	}
-	/* @@ *///	throw CosNaming::NamingContext::NotFound (CosNaming::NamingContext::not_object, n);
-    }
-}
-    
-CosNaming::NamingContext_ptr 
-NS_NamingContext::new_context (CORBA::Environment &IT_env) 
-{
-  // Macro to avoid "warning: unused parameter" type warning.
-  ACE_UNUSED_ARG (IT_env); 
-
-  NS_NamingContext *c = new NS_NamingContext;
-  //  CosNaming::NamingContext_ptr cont 
-  //= new TIE_CosNaming_NamingContext (NS_NamingContext) (c);
-
-  //  c->initialize (cont);
-
-  return c->_duplicate (c);
-}
-    
-CosNaming::NamingContext_ptr 
-NS_NamingContext::bind_new_context (const CosNaming::Name& n, 
-						CORBA::Environment &IT_env) 
-{
-  NS_NamingContext *c = new NS_NamingContext;
-  //  CosNaming::NamingContext_ptr cont = 
-  // new TIE_CosNaming_NamingContext (NS_NamingContext) (c);
-  
-  //  c->initialize (cont);
-
-      bind_context (n, c, IT_env);
-      CORBA::release (c);
-      CORBA::release (c);
-      CORBA::release (c);
-      CORBA::release (c);
-
-  return c->_duplicate (c);
-}
-    
-void 
-NS_NamingContext::destroy (CORBA::Environment &IT_env) 
-{
-  // Macro to avoid "warning: unused parameter" type warning.
-  ACE_UNUSED_ARG (IT_env); 
-
-  if (context_.current_size () != 0)
-    {
-      IT_env.clear ();
-      IT_env.exception (new CORBA::UNKNOWN (CORBA::COMPLETED_NO));
-      //      IT_env.exception (new ACE_NESTED_CLASS (CosNaming,NamingContext)::NotEmpty);
-      return;
-    }
-    /* @@ *///    throw CosNaming::NamingContext::NotEmpty ();
-
-  // destroy context
-  CORBA::release (tie_ref_);
-}
-    
-void 
-NS_NamingContext::list (CORBA::ULong how_many, 
-			CosNaming::BindingList_out bl, 
-			CosNaming::BindingIterator_out bi, 
-			CORBA::Environment &IT_env) 
-{
-  // Macro to avoid "warning: unused parameter" type warning.
-  ACE_UNUSED_ARG (IT_env); 
-
-  // Dynamically allocate hash map iterator.
-  NS_NamingContext::HASH_MAP::ITERATOR *hash_iter = 
-    new NS_NamingContext::HASH_MAP::ITERATOR (context_);
-
-  // Number of bindings that will go into the BindingList.
-  CORBA::ULong n;
-
-  if (context_.current_size () > how_many)
-    // number of bindings in the context is > <how_many>
-    // so need to return a BindingIterator.
-     {
-       NS_BindingIterator *bind_iter = new NS_BindingIterator (hash_iter);
-       
-       ACE_UNUSED_ARG (bind_iter);
-	 
-       //  bind_iter->initialize (bi); 
-       bi->_duplicate (bi);
-       
-       n = how_many;
-    }
-  else
-    {
-      // Number of bindings in the context is <= <how_many>,
-      // so do not need to return a BindingIterator.
-      bi = CosNaming::BindingIterator::_nil (); 
-      n = context_.current_size ();
-    }     
-
-  // use hash iterator to populate a BindingList with
-  // bindings.
-  CosNaming::BindingList bindings;
-  bindings.length (n); 
-  NS_NamingContext::HASH_MAP::ENTRY *hash_entry;
-
-  for (CORBA::ULong i = 0; i < n; i++) 
-    {
-      hash_iter->next (hash_entry);
-      hash_iter->advance ();
-      
-      bindings[i].binding_type = hash_entry->int_id_.type_;
-      
-      bindings[i].binding_name.length (1); 
-      bindings[i].binding_name[0].id =
-	CORBA::string_dup (hash_entry->ext_id_.id_.fast_rep ());
-      bindings[i].binding_name[0].kind =
-	CORBA::string_dup (hash_entry->ext_id_.kind_.fast_rep ());
-    }
-  // Marina, please add check for memory failure.
-  bl = new CosNaming::BindingList (bindings);
-
-  // If did not allocate BindingIterator, deallocate hash map
-  // iterator.
-  if (context_.current_size () <= how_many)
-    delete hash_iter;
-}
-  
-NS_BindingIterator::NS_BindingIterator (NS_NamingContext::HASH_MAP::ITERATOR *hash_iter)
-{
-  hash_iter_ = hash_iter;
-}
- 
-NS_BindingIterator::~NS_BindingIterator (void)
-{
-  delete hash_iter_;
-}
-   
-CORBA::Boolean 
-NS_BindingIterator::next_one (CosNaming::Binding_out b, 
-			      CORBA::Environment &IT_env) 
-{
-  // Macro to avoid "warning: unused parameter" type warning.
-  ACE_UNUSED_ARG (IT_env); 
-
-  if (hash_iter_->done ()) {
-    b = new CosNaming::Binding;
-    return 0;
-  }
-  else
-    {
-      b = new CosNaming::Binding;
-
-      NS_NamingContext::HASH_MAP::ENTRY *hash_entry;
-      hash_iter_->next (hash_entry);
-      hash_iter_->advance ();
-      
-      b->binding_type = hash_entry->int_id_.type_;
-
-      b->binding_name.length (1); 
-      b->binding_name[0].id =
-	CORBA::string_dup (hash_entry->ext_id_.id_.fast_rep ());
-      b->binding_name[0].kind =
-	CORBA::string_dup (hash_entry->ext_id_.kind_.fast_rep ());      
-
-      return 1;
-    }
-}
-    
-CORBA::Boolean 
-NS_BindingIterator::next_n (CORBA::ULong how_many, 
-			    CosNaming::BindingList_out bl,
-			    CORBA::Environment &IT_env) 
-{
-  // Macro to avoid "warning: unused parameter" type warning.
-  ACE_UNUSED_ARG (IT_env); 
-
-  if (hash_iter_->done ()) {
-    bl = new CosNaming::BindingList;
-    return 0;
-  }
-  else
-    {
-      // Statically allocate a BindingList.
-      CosNaming::BindingList bindings;
-
-      // Initially assume that iterator has the requested number of
-      // bindings.
-      bindings.length (how_many);
-
-      // Iterate and populate the BindingList.
-      NS_NamingContext::HASH_MAP::ENTRY *hash_entry;
-      for (CORBA::ULong i = 0; i < how_many; i++) 
-	{
-	  hash_iter_->next (hash_entry);
-	  
-	  bindings[i].binding_type = hash_entry->int_id_.type_;
-	  
-	  bindings[i].binding_name.length (1); 
-	  bindings[i].binding_name[0].id =
-	    CORBA::string_dup (hash_entry->ext_id_.id_.fast_rep ());
-	  bindings[i].binding_name[0].kind =
-	    CORBA::string_dup (hash_entry->ext_id_.kind_.fast_rep ());
-	  
-	  if (hash_iter_->advance () == 0)
-	    {
-	      // If no more bindings left, reset length to the actual
-	      // number of bindings populated and get out of the loop.
-	      bindings.length (i + 1);
-	      break;	    
-	    }
-	}
-
-      bl = new CosNaming::BindingList (bindings);
-      // Marina, please check for failed memory allocation.
-      return 1;
-    }
-}
-    
-void 
-NS_BindingIterator::destroy (CORBA::Environment &IT_env) 
-{
-  // Macro to avoid "warning: unused parameter" type warning.
-  ACE_UNUSED_ARG (IT_env); 
-
-  //  CORBA::release (tie_ref_);
-}
-
-#if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0)
-// These templates will specialized in libACE.* if the platforms does
-// not define ACE_MT_SAFE.
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Hash_Map_Manager<NS_ExtId, NS_IntId, ACE_Null_Mutex>;
-template class  ACE_Hash_Map_Entry<NS_ExtId, NS_IntId>;
-template class  ACE_Hash_Map_Iterator<NS_ExtId, NS_IntId, ACE_Null_Mutex>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Hash_Map_Manager<NS_ExtId, NS_IntId, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Entry<NS_ExtId, NS_IntId>
-#pragma instantiate ACE_Hash_Map_Iterator<NS_ExtId, NS_IntId, ACE_Null_Mutex>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-#endif /* ACE_MT_SAFE */
-
diff --git a/TAO/orbsvcs/bin/Naming_Service/CosNaming_i.h b/TAO/orbsvcs/bin/Naming_Service/CosNaming_i.h
deleted file mode 100644
index 6ef104a7a23..00000000000
--- a/TAO/orbsvcs/bin/Naming_Service/CosNaming_i.h
+++ /dev/null
@@ -1,173 +0,0 @@
-/* -*- C++ -*- */
-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    cos
-// 
-// = FILENAME
-//   CosNaming_i.h
-//
-// = AUTHOR
-//    Sergio Flores-Gaitan <sergio@cs.wustl.edu>
-// 
-// ============================================================================
-
-#if !defined (COSNAMING_I_H)
-#define	COSNAMING_I_H
-
-#include "CosNamingS.h"
-#include "NS_CosNaming.h"
-  
-class NS_NamingContext : public POA_CosNaming::NamingContext
-  // = TITLE
-  //     This class implements the NamingContext interface that is part of the 
-  //     CosNaming idl module.  
-  //
-  // = DESCRIPTION
-  //     Extensive comments can be found in the idl file. 
-{
- public:
-  
-  enum
-  {
-    NS_MAP_SIZE = 23
-    // The size of hash map for a NS_NamingContext object.
-  };
-
-  typedef ACE_Hash_Map_Manager<NS_ExtId, NS_IntId, ACE_Null_Mutex> HASH_MAP;
-         
-  NS_NamingContext (void);
-  // default constructor.
-
-  ~NS_NamingContext (void);
-  // destructor.
-
-  virtual void bind (const CosNaming::Name &n, 
-		     CORBA::Object_ptr obj, 
-		     CORBA::Environment &IT_env);
-                
-  virtual void rebind (const CosNaming::Name &n, 
-		       CORBA::Object_ptr obj, 
-		       CORBA::Environment &IT_env);
-                
-  virtual void bind_context (const CosNaming::Name &n, 
-			     CosNaming::NamingContext_ptr nc, 
-			     CORBA::Environment &IT_env);
-                
-  virtual void rebind_context (const CosNaming::Name &n, 
-			       CosNaming::NamingContext_ptr nc, 
-			       CORBA::Environment &IT_env);
-                
-  virtual CORBA::Object_ptr resolve (const CosNaming::Name &n, 
-				     CORBA::Environment &IT_env);
-                
-  virtual void unbind (const CosNaming::Name &n, 
-		       CORBA::Environment &IT_env);
-                
-  virtual CosNaming::NamingContext_ptr new_context (CORBA::Environment &IT_env);
-                
-  virtual CosNaming::NamingContext_ptr bind_new_context (const CosNaming::Name &n, 
-							 CORBA::Environment &IT_env);
-                
-  virtual void destroy (CORBA::Environment &IT_env);
-                
-  virtual void list (CORBA::ULong how_many, 
-		     CosNaming::BindingList_out bl, 
-		     CosNaming::BindingIterator_out bi, 
-		     CORBA::Environment &IT_env);
-
- protected:
-  // = These are the helper methods used by other methods.
-
-  CosNaming::NamingContext_ptr get_context (const CosNaming::Name &name);
-  // This is used by methods that need to resolve a compound name to
-  // get the reference to the target context before performing the
-  // actual operation (e.g. bind, unbind, etc.)  Takes a full name
-  // (including the last component that doesn't need to be resolved)
-  // Returns a pointer to the target context.
-
- private:    
-  
-  HASH_MAP context_;
-  // This implementation of NamingContext uses ACE thread-safe Hash
-  // Map for storage and manipulation of name-object bindings.
-
-  CosNaming::NamingContext_ptr tie_ref_;
-  // Stores CORBA object reference to the TIE object this object
-  // implements.  This is needed to implement the <destroy> method.
-};
-
-class NS_BindingIterator : public POA_CosNaming::BindingIterator
-  // = TITLE
-  //     This class implements the BindingIterator interface 
-  //     that is part of the CosNaming idl module.
-  //
-  // = DESCRIPTION
-  //     NS_BindingIterator constructor expects a pointer to a
-  //     DYNAMICALLY allocated hash map iterator. Destructor
-  //     deallocates hash map iterator.
-{
- public:
-  // = Intialization and termination methods.
-  NS_BindingIterator (NS_NamingContext::HASH_MAP::ITERATOR *hash_iter);
-  // constructor.
-
-  ~NS_BindingIterator (void);
-  // destructor.
-
-  // Marina, please add comments.
-  CORBA::Boolean next_one (CosNaming::Binding_out b, 
-			   CORBA::Environment &IT_env);
- 
-  CORBA::Boolean next_n (CORBA::ULong how_many, 
-			 CosNaming::BindingList_out bl, 
-			 CORBA::Environment &IT_env);
-
-  void destroy (CORBA::Environment &IT_env);
-    
- private:
-  NS_NamingContext::HASH_MAP::ITERATOR *hash_iter_;
-  // A pointer to the hash map iterator.
-}; 
-
-
-
-
-// ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
-
-#if 0
-class CosNaming_i : public POA_CosNaming
-  // = TITLE
-  //    Integrates the naming service with the
-  //    generated skeleton.
-  // = DESCRIPTION
-  //    Implementation of the naming service at the servant side.
-{
- public:
-  CosNaming_i (void);
-  // constructor
- 
-  ~CosNaming_i (void);
-  // destructor
-  
-  static CosNaming::NamingContext_ptr _bind (const char *host, 
-					     CORBA::ULong port, 
-					     const char *key, 
-					     CORBA::Environment &env);
-
-  NamingContext & naming_context (void)
-    {
-      return nc;
-    }
-
- private:
-    NS_NamingContext nc;
-    // not sure about this.  
-};
-#endif
-
-
-#endif /* COSNAMING_I_H */
diff --git a/TAO/orbsvcs/bin/Naming_Service/Makefile b/TAO/orbsvcs/bin/Naming_Service/Makefile
deleted file mode 100644
index c8b53530a75..00000000000
--- a/TAO/orbsvcs/bin/Naming_Service/Makefile
+++ /dev/null
@@ -1,551 +0,0 @@
-#----------------------------------------------------------------------------
-#
-# $Id$
-#
-#----------------------------------------------------------------------------
-
-#----------------------------------------------------------------------------
-#	Local macros
-#----------------------------------------------------------------------------
-
-SVR_SRCS=NS_CosNaming.cpp CosNaming_i.cpp svr.cpp
-
-LSRC = $(SVR_SRCS)
-
-SVR_OBJS = $(SVR_SRCS:.cpp=.o)
-
-BIN = svr
-BUILD = $(BIN)
-LDLIBS     =  -lorbsvcs -lTAO
-VLDLIBS = $(LDLIBS:%=%$(VAR))
-
-#----------------------------------------------------------------------------
-#	Include macros and targets
-#----------------------------------------------------------------------------
-
-include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-include $(ACE_ROOT)/include/makeinclude/macros.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
-# include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
-
-ifndef TAO_ROOT
-TAO_ROOT = $(ACE_ROOT)/TAO
-endif
-TSS_ORB_FLAG = #-DTAO_HAS_TSS_ORBCORE
-DCFLAGS = -g
-LDFLAGS += -L$(TAO_ROOT)/orbsvcs/lib -L$(TAO_ROOT)/tao
-CPPFLAGS += -I$(TAO_ROOT)/orbsvcs/lib -I$(TAO_ROOT) -I$(TAO_ROOT)/tao/compat $(TSS_ORB_FLAG)#-H
-
-#$(IDL_SRC): CosNaming.idl logger.idl
-#	$(TAO_ROOT)/TAO_IDL/tao_idl CosNaming.idl
-#	$(TAO_ROOT)/TAO_IDL/tao_idl logger.idl
-#
-
-svr:	$(addprefix $(VDIR),$(SVR_OBJS))
-	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS)
-
-# DO NOT DELETE THIS LINE -- g++dep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-
-.obj/NS_CosNaming.o .shobj/NS_CosNaming.: NS_CosNaming.cpp NS_CosNaming.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/stdcpp.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/Task_T.i \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Svc_Handler.i \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(TAO_ROOT)/tao/orbconf.h \
- $(TAO_ROOT)/tao/orb.h \
- $(TAO_ROOT)/tao/corbacom.h \
- $(TAO_ROOT)/tao/object.h \
- $(TAO_ROOT)/tao/align.h \
- $(TAO_ROOT)/tao/sequence.h \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/any.h \
- $(TAO_ROOT)/tao/poa.h \
- $(TAO_ROOT)/tao/tao_internals.h \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/client_factory.h \
- $(TAO_ROOT)/tao/server_factory.h \
- $(TAO_ROOT)/tao/default_client.h \
- $(TAO_ROOT)/tao/default_server.h \
- $(TAO_ROOT)/tao/except.h \
- $(TAO_ROOT)/tao/orbobj.h \
- $(TAO_ROOT)/tao/nvlist.h \
- $(TAO_ROOT)/tao/principa.h \
- $(TAO_ROOT)/tao/request.h \
- $(TAO_ROOT)/tao/svrrqst.h \
- $(TAO_ROOT)/tao/typecode.h \
- $(TAO_ROOT)/tao/marshal.h \
- $(TAO_ROOT)/tao/cdr.h \
- $(TAO_ROOT)/tao/stub.h \
- $(TAO_ROOT)/tao/connect.h \
- $(TAO_ROOT)/tao/orb_core.h \
- $(TAO_ROOT)/tao/objtable.h \
- $(TAO_ROOT)/tao/optable.h \
- $(TAO_ROOT)/tao/debug.h \
- $(TAO_ROOT)/tao/iiopobj.h \
- $(TAO_ROOT)/tao/iioporb.h \
- $(TAO_ROOT)/tao/giop.h \
- $(TAO_ROOT)/tao/orb_core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(TAO_ROOT)/tao/corbacom.i \
- $(TAO_ROOT)/tao/sequence.i \
- $(TAO_ROOT)/tao/typecode.i \
- $(TAO_ROOT)/tao/any.i \
- $(TAO_ROOT)/tao/cdr.i \
- $(TAO_ROOT)/tao/stub.i \
- $(TAO_ROOT)/tao/object.i \
- $(TAO_ROOT)/tao/orbobj.i \
- $(TAO_ROOT)/tao/marshal.i \
- $(TAO_ROOT)/tao/poa.i \
- $(TAO_ROOT)/tao/giop.i \
- $(TAO_ROOT)/tao/iioporb.i \
- $(TAO_ROOT)/tao/iiopobj.i \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/server_factory.i \
- $(TAO_ROOT)/tao/default_client.i \
- $(TAO_ROOT)/tao/default_server.i \
- $(TAO_ROOT)/tao/connect.i \
- $(TAO_ROOT)/tao/singletons.h \
- $(TAO_ROOT)/orbsvcs/lib/CosNamingC.h \
- $(TAO_ROOT)/orbsvcs/lib/CosNamingC.i
-.obj/CosNaming_i.o .shobj/CosNaming_i.: CosNaming_i.cpp CosNaming_i.h \
- $(TAO_ROOT)/orbsvcs/lib/CosNamingS.h \
- $(TAO_ROOT)/orbsvcs/lib/CosNamingC.h \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/stdcpp.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/Task_T.i \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Svc_Handler.i \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(TAO_ROOT)/tao/orbconf.h \
- $(TAO_ROOT)/tao/orb.h \
- $(TAO_ROOT)/tao/corbacom.h \
- $(TAO_ROOT)/tao/object.h \
- $(TAO_ROOT)/tao/align.h \
- $(TAO_ROOT)/tao/sequence.h \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/any.h \
- $(TAO_ROOT)/tao/poa.h \
- $(TAO_ROOT)/tao/tao_internals.h \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/client_factory.h \
- $(TAO_ROOT)/tao/server_factory.h \
- $(TAO_ROOT)/tao/default_client.h \
- $(TAO_ROOT)/tao/default_server.h \
- $(TAO_ROOT)/tao/except.h \
- $(TAO_ROOT)/tao/orbobj.h \
- $(TAO_ROOT)/tao/nvlist.h \
- $(TAO_ROOT)/tao/principa.h \
- $(TAO_ROOT)/tao/request.h \
- $(TAO_ROOT)/tao/svrrqst.h \
- $(TAO_ROOT)/tao/typecode.h \
- $(TAO_ROOT)/tao/marshal.h \
- $(TAO_ROOT)/tao/cdr.h \
- $(TAO_ROOT)/tao/stub.h \
- $(TAO_ROOT)/tao/connect.h \
- $(TAO_ROOT)/tao/orb_core.h \
- $(TAO_ROOT)/tao/objtable.h \
- $(TAO_ROOT)/tao/optable.h \
- $(TAO_ROOT)/tao/debug.h \
- $(TAO_ROOT)/tao/iiopobj.h \
- $(TAO_ROOT)/tao/iioporb.h \
- $(TAO_ROOT)/tao/giop.h \
- $(TAO_ROOT)/tao/orb_core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(TAO_ROOT)/tao/corbacom.i \
- $(TAO_ROOT)/tao/sequence.i \
- $(TAO_ROOT)/tao/typecode.i \
- $(TAO_ROOT)/tao/any.i \
- $(TAO_ROOT)/tao/cdr.i \
- $(TAO_ROOT)/tao/stub.i \
- $(TAO_ROOT)/tao/object.i \
- $(TAO_ROOT)/tao/orbobj.i \
- $(TAO_ROOT)/tao/marshal.i \
- $(TAO_ROOT)/tao/poa.i \
- $(TAO_ROOT)/tao/giop.i \
- $(TAO_ROOT)/tao/iioporb.i \
- $(TAO_ROOT)/tao/iiopobj.i \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/server_factory.i \
- $(TAO_ROOT)/tao/default_client.i \
- $(TAO_ROOT)/tao/default_server.i \
- $(TAO_ROOT)/tao/connect.i \
- $(TAO_ROOT)/tao/singletons.h \
- $(TAO_ROOT)/orbsvcs/lib/CosNamingC.i \
- $(TAO_ROOT)/orbsvcs/lib/CosNamingS.i \
- NS_CosNaming.h
-.obj/svr.o .shobj/svr.: svr.cpp CosNaming_i.h \
- $(TAO_ROOT)/orbsvcs/lib/CosNamingS.h \
- $(TAO_ROOT)/orbsvcs/lib/CosNamingC.h \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/stdcpp.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/Task_T.i \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Svc_Handler.i \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(TAO_ROOT)/tao/orbconf.h \
- $(TAO_ROOT)/tao/orb.h \
- $(TAO_ROOT)/tao/corbacom.h \
- $(TAO_ROOT)/tao/object.h \
- $(TAO_ROOT)/tao/align.h \
- $(TAO_ROOT)/tao/sequence.h \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/any.h \
- $(TAO_ROOT)/tao/poa.h \
- $(TAO_ROOT)/tao/tao_internals.h \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/client_factory.h \
- $(TAO_ROOT)/tao/server_factory.h \
- $(TAO_ROOT)/tao/default_client.h \
- $(TAO_ROOT)/tao/default_server.h \
- $(TAO_ROOT)/tao/except.h \
- $(TAO_ROOT)/tao/orbobj.h \
- $(TAO_ROOT)/tao/nvlist.h \
- $(TAO_ROOT)/tao/principa.h \
- $(TAO_ROOT)/tao/request.h \
- $(TAO_ROOT)/tao/svrrqst.h \
- $(TAO_ROOT)/tao/typecode.h \
- $(TAO_ROOT)/tao/marshal.h \
- $(TAO_ROOT)/tao/cdr.h \
- $(TAO_ROOT)/tao/stub.h \
- $(TAO_ROOT)/tao/connect.h \
- $(TAO_ROOT)/tao/orb_core.h \
- $(TAO_ROOT)/tao/objtable.h \
- $(TAO_ROOT)/tao/optable.h \
- $(TAO_ROOT)/tao/debug.h \
- $(TAO_ROOT)/tao/iiopobj.h \
- $(TAO_ROOT)/tao/iioporb.h \
- $(TAO_ROOT)/tao/giop.h \
- $(TAO_ROOT)/tao/orb_core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(TAO_ROOT)/tao/corbacom.i \
- $(TAO_ROOT)/tao/sequence.i \
- $(TAO_ROOT)/tao/typecode.i \
- $(TAO_ROOT)/tao/any.i \
- $(TAO_ROOT)/tao/cdr.i \
- $(TAO_ROOT)/tao/stub.i \
- $(TAO_ROOT)/tao/object.i \
- $(TAO_ROOT)/tao/orbobj.i \
- $(TAO_ROOT)/tao/marshal.i \
- $(TAO_ROOT)/tao/poa.i \
- $(TAO_ROOT)/tao/giop.i \
- $(TAO_ROOT)/tao/iioporb.i \
- $(TAO_ROOT)/tao/iiopobj.i \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/server_factory.i \
- $(TAO_ROOT)/tao/default_client.i \
- $(TAO_ROOT)/tao/default_server.i \
- $(TAO_ROOT)/tao/connect.i \
- $(TAO_ROOT)/tao/singletons.h \
- $(TAO_ROOT)/orbsvcs/lib/CosNamingC.i \
- $(TAO_ROOT)/orbsvcs/lib/CosNamingS.i \
- NS_CosNaming.h
-
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/orbsvcs/bin/Naming_Service/NS_CosNaming.cpp b/TAO/orbsvcs/bin/Naming_Service/NS_CosNaming.cpp
deleted file mode 100644
index ee1843581db..00000000000
--- a/TAO/orbsvcs/bin/Naming_Service/NS_CosNaming.cpp
+++ /dev/null
@@ -1,107 +0,0 @@
-// ============================================================================
-//
-// = LIBRARY
-//    cos
-// 
-// = FILENAME
-//    NS_CosNaming.C
-//
-// = AUTHOR
-//    Marina Spivak <marina@cs.wustl.edu>
-// 
-// ============================================================================
-
-#include "NS_CosNaming.h"
-
-NS_IntId::NS_IntId (void)
-  : type_ (CosNaming::nobject)
-{
-  ref_ = CORBA::Object::_nil ();
-}
-
-NS_IntId::NS_IntId (CORBA::Object_ptr obj,
-		    CosNaming::BindingType type)
-  : type_ (type)
-{
-  ref_ = obj->_duplicate (obj);
-}
-
-NS_IntId::NS_IntId (const NS_IntId &rhs)
-{
-  type_ = rhs.type_;
-  ref_ =  rhs.ref_->_duplicate (rhs.ref_);
-}
-
-NS_IntId::~NS_IntId (void)
-{
-  CORBA::release (ref_);
-}
-
-void 
-NS_IntId::operator= (const NS_IntId &rhs)
-{
-  // check for self assignment.
-  if (&rhs == this)
-    return;
-
-  type_ = rhs.type_;
-  
-  CORBA::release (ref_);
-  ref_ =  rhs.ref_->_duplicate (rhs.ref_);
-}
-
-NS_ExtId::NS_ExtId (void)
-  : kind_ (),
-    id_ ()
-{
-}
-
-NS_ExtId::NS_ExtId (const char *id, 
-		    const char *kind)
-  : kind_ (kind),
-    id_ (id)
-{
-}
-
-NS_ExtId::NS_ExtId (const NS_ExtId &rhs)
-{
-  id_ = rhs.id_;
-  kind_ = rhs.kind_; 
-}
-
-NS_ExtId::~NS_ExtId (void)
-{
-}
-
-void 
-NS_ExtId::operator= (const NS_ExtId &rhs)
-{
-  // Check for self assignment.
-  if (&rhs == this)
-    return;
-
-  id_ = rhs.id_;
-  kind_ = rhs.kind_; 
-}
- 
-int 
-NS_ExtId::operator== (const NS_ExtId &rhs) const
-{
-  return id_ == rhs.id_ && kind_ == rhs.kind_;
-}
-
-int 
-NS_ExtId::operator!= (const NS_ExtId &rhs) const
-{
-  return id_ != rhs.id_ || kind_ != rhs.kind_;
-}
-
-u_long
-NS_ExtId::hash (void) const
-{
-  ACE_CString temp (id_);
-  temp += kind_;
-
-  return temp.hash ();
-}
-
diff --git a/TAO/orbsvcs/bin/Naming_Service/NS_CosNaming.h b/TAO/orbsvcs/bin/Naming_Service/NS_CosNaming.h
deleted file mode 100644
index f897f23d2ca..00000000000
--- a/TAO/orbsvcs/bin/Naming_Service/NS_CosNaming.h
+++ /dev/null
@@ -1,108 +0,0 @@
-/* -*- C++ -*- */
-
-// ============================================================================
-//
-// = LIBRARY
-//    cos
-// 
-// = FILENAME
-//   NS_CosNaming.h
-//
-// = AUTHOR
-//    Marina Spivak <marina@cs.wustl.edu>
-// 
-// ============================================================================
-
-#if !defined (NS_COSNAMING_H)
-#define NS_COSNAMING_H
-
-#include "ace/Hash_Map_Manager.h"
-#include "ace/Synch.h"
-#include "ace/SString.h"
-
-#include "tao/corba.h"
-#include "CosNamingC.h"
-
-class NS_IntId 
-  // = TITLE
-  //     Stores information a context keeps for each bound name
-  //     (object reference and the type of binding).
-  //
-  // = DESCRIPTION
-  //
-  //
-  //
-  //
-{
-public:
-  // = Initialization and termination methods.
-  NS_IntId (void);
-  // default constructor.
-
-  NS_IntId (CORBA::Object_ptr obj,
-	    CosNaming::BindingType type = CosNaming::nobject);
-  // constructor.
-  
-  NS_IntId (const NS_IntId & rhs);
-  // copy constructor
-
-  ~NS_IntId (void);
-  // destructor 
-
-  void operator= (const NS_IntId & rhs);
-  // Assignment operator (does copy memory).
-
-  CORBA::Object_ptr ref_;   
-  // CORBA object reference of the bound object.
-
-  CosNaming::BindingType type_;  
-  // Indicator of whether the object is a NamingContext that should
-  // participate in name resolution when compound names are used.
-};
-
-class NS_ExtId 
-  // = TITLE
-  //    Stores the name to which an object is bound.
-  //
-  // = DESCRIPTION
-  //
-  //
-  //
-  //
-{
-public:
-  // = Initialization and termination methods.
-  NS_ExtId (void);
-  // default constructor.
-
-  NS_ExtId (const char *id, 
-	    const char *kind);
-  // constructor.
-  
-  NS_ExtId (const NS_ExtId & rhs);
-  // copy constructor
-
-  ~NS_ExtId (void);
-  // destructor 
-
-  void operator= (const NS_ExtId & rhs);
-  // Assignment operator (does copy memory).
-
-  int operator== (const NS_ExtId &rhs) const;
-  // Equality comparison operator (must match both id_ and kind_).
-
-  int operator!= (const NS_ExtId &rhs) const;
-  // Inequality comparison operator.
-
-  u_long hash (void) const;
-  // This class has to have a hash for use with ACE_Hash_Map_Manager.
-
-  ACE_CString kind_;  
-  // any information user wants to store (not used by Naming Service).
-
-  ACE_CString id_;  
-  // any information user wants to store (not used by Naming Service).
-};
-
-
-#endif /* NS_COSNAMING_H */
diff --git a/TAO/orbsvcs/bin/Naming_Service/svc.conf b/TAO/orbsvcs/bin/Naming_Service/svc.conf
deleted file mode 100644
index 43c6a486c92..00000000000
--- a/TAO/orbsvcs/bin/Naming_Service/svc.conf
+++ /dev/null
@@ -1,49 +0,0 @@
-# $Id$
-#
-# This file contains a sample ACE_Service_Config configuration
-# file specifying the strategy factories utilized by an application
-# using TAO.  There are currently only two possible factories:
-# Client_Strategy_Factory and Server_Strategy_Factory.  These names
-# must be used as the second argument to their corresponding line,
-# because that's what the ORB uses to find the desired factory.
-#
-# Note that there are two unordinary characteristics of the way *this*
-# file is set up:
-#   - both client and server strategies are specified in the same
-#     file, which would only make sense for co-located clients & servers
-#   - both of the factories are actually sourced out of libTAO.so
-#     (TAO.DLL on Win32), and they would normally be in a separate
-#     dll from the TAO ORB Core.
-#
-# The options which can be passed to the Resource Factory are:
-#
-#   -ORBresources <which>
-#       where <which> can be 'global' to specify globally-held resources,
-#       or 'tss' to specify thread-specific resources.
-#
-# The options which can be passed to the Client are:
-#     <none currently>
-#
-# The options which can be passed to the Server are:
-#
-#   -ORBconcurrency <which>
-#       where <which> can be 'thread-per-connection' to specify
-#       use of the ACE_Threaded_Strategy concurrency strategy,
-#       or 'reactive' to specify use of the ACE_Reactive_Strategy
-#       concurrency strategy.
-#
-#   -ORBthreadflags  <flags>
-#       specifies the default thread flags to use, where <flags> is a
-#       logical OR'ing of the flags THR_DETACHED, THR_BOUND, THR_NEW_LWP,
-#       THR_SUSPENDED, or THR_DAEMON.  Note that not every flag may be valid
-#       on every platform.
-#
-#   -ORBdemuxstrategy <which>
-#       where <which> can be one of 'dynamic', 'linear', 'active', or 'user',
-#       and specifies the type of object lookup strategy used internally.
-#   -ORBtablesize <unsigned>
-#       specifies the size of the object table
-#
-dynamic Resource_Factory Service_Object * TAO:_make_TAO_Resource_Factory() "-ORBresources global"
-dynamic Client_Strategy_Factory Service_Object * TAO:_make_TAO_Default_Client_Strategy_Factory()
-dynamic Server_Strategy_Factory Service_Object * TAO:_make_TAO_Default_Server_Strategy_Factory() "-ORBconcurrency reactive -ORBdemuxstrategy dynamic -ORBtablesize 128"
diff --git a/TAO/orbsvcs/bin/Naming_Service/svr.cpp b/TAO/orbsvcs/bin/Naming_Service/svr.cpp
deleted file mode 100644
index 2921db2be04..00000000000
--- a/TAO/orbsvcs/bin/Naming_Service/svr.cpp
+++ /dev/null
@@ -1,171 +0,0 @@
-//
-// $Id$
-//
-#include <iostream.h>
-#include "CosNaming_i.h"
-#include "svr.h"
-
-// This is a startup for the naming server.
-// This is used for testing of the Naming Service.
-
-ACE_HANDLE
-IOR_Multicast::get_handle (void) const
-{
-  return this->mcast_dgram_.get_handle ();
-}
-
-IOR_Multicast::IOR_Multicast (char * ior,
-			      u_short port, 
-			      const char *mcast_addr)
-  : mcast_addr_ (port, mcast_addr),
-    ior_ (ior),
-    response_ (response_addr_)
-{
-  // Use ACE_SOCK_Dgram_Mcast factory to subscribe to multicast group.
-  if (this->mcast_dgram_.subscribe (this->mcast_addr_) == -1)
-    ACE_ERROR ((LM_ERROR, "%p\n", "subscribe"));
-}
-
-// destructor 
-
-IOR_Multicast::~IOR_Multicast (void)
-{
-  this->mcast_dgram_.unsubscribe ();    
-}
-
-int
-IOR_Multicast::handle_timeout (const ACE_Time_Value &,
-                               const void *)
-{
-  return 0;
-}
-
-int
-IOR_Multicast::handle_input (ACE_HANDLE)
-{
-  ssize_t retcode = 
-    this->mcast_dgram_.recv (this->buf_, 
-			     BUFSIZ, 
-			     this->remote_addr_);
-  
-  if (retcode == -1)
-    return -1;
-
-  ACE_DEBUG ((LM_DEBUG, "Received multicast.\n"));
-  
-  // @@ validate data string received is from a valid client here
-  // @@ Probably not needed
-
-  if (retcode != sizeof (CORBA::Short))
-    {
-      ACE_ERROR_RETURN ((LM_ERROR, 
-			 "Reply to multicast not sent. Received %d bytes, expected %d.", 
-			 retcode, 
-			 sizeof(CORBA::Short)), -1);
-    }
-
-  // convert port number received to network byte order.
-  CORBA::Short reply_port_number = ntohs (*(CORBA::Short *)this->buf_);
-
-  // set port number to reply.
-  this->remote_addr_.set_port_number (reply_port_number);
-  
-  // send the object reference for the naming service
-  retcode = response_.send (this->ior_, 
-			    ACE_OS::strlen (this->ior_) + 1, 
-			    this->remote_addr_, 
-			    0);
-
-  ACE_DEBUG ((LM_DEBUG, 
-	      "ior_ '%s' sent through port %u.\nretcode=%d\n", 
-	      this->ior_, 
-	      this->remote_addr_.get_port_number (), 
-	      retcode));
-
-  if (retcode == -1)
-    return -1;  
-
-  return 0;
-}
-
-
-int
-main (int argc, char ** argv)
-{
-  CORBA::Environment env;
-  char *orb_name = "internet";
-
-  CORBA::ORB_ptr orb_ptr = CORBA::ORB_init (argc, 
-					    argv, 
-					    orb_name, 
-					    env);
-
-  if (env.exception () != 0)
-    {
-      env.print_exception ("ORB init");
-      return 1;
-    }
-
-  // Initialize the Object Adapter
-  CORBA::POA_ptr oa_ptr = orb_ptr->POA_init (argc, argv, "POA");
-
-  if (oa_ptr == 0)
-    ACE_ERROR_RETURN ((LM_ERROR,
-		       " (%P|%t) Unable to initialize the POA.\n"),
-		      1);
-
-  // Create a naming context object.
-  NS_NamingContext *naming_context = new NS_NamingContext;
-  
-  // Stringify the objref we'll be implementing, and print it to
-  // stdout.  Someone will take that string and give it to a
-  // client.  Then release the object.
-  CORBA::String str;
-  str = orb_ptr->object_to_string (naming_context, env);
-
-  if (env.exception () != 0)
-    {
-      env.print_exception ("object2string");
-      return 1;
-    }
-
-  ACE_DEBUG ((LM_DEBUG, "listening as object '%s'\n", str));
-
-#if defined (ACE_HAS_IP_MULTICAST)
-  // get reactor instance from TAO
-  ACE_Reactor *reactor = TAO_ORB_Core_instance ()->reactor ();
-  
-  // First, see if the user has given us a multicast port number
-  // for the name service on the command-line;
-  u_short port = TAO_ORB_Core_instance ()->orb_params ()->name_service_port ();
-  if (port == 0)
-    {
-      const char *port_number = ACE_OS::getenv ("NameServicePort");
-
-      if (port_number != 0)
-	port = ACE_OS::atoi (port_number);
-    }
-
-  if (port == 0)
-    port = TAO_DEFAULT_NAME_SERVER_REQUEST_PORT;
-
-  // Instantiate a server which will receive requests for an ior
-  IOR_Multicast ior_multicast (str,
-			       port,
-			       ACE_DEFAULT_MULTICAST_ADDR);
-
-  // register event handler for the ior multicast.
-  if (reactor->register_handler (&ior_multicast,
-				 ACE_Event_Handler::READ_MASK) == -1)
-    ACE_ERROR ((LM_ERROR, "%p\n%a", "register_handler", 1));
-    
-  ACE_DEBUG ((LM_DEBUG, "The multicast server setup is done.\n"));
-#endif /* ACE_HAS_IP_MULTICAST */
-
-  // Handle requests for this object until we're killed, or one of the
-  // methods asks us to exit.
-  if (orb_ptr->run () == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "run"), -1);
-
-  return 0;
-}
diff --git a/TAO/orbsvcs/bin/Naming_Service/svr.h b/TAO/orbsvcs/bin/Naming_Service/svr.h
deleted file mode 100644
index 988145b53c8..00000000000
--- a/TAO/orbsvcs/bin/Naming_Service/svr.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/orbsvcs/bin/Naming_Service
-//
-// = FILENAME
-//    svr.h
-//
-// = DESCRIPTION 
-//    Defines a class that listens to a multicast address for client requests 
-//    for ior of the naming service.
-//    
-// = AUTHORS
-//      Sergio Flores-Gaitan
-//
-// ============================================================================
-
-#if !defined (SVR_H)
-#define SVR_H
-
-#include "ace/INET_Addr.h"
-#include "ace/SOCK_Dgram_Mcast.h"
-#include "ace/Reactor.h"
-
-class IOR_Multicast : public ACE_Event_Handler
-{
-public:
-  // constructor
-  IOR_Multicast (char * ior,
-		u_short port,
-		const char *mcast_addr);
-
-  // destructor
-  ~IOR_Multicast (void);
-
-  // call back when input is received on the handle.
-  virtual int handle_input (ACE_HANDLE fd);
-  
-  // callback when a timeout has occurred.
-  virtual int handle_timeout (const ACE_Time_Value &tv,
-			      const void *arg);
-
-  // returns the internal handle used to receive multicast
-  virtual ACE_HANDLE get_handle (void) const;
-
-private:
-  char buf_[BUFSIZ];
-  // temporary buffer
-
-  ACE_SOCK_Dgram_Mcast mcast_dgram_;
-  // multicast endpoint of communication
-
-  ACE_INET_Addr remote_addr_;
-  // remote address that sent multicast
-
-  ACE_INET_Addr mcast_addr_;
-  // multicast address
-
-  char * ior_;
-  // object reference to send in response to the multicast
-
-  ACE_INET_Addr response_addr_;
-  // address of response.
-
-  ACE_SOCK_Dgram response_;
-  // socket for response to the multicast
-};
-
-#endif /* SVR_H */
diff --git a/TAO/orbsvcs/lib/Channel_Clients.cpp b/TAO/orbsvcs/lib/Channel_Clients.cpp
deleted file mode 100644
index cfa1da318d3..00000000000
--- a/TAO/orbsvcs/lib/Channel_Clients.cpp
+++ /dev/null
@@ -1 +0,0 @@
-// $Id$
diff --git a/TAO/orbsvcs/lib/Channel_Clients.h b/TAO/orbsvcs/lib/Channel_Clients.h
deleted file mode 100644
index 57781f9f3a7..00000000000
--- a/TAO/orbsvcs/lib/Channel_Clients.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-//
-// ============================================================================
-//
-// = LIBRARY
-//    ace
-// 
-// = FILENAME
-//    Channel_Clients
-//
-// = AUTHOR
-//    Tim Harrison (harrison@cs.wustl.edu)
-//
-// ============================================================================
-
-#ifndef ACE_CHANNEL_CLIENTS_H
-#define ACE_CHANNEL_CLIENTS_H
-
-#include "Channel_Clients_T.h"
-
-#if defined (__ACE_INLINE__)
-#include "Channel_Clients.i"
-#endif /* __ACE_INLINE__ */
-#endif /* ACE_CHANNEL_CLIENTS_H */
-
diff --git a/TAO/orbsvcs/lib/Channel_Clients_T.cpp b/TAO/orbsvcs/lib/Channel_Clients_T.cpp
deleted file mode 100644
index 3207d44f091..00000000000
--- a/TAO/orbsvcs/lib/Channel_Clients_T.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-// $Id$
-
-#ifndef ACE_CHANNEL_CLIENTS_T_C
-#define ACE_CHANNEL_CLIENTS_T_C
-
-#include "Channel_Clients_T.h"
-
-#if !defined (__ACE_INLINE__)
-#include "Channel_Clients_T.i"
-#endif /* __ACE_INLINE__ */
-
-#endif /* ACE_CHANNEL_CLIENTS_T_C */
diff --git a/TAO/orbsvcs/lib/Channel_Clients_T.h b/TAO/orbsvcs/lib/Channel_Clients_T.h
deleted file mode 100644
index 732353773eb..00000000000
--- a/TAO/orbsvcs/lib/Channel_Clients_T.h
+++ /dev/null
@@ -1,88 +0,0 @@
-/* -*- C++ -*- */
-// $Id $
-//
-// ============================================================================
-//
-// = LIBRARY
-//    ace
-// 
-// = FILENAME
-//    Channel_Clients_T
-//
-// = AUTHOR
-//    Tim Harrison (harrison@cs.wustl.edu) and 
-//    Douglas Schmidt (schmidt@cs.wustl.edu)
-//
-// = DESCRIPTION
-//    These classes allow applications to be consumer, suppliers, and
-//    consumer suppliers, as well as being active objects.  This is
-//    accomplished with adapters to prevent the use of multiple
-//    inheritence (which is this root of all evil.)
-//
-// ============================================================================
-
-#ifndef ACE_CHANNEL_CLIENTS_T_H
-#define ACE_CHANNEL_CLIENTS_T_H
-
-#include "RtecEventCommC.h"
-
-// TODO: Add throw specs to this classes.
-
-template <class TARGET>
-class ACE_PushConsumer_Adapter : public RtecEventComm::PushConsumer
-// = TITLE
-//    ACE Push Consumer Adapter
-//
-// = DESCRIPTION
-//    Forwards all calls to the owner_.
-{
-public:
-  ACE_PushConsumer_Adapter (TARGET *target);
-  // Forwards all calls to <owner>.
-
-  virtual void push (const RtecEventComm::EventSet& events,
-		     CORBA::Environment &);
-  // Forwards to target_.
-
-  virtual void disconnect_push_consumer (CORBA::Environment &);
-  // Forwards to target_.
-
-private:
-  TARGET *target_;
-};
-
-// ************************************************************
-
-template <class TARGET>
-class ACE_PushSupplier_Adapter : public RtecEventComm::PushSupplier
-// = TITLE
-//    ACE Push Supplier Adapter
-//
-// = DESCRIPTION
-//    Forwards all calls to disconnect_push_supplier the target_.
-{
-public:
-  ACE_PushSupplier_Adapter (TARGET *target);
-  // Forwards all calls to <owner>.
-
-  virtual void disconnect_push_supplier (CORBA::Environment &);
-  // Forwards to target_.
-
-private:
-  TARGET *target_;
-};
-
-#if defined (__ACE_INLINE__)
-#include "Channel_Clients_T.i"
-#endif /* __ACE_INLINE__ */
-
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "Channel_Clients_T.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Channel_Clients_T.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
-#endif /* ACE_CHANNEL_CLIENTS_T_H */
-
diff --git a/TAO/orbsvcs/lib/CosNaming.idl b/TAO/orbsvcs/lib/CosNaming.idl
deleted file mode 100644
index 770a2adea9f..00000000000
--- a/TAO/orbsvcs/lib/CosNaming.idl
+++ /dev/null
@@ -1,207 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    cos
-// 
-// = FILENAME
-//    CosNaming.idl
-//
-// = AUTHOR
-//    Marina Spivak
-// 
-// ============================================================================
-
-module CosNaming
-  // = TITLE
-  // This module provides interface for using COS Naming Service.   
-{
-  typedef string Istring;
-  struct NameComponent 
-  {
-    Istring id;	
-    // This is the name that is used to identify object references.
-
-    Istring kind;	
-    // Stores any addtional info about the object reference.
-  };
-  // This is a 'simple' name.
-  // NOTE: both id and kind fields are used in resolving names.
-
-  typedef sequence <NameComponent> Name;
-  // This is a compound name: <c1; c2; c3; cn> where c1 to cn-1 are
-  // the names of the nested contexts, and cn is the name of the
-  // object bound in cn-1.
-
-  enum BindingType 
-  {
-    nobject,
-    // object binding.
-
-    ncontext
-    // naming context binding.
-  };
-
-  struct Binding 
-  {
-    Name    	binding_name;
-    BindingType	binding_type;                                  
-  };
-
-  typedef sequence <Binding> BindingList;
-
-  interface BindingIterator;
-  // Forward declaration.
-
-  interface NamingContext 
-    // = TITLE
-    // Interface for managing name bindings and naming contexts.
-    {
-      // = Exceptions.
-
-      enum NotFoundReason 
-      { 
-	missing_node,
-	not_context,
-	not_object
-      };
-        
-      exception NotFound 
-	{
-	  NotFoundReason why;
-	  Name rest_of_name;
-	};
-      // Indicates that the name does not identify a binding.
-
-      exception CannotProceed 
-	{
-	  //Commented out due to the bug in Orbix compiler               
-	  NamingContext cxt;
-	  Name rest_of_name;
-	};
-      // Implementation has given up for some reason.  The client,
-      // however, may be able to continue operation at the returned
-      // naming context.
-                                 
-      exception InvalidName {};                             
-      // A name of length 0 is invalid. 
-      // Implementations may place further restrictions.            
-                               
-      exception AlreadyBound {};
-      // Indicates that the specified name is already bound to some
-      // object.  Only one object can be bound to a particular name in
-      // a context.  To change the binding, <rebind> and
-      // <rebind_context> can be used.
-
-      exception NotEmpty {};
-      // Indicates that the context is not empty.
-
-      // = Binding operations.
-
-      void bind (in Name n, in Object obj)             
-	raises(NotFound, CannotProceed, InvalidName, AlreadyBound);
-      // create a binding for name <n> and object <obj> in the naming
-      // context.  Compound names are treated as follows: ctx->bind
-      // (<c1; c2; c3; cn>, obj) = (ctx->resolve (<c1; c2;
-      // cn-1>))->bind (<cn>, obj) if the there already exists a
-      // binding for the specified name, <AlreadyBound> exception is
-      // thrown.  Naming contexts should be bound using <bind_context>
-      // and <rebind_context> in order to participate in name
-      // resolution later.
-
-      void rebind (in Name n, in Object obj)   
-	raises(NotFound, CannotProceed, InvalidName);
-      // this is similar to <bind> operation above, except for when
-      // the binding for the specified name already exists in the
-      // specified context.  In that case, the existing binding is
-      // replaced with the new one.
-		
-      void bind_context (in Name n, in NamingContext nc)               
-	raises(NotFound, CannotProceed, InvalidName, AlreadyBound);
-      // This is the version of <bind> specifically for binding naming
-      // contexts, so that they will participate in name resolution
-      // when compound names are passed to be resolved.
-
-      void rebind_context (in Name n, in NamingContext nc)     
-	raises(NotFound, CannotProceed, InvalidName);
-      // This is a version of <rebind> specifically for naming
-      // contexts, so that they can participate in name resolution
-      // when compound names are passed.
-
-      // = Resolving names.
-
-      Object resolve (in Name n)
-	raises(NotFound, CannotProceed, InvalidName);
-      // Return object reference that is bound to the name.  Compound
-      // name resolve is defined as follows: ctx->resolve (<c1; c2;
-      // cn>) = ctx->resolve (<c1; c2 cn-1>)->resolve (<cn>) The
-      // naming service does not return the type of the object.
-      // Clients are responsible for "narrowing" the object to the
-      // appropriate type.
-
-      // = Unbinding names.
-
-      void unbind (in Name n)
-	raises(NotFound, CannotProceed, InvalidName);
-      // Remove the name binding from the context.  When compound
-      // names are used, unbind is defined as follows: ctx->unbind
-      // (<c1; c2; cn>) = (ctx->resolve (<c1; c2; cn-1>))->unbind
-      // (<cn>)
-
-      // = Creating Naming Contexts.
-
-      NamingContext new_context ();
-      // This operation returns a new naming context implemented by
-      // the same naming server in which the operation was invoked.
-      // The context is not bound.
-
-      NamingContext bind_new_context (in Name n)
-	raises(NotFound, AlreadyBound, CannotProceed, InvalidName);
-      // This operation creates a new context and binds it to the name
-      // supplied as an argument.  The newly-created context is
-      // implemented by the same server as the context in which it was
-      // bound (the name argument excluding the last component).
-
-      // = Deleting contexts.
-
-      void destroy ()
-	raises (NotEmpty);
-      // Delete the naming context.  NOTE: the user should <unbind>
-      // any bindings in which the given context is bound to some
-      // names before invoking <destroy> operation on it.  Ignoring
-      // this rule may cause unexpected behaviour.  <destroy> deletes
-      // the context object if it is not bound to any names in the
-      // given address space.  <destroys> decrements the reference
-      // count of the context if bindings to it exist.
-		
-      // = Listing the naming context.
-		
-      void list (in unsigned long how_many, 
-		 out BindingList bl, out BindingIterator bi);
-      // Returns at most the requested number of bindings <how_many>
-      // in <bl>.  If the naming context contains additional bindings,
-      // they are returned with a BindingIterator.  In the naming
-      // context does not contain any additional bindings <bi>
-      // returned as null.
-    };
-
-  interface BindingIterator 
-    // = TITLE
-    // Interface for iterating over Bindings returned with the <list>
-    // operation.
-    {
-      boolean next_one (out Binding b);
-      // This operation returns the next binding.  If there are no
-      // more bindings false is returned.
-
-      boolean next_n (in unsigned long how_many, 
-		      out BindingList bl);
-      // This operation returns at most the requested number of
-      // bindings.
-
-      void destroy ();
-      // This operation destroys the iterator.
-    };
-};
diff --git a/TAO/orbsvcs/lib/Event_Service_Constants.h b/TAO/orbsvcs/lib/Event_Service_Constants.h
deleted file mode 100644
index 9aae513b530..00000000000
--- a/TAO/orbsvcs/lib/Event_Service_Constants.h
+++ /dev/null
@@ -1,93 +0,0 @@
-//
-// $Id$
-//
-// = DESCRIPTION
-//    Keep constants required by both Event Service implementation and
-//    the Scheduling Service implementation.
-//
-
-#if !defined (ACE_ES_CONSTANTS_H)
-#define ACE_ES_CONSTANTS_H
-
-#include <ace/Message_Block.h>
-#include <ace/Synch.h>
-
-const int ACE_ES_MAX_SUBSCRIPTIONS = 32;
-// This is the number of events a consumer can subscribe to.
-
-//const int ACE_ES_MAX_SUPPLIERS = 100;
-// Max number of suppliers that a channel can handle.
-
-const int ACE_ES_MAX_CONSUMERS_PER_SUPPLIER = 100;
-// Max number of consumers that one supplier can have subscribed to
-// one type of event (including source-only).  This restriction is
-// very lightweight since subscription lists are dynamic.  This
-// constant is only used for ACE_ES_Simple_Set in Event_Channel.* for
-// disconnecting consumers.  Since these objects are allocated off the
-// stack, we can increase this number without requiring more heap
-// memory.
-
-// = Predefined event types.  All application defined types should be
-// relative to ACE_ES_EVENT_UNDEFINED.
-const u_long ACE_ES_EVENT_ANY = 0;
-const u_long ACE_ES_EVENT_SHUTDOWN = 1;
-const u_long ACE_ES_EVENT_ACT = 2;
-const u_long ACE_ES_EVENT_NOTIFICATION = 3;
-const u_long ACE_ES_EVENT_TIMEOUT = 4;
-const u_long ACE_ES_EVENT_INTERVAL_TIMEOUT = 5;
-const u_long ACE_ES_EVENT_DEADLINE_TIMEOUT = 6;
-const u_long ACE_ES_GLOBAL_DESIGNATOR = 7;
-const u_long ACE_ES_CONJUNCTION_DESIGNATOR = 8;
-const u_long ACE_ES_DISJUNCTION_DESIGNATOR = 9;
-const u_long ACE_ES_EVENT_UNDEFINED = 16;
-
-// The max number of priorities provided by the target platform.
-// TODO: This should be defined in ACE (somehow) and only mapped here
-// to some variables (and even that is doubtful).
-const long ACE_Scheduler_MAX_PRIORITIES = 5;
-
-const u_long ACE_Scheduler_Rates[ACE_Scheduler_MAX_PRIORITIES] = {
-  250000, 500000, 1000000, 2000000, 10000000 };
-
-// The minimum preemption priority.
-const long ACE_Scheduler_MIN_PREEMPTION_PRIORITY = 
-      ACE_Scheduler_MAX_PRIORITIES - 1;
-// Max preemption priority.
-const long ACE_Scheduler_MAX_PREEMPTION_PRIORITY = 0;
-
-// This is the maximum sub priority.
-const u_long ACE_Scheduler_MAX_SUB_PRIORITY = 
-      ACE_Message_Block::MB_USER - 1;
-
-// This is the minimum sub priority.
-const u_long ACE_Scheduler_MIN_SUB_PRIORITY =
-      ACE_Message_Block::MB_NORMAL;
-
-typedef ACE_Thread_Mutex ACE_ES_MUTEX;
-typedef ACE_Guard<ACE_ES_MUTEX> ACE_ES_GUARD;
-
-typedef ACE_RW_Thread_Mutex ACE_ES_RW_LOCK;
-typedef ACE_Write_Guard<ACE_ES_RW_LOCK> ACE_ES_WGUARD;
-typedef ACE_Read_Guard<ACE_ES_RW_LOCK> ACE_ES_RGUARD;
-
-// ************************************************************
-// Channel configuration parameters.
-
-// ACE_ES_DISPATCHING_MODULE determines what Dispatching Module is
-// used by the channel.  ACE_ES_Dispatching_Base is a null dispatcher
-// that can be used to build an EFD.
-#define ACE_ES_DISPATCHING_MODULE ACE_ES_Priority_Dispatching
-//#define ACE_ES_DISPATCHING_MODULE ACE_ES_Dispatching_Base
-
-// This is the number of threads spawned for *each* priority queue in
-// the channel's Dispatching Module.  This is used by the channel when
-// creating the dispatch module.
-const int THREADS_PER_DISPATCH_QUEUE = 1;
-
-// This is the chunk size of the cached allocator for
-// ACE_ES_Event_Container.
-const int ACE_ES_EVENT_CONTAINER_MEMORY_POOL = 1024;
-const int ACE_ES_EVENT_MEMORY_POOL = 1024;
-const int ACE_ES_DISPATCH_REQUEST_MEMORY_POOL = 1024;
-
-#endif /* ACE_ES_CONSTANTS_H */
diff --git a/TAO/orbsvcs/lib/Event_Utilities.cpp b/TAO/orbsvcs/lib/Event_Utilities.cpp
deleted file mode 100644
index 75394f34e2b..00000000000
--- a/TAO/orbsvcs/lib/Event_Utilities.cpp
+++ /dev/null
@@ -1,131 +0,0 @@
-//
-// $Id$
-//
-#include "Event_Utilities.h"
-
-#if !defined (__ACE_INLINE__)
-#include "Event_Utilities.i"
-#endif /* __ACE_INLINE__ */
-
-ACE_ConsumerQOS_Factory::ACE_ConsumerQOS_Factory (void) :
-  qos_ (),
-  designator_set_ (0)
-{
-}
-
-ACE_ConsumerQOS_Factory::~ACE_ConsumerQOS_Factory (void)
-{
-}
-
-int
-ACE_ConsumerQOS_Factory::start_conjunction_group (void)
-{
-  int l = qos_.dependencies.length ();
-  qos_.dependencies.length (l + 1);
-  qos_.dependencies[l].event_.type_ = ACE_ES_CONJUNCTION_DESIGNATOR;
-  // TODO: qos_.dependencies[l].event_.data_.lval (0);
-  designator_set_ = 1;
-  return 0;
-}
-
-int
-ACE_ConsumerQOS_Factory::start_disjunction_group (void)
-{
-  int l = qos_.dependencies.length ();
-  qos_.dependencies.length (l + 1);
-  qos_.dependencies[l].event_.type_ = ACE_ES_DISJUNCTION_DESIGNATOR;
-  // TODO: qos_.dependencies[l].event_.data_.lval (0);
-  designator_set_ = 1;
-  return 0;
-}
-
-int
-ACE_ConsumerQOS_Factory::insert (const RtecEventChannelAdmin::Dependency &subscribe)
-{
-  RtecScheduler::RT_Info dummy;
-  // Make sure that a designator is first.
-  if (designator_set_ == 0)
-    {
-      int l = qos_.dependencies.length ();
-      qos_.dependencies.length (l + 1);
-      qos_.dependencies[l].event_.type_ = ACE_ES_GLOBAL_DESIGNATOR;
-      // TODO: IDL union qos_.dependencies[l].event_.data_.lval (0);
-      designator_set_ = 1;
-    }
-
-  int l = qos_.dependencies.length ();
-  qos_.dependencies.length (l + 1);
-  qos_.dependencies[l] = subscribe;
-  // TODO: IDL union qos_.dependencies[l].event_.data_.lval (0);
-  return 0;
-}
-
-void event_debug (const char* p,
-		  const RtecEventComm::Event& event)
-{
-  int l = ACE_OS::strlen (p);
-  ACE_DEBUG ((LM_DEBUG,
-	      "%*.*s - event.source: %d\n"
-	      "%*.*s   event.type: %d\n"
-	      "%*.*s   event.time: %f\n",
-	      l, l, p, event.source_,
-	      l, l, p, event.type_,
-	      l, l, p, event.time_));
-}
-
-void
-ACE_ConsumerQOS_Factory::debug (const RtecEventChannelAdmin::ConsumerQOS& qos)
-{
-  ACE_DEBUG ((LM_DEBUG, "ConsumerQOS { \n"));
-
-  for (u_int i = 0; i < qos.dependencies.length (); ++i)
-    {
-      char buf[128];
-      ACE_OS::sprintf (buf, " dep[%d]", i);
-      event_debug (buf, qos.dependencies[i].event_);
-      ACE_DEBUG ((LM_DEBUG, "%s  rt_info: %d\n",
-		  buf, qos.dependencies[i].rt_info));
-    }
-  ACE_DEBUG ((LM_DEBUG, "}\n"));
-}
-
-// ************************************************************
-
-ACE_SupplierQOS_Factory::ACE_SupplierQOS_Factory (void) :
-  qos_ ()
-{
-}
-
-int
-ACE_SupplierQOS_Factory::insert (RtecEventComm::EventSourceID sid,
-				 RtecEventComm::EventType type,
-				 RtecScheduler::handle_t rt_info,
-				 u_int ncalls)
-{
-  int l = qos_.publications_.length ();
-  qos_.publications_.length (l + 1);
-  qos_.publications_[l].event_.source_ = sid;
-  qos_.publications_[l].event_.type_ = type;
-  // TODO: IDL union qos_.publications_[l].event_.data_.lval (0);
-  qos_.publications_[l].dependency_info_.rt_info = rt_info;
-  qos_.publications_[l].dependency_info_.number_of_calls = ncalls;
-  return 0;
-}
-
-void ACE_SupplierQOS_Factory::debug (const RtecEventChannelAdmin::SupplierQOS& qos)
-{
-  ACE_DEBUG ((LM_DEBUG, "ConsumerQOS { \n"));
-  for (u_int i = 0; i < qos.publications_.length (); ++i)
-    {
-      char buf[128];
-      ACE_OS::sprintf (buf, " publications[%d]", i);
-      event_debug (buf, qos.publications_[i].event_);
-      ACE_DEBUG ((LM_DEBUG,
-		  "%s   dependency_info.rt_info: %d\n"
-		  "%s   dependency_info.number_of_calls: %d\n",
-		  buf, qos.publications_[i].dependency_info_.rt_info,
-		  buf, qos.publications_[i].dependency_info_.number_of_calls));
-	}
-  ACE_DEBUG ((LM_DEBUG, "}\n"));
-
-}
diff --git a/TAO/orbsvcs/lib/Event_Utilities.h b/TAO/orbsvcs/lib/Event_Utilities.h
deleted file mode 100644
index ea6ab98f631..00000000000
--- a/TAO/orbsvcs/lib/Event_Utilities.h
+++ /dev/null
@@ -1,221 +0,0 @@
-/* -*- C++ -*- */
-
-// ============================================================================
-//
-// = LIBRARY
-//    ace ORB
-// 
-// = FILENAME
-//    Event_Utilities
-//
-// = AUTHOR
-//    Tim Harrison (harrison@cs.wustl.edu)
-//
-// = DESCRIPTION
-// ============================================================================
-
-#ifndef ACE_EVENT_UTILITIES_H
-#define ACE_EVENT_UTILITIES_H
-
-#include "RtecEventChannelAdminC.h"
-#include "Event_Service_Constants.h"
-
-class ACE_ConsumerQOS_Factory
-// = TITLE 
-//    Consumer QOS Factory
-//
-// = DESCRIPTION
-//
-//    This class allows easy (free from CORBA IDL constraints)
-//    construction of RtecEventChannelAdmin::ConsumerQOS structures.
-//
-// = CORRELATIONS
-//
-//    ACE_ConsumerQOS_Factory separates subscriptions into conjunction
-//    and disjunction groups.  A group can be thought of as a set of
-//    events inside parenthesis: (A+B+C), where A,B, and C are
-//    events.
-//
-//    The following code would be used to represent (A+B) | (B+C):
-//
-//    ACE_ConsumerQOS_Factor factory;
-//    factory.start_conjunction_group ();
-//    factory.insert (A);
-//    factory.insert (B);
-//    factory.start_conjunction_group ();
-//    factory.insert (B);
-//    factory.insert (C);
-//
-//    The following code would be used to represent (A|B) | (B|C):
-//
-//    ACE_ConsumerQOS_Factor factory;
-//    factory.start_disjunction_group ();
-//    factory.insert (A);
-//    factory.insert (B);
-//    factory.start_disjunction_group ();
-//    factory.insert (B);
-//    factory.insert (C);
-//
-//    First, this may not seem to be initially useful, as (A|B) |
-//    (B|C) seems the same as A|B|C.  However, this form does have a
-//    significant use when deadline timers are specified (described
-//    below). Note that groups end with the next call to
-//    start_XX_group.  Groups are always OR'd together.  That is,
-//    there is no way to directly build (A|B|C) + (D|E|F).  You can
-//    always expand the previous statement to the OR of multiple ANDs.
-//
-// = TIMEOUTS
-//
-//    There are two types of timeout types defined in
-//    Event_Service_Constants.h.
-//
-//    ACE_ES_EVENT_INTERVAL_TIMEOUT - the consumer wants to receive a
-//    timeout every N seconds. 
-//
-//    ACE_ES_EVENT_DEADLINE_TIMEOUT - the consumer wants the timeout
-//    if and only if some dependencies are not resolved first.
-//
-//    Using these timeouts with the correlations discussed above, we
-//    can construct four different timer semantics: Interval Timer,
-//    Deadline Timer, Interval Correlation, Deadline Correlation:
-//
-//    Interval Timer:
-//
-//    	(A+B+C) | (D+E+F) | (G+H+I) | IntervalTimeout
-//
-//    	This registers to receive an interval timeout regardless of
-//    	other dependencies.  Event if events occur, the interval
-//    	timeout will still be sent.
-//
-//    Deadline Timer:
-//
-//    	(A+B+C) | (D+E+F) | (G+H+I) | DeadlineTimeout
-//
-//    	This registers to receive the deadline timeout ONLY if no
-//    	other events occur.  If a single event is sent to the
-//    	consumer, the timer is cancelled and rescheduled.
-//
-//    Deadline Correlation:
-//
-//    	(A+B+C) | (D+E+F) | (G+H+DeadlineTimeout)
-//
-//    	If G and H do not occur within DeadlineTimeout time, a
-//    	deadline timeout is sent.  It is cancelled and rescheduled if G
-//    	and H occur.
-//
-//    Interval Correlation:
-//
-//    	(A+B+C) | (D+E+F) | (G+H+IntervalTimeout)
-//
-//    	G+H+IntervalTimeout are sent ONLY after all have occurred.  If
-//    	G+H occur, they are queued until IntervalTimeout occurs.  If
-//    	IntervalTimeout occurs, it is queued until G+H occur.
-{
-public:
-  ACE_ConsumerQOS_Factory (void);
-  // Default construction.
-
-  ~ACE_ConsumerQOS_Factory (void);
-  // Death and destruction.
-
-  int start_conjunction_group (void);
-  // This signifies that the consumer needs the AND of all following
-  // insert calls (up until the next start_XX_group call).  Returns 0
-  // on success, -1 on failure.
-
-  int start_disjunction_group (void);
-  // This signifies that the consumer needs the OR of all following
-  // insert calls (up until the next start_XX_group call).  Returns 0
-  // on success, -1 on failure.
-
-  // = Insert operations add to the current conjunction or disjunction
-  // group.  These return 0 on success, -1 on failure.  Before insert
-  // is called, a start_XX_group method should be called.  If a
-  // start_XX_group method is not called, start_conjunction_group is
-  // assumed.
-
-  int insert (const RtecEventChannelAdmin::Dependency &subscribe);
-  // Insert the <subscribe> structure describing the event and
-  // receiving method into the current group.
-
-  int insert (RtecEventComm::EventSourceID source,
-	      RtecEventComm::EventType type,
-	      RtecScheduler::handle_t rt_info);
-  // Insert source/type dependency.  <source> of the event (may be
-  // zero), <type> of the event.  <rt_info> describes the method that
-  // will handle the <source>/<type> events.
-
-  int insert_type (RtecEventComm::EventType type,
-		   RtecScheduler::handle_t rt_info);
-  // Insert type-only dependency.
-
-  int insert_source (RtecEventComm::EventSourceID source,
-		     RtecScheduler::handle_t rt_info);
-  // Insert source-only dependency.
-
-  int insert_time (RtecEventComm::EventType type,
-		   RtecEventComm::Time interval,
-		   RtecScheduler::handle_t rt_info);
-  // Register temporal dependency.  <type> designates interval or
-  // deadline timeout that will occur every <interval>.
-
-  int insert_act (RtecEventComm::EventData act);
-  // This will be inserted as type ACE_ES_EVENT_ACT.
-
-  // = Conversion operators.  The Event Channel takes ConsumerQOS
-  // objects.
-
-  const RtecEventChannelAdmin::ConsumerQOS &get_ConsumerQOS (void);
-  // Allows conversions to ConsumerQOS, which is expected by the
-  // PushSupplierProxy::connect_push_consumer interface.
-
-  operator const RtecEventChannelAdmin::ConsumerQOS &(void);
-  // Calls this->get_ConsumerQOS.
-
-  static void debug (const RtecEventChannelAdmin::ConsumerQOS& qos);
-
-private:
-  RtecEventChannelAdmin::ConsumerQOS qos_;
-  // The representation to be sent to the channel.
-
-  int designator_set_;
-  // Whether a start_XX_group has been called yet.  This is to make
-  // sure that a designator is placed in the subscription list first.
-};
-
-// ************************************************************
-
-class ACE_SupplierQOS_Factory
-{
-public:
-  ACE_SupplierQOS_Factory (void);
-  // Default construction.
-
-  int insert (RtecEventComm::EventSourceID sid,
-	      RtecEventComm::EventType type,
-	      RtecScheduler::handle_t rtinfo,
-	      u_int ncalls);
-  // Publish <sid> and <type> that is generate by a method described by
-  // <rtinfo>.  The method generates <type> <ncalls> number of times
-  // per "iteration."
-
-  const RtecEventChannelAdmin::SupplierQOS &get_SupplierQOS (void);
-  // Allows conversions to SupplierQOS, which is expected by the
-  // PushSupplierProxy::connect_push_supplier interface.
-
-  operator const RtecEventChannelAdmin::SupplierQOS &(void);
-  // Calls this->get_SupplierQOS.
-
-  static void debug (const RtecEventChannelAdmin::SupplierQOS& qos);
-
-private:
-  RtecEventChannelAdmin::SupplierQOS qos_;
-  // Representation needed by channel.
-};
-
-
-#if defined (__ACE_INLINE__)
-#include "Event_Utilities.i"
-#endif /* __ACE_INLINE__ */
-#endif /* ACE_EVENT_UTILITIES_H */
-
diff --git a/TAO/orbsvcs/lib/Event_Utilities.i b/TAO/orbsvcs/lib/Event_Utilities.i
deleted file mode 100644
index 030cb0273eb..00000000000
--- a/TAO/orbsvcs/lib/Event_Utilities.i
+++ /dev/null
@@ -1,88 +0,0 @@
-/* -*- C++ -*- */
-
-ACE_INLINE int
-ACE_ConsumerQOS_Factory::insert (RtecEventComm::EventSourceID source,
-				 RtecEventComm::EventType type,
-				 RtecScheduler::handle_t rt_info)
-{
-  RtecEventChannelAdmin::Dependency dependency;
-  dependency.event_.source_ = source;
-  dependency.event_.type_ = type;
-  dependency.event_.time_ = 0;
-  dependency.rt_info = rt_info;
-  return this->insert (dependency);
-}
-
-ACE_INLINE int
-ACE_ConsumerQOS_Factory::insert_type (RtecEventComm::EventType type,
-				      RtecScheduler::handle_t rt_info)
-{
-  RtecEventChannelAdmin::Dependency dependency;
-  dependency.event_.source_ = 0;
-  dependency.event_.type_ = type;
-  dependency.event_.time_ = 0;
-  dependency.rt_info = rt_info;
-  return this->insert (dependency);
-}
-
-ACE_INLINE int
-ACE_ConsumerQOS_Factory::insert_source (RtecEventComm::EventSourceID source,
-					RtecScheduler::handle_t rt_info)
-{
-  RtecEventChannelAdmin::Dependency dependency;
-  dependency.event_.source_ = source;
-  dependency.event_.type_ = ACE_ES_EVENT_ANY;
-  dependency.rt_info = rt_info;
-  return this->insert (dependency);
-}
-
-ACE_INLINE int
-ACE_ConsumerQOS_Factory::insert_time (RtecEventComm::EventType type,
-				      RtecEventComm::Time interval,
-				      RtecScheduler::handle_t rt_info)
-{
-  RtecEventChannelAdmin::Dependency dependency;
-  dependency.event_.source_ = 0;
-  dependency.event_.type_ = type;
-  dependency.event_.time_ = interval;
-  dependency.rt_info = rt_info;
-  return this->insert (dependency);
-}
-
-ACE_INLINE int
-ACE_ConsumerQOS_Factory::insert_act (RtecEventComm::EventData act)
-{
-  RtecEventChannelAdmin::Dependency dependency;
-  dependency.event_.source_ = 0;
-  dependency.event_.type_ = ACE_ES_EVENT_ACT;
-  dependency.event_.time_ = 0;
-  dependency.event_.data_ = act;
-  return this->insert (dependency);
-}
-
-ACE_INLINE const RtecEventChannelAdmin::ConsumerQOS& 
-ACE_ConsumerQOS_Factory::get_ConsumerQOS (void)
-{
-  return qos_;
-}
-
-ACE_INLINE
-ACE_ConsumerQOS_Factory::operator const RtecEventChannelAdmin::ConsumerQOS& (void)
-{
-  return qos_;
-}
-
-// ************************************************************
-
-ACE_INLINE const RtecEventChannelAdmin::SupplierQOS& 
-ACE_SupplierQOS_Factory::get_SupplierQOS (void)
-{
-  return qos_;
-}
-
-ACE_INLINE
-ACE_SupplierQOS_Factory::operator const RtecEventChannelAdmin::SupplierQOS& (void)
-{
-  return qos_;
-}
-
diff --git a/TAO/orbsvcs/lib/Makefile b/TAO/orbsvcs/lib/Makefile
deleted file mode 100644
index edeef9c07f1..00000000000
--- a/TAO/orbsvcs/lib/Makefile
+++ /dev/null
@@ -1,1873 +0,0 @@
-#----------------------------------------------------------------------------
-#
-#	$Id$
-#
-#----------------------------------------------------------------------------
-
-MAKEFILE = Makefile
-LIBNAME  = liborbsvcs
-LIB      = $(LIBNAME).a
-SHLIB    = $(LIBNAME).$(SOEXT)
-
-IDL_FILES = \
-	CosNamingC \
-	CosNamingS \
-	RtecSchedulerC \
-	RtecSchedulerS \
-	RtecEventCommC \
-	RtecEventCommS \
-	RtecEventChannelAdminC \
-	RtecEventChannelAdminS \
-
-FILES= $(IDL_FILES) \
-	Event_Utilities \
-	Scheduler_Factory \
-	Runtime_Scheduler \
-	Scheduler_Utilities \
-
-DEFS    = $(addsuffix .h,$(FILES))
-LSRC	= $(addsuffix .cpp,$(FILES))
-
-LIBS 	+= -lTAO -lACE
-
-#----------------------------------------------------------------------------
-#	Include macros and targets
-#----------------------------------------------------------------------------
-
-include	$(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-include	$(ACE_ROOT)/include/makeinclude/macros.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.common.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.lib.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.bin.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
-
-#----------------------------------------------------------------------------
-#	Local targets (and local hacks)
-#----------------------------------------------------------------------------
-
-ifndef TAO_ROOT
-TAO_ROOT = $(ACE_ROOT)/TAO
-endif
-
-LDFLAGS += -L$(TAO_ROOT)/tao
-CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/tao/compat $(TSS_ORB_FLAG)#-H
-
-# @@ Commented out until no more hand-crafting is needed, right now the
-# main problem is the ACE_Export macros for NT.
-
-CosNamingC.cpp CosNamingS.cpp CosNamingC.h CosNamingS.h: CosNaming.idl
-	$(TAO_ROOT)/TAO_IDL/tao_idl $^
-
-RtecSchedulerC.cpp RtecSchedulerS.cpp RtecSchedulerC.h RtecSchedulerS.h: RtecScheduler.idl
-	$(TAO_ROOT)/TAO_IDL/tao_idl $^
-
-RtecEventCommC.cpp RtecEventCommS.cpp RtecEventCommC.h RtecEventCommS.h: RtecEventComm.idl
-	$(TAO_ROOT)/TAO_IDL/tao_idl $^
-
-RtecEventChannelAdminC.cpp RtecEventChannelAdminS.cpp RtecEventChannelAdminC.h RtecEventChannelAdminS.h: RtecEventChannelAdmin.idl
-	$(TAO_ROOT)/TAO_IDL/tao_idl $^
-
-clean:
-	-/bin/rm -rf *.o Log $(BIN) obj.* core Templates.DB .make.state
- 
-realclean: clean
-	-/bin/rm -rf CosNamingC.* CosNamingS.* 
-
-
-# DO NOT DELETE THIS LINE -- g++dep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-
-.obj/CosNamingC.o .shobj/CosNamingC.so: CosNamingC.cpp CosNamingC.h \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/stdcpp.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/Task_T.i \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Svc_Handler.i \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(TAO_ROOT)/tao/orbconf.h \
- $(TAO_ROOT)/tao/orb.h \
- $(TAO_ROOT)/tao/corbacom.h \
- $(TAO_ROOT)/tao/object.h \
- $(TAO_ROOT)/tao/align.h \
- $(TAO_ROOT)/tao/sequence.h \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/any.h \
- $(TAO_ROOT)/tao/poa.h \
- $(TAO_ROOT)/tao/tao_internals.h \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/client_factory.h \
- $(TAO_ROOT)/tao/server_factory.h \
- $(TAO_ROOT)/tao/default_client.h \
- $(TAO_ROOT)/tao/default_server.h \
- $(TAO_ROOT)/tao/except.h \
- $(TAO_ROOT)/tao/orbobj.h \
- $(TAO_ROOT)/tao/nvlist.h \
- $(TAO_ROOT)/tao/principa.h \
- $(TAO_ROOT)/tao/request.h \
- $(TAO_ROOT)/tao/svrrqst.h \
- $(TAO_ROOT)/tao/typecode.h \
- $(TAO_ROOT)/tao/marshal.h \
- $(TAO_ROOT)/tao/cdr.h \
- $(TAO_ROOT)/tao/stub.h \
- $(TAO_ROOT)/tao/connect.h \
- $(TAO_ROOT)/tao/orb_core.h \
- $(TAO_ROOT)/tao/objtable.h \
- $(TAO_ROOT)/tao/optable.h \
- $(TAO_ROOT)/tao/debug.h \
- $(TAO_ROOT)/tao/iiopobj.h \
- $(TAO_ROOT)/tao/iioporb.h \
- $(TAO_ROOT)/tao/giop.h \
- $(TAO_ROOT)/tao/orb_core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(TAO_ROOT)/tao/corbacom.i \
- $(TAO_ROOT)/tao/sequence.i \
- $(TAO_ROOT)/tao/typecode.i \
- $(TAO_ROOT)/tao/any.i \
- $(TAO_ROOT)/tao/cdr.i \
- $(TAO_ROOT)/tao/stub.i \
- $(TAO_ROOT)/tao/object.i \
- $(TAO_ROOT)/tao/orbobj.i \
- $(TAO_ROOT)/tao/marshal.i \
- $(TAO_ROOT)/tao/poa.i \
- $(TAO_ROOT)/tao/giop.i \
- $(TAO_ROOT)/tao/iioporb.i \
- $(TAO_ROOT)/tao/iiopobj.i \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/server_factory.i \
- $(TAO_ROOT)/tao/default_client.i \
- $(TAO_ROOT)/tao/default_server.i \
- $(TAO_ROOT)/tao/connect.i \
- $(TAO_ROOT)/tao/singletons.h \
- CosNamingC.i
-.obj/CosNamingS.o .shobj/CosNamingS.so: CosNamingS.cpp CosNamingS.h CosNamingC.h \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/stdcpp.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/Task_T.i \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Svc_Handler.i \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(TAO_ROOT)/tao/orbconf.h \
- $(TAO_ROOT)/tao/orb.h \
- $(TAO_ROOT)/tao/corbacom.h \
- $(TAO_ROOT)/tao/object.h \
- $(TAO_ROOT)/tao/align.h \
- $(TAO_ROOT)/tao/sequence.h \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/any.h \
- $(TAO_ROOT)/tao/poa.h \
- $(TAO_ROOT)/tao/tao_internals.h \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/client_factory.h \
- $(TAO_ROOT)/tao/server_factory.h \
- $(TAO_ROOT)/tao/default_client.h \
- $(TAO_ROOT)/tao/default_server.h \
- $(TAO_ROOT)/tao/except.h \
- $(TAO_ROOT)/tao/orbobj.h \
- $(TAO_ROOT)/tao/nvlist.h \
- $(TAO_ROOT)/tao/principa.h \
- $(TAO_ROOT)/tao/request.h \
- $(TAO_ROOT)/tao/svrrqst.h \
- $(TAO_ROOT)/tao/typecode.h \
- $(TAO_ROOT)/tao/marshal.h \
- $(TAO_ROOT)/tao/cdr.h \
- $(TAO_ROOT)/tao/stub.h \
- $(TAO_ROOT)/tao/connect.h \
- $(TAO_ROOT)/tao/orb_core.h \
- $(TAO_ROOT)/tao/objtable.h \
- $(TAO_ROOT)/tao/optable.h \
- $(TAO_ROOT)/tao/debug.h \
- $(TAO_ROOT)/tao/iiopobj.h \
- $(TAO_ROOT)/tao/iioporb.h \
- $(TAO_ROOT)/tao/giop.h \
- $(TAO_ROOT)/tao/orb_core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(TAO_ROOT)/tao/corbacom.i \
- $(TAO_ROOT)/tao/sequence.i \
- $(TAO_ROOT)/tao/typecode.i \
- $(TAO_ROOT)/tao/any.i \
- $(TAO_ROOT)/tao/cdr.i \
- $(TAO_ROOT)/tao/stub.i \
- $(TAO_ROOT)/tao/object.i \
- $(TAO_ROOT)/tao/orbobj.i \
- $(TAO_ROOT)/tao/marshal.i \
- $(TAO_ROOT)/tao/poa.i \
- $(TAO_ROOT)/tao/giop.i \
- $(TAO_ROOT)/tao/iioporb.i \
- $(TAO_ROOT)/tao/iiopobj.i \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/server_factory.i \
- $(TAO_ROOT)/tao/default_client.i \
- $(TAO_ROOT)/tao/default_server.i \
- $(TAO_ROOT)/tao/connect.i \
- $(TAO_ROOT)/tao/singletons.h \
- CosNamingC.i CosNamingS.i
-.obj/RtecSchedulerC.o .shobj/RtecSchedulerC.so: RtecSchedulerC.cpp RtecSchedulerC.h \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/stdcpp.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/Task_T.i \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Svc_Handler.i \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(TAO_ROOT)/tao/orbconf.h \
- $(TAO_ROOT)/tao/orb.h \
- $(TAO_ROOT)/tao/corbacom.h \
- $(TAO_ROOT)/tao/object.h \
- $(TAO_ROOT)/tao/align.h \
- $(TAO_ROOT)/tao/sequence.h \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/any.h \
- $(TAO_ROOT)/tao/poa.h \
- $(TAO_ROOT)/tao/tao_internals.h \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/client_factory.h \
- $(TAO_ROOT)/tao/server_factory.h \
- $(TAO_ROOT)/tao/default_client.h \
- $(TAO_ROOT)/tao/default_server.h \
- $(TAO_ROOT)/tao/except.h \
- $(TAO_ROOT)/tao/orbobj.h \
- $(TAO_ROOT)/tao/nvlist.h \
- $(TAO_ROOT)/tao/principa.h \
- $(TAO_ROOT)/tao/request.h \
- $(TAO_ROOT)/tao/svrrqst.h \
- $(TAO_ROOT)/tao/typecode.h \
- $(TAO_ROOT)/tao/marshal.h \
- $(TAO_ROOT)/tao/cdr.h \
- $(TAO_ROOT)/tao/stub.h \
- $(TAO_ROOT)/tao/connect.h \
- $(TAO_ROOT)/tao/orb_core.h \
- $(TAO_ROOT)/tao/objtable.h \
- $(TAO_ROOT)/tao/optable.h \
- $(TAO_ROOT)/tao/debug.h \
- $(TAO_ROOT)/tao/iiopobj.h \
- $(TAO_ROOT)/tao/iioporb.h \
- $(TAO_ROOT)/tao/giop.h \
- $(TAO_ROOT)/tao/orb_core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(TAO_ROOT)/tao/corbacom.i \
- $(TAO_ROOT)/tao/sequence.i \
- $(TAO_ROOT)/tao/typecode.i \
- $(TAO_ROOT)/tao/any.i \
- $(TAO_ROOT)/tao/cdr.i \
- $(TAO_ROOT)/tao/stub.i \
- $(TAO_ROOT)/tao/object.i \
- $(TAO_ROOT)/tao/orbobj.i \
- $(TAO_ROOT)/tao/marshal.i \
- $(TAO_ROOT)/tao/poa.i \
- $(TAO_ROOT)/tao/giop.i \
- $(TAO_ROOT)/tao/iioporb.i \
- $(TAO_ROOT)/tao/iiopobj.i \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/server_factory.i \
- $(TAO_ROOT)/tao/default_client.i \
- $(TAO_ROOT)/tao/default_server.i \
- $(TAO_ROOT)/tao/connect.i \
- $(TAO_ROOT)/tao/singletons.h \
- RtecSchedulerC.i
-.obj/RtecSchedulerS.o .shobj/RtecSchedulerS.so: RtecSchedulerS.cpp RtecSchedulerS.h RtecSchedulerC.h \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/stdcpp.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/Task_T.i \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Svc_Handler.i \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(TAO_ROOT)/tao/orbconf.h \
- $(TAO_ROOT)/tao/orb.h \
- $(TAO_ROOT)/tao/corbacom.h \
- $(TAO_ROOT)/tao/object.h \
- $(TAO_ROOT)/tao/align.h \
- $(TAO_ROOT)/tao/sequence.h \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/any.h \
- $(TAO_ROOT)/tao/poa.h \
- $(TAO_ROOT)/tao/tao_internals.h \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/client_factory.h \
- $(TAO_ROOT)/tao/server_factory.h \
- $(TAO_ROOT)/tao/default_client.h \
- $(TAO_ROOT)/tao/default_server.h \
- $(TAO_ROOT)/tao/except.h \
- $(TAO_ROOT)/tao/orbobj.h \
- $(TAO_ROOT)/tao/nvlist.h \
- $(TAO_ROOT)/tao/principa.h \
- $(TAO_ROOT)/tao/request.h \
- $(TAO_ROOT)/tao/svrrqst.h \
- $(TAO_ROOT)/tao/typecode.h \
- $(TAO_ROOT)/tao/marshal.h \
- $(TAO_ROOT)/tao/cdr.h \
- $(TAO_ROOT)/tao/stub.h \
- $(TAO_ROOT)/tao/connect.h \
- $(TAO_ROOT)/tao/orb_core.h \
- $(TAO_ROOT)/tao/objtable.h \
- $(TAO_ROOT)/tao/optable.h \
- $(TAO_ROOT)/tao/debug.h \
- $(TAO_ROOT)/tao/iiopobj.h \
- $(TAO_ROOT)/tao/iioporb.h \
- $(TAO_ROOT)/tao/giop.h \
- $(TAO_ROOT)/tao/orb_core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(TAO_ROOT)/tao/corbacom.i \
- $(TAO_ROOT)/tao/sequence.i \
- $(TAO_ROOT)/tao/typecode.i \
- $(TAO_ROOT)/tao/any.i \
- $(TAO_ROOT)/tao/cdr.i \
- $(TAO_ROOT)/tao/stub.i \
- $(TAO_ROOT)/tao/object.i \
- $(TAO_ROOT)/tao/orbobj.i \
- $(TAO_ROOT)/tao/marshal.i \
- $(TAO_ROOT)/tao/poa.i \
- $(TAO_ROOT)/tao/giop.i \
- $(TAO_ROOT)/tao/iioporb.i \
- $(TAO_ROOT)/tao/iiopobj.i \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/server_factory.i \
- $(TAO_ROOT)/tao/default_client.i \
- $(TAO_ROOT)/tao/default_server.i \
- $(TAO_ROOT)/tao/connect.i \
- $(TAO_ROOT)/tao/singletons.h \
- RtecSchedulerC.i RtecSchedulerS.i
-.obj/RtecEventCommC.o .shobj/RtecEventCommC.so: RtecEventCommC.cpp RtecEventCommC.h \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/stdcpp.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/Task_T.i \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Svc_Handler.i \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(TAO_ROOT)/tao/orbconf.h \
- $(TAO_ROOT)/tao/orb.h \
- $(TAO_ROOT)/tao/corbacom.h \
- $(TAO_ROOT)/tao/object.h \
- $(TAO_ROOT)/tao/align.h \
- $(TAO_ROOT)/tao/sequence.h \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/any.h \
- $(TAO_ROOT)/tao/poa.h \
- $(TAO_ROOT)/tao/tao_internals.h \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/client_factory.h \
- $(TAO_ROOT)/tao/server_factory.h \
- $(TAO_ROOT)/tao/default_client.h \
- $(TAO_ROOT)/tao/default_server.h \
- $(TAO_ROOT)/tao/except.h \
- $(TAO_ROOT)/tao/orbobj.h \
- $(TAO_ROOT)/tao/nvlist.h \
- $(TAO_ROOT)/tao/principa.h \
- $(TAO_ROOT)/tao/request.h \
- $(TAO_ROOT)/tao/svrrqst.h \
- $(TAO_ROOT)/tao/typecode.h \
- $(TAO_ROOT)/tao/marshal.h \
- $(TAO_ROOT)/tao/cdr.h \
- $(TAO_ROOT)/tao/stub.h \
- $(TAO_ROOT)/tao/connect.h \
- $(TAO_ROOT)/tao/orb_core.h \
- $(TAO_ROOT)/tao/objtable.h \
- $(TAO_ROOT)/tao/optable.h \
- $(TAO_ROOT)/tao/debug.h \
- $(TAO_ROOT)/tao/iiopobj.h \
- $(TAO_ROOT)/tao/iioporb.h \
- $(TAO_ROOT)/tao/giop.h \
- $(TAO_ROOT)/tao/orb_core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(TAO_ROOT)/tao/corbacom.i \
- $(TAO_ROOT)/tao/sequence.i \
- $(TAO_ROOT)/tao/typecode.i \
- $(TAO_ROOT)/tao/any.i \
- $(TAO_ROOT)/tao/cdr.i \
- $(TAO_ROOT)/tao/stub.i \
- $(TAO_ROOT)/tao/object.i \
- $(TAO_ROOT)/tao/orbobj.i \
- $(TAO_ROOT)/tao/marshal.i \
- $(TAO_ROOT)/tao/poa.i \
- $(TAO_ROOT)/tao/giop.i \
- $(TAO_ROOT)/tao/iioporb.i \
- $(TAO_ROOT)/tao/iiopobj.i \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/server_factory.i \
- $(TAO_ROOT)/tao/default_client.i \
- $(TAO_ROOT)/tao/default_server.i \
- $(TAO_ROOT)/tao/connect.i \
- $(TAO_ROOT)/tao/singletons.h \
- RtecEventCommC.i
-.obj/RtecEventCommS.o .shobj/RtecEventCommS.so: RtecEventCommS.cpp RtecEventCommS.h RtecEventCommC.h \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/stdcpp.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/Task_T.i \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Svc_Handler.i \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(TAO_ROOT)/tao/orbconf.h \
- $(TAO_ROOT)/tao/orb.h \
- $(TAO_ROOT)/tao/corbacom.h \
- $(TAO_ROOT)/tao/object.h \
- $(TAO_ROOT)/tao/align.h \
- $(TAO_ROOT)/tao/sequence.h \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/any.h \
- $(TAO_ROOT)/tao/poa.h \
- $(TAO_ROOT)/tao/tao_internals.h \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/client_factory.h \
- $(TAO_ROOT)/tao/server_factory.h \
- $(TAO_ROOT)/tao/default_client.h \
- $(TAO_ROOT)/tao/default_server.h \
- $(TAO_ROOT)/tao/except.h \
- $(TAO_ROOT)/tao/orbobj.h \
- $(TAO_ROOT)/tao/nvlist.h \
- $(TAO_ROOT)/tao/principa.h \
- $(TAO_ROOT)/tao/request.h \
- $(TAO_ROOT)/tao/svrrqst.h \
- $(TAO_ROOT)/tao/typecode.h \
- $(TAO_ROOT)/tao/marshal.h \
- $(TAO_ROOT)/tao/cdr.h \
- $(TAO_ROOT)/tao/stub.h \
- $(TAO_ROOT)/tao/connect.h \
- $(TAO_ROOT)/tao/orb_core.h \
- $(TAO_ROOT)/tao/objtable.h \
- $(TAO_ROOT)/tao/optable.h \
- $(TAO_ROOT)/tao/debug.h \
- $(TAO_ROOT)/tao/iiopobj.h \
- $(TAO_ROOT)/tao/iioporb.h \
- $(TAO_ROOT)/tao/giop.h \
- $(TAO_ROOT)/tao/orb_core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(TAO_ROOT)/tao/corbacom.i \
- $(TAO_ROOT)/tao/sequence.i \
- $(TAO_ROOT)/tao/typecode.i \
- $(TAO_ROOT)/tao/any.i \
- $(TAO_ROOT)/tao/cdr.i \
- $(TAO_ROOT)/tao/stub.i \
- $(TAO_ROOT)/tao/object.i \
- $(TAO_ROOT)/tao/orbobj.i \
- $(TAO_ROOT)/tao/marshal.i \
- $(TAO_ROOT)/tao/poa.i \
- $(TAO_ROOT)/tao/giop.i \
- $(TAO_ROOT)/tao/iioporb.i \
- $(TAO_ROOT)/tao/iiopobj.i \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/server_factory.i \
- $(TAO_ROOT)/tao/default_client.i \
- $(TAO_ROOT)/tao/default_server.i \
- $(TAO_ROOT)/tao/connect.i \
- $(TAO_ROOT)/tao/singletons.h \
- RtecEventCommC.i RtecEventCommS.i
-.obj/RtecEventChannelAdminC.o .shobj/RtecEventChannelAdminC.so: RtecEventChannelAdminC.cpp \
- RtecEventChannelAdminC.h \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/stdcpp.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/Task_T.i \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Svc_Handler.i \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(TAO_ROOT)/tao/orbconf.h \
- $(TAO_ROOT)/tao/orb.h \
- $(TAO_ROOT)/tao/corbacom.h \
- $(TAO_ROOT)/tao/object.h \
- $(TAO_ROOT)/tao/align.h \
- $(TAO_ROOT)/tao/sequence.h \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/any.h \
- $(TAO_ROOT)/tao/poa.h \
- $(TAO_ROOT)/tao/tao_internals.h \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/client_factory.h \
- $(TAO_ROOT)/tao/server_factory.h \
- $(TAO_ROOT)/tao/default_client.h \
- $(TAO_ROOT)/tao/default_server.h \
- $(TAO_ROOT)/tao/except.h \
- $(TAO_ROOT)/tao/orbobj.h \
- $(TAO_ROOT)/tao/nvlist.h \
- $(TAO_ROOT)/tao/principa.h \
- $(TAO_ROOT)/tao/request.h \
- $(TAO_ROOT)/tao/svrrqst.h \
- $(TAO_ROOT)/tao/typecode.h \
- $(TAO_ROOT)/tao/marshal.h \
- $(TAO_ROOT)/tao/cdr.h \
- $(TAO_ROOT)/tao/stub.h \
- $(TAO_ROOT)/tao/connect.h \
- $(TAO_ROOT)/tao/orb_core.h \
- $(TAO_ROOT)/tao/objtable.h \
- $(TAO_ROOT)/tao/optable.h \
- $(TAO_ROOT)/tao/debug.h \
- $(TAO_ROOT)/tao/iiopobj.h \
- $(TAO_ROOT)/tao/iioporb.h \
- $(TAO_ROOT)/tao/giop.h \
- $(TAO_ROOT)/tao/orb_core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(TAO_ROOT)/tao/corbacom.i \
- $(TAO_ROOT)/tao/sequence.i \
- $(TAO_ROOT)/tao/typecode.i \
- $(TAO_ROOT)/tao/any.i \
- $(TAO_ROOT)/tao/cdr.i \
- $(TAO_ROOT)/tao/stub.i \
- $(TAO_ROOT)/tao/object.i \
- $(TAO_ROOT)/tao/orbobj.i \
- $(TAO_ROOT)/tao/marshal.i \
- $(TAO_ROOT)/tao/poa.i \
- $(TAO_ROOT)/tao/giop.i \
- $(TAO_ROOT)/tao/iioporb.i \
- $(TAO_ROOT)/tao/iiopobj.i \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/server_factory.i \
- $(TAO_ROOT)/tao/default_client.i \
- $(TAO_ROOT)/tao/default_server.i \
- $(TAO_ROOT)/tao/connect.i \
- $(TAO_ROOT)/tao/singletons.h \
- RtecEventCommC.h RtecEventCommC.i RtecSchedulerC.h RtecSchedulerC.i \
- RtecEventChannelAdminC.i
-.obj/RtecEventChannelAdminS.o .shobj/RtecEventChannelAdminS.so: RtecEventChannelAdminS.cpp \
- RtecEventChannelAdminS.h RtecEventChannelAdminC.h \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/stdcpp.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/Task_T.i \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Svc_Handler.i \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(TAO_ROOT)/tao/orbconf.h \
- $(TAO_ROOT)/tao/orb.h \
- $(TAO_ROOT)/tao/corbacom.h \
- $(TAO_ROOT)/tao/object.h \
- $(TAO_ROOT)/tao/align.h \
- $(TAO_ROOT)/tao/sequence.h \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/any.h \
- $(TAO_ROOT)/tao/poa.h \
- $(TAO_ROOT)/tao/tao_internals.h \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/client_factory.h \
- $(TAO_ROOT)/tao/server_factory.h \
- $(TAO_ROOT)/tao/default_client.h \
- $(TAO_ROOT)/tao/default_server.h \
- $(TAO_ROOT)/tao/except.h \
- $(TAO_ROOT)/tao/orbobj.h \
- $(TAO_ROOT)/tao/nvlist.h \
- $(TAO_ROOT)/tao/principa.h \
- $(TAO_ROOT)/tao/request.h \
- $(TAO_ROOT)/tao/svrrqst.h \
- $(TAO_ROOT)/tao/typecode.h \
- $(TAO_ROOT)/tao/marshal.h \
- $(TAO_ROOT)/tao/cdr.h \
- $(TAO_ROOT)/tao/stub.h \
- $(TAO_ROOT)/tao/connect.h \
- $(TAO_ROOT)/tao/orb_core.h \
- $(TAO_ROOT)/tao/objtable.h \
- $(TAO_ROOT)/tao/optable.h \
- $(TAO_ROOT)/tao/debug.h \
- $(TAO_ROOT)/tao/iiopobj.h \
- $(TAO_ROOT)/tao/iioporb.h \
- $(TAO_ROOT)/tao/giop.h \
- $(TAO_ROOT)/tao/orb_core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(TAO_ROOT)/tao/corbacom.i \
- $(TAO_ROOT)/tao/sequence.i \
- $(TAO_ROOT)/tao/typecode.i \
- $(TAO_ROOT)/tao/any.i \
- $(TAO_ROOT)/tao/cdr.i \
- $(TAO_ROOT)/tao/stub.i \
- $(TAO_ROOT)/tao/object.i \
- $(TAO_ROOT)/tao/orbobj.i \
- $(TAO_ROOT)/tao/marshal.i \
- $(TAO_ROOT)/tao/poa.i \
- $(TAO_ROOT)/tao/giop.i \
- $(TAO_ROOT)/tao/iioporb.i \
- $(TAO_ROOT)/tao/iiopobj.i \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/server_factory.i \
- $(TAO_ROOT)/tao/default_client.i \
- $(TAO_ROOT)/tao/default_server.i \
- $(TAO_ROOT)/tao/connect.i \
- $(TAO_ROOT)/tao/singletons.h \
- RtecEventCommC.h RtecEventCommC.i RtecSchedulerC.h RtecSchedulerC.i \
- RtecEventChannelAdminC.i RtecEventCommS.h RtecEventCommS.i \
- RtecSchedulerS.h RtecSchedulerS.i RtecEventChannelAdminS.i
-.obj/Event_Utilities.o .shobj/Event_Utilities.so: Event_Utilities.cpp Event_Utilities.h \
- RtecEventChannelAdminC.h \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/stdcpp.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/Task_T.i \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Svc_Handler.i \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(TAO_ROOT)/tao/orbconf.h \
- $(TAO_ROOT)/tao/orb.h \
- $(TAO_ROOT)/tao/corbacom.h \
- $(TAO_ROOT)/tao/object.h \
- $(TAO_ROOT)/tao/align.h \
- $(TAO_ROOT)/tao/sequence.h \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/any.h \
- $(TAO_ROOT)/tao/poa.h \
- $(TAO_ROOT)/tao/tao_internals.h \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/client_factory.h \
- $(TAO_ROOT)/tao/server_factory.h \
- $(TAO_ROOT)/tao/default_client.h \
- $(TAO_ROOT)/tao/default_server.h \
- $(TAO_ROOT)/tao/except.h \
- $(TAO_ROOT)/tao/orbobj.h \
- $(TAO_ROOT)/tao/nvlist.h \
- $(TAO_ROOT)/tao/principa.h \
- $(TAO_ROOT)/tao/request.h \
- $(TAO_ROOT)/tao/svrrqst.h \
- $(TAO_ROOT)/tao/typecode.h \
- $(TAO_ROOT)/tao/marshal.h \
- $(TAO_ROOT)/tao/cdr.h \
- $(TAO_ROOT)/tao/stub.h \
- $(TAO_ROOT)/tao/connect.h \
- $(TAO_ROOT)/tao/orb_core.h \
- $(TAO_ROOT)/tao/objtable.h \
- $(TAO_ROOT)/tao/optable.h \
- $(TAO_ROOT)/tao/debug.h \
- $(TAO_ROOT)/tao/iiopobj.h \
- $(TAO_ROOT)/tao/iioporb.h \
- $(TAO_ROOT)/tao/giop.h \
- $(TAO_ROOT)/tao/orb_core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(TAO_ROOT)/tao/corbacom.i \
- $(TAO_ROOT)/tao/sequence.i \
- $(TAO_ROOT)/tao/typecode.i \
- $(TAO_ROOT)/tao/any.i \
- $(TAO_ROOT)/tao/cdr.i \
- $(TAO_ROOT)/tao/stub.i \
- $(TAO_ROOT)/tao/object.i \
- $(TAO_ROOT)/tao/orbobj.i \
- $(TAO_ROOT)/tao/marshal.i \
- $(TAO_ROOT)/tao/poa.i \
- $(TAO_ROOT)/tao/giop.i \
- $(TAO_ROOT)/tao/iioporb.i \
- $(TAO_ROOT)/tao/iiopobj.i \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/server_factory.i \
- $(TAO_ROOT)/tao/default_client.i \
- $(TAO_ROOT)/tao/default_server.i \
- $(TAO_ROOT)/tao/connect.i \
- $(TAO_ROOT)/tao/singletons.h \
- RtecEventCommC.h RtecEventCommC.i RtecSchedulerC.h RtecSchedulerC.i \
- RtecEventChannelAdminC.i Event_Service_Constants.h Event_Utilities.i
-.obj/Scheduler_Factory.o .shobj/Scheduler_Factory.so: Scheduler_Factory.cpp Runtime_Scheduler.h \
- RtecSchedulerS.h RtecSchedulerC.h \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/Task_T.i \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Svc_Handler.i \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(TAO_ROOT)/tao/orbconf.h \
- $(TAO_ROOT)/tao/orb.h \
- $(TAO_ROOT)/tao/corbacom.h \
- $(TAO_ROOT)/tao/object.h \
- $(TAO_ROOT)/tao/align.h \
- $(TAO_ROOT)/tao/sequence.h \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/any.h \
- $(TAO_ROOT)/tao/poa.h \
- $(TAO_ROOT)/tao/tao_internals.h \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/client_factory.h \
- $(TAO_ROOT)/tao/server_factory.h \
- $(TAO_ROOT)/tao/default_client.h \
- $(TAO_ROOT)/tao/default_server.h \
- $(TAO_ROOT)/tao/except.h \
- $(TAO_ROOT)/tao/orbobj.h \
- $(TAO_ROOT)/tao/nvlist.h \
- $(TAO_ROOT)/tao/principa.h \
- $(TAO_ROOT)/tao/request.h \
- $(TAO_ROOT)/tao/svrrqst.h \
- $(TAO_ROOT)/tao/typecode.h \
- $(TAO_ROOT)/tao/marshal.h \
- $(TAO_ROOT)/tao/cdr.h \
- $(TAO_ROOT)/tao/stub.h \
- $(TAO_ROOT)/tao/connect.h \
- $(TAO_ROOT)/tao/orb_core.h \
- $(TAO_ROOT)/tao/objtable.h \
- $(TAO_ROOT)/tao/optable.h \
- $(TAO_ROOT)/tao/debug.h \
- $(TAO_ROOT)/tao/iiopobj.h \
- $(TAO_ROOT)/tao/iioporb.h \
- $(TAO_ROOT)/tao/giop.h \
- $(TAO_ROOT)/tao/orb_core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(TAO_ROOT)/tao/corbacom.i \
- $(TAO_ROOT)/tao/sequence.i \
- $(TAO_ROOT)/tao/typecode.i \
- $(TAO_ROOT)/tao/any.i \
- $(TAO_ROOT)/tao/cdr.i \
- $(TAO_ROOT)/tao/stub.i \
- $(TAO_ROOT)/tao/object.i \
- $(TAO_ROOT)/tao/orbobj.i \
- $(TAO_ROOT)/tao/marshal.i \
- $(TAO_ROOT)/tao/poa.i \
- $(TAO_ROOT)/tao/giop.i \
- $(TAO_ROOT)/tao/iioporb.i \
- $(TAO_ROOT)/tao/iiopobj.i \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/server_factory.i \
- $(TAO_ROOT)/tao/default_client.i \
- $(TAO_ROOT)/tao/default_server.i \
- $(TAO_ROOT)/tao/connect.i \
- $(TAO_ROOT)/tao/singletons.h \
- RtecSchedulerC.i RtecSchedulerS.i Runtime_Scheduler.i \
- Scheduler_Factory.h CosNamingC.h CosNamingC.i Scheduler_Factory.i
-.obj/Runtime_Scheduler.o .shobj/Runtime_Scheduler.so: Runtime_Scheduler.cpp Runtime_Scheduler.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/stdcpp.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- RtecSchedulerS.h RtecSchedulerC.h \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/Task_T.i \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Svc_Handler.i \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(TAO_ROOT)/tao/orbconf.h \
- $(TAO_ROOT)/tao/orb.h \
- $(TAO_ROOT)/tao/corbacom.h \
- $(TAO_ROOT)/tao/object.h \
- $(TAO_ROOT)/tao/align.h \
- $(TAO_ROOT)/tao/sequence.h \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/any.h \
- $(TAO_ROOT)/tao/poa.h \
- $(TAO_ROOT)/tao/tao_internals.h \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/client_factory.h \
- $(TAO_ROOT)/tao/server_factory.h \
- $(TAO_ROOT)/tao/default_client.h \
- $(TAO_ROOT)/tao/default_server.h \
- $(TAO_ROOT)/tao/except.h \
- $(TAO_ROOT)/tao/orbobj.h \
- $(TAO_ROOT)/tao/nvlist.h \
- $(TAO_ROOT)/tao/principa.h \
- $(TAO_ROOT)/tao/request.h \
- $(TAO_ROOT)/tao/svrrqst.h \
- $(TAO_ROOT)/tao/typecode.h \
- $(TAO_ROOT)/tao/marshal.h \
- $(TAO_ROOT)/tao/cdr.h \
- $(TAO_ROOT)/tao/stub.h \
- $(TAO_ROOT)/tao/connect.h \
- $(TAO_ROOT)/tao/orb_core.h \
- $(TAO_ROOT)/tao/objtable.h \
- $(TAO_ROOT)/tao/optable.h \
- $(TAO_ROOT)/tao/debug.h \
- $(TAO_ROOT)/tao/iiopobj.h \
- $(TAO_ROOT)/tao/iioporb.h \
- $(TAO_ROOT)/tao/giop.h \
- $(TAO_ROOT)/tao/orb_core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(TAO_ROOT)/tao/corbacom.i \
- $(TAO_ROOT)/tao/sequence.i \
- $(TAO_ROOT)/tao/typecode.i \
- $(TAO_ROOT)/tao/any.i \
- $(TAO_ROOT)/tao/cdr.i \
- $(TAO_ROOT)/tao/stub.i \
- $(TAO_ROOT)/tao/object.i \
- $(TAO_ROOT)/tao/orbobj.i \
- $(TAO_ROOT)/tao/marshal.i \
- $(TAO_ROOT)/tao/poa.i \
- $(TAO_ROOT)/tao/giop.i \
- $(TAO_ROOT)/tao/iioporb.i \
- $(TAO_ROOT)/tao/iiopobj.i \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/server_factory.i \
- $(TAO_ROOT)/tao/default_client.i \
- $(TAO_ROOT)/tao/default_server.i \
- $(TAO_ROOT)/tao/connect.i \
- $(TAO_ROOT)/tao/singletons.h \
- RtecSchedulerC.i RtecSchedulerS.i Runtime_Scheduler.i
-
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/orbsvcs/lib/RtecEventChannelAdmin.idl b/TAO/orbsvcs/lib/RtecEventChannelAdmin.idl
deleted file mode 100644
index ec0147abbb9..00000000000
--- a/TAO/orbsvcs/lib/RtecEventChannelAdmin.idl
+++ /dev/null
@@ -1,91 +0,0 @@
-//
-// $Id$
-//
-#include "RtecEventComm.idl"
-#include "RtecScheduler.idl"
-
-module RtecEventChannelAdmin {
-
-  exception AlreadyConnected {
-  };
-  exception TypeError {
-  };
-
-  struct Dependency {
-    RtecEventComm::Event event_;
-    RtecScheduler::handle_t rt_info;
-  };
-  typedef sequence<Dependency> DependencySet;
-
-  struct ConsumerQOS {
-    DependencySet dependencies;
-  };
-
-  struct Publication {
-    RtecEventComm::Event event_;
-    RtecScheduler::Dependency_Info dependency_info_;
-  };
-  typedef sequence<Publication> PublicationSet;
-
-  struct SupplierQOS {
-    PublicationSet publications_;
-  };
-
-  interface ProxyPushConsumer: RtecEventComm::PushConsumer {
-    oneway void connect_push_supplier(
-		in RtecEventComm::PushSupplier push_supplier,
-		in SupplierQOS qos);
-        // raises(AlreadyConnected);
-  };
-
-  interface ProxyPushSupplier: RtecEventComm::PushSupplier {
-    oneway void connect_push_consumer(
-		in RtecEventComm::PushConsumer push_consumer,
-		in ConsumerQOS qos);
-      // raises(AlreadyConnected, TypeError);
-  };
-
-  // TODO: Find out the exception specs for the following interface's
-  // methods.
-  interface ConsumerAdmin {
-    ProxyPushSupplier obtain_push_supplier();
-  };
-  interface SupplierAdmin {
-    ProxyPushConsumer obtain_push_consumer();
-  };
-
-  interface EventChannel {
-    exception SYNCHRONIZATION_ERROR {
-      long minor;
-      long status;
-      string name;
-    };
-    exception QOS_ERROR {
-      long minor;
-      long status;
-      string name;
-    };
-    exception SUBSCRIPTION_ERROR {
-      long minor;
-      long status;
-      string name;
-    };
-    exception CORRELATION_ERROR {
-      long minor;
-      long status;
-      string name;
-    };
-    exception DISPATCH_ERROR {
-      long minor;
-      long status;
-      string name;
-    };
-    ConsumerAdmin for_consumers();
-    SupplierAdmin for_suppliers();
-
-    void destroy();
-  };
-
-};
-
-
diff --git a/TAO/orbsvcs/lib/RtecEventChannelAdminC.cpp b/TAO/orbsvcs/lib/RtecEventChannelAdminC.cpp
deleted file mode 100644
index 694e0b7a276..00000000000
--- a/TAO/orbsvcs/lib/RtecEventChannelAdminC.cpp
+++ /dev/null
@@ -1,1304 +0,0 @@
-// ******  Code generated by the The ACE ORB (TAO) IDL Compiler *******
-// TAO ORB and the TAO IDL Compiler have been developed by Washington 
-// University Computer Science's Distributed Object Computing Group.
-//
-// Information on TAO is available at
-//                 http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#include "RtecEventChannelAdminC.h"
-
-#if !defined (__ACE_INLINE__)
-#include "RtecEventChannelAdminC.i"
-#endif // !defined INLINE
-
-static const CORBA::Long _oc_RtecEventChannelAdmin_AlreadyConnected[] =
-{
-  0, // byte order
-  47, 0x49444c3a, 0x52746563, 0x4576656e, 0x74436861, 0x6e6e656c, 0x41646d69, 0x6e2f416c, 0x72656164, 0x79436f6e, 0x6e656374, 0x65643a31, 0x2e300000,  // repository ID = IDL:RtecEventChannelAdmin/AlreadyConnected:1.0
-  17, 0x416c7265, 0x61647943, 0x6f6e6e65, 0x63746564, 0x0,  // name = AlreadyConnected
-  0, // member count
-};
-static CORBA::TypeCode _tc__tc_RtecEventChannelAdmin_AlreadyConnected (CORBA::tk_struct, sizeof (_oc_RtecEventChannelAdmin_AlreadyConnected), (unsigned char *) &_oc_RtecEventChannelAdmin_AlreadyConnected, CORBA::B_FALSE);
-CORBA::TypeCode_ptr RtecEventChannelAdmin::_tc_AlreadyConnected = &_tc__tc_RtecEventChannelAdmin_AlreadyConnected;
-
-static const CORBA::Long _oc_RtecEventChannelAdmin_TypeError[] =
-{
-  0, // byte order
-  40, 0x49444c3a, 0x52746563, 0x4576656e, 0x74436861, 0x6e6e656c, 0x41646d69, 0x6e2f5479, 0x70654572, 0x726f723a, 0x312e3000,  // repository ID = IDL:RtecEventChannelAdmin/TypeError:1.0
-  10, 0x54797065, 0x4572726f, 0x72000000,  // name = TypeError
-  0, // member count
-};
-static CORBA::TypeCode _tc__tc_RtecEventChannelAdmin_TypeError (CORBA::tk_struct, sizeof (_oc_RtecEventChannelAdmin_TypeError), (unsigned char *) &_oc_RtecEventChannelAdmin_TypeError, CORBA::B_FALSE);
-CORBA::TypeCode_ptr RtecEventChannelAdmin::_tc_TypeError = &_tc__tc_RtecEventChannelAdmin_TypeError;
-
-static const CORBA::Long _oc_RtecEventChannelAdmin_Dependency[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  41, 0x49444c3a, 0x52746563, 0x4576656e, 0x74436861, 0x6e6e656c, 0x41646d69, 0x6e2f4465, 0x70656e64, 0x656e6379, 0x3a312e30, 0x0,  // repository ID = IDL:RtecEventChannelAdmin/Dependency:1.0
-  11, 0x44657065, 0x6e64656e, 0x63790000,  // name = Dependency
-  2, // member count
-    7, 0x6576656e, 0x745f0000,  // name = event_
-    CORBA::tk_struct, // typecode kind
-    396, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      28, 0x49444c3a, 0x52746563, 0x4576656e, 0x74436f6d, 0x6d2f4576, 0x656e743a, 0x312e3000,  // repository ID = IDL:RtecEventComm/Event:1.0
-      6, 0x4576656e, 0x74000000,  // name = Event
-      4, // member count
-        8, 0x736f7572, 0x63655f00,  // name = source_
-        CORBA::tk_alias, // typecode kind for typedefs
-        68, // encapsulation length
-          TAO_ENCAP_BYTE_ORDER, // byte order
-          36, 0x49444c3a, 0x52746563, 0x4576656e, 0x74436f6d, 0x6d2f4576, 0x656e7453, 0x6f757263, 0x6549443a, 0x312e3000,  // repository ID = IDL:RtecEventComm/EventSourceID:1.0
-          14, 0x4576656e, 0x74536f75, 0x72636549, 0x44000000,  // name = EventSourceID
-          CORBA::tk_long,
-
-        6, 0x74797065, 0x5f000000,  // name = type_
-        CORBA::tk_alias, // typecode kind for typedefs
-        60, // encapsulation length
-          TAO_ENCAP_BYTE_ORDER, // byte order
-          32, 0x49444c3a, 0x52746563, 0x4576656e, 0x74436f6d, 0x6d2f4576, 0x656e7454, 0x7970653a, 0x312e3000,  // repository ID = IDL:RtecEventComm/EventType:1.0
-          10, 0x4576656e, 0x74547970, 0x65000000,  // name = EventType
-          CORBA::tk_long,
-
-        6, 0x74696d65, 0x5f000000,  // name = time_
-        CORBA::tk_alias, // typecode kind for typedefs
-        52, // encapsulation length
-          TAO_ENCAP_BYTE_ORDER, // byte order
-          27, 0x49444c3a, 0x52746563, 0x4576656e, 0x74436f6d, 0x6d2f5469, 0x6d653a31, 0x2e300000,  // repository ID = IDL:RtecEventComm/Time:1.0
-          5, 0x54696d65, 0x0,  // name = Time
-          CORBA::tk_long,
-
-        6, 0x64617461, 0x5f000000,  // name = data_
-        CORBA::tk_struct, // typecode kind
-        84, // encapsulation length
-          TAO_ENCAP_BYTE_ORDER, // byte order
-          32, 0x49444c3a, 0x52746563, 0x4576656e, 0x74436f6d, 0x6d2f4576, 0x656e7444, 0x6174613a, 0x312e3000,  // repository ID = IDL:RtecEventComm/EventData:1.0
-          10, 0x4576656e, 0x74446174, 0x61000000,  // name = EventData
-          2, // member count
-            2, 0x78000000,  // name = x
-            CORBA::tk_long,
-
-            2, 0x79000000,  // name = y
-            CORBA::tk_long,
-
-                8, 0x72745f69, 0x6e666f00,  // name = rt_info
-    CORBA::tk_alias, // typecode kind for typedefs
-    60, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      31, 0x49444c3a, 0x52746563, 0x53636865, 0x64756c65, 0x722f6861, 0x6e646c65, 0x5f743a31, 0x2e300000,  // repository ID = IDL:RtecScheduler/handle_t:1.0
-      9, 0x68616e64, 0x6c655f74, 0x0,  // name = handle_t
-      CORBA::tk_long,
-
-};
-static CORBA::TypeCode _tc__tc_RtecEventChannelAdmin_Dependency (CORBA::tk_struct, sizeof (_oc_RtecEventChannelAdmin_Dependency), (unsigned char *) &_oc_RtecEventChannelAdmin_Dependency, CORBA::B_FALSE);
-CORBA::TypeCode_ptr RtecEventChannelAdmin::_tc_Dependency = &_tc__tc_RtecEventChannelAdmin_Dependency;
-
-// *************************************************************
-// class RtecEventChannelAdmin::_tao__seq_DependencySet
-// *************************************************************
-
-// copy constructor
-RtecEventChannelAdmin::_tao__seq_DependencySet::_tao__seq_DependencySet (const RtecEventChannelAdmin::_tao__seq_DependencySet &seq)
-	: maximum_ (seq.maximum_),
-	  length_ (seq.length_),
-	  buffer_ (RtecEventChannelAdmin::_tao__seq_DependencySet::allocbuf (seq.maximum_)),
-	  release_ (1) // we always own it
-{
-  for (CORBA::ULong i=0; i < seq.length_; i++)
-  	this->buffer_[i] = seq.buffer_[i];
-}
-
-// destructor
-RtecEventChannelAdmin::_tao__seq_DependencySet::~_tao__seq_DependencySet (void)
-{
-  if (this->release_) // we own the buffer
-  {
-    RtecEventChannelAdmin::_tao__seq_DependencySet::freebuf (this->buffer_);
-  }
-}
-
-// assignment operator
-RtecEventChannelAdmin::_tao__seq_DependencySet& 
-RtecEventChannelAdmin::_tao__seq_DependencySet::operator= (const RtecEventChannelAdmin::_tao__seq_DependencySet &seq)
-{
-  if (this == &seq) return *this;
-  if (this->release_)
-  {
-    RtecEventChannelAdmin::_tao__seq_DependencySet::freebuf (this->buffer_);
-  }
-  this->length_ = seq.length_;
-  this->maximum_ = seq.maximum_;
-  this->buffer_ = RtecEventChannelAdmin::_tao__seq_DependencySet::allocbuf (seq.maximum_),
-  this->release_ =1; // we always own it
-  for (CORBA::ULong i=0; i < seq.length_; i++)
-  	this->buffer_[i] = seq.buffer_[i];
-  return *this;
-}
-
-void
-RtecEventChannelAdmin::_tao__seq_DependencySet::length (CORBA::ULong length)
-{
-  if (length > this->maximum_)
-  {
-    RtecEventChannelAdmin::Dependency *tmp = RtecEventChannelAdmin::_tao__seq_DependencySet::allocbuf (length);
-    if (tmp == 0)
-      return;
-    for (int i = 0; i < this->length_; ++i)
-    {
-      tmp[i] = this->buffer_[i];
-    }
-    if (this->release_)
-      RtecEventChannelAdmin::_tao__seq_DependencySet::freebuf (this->buffer_);
-    this->buffer_ = tmp;
-    this->release_ = 1;
-    this->maximum_ = length;
-  }
-this->length_ = length;
-}
-
-static const CORBA::Long _oc_RtecEventChannelAdmin__tao__seq_DependencySet[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_struct, // typecode kind
-  568, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    41, 0x49444c3a, 0x52746563, 0x4576656e, 0x74436861, 0x6e6e656c, 0x41646d69, 0x6e2f4465, 0x70656e64, 0x656e6379, 0x3a312e30, 0x0,  // repository ID = IDL:RtecEventChannelAdmin/Dependency:1.0
-    11, 0x44657065, 0x6e64656e, 0x63790000,  // name = Dependency
-    2, // member count
-      7, 0x6576656e, 0x745f0000,  // name = event_
-      CORBA::tk_struct, // typecode kind
-      396, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        28, 0x49444c3a, 0x52746563, 0x4576656e, 0x74436f6d, 0x6d2f4576, 0x656e743a, 0x312e3000,  // repository ID = IDL:RtecEventComm/Event:1.0
-        6, 0x4576656e, 0x74000000,  // name = Event
-        4, // member count
-          8, 0x736f7572, 0x63655f00,  // name = source_
-          CORBA::tk_alias, // typecode kind for typedefs
-          68, // encapsulation length
-            TAO_ENCAP_BYTE_ORDER, // byte order
-            36, 0x49444c3a, 0x52746563, 0x4576656e, 0x74436f6d, 0x6d2f4576, 0x656e7453, 0x6f757263, 0x6549443a, 0x312e3000,  // repository ID = IDL:RtecEventComm/EventSourceID:1.0
-            14, 0x4576656e, 0x74536f75, 0x72636549, 0x44000000,  // name = EventSourceID
-            CORBA::tk_long,
-
-          6, 0x74797065, 0x5f000000,  // name = type_
-          CORBA::tk_alias, // typecode kind for typedefs
-          60, // encapsulation length
-            TAO_ENCAP_BYTE_ORDER, // byte order
-            32, 0x49444c3a, 0x52746563, 0x4576656e, 0x74436f6d, 0x6d2f4576, 0x656e7454, 0x7970653a, 0x312e3000,  // repository ID = IDL:RtecEventComm/EventType:1.0
-            10, 0x4576656e, 0x74547970, 0x65000000,  // name = EventType
-            CORBA::tk_long,
-
-          6, 0x74696d65, 0x5f000000,  // name = time_
-          CORBA::tk_alias, // typecode kind for typedefs
-          52, // encapsulation length
-            TAO_ENCAP_BYTE_ORDER, // byte order
-            27, 0x49444c3a, 0x52746563, 0x4576656e, 0x74436f6d, 0x6d2f5469, 0x6d653a31, 0x2e300000,  // repository ID = IDL:RtecEventComm/Time:1.0
-            5, 0x54696d65, 0x0,  // name = Time
-            CORBA::tk_long,
-
-          6, 0x64617461, 0x5f000000,  // name = data_
-          CORBA::tk_struct, // typecode kind
-          84, // encapsulation length
-            TAO_ENCAP_BYTE_ORDER, // byte order
-            32, 0x49444c3a, 0x52746563, 0x4576656e, 0x74436f6d, 0x6d2f4576, 0x656e7444, 0x6174613a, 0x312e3000,  // repository ID = IDL:RtecEventComm/EventData:1.0
-            10, 0x4576656e, 0x74446174, 0x61000000,  // name = EventData
-            2, // member count
-              2, 0x78000000,  // name = x
-              CORBA::tk_long,
-
-              2, 0x79000000,  // name = y
-              CORBA::tk_long,
-
-                      8, 0x72745f69, 0x6e666f00,  // name = rt_info
-      CORBA::tk_alias, // typecode kind for typedefs
-      60, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        31, 0x49444c3a, 0x52746563, 0x53636865, 0x64756c65, 0x722f6861, 0x6e646c65, 0x5f743a31, 0x2e300000,  // repository ID = IDL:RtecScheduler/handle_t:1.0
-        9, 0x68616e64, 0x6c655f74, 0x0,  // name = handle_t
-        CORBA::tk_long,
-
-    0,
-};
-static CORBA::TypeCode _tc__tc_RtecEventChannelAdmin__tao__seq_DependencySet (CORBA::tk_sequence, sizeof (_oc_RtecEventChannelAdmin__tao__seq_DependencySet), (unsigned char *) &_oc_RtecEventChannelAdmin__tao__seq_DependencySet, CORBA::B_FALSE);
-CORBA::TypeCode_ptr RtecEventChannelAdmin::_tc__tao__seq_DependencySet = &_tc__tc_RtecEventChannelAdmin__tao__seq_DependencySet;
-
-static const CORBA::Long _oc_RtecEventChannelAdmin_DependencySet[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  44, 0x49444c3a, 0x52746563, 0x4576656e, 0x74436861, 0x6e6e656c, 0x41646d69, 0x6e2f4465, 0x70656e64, 0x656e6379, 0x5365743a, 0x312e3000,  // repository ID = IDL:RtecEventChannelAdmin/DependencySet:1.0
-  14, 0x44657065, 0x6e64656e, 0x63795365, 0x74000000,  // name = DependencySet
-  CORBA::tk_sequence, // typecode kind
-  592, // encapsulation length
-  TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_struct, // typecode kind
-  568, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    41, 0x49444c3a, 0x52746563, 0x4576656e, 0x74436861, 0x6e6e656c, 0x41646d69, 0x6e2f4465, 0x70656e64, 0x656e6379, 0x3a312e30, 0x0,  // repository ID = IDL:RtecEventChannelAdmin/Dependency:1.0
-    11, 0x44657065, 0x6e64656e, 0x63790000,  // name = Dependency
-    2, // member count
-      7, 0x6576656e, 0x745f0000,  // name = event_
-      CORBA::tk_struct, // typecode kind
-      396, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        28, 0x49444c3a, 0x52746563, 0x4576656e, 0x74436f6d, 0x6d2f4576, 0x656e743a, 0x312e3000,  // repository ID = IDL:RtecEventComm/Event:1.0
-        6, 0x4576656e, 0x74000000,  // name = Event
-        4, // member count
-          8, 0x736f7572, 0x63655f00,  // name = source_
-          CORBA::tk_alias, // typecode kind for typedefs
-          68, // encapsulation length
-            TAO_ENCAP_BYTE_ORDER, // byte order
-            36, 0x49444c3a, 0x52746563, 0x4576656e, 0x74436f6d, 0x6d2f4576, 0x656e7453, 0x6f757263, 0x6549443a, 0x312e3000,  // repository ID = IDL:RtecEventComm/EventSourceID:1.0
-            14, 0x4576656e, 0x74536f75, 0x72636549, 0x44000000,  // name = EventSourceID
-            CORBA::tk_long,
-
-          6, 0x74797065, 0x5f000000,  // name = type_
-          CORBA::tk_alias, // typecode kind for typedefs
-          60, // encapsulation length
-            TAO_ENCAP_BYTE_ORDER, // byte order
-            32, 0x49444c3a, 0x52746563, 0x4576656e, 0x74436f6d, 0x6d2f4576, 0x656e7454, 0x7970653a, 0x312e3000,  // repository ID = IDL:RtecEventComm/EventType:1.0
-            10, 0x4576656e, 0x74547970, 0x65000000,  // name = EventType
-            CORBA::tk_long,
-
-          6, 0x74696d65, 0x5f000000,  // name = time_
-          CORBA::tk_alias, // typecode kind for typedefs
-          52, // encapsulation length
-            TAO_ENCAP_BYTE_ORDER, // byte order
-            27, 0x49444c3a, 0x52746563, 0x4576656e, 0x74436f6d, 0x6d2f5469, 0x6d653a31, 0x2e300000,  // repository ID = IDL:RtecEventComm/Time:1.0
-            5, 0x54696d65, 0x0,  // name = Time
-            CORBA::tk_long,
-
-          6, 0x64617461, 0x5f000000,  // name = data_
-          CORBA::tk_struct, // typecode kind
-          84, // encapsulation length
-            TAO_ENCAP_BYTE_ORDER, // byte order
-            32, 0x49444c3a, 0x52746563, 0x4576656e, 0x74436f6d, 0x6d2f4576, 0x656e7444, 0x6174613a, 0x312e3000,  // repository ID = IDL:RtecEventComm/EventData:1.0
-            10, 0x4576656e, 0x74446174, 0x61000000,  // name = EventData
-            2, // member count
-              2, 0x78000000,  // name = x
-              CORBA::tk_long,
-
-              2, 0x79000000,  // name = y
-              CORBA::tk_long,
-
-                      8, 0x72745f69, 0x6e666f00,  // name = rt_info
-      CORBA::tk_alias, // typecode kind for typedefs
-      60, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        31, 0x49444c3a, 0x52746563, 0x53636865, 0x64756c65, 0x722f6861, 0x6e646c65, 0x5f743a31, 0x2e300000,  // repository ID = IDL:RtecScheduler/handle_t:1.0
-        9, 0x68616e64, 0x6c655f74, 0x0,  // name = handle_t
-        CORBA::tk_long,
-
-    0,
-};
-static CORBA::TypeCode _tc__tc_RtecEventChannelAdmin_DependencySet (CORBA::tk_alias, sizeof (_oc_RtecEventChannelAdmin_DependencySet), (unsigned char *) &_oc_RtecEventChannelAdmin_DependencySet, CORBA::B_FALSE);
-CORBA::TypeCode_ptr RtecEventChannelAdmin::_tc_DependencySet = &_tc__tc_RtecEventChannelAdmin_DependencySet;
-
-static const CORBA::Long _oc_RtecEventChannelAdmin_ConsumerQOS[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  42, 0x49444c3a, 0x52746563, 0x4576656e, 0x74436861, 0x6e6e656c, 0x41646d69, 0x6e2f436f, 0x6e73756d, 0x6572514f, 0x533a312e, 0x30000000,  // repository ID = IDL:RtecEventChannelAdmin/ConsumerQOS:1.0
-  12, 0x436f6e73, 0x756d6572, 0x514f5300,  // name = ConsumerQOS
-  1, // member count
-    13, 0x64657065, 0x6e64656e, 0x63696573, 0x0,  // name = dependencies
-    CORBA::tk_alias, // typecode kind for typedefs
-    664, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      44, 0x49444c3a, 0x52746563, 0x4576656e, 0x74436861, 0x6e6e656c, 0x41646d69, 0x6e2f4465, 0x70656e64, 0x656e6379, 0x5365743a, 0x312e3000,  // repository ID = IDL:RtecEventChannelAdmin/DependencySet:1.0
-      14, 0x44657065, 0x6e64656e, 0x63795365, 0x74000000,  // name = DependencySet
-      CORBA::tk_sequence, // typecode kind
-      592, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-            CORBA::tk_struct, // typecode kind
-      568, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        41, 0x49444c3a, 0x52746563, 0x4576656e, 0x74436861, 0x6e6e656c, 0x41646d69, 0x6e2f4465, 0x70656e64, 0x656e6379, 0x3a312e30, 0x0,  // repository ID = IDL:RtecEventChannelAdmin/Dependency:1.0
-        11, 0x44657065, 0x6e64656e, 0x63790000,  // name = Dependency
-        2, // member count
-          7, 0x6576656e, 0x745f0000,  // name = event_
-          CORBA::tk_struct, // typecode kind
-          396, // encapsulation length
-            TAO_ENCAP_BYTE_ORDER, // byte order
-            28, 0x49444c3a, 0x52746563, 0x4576656e, 0x74436f6d, 0x6d2f4576, 0x656e743a, 0x312e3000,  // repository ID = IDL:RtecEventComm/Event:1.0
-            6, 0x4576656e, 0x74000000,  // name = Event
-            4, // member count
-              8, 0x736f7572, 0x63655f00,  // name = source_
-              CORBA::tk_alias, // typecode kind for typedefs
-              68, // encapsulation length
-                TAO_ENCAP_BYTE_ORDER, // byte order
-                36, 0x49444c3a, 0x52746563, 0x4576656e, 0x74436f6d, 0x6d2f4576, 0x656e7453, 0x6f757263, 0x6549443a, 0x312e3000,  // repository ID = IDL:RtecEventComm/EventSourceID:1.0
-                14, 0x4576656e, 0x74536f75, 0x72636549, 0x44000000,  // name = EventSourceID
-                CORBA::tk_long,
-
-              6, 0x74797065, 0x5f000000,  // name = type_
-              CORBA::tk_alias, // typecode kind for typedefs
-              60, // encapsulation length
-                TAO_ENCAP_BYTE_ORDER, // byte order
-                32, 0x49444c3a, 0x52746563, 0x4576656e, 0x74436f6d, 0x6d2f4576, 0x656e7454, 0x7970653a, 0x312e3000,  // repository ID = IDL:RtecEventComm/EventType:1.0
-                10, 0x4576656e, 0x74547970, 0x65000000,  // name = EventType
-                CORBA::tk_long,
-
-              6, 0x74696d65, 0x5f000000,  // name = time_
-              CORBA::tk_alias, // typecode kind for typedefs
-              52, // encapsulation length
-                TAO_ENCAP_BYTE_ORDER, // byte order
-                27, 0x49444c3a, 0x52746563, 0x4576656e, 0x74436f6d, 0x6d2f5469, 0x6d653a31, 0x2e300000,  // repository ID = IDL:RtecEventComm/Time:1.0
-                5, 0x54696d65, 0x0,  // name = Time
-                CORBA::tk_long,
-
-              6, 0x64617461, 0x5f000000,  // name = data_
-              CORBA::tk_struct, // typecode kind
-              84, // encapsulation length
-                TAO_ENCAP_BYTE_ORDER, // byte order
-                32, 0x49444c3a, 0x52746563, 0x4576656e, 0x74436f6d, 0x6d2f4576, 0x656e7444, 0x6174613a, 0x312e3000,  // repository ID = IDL:RtecEventComm/EventData:1.0
-                10, 0x4576656e, 0x74446174, 0x61000000,  // name = EventData
-                2, // member count
-                  2, 0x78000000,  // name = x
-                  CORBA::tk_long,
-
-                  2, 0x79000000,  // name = y
-                  CORBA::tk_long,
-
-                                  8, 0x72745f69, 0x6e666f00,  // name = rt_info
-          CORBA::tk_alias, // typecode kind for typedefs
-          60, // encapsulation length
-            TAO_ENCAP_BYTE_ORDER, // byte order
-            31, 0x49444c3a, 0x52746563, 0x53636865, 0x64756c65, 0x722f6861, 0x6e646c65, 0x5f743a31, 0x2e300000,  // repository ID = IDL:RtecScheduler/handle_t:1.0
-            9, 0x68616e64, 0x6c655f74, 0x0,  // name = handle_t
-            CORBA::tk_long,
-
-            0,
-};
-static CORBA::TypeCode _tc__tc_RtecEventChannelAdmin_ConsumerQOS (CORBA::tk_struct, sizeof (_oc_RtecEventChannelAdmin_ConsumerQOS), (unsigned char *) &_oc_RtecEventChannelAdmin_ConsumerQOS, CORBA::B_FALSE);
-CORBA::TypeCode_ptr RtecEventChannelAdmin::_tc_ConsumerQOS = &_tc__tc_RtecEventChannelAdmin_ConsumerQOS;
-
-static const CORBA::Long _oc_RtecEventChannelAdmin_Publication[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  42, 0x49444c3a, 0x52746563, 0x4576656e, 0x74436861, 0x6e6e656c, 0x41646d69, 0x6e2f5075, 0x626c6963, 0x6174696f, 0x6e3a312e, 0x30000000,  // repository ID = IDL:RtecEventChannelAdmin/Publication:1.0
-  12, 0x5075626c, 0x69636174, 0x696f6e00,  // name = Publication
-  2, // member count
-    7, 0x6576656e, 0x745f0000,  // name = event_
-    CORBA::tk_struct, // typecode kind
-    396, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      28, 0x49444c3a, 0x52746563, 0x4576656e, 0x74436f6d, 0x6d2f4576, 0x656e743a, 0x312e3000,  // repository ID = IDL:RtecEventComm/Event:1.0
-      6, 0x4576656e, 0x74000000,  // name = Event
-      4, // member count
-        8, 0x736f7572, 0x63655f00,  // name = source_
-        CORBA::tk_alias, // typecode kind for typedefs
-        68, // encapsulation length
-          TAO_ENCAP_BYTE_ORDER, // byte order
-          36, 0x49444c3a, 0x52746563, 0x4576656e, 0x74436f6d, 0x6d2f4576, 0x656e7453, 0x6f757263, 0x6549443a, 0x312e3000,  // repository ID = IDL:RtecEventComm/EventSourceID:1.0
-          14, 0x4576656e, 0x74536f75, 0x72636549, 0x44000000,  // name = EventSourceID
-          CORBA::tk_long,
-
-        6, 0x74797065, 0x5f000000,  // name = type_
-        CORBA::tk_alias, // typecode kind for typedefs
-        60, // encapsulation length
-          TAO_ENCAP_BYTE_ORDER, // byte order
-          32, 0x49444c3a, 0x52746563, 0x4576656e, 0x74436f6d, 0x6d2f4576, 0x656e7454, 0x7970653a, 0x312e3000,  // repository ID = IDL:RtecEventComm/EventType:1.0
-          10, 0x4576656e, 0x74547970, 0x65000000,  // name = EventType
-          CORBA::tk_long,
-
-        6, 0x74696d65, 0x5f000000,  // name = time_
-        CORBA::tk_alias, // typecode kind for typedefs
-        52, // encapsulation length
-          TAO_ENCAP_BYTE_ORDER, // byte order
-          27, 0x49444c3a, 0x52746563, 0x4576656e, 0x74436f6d, 0x6d2f5469, 0x6d653a31, 0x2e300000,  // repository ID = IDL:RtecEventComm/Time:1.0
-          5, 0x54696d65, 0x0,  // name = Time
-          CORBA::tk_long,
-
-        6, 0x64617461, 0x5f000000,  // name = data_
-        CORBA::tk_struct, // typecode kind
-        84, // encapsulation length
-          TAO_ENCAP_BYTE_ORDER, // byte order
-          32, 0x49444c3a, 0x52746563, 0x4576656e, 0x74436f6d, 0x6d2f4576, 0x656e7444, 0x6174613a, 0x312e3000,  // repository ID = IDL:RtecEventComm/EventData:1.0
-          10, 0x4576656e, 0x74446174, 0x61000000,  // name = EventData
-          2, // member count
-            2, 0x78000000,  // name = x
-            CORBA::tk_long,
-
-            2, 0x79000000,  // name = y
-            CORBA::tk_long,
-
-                17, 0x64657065, 0x6e64656e, 0x63795f69, 0x6e666f5f, 0x0,  // name = dependency_info_
-    CORBA::tk_struct, // typecode kind
-    176, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      38, 0x49444c3a, 0x52746563, 0x53636865, 0x64756c65, 0x722f4465, 0x70656e64, 0x656e6379, 0x5f496e66, 0x6f3a312e, 0x30000000,  // repository ID = IDL:RtecScheduler/Dependency_Info:1.0
-      16, 0x44657065, 0x6e64656e, 0x63795f49, 0x6e666f00,  // name = Dependency_Info
-      2, // member count
-        16, 0x6e756d62, 0x65725f6f, 0x665f6361, 0x6c6c7300,  // name = number_of_calls
-        CORBA::tk_long,
-
-        8, 0x72745f69, 0x6e666f00,  // name = rt_info
-        CORBA::tk_alias, // typecode kind for typedefs
-        60, // encapsulation length
-          TAO_ENCAP_BYTE_ORDER, // byte order
-          31, 0x49444c3a, 0x52746563, 0x53636865, 0x64756c65, 0x722f6861, 0x6e646c65, 0x5f743a31, 0x2e300000,  // repository ID = IDL:RtecScheduler/handle_t:1.0
-          9, 0x68616e64, 0x6c655f74, 0x0,  // name = handle_t
-          CORBA::tk_long,
-
-    };
-static CORBA::TypeCode _tc__tc_RtecEventChannelAdmin_Publication (CORBA::tk_struct, sizeof (_oc_RtecEventChannelAdmin_Publication), (unsigned char *) &_oc_RtecEventChannelAdmin_Publication, CORBA::B_FALSE);
-CORBA::TypeCode_ptr RtecEventChannelAdmin::_tc_Publication = &_tc__tc_RtecEventChannelAdmin_Publication;
-
-// *************************************************************
-// class RtecEventChannelAdmin::_tao__seq_PublicationSet
-// *************************************************************
-
-// copy constructor
-RtecEventChannelAdmin::_tao__seq_PublicationSet::_tao__seq_PublicationSet (const RtecEventChannelAdmin::_tao__seq_PublicationSet &seq)
-	: maximum_ (seq.maximum_),
-	  length_ (seq.length_),
-	  buffer_ (RtecEventChannelAdmin::_tao__seq_PublicationSet::allocbuf (seq.maximum_)),
-	  release_ (1) // we always own it
-{
-  for (CORBA::ULong i=0; i < seq.length_; i++)
-  	this->buffer_[i] = seq.buffer_[i];
-}
-
-// destructor
-RtecEventChannelAdmin::_tao__seq_PublicationSet::~_tao__seq_PublicationSet (void)
-{
-  if (this->release_) // we own the buffer
-  {
-    RtecEventChannelAdmin::_tao__seq_PublicationSet::freebuf (this->buffer_);
-  }
-}
-
-// assignment operator
-RtecEventChannelAdmin::_tao__seq_PublicationSet& 
-RtecEventChannelAdmin::_tao__seq_PublicationSet::operator= (const RtecEventChannelAdmin::_tao__seq_PublicationSet &seq)
-{
-  if (this == &seq) return *this;
-  if (this->release_)
-  {
-    RtecEventChannelAdmin::_tao__seq_PublicationSet::freebuf (this->buffer_);
-  }
-  this->length_ = seq.length_;
-  this->maximum_ = seq.maximum_;
-  this->buffer_ = RtecEventChannelAdmin::_tao__seq_PublicationSet::allocbuf (seq.maximum_),
-  this->release_ =1; // we always own it
-  for (CORBA::ULong i=0; i < seq.length_; i++)
-  	this->buffer_[i] = seq.buffer_[i];
-  return *this;
-}
-
-void
-RtecEventChannelAdmin::_tao__seq_PublicationSet::length (CORBA::ULong length)
-{
-  if (length > this->maximum_)
-  {
-    RtecEventChannelAdmin::Publication *tmp = RtecEventChannelAdmin::_tao__seq_PublicationSet::allocbuf (length);
-    if (tmp == 0)
-      return;
-    for (int i = 0; i < this->length_; ++i)
-    {
-      tmp[i] = this->buffer_[i];
-    }
-    if (this->release_)
-      RtecEventChannelAdmin::_tao__seq_PublicationSet::freebuf (this->buffer_);
-    this->buffer_ = tmp;
-    this->release_ = 1;
-    this->maximum_ = length;
-  }
-this->length_ = length;
-}
-
-static const CORBA::Long _oc_RtecEventChannelAdmin__tao__seq_PublicationSet[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_struct, // typecode kind
-  696, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    42, 0x49444c3a, 0x52746563, 0x4576656e, 0x74436861, 0x6e6e656c, 0x41646d69, 0x6e2f5075, 0x626c6963, 0x6174696f, 0x6e3a312e, 0x30000000,  // repository ID = IDL:RtecEventChannelAdmin/Publication:1.0
-    12, 0x5075626c, 0x69636174, 0x696f6e00,  // name = Publication
-    2, // member count
-      7, 0x6576656e, 0x745f0000,  // name = event_
-      CORBA::tk_struct, // typecode kind
-      396, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        28, 0x49444c3a, 0x52746563, 0x4576656e, 0x74436f6d, 0x6d2f4576, 0x656e743a, 0x312e3000,  // repository ID = IDL:RtecEventComm/Event:1.0
-        6, 0x4576656e, 0x74000000,  // name = Event
-        4, // member count
-          8, 0x736f7572, 0x63655f00,  // name = source_
-          CORBA::tk_alias, // typecode kind for typedefs
-          68, // encapsulation length
-            TAO_ENCAP_BYTE_ORDER, // byte order
-            36, 0x49444c3a, 0x52746563, 0x4576656e, 0x74436f6d, 0x6d2f4576, 0x656e7453, 0x6f757263, 0x6549443a, 0x312e3000,  // repository ID = IDL:RtecEventComm/EventSourceID:1.0
-            14, 0x4576656e, 0x74536f75, 0x72636549, 0x44000000,  // name = EventSourceID
-            CORBA::tk_long,
-
-          6, 0x74797065, 0x5f000000,  // name = type_
-          CORBA::tk_alias, // typecode kind for typedefs
-          60, // encapsulation length
-            TAO_ENCAP_BYTE_ORDER, // byte order
-            32, 0x49444c3a, 0x52746563, 0x4576656e, 0x74436f6d, 0x6d2f4576, 0x656e7454, 0x7970653a, 0x312e3000,  // repository ID = IDL:RtecEventComm/EventType:1.0
-            10, 0x4576656e, 0x74547970, 0x65000000,  // name = EventType
-            CORBA::tk_long,
-
-          6, 0x74696d65, 0x5f000000,  // name = time_
-          CORBA::tk_alias, // typecode kind for typedefs
-          52, // encapsulation length
-            TAO_ENCAP_BYTE_ORDER, // byte order
-            27, 0x49444c3a, 0x52746563, 0x4576656e, 0x74436f6d, 0x6d2f5469, 0x6d653a31, 0x2e300000,  // repository ID = IDL:RtecEventComm/Time:1.0
-            5, 0x54696d65, 0x0,  // name = Time
-            CORBA::tk_long,
-
-          6, 0x64617461, 0x5f000000,  // name = data_
-          CORBA::tk_struct, // typecode kind
-          84, // encapsulation length
-            TAO_ENCAP_BYTE_ORDER, // byte order
-            32, 0x49444c3a, 0x52746563, 0x4576656e, 0x74436f6d, 0x6d2f4576, 0x656e7444, 0x6174613a, 0x312e3000,  // repository ID = IDL:RtecEventComm/EventData:1.0
-            10, 0x4576656e, 0x74446174, 0x61000000,  // name = EventData
-            2, // member count
-              2, 0x78000000,  // name = x
-              CORBA::tk_long,
-
-              2, 0x79000000,  // name = y
-              CORBA::tk_long,
-
-                      17, 0x64657065, 0x6e64656e, 0x63795f69, 0x6e666f5f, 0x0,  // name = dependency_info_
-      CORBA::tk_struct, // typecode kind
-      176, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        38, 0x49444c3a, 0x52746563, 0x53636865, 0x64756c65, 0x722f4465, 0x70656e64, 0x656e6379, 0x5f496e66, 0x6f3a312e, 0x30000000,  // repository ID = IDL:RtecScheduler/Dependency_Info:1.0
-        16, 0x44657065, 0x6e64656e, 0x63795f49, 0x6e666f00,  // name = Dependency_Info
-        2, // member count
-          16, 0x6e756d62, 0x65725f6f, 0x665f6361, 0x6c6c7300,  // name = number_of_calls
-          CORBA::tk_long,
-
-          8, 0x72745f69, 0x6e666f00,  // name = rt_info
-          CORBA::tk_alias, // typecode kind for typedefs
-          60, // encapsulation length
-            TAO_ENCAP_BYTE_ORDER, // byte order
-            31, 0x49444c3a, 0x52746563, 0x53636865, 0x64756c65, 0x722f6861, 0x6e646c65, 0x5f743a31, 0x2e300000,  // repository ID = IDL:RtecScheduler/handle_t:1.0
-            9, 0x68616e64, 0x6c655f74, 0x0,  // name = handle_t
-            CORBA::tk_long,
-
-          0,
-};
-static CORBA::TypeCode _tc__tc_RtecEventChannelAdmin__tao__seq_PublicationSet (CORBA::tk_sequence, sizeof (_oc_RtecEventChannelAdmin__tao__seq_PublicationSet), (unsigned char *) &_oc_RtecEventChannelAdmin__tao__seq_PublicationSet, CORBA::B_FALSE);
-CORBA::TypeCode_ptr RtecEventChannelAdmin::_tc__tao__seq_PublicationSet = &_tc__tc_RtecEventChannelAdmin__tao__seq_PublicationSet;
-
-static const CORBA::Long _oc_RtecEventChannelAdmin_PublicationSet[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  45, 0x49444c3a, 0x52746563, 0x4576656e, 0x74436861, 0x6e6e656c, 0x41646d69, 0x6e2f5075, 0x626c6963, 0x6174696f, 0x6e536574, 0x3a312e30, 0x0,  // repository ID = IDL:RtecEventChannelAdmin/PublicationSet:1.0
-  15, 0x5075626c, 0x69636174, 0x696f6e53, 0x65740000,  // name = PublicationSet
-  CORBA::tk_sequence, // typecode kind
-  720, // encapsulation length
-  TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_struct, // typecode kind
-  696, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    42, 0x49444c3a, 0x52746563, 0x4576656e, 0x74436861, 0x6e6e656c, 0x41646d69, 0x6e2f5075, 0x626c6963, 0x6174696f, 0x6e3a312e, 0x30000000,  // repository ID = IDL:RtecEventChannelAdmin/Publication:1.0
-    12, 0x5075626c, 0x69636174, 0x696f6e00,  // name = Publication
-    2, // member count
-      7, 0x6576656e, 0x745f0000,  // name = event_
-      CORBA::tk_struct, // typecode kind
-      396, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        28, 0x49444c3a, 0x52746563, 0x4576656e, 0x74436f6d, 0x6d2f4576, 0x656e743a, 0x312e3000,  // repository ID = IDL:RtecEventComm/Event:1.0
-        6, 0x4576656e, 0x74000000,  // name = Event
-        4, // member count
-          8, 0x736f7572, 0x63655f00,  // name = source_
-          CORBA::tk_alias, // typecode kind for typedefs
-          68, // encapsulation length
-            TAO_ENCAP_BYTE_ORDER, // byte order
-            36, 0x49444c3a, 0x52746563, 0x4576656e, 0x74436f6d, 0x6d2f4576, 0x656e7453, 0x6f757263, 0x6549443a, 0x312e3000,  // repository ID = IDL:RtecEventComm/EventSourceID:1.0
-            14, 0x4576656e, 0x74536f75, 0x72636549, 0x44000000,  // name = EventSourceID
-            CORBA::tk_long,
-
-          6, 0x74797065, 0x5f000000,  // name = type_
-          CORBA::tk_alias, // typecode kind for typedefs
-          60, // encapsulation length
-            TAO_ENCAP_BYTE_ORDER, // byte order
-            32, 0x49444c3a, 0x52746563, 0x4576656e, 0x74436f6d, 0x6d2f4576, 0x656e7454, 0x7970653a, 0x312e3000,  // repository ID = IDL:RtecEventComm/EventType:1.0
-            10, 0x4576656e, 0x74547970, 0x65000000,  // name = EventType
-            CORBA::tk_long,
-
-          6, 0x74696d65, 0x5f000000,  // name = time_
-          CORBA::tk_alias, // typecode kind for typedefs
-          52, // encapsulation length
-            TAO_ENCAP_BYTE_ORDER, // byte order
-            27, 0x49444c3a, 0x52746563, 0x4576656e, 0x74436f6d, 0x6d2f5469, 0x6d653a31, 0x2e300000,  // repository ID = IDL:RtecEventComm/Time:1.0
-            5, 0x54696d65, 0x0,  // name = Time
-            CORBA::tk_long,
-
-          6, 0x64617461, 0x5f000000,  // name = data_
-          CORBA::tk_struct, // typecode kind
-          84, // encapsulation length
-            TAO_ENCAP_BYTE_ORDER, // byte order
-            32, 0x49444c3a, 0x52746563, 0x4576656e, 0x74436f6d, 0x6d2f4576, 0x656e7444, 0x6174613a, 0x312e3000,  // repository ID = IDL:RtecEventComm/EventData:1.0
-            10, 0x4576656e, 0x74446174, 0x61000000,  // name = EventData
-            2, // member count
-              2, 0x78000000,  // name = x
-              CORBA::tk_long,
-
-              2, 0x79000000,  // name = y
-              CORBA::tk_long,
-
-                      17, 0x64657065, 0x6e64656e, 0x63795f69, 0x6e666f5f, 0x0,  // name = dependency_info_
-      CORBA::tk_struct, // typecode kind
-      176, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        38, 0x49444c3a, 0x52746563, 0x53636865, 0x64756c65, 0x722f4465, 0x70656e64, 0x656e6379, 0x5f496e66, 0x6f3a312e, 0x30000000,  // repository ID = IDL:RtecScheduler/Dependency_Info:1.0
-        16, 0x44657065, 0x6e64656e, 0x63795f49, 0x6e666f00,  // name = Dependency_Info
-        2, // member count
-          16, 0x6e756d62, 0x65725f6f, 0x665f6361, 0x6c6c7300,  // name = number_of_calls
-          CORBA::tk_long,
-
-          8, 0x72745f69, 0x6e666f00,  // name = rt_info
-          CORBA::tk_alias, // typecode kind for typedefs
-          60, // encapsulation length
-            TAO_ENCAP_BYTE_ORDER, // byte order
-            31, 0x49444c3a, 0x52746563, 0x53636865, 0x64756c65, 0x722f6861, 0x6e646c65, 0x5f743a31, 0x2e300000,  // repository ID = IDL:RtecScheduler/handle_t:1.0
-            9, 0x68616e64, 0x6c655f74, 0x0,  // name = handle_t
-            CORBA::tk_long,
-
-          0,
-};
-static CORBA::TypeCode _tc__tc_RtecEventChannelAdmin_PublicationSet (CORBA::tk_alias, sizeof (_oc_RtecEventChannelAdmin_PublicationSet), (unsigned char *) &_oc_RtecEventChannelAdmin_PublicationSet, CORBA::B_FALSE);
-CORBA::TypeCode_ptr RtecEventChannelAdmin::_tc_PublicationSet = &_tc__tc_RtecEventChannelAdmin_PublicationSet;
-
-static const CORBA::Long _oc_RtecEventChannelAdmin_SupplierQOS[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  42, 0x49444c3a, 0x52746563, 0x4576656e, 0x74436861, 0x6e6e656c, 0x41646d69, 0x6e2f5375, 0x70706c69, 0x6572514f, 0x533a312e, 0x30000000,  // repository ID = IDL:RtecEventChannelAdmin/SupplierQOS:1.0
-  12, 0x53757070, 0x6c696572, 0x514f5300,  // name = SupplierQOS
-  1, // member count
-    14, 0x7075626c, 0x69636174, 0x696f6e73, 0x5f000000,  // name = publications_
-    CORBA::tk_alias, // typecode kind for typedefs
-    796, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      45, 0x49444c3a, 0x52746563, 0x4576656e, 0x74436861, 0x6e6e656c, 0x41646d69, 0x6e2f5075, 0x626c6963, 0x6174696f, 0x6e536574, 0x3a312e30, 0x0,  // repository ID = IDL:RtecEventChannelAdmin/PublicationSet:1.0
-      15, 0x5075626c, 0x69636174, 0x696f6e53, 0x65740000,  // name = PublicationSet
-      CORBA::tk_sequence, // typecode kind
-      720, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-            CORBA::tk_struct, // typecode kind
-      696, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        42, 0x49444c3a, 0x52746563, 0x4576656e, 0x74436861, 0x6e6e656c, 0x41646d69, 0x6e2f5075, 0x626c6963, 0x6174696f, 0x6e3a312e, 0x30000000,  // repository ID = IDL:RtecEventChannelAdmin/Publication:1.0
-        12, 0x5075626c, 0x69636174, 0x696f6e00,  // name = Publication
-        2, // member count
-          7, 0x6576656e, 0x745f0000,  // name = event_
-          CORBA::tk_struct, // typecode kind
-          396, // encapsulation length
-            TAO_ENCAP_BYTE_ORDER, // byte order
-            28, 0x49444c3a, 0x52746563, 0x4576656e, 0x74436f6d, 0x6d2f4576, 0x656e743a, 0x312e3000,  // repository ID = IDL:RtecEventComm/Event:1.0
-            6, 0x4576656e, 0x74000000,  // name = Event
-            4, // member count
-              8, 0x736f7572, 0x63655f00,  // name = source_
-              CORBA::tk_alias, // typecode kind for typedefs
-              68, // encapsulation length
-                TAO_ENCAP_BYTE_ORDER, // byte order
-                36, 0x49444c3a, 0x52746563, 0x4576656e, 0x74436f6d, 0x6d2f4576, 0x656e7453, 0x6f757263, 0x6549443a, 0x312e3000,  // repository ID = IDL:RtecEventComm/EventSourceID:1.0
-                14, 0x4576656e, 0x74536f75, 0x72636549, 0x44000000,  // name = EventSourceID
-                CORBA::tk_long,
-
-              6, 0x74797065, 0x5f000000,  // name = type_
-              CORBA::tk_alias, // typecode kind for typedefs
-              60, // encapsulation length
-                TAO_ENCAP_BYTE_ORDER, // byte order
-                32, 0x49444c3a, 0x52746563, 0x4576656e, 0x74436f6d, 0x6d2f4576, 0x656e7454, 0x7970653a, 0x312e3000,  // repository ID = IDL:RtecEventComm/EventType:1.0
-                10, 0x4576656e, 0x74547970, 0x65000000,  // name = EventType
-                CORBA::tk_long,
-
-              6, 0x74696d65, 0x5f000000,  // name = time_
-              CORBA::tk_alias, // typecode kind for typedefs
-              52, // encapsulation length
-                TAO_ENCAP_BYTE_ORDER, // byte order
-                27, 0x49444c3a, 0x52746563, 0x4576656e, 0x74436f6d, 0x6d2f5469, 0x6d653a31, 0x2e300000,  // repository ID = IDL:RtecEventComm/Time:1.0
-                5, 0x54696d65, 0x0,  // name = Time
-                CORBA::tk_long,
-
-              6, 0x64617461, 0x5f000000,  // name = data_
-              CORBA::tk_struct, // typecode kind
-              84, // encapsulation length
-                TAO_ENCAP_BYTE_ORDER, // byte order
-                32, 0x49444c3a, 0x52746563, 0x4576656e, 0x74436f6d, 0x6d2f4576, 0x656e7444, 0x6174613a, 0x312e3000,  // repository ID = IDL:RtecEventComm/EventData:1.0
-                10, 0x4576656e, 0x74446174, 0x61000000,  // name = EventData
-                2, // member count
-                  2, 0x78000000,  // name = x
-                  CORBA::tk_long,
-
-                  2, 0x79000000,  // name = y
-                  CORBA::tk_long,
-
-                                  17, 0x64657065, 0x6e64656e, 0x63795f69, 0x6e666f5f, 0x0,  // name = dependency_info_
-          CORBA::tk_struct, // typecode kind
-          176, // encapsulation length
-            TAO_ENCAP_BYTE_ORDER, // byte order
-            38, 0x49444c3a, 0x52746563, 0x53636865, 0x64756c65, 0x722f4465, 0x70656e64, 0x656e6379, 0x5f496e66, 0x6f3a312e, 0x30000000,  // repository ID = IDL:RtecScheduler/Dependency_Info:1.0
-            16, 0x44657065, 0x6e64656e, 0x63795f49, 0x6e666f00,  // name = Dependency_Info
-            2, // member count
-              16, 0x6e756d62, 0x65725f6f, 0x665f6361, 0x6c6c7300,  // name = number_of_calls
-              CORBA::tk_long,
-
-              8, 0x72745f69, 0x6e666f00,  // name = rt_info
-              CORBA::tk_alias, // typecode kind for typedefs
-              60, // encapsulation length
-                TAO_ENCAP_BYTE_ORDER, // byte order
-                31, 0x49444c3a, 0x52746563, 0x53636865, 0x64756c65, 0x722f6861, 0x6e646c65, 0x5f743a31, 0x2e300000,  // repository ID = IDL:RtecScheduler/handle_t:1.0
-                9, 0x68616e64, 0x6c655f74, 0x0,  // name = handle_t
-                CORBA::tk_long,
-
-                      0,
-};
-static CORBA::TypeCode _tc__tc_RtecEventChannelAdmin_SupplierQOS (CORBA::tk_struct, sizeof (_oc_RtecEventChannelAdmin_SupplierQOS), (unsigned char *) &_oc_RtecEventChannelAdmin_SupplierQOS, CORBA::B_FALSE);
-CORBA::TypeCode_ptr RtecEventChannelAdmin::_tc_SupplierQOS = &_tc__tc_RtecEventChannelAdmin_SupplierQOS;
-
-RtecEventChannelAdmin::ProxyPushConsumer_ptr RtecEventChannelAdmin::ProxyPushConsumer::_duplicate (RtecEventChannelAdmin::ProxyPushConsumer_ptr obj)
-{
-  if (!CORBA::is_nil (obj))
-    obj->AddRef ();
-  
-  return obj;
-} // end of _duplicate
-
-RtecEventChannelAdmin::ProxyPushConsumer_ptr RtecEventChannelAdmin::ProxyPushConsumer::_narrow (CORBA::Object_ptr obj, CORBA::Environment &env)
-{
-  if (CORBA::is_nil (obj)) return RtecEventChannelAdmin::ProxyPushConsumer::_nil ();
-  if (obj->_is_a ("IDL:RtecEventChannelAdmin/ProxyPushConsumer:1.0", env))
-  {
-    STUB_Object *istub;
-    RtecEventChannelAdmin::ProxyPushConsumer_ptr new_obj; // to be returned 
-    if (obj->QueryInterface (IID_STUB_Object, (void **)&istub) != NOERROR)
-      return RtecEventChannelAdmin::ProxyPushConsumer::_nil ();
-    
-    obj->Release (); // need this since QueryIntf bumped our refcount
-    new_obj = new RtecEventChannelAdmin::ProxyPushConsumer (istub); // construct obj ref using the stub object
-    return new_obj;
-  } // end of if
-  return RtecEventChannelAdmin::ProxyPushConsumer::_nil (); // _narrow failed
-} // end of _narrow
-
-RtecEventChannelAdmin::ProxyPushConsumer_ptr RtecEventChannelAdmin::ProxyPushConsumer::_nil (void)
-{
-  return (RtecEventChannelAdmin::ProxyPushConsumer_ptr)NULL;
-} // end of _nil
-
-RtecEventChannelAdmin::ProxyPushConsumer_ptr RtecEventChannelAdmin::ProxyPushConsumer::_bind (const char *host, CORBA::UShort port, const char *key, CORBA::Environment &env)
-{
-  CORBA::Object_ptr objref = CORBA::Object::_nil ();
-  IIOP_Object *data = new IIOP_Object (host, port, key);
-  if (!data) return RtecEventChannelAdmin::ProxyPushConsumer::_nil ();
-  // get the object_ptr using Query Interface
-  if (data->QueryInterface (IID_CORBA_Object, (void **)&objref) != NOERROR)
-  {
-  	env.exception (new CORBA::DATA_CONVERSION (CORBA::COMPLETED_NO));
-  	return RtecEventChannelAdmin::ProxyPushConsumer::_nil ();
-  }
-  data->Release (); // QueryInterface had bumped up our count
-  if (CORBA::is_nil (objref))
-  	return RtecEventChannelAdmin::ProxyPushConsumer::_nil ();
-  else // narrow it
-  	return RtecEventChannelAdmin::ProxyPushConsumer::_narrow (objref, env);
-}
-
-static const TAO_Param_Data RtecEventChannelAdmin_ProxyPushConsumer_connect_push_supplier_paramdata [] = 
-{
-  {CORBA::_tc_void, PARAM_RETURN, 0},
-  {RtecEventComm::_tc_PushSupplier, PARAM_IN, 0},
-  {RtecEventChannelAdmin::_tc_SupplierQOS, PARAM_IN, 0}
-};
-
-static const TAO_Call_Data RtecEventChannelAdmin_ProxyPushConsumer_connect_push_supplier_calldata = 
-{"connect_push_supplier", 0, 3, RtecEventChannelAdmin_ProxyPushConsumer_connect_push_supplier_paramdata, 0, 0};
-
-void  RtecEventChannelAdmin::ProxyPushConsumer::connect_push_supplier (RtecEventComm::PushSupplier_ptr push_supplier, const RtecEventChannelAdmin::SupplierQOS &qos, CORBA::Environment &env)
-{
-  STUB_Object *istub;
-
-  if (this->QueryInterface (IID_STUB_Object, (void **)&istub) != NOERROR)
-  {
-    env.exception (new CORBA::DATA_CONVERSION (CORBA::COMPLETED_NO));
-    return;
-  }
-  this->Release (); // QueryInterface has bumped up our refcount
-  CORBA::Object_ptr _tao_base_push_supplier = push_supplier; // cast it
-  istub->do_call (env, &RtecEventChannelAdmin_ProxyPushConsumer_connect_push_supplier_calldata, 0, &_tao_base_push_supplier, &qos);
-  return; // no value
-  
-}
-
-static const CORBA::Long _oc_RtecEventChannelAdmin_ProxyPushConsumer[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  48, 0x49444c3a, 0x52746563, 0x4576656e, 0x74436861, 0x6e6e656c, 0x41646d69, 0x6e2f5072, 0x6f787950, 0x75736843, 0x6f6e7375, 0x6d65723a, 0x312e3000,  // repository ID = IDL:RtecEventChannelAdmin/ProxyPushConsumer:1.0
-  18, 0x50726f78, 0x79507573, 0x68436f6e, 0x73756d65, 0x72000000,  // name = ProxyPushConsumer,
-};
-static CORBA::TypeCode _tc__tc_RtecEventChannelAdmin_ProxyPushConsumer (CORBA::tk_objref, sizeof (_oc_RtecEventChannelAdmin_ProxyPushConsumer), (unsigned char *) &_oc_RtecEventChannelAdmin_ProxyPushConsumer, CORBA::B_FALSE);
-CORBA::TypeCode_ptr RtecEventChannelAdmin::_tc_ProxyPushConsumer = &_tc__tc_RtecEventChannelAdmin_ProxyPushConsumer;
-
-RtecEventChannelAdmin::ProxyPushSupplier_ptr RtecEventChannelAdmin::ProxyPushSupplier::_duplicate (RtecEventChannelAdmin::ProxyPushSupplier_ptr obj)
-{
-  if (!CORBA::is_nil (obj))
-    obj->AddRef ();
-  
-  return obj;
-} // end of _duplicate
-
-RtecEventChannelAdmin::ProxyPushSupplier_ptr RtecEventChannelAdmin::ProxyPushSupplier::_narrow (CORBA::Object_ptr obj, CORBA::Environment &env)
-{
-  if (CORBA::is_nil (obj)) return RtecEventChannelAdmin::ProxyPushSupplier::_nil ();
-  if (obj->_is_a ("IDL:RtecEventChannelAdmin/ProxyPushSupplier:1.0", env))
-  {
-    STUB_Object *istub;
-    RtecEventChannelAdmin::ProxyPushSupplier_ptr new_obj; // to be returned 
-    if (obj->QueryInterface (IID_STUB_Object, (void **)&istub) != NOERROR)
-      return RtecEventChannelAdmin::ProxyPushSupplier::_nil ();
-    
-    obj->Release (); // need this since QueryIntf bumped our refcount
-    new_obj = new RtecEventChannelAdmin::ProxyPushSupplier (istub); // construct obj ref using the stub object
-    return new_obj;
-  } // end of if
-  return RtecEventChannelAdmin::ProxyPushSupplier::_nil (); // _narrow failed
-} // end of _narrow
-
-RtecEventChannelAdmin::ProxyPushSupplier_ptr RtecEventChannelAdmin::ProxyPushSupplier::_nil (void)
-{
-  return (RtecEventChannelAdmin::ProxyPushSupplier_ptr)NULL;
-} // end of _nil
-
-RtecEventChannelAdmin::ProxyPushSupplier_ptr RtecEventChannelAdmin::ProxyPushSupplier::_bind (const char *host, CORBA::UShort port, const char *key, CORBA::Environment &env)
-{
-  CORBA::Object_ptr objref = CORBA::Object::_nil ();
-  IIOP_Object *data = new IIOP_Object (host, port, key);
-  if (!data) return RtecEventChannelAdmin::ProxyPushSupplier::_nil ();
-  // get the object_ptr using Query Interface
-  if (data->QueryInterface (IID_CORBA_Object, (void **)&objref) != NOERROR)
-  {
-  	env.exception (new CORBA::DATA_CONVERSION (CORBA::COMPLETED_NO));
-  	return RtecEventChannelAdmin::ProxyPushSupplier::_nil ();
-  }
-  data->Release (); // QueryInterface had bumped up our count
-  if (CORBA::is_nil (objref))
-  	return RtecEventChannelAdmin::ProxyPushSupplier::_nil ();
-  else // narrow it
-  	return RtecEventChannelAdmin::ProxyPushSupplier::_narrow (objref, env);
-}
-
-static const TAO_Param_Data RtecEventChannelAdmin_ProxyPushSupplier_connect_push_consumer_paramdata [] = 
-{
-  {CORBA::_tc_void, PARAM_RETURN, 0},
-  {RtecEventComm::_tc_PushConsumer, PARAM_IN, 0},
-  {RtecEventChannelAdmin::_tc_ConsumerQOS, PARAM_IN, 0}
-};
-
-static const TAO_Call_Data RtecEventChannelAdmin_ProxyPushSupplier_connect_push_consumer_calldata = 
-{"connect_push_consumer", 0, 3, RtecEventChannelAdmin_ProxyPushSupplier_connect_push_consumer_paramdata, 0, 0};
-
-void  RtecEventChannelAdmin::ProxyPushSupplier::connect_push_consumer (RtecEventComm::PushConsumer_ptr push_consumer, const RtecEventChannelAdmin::ConsumerQOS &qos, CORBA::Environment &env)
-{
-  STUB_Object *istub;
-
-  if (this->QueryInterface (IID_STUB_Object, (void **)&istub) != NOERROR)
-  {
-    env.exception (new CORBA::DATA_CONVERSION (CORBA::COMPLETED_NO));
-    return;
-  }
-  this->Release (); // QueryInterface has bumped up our refcount
-  CORBA::Object_ptr _tao_base_push_consumer = push_consumer; // cast it
-  istub->do_call (env, &RtecEventChannelAdmin_ProxyPushSupplier_connect_push_consumer_calldata, 0, &_tao_base_push_consumer, &qos);
-  return; // no value
-  
-}
-
-static const CORBA::Long _oc_RtecEventChannelAdmin_ProxyPushSupplier[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  48, 0x49444c3a, 0x52746563, 0x4576656e, 0x74436861, 0x6e6e656c, 0x41646d69, 0x6e2f5072, 0x6f787950, 0x75736853, 0x7570706c, 0x6965723a, 0x312e3000,  // repository ID = IDL:RtecEventChannelAdmin/ProxyPushSupplier:1.0
-  18, 0x50726f78, 0x79507573, 0x68537570, 0x706c6965, 0x72000000,  // name = ProxyPushSupplier,
-};
-static CORBA::TypeCode _tc__tc_RtecEventChannelAdmin_ProxyPushSupplier (CORBA::tk_objref, sizeof (_oc_RtecEventChannelAdmin_ProxyPushSupplier), (unsigned char *) &_oc_RtecEventChannelAdmin_ProxyPushSupplier, CORBA::B_FALSE);
-CORBA::TypeCode_ptr RtecEventChannelAdmin::_tc_ProxyPushSupplier = &_tc__tc_RtecEventChannelAdmin_ProxyPushSupplier;
-
-RtecEventChannelAdmin::ConsumerAdmin_ptr RtecEventChannelAdmin::ConsumerAdmin::_duplicate (RtecEventChannelAdmin::ConsumerAdmin_ptr obj)
-{
-  if (!CORBA::is_nil (obj))
-    obj->AddRef ();
-  
-  return obj;
-} // end of _duplicate
-
-RtecEventChannelAdmin::ConsumerAdmin_ptr RtecEventChannelAdmin::ConsumerAdmin::_narrow (CORBA::Object_ptr obj, CORBA::Environment &env)
-{
-  if (CORBA::is_nil (obj)) return RtecEventChannelAdmin::ConsumerAdmin::_nil ();
-  if (obj->_is_a ("IDL:RtecEventChannelAdmin/ConsumerAdmin:1.0", env))
-  {
-    STUB_Object *istub;
-    RtecEventChannelAdmin::ConsumerAdmin_ptr new_obj; // to be returned 
-    if (obj->QueryInterface (IID_STUB_Object, (void **)&istub) != NOERROR)
-      return RtecEventChannelAdmin::ConsumerAdmin::_nil ();
-    
-    obj->Release (); // need this since QueryIntf bumped our refcount
-    new_obj = new RtecEventChannelAdmin::ConsumerAdmin (istub); // construct obj ref using the stub object
-    return new_obj;
-  } // end of if
-  return RtecEventChannelAdmin::ConsumerAdmin::_nil (); // _narrow failed
-} // end of _narrow
-
-RtecEventChannelAdmin::ConsumerAdmin_ptr RtecEventChannelAdmin::ConsumerAdmin::_nil (void)
-{
-  return (RtecEventChannelAdmin::ConsumerAdmin_ptr)NULL;
-} // end of _nil
-
-RtecEventChannelAdmin::ConsumerAdmin_ptr RtecEventChannelAdmin::ConsumerAdmin::_bind (const char *host, CORBA::UShort port, const char *key, CORBA::Environment &env)
-{
-  CORBA::Object_ptr objref = CORBA::Object::_nil ();
-  IIOP_Object *data = new IIOP_Object (host, port, key);
-  if (!data) return RtecEventChannelAdmin::ConsumerAdmin::_nil ();
-  // get the object_ptr using Query Interface
-  if (data->QueryInterface (IID_CORBA_Object, (void **)&objref) != NOERROR)
-  {
-  	env.exception (new CORBA::DATA_CONVERSION (CORBA::COMPLETED_NO));
-  	return RtecEventChannelAdmin::ConsumerAdmin::_nil ();
-  }
-  data->Release (); // QueryInterface had bumped up our count
-  if (CORBA::is_nil (objref))
-  	return RtecEventChannelAdmin::ConsumerAdmin::_nil ();
-  else // narrow it
-  	return RtecEventChannelAdmin::ConsumerAdmin::_narrow (objref, env);
-}
-
-static const TAO_Param_Data RtecEventChannelAdmin_ConsumerAdmin_obtain_push_supplier_paramdata [] = 
-{
-  {RtecEventChannelAdmin::_tc_ProxyPushSupplier, PARAM_RETURN, 0}
-};
-
-static const TAO_Call_Data RtecEventChannelAdmin_ConsumerAdmin_obtain_push_supplier_calldata = 
-{"obtain_push_supplier", 1, 1, RtecEventChannelAdmin_ConsumerAdmin_obtain_push_supplier_paramdata, 0, 0};
-
-RtecEventChannelAdmin::ProxyPushSupplier_ptr  RtecEventChannelAdmin::ConsumerAdmin::obtain_push_supplier (CORBA::Environment &env)
-{
-  CORBA::Object_ptr retval = CORBA::Object::_nil ();
-  STUB_Object *istub;
-
-  if (this->QueryInterface (IID_STUB_Object, (void **)&istub) != NOERROR)
-  {
-    env.exception (new CORBA::DATA_CONVERSION (CORBA::COMPLETED_NO));
-    return RtecEventChannelAdmin::ProxyPushSupplier::_nil ();
-  }
-  this->Release (); // QueryInterface has bumped up our refcount
-  istub->do_call (env, &RtecEventChannelAdmin_ConsumerAdmin_obtain_push_supplier_calldata, &retval);
-  return RtecEventChannelAdmin::ProxyPushSupplier::_narrow (retval, env);
-  
-}
-
-static const CORBA::Long _oc_RtecEventChannelAdmin_ConsumerAdmin[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  44, 0x49444c3a, 0x52746563, 0x4576656e, 0x74436861, 0x6e6e656c, 0x41646d69, 0x6e2f436f, 0x6e73756d, 0x65724164, 0x6d696e3a, 0x312e3000,  // repository ID = IDL:RtecEventChannelAdmin/ConsumerAdmin:1.0
-  14, 0x436f6e73, 0x756d6572, 0x41646d69, 0x6e000000,  // name = ConsumerAdmin,
-};
-static CORBA::TypeCode _tc__tc_RtecEventChannelAdmin_ConsumerAdmin (CORBA::tk_objref, sizeof (_oc_RtecEventChannelAdmin_ConsumerAdmin), (unsigned char *) &_oc_RtecEventChannelAdmin_ConsumerAdmin, CORBA::B_FALSE);
-CORBA::TypeCode_ptr RtecEventChannelAdmin::_tc_ConsumerAdmin = &_tc__tc_RtecEventChannelAdmin_ConsumerAdmin;
-
-RtecEventChannelAdmin::SupplierAdmin_ptr RtecEventChannelAdmin::SupplierAdmin::_duplicate (RtecEventChannelAdmin::SupplierAdmin_ptr obj)
-{
-  if (!CORBA::is_nil (obj))
-    obj->AddRef ();
-  
-  return obj;
-} // end of _duplicate
-
-RtecEventChannelAdmin::SupplierAdmin_ptr RtecEventChannelAdmin::SupplierAdmin::_narrow (CORBA::Object_ptr obj, CORBA::Environment &env)
-{
-  if (CORBA::is_nil (obj)) return RtecEventChannelAdmin::SupplierAdmin::_nil ();
-  if (obj->_is_a ("IDL:RtecEventChannelAdmin/SupplierAdmin:1.0", env))
-  {
-    STUB_Object *istub;
-    RtecEventChannelAdmin::SupplierAdmin_ptr new_obj; // to be returned 
-    if (obj->QueryInterface (IID_STUB_Object, (void **)&istub) != NOERROR)
-      return RtecEventChannelAdmin::SupplierAdmin::_nil ();
-    
-    obj->Release (); // need this since QueryIntf bumped our refcount
-    new_obj = new RtecEventChannelAdmin::SupplierAdmin (istub); // construct obj ref using the stub object
-    return new_obj;
-  } // end of if
-  return RtecEventChannelAdmin::SupplierAdmin::_nil (); // _narrow failed
-} // end of _narrow
-
-RtecEventChannelAdmin::SupplierAdmin_ptr RtecEventChannelAdmin::SupplierAdmin::_nil (void)
-{
-  return (RtecEventChannelAdmin::SupplierAdmin_ptr)NULL;
-} // end of _nil
-
-RtecEventChannelAdmin::SupplierAdmin_ptr RtecEventChannelAdmin::SupplierAdmin::_bind (const char *host, CORBA::UShort port, const char *key, CORBA::Environment &env)
-{
-  CORBA::Object_ptr objref = CORBA::Object::_nil ();
-  IIOP_Object *data = new IIOP_Object (host, port, key);
-  if (!data) return RtecEventChannelAdmin::SupplierAdmin::_nil ();
-  // get the object_ptr using Query Interface
-  if (data->QueryInterface (IID_CORBA_Object, (void **)&objref) != NOERROR)
-  {
-  	env.exception (new CORBA::DATA_CONVERSION (CORBA::COMPLETED_NO));
-  	return RtecEventChannelAdmin::SupplierAdmin::_nil ();
-  }
-  data->Release (); // QueryInterface had bumped up our count
-  if (CORBA::is_nil (objref))
-  	return RtecEventChannelAdmin::SupplierAdmin::_nil ();
-  else // narrow it
-  	return RtecEventChannelAdmin::SupplierAdmin::_narrow (objref, env);
-}
-
-static const TAO_Param_Data RtecEventChannelAdmin_SupplierAdmin_obtain_push_consumer_paramdata [] = 
-{
-  {RtecEventChannelAdmin::_tc_ProxyPushConsumer, PARAM_RETURN, 0}
-};
-
-static const TAO_Call_Data RtecEventChannelAdmin_SupplierAdmin_obtain_push_consumer_calldata = 
-{"obtain_push_consumer", 1, 1, RtecEventChannelAdmin_SupplierAdmin_obtain_push_consumer_paramdata, 0, 0};
-
-RtecEventChannelAdmin::ProxyPushConsumer_ptr  RtecEventChannelAdmin::SupplierAdmin::obtain_push_consumer (CORBA::Environment &env)
-{
-  CORBA::Object_ptr retval = CORBA::Object::_nil ();
-  STUB_Object *istub;
-
-  if (this->QueryInterface (IID_STUB_Object, (void **)&istub) != NOERROR)
-  {
-    env.exception (new CORBA::DATA_CONVERSION (CORBA::COMPLETED_NO));
-    return RtecEventChannelAdmin::ProxyPushConsumer::_nil ();
-  }
-  this->Release (); // QueryInterface has bumped up our refcount
-  istub->do_call (env, &RtecEventChannelAdmin_SupplierAdmin_obtain_push_consumer_calldata, &retval);
-  return RtecEventChannelAdmin::ProxyPushConsumer::_narrow (retval, env);
-  
-}
-
-static const CORBA::Long _oc_RtecEventChannelAdmin_SupplierAdmin[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  44, 0x49444c3a, 0x52746563, 0x4576656e, 0x74436861, 0x6e6e656c, 0x41646d69, 0x6e2f5375, 0x70706c69, 0x65724164, 0x6d696e3a, 0x312e3000,  // repository ID = IDL:RtecEventChannelAdmin/SupplierAdmin:1.0
-  14, 0x53757070, 0x6c696572, 0x41646d69, 0x6e000000,  // name = SupplierAdmin,
-};
-static CORBA::TypeCode _tc__tc_RtecEventChannelAdmin_SupplierAdmin (CORBA::tk_objref, sizeof (_oc_RtecEventChannelAdmin_SupplierAdmin), (unsigned char *) &_oc_RtecEventChannelAdmin_SupplierAdmin, CORBA::B_FALSE);
-CORBA::TypeCode_ptr RtecEventChannelAdmin::_tc_SupplierAdmin = &_tc__tc_RtecEventChannelAdmin_SupplierAdmin;
-
-RtecEventChannelAdmin::EventChannel_ptr RtecEventChannelAdmin::EventChannel::_duplicate (RtecEventChannelAdmin::EventChannel_ptr obj)
-{
-  if (!CORBA::is_nil (obj))
-    obj->AddRef ();
-  
-  return obj;
-} // end of _duplicate
-
-RtecEventChannelAdmin::EventChannel_ptr RtecEventChannelAdmin::EventChannel::_narrow (CORBA::Object_ptr obj, CORBA::Environment &env)
-{
-  if (CORBA::is_nil (obj)) return RtecEventChannelAdmin::EventChannel::_nil ();
-  if (obj->_is_a ("IDL:RtecEventChannelAdmin/EventChannel:1.0", env))
-  {
-    STUB_Object *istub;
-    RtecEventChannelAdmin::EventChannel_ptr new_obj; // to be returned 
-    if (obj->QueryInterface (IID_STUB_Object, (void **)&istub) != NOERROR)
-      return RtecEventChannelAdmin::EventChannel::_nil ();
-    
-    obj->Release (); // need this since QueryIntf bumped our refcount
-    new_obj = new RtecEventChannelAdmin::EventChannel (istub); // construct obj ref using the stub object
-    return new_obj;
-  } // end of if
-  return RtecEventChannelAdmin::EventChannel::_nil (); // _narrow failed
-} // end of _narrow
-
-RtecEventChannelAdmin::EventChannel_ptr RtecEventChannelAdmin::EventChannel::_nil (void)
-{
-  return (RtecEventChannelAdmin::EventChannel_ptr)NULL;
-} // end of _nil
-
-RtecEventChannelAdmin::EventChannel_ptr RtecEventChannelAdmin::EventChannel::_bind (const char *host, CORBA::UShort port, const char *key, CORBA::Environment &env)
-{
-  CORBA::Object_ptr objref = CORBA::Object::_nil ();
-  IIOP_Object *data = new IIOP_Object (host, port, key);
-  if (!data) return RtecEventChannelAdmin::EventChannel::_nil ();
-  // get the object_ptr using Query Interface
-  if (data->QueryInterface (IID_CORBA_Object, (void **)&objref) != NOERROR)
-  {
-  	env.exception (new CORBA::DATA_CONVERSION (CORBA::COMPLETED_NO));
-  	return RtecEventChannelAdmin::EventChannel::_nil ();
-  }
-  data->Release (); // QueryInterface had bumped up our count
-  if (CORBA::is_nil (objref))
-  	return RtecEventChannelAdmin::EventChannel::_nil ();
-  else // narrow it
-  	return RtecEventChannelAdmin::EventChannel::_narrow (objref, env);
-}
-
-static const CORBA::Long _oc_RtecEventChannelAdmin_EventChannel_SYNCHRONIZATION_ERROR[] =
-{
-  0, // byte order
-  65, 0x49444c3a, 0x52746563, 0x4576656e, 0x74436861, 0x6e6e656c, 0x41646d69, 0x6e2f4576, 0x656e7443, 0x68616e6e, 0x656c2f53, 0x594e4348, 0x524f4e49, 0x5a415449, 0x4f4e5f45, 0x52524f52, 0x3a312e30, 0x0,  // repository ID = IDL:RtecEventChannelAdmin/EventChannel/SYNCHRONIZATION_ERROR:1.0
-  22, 0x53594e43, 0x48524f4e, 0x495a4154, 0x494f4e5f, 0x4552524f, 0x52000000,  // name = SYNCHRONIZATION_ERROR
-  3, // member count
-    6, 0x6d696e6f, 0x72000000,  // name = minor
-    CORBA::tk_long,
-
-    7, 0x73746174, 0x75730000,  // name = status
-    CORBA::tk_long,
-
-    5, 0x6e616d65, 0x0,  // name = name
-    CORBA::tk_string, 
-    0, // string length
-    };
-static CORBA::TypeCode _tc__tc_RtecEventChannelAdmin_EventChannel_SYNCHRONIZATION_ERROR (CORBA::tk_struct, sizeof (_oc_RtecEventChannelAdmin_EventChannel_SYNCHRONIZATION_ERROR), (unsigned char *) &_oc_RtecEventChannelAdmin_EventChannel_SYNCHRONIZATION_ERROR, CORBA::B_FALSE);
-CORBA::TypeCode_ptr RtecEventChannelAdmin::EventChannel::_tc_SYNCHRONIZATION_ERROR = &_tc__tc_RtecEventChannelAdmin_EventChannel_SYNCHRONIZATION_ERROR;
-
-static const CORBA::Long _oc_RtecEventChannelAdmin_EventChannel_QOS_ERROR[] =
-{
-  0, // byte order
-  53, 0x49444c3a, 0x52746563, 0x4576656e, 0x74436861, 0x6e6e656c, 0x41646d69, 0x6e2f4576, 0x656e7443, 0x68616e6e, 0x656c2f51, 0x4f535f45, 0x52524f52, 0x3a312e30, 0x0,  // repository ID = IDL:RtecEventChannelAdmin/EventChannel/QOS_ERROR:1.0
-  10, 0x514f535f, 0x4552524f, 0x52000000,  // name = QOS_ERROR
-  3, // member count
-    6, 0x6d696e6f, 0x72000000,  // name = minor
-    CORBA::tk_long,
-
-    7, 0x73746174, 0x75730000,  // name = status
-    CORBA::tk_long,
-
-    5, 0x6e616d65, 0x0,  // name = name
-    CORBA::tk_string, 
-    0, // string length
-    };
-static CORBA::TypeCode _tc__tc_RtecEventChannelAdmin_EventChannel_QOS_ERROR (CORBA::tk_struct, sizeof (_oc_RtecEventChannelAdmin_EventChannel_QOS_ERROR), (unsigned char *) &_oc_RtecEventChannelAdmin_EventChannel_QOS_ERROR, CORBA::B_FALSE);
-CORBA::TypeCode_ptr RtecEventChannelAdmin::EventChannel::_tc_QOS_ERROR = &_tc__tc_RtecEventChannelAdmin_EventChannel_QOS_ERROR;
-
-static const CORBA::Long _oc_RtecEventChannelAdmin_EventChannel_SUBSCRIPTION_ERROR[] =
-{
-  0, // byte order
-  62, 0x49444c3a, 0x52746563, 0x4576656e, 0x74436861, 0x6e6e656c, 0x41646d69, 0x6e2f4576, 0x656e7443, 0x68616e6e, 0x656c2f53, 0x55425343, 0x52495054, 0x494f4e5f, 0x4552524f, 0x523a312e, 0x30000000,  // repository ID = IDL:RtecEventChannelAdmin/EventChannel/SUBSCRIPTION_ERROR:1.0
-  19, 0x53554253, 0x43524950, 0x54494f4e, 0x5f455252, 0x4f520000,  // name = SUBSCRIPTION_ERROR
-  3, // member count
-    6, 0x6d696e6f, 0x72000000,  // name = minor
-    CORBA::tk_long,
-
-    7, 0x73746174, 0x75730000,  // name = status
-    CORBA::tk_long,
-
-    5, 0x6e616d65, 0x0,  // name = name
-    CORBA::tk_string, 
-    0, // string length
-    };
-static CORBA::TypeCode _tc__tc_RtecEventChannelAdmin_EventChannel_SUBSCRIPTION_ERROR (CORBA::tk_struct, sizeof (_oc_RtecEventChannelAdmin_EventChannel_SUBSCRIPTION_ERROR), (unsigned char *) &_oc_RtecEventChannelAdmin_EventChannel_SUBSCRIPTION_ERROR, CORBA::B_FALSE);
-CORBA::TypeCode_ptr RtecEventChannelAdmin::EventChannel::_tc_SUBSCRIPTION_ERROR = &_tc__tc_RtecEventChannelAdmin_EventChannel_SUBSCRIPTION_ERROR;
-
-static const CORBA::Long _oc_RtecEventChannelAdmin_EventChannel_CORRELATION_ERROR[] =
-{
-  0, // byte order
-  61, 0x49444c3a, 0x52746563, 0x4576656e, 0x74436861, 0x6e6e656c, 0x41646d69, 0x6e2f4576, 0x656e7443, 0x68616e6e, 0x656c2f43, 0x4f525245, 0x4c415449, 0x4f4e5f45, 0x52524f52, 0x3a312e30, 0x0,  // repository ID = IDL:RtecEventChannelAdmin/EventChannel/CORRELATION_ERROR:1.0
-  18, 0x434f5252, 0x454c4154, 0x494f4e5f, 0x4552524f, 0x52000000,  // name = CORRELATION_ERROR
-  3, // member count
-    6, 0x6d696e6f, 0x72000000,  // name = minor
-    CORBA::tk_long,
-
-    7, 0x73746174, 0x75730000,  // name = status
-    CORBA::tk_long,
-
-    5, 0x6e616d65, 0x0,  // name = name
-    CORBA::tk_string, 
-    0, // string length
-    };
-static CORBA::TypeCode _tc__tc_RtecEventChannelAdmin_EventChannel_CORRELATION_ERROR (CORBA::tk_struct, sizeof (_oc_RtecEventChannelAdmin_EventChannel_CORRELATION_ERROR), (unsigned char *) &_oc_RtecEventChannelAdmin_EventChannel_CORRELATION_ERROR, CORBA::B_FALSE);
-CORBA::TypeCode_ptr RtecEventChannelAdmin::EventChannel::_tc_CORRELATION_ERROR = &_tc__tc_RtecEventChannelAdmin_EventChannel_CORRELATION_ERROR;
-
-static const CORBA::Long _oc_RtecEventChannelAdmin_EventChannel_DISPATCH_ERROR[] =
-{
-  0, // byte order
-  58, 0x49444c3a, 0x52746563, 0x4576656e, 0x74436861, 0x6e6e656c, 0x41646d69, 0x6e2f4576, 0x656e7443, 0x68616e6e, 0x656c2f44, 0x49535041, 0x5443485f, 0x4552524f, 0x523a312e, 0x30000000,  // repository ID = IDL:RtecEventChannelAdmin/EventChannel/DISPATCH_ERROR:1.0
-  15, 0x44495350, 0x41544348, 0x5f455252, 0x4f520000,  // name = DISPATCH_ERROR
-  3, // member count
-    6, 0x6d696e6f, 0x72000000,  // name = minor
-    CORBA::tk_long,
-
-    7, 0x73746174, 0x75730000,  // name = status
-    CORBA::tk_long,
-
-    5, 0x6e616d65, 0x0,  // name = name
-    CORBA::tk_string, 
-    0, // string length
-    };
-static CORBA::TypeCode _tc__tc_RtecEventChannelAdmin_EventChannel_DISPATCH_ERROR (CORBA::tk_struct, sizeof (_oc_RtecEventChannelAdmin_EventChannel_DISPATCH_ERROR), (unsigned char *) &_oc_RtecEventChannelAdmin_EventChannel_DISPATCH_ERROR, CORBA::B_FALSE);
-CORBA::TypeCode_ptr RtecEventChannelAdmin::EventChannel::_tc_DISPATCH_ERROR = &_tc__tc_RtecEventChannelAdmin_EventChannel_DISPATCH_ERROR;
-
-static const TAO_Param_Data RtecEventChannelAdmin_EventChannel_for_consumers_paramdata [] = 
-{
-  {RtecEventChannelAdmin::_tc_ConsumerAdmin, PARAM_RETURN, 0}
-};
-
-static const TAO_Call_Data RtecEventChannelAdmin_EventChannel_for_consumers_calldata = 
-{"for_consumers", 1, 1, RtecEventChannelAdmin_EventChannel_for_consumers_paramdata, 0, 0};
-
-RtecEventChannelAdmin::ConsumerAdmin_ptr  RtecEventChannelAdmin::EventChannel::for_consumers (CORBA::Environment &env)
-{
-  CORBA::Object_ptr retval = CORBA::Object::_nil ();
-  STUB_Object *istub;
-
-  if (this->QueryInterface (IID_STUB_Object, (void **)&istub) != NOERROR)
-  {
-    env.exception (new CORBA::DATA_CONVERSION (CORBA::COMPLETED_NO));
-    return RtecEventChannelAdmin::ConsumerAdmin::_nil ();
-  }
-  this->Release (); // QueryInterface has bumped up our refcount
-  istub->do_call (env, &RtecEventChannelAdmin_EventChannel_for_consumers_calldata, &retval);
-  return RtecEventChannelAdmin::ConsumerAdmin::_narrow (retval, env);
-  
-}
-
-static const TAO_Param_Data RtecEventChannelAdmin_EventChannel_for_suppliers_paramdata [] = 
-{
-  {RtecEventChannelAdmin::_tc_SupplierAdmin, PARAM_RETURN, 0}
-};
-
-static const TAO_Call_Data RtecEventChannelAdmin_EventChannel_for_suppliers_calldata = 
-{"for_suppliers", 1, 1, RtecEventChannelAdmin_EventChannel_for_suppliers_paramdata, 0, 0};
-
-RtecEventChannelAdmin::SupplierAdmin_ptr  RtecEventChannelAdmin::EventChannel::for_suppliers (CORBA::Environment &env)
-{
-  CORBA::Object_ptr retval = CORBA::Object::_nil ();
-  STUB_Object *istub;
-
-  if (this->QueryInterface (IID_STUB_Object, (void **)&istub) != NOERROR)
-  {
-    env.exception (new CORBA::DATA_CONVERSION (CORBA::COMPLETED_NO));
-    return RtecEventChannelAdmin::SupplierAdmin::_nil ();
-  }
-  this->Release (); // QueryInterface has bumped up our refcount
-  istub->do_call (env, &RtecEventChannelAdmin_EventChannel_for_suppliers_calldata, &retval);
-  return RtecEventChannelAdmin::SupplierAdmin::_narrow (retval, env);
-  
-}
-
-static const TAO_Param_Data RtecEventChannelAdmin_EventChannel_destroy_paramdata [] = 
-{
-  {CORBA::_tc_void, PARAM_RETURN, 0}
-};
-
-static const TAO_Call_Data RtecEventChannelAdmin_EventChannel_destroy_calldata = 
-{"destroy", 1, 1, RtecEventChannelAdmin_EventChannel_destroy_paramdata, 0, 0};
-
-void  RtecEventChannelAdmin::EventChannel::destroy (CORBA::Environment &env)
-{
-  STUB_Object *istub;
-
-  if (this->QueryInterface (IID_STUB_Object, (void **)&istub) != NOERROR)
-  {
-    env.exception (new CORBA::DATA_CONVERSION (CORBA::COMPLETED_NO));
-    return;
-  }
-  this->Release (); // QueryInterface has bumped up our refcount
-  istub->do_call (env, &RtecEventChannelAdmin_EventChannel_destroy_calldata, 0);
-  return; // no value
-  
-}
-
-static const CORBA::Long _oc_RtecEventChannelAdmin_EventChannel[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  43, 0x49444c3a, 0x52746563, 0x4576656e, 0x74436861, 0x6e6e656c, 0x41646d69, 0x6e2f4576, 0x656e7443, 0x68616e6e, 0x656c3a31, 0x2e300000,  // repository ID = IDL:RtecEventChannelAdmin/EventChannel:1.0
-  13, 0x4576656e, 0x74436861, 0x6e6e656c, 0x0,  // name = EventChannel,
-};
-static CORBA::TypeCode _tc__tc_RtecEventChannelAdmin_EventChannel (CORBA::tk_objref, sizeof (_oc_RtecEventChannelAdmin_EventChannel), (unsigned char *) &_oc_RtecEventChannelAdmin_EventChannel, CORBA::B_FALSE);
-CORBA::TypeCode_ptr RtecEventChannelAdmin::_tc_EventChannel = &_tc__tc_RtecEventChannelAdmin_EventChannel;
-
diff --git a/TAO/orbsvcs/lib/RtecEventChannelAdminC.h b/TAO/orbsvcs/lib/RtecEventChannelAdminC.h
deleted file mode 100644
index 07567869f9c..00000000000
--- a/TAO/orbsvcs/lib/RtecEventChannelAdminC.h
+++ /dev/null
@@ -1,1130 +0,0 @@
-// ******  Code generated by the The ACE ORB (TAO) IDL Compiler *******
-// TAO ORB and the TAO IDL Compiler have been developed by Washington 
-// University Computer Science's Distributed Object Computing Group.
-//
-// Information on TAO is available at
-//                 http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#if !defined (_TAO_IDL_RTECEVENTCHANNELADMINC_H_)
-#define _TAO_IDL_RTECEVENTCHANNELADMINC_H_
-
-#include "tao/corba.h"
-#include "RtecEventCommC.h"
-#include "RtecSchedulerC.h"
-
-class RtecEventChannelAdmin{
-public:
-  
-#if !defined (_RTECEVENTCHANNELADMIN_ALREADYCONNECTED___PTR_CH_)
-#define _RTECEVENTCHANNELADMIN_ALREADYCONNECTED___PTR_CH_
-
-  class AlreadyConnected;
-  typedef AlreadyConnected *AlreadyConnected_ptr;
-  
-#endif // end #if !defined
-
-
-#if !defined (_RTECEVENTCHANNELADMIN_ALREADYCONNECTED_CH_)
-#define _RTECEVENTCHANNELADMIN_ALREADYCONNECTED_CH_
-
-  class AlreadyConnected : public virtual CORBA::UserException
-  {
-  public:
-      AlreadyConnected (void);
-  };
-  
-  
-#endif // end #if !defined
-
-static CORBA::TypeCode_ptr _tc_AlreadyConnected;
-
-  
-#if !defined (_RTECEVENTCHANNELADMIN_TYPEERROR___PTR_CH_)
-#define _RTECEVENTCHANNELADMIN_TYPEERROR___PTR_CH_
-
-  class TypeError;
-  typedef TypeError *TypeError_ptr;
-  
-#endif // end #if !defined
-
-
-#if !defined (_RTECEVENTCHANNELADMIN_TYPEERROR_CH_)
-#define _RTECEVENTCHANNELADMIN_TYPEERROR_CH_
-
-  class TypeError : public virtual CORBA::UserException
-  {
-  public:
-      TypeError (void);
-  };
-  
-  
-#endif // end #if !defined
-
-static CORBA::TypeCode_ptr _tc_TypeError;
-
-  struct Dependency
-  {
-    struct Event
-    {
-    };
-
-    class Event_var
-    {
-    public:
-      Event_var (void); // default constructor
-      Event_var (Event *);
-      Event_var (const Event_var &); // copy constructor
-      ~Event_var (void); // destructor
-      
-      Event_var &operator= (Event *);
-      Event_var &operator= (const Event_var &);
-      Event *operator-> (void);
-      const Event *operator-> (void) const;
-      
-      operator const Event &() const;
-      operator Event &();
-      operator Event &() const;
-      // in, inout, out, _retn 
-      const Event &in (void) const;
-      Event &inout (void);
-      Event &out (void);
-      Event _retn (void);
-      Event *ptr(void) const;
-
-    private:
-      Event *ptr_;
-    };
-
-    typedef Event &Event_out;
-
-    static CORBA::TypeCode_ptr _tc_Event;
-
-    RtecEventComm::Event event_;
-
-    RtecScheduler::handle_t rt_info;
-
-  };
-
-  class Dependency_var
-  {
-  public:
-    Dependency_var (void); // default constructor
-    Dependency_var (Dependency *);
-    Dependency_var (const Dependency_var &); // copy constructor
-    ~Dependency_var (void); // destructor
-    
-    Dependency_var &operator= (Dependency *);
-    Dependency_var &operator= (const Dependency_var &);
-    Dependency *operator-> (void);
-    const Dependency *operator-> (void) const;
-    
-    operator const Dependency &() const;
-    operator Dependency &();
-    operator Dependency &() const;
-    // in, inout, out, _retn 
-    const Dependency &in (void) const;
-    Dependency &inout (void);
-    Dependency &out (void);
-    Dependency _retn (void);
-    Dependency *ptr(void) const;
-
-  private:
-    Dependency *ptr_;
-  };
-
-  typedef Dependency &Dependency_out;
-
-  static CORBA::TypeCode_ptr _tc_Dependency;
-
-
-#if !defined (_RTECEVENTCHANNELADMIN__TAO__SEQ_DEPENDENCYSET_CH_)
-#define _RTECEVENTCHANNELADMIN__TAO__SEQ_DEPENDENCYSET_CH_
-
-  // *************************************************************
-  // class _tao__seq_DependencySet
-  // *************************************************************
-  
-  class _tao__seq_DependencySet
-  {
-  public:
-    _tao__seq_DependencySet (void); // default constructor
-    _tao__seq_DependencySet (CORBA::ULong max);
-    _tao__seq_DependencySet (CORBA::ULong max, CORBA::ULong length, 
-    	ACE_NESTED_CLASS (RtecEventChannelAdmin,Dependency) *value, CORBA::Boolean release=CORBA::B_FALSE);
-    _tao__seq_DependencySet(const _tao__seq_DependencySet &); // copy constructor
-    ~_tao__seq_DependencySet (void);
-    _tao__seq_DependencySet &operator= (const _tao__seq_DependencySet &);
-    CORBA::ULong maximum (void) const;
-    void length (CORBA::ULong);
-    CORBA::ULong length (void) const;
-    ACE_NESTED_CLASS (RtecEventChannelAdmin,Dependency) &operator[] (CORBA::ULong index);
-    const ACE_NESTED_CLASS (RtecEventChannelAdmin,Dependency) &operator[] (CORBA::ULong index) const;
-    static ACE_NESTED_CLASS (RtecEventChannelAdmin,Dependency) *allocbuf (CORBA::ULong nelems);
-    static void freebuf (ACE_NESTED_CLASS (RtecEventChannelAdmin,Dependency) *);
-  private:
-    CORBA::ULong maximum_;
-    CORBA::ULong length_;
-    ACE_NESTED_CLASS (RtecEventChannelAdmin,Dependency) *buffer_;
-    CORBA::Boolean release_;
-  };
-  typedef _tao__seq_DependencySet* _tao__seq_DependencySet_ptr;
-  static CORBA::TypeCode_ptr _tc__tao__seq_DependencySet;
-
-
-#endif // end #if !defined
-
-
-#if !defined (_RTECEVENTCHANNELADMIN__TAO__SEQ_DEPENDENCYSET___VAR_CH_)
-#define _RTECEVENTCHANNELADMIN__TAO__SEQ_DEPENDENCYSET___VAR_CH_
-
-// *************************************************************
-  // class RtecEventChannelAdmin::_tao__seq_DependencySet_var
-  // *************************************************************
-
-  class _tao__seq_DependencySet_var
-  {
-  public:
-    _tao__seq_DependencySet_var (void); // default constructor
-    _tao__seq_DependencySet_var (_tao__seq_DependencySet *);
-    _tao__seq_DependencySet_var (const _tao__seq_DependencySet_var &); // copy constructor
-    ~_tao__seq_DependencySet_var (void); // destructor
-    
-    _tao__seq_DependencySet_var &operator= (_tao__seq_DependencySet *);
-    _tao__seq_DependencySet_var &operator= (const _tao__seq_DependencySet_var &);
-    _tao__seq_DependencySet *operator-> (void);
-    const _tao__seq_DependencySet *operator-> (void) const;
-    
-    operator const _tao__seq_DependencySet &() const;
-    operator _tao__seq_DependencySet &();
-    operator _tao__seq_DependencySet &() const;
-    ACE_NESTED_CLASS (RtecEventChannelAdmin,Dependency) &operator[] (CORBA::ULong index);
-    // in, inout, out, _retn 
-    const _tao__seq_DependencySet &in (void) const;
-    _tao__seq_DependencySet &inout (void);
-    _tao__seq_DependencySet *&out (void);
-    _tao__seq_DependencySet *_retn (void);
-    _tao__seq_DependencySet *ptr (void) const;
-
-  private:
-    _tao__seq_DependencySet *ptr_;
-  };
-
-
-#endif // end #if !defined
-
-
-#if !defined (_RTECEVENTCHANNELADMIN__TAO__SEQ_DEPENDENCYSET___OUT_CH_)
-#define _RTECEVENTCHANNELADMIN__TAO__SEQ_DEPENDENCYSET___OUT_CH_
-
-  class _tao__seq_DependencySet_out
-  {
-  public:
-    _tao__seq_DependencySet_out (_tao__seq_DependencySet *&);
-    _tao__seq_DependencySet_out (_tao__seq_DependencySet_var &);
-    _tao__seq_DependencySet_out (_tao__seq_DependencySet_out &);
-    _tao__seq_DependencySet_out &operator= (_tao__seq_DependencySet_out &);
-    _tao__seq_DependencySet_out &operator= (_tao__seq_DependencySet *);
-    operator _tao__seq_DependencySet *&();
-    _tao__seq_DependencySet *&ptr (void);
-    _tao__seq_DependencySet *operator-> (void);
-    ACE_NESTED_CLASS (RtecEventChannelAdmin,Dependency) &operator[] (CORBA::ULong index);
-    
-  private:
-    _tao__seq_DependencySet *&ptr_;
-    // assignment from T_var not allowed
-    void operator= (const _tao__seq_DependencySet_var &);
-  };
-
-
-#endif // end #if !defined
-
-  typedef ACE_NESTED_CLASS (RtecEventChannelAdmin,_tao__seq_DependencySet) DependencySet;
-  typedef ACE_NESTED_CLASS (RtecEventChannelAdmin,_tao__seq_DependencySet_var) DependencySet_var;
-  typedef ACE_NESTED_CLASS (RtecEventChannelAdmin,_tao__seq_DependencySet_out) DependencySet_out;
-
-  static CORBA::TypeCode_ptr _tc_DependencySet;
-
-  struct ConsumerQOS
-  {
-    ACE_NESTED_CLASS (RtecEventChannelAdmin,DependencySet) dependencies;
-
-  };
-
-  class ConsumerQOS_var
-  {
-  public:
-    ConsumerQOS_var (void); // default constructor
-    ConsumerQOS_var (ConsumerQOS *);
-    ConsumerQOS_var (const ConsumerQOS_var &); // copy constructor
-    ~ConsumerQOS_var (void); // destructor
-    
-    ConsumerQOS_var &operator= (ConsumerQOS *);
-    ConsumerQOS_var &operator= (const ConsumerQOS_var &);
-    ConsumerQOS *operator-> (void);
-    const ConsumerQOS *operator-> (void) const;
-    
-    operator const ConsumerQOS &() const;
-    operator ConsumerQOS &();
-    operator ConsumerQOS &() const;
-    // in, inout, out, _retn 
-    const ConsumerQOS &in (void) const;
-    ConsumerQOS &inout (void);
-    ConsumerQOS *&out (void);
-    ConsumerQOS *_retn (void);
-    ConsumerQOS *ptr(void) const;
-
-  private:
-    ConsumerQOS *ptr_;
-  };
-
-  class ConsumerQOS_out
-  {
-  public:
-    ConsumerQOS_out (ConsumerQOS *&);
-    ConsumerQOS_out (ConsumerQOS_var &);
-    ConsumerQOS_out (ConsumerQOS_out &);
-    ConsumerQOS_out &operator= (ConsumerQOS_out &);
-    ConsumerQOS_out &operator= (ConsumerQOS *);
-    operator ConsumerQOS *&();
-    ConsumerQOS *&ptr (void);
-    ConsumerQOS *operator-> (void);
-    
-  private:
-    ConsumerQOS *&ptr_;
-    // assignment from T_var not allowed
-    void operator= (const ConsumerQOS_var &);
-  };
-
-  static CORBA::TypeCode_ptr _tc_ConsumerQOS;
-
-  struct Publication
-  {
-    RtecEventComm::Event event_;
-
-    struct Dependency_Info
-    {
-    };
-
-    class Dependency_Info_var
-    {
-    public:
-      Dependency_Info_var (void); // default constructor
-      Dependency_Info_var (Dependency_Info *);
-      Dependency_Info_var (const Dependency_Info_var &); // copy constructor
-      ~Dependency_Info_var (void); // destructor
-      
-      Dependency_Info_var &operator= (Dependency_Info *);
-      Dependency_Info_var &operator= (const Dependency_Info_var &);
-      Dependency_Info *operator-> (void);
-      const Dependency_Info *operator-> (void) const;
-      
-      operator const Dependency_Info &() const;
-      operator Dependency_Info &();
-      operator Dependency_Info &() const;
-      // in, inout, out, _retn 
-      const Dependency_Info &in (void) const;
-      Dependency_Info &inout (void);
-      Dependency_Info &out (void);
-      Dependency_Info _retn (void);
-      Dependency_Info *ptr(void) const;
-
-    private:
-      Dependency_Info *ptr_;
-    };
-
-    typedef Dependency_Info &Dependency_Info_out;
-
-    static CORBA::TypeCode_ptr _tc_Dependency_Info;
-
-    RtecScheduler::Dependency_Info dependency_info_;
-
-  };
-
-  class Publication_var
-  {
-  public:
-    Publication_var (void); // default constructor
-    Publication_var (Publication *);
-    Publication_var (const Publication_var &); // copy constructor
-    ~Publication_var (void); // destructor
-    
-    Publication_var &operator= (Publication *);
-    Publication_var &operator= (const Publication_var &);
-    Publication *operator-> (void);
-    const Publication *operator-> (void) const;
-    
-    operator const Publication &() const;
-    operator Publication &();
-    operator Publication &() const;
-    // in, inout, out, _retn 
-    const Publication &in (void) const;
-    Publication &inout (void);
-    Publication &out (void);
-    Publication _retn (void);
-    Publication *ptr(void) const;
-
-  private:
-    Publication *ptr_;
-  };
-
-  typedef Publication &Publication_out;
-
-  static CORBA::TypeCode_ptr _tc_Publication;
-
-
-#if !defined (_RTECEVENTCHANNELADMIN__TAO__SEQ_PUBLICATIONSET_CH_)
-#define _RTECEVENTCHANNELADMIN__TAO__SEQ_PUBLICATIONSET_CH_
-
-  // *************************************************************
-  // class _tao__seq_PublicationSet
-  // *************************************************************
-  
-  class _tao__seq_PublicationSet
-  {
-  public:
-    _tao__seq_PublicationSet (void); // default constructor
-    _tao__seq_PublicationSet (CORBA::ULong max);
-    _tao__seq_PublicationSet (CORBA::ULong max, CORBA::ULong length, 
-    	ACE_NESTED_CLASS (RtecEventChannelAdmin,Publication) *value, CORBA::Boolean release=CORBA::B_FALSE);
-    _tao__seq_PublicationSet(const _tao__seq_PublicationSet &); // copy constructor
-    ~_tao__seq_PublicationSet (void);
-    _tao__seq_PublicationSet &operator= (const _tao__seq_PublicationSet &);
-    CORBA::ULong maximum (void) const;
-    void length (CORBA::ULong);
-    CORBA::ULong length (void) const;
-    ACE_NESTED_CLASS (RtecEventChannelAdmin,Publication) &operator[] (CORBA::ULong index);
-    const ACE_NESTED_CLASS (RtecEventChannelAdmin,Publication) &operator[] (CORBA::ULong index) const;
-    static ACE_NESTED_CLASS (RtecEventChannelAdmin,Publication) *allocbuf (CORBA::ULong nelems);
-    static void freebuf (ACE_NESTED_CLASS (RtecEventChannelAdmin,Publication) *);
-  private:
-    CORBA::ULong maximum_;
-    CORBA::ULong length_;
-    ACE_NESTED_CLASS (RtecEventChannelAdmin,Publication) *buffer_;
-    CORBA::Boolean release_;
-  };
-  typedef _tao__seq_PublicationSet* _tao__seq_PublicationSet_ptr;
-  static CORBA::TypeCode_ptr _tc__tao__seq_PublicationSet;
-
-
-#endif // end #if !defined
-
-
-#if !defined (_RTECEVENTCHANNELADMIN__TAO__SEQ_PUBLICATIONSET___VAR_CH_)
-#define _RTECEVENTCHANNELADMIN__TAO__SEQ_PUBLICATIONSET___VAR_CH_
-
-// *************************************************************
-  // class RtecEventChannelAdmin::_tao__seq_PublicationSet_var
-  // *************************************************************
-
-  class _tao__seq_PublicationSet_var
-  {
-  public:
-    _tao__seq_PublicationSet_var (void); // default constructor
-    _tao__seq_PublicationSet_var (_tao__seq_PublicationSet *);
-    _tao__seq_PublicationSet_var (const _tao__seq_PublicationSet_var &); // copy constructor
-    ~_tao__seq_PublicationSet_var (void); // destructor
-    
-    _tao__seq_PublicationSet_var &operator= (_tao__seq_PublicationSet *);
-    _tao__seq_PublicationSet_var &operator= (const _tao__seq_PublicationSet_var &);
-    _tao__seq_PublicationSet *operator-> (void);
-    const _tao__seq_PublicationSet *operator-> (void) const;
-    
-    operator const _tao__seq_PublicationSet &() const;
-    operator _tao__seq_PublicationSet &();
-    operator _tao__seq_PublicationSet &() const;
-    ACE_NESTED_CLASS (RtecEventChannelAdmin,Publication) &operator[] (CORBA::ULong index);
-    // in, inout, out, _retn 
-    const _tao__seq_PublicationSet &in (void) const;
-    _tao__seq_PublicationSet &inout (void);
-    _tao__seq_PublicationSet *&out (void);
-    _tao__seq_PublicationSet *_retn (void);
-    _tao__seq_PublicationSet *ptr (void) const;
-
-  private:
-    _tao__seq_PublicationSet *ptr_;
-  };
-
-
-#endif // end #if !defined
-
-
-#if !defined (_RTECEVENTCHANNELADMIN__TAO__SEQ_PUBLICATIONSET___OUT_CH_)
-#define _RTECEVENTCHANNELADMIN__TAO__SEQ_PUBLICATIONSET___OUT_CH_
-
-  class _tao__seq_PublicationSet_out
-  {
-  public:
-    _tao__seq_PublicationSet_out (_tao__seq_PublicationSet *&);
-    _tao__seq_PublicationSet_out (_tao__seq_PublicationSet_var &);
-    _tao__seq_PublicationSet_out (_tao__seq_PublicationSet_out &);
-    _tao__seq_PublicationSet_out &operator= (_tao__seq_PublicationSet_out &);
-    _tao__seq_PublicationSet_out &operator= (_tao__seq_PublicationSet *);
-    operator _tao__seq_PublicationSet *&();
-    _tao__seq_PublicationSet *&ptr (void);
-    _tao__seq_PublicationSet *operator-> (void);
-    ACE_NESTED_CLASS (RtecEventChannelAdmin,Publication) &operator[] (CORBA::ULong index);
-    
-  private:
-    _tao__seq_PublicationSet *&ptr_;
-    // assignment from T_var not allowed
-    void operator= (const _tao__seq_PublicationSet_var &);
-  };
-
-
-#endif // end #if !defined
-
-  typedef ACE_NESTED_CLASS (RtecEventChannelAdmin,_tao__seq_PublicationSet) PublicationSet;
-  typedef ACE_NESTED_CLASS (RtecEventChannelAdmin,_tao__seq_PublicationSet_var) PublicationSet_var;
-  typedef ACE_NESTED_CLASS (RtecEventChannelAdmin,_tao__seq_PublicationSet_out) PublicationSet_out;
-
-  static CORBA::TypeCode_ptr _tc_PublicationSet;
-
-  struct SupplierQOS
-  {
-    ACE_NESTED_CLASS (RtecEventChannelAdmin,PublicationSet) publications_;
-
-  };
-
-  class SupplierQOS_var
-  {
-  public:
-    SupplierQOS_var (void); // default constructor
-    SupplierQOS_var (SupplierQOS *);
-    SupplierQOS_var (const SupplierQOS_var &); // copy constructor
-    ~SupplierQOS_var (void); // destructor
-    
-    SupplierQOS_var &operator= (SupplierQOS *);
-    SupplierQOS_var &operator= (const SupplierQOS_var &);
-    SupplierQOS *operator-> (void);
-    const SupplierQOS *operator-> (void) const;
-    
-    operator const SupplierQOS &() const;
-    operator SupplierQOS &();
-    operator SupplierQOS &() const;
-    // in, inout, out, _retn 
-    const SupplierQOS &in (void) const;
-    SupplierQOS &inout (void);
-    SupplierQOS *&out (void);
-    SupplierQOS *_retn (void);
-    SupplierQOS *ptr(void) const;
-
-  private:
-    SupplierQOS *ptr_;
-  };
-
-  class SupplierQOS_out
-  {
-  public:
-    SupplierQOS_out (SupplierQOS *&);
-    SupplierQOS_out (SupplierQOS_var &);
-    SupplierQOS_out (SupplierQOS_out &);
-    SupplierQOS_out &operator= (SupplierQOS_out &);
-    SupplierQOS_out &operator= (SupplierQOS *);
-    operator SupplierQOS *&();
-    SupplierQOS *&ptr (void);
-    SupplierQOS *operator-> (void);
-    
-  private:
-    SupplierQOS *&ptr_;
-    // assignment from T_var not allowed
-    void operator= (const SupplierQOS_var &);
-  };
-
-  static CORBA::TypeCode_ptr _tc_SupplierQOS;
-
-  
-#if !defined (_RTECEVENTCHANNELADMIN_PROXYPUSHCONSUMER___PTR_CH_)
-#define _RTECEVENTCHANNELADMIN_PROXYPUSHCONSUMER___PTR_CH_
-
-class ProxyPushConsumer;
-  typedef ProxyPushConsumer *ProxyPushConsumer_ptr;
-  
-#endif // end #if !defined
-
-
-#if !defined (_RTECEVENTCHANNELADMIN_PROXYPUSHCONSUMER_CH_)
-#define _RTECEVENTCHANNELADMIN_PROXYPUSHCONSUMER_CH_
-
-class ProxyPushConsumer: public virtual RtecEventComm::PushConsumer
-  {
-  public:
-    // the static operations
-    static ProxyPushConsumer_ptr _duplicate (ProxyPushConsumer_ptr obj);
-    static ProxyPushConsumer_ptr _narrow (CORBA::Object_ptr obj, CORBA::Environment &env);
-    static ProxyPushConsumer_ptr _nil (void);
-    static ProxyPushConsumer_ptr _bind (const char *host, CORBA::UShort port, const char *key, CORBA::Environment &env);
-
-    virtual void connect_push_supplier (RtecEventComm::PushSupplier_ptr push_supplier, const ACE_NESTED_CLASS (RtecEventChannelAdmin,SupplierQOS) &qos, CORBA::Environment &env);
-  protected:
-    ProxyPushConsumer (void); // default constructor
-    ProxyPushConsumer (STUB_Object *objref);
-    virtual ~ProxyPushConsumer (void);
-  private:
-    ProxyPushConsumer (const ProxyPushConsumer&);
-    void operator= (const ProxyPushConsumer&);
-  };
-
-
-#endif // end #if !defined
-
-
-#if !defined (_RTECEVENTCHANNELADMIN_PROXYPUSHCONSUMER___VAR_CH_)
-#define _RTECEVENTCHANNELADMIN_PROXYPUSHCONSUMER___VAR_CH_
-
-  class ProxyPushConsumer_var
-  {
-  public:
-    ProxyPushConsumer_var (void); // default constructor
-    ProxyPushConsumer_var (ProxyPushConsumer_ptr);
-    ProxyPushConsumer_var (const ProxyPushConsumer_var &); // copy constructor
-    ~ProxyPushConsumer_var (void); // destructor
-    
-    ProxyPushConsumer_var &operator= (ProxyPushConsumer_ptr);
-    ProxyPushConsumer_var &operator= (const ProxyPushConsumer_var &);
-    ProxyPushConsumer_ptr operator-> (void) const;
-    
-    operator const ProxyPushConsumer_ptr &() const;
-    operator ProxyPushConsumer_ptr &();
-    // in, inout, out, _retn 
-    ProxyPushConsumer_ptr in (void) const;
-    ProxyPushConsumer_ptr &inout (void);
-    ProxyPushConsumer_ptr &out (void);
-    ProxyPushConsumer_ptr _retn (void);
-    ProxyPushConsumer_ptr ptr (void) const;
-
-  private:
-    ProxyPushConsumer_ptr ptr_;
-  };
-
-
-#endif // end #if !defined
-
-
-#if !defined (_RTECEVENTCHANNELADMIN_PROXYPUSHCONSUMER___OUT_CH_)
-#define _RTECEVENTCHANNELADMIN_PROXYPUSHCONSUMER___OUT_CH_
-
-  class ProxyPushConsumer_out
-  {
-  public:
-    ProxyPushConsumer_out (ProxyPushConsumer_ptr &);
-    ProxyPushConsumer_out (ProxyPushConsumer_var &);
-    ProxyPushConsumer_out (ProxyPushConsumer_out &);
-    ProxyPushConsumer_out &operator= (ProxyPushConsumer_out &);
-    ProxyPushConsumer_out &operator= (const ProxyPushConsumer_var &);
-    ProxyPushConsumer_out &operator= (ProxyPushConsumer_ptr);
-    operator ProxyPushConsumer_ptr &();
-    ProxyPushConsumer_ptr &ptr (void);
-    ProxyPushConsumer_ptr operator-> (void);
-    
-  private:
-    ProxyPushConsumer_ptr &ptr_;
-  };
-
-
-#endif // end #if !defined
-
-  static CORBA::TypeCode_ptr _tc_ProxyPushConsumer;
-
-  
-#if !defined (_RTECEVENTCHANNELADMIN_PROXYPUSHSUPPLIER___PTR_CH_)
-#define _RTECEVENTCHANNELADMIN_PROXYPUSHSUPPLIER___PTR_CH_
-
-class ProxyPushSupplier;
-  typedef ProxyPushSupplier *ProxyPushSupplier_ptr;
-  
-#endif // end #if !defined
-
-
-#if !defined (_RTECEVENTCHANNELADMIN_PROXYPUSHSUPPLIER_CH_)
-#define _RTECEVENTCHANNELADMIN_PROXYPUSHSUPPLIER_CH_
-
-class ProxyPushSupplier: public virtual RtecEventComm::PushSupplier
-  {
-  public:
-    // the static operations
-    static ProxyPushSupplier_ptr _duplicate (ProxyPushSupplier_ptr obj);
-    static ProxyPushSupplier_ptr _narrow (CORBA::Object_ptr obj, CORBA::Environment &env);
-    static ProxyPushSupplier_ptr _nil (void);
-    static ProxyPushSupplier_ptr _bind (const char *host, CORBA::UShort port, const char *key, CORBA::Environment &env);
-
-    virtual void connect_push_consumer (RtecEventComm::PushConsumer_ptr push_consumer, const ACE_NESTED_CLASS (RtecEventChannelAdmin,ConsumerQOS) &qos, CORBA::Environment &env);
-  protected:
-    ProxyPushSupplier (void); // default constructor
-    ProxyPushSupplier (STUB_Object *objref);
-    virtual ~ProxyPushSupplier (void);
-  private:
-    ProxyPushSupplier (const ProxyPushSupplier&);
-    void operator= (const ProxyPushSupplier&);
-  };
-
-
-#endif // end #if !defined
-
-
-#if !defined (_RTECEVENTCHANNELADMIN_PROXYPUSHSUPPLIER___VAR_CH_)
-#define _RTECEVENTCHANNELADMIN_PROXYPUSHSUPPLIER___VAR_CH_
-
-  class ProxyPushSupplier_var
-  {
-  public:
-    ProxyPushSupplier_var (void); // default constructor
-    ProxyPushSupplier_var (ProxyPushSupplier_ptr);
-    ProxyPushSupplier_var (const ProxyPushSupplier_var &); // copy constructor
-    ~ProxyPushSupplier_var (void); // destructor
-    
-    ProxyPushSupplier_var &operator= (ProxyPushSupplier_ptr);
-    ProxyPushSupplier_var &operator= (const ProxyPushSupplier_var &);
-    ProxyPushSupplier_ptr operator-> (void) const;
-    
-    operator const ProxyPushSupplier_ptr &() const;
-    operator ProxyPushSupplier_ptr &();
-    // in, inout, out, _retn 
-    ProxyPushSupplier_ptr in (void) const;
-    ProxyPushSupplier_ptr &inout (void);
-    ProxyPushSupplier_ptr &out (void);
-    ProxyPushSupplier_ptr _retn (void);
-    ProxyPushSupplier_ptr ptr (void) const;
-
-  private:
-    ProxyPushSupplier_ptr ptr_;
-  };
-
-
-#endif // end #if !defined
-
-
-#if !defined (_RTECEVENTCHANNELADMIN_PROXYPUSHSUPPLIER___OUT_CH_)
-#define _RTECEVENTCHANNELADMIN_PROXYPUSHSUPPLIER___OUT_CH_
-
-  class ProxyPushSupplier_out
-  {
-  public:
-    ProxyPushSupplier_out (ProxyPushSupplier_ptr &);
-    ProxyPushSupplier_out (ProxyPushSupplier_var &);
-    ProxyPushSupplier_out (ProxyPushSupplier_out &);
-    ProxyPushSupplier_out &operator= (ProxyPushSupplier_out &);
-    ProxyPushSupplier_out &operator= (const ProxyPushSupplier_var &);
-    ProxyPushSupplier_out &operator= (ProxyPushSupplier_ptr);
-    operator ProxyPushSupplier_ptr &();
-    ProxyPushSupplier_ptr &ptr (void);
-    ProxyPushSupplier_ptr operator-> (void);
-    
-  private:
-    ProxyPushSupplier_ptr &ptr_;
-  };
-
-
-#endif // end #if !defined
-
-  static CORBA::TypeCode_ptr _tc_ProxyPushSupplier;
-
-  
-#if !defined (_RTECEVENTCHANNELADMIN_CONSUMERADMIN___PTR_CH_)
-#define _RTECEVENTCHANNELADMIN_CONSUMERADMIN___PTR_CH_
-
-class ConsumerAdmin;
-  typedef ConsumerAdmin *ConsumerAdmin_ptr;
-  
-#endif // end #if !defined
-
-
-#if !defined (_RTECEVENTCHANNELADMIN_CONSUMERADMIN_CH_)
-#define _RTECEVENTCHANNELADMIN_CONSUMERADMIN_CH_
-
-class ConsumerAdmin: public virtual ACE_CORBA_1 (Object)
-  {
-  public:
-    // the static operations
-    static ConsumerAdmin_ptr _duplicate (ConsumerAdmin_ptr obj);
-    static ConsumerAdmin_ptr _narrow (CORBA::Object_ptr obj, CORBA::Environment &env);
-    static ConsumerAdmin_ptr _nil (void);
-    static ConsumerAdmin_ptr _bind (const char *host, CORBA::UShort port, const char *key, CORBA::Environment &env);
-
-    virtual ACE_NESTED_CLASS (RtecEventChannelAdmin,ProxyPushSupplier_ptr)  obtain_push_supplier (CORBA::Environment &env);
-  protected:
-    ConsumerAdmin (void); // default constructor
-    ConsumerAdmin (STUB_Object *objref);
-    virtual ~ConsumerAdmin (void);
-  private:
-    ConsumerAdmin (const ConsumerAdmin&);
-    void operator= (const ConsumerAdmin&);
-  };
-
-
-#endif // end #if !defined
-
-
-#if !defined (_RTECEVENTCHANNELADMIN_CONSUMERADMIN___VAR_CH_)
-#define _RTECEVENTCHANNELADMIN_CONSUMERADMIN___VAR_CH_
-
-  class ConsumerAdmin_var
-  {
-  public:
-    ConsumerAdmin_var (void); // default constructor
-    ConsumerAdmin_var (ConsumerAdmin_ptr);
-    ConsumerAdmin_var (const ConsumerAdmin_var &); // copy constructor
-    ~ConsumerAdmin_var (void); // destructor
-    
-    ConsumerAdmin_var &operator= (ConsumerAdmin_ptr);
-    ConsumerAdmin_var &operator= (const ConsumerAdmin_var &);
-    ConsumerAdmin_ptr operator-> (void) const;
-    
-    operator const ConsumerAdmin_ptr &() const;
-    operator ConsumerAdmin_ptr &();
-    // in, inout, out, _retn 
-    ConsumerAdmin_ptr in (void) const;
-    ConsumerAdmin_ptr &inout (void);
-    ConsumerAdmin_ptr &out (void);
-    ConsumerAdmin_ptr _retn (void);
-    ConsumerAdmin_ptr ptr (void) const;
-
-  private:
-    ConsumerAdmin_ptr ptr_;
-  };
-
-
-#endif // end #if !defined
-
-
-#if !defined (_RTECEVENTCHANNELADMIN_CONSUMERADMIN___OUT_CH_)
-#define _RTECEVENTCHANNELADMIN_CONSUMERADMIN___OUT_CH_
-
-  class ConsumerAdmin_out
-  {
-  public:
-    ConsumerAdmin_out (ConsumerAdmin_ptr &);
-    ConsumerAdmin_out (ConsumerAdmin_var &);
-    ConsumerAdmin_out (ConsumerAdmin_out &);
-    ConsumerAdmin_out &operator= (ConsumerAdmin_out &);
-    ConsumerAdmin_out &operator= (const ConsumerAdmin_var &);
-    ConsumerAdmin_out &operator= (ConsumerAdmin_ptr);
-    operator ConsumerAdmin_ptr &();
-    ConsumerAdmin_ptr &ptr (void);
-    ConsumerAdmin_ptr operator-> (void);
-    
-  private:
-    ConsumerAdmin_ptr &ptr_;
-  };
-
-
-#endif // end #if !defined
-
-  static CORBA::TypeCode_ptr _tc_ConsumerAdmin;
-
-  
-#if !defined (_RTECEVENTCHANNELADMIN_SUPPLIERADMIN___PTR_CH_)
-#define _RTECEVENTCHANNELADMIN_SUPPLIERADMIN___PTR_CH_
-
-class SupplierAdmin;
-  typedef SupplierAdmin *SupplierAdmin_ptr;
-  
-#endif // end #if !defined
-
-
-#if !defined (_RTECEVENTCHANNELADMIN_SUPPLIERADMIN_CH_)
-#define _RTECEVENTCHANNELADMIN_SUPPLIERADMIN_CH_
-
-class SupplierAdmin: public virtual ACE_CORBA_1 (Object)
-  {
-  public:
-    // the static operations
-    static SupplierAdmin_ptr _duplicate (SupplierAdmin_ptr obj);
-    static SupplierAdmin_ptr _narrow (CORBA::Object_ptr obj, CORBA::Environment &env);
-    static SupplierAdmin_ptr _nil (void);
-    static SupplierAdmin_ptr _bind (const char *host, CORBA::UShort port, const char *key, CORBA::Environment &env);
-
-    virtual ACE_NESTED_CLASS (RtecEventChannelAdmin,ProxyPushConsumer_ptr)  obtain_push_consumer (CORBA::Environment &env);
-  protected:
-    SupplierAdmin (void); // default constructor
-    SupplierAdmin (STUB_Object *objref);
-    virtual ~SupplierAdmin (void);
-  private:
-    SupplierAdmin (const SupplierAdmin&);
-    void operator= (const SupplierAdmin&);
-  };
-
-
-#endif // end #if !defined
-
-
-#if !defined (_RTECEVENTCHANNELADMIN_SUPPLIERADMIN___VAR_CH_)
-#define _RTECEVENTCHANNELADMIN_SUPPLIERADMIN___VAR_CH_
-
-  class SupplierAdmin_var
-  {
-  public:
-    SupplierAdmin_var (void); // default constructor
-    SupplierAdmin_var (SupplierAdmin_ptr);
-    SupplierAdmin_var (const SupplierAdmin_var &); // copy constructor
-    ~SupplierAdmin_var (void); // destructor
-    
-    SupplierAdmin_var &operator= (SupplierAdmin_ptr);
-    SupplierAdmin_var &operator= (const SupplierAdmin_var &);
-    SupplierAdmin_ptr operator-> (void) const;
-    
-    operator const SupplierAdmin_ptr &() const;
-    operator SupplierAdmin_ptr &();
-    // in, inout, out, _retn 
-    SupplierAdmin_ptr in (void) const;
-    SupplierAdmin_ptr &inout (void);
-    SupplierAdmin_ptr &out (void);
-    SupplierAdmin_ptr _retn (void);
-    SupplierAdmin_ptr ptr (void) const;
-
-  private:
-    SupplierAdmin_ptr ptr_;
-  };
-
-
-#endif // end #if !defined
-
-
-#if !defined (_RTECEVENTCHANNELADMIN_SUPPLIERADMIN___OUT_CH_)
-#define _RTECEVENTCHANNELADMIN_SUPPLIERADMIN___OUT_CH_
-
-  class SupplierAdmin_out
-  {
-  public:
-    SupplierAdmin_out (SupplierAdmin_ptr &);
-    SupplierAdmin_out (SupplierAdmin_var &);
-    SupplierAdmin_out (SupplierAdmin_out &);
-    SupplierAdmin_out &operator= (SupplierAdmin_out &);
-    SupplierAdmin_out &operator= (const SupplierAdmin_var &);
-    SupplierAdmin_out &operator= (SupplierAdmin_ptr);
-    operator SupplierAdmin_ptr &();
-    SupplierAdmin_ptr &ptr (void);
-    SupplierAdmin_ptr operator-> (void);
-    
-  private:
-    SupplierAdmin_ptr &ptr_;
-  };
-
-
-#endif // end #if !defined
-
-  static CORBA::TypeCode_ptr _tc_SupplierAdmin;
-
-  
-#if !defined (_RTECEVENTCHANNELADMIN_EVENTCHANNEL___PTR_CH_)
-#define _RTECEVENTCHANNELADMIN_EVENTCHANNEL___PTR_CH_
-
-class EventChannel;
-  typedef EventChannel *EventChannel_ptr;
-  
-#endif // end #if !defined
-
-
-#if !defined (_RTECEVENTCHANNELADMIN_EVENTCHANNEL_CH_)
-#define _RTECEVENTCHANNELADMIN_EVENTCHANNEL_CH_
-
-class EventChannel: public virtual ACE_CORBA_1 (Object)
-  {
-  public:
-    // the static operations
-    static EventChannel_ptr _duplicate (EventChannel_ptr obj);
-    static EventChannel_ptr _narrow (CORBA::Object_ptr obj, CORBA::Environment &env);
-    static EventChannel_ptr _nil (void);
-    static EventChannel_ptr _bind (const char *host, CORBA::UShort port, const char *key, CORBA::Environment &env);
-
-    
-#if !defined (_RTECEVENTCHANNELADMIN_EVENTCHANNEL_SYNCHRONIZATION_ERROR___PTR_CH_)
-#define _RTECEVENTCHANNELADMIN_EVENTCHANNEL_SYNCHRONIZATION_ERROR___PTR_CH_
-
-    class SYNCHRONIZATION_ERROR;
-    typedef SYNCHRONIZATION_ERROR *SYNCHRONIZATION_ERROR_ptr;
-    
-#endif // end #if !defined
-
-
-#if !defined (_RTECEVENTCHANNELADMIN_EVENTCHANNEL_SYNCHRONIZATION_ERROR_CH_)
-#define _RTECEVENTCHANNELADMIN_EVENTCHANNEL_SYNCHRONIZATION_ERROR_CH_
-
-    class SYNCHRONIZATION_ERROR : public virtual CORBA::UserException
-    {
-    public:
-          SYNCHRONIZATION_ERROR (void);
-    };
-    
-    
-#endif // end #if !defined
-
-static CORBA::TypeCode_ptr _tc_SYNCHRONIZATION_ERROR;
-
-    
-#if !defined (_RTECEVENTCHANNELADMIN_EVENTCHANNEL_QOS_ERROR___PTR_CH_)
-#define _RTECEVENTCHANNELADMIN_EVENTCHANNEL_QOS_ERROR___PTR_CH_
-
-    class QOS_ERROR;
-    typedef QOS_ERROR *QOS_ERROR_ptr;
-    
-#endif // end #if !defined
-
-
-#if !defined (_RTECEVENTCHANNELADMIN_EVENTCHANNEL_QOS_ERROR_CH_)
-#define _RTECEVENTCHANNELADMIN_EVENTCHANNEL_QOS_ERROR_CH_
-
-    class QOS_ERROR : public virtual CORBA::UserException
-    {
-    public:
-          QOS_ERROR (void);
-    };
-    
-    
-#endif // end #if !defined
-
-static CORBA::TypeCode_ptr _tc_QOS_ERROR;
-
-    
-#if !defined (_RTECEVENTCHANNELADMIN_EVENTCHANNEL_SUBSCRIPTION_ERROR___PTR_CH_)
-#define _RTECEVENTCHANNELADMIN_EVENTCHANNEL_SUBSCRIPTION_ERROR___PTR_CH_
-
-    class SUBSCRIPTION_ERROR;
-    typedef SUBSCRIPTION_ERROR *SUBSCRIPTION_ERROR_ptr;
-    
-#endif // end #if !defined
-
-
-#if !defined (_RTECEVENTCHANNELADMIN_EVENTCHANNEL_SUBSCRIPTION_ERROR_CH_)
-#define _RTECEVENTCHANNELADMIN_EVENTCHANNEL_SUBSCRIPTION_ERROR_CH_
-
-    class SUBSCRIPTION_ERROR : public virtual CORBA::UserException
-    {
-    public:
-          SUBSCRIPTION_ERROR (void);
-    };
-    
-    
-#endif // end #if !defined
-
-static CORBA::TypeCode_ptr _tc_SUBSCRIPTION_ERROR;
-
-    
-#if !defined (_RTECEVENTCHANNELADMIN_EVENTCHANNEL_CORRELATION_ERROR___PTR_CH_)
-#define _RTECEVENTCHANNELADMIN_EVENTCHANNEL_CORRELATION_ERROR___PTR_CH_
-
-    class CORRELATION_ERROR;
-    typedef CORRELATION_ERROR *CORRELATION_ERROR_ptr;
-    
-#endif // end #if !defined
-
-
-#if !defined (_RTECEVENTCHANNELADMIN_EVENTCHANNEL_CORRELATION_ERROR_CH_)
-#define _RTECEVENTCHANNELADMIN_EVENTCHANNEL_CORRELATION_ERROR_CH_
-
-    class CORRELATION_ERROR : public virtual CORBA::UserException
-    {
-    public:
-          CORRELATION_ERROR (void);
-    };
-    
-    
-#endif // end #if !defined
-
-static CORBA::TypeCode_ptr _tc_CORRELATION_ERROR;
-
-    
-#if !defined (_RTECEVENTCHANNELADMIN_EVENTCHANNEL_DISPATCH_ERROR___PTR_CH_)
-#define _RTECEVENTCHANNELADMIN_EVENTCHANNEL_DISPATCH_ERROR___PTR_CH_
-
-    class DISPATCH_ERROR;
-    typedef DISPATCH_ERROR *DISPATCH_ERROR_ptr;
-    
-#endif // end #if !defined
-
-
-#if !defined (_RTECEVENTCHANNELADMIN_EVENTCHANNEL_DISPATCH_ERROR_CH_)
-#define _RTECEVENTCHANNELADMIN_EVENTCHANNEL_DISPATCH_ERROR_CH_
-
-    class DISPATCH_ERROR : public virtual CORBA::UserException
-    {
-    public:
-          DISPATCH_ERROR (void);
-    };
-    
-    
-#endif // end #if !defined
-
-static CORBA::TypeCode_ptr _tc_DISPATCH_ERROR;
-
-    virtual ACE_NESTED_CLASS (RtecEventChannelAdmin,ConsumerAdmin_ptr)  for_consumers (CORBA::Environment &env);
-    virtual ACE_NESTED_CLASS (RtecEventChannelAdmin,SupplierAdmin_ptr)  for_suppliers (CORBA::Environment &env);
-    virtual void destroy (CORBA::Environment &env);
-  protected:
-    EventChannel (void); // default constructor
-    EventChannel (STUB_Object *objref);
-    virtual ~EventChannel (void);
-  private:
-    EventChannel (const EventChannel&);
-    void operator= (const EventChannel&);
-  };
-
-
-#endif // end #if !defined
-
-
-#if !defined (_RTECEVENTCHANNELADMIN_EVENTCHANNEL___VAR_CH_)
-#define _RTECEVENTCHANNELADMIN_EVENTCHANNEL___VAR_CH_
-
-  class EventChannel_var
-  {
-  public:
-    EventChannel_var (void); // default constructor
-    EventChannel_var (EventChannel_ptr);
-    EventChannel_var (const EventChannel_var &); // copy constructor
-    ~EventChannel_var (void); // destructor
-    
-    EventChannel_var &operator= (EventChannel_ptr);
-    EventChannel_var &operator= (const EventChannel_var &);
-    EventChannel_ptr operator-> (void) const;
-    
-    operator const EventChannel_ptr &() const;
-    operator EventChannel_ptr &();
-    // in, inout, out, _retn 
-    EventChannel_ptr in (void) const;
-    EventChannel_ptr &inout (void);
-    EventChannel_ptr &out (void);
-    EventChannel_ptr _retn (void);
-    EventChannel_ptr ptr (void) const;
-
-  private:
-    EventChannel_ptr ptr_;
-  };
-
-
-#endif // end #if !defined
-
-
-#if !defined (_RTECEVENTCHANNELADMIN_EVENTCHANNEL___OUT_CH_)
-#define _RTECEVENTCHANNELADMIN_EVENTCHANNEL___OUT_CH_
-
-  class EventChannel_out
-  {
-  public:
-    EventChannel_out (EventChannel_ptr &);
-    EventChannel_out (EventChannel_var &);
-    EventChannel_out (EventChannel_out &);
-    EventChannel_out &operator= (EventChannel_out &);
-    EventChannel_out &operator= (const EventChannel_var &);
-    EventChannel_out &operator= (EventChannel_ptr);
-    operator EventChannel_ptr &();
-    EventChannel_ptr &ptr (void);
-    EventChannel_ptr operator-> (void);
-    
-  private:
-    EventChannel_ptr &ptr_;
-  };
-
-
-#endif // end #if !defined
-
-  static CORBA::TypeCode_ptr _tc_EventChannel;
-
-};
-
-
-#if defined (__ACE_INLINE__)
-#include "RtecEventChannelAdminC.i"
-#endif // defined INLINE
-
-
-#endif // if !defined
diff --git a/TAO/orbsvcs/lib/RtecEventChannelAdminC.i b/TAO/orbsvcs/lib/RtecEventChannelAdminC.i
deleted file mode 100644
index 0cb79d07449..00000000000
--- a/TAO/orbsvcs/lib/RtecEventChannelAdminC.i
+++ /dev/null
@@ -1,2053 +0,0 @@
-// ******  Code generated by the The ACE ORB (TAO) IDL Compiler *******
-// TAO ORB and the TAO IDL Compiler have been developed by Washington 
-// University Computer Science's Distributed Object Computing Group.
-//
-// Information on TAO is available at
-//                 http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// *************************************************************
-// Inline operations for exception RtecEventChannelAdmin::AlreadyConnected
-// *************************************************************
-
-// default constructor
-ACE_INLINE
-RtecEventChannelAdmin::AlreadyConnected::AlreadyConnected (void)
-  : CORBA_UserException (_tc_AlreadyConnected)
-{
-}
-
-// *************************************************************
-// Inline operations for exception RtecEventChannelAdmin::TypeError
-// *************************************************************
-
-// default constructor
-ACE_INLINE
-RtecEventChannelAdmin::TypeError::TypeError (void)
-  : CORBA_UserException (_tc_TypeError)
-{
-}
-
-// *************************************************************
-// Inline operations for class RtecEventChannelAdmin::Dependency_var
-// *************************************************************
-
-ACE_INLINE
-RtecEventChannelAdmin::Dependency_var::Dependency_var (void) // default constructor
-	: ptr_ (0)
-{}
-
-ACE_INLINE
-RtecEventChannelAdmin::Dependency_var::Dependency_var (RtecEventChannelAdmin::Dependency *p)
-	: ptr_ (p)
-{}
-
-ACE_INLINE
-RtecEventChannelAdmin::Dependency_var::Dependency_var (const RtecEventChannelAdmin::Dependency_var &p) // copy constructor
-{
-  if (p.ptr_)
-  	this->ptr_ = new RtecEventChannelAdmin::Dependency(*p.ptr_);
-  else
-  	this->ptr_ = 0;
-}
-
-ACE_INLINE
-RtecEventChannelAdmin::Dependency_var::~Dependency_var (void) // destructor
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE RtecEventChannelAdmin::Dependency_var &
-RtecEventChannelAdmin::Dependency_var::operator= (RtecEventChannelAdmin::Dependency *p)
-{
-  delete this->ptr_;
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE RtecEventChannelAdmin::Dependency_var &
-RtecEventChannelAdmin::Dependency_var::operator= (const RtecEventChannelAdmin::Dependency_var &p)
-{
-  if (this != &p)
-  {
-    delete this->ptr_;
-    this->ptr_ = new RtecEventChannelAdmin::Dependency (*p.ptr_);
-  }
-  return *this;
-}
-
-ACE_INLINE const RtecEventChannelAdmin::Dependency *
-RtecEventChannelAdmin::Dependency_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE RtecEventChannelAdmin::Dependency *
-RtecEventChannelAdmin::Dependency_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE 
-RtecEventChannelAdmin::Dependency_var::operator const RtecEventChannelAdmin::Dependency &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE 
-RtecEventChannelAdmin::Dependency_var::operator RtecEventChannelAdmin::Dependency &() // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE 
-RtecEventChannelAdmin::Dependency_var::operator RtecEventChannelAdmin::Dependency &() const// cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE const RtecEventChannelAdmin::Dependency &
-RtecEventChannelAdmin::Dependency_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE RtecEventChannelAdmin::Dependency &
-RtecEventChannelAdmin::Dependency_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-// mapping for fixed size 
-ACE_INLINE RtecEventChannelAdmin::Dependency &
-RtecEventChannelAdmin::Dependency_var::out (void)
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE RtecEventChannelAdmin::Dependency
-RtecEventChannelAdmin::Dependency_var::_retn (void)
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE RtecEventChannelAdmin::Dependency *
-RtecEventChannelAdmin::Dependency_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE RtecEventChannelAdmin::Dependency *
-RtecEventChannelAdmin::_tao__seq_DependencySet::allocbuf (CORBA::ULong nelems)
-{
-  return new RtecEventChannelAdmin::Dependency[nelems]; // allocate from heap
-}
-
-ACE_INLINE void
-RtecEventChannelAdmin::_tao__seq_DependencySet::freebuf (RtecEventChannelAdmin::Dependency *seq)
-{
-  delete [] seq;
-}
-
-//default constructor
-ACE_INLINE 
-RtecEventChannelAdmin::_tao__seq_DependencySet::_tao__seq_DependencySet (void)
-	: maximum_ (0),
-	  length_ (0),
-	  buffer_ (0),
-	  release_ (0) // does not own
-{}
-
-// constructor for unbounded seq
-ACE_INLINE 
-RtecEventChannelAdmin::_tao__seq_DependencySet::_tao__seq_DependencySet(CORBA::ULong max )
-	: maximum_ (max),
-	  length_ (0),
-	  buffer_ (RtecEventChannelAdmin::_tao__seq_DependencySet::allocbuf (max)),
-	  release_ (1) // owns
-{}
-
-// constructor from data buffer
-ACE_INLINE 
-RtecEventChannelAdmin::_tao__seq_DependencySet::_tao__seq_DependencySet (CORBA::ULong max, CORBA::ULong length, 
-	RtecEventChannelAdmin::Dependency *value, CORBA::Boolean release)
-	: maximum_ (max),
-	  length_ (length),
-	  buffer_ (value),
-	  release_ (release) // ownership depends on release
-{}
-
-ACE_INLINE CORBA::ULong
-RtecEventChannelAdmin::_tao__seq_DependencySet::maximum (void) const
-{
-  return this->maximum_;
-}
-
-ACE_INLINE CORBA::ULong
-RtecEventChannelAdmin::_tao__seq_DependencySet::length  (void) const
-{
-  return this->length_;
-}
-
-ACE_INLINE RtecEventChannelAdmin::Dependency &
-RtecEventChannelAdmin::_tao__seq_DependencySet::operator[] (CORBA::ULong index) // read/write
-{
-  return this->buffer_[index];
-}
-
-ACE_INLINE const RtecEventChannelAdmin::Dependency &
-RtecEventChannelAdmin::_tao__seq_DependencySet::operator[] (CORBA::ULong index) const // read
-{
-  return this->buffer_[index];
-}
-
-// *************************************************************
-// Inline operations for class RtecEventChannelAdmin::_tao__seq_DependencySet_var
-// *************************************************************
-
-ACE_INLINE
-RtecEventChannelAdmin::_tao__seq_DependencySet_var::_tao__seq_DependencySet_var (void) // default constructor
-	: ptr_ (0)
-{}
-
-ACE_INLINE
-RtecEventChannelAdmin::_tao__seq_DependencySet_var::_tao__seq_DependencySet_var (RtecEventChannelAdmin::_tao__seq_DependencySet_ptr p)
-	: ptr_ (p)
-{}
-
-ACE_INLINE
-RtecEventChannelAdmin::_tao__seq_DependencySet_var::_tao__seq_DependencySet_var (const RtecEventChannelAdmin::_tao__seq_DependencySet_var &p) // copy constructor
-{
-  if (p.ptr_)
-  	this->ptr_ = new RtecEventChannelAdmin::_tao__seq_DependencySet(*p.ptr_);
-  else
-  	this->ptr_ = 0;
-}
-
-ACE_INLINE
-RtecEventChannelAdmin::_tao__seq_DependencySet_var::~_tao__seq_DependencySet_var (void) // destructor
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE RtecEventChannelAdmin::_tao__seq_DependencySet_var &
-RtecEventChannelAdmin::_tao__seq_DependencySet_var::operator= (RtecEventChannelAdmin::_tao__seq_DependencySet *p)
-{
-  delete this->ptr_;
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE RtecEventChannelAdmin::_tao__seq_DependencySet_var &
-RtecEventChannelAdmin::_tao__seq_DependencySet_var::operator= (const RtecEventChannelAdmin::_tao__seq_DependencySet_var &p) // deep copy
-{
-  if (this != &p)
-  {
-    delete this->ptr_;
-    this->ptr_ = new RtecEventChannelAdmin::_tao__seq_DependencySet (*p.ptr_);
-  }
-  return *this;
-}
-
-ACE_INLINE const RtecEventChannelAdmin::_tao__seq_DependencySet *
-RtecEventChannelAdmin::_tao__seq_DependencySet_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE RtecEventChannelAdmin::_tao__seq_DependencySet *
-RtecEventChannelAdmin::_tao__seq_DependencySet_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE 
-RtecEventChannelAdmin::_tao__seq_DependencySet_var::operator const RtecEventChannelAdmin::_tao__seq_DependencySet &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE 
-RtecEventChannelAdmin::_tao__seq_DependencySet_var::operator RtecEventChannelAdmin::_tao__seq_DependencySet &() // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE 
-RtecEventChannelAdmin::_tao__seq_DependencySet_var::operator RtecEventChannelAdmin::_tao__seq_DependencySet &() const// cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE RtecEventChannelAdmin::Dependency&
-RtecEventChannelAdmin::_tao__seq_DependencySet_var::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-ACE_INLINE const RtecEventChannelAdmin::_tao__seq_DependencySet &
-RtecEventChannelAdmin::_tao__seq_DependencySet_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE RtecEventChannelAdmin::_tao__seq_DependencySet &
-RtecEventChannelAdmin::_tao__seq_DependencySet_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-// mapping for variable size 
-ACE_INLINE RtecEventChannelAdmin::_tao__seq_DependencySet *&
-RtecEventChannelAdmin::_tao__seq_DependencySet_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE RtecEventChannelAdmin::_tao__seq_DependencySet *
-RtecEventChannelAdmin::_tao__seq_DependencySet_var::_retn (void)
-{
-  RtecEventChannelAdmin::_tao__seq_DependencySet *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE RtecEventChannelAdmin::_tao__seq_DependencySet *
-RtecEventChannelAdmin::_tao__seq_DependencySet_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// *************************************************************
-// Inline operations for class RtecEventChannelAdmin::_tao__seq_DependencySet_out
-// *************************************************************
-
-ACE_INLINE
-RtecEventChannelAdmin::_tao__seq_DependencySet_out::_tao__seq_DependencySet_out (RtecEventChannelAdmin::_tao__seq_DependencySet *&p)
-	: ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-RtecEventChannelAdmin::_tao__seq_DependencySet_out::_tao__seq_DependencySet_out (RtecEventChannelAdmin::_tao__seq_DependencySet_var &p) // constructor from _var
-	: ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-RtecEventChannelAdmin::_tao__seq_DependencySet_out::_tao__seq_DependencySet_out (RtecEventChannelAdmin::_tao__seq_DependencySet_out &p) // copy constructor
-	: ptr_ (p.ptr_)
-{}
-
-ACE_INLINE RtecEventChannelAdmin::_tao__seq_DependencySet_out &
-RtecEventChannelAdmin::_tao__seq_DependencySet_out::operator= (RtecEventChannelAdmin::_tao__seq_DependencySet_out &p)
-{
-  this->ptr_ = p.ptr_;
-  return *this;
-}
-
-ACE_INLINE RtecEventChannelAdmin::_tao__seq_DependencySet_out &
-RtecEventChannelAdmin::_tao__seq_DependencySet_out::operator= (RtecEventChannelAdmin::_tao__seq_DependencySet *p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE 
-RtecEventChannelAdmin::_tao__seq_DependencySet_out::operator RtecEventChannelAdmin::_tao__seq_DependencySet *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE RtecEventChannelAdmin::_tao__seq_DependencySet *&
-RtecEventChannelAdmin::_tao__seq_DependencySet_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE RtecEventChannelAdmin::_tao__seq_DependencySet *
-RtecEventChannelAdmin::_tao__seq_DependencySet_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE RtecEventChannelAdmin::Dependency& 
-RtecEventChannelAdmin::_tao__seq_DependencySet_out::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-// *************************************************************
-// Inline operations for class RtecEventChannelAdmin::ConsumerQOS_var
-// *************************************************************
-
-ACE_INLINE
-RtecEventChannelAdmin::ConsumerQOS_var::ConsumerQOS_var (void) // default constructor
-	: ptr_ (0)
-{}
-
-ACE_INLINE
-RtecEventChannelAdmin::ConsumerQOS_var::ConsumerQOS_var (RtecEventChannelAdmin::ConsumerQOS *p)
-	: ptr_ (p)
-{}
-
-ACE_INLINE
-RtecEventChannelAdmin::ConsumerQOS_var::ConsumerQOS_var (const RtecEventChannelAdmin::ConsumerQOS_var &p) // copy constructor
-{
-  if (p.ptr_)
-  	this->ptr_ = new RtecEventChannelAdmin::ConsumerQOS(*p.ptr_);
-  else
-  	this->ptr_ = 0;
-}
-
-ACE_INLINE
-RtecEventChannelAdmin::ConsumerQOS_var::~ConsumerQOS_var (void) // destructor
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE RtecEventChannelAdmin::ConsumerQOS_var &
-RtecEventChannelAdmin::ConsumerQOS_var::operator= (RtecEventChannelAdmin::ConsumerQOS *p)
-{
-  delete this->ptr_;
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE RtecEventChannelAdmin::ConsumerQOS_var &
-RtecEventChannelAdmin::ConsumerQOS_var::operator= (const RtecEventChannelAdmin::ConsumerQOS_var &p)
-{
-  if (this != &p)
-  {
-    delete this->ptr_;
-    this->ptr_ = new RtecEventChannelAdmin::ConsumerQOS (*p.ptr_);
-  }
-  return *this;
-}
-
-ACE_INLINE const RtecEventChannelAdmin::ConsumerQOS *
-RtecEventChannelAdmin::ConsumerQOS_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE RtecEventChannelAdmin::ConsumerQOS *
-RtecEventChannelAdmin::ConsumerQOS_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE 
-RtecEventChannelAdmin::ConsumerQOS_var::operator const RtecEventChannelAdmin::ConsumerQOS &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE 
-RtecEventChannelAdmin::ConsumerQOS_var::operator RtecEventChannelAdmin::ConsumerQOS &() // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE 
-RtecEventChannelAdmin::ConsumerQOS_var::operator RtecEventChannelAdmin::ConsumerQOS &() const// cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE const RtecEventChannelAdmin::ConsumerQOS &
-RtecEventChannelAdmin::ConsumerQOS_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE RtecEventChannelAdmin::ConsumerQOS &
-RtecEventChannelAdmin::ConsumerQOS_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-// mapping for variable size 
-ACE_INLINE RtecEventChannelAdmin::ConsumerQOS *&
-RtecEventChannelAdmin::ConsumerQOS_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE RtecEventChannelAdmin::ConsumerQOS *
-RtecEventChannelAdmin::ConsumerQOS_var::_retn (void)
-{
-  RtecEventChannelAdmin::ConsumerQOS *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-// *************************************************************
-// Inline operations for class RtecEventChannelAdmin::ConsumerQOS_out
-// *************************************************************
-
-ACE_INLINE
-RtecEventChannelAdmin::ConsumerQOS_out::ConsumerQOS_out (RtecEventChannelAdmin::ConsumerQOS *&p)
-	: ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-RtecEventChannelAdmin::ConsumerQOS_out::ConsumerQOS_out (RtecEventChannelAdmin::ConsumerQOS_var &p) // constructor from _var
-	: ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-RtecEventChannelAdmin::ConsumerQOS_out::ConsumerQOS_out (RtecEventChannelAdmin::ConsumerQOS_out &p) // copy constructor
-	: ptr_ (p.ptr_)
-{}
-
-ACE_INLINE RtecEventChannelAdmin::ConsumerQOS_out &
-RtecEventChannelAdmin::ConsumerQOS_out::operator= (RtecEventChannelAdmin::ConsumerQOS_out &p)
-{
-  this->ptr_ = p.ptr_;
-  return *this;
-}
-
-ACE_INLINE RtecEventChannelAdmin::ConsumerQOS_out &
-RtecEventChannelAdmin::ConsumerQOS_out::operator= (RtecEventChannelAdmin::ConsumerQOS *p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE 
-RtecEventChannelAdmin::ConsumerQOS_out::operator RtecEventChannelAdmin::ConsumerQOS *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE RtecEventChannelAdmin::ConsumerQOS *&
-RtecEventChannelAdmin::ConsumerQOS_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE RtecEventChannelAdmin::ConsumerQOS *
-RtecEventChannelAdmin::ConsumerQOS_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-// *************************************************************
-// Inline operations for class RtecEventChannelAdmin::Publication_var
-// *************************************************************
-
-ACE_INLINE
-RtecEventChannelAdmin::Publication_var::Publication_var (void) // default constructor
-	: ptr_ (0)
-{}
-
-ACE_INLINE
-RtecEventChannelAdmin::Publication_var::Publication_var (RtecEventChannelAdmin::Publication *p)
-	: ptr_ (p)
-{}
-
-ACE_INLINE
-RtecEventChannelAdmin::Publication_var::Publication_var (const RtecEventChannelAdmin::Publication_var &p) // copy constructor
-{
-  if (p.ptr_)
-  	this->ptr_ = new RtecEventChannelAdmin::Publication(*p.ptr_);
-  else
-  	this->ptr_ = 0;
-}
-
-ACE_INLINE
-RtecEventChannelAdmin::Publication_var::~Publication_var (void) // destructor
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE RtecEventChannelAdmin::Publication_var &
-RtecEventChannelAdmin::Publication_var::operator= (RtecEventChannelAdmin::Publication *p)
-{
-  delete this->ptr_;
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE RtecEventChannelAdmin::Publication_var &
-RtecEventChannelAdmin::Publication_var::operator= (const RtecEventChannelAdmin::Publication_var &p)
-{
-  if (this != &p)
-  {
-    delete this->ptr_;
-    this->ptr_ = new RtecEventChannelAdmin::Publication (*p.ptr_);
-  }
-  return *this;
-}
-
-ACE_INLINE const RtecEventChannelAdmin::Publication *
-RtecEventChannelAdmin::Publication_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE RtecEventChannelAdmin::Publication *
-RtecEventChannelAdmin::Publication_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE 
-RtecEventChannelAdmin::Publication_var::operator const RtecEventChannelAdmin::Publication &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE 
-RtecEventChannelAdmin::Publication_var::operator RtecEventChannelAdmin::Publication &() // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE 
-RtecEventChannelAdmin::Publication_var::operator RtecEventChannelAdmin::Publication &() const// cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE const RtecEventChannelAdmin::Publication &
-RtecEventChannelAdmin::Publication_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE RtecEventChannelAdmin::Publication &
-RtecEventChannelAdmin::Publication_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-// mapping for fixed size 
-ACE_INLINE RtecEventChannelAdmin::Publication &
-RtecEventChannelAdmin::Publication_var::out (void)
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE RtecEventChannelAdmin::Publication
-RtecEventChannelAdmin::Publication_var::_retn (void)
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE RtecEventChannelAdmin::Publication *
-RtecEventChannelAdmin::Publication_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE RtecEventChannelAdmin::Publication *
-RtecEventChannelAdmin::_tao__seq_PublicationSet::allocbuf (CORBA::ULong nelems)
-{
-  return new RtecEventChannelAdmin::Publication[nelems]; // allocate from heap
-}
-
-ACE_INLINE void
-RtecEventChannelAdmin::_tao__seq_PublicationSet::freebuf (RtecEventChannelAdmin::Publication *seq)
-{
-  delete [] seq;
-}
-
-//default constructor
-ACE_INLINE 
-RtecEventChannelAdmin::_tao__seq_PublicationSet::_tao__seq_PublicationSet (void)
-	: maximum_ (0),
-	  length_ (0),
-	  buffer_ (0),
-	  release_ (0) // does not own
-{}
-
-// constructor for unbounded seq
-ACE_INLINE 
-RtecEventChannelAdmin::_tao__seq_PublicationSet::_tao__seq_PublicationSet(CORBA::ULong max )
-	: maximum_ (max),
-	  length_ (0),
-	  buffer_ (RtecEventChannelAdmin::_tao__seq_PublicationSet::allocbuf (max)),
-	  release_ (1) // owns
-{}
-
-// constructor from data buffer
-ACE_INLINE 
-RtecEventChannelAdmin::_tao__seq_PublicationSet::_tao__seq_PublicationSet (CORBA::ULong max, CORBA::ULong length, 
-	RtecEventChannelAdmin::Publication *value, CORBA::Boolean release)
-	: maximum_ (max),
-	  length_ (length),
-	  buffer_ (value),
-	  release_ (release) // ownership depends on release
-{}
-
-ACE_INLINE CORBA::ULong
-RtecEventChannelAdmin::_tao__seq_PublicationSet::maximum (void) const
-{
-  return this->maximum_;
-}
-
-ACE_INLINE CORBA::ULong
-RtecEventChannelAdmin::_tao__seq_PublicationSet::length  (void) const
-{
-  return this->length_;
-}
-
-ACE_INLINE RtecEventChannelAdmin::Publication &
-RtecEventChannelAdmin::_tao__seq_PublicationSet::operator[] (CORBA::ULong index) // read/write
-{
-  return this->buffer_[index];
-}
-
-ACE_INLINE const RtecEventChannelAdmin::Publication &
-RtecEventChannelAdmin::_tao__seq_PublicationSet::operator[] (CORBA::ULong index) const // read
-{
-  return this->buffer_[index];
-}
-
-// *************************************************************
-// Inline operations for class RtecEventChannelAdmin::_tao__seq_PublicationSet_var
-// *************************************************************
-
-ACE_INLINE
-RtecEventChannelAdmin::_tao__seq_PublicationSet_var::_tao__seq_PublicationSet_var (void) // default constructor
-	: ptr_ (0)
-{}
-
-ACE_INLINE
-RtecEventChannelAdmin::_tao__seq_PublicationSet_var::_tao__seq_PublicationSet_var (RtecEventChannelAdmin::_tao__seq_PublicationSet_ptr p)
-	: ptr_ (p)
-{}
-
-ACE_INLINE
-RtecEventChannelAdmin::_tao__seq_PublicationSet_var::_tao__seq_PublicationSet_var (const RtecEventChannelAdmin::_tao__seq_PublicationSet_var &p) // copy constructor
-{
-  if (p.ptr_)
-  	this->ptr_ = new RtecEventChannelAdmin::_tao__seq_PublicationSet(*p.ptr_);
-  else
-  	this->ptr_ = 0;
-}
-
-ACE_INLINE
-RtecEventChannelAdmin::_tao__seq_PublicationSet_var::~_tao__seq_PublicationSet_var (void) // destructor
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE RtecEventChannelAdmin::_tao__seq_PublicationSet_var &
-RtecEventChannelAdmin::_tao__seq_PublicationSet_var::operator= (RtecEventChannelAdmin::_tao__seq_PublicationSet *p)
-{
-  delete this->ptr_;
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE RtecEventChannelAdmin::_tao__seq_PublicationSet_var &
-RtecEventChannelAdmin::_tao__seq_PublicationSet_var::operator= (const RtecEventChannelAdmin::_tao__seq_PublicationSet_var &p) // deep copy
-{
-  if (this != &p)
-  {
-    delete this->ptr_;
-    this->ptr_ = new RtecEventChannelAdmin::_tao__seq_PublicationSet (*p.ptr_);
-  }
-  return *this;
-}
-
-ACE_INLINE const RtecEventChannelAdmin::_tao__seq_PublicationSet *
-RtecEventChannelAdmin::_tao__seq_PublicationSet_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE RtecEventChannelAdmin::_tao__seq_PublicationSet *
-RtecEventChannelAdmin::_tao__seq_PublicationSet_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE 
-RtecEventChannelAdmin::_tao__seq_PublicationSet_var::operator const RtecEventChannelAdmin::_tao__seq_PublicationSet &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE 
-RtecEventChannelAdmin::_tao__seq_PublicationSet_var::operator RtecEventChannelAdmin::_tao__seq_PublicationSet &() // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE 
-RtecEventChannelAdmin::_tao__seq_PublicationSet_var::operator RtecEventChannelAdmin::_tao__seq_PublicationSet &() const// cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE RtecEventChannelAdmin::Publication&
-RtecEventChannelAdmin::_tao__seq_PublicationSet_var::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-ACE_INLINE const RtecEventChannelAdmin::_tao__seq_PublicationSet &
-RtecEventChannelAdmin::_tao__seq_PublicationSet_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE RtecEventChannelAdmin::_tao__seq_PublicationSet &
-RtecEventChannelAdmin::_tao__seq_PublicationSet_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-// mapping for variable size 
-ACE_INLINE RtecEventChannelAdmin::_tao__seq_PublicationSet *&
-RtecEventChannelAdmin::_tao__seq_PublicationSet_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE RtecEventChannelAdmin::_tao__seq_PublicationSet *
-RtecEventChannelAdmin::_tao__seq_PublicationSet_var::_retn (void)
-{
-  RtecEventChannelAdmin::_tao__seq_PublicationSet *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE RtecEventChannelAdmin::_tao__seq_PublicationSet *
-RtecEventChannelAdmin::_tao__seq_PublicationSet_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// *************************************************************
-// Inline operations for class RtecEventChannelAdmin::_tao__seq_PublicationSet_out
-// *************************************************************
-
-ACE_INLINE
-RtecEventChannelAdmin::_tao__seq_PublicationSet_out::_tao__seq_PublicationSet_out (RtecEventChannelAdmin::_tao__seq_PublicationSet *&p)
-	: ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-RtecEventChannelAdmin::_tao__seq_PublicationSet_out::_tao__seq_PublicationSet_out (RtecEventChannelAdmin::_tao__seq_PublicationSet_var &p) // constructor from _var
-	: ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-RtecEventChannelAdmin::_tao__seq_PublicationSet_out::_tao__seq_PublicationSet_out (RtecEventChannelAdmin::_tao__seq_PublicationSet_out &p) // copy constructor
-	: ptr_ (p.ptr_)
-{}
-
-ACE_INLINE RtecEventChannelAdmin::_tao__seq_PublicationSet_out &
-RtecEventChannelAdmin::_tao__seq_PublicationSet_out::operator= (RtecEventChannelAdmin::_tao__seq_PublicationSet_out &p)
-{
-  this->ptr_ = p.ptr_;
-  return *this;
-}
-
-ACE_INLINE RtecEventChannelAdmin::_tao__seq_PublicationSet_out &
-RtecEventChannelAdmin::_tao__seq_PublicationSet_out::operator= (RtecEventChannelAdmin::_tao__seq_PublicationSet *p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE 
-RtecEventChannelAdmin::_tao__seq_PublicationSet_out::operator RtecEventChannelAdmin::_tao__seq_PublicationSet *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE RtecEventChannelAdmin::_tao__seq_PublicationSet *&
-RtecEventChannelAdmin::_tao__seq_PublicationSet_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE RtecEventChannelAdmin::_tao__seq_PublicationSet *
-RtecEventChannelAdmin::_tao__seq_PublicationSet_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE RtecEventChannelAdmin::Publication& 
-RtecEventChannelAdmin::_tao__seq_PublicationSet_out::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-// *************************************************************
-// Inline operations for class RtecEventChannelAdmin::SupplierQOS_var
-// *************************************************************
-
-ACE_INLINE
-RtecEventChannelAdmin::SupplierQOS_var::SupplierQOS_var (void) // default constructor
-	: ptr_ (0)
-{}
-
-ACE_INLINE
-RtecEventChannelAdmin::SupplierQOS_var::SupplierQOS_var (RtecEventChannelAdmin::SupplierQOS *p)
-	: ptr_ (p)
-{}
-
-ACE_INLINE
-RtecEventChannelAdmin::SupplierQOS_var::SupplierQOS_var (const RtecEventChannelAdmin::SupplierQOS_var &p) // copy constructor
-{
-  if (p.ptr_)
-  	this->ptr_ = new RtecEventChannelAdmin::SupplierQOS(*p.ptr_);
-  else
-  	this->ptr_ = 0;
-}
-
-ACE_INLINE
-RtecEventChannelAdmin::SupplierQOS_var::~SupplierQOS_var (void) // destructor
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE RtecEventChannelAdmin::SupplierQOS_var &
-RtecEventChannelAdmin::SupplierQOS_var::operator= (RtecEventChannelAdmin::SupplierQOS *p)
-{
-  delete this->ptr_;
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE RtecEventChannelAdmin::SupplierQOS_var &
-RtecEventChannelAdmin::SupplierQOS_var::operator= (const RtecEventChannelAdmin::SupplierQOS_var &p)
-{
-  if (this != &p)
-  {
-    delete this->ptr_;
-    this->ptr_ = new RtecEventChannelAdmin::SupplierQOS (*p.ptr_);
-  }
-  return *this;
-}
-
-ACE_INLINE const RtecEventChannelAdmin::SupplierQOS *
-RtecEventChannelAdmin::SupplierQOS_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE RtecEventChannelAdmin::SupplierQOS *
-RtecEventChannelAdmin::SupplierQOS_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE 
-RtecEventChannelAdmin::SupplierQOS_var::operator const RtecEventChannelAdmin::SupplierQOS &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE 
-RtecEventChannelAdmin::SupplierQOS_var::operator RtecEventChannelAdmin::SupplierQOS &() // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE 
-RtecEventChannelAdmin::SupplierQOS_var::operator RtecEventChannelAdmin::SupplierQOS &() const// cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE const RtecEventChannelAdmin::SupplierQOS &
-RtecEventChannelAdmin::SupplierQOS_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE RtecEventChannelAdmin::SupplierQOS &
-RtecEventChannelAdmin::SupplierQOS_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-// mapping for variable size 
-ACE_INLINE RtecEventChannelAdmin::SupplierQOS *&
-RtecEventChannelAdmin::SupplierQOS_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE RtecEventChannelAdmin::SupplierQOS *
-RtecEventChannelAdmin::SupplierQOS_var::_retn (void)
-{
-  RtecEventChannelAdmin::SupplierQOS *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-// *************************************************************
-// Inline operations for class RtecEventChannelAdmin::SupplierQOS_out
-// *************************************************************
-
-ACE_INLINE
-RtecEventChannelAdmin::SupplierQOS_out::SupplierQOS_out (RtecEventChannelAdmin::SupplierQOS *&p)
-	: ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-RtecEventChannelAdmin::SupplierQOS_out::SupplierQOS_out (RtecEventChannelAdmin::SupplierQOS_var &p) // constructor from _var
-	: ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-RtecEventChannelAdmin::SupplierQOS_out::SupplierQOS_out (RtecEventChannelAdmin::SupplierQOS_out &p) // copy constructor
-	: ptr_ (p.ptr_)
-{}
-
-ACE_INLINE RtecEventChannelAdmin::SupplierQOS_out &
-RtecEventChannelAdmin::SupplierQOS_out::operator= (RtecEventChannelAdmin::SupplierQOS_out &p)
-{
-  this->ptr_ = p.ptr_;
-  return *this;
-}
-
-ACE_INLINE RtecEventChannelAdmin::SupplierQOS_out &
-RtecEventChannelAdmin::SupplierQOS_out::operator= (RtecEventChannelAdmin::SupplierQOS *p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE 
-RtecEventChannelAdmin::SupplierQOS_out::operator RtecEventChannelAdmin::SupplierQOS *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE RtecEventChannelAdmin::SupplierQOS *&
-RtecEventChannelAdmin::SupplierQOS_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE RtecEventChannelAdmin::SupplierQOS *
-RtecEventChannelAdmin::SupplierQOS_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-RtecEventChannelAdmin::ProxyPushConsumer::ProxyPushConsumer (void) // default constructor
-{}
-
-ACE_INLINE
-RtecEventChannelAdmin::ProxyPushConsumer::ProxyPushConsumer (STUB_Object *objref) // constructor
-	: ACE_CORBA_1 (Object) (objref)
-{}
-
-ACE_INLINE
-RtecEventChannelAdmin::ProxyPushConsumer::~ProxyPushConsumer (void) // destructor
-{}
-
-
-#if !defined (_RTECEVENTCHANNELADMIN_PROXYPUSHCONSUMER___VAR_CI_)
-#define _RTECEVENTCHANNELADMIN_PROXYPUSHCONSUMER___VAR_CI_
-
-// *************************************************************
-// Inline operations for class RtecEventChannelAdmin::ProxyPushConsumer_var
-// *************************************************************
-
-ACE_INLINE
-RtecEventChannelAdmin::ProxyPushConsumer_var::ProxyPushConsumer_var (void) // default constructor
-	: ptr_ (RtecEventChannelAdmin::ProxyPushConsumer::_nil ())
-{}
-
-ACE_INLINE
-RtecEventChannelAdmin::ProxyPushConsumer_var::ProxyPushConsumer_var (RtecEventChannelAdmin::ProxyPushConsumer_ptr p)
-	: ptr_ (p)
-{}
-
-ACE_INLINE RtecEventChannelAdmin::ProxyPushConsumer_ptr 
-RtecEventChannelAdmin::ProxyPushConsumer_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-RtecEventChannelAdmin::ProxyPushConsumer_var::ProxyPushConsumer_var (const RtecEventChannelAdmin::ProxyPushConsumer_var &p) // copy constructor
-	: ptr_ (RtecEventChannelAdmin::ProxyPushConsumer::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-RtecEventChannelAdmin::ProxyPushConsumer_var::~ProxyPushConsumer_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE RtecEventChannelAdmin::ProxyPushConsumer_var &
-RtecEventChannelAdmin::ProxyPushConsumer_var::operator= (RtecEventChannelAdmin::ProxyPushConsumer_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE RtecEventChannelAdmin::ProxyPushConsumer_var &
-RtecEventChannelAdmin::ProxyPushConsumer_var::operator= (const RtecEventChannelAdmin::ProxyPushConsumer_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = RtecEventChannelAdmin::ProxyPushConsumer::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE 
-RtecEventChannelAdmin::ProxyPushConsumer_var::operator const RtecEventChannelAdmin::ProxyPushConsumer_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE 
-RtecEventChannelAdmin::ProxyPushConsumer_var::operator RtecEventChannelAdmin::ProxyPushConsumer_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE RtecEventChannelAdmin::ProxyPushConsumer_ptr 
-RtecEventChannelAdmin::ProxyPushConsumer_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE RtecEventChannelAdmin::ProxyPushConsumer_ptr
-RtecEventChannelAdmin::ProxyPushConsumer_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE RtecEventChannelAdmin::ProxyPushConsumer_ptr &
-RtecEventChannelAdmin::ProxyPushConsumer_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE RtecEventChannelAdmin::ProxyPushConsumer_ptr &
-RtecEventChannelAdmin::ProxyPushConsumer_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = RtecEventChannelAdmin::ProxyPushConsumer::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE RtecEventChannelAdmin::ProxyPushConsumer_ptr 
-RtecEventChannelAdmin::ProxyPushConsumer_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  RtecEventChannelAdmin::ProxyPushConsumer_ptr val = this->ptr_;
-  this->ptr_ = RtecEventChannelAdmin::ProxyPushConsumer::_nil ();
-  return val;
-}
-
-
-#endif // end #if !defined
-
-
-#if !defined (_RTECEVENTCHANNELADMIN_PROXYPUSHCONSUMER___OUT_CI_)
-#define _RTECEVENTCHANNELADMIN_PROXYPUSHCONSUMER___OUT_CI_
-
-// *************************************************************
-// Inline operations for class RtecEventChannelAdmin::ProxyPushConsumer_out
-// *************************************************************
-
-ACE_INLINE
-RtecEventChannelAdmin::ProxyPushConsumer_out::ProxyPushConsumer_out (RtecEventChannelAdmin::ProxyPushConsumer_ptr &p)
-	: ptr_ (p)
-{
-  this->ptr_ = RtecEventChannelAdmin::ProxyPushConsumer::_nil ();
-}
-
-ACE_INLINE
-RtecEventChannelAdmin::ProxyPushConsumer_out::ProxyPushConsumer_out (RtecEventChannelAdmin::ProxyPushConsumer_var &p) // constructor from _var
-	: ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = RtecEventChannelAdmin::ProxyPushConsumer::_nil ();
-}
-
-ACE_INLINE
-RtecEventChannelAdmin::ProxyPushConsumer_out::ProxyPushConsumer_out (RtecEventChannelAdmin::ProxyPushConsumer_out &p) // copy constructor
-	: ptr_ (p.ptr_)
-{}
-
-ACE_INLINE RtecEventChannelAdmin::ProxyPushConsumer_out &
-RtecEventChannelAdmin::ProxyPushConsumer_out::operator= (RtecEventChannelAdmin::ProxyPushConsumer_out &p)
-{
-  this->ptr_ = p.ptr_;
-  return *this;
-}
-
-ACE_INLINE RtecEventChannelAdmin::ProxyPushConsumer_out &
-RtecEventChannelAdmin::ProxyPushConsumer_out::operator= (const RtecEventChannelAdmin::ProxyPushConsumer_var &p)
-{
-  this->ptr_ = RtecEventChannelAdmin::ProxyPushConsumer::_duplicate (p.ptr ());
-  return *this;
-}
-
-ACE_INLINE RtecEventChannelAdmin::ProxyPushConsumer_out &
-RtecEventChannelAdmin::ProxyPushConsumer_out::operator= (RtecEventChannelAdmin::ProxyPushConsumer_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE 
-RtecEventChannelAdmin::ProxyPushConsumer_out::operator RtecEventChannelAdmin::ProxyPushConsumer_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE RtecEventChannelAdmin::ProxyPushConsumer_ptr &
-RtecEventChannelAdmin::ProxyPushConsumer_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE RtecEventChannelAdmin::ProxyPushConsumer_ptr 
-RtecEventChannelAdmin::ProxyPushConsumer_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-
-#endif // end #if !defined
-
-ACE_INLINE
-RtecEventChannelAdmin::ProxyPushSupplier::ProxyPushSupplier (void) // default constructor
-{}
-
-ACE_INLINE
-RtecEventChannelAdmin::ProxyPushSupplier::ProxyPushSupplier (STUB_Object *objref) // constructor
-	: ACE_CORBA_1 (Object) (objref)
-{}
-
-ACE_INLINE
-RtecEventChannelAdmin::ProxyPushSupplier::~ProxyPushSupplier (void) // destructor
-{}
-
-
-#if !defined (_RTECEVENTCHANNELADMIN_PROXYPUSHSUPPLIER___VAR_CI_)
-#define _RTECEVENTCHANNELADMIN_PROXYPUSHSUPPLIER___VAR_CI_
-
-// *************************************************************
-// Inline operations for class RtecEventChannelAdmin::ProxyPushSupplier_var
-// *************************************************************
-
-ACE_INLINE
-RtecEventChannelAdmin::ProxyPushSupplier_var::ProxyPushSupplier_var (void) // default constructor
-	: ptr_ (RtecEventChannelAdmin::ProxyPushSupplier::_nil ())
-{}
-
-ACE_INLINE
-RtecEventChannelAdmin::ProxyPushSupplier_var::ProxyPushSupplier_var (RtecEventChannelAdmin::ProxyPushSupplier_ptr p)
-	: ptr_ (p)
-{}
-
-ACE_INLINE RtecEventChannelAdmin::ProxyPushSupplier_ptr 
-RtecEventChannelAdmin::ProxyPushSupplier_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-RtecEventChannelAdmin::ProxyPushSupplier_var::ProxyPushSupplier_var (const RtecEventChannelAdmin::ProxyPushSupplier_var &p) // copy constructor
-	: ptr_ (RtecEventChannelAdmin::ProxyPushSupplier::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-RtecEventChannelAdmin::ProxyPushSupplier_var::~ProxyPushSupplier_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE RtecEventChannelAdmin::ProxyPushSupplier_var &
-RtecEventChannelAdmin::ProxyPushSupplier_var::operator= (RtecEventChannelAdmin::ProxyPushSupplier_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE RtecEventChannelAdmin::ProxyPushSupplier_var &
-RtecEventChannelAdmin::ProxyPushSupplier_var::operator= (const RtecEventChannelAdmin::ProxyPushSupplier_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = RtecEventChannelAdmin::ProxyPushSupplier::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE 
-RtecEventChannelAdmin::ProxyPushSupplier_var::operator const RtecEventChannelAdmin::ProxyPushSupplier_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE 
-RtecEventChannelAdmin::ProxyPushSupplier_var::operator RtecEventChannelAdmin::ProxyPushSupplier_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE RtecEventChannelAdmin::ProxyPushSupplier_ptr 
-RtecEventChannelAdmin::ProxyPushSupplier_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE RtecEventChannelAdmin::ProxyPushSupplier_ptr
-RtecEventChannelAdmin::ProxyPushSupplier_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE RtecEventChannelAdmin::ProxyPushSupplier_ptr &
-RtecEventChannelAdmin::ProxyPushSupplier_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE RtecEventChannelAdmin::ProxyPushSupplier_ptr &
-RtecEventChannelAdmin::ProxyPushSupplier_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = RtecEventChannelAdmin::ProxyPushSupplier::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE RtecEventChannelAdmin::ProxyPushSupplier_ptr 
-RtecEventChannelAdmin::ProxyPushSupplier_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  RtecEventChannelAdmin::ProxyPushSupplier_ptr val = this->ptr_;
-  this->ptr_ = RtecEventChannelAdmin::ProxyPushSupplier::_nil ();
-  return val;
-}
-
-
-#endif // end #if !defined
-
-
-#if !defined (_RTECEVENTCHANNELADMIN_PROXYPUSHSUPPLIER___OUT_CI_)
-#define _RTECEVENTCHANNELADMIN_PROXYPUSHSUPPLIER___OUT_CI_
-
-// *************************************************************
-// Inline operations for class RtecEventChannelAdmin::ProxyPushSupplier_out
-// *************************************************************
-
-ACE_INLINE
-RtecEventChannelAdmin::ProxyPushSupplier_out::ProxyPushSupplier_out (RtecEventChannelAdmin::ProxyPushSupplier_ptr &p)
-	: ptr_ (p)
-{
-  this->ptr_ = RtecEventChannelAdmin::ProxyPushSupplier::_nil ();
-}
-
-ACE_INLINE
-RtecEventChannelAdmin::ProxyPushSupplier_out::ProxyPushSupplier_out (RtecEventChannelAdmin::ProxyPushSupplier_var &p) // constructor from _var
-	: ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = RtecEventChannelAdmin::ProxyPushSupplier::_nil ();
-}
-
-ACE_INLINE
-RtecEventChannelAdmin::ProxyPushSupplier_out::ProxyPushSupplier_out (RtecEventChannelAdmin::ProxyPushSupplier_out &p) // copy constructor
-	: ptr_ (p.ptr_)
-{}
-
-ACE_INLINE RtecEventChannelAdmin::ProxyPushSupplier_out &
-RtecEventChannelAdmin::ProxyPushSupplier_out::operator= (RtecEventChannelAdmin::ProxyPushSupplier_out &p)
-{
-  this->ptr_ = p.ptr_;
-  return *this;
-}
-
-ACE_INLINE RtecEventChannelAdmin::ProxyPushSupplier_out &
-RtecEventChannelAdmin::ProxyPushSupplier_out::operator= (const RtecEventChannelAdmin::ProxyPushSupplier_var &p)
-{
-  this->ptr_ = RtecEventChannelAdmin::ProxyPushSupplier::_duplicate (p.ptr ());
-  return *this;
-}
-
-ACE_INLINE RtecEventChannelAdmin::ProxyPushSupplier_out &
-RtecEventChannelAdmin::ProxyPushSupplier_out::operator= (RtecEventChannelAdmin::ProxyPushSupplier_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE 
-RtecEventChannelAdmin::ProxyPushSupplier_out::operator RtecEventChannelAdmin::ProxyPushSupplier_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE RtecEventChannelAdmin::ProxyPushSupplier_ptr &
-RtecEventChannelAdmin::ProxyPushSupplier_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE RtecEventChannelAdmin::ProxyPushSupplier_ptr 
-RtecEventChannelAdmin::ProxyPushSupplier_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-
-#endif // end #if !defined
-
-ACE_INLINE
-RtecEventChannelAdmin::ConsumerAdmin::ConsumerAdmin (void) // default constructor
-{}
-
-ACE_INLINE
-RtecEventChannelAdmin::ConsumerAdmin::ConsumerAdmin (STUB_Object *objref) // constructor
-	: ACE_CORBA_1 (Object) (objref)
-{}
-
-ACE_INLINE
-RtecEventChannelAdmin::ConsumerAdmin::~ConsumerAdmin (void) // destructor
-{}
-
-
-#if !defined (_RTECEVENTCHANNELADMIN_CONSUMERADMIN___VAR_CI_)
-#define _RTECEVENTCHANNELADMIN_CONSUMERADMIN___VAR_CI_
-
-// *************************************************************
-// Inline operations for class RtecEventChannelAdmin::ConsumerAdmin_var
-// *************************************************************
-
-ACE_INLINE
-RtecEventChannelAdmin::ConsumerAdmin_var::ConsumerAdmin_var (void) // default constructor
-	: ptr_ (RtecEventChannelAdmin::ConsumerAdmin::_nil ())
-{}
-
-ACE_INLINE
-RtecEventChannelAdmin::ConsumerAdmin_var::ConsumerAdmin_var (RtecEventChannelAdmin::ConsumerAdmin_ptr p)
-	: ptr_ (p)
-{}
-
-ACE_INLINE RtecEventChannelAdmin::ConsumerAdmin_ptr 
-RtecEventChannelAdmin::ConsumerAdmin_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-RtecEventChannelAdmin::ConsumerAdmin_var::ConsumerAdmin_var (const RtecEventChannelAdmin::ConsumerAdmin_var &p) // copy constructor
-	: ptr_ (RtecEventChannelAdmin::ConsumerAdmin::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-RtecEventChannelAdmin::ConsumerAdmin_var::~ConsumerAdmin_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE RtecEventChannelAdmin::ConsumerAdmin_var &
-RtecEventChannelAdmin::ConsumerAdmin_var::operator= (RtecEventChannelAdmin::ConsumerAdmin_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE RtecEventChannelAdmin::ConsumerAdmin_var &
-RtecEventChannelAdmin::ConsumerAdmin_var::operator= (const RtecEventChannelAdmin::ConsumerAdmin_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = RtecEventChannelAdmin::ConsumerAdmin::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE 
-RtecEventChannelAdmin::ConsumerAdmin_var::operator const RtecEventChannelAdmin::ConsumerAdmin_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE 
-RtecEventChannelAdmin::ConsumerAdmin_var::operator RtecEventChannelAdmin::ConsumerAdmin_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE RtecEventChannelAdmin::ConsumerAdmin_ptr 
-RtecEventChannelAdmin::ConsumerAdmin_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE RtecEventChannelAdmin::ConsumerAdmin_ptr
-RtecEventChannelAdmin::ConsumerAdmin_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE RtecEventChannelAdmin::ConsumerAdmin_ptr &
-RtecEventChannelAdmin::ConsumerAdmin_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE RtecEventChannelAdmin::ConsumerAdmin_ptr &
-RtecEventChannelAdmin::ConsumerAdmin_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = RtecEventChannelAdmin::ConsumerAdmin::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE RtecEventChannelAdmin::ConsumerAdmin_ptr 
-RtecEventChannelAdmin::ConsumerAdmin_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  RtecEventChannelAdmin::ConsumerAdmin_ptr val = this->ptr_;
-  this->ptr_ = RtecEventChannelAdmin::ConsumerAdmin::_nil ();
-  return val;
-}
-
-
-#endif // end #if !defined
-
-
-#if !defined (_RTECEVENTCHANNELADMIN_CONSUMERADMIN___OUT_CI_)
-#define _RTECEVENTCHANNELADMIN_CONSUMERADMIN___OUT_CI_
-
-// *************************************************************
-// Inline operations for class RtecEventChannelAdmin::ConsumerAdmin_out
-// *************************************************************
-
-ACE_INLINE
-RtecEventChannelAdmin::ConsumerAdmin_out::ConsumerAdmin_out (RtecEventChannelAdmin::ConsumerAdmin_ptr &p)
-	: ptr_ (p)
-{
-  this->ptr_ = RtecEventChannelAdmin::ConsumerAdmin::_nil ();
-}
-
-ACE_INLINE
-RtecEventChannelAdmin::ConsumerAdmin_out::ConsumerAdmin_out (RtecEventChannelAdmin::ConsumerAdmin_var &p) // constructor from _var
-	: ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = RtecEventChannelAdmin::ConsumerAdmin::_nil ();
-}
-
-ACE_INLINE
-RtecEventChannelAdmin::ConsumerAdmin_out::ConsumerAdmin_out (RtecEventChannelAdmin::ConsumerAdmin_out &p) // copy constructor
-	: ptr_ (p.ptr_)
-{}
-
-ACE_INLINE RtecEventChannelAdmin::ConsumerAdmin_out &
-RtecEventChannelAdmin::ConsumerAdmin_out::operator= (RtecEventChannelAdmin::ConsumerAdmin_out &p)
-{
-  this->ptr_ = p.ptr_;
-  return *this;
-}
-
-ACE_INLINE RtecEventChannelAdmin::ConsumerAdmin_out &
-RtecEventChannelAdmin::ConsumerAdmin_out::operator= (const RtecEventChannelAdmin::ConsumerAdmin_var &p)
-{
-  this->ptr_ = RtecEventChannelAdmin::ConsumerAdmin::_duplicate (p.ptr ());
-  return *this;
-}
-
-ACE_INLINE RtecEventChannelAdmin::ConsumerAdmin_out &
-RtecEventChannelAdmin::ConsumerAdmin_out::operator= (RtecEventChannelAdmin::ConsumerAdmin_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE 
-RtecEventChannelAdmin::ConsumerAdmin_out::operator RtecEventChannelAdmin::ConsumerAdmin_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE RtecEventChannelAdmin::ConsumerAdmin_ptr &
-RtecEventChannelAdmin::ConsumerAdmin_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE RtecEventChannelAdmin::ConsumerAdmin_ptr 
-RtecEventChannelAdmin::ConsumerAdmin_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-
-#endif // end #if !defined
-
-ACE_INLINE
-RtecEventChannelAdmin::SupplierAdmin::SupplierAdmin (void) // default constructor
-{}
-
-ACE_INLINE
-RtecEventChannelAdmin::SupplierAdmin::SupplierAdmin (STUB_Object *objref) // constructor
-	: ACE_CORBA_1 (Object) (objref)
-{}
-
-ACE_INLINE
-RtecEventChannelAdmin::SupplierAdmin::~SupplierAdmin (void) // destructor
-{}
-
-
-#if !defined (_RTECEVENTCHANNELADMIN_SUPPLIERADMIN___VAR_CI_)
-#define _RTECEVENTCHANNELADMIN_SUPPLIERADMIN___VAR_CI_
-
-// *************************************************************
-// Inline operations for class RtecEventChannelAdmin::SupplierAdmin_var
-// *************************************************************
-
-ACE_INLINE
-RtecEventChannelAdmin::SupplierAdmin_var::SupplierAdmin_var (void) // default constructor
-	: ptr_ (RtecEventChannelAdmin::SupplierAdmin::_nil ())
-{}
-
-ACE_INLINE
-RtecEventChannelAdmin::SupplierAdmin_var::SupplierAdmin_var (RtecEventChannelAdmin::SupplierAdmin_ptr p)
-	: ptr_ (p)
-{}
-
-ACE_INLINE RtecEventChannelAdmin::SupplierAdmin_ptr 
-RtecEventChannelAdmin::SupplierAdmin_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-RtecEventChannelAdmin::SupplierAdmin_var::SupplierAdmin_var (const RtecEventChannelAdmin::SupplierAdmin_var &p) // copy constructor
-	: ptr_ (RtecEventChannelAdmin::SupplierAdmin::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-RtecEventChannelAdmin::SupplierAdmin_var::~SupplierAdmin_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE RtecEventChannelAdmin::SupplierAdmin_var &
-RtecEventChannelAdmin::SupplierAdmin_var::operator= (RtecEventChannelAdmin::SupplierAdmin_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE RtecEventChannelAdmin::SupplierAdmin_var &
-RtecEventChannelAdmin::SupplierAdmin_var::operator= (const RtecEventChannelAdmin::SupplierAdmin_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = RtecEventChannelAdmin::SupplierAdmin::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE 
-RtecEventChannelAdmin::SupplierAdmin_var::operator const RtecEventChannelAdmin::SupplierAdmin_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE 
-RtecEventChannelAdmin::SupplierAdmin_var::operator RtecEventChannelAdmin::SupplierAdmin_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE RtecEventChannelAdmin::SupplierAdmin_ptr 
-RtecEventChannelAdmin::SupplierAdmin_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE RtecEventChannelAdmin::SupplierAdmin_ptr
-RtecEventChannelAdmin::SupplierAdmin_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE RtecEventChannelAdmin::SupplierAdmin_ptr &
-RtecEventChannelAdmin::SupplierAdmin_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE RtecEventChannelAdmin::SupplierAdmin_ptr &
-RtecEventChannelAdmin::SupplierAdmin_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = RtecEventChannelAdmin::SupplierAdmin::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE RtecEventChannelAdmin::SupplierAdmin_ptr 
-RtecEventChannelAdmin::SupplierAdmin_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  RtecEventChannelAdmin::SupplierAdmin_ptr val = this->ptr_;
-  this->ptr_ = RtecEventChannelAdmin::SupplierAdmin::_nil ();
-  return val;
-}
-
-
-#endif // end #if !defined
-
-
-#if !defined (_RTECEVENTCHANNELADMIN_SUPPLIERADMIN___OUT_CI_)
-#define _RTECEVENTCHANNELADMIN_SUPPLIERADMIN___OUT_CI_
-
-// *************************************************************
-// Inline operations for class RtecEventChannelAdmin::SupplierAdmin_out
-// *************************************************************
-
-ACE_INLINE
-RtecEventChannelAdmin::SupplierAdmin_out::SupplierAdmin_out (RtecEventChannelAdmin::SupplierAdmin_ptr &p)
-	: ptr_ (p)
-{
-  this->ptr_ = RtecEventChannelAdmin::SupplierAdmin::_nil ();
-}
-
-ACE_INLINE
-RtecEventChannelAdmin::SupplierAdmin_out::SupplierAdmin_out (RtecEventChannelAdmin::SupplierAdmin_var &p) // constructor from _var
-	: ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = RtecEventChannelAdmin::SupplierAdmin::_nil ();
-}
-
-ACE_INLINE
-RtecEventChannelAdmin::SupplierAdmin_out::SupplierAdmin_out (RtecEventChannelAdmin::SupplierAdmin_out &p) // copy constructor
-	: ptr_ (p.ptr_)
-{}
-
-ACE_INLINE RtecEventChannelAdmin::SupplierAdmin_out &
-RtecEventChannelAdmin::SupplierAdmin_out::operator= (RtecEventChannelAdmin::SupplierAdmin_out &p)
-{
-  this->ptr_ = p.ptr_;
-  return *this;
-}
-
-ACE_INLINE RtecEventChannelAdmin::SupplierAdmin_out &
-RtecEventChannelAdmin::SupplierAdmin_out::operator= (const RtecEventChannelAdmin::SupplierAdmin_var &p)
-{
-  this->ptr_ = RtecEventChannelAdmin::SupplierAdmin::_duplicate (p.ptr ());
-  return *this;
-}
-
-ACE_INLINE RtecEventChannelAdmin::SupplierAdmin_out &
-RtecEventChannelAdmin::SupplierAdmin_out::operator= (RtecEventChannelAdmin::SupplierAdmin_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE 
-RtecEventChannelAdmin::SupplierAdmin_out::operator RtecEventChannelAdmin::SupplierAdmin_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE RtecEventChannelAdmin::SupplierAdmin_ptr &
-RtecEventChannelAdmin::SupplierAdmin_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE RtecEventChannelAdmin::SupplierAdmin_ptr 
-RtecEventChannelAdmin::SupplierAdmin_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-
-#endif // end #if !defined
-
-ACE_INLINE
-RtecEventChannelAdmin::EventChannel::EventChannel (void) // default constructor
-{}
-
-ACE_INLINE
-RtecEventChannelAdmin::EventChannel::EventChannel (STUB_Object *objref) // constructor
-	: ACE_CORBA_1 (Object) (objref)
-{}
-
-ACE_INLINE
-RtecEventChannelAdmin::EventChannel::~EventChannel (void) // destructor
-{}
-
-
-#if !defined (_RTECEVENTCHANNELADMIN_EVENTCHANNEL___VAR_CI_)
-#define _RTECEVENTCHANNELADMIN_EVENTCHANNEL___VAR_CI_
-
-// *************************************************************
-// Inline operations for class RtecEventChannelAdmin::EventChannel_var
-// *************************************************************
-
-ACE_INLINE
-RtecEventChannelAdmin::EventChannel_var::EventChannel_var (void) // default constructor
-	: ptr_ (RtecEventChannelAdmin::EventChannel::_nil ())
-{}
-
-ACE_INLINE
-RtecEventChannelAdmin::EventChannel_var::EventChannel_var (RtecEventChannelAdmin::EventChannel_ptr p)
-	: ptr_ (p)
-{}
-
-ACE_INLINE RtecEventChannelAdmin::EventChannel_ptr 
-RtecEventChannelAdmin::EventChannel_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-RtecEventChannelAdmin::EventChannel_var::EventChannel_var (const RtecEventChannelAdmin::EventChannel_var &p) // copy constructor
-	: ptr_ (RtecEventChannelAdmin::EventChannel::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-RtecEventChannelAdmin::EventChannel_var::~EventChannel_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE RtecEventChannelAdmin::EventChannel_var &
-RtecEventChannelAdmin::EventChannel_var::operator= (RtecEventChannelAdmin::EventChannel_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE RtecEventChannelAdmin::EventChannel_var &
-RtecEventChannelAdmin::EventChannel_var::operator= (const RtecEventChannelAdmin::EventChannel_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = RtecEventChannelAdmin::EventChannel::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE 
-RtecEventChannelAdmin::EventChannel_var::operator const RtecEventChannelAdmin::EventChannel_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE 
-RtecEventChannelAdmin::EventChannel_var::operator RtecEventChannelAdmin::EventChannel_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE RtecEventChannelAdmin::EventChannel_ptr 
-RtecEventChannelAdmin::EventChannel_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE RtecEventChannelAdmin::EventChannel_ptr
-RtecEventChannelAdmin::EventChannel_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE RtecEventChannelAdmin::EventChannel_ptr &
-RtecEventChannelAdmin::EventChannel_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE RtecEventChannelAdmin::EventChannel_ptr &
-RtecEventChannelAdmin::EventChannel_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = RtecEventChannelAdmin::EventChannel::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE RtecEventChannelAdmin::EventChannel_ptr 
-RtecEventChannelAdmin::EventChannel_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  RtecEventChannelAdmin::EventChannel_ptr val = this->ptr_;
-  this->ptr_ = RtecEventChannelAdmin::EventChannel::_nil ();
-  return val;
-}
-
-
-#endif // end #if !defined
-
-
-#if !defined (_RTECEVENTCHANNELADMIN_EVENTCHANNEL___OUT_CI_)
-#define _RTECEVENTCHANNELADMIN_EVENTCHANNEL___OUT_CI_
-
-// *************************************************************
-// Inline operations for class RtecEventChannelAdmin::EventChannel_out
-// *************************************************************
-
-ACE_INLINE
-RtecEventChannelAdmin::EventChannel_out::EventChannel_out (RtecEventChannelAdmin::EventChannel_ptr &p)
-	: ptr_ (p)
-{
-  this->ptr_ = RtecEventChannelAdmin::EventChannel::_nil ();
-}
-
-ACE_INLINE
-RtecEventChannelAdmin::EventChannel_out::EventChannel_out (RtecEventChannelAdmin::EventChannel_var &p) // constructor from _var
-	: ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = RtecEventChannelAdmin::EventChannel::_nil ();
-}
-
-ACE_INLINE
-RtecEventChannelAdmin::EventChannel_out::EventChannel_out (RtecEventChannelAdmin::EventChannel_out &p) // copy constructor
-	: ptr_ (p.ptr_)
-{}
-
-ACE_INLINE RtecEventChannelAdmin::EventChannel_out &
-RtecEventChannelAdmin::EventChannel_out::operator= (RtecEventChannelAdmin::EventChannel_out &p)
-{
-  this->ptr_ = p.ptr_;
-  return *this;
-}
-
-ACE_INLINE RtecEventChannelAdmin::EventChannel_out &
-RtecEventChannelAdmin::EventChannel_out::operator= (const RtecEventChannelAdmin::EventChannel_var &p)
-{
-  this->ptr_ = RtecEventChannelAdmin::EventChannel::_duplicate (p.ptr ());
-  return *this;
-}
-
-ACE_INLINE RtecEventChannelAdmin::EventChannel_out &
-RtecEventChannelAdmin::EventChannel_out::operator= (RtecEventChannelAdmin::EventChannel_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE 
-RtecEventChannelAdmin::EventChannel_out::operator RtecEventChannelAdmin::EventChannel_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE RtecEventChannelAdmin::EventChannel_ptr &
-RtecEventChannelAdmin::EventChannel_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE RtecEventChannelAdmin::EventChannel_ptr 
-RtecEventChannelAdmin::EventChannel_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-
-#endif // end #if !defined
-
-// *************************************************************
-// Inline operations for exception RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR
-// *************************************************************
-
-// default constructor
-ACE_INLINE
-RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR::SYNCHRONIZATION_ERROR (void)
-  : CORBA_UserException (_tc_SYNCHRONIZATION_ERROR)
-{
-}
-
-// *************************************************************
-// Inline operations for exception RtecEventChannelAdmin::EventChannel::QOS_ERROR
-// *************************************************************
-
-// default constructor
-ACE_INLINE
-RtecEventChannelAdmin::EventChannel::QOS_ERROR::QOS_ERROR (void)
-  : CORBA_UserException (_tc_QOS_ERROR)
-{
-}
-
-// *************************************************************
-// Inline operations for exception RtecEventChannelAdmin::EventChannel::SUBSCRIPTION_ERROR
-// *************************************************************
-
-// default constructor
-ACE_INLINE
-RtecEventChannelAdmin::EventChannel::SUBSCRIPTION_ERROR::SUBSCRIPTION_ERROR (void)
-  : CORBA_UserException (_tc_SUBSCRIPTION_ERROR)
-{
-}
-
-// *************************************************************
-// Inline operations for exception RtecEventChannelAdmin::EventChannel::CORRELATION_ERROR
-// *************************************************************
-
-// default constructor
-ACE_INLINE
-RtecEventChannelAdmin::EventChannel::CORRELATION_ERROR::CORRELATION_ERROR (void)
-  : CORBA_UserException (_tc_CORRELATION_ERROR)
-{
-}
-
-// *************************************************************
-// Inline operations for exception RtecEventChannelAdmin::EventChannel::DISPATCH_ERROR
-// *************************************************************
-
-// default constructor
-ACE_INLINE
-RtecEventChannelAdmin::EventChannel::DISPATCH_ERROR::DISPATCH_ERROR (void)
-  : CORBA_UserException (_tc_DISPATCH_ERROR)
-{
-}
-
diff --git a/TAO/orbsvcs/lib/RtecEventChannelAdminS.cpp b/TAO/orbsvcs/lib/RtecEventChannelAdminS.cpp
deleted file mode 100644
index a4fdcfc2b6d..00000000000
--- a/TAO/orbsvcs/lib/RtecEventChannelAdminS.cpp
+++ /dev/null
@@ -1,480 +0,0 @@
-// ******  Code generated by the The ACE ORB (TAO) IDL Compiler *******
-// TAO ORB and the TAO IDL Compiler have been developed by Washington 
-// University Computer Science's Distributed Object Computing Group.
-//
-// Information on TAO is available at
-//                 http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#include "RtecEventChannelAdminS.h"
-
-#if !defined (__ACE_INLINE__)
-#include "RtecEventChannelAdminS.i"
-#endif // !defined INLINE
-
-void POA_RtecEventComm_PushConsumer_push_skel (CORBA::ServerRequest &_tao_server_request, CORBA::Object_ptr _tao_object_reference, CORBA::Environment &_tao_environment)
-{
-  CORBA::NVList_ptr 	 nvlist;
-  POA_RtecEventComm::PushConsumer_ptr 	 impl;
-  RtecEventComm::EventSet data;
-  CORBA::NamedValue_ptr nv_data;
-  CORBA::Any 	 any_data (RtecEventComm::_tc_EventSet, &data); // ORB does not own
-  
-  // create an NV list and populate it with typecodes
-  _tao_server_request.orb ()->create_list (0, nvlist); // initialize a list
-  // add each argument according to the in, out, inout semantics
-  nv_data = nvlist->add_value ("data", any_data, CORBA::ARG_IN, _tao_environment);
-  // parse the arguments
-  _tao_server_request.params (nvlist, _tao_environment);
-  if (_tao_environment.exception ()) return;
-  
-impl = (POA_RtecEventChannelAdmin::ProxyPushConsumer_ptr) _tao_object_reference->get_subclass ();
-  impl->push(data, _tao_environment);
-  
-
-}
-
-void POA_RtecEventComm_PushConsumer_disconnect_push_consumer_skel (CORBA::ServerRequest &_tao_server_request, CORBA::Object_ptr _tao_object_reference, CORBA::Environment &_tao_environment)
-{
-  CORBA::NVList_ptr 	 nvlist;
-  POA_RtecEventComm::PushConsumer_ptr 	 impl;
-  
-  // create an NV list and populate it with typecodes
-  _tao_server_request.orb ()->create_list (0, nvlist); // initialize a list
-  // add each argument according to the in, out, inout semantics
-  // parse the arguments
-  _tao_server_request.params (nvlist, _tao_environment);
-  if (_tao_environment.exception ()) return;
-  
-impl = (POA_RtecEventChannelAdmin::ProxyPushConsumer_ptr) _tao_object_reference->get_subclass ();
-  impl->disconnect_push_consumer(_tao_environment);
-  
-
-}
-
-static const TAO_operation_db_entry ProxyPushConsumer_operations [] = {
-  {"push", &POA_RtecEventComm_PushConsumer_push_skel},
-  {"disconnect_push_consumer", &POA_RtecEventComm_PushConsumer_disconnect_push_consumer_skel},
-  {"connect_push_supplier", &POA_RtecEventChannelAdmin::ProxyPushConsumer::connect_push_supplier_skel},
-  {"_is_a", &POA_RtecEventChannelAdmin::ProxyPushConsumer::_is_a_skel}
-};
-
-TAO_Dynamic_Hash_OpTable tao_ProxyPushConsumer_optable (ProxyPushConsumer_operations, 4, 8);
-// skeleton constructor
-POA_RtecEventChannelAdmin::ProxyPushConsumer::ProxyPushConsumer (const char *obj_name)
-{
-  const CORBA::String repoID = "IDL:RtecEventChannelAdmin/ProxyPushConsumer:1.0"; // repository ID
-  IIOP_Object *data; // Actual object reference
-  TAO_ORB_Core *ocp = TAO_ORB_Core_instance (); // underlying ORB core instance
-  CORBA::POA_ptr oa = TAO_ORB_Core_instance ()->root_poa (); // underlying OA
-  const ACE_INET_Addr &addr = ocp->orb_params ()->addr ();
-  this->optable_ = &tao_ProxyPushConsumer_optable;
-  
-  // set up an IIOP object
-  data = new IIOP_Object (CORBA::string_dup (repoID), addr, obj_name);
-  this->set_parent (data); // store the IIOP obj ref with us
-  this->sub_ = this; // set the most derived type to be us
-  if (oa) oa->bind (data->profile.object_key, this); // register ourselves
-}
-
-void POA_RtecEventChannelAdmin::ProxyPushConsumer::connect_push_supplier_skel (CORBA::ServerRequest &_tao_server_request, CORBA::Object_ptr _tao_object_reference, CORBA::Environment &_tao_environment)
-{
-  CORBA::NVList_ptr 	 nvlist;
-  POA_RtecEventChannelAdmin::ProxyPushConsumer_ptr 	 impl;
-  RtecEventComm::PushSupplier_ptr push_supplier;
-  CORBA::Object_ptr _tao_base_push_supplier;
-  CORBA::NamedValue_ptr nv_push_supplier;
-  CORBA::Any 	 any_push_supplier (RtecEventComm::_tc_PushSupplier, &_tao_base_push_supplier); // ORB does not own
-  RtecEventChannelAdmin::SupplierQOS qos;
-  CORBA::NamedValue_ptr nv_qos;
-  CORBA::Any 	 any_qos (RtecEventChannelAdmin::_tc_SupplierQOS, &qos); // ORB does not own
-  
-  // create an NV list and populate it with typecodes
-  _tao_server_request.orb ()->create_list (0, nvlist); // initialize a list
-  // add each argument according to the in, out, inout semantics
-  nv_push_supplier = nvlist->add_value ("push_supplier", any_push_supplier, CORBA::ARG_IN, _tao_environment);
-  nv_qos = nvlist->add_value ("qos", any_qos, CORBA::ARG_IN, _tao_environment);
-  // parse the arguments
-  _tao_server_request.params (nvlist, _tao_environment);
-  if (_tao_environment.exception ()) return;
-  push_supplier = RtecEventComm::PushSupplier::_narrow (_tao_base_push_supplier, _tao_environment);
-  if (_tao_environment.exception ()) return;
-  
-impl = (POA_RtecEventChannelAdmin::ProxyPushConsumer_ptr) _tao_object_reference->get_subclass ();
-  impl->connect_push_supplier(push_supplier, qos, _tao_environment);
-  
-
-}
-
-void POA_RtecEventChannelAdmin::ProxyPushConsumer::_is_a_skel (CORBA::ServerRequest &req, CORBA::Object_ptr /* obj */, CORBA::Environment &env)
-{
-  const CORBA::String type_id = "IDL:RtecEventChannelAdmin/ProxyPushConsumer:1.0"; // repository ID
-  CORBA::NVList_ptr nvlist;
-  CORBA::NamedValue_ptr nv;
-  CORBA::Any temp_value (CORBA::_tc_string);
-  CORBA::Any *any;
-  CORBA::Boolean *retval;
-  CORBA::String value;
-  
-  req.orb()->create_list (0, nvlist);
-  nv = nvlist->add_value (0, temp_value, CORBA::ARG_IN, env);
-  req.params (nvlist, env); // parse the args
-  if (env.exception () != 0) return;
-  value = *(CORBA::String *)nv->value ()->value ();
-  if (ACE_OS::strcmp ((char *)value, (char *)type_id) == 0
-    || ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (env)) == 0)
-
-  	retval = new CORBA::Boolean (CORBA::B_TRUE);
-  else
-  	retval = new CORBA::Boolean (CORBA::B_FALSE);
-  any = new CORBA::Any (CORBA::_tc_boolean, retval, CORBA::B_TRUE);
-  req.result (any, env);
-}
-
-void POA_RtecEventComm_PushSupplier_disconnect_push_supplier_skel (CORBA::ServerRequest &_tao_server_request, CORBA::Object_ptr _tao_object_reference, CORBA::Environment &_tao_environment)
-{
-  CORBA::NVList_ptr 	 nvlist;
-  POA_RtecEventComm::PushSupplier_ptr 	 impl;
-  
-  // create an NV list and populate it with typecodes
-  _tao_server_request.orb ()->create_list (0, nvlist); // initialize a list
-  // add each argument according to the in, out, inout semantics
-  // parse the arguments
-  _tao_server_request.params (nvlist, _tao_environment);
-  if (_tao_environment.exception ()) return;
-  
-impl = (POA_RtecEventChannelAdmin::ProxyPushSupplier_ptr) _tao_object_reference->get_subclass ();
-  impl->disconnect_push_supplier(_tao_environment);
-  
-
-}
-
-static const TAO_operation_db_entry ProxyPushSupplier_operations [] = {
-  {"disconnect_push_supplier", &POA_RtecEventComm_PushSupplier_disconnect_push_supplier_skel},
-  {"connect_push_consumer", &POA_RtecEventChannelAdmin::ProxyPushSupplier::connect_push_consumer_skel},
-  {"_is_a", &POA_RtecEventChannelAdmin::ProxyPushSupplier::_is_a_skel}
-};
-
-TAO_Dynamic_Hash_OpTable tao_ProxyPushSupplier_optable (ProxyPushSupplier_operations, 3, 6);
-// skeleton constructor
-POA_RtecEventChannelAdmin::ProxyPushSupplier::ProxyPushSupplier (const char *obj_name)
-{
-  const CORBA::String repoID = "IDL:RtecEventChannelAdmin/ProxyPushSupplier:1.0"; // repository ID
-  IIOP_Object *data; // Actual object reference
-  TAO_ORB_Core *ocp = TAO_ORB_Core_instance (); // underlying ORB core instance
-  CORBA::POA_ptr oa = TAO_ORB_Core_instance ()->root_poa (); // underlying OA
-  const ACE_INET_Addr &addr = ocp->orb_params ()->addr ();
-  this->optable_ = &tao_ProxyPushSupplier_optable;
-  
-  // set up an IIOP object
-  data = new IIOP_Object (CORBA::string_dup (repoID), addr, obj_name);
-  this->set_parent (data); // store the IIOP obj ref with us
-  this->sub_ = this; // set the most derived type to be us
-  if (oa) oa->bind (data->profile.object_key, this); // register ourselves
-}
-
-void POA_RtecEventChannelAdmin::ProxyPushSupplier::connect_push_consumer_skel (CORBA::ServerRequest &_tao_server_request, CORBA::Object_ptr _tao_object_reference, CORBA::Environment &_tao_environment)
-{
-  CORBA::NVList_ptr 	 nvlist;
-  POA_RtecEventChannelAdmin::ProxyPushSupplier_ptr 	 impl;
-  RtecEventComm::PushConsumer_ptr push_consumer;
-  CORBA::Object_ptr _tao_base_push_consumer;
-  CORBA::NamedValue_ptr nv_push_consumer;
-  CORBA::Any 	 any_push_consumer (RtecEventComm::_tc_PushConsumer, &_tao_base_push_consumer); // ORB does not own
-  RtecEventChannelAdmin::ConsumerQOS qos;
-  CORBA::NamedValue_ptr nv_qos;
-  CORBA::Any 	 any_qos (RtecEventChannelAdmin::_tc_ConsumerQOS, &qos); // ORB does not own
-  
-  // create an NV list and populate it with typecodes
-  _tao_server_request.orb ()->create_list (0, nvlist); // initialize a list
-  // add each argument according to the in, out, inout semantics
-  nv_push_consumer = nvlist->add_value ("push_consumer", any_push_consumer, CORBA::ARG_IN, _tao_environment);
-  nv_qos = nvlist->add_value ("qos", any_qos, CORBA::ARG_IN, _tao_environment);
-  // parse the arguments
-  _tao_server_request.params (nvlist, _tao_environment);
-  if (_tao_environment.exception ()) return;
-  push_consumer = RtecEventComm::PushConsumer::_narrow (_tao_base_push_consumer, _tao_environment);
-  if (_tao_environment.exception ()) return;
-  
-impl = (POA_RtecEventChannelAdmin::ProxyPushSupplier_ptr) _tao_object_reference->get_subclass ();
-  impl->connect_push_consumer(push_consumer, qos, _tao_environment);
-  
-
-}
-
-void POA_RtecEventChannelAdmin::ProxyPushSupplier::_is_a_skel (CORBA::ServerRequest &req, CORBA::Object_ptr /* obj */, CORBA::Environment &env)
-{
-  const CORBA::String type_id = "IDL:RtecEventChannelAdmin/ProxyPushSupplier:1.0"; // repository ID
-  CORBA::NVList_ptr nvlist;
-  CORBA::NamedValue_ptr nv;
-  CORBA::Any temp_value (CORBA::_tc_string);
-  CORBA::Any *any;
-  CORBA::Boolean *retval;
-  CORBA::String value;
-  
-  req.orb()->create_list (0, nvlist);
-  nv = nvlist->add_value (0, temp_value, CORBA::ARG_IN, env);
-  req.params (nvlist, env); // parse the args
-  if (env.exception () != 0) return;
-  value = *(CORBA::String *)nv->value ()->value ();
-  if (ACE_OS::strcmp ((char *)value, (char *)type_id) == 0
-    || ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (env)) == 0)
-
-  	retval = new CORBA::Boolean (CORBA::B_TRUE);
-  else
-  	retval = new CORBA::Boolean (CORBA::B_FALSE);
-  any = new CORBA::Any (CORBA::_tc_boolean, retval, CORBA::B_TRUE);
-  req.result (any, env);
-}
-
-static const TAO_operation_db_entry ConsumerAdmin_operations [] = {
-  {"obtain_push_supplier", &POA_RtecEventChannelAdmin::ConsumerAdmin::obtain_push_supplier_skel},
-  {"_is_a", &POA_RtecEventChannelAdmin::ConsumerAdmin::_is_a_skel}
-};
-
-TAO_Dynamic_Hash_OpTable tao_ConsumerAdmin_optable (ConsumerAdmin_operations, 2, 4);
-// skeleton constructor
-POA_RtecEventChannelAdmin::ConsumerAdmin::ConsumerAdmin (const char *obj_name)
-{
-  const CORBA::String repoID = "IDL:RtecEventChannelAdmin/ConsumerAdmin:1.0"; // repository ID
-  IIOP_Object *data; // Actual object reference
-  TAO_ORB_Core *ocp = TAO_ORB_Core_instance (); // underlying ORB core instance
-  CORBA::POA_ptr oa = TAO_ORB_Core_instance ()->root_poa (); // underlying OA
-  const ACE_INET_Addr &addr = ocp->orb_params ()->addr ();
-  this->optable_ = &tao_ConsumerAdmin_optable;
-  
-  // set up an IIOP object
-  data = new IIOP_Object (CORBA::string_dup (repoID), addr, obj_name);
-  this->set_parent (data); // store the IIOP obj ref with us
-  this->sub_ = this; // set the most derived type to be us
-  if (oa) oa->bind (data->profile.object_key, this); // register ourselves
-}
-
-void POA_RtecEventChannelAdmin::ConsumerAdmin::obtain_push_supplier_skel (CORBA::ServerRequest &_tao_server_request, CORBA::Object_ptr _tao_object_reference, CORBA::Environment &_tao_environment)
-{
-  CORBA::NVList_ptr 	 nvlist;
-  POA_RtecEventChannelAdmin::ConsumerAdmin_ptr 	 impl;
-  CORBA::Any *result;
-  CORBA::Object_ptr *retval = new CORBA::Object_ptr;
-  
-  // create an NV list and populate it with typecodes
-  _tao_server_request.orb ()->create_list (0, nvlist); // initialize a list
-  // add each argument according to the in, out, inout semantics
-  // parse the arguments
-  _tao_server_request.params (nvlist, _tao_environment);
-  if (_tao_environment.exception ()) return;
-  
-impl = (POA_RtecEventChannelAdmin::ConsumerAdmin_ptr) _tao_object_reference->get_subclass ();
-  *retval = impl->obtain_push_supplier(_tao_environment);
-  
-result = new CORBA::Any (RtecEventChannelAdmin::_tc_ProxyPushSupplier, retval, 1); // ORB owns
-  _tao_server_request.result (result, _tao_environment);
-  
-}
-
-void POA_RtecEventChannelAdmin::ConsumerAdmin::_is_a_skel (CORBA::ServerRequest &req, CORBA::Object_ptr /* obj */, CORBA::Environment &env)
-{
-  const CORBA::String type_id = "IDL:RtecEventChannelAdmin/ConsumerAdmin:1.0"; // repository ID
-  CORBA::NVList_ptr nvlist;
-  CORBA::NamedValue_ptr nv;
-  CORBA::Any temp_value (CORBA::_tc_string);
-  CORBA::Any *any;
-  CORBA::Boolean *retval;
-  CORBA::String value;
-  
-  req.orb()->create_list (0, nvlist);
-  nv = nvlist->add_value (0, temp_value, CORBA::ARG_IN, env);
-  req.params (nvlist, env); // parse the args
-  if (env.exception () != 0) return;
-  value = *(CORBA::String *)nv->value ()->value ();
-  if (ACE_OS::strcmp ((char *)value, (char *)type_id) == 0
-    || ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (env)) == 0)
-
-  	retval = new CORBA::Boolean (CORBA::B_TRUE);
-  else
-  	retval = new CORBA::Boolean (CORBA::B_FALSE);
-  any = new CORBA::Any (CORBA::_tc_boolean, retval, CORBA::B_TRUE);
-  req.result (any, env);
-}
-
-static const TAO_operation_db_entry SupplierAdmin_operations [] = {
-  {"obtain_push_consumer", &POA_RtecEventChannelAdmin::SupplierAdmin::obtain_push_consumer_skel},
-  {"_is_a", &POA_RtecEventChannelAdmin::SupplierAdmin::_is_a_skel}
-};
-
-TAO_Dynamic_Hash_OpTable tao_SupplierAdmin_optable (SupplierAdmin_operations, 2, 4);
-// skeleton constructor
-POA_RtecEventChannelAdmin::SupplierAdmin::SupplierAdmin (const char *obj_name)
-{
-  const CORBA::String repoID = "IDL:RtecEventChannelAdmin/SupplierAdmin:1.0"; // repository ID
-  IIOP_Object *data; // Actual object reference
-  TAO_ORB_Core *ocp = TAO_ORB_Core_instance (); // underlying ORB core instance
-  CORBA::POA_ptr oa = TAO_ORB_Core_instance ()->root_poa (); // underlying OA
-  const ACE_INET_Addr &addr = ocp->orb_params ()->addr ();
-  this->optable_ = &tao_SupplierAdmin_optable;
-  
-  // set up an IIOP object
-  data = new IIOP_Object (CORBA::string_dup (repoID), addr, obj_name);
-  this->set_parent (data); // store the IIOP obj ref with us
-  this->sub_ = this; // set the most derived type to be us
-  if (oa) oa->bind (data->profile.object_key, this); // register ourselves
-}
-
-void POA_RtecEventChannelAdmin::SupplierAdmin::obtain_push_consumer_skel (CORBA::ServerRequest &_tao_server_request, CORBA::Object_ptr _tao_object_reference, CORBA::Environment &_tao_environment)
-{
-  CORBA::NVList_ptr 	 nvlist;
-  POA_RtecEventChannelAdmin::SupplierAdmin_ptr 	 impl;
-  CORBA::Any *result;
-  CORBA::Object_ptr *retval = new CORBA::Object_ptr;
-  
-  // create an NV list and populate it with typecodes
-  _tao_server_request.orb ()->create_list (0, nvlist); // initialize a list
-  // add each argument according to the in, out, inout semantics
-  // parse the arguments
-  _tao_server_request.params (nvlist, _tao_environment);
-  if (_tao_environment.exception ()) return;
-  
-impl = (POA_RtecEventChannelAdmin::SupplierAdmin_ptr) _tao_object_reference->get_subclass ();
-  *retval = impl->obtain_push_consumer(_tao_environment);
-  
-result = new CORBA::Any (RtecEventChannelAdmin::_tc_ProxyPushConsumer, retval, 1); // ORB owns
-  _tao_server_request.result (result, _tao_environment);
-  
-}
-
-void POA_RtecEventChannelAdmin::SupplierAdmin::_is_a_skel (CORBA::ServerRequest &req, CORBA::Object_ptr /* obj */, CORBA::Environment &env)
-{
-  const CORBA::String type_id = "IDL:RtecEventChannelAdmin/SupplierAdmin:1.0"; // repository ID
-  CORBA::NVList_ptr nvlist;
-  CORBA::NamedValue_ptr nv;
-  CORBA::Any temp_value (CORBA::_tc_string);
-  CORBA::Any *any;
-  CORBA::Boolean *retval;
-  CORBA::String value;
-  
-  req.orb()->create_list (0, nvlist);
-  nv = nvlist->add_value (0, temp_value, CORBA::ARG_IN, env);
-  req.params (nvlist, env); // parse the args
-  if (env.exception () != 0) return;
-  value = *(CORBA::String *)nv->value ()->value ();
-  if (ACE_OS::strcmp ((char *)value, (char *)type_id) == 0
-    || ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (env)) == 0)
-
-  	retval = new CORBA::Boolean (CORBA::B_TRUE);
-  else
-  	retval = new CORBA::Boolean (CORBA::B_FALSE);
-  any = new CORBA::Any (CORBA::_tc_boolean, retval, CORBA::B_TRUE);
-  req.result (any, env);
-}
-
-static const TAO_operation_db_entry EventChannel_operations [] = {
-  {"for_consumers", &POA_RtecEventChannelAdmin::EventChannel::for_consumers_skel},
-  {"for_suppliers", &POA_RtecEventChannelAdmin::EventChannel::for_suppliers_skel},
-  {"destroy", &POA_RtecEventChannelAdmin::EventChannel::destroy_skel},
-  {"_is_a", &POA_RtecEventChannelAdmin::EventChannel::_is_a_skel}
-};
-
-TAO_Dynamic_Hash_OpTable tao_EventChannel_optable (EventChannel_operations, 4, 8);
-// skeleton constructor
-POA_RtecEventChannelAdmin::EventChannel::EventChannel (const char *obj_name)
-{
-  const CORBA::String repoID = "IDL:RtecEventChannelAdmin/EventChannel:1.0"; // repository ID
-  IIOP_Object *data; // Actual object reference
-  TAO_ORB_Core *ocp = TAO_ORB_Core_instance (); // underlying ORB core instance
-  CORBA::POA_ptr oa = TAO_ORB_Core_instance ()->root_poa (); // underlying OA
-  const ACE_INET_Addr &addr = ocp->orb_params ()->addr ();
-  this->optable_ = &tao_EventChannel_optable;
-  
-  // set up an IIOP object
-  data = new IIOP_Object (CORBA::string_dup (repoID), addr, obj_name);
-  this->set_parent (data); // store the IIOP obj ref with us
-  this->sub_ = this; // set the most derived type to be us
-  if (oa) oa->bind (data->profile.object_key, this); // register ourselves
-}
-
-void POA_RtecEventChannelAdmin::EventChannel::for_consumers_skel (CORBA::ServerRequest &_tao_server_request, CORBA::Object_ptr _tao_object_reference, CORBA::Environment &_tao_environment)
-{
-  CORBA::NVList_ptr 	 nvlist;
-  POA_RtecEventChannelAdmin::EventChannel_ptr 	 impl;
-  CORBA::Any *result;
-  CORBA::Object_ptr *retval = new CORBA::Object_ptr;
-  
-  // create an NV list and populate it with typecodes
-  _tao_server_request.orb ()->create_list (0, nvlist); // initialize a list
-  // add each argument according to the in, out, inout semantics
-  // parse the arguments
-  _tao_server_request.params (nvlist, _tao_environment);
-  if (_tao_environment.exception ()) return;
-  
-impl = (POA_RtecEventChannelAdmin::EventChannel_ptr) _tao_object_reference->get_subclass ();
-  *retval = impl->for_consumers(_tao_environment);
-  
-result = new CORBA::Any (RtecEventChannelAdmin::_tc_ConsumerAdmin, retval, 1); // ORB owns
-  _tao_server_request.result (result, _tao_environment);
-  
-}
-
-void POA_RtecEventChannelAdmin::EventChannel::for_suppliers_skel (CORBA::ServerRequest &_tao_server_request, CORBA::Object_ptr _tao_object_reference, CORBA::Environment &_tao_environment)
-{
-  CORBA::NVList_ptr 	 nvlist;
-  POA_RtecEventChannelAdmin::EventChannel_ptr 	 impl;
-  CORBA::Any *result;
-  CORBA::Object_ptr *retval = new CORBA::Object_ptr;
-  
-  // create an NV list and populate it with typecodes
-  _tao_server_request.orb ()->create_list (0, nvlist); // initialize a list
-  // add each argument according to the in, out, inout semantics
-  // parse the arguments
-  _tao_server_request.params (nvlist, _tao_environment);
-  if (_tao_environment.exception ()) return;
-  
-impl = (POA_RtecEventChannelAdmin::EventChannel_ptr) _tao_object_reference->get_subclass ();
-  *retval = impl->for_suppliers(_tao_environment);
-  
-result = new CORBA::Any (RtecEventChannelAdmin::_tc_SupplierAdmin, retval, 1); // ORB owns
-  _tao_server_request.result (result, _tao_environment);
-  
-}
-
-void POA_RtecEventChannelAdmin::EventChannel::destroy_skel (CORBA::ServerRequest &_tao_server_request, CORBA::Object_ptr _tao_object_reference, CORBA::Environment &_tao_environment)
-{
-  CORBA::NVList_ptr 	 nvlist;
-  POA_RtecEventChannelAdmin::EventChannel_ptr 	 impl;
-  
-  // create an NV list and populate it with typecodes
-  _tao_server_request.orb ()->create_list (0, nvlist); // initialize a list
-  // add each argument according to the in, out, inout semantics
-  // parse the arguments
-  _tao_server_request.params (nvlist, _tao_environment);
-  if (_tao_environment.exception ()) return;
-  
-impl = (POA_RtecEventChannelAdmin::EventChannel_ptr) _tao_object_reference->get_subclass ();
-  impl->destroy(_tao_environment);
-  
-
-}
-
-void POA_RtecEventChannelAdmin::EventChannel::_is_a_skel (CORBA::ServerRequest &req, CORBA::Object_ptr /* obj */, CORBA::Environment &env)
-{
-  const CORBA::String type_id = "IDL:RtecEventChannelAdmin/EventChannel:1.0"; // repository ID
-  CORBA::NVList_ptr nvlist;
-  CORBA::NamedValue_ptr nv;
-  CORBA::Any temp_value (CORBA::_tc_string);
-  CORBA::Any *any;
-  CORBA::Boolean *retval;
-  CORBA::String value;
-  
-  req.orb()->create_list (0, nvlist);
-  nv = nvlist->add_value (0, temp_value, CORBA::ARG_IN, env);
-  req.params (nvlist, env); // parse the args
-  if (env.exception () != 0) return;
-  value = *(CORBA::String *)nv->value ()->value ();
-  if (ACE_OS::strcmp ((char *)value, (char *)type_id) == 0
-    || ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (env)) == 0)
-
-  	retval = new CORBA::Boolean (CORBA::B_TRUE);
-  else
-  	retval = new CORBA::Boolean (CORBA::B_FALSE);
-  any = new CORBA::Any (CORBA::_tc_boolean, retval, CORBA::B_TRUE);
-  req.result (any, env);
-}
-
diff --git a/TAO/orbsvcs/lib/RtecEventChannelAdminS.h b/TAO/orbsvcs/lib/RtecEventChannelAdminS.h
deleted file mode 100644
index 304f643e912..00000000000
--- a/TAO/orbsvcs/lib/RtecEventChannelAdminS.h
+++ /dev/null
@@ -1,107 +0,0 @@
-// ******  Code generated by the The ACE ORB (TAO) IDL Compiler *******
-// TAO ORB and the TAO IDL Compiler have been developed by Washington 
-// University Computer Science's Distributed Object Computing Group.
-//
-// Information on TAO is available at
-//                 http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#if !defined (_TAO_IDL_RTECEVENTCHANNELADMINS_H_)
-#define _TAO_IDL_RTECEVENTCHANNELADMINS_H_
-
-#include "RtecEventCommS.h"
-#include "RtecSchedulerS.h"
-#include "RtecEventChannelAdminC.h"
-
-class POA_RtecEventChannelAdmin
-{
-public:
-  class ProxyPushConsumer;
-  typedef ProxyPushConsumer *ProxyPushConsumer_ptr;
-  class ProxyPushConsumer : public virtual RtecEventChannelAdmin::ProxyPushConsumer, public virtual POA_RtecEventComm::PushConsumer
-  {
-  protected:
-    ProxyPushConsumer (const char *obj_name = 0);
-    virtual ~ProxyPushConsumer (void);
-  public:
-    virtual void connect_push_supplier (RtecEventComm::PushSupplier_ptr push_supplier, const RtecEventChannelAdmin::SupplierQOS &qos,  CORBA::Environment &env) = 0; // pure virtual
-    static void connect_push_supplier_skel (CORBA::ServerRequest &req, CORBA::Object_ptr obj, CORBA::Environment &env);
-
-    static void _is_a_skel (CORBA::ServerRequest &req, CORBA::Object_ptr obj, CORBA::Environment &env);
-
-  };
-
-  class ProxyPushSupplier;
-  typedef ProxyPushSupplier *ProxyPushSupplier_ptr;
-  class ProxyPushSupplier : public virtual RtecEventChannelAdmin::ProxyPushSupplier, public virtual POA_RtecEventComm::PushSupplier
-  {
-  protected:
-    ProxyPushSupplier (const char *obj_name = 0);
-    virtual ~ProxyPushSupplier (void);
-  public:
-    virtual void connect_push_consumer (RtecEventComm::PushConsumer_ptr push_consumer, const RtecEventChannelAdmin::ConsumerQOS &qos,  CORBA::Environment &env) = 0; // pure virtual
-    static void connect_push_consumer_skel (CORBA::ServerRequest &req, CORBA::Object_ptr obj, CORBA::Environment &env);
-
-    static void _is_a_skel (CORBA::ServerRequest &req, CORBA::Object_ptr obj, CORBA::Environment &env);
-
-  };
-
-  class ConsumerAdmin;
-  typedef ConsumerAdmin *ConsumerAdmin_ptr;
-  class ConsumerAdmin : public virtual RtecEventChannelAdmin::ConsumerAdmin
-  {
-  protected:
-    ConsumerAdmin (const char *obj_name = 0);
-    virtual ~ConsumerAdmin (void);
-  public:
-    virtual RtecEventChannelAdmin::ProxyPushSupplier_ptr  obtain_push_supplier ( CORBA::Environment &env) = 0; // pure virtual
-    static void obtain_push_supplier_skel (CORBA::ServerRequest &req, CORBA::Object_ptr obj, CORBA::Environment &env);
-
-    static void _is_a_skel (CORBA::ServerRequest &req, CORBA::Object_ptr obj, CORBA::Environment &env);
-
-  };
-
-  class SupplierAdmin;
-  typedef SupplierAdmin *SupplierAdmin_ptr;
-  class SupplierAdmin : public virtual RtecEventChannelAdmin::SupplierAdmin
-  {
-  protected:
-    SupplierAdmin (const char *obj_name = 0);
-    virtual ~SupplierAdmin (void);
-  public:
-    virtual RtecEventChannelAdmin::ProxyPushConsumer_ptr  obtain_push_consumer ( CORBA::Environment &env) = 0; // pure virtual
-    static void obtain_push_consumer_skel (CORBA::ServerRequest &req, CORBA::Object_ptr obj, CORBA::Environment &env);
-
-    static void _is_a_skel (CORBA::ServerRequest &req, CORBA::Object_ptr obj, CORBA::Environment &env);
-
-  };
-
-  class EventChannel;
-  typedef EventChannel *EventChannel_ptr;
-  class EventChannel : public virtual RtecEventChannelAdmin::EventChannel
-  {
-  protected:
-    EventChannel (const char *obj_name = 0);
-    virtual ~EventChannel (void);
-  public:
-    virtual RtecEventChannelAdmin::ConsumerAdmin_ptr  for_consumers ( CORBA::Environment &env) = 0; // pure virtual
-    static void for_consumers_skel (CORBA::ServerRequest &req, CORBA::Object_ptr obj, CORBA::Environment &env);
-
-    virtual RtecEventChannelAdmin::SupplierAdmin_ptr  for_suppliers ( CORBA::Environment &env) = 0; // pure virtual
-    static void for_suppliers_skel (CORBA::ServerRequest &req, CORBA::Object_ptr obj, CORBA::Environment &env);
-
-    virtual void destroy ( CORBA::Environment &env) = 0; // pure virtual
-    static void destroy_skel (CORBA::ServerRequest &req, CORBA::Object_ptr obj, CORBA::Environment &env);
-
-    static void _is_a_skel (CORBA::ServerRequest &req, CORBA::Object_ptr obj, CORBA::Environment &env);
-
-  };
-
-};
-
-
-#if defined (__ACE_INLINE__)
-#include "RtecEventChannelAdminS.i"
-#endif // defined INLINE
-
-
-#endif // if !defined
diff --git a/TAO/orbsvcs/lib/RtecEventChannelAdminS.i b/TAO/orbsvcs/lib/RtecEventChannelAdminS.i
deleted file mode 100644
index 0ac13183194..00000000000
--- a/TAO/orbsvcs/lib/RtecEventChannelAdminS.i
+++ /dev/null
@@ -1,32 +0,0 @@
-// ******  Code generated by the The ACE ORB (TAO) IDL Compiler *******
-// TAO ORB and the TAO IDL Compiler have been developed by Washington 
-// University Computer Science's Distributed Object Computing Group.
-//
-// Information on TAO is available at
-//                 http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// skeleton destructor
-ACE_INLINE
-POA_RtecEventChannelAdmin::ProxyPushConsumer::~ProxyPushConsumer (void)
-{
-}
-// skeleton destructor
-ACE_INLINE
-POA_RtecEventChannelAdmin::ProxyPushSupplier::~ProxyPushSupplier (void)
-{
-}
-// skeleton destructor
-ACE_INLINE
-POA_RtecEventChannelAdmin::ConsumerAdmin::~ConsumerAdmin (void)
-{
-}
-// skeleton destructor
-ACE_INLINE
-POA_RtecEventChannelAdmin::SupplierAdmin::~SupplierAdmin (void)
-{
-}
-// skeleton destructor
-ACE_INLINE
-POA_RtecEventChannelAdmin::EventChannel::~EventChannel (void)
-{
-}
diff --git a/TAO/orbsvcs/lib/RtecEventComm.idl b/TAO/orbsvcs/lib/RtecEventComm.idl
deleted file mode 100644
index 3ce98797ae8..00000000000
--- a/TAO/orbsvcs/lib/RtecEventComm.idl
+++ /dev/null
@@ -1,45 +0,0 @@
-//
-// $Id$
-//
-
-module RtecEventComm {
-  exception Disconnected {};
-
-#if 0
-  union EventData switch(short) {
-  case 1: double dval;
-  case 2: string sval;
-  case 3: sequence<octet> bval;
-  default: long lval;
-  };
-#else
-  struct EventData {
-    long x;
-    long y;
-  };
-#endif
-
-  typedef long EventSourceID;
-  // TODO: Use CosTimeService?
-  typedef long Time;
-  typedef long EventType;
-  struct Event {
-    EventSourceID source_;
-    EventType type_;
-    Time time_;
-    EventData data_;
-  };
-  typedef sequence<Event> EventSet;
-
-  interface PushConsumer {
-    oneway void push (in EventSet data); //  raises(Disconnected);
-    oneway void disconnect_push_consumer(); 
-  };
-
-  interface PushSupplier {
-    oneway void disconnect_push_supplier();
-  };
-
-};
-
-
diff --git a/TAO/orbsvcs/lib/RtecEventCommC.cpp b/TAO/orbsvcs/lib/RtecEventCommC.cpp
deleted file mode 100644
index dbcac3ed93b..00000000000
--- a/TAO/orbsvcs/lib/RtecEventCommC.cpp
+++ /dev/null
@@ -1,473 +0,0 @@
-// ******  Code generated by the The ACE ORB (TAO) IDL Compiler *******
-// TAO ORB and the TAO IDL Compiler have been developed by Washington 
-// University Computer Science's Distributed Object Computing Group.
-//
-// Information on TAO is available at
-//                 http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#include "RtecEventCommC.h"
-
-#if !defined (__ACE_INLINE__)
-#include "RtecEventCommC.i"
-#endif // !defined INLINE
-
-static const CORBA::Long _oc_RtecEventComm_Disconnected[] =
-{
-  0, // byte order
-  35, 0x49444c3a, 0x52746563, 0x4576656e, 0x74436f6d, 0x6d2f4469, 0x73636f6e, 0x6e656374, 0x65643a31, 0x2e300000,  // repository ID = IDL:RtecEventComm/Disconnected:1.0
-  13, 0x44697363, 0x6f6e6e65, 0x63746564, 0x0,  // name = Disconnected
-  0, // member count
-};
-static CORBA::TypeCode _tc__tc_RtecEventComm_Disconnected (CORBA::tk_struct, sizeof (_oc_RtecEventComm_Disconnected), (unsigned char *) &_oc_RtecEventComm_Disconnected, CORBA::B_FALSE);
-CORBA::TypeCode_ptr RtecEventComm::_tc_Disconnected = &_tc__tc_RtecEventComm_Disconnected;
-
-static const CORBA::Long _oc_RtecEventComm_EventData[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  32, 0x49444c3a, 0x52746563, 0x4576656e, 0x74436f6d, 0x6d2f4576, 0x656e7444, 0x6174613a, 0x312e3000,  // repository ID = IDL:RtecEventComm/EventData:1.0
-  10, 0x4576656e, 0x74446174, 0x61000000,  // name = EventData
-  2, // member count
-    2, 0x78000000,  // name = x
-    CORBA::tk_long,
-
-    2, 0x79000000,  // name = y
-    CORBA::tk_long,
-
-};
-static CORBA::TypeCode _tc__tc_RtecEventComm_EventData (CORBA::tk_struct, sizeof (_oc_RtecEventComm_EventData), (unsigned char *) &_oc_RtecEventComm_EventData, CORBA::B_FALSE);
-CORBA::TypeCode_ptr RtecEventComm::_tc_EventData = &_tc__tc_RtecEventComm_EventData;
-
-static const CORBA::Long _oc_RtecEventComm_EventSourceID[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  36, 0x49444c3a, 0x52746563, 0x4576656e, 0x74436f6d, 0x6d2f4576, 0x656e7453, 0x6f757263, 0x6549443a, 0x312e3000,  // repository ID = IDL:RtecEventComm/EventSourceID:1.0
-  14, 0x4576656e, 0x74536f75, 0x72636549, 0x44000000,  // name = EventSourceID
-  CORBA::tk_long,
-
-};
-static CORBA::TypeCode _tc__tc_RtecEventComm_EventSourceID (CORBA::tk_alias, sizeof (_oc_RtecEventComm_EventSourceID), (unsigned char *) &_oc_RtecEventComm_EventSourceID, CORBA::B_FALSE);
-CORBA::TypeCode_ptr RtecEventComm::_tc_EventSourceID = &_tc__tc_RtecEventComm_EventSourceID;
-
-static const CORBA::Long _oc_RtecEventComm_Time[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  27, 0x49444c3a, 0x52746563, 0x4576656e, 0x74436f6d, 0x6d2f5469, 0x6d653a31, 0x2e300000,  // repository ID = IDL:RtecEventComm/Time:1.0
-  5, 0x54696d65, 0x0,  // name = Time
-  CORBA::tk_long,
-
-};
-static CORBA::TypeCode _tc__tc_RtecEventComm_Time (CORBA::tk_alias, sizeof (_oc_RtecEventComm_Time), (unsigned char *) &_oc_RtecEventComm_Time, CORBA::B_FALSE);
-CORBA::TypeCode_ptr RtecEventComm::_tc_Time = &_tc__tc_RtecEventComm_Time;
-
-static const CORBA::Long _oc_RtecEventComm_EventType[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  32, 0x49444c3a, 0x52746563, 0x4576656e, 0x74436f6d, 0x6d2f4576, 0x656e7454, 0x7970653a, 0x312e3000,  // repository ID = IDL:RtecEventComm/EventType:1.0
-  10, 0x4576656e, 0x74547970, 0x65000000,  // name = EventType
-  CORBA::tk_long,
-
-};
-static CORBA::TypeCode _tc__tc_RtecEventComm_EventType (CORBA::tk_alias, sizeof (_oc_RtecEventComm_EventType), (unsigned char *) &_oc_RtecEventComm_EventType, CORBA::B_FALSE);
-CORBA::TypeCode_ptr RtecEventComm::_tc_EventType = &_tc__tc_RtecEventComm_EventType;
-
-static const CORBA::Long _oc_RtecEventComm_Event[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  28, 0x49444c3a, 0x52746563, 0x4576656e, 0x74436f6d, 0x6d2f4576, 0x656e743a, 0x312e3000,  // repository ID = IDL:RtecEventComm/Event:1.0
-  6, 0x4576656e, 0x74000000,  // name = Event
-  4, // member count
-    8, 0x736f7572, 0x63655f00,  // name = source_
-    CORBA::tk_alias, // typecode kind for typedefs
-    68, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      36, 0x49444c3a, 0x52746563, 0x4576656e, 0x74436f6d, 0x6d2f4576, 0x656e7453, 0x6f757263, 0x6549443a, 0x312e3000,  // repository ID = IDL:RtecEventComm/EventSourceID:1.0
-      14, 0x4576656e, 0x74536f75, 0x72636549, 0x44000000,  // name = EventSourceID
-      CORBA::tk_long,
-
-    6, 0x74797065, 0x5f000000,  // name = type_
-    CORBA::tk_alias, // typecode kind for typedefs
-    60, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      32, 0x49444c3a, 0x52746563, 0x4576656e, 0x74436f6d, 0x6d2f4576, 0x656e7454, 0x7970653a, 0x312e3000,  // repository ID = IDL:RtecEventComm/EventType:1.0
-      10, 0x4576656e, 0x74547970, 0x65000000,  // name = EventType
-      CORBA::tk_long,
-
-    6, 0x74696d65, 0x5f000000,  // name = time_
-    CORBA::tk_alias, // typecode kind for typedefs
-    52, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      27, 0x49444c3a, 0x52746563, 0x4576656e, 0x74436f6d, 0x6d2f5469, 0x6d653a31, 0x2e300000,  // repository ID = IDL:RtecEventComm/Time:1.0
-      5, 0x54696d65, 0x0,  // name = Time
-      CORBA::tk_long,
-
-    6, 0x64617461, 0x5f000000,  // name = data_
-    CORBA::tk_struct, // typecode kind
-    84, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      32, 0x49444c3a, 0x52746563, 0x4576656e, 0x74436f6d, 0x6d2f4576, 0x656e7444, 0x6174613a, 0x312e3000,  // repository ID = IDL:RtecEventComm/EventData:1.0
-      10, 0x4576656e, 0x74446174, 0x61000000,  // name = EventData
-      2, // member count
-        2, 0x78000000,  // name = x
-        CORBA::tk_long,
-
-        2, 0x79000000,  // name = y
-        CORBA::tk_long,
-
-    };
-static CORBA::TypeCode _tc__tc_RtecEventComm_Event (CORBA::tk_struct, sizeof (_oc_RtecEventComm_Event), (unsigned char *) &_oc_RtecEventComm_Event, CORBA::B_FALSE);
-CORBA::TypeCode_ptr RtecEventComm::_tc_Event = &_tc__tc_RtecEventComm_Event;
-
-// *************************************************************
-// class RtecEventComm::_tao__seq_EventSet
-// *************************************************************
-
-// copy constructor
-RtecEventComm::_tao__seq_EventSet::_tao__seq_EventSet (const RtecEventComm::_tao__seq_EventSet &seq)
-	: maximum_ (seq.maximum_),
-	  length_ (seq.length_),
-	  buffer_ (RtecEventComm::_tao__seq_EventSet::allocbuf (seq.maximum_)),
-	  release_ (1) // we always own it
-{
-  for (CORBA::ULong i=0; i < seq.length_; i++)
-  	this->buffer_[i] = seq.buffer_[i];
-}
-
-// destructor
-RtecEventComm::_tao__seq_EventSet::~_tao__seq_EventSet (void)
-{
-  if (this->release_) // we own the buffer
-  {
-    RtecEventComm::_tao__seq_EventSet::freebuf (this->buffer_);
-  }
-}
-
-// assignment operator
-RtecEventComm::_tao__seq_EventSet& 
-RtecEventComm::_tao__seq_EventSet::operator= (const RtecEventComm::_tao__seq_EventSet &seq)
-{
-  if (this == &seq) return *this;
-  if (this->release_)
-  {
-    RtecEventComm::_tao__seq_EventSet::freebuf (this->buffer_);
-  }
-  this->length_ = seq.length_;
-  this->maximum_ = seq.maximum_;
-  this->buffer_ = RtecEventComm::_tao__seq_EventSet::allocbuf (seq.maximum_),
-  this->release_ =1; // we always own it
-  for (CORBA::ULong i=0; i < seq.length_; i++)
-  	this->buffer_[i] = seq.buffer_[i];
-  return *this;
-}
-
-void
-RtecEventComm::_tao__seq_EventSet::length (CORBA::ULong length)
-{
-  if (length > this->maximum_)
-  {
-    RtecEventComm::Event *tmp = RtecEventComm::_tao__seq_EventSet::allocbuf (length);
-    if (tmp == 0)
-      return;
-    for (int i = 0; i < this->length_; ++i)
-    {
-      tmp[i] = this->buffer_[i];
-    }
-    if (this->release_)
-      RtecEventComm::_tao__seq_EventSet::freebuf (this->buffer_);
-    this->buffer_ = tmp;
-    this->release_ = 1;
-    this->maximum_ = length;
-  }
-this->length_ = length;
-}
-
-static const CORBA::Long _oc_RtecEventComm__tao__seq_EventSet[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_struct, // typecode kind
-  396, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    28, 0x49444c3a, 0x52746563, 0x4576656e, 0x74436f6d, 0x6d2f4576, 0x656e743a, 0x312e3000,  // repository ID = IDL:RtecEventComm/Event:1.0
-    6, 0x4576656e, 0x74000000,  // name = Event
-    4, // member count
-      8, 0x736f7572, 0x63655f00,  // name = source_
-      CORBA::tk_alias, // typecode kind for typedefs
-      68, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        36, 0x49444c3a, 0x52746563, 0x4576656e, 0x74436f6d, 0x6d2f4576, 0x656e7453, 0x6f757263, 0x6549443a, 0x312e3000,  // repository ID = IDL:RtecEventComm/EventSourceID:1.0
-        14, 0x4576656e, 0x74536f75, 0x72636549, 0x44000000,  // name = EventSourceID
-        CORBA::tk_long,
-
-      6, 0x74797065, 0x5f000000,  // name = type_
-      CORBA::tk_alias, // typecode kind for typedefs
-      60, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        32, 0x49444c3a, 0x52746563, 0x4576656e, 0x74436f6d, 0x6d2f4576, 0x656e7454, 0x7970653a, 0x312e3000,  // repository ID = IDL:RtecEventComm/EventType:1.0
-        10, 0x4576656e, 0x74547970, 0x65000000,  // name = EventType
-        CORBA::tk_long,
-
-      6, 0x74696d65, 0x5f000000,  // name = time_
-      CORBA::tk_alias, // typecode kind for typedefs
-      52, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        27, 0x49444c3a, 0x52746563, 0x4576656e, 0x74436f6d, 0x6d2f5469, 0x6d653a31, 0x2e300000,  // repository ID = IDL:RtecEventComm/Time:1.0
-        5, 0x54696d65, 0x0,  // name = Time
-        CORBA::tk_long,
-
-      6, 0x64617461, 0x5f000000,  // name = data_
-      CORBA::tk_struct, // typecode kind
-      84, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        32, 0x49444c3a, 0x52746563, 0x4576656e, 0x74436f6d, 0x6d2f4576, 0x656e7444, 0x6174613a, 0x312e3000,  // repository ID = IDL:RtecEventComm/EventData:1.0
-        10, 0x4576656e, 0x74446174, 0x61000000,  // name = EventData
-        2, // member count
-          2, 0x78000000,  // name = x
-          CORBA::tk_long,
-
-          2, 0x79000000,  // name = y
-          CORBA::tk_long,
-
-          0,
-};
-static CORBA::TypeCode _tc__tc_RtecEventComm__tao__seq_EventSet (CORBA::tk_sequence, sizeof (_oc_RtecEventComm__tao__seq_EventSet), (unsigned char *) &_oc_RtecEventComm__tao__seq_EventSet, CORBA::B_FALSE);
-CORBA::TypeCode_ptr RtecEventComm::_tc__tao__seq_EventSet = &_tc__tc_RtecEventComm__tao__seq_EventSet;
-
-static const CORBA::Long _oc_RtecEventComm_EventSet[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  31, 0x49444c3a, 0x52746563, 0x4576656e, 0x74436f6d, 0x6d2f4576, 0x656e7453, 0x65743a31, 0x2e300000,  // repository ID = IDL:RtecEventComm/EventSet:1.0
-  9, 0x4576656e, 0x74536574, 0x0,  // name = EventSet
-  CORBA::tk_sequence, // typecode kind
-  420, // encapsulation length
-  TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_struct, // typecode kind
-  396, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    28, 0x49444c3a, 0x52746563, 0x4576656e, 0x74436f6d, 0x6d2f4576, 0x656e743a, 0x312e3000,  // repository ID = IDL:RtecEventComm/Event:1.0
-    6, 0x4576656e, 0x74000000,  // name = Event
-    4, // member count
-      8, 0x736f7572, 0x63655f00,  // name = source_
-      CORBA::tk_alias, // typecode kind for typedefs
-      68, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        36, 0x49444c3a, 0x52746563, 0x4576656e, 0x74436f6d, 0x6d2f4576, 0x656e7453, 0x6f757263, 0x6549443a, 0x312e3000,  // repository ID = IDL:RtecEventComm/EventSourceID:1.0
-        14, 0x4576656e, 0x74536f75, 0x72636549, 0x44000000,  // name = EventSourceID
-        CORBA::tk_long,
-
-      6, 0x74797065, 0x5f000000,  // name = type_
-      CORBA::tk_alias, // typecode kind for typedefs
-      60, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        32, 0x49444c3a, 0x52746563, 0x4576656e, 0x74436f6d, 0x6d2f4576, 0x656e7454, 0x7970653a, 0x312e3000,  // repository ID = IDL:RtecEventComm/EventType:1.0
-        10, 0x4576656e, 0x74547970, 0x65000000,  // name = EventType
-        CORBA::tk_long,
-
-      6, 0x74696d65, 0x5f000000,  // name = time_
-      CORBA::tk_alias, // typecode kind for typedefs
-      52, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        27, 0x49444c3a, 0x52746563, 0x4576656e, 0x74436f6d, 0x6d2f5469, 0x6d653a31, 0x2e300000,  // repository ID = IDL:RtecEventComm/Time:1.0
-        5, 0x54696d65, 0x0,  // name = Time
-        CORBA::tk_long,
-
-      6, 0x64617461, 0x5f000000,  // name = data_
-      CORBA::tk_struct, // typecode kind
-      84, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        32, 0x49444c3a, 0x52746563, 0x4576656e, 0x74436f6d, 0x6d2f4576, 0x656e7444, 0x6174613a, 0x312e3000,  // repository ID = IDL:RtecEventComm/EventData:1.0
-        10, 0x4576656e, 0x74446174, 0x61000000,  // name = EventData
-        2, // member count
-          2, 0x78000000,  // name = x
-          CORBA::tk_long,
-
-          2, 0x79000000,  // name = y
-          CORBA::tk_long,
-
-          0,
-};
-static CORBA::TypeCode _tc__tc_RtecEventComm_EventSet (CORBA::tk_alias, sizeof (_oc_RtecEventComm_EventSet), (unsigned char *) &_oc_RtecEventComm_EventSet, CORBA::B_FALSE);
-CORBA::TypeCode_ptr RtecEventComm::_tc_EventSet = &_tc__tc_RtecEventComm_EventSet;
-
-RtecEventComm::PushConsumer_ptr RtecEventComm::PushConsumer::_duplicate (RtecEventComm::PushConsumer_ptr obj)
-{
-  if (!CORBA::is_nil (obj))
-    obj->AddRef ();
-  
-  return obj;
-} // end of _duplicate
-
-RtecEventComm::PushConsumer_ptr RtecEventComm::PushConsumer::_narrow (CORBA::Object_ptr obj, CORBA::Environment &env)
-{
-  if (CORBA::is_nil (obj)) return RtecEventComm::PushConsumer::_nil ();
-  if (obj->_is_a ("IDL:RtecEventComm/PushConsumer:1.0", env))
-  {
-    STUB_Object *istub;
-    RtecEventComm::PushConsumer_ptr new_obj; // to be returned 
-    if (obj->QueryInterface (IID_STUB_Object, (void **)&istub) != NOERROR)
-      return RtecEventComm::PushConsumer::_nil ();
-    
-    obj->Release (); // need this since QueryIntf bumped our refcount
-    new_obj = new RtecEventComm::PushConsumer (istub); // construct obj ref using the stub object
-    return new_obj;
-  } // end of if
-  return RtecEventComm::PushConsumer::_nil (); // _narrow failed
-} // end of _narrow
-
-RtecEventComm::PushConsumer_ptr RtecEventComm::PushConsumer::_nil (void)
-{
-  return (RtecEventComm::PushConsumer_ptr)NULL;
-} // end of _nil
-
-RtecEventComm::PushConsumer_ptr RtecEventComm::PushConsumer::_bind (const char *host, CORBA::UShort port, const char *key, CORBA::Environment &env)
-{
-  CORBA::Object_ptr objref = CORBA::Object::_nil ();
-  IIOP_Object *data = new IIOP_Object (host, port, key);
-  if (!data) return RtecEventComm::PushConsumer::_nil ();
-  // get the object_ptr using Query Interface
-  if (data->QueryInterface (IID_CORBA_Object, (void **)&objref) != NOERROR)
-  {
-  	env.exception (new CORBA::DATA_CONVERSION (CORBA::COMPLETED_NO));
-  	return RtecEventComm::PushConsumer::_nil ();
-  }
-  data->Release (); // QueryInterface had bumped up our count
-  if (CORBA::is_nil (objref))
-  	return RtecEventComm::PushConsumer::_nil ();
-  else // narrow it
-  	return RtecEventComm::PushConsumer::_narrow (objref, env);
-}
-
-static const TAO_Param_Data RtecEventComm_PushConsumer_push_paramdata [] = 
-{
-  {CORBA::_tc_void, PARAM_RETURN, 0},
-  {RtecEventComm::_tc_EventSet, PARAM_IN, 0}
-};
-
-static const TAO_Call_Data RtecEventComm_PushConsumer_push_calldata = 
-{"push", 0, 2, RtecEventComm_PushConsumer_push_paramdata, 0, 0};
-
-void  RtecEventComm::PushConsumer::push (const RtecEventComm::EventSet &data, CORBA::Environment &env)
-{
-  STUB_Object *istub;
-
-  if (this->QueryInterface (IID_STUB_Object, (void **)&istub) != NOERROR)
-  {
-    env.exception (new CORBA::DATA_CONVERSION (CORBA::COMPLETED_NO));
-    return;
-  }
-  this->Release (); // QueryInterface has bumped up our refcount
-  istub->do_call (env, &RtecEventComm_PushConsumer_push_calldata, 0, &data);
-  return; // no value
-  
-}
-
-static const TAO_Param_Data RtecEventComm_PushConsumer_disconnect_push_consumer_paramdata [] = 
-{
-  {CORBA::_tc_void, PARAM_RETURN, 0}
-};
-
-static const TAO_Call_Data RtecEventComm_PushConsumer_disconnect_push_consumer_calldata = 
-{"disconnect_push_consumer", 0, 1, RtecEventComm_PushConsumer_disconnect_push_consumer_paramdata, 0, 0};
-
-void  RtecEventComm::PushConsumer::disconnect_push_consumer (CORBA::Environment &env)
-{
-  STUB_Object *istub;
-
-  if (this->QueryInterface (IID_STUB_Object, (void **)&istub) != NOERROR)
-  {
-    env.exception (new CORBA::DATA_CONVERSION (CORBA::COMPLETED_NO));
-    return;
-  }
-  this->Release (); // QueryInterface has bumped up our refcount
-  istub->do_call (env, &RtecEventComm_PushConsumer_disconnect_push_consumer_calldata, 0);
-  return; // no value
-  
-}
-
-static const CORBA::Long _oc_RtecEventComm_PushConsumer[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  35, 0x49444c3a, 0x52746563, 0x4576656e, 0x74436f6d, 0x6d2f5075, 0x7368436f, 0x6e73756d, 0x65723a31, 0x2e300000,  // repository ID = IDL:RtecEventComm/PushConsumer:1.0
-  13, 0x50757368, 0x436f6e73, 0x756d6572, 0x0,  // name = PushConsumer,
-};
-static CORBA::TypeCode _tc__tc_RtecEventComm_PushConsumer (CORBA::tk_objref, sizeof (_oc_RtecEventComm_PushConsumer), (unsigned char *) &_oc_RtecEventComm_PushConsumer, CORBA::B_FALSE);
-CORBA::TypeCode_ptr RtecEventComm::_tc_PushConsumer = &_tc__tc_RtecEventComm_PushConsumer;
-
-RtecEventComm::PushSupplier_ptr RtecEventComm::PushSupplier::_duplicate (RtecEventComm::PushSupplier_ptr obj)
-{
-  if (!CORBA::is_nil (obj))
-    obj->AddRef ();
-  
-  return obj;
-} // end of _duplicate
-
-RtecEventComm::PushSupplier_ptr RtecEventComm::PushSupplier::_narrow (CORBA::Object_ptr obj, CORBA::Environment &env)
-{
-  if (CORBA::is_nil (obj)) return RtecEventComm::PushSupplier::_nil ();
-  if (obj->_is_a ("IDL:RtecEventComm/PushSupplier:1.0", env))
-  {
-    STUB_Object *istub;
-    RtecEventComm::PushSupplier_ptr new_obj; // to be returned 
-    if (obj->QueryInterface (IID_STUB_Object, (void **)&istub) != NOERROR)
-      return RtecEventComm::PushSupplier::_nil ();
-    
-    obj->Release (); // need this since QueryIntf bumped our refcount
-    new_obj = new RtecEventComm::PushSupplier (istub); // construct obj ref using the stub object
-    return new_obj;
-  } // end of if
-  return RtecEventComm::PushSupplier::_nil (); // _narrow failed
-} // end of _narrow
-
-RtecEventComm::PushSupplier_ptr RtecEventComm::PushSupplier::_nil (void)
-{
-  return (RtecEventComm::PushSupplier_ptr)NULL;
-} // end of _nil
-
-RtecEventComm::PushSupplier_ptr RtecEventComm::PushSupplier::_bind (const char *host, CORBA::UShort port, const char *key, CORBA::Environment &env)
-{
-  CORBA::Object_ptr objref = CORBA::Object::_nil ();
-  IIOP_Object *data = new IIOP_Object (host, port, key);
-  if (!data) return RtecEventComm::PushSupplier::_nil ();
-  // get the object_ptr using Query Interface
-  if (data->QueryInterface (IID_CORBA_Object, (void **)&objref) != NOERROR)
-  {
-  	env.exception (new CORBA::DATA_CONVERSION (CORBA::COMPLETED_NO));
-  	return RtecEventComm::PushSupplier::_nil ();
-  }
-  data->Release (); // QueryInterface had bumped up our count
-  if (CORBA::is_nil (objref))
-  	return RtecEventComm::PushSupplier::_nil ();
-  else // narrow it
-  	return RtecEventComm::PushSupplier::_narrow (objref, env);
-}
-
-static const TAO_Param_Data RtecEventComm_PushSupplier_disconnect_push_supplier_paramdata [] = 
-{
-  {CORBA::_tc_void, PARAM_RETURN, 0}
-};
-
-static const TAO_Call_Data RtecEventComm_PushSupplier_disconnect_push_supplier_calldata = 
-{"disconnect_push_supplier", 0, 1, RtecEventComm_PushSupplier_disconnect_push_supplier_paramdata, 0, 0};
-
-void  RtecEventComm::PushSupplier::disconnect_push_supplier (CORBA::Environment &env)
-{
-  STUB_Object *istub;
-
-  if (this->QueryInterface (IID_STUB_Object, (void **)&istub) != NOERROR)
-  {
-    env.exception (new CORBA::DATA_CONVERSION (CORBA::COMPLETED_NO));
-    return;
-  }
-  this->Release (); // QueryInterface has bumped up our refcount
-  istub->do_call (env, &RtecEventComm_PushSupplier_disconnect_push_supplier_calldata, 0);
-  return; // no value
-  
-}
-
-static const CORBA::Long _oc_RtecEventComm_PushSupplier[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  35, 0x49444c3a, 0x52746563, 0x4576656e, 0x74436f6d, 0x6d2f5075, 0x73685375, 0x70706c69, 0x65723a31, 0x2e300000,  // repository ID = IDL:RtecEventComm/PushSupplier:1.0
-  13, 0x50757368, 0x53757070, 0x6c696572, 0x0,  // name = PushSupplier,
-};
-static CORBA::TypeCode _tc__tc_RtecEventComm_PushSupplier (CORBA::tk_objref, sizeof (_oc_RtecEventComm_PushSupplier), (unsigned char *) &_oc_RtecEventComm_PushSupplier, CORBA::B_FALSE);
-CORBA::TypeCode_ptr RtecEventComm::_tc_PushSupplier = &_tc__tc_RtecEventComm_PushSupplier;
-
diff --git a/TAO/orbsvcs/lib/RtecEventCommC.h b/TAO/orbsvcs/lib/RtecEventCommC.h
deleted file mode 100644
index 99f5e65bd8d..00000000000
--- a/TAO/orbsvcs/lib/RtecEventCommC.h
+++ /dev/null
@@ -1,436 +0,0 @@
-// ******  Code generated by the The ACE ORB (TAO) IDL Compiler *******
-// TAO ORB and the TAO IDL Compiler have been developed by Washington 
-// University Computer Science's Distributed Object Computing Group.
-//
-// Information on TAO is available at
-//                 http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#if !defined (_TAO_IDL_RTECEVENTCOMMC_H_)
-#define _TAO_IDL_RTECEVENTCOMMC_H_
-
-#include "tao/corba.h"
-
-class RtecEventComm{
-public:
-  
-#if !defined (_RTECEVENTCOMM_DISCONNECTED___PTR_CH_)
-#define _RTECEVENTCOMM_DISCONNECTED___PTR_CH_
-
-  class Disconnected;
-  typedef Disconnected *Disconnected_ptr;
-  
-#endif // end #if !defined
-
-
-#if !defined (_RTECEVENTCOMM_DISCONNECTED_CH_)
-#define _RTECEVENTCOMM_DISCONNECTED_CH_
-
-  class Disconnected : public virtual CORBA::UserException
-  {
-  public:
-      Disconnected (void);
-  };
-  
-  
-#endif // end #if !defined
-
-static CORBA::TypeCode_ptr _tc_Disconnected;
-
-  struct EventData
-  {
-    CORBA::Long x;
-
-    CORBA::Long y;
-
-  };
-
-  class EventData_var
-  {
-  public:
-    EventData_var (void); // default constructor
-    EventData_var (EventData *);
-    EventData_var (const EventData_var &); // copy constructor
-    ~EventData_var (void); // destructor
-    
-    EventData_var &operator= (EventData *);
-    EventData_var &operator= (const EventData_var &);
-    EventData *operator-> (void);
-    const EventData *operator-> (void) const;
-    
-    operator const EventData &() const;
-    operator EventData &();
-    operator EventData &() const;
-    // in, inout, out, _retn 
-    const EventData &in (void) const;
-    EventData &inout (void);
-    EventData &out (void);
-    EventData _retn (void);
-    EventData *ptr(void) const;
-
-  private:
-    EventData *ptr_;
-  };
-
-  typedef EventData &EventData_out;
-
-  static CORBA::TypeCode_ptr _tc_EventData;
-
-  typedef CORBA::Long EventSourceID;typedef CORBA::Long_out EventSourceID_out;
-
-  static CORBA::TypeCode_ptr _tc_EventSourceID;
-
-  typedef CORBA::Long Time;typedef CORBA::Long_out Time_out;
-
-  static CORBA::TypeCode_ptr _tc_Time;
-
-  typedef CORBA::Long EventType;typedef CORBA::Long_out EventType_out;
-
-  static CORBA::TypeCode_ptr _tc_EventType;
-
-  struct Event
-  {
-    ACE_NESTED_CLASS (RtecEventComm,EventSourceID) source_;
-
-    ACE_NESTED_CLASS (RtecEventComm,EventType) type_;
-
-    ACE_NESTED_CLASS (RtecEventComm,Time) time_;
-
-    ACE_NESTED_CLASS (RtecEventComm,EventData) data_;
-
-  };
-
-  class Event_var
-  {
-  public:
-    Event_var (void); // default constructor
-    Event_var (Event *);
-    Event_var (const Event_var &); // copy constructor
-    ~Event_var (void); // destructor
-    
-    Event_var &operator= (Event *);
-    Event_var &operator= (const Event_var &);
-    Event *operator-> (void);
-    const Event *operator-> (void) const;
-    
-    operator const Event &() const;
-    operator Event &();
-    operator Event &() const;
-    // in, inout, out, _retn 
-    const Event &in (void) const;
-    Event &inout (void);
-    Event &out (void);
-    Event _retn (void);
-    Event *ptr(void) const;
-
-  private:
-    Event *ptr_;
-  };
-
-  typedef Event &Event_out;
-
-  static CORBA::TypeCode_ptr _tc_Event;
-
-
-#if !defined (_RTECEVENTCOMM__TAO__SEQ_EVENTSET_CH_)
-#define _RTECEVENTCOMM__TAO__SEQ_EVENTSET_CH_
-
-  // *************************************************************
-  // class _tao__seq_EventSet
-  // *************************************************************
-  
-  class _tao__seq_EventSet
-  {
-  public:
-    _tao__seq_EventSet (void); // default constructor
-    _tao__seq_EventSet (CORBA::ULong max);
-    _tao__seq_EventSet (CORBA::ULong max, CORBA::ULong length, 
-    	ACE_NESTED_CLASS (RtecEventComm,Event) *value, CORBA::Boolean release=CORBA::B_FALSE);
-    _tao__seq_EventSet(const _tao__seq_EventSet &); // copy constructor
-    ~_tao__seq_EventSet (void);
-    _tao__seq_EventSet &operator= (const _tao__seq_EventSet &);
-    CORBA::ULong maximum (void) const;
-    void length (CORBA::ULong);
-    CORBA::ULong length (void) const;
-    ACE_NESTED_CLASS (RtecEventComm,Event) &operator[] (CORBA::ULong index);
-    const ACE_NESTED_CLASS (RtecEventComm,Event) &operator[] (CORBA::ULong index) const;
-    static ACE_NESTED_CLASS (RtecEventComm,Event) *allocbuf (CORBA::ULong nelems);
-    static void freebuf (ACE_NESTED_CLASS (RtecEventComm,Event) *);
-  private:
-    CORBA::ULong maximum_;
-    CORBA::ULong length_;
-    ACE_NESTED_CLASS (RtecEventComm,Event) *buffer_;
-    CORBA::Boolean release_;
-  };
-  typedef _tao__seq_EventSet* _tao__seq_EventSet_ptr;
-  static CORBA::TypeCode_ptr _tc__tao__seq_EventSet;
-
-
-#endif // end #if !defined
-
-
-#if !defined (_RTECEVENTCOMM__TAO__SEQ_EVENTSET___VAR_CH_)
-#define _RTECEVENTCOMM__TAO__SEQ_EVENTSET___VAR_CH_
-
-// *************************************************************
-  // class RtecEventComm::_tao__seq_EventSet_var
-  // *************************************************************
-
-  class _tao__seq_EventSet_var
-  {
-  public:
-    _tao__seq_EventSet_var (void); // default constructor
-    _tao__seq_EventSet_var (_tao__seq_EventSet *);
-    _tao__seq_EventSet_var (const _tao__seq_EventSet_var &); // copy constructor
-    ~_tao__seq_EventSet_var (void); // destructor
-    
-    _tao__seq_EventSet_var &operator= (_tao__seq_EventSet *);
-    _tao__seq_EventSet_var &operator= (const _tao__seq_EventSet_var &);
-    _tao__seq_EventSet *operator-> (void);
-    const _tao__seq_EventSet *operator-> (void) const;
-    
-    operator const _tao__seq_EventSet &() const;
-    operator _tao__seq_EventSet &();
-    operator _tao__seq_EventSet &() const;
-    ACE_NESTED_CLASS (RtecEventComm,Event) &operator[] (CORBA::ULong index);
-    // in, inout, out, _retn 
-    const _tao__seq_EventSet &in (void) const;
-    _tao__seq_EventSet &inout (void);
-    _tao__seq_EventSet *&out (void);
-    _tao__seq_EventSet *_retn (void);
-    _tao__seq_EventSet *ptr (void) const;
-
-  private:
-    _tao__seq_EventSet *ptr_;
-  };
-
-
-#endif // end #if !defined
-
-
-#if !defined (_RTECEVENTCOMM__TAO__SEQ_EVENTSET___OUT_CH_)
-#define _RTECEVENTCOMM__TAO__SEQ_EVENTSET___OUT_CH_
-
-  class _tao__seq_EventSet_out
-  {
-  public:
-    _tao__seq_EventSet_out (_tao__seq_EventSet *&);
-    _tao__seq_EventSet_out (_tao__seq_EventSet_var &);
-    _tao__seq_EventSet_out (_tao__seq_EventSet_out &);
-    _tao__seq_EventSet_out &operator= (_tao__seq_EventSet_out &);
-    _tao__seq_EventSet_out &operator= (_tao__seq_EventSet *);
-    operator _tao__seq_EventSet *&();
-    _tao__seq_EventSet *&ptr (void);
-    _tao__seq_EventSet *operator-> (void);
-    ACE_NESTED_CLASS (RtecEventComm,Event) &operator[] (CORBA::ULong index);
-    
-  private:
-    _tao__seq_EventSet *&ptr_;
-    // assignment from T_var not allowed
-    void operator= (const _tao__seq_EventSet_var &);
-  };
-
-
-#endif // end #if !defined
-
-  typedef ACE_NESTED_CLASS (RtecEventComm,_tao__seq_EventSet) EventSet;
-  typedef ACE_NESTED_CLASS (RtecEventComm,_tao__seq_EventSet_var) EventSet_var;
-  typedef ACE_NESTED_CLASS (RtecEventComm,_tao__seq_EventSet_out) EventSet_out;
-
-  static CORBA::TypeCode_ptr _tc_EventSet;
-
-  
-#if !defined (_RTECEVENTCOMM_PUSHCONSUMER___PTR_CH_)
-#define _RTECEVENTCOMM_PUSHCONSUMER___PTR_CH_
-
-class PushConsumer;
-  typedef PushConsumer *PushConsumer_ptr;
-  
-#endif // end #if !defined
-
-
-#if !defined (_RTECEVENTCOMM_PUSHCONSUMER_CH_)
-#define _RTECEVENTCOMM_PUSHCONSUMER_CH_
-
-class PushConsumer: public virtual ACE_CORBA_1 (Object)
-  {
-  public:
-    // the static operations
-    static PushConsumer_ptr _duplicate (PushConsumer_ptr obj);
-    static PushConsumer_ptr _narrow (CORBA::Object_ptr obj, CORBA::Environment &env);
-    static PushConsumer_ptr _nil (void);
-    static PushConsumer_ptr _bind (const char *host, CORBA::UShort port, const char *key, CORBA::Environment &env);
-
-    virtual void push (const ACE_NESTED_CLASS (RtecEventComm,EventSet) &data, CORBA::Environment &env);
-    virtual void disconnect_push_consumer (CORBA::Environment &env);
-  protected:
-    PushConsumer (void); // default constructor
-    PushConsumer (STUB_Object *objref);
-    virtual ~PushConsumer (void);
-  private:
-    PushConsumer (const PushConsumer&);
-    void operator= (const PushConsumer&);
-  };
-
-
-#endif // end #if !defined
-
-
-#if !defined (_RTECEVENTCOMM_PUSHCONSUMER___VAR_CH_)
-#define _RTECEVENTCOMM_PUSHCONSUMER___VAR_CH_
-
-  class PushConsumer_var
-  {
-  public:
-    PushConsumer_var (void); // default constructor
-    PushConsumer_var (PushConsumer_ptr);
-    PushConsumer_var (const PushConsumer_var &); // copy constructor
-    ~PushConsumer_var (void); // destructor
-    
-    PushConsumer_var &operator= (PushConsumer_ptr);
-    PushConsumer_var &operator= (const PushConsumer_var &);
-    PushConsumer_ptr operator-> (void) const;
-    
-    operator const PushConsumer_ptr &() const;
-    operator PushConsumer_ptr &();
-    // in, inout, out, _retn 
-    PushConsumer_ptr in (void) const;
-    PushConsumer_ptr &inout (void);
-    PushConsumer_ptr &out (void);
-    PushConsumer_ptr _retn (void);
-    PushConsumer_ptr ptr (void) const;
-
-  private:
-    PushConsumer_ptr ptr_;
-  };
-
-
-#endif // end #if !defined
-
-
-#if !defined (_RTECEVENTCOMM_PUSHCONSUMER___OUT_CH_)
-#define _RTECEVENTCOMM_PUSHCONSUMER___OUT_CH_
-
-  class PushConsumer_out
-  {
-  public:
-    PushConsumer_out (PushConsumer_ptr &);
-    PushConsumer_out (PushConsumer_var &);
-    PushConsumer_out (PushConsumer_out &);
-    PushConsumer_out &operator= (PushConsumer_out &);
-    PushConsumer_out &operator= (const PushConsumer_var &);
-    PushConsumer_out &operator= (PushConsumer_ptr);
-    operator PushConsumer_ptr &();
-    PushConsumer_ptr &ptr (void);
-    PushConsumer_ptr operator-> (void);
-    
-  private:
-    PushConsumer_ptr &ptr_;
-  };
-
-
-#endif // end #if !defined
-
-  static CORBA::TypeCode_ptr _tc_PushConsumer;
-
-  
-#if !defined (_RTECEVENTCOMM_PUSHSUPPLIER___PTR_CH_)
-#define _RTECEVENTCOMM_PUSHSUPPLIER___PTR_CH_
-
-class PushSupplier;
-  typedef PushSupplier *PushSupplier_ptr;
-  
-#endif // end #if !defined
-
-
-#if !defined (_RTECEVENTCOMM_PUSHSUPPLIER_CH_)
-#define _RTECEVENTCOMM_PUSHSUPPLIER_CH_
-
-class PushSupplier: public virtual ACE_CORBA_1 (Object)
-  {
-  public:
-    // the static operations
-    static PushSupplier_ptr _duplicate (PushSupplier_ptr obj);
-    static PushSupplier_ptr _narrow (CORBA::Object_ptr obj, CORBA::Environment &env);
-    static PushSupplier_ptr _nil (void);
-    static PushSupplier_ptr _bind (const char *host, CORBA::UShort port, const char *key, CORBA::Environment &env);
-
-    virtual void disconnect_push_supplier (CORBA::Environment &env);
-  protected:
-    PushSupplier (void); // default constructor
-    PushSupplier (STUB_Object *objref);
-    virtual ~PushSupplier (void);
-  private:
-    PushSupplier (const PushSupplier&);
-    void operator= (const PushSupplier&);
-  };
-
-
-#endif // end #if !defined
-
-
-#if !defined (_RTECEVENTCOMM_PUSHSUPPLIER___VAR_CH_)
-#define _RTECEVENTCOMM_PUSHSUPPLIER___VAR_CH_
-
-  class PushSupplier_var
-  {
-  public:
-    PushSupplier_var (void); // default constructor
-    PushSupplier_var (PushSupplier_ptr);
-    PushSupplier_var (const PushSupplier_var &); // copy constructor
-    ~PushSupplier_var (void); // destructor
-    
-    PushSupplier_var &operator= (PushSupplier_ptr);
-    PushSupplier_var &operator= (const PushSupplier_var &);
-    PushSupplier_ptr operator-> (void) const;
-    
-    operator const PushSupplier_ptr &() const;
-    operator PushSupplier_ptr &();
-    // in, inout, out, _retn 
-    PushSupplier_ptr in (void) const;
-    PushSupplier_ptr &inout (void);
-    PushSupplier_ptr &out (void);
-    PushSupplier_ptr _retn (void);
-    PushSupplier_ptr ptr (void) const;
-
-  private:
-    PushSupplier_ptr ptr_;
-  };
-
-
-#endif // end #if !defined
-
-
-#if !defined (_RTECEVENTCOMM_PUSHSUPPLIER___OUT_CH_)
-#define _RTECEVENTCOMM_PUSHSUPPLIER___OUT_CH_
-
-  class PushSupplier_out
-  {
-  public:
-    PushSupplier_out (PushSupplier_ptr &);
-    PushSupplier_out (PushSupplier_var &);
-    PushSupplier_out (PushSupplier_out &);
-    PushSupplier_out &operator= (PushSupplier_out &);
-    PushSupplier_out &operator= (const PushSupplier_var &);
-    PushSupplier_out &operator= (PushSupplier_ptr);
-    operator PushSupplier_ptr &();
-    PushSupplier_ptr &ptr (void);
-    PushSupplier_ptr operator-> (void);
-    
-  private:
-    PushSupplier_ptr &ptr_;
-  };
-
-
-#endif // end #if !defined
-
-  static CORBA::TypeCode_ptr _tc_PushSupplier;
-
-};
-
-
-#if defined (__ACE_INLINE__)
-#include "RtecEventCommC.i"
-#endif // defined INLINE
-
-
-#endif // if !defined
diff --git a/TAO/orbsvcs/lib/RtecEventCommC.i b/TAO/orbsvcs/lib/RtecEventCommC.i
deleted file mode 100644
index 7b0354fcb01..00000000000
--- a/TAO/orbsvcs/lib/RtecEventCommC.i
+++ /dev/null
@@ -1,855 +0,0 @@
-// ******  Code generated by the The ACE ORB (TAO) IDL Compiler *******
-// TAO ORB and the TAO IDL Compiler have been developed by Washington 
-// University Computer Science's Distributed Object Computing Group.
-//
-// Information on TAO is available at
-//                 http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// *************************************************************
-// Inline operations for exception RtecEventComm::Disconnected
-// *************************************************************
-
-// default constructor
-ACE_INLINE
-RtecEventComm::Disconnected::Disconnected (void)
-  : CORBA_UserException (_tc_Disconnected)
-{
-}
-
-// *************************************************************
-// Inline operations for class RtecEventComm::EventData_var
-// *************************************************************
-
-ACE_INLINE
-RtecEventComm::EventData_var::EventData_var (void) // default constructor
-	: ptr_ (0)
-{}
-
-ACE_INLINE
-RtecEventComm::EventData_var::EventData_var (RtecEventComm::EventData *p)
-	: ptr_ (p)
-{}
-
-ACE_INLINE
-RtecEventComm::EventData_var::EventData_var (const RtecEventComm::EventData_var &p) // copy constructor
-{
-  if (p.ptr_)
-  	this->ptr_ = new RtecEventComm::EventData(*p.ptr_);
-  else
-  	this->ptr_ = 0;
-}
-
-ACE_INLINE
-RtecEventComm::EventData_var::~EventData_var (void) // destructor
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE RtecEventComm::EventData_var &
-RtecEventComm::EventData_var::operator= (RtecEventComm::EventData *p)
-{
-  delete this->ptr_;
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE RtecEventComm::EventData_var &
-RtecEventComm::EventData_var::operator= (const RtecEventComm::EventData_var &p)
-{
-  if (this != &p)
-  {
-    delete this->ptr_;
-    this->ptr_ = new RtecEventComm::EventData (*p.ptr_);
-  }
-  return *this;
-}
-
-ACE_INLINE const RtecEventComm::EventData *
-RtecEventComm::EventData_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE RtecEventComm::EventData *
-RtecEventComm::EventData_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE 
-RtecEventComm::EventData_var::operator const RtecEventComm::EventData &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE 
-RtecEventComm::EventData_var::operator RtecEventComm::EventData &() // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE 
-RtecEventComm::EventData_var::operator RtecEventComm::EventData &() const// cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE const RtecEventComm::EventData &
-RtecEventComm::EventData_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE RtecEventComm::EventData &
-RtecEventComm::EventData_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-// mapping for fixed size 
-ACE_INLINE RtecEventComm::EventData &
-RtecEventComm::EventData_var::out (void)
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE RtecEventComm::EventData
-RtecEventComm::EventData_var::_retn (void)
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE RtecEventComm::EventData *
-RtecEventComm::EventData_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// *************************************************************
-// Inline operations for class RtecEventComm::Event_var
-// *************************************************************
-
-ACE_INLINE
-RtecEventComm::Event_var::Event_var (void) // default constructor
-	: ptr_ (0)
-{}
-
-ACE_INLINE
-RtecEventComm::Event_var::Event_var (RtecEventComm::Event *p)
-	: ptr_ (p)
-{}
-
-ACE_INLINE
-RtecEventComm::Event_var::Event_var (const RtecEventComm::Event_var &p) // copy constructor
-{
-  if (p.ptr_)
-  	this->ptr_ = new RtecEventComm::Event(*p.ptr_);
-  else
-  	this->ptr_ = 0;
-}
-
-ACE_INLINE
-RtecEventComm::Event_var::~Event_var (void) // destructor
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE RtecEventComm::Event_var &
-RtecEventComm::Event_var::operator= (RtecEventComm::Event *p)
-{
-  delete this->ptr_;
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE RtecEventComm::Event_var &
-RtecEventComm::Event_var::operator= (const RtecEventComm::Event_var &p)
-{
-  if (this != &p)
-  {
-    delete this->ptr_;
-    this->ptr_ = new RtecEventComm::Event (*p.ptr_);
-  }
-  return *this;
-}
-
-ACE_INLINE const RtecEventComm::Event *
-RtecEventComm::Event_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE RtecEventComm::Event *
-RtecEventComm::Event_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE 
-RtecEventComm::Event_var::operator const RtecEventComm::Event &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE 
-RtecEventComm::Event_var::operator RtecEventComm::Event &() // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE 
-RtecEventComm::Event_var::operator RtecEventComm::Event &() const// cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE const RtecEventComm::Event &
-RtecEventComm::Event_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE RtecEventComm::Event &
-RtecEventComm::Event_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-// mapping for fixed size 
-ACE_INLINE RtecEventComm::Event &
-RtecEventComm::Event_var::out (void)
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE RtecEventComm::Event
-RtecEventComm::Event_var::_retn (void)
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE RtecEventComm::Event *
-RtecEventComm::Event_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE RtecEventComm::Event *
-RtecEventComm::_tao__seq_EventSet::allocbuf (CORBA::ULong nelems)
-{
-  return new RtecEventComm::Event[nelems]; // allocate from heap
-}
-
-ACE_INLINE void
-RtecEventComm::_tao__seq_EventSet::freebuf (RtecEventComm::Event *seq)
-{
-  delete [] seq;
-}
-
-//default constructor
-ACE_INLINE 
-RtecEventComm::_tao__seq_EventSet::_tao__seq_EventSet (void)
-	: maximum_ (0),
-	  length_ (0),
-	  buffer_ (0),
-	  release_ (0) // does not own
-{}
-
-// constructor for unbounded seq
-ACE_INLINE 
-RtecEventComm::_tao__seq_EventSet::_tao__seq_EventSet(CORBA::ULong max )
-	: maximum_ (max),
-	  length_ (0),
-	  buffer_ (RtecEventComm::_tao__seq_EventSet::allocbuf (max)),
-	  release_ (1) // owns
-{}
-
-// constructor from data buffer
-ACE_INLINE 
-RtecEventComm::_tao__seq_EventSet::_tao__seq_EventSet (CORBA::ULong max, CORBA::ULong length, 
-	RtecEventComm::Event *value, CORBA::Boolean release)
-	: maximum_ (max),
-	  length_ (length),
-	  buffer_ (value),
-	  release_ (release) // ownership depends on release
-{}
-
-ACE_INLINE CORBA::ULong
-RtecEventComm::_tao__seq_EventSet::maximum (void) const
-{
-  return this->maximum_;
-}
-
-ACE_INLINE CORBA::ULong
-RtecEventComm::_tao__seq_EventSet::length  (void) const
-{
-  return this->length_;
-}
-
-ACE_INLINE RtecEventComm::Event &
-RtecEventComm::_tao__seq_EventSet::operator[] (CORBA::ULong index) // read/write
-{
-  return this->buffer_[index];
-}
-
-ACE_INLINE const RtecEventComm::Event &
-RtecEventComm::_tao__seq_EventSet::operator[] (CORBA::ULong index) const // read
-{
-  return this->buffer_[index];
-}
-
-// *************************************************************
-// Inline operations for class RtecEventComm::_tao__seq_EventSet_var
-// *************************************************************
-
-ACE_INLINE
-RtecEventComm::_tao__seq_EventSet_var::_tao__seq_EventSet_var (void) // default constructor
-	: ptr_ (0)
-{}
-
-ACE_INLINE
-RtecEventComm::_tao__seq_EventSet_var::_tao__seq_EventSet_var (RtecEventComm::_tao__seq_EventSet_ptr p)
-	: ptr_ (p)
-{}
-
-ACE_INLINE
-RtecEventComm::_tao__seq_EventSet_var::_tao__seq_EventSet_var (const RtecEventComm::_tao__seq_EventSet_var &p) // copy constructor
-{
-  if (p.ptr_)
-  	this->ptr_ = new RtecEventComm::_tao__seq_EventSet(*p.ptr_);
-  else
-  	this->ptr_ = 0;
-}
-
-ACE_INLINE
-RtecEventComm::_tao__seq_EventSet_var::~_tao__seq_EventSet_var (void) // destructor
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE RtecEventComm::_tao__seq_EventSet_var &
-RtecEventComm::_tao__seq_EventSet_var::operator= (RtecEventComm::_tao__seq_EventSet *p)
-{
-  delete this->ptr_;
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE RtecEventComm::_tao__seq_EventSet_var &
-RtecEventComm::_tao__seq_EventSet_var::operator= (const RtecEventComm::_tao__seq_EventSet_var &p) // deep copy
-{
-  if (this != &p)
-  {
-    delete this->ptr_;
-    this->ptr_ = new RtecEventComm::_tao__seq_EventSet (*p.ptr_);
-  }
-  return *this;
-}
-
-ACE_INLINE const RtecEventComm::_tao__seq_EventSet *
-RtecEventComm::_tao__seq_EventSet_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE RtecEventComm::_tao__seq_EventSet *
-RtecEventComm::_tao__seq_EventSet_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE 
-RtecEventComm::_tao__seq_EventSet_var::operator const RtecEventComm::_tao__seq_EventSet &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE 
-RtecEventComm::_tao__seq_EventSet_var::operator RtecEventComm::_tao__seq_EventSet &() // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE 
-RtecEventComm::_tao__seq_EventSet_var::operator RtecEventComm::_tao__seq_EventSet &() const// cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE RtecEventComm::Event&
-RtecEventComm::_tao__seq_EventSet_var::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-ACE_INLINE const RtecEventComm::_tao__seq_EventSet &
-RtecEventComm::_tao__seq_EventSet_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE RtecEventComm::_tao__seq_EventSet &
-RtecEventComm::_tao__seq_EventSet_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-// mapping for variable size 
-ACE_INLINE RtecEventComm::_tao__seq_EventSet *&
-RtecEventComm::_tao__seq_EventSet_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE RtecEventComm::_tao__seq_EventSet *
-RtecEventComm::_tao__seq_EventSet_var::_retn (void)
-{
-  RtecEventComm::_tao__seq_EventSet *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE RtecEventComm::_tao__seq_EventSet *
-RtecEventComm::_tao__seq_EventSet_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// *************************************************************
-// Inline operations for class RtecEventComm::_tao__seq_EventSet_out
-// *************************************************************
-
-ACE_INLINE
-RtecEventComm::_tao__seq_EventSet_out::_tao__seq_EventSet_out (RtecEventComm::_tao__seq_EventSet *&p)
-	: ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-RtecEventComm::_tao__seq_EventSet_out::_tao__seq_EventSet_out (RtecEventComm::_tao__seq_EventSet_var &p) // constructor from _var
-	: ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-RtecEventComm::_tao__seq_EventSet_out::_tao__seq_EventSet_out (RtecEventComm::_tao__seq_EventSet_out &p) // copy constructor
-	: ptr_ (p.ptr_)
-{}
-
-ACE_INLINE RtecEventComm::_tao__seq_EventSet_out &
-RtecEventComm::_tao__seq_EventSet_out::operator= (RtecEventComm::_tao__seq_EventSet_out &p)
-{
-  this->ptr_ = p.ptr_;
-  return *this;
-}
-
-ACE_INLINE RtecEventComm::_tao__seq_EventSet_out &
-RtecEventComm::_tao__seq_EventSet_out::operator= (RtecEventComm::_tao__seq_EventSet *p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE 
-RtecEventComm::_tao__seq_EventSet_out::operator RtecEventComm::_tao__seq_EventSet *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE RtecEventComm::_tao__seq_EventSet *&
-RtecEventComm::_tao__seq_EventSet_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE RtecEventComm::_tao__seq_EventSet *
-RtecEventComm::_tao__seq_EventSet_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE RtecEventComm::Event& 
-RtecEventComm::_tao__seq_EventSet_out::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-ACE_INLINE
-RtecEventComm::PushConsumer::PushConsumer (void) // default constructor
-{}
-
-ACE_INLINE
-RtecEventComm::PushConsumer::PushConsumer (STUB_Object *objref) // constructor
-	: ACE_CORBA_1 (Object) (objref)
-{}
-
-ACE_INLINE
-RtecEventComm::PushConsumer::~PushConsumer (void) // destructor
-{}
-
-
-#if !defined (_RTECEVENTCOMM_PUSHCONSUMER___VAR_CI_)
-#define _RTECEVENTCOMM_PUSHCONSUMER___VAR_CI_
-
-// *************************************************************
-// Inline operations for class RtecEventComm::PushConsumer_var
-// *************************************************************
-
-ACE_INLINE
-RtecEventComm::PushConsumer_var::PushConsumer_var (void) // default constructor
-	: ptr_ (RtecEventComm::PushConsumer::_nil ())
-{}
-
-ACE_INLINE
-RtecEventComm::PushConsumer_var::PushConsumer_var (RtecEventComm::PushConsumer_ptr p)
-	: ptr_ (p)
-{}
-
-ACE_INLINE RtecEventComm::PushConsumer_ptr 
-RtecEventComm::PushConsumer_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-RtecEventComm::PushConsumer_var::PushConsumer_var (const RtecEventComm::PushConsumer_var &p) // copy constructor
-	: ptr_ (RtecEventComm::PushConsumer::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-RtecEventComm::PushConsumer_var::~PushConsumer_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE RtecEventComm::PushConsumer_var &
-RtecEventComm::PushConsumer_var::operator= (RtecEventComm::PushConsumer_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE RtecEventComm::PushConsumer_var &
-RtecEventComm::PushConsumer_var::operator= (const RtecEventComm::PushConsumer_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = RtecEventComm::PushConsumer::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE 
-RtecEventComm::PushConsumer_var::operator const RtecEventComm::PushConsumer_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE 
-RtecEventComm::PushConsumer_var::operator RtecEventComm::PushConsumer_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE RtecEventComm::PushConsumer_ptr 
-RtecEventComm::PushConsumer_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE RtecEventComm::PushConsumer_ptr
-RtecEventComm::PushConsumer_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE RtecEventComm::PushConsumer_ptr &
-RtecEventComm::PushConsumer_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE RtecEventComm::PushConsumer_ptr &
-RtecEventComm::PushConsumer_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = RtecEventComm::PushConsumer::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE RtecEventComm::PushConsumer_ptr 
-RtecEventComm::PushConsumer_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  RtecEventComm::PushConsumer_ptr val = this->ptr_;
-  this->ptr_ = RtecEventComm::PushConsumer::_nil ();
-  return val;
-}
-
-
-#endif // end #if !defined
-
-
-#if !defined (_RTECEVENTCOMM_PUSHCONSUMER___OUT_CI_)
-#define _RTECEVENTCOMM_PUSHCONSUMER___OUT_CI_
-
-// *************************************************************
-// Inline operations for class RtecEventComm::PushConsumer_out
-// *************************************************************
-
-ACE_INLINE
-RtecEventComm::PushConsumer_out::PushConsumer_out (RtecEventComm::PushConsumer_ptr &p)
-	: ptr_ (p)
-{
-  this->ptr_ = RtecEventComm::PushConsumer::_nil ();
-}
-
-ACE_INLINE
-RtecEventComm::PushConsumer_out::PushConsumer_out (RtecEventComm::PushConsumer_var &p) // constructor from _var
-	: ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = RtecEventComm::PushConsumer::_nil ();
-}
-
-ACE_INLINE
-RtecEventComm::PushConsumer_out::PushConsumer_out (RtecEventComm::PushConsumer_out &p) // copy constructor
-	: ptr_ (p.ptr_)
-{}
-
-ACE_INLINE RtecEventComm::PushConsumer_out &
-RtecEventComm::PushConsumer_out::operator= (RtecEventComm::PushConsumer_out &p)
-{
-  this->ptr_ = p.ptr_;
-  return *this;
-}
-
-ACE_INLINE RtecEventComm::PushConsumer_out &
-RtecEventComm::PushConsumer_out::operator= (const RtecEventComm::PushConsumer_var &p)
-{
-  this->ptr_ = RtecEventComm::PushConsumer::_duplicate (p.ptr ());
-  return *this;
-}
-
-ACE_INLINE RtecEventComm::PushConsumer_out &
-RtecEventComm::PushConsumer_out::operator= (RtecEventComm::PushConsumer_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE 
-RtecEventComm::PushConsumer_out::operator RtecEventComm::PushConsumer_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE RtecEventComm::PushConsumer_ptr &
-RtecEventComm::PushConsumer_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE RtecEventComm::PushConsumer_ptr 
-RtecEventComm::PushConsumer_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-
-#endif // end #if !defined
-
-ACE_INLINE
-RtecEventComm::PushSupplier::PushSupplier (void) // default constructor
-{}
-
-ACE_INLINE
-RtecEventComm::PushSupplier::PushSupplier (STUB_Object *objref) // constructor
-	: ACE_CORBA_1 (Object) (objref)
-{}
-
-ACE_INLINE
-RtecEventComm::PushSupplier::~PushSupplier (void) // destructor
-{}
-
-
-#if !defined (_RTECEVENTCOMM_PUSHSUPPLIER___VAR_CI_)
-#define _RTECEVENTCOMM_PUSHSUPPLIER___VAR_CI_
-
-// *************************************************************
-// Inline operations for class RtecEventComm::PushSupplier_var
-// *************************************************************
-
-ACE_INLINE
-RtecEventComm::PushSupplier_var::PushSupplier_var (void) // default constructor
-	: ptr_ (RtecEventComm::PushSupplier::_nil ())
-{}
-
-ACE_INLINE
-RtecEventComm::PushSupplier_var::PushSupplier_var (RtecEventComm::PushSupplier_ptr p)
-	: ptr_ (p)
-{}
-
-ACE_INLINE RtecEventComm::PushSupplier_ptr 
-RtecEventComm::PushSupplier_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-RtecEventComm::PushSupplier_var::PushSupplier_var (const RtecEventComm::PushSupplier_var &p) // copy constructor
-	: ptr_ (RtecEventComm::PushSupplier::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-RtecEventComm::PushSupplier_var::~PushSupplier_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE RtecEventComm::PushSupplier_var &
-RtecEventComm::PushSupplier_var::operator= (RtecEventComm::PushSupplier_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE RtecEventComm::PushSupplier_var &
-RtecEventComm::PushSupplier_var::operator= (const RtecEventComm::PushSupplier_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = RtecEventComm::PushSupplier::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE 
-RtecEventComm::PushSupplier_var::operator const RtecEventComm::PushSupplier_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE 
-RtecEventComm::PushSupplier_var::operator RtecEventComm::PushSupplier_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE RtecEventComm::PushSupplier_ptr 
-RtecEventComm::PushSupplier_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE RtecEventComm::PushSupplier_ptr
-RtecEventComm::PushSupplier_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE RtecEventComm::PushSupplier_ptr &
-RtecEventComm::PushSupplier_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE RtecEventComm::PushSupplier_ptr &
-RtecEventComm::PushSupplier_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = RtecEventComm::PushSupplier::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE RtecEventComm::PushSupplier_ptr 
-RtecEventComm::PushSupplier_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  RtecEventComm::PushSupplier_ptr val = this->ptr_;
-  this->ptr_ = RtecEventComm::PushSupplier::_nil ();
-  return val;
-}
-
-
-#endif // end #if !defined
-
-
-#if !defined (_RTECEVENTCOMM_PUSHSUPPLIER___OUT_CI_)
-#define _RTECEVENTCOMM_PUSHSUPPLIER___OUT_CI_
-
-// *************************************************************
-// Inline operations for class RtecEventComm::PushSupplier_out
-// *************************************************************
-
-ACE_INLINE
-RtecEventComm::PushSupplier_out::PushSupplier_out (RtecEventComm::PushSupplier_ptr &p)
-	: ptr_ (p)
-{
-  this->ptr_ = RtecEventComm::PushSupplier::_nil ();
-}
-
-ACE_INLINE
-RtecEventComm::PushSupplier_out::PushSupplier_out (RtecEventComm::PushSupplier_var &p) // constructor from _var
-	: ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = RtecEventComm::PushSupplier::_nil ();
-}
-
-ACE_INLINE
-RtecEventComm::PushSupplier_out::PushSupplier_out (RtecEventComm::PushSupplier_out &p) // copy constructor
-	: ptr_ (p.ptr_)
-{}
-
-ACE_INLINE RtecEventComm::PushSupplier_out &
-RtecEventComm::PushSupplier_out::operator= (RtecEventComm::PushSupplier_out &p)
-{
-  this->ptr_ = p.ptr_;
-  return *this;
-}
-
-ACE_INLINE RtecEventComm::PushSupplier_out &
-RtecEventComm::PushSupplier_out::operator= (const RtecEventComm::PushSupplier_var &p)
-{
-  this->ptr_ = RtecEventComm::PushSupplier::_duplicate (p.ptr ());
-  return *this;
-}
-
-ACE_INLINE RtecEventComm::PushSupplier_out &
-RtecEventComm::PushSupplier_out::operator= (RtecEventComm::PushSupplier_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE 
-RtecEventComm::PushSupplier_out::operator RtecEventComm::PushSupplier_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE RtecEventComm::PushSupplier_ptr &
-RtecEventComm::PushSupplier_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE RtecEventComm::PushSupplier_ptr 
-RtecEventComm::PushSupplier_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-
-#endif // end #if !defined
-
diff --git a/TAO/orbsvcs/lib/RtecEventCommS.cpp b/TAO/orbsvcs/lib/RtecEventCommS.cpp
deleted file mode 100644
index 0deb62ae2fa..00000000000
--- a/TAO/orbsvcs/lib/RtecEventCommS.cpp
+++ /dev/null
@@ -1,168 +0,0 @@
-// ******  Code generated by the The ACE ORB (TAO) IDL Compiler *******
-// TAO ORB and the TAO IDL Compiler have been developed by Washington 
-// University Computer Science's Distributed Object Computing Group.
-//
-// Information on TAO is available at
-//                 http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#include "RtecEventCommS.h"
-
-#if !defined (__ACE_INLINE__)
-#include "RtecEventCommS.i"
-#endif // !defined INLINE
-
-static const TAO_operation_db_entry PushConsumer_operations [] = {
-  {"push", &POA_RtecEventComm::PushConsumer::push_skel},
-  {"disconnect_push_consumer", &POA_RtecEventComm::PushConsumer::disconnect_push_consumer_skel},
-  {"_is_a", &POA_RtecEventComm::PushConsumer::_is_a_skel}
-};
-
-TAO_Dynamic_Hash_OpTable tao_PushConsumer_optable (PushConsumer_operations, 3, 6);
-// skeleton constructor
-POA_RtecEventComm::PushConsumer::PushConsumer (const char *obj_name)
-{
-  const CORBA::String repoID = "IDL:RtecEventComm/PushConsumer:1.0"; // repository ID
-  IIOP_Object *data; // Actual object reference
-  TAO_ORB_Core *ocp = TAO_ORB_Core_instance (); // underlying ORB core instance
-  CORBA::POA_ptr oa = TAO_ORB_Core_instance ()->root_poa (); // underlying OA
-  const ACE_INET_Addr &addr = ocp->orb_params ()->addr ();
-  this->optable_ = &tao_PushConsumer_optable;
-  
-  // set up an IIOP object
-  data = new IIOP_Object (CORBA::string_dup (repoID), addr, obj_name);
-  this->set_parent (data); // store the IIOP obj ref with us
-  this->sub_ = this; // set the most derived type to be us
-  if (oa) oa->bind (data->profile.object_key, this); // register ourselves
-}
-
-void POA_RtecEventComm::PushConsumer::push_skel (CORBA::ServerRequest &_tao_server_request, CORBA::Object_ptr _tao_object_reference, CORBA::Environment &_tao_environment)
-{
-  CORBA::NVList_ptr 	 nvlist;
-  POA_RtecEventComm::PushConsumer_ptr 	 impl;
-  RtecEventComm::EventSet data;
-  CORBA::NamedValue_ptr nv_data;
-  CORBA::Any 	 any_data (RtecEventComm::_tc_EventSet, &data); // ORB does not own
-  
-  // create an NV list and populate it with typecodes
-  _tao_server_request.orb ()->create_list (0, nvlist); // initialize a list
-  // add each argument according to the in, out, inout semantics
-  nv_data = nvlist->add_value ("data", any_data, CORBA::ARG_IN, _tao_environment);
-  // parse the arguments
-  _tao_server_request.params (nvlist, _tao_environment);
-  if (_tao_environment.exception ()) return;
-  
-impl = (POA_RtecEventComm::PushConsumer_ptr) _tao_object_reference->get_subclass ();
-  impl->push(data, _tao_environment);
-  
-
-}
-
-void POA_RtecEventComm::PushConsumer::disconnect_push_consumer_skel (CORBA::ServerRequest &_tao_server_request, CORBA::Object_ptr _tao_object_reference, CORBA::Environment &_tao_environment)
-{
-  CORBA::NVList_ptr 	 nvlist;
-  POA_RtecEventComm::PushConsumer_ptr 	 impl;
-  
-  // create an NV list and populate it with typecodes
-  _tao_server_request.orb ()->create_list (0, nvlist); // initialize a list
-  // add each argument according to the in, out, inout semantics
-  // parse the arguments
-  _tao_server_request.params (nvlist, _tao_environment);
-  if (_tao_environment.exception ()) return;
-  
-impl = (POA_RtecEventComm::PushConsumer_ptr) _tao_object_reference->get_subclass ();
-  impl->disconnect_push_consumer(_tao_environment);
-  
-
-}
-
-void POA_RtecEventComm::PushConsumer::_is_a_skel (CORBA::ServerRequest &req, CORBA::Object_ptr /* obj */, CORBA::Environment &env)
-{
-  const CORBA::String type_id = "IDL:RtecEventComm/PushConsumer:1.0"; // repository ID
-  CORBA::NVList_ptr nvlist;
-  CORBA::NamedValue_ptr nv;
-  CORBA::Any temp_value (CORBA::_tc_string);
-  CORBA::Any *any;
-  CORBA::Boolean *retval;
-  CORBA::String value;
-  
-  req.orb()->create_list (0, nvlist);
-  nv = nvlist->add_value (0, temp_value, CORBA::ARG_IN, env);
-  req.params (nvlist, env); // parse the args
-  if (env.exception () != 0) return;
-  value = *(CORBA::String *)nv->value ()->value ();
-  if (ACE_OS::strcmp ((char *)value, (char *)type_id) == 0
-    || ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (env)) == 0)
-
-  	retval = new CORBA::Boolean (CORBA::B_TRUE);
-  else
-  	retval = new CORBA::Boolean (CORBA::B_FALSE);
-  any = new CORBA::Any (CORBA::_tc_boolean, retval, CORBA::B_TRUE);
-  req.result (any, env);
-}
-
-static const TAO_operation_db_entry PushSupplier_operations [] = {
-  {"disconnect_push_supplier", &POA_RtecEventComm::PushSupplier::disconnect_push_supplier_skel},
-  {"_is_a", &POA_RtecEventComm::PushSupplier::_is_a_skel}
-};
-
-TAO_Dynamic_Hash_OpTable tao_PushSupplier_optable (PushSupplier_operations, 2, 4);
-// skeleton constructor
-POA_RtecEventComm::PushSupplier::PushSupplier (const char *obj_name)
-{
-  const CORBA::String repoID = "IDL:RtecEventComm/PushSupplier:1.0"; // repository ID
-  IIOP_Object *data; // Actual object reference
-  TAO_ORB_Core *ocp = TAO_ORB_Core_instance (); // underlying ORB core instance
-  CORBA::POA_ptr oa = TAO_ORB_Core_instance ()->root_poa (); // underlying OA
-  const ACE_INET_Addr &addr = ocp->orb_params ()->addr ();
-  this->optable_ = &tao_PushSupplier_optable;
-  
-  // set up an IIOP object
-  data = new IIOP_Object (CORBA::string_dup (repoID), addr, obj_name);
-  this->set_parent (data); // store the IIOP obj ref with us
-  this->sub_ = this; // set the most derived type to be us
-  if (oa) oa->bind (data->profile.object_key, this); // register ourselves
-}
-
-void POA_RtecEventComm::PushSupplier::disconnect_push_supplier_skel (CORBA::ServerRequest &_tao_server_request, CORBA::Object_ptr _tao_object_reference, CORBA::Environment &_tao_environment)
-{
-  CORBA::NVList_ptr 	 nvlist;
-  POA_RtecEventComm::PushSupplier_ptr 	 impl;
-  
-  // create an NV list and populate it with typecodes
-  _tao_server_request.orb ()->create_list (0, nvlist); // initialize a list
-  // add each argument according to the in, out, inout semantics
-  // parse the arguments
-  _tao_server_request.params (nvlist, _tao_environment);
-  if (_tao_environment.exception ()) return;
-  
-impl = (POA_RtecEventComm::PushSupplier_ptr) _tao_object_reference->get_subclass ();
-  impl->disconnect_push_supplier(_tao_environment);
-  
-
-}
-
-void POA_RtecEventComm::PushSupplier::_is_a_skel (CORBA::ServerRequest &req, CORBA::Object_ptr /* obj */, CORBA::Environment &env)
-{
-  const CORBA::String type_id = "IDL:RtecEventComm/PushSupplier:1.0"; // repository ID
-  CORBA::NVList_ptr nvlist;
-  CORBA::NamedValue_ptr nv;
-  CORBA::Any temp_value (CORBA::_tc_string);
-  CORBA::Any *any;
-  CORBA::Boolean *retval;
-  CORBA::String value;
-  
-  req.orb()->create_list (0, nvlist);
-  nv = nvlist->add_value (0, temp_value, CORBA::ARG_IN, env);
-  req.params (nvlist, env); // parse the args
-  if (env.exception () != 0) return;
-  value = *(CORBA::String *)nv->value ()->value ();
-  if (ACE_OS::strcmp ((char *)value, (char *)type_id) == 0
-    || ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (env)) == 0)
-
-  	retval = new CORBA::Boolean (CORBA::B_TRUE);
-  else
-  	retval = new CORBA::Boolean (CORBA::B_FALSE);
-  any = new CORBA::Any (CORBA::_tc_boolean, retval, CORBA::B_TRUE);
-  req.result (any, env);
-}
-
diff --git a/TAO/orbsvcs/lib/RtecEventCommS.h b/TAO/orbsvcs/lib/RtecEventCommS.h
deleted file mode 100644
index bee4b6dc89c..00000000000
--- a/TAO/orbsvcs/lib/RtecEventCommS.h
+++ /dev/null
@@ -1,57 +0,0 @@
-// ******  Code generated by the The ACE ORB (TAO) IDL Compiler *******
-// TAO ORB and the TAO IDL Compiler have been developed by Washington 
-// University Computer Science's Distributed Object Computing Group.
-//
-// Information on TAO is available at
-//                 http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#if !defined (_TAO_IDL_RTECEVENTCOMMS_H_)
-#define _TAO_IDL_RTECEVENTCOMMS_H_
-
-#include "RtecEventCommC.h"
-
-class POA_RtecEventComm
-{
-public:
-  class PushConsumer;
-  typedef PushConsumer *PushConsumer_ptr;
-  class PushConsumer : public virtual RtecEventComm::PushConsumer
-  {
-  protected:
-    PushConsumer (const char *obj_name = 0);
-    virtual ~PushConsumer (void);
-  public:
-    virtual void push (const RtecEventComm::EventSet &data,  CORBA::Environment &env) = 0; // pure virtual
-    static void push_skel (CORBA::ServerRequest &req, CORBA::Object_ptr obj, CORBA::Environment &env);
-
-    virtual void disconnect_push_consumer ( CORBA::Environment &env) = 0; // pure virtual
-    static void disconnect_push_consumer_skel (CORBA::ServerRequest &req, CORBA::Object_ptr obj, CORBA::Environment &env);
-
-    static void _is_a_skel (CORBA::ServerRequest &req, CORBA::Object_ptr obj, CORBA::Environment &env);
-
-  };
-
-  class PushSupplier;
-  typedef PushSupplier *PushSupplier_ptr;
-  class PushSupplier : public virtual RtecEventComm::PushSupplier
-  {
-  protected:
-    PushSupplier (const char *obj_name = 0);
-    virtual ~PushSupplier (void);
-  public:
-    virtual void disconnect_push_supplier ( CORBA::Environment &env) = 0; // pure virtual
-    static void disconnect_push_supplier_skel (CORBA::ServerRequest &req, CORBA::Object_ptr obj, CORBA::Environment &env);
-
-    static void _is_a_skel (CORBA::ServerRequest &req, CORBA::Object_ptr obj, CORBA::Environment &env);
-
-  };
-
-};
-
-
-#if defined (__ACE_INLINE__)
-#include "RtecEventCommS.i"
-#endif // defined INLINE
-
-
-#endif // if !defined
diff --git a/TAO/orbsvcs/lib/RtecEventCommS.i b/TAO/orbsvcs/lib/RtecEventCommS.i
deleted file mode 100644
index 3d902c27c7f..00000000000
--- a/TAO/orbsvcs/lib/RtecEventCommS.i
+++ /dev/null
@@ -1,17 +0,0 @@
-// ******  Code generated by the The ACE ORB (TAO) IDL Compiler *******
-// TAO ORB and the TAO IDL Compiler have been developed by Washington 
-// University Computer Science's Distributed Object Computing Group.
-//
-// Information on TAO is available at
-//                 http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// skeleton destructor
-ACE_INLINE
-POA_RtecEventComm::PushConsumer::~PushConsumer (void)
-{
-}
-// skeleton destructor
-ACE_INLINE
-POA_RtecEventComm::PushSupplier::~PushSupplier (void)
-{
-}
diff --git a/TAO/orbsvcs/lib/RtecScheduler.idl b/TAO/orbsvcs/lib/RtecScheduler.idl
deleted file mode 100644
index e0d2ea9fa0f..00000000000
--- a/TAO/orbsvcs/lib/RtecScheduler.idl
+++ /dev/null
@@ -1,222 +0,0 @@
-//
-// $Id$
-//
-
-module RtecScheduler {
-
-  // TODO: Use the COS Time Service TimeT type.
-  typedef double Time;
-  typedef long Period;
-  typedef Time Quantum;
-
-  const long NO_QUANTUM = 0;
-
-  //
-  // TODO: This differ from the ones documented in the TAO paper,
-  // namely:
-  // INTERRUPT
-  // IO_SERVICE
-  // CRITICAL
-  // HARD_DEADLINE
-  // BACKGROUND
-  // Notice that the order is inverted and, of course, the names don't
-  // match.
-  // 
-  enum Importance {
-    VERY_LOW,
-    LOW,
-    MEDIUM,
-    HIGH,
-    VERY_HIGH
-  };
-
-  typedef long handle_t;
-  // RT_Info's are assignned per-application unique identifiers.
-  
-  struct Dependency_Info {
-    long number_of_calls;
-    handle_t rt_info;
-    // Notice the reference to the RT_Info we depend on.
-  };
-
-  typedef sequence<Dependency_Info> Dependency_Set;
-
-  typedef long OS_Priority;
-  typedef long Sub_Priority;
-  typedef long Preemption_Priority;
-
-  struct RT_Info
-    // = TITLE
-    //   Describes the QoS for an "operation".
-    //
-    // = DESCRIPTION
-    //   The CPU requirements and QoS for each "entity" implementing
-    //   an application operation is described by the following
-    //   information.
-  {
-    // Application defined string that uniquely identifies the
-    // operation.
-    string entry_point;
-
-    // The scheduler defined unique identifier.
-    handle_t handle;
-
-    // Execution times
-    Time worst_case_execution_time;
-    Time typical_execution_time;
-
-    // To account for server data caching.
-    Time cached_execution_time;
-
-    // For rate operations this defines the period of the rate.
-    // 0 means "completely pasive", i.e., this operation only executes
-    // when called.
-    Period period;
-
-    // Operation importance (used to "break ties").
-    Importance importance;
-
-    // For time-slicing (for BACKGROUND operations only).
-    Quantum quantum;
-
-    // The following attributes are defined by the Scheduler once the
-    // off-line scheduling is computed.
-
-    // The number of threads that will execute this operation?
-    // TODO: clarify this.
-    long threads;
-
-    // The operations we depend upon.
-    Dependency_Set dependencies;
-
-    // The OS por processing the events generated from this RT_Info.
-    OS_Priority priority;
-
-    // For ordering RT_Info's with equal priority.
-    Sub_Priority subpriority;
-
-    // The queue number for this RT_Info.
-    Preemption_Priority preemption_priority;
-  };
-
-  exception DUPLICATE_NAME {};
-  // The application is trying to register the same task again.
-
-  exception UNKNOWN_TASK {};
-  // The RT_Info handle was not valid.
-
-  exception NOT_SCHEDULED {};
-  // The application is trying to obtain scheduling information, but
-  // none is available.
-
-  exception UTILIZATION_BOUND_EXCEEDED {};
-  exception INSUFFICIENT_THREAD_PRIORITY_LEVELS {};
-  exception TASK_COUNT_MISMATCH {};
-  // Problems while computing off-line scheduling.
-
-  typedef sequence<RT_Info> RT_Info_Set;
-
-  // TODO: Find a reasonable name for this interface, maybe we should
-  // change the name of the module to RtecSchedulerAdmin and name this
-  // Scheduler 
-  interface Scheduler
-    // = DESCRIPTION
-    //   This class holds all the RT_Info's for a single application.
-    //   During the configuration run this will be implemented as a
-    //   single remote object, whose services are used by the
-    //   suppliers, consumers and the EC.
-    //   At run-time each process will hold a copy of the compiled
-    //   version of the Scheduler, using the precomputed data to
-    //   resolve requests (avoiding any remote calls) and ignoring any
-    //   requests for modifying its state.
-    //   A Factory class will be used to choose the proper
-    //   implementation.
-    //
-    //   This class must be registered with the naming service using a
-    //   well known name ("Scheduler" seems the obvious choice), the
-    //   Naming Context will account for different applications and
-    //   modes.
-    //
-    //   Once the scheduling data is computed it can be retrieved
-    //   remotely to generate the code for the run-time version.
-  {
-    handle_t create (in string entry_point) raises (DUPLICATE_NAME);
-    // Creates a new RT_Info entry for the function identifier
-    // "entry_point", it can be any string, but the fully qualified
-    // name function name is suggested.
-    // Returns a handle to the RT_Info. 
-
-    handle_t lookup (in string entry_point);
-    // Lookups a handle for entry_point.
-    // TODO: Should we add INVALID_HANDLE or raise an exception?
-
-    RT_Info get (in handle_t handle) raises (UNKNOWN_TASK);
-    // Retrieve information about an RT_Info.
-
-    void set (in handle_t handle,
-	      in Time time,
-	      in Time typical_time,
-	      in Time cached_time,
-	      in Period period,
-	      in Importance importance,
-	      in Quantum quantum,
-	      in long threads)
-      raises (UNKNOWN_TASK);
-    // Set the attributes of an RT_Info.
-    // Notice that some values may not be modified (like priority).
-
-    void add_dependency (in handle_t handle,
-			 in handle_t dependency,
-			 in long number_of_calls)
-      raises (UNKNOWN_TASK);
-    // Adds <dependency> to <handle>
-
-    void priority (in handle_t handle,
-		       out OS_Priority priority,
-		       out Sub_Priority subpriority,
-		       out Preemption_Priority p_priority)
-      raises (UNKNOWN_TASK, NOT_SCHEDULED);
-    void entry_point_priority (in string entry_point,
-			       out OS_Priority priority,
-			       out Sub_Priority subpriority,
-			       out Preemption_Priority p_priority)
-      raises (UNKNOWN_TASK, NOT_SCHEDULED);
-    // Obtain the run time priorities.
-    // TODO: Do we need the two interfaces or is it simply confusing?
-    // If we should to keep only the <handle> version: Are the extra
-    // round-trips too expensive?
-    // If we choose only the <entry_point> version: Are the copies for
-    // the string affordable?
-
-    void compute_scheduling (in long minimum_priority,
-			     in long maximum_priority,
-			     out RT_Info_Set infos)
-      raises (UTILIZATION_BOUND_EXCEEDED,
-	      INSUFFICIENT_THREAD_PRIORITY_LEVELS,
-	      TASK_COUNT_MISMATCH);
-    // Computes the scheduling priorities, returns the RT_Info's with
-    // their priorities properly filled.
-    // This info can be cached by a Run_Time_Scheduler service or
-    // dumped into a C++ file for compilation and even faster (static)
-    // lookup.
-
-    // TODO: The dependencies field can be removed from the RT_Info
-    // and made part of the secrets of "Application", adding the
-    // following to satisfy curious clients:
-    //
-    // struct Dependency {
-    //   long number_of_calls;
-    //   handle_t dependency;
-    // };
-    // typedef sequence<Dependency> Dependency_Set;
-    // 
-    // Dependency_Set dependencies (in handle_t handle)
-    //    raises (UNKNOWN_TASK);
-    // Returns the list of dependencies
-    // 
-    // long number_of_dependencies (in handle_t handle)
-    //    raises (UNKNOWN_TASK);
-    // Returns the number of dependencies.
-
-  };
-};
diff --git a/TAO/orbsvcs/lib/RtecSchedulerC.cpp b/TAO/orbsvcs/lib/RtecSchedulerC.cpp
deleted file mode 100644
index 6e06941c72f..00000000000
--- a/TAO/orbsvcs/lib/RtecSchedulerC.cpp
+++ /dev/null
@@ -1,1055 +0,0 @@
-// ******  Code generated by the The ACE ORB (TAO) IDL Compiler *******
-// TAO ORB and the TAO IDL Compiler have been developed by Washington 
-// University Computer Science's Distributed Object Computing Group.
-//
-// Information on TAO is available at
-//                 http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#include "RtecSchedulerC.h"
-
-#if !defined (__ACE_INLINE__)
-#include "RtecSchedulerC.i"
-#endif // !defined INLINE
-
-static const CORBA::Long _oc_RtecScheduler_Time[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  27, 0x49444c3a, 0x52746563, 0x53636865, 0x64756c65, 0x722f5469, 0x6d653a31, 0x2e300000,  // repository ID = IDL:RtecScheduler/Time:1.0
-  5, 0x54696d65, 0x0,  // name = Time
-  CORBA::tk_double,
-
-};
-static CORBA::TypeCode _tc__tc_RtecScheduler_Time (CORBA::tk_alias, sizeof (_oc_RtecScheduler_Time), (unsigned char *) &_oc_RtecScheduler_Time, CORBA::B_FALSE);
-CORBA::TypeCode_ptr RtecScheduler::_tc_Time = &_tc__tc_RtecScheduler_Time;
-
-static const CORBA::Long _oc_RtecScheduler_Period[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  29, 0x49444c3a, 0x52746563, 0x53636865, 0x64756c65, 0x722f5065, 0x72696f64, 0x3a312e30, 0x0,  // repository ID = IDL:RtecScheduler/Period:1.0
-  7, 0x50657269, 0x6f640000,  // name = Period
-  CORBA::tk_long,
-
-};
-static CORBA::TypeCode _tc__tc_RtecScheduler_Period (CORBA::tk_alias, sizeof (_oc_RtecScheduler_Period), (unsigned char *) &_oc_RtecScheduler_Period, CORBA::B_FALSE);
-CORBA::TypeCode_ptr RtecScheduler::_tc_Period = &_tc__tc_RtecScheduler_Period;
-
-static const CORBA::Long _oc_RtecScheduler_Quantum[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  30, 0x49444c3a, 0x52746563, 0x53636865, 0x64756c65, 0x722f5175, 0x616e7475, 0x6d3a312e, 0x30000000,  // repository ID = IDL:RtecScheduler/Quantum:1.0
-  8, 0x5175616e, 0x74756d00,  // name = Quantum
-  CORBA::tk_alias, // typecode kind for typedefs
-  52, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    27, 0x49444c3a, 0x52746563, 0x53636865, 0x64756c65, 0x722f5469, 0x6d653a31, 0x2e300000,  // repository ID = IDL:RtecScheduler/Time:1.0
-    5, 0x54696d65, 0x0,  // name = Time
-    CORBA::tk_double,
-
-};
-static CORBA::TypeCode _tc__tc_RtecScheduler_Quantum (CORBA::tk_alias, sizeof (_oc_RtecScheduler_Quantum), (unsigned char *) &_oc_RtecScheduler_Quantum, CORBA::B_FALSE);
-CORBA::TypeCode_ptr RtecScheduler::_tc_Quantum = &_tc__tc_RtecScheduler_Quantum;
-
-const CORBA::Long RtecScheduler::NO_QUANTUM = 0;
-
-
-static const CORBA::Long _oc_RtecScheduler_Importance[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  33, 0x49444c3a, 0x52746563, 0x53636865, 0x64756c65, 0x722f496d, 0x706f7274, 0x616e6365, 0x3a312e30, 0x0,  // repository ID = IDL:RtecScheduler/Importance:1.0
-  11, 0x496d706f, 0x7274616e, 0x63650000,  // name = Importance
-  5, // member count
-    9, 0x56455259, 0x5f4c4f57, 0x0,  // name = VERY_LOW
-    4, 0x4c4f5700,  // name = LOW
-    7, 0x4d454449, 0x554d0000,  // name = MEDIUM
-    5, 0x48494748, 0x0,  // name = HIGH
-    10, 0x56455259, 0x5f484947, 0x48000000,  // name = VERY_HIGH
-};
-static CORBA::TypeCode _tc__tc_RtecScheduler_Importance (CORBA::tk_enum, sizeof (_oc_RtecScheduler_Importance), (unsigned char *) &_oc_RtecScheduler_Importance, CORBA::B_FALSE);
-CORBA::TypeCode_ptr RtecScheduler::_tc_Importance = &_tc__tc_RtecScheduler_Importance;
-
-static const CORBA::Long _oc_RtecScheduler_handle_t[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  31, 0x49444c3a, 0x52746563, 0x53636865, 0x64756c65, 0x722f6861, 0x6e646c65, 0x5f743a31, 0x2e300000,  // repository ID = IDL:RtecScheduler/handle_t:1.0
-  9, 0x68616e64, 0x6c655f74, 0x0,  // name = handle_t
-  CORBA::tk_long,
-
-};
-static CORBA::TypeCode _tc__tc_RtecScheduler_handle_t (CORBA::tk_alias, sizeof (_oc_RtecScheduler_handle_t), (unsigned char *) &_oc_RtecScheduler_handle_t, CORBA::B_FALSE);
-CORBA::TypeCode_ptr RtecScheduler::_tc_handle_t = &_tc__tc_RtecScheduler_handle_t;
-
-static const CORBA::Long _oc_RtecScheduler_Dependency_Info[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  38, 0x49444c3a, 0x52746563, 0x53636865, 0x64756c65, 0x722f4465, 0x70656e64, 0x656e6379, 0x5f496e66, 0x6f3a312e, 0x30000000,  // repository ID = IDL:RtecScheduler/Dependency_Info:1.0
-  16, 0x44657065, 0x6e64656e, 0x63795f49, 0x6e666f00,  // name = Dependency_Info
-  2, // member count
-    16, 0x6e756d62, 0x65725f6f, 0x665f6361, 0x6c6c7300,  // name = number_of_calls
-    CORBA::tk_long,
-
-    8, 0x72745f69, 0x6e666f00,  // name = rt_info
-    CORBA::tk_alias, // typecode kind for typedefs
-    60, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      31, 0x49444c3a, 0x52746563, 0x53636865, 0x64756c65, 0x722f6861, 0x6e646c65, 0x5f743a31, 0x2e300000,  // repository ID = IDL:RtecScheduler/handle_t:1.0
-      9, 0x68616e64, 0x6c655f74, 0x0,  // name = handle_t
-      CORBA::tk_long,
-
-};
-static CORBA::TypeCode _tc__tc_RtecScheduler_Dependency_Info (CORBA::tk_struct, sizeof (_oc_RtecScheduler_Dependency_Info), (unsigned char *) &_oc_RtecScheduler_Dependency_Info, CORBA::B_FALSE);
-CORBA::TypeCode_ptr RtecScheduler::_tc_Dependency_Info = &_tc__tc_RtecScheduler_Dependency_Info;
-
-// *************************************************************
-// class RtecScheduler::_tao__seq_Dependency_Set
-// *************************************************************
-
-// copy constructor
-RtecScheduler::_tao__seq_Dependency_Set::_tao__seq_Dependency_Set (const RtecScheduler::_tao__seq_Dependency_Set &seq)
-	: maximum_ (seq.maximum_),
-	  length_ (seq.length_),
-	  buffer_ (RtecScheduler::_tao__seq_Dependency_Set::allocbuf (seq.maximum_)),
-	  release_ (1) // we always own it
-{
-  for (CORBA::ULong i=0; i < seq.length_; i++)
-  	this->buffer_[i] = seq.buffer_[i];
-}
-
-// destructor
-RtecScheduler::_tao__seq_Dependency_Set::~_tao__seq_Dependency_Set (void)
-{
-  if (this->release_) // we own the buffer
-  {
-    RtecScheduler::_tao__seq_Dependency_Set::freebuf (this->buffer_);
-  }
-}
-
-// assignment operator
-RtecScheduler::_tao__seq_Dependency_Set& 
-RtecScheduler::_tao__seq_Dependency_Set::operator= (const RtecScheduler::_tao__seq_Dependency_Set &seq)
-{
-  if (this == &seq) return *this;
-  if (this->release_)
-  {
-    RtecScheduler::_tao__seq_Dependency_Set::freebuf (this->buffer_);
-  }
-  this->length_ = seq.length_;
-  this->maximum_ = seq.maximum_;
-  this->buffer_ = RtecScheduler::_tao__seq_Dependency_Set::allocbuf (seq.maximum_),
-  this->release_ =1; // we always own it
-  for (CORBA::ULong i=0; i < seq.length_; i++)
-  	this->buffer_[i] = seq.buffer_[i];
-  return *this;
-}
-
-void
-RtecScheduler::_tao__seq_Dependency_Set::length (CORBA::ULong length)
-{
-  if (length > this->maximum_)
-  {
-    RtecScheduler::Dependency_Info *tmp = RtecScheduler::_tao__seq_Dependency_Set::allocbuf (length);
-    if (tmp == 0)
-      return;
-    for (int i = 0; i < this->length_; ++i)
-    {
-      tmp[i] = this->buffer_[i];
-    }
-    if (this->release_)
-      RtecScheduler::_tao__seq_Dependency_Set::freebuf (this->buffer_);
-    this->buffer_ = tmp;
-    this->release_ = 1;
-    this->maximum_ = length;
-  }
-this->length_ = length;
-}
-
-static const CORBA::Long _oc_RtecScheduler__tao__seq_Dependency_Set[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_struct, // typecode kind
-  176, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    38, 0x49444c3a, 0x52746563, 0x53636865, 0x64756c65, 0x722f4465, 0x70656e64, 0x656e6379, 0x5f496e66, 0x6f3a312e, 0x30000000,  // repository ID = IDL:RtecScheduler/Dependency_Info:1.0
-    16, 0x44657065, 0x6e64656e, 0x63795f49, 0x6e666f00,  // name = Dependency_Info
-    2, // member count
-      16, 0x6e756d62, 0x65725f6f, 0x665f6361, 0x6c6c7300,  // name = number_of_calls
-      CORBA::tk_long,
-
-      8, 0x72745f69, 0x6e666f00,  // name = rt_info
-      CORBA::tk_alias, // typecode kind for typedefs
-      60, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        31, 0x49444c3a, 0x52746563, 0x53636865, 0x64756c65, 0x722f6861, 0x6e646c65, 0x5f743a31, 0x2e300000,  // repository ID = IDL:RtecScheduler/handle_t:1.0
-        9, 0x68616e64, 0x6c655f74, 0x0,  // name = handle_t
-        CORBA::tk_long,
-
-    0,
-};
-static CORBA::TypeCode _tc__tc_RtecScheduler__tao__seq_Dependency_Set (CORBA::tk_sequence, sizeof (_oc_RtecScheduler__tao__seq_Dependency_Set), (unsigned char *) &_oc_RtecScheduler__tao__seq_Dependency_Set, CORBA::B_FALSE);
-CORBA::TypeCode_ptr RtecScheduler::_tc__tao__seq_Dependency_Set = &_tc__tc_RtecScheduler__tao__seq_Dependency_Set;
-
-static const CORBA::Long _oc_RtecScheduler_Dependency_Set[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  37, 0x49444c3a, 0x52746563, 0x53636865, 0x64756c65, 0x722f4465, 0x70656e64, 0x656e6379, 0x5f536574, 0x3a312e30, 0x0,  // repository ID = IDL:RtecScheduler/Dependency_Set:1.0
-  15, 0x44657065, 0x6e64656e, 0x63795f53, 0x65740000,  // name = Dependency_Set
-  CORBA::tk_sequence, // typecode kind
-  200, // encapsulation length
-  TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_struct, // typecode kind
-  176, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    38, 0x49444c3a, 0x52746563, 0x53636865, 0x64756c65, 0x722f4465, 0x70656e64, 0x656e6379, 0x5f496e66, 0x6f3a312e, 0x30000000,  // repository ID = IDL:RtecScheduler/Dependency_Info:1.0
-    16, 0x44657065, 0x6e64656e, 0x63795f49, 0x6e666f00,  // name = Dependency_Info
-    2, // member count
-      16, 0x6e756d62, 0x65725f6f, 0x665f6361, 0x6c6c7300,  // name = number_of_calls
-      CORBA::tk_long,
-
-      8, 0x72745f69, 0x6e666f00,  // name = rt_info
-      CORBA::tk_alias, // typecode kind for typedefs
-      60, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        31, 0x49444c3a, 0x52746563, 0x53636865, 0x64756c65, 0x722f6861, 0x6e646c65, 0x5f743a31, 0x2e300000,  // repository ID = IDL:RtecScheduler/handle_t:1.0
-        9, 0x68616e64, 0x6c655f74, 0x0,  // name = handle_t
-        CORBA::tk_long,
-
-    0,
-};
-static CORBA::TypeCode _tc__tc_RtecScheduler_Dependency_Set (CORBA::tk_alias, sizeof (_oc_RtecScheduler_Dependency_Set), (unsigned char *) &_oc_RtecScheduler_Dependency_Set, CORBA::B_FALSE);
-CORBA::TypeCode_ptr RtecScheduler::_tc_Dependency_Set = &_tc__tc_RtecScheduler_Dependency_Set;
-
-static const CORBA::Long _oc_RtecScheduler_OS_Priority[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  34, 0x49444c3a, 0x52746563, 0x53636865, 0x64756c65, 0x722f4f53, 0x5f507269, 0x6f726974, 0x793a312e, 0x30000000,  // repository ID = IDL:RtecScheduler/OS_Priority:1.0
-  12, 0x4f535f50, 0x72696f72, 0x69747900,  // name = OS_Priority
-  CORBA::tk_long,
-
-};
-static CORBA::TypeCode _tc__tc_RtecScheduler_OS_Priority (CORBA::tk_alias, sizeof (_oc_RtecScheduler_OS_Priority), (unsigned char *) &_oc_RtecScheduler_OS_Priority, CORBA::B_FALSE);
-CORBA::TypeCode_ptr RtecScheduler::_tc_OS_Priority = &_tc__tc_RtecScheduler_OS_Priority;
-
-static const CORBA::Long _oc_RtecScheduler_Sub_Priority[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  35, 0x49444c3a, 0x52746563, 0x53636865, 0x64756c65, 0x722f5375, 0x625f5072, 0x696f7269, 0x74793a31, 0x2e300000,  // repository ID = IDL:RtecScheduler/Sub_Priority:1.0
-  13, 0x5375625f, 0x5072696f, 0x72697479, 0x0,  // name = Sub_Priority
-  CORBA::tk_long,
-
-};
-static CORBA::TypeCode _tc__tc_RtecScheduler_Sub_Priority (CORBA::tk_alias, sizeof (_oc_RtecScheduler_Sub_Priority), (unsigned char *) &_oc_RtecScheduler_Sub_Priority, CORBA::B_FALSE);
-CORBA::TypeCode_ptr RtecScheduler::_tc_Sub_Priority = &_tc__tc_RtecScheduler_Sub_Priority;
-
-static const CORBA::Long _oc_RtecScheduler_Preemption_Priority[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  42, 0x49444c3a, 0x52746563, 0x53636865, 0x64756c65, 0x722f5072, 0x65656d70, 0x74696f6e, 0x5f507269, 0x6f726974, 0x793a312e, 0x30000000,  // repository ID = IDL:RtecScheduler/Preemption_Priority:1.0
-  20, 0x50726565, 0x6d707469, 0x6f6e5f50, 0x72696f72, 0x69747900,  // name = Preemption_Priority
-  CORBA::tk_long,
-
-};
-static CORBA::TypeCode _tc__tc_RtecScheduler_Preemption_Priority (CORBA::tk_alias, sizeof (_oc_RtecScheduler_Preemption_Priority), (unsigned char *) &_oc_RtecScheduler_Preemption_Priority, CORBA::B_FALSE);
-CORBA::TypeCode_ptr RtecScheduler::_tc_Preemption_Priority = &_tc__tc_RtecScheduler_Preemption_Priority;
-
-static const CORBA::Long _oc_RtecScheduler_RT_Info[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  30, 0x49444c3a, 0x52746563, 0x53636865, 0x64756c65, 0x722f5254, 0x5f496e66, 0x6f3a312e, 0x30000000,  // repository ID = IDL:RtecScheduler/RT_Info:1.0
-  8, 0x52545f49, 0x6e666f00,  // name = RT_Info
-  13, // member count
-    12, 0x656e7472, 0x795f706f, 0x696e7400,  // name = entry_point
-    CORBA::tk_string, 
-    0, // string length
-        7, 0x68616e64, 0x6c650000,  // name = handle
-    CORBA::tk_alias, // typecode kind for typedefs
-    60, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      31, 0x49444c3a, 0x52746563, 0x53636865, 0x64756c65, 0x722f6861, 0x6e646c65, 0x5f743a31, 0x2e300000,  // repository ID = IDL:RtecScheduler/handle_t:1.0
-      9, 0x68616e64, 0x6c655f74, 0x0,  // name = handle_t
-      CORBA::tk_long,
-
-    26, 0x776f7273, 0x745f6361, 0x73655f65, 0x78656375, 0x74696f6e, 0x5f74696d, 0x65000000,  // name = worst_case_execution_time
-    CORBA::tk_alias, // typecode kind for typedefs
-    52, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      27, 0x49444c3a, 0x52746563, 0x53636865, 0x64756c65, 0x722f5469, 0x6d653a31, 0x2e300000,  // repository ID = IDL:RtecScheduler/Time:1.0
-      5, 0x54696d65, 0x0,  // name = Time
-      CORBA::tk_double,
-
-    23, 0x74797069, 0x63616c5f, 0x65786563, 0x7574696f, 0x6e5f7469, 0x6d650000,  // name = typical_execution_time
-    CORBA::tk_alias, // typecode kind for typedefs
-    52, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      27, 0x49444c3a, 0x52746563, 0x53636865, 0x64756c65, 0x722f5469, 0x6d653a31, 0x2e300000,  // repository ID = IDL:RtecScheduler/Time:1.0
-      5, 0x54696d65, 0x0,  // name = Time
-      CORBA::tk_double,
-
-    22, 0x63616368, 0x65645f65, 0x78656375, 0x74696f6e, 0x5f74696d, 0x65000000,  // name = cached_execution_time
-    CORBA::tk_alias, // typecode kind for typedefs
-    52, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      27, 0x49444c3a, 0x52746563, 0x53636865, 0x64756c65, 0x722f5469, 0x6d653a31, 0x2e300000,  // repository ID = IDL:RtecScheduler/Time:1.0
-      5, 0x54696d65, 0x0,  // name = Time
-      CORBA::tk_double,
-
-    7, 0x70657269, 0x6f640000,  // name = period
-    CORBA::tk_alias, // typecode kind for typedefs
-    56, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      29, 0x49444c3a, 0x52746563, 0x53636865, 0x64756c65, 0x722f5065, 0x72696f64, 0x3a312e30, 0x0,  // repository ID = IDL:RtecScheduler/Period:1.0
-      7, 0x50657269, 0x6f640000,  // name = Period
-      CORBA::tk_long,
-
-    11, 0x696d706f, 0x7274616e, 0x63650000,  // name = importance
-    CORBA::tk_enum, // typecode kind
-    128, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    33, 0x49444c3a, 0x52746563, 0x53636865, 0x64756c65, 0x722f496d, 0x706f7274, 0x616e6365, 0x3a312e30, 0x0,  // repository ID = IDL:RtecScheduler/Importance:1.0
-    11, 0x496d706f, 0x7274616e, 0x63650000,  // name = Importance
-    5, // member count
-      9, 0x56455259, 0x5f4c4f57, 0x0,  // name = VERY_LOW
-      4, 0x4c4f5700,  // name = LOW
-      7, 0x4d454449, 0x554d0000,  // name = MEDIUM
-      5, 0x48494748, 0x0,  // name = HIGH
-      10, 0x56455259, 0x5f484947, 0x48000000,  // name = VERY_HIGH
-    8, 0x7175616e, 0x74756d00,  // name = quantum
-    CORBA::tk_alias, // typecode kind for typedefs
-    112, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      30, 0x49444c3a, 0x52746563, 0x53636865, 0x64756c65, 0x722f5175, 0x616e7475, 0x6d3a312e, 0x30000000,  // repository ID = IDL:RtecScheduler/Quantum:1.0
-      8, 0x5175616e, 0x74756d00,  // name = Quantum
-      CORBA::tk_alias, // typecode kind for typedefs
-      52, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        27, 0x49444c3a, 0x52746563, 0x53636865, 0x64756c65, 0x722f5469, 0x6d653a31, 0x2e300000,  // repository ID = IDL:RtecScheduler/Time:1.0
-        5, 0x54696d65, 0x0,  // name = Time
-        CORBA::tk_double,
-
-    8, 0x74687265, 0x61647300,  // name = threads
-    CORBA::tk_long,
-
-    13, 0x64657065, 0x6e64656e, 0x63696573, 0x0,  // name = dependencies
-    CORBA::tk_alias, // typecode kind for typedefs
-    268, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      37, 0x49444c3a, 0x52746563, 0x53636865, 0x64756c65, 0x722f4465, 0x70656e64, 0x656e6379, 0x5f536574, 0x3a312e30, 0x0,  // repository ID = IDL:RtecScheduler/Dependency_Set:1.0
-      15, 0x44657065, 0x6e64656e, 0x63795f53, 0x65740000,  // name = Dependency_Set
-      CORBA::tk_sequence, // typecode kind
-      200, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-            CORBA::tk_struct, // typecode kind
-      176, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        38, 0x49444c3a, 0x52746563, 0x53636865, 0x64756c65, 0x722f4465, 0x70656e64, 0x656e6379, 0x5f496e66, 0x6f3a312e, 0x30000000,  // repository ID = IDL:RtecScheduler/Dependency_Info:1.0
-        16, 0x44657065, 0x6e64656e, 0x63795f49, 0x6e666f00,  // name = Dependency_Info
-        2, // member count
-          16, 0x6e756d62, 0x65725f6f, 0x665f6361, 0x6c6c7300,  // name = number_of_calls
-          CORBA::tk_long,
-
-          8, 0x72745f69, 0x6e666f00,  // name = rt_info
-          CORBA::tk_alias, // typecode kind for typedefs
-          60, // encapsulation length
-            TAO_ENCAP_BYTE_ORDER, // byte order
-            31, 0x49444c3a, 0x52746563, 0x53636865, 0x64756c65, 0x722f6861, 0x6e646c65, 0x5f743a31, 0x2e300000,  // repository ID = IDL:RtecScheduler/handle_t:1.0
-            9, 0x68616e64, 0x6c655f74, 0x0,  // name = handle_t
-            CORBA::tk_long,
-
-            0,
-    9, 0x7072696f, 0x72697479, 0x0,  // name = priority
-    CORBA::tk_alias, // typecode kind for typedefs
-    64, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      34, 0x49444c3a, 0x52746563, 0x53636865, 0x64756c65, 0x722f4f53, 0x5f507269, 0x6f726974, 0x793a312e, 0x30000000,  // repository ID = IDL:RtecScheduler/OS_Priority:1.0
-      12, 0x4f535f50, 0x72696f72, 0x69747900,  // name = OS_Priority
-      CORBA::tk_long,
-
-    12, 0x73756270, 0x72696f72, 0x69747900,  // name = subpriority
-    CORBA::tk_alias, // typecode kind for typedefs
-    68, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      35, 0x49444c3a, 0x52746563, 0x53636865, 0x64756c65, 0x722f5375, 0x625f5072, 0x696f7269, 0x74793a31, 0x2e300000,  // repository ID = IDL:RtecScheduler/Sub_Priority:1.0
-      13, 0x5375625f, 0x5072696f, 0x72697479, 0x0,  // name = Sub_Priority
-      CORBA::tk_long,
-
-    20, 0x70726565, 0x6d707469, 0x6f6e5f70, 0x72696f72, 0x69747900,  // name = preemption_priority
-    CORBA::tk_alias, // typecode kind for typedefs
-    80, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      42, 0x49444c3a, 0x52746563, 0x53636865, 0x64756c65, 0x722f5072, 0x65656d70, 0x74696f6e, 0x5f507269, 0x6f726974, 0x793a312e, 0x30000000,  // repository ID = IDL:RtecScheduler/Preemption_Priority:1.0
-      20, 0x50726565, 0x6d707469, 0x6f6e5f50, 0x72696f72, 0x69747900,  // name = Preemption_Priority
-      CORBA::tk_long,
-
-};
-static CORBA::TypeCode _tc__tc_RtecScheduler_RT_Info (CORBA::tk_struct, sizeof (_oc_RtecScheduler_RT_Info), (unsigned char *) &_oc_RtecScheduler_RT_Info, CORBA::B_FALSE);
-CORBA::TypeCode_ptr RtecScheduler::_tc_RT_Info = &_tc__tc_RtecScheduler_RT_Info;
-
-static const CORBA::Long _oc_RtecScheduler_DUPLICATE_NAME[] =
-{
-  0, // byte order
-  37, 0x49444c3a, 0x52746563, 0x53636865, 0x64756c65, 0x722f4455, 0x504c4943, 0x4154455f, 0x4e414d45, 0x3a312e30, 0x0,  // repository ID = IDL:RtecScheduler/DUPLICATE_NAME:1.0
-  15, 0x4455504c, 0x49434154, 0x455f4e41, 0x4d450000,  // name = DUPLICATE_NAME
-  0, // member count
-};
-static CORBA::TypeCode _tc__tc_RtecScheduler_DUPLICATE_NAME (CORBA::tk_struct, sizeof (_oc_RtecScheduler_DUPLICATE_NAME), (unsigned char *) &_oc_RtecScheduler_DUPLICATE_NAME, CORBA::B_FALSE);
-CORBA::TypeCode_ptr RtecScheduler::_tc_DUPLICATE_NAME = &_tc__tc_RtecScheduler_DUPLICATE_NAME;
-
-static const CORBA::Long _oc_RtecScheduler_UNKNOWN_TASK[] =
-{
-  0, // byte order
-  35, 0x49444c3a, 0x52746563, 0x53636865, 0x64756c65, 0x722f554e, 0x4b4e4f57, 0x4e5f5441, 0x534b3a31, 0x2e300000,  // repository ID = IDL:RtecScheduler/UNKNOWN_TASK:1.0
-  13, 0x554e4b4e, 0x4f574e5f, 0x5441534b, 0x0,  // name = UNKNOWN_TASK
-  0, // member count
-};
-static CORBA::TypeCode _tc__tc_RtecScheduler_UNKNOWN_TASK (CORBA::tk_struct, sizeof (_oc_RtecScheduler_UNKNOWN_TASK), (unsigned char *) &_oc_RtecScheduler_UNKNOWN_TASK, CORBA::B_FALSE);
-CORBA::TypeCode_ptr RtecScheduler::_tc_UNKNOWN_TASK = &_tc__tc_RtecScheduler_UNKNOWN_TASK;
-
-static const CORBA::Long _oc_RtecScheduler_NOT_SCHEDULED[] =
-{
-  0, // byte order
-  36, 0x49444c3a, 0x52746563, 0x53636865, 0x64756c65, 0x722f4e4f, 0x545f5343, 0x48454455, 0x4c45443a, 0x312e3000,  // repository ID = IDL:RtecScheduler/NOT_SCHEDULED:1.0
-  14, 0x4e4f545f, 0x53434845, 0x44554c45, 0x44000000,  // name = NOT_SCHEDULED
-  0, // member count
-};
-static CORBA::TypeCode _tc__tc_RtecScheduler_NOT_SCHEDULED (CORBA::tk_struct, sizeof (_oc_RtecScheduler_NOT_SCHEDULED), (unsigned char *) &_oc_RtecScheduler_NOT_SCHEDULED, CORBA::B_FALSE);
-CORBA::TypeCode_ptr RtecScheduler::_tc_NOT_SCHEDULED = &_tc__tc_RtecScheduler_NOT_SCHEDULED;
-
-static const CORBA::Long _oc_RtecScheduler_UTILIZATION_BOUND_EXCEEDED[] =
-{
-  0, // byte order
-  49, 0x49444c3a, 0x52746563, 0x53636865, 0x64756c65, 0x722f5554, 0x494c495a, 0x4154494f, 0x4e5f424f, 0x554e445f, 0x45584345, 0x45444544, 0x3a312e30, 0x0,  // repository ID = IDL:RtecScheduler/UTILIZATION_BOUND_EXCEEDED:1.0
-  27, 0x5554494c, 0x495a4154, 0x494f4e5f, 0x424f554e, 0x445f4558, 0x43454544, 0x45440000,  // name = UTILIZATION_BOUND_EXCEEDED
-  0, // member count
-};
-static CORBA::TypeCode _tc__tc_RtecScheduler_UTILIZATION_BOUND_EXCEEDED (CORBA::tk_struct, sizeof (_oc_RtecScheduler_UTILIZATION_BOUND_EXCEEDED), (unsigned char *) &_oc_RtecScheduler_UTILIZATION_BOUND_EXCEEDED, CORBA::B_FALSE);
-CORBA::TypeCode_ptr RtecScheduler::_tc_UTILIZATION_BOUND_EXCEEDED = &_tc__tc_RtecScheduler_UTILIZATION_BOUND_EXCEEDED;
-
-static const CORBA::Long _oc_RtecScheduler_INSUFFICIENT_THREAD_PRIORITY_LEVELS[] =
-{
-  0, // byte order
-  58, 0x49444c3a, 0x52746563, 0x53636865, 0x64756c65, 0x722f494e, 0x53554646, 0x49434945, 0x4e545f54, 0x48524541, 0x445f5052, 0x494f5249, 0x54595f4c, 0x4556454c, 0x533a312e, 0x30000000,  // repository ID = IDL:RtecScheduler/INSUFFICIENT_THREAD_PRIORITY_LEVELS:1.0
-  36, 0x494e5355, 0x46464943, 0x49454e54, 0x5f544852, 0x4541445f, 0x5052494f, 0x52495459, 0x5f4c4556, 0x454c5300,  // name = INSUFFICIENT_THREAD_PRIORITY_LEVELS
-  0, // member count
-};
-static CORBA::TypeCode _tc__tc_RtecScheduler_INSUFFICIENT_THREAD_PRIORITY_LEVELS (CORBA::tk_struct, sizeof (_oc_RtecScheduler_INSUFFICIENT_THREAD_PRIORITY_LEVELS), (unsigned char *) &_oc_RtecScheduler_INSUFFICIENT_THREAD_PRIORITY_LEVELS, CORBA::B_FALSE);
-CORBA::TypeCode_ptr RtecScheduler::_tc_INSUFFICIENT_THREAD_PRIORITY_LEVELS = &_tc__tc_RtecScheduler_INSUFFICIENT_THREAD_PRIORITY_LEVELS;
-
-static const CORBA::Long _oc_RtecScheduler_TASK_COUNT_MISMATCH[] =
-{
-  0, // byte order
-  42, 0x49444c3a, 0x52746563, 0x53636865, 0x64756c65, 0x722f5441, 0x534b5f43, 0x4f554e54, 0x5f4d4953, 0x4d415443, 0x483a312e, 0x30000000,  // repository ID = IDL:RtecScheduler/TASK_COUNT_MISMATCH:1.0
-  20, 0x5441534b, 0x5f434f55, 0x4e545f4d, 0x49534d41, 0x54434800,  // name = TASK_COUNT_MISMATCH
-  0, // member count
-};
-static CORBA::TypeCode _tc__tc_RtecScheduler_TASK_COUNT_MISMATCH (CORBA::tk_struct, sizeof (_oc_RtecScheduler_TASK_COUNT_MISMATCH), (unsigned char *) &_oc_RtecScheduler_TASK_COUNT_MISMATCH, CORBA::B_FALSE);
-CORBA::TypeCode_ptr RtecScheduler::_tc_TASK_COUNT_MISMATCH = &_tc__tc_RtecScheduler_TASK_COUNT_MISMATCH;
-
-// *************************************************************
-// class RtecScheduler::_tao__seq_RT_Info_Set
-// *************************************************************
-
-// copy constructor
-RtecScheduler::_tao__seq_RT_Info_Set::_tao__seq_RT_Info_Set (const RtecScheduler::_tao__seq_RT_Info_Set &seq)
-	: maximum_ (seq.maximum_),
-	  length_ (seq.length_),
-	  buffer_ (RtecScheduler::_tao__seq_RT_Info_Set::allocbuf (seq.maximum_)),
-	  release_ (1) // we always own it
-{
-  for (CORBA::ULong i=0; i < seq.length_; i++)
-  	this->buffer_[i] = seq.buffer_[i];
-}
-
-// destructor
-RtecScheduler::_tao__seq_RT_Info_Set::~_tao__seq_RT_Info_Set (void)
-{
-  if (this->release_) // we own the buffer
-  {
-    RtecScheduler::_tao__seq_RT_Info_Set::freebuf (this->buffer_);
-  }
-}
-
-// assignment operator
-RtecScheduler::_tao__seq_RT_Info_Set& 
-RtecScheduler::_tao__seq_RT_Info_Set::operator= (const RtecScheduler::_tao__seq_RT_Info_Set &seq)
-{
-  if (this == &seq) return *this;
-  if (this->release_)
-  {
-    RtecScheduler::_tao__seq_RT_Info_Set::freebuf (this->buffer_);
-  }
-  this->length_ = seq.length_;
-  this->maximum_ = seq.maximum_;
-  this->buffer_ = RtecScheduler::_tao__seq_RT_Info_Set::allocbuf (seq.maximum_),
-  this->release_ =1; // we always own it
-  for (CORBA::ULong i=0; i < seq.length_; i++)
-  	this->buffer_[i] = seq.buffer_[i];
-  return *this;
-}
-
-void
-RtecScheduler::_tao__seq_RT_Info_Set::length (CORBA::ULong length)
-{
-  if (length > this->maximum_)
-  {
-    RtecScheduler::RT_Info *tmp = RtecScheduler::_tao__seq_RT_Info_Set::allocbuf (length);
-    if (tmp == 0)
-      return;
-    for (int i = 0; i < this->length_; ++i)
-    {
-      tmp[i] = this->buffer_[i];
-    }
-    if (this->release_)
-      RtecScheduler::_tao__seq_RT_Info_Set::freebuf (this->buffer_);
-    this->buffer_ = tmp;
-    this->release_ = 1;
-    this->maximum_ = length;
-  }
-this->length_ = length;
-}
-
-static const CORBA::Long _oc_RtecScheduler__tao__seq_RT_Info_Set[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_struct, // typecode kind
-  1392, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    30, 0x49444c3a, 0x52746563, 0x53636865, 0x64756c65, 0x722f5254, 0x5f496e66, 0x6f3a312e, 0x30000000,  // repository ID = IDL:RtecScheduler/RT_Info:1.0
-    8, 0x52545f49, 0x6e666f00,  // name = RT_Info
-    13, // member count
-      12, 0x656e7472, 0x795f706f, 0x696e7400,  // name = entry_point
-      CORBA::tk_string, 
-      0, // string length
-            7, 0x68616e64, 0x6c650000,  // name = handle
-      CORBA::tk_alias, // typecode kind for typedefs
-      60, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        31, 0x49444c3a, 0x52746563, 0x53636865, 0x64756c65, 0x722f6861, 0x6e646c65, 0x5f743a31, 0x2e300000,  // repository ID = IDL:RtecScheduler/handle_t:1.0
-        9, 0x68616e64, 0x6c655f74, 0x0,  // name = handle_t
-        CORBA::tk_long,
-
-      26, 0x776f7273, 0x745f6361, 0x73655f65, 0x78656375, 0x74696f6e, 0x5f74696d, 0x65000000,  // name = worst_case_execution_time
-      CORBA::tk_alias, // typecode kind for typedefs
-      52, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        27, 0x49444c3a, 0x52746563, 0x53636865, 0x64756c65, 0x722f5469, 0x6d653a31, 0x2e300000,  // repository ID = IDL:RtecScheduler/Time:1.0
-        5, 0x54696d65, 0x0,  // name = Time
-        CORBA::tk_double,
-
-      23, 0x74797069, 0x63616c5f, 0x65786563, 0x7574696f, 0x6e5f7469, 0x6d650000,  // name = typical_execution_time
-      CORBA::tk_alias, // typecode kind for typedefs
-      52, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        27, 0x49444c3a, 0x52746563, 0x53636865, 0x64756c65, 0x722f5469, 0x6d653a31, 0x2e300000,  // repository ID = IDL:RtecScheduler/Time:1.0
-        5, 0x54696d65, 0x0,  // name = Time
-        CORBA::tk_double,
-
-      22, 0x63616368, 0x65645f65, 0x78656375, 0x74696f6e, 0x5f74696d, 0x65000000,  // name = cached_execution_time
-      CORBA::tk_alias, // typecode kind for typedefs
-      52, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        27, 0x49444c3a, 0x52746563, 0x53636865, 0x64756c65, 0x722f5469, 0x6d653a31, 0x2e300000,  // repository ID = IDL:RtecScheduler/Time:1.0
-        5, 0x54696d65, 0x0,  // name = Time
-        CORBA::tk_double,
-
-      7, 0x70657269, 0x6f640000,  // name = period
-      CORBA::tk_alias, // typecode kind for typedefs
-      56, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        29, 0x49444c3a, 0x52746563, 0x53636865, 0x64756c65, 0x722f5065, 0x72696f64, 0x3a312e30, 0x0,  // repository ID = IDL:RtecScheduler/Period:1.0
-        7, 0x50657269, 0x6f640000,  // name = Period
-        CORBA::tk_long,
-
-      11, 0x696d706f, 0x7274616e, 0x63650000,  // name = importance
-      CORBA::tk_enum, // typecode kind
-      128, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      33, 0x49444c3a, 0x52746563, 0x53636865, 0x64756c65, 0x722f496d, 0x706f7274, 0x616e6365, 0x3a312e30, 0x0,  // repository ID = IDL:RtecScheduler/Importance:1.0
-      11, 0x496d706f, 0x7274616e, 0x63650000,  // name = Importance
-      5, // member count
-        9, 0x56455259, 0x5f4c4f57, 0x0,  // name = VERY_LOW
-        4, 0x4c4f5700,  // name = LOW
-        7, 0x4d454449, 0x554d0000,  // name = MEDIUM
-        5, 0x48494748, 0x0,  // name = HIGH
-        10, 0x56455259, 0x5f484947, 0x48000000,  // name = VERY_HIGH
-      8, 0x7175616e, 0x74756d00,  // name = quantum
-      CORBA::tk_alias, // typecode kind for typedefs
-      112, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        30, 0x49444c3a, 0x52746563, 0x53636865, 0x64756c65, 0x722f5175, 0x616e7475, 0x6d3a312e, 0x30000000,  // repository ID = IDL:RtecScheduler/Quantum:1.0
-        8, 0x5175616e, 0x74756d00,  // name = Quantum
-        CORBA::tk_alias, // typecode kind for typedefs
-        52, // encapsulation length
-          TAO_ENCAP_BYTE_ORDER, // byte order
-          27, 0x49444c3a, 0x52746563, 0x53636865, 0x64756c65, 0x722f5469, 0x6d653a31, 0x2e300000,  // repository ID = IDL:RtecScheduler/Time:1.0
-          5, 0x54696d65, 0x0,  // name = Time
-          CORBA::tk_double,
-
-      8, 0x74687265, 0x61647300,  // name = threads
-      CORBA::tk_long,
-
-      13, 0x64657065, 0x6e64656e, 0x63696573, 0x0,  // name = dependencies
-      CORBA::tk_alias, // typecode kind for typedefs
-      268, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        37, 0x49444c3a, 0x52746563, 0x53636865, 0x64756c65, 0x722f4465, 0x70656e64, 0x656e6379, 0x5f536574, 0x3a312e30, 0x0,  // repository ID = IDL:RtecScheduler/Dependency_Set:1.0
-        15, 0x44657065, 0x6e64656e, 0x63795f53, 0x65740000,  // name = Dependency_Set
-        CORBA::tk_sequence, // typecode kind
-        200, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-                CORBA::tk_struct, // typecode kind
-        176, // encapsulation length
-          TAO_ENCAP_BYTE_ORDER, // byte order
-          38, 0x49444c3a, 0x52746563, 0x53636865, 0x64756c65, 0x722f4465, 0x70656e64, 0x656e6379, 0x5f496e66, 0x6f3a312e, 0x30000000,  // repository ID = IDL:RtecScheduler/Dependency_Info:1.0
-          16, 0x44657065, 0x6e64656e, 0x63795f49, 0x6e666f00,  // name = Dependency_Info
-          2, // member count
-            16, 0x6e756d62, 0x65725f6f, 0x665f6361, 0x6c6c7300,  // name = number_of_calls
-            CORBA::tk_long,
-
-            8, 0x72745f69, 0x6e666f00,  // name = rt_info
-            CORBA::tk_alias, // typecode kind for typedefs
-            60, // encapsulation length
-              TAO_ENCAP_BYTE_ORDER, // byte order
-              31, 0x49444c3a, 0x52746563, 0x53636865, 0x64756c65, 0x722f6861, 0x6e646c65, 0x5f743a31, 0x2e300000,  // repository ID = IDL:RtecScheduler/handle_t:1.0
-              9, 0x68616e64, 0x6c655f74, 0x0,  // name = handle_t
-              CORBA::tk_long,
-
-                0,
-      9, 0x7072696f, 0x72697479, 0x0,  // name = priority
-      CORBA::tk_alias, // typecode kind for typedefs
-      64, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        34, 0x49444c3a, 0x52746563, 0x53636865, 0x64756c65, 0x722f4f53, 0x5f507269, 0x6f726974, 0x793a312e, 0x30000000,  // repository ID = IDL:RtecScheduler/OS_Priority:1.0
-        12, 0x4f535f50, 0x72696f72, 0x69747900,  // name = OS_Priority
-        CORBA::tk_long,
-
-      12, 0x73756270, 0x72696f72, 0x69747900,  // name = subpriority
-      CORBA::tk_alias, // typecode kind for typedefs
-      68, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        35, 0x49444c3a, 0x52746563, 0x53636865, 0x64756c65, 0x722f5375, 0x625f5072, 0x696f7269, 0x74793a31, 0x2e300000,  // repository ID = IDL:RtecScheduler/Sub_Priority:1.0
-        13, 0x5375625f, 0x5072696f, 0x72697479, 0x0,  // name = Sub_Priority
-        CORBA::tk_long,
-
-      20, 0x70726565, 0x6d707469, 0x6f6e5f70, 0x72696f72, 0x69747900,  // name = preemption_priority
-      CORBA::tk_alias, // typecode kind for typedefs
-      80, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        42, 0x49444c3a, 0x52746563, 0x53636865, 0x64756c65, 0x722f5072, 0x65656d70, 0x74696f6e, 0x5f507269, 0x6f726974, 0x793a312e, 0x30000000,  // repository ID = IDL:RtecScheduler/Preemption_Priority:1.0
-        20, 0x50726565, 0x6d707469, 0x6f6e5f50, 0x72696f72, 0x69747900,  // name = Preemption_Priority
-        CORBA::tk_long,
-
-    0,
-};
-static CORBA::TypeCode _tc__tc_RtecScheduler__tao__seq_RT_Info_Set (CORBA::tk_sequence, sizeof (_oc_RtecScheduler__tao__seq_RT_Info_Set), (unsigned char *) &_oc_RtecScheduler__tao__seq_RT_Info_Set, CORBA::B_FALSE);
-CORBA::TypeCode_ptr RtecScheduler::_tc__tao__seq_RT_Info_Set = &_tc__tc_RtecScheduler__tao__seq_RT_Info_Set;
-
-static const CORBA::Long _oc_RtecScheduler_RT_Info_Set[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  34, 0x49444c3a, 0x52746563, 0x53636865, 0x64756c65, 0x722f5254, 0x5f496e66, 0x6f5f5365, 0x743a312e, 0x30000000,  // repository ID = IDL:RtecScheduler/RT_Info_Set:1.0
-  12, 0x52545f49, 0x6e666f5f, 0x53657400,  // name = RT_Info_Set
-  CORBA::tk_sequence, // typecode kind
-  1416, // encapsulation length
-  TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_struct, // typecode kind
-  1392, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    30, 0x49444c3a, 0x52746563, 0x53636865, 0x64756c65, 0x722f5254, 0x5f496e66, 0x6f3a312e, 0x30000000,  // repository ID = IDL:RtecScheduler/RT_Info:1.0
-    8, 0x52545f49, 0x6e666f00,  // name = RT_Info
-    13, // member count
-      12, 0x656e7472, 0x795f706f, 0x696e7400,  // name = entry_point
-      CORBA::tk_string, 
-      0, // string length
-            7, 0x68616e64, 0x6c650000,  // name = handle
-      CORBA::tk_alias, // typecode kind for typedefs
-      60, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        31, 0x49444c3a, 0x52746563, 0x53636865, 0x64756c65, 0x722f6861, 0x6e646c65, 0x5f743a31, 0x2e300000,  // repository ID = IDL:RtecScheduler/handle_t:1.0
-        9, 0x68616e64, 0x6c655f74, 0x0,  // name = handle_t
-        CORBA::tk_long,
-
-      26, 0x776f7273, 0x745f6361, 0x73655f65, 0x78656375, 0x74696f6e, 0x5f74696d, 0x65000000,  // name = worst_case_execution_time
-      CORBA::tk_alias, // typecode kind for typedefs
-      52, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        27, 0x49444c3a, 0x52746563, 0x53636865, 0x64756c65, 0x722f5469, 0x6d653a31, 0x2e300000,  // repository ID = IDL:RtecScheduler/Time:1.0
-        5, 0x54696d65, 0x0,  // name = Time
-        CORBA::tk_double,
-
-      23, 0x74797069, 0x63616c5f, 0x65786563, 0x7574696f, 0x6e5f7469, 0x6d650000,  // name = typical_execution_time
-      CORBA::tk_alias, // typecode kind for typedefs
-      52, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        27, 0x49444c3a, 0x52746563, 0x53636865, 0x64756c65, 0x722f5469, 0x6d653a31, 0x2e300000,  // repository ID = IDL:RtecScheduler/Time:1.0
-        5, 0x54696d65, 0x0,  // name = Time
-        CORBA::tk_double,
-
-      22, 0x63616368, 0x65645f65, 0x78656375, 0x74696f6e, 0x5f74696d, 0x65000000,  // name = cached_execution_time
-      CORBA::tk_alias, // typecode kind for typedefs
-      52, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        27, 0x49444c3a, 0x52746563, 0x53636865, 0x64756c65, 0x722f5469, 0x6d653a31, 0x2e300000,  // repository ID = IDL:RtecScheduler/Time:1.0
-        5, 0x54696d65, 0x0,  // name = Time
-        CORBA::tk_double,
-
-      7, 0x70657269, 0x6f640000,  // name = period
-      CORBA::tk_alias, // typecode kind for typedefs
-      56, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        29, 0x49444c3a, 0x52746563, 0x53636865, 0x64756c65, 0x722f5065, 0x72696f64, 0x3a312e30, 0x0,  // repository ID = IDL:RtecScheduler/Period:1.0
-        7, 0x50657269, 0x6f640000,  // name = Period
-        CORBA::tk_long,
-
-      11, 0x696d706f, 0x7274616e, 0x63650000,  // name = importance
-      CORBA::tk_enum, // typecode kind
-      128, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      33, 0x49444c3a, 0x52746563, 0x53636865, 0x64756c65, 0x722f496d, 0x706f7274, 0x616e6365, 0x3a312e30, 0x0,  // repository ID = IDL:RtecScheduler/Importance:1.0
-      11, 0x496d706f, 0x7274616e, 0x63650000,  // name = Importance
-      5, // member count
-        9, 0x56455259, 0x5f4c4f57, 0x0,  // name = VERY_LOW
-        4, 0x4c4f5700,  // name = LOW
-        7, 0x4d454449, 0x554d0000,  // name = MEDIUM
-        5, 0x48494748, 0x0,  // name = HIGH
-        10, 0x56455259, 0x5f484947, 0x48000000,  // name = VERY_HIGH
-      8, 0x7175616e, 0x74756d00,  // name = quantum
-      CORBA::tk_alias, // typecode kind for typedefs
-      112, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        30, 0x49444c3a, 0x52746563, 0x53636865, 0x64756c65, 0x722f5175, 0x616e7475, 0x6d3a312e, 0x30000000,  // repository ID = IDL:RtecScheduler/Quantum:1.0
-        8, 0x5175616e, 0x74756d00,  // name = Quantum
-        CORBA::tk_alias, // typecode kind for typedefs
-        52, // encapsulation length
-          TAO_ENCAP_BYTE_ORDER, // byte order
-          27, 0x49444c3a, 0x52746563, 0x53636865, 0x64756c65, 0x722f5469, 0x6d653a31, 0x2e300000,  // repository ID = IDL:RtecScheduler/Time:1.0
-          5, 0x54696d65, 0x0,  // name = Time
-          CORBA::tk_double,
-
-      8, 0x74687265, 0x61647300,  // name = threads
-      CORBA::tk_long,
-
-      13, 0x64657065, 0x6e64656e, 0x63696573, 0x0,  // name = dependencies
-      CORBA::tk_alias, // typecode kind for typedefs
-      268, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        37, 0x49444c3a, 0x52746563, 0x53636865, 0x64756c65, 0x722f4465, 0x70656e64, 0x656e6379, 0x5f536574, 0x3a312e30, 0x0,  // repository ID = IDL:RtecScheduler/Dependency_Set:1.0
-        15, 0x44657065, 0x6e64656e, 0x63795f53, 0x65740000,  // name = Dependency_Set
-        CORBA::tk_sequence, // typecode kind
-        200, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-                CORBA::tk_struct, // typecode kind
-        176, // encapsulation length
-          TAO_ENCAP_BYTE_ORDER, // byte order
-          38, 0x49444c3a, 0x52746563, 0x53636865, 0x64756c65, 0x722f4465, 0x70656e64, 0x656e6379, 0x5f496e66, 0x6f3a312e, 0x30000000,  // repository ID = IDL:RtecScheduler/Dependency_Info:1.0
-          16, 0x44657065, 0x6e64656e, 0x63795f49, 0x6e666f00,  // name = Dependency_Info
-          2, // member count
-            16, 0x6e756d62, 0x65725f6f, 0x665f6361, 0x6c6c7300,  // name = number_of_calls
-            CORBA::tk_long,
-
-            8, 0x72745f69, 0x6e666f00,  // name = rt_info
-            CORBA::tk_alias, // typecode kind for typedefs
-            60, // encapsulation length
-              TAO_ENCAP_BYTE_ORDER, // byte order
-              31, 0x49444c3a, 0x52746563, 0x53636865, 0x64756c65, 0x722f6861, 0x6e646c65, 0x5f743a31, 0x2e300000,  // repository ID = IDL:RtecScheduler/handle_t:1.0
-              9, 0x68616e64, 0x6c655f74, 0x0,  // name = handle_t
-              CORBA::tk_long,
-
-                0,
-      9, 0x7072696f, 0x72697479, 0x0,  // name = priority
-      CORBA::tk_alias, // typecode kind for typedefs
-      64, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        34, 0x49444c3a, 0x52746563, 0x53636865, 0x64756c65, 0x722f4f53, 0x5f507269, 0x6f726974, 0x793a312e, 0x30000000,  // repository ID = IDL:RtecScheduler/OS_Priority:1.0
-        12, 0x4f535f50, 0x72696f72, 0x69747900,  // name = OS_Priority
-        CORBA::tk_long,
-
-      12, 0x73756270, 0x72696f72, 0x69747900,  // name = subpriority
-      CORBA::tk_alias, // typecode kind for typedefs
-      68, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        35, 0x49444c3a, 0x52746563, 0x53636865, 0x64756c65, 0x722f5375, 0x625f5072, 0x696f7269, 0x74793a31, 0x2e300000,  // repository ID = IDL:RtecScheduler/Sub_Priority:1.0
-        13, 0x5375625f, 0x5072696f, 0x72697479, 0x0,  // name = Sub_Priority
-        CORBA::tk_long,
-
-      20, 0x70726565, 0x6d707469, 0x6f6e5f70, 0x72696f72, 0x69747900,  // name = preemption_priority
-      CORBA::tk_alias, // typecode kind for typedefs
-      80, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        42, 0x49444c3a, 0x52746563, 0x53636865, 0x64756c65, 0x722f5072, 0x65656d70, 0x74696f6e, 0x5f507269, 0x6f726974, 0x793a312e, 0x30000000,  // repository ID = IDL:RtecScheduler/Preemption_Priority:1.0
-        20, 0x50726565, 0x6d707469, 0x6f6e5f50, 0x72696f72, 0x69747900,  // name = Preemption_Priority
-        CORBA::tk_long,
-
-    0,
-};
-static CORBA::TypeCode _tc__tc_RtecScheduler_RT_Info_Set (CORBA::tk_alias, sizeof (_oc_RtecScheduler_RT_Info_Set), (unsigned char *) &_oc_RtecScheduler_RT_Info_Set, CORBA::B_FALSE);
-CORBA::TypeCode_ptr RtecScheduler::_tc_RT_Info_Set = &_tc__tc_RtecScheduler_RT_Info_Set;
-
-RtecScheduler::Scheduler_ptr RtecScheduler::Scheduler::_duplicate (RtecScheduler::Scheduler_ptr obj)
-{
-  if (!CORBA::is_nil (obj))
-    obj->AddRef ();
-  
-  return obj;
-} // end of _duplicate
-
-RtecScheduler::Scheduler_ptr RtecScheduler::Scheduler::_narrow (CORBA::Object_ptr obj, CORBA::Environment &env)
-{
-  if (CORBA::is_nil (obj)) return RtecScheduler::Scheduler::_nil ();
-  if (obj->_is_a ("IDL:RtecScheduler/Scheduler:1.0", env))
-  {
-    STUB_Object *istub;
-    RtecScheduler::Scheduler_ptr new_obj; // to be returned 
-    if (obj->QueryInterface (IID_STUB_Object, (void **)&istub) != NOERROR)
-      return RtecScheduler::Scheduler::_nil ();
-    
-    obj->Release (); // need this since QueryIntf bumped our refcount
-    new_obj = new RtecScheduler::Scheduler (istub); // construct obj ref using the stub object
-    return new_obj;
-  } // end of if
-  return RtecScheduler::Scheduler::_nil (); // _narrow failed
-} // end of _narrow
-
-RtecScheduler::Scheduler_ptr RtecScheduler::Scheduler::_nil (void)
-{
-  return (RtecScheduler::Scheduler_ptr)NULL;
-} // end of _nil
-
-RtecScheduler::Scheduler_ptr RtecScheduler::Scheduler::_bind (const char *host, CORBA::UShort port, const char *key, CORBA::Environment &env)
-{
-  CORBA::Object_ptr objref = CORBA::Object::_nil ();
-  IIOP_Object *data = new IIOP_Object (host, port, key);
-  if (!data) return RtecScheduler::Scheduler::_nil ();
-  // get the object_ptr using Query Interface
-  if (data->QueryInterface (IID_CORBA_Object, (void **)&objref) != NOERROR)
-  {
-  	env.exception (new CORBA::DATA_CONVERSION (CORBA::COMPLETED_NO));
-  	return RtecScheduler::Scheduler::_nil ();
-  }
-  data->Release (); // QueryInterface had bumped up our count
-  if (CORBA::is_nil (objref))
-  	return RtecScheduler::Scheduler::_nil ();
-  else // narrow it
-  	return RtecScheduler::Scheduler::_narrow (objref, env);
-}
-
-static const TAO_Param_Data RtecScheduler_Scheduler_create_paramdata [] = 
-{
-  {RtecScheduler::_tc_handle_t, PARAM_RETURN, 0},
-  {CORBA::_tc_string, PARAM_IN, 0}
-};
-
-static const TAO_Call_Data RtecScheduler_Scheduler_create_calldata = 
-{"create", 1, 2, RtecScheduler_Scheduler_create_paramdata, 0, 0};
-
-RtecScheduler::handle_t  RtecScheduler::Scheduler::create (const char *entry_point, CORBA::Environment &env)
-{
-  RtecScheduler::handle_t retval;
-  STUB_Object *istub;
-
-  if (this->QueryInterface (IID_STUB_Object, (void **)&istub) != NOERROR)
-  {
-    env.exception (new CORBA::DATA_CONVERSION (CORBA::COMPLETED_NO));
-    return retval;
-  }
-  this->Release (); // QueryInterface has bumped up our refcount
-  istub->do_call (env, &RtecScheduler_Scheduler_create_calldata, &retval, &entry_point);
-  return retval;
-  
-}
-
-static const TAO_Param_Data RtecScheduler_Scheduler_lookup_paramdata [] = 
-{
-  {RtecScheduler::_tc_handle_t, PARAM_RETURN, 0},
-  {CORBA::_tc_string, PARAM_IN, 0}
-};
-
-static const TAO_Call_Data RtecScheduler_Scheduler_lookup_calldata = 
-{"lookup", 1, 2, RtecScheduler_Scheduler_lookup_paramdata, 0, 0};
-
-RtecScheduler::handle_t  RtecScheduler::Scheduler::lookup (const char *entry_point, CORBA::Environment &env)
-{
-  RtecScheduler::handle_t retval;
-  STUB_Object *istub;
-
-  if (this->QueryInterface (IID_STUB_Object, (void **)&istub) != NOERROR)
-  {
-    env.exception (new CORBA::DATA_CONVERSION (CORBA::COMPLETED_NO));
-    return retval;
-  }
-  this->Release (); // QueryInterface has bumped up our refcount
-  istub->do_call (env, &RtecScheduler_Scheduler_lookup_calldata, &retval, &entry_point);
-  return retval;
-  
-}
-
-static const TAO_Param_Data RtecScheduler_Scheduler_get_paramdata [] = 
-{
-  {RtecScheduler::_tc_RT_Info, PARAM_RETURN, 0},
-  {RtecScheduler::_tc_handle_t, PARAM_IN, 0}
-};
-
-static const TAO_Call_Data RtecScheduler_Scheduler_get_calldata = 
-{"get", 1, 2, RtecScheduler_Scheduler_get_paramdata, 0, 0};
-
-RtecScheduler::RT_Info * RtecScheduler::Scheduler::get (RtecScheduler::handle_t handle, CORBA::Environment &env)
-{
-  RtecScheduler::RT_Info *retval;
-  STUB_Object *istub;
-
-  if (this->QueryInterface (IID_STUB_Object, (void **)&istub) != NOERROR)
-  {
-    env.exception (new CORBA::DATA_CONVERSION (CORBA::COMPLETED_NO));
-    return 0;
-  }
-  this->Release (); // QueryInterface has bumped up our refcount
-  istub->do_call (env, &RtecScheduler_Scheduler_get_calldata, &retval, &handle);
-  return retval;
-  
-}
-
-static const TAO_Param_Data RtecScheduler_Scheduler_set_paramdata [] = 
-{
-  {CORBA::_tc_void, PARAM_RETURN, 0},
-  {RtecScheduler::_tc_handle_t, PARAM_IN, 0},
-  {RtecScheduler::_tc_Time, PARAM_IN, 0},
-  {RtecScheduler::_tc_Time, PARAM_IN, 0},
-  {RtecScheduler::_tc_Time, PARAM_IN, 0},
-  {RtecScheduler::_tc_Period, PARAM_IN, 0},
-  {RtecScheduler::_tc_Importance, PARAM_IN, 0},
-  {RtecScheduler::_tc_Quantum, PARAM_IN, 0},
-  {CORBA::_tc_long, PARAM_IN, 0}
-};
-
-static const TAO_Call_Data RtecScheduler_Scheduler_set_calldata = 
-{"set", 1, 9, RtecScheduler_Scheduler_set_paramdata, 0, 0};
-
-void  RtecScheduler::Scheduler::set (RtecScheduler::handle_t handle, RtecScheduler::Time time, RtecScheduler::Time typical_time, RtecScheduler::Time cached_time, RtecScheduler::Period period, RtecScheduler::Importance importance, RtecScheduler::Quantum quantum, CORBA::Long threads, CORBA::Environment &env)
-{
-  STUB_Object *istub;
-
-  if (this->QueryInterface (IID_STUB_Object, (void **)&istub) != NOERROR)
-  {
-    env.exception (new CORBA::DATA_CONVERSION (CORBA::COMPLETED_NO));
-    return;
-  }
-  this->Release (); // QueryInterface has bumped up our refcount
-  istub->do_call (env, &RtecScheduler_Scheduler_set_calldata, 0, &handle, &time, &typical_time, &cached_time, &period, &quantum, &threads);
-  return; // no value
-  
-}
-
-static const TAO_Param_Data RtecScheduler_Scheduler_add_dependency_paramdata [] = 
-{
-  {CORBA::_tc_void, PARAM_RETURN, 0},
-  {RtecScheduler::_tc_handle_t, PARAM_IN, 0},
-  {RtecScheduler::_tc_handle_t, PARAM_IN, 0},
-  {CORBA::_tc_long, PARAM_IN, 0}
-};
-
-static const TAO_Call_Data RtecScheduler_Scheduler_add_dependency_calldata = 
-{"add_dependency", 1, 4, RtecScheduler_Scheduler_add_dependency_paramdata, 0, 0};
-
-void  RtecScheduler::Scheduler::add_dependency (RtecScheduler::handle_t handle, RtecScheduler::handle_t dependency, CORBA::Long number_of_calls, CORBA::Environment &env)
-{
-  STUB_Object *istub;
-
-  if (this->QueryInterface (IID_STUB_Object, (void **)&istub) != NOERROR)
-  {
-    env.exception (new CORBA::DATA_CONVERSION (CORBA::COMPLETED_NO));
-    return;
-  }
-  this->Release (); // QueryInterface has bumped up our refcount
-  istub->do_call (env, &RtecScheduler_Scheduler_add_dependency_calldata, 0, &handle, &dependency, &number_of_calls);
-  return; // no value
-  
-}
-
-static const TAO_Param_Data RtecScheduler_Scheduler_priority_paramdata [] = 
-{
-  {CORBA::_tc_void, PARAM_RETURN, 0},
-  {RtecScheduler::_tc_handle_t, PARAM_IN, 0},
-  {RtecScheduler::_tc_OS_Priority, PARAM_OUT, 0},
-  {RtecScheduler::_tc_Sub_Priority, PARAM_OUT, 0},
-  {RtecScheduler::_tc_Preemption_Priority, PARAM_OUT, 0}
-};
-
-static const TAO_Call_Data RtecScheduler_Scheduler_priority_calldata = 
-{"priority", 1, 5, RtecScheduler_Scheduler_priority_paramdata, 0, 0};
-
-void  RtecScheduler::Scheduler::priority (RtecScheduler::handle_t handle, RtecScheduler::OS_Priority_out priority, RtecScheduler::Sub_Priority_out subpriority, RtecScheduler::Preemption_Priority_out p_priority, CORBA::Environment &env)
-{
-  STUB_Object *istub;
-
-  if (this->QueryInterface (IID_STUB_Object, (void **)&istub) != NOERROR)
-  {
-    env.exception (new CORBA::DATA_CONVERSION (CORBA::COMPLETED_NO));
-    return;
-  }
-  this->Release (); // QueryInterface has bumped up our refcount
-  istub->do_call (env, &RtecScheduler_Scheduler_priority_calldata, 0, &handle, &priority, &subpriority, &p_priority);
-  return; // no value
-  
-}
-
-static const TAO_Param_Data RtecScheduler_Scheduler_entry_point_priority_paramdata [] = 
-{
-  {CORBA::_tc_void, PARAM_RETURN, 0},
-  {CORBA::_tc_string, PARAM_IN, 0},
-  {RtecScheduler::_tc_OS_Priority, PARAM_OUT, 0},
-  {RtecScheduler::_tc_Sub_Priority, PARAM_OUT, 0},
-  {RtecScheduler::_tc_Preemption_Priority, PARAM_OUT, 0}
-};
-
-static const TAO_Call_Data RtecScheduler_Scheduler_entry_point_priority_calldata = 
-{"entry_point_priority", 1, 5, RtecScheduler_Scheduler_entry_point_priority_paramdata, 0, 0};
-
-void  RtecScheduler::Scheduler::entry_point_priority (const char *entry_point, RtecScheduler::OS_Priority_out priority, RtecScheduler::Sub_Priority_out subpriority, RtecScheduler::Preemption_Priority_out p_priority, CORBA::Environment &env)
-{
-  STUB_Object *istub;
-
-  if (this->QueryInterface (IID_STUB_Object, (void **)&istub) != NOERROR)
-  {
-    env.exception (new CORBA::DATA_CONVERSION (CORBA::COMPLETED_NO));
-    return;
-  }
-  this->Release (); // QueryInterface has bumped up our refcount
-  istub->do_call (env, &RtecScheduler_Scheduler_entry_point_priority_calldata, 0, &entry_point, &priority, &subpriority, &p_priority);
-  return; // no value
-  
-}
-
-static const TAO_Param_Data RtecScheduler_Scheduler_compute_scheduling_paramdata [] = 
-{
-  {CORBA::_tc_void, PARAM_RETURN, 0},
-  {CORBA::_tc_long, PARAM_IN, 0},
-  {CORBA::_tc_long, PARAM_IN, 0},
-  {RtecScheduler::_tc_RT_Info_Set, PARAM_OUT, 0}
-};
-
-static const TAO_Call_Data RtecScheduler_Scheduler_compute_scheduling_calldata = 
-{"compute_scheduling", 1, 4, RtecScheduler_Scheduler_compute_scheduling_paramdata, 0, 0};
-
-void  RtecScheduler::Scheduler::compute_scheduling (CORBA::Long minimum_priority, CORBA::Long maximum_priority, RtecScheduler::RT_Info_Set_out infos, CORBA::Environment &env)
-{
-  STUB_Object *istub;
-
-  if (this->QueryInterface (IID_STUB_Object, (void **)&istub) != NOERROR)
-  {
-    env.exception (new CORBA::DATA_CONVERSION (CORBA::COMPLETED_NO));
-    return;
-  }
-  this->Release (); // QueryInterface has bumped up our refcount
-  RtecScheduler::RT_Info_Set *_tao_base_infos = new RtecScheduler::RT_Info_Set;
-  istub->do_call (env, &RtecScheduler_Scheduler_compute_scheduling_calldata, 0, &minimum_priority, &maximum_priority, _tao_base_infos);
-  infos = _tao_base_infos;
-  return; // no value
-  
-}
-
-static const CORBA::Long _oc_RtecScheduler_Scheduler[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  32, 0x49444c3a, 0x52746563, 0x53636865, 0x64756c65, 0x722f5363, 0x68656475, 0x6c65723a, 0x312e3000,  // repository ID = IDL:RtecScheduler/Scheduler:1.0
-  10, 0x53636865, 0x64756c65, 0x72000000,  // name = Scheduler,
-};
-static CORBA::TypeCode _tc__tc_RtecScheduler_Scheduler (CORBA::tk_objref, sizeof (_oc_RtecScheduler_Scheduler), (unsigned char *) &_oc_RtecScheduler_Scheduler, CORBA::B_FALSE);
-CORBA::TypeCode_ptr RtecScheduler::_tc_Scheduler = &_tc__tc_RtecScheduler_Scheduler;
-
diff --git a/TAO/orbsvcs/lib/RtecSchedulerC.h b/TAO/orbsvcs/lib/RtecSchedulerC.h
deleted file mode 100644
index eec210cb6b1..00000000000
--- a/TAO/orbsvcs/lib/RtecSchedulerC.h
+++ /dev/null
@@ -1,640 +0,0 @@
-// ******  Code generated by the The ACE ORB (TAO) IDL Compiler *******
-// TAO ORB and the TAO IDL Compiler have been developed by Washington 
-// University Computer Science's Distributed Object Computing Group.
-//
-// Information on TAO is available at
-//                 http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#if !defined (_TAO_IDL_RTECSCHEDULERC_H_)
-#define _TAO_IDL_RTECSCHEDULERC_H_
-
-#include "tao/corba.h"
-
-class RtecScheduler{
-public:
-  typedef CORBA::Double Time;typedef CORBA::Double_out Time_out;
-
-  static CORBA::TypeCode_ptr _tc_Time;
-
-  typedef CORBA::Long Period;typedef CORBA::Long_out Period_out;
-
-  static CORBA::TypeCode_ptr _tc_Period;
-
-  typedef ACE_NESTED_CLASS (RtecScheduler,Time) Quantum;typedef ACE_NESTED_CLASS (RtecScheduler,Time_out) Quantum_out;
-
-  static CORBA::TypeCode_ptr _tc_Quantum;
-
-  static const CORBA::Long NO_QUANTUM;
-
-  enum Importance
-  {
-    VERY_LOW, 
-    LOW, 
-    MEDIUM, 
-    HIGH, 
-    VERY_HIGH
-  };
-  typedef Importance &Importance_out;
-  static CORBA::TypeCode_ptr _tc_Importance;
-
-  typedef CORBA::Long handle_t;typedef CORBA::Long_out handle_t_out;
-
-  static CORBA::TypeCode_ptr _tc_handle_t;
-
-  struct Dependency_Info
-  {
-    CORBA::Long number_of_calls;
-
-    ACE_NESTED_CLASS (RtecScheduler,handle_t) rt_info;
-
-  };
-
-  class Dependency_Info_var
-  {
-  public:
-    Dependency_Info_var (void); // default constructor
-    Dependency_Info_var (Dependency_Info *);
-    Dependency_Info_var (const Dependency_Info_var &); // copy constructor
-    ~Dependency_Info_var (void); // destructor
-    
-    Dependency_Info_var &operator= (Dependency_Info *);
-    Dependency_Info_var &operator= (const Dependency_Info_var &);
-    Dependency_Info *operator-> (void);
-    const Dependency_Info *operator-> (void) const;
-    
-    operator const Dependency_Info &() const;
-    operator Dependency_Info &();
-    operator Dependency_Info &() const;
-    // in, inout, out, _retn 
-    const Dependency_Info &in (void) const;
-    Dependency_Info &inout (void);
-    Dependency_Info &out (void);
-    Dependency_Info _retn (void);
-    Dependency_Info *ptr(void) const;
-
-  private:
-    Dependency_Info *ptr_;
-  };
-
-  typedef Dependency_Info &Dependency_Info_out;
-
-  static CORBA::TypeCode_ptr _tc_Dependency_Info;
-
-
-#if !defined (_RTECSCHEDULER__TAO__SEQ_DEPENDENCY_SET_CH_)
-#define _RTECSCHEDULER__TAO__SEQ_DEPENDENCY_SET_CH_
-
-  // *************************************************************
-  // class _tao__seq_Dependency_Set
-  // *************************************************************
-  
-  class _tao__seq_Dependency_Set
-  {
-  public:
-    _tao__seq_Dependency_Set (void); // default constructor
-    _tao__seq_Dependency_Set (CORBA::ULong max);
-    _tao__seq_Dependency_Set (CORBA::ULong max, CORBA::ULong length, 
-    	ACE_NESTED_CLASS (RtecScheduler,Dependency_Info) *value, CORBA::Boolean release=CORBA::B_FALSE);
-    _tao__seq_Dependency_Set(const _tao__seq_Dependency_Set &); // copy constructor
-    ~_tao__seq_Dependency_Set (void);
-    _tao__seq_Dependency_Set &operator= (const _tao__seq_Dependency_Set &);
-    CORBA::ULong maximum (void) const;
-    void length (CORBA::ULong);
-    CORBA::ULong length (void) const;
-    ACE_NESTED_CLASS (RtecScheduler,Dependency_Info) &operator[] (CORBA::ULong index);
-    const ACE_NESTED_CLASS (RtecScheduler,Dependency_Info) &operator[] (CORBA::ULong index) const;
-    static ACE_NESTED_CLASS (RtecScheduler,Dependency_Info) *allocbuf (CORBA::ULong nelems);
-    static void freebuf (ACE_NESTED_CLASS (RtecScheduler,Dependency_Info) *);
-  private:
-    CORBA::ULong maximum_;
-    CORBA::ULong length_;
-    ACE_NESTED_CLASS (RtecScheduler,Dependency_Info) *buffer_;
-    CORBA::Boolean release_;
-  };
-  typedef _tao__seq_Dependency_Set* _tao__seq_Dependency_Set_ptr;
-  static CORBA::TypeCode_ptr _tc__tao__seq_Dependency_Set;
-
-
-#endif // end #if !defined
-
-
-#if !defined (_RTECSCHEDULER__TAO__SEQ_DEPENDENCY_SET___VAR_CH_)
-#define _RTECSCHEDULER__TAO__SEQ_DEPENDENCY_SET___VAR_CH_
-
-// *************************************************************
-  // class RtecScheduler::_tao__seq_Dependency_Set_var
-  // *************************************************************
-
-  class _tao__seq_Dependency_Set_var
-  {
-  public:
-    _tao__seq_Dependency_Set_var (void); // default constructor
-    _tao__seq_Dependency_Set_var (_tao__seq_Dependency_Set *);
-    _tao__seq_Dependency_Set_var (const _tao__seq_Dependency_Set_var &); // copy constructor
-    ~_tao__seq_Dependency_Set_var (void); // destructor
-    
-    _tao__seq_Dependency_Set_var &operator= (_tao__seq_Dependency_Set *);
-    _tao__seq_Dependency_Set_var &operator= (const _tao__seq_Dependency_Set_var &);
-    _tao__seq_Dependency_Set *operator-> (void);
-    const _tao__seq_Dependency_Set *operator-> (void) const;
-    
-    operator const _tao__seq_Dependency_Set &() const;
-    operator _tao__seq_Dependency_Set &();
-    operator _tao__seq_Dependency_Set &() const;
-    ACE_NESTED_CLASS (RtecScheduler,Dependency_Info) &operator[] (CORBA::ULong index);
-    // in, inout, out, _retn 
-    const _tao__seq_Dependency_Set &in (void) const;
-    _tao__seq_Dependency_Set &inout (void);
-    _tao__seq_Dependency_Set *&out (void);
-    _tao__seq_Dependency_Set *_retn (void);
-    _tao__seq_Dependency_Set *ptr (void) const;
-
-  private:
-    _tao__seq_Dependency_Set *ptr_;
-  };
-
-
-#endif // end #if !defined
-
-
-#if !defined (_RTECSCHEDULER__TAO__SEQ_DEPENDENCY_SET___OUT_CH_)
-#define _RTECSCHEDULER__TAO__SEQ_DEPENDENCY_SET___OUT_CH_
-
-  class _tao__seq_Dependency_Set_out
-  {
-  public:
-    _tao__seq_Dependency_Set_out (_tao__seq_Dependency_Set *&);
-    _tao__seq_Dependency_Set_out (_tao__seq_Dependency_Set_var &);
-    _tao__seq_Dependency_Set_out (_tao__seq_Dependency_Set_out &);
-    _tao__seq_Dependency_Set_out &operator= (_tao__seq_Dependency_Set_out &);
-    _tao__seq_Dependency_Set_out &operator= (_tao__seq_Dependency_Set *);
-    operator _tao__seq_Dependency_Set *&();
-    _tao__seq_Dependency_Set *&ptr (void);
-    _tao__seq_Dependency_Set *operator-> (void);
-    ACE_NESTED_CLASS (RtecScheduler,Dependency_Info) &operator[] (CORBA::ULong index);
-    
-  private:
-    _tao__seq_Dependency_Set *&ptr_;
-    // assignment from T_var not allowed
-    void operator= (const _tao__seq_Dependency_Set_var &);
-  };
-
-
-#endif // end #if !defined
-
-  typedef ACE_NESTED_CLASS (RtecScheduler,_tao__seq_Dependency_Set) Dependency_Set;
-  typedef ACE_NESTED_CLASS (RtecScheduler,_tao__seq_Dependency_Set_var) Dependency_Set_var;
-  typedef ACE_NESTED_CLASS (RtecScheduler,_tao__seq_Dependency_Set_out) Dependency_Set_out;
-
-  static CORBA::TypeCode_ptr _tc_Dependency_Set;
-
-  typedef CORBA::Long OS_Priority;typedef CORBA::Long_out OS_Priority_out;
-
-  static CORBA::TypeCode_ptr _tc_OS_Priority;
-
-  typedef CORBA::Long Sub_Priority;typedef CORBA::Long_out Sub_Priority_out;
-
-  static CORBA::TypeCode_ptr _tc_Sub_Priority;
-
-  typedef CORBA::Long Preemption_Priority;typedef CORBA::Long_out Preemption_Priority_out;
-
-  static CORBA::TypeCode_ptr _tc_Preemption_Priority;
-
-  struct RT_Info
-  {
-    CORBA::String_var entry_point;
-
-    ACE_NESTED_CLASS (RtecScheduler,handle_t) handle;
-
-    ACE_NESTED_CLASS (RtecScheduler,Time) worst_case_execution_time;
-
-    ACE_NESTED_CLASS (RtecScheduler,Time) typical_execution_time;
-
-    ACE_NESTED_CLASS (RtecScheduler,Time) cached_execution_time;
-
-    ACE_NESTED_CLASS (RtecScheduler,Period) period;
-
-    ACE_NESTED_CLASS (RtecScheduler,Importance) importance;
-
-    ACE_NESTED_CLASS (RtecScheduler,Quantum) quantum;
-
-    CORBA::Long threads;
-
-    ACE_NESTED_CLASS (RtecScheduler,Dependency_Set) dependencies;
-
-    ACE_NESTED_CLASS (RtecScheduler,OS_Priority) priority;
-
-    ACE_NESTED_CLASS (RtecScheduler,Sub_Priority) subpriority;
-
-    ACE_NESTED_CLASS (RtecScheduler,Preemption_Priority) preemption_priority;
-
-  };
-
-  class RT_Info_var
-  {
-  public:
-    RT_Info_var (void); // default constructor
-    RT_Info_var (RT_Info *);
-    RT_Info_var (const RT_Info_var &); // copy constructor
-    ~RT_Info_var (void); // destructor
-    
-    RT_Info_var &operator= (RT_Info *);
-    RT_Info_var &operator= (const RT_Info_var &);
-    RT_Info *operator-> (void);
-    const RT_Info *operator-> (void) const;
-    
-    operator const RT_Info &() const;
-    operator RT_Info &();
-    operator RT_Info &() const;
-    // in, inout, out, _retn 
-    const RT_Info &in (void) const;
-    RT_Info &inout (void);
-    RT_Info *&out (void);
-    RT_Info *_retn (void);
-    RT_Info *ptr(void) const;
-
-  private:
-    RT_Info *ptr_;
-  };
-
-  class RT_Info_out
-  {
-  public:
-    RT_Info_out (RT_Info *&);
-    RT_Info_out (RT_Info_var &);
-    RT_Info_out (const RT_Info_out &);
-    RT_Info_out &operator= (const RT_Info_out &);
-    RT_Info_out &operator= (RT_Info *);
-    operator RT_Info *&();
-    RT_Info *&ptr (void);
-    RT_Info *operator-> (void);
-    
-  private:
-    RT_Info *&ptr_;
-    // assignment from T_var not allowed
-    void operator= (const RT_Info_var &);
-  };
-
-  static CORBA::TypeCode_ptr _tc_RT_Info;
-
-  
-#if !defined (_RTECSCHEDULER_DUPLICATE_NAME___PTR_CH_)
-#define _RTECSCHEDULER_DUPLICATE_NAME___PTR_CH_
-
-  class DUPLICATE_NAME;
-  typedef DUPLICATE_NAME *DUPLICATE_NAME_ptr;
-  
-#endif // end #if !defined
-
-
-#if !defined (_RTECSCHEDULER_DUPLICATE_NAME_CH_)
-#define _RTECSCHEDULER_DUPLICATE_NAME_CH_
-
-  class DUPLICATE_NAME : public virtual CORBA::UserException
-  {
-  public:
-      DUPLICATE_NAME (void);
-  };
-  
-  
-#endif // end #if !defined
-
-static CORBA::TypeCode_ptr _tc_DUPLICATE_NAME;
-
-  
-#if !defined (_RTECSCHEDULER_UNKNOWN_TASK___PTR_CH_)
-#define _RTECSCHEDULER_UNKNOWN_TASK___PTR_CH_
-
-  class UNKNOWN_TASK;
-  typedef UNKNOWN_TASK *UNKNOWN_TASK_ptr;
-  
-#endif // end #if !defined
-
-
-#if !defined (_RTECSCHEDULER_UNKNOWN_TASK_CH_)
-#define _RTECSCHEDULER_UNKNOWN_TASK_CH_
-
-  class UNKNOWN_TASK : public virtual CORBA::UserException
-  {
-  public:
-      UNKNOWN_TASK (void);
-  };
-  
-  
-#endif // end #if !defined
-
-static CORBA::TypeCode_ptr _tc_UNKNOWN_TASK;
-
-  
-#if !defined (_RTECSCHEDULER_NOT_SCHEDULED___PTR_CH_)
-#define _RTECSCHEDULER_NOT_SCHEDULED___PTR_CH_
-
-  class NOT_SCHEDULED;
-  typedef NOT_SCHEDULED *NOT_SCHEDULED_ptr;
-  
-#endif // end #if !defined
-
-
-#if !defined (_RTECSCHEDULER_NOT_SCHEDULED_CH_)
-#define _RTECSCHEDULER_NOT_SCHEDULED_CH_
-
-  class NOT_SCHEDULED : public virtual CORBA::UserException
-  {
-  public:
-      NOT_SCHEDULED (void);
-  };
-  
-  
-#endif // end #if !defined
-
-static CORBA::TypeCode_ptr _tc_NOT_SCHEDULED;
-
-  
-#if !defined (_RTECSCHEDULER_UTILIZATION_BOUND_EXCEEDED___PTR_CH_)
-#define _RTECSCHEDULER_UTILIZATION_BOUND_EXCEEDED___PTR_CH_
-
-  class UTILIZATION_BOUND_EXCEEDED;
-  typedef UTILIZATION_BOUND_EXCEEDED *UTILIZATION_BOUND_EXCEEDED_ptr;
-  
-#endif // end #if !defined
-
-
-#if !defined (_RTECSCHEDULER_UTILIZATION_BOUND_EXCEEDED_CH_)
-#define _RTECSCHEDULER_UTILIZATION_BOUND_EXCEEDED_CH_
-
-  class UTILIZATION_BOUND_EXCEEDED : public virtual CORBA::UserException
-  {
-  public:
-      UTILIZATION_BOUND_EXCEEDED (void);
-  };
-  
-  
-#endif // end #if !defined
-
-static CORBA::TypeCode_ptr _tc_UTILIZATION_BOUND_EXCEEDED;
-
-  
-#if !defined (_RTECSCHEDULER_INSUFFICIENT_THREAD_PRIORITY_LEVELS___PTR_CH_)
-#define _RTECSCHEDULER_INSUFFICIENT_THREAD_PRIORITY_LEVELS___PTR_CH_
-
-  class INSUFFICIENT_THREAD_PRIORITY_LEVELS;
-  typedef INSUFFICIENT_THREAD_PRIORITY_LEVELS *INSUFFICIENT_THREAD_PRIORITY_LEVELS_ptr;
-  
-#endif // end #if !defined
-
-
-#if !defined (_RTECSCHEDULER_INSUFFICIENT_THREAD_PRIORITY_LEVELS_CH_)
-#define _RTECSCHEDULER_INSUFFICIENT_THREAD_PRIORITY_LEVELS_CH_
-
-  class INSUFFICIENT_THREAD_PRIORITY_LEVELS : public virtual CORBA::UserException
-  {
-  public:
-      INSUFFICIENT_THREAD_PRIORITY_LEVELS (void);
-  };
-  
-  
-#endif // end #if !defined
-
-static CORBA::TypeCode_ptr _tc_INSUFFICIENT_THREAD_PRIORITY_LEVELS;
-
-  
-#if !defined (_RTECSCHEDULER_TASK_COUNT_MISMATCH___PTR_CH_)
-#define _RTECSCHEDULER_TASK_COUNT_MISMATCH___PTR_CH_
-
-  class TASK_COUNT_MISMATCH;
-  typedef TASK_COUNT_MISMATCH *TASK_COUNT_MISMATCH_ptr;
-  
-#endif // end #if !defined
-
-
-#if !defined (_RTECSCHEDULER_TASK_COUNT_MISMATCH_CH_)
-#define _RTECSCHEDULER_TASK_COUNT_MISMATCH_CH_
-
-  class TASK_COUNT_MISMATCH : public virtual CORBA::UserException
-  {
-  public:
-      TASK_COUNT_MISMATCH (void);
-  };
-  
-  
-#endif // end #if !defined
-
-static CORBA::TypeCode_ptr _tc_TASK_COUNT_MISMATCH;
-
-
-#if !defined (_RTECSCHEDULER__TAO__SEQ_RT_INFO_SET_CH_)
-#define _RTECSCHEDULER__TAO__SEQ_RT_INFO_SET_CH_
-
-  // *************************************************************
-  // class _tao__seq_RT_Info_Set
-  // *************************************************************
-  
-  class _tao__seq_RT_Info_Set
-  {
-  public:
-    _tao__seq_RT_Info_Set (void); // default constructor
-    _tao__seq_RT_Info_Set (CORBA::ULong max);
-    _tao__seq_RT_Info_Set (CORBA::ULong max, CORBA::ULong length, 
-    	ACE_NESTED_CLASS (RtecScheduler,RT_Info) *value, CORBA::Boolean release=CORBA::B_FALSE);
-    _tao__seq_RT_Info_Set(const _tao__seq_RT_Info_Set &); // copy constructor
-    ~_tao__seq_RT_Info_Set (void);
-    _tao__seq_RT_Info_Set &operator= (const _tao__seq_RT_Info_Set &);
-    CORBA::ULong maximum (void) const;
-    void length (CORBA::ULong);
-    CORBA::ULong length (void) const;
-    ACE_NESTED_CLASS (RtecScheduler,RT_Info) &operator[] (CORBA::ULong index);
-    const ACE_NESTED_CLASS (RtecScheduler,RT_Info) &operator[] (CORBA::ULong index) const;
-    static ACE_NESTED_CLASS (RtecScheduler,RT_Info) *allocbuf (CORBA::ULong nelems);
-    static void freebuf (ACE_NESTED_CLASS (RtecScheduler,RT_Info) *);
-  private:
-    CORBA::ULong maximum_;
-    CORBA::ULong length_;
-    ACE_NESTED_CLASS (RtecScheduler,RT_Info) *buffer_;
-    CORBA::Boolean release_;
-  };
-  typedef _tao__seq_RT_Info_Set* _tao__seq_RT_Info_Set_ptr;
-  static CORBA::TypeCode_ptr _tc__tao__seq_RT_Info_Set;
-
-
-#endif // end #if !defined
-
-
-#if !defined (_RTECSCHEDULER__TAO__SEQ_RT_INFO_SET___VAR_CH_)
-#define _RTECSCHEDULER__TAO__SEQ_RT_INFO_SET___VAR_CH_
-
-// *************************************************************
-  // class RtecScheduler::_tao__seq_RT_Info_Set_var
-  // *************************************************************
-
-  class _tao__seq_RT_Info_Set_var
-  {
-  public:
-    _tao__seq_RT_Info_Set_var (void); // default constructor
-    _tao__seq_RT_Info_Set_var (_tao__seq_RT_Info_Set *);
-    _tao__seq_RT_Info_Set_var (const _tao__seq_RT_Info_Set_var &); // copy constructor
-    ~_tao__seq_RT_Info_Set_var (void); // destructor
-    
-    _tao__seq_RT_Info_Set_var &operator= (_tao__seq_RT_Info_Set *);
-    _tao__seq_RT_Info_Set_var &operator= (const _tao__seq_RT_Info_Set_var &);
-    _tao__seq_RT_Info_Set *operator-> (void);
-    const _tao__seq_RT_Info_Set *operator-> (void) const;
-    
-    operator const _tao__seq_RT_Info_Set &() const;
-    operator _tao__seq_RT_Info_Set &();
-    operator _tao__seq_RT_Info_Set &() const;
-    ACE_NESTED_CLASS (RtecScheduler,RT_Info) &operator[] (CORBA::ULong index);
-    // in, inout, out, _retn 
-    const _tao__seq_RT_Info_Set &in (void) const;
-    _tao__seq_RT_Info_Set &inout (void);
-    _tao__seq_RT_Info_Set *&out (void);
-    _tao__seq_RT_Info_Set *_retn (void);
-    _tao__seq_RT_Info_Set *ptr (void) const;
-
-  private:
-    _tao__seq_RT_Info_Set *ptr_;
-  };
-
-
-#endif // end #if !defined
-
-
-#if !defined (_RTECSCHEDULER__TAO__SEQ_RT_INFO_SET___OUT_CH_)
-#define _RTECSCHEDULER__TAO__SEQ_RT_INFO_SET___OUT_CH_
-
-  class _tao__seq_RT_Info_Set_out
-  {
-  public:
-    _tao__seq_RT_Info_Set_out (_tao__seq_RT_Info_Set *&);
-    _tao__seq_RT_Info_Set_out (_tao__seq_RT_Info_Set_var &);
-    _tao__seq_RT_Info_Set_out (const _tao__seq_RT_Info_Set_out &);
-    _tao__seq_RT_Info_Set_out &operator= (const _tao__seq_RT_Info_Set_out &);
-    _tao__seq_RT_Info_Set_out &operator= (_tao__seq_RT_Info_Set *);
-    operator _tao__seq_RT_Info_Set *&();
-    _tao__seq_RT_Info_Set *&ptr (void);
-    _tao__seq_RT_Info_Set *operator-> (void);
-    ACE_NESTED_CLASS (RtecScheduler,RT_Info) &operator[] (CORBA::ULong index);
-    
-  private:
-    _tao__seq_RT_Info_Set *&ptr_;
-    // assignment from T_var not allowed
-    void operator= (const _tao__seq_RT_Info_Set_var &);
-  };
-
-
-#endif // end #if !defined
-
-  typedef ACE_NESTED_CLASS (RtecScheduler,_tao__seq_RT_Info_Set) RT_Info_Set;
-  typedef ACE_NESTED_CLASS (RtecScheduler,_tao__seq_RT_Info_Set_var) RT_Info_Set_var;
-  typedef ACE_NESTED_CLASS (RtecScheduler,_tao__seq_RT_Info_Set_out) RT_Info_Set_out;
-
-  static CORBA::TypeCode_ptr _tc_RT_Info_Set;
-
-  
-#if !defined (_RTECSCHEDULER_SCHEDULER___PTR_CH_)
-#define _RTECSCHEDULER_SCHEDULER___PTR_CH_
-
-class Scheduler;
-  typedef Scheduler *Scheduler_ptr;
-  
-#endif // end #if !defined
-
-
-#if !defined (_RTECSCHEDULER_SCHEDULER_CH_)
-#define _RTECSCHEDULER_SCHEDULER_CH_
-
-class Scheduler: public virtual ACE_CORBA_1 (Object)
-  {
-  public:
-    // the static operations
-    static Scheduler_ptr _duplicate (Scheduler_ptr obj);
-    static Scheduler_ptr _narrow (CORBA::Object_ptr obj, CORBA::Environment &env);
-    static Scheduler_ptr _nil (void);
-    static Scheduler_ptr _bind (const char *host, CORBA::UShort port, const char *key, CORBA::Environment &env);
-
-    virtual RtecScheduler::handle_t create (const char *entry_point, CORBA::Environment &env);
-    virtual RtecScheduler::handle_t lookup (const char *entry_point, CORBA::Environment &env);
-    virtual ACE_NESTED_CLASS (RtecScheduler,RT_Info) * get (ACE_NESTED_CLASS (RtecScheduler,handle_t) handle, CORBA::Environment &env);
-    virtual void set (ACE_NESTED_CLASS (RtecScheduler,handle_t) handle, ACE_NESTED_CLASS (RtecScheduler,Time) time, ACE_NESTED_CLASS (RtecScheduler,Time) typical_time, ACE_NESTED_CLASS (RtecScheduler,Time) cached_time, ACE_NESTED_CLASS (RtecScheduler,Period) period, ACE_NESTED_CLASS (RtecScheduler,Importance) importance, ACE_NESTED_CLASS (RtecScheduler,Quantum) quantum, CORBA::Long threads, CORBA::Environment &env);
-    virtual void add_dependency (ACE_NESTED_CLASS (RtecScheduler,handle_t) handle, ACE_NESTED_CLASS (RtecScheduler,handle_t) dependency, CORBA::Long number_of_calls, CORBA::Environment &env);
-    virtual void priority (ACE_NESTED_CLASS (RtecScheduler,handle_t) handle, ACE_NESTED_CLASS (RtecScheduler,OS_Priority_out) priority, ACE_NESTED_CLASS (RtecScheduler,Sub_Priority_out) subpriority, ACE_NESTED_CLASS (RtecScheduler,Preemption_Priority_out) p_priority, CORBA::Environment &env);
-    virtual void entry_point_priority (const char *entry_point, ACE_NESTED_CLASS (RtecScheduler,OS_Priority_out) priority, ACE_NESTED_CLASS (RtecScheduler,Sub_Priority_out) subpriority, ACE_NESTED_CLASS (RtecScheduler,Preemption_Priority_out) p_priority, CORBA::Environment &env);
-    virtual void compute_scheduling (CORBA::Long minimum_priority, CORBA::Long maximum_priority, ACE_NESTED_CLASS (RtecScheduler,RT_Info_Set_out) infos, CORBA::Environment &env);
-  protected:
-    Scheduler (void); // default constructor
-    Scheduler (STUB_Object *objref);
-    virtual ~Scheduler (void);
-  private:
-    Scheduler (const Scheduler&);
-    void operator= (const Scheduler&);
-  };
-
-
-#endif // end #if !defined
-
-
-#if !defined (_RTECSCHEDULER_SCHEDULER___VAR_CH_)
-#define _RTECSCHEDULER_SCHEDULER___VAR_CH_
-
-  class Scheduler_var
-  {
-  public:
-    Scheduler_var (void); // default constructor
-    Scheduler_var (Scheduler_ptr);
-    Scheduler_var (const Scheduler_var &); // copy constructor
-    ~Scheduler_var (void); // destructor
-    
-    Scheduler_var &operator= (Scheduler_ptr);
-    Scheduler_var &operator= (const Scheduler_var &);
-    Scheduler_ptr operator-> (void) const;
-    
-    operator const Scheduler_ptr &() const;
-    operator Scheduler_ptr &();
-    // in, inout, out, _retn 
-    Scheduler_ptr in (void) const;
-    Scheduler_ptr &inout (void);
-    Scheduler_ptr &out (void);
-    Scheduler_ptr _retn (void);
-    Scheduler_ptr ptr (void) const;
-
-  private:
-    Scheduler_ptr ptr_;
-  };
-
-
-#endif // end #if !defined
-
-
-#if !defined (_RTECSCHEDULER_SCHEDULER___OUT_CH_)
-#define _RTECSCHEDULER_SCHEDULER___OUT_CH_
-
-  class Scheduler_out
-  {
-  public:
-    Scheduler_out (Scheduler_ptr &);
-    Scheduler_out (Scheduler_var &);
-    Scheduler_out (Scheduler_out &);
-    Scheduler_out &operator= (Scheduler_out &);
-    Scheduler_out &operator= (const Scheduler_var &);
-    Scheduler_out &operator= (Scheduler_ptr);
-    operator Scheduler_ptr &();
-    Scheduler_ptr &ptr (void);
-    Scheduler_ptr operator-> (void);
-    
-  private:
-    Scheduler_ptr &ptr_;
-  };
-
-
-#endif // end #if !defined
-
-  static CORBA::TypeCode_ptr _tc_Scheduler;
-
-};
-
-
-#if defined (__ACE_INLINE__)
-#include "RtecSchedulerC.i"
-#endif // defined INLINE
-
-
-#endif // if !defined
diff --git a/TAO/orbsvcs/lib/RtecSchedulerC.i b/TAO/orbsvcs/lib/RtecSchedulerC.i
deleted file mode 100644
index 9da5fcca635..00000000000
--- a/TAO/orbsvcs/lib/RtecSchedulerC.i
+++ /dev/null
@@ -1,1022 +0,0 @@
-// ******  Code generated by the The ACE ORB (TAO) IDL Compiler *******
-// TAO ORB and the TAO IDL Compiler have been developed by Washington 
-// University Computer Science's Distributed Object Computing Group.
-//
-// Information on TAO is available at
-//                 http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// *************************************************************
-// Inline operations for class RtecScheduler::Dependency_Info_var
-// *************************************************************
-
-ACE_INLINE
-RtecScheduler::Dependency_Info_var::Dependency_Info_var (void) // default constructor
-	: ptr_ (0)
-{}
-
-ACE_INLINE
-RtecScheduler::Dependency_Info_var::Dependency_Info_var (RtecScheduler::Dependency_Info *p)
-	: ptr_ (p)
-{}
-
-ACE_INLINE
-RtecScheduler::Dependency_Info_var::Dependency_Info_var (const RtecScheduler::Dependency_Info_var &p) // copy constructor
-{
-  if (p.ptr_)
-  	this->ptr_ = new RtecScheduler::Dependency_Info(*p.ptr_);
-  else
-  	this->ptr_ = 0;
-}
-
-ACE_INLINE
-RtecScheduler::Dependency_Info_var::~Dependency_Info_var (void) // destructor
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE RtecScheduler::Dependency_Info_var &
-RtecScheduler::Dependency_Info_var::operator= (RtecScheduler::Dependency_Info *p)
-{
-  delete this->ptr_;
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE RtecScheduler::Dependency_Info_var &
-RtecScheduler::Dependency_Info_var::operator= (const RtecScheduler::Dependency_Info_var &p)
-{
-  if (this != &p)
-  {
-    delete this->ptr_;
-    this->ptr_ = new RtecScheduler::Dependency_Info (*p.ptr_);
-  }
-  return *this;
-}
-
-ACE_INLINE const RtecScheduler::Dependency_Info *
-RtecScheduler::Dependency_Info_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE RtecScheduler::Dependency_Info *
-RtecScheduler::Dependency_Info_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE 
-RtecScheduler::Dependency_Info_var::operator const RtecScheduler::Dependency_Info &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE 
-RtecScheduler::Dependency_Info_var::operator RtecScheduler::Dependency_Info &() // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE 
-RtecScheduler::Dependency_Info_var::operator RtecScheduler::Dependency_Info &() const// cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE const RtecScheduler::Dependency_Info &
-RtecScheduler::Dependency_Info_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE RtecScheduler::Dependency_Info &
-RtecScheduler::Dependency_Info_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-// mapping for fixed size 
-ACE_INLINE RtecScheduler::Dependency_Info &
-RtecScheduler::Dependency_Info_var::out (void)
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE RtecScheduler::Dependency_Info
-RtecScheduler::Dependency_Info_var::_retn (void)
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE RtecScheduler::Dependency_Info *
-RtecScheduler::Dependency_Info_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE RtecScheduler::Dependency_Info *
-RtecScheduler::_tao__seq_Dependency_Set::allocbuf (CORBA::ULong nelems)
-{
-  return new RtecScheduler::Dependency_Info[nelems]; // allocate from heap
-}
-
-ACE_INLINE void
-RtecScheduler::_tao__seq_Dependency_Set::freebuf (RtecScheduler::Dependency_Info *seq)
-{
-  delete [] seq;
-}
-
-//default constructor
-ACE_INLINE 
-RtecScheduler::_tao__seq_Dependency_Set::_tao__seq_Dependency_Set (void)
-	: maximum_ (0),
-	  length_ (0),
-	  buffer_ (0),
-	  release_ (0) // does not own
-{}
-
-// constructor for unbounded seq
-ACE_INLINE 
-RtecScheduler::_tao__seq_Dependency_Set::_tao__seq_Dependency_Set(CORBA::ULong max )
-	: maximum_ (max),
-	  length_ (0),
-	  buffer_ (RtecScheduler::_tao__seq_Dependency_Set::allocbuf (max)),
-	  release_ (1) // owns
-{}
-
-// constructor from data buffer
-ACE_INLINE 
-RtecScheduler::_tao__seq_Dependency_Set::_tao__seq_Dependency_Set (CORBA::ULong max, CORBA::ULong length, 
-	RtecScheduler::Dependency_Info *value, CORBA::Boolean release)
-	: maximum_ (max),
-	  length_ (length),
-	  buffer_ (value),
-	  release_ (release) // ownership depends on release
-{}
-
-ACE_INLINE CORBA::ULong
-RtecScheduler::_tao__seq_Dependency_Set::maximum (void) const
-{
-  return this->maximum_;
-}
-
-ACE_INLINE CORBA::ULong
-RtecScheduler::_tao__seq_Dependency_Set::length  (void) const
-{
-  return this->length_;
-}
-
-ACE_INLINE RtecScheduler::Dependency_Info &
-RtecScheduler::_tao__seq_Dependency_Set::operator[] (CORBA::ULong index) // read/write
-{
-  return this->buffer_[index];
-}
-
-ACE_INLINE const RtecScheduler::Dependency_Info &
-RtecScheduler::_tao__seq_Dependency_Set::operator[] (CORBA::ULong index) const // read
-{
-  return this->buffer_[index];
-}
-
-// *************************************************************
-// Inline operations for class RtecScheduler::_tao__seq_Dependency_Set_var
-// *************************************************************
-
-ACE_INLINE
-RtecScheduler::_tao__seq_Dependency_Set_var::_tao__seq_Dependency_Set_var (void) // default constructor
-	: ptr_ (0)
-{}
-
-ACE_INLINE
-RtecScheduler::_tao__seq_Dependency_Set_var::_tao__seq_Dependency_Set_var (RtecScheduler::_tao__seq_Dependency_Set_ptr p)
-	: ptr_ (p)
-{}
-
-ACE_INLINE
-RtecScheduler::_tao__seq_Dependency_Set_var::_tao__seq_Dependency_Set_var (const RtecScheduler::_tao__seq_Dependency_Set_var &p) // copy constructor
-{
-  if (p.ptr_)
-  	this->ptr_ = new RtecScheduler::_tao__seq_Dependency_Set(*p.ptr_);
-  else
-  	this->ptr_ = 0;
-}
-
-ACE_INLINE
-RtecScheduler::_tao__seq_Dependency_Set_var::~_tao__seq_Dependency_Set_var (void) // destructor
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE RtecScheduler::_tao__seq_Dependency_Set_var &
-RtecScheduler::_tao__seq_Dependency_Set_var::operator= (RtecScheduler::_tao__seq_Dependency_Set *p)
-{
-  delete this->ptr_;
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE RtecScheduler::_tao__seq_Dependency_Set_var &
-RtecScheduler::_tao__seq_Dependency_Set_var::operator= (const RtecScheduler::_tao__seq_Dependency_Set_var &p) // deep copy
-{
-  if (this != &p)
-  {
-    delete this->ptr_;
-    this->ptr_ = new RtecScheduler::_tao__seq_Dependency_Set (*p.ptr_);
-  }
-  return *this;
-}
-
-ACE_INLINE const RtecScheduler::_tao__seq_Dependency_Set *
-RtecScheduler::_tao__seq_Dependency_Set_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE RtecScheduler::_tao__seq_Dependency_Set *
-RtecScheduler::_tao__seq_Dependency_Set_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE 
-RtecScheduler::_tao__seq_Dependency_Set_var::operator const RtecScheduler::_tao__seq_Dependency_Set &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE 
-RtecScheduler::_tao__seq_Dependency_Set_var::operator RtecScheduler::_tao__seq_Dependency_Set &() // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE 
-RtecScheduler::_tao__seq_Dependency_Set_var::operator RtecScheduler::_tao__seq_Dependency_Set &() const// cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE RtecScheduler::Dependency_Info&
-RtecScheduler::_tao__seq_Dependency_Set_var::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-ACE_INLINE const RtecScheduler::_tao__seq_Dependency_Set &
-RtecScheduler::_tao__seq_Dependency_Set_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE RtecScheduler::_tao__seq_Dependency_Set &
-RtecScheduler::_tao__seq_Dependency_Set_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-// mapping for variable size 
-ACE_INLINE RtecScheduler::_tao__seq_Dependency_Set *&
-RtecScheduler::_tao__seq_Dependency_Set_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE RtecScheduler::_tao__seq_Dependency_Set *
-RtecScheduler::_tao__seq_Dependency_Set_var::_retn (void)
-{
-  RtecScheduler::_tao__seq_Dependency_Set *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE RtecScheduler::_tao__seq_Dependency_Set *
-RtecScheduler::_tao__seq_Dependency_Set_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// *************************************************************
-// Inline operations for class RtecScheduler::_tao__seq_Dependency_Set_out
-// *************************************************************
-
-ACE_INLINE
-RtecScheduler::_tao__seq_Dependency_Set_out::_tao__seq_Dependency_Set_out (RtecScheduler::_tao__seq_Dependency_Set *&p)
-	: ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-RtecScheduler::_tao__seq_Dependency_Set_out::_tao__seq_Dependency_Set_out (RtecScheduler::_tao__seq_Dependency_Set_var &p) // constructor from _var
-	: ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-RtecScheduler::_tao__seq_Dependency_Set_out::_tao__seq_Dependency_Set_out (RtecScheduler::_tao__seq_Dependency_Set_out &p) // copy constructor
-	: ptr_ (p.ptr_)
-{}
-
-ACE_INLINE RtecScheduler::_tao__seq_Dependency_Set_out &
-RtecScheduler::_tao__seq_Dependency_Set_out::operator= (RtecScheduler::_tao__seq_Dependency_Set_out &p)
-{
-  this->ptr_ = p.ptr_;
-  return *this;
-}
-
-ACE_INLINE RtecScheduler::_tao__seq_Dependency_Set_out &
-RtecScheduler::_tao__seq_Dependency_Set_out::operator= (RtecScheduler::_tao__seq_Dependency_Set *p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE 
-RtecScheduler::_tao__seq_Dependency_Set_out::operator RtecScheduler::_tao__seq_Dependency_Set *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE RtecScheduler::_tao__seq_Dependency_Set *&
-RtecScheduler::_tao__seq_Dependency_Set_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE RtecScheduler::_tao__seq_Dependency_Set *
-RtecScheduler::_tao__seq_Dependency_Set_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE RtecScheduler::Dependency_Info& 
-RtecScheduler::_tao__seq_Dependency_Set_out::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-// *************************************************************
-// Inline operations for class RtecScheduler::RT_Info_var
-// *************************************************************
-
-ACE_INLINE
-RtecScheduler::RT_Info_var::RT_Info_var (void) // default constructor
-	: ptr_ (0)
-{}
-
-ACE_INLINE
-RtecScheduler::RT_Info_var::RT_Info_var (RtecScheduler::RT_Info *p)
-	: ptr_ (p)
-{}
-
-ACE_INLINE
-RtecScheduler::RT_Info_var::RT_Info_var (const RtecScheduler::RT_Info_var &p) // copy constructor
-{
-  if (p.ptr_)
-  	this->ptr_ = new RtecScheduler::RT_Info(*p.ptr_);
-  else
-  	this->ptr_ = 0;
-}
-
-ACE_INLINE
-RtecScheduler::RT_Info_var::~RT_Info_var (void) // destructor
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE RtecScheduler::RT_Info_var &
-RtecScheduler::RT_Info_var::operator= (RtecScheduler::RT_Info *p)
-{
-  delete this->ptr_;
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE RtecScheduler::RT_Info_var &
-RtecScheduler::RT_Info_var::operator= (const RtecScheduler::RT_Info_var &p)
-{
-  if (this != &p)
-  {
-    delete this->ptr_;
-    this->ptr_ = new RtecScheduler::RT_Info (*p.ptr_);
-  }
-  return *this;
-}
-
-ACE_INLINE const RtecScheduler::RT_Info *
-RtecScheduler::RT_Info_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE RtecScheduler::RT_Info *
-RtecScheduler::RT_Info_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE 
-RtecScheduler::RT_Info_var::operator const RtecScheduler::RT_Info &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE 
-RtecScheduler::RT_Info_var::operator RtecScheduler::RT_Info &() // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE 
-RtecScheduler::RT_Info_var::operator RtecScheduler::RT_Info &() const// cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE const RtecScheduler::RT_Info &
-RtecScheduler::RT_Info_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE RtecScheduler::RT_Info &
-RtecScheduler::RT_Info_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-// mapping for variable size 
-ACE_INLINE RtecScheduler::RT_Info *&
-RtecScheduler::RT_Info_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE RtecScheduler::RT_Info *
-RtecScheduler::RT_Info_var::_retn (void)
-{
-  RtecScheduler::RT_Info *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-// *************************************************************
-// Inline operations for class RtecScheduler::RT_Info_out
-// *************************************************************
-
-ACE_INLINE
-RtecScheduler::RT_Info_out::RT_Info_out (RtecScheduler::RT_Info *&p)
-	: ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-RtecScheduler::RT_Info_out::RT_Info_out (RtecScheduler::RT_Info_var &p) // constructor from _var
-	: ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-RtecScheduler::RT_Info_out::RT_Info_out (const RtecScheduler::RT_Info_out &p) // copy constructor
-	: ptr_ (p.ptr_)
-{}
-
-ACE_INLINE RtecScheduler::RT_Info_out &
-RtecScheduler::RT_Info_out::operator= (const RtecScheduler::RT_Info_out &p)
-{
-  this->ptr_ = p.ptr_;
-  return *this;
-}
-
-ACE_INLINE RtecScheduler::RT_Info_out &
-RtecScheduler::RT_Info_out::operator= (RtecScheduler::RT_Info *p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE 
-RtecScheduler::RT_Info_out::operator RtecScheduler::RT_Info *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE RtecScheduler::RT_Info *&
-RtecScheduler::RT_Info_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE RtecScheduler::RT_Info *
-RtecScheduler::RT_Info_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-// *************************************************************
-// Inline operations for exception RtecScheduler::DUPLICATE_NAME
-// *************************************************************
-
-// default constructor
-ACE_INLINE
-RtecScheduler::DUPLICATE_NAME::DUPLICATE_NAME (void)
-  : CORBA_UserException (_tc_DUPLICATE_NAME)
-{
-}
-
-// *************************************************************
-// Inline operations for exception RtecScheduler::UNKNOWN_TASK
-// *************************************************************
-
-// default constructor
-ACE_INLINE
-RtecScheduler::UNKNOWN_TASK::UNKNOWN_TASK (void)
-  : CORBA_UserException (_tc_UNKNOWN_TASK)
-{
-}
-
-// *************************************************************
-// Inline operations for exception RtecScheduler::NOT_SCHEDULED
-// *************************************************************
-
-// default constructor
-ACE_INLINE
-RtecScheduler::NOT_SCHEDULED::NOT_SCHEDULED (void)
-  : CORBA_UserException (_tc_NOT_SCHEDULED)
-{
-}
-
-// *************************************************************
-// Inline operations for exception RtecScheduler::UTILIZATION_BOUND_EXCEEDED
-// *************************************************************
-
-// default constructor
-ACE_INLINE
-RtecScheduler::UTILIZATION_BOUND_EXCEEDED::UTILIZATION_BOUND_EXCEEDED (void)
-  : CORBA_UserException (_tc_UTILIZATION_BOUND_EXCEEDED)
-{
-}
-
-// *************************************************************
-// Inline operations for exception RtecScheduler::INSUFFICIENT_THREAD_PRIORITY_LEVELS
-// *************************************************************
-
-// default constructor
-ACE_INLINE
-RtecScheduler::INSUFFICIENT_THREAD_PRIORITY_LEVELS::INSUFFICIENT_THREAD_PRIORITY_LEVELS (void)
-  : CORBA_UserException (_tc_INSUFFICIENT_THREAD_PRIORITY_LEVELS)
-{
-}
-
-// *************************************************************
-// Inline operations for exception RtecScheduler::TASK_COUNT_MISMATCH
-// *************************************************************
-
-// default constructor
-ACE_INLINE
-RtecScheduler::TASK_COUNT_MISMATCH::TASK_COUNT_MISMATCH (void)
-  : CORBA_UserException (_tc_TASK_COUNT_MISMATCH)
-{
-}
-
-ACE_INLINE RtecScheduler::RT_Info *
-RtecScheduler::_tao__seq_RT_Info_Set::allocbuf (CORBA::ULong nelems)
-{
-  return new RtecScheduler::RT_Info[nelems]; // allocate from heap
-}
-
-ACE_INLINE void
-RtecScheduler::_tao__seq_RT_Info_Set::freebuf (RtecScheduler::RT_Info *seq)
-{
-  delete [] seq;
-}
-
-//default constructor
-ACE_INLINE 
-RtecScheduler::_tao__seq_RT_Info_Set::_tao__seq_RT_Info_Set (void)
-	: maximum_ (0),
-	  length_ (0),
-	  buffer_ (0),
-	  release_ (0) // does not own
-{}
-
-// constructor for unbounded seq
-ACE_INLINE 
-RtecScheduler::_tao__seq_RT_Info_Set::_tao__seq_RT_Info_Set(CORBA::ULong max )
-	: maximum_ (max),
-	  length_ (0),
-	  buffer_ (RtecScheduler::_tao__seq_RT_Info_Set::allocbuf (max)),
-	  release_ (1) // owns
-{}
-
-// constructor from data buffer
-ACE_INLINE 
-RtecScheduler::_tao__seq_RT_Info_Set::_tao__seq_RT_Info_Set (CORBA::ULong max, CORBA::ULong length, 
-	RtecScheduler::RT_Info *value, CORBA::Boolean release)
-	: maximum_ (max),
-	  length_ (length),
-	  buffer_ (value),
-	  release_ (release) // ownership depends on release
-{}
-
-ACE_INLINE CORBA::ULong
-RtecScheduler::_tao__seq_RT_Info_Set::maximum (void) const
-{
-  return this->maximum_;
-}
-
-ACE_INLINE CORBA::ULong
-RtecScheduler::_tao__seq_RT_Info_Set::length  (void) const
-{
-  return this->length_;
-}
-
-ACE_INLINE RtecScheduler::RT_Info &
-RtecScheduler::_tao__seq_RT_Info_Set::operator[] (CORBA::ULong index) // read/write
-{
-  return this->buffer_[index];
-}
-
-ACE_INLINE const RtecScheduler::RT_Info &
-RtecScheduler::_tao__seq_RT_Info_Set::operator[] (CORBA::ULong index) const // read
-{
-  return this->buffer_[index];
-}
-
-// *************************************************************
-// Inline operations for class RtecScheduler::_tao__seq_RT_Info_Set_var
-// *************************************************************
-
-ACE_INLINE
-RtecScheduler::_tao__seq_RT_Info_Set_var::_tao__seq_RT_Info_Set_var (void) // default constructor
-	: ptr_ (0)
-{}
-
-ACE_INLINE
-RtecScheduler::_tao__seq_RT_Info_Set_var::_tao__seq_RT_Info_Set_var (RtecScheduler::_tao__seq_RT_Info_Set_ptr p)
-	: ptr_ (p)
-{}
-
-ACE_INLINE
-RtecScheduler::_tao__seq_RT_Info_Set_var::_tao__seq_RT_Info_Set_var (const RtecScheduler::_tao__seq_RT_Info_Set_var &p) // copy constructor
-{
-  if (p.ptr_)
-  	this->ptr_ = new RtecScheduler::_tao__seq_RT_Info_Set(*p.ptr_);
-  else
-  	this->ptr_ = 0;
-}
-
-ACE_INLINE
-RtecScheduler::_tao__seq_RT_Info_Set_var::~_tao__seq_RT_Info_Set_var (void) // destructor
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE RtecScheduler::_tao__seq_RT_Info_Set_var &
-RtecScheduler::_tao__seq_RT_Info_Set_var::operator= (RtecScheduler::_tao__seq_RT_Info_Set *p)
-{
-  delete this->ptr_;
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE RtecScheduler::_tao__seq_RT_Info_Set_var &
-RtecScheduler::_tao__seq_RT_Info_Set_var::operator= (const RtecScheduler::_tao__seq_RT_Info_Set_var &p) // deep copy
-{
-  if (this != &p)
-  {
-    delete this->ptr_;
-    this->ptr_ = new RtecScheduler::_tao__seq_RT_Info_Set (*p.ptr_);
-  }
-  return *this;
-}
-
-ACE_INLINE const RtecScheduler::_tao__seq_RT_Info_Set *
-RtecScheduler::_tao__seq_RT_Info_Set_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE RtecScheduler::_tao__seq_RT_Info_Set *
-RtecScheduler::_tao__seq_RT_Info_Set_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE 
-RtecScheduler::_tao__seq_RT_Info_Set_var::operator const RtecScheduler::_tao__seq_RT_Info_Set &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE 
-RtecScheduler::_tao__seq_RT_Info_Set_var::operator RtecScheduler::_tao__seq_RT_Info_Set &() // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE 
-RtecScheduler::_tao__seq_RT_Info_Set_var::operator RtecScheduler::_tao__seq_RT_Info_Set &() const// cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE RtecScheduler::RT_Info&
-RtecScheduler::_tao__seq_RT_Info_Set_var::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-ACE_INLINE const RtecScheduler::_tao__seq_RT_Info_Set &
-RtecScheduler::_tao__seq_RT_Info_Set_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE RtecScheduler::_tao__seq_RT_Info_Set &
-RtecScheduler::_tao__seq_RT_Info_Set_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-// mapping for variable size 
-ACE_INLINE RtecScheduler::_tao__seq_RT_Info_Set *&
-RtecScheduler::_tao__seq_RT_Info_Set_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE RtecScheduler::_tao__seq_RT_Info_Set *
-RtecScheduler::_tao__seq_RT_Info_Set_var::_retn (void)
-{
-  RtecScheduler::_tao__seq_RT_Info_Set *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE RtecScheduler::_tao__seq_RT_Info_Set *
-RtecScheduler::_tao__seq_RT_Info_Set_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// *************************************************************
-// Inline operations for class RtecScheduler::_tao__seq_RT_Info_Set_out
-// *************************************************************
-
-ACE_INLINE
-RtecScheduler::_tao__seq_RT_Info_Set_out::_tao__seq_RT_Info_Set_out (RtecScheduler::_tao__seq_RT_Info_Set *&p)
-	: ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-RtecScheduler::_tao__seq_RT_Info_Set_out::_tao__seq_RT_Info_Set_out (RtecScheduler::_tao__seq_RT_Info_Set_var &p) // constructor from _var
-	: ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-RtecScheduler::_tao__seq_RT_Info_Set_out::_tao__seq_RT_Info_Set_out (const RtecScheduler::_tao__seq_RT_Info_Set_out &p) // copy constructor
-	: ptr_ (p.ptr_)
-{}
-
-ACE_INLINE RtecScheduler::_tao__seq_RT_Info_Set_out &
-RtecScheduler::_tao__seq_RT_Info_Set_out::operator= (const RtecScheduler::_tao__seq_RT_Info_Set_out &p)
-{
-  this->ptr_ = p.ptr_;
-  return *this;
-}
-
-ACE_INLINE RtecScheduler::_tao__seq_RT_Info_Set_out &
-RtecScheduler::_tao__seq_RT_Info_Set_out::operator= (RtecScheduler::_tao__seq_RT_Info_Set *p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE 
-RtecScheduler::_tao__seq_RT_Info_Set_out::operator RtecScheduler::_tao__seq_RT_Info_Set *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE RtecScheduler::_tao__seq_RT_Info_Set *&
-RtecScheduler::_tao__seq_RT_Info_Set_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE RtecScheduler::_tao__seq_RT_Info_Set *
-RtecScheduler::_tao__seq_RT_Info_Set_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE RtecScheduler::RT_Info& 
-RtecScheduler::_tao__seq_RT_Info_Set_out::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-ACE_INLINE
-RtecScheduler::Scheduler::Scheduler (void) // default constructor
-{}
-
-ACE_INLINE
-RtecScheduler::Scheduler::Scheduler (STUB_Object *objref) // constructor
-	: ACE_CORBA_1 (Object) (objref)
-{}
-
-ACE_INLINE
-RtecScheduler::Scheduler::~Scheduler (void) // destructor
-{}
-
-
-#if !defined (_RTECSCHEDULER_SCHEDULER___VAR_CI_)
-#define _RTECSCHEDULER_SCHEDULER___VAR_CI_
-
-// *************************************************************
-// Inline operations for class RtecScheduler::Scheduler_var
-// *************************************************************
-
-ACE_INLINE
-RtecScheduler::Scheduler_var::Scheduler_var (void) // default constructor
-	: ptr_ (RtecScheduler::Scheduler::_nil ())
-{}
-
-ACE_INLINE
-RtecScheduler::Scheduler_var::Scheduler_var (RtecScheduler::Scheduler_ptr p)
-	: ptr_ (p)
-{}
-
-ACE_INLINE RtecScheduler::Scheduler_ptr 
-RtecScheduler::Scheduler_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-RtecScheduler::Scheduler_var::Scheduler_var (const RtecScheduler::Scheduler_var &p) // copy constructor
-	: ptr_ (RtecScheduler::Scheduler::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-RtecScheduler::Scheduler_var::~Scheduler_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE RtecScheduler::Scheduler_var &
-RtecScheduler::Scheduler_var::operator= (RtecScheduler::Scheduler_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE RtecScheduler::Scheduler_var &
-RtecScheduler::Scheduler_var::operator= (const RtecScheduler::Scheduler_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = RtecScheduler::Scheduler::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE 
-RtecScheduler::Scheduler_var::operator const RtecScheduler::Scheduler_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE 
-RtecScheduler::Scheduler_var::operator RtecScheduler::Scheduler_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE RtecScheduler::Scheduler_ptr 
-RtecScheduler::Scheduler_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE RtecScheduler::Scheduler_ptr
-RtecScheduler::Scheduler_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE RtecScheduler::Scheduler_ptr &
-RtecScheduler::Scheduler_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE RtecScheduler::Scheduler_ptr &
-RtecScheduler::Scheduler_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = RtecScheduler::Scheduler::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE RtecScheduler::Scheduler_ptr 
-RtecScheduler::Scheduler_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  RtecScheduler::Scheduler_ptr val = this->ptr_;
-  this->ptr_ = RtecScheduler::Scheduler::_nil ();
-  return val;
-}
-
-
-#endif // end #if !defined
-
-
-#if !defined (_RTECSCHEDULER_SCHEDULER___OUT_CI_)
-#define _RTECSCHEDULER_SCHEDULER___OUT_CI_
-
-// *************************************************************
-// Inline operations for class RtecScheduler::Scheduler_out
-// *************************************************************
-
-ACE_INLINE
-RtecScheduler::Scheduler_out::Scheduler_out (RtecScheduler::Scheduler_ptr &p)
-	: ptr_ (p)
-{
-  this->ptr_ = RtecScheduler::Scheduler::_nil ();
-}
-
-ACE_INLINE
-RtecScheduler::Scheduler_out::Scheduler_out (RtecScheduler::Scheduler_var &p) // constructor from _var
-	: ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = RtecScheduler::Scheduler::_nil ();
-}
-
-ACE_INLINE
-RtecScheduler::Scheduler_out::Scheduler_out (RtecScheduler::Scheduler_out &p) // copy constructor
-	: ptr_ (p.ptr_)
-{}
-
-ACE_INLINE RtecScheduler::Scheduler_out &
-RtecScheduler::Scheduler_out::operator= (RtecScheduler::Scheduler_out &p)
-{
-  this->ptr_ = p.ptr_;
-  return *this;
-}
-
-ACE_INLINE RtecScheduler::Scheduler_out &
-RtecScheduler::Scheduler_out::operator= (const RtecScheduler::Scheduler_var &p)
-{
-  this->ptr_ = RtecScheduler::Scheduler::_duplicate (p.ptr ());
-  return *this;
-}
-
-ACE_INLINE RtecScheduler::Scheduler_out &
-RtecScheduler::Scheduler_out::operator= (RtecScheduler::Scheduler_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE 
-RtecScheduler::Scheduler_out::operator RtecScheduler::Scheduler_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE RtecScheduler::Scheduler_ptr &
-RtecScheduler::Scheduler_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE RtecScheduler::Scheduler_ptr 
-RtecScheduler::Scheduler_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-
-#endif // end #if !defined
-
diff --git a/TAO/orbsvcs/lib/RtecSchedulerS.cpp b/TAO/orbsvcs/lib/RtecSchedulerS.cpp
deleted file mode 100644
index 43679b79f97..00000000000
--- a/TAO/orbsvcs/lib/RtecSchedulerS.cpp
+++ /dev/null
@@ -1,325 +0,0 @@
-// ******  Code generated by the The ACE ORB (TAO) IDL Compiler *******
-// TAO ORB and the TAO IDL Compiler have been developed by Washington 
-// University Computer Science's Distributed Object Computing Group.
-//
-// Information on TAO is available at
-//                 http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#include "RtecSchedulerS.h"
-
-#if !defined (__ACE_INLINE__)
-#include "RtecSchedulerS.i"
-#endif // !defined INLINE
-
-static const TAO_operation_db_entry Scheduler_operations [] = {
-  {"create", &POA_RtecScheduler::Scheduler::create_skel},
-  {"lookup", &POA_RtecScheduler::Scheduler::lookup_skel},
-  {"get", &POA_RtecScheduler::Scheduler::get_skel},
-  {"set", &POA_RtecScheduler::Scheduler::set_skel},
-  {"add_dependency", &POA_RtecScheduler::Scheduler::add_dependency_skel},
-  {"priority", &POA_RtecScheduler::Scheduler::priority_skel},
-  {"entry_point_priority", &POA_RtecScheduler::Scheduler::entry_point_priority_skel},
-  {"compute_scheduling", &POA_RtecScheduler::Scheduler::compute_scheduling_skel},
-  {"_is_a", &POA_RtecScheduler::Scheduler::_is_a_skel}
-};
-
-TAO_Dynamic_Hash_OpTable tao_Scheduler_optable (Scheduler_operations, 9, 18);
-// skeleton constructor
-POA_RtecScheduler::Scheduler::Scheduler (const char *obj_name)
-{
-  const CORBA::String repoID = "IDL:RtecScheduler/Scheduler:1.0"; // repository ID
-  IIOP_Object *data; // Actual object reference
-  TAO_ORB_Core *ocp = TAO_ORB_Core_instance (); // underlying ORB core instance
-  CORBA::POA_ptr oa = TAO_ORB_Core_instance ()->root_poa (); // underlying OA
-  const ACE_INET_Addr &addr = ocp->orb_params ()->addr ();
-  this->optable_ = &tao_Scheduler_optable;
-  
-  // set up an IIOP object
-  data = new IIOP_Object (CORBA::string_dup (repoID), addr, obj_name);
-  this->set_parent (data); // store the IIOP obj ref with us
-  this->sub_ = this; // set the most derived type to be us
-  if (oa) oa->bind (data->profile.object_key, this); // register ourselves
-}
-
-void POA_RtecScheduler::Scheduler::create_skel (CORBA::ServerRequest &_tao_server_request, CORBA::Object_ptr _tao_object_reference, CORBA::Environment &_tao_environment)
-{
-  CORBA::NVList_ptr 	 nvlist;
-  POA_RtecScheduler::Scheduler_ptr 	 impl;
-  CORBA::Any *result;
-  RtecScheduler::handle_t *retval = new RtecScheduler::handle_t;
-  char *entry_point;
-  CORBA::NamedValue_ptr nv_entry_point;
-  CORBA::Any 	 any_entry_point (CORBA::_tc_string, &entry_point); // ORB does not own
-  
-  // create an NV list and populate it with typecodes
-  _tao_server_request.orb ()->create_list (0, nvlist); // initialize a list
-  // add each argument according to the in, out, inout semantics
-  nv_entry_point = nvlist->add_value ("entry_point", any_entry_point, CORBA::ARG_IN, _tao_environment);
-  // parse the arguments
-  _tao_server_request.params (nvlist, _tao_environment);
-  if (_tao_environment.exception ()) return;
-  
-impl = (POA_RtecScheduler::Scheduler_ptr) _tao_object_reference->get_subclass ();
-   *retval = impl->create(entry_point, _tao_environment);
-  
-result = new CORBA::Any (RtecScheduler::_tc_handle_t, retval, 1); // ORB owns
-  _tao_server_request.result (result, _tao_environment);
-  
-}
-
-void POA_RtecScheduler::Scheduler::lookup_skel (CORBA::ServerRequest &_tao_server_request, CORBA::Object_ptr _tao_object_reference, CORBA::Environment &_tao_environment)
-{
-  CORBA::NVList_ptr 	 nvlist;
-  POA_RtecScheduler::Scheduler_ptr 	 impl;
-  CORBA::Any *result;
-  RtecScheduler::handle_t *retval = new RtecScheduler::handle_t;
-  char *entry_point;
-  CORBA::NamedValue_ptr nv_entry_point;
-  CORBA::Any 	 any_entry_point (CORBA::_tc_string, &entry_point); // ORB does not own
-  
-  // create an NV list and populate it with typecodes
-  _tao_server_request.orb ()->create_list (0, nvlist); // initialize a list
-  // add each argument according to the in, out, inout semantics
-  nv_entry_point = nvlist->add_value ("entry_point", any_entry_point, CORBA::ARG_IN, _tao_environment);
-  // parse the arguments
-  _tao_server_request.params (nvlist, _tao_environment);
-  if (_tao_environment.exception ()) return;
-  
-impl = (POA_RtecScheduler::Scheduler_ptr) _tao_object_reference->get_subclass ();
-   *retval = impl->lookup(entry_point, _tao_environment);
-  
-result = new CORBA::Any (RtecScheduler::_tc_handle_t, retval, 1); // ORB owns
-  _tao_server_request.result (result, _tao_environment);
-  
-}
-
-void POA_RtecScheduler::Scheduler::get_skel (CORBA::ServerRequest &_tao_server_request, CORBA::Object_ptr _tao_object_reference, CORBA::Environment &_tao_environment)
-{
-  CORBA::NVList_ptr 	 nvlist;
-  POA_RtecScheduler::Scheduler_ptr 	 impl;
-  CORBA::Any *result;
-  RtecScheduler::RT_Info *retval;
-  RtecScheduler::handle_t handle;
-  CORBA::NamedValue_ptr nv_handle;
-  CORBA::Any 	 any_handle (RtecScheduler::_tc_handle_t, &handle); // ORB does not own
-  
-  // create an NV list and populate it with typecodes
-  _tao_server_request.orb ()->create_list (0, nvlist); // initialize a list
-  // add each argument according to the in, out, inout semantics
-  nv_handle = nvlist->add_value ("handle", any_handle, CORBA::ARG_IN, _tao_environment);
-  // parse the arguments
-  _tao_server_request.params (nvlist, _tao_environment);
-  if (_tao_environment.exception ()) return;
-  
-impl = (POA_RtecScheduler::Scheduler_ptr) _tao_object_reference->get_subclass ();
-  retval = impl->get(handle, _tao_environment);
-  
-result = new CORBA::Any (RtecScheduler::_tc_RT_Info, retval, 1); // ORB owns
-  _tao_server_request.result (result, _tao_environment);
-  
-}
-
-void POA_RtecScheduler::Scheduler::set_skel (CORBA::ServerRequest &_tao_server_request, CORBA::Object_ptr _tao_object_reference, CORBA::Environment &_tao_environment)
-{
-  CORBA::NVList_ptr 	 nvlist;
-  POA_RtecScheduler::Scheduler_ptr 	 impl;
-  RtecScheduler::handle_t handle;
-  CORBA::NamedValue_ptr nv_handle;
-  CORBA::Any 	 any_handle (RtecScheduler::_tc_handle_t, &handle); // ORB does not own
-  RtecScheduler::Time time;
-  CORBA::NamedValue_ptr nv_time;
-  CORBA::Any 	 any_time (RtecScheduler::_tc_Time, &time); // ORB does not own
-  RtecScheduler::Time typical_time;
-  CORBA::NamedValue_ptr nv_typical_time;
-  CORBA::Any 	 any_typical_time (RtecScheduler::_tc_Time, &typical_time); // ORB does not own
-  RtecScheduler::Time cached_time;
-  CORBA::NamedValue_ptr nv_cached_time;
-  CORBA::Any 	 any_cached_time (RtecScheduler::_tc_Time, &cached_time); // ORB does not own
-  RtecScheduler::Period period;
-  CORBA::NamedValue_ptr nv_period;
-  CORBA::Any 	 any_period (RtecScheduler::_tc_Period, &period); // ORB does not own
-  RtecScheduler::Importance importance;
-  CORBA::NamedValue_ptr nv_importance;
-  CORBA::Any 	 any_importance (RtecScheduler::_tc_Importance, &importance); // ORB does not own
-  RtecScheduler::Quantum quantum;
-  CORBA::NamedValue_ptr nv_quantum;
-  CORBA::Any 	 any_quantum (RtecScheduler::_tc_Quantum, &quantum); // ORB does not own
-  CORBA::Long threads;
-  CORBA::NamedValue_ptr nv_threads;
-  CORBA::Any 	 any_threads (CORBA::_tc_long, &threads); // ORB does not own
-  
-  // create an NV list and populate it with typecodes
-  _tao_server_request.orb ()->create_list (0, nvlist); // initialize a list
-  // add each argument according to the in, out, inout semantics
-  nv_handle = nvlist->add_value ("handle", any_handle, CORBA::ARG_IN, _tao_environment);
-  nv_time = nvlist->add_value ("time", any_time, CORBA::ARG_IN, _tao_environment);
-  nv_typical_time = nvlist->add_value ("typical_time", any_typical_time, CORBA::ARG_IN, _tao_environment);
-  nv_cached_time = nvlist->add_value ("cached_time", any_cached_time, CORBA::ARG_IN, _tao_environment);
-  nv_period = nvlist->add_value ("period", any_period, CORBA::ARG_IN, _tao_environment);
-  nv_importance = nvlist->add_value ("importance", any_importance, CORBA::ARG_IN, _tao_environment);
-  nv_quantum = nvlist->add_value ("quantum", any_quantum, CORBA::ARG_IN, _tao_environment);
-  nv_threads = nvlist->add_value ("threads", any_threads, CORBA::ARG_IN, _tao_environment);
-  // parse the arguments
-  _tao_server_request.params (nvlist, _tao_environment);
-  if (_tao_environment.exception ()) return;
-  
-impl = (POA_RtecScheduler::Scheduler_ptr) _tao_object_reference->get_subclass ();
-  impl->set(handle, time, typical_time, cached_time, period, importance, quantum, threads, _tao_environment);
-  
-
-}
-
-void POA_RtecScheduler::Scheduler::add_dependency_skel (CORBA::ServerRequest &_tao_server_request, CORBA::Object_ptr _tao_object_reference, CORBA::Environment &_tao_environment)
-{
-  CORBA::NVList_ptr 	 nvlist;
-  POA_RtecScheduler::Scheduler_ptr 	 impl;
-  RtecScheduler::handle_t handle;
-  CORBA::NamedValue_ptr nv_handle;
-  CORBA::Any 	 any_handle (RtecScheduler::_tc_handle_t, &handle); // ORB does not own
-  RtecScheduler::handle_t dependency;
-  CORBA::NamedValue_ptr nv_dependency;
-  CORBA::Any 	 any_dependency (RtecScheduler::_tc_handle_t, &dependency); // ORB does not own
-  CORBA::Long number_of_calls;
-  CORBA::NamedValue_ptr nv_number_of_calls;
-  CORBA::Any 	 any_number_of_calls (CORBA::_tc_long, &number_of_calls); // ORB does not own
-  
-  // create an NV list and populate it with typecodes
-  _tao_server_request.orb ()->create_list (0, nvlist); // initialize a list
-  // add each argument according to the in, out, inout semantics
-  nv_handle = nvlist->add_value ("handle", any_handle, CORBA::ARG_IN, _tao_environment);
-  nv_dependency = nvlist->add_value ("dependency", any_dependency, CORBA::ARG_IN, _tao_environment);
-  nv_number_of_calls = nvlist->add_value ("number_of_calls", any_number_of_calls, CORBA::ARG_IN, _tao_environment);
-  // parse the arguments
-  _tao_server_request.params (nvlist, _tao_environment);
-  if (_tao_environment.exception ()) return;
-  
-impl = (POA_RtecScheduler::Scheduler_ptr) _tao_object_reference->get_subclass ();
-  impl->add_dependency(handle, dependency, number_of_calls, _tao_environment);
-  
-
-}
-
-void POA_RtecScheduler::Scheduler::priority_skel (CORBA::ServerRequest &_tao_server_request, CORBA::Object_ptr _tao_object_reference, CORBA::Environment &_tao_environment)
-{
-  CORBA::NVList_ptr 	 nvlist;
-  POA_RtecScheduler::Scheduler_ptr 	 impl;
-  RtecScheduler::handle_t handle;
-  CORBA::NamedValue_ptr nv_handle;
-  CORBA::Any 	 any_handle (RtecScheduler::_tc_handle_t, &handle); // ORB does not own
-  RtecScheduler::OS_Priority *priority = new RtecScheduler::OS_Priority;
-  CORBA::NamedValue_ptr nv_priority;
-  CORBA::Any 	 any_priority (RtecScheduler::_tc_OS_Priority, priority, 1); // ORB owns
-  RtecScheduler::Sub_Priority *subpriority = new RtecScheduler::Sub_Priority;
-  CORBA::NamedValue_ptr nv_subpriority;
-  CORBA::Any 	 any_subpriority (RtecScheduler::_tc_Sub_Priority, subpriority, 1); // ORB owns
-  RtecScheduler::Preemption_Priority *p_priority = new RtecScheduler::Preemption_Priority;
-  CORBA::NamedValue_ptr nv_p_priority;
-  CORBA::Any 	 any_p_priority (RtecScheduler::_tc_Preemption_Priority, p_priority, 1); // ORB owns
-  
-  // create an NV list and populate it with typecodes
-  _tao_server_request.orb ()->create_list (0, nvlist); // initialize a list
-  // add each argument according to the in, out, inout semantics
-  nv_handle = nvlist->add_value ("handle", any_handle, CORBA::ARG_IN, _tao_environment);
-  nv_priority = nvlist->add_value ("priority", any_priority, CORBA::ARG_OUT, _tao_environment);
-  nv_subpriority = nvlist->add_value ("subpriority", any_subpriority, CORBA::ARG_OUT, _tao_environment);
-  nv_p_priority = nvlist->add_value ("p_priority", any_p_priority, CORBA::ARG_OUT, _tao_environment);
-  // parse the arguments
-  _tao_server_request.params (nvlist, _tao_environment);
-  if (_tao_environment.exception ()) return;
-  
-impl = (POA_RtecScheduler::Scheduler_ptr) _tao_object_reference->get_subclass ();
-  impl->priority(handle, *priority, *subpriority, *p_priority, _tao_environment);
-  
-
-}
-
-void POA_RtecScheduler::Scheduler::entry_point_priority_skel (CORBA::ServerRequest &_tao_server_request, CORBA::Object_ptr _tao_object_reference, CORBA::Environment &_tao_environment)
-{
-  CORBA::NVList_ptr 	 nvlist;
-  POA_RtecScheduler::Scheduler_ptr 	 impl;
-  char *entry_point;
-  CORBA::NamedValue_ptr nv_entry_point;
-  CORBA::Any 	 any_entry_point (CORBA::_tc_string, &entry_point); // ORB does not own
-  RtecScheduler::OS_Priority *priority = new RtecScheduler::OS_Priority;
-  CORBA::NamedValue_ptr nv_priority;
-  CORBA::Any 	 any_priority (RtecScheduler::_tc_OS_Priority, priority, 1); // ORB owns
-  RtecScheduler::Sub_Priority *subpriority = new RtecScheduler::Sub_Priority;
-  CORBA::NamedValue_ptr nv_subpriority;
-  CORBA::Any 	 any_subpriority (RtecScheduler::_tc_Sub_Priority, subpriority, 1); // ORB owns
-  RtecScheduler::Preemption_Priority *p_priority = new RtecScheduler::Preemption_Priority;
-  CORBA::NamedValue_ptr nv_p_priority;
-  CORBA::Any 	 any_p_priority (RtecScheduler::_tc_Preemption_Priority, p_priority, 1); // ORB owns
-  
-  // create an NV list and populate it with typecodes
-  _tao_server_request.orb ()->create_list (0, nvlist); // initialize a list
-  // add each argument according to the in, out, inout semantics
-  nv_entry_point = nvlist->add_value ("entry_point", any_entry_point, CORBA::ARG_IN, _tao_environment);
-  nv_priority = nvlist->add_value ("priority", any_priority, CORBA::ARG_OUT, _tao_environment);
-  nv_subpriority = nvlist->add_value ("subpriority", any_subpriority, CORBA::ARG_OUT, _tao_environment);
-  nv_p_priority = nvlist->add_value ("p_priority", any_p_priority, CORBA::ARG_OUT, _tao_environment);
-  // parse the arguments
-  _tao_server_request.params (nvlist, _tao_environment);
-  if (_tao_environment.exception ()) return;
-  
-impl = (POA_RtecScheduler::Scheduler_ptr) _tao_object_reference->get_subclass ();
-  impl->entry_point_priority(entry_point, *priority, *subpriority, *p_priority, _tao_environment);
-  
-
-}
-
-void POA_RtecScheduler::Scheduler::compute_scheduling_skel (CORBA::ServerRequest &_tao_server_request, CORBA::Object_ptr _tao_object_reference, CORBA::Environment &_tao_environment)
-{
-  CORBA::NVList_ptr 	 nvlist;
-  POA_RtecScheduler::Scheduler_ptr 	 impl;
-  CORBA::Long minimum_priority;
-  CORBA::NamedValue_ptr nv_minimum_priority;
-  CORBA::Any 	 any_minimum_priority (CORBA::_tc_long, &minimum_priority); // ORB does not own
-  CORBA::Long maximum_priority;
-  CORBA::NamedValue_ptr nv_maximum_priority;
-  CORBA::Any 	 any_maximum_priority (CORBA::_tc_long, &maximum_priority); // ORB does not own
-  RtecScheduler::RT_Info_Set *infos;
-  RtecScheduler::RT_Info_Set_out infos_out (infos);
-  CORBA::NamedValue_ptr nv_infos;
-  CORBA::Any 	 any_infos (RtecScheduler::_tc_RT_Info_Set, infos, 1); // ORB owns
-  
-  // create an NV list and populate it with typecodes
-  _tao_server_request.orb ()->create_list (0, nvlist); // initialize a list
-  // add each argument according to the in, out, inout semantics
-  nv_minimum_priority = nvlist->add_value ("minimum_priority", any_minimum_priority, CORBA::ARG_IN, _tao_environment);
-  nv_maximum_priority = nvlist->add_value ("maximum_priority", any_maximum_priority, CORBA::ARG_IN, _tao_environment);
-  nv_infos = nvlist->add_value ("infos", any_infos, CORBA::ARG_OUT, _tao_environment);
-  // parse the arguments
-  _tao_server_request.params (nvlist, _tao_environment);
-  if (_tao_environment.exception ()) return;
-  
-impl = (POA_RtecScheduler::Scheduler_ptr) _tao_object_reference->get_subclass ();
-  impl->compute_scheduling(minimum_priority, maximum_priority, infos_out, _tao_environment);
-  
-
-}
-
-void POA_RtecScheduler::Scheduler::_is_a_skel (CORBA::ServerRequest &req, CORBA::Object_ptr /* obj */, CORBA::Environment &env)
-{
-  const CORBA::String type_id = "IDL:RtecScheduler/Scheduler:1.0"; // repository ID
-  CORBA::NVList_ptr nvlist;
-  CORBA::NamedValue_ptr nv;
-  CORBA::Any temp_value (CORBA::_tc_string);
-  CORBA::Any *any;
-  CORBA::Boolean *retval;
-  CORBA::String value;
-  
-  req.orb()->create_list (0, nvlist);
-  nv = nvlist->add_value (0, temp_value, CORBA::ARG_IN, env);
-  req.params (nvlist, env); // parse the args
-  if (env.exception () != 0) return;
-  value = *(CORBA::String *)nv->value ()->value ();
-  if (ACE_OS::strcmp ((char *)value, (char *)type_id) == 0
-    || ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (env)) == 0)
-
-  	retval = new CORBA::Boolean (CORBA::B_TRUE);
-  else
-  	retval = new CORBA::Boolean (CORBA::B_FALSE);
-  any = new CORBA::Any (CORBA::_tc_boolean, retval, CORBA::B_TRUE);
-  req.result (any, env);
-}
-
diff --git a/TAO/orbsvcs/lib/RtecSchedulerS.h b/TAO/orbsvcs/lib/RtecSchedulerS.h
deleted file mode 100644
index 83e89a3b372..00000000000
--- a/TAO/orbsvcs/lib/RtecSchedulerS.h
+++ /dev/null
@@ -1,60 +0,0 @@
-// ******  Code generated by the The ACE ORB (TAO) IDL Compiler *******
-// TAO ORB and the TAO IDL Compiler have been developed by Washington 
-// University Computer Science's Distributed Object Computing Group.
-//
-// Information on TAO is available at
-//                 http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#if !defined (_TAO_IDL_RTECSCHEDULERS_H_)
-#define _TAO_IDL_RTECSCHEDULERS_H_
-
-#include "RtecSchedulerC.h"
-
-class POA_RtecScheduler
-{
-public:
-  class Scheduler;
-  typedef Scheduler *Scheduler_ptr;
-  class Scheduler : public virtual RtecScheduler::Scheduler
-  {
-  protected:
-    Scheduler (const char *obj_name = 0);
-    virtual ~Scheduler (void);
-  public:
-    virtual RtecScheduler::handle_t create (const char *entry_point,  CORBA::Environment &env) = 0; // pure virtual
-    static void create_skel (CORBA::ServerRequest &req, CORBA::Object_ptr obj, CORBA::Environment &env);
-
-    virtual RtecScheduler::handle_t lookup (const char *entry_point,  CORBA::Environment &env) = 0; // pure virtual
-    static void lookup_skel (CORBA::ServerRequest &req, CORBA::Object_ptr obj, CORBA::Environment &env);
-
-    virtual RtecScheduler::RT_Info * get (RtecScheduler::handle_t handle,  CORBA::Environment &env) = 0; // pure virtual
-    static void get_skel (CORBA::ServerRequest &req, CORBA::Object_ptr obj, CORBA::Environment &env);
-
-    virtual void set (RtecScheduler::handle_t handle, RtecScheduler::Time time, RtecScheduler::Time typical_time, RtecScheduler::Time cached_time, RtecScheduler::Period period, RtecScheduler::Importance importance, RtecScheduler::Quantum quantum, CORBA::Long threads,  CORBA::Environment &env) = 0; // pure virtual
-    static void set_skel (CORBA::ServerRequest &req, CORBA::Object_ptr obj, CORBA::Environment &env);
-
-    virtual void add_dependency (RtecScheduler::handle_t handle, RtecScheduler::handle_t dependency, CORBA::Long number_of_calls,  CORBA::Environment &env) = 0; // pure virtual
-    static void add_dependency_skel (CORBA::ServerRequest &req, CORBA::Object_ptr obj, CORBA::Environment &env);
-
-    virtual void priority (RtecScheduler::handle_t handle, RtecScheduler::OS_Priority_out priority, RtecScheduler::Sub_Priority_out subpriority, RtecScheduler::Preemption_Priority_out p_priority,  CORBA::Environment &env) = 0; // pure virtual
-    static void priority_skel (CORBA::ServerRequest &req, CORBA::Object_ptr obj, CORBA::Environment &env);
-
-    virtual void entry_point_priority (const char *entry_point, RtecScheduler::OS_Priority_out priority, RtecScheduler::Sub_Priority_out subpriority, RtecScheduler::Preemption_Priority_out p_priority,  CORBA::Environment &env) = 0; // pure virtual
-    static void entry_point_priority_skel (CORBA::ServerRequest &req, CORBA::Object_ptr obj, CORBA::Environment &env);
-
-    virtual void compute_scheduling (CORBA::Long minimum_priority, CORBA::Long maximum_priority, RtecScheduler::RT_Info_Set_out infos,  CORBA::Environment &env) = 0; // pure virtual
-    static void compute_scheduling_skel (CORBA::ServerRequest &req, CORBA::Object_ptr obj, CORBA::Environment &env);
-
-    static void _is_a_skel (CORBA::ServerRequest &req, CORBA::Object_ptr obj, CORBA::Environment &env);
-
-  };
-
-};
-
-
-#if defined (__ACE_INLINE__)
-#include "RtecSchedulerS.i"
-#endif // defined INLINE
-
-
-#endif // if !defined
diff --git a/TAO/orbsvcs/lib/RtecSchedulerS.i b/TAO/orbsvcs/lib/RtecSchedulerS.i
deleted file mode 100644
index 2d9c404097a..00000000000
--- a/TAO/orbsvcs/lib/RtecSchedulerS.i
+++ /dev/null
@@ -1,12 +0,0 @@
-// ******  Code generated by the The ACE ORB (TAO) IDL Compiler *******
-// TAO ORB and the TAO IDL Compiler have been developed by Washington 
-// University Computer Science's Distributed Object Computing Group.
-//
-// Information on TAO is available at
-//                 http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// skeleton destructor
-ACE_INLINE
-POA_RtecScheduler::Scheduler::~Scheduler (void)
-{
-}
diff --git a/TAO/orbsvcs/lib/Runtime_Scheduler.cpp b/TAO/orbsvcs/lib/Runtime_Scheduler.cpp
deleted file mode 100644
index 183800b8ad1..00000000000
--- a/TAO/orbsvcs/lib/Runtime_Scheduler.cpp
+++ /dev/null
@@ -1,173 +0,0 @@
-// ============================================================================
-//
-// $Id$
-//
-// ============================================================================
-
-#include "Runtime_Scheduler.h"
-
-#if defined (__ACE_INLINE__)
-#include "Runtime_Scheduler.i"
-#endif /* __ACE_INLINE__ */
-
-ACE_Runtime_Scheduler::
-ACE_Runtime_Scheduler (int entry_count,
-		       RtecScheduler::RT_Info* rt_info[])
-:  POA_RtecScheduler::Scheduler ("Static_Scheduler"),
-   entry_count_ (entry_count),
-   rt_info_ (rt_info)
-{
-}
-
-RtecScheduler::handle_t
-ACE_Runtime_Scheduler::create (const char * entry_point,
-			       CORBA::Environment &_env)
-     ACE_THROW_SPEC ((CORBA::SystemException,
-		      RtecScheduler::DUPLICATE_NAME))
-{
-  // Just make sure its there and returns its handle (position).
-  int i;
-  for (i = 0; i < entry_count_; ++i)
-    {
-      if (strcmp (entry_point, rt_info_[i]->entry_point) == 0)
-	{
-	  return i;
-	}
-    }
-  // TODO: throw an exception or print an error.
-  return -1;
-}
-
-RtecScheduler::handle_t
-ACE_Runtime_Scheduler::lookup (const char * entry_point,
-			       CORBA::Environment &_env)
-    ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return create (entry_point, _env);
-}
-
-RtecScheduler::RT_Info*
-ACE_Runtime_Scheduler::get (RtecScheduler::handle_t handle,
-			    CORBA::Environment &_env)
-     ACE_THROW_SPEC((CORBA::SystemException,
-		     RtecScheduler::UNKNOWN_TASK))
-{
-  if (handle < 0 || handle > entry_count_)
-    {
-      ACE_THROW_RETURN (RtecScheduler::UNKNOWN_TASK(), 0);
-    }
-  return rt_info_[handle];
-}
-
-void ACE_Runtime_Scheduler::set (RtecScheduler::handle_t handle,
-				 RtecScheduler::Time time,
-				 RtecScheduler::Time typical_time,
-				 RtecScheduler::Time cached_time,
-				 RtecScheduler::Period period,
-				 RtecScheduler::Importance importance,
-				 RtecScheduler::Quantum quantum,
-				 CORBA::Long threads,
-				 CORBA::Environment &_env)
-     ACE_THROW_SPEC ((CORBA::SystemException,
-		      RtecScheduler::UNKNOWN_TASK))
-{
-  // We compare the values with the ones stored and print a message on
-  // any differences.
-  if (handle < 0 || handle > entry_count_)
-    {
-      ACE_THROW (RtecScheduler::UNKNOWN_TASK);
-      return;
-    }
-  if (rt_info_[handle]->worst_case_execution_time != time
-      || rt_info_[handle]->typical_execution_time != typical_time
-      || rt_info_[handle]->cached_execution_time != cached_time
-      || rt_info_[handle]->period != period
-      || rt_info_[handle]->importance != importance
-      || rt_info_[handle]->quantum != quantum
-      || rt_info_[handle]->threads != threads)
-    {
-      ACE_ERROR ((LM_ERROR, "invalid data for RT_Info: %s\n",
-		  (const char*)rt_info_[handle]->entry_point));
-      // TODO: throw something here.
-    }
-}
-
-
-void ACE_Runtime_Scheduler::priority (RtecScheduler::handle_t handle,
-				      RtecScheduler::OS_Priority& priority,
-				      RtecScheduler::Sub_Priority& subpriority,
-				      RtecScheduler::Preemption_Priority& p_priority,
-				      CORBA::Environment &_env)
-     ACE_THROW_SPEC ((CORBA::SystemException,
-		      RtecScheduler::UNKNOWN_TASK,
-		      RtecScheduler::NOT_SCHEDULED))
-{
-  if (handle < 0 || handle > entry_count_)
-    {
-      ACE_THROW (RtecScheduler::UNKNOWN_TASK());
-      return;
-    }
-  priority = rt_info_[handle]->priority;
-  subpriority = rt_info_[handle]->subpriority;
-  p_priority = rt_info_[handle]->preemption_priority;
-}
-           
-void ACE_Runtime_Scheduler::entry_point_priority (const char * entry_point,
-						  RtecScheduler::OS_Priority& priority,
-						  RtecScheduler::Sub_Priority& subpriority,
-						  RtecScheduler::Preemption_Priority& p_priority,
-						  CORBA::Environment &_env)
-     ACE_THROW_SPEC((CORBA::SystemException,
-		     RtecScheduler::UNKNOWN_TASK,
-		     RtecScheduler::NOT_SCHEDULED))
-{
-  RtecScheduler::handle_t handle = lookup (entry_point, _env);
-  if (handle < -1)
-    {
-      // The exception was thrown or is in _env already.
-      return;
-    }
-  this->priority (handle, priority, subpriority, p_priority, _env);
-}
-
-void ACE_Runtime_Scheduler::add_dependency (RtecScheduler::handle_t handle,
-					    RtecScheduler::handle_t dependency,
-					    CORBA::Long number_of_calls,
-					    CORBA::Environment &_env)
-     ACE_THROW_SPEC ((CORBA::SystemException,
-		      RtecScheduler::UNKNOWN_TASK))
-{
-  if (handle < 0 || handle > entry_count_)
-    {
-      ACE_THROW (RtecScheduler::UNKNOWN_TASK);
-      return;
-    }
-  // Just check that the information is consistent.
-  RtecScheduler::Dependency_Set& deps = rt_info_[handle]->dependencies;
-  for (int i = 0; i < deps.length (); ++i)
-    {
-      if (deps[i].rt_info == dependency
-	  && deps[i].number_of_calls == number_of_calls)
-	{
-	  return;
-	}
-    }
-  ACE_ERROR ((LM_ERROR, "unmatched dependency on %s\n",
-	      (const char*)rt_info_[handle]->entry_point));
-}
-
-void ACE_Runtime_Scheduler::compute_scheduling (CORBA::Long minimum_priority,
-						CORBA::Long maximum_priority,
-						RtecScheduler::RT_Info_Set_out infos,
-						CORBA::Environment &_env)
-     ACE_THROW_SPEC ((CORBA::SystemException,
-		      RtecScheduler::UTILIZATION_BOUND_EXCEEDED,
-		      RtecScheduler::INSUFFICIENT_THREAD_PRIORITY_LEVELS,
-		      RtecScheduler::TASK_COUNT_MISMATCH))
-{
-  // TODO: Right now just do nothing, later we could validate the
-  // priorities (without recomputing).
-  // TODO: fill up the infos.
-  return;
-}
-
diff --git a/TAO/orbsvcs/lib/Runtime_Scheduler.h b/TAO/orbsvcs/lib/Runtime_Scheduler.h
deleted file mode 100644
index 4209b7cbf44..00000000000
--- a/TAO/orbsvcs/lib/Runtime_Scheduler.h
+++ /dev/null
@@ -1,96 +0,0 @@
-// ============================================================================
-//
-// $Id$
-//
-// ============================================================================
-
-#ifndef ACE_RUNTIME_SCHEDULER_H
-#define ACE_RUNTIME_SCHEDULER_H
-
-#include "ace/OS.h"
-
-#include "RtecSchedulerS.h"
-
-class ACE_Runtime_Scheduler
-  : public POA_RtecScheduler::Scheduler
-  // = TITLE
-  //   A proxy server for RtecScheduler::Scheduler.
-  //
-  // = DESCRIPTION
-  //   This class offers the services of the scheduler, but based on
-  //   precomputed and precompiled information. This results in a
-  //   highly optimized execution after the configuration runs.
-{
-public:
-  ACE_Runtime_Scheduler (int entry_count,
-			 RtecScheduler::RT_Info* rt_info[]);
-  // Initialize the data from the RT_Info array.
-  // Only basic validation is done.
-
-  virtual RtecScheduler::handle_t create (const char * entry_point,
-					  CORBA::Environment &_env)
-    ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::DUPLICATE_NAME));
-
-  virtual RtecScheduler::handle_t lookup (const char * entry_point,
-					  CORBA::Environment &_env)
-    ACE_THROW_SPEC((CORBA::SystemException));
-
-  virtual RtecScheduler::RT_Info* get (RtecScheduler::handle_t handle,
-				       CORBA::Environment &_env)
-    ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::UNKNOWN_TASK));
-
-  virtual void set (RtecScheduler::handle_t handle,
-		    RtecScheduler::Time time,
-		    RtecScheduler::Time typical_time,
-		    RtecScheduler::Time cached_time,
-		    RtecScheduler::Period period,
-		    RtecScheduler::Importance importance,
-		    RtecScheduler::Quantum quantum,
-		    CORBA::Long threads,
-		    CORBA::Environment &_env)
-    ACE_THROW_SPEC ((CORBA::SystemException, RtecScheduler::UNKNOWN_TASK));
-
-  virtual void priority (RtecScheduler::handle_t handle,
-			 RtecScheduler::OS_Priority& priority,
-			 RtecScheduler::Sub_Priority& subpriority,
-			 RtecScheduler::Preemption_Priority& p_priority,
-			 CORBA::Environment &_env)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-		     RtecScheduler::UNKNOWN_TASK,
-		     RtecScheduler::NOT_SCHEDULED));
-           
-  virtual void entry_point_priority (const char * entry_point,
-				     RtecScheduler::OS_Priority& priority,
-				     RtecScheduler::Sub_Priority& subpriority,
-				     RtecScheduler::Preemption_Priority& p_priority,
-				     CORBA::Environment &_env)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-		     RtecScheduler::UNKNOWN_TASK,
-		     RtecScheduler::NOT_SCHEDULED));
-
-  virtual void add_dependency (RtecScheduler::handle_t handle,
-			       RtecScheduler::handle_t dependency,
-			       CORBA::Long number_of_calls,
-			       CORBA::Environment &_env)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-		     RtecScheduler::UNKNOWN_TASK));
-
-  virtual void compute_scheduling (CORBA::Long minimum_priority,
-				   CORBA::Long maximum_priority,
-				   RtecScheduler::RT_Info_Set_out infos,
-				   CORBA::Environment &_env)
-    ACE_THROW_SPEC((CORBA::SystemException,
-		    RtecScheduler::UTILIZATION_BOUND_EXCEEDED,
-		    RtecScheduler::INSUFFICIENT_THREAD_PRIORITY_LEVELS,
-		    RtecScheduler::TASK_COUNT_MISMATCH));
-
-private:
-  int entry_count_;
-  RtecScheduler::RT_Info** rt_info_;
-};
-
-#if defined (__ACE_INLINE__)
-#include "Runtime_Scheduler.i"
-#endif /* __ACE_INLINE__ */
-
-#endif /* ACE_RUNTIME_SCHEDULER_H */
diff --git a/TAO/orbsvcs/lib/Runtime_Scheduler.i b/TAO/orbsvcs/lib/Runtime_Scheduler.i
deleted file mode 100644
index a21ea7f9897..00000000000
--- a/TAO/orbsvcs/lib/Runtime_Scheduler.i
+++ /dev/null
@@ -1,5 +0,0 @@
-// ============================================================================
-//
-// $Id$
-//
-// ============================================================================
diff --git a/TAO/orbsvcs/lib/Scheduler_Factory.cpp b/TAO/orbsvcs/lib/Scheduler_Factory.cpp
deleted file mode 100644
index dd197beafe9..00000000000
--- a/TAO/orbsvcs/lib/Scheduler_Factory.cpp
+++ /dev/null
@@ -1,246 +0,0 @@
-// ============================================================================
-//
-// $Id$
-//
-// ============================================================================
-
-#include <ace/OS.h>
-
-#include "Runtime_Scheduler.h"
-#include "Scheduler_Factory.h"
-
-#if ! defined (__ACE_INLINE__)
-#include "Scheduler_Factory.i"
-#endif /* __ACE_INLINE__ */
-
-RtecScheduler::Scheduler_ptr ACE_Scheduler_Factory::server_ = 0;
-
-static int entry_count = -1;
-static ACE_Scheduler_Factory::POD_RT_Info* rt_info = 0;
-
-int ACE_Scheduler_Factory::use_runtime (int ec,
-					POD_RT_Info rti[])
-{
-  if (server_ != 0 || entry_count != -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-			 "ACE_Scheduler_Factory::use_runtime - "
-			 "server already configured\n"), -1);
-    }
-
-  entry_count = ec;
-  rt_info = rti;
-
-  return 0;
-}
-
-RtecScheduler::Scheduler_ptr static_server ()
-{
-  RtecScheduler::Scheduler_ptr server_ = 0;
-
-  typedef RtecScheduler::RT_Info* RT_Info_ptr;
-  RtecScheduler::RT_Info** info;
-  ACE_NEW_RETURN (info, RT_Info_ptr[entry_count], 0);
-  for (int i = 0; i < entry_count; ++i)
-    {
-      info[i] = new RtecScheduler::RT_Info;
-      if (info[i] == 0)
-	{
-	  for (int j = 0; j < i; ++j)
-	    {
-	      delete info[i];
-	    }
-	  delete[] info;
-	  ACE_ERROR_RETURN ((LM_ERROR,
-			     "ACE_Scheduler_Factory::config_runtime - "
-			     "cannot allocate RT_Info\n"), 0);
-	}
-      info[i]->entry_point = rt_info[i].entry_point;
-      info[i]->handle = rt_info[i].handle;
-      info[i]->worst_case_execution_time = rt_info[i].worst_case_execution_time;
-      info[i]->typical_execution_time = rt_info[i].typical_execution_time;
-      info[i]->cached_execution_time = rt_info[i].cached_execution_time;
-      info[i]->period = rt_info[i].period;
-      info[i]->importance = rt_info[i].importance;
-      info[i]->quantum = rt_info[i].quantum;
-      info[i]->threads = rt_info[i].threads;
-      info[i]->priority = rt_info[i].priority;
-      info[i]->subpriority = rt_info[i].subpriority;
-      info[i]->preemption_priority = rt_info[i].preemption_priority;
-    }
-  server_ = new ACE_Runtime_Scheduler (entry_count, info);
-
-  if (server_ == 0)
-    {
-      for (int i = 0; i < entry_count; ++i)
-	{
-	  delete info[i];
-	}
-      delete[] info;
-      ACE_ERROR_RETURN ((LM_ERROR,
-			 "ACE_Scheduler_Factory::config_runtime - "
-			 "cannot allocate server\n"), 0);
-    }
-  ACE_DEBUG ((LM_DEBUG,
-	      "ACE_Scheduler_Factory - configured static server\n"));
-  CORBA::Object::_duplicate (server_);
-  return server_;
-}
-
-int
-ACE_Scheduler_Factory::use_config (CosNaming::NamingContext_ptr naming)
-{
-  if (server_ != 0 || entry_count != -1)
-    {
-      // No errors, runtime execution simply takes precedence over
-      // config runs.
-      return 0;
-    }
-
-  ACE_TRY
-    {
-      CosNaming::Name schedule_name (1);
-      schedule_name[0].id = CORBA::string_dup ("ScheduleService");
-      schedule_name.length (1);
-      CORBA::Object_ptr objref =
-	naming->resolve (schedule_name, ACE_TRY_ENV);
-      ACE_CHECK_ENV;
-
-      server_ =
-	RtecScheduler::Scheduler::_narrow(objref, ACE_TRY_ENV);
-      ACE_CHECK_ENV;
-
-      RtecScheduler::Scheduler::_duplicate (server_);
-      ACE_CHECK_ENV;
-    }
-  ACE_CATCHANY
-    {
-      server_ = 0;
-      ACE_ERROR_RETURN ((LM_ERROR,
-			 "ACE_Scheduler_Factory::use_context - "
-			 " exception while resolving server\n"), -1);
-    }
-  ACE_ENDTRY;
-  return 0;
-}
-
-int
-ACE_Scheduler_Factory::use_config (CORBA::ORB_ptr orb)
-{
-  if (server_ != 0 || entry_count != -1)
-    {
-      // No errors, runtime execution simply takes precedence over
-      // config runs.
-      return 0;
-    }
-
-  ACE_TRY
-    {
-      CORBA::Object_ptr objref =
-	orb->resolve_initial_references ("ScheduleService");
-      ACE_CHECK_ENV;
-
-      server_ =
-	RtecScheduler::Scheduler::_narrow(objref, ACE_TRY_ENV);
-      ACE_CHECK_ENV;
-
-      RtecScheduler::Scheduler::_duplicate (server_);
-      ACE_CHECK_ENV;
-    }
-  ACE_CATCHANY
-    {
-      server_ = 0;
-      ACE_ERROR_RETURN ((LM_ERROR,
-			 "ACE_Scheduler_Factory::use_context - "
-			 " exception while resolving server\n"), -1);
-    }
-  ACE_ENDTRY;
-  return 0;
-}
-
-
-RtecScheduler::Scheduler_ptr
-ACE_Scheduler_Factory::server (void)
-{
-  if (server_ == 0 && entry_count != -1)
-    {
-      server_ = static_server ();
-    }
-	
-  if (server_ == 0)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-			 "ACE_Scheduler_Factor::server - "
-			 "no scheduling service configured\n"), 0);
-    }
-  return server_;
-}
-
-static char header[] =
-"// This file was automatically generated by Scheduler_Factory\n"
-"// before editing the file please consider generating it again\n"
-"\n"
-"#include \"Scheduler_Factory.h\"\n"
-"\n";
-
-static char footer[] = 
-"\n"
-"// This setups Scheduler_Factory to use the runtime version\n"
-"static int scheduler_factory_setup = \n"
-"  ACE_Scheduler_Factory::use_runtime (sizeof (infos)/sizeof (infos[0]),\n"
-"                                      infos);\n"
-"\n"
-"// EOF\n";
-
-static char start_infos[] = 
-"static ACE_Scheduler_Factory::POD_RT_Info infos[] = {\n";
-
-static char end_infos[] = 
-"};\n";
-
-int ACE_Scheduler_Factory::dump_schedule
-    (const RtecScheduler::RT_Info_Set& infos,
-     const char* filename)
-{
-  FILE* file = stdin;
-  if (filename != 0)
-    {
-      file = ACE_OS::fopen (filename, "w");
-      if (file == 0)
-	{
-	  return -1;
-	}
-    }
-  ACE_OS::fprintf(file, header);
-
-  ACE_OS::fprintf(file, start_infos);
-  for (u_int i = 0; i < infos.length (); ++i)
-    {
-      if (i != 0)
-	{
-	  // Finish previous line
-	  ACE_OS::fprintf(file, ",\n");
-	}
-      const RtecScheduler::RT_Info& info = infos[i];
-      ACE_OS::fprintf (file,
-"{ \"%s\", %d, %f, %f, %f, %d, %d, %f, %d, %d, %d, %d }",
-		       (const char*)info.entry_point,
-		       info.handle,
-		       info.worst_case_execution_time,
-		       info.typical_execution_time,
-		       info.cached_execution_time,
-		       info.period,
-		       info.importance,
-		       info.quantum,
-		       info.threads,
-		       info.priority,
-		       info.subpriority,
-		       info.preemption_priority);
-    }
-  // finish last line.
-  ACE_OS::fprintf(file, "\n");
-  ACE_OS::fprintf(file, end_infos);
-  ACE_OS::fprintf(file, footer);
-  ACE_OS::fclose (file);
-  return 0;
-}
diff --git a/TAO/orbsvcs/lib/Scheduler_Factory.h b/TAO/orbsvcs/lib/Scheduler_Factory.h
deleted file mode 100644
index 2529b0be35a..00000000000
--- a/TAO/orbsvcs/lib/Scheduler_Factory.h
+++ /dev/null
@@ -1,98 +0,0 @@
-// ============================================================================
-//
-// $Id$
-//
-// ============================================================================
-
-#ifndef ACE_SCHEDULER_FACTORY_H
-#define ACE_SCHEDULER_FACTORY_H
-
-#include "ace/OS.h"
-
-#include "RtecSchedulerC.h"
-#include "CosNamingC.h"
-
-class ACE_Scheduler_Factory
-  // = TITLE
-  //   Factory of scheduler services.
-  //
-  // = DESCRIPTION
-  //   This class acts as a factory for scheduler servers. At config
-  //   time it will return a remote server, which will actually
-  //   compute the scheduling parameters. At run-time it returns a
-  //   local server, which will use the results of the config runs to
-  //   actually do the scheduling, without incurring in RPC overheads.
-{
-public:
-  struct POD_RT_Info
-    // = TITLE
-    //   Plain Old Data for RT_Infos.
-    //
-    // = DESCRIPTION
-    //   This class provide us with a plain old data version of
-    //   RT_Info, this is useful for implementing static arrays or  of
-    //   those.
-  {
-    const char* entry_point;
-    RtecScheduler::handle_t handle;
-    RtecScheduler::Time worst_case_execution_time;
-    RtecScheduler::Time typical_execution_time;
-    RtecScheduler::Time cached_execution_time;
-    RtecScheduler::Period period;
-    RtecScheduler::Importance importance;
-    RtecScheduler::Quantum quantum;
-    CORBA::Long threads;
-    RtecScheduler::OS_Priority priority;
-    RtecScheduler::Sub_Priority subpriority;
-    RtecScheduler::Preemption_Priority preemption_priority;
-  };
-  
-  static int use_config (CosNaming::NamingContext_ptr naming);
-  // Setup the variables needed for a config run, using the
-  // NamingContext to locate a Scheduler.
-
-  static int use_config (CORBA::ORB_ptr orb);
-  // Setup the variable needed for a config run, using an environment
-  // variable to locate a Scheduler.
-
-  static int use_runtime (int entry_count,
-			  POD_RT_Info rt_info[]);
-  // Disable config runs in the Factory and setups the precomputed
-  // scheduling.
-
-  static RtecScheduler::Scheduler_ptr server (void);
-  // Return the Real-time Scheduling Service used for this run.
-  // Must have been configured either using use_context() or use_data().
-  //
-  // Normally use_data() is called at static elaboration time, so
-  // everything is automatic.
-  // On config runs use_context() is called from main, after
-  // resolve_initial_references.
-
-  static int dump_schedule (const RtecScheduler::RT_Info_Set& infos,
-			    const char* file_name = 0);
-  // This helper function will dump the schedule returned by a
-  // RtecScheduler::Scheduler into a file, the file can be compiled to
-  // create an efficient local implementation of the Scheduler.
-
-  // TODO: How to do cleanup()? Use the ACE_Object_Manager stuff?
-
-protected:
-  static int no_config_run (void);
-  // By default this factory assumes we are runnning a config
-  // run. Calling this method disables that.
-  // Since the methods returns an int it can be used to initialize a
-  // static variable, hence calling it before main(); this technique
-  // can be used in the code emitted for the run-time scheduler,
-  // automagically disabling the config_run() when that code is linked
-  // in.
-
-private:
-  static RtecScheduler::Scheduler_ptr server_;
-};
-
-#if defined (__ACE_INLINE__)
-#include "Scheduler_Factory.i"
-#endif /* __ACE_INLINE__ */
-
-#endif /* ACE_SCHEDULER_FACTORY_H */
diff --git a/TAO/orbsvcs/lib/Scheduler_Factory.i b/TAO/orbsvcs/lib/Scheduler_Factory.i
deleted file mode 100644
index 8d85b9d5a37..00000000000
--- a/TAO/orbsvcs/lib/Scheduler_Factory.i
+++ /dev/null
@@ -1,6 +0,0 @@
-// ============================================================================
-//
-// $Id$
-//
-// ============================================================================
-
diff --git a/TAO/orbsvcs/lib/Scheduler_Utilities.cpp b/TAO/orbsvcs/lib/Scheduler_Utilities.cpp
deleted file mode 100644
index 78147115178..00000000000
--- a/TAO/orbsvcs/lib/Scheduler_Utilities.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-// ============================================================================
-//
-// $Id$
-//
-// ============================================================================
-
-#include <ace/OS.h>
-
-#include "Scheduler_Utilities.h"
-
-#if ! defined (__ACE_INLINE__)
-#include "Scheduler_Utilities.i"
-#endif /* __ACE_INLINE__ */
-
diff --git a/TAO/orbsvcs/lib/Scheduler_Utilities.h b/TAO/orbsvcs/lib/Scheduler_Utilities.h
deleted file mode 100644
index 2475751020a..00000000000
--- a/TAO/orbsvcs/lib/Scheduler_Utilities.h
+++ /dev/null
@@ -1,46 +0,0 @@
-// ============================================================================
-//
-// $Id$
-//
-// ============================================================================
-
-#ifndef ACE_SCHEDULER_UTILITIES_H
-#define ACE_SCHEDULER_UTILITIES_H
-
-#include <ace/OS.h>
-
-#include "RtecSchedulerC.h"
-
-class ACE_RT_Info : public RtecScheduler::RT_Info
-  // = TITLE
-  //   Offers a convenient C++ interface to the IDL RT_Info structure.
-  //
-  // = DESCRIPTION
-  //   For performance reasons the RT_Info data is represented as an
-  //   IDL structure, this permits sending complete RT_Info's from the
-  //   client to the server.
-  //   Unfortunately this precludes the usage of member functions and
-  //   constructors, this class serves as a helper to implement those
-  //   without loosing the performance on IDL.
-{
-public:
-  ACE_RT_Info (const char* entry_point,
-	       RtecScheduler::Time worst_time,
-	       RtecScheduler::Time typical_time,
-	       RtecScheduler::Time cached_time,
-	       RtecScheduler::Period period,
-	       RtecScheduler::Importance importance,
-	       RtecScheduler::Quantum quantum,
-	       CORBA::Long threads);
-
-  ACE_RT_Info (const RtecScheduler::RT_Info& rt_info);
-
-  int add_dependency(RtecScheduler::handle_t dep,
-		     int number_of_calls = 1);
-};
-
-#if defined (__ACE_INLINE__)
-#include "Scheduler_Utilities.i"
-#endif /* __ACE_INLINE__ */
-
-#endif /* ACE_SCHEDULER_UTILITIES_H */
diff --git a/TAO/orbsvcs/lib/Scheduler_Utilities.i b/TAO/orbsvcs/lib/Scheduler_Utilities.i
deleted file mode 100644
index 1d62ceffaf5..00000000000
--- a/TAO/orbsvcs/lib/Scheduler_Utilities.i
+++ /dev/null
@@ -1,32 +0,0 @@
-// ============================================================================
-//
-// $Id$
-//
-// ============================================================================
-
-ACE_INLINE
-ACE_RT_Info::ACE_RT_Info (const char* entry_point_,
-			  RtecScheduler::Time worst_time_,
-			  RtecScheduler::Time typical_time_,
-			  RtecScheduler::Time cached_time_,
-			  RtecScheduler::Period period_,
-			  RtecScheduler::Importance importance_,
-			  RtecScheduler::Quantum quantum_,
-			  CORBA::Long threads_)
-{
-  this->entry_point = entry_point_;
-  this->worst_case_execution_time = worst_time_;
-  this->typical_execution_time = typical_time_;
-  this->cached_execution_time = cached_time_;
-  this->period = period_;
-  this->importance = importance_;
-  this->quantum = quantum_;
-  this->threads = threads_;
-}
-
-ACE_INLINE
-ACE_RT_Info::ACE_RT_Info (const RtecScheduler::RT_Info& rt_info)
-  :  RtecScheduler::RT_Info (rt_info)
-{
-}
-
diff --git a/TAO/orbsvcs/tests/Logger/Makefile b/TAO/orbsvcs/tests/Logger/Makefile
deleted file mode 100644
index 1908db92720..00000000000
--- a/TAO/orbsvcs/tests/Logger/Makefile
+++ /dev/null
@@ -1,87 +0,0 @@
-#----------------------------------------------------------------------------
-#	$Id$
-#
-#	Top-level Makefile for the Logger Service of the TAO ORB
-#
-#----------------------------------------------------------------------------
-
-#----------------------------------------------------------------------------
-#	Local macros
-#----------------------------------------------------------------------------
-
-LDLIBS     =  -lorbsvcs -lTAO
-
-IDL_SRC	= loggerC.cpp loggerS.cpp
-PROG_SRCS =	$(IDL_SRC) logger_i.cpp 
-
-LSRC = $(PROG_SRCS)
-
-logger_SVR_OBJS = loggerC.o loggerS.o svr.o logger_i.o 
-logger_CLT_OBJS = loggerC.o clnt.o
-
-BIN = svr clnt
-BUILD = $(BIN)
-VLDLIBS = $(LDLIBS:%=%$(VAR))
-
-#----------------------------------------------------------------------------
-#	Include macros and targets
-#----------------------------------------------------------------------------
-
-include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-include $(ACE_ROOT)/include/makeinclude/macros.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
-#include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
-
-ifndef TAO_ROOT
-TAO_ROOT = $(ACE_ROOT)/TAO
-endif
-TSS_ORB_FLAG = #-DTAO_HAS_TSS_ORBCORE
-DCFLAGS = -g
-LDFLAGS += -L$(TAO_ROOT)/orbsvcs/lib -L$(TAO_ROOT)/tao
-CPPFLAGS += -I$(TAO_ROOT)/orbsvcs/lib -I$(TAO_ROOT) -I$(TAO_ROOT)/tao/compat $(TSS_ORB_FLAG)#-H
-
-$(IDL_SRC): logger.idl
-	$(TAO_ROOT)/TAO_IDL/tao_idl logger.idl
-
-svr:	$(addprefix $(VDIR),$(logger_SVR_OBJS))
-	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS)
-
-clnt:	$(addprefix $(VDIR),$(logger_CLT_OBJS))
-	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS)
-
-########
-# Sanity check builds by running basic functionality tests.
-#
-# "sleep 5" in the server startup is usually enough to get the
-# objref into the file so the client can read it.
-#
-check:	$(TESTS)
-	@echo "testing with 'cube' calls, stub + DII, IOR strings"
-	@./svr -i30 -o non-internet > obj.1 & sleep 5
-	@./clnt -n250 -O `cat obj.1` -x
-	@echo ''
-	@echo "testing request forwarding with 'cube' calls, stub + DII"
-	@./svr -f -i30 > obj.2 & sleep 5
-	@./clnt -n250 -O `cat obj.2` -x
-	@echo ''
-	@echo "testing transmission of primitive data types"
-	@./test1_svr -i30 > obj.3 & sleep 5
-	@./test1_clnt -n50 -O `cat obj.3` -x
-	@echo ''
-#	@echo "testing echo of primitive data values"
-#	@./echo_svr -i30 > obj.4 & sleep 5
-#	@./echo_clnt -O `cat obj.4` -x
-#	@echo ''
-	@echo "testing with 'cube' calls, MT-ized (no forwarding)"
-	@./svr -t -i30 -o non-internet > obj.5 & sleep 5
-	@./clnt -n250 -O `cat obj.5` -x
-	@echo ''
-
-clean:
-	-/bin/rm -rf *.o Log $(BIN) obj.* core Templates.DB .make.state
-
-realclean: clean
-	-/bin/rm -rf loggerC.* loggerS.* 
-
diff --git a/TAO/orbsvcs/tests/Logger/clnt.cpp b/TAO/orbsvcs/tests/Logger/clnt.cpp
deleted file mode 100644
index 1ebc1f5aad3..00000000000
--- a/TAO/orbsvcs/tests/Logger/clnt.cpp
+++ /dev/null
@@ -1,235 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/orbsvcs/bin/Logger
-//
-// = FILENAME
-//    clnt.cpp
-//
-// = DESCRIPTION 
-//    This program tests an implementation of a logger service.  It uses the
-//    Logger_Factory server to create a number of logger objects.  It then
-//    uses their object references to test functions supported by the
-//    logger server. 
-//
-// = AUTHORS
-//      Sergio Flores-Gaitan
-//
-// ============================================================================
-
-#include <iostream.h>
-#include "ace/INET_Addr.h"
-#include "ace/SOCK_Dgram_Mcast.h"
-#include "loggerC.h"
-#include "CosNamingC.h"
-#include "clnt.h"
-
-// constructor
-
-Logger_Client::Logger_Client (void)
-  : logger_factory_key_ ("factory"),
-    hostname_ (ACE_DEFAULT_SERVER_HOST),
-    portnum_ (TAO_DEFAULT_SERVER_PORT),
-    exit_later_ (0),
-    factory_ (Logger_Factory::_nil ()),
-    objref_ (CORBA::Object::_nil ()),
-    orb_ptr_ (0),
-    logger_1_ (Logger::_nil ()),
-    logger_2_ (Logger::_nil ()),
-    naming_service_ (CosNaming::NamingContext::_nil ())
-{
-}
-
-// Parses the command line arguments and returns an error status.
-
-int
-Logger_Client::parse_args (void)
-{
-  ACE_Get_Opt get_opts (argc_, argv_, "d:h:p:x");
-  int c;
-
-  while ((c = get_opts ()) != -1)
-    switch (c)
-      {
-      case 'd':  // debug flag
-        TAO_debug_level++;
-        break;
-      case 'h':
-        hostname_ = ACE_OS::strdup (get_opts.optarg);
-        break;
-      case 'p':
-        portnum_ = ACE_OS::atoi (get_opts.optarg);
-        break;
-      case 'x':
-        this->exit_later_++;
-        break;
-      case '?':
-      default:
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "usage:  %s"
-                           " [-d]"
-                           " [-h hostname]"
-                           " [-p port]"
-                           " [-x]"
-                           "\n",
-                           this->argv_ [0]),
-                          -1);
-      }
-
-  // Indicates successful parsing of command line.
-  return 0;
-}
-
-// Execute client example code.
-
-int
-Logger_Client::run (void)
-{
-  this->logger_1_->log ("Logging at logger 1", this->env_);
-  this->logger_2_->log ("Logging at logger 2", this->env_);
-    
-  if (this->exit_later_)
-    {
-      //Not supported yet.
-      //this->logger_1_->please_exit (this->env_);
-      //this->logger_2_->please_exit (this->env_);
-      dexc (this->env_, "server, please ACE_OS::exit");
-    }
-  return 0;
-}
-
-Logger_Client::~Logger_Client (void)
-{
-  // Free resources
-  if (CORBA::is_nil (this->naming_service_) == CORBA::B_FALSE)
-    CORBA::release (this->naming_service_);
-  CORBA::release (this->logger_1_);
-  CORBA::release (this->logger_2_);
-  CORBA::release (this->factory_);
-  CORBA::release (this->orb_ptr_);
-}
-
-int
-Logger_Client::init (int argc, char **argv)
-{
-  this->argc_ = argc;
-  this->argv_ = argv;
-
-  // Parse command line and verify parameters.
-  if (this->parse_args () == -1)
-    {
-      return 1;
-    }
-  
-  // retrieve the ORB
-  this->orb_ptr_ = CORBA::ORB_init (this->argc_,
-                                    this->argv_,
-                                    "internet",
-                                    this->env_);
-
-  if (this->env_.exception () != 0)
-    {
-      this->env_.print_exception ("ORB initialization");
-      return 1;
-    }
-
-  this->objref_ = this->orb_ptr_->resolve_initial_references ("NameService");
-  
-  if (CORBA::is_nil (this->objref_) != CORBA::B_TRUE)
-    {  
-      // resolve the naming service
-      this->naming_service_ = 
-	CosNaming::NamingContext::_narrow (this->objref_, this->env_);
-
-      if (CORBA::is_nil (this->naming_service_) == CORBA::B_TRUE)
-	ACE_ERROR_RETURN ((LM_ERROR, "CosNaming::NamingContext::_narrow"), 1);
-
-      // Create the name of the logger factory.
-      CosNaming::Name n(1);
-      n.length (1);
-      n[0].id = CORBA::string_dup ("logger_factory");  
-
-      // Resolve the logger factory to a corba object pointer
-      this->objref_ = this->naming_service_->resolve (n, this->env_);
-  
-      if (CORBA::is_nil (this->objref_) == CORBA::B_TRUE)
-	ACE_ERROR_RETURN ((LM_ERROR, "resolve"), 1);
-    }
-  else
-    {
-      ACE_ERROR ((LM_ERROR, "resolve_initial_references failed\n"));  
-      ACE_ERROR ((LM_ERROR, "Unable to use the naming service\n"));  
-
-      // Retrieve a factory objref.
-      this->objref_ = Logger_Factory::_bind (this->hostname_,
-					     this->portnum_,
-					     this->logger_factory_key_,
-					     this->env_);
-
-      if (this->env_.exception () != 0)
-	{
-	  this->env_.print_exception ("Logger_Factory::_bind");
-	  return -1;
-	}
-
-      if (CORBA::is_nil (this->objref_) == CORBA::B_TRUE)
-	ACE_ERROR_RETURN ((LM_ERROR,
-			   " _bind returned null object for key (%s), host (%s), port (%d)\n",
-			   this->logger_factory_key_,
-			   this->hostname_,
-			   this->portnum_),
-			  -1);
-    }
-
-  // Narrow it to a logger factory pointer
-  this->factory_ = Logger_Factory::_narrow (this->objref_, this->env_);
-
-  if (this->env_.exception () != 0)
-    {
-      this->env_.print_exception ("Logger_Factory::_narrow");
-      return 1;
-    }
-
-  
-
-  // Now retrieve the Logger obj ref corresponding to key1 and key2
-  this->logger_1_ = this->factory_->make_logger ("key1", this->env_);
-  this->logger_2_ = this->factory_->make_logger ("key2", this->env_);
-
-  if (this->env_.exception () != 0)
-    {
-      this->env_.print_exception ("factory_->make_logger");
-      return 1;
-    }
-
-  if (CORBA::is_nil (this->logger_1_))
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "null logger objref returned by factory\n"),
-                      1);
-
-  if (CORBA::is_nil (this->logger_2_))
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "null logger objref returned by factory\n"),
-                      1);
-
-  return 0;
-}
-
-// This function runs the test.
-
-int
-main (int argc, char **argv)
-{
-  int rc;
-  Logger_Client logger_client;
- 
-  if (logger_client.init (argc, argv) != 0)
-    return 1;
-  else
-    rc = logger_client.run ();
-
-  cout << "....the end" << endl;
-  return rc;
-}
diff --git a/TAO/orbsvcs/tests/Logger/clnt.h b/TAO/orbsvcs/tests/Logger/clnt.h
deleted file mode 100644
index c68b8c39126..00000000000
--- a/TAO/orbsvcs/tests/Logger/clnt.h
+++ /dev/null
@@ -1,93 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/orbsvcs/bin/Logger
-//
-// = FILENAME
-//    clnt.h
-//
-// = DESCRIPTION
-//    This program tests an implementation of a logger service.  It uses the
-//    Logger_Factory server to create a number of logger objects.  It then
-//    uses their object references to test functions supported by the
-//    logger server. 
-//
-// = AUTHORS
-//      Sergio Flores-Gaitan
-//
-// ============================================================================
-
-
-#include "ace/Get_Opt.h"
-#include "tao/corba.h"
-#include "loggerC.h"
-#include "CosNamingC.h"
-
-class Logger_Client 
-  // = TITLE
-  //    Defines a class that encapsulates behaviour of the Logger client
-  //    example.  Provides a better understanding of the logic in an 
-  //    object oriented way.
-  //
-  // = DESCRIPTION
-  //    This class declares an interface to run the example client for
-  //    Logger CORBA server.  All the complexity for initializing the 
-  //    server is hidden in the class.  Just the run() interface is needed.
-{
-public:
-  // = Constructor and destructor.
-  Logger_Client (void);
-  ~Logger_Client (void);
-
-  int run (void);
-  // Execute client example code.
-
-  int init (int argc, char **argv);
-  // Initialize the client communication endpoint with server.
-
-private:
-  int parse_args (void);
-  // Parses the arguments passed on the command line.
-
-  int argc_;
-  // # of arguments on the command line.
-
-  char **argv_;
-  // arguments from command line.
-
-  const char *logger_factory_key_;
-  // Key of factory obj ref.
-
-  char *hostname_;
-  // Hostname of server.
-
-  CORBA::ULong portnum_;
-  // default port number of server.
-
-  int exit_later_;
-  // Flag to tell server to not exit immediately
-
-  Logger_Factory_ptr factory_;
-  // factory pointer for logger.
-
-  CORBA::Object_ptr objref_;
-  // storage of the factory objref
-  
-  CORBA::Environment env_;
-  // Environment variable
-
-  CORBA::ORB_ptr orb_ptr_;
-  // Remember our orb
-
-  Logger_ptr logger_1_;
-  // Logger obj ref
-
-  Logger_ptr logger_2_;
-  // Logger obj ref
-
-  CosNaming::NamingContext_ptr naming_service_;
-  // naming service
-};
diff --git a/TAO/orbsvcs/tests/Logger/logger.idl b/TAO/orbsvcs/tests/Logger/logger.idl
deleted file mode 100644
index 658859115e7..00000000000
--- a/TAO/orbsvcs/tests/Logger/logger.idl
+++ /dev/null
@@ -1,21 +0,0 @@
-//
-// Simplified logger and Logger factory interfaces for 
-// testing of the Name Service implementation.
-
-
-interface Logger;
-
-interface Logger_Factory
-{
-  Logger make_logger (in string name);
-};
-
-
-
-
-interface Logger
-{
-  // Transmit a Log_Record to the logging server.
-  oneway void log (in string message);
-};
-
diff --git a/TAO/orbsvcs/tests/Logger/logger_i.cpp b/TAO/orbsvcs/tests/Logger/logger_i.cpp
deleted file mode 100644
index 523849c6cb7..00000000000
--- a/TAO/orbsvcs/tests/Logger/logger_i.cpp
+++ /dev/null
@@ -1,43 +0,0 @@
-#include <iostream.h>
-#include "ace/ACE.h"
-#include "loggerC.h"
-#include "logger_i.h"
-
-
-Logger_ptr 
-Logger_Factory_i::make_logger (const char* name, 
-				 CORBA::Environment &IT_env) 
-{
-  ACE_UNUSED_ARG (IT_env);
-
-  Logger_i* l = new Logger_i (name);
-  return (l->_duplicate (l));
-}
-
-Logger_Factory_i::Logger_Factory_i (const char *key)
-  :POA_Logger_Factory (key)
-{
-}
-
-Logger_i::Logger_i (const char* name)
-  :POA_Logger (name)
-{
-  name_ = new char [strlen (name) + 1];
-  strcpy (name_, name);
-
-  cout << name_ << ": in the constructor" << endl;
-}
-
-Logger_i::~Logger_i (void)
-{
-  cout << name_ << ": in the destructor" << endl;
-  delete name_;
-}
-
-void 
-Logger_i::log (const char* message, CORBA::Environment &IT_env)
-{
-  ACE_UNUSED_ARG (IT_env);
-
-  cout << name_ << ": " << message << endl;
-}
diff --git a/TAO/orbsvcs/tests/Logger/logger_i.h b/TAO/orbsvcs/tests/Logger/logger_i.h
deleted file mode 100644
index 18bb27d167b..00000000000
--- a/TAO/orbsvcs/tests/Logger/logger_i.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/* -*- C++ -*- */
-
-#if !defined (LOGGER_I_H)
-#define LOGGER_I_H
-
-
-#include "loggerS.h"
-#include <iostream.h>
-#include <string.h>
-
-
-class Logger_Factory_i : public virtual POA_Logger_Factory
-{
-public:
-  Logger_Factory_i (const char *key);
-  // constructor
-
-  virtual Logger_ptr make_logger (const char * name, 
-				  CORBA::Environment &IT_env);
-  // this function creates and returns a logger with the given name 
-};
-
-
-class Logger_i : public virtual POA_Logger
-{
-public:
-
-  // constructor
-  Logger_i (const char * name);
-
-  // destructor
-  virtual ~Logger_i (void);
-
-  virtual void log (const char *message, 
-		    CORBA::Environment &IT_env);
-
-private:
-  // logger identification
-  char *name_;
-};
-
-#endif /* LOGGER_I_H */
diff --git a/TAO/orbsvcs/tests/Logger/svc.conf b/TAO/orbsvcs/tests/Logger/svc.conf
deleted file mode 100644
index 43c6a486c92..00000000000
--- a/TAO/orbsvcs/tests/Logger/svc.conf
+++ /dev/null
@@ -1,49 +0,0 @@
-# $Id$
-#
-# This file contains a sample ACE_Service_Config configuration
-# file specifying the strategy factories utilized by an application
-# using TAO.  There are currently only two possible factories:
-# Client_Strategy_Factory and Server_Strategy_Factory.  These names
-# must be used as the second argument to their corresponding line,
-# because that's what the ORB uses to find the desired factory.
-#
-# Note that there are two unordinary characteristics of the way *this*
-# file is set up:
-#   - both client and server strategies are specified in the same
-#     file, which would only make sense for co-located clients & servers
-#   - both of the factories are actually sourced out of libTAO.so
-#     (TAO.DLL on Win32), and they would normally be in a separate
-#     dll from the TAO ORB Core.
-#
-# The options which can be passed to the Resource Factory are:
-#
-#   -ORBresources <which>
-#       where <which> can be 'global' to specify globally-held resources,
-#       or 'tss' to specify thread-specific resources.
-#
-# The options which can be passed to the Client are:
-#     <none currently>
-#
-# The options which can be passed to the Server are:
-#
-#   -ORBconcurrency <which>
-#       where <which> can be 'thread-per-connection' to specify
-#       use of the ACE_Threaded_Strategy concurrency strategy,
-#       or 'reactive' to specify use of the ACE_Reactive_Strategy
-#       concurrency strategy.
-#
-#   -ORBthreadflags  <flags>
-#       specifies the default thread flags to use, where <flags> is a
-#       logical OR'ing of the flags THR_DETACHED, THR_BOUND, THR_NEW_LWP,
-#       THR_SUSPENDED, or THR_DAEMON.  Note that not every flag may be valid
-#       on every platform.
-#
-#   -ORBdemuxstrategy <which>
-#       where <which> can be one of 'dynamic', 'linear', 'active', or 'user',
-#       and specifies the type of object lookup strategy used internally.
-#   -ORBtablesize <unsigned>
-#       specifies the size of the object table
-#
-dynamic Resource_Factory Service_Object * TAO:_make_TAO_Resource_Factory() "-ORBresources global"
-dynamic Client_Strategy_Factory Service_Object * TAO:_make_TAO_Default_Client_Strategy_Factory()
-dynamic Server_Strategy_Factory Service_Object * TAO:_make_TAO_Default_Server_Strategy_Factory() "-ORBconcurrency reactive -ORBdemuxstrategy dynamic -ORBtablesize 128"
diff --git a/TAO/orbsvcs/tests/Logger/svr.cpp b/TAO/orbsvcs/tests/Logger/svr.cpp
deleted file mode 100644
index b640b7222ec..00000000000
--- a/TAO/orbsvcs/tests/Logger/svr.cpp
+++ /dev/null
@@ -1,139 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/orbsvcs/tests/Logger
-//
-// = FILENAME
-//    svr.cpp
-//
-// = DESCRIPTION 
-//    This program is an implementation of a simple logger service.  
-//    Whatever is sent to it through its interface is displayed on stdout.
-//    It uses the Logger_Factory server to create logger objects.  
-//
-// = AUTHORS
-//    Sergio Flores-Gaitan <sergio@cs.wustl.edu>
-//
-// ============================================================================
-
-#include <iostream.h>
-#include "loggerS.h"
-#include "logger_i.h"
-#include "CosNamingC.h"
-
-int
-main (int argc, char ** argv)
-{
-  CORBA::Environment env;
-  char *orb_name = "logger";
-
-  CORBA::ORB_ptr orb_ptr = CORBA::ORB_init (argc, argv, orb_name, env);
-
-  if (env.exception () != 0)
-    {
-      env.print_exception ("ORB init");
-      return 1;
-    }
-
-  // Initialize the Object Adapter
-  CORBA::POA_ptr oa_ptr = orb_ptr->POA_init (argc, argv, "POA");
-
-  if (oa_ptr == 0)
-    ACE_ERROR_RETURN ((LM_ERROR,
-		       " (%P|%t) Unable to initialize the POA.\n"),
-		      1);
-
-  // create a factory implementation
-  Logger_Factory_ptr f;
-
-  ACE_NEW_RETURN (f, Logger_Factory_i ("factory"), -1);
-
-  // Stringify the objref we'll be implementing, and print it to
-  // stdout.  Someone will take that string and give it to a
-  // client.  Then release the object.
-  
-  CORBA::String str;
-  
-  str = orb_ptr->object_to_string (f, env);
-  
-  if (env.exception () != 0)
-    {
-      env.print_exception ("object2string");
-      return 1;
-    }
-  
-  ACE_DEBUG ((LM_DEBUG, "listening as object '%s'\n", str)); 
-
-  int name_service_flag = 0;
-  CosNaming::NamingContext_ptr naming_service = 0;
-  CosNaming::Name n(1);
-
-  do {
-    CORBA::Object_ptr  obj_ptr = 
-      orb_ptr->resolve_initial_references ("NameService");
-  
-    // Use the naming service to advertise us, if we could successfully get a reference.
-    if (CORBA::is_nil (obj_ptr) == CORBA::B_TRUE)
-      {
-	ACE_ERROR ((LM_ERROR, "resolve_initial_references failed.\n"));
-	break;
-      }
-    
-    // resolve the naming service
-    naming_service = CosNaming::NamingContext::_narrow (obj_ptr, env);
-
-    if (CORBA::is_nil (naming_service) == CORBA::B_TRUE)
-      {
-	ACE_ERROR ((LM_ERROR, "_narrow failed\n"));
-	break;
-      }
-
-    // The name of the logger factory in the naming service.
-    n.length (1);
-    n[0].id = CORBA::string_dup ("logger_factory");
-    
-    // bind the logger factory to a name using the naming service.
-    naming_service->bind (n, f, env);
-    
-    // check for errors!
-    if (env.exception () != 0)
-      {
-	env.print_exception ("name_service->bind()");
-	break;
-      }
-    else
-      {
-	ACE_DEBUG ((LM_DEBUG, "Success using the naming service!! to bind the logger factory!\n"));
-	name_service_flag = 1;
-      }
-
-  } while (0);
-
-  if (name_service_flag == 0)
-    {
-      ACE_ERROR ((LM_ERROR, "Unable to use the naming service.\n"));
-    }
-
-  // Handle requests for this object until we're killed, or one of the
-  // methods asks us to exit.
-  if (orb_ptr->run () == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "run"), -1);
-
-  // unbind the logger factory name 
-  naming_service->unbind (n, env);
-
-  // check for errors!
-  if (env.exception () != 0)
-    {
-      env.print_exception ("name_service->unbind()");
-    }
-
-  // release the object reference for the naming service.
-  CORBA::release (naming_service);
-  
-  cout << "Server logger_factory is terminating" << endl;
-  return 0;
-}
-
diff --git a/TAO/orbsvcs/tests/Makefile b/TAO/orbsvcs/tests/Makefile
deleted file mode 100644
index f6471c39a08..00000000000
--- a/TAO/orbsvcs/tests/Makefile
+++ /dev/null
@@ -1,23 +0,0 @@
-#----------------------------------------------------------------------------
-#
-# $Id$
-#
-#----------------------------------------------------------------------------
-
-#----------------------------------------------------------------------------
-#	Local macros
-#----------------------------------------------------------------------------
-
-DIRS  =	Simple_Naming \
-	Logger \
-
-#----------------------------------------------------------------------------
-#	Include macros and targets
-#----------------------------------------------------------------------------
-
-include	$(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-include	$(ACE_ROOT)/include/makeinclude/macros.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.common.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.nested.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.nolocal.GNU
-
diff --git a/TAO/orbsvcs/tests/Simple_Naming/Makefile b/TAO/orbsvcs/tests/Simple_Naming/Makefile
deleted file mode 100644
index 02bbe8e5569..00000000000
--- a/TAO/orbsvcs/tests/Simple_Naming/Makefile
+++ /dev/null
@@ -1,210 +0,0 @@
-#----------------------------------------------------------------------------
-#
-# $Id$
-#
-#----------------------------------------------------------------------------
-
-#----------------------------------------------------------------------------
-#	Local macros
-#----------------------------------------------------------------------------
-
-LDLIBS =  -lorbsvcs -lTAO
-
-CLNT_SRCS = clnt.cpp
-
-LSRC = $(CLNT_SRCS)
-
-CLNT_OBJS = $(CLNT_SRCS:.cpp=.o)
-
-BIN = clnt
-BUILD = $(BIN)
-VLDLIBS = $(LDLIBS:%=%$(VAR))
-
-#----------------------------------------------------------------------------
-#	Include macros and targets
-#----------------------------------------------------------------------------
-
-include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-include $(ACE_ROOT)/include/makeinclude/macros.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
-
-ifndef TAO_ROOT
-TAO_ROOT = $(ACE_ROOT)/TAO
-endif
-TSS_ORB_FLAG = #-DTAO_HAS_TSS_ORBCORE
-DCFLAGS = -g
-LDFLAGS += -L$(TAO_ROOT)/orbsvcs/lib -L$(TAO_ROOT)/tao
-CPPFLAGS += -I$(TAO_ROOT)/orbsvcs/lib -I$(TAO_ROOT) -I$(TAO_ROOT)/tao/compat $(TSS_ORB_FLAG)#-H
-
-# DO NOT DELETE THIS LINE -- g++dep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-
-.obj/clnt.o .shobj/clnt.: clnt.cpp clnt.h \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/stdcpp.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Get_Opt.i \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/Task_T.i \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Svc_Handler.i \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(TAO_ROOT)/tao/orbconf.h \
- $(TAO_ROOT)/tao/orb.h \
- $(TAO_ROOT)/tao/corbacom.h \
- $(TAO_ROOT)/tao/object.h \
- $(TAO_ROOT)/tao/align.h \
- $(TAO_ROOT)/tao/sequence.h \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/any.h \
- $(TAO_ROOT)/tao/poa.h \
- $(TAO_ROOT)/tao/tao_internals.h \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/client_factory.h \
- $(TAO_ROOT)/tao/server_factory.h \
- $(TAO_ROOT)/tao/default_client.h \
- $(TAO_ROOT)/tao/default_server.h \
- $(TAO_ROOT)/tao/except.h \
- $(TAO_ROOT)/tao/orbobj.h \
- $(TAO_ROOT)/tao/nvlist.h \
- $(TAO_ROOT)/tao/principa.h \
- $(TAO_ROOT)/tao/request.h \
- $(TAO_ROOT)/tao/svrrqst.h \
- $(TAO_ROOT)/tao/typecode.h \
- $(TAO_ROOT)/tao/marshal.h \
- $(TAO_ROOT)/tao/cdr.h \
- $(TAO_ROOT)/tao/stub.h \
- $(TAO_ROOT)/tao/connect.h \
- $(TAO_ROOT)/tao/orb_core.h \
- $(TAO_ROOT)/tao/objtable.h \
- $(TAO_ROOT)/tao/optable.h \
- $(TAO_ROOT)/tao/debug.h \
- $(TAO_ROOT)/tao/iiopobj.h \
- $(TAO_ROOT)/tao/iioporb.h \
- $(TAO_ROOT)/tao/giop.h \
- $(TAO_ROOT)/tao/orb_core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(TAO_ROOT)/tao/corbacom.i \
- $(TAO_ROOT)/tao/sequence.i \
- $(TAO_ROOT)/tao/typecode.i \
- $(TAO_ROOT)/tao/any.i \
- $(TAO_ROOT)/tao/cdr.i \
- $(TAO_ROOT)/tao/stub.i \
- $(TAO_ROOT)/tao/object.i \
- $(TAO_ROOT)/tao/orbobj.i \
- $(TAO_ROOT)/tao/marshal.i \
- $(TAO_ROOT)/tao/poa.i \
- $(TAO_ROOT)/tao/giop.i \
- $(TAO_ROOT)/tao/iioporb.i \
- $(TAO_ROOT)/tao/iiopobj.i \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/server_factory.i \
- $(TAO_ROOT)/tao/default_client.i \
- $(TAO_ROOT)/tao/default_server.i \
- $(TAO_ROOT)/tao/connect.i \
- $(TAO_ROOT)/tao/singletons.h \
- $(TAO_ROOT)/orbsvcs/lib/CosNamingC.h \
- $(TAO_ROOT)/orbsvcs/lib/CosNamingC.i
-
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/orbsvcs/tests/Simple_Naming/clnt.cpp b/TAO/orbsvcs/tests/Simple_Naming/clnt.cpp
deleted file mode 100644
index f657ce240e8..00000000000
--- a/TAO/orbsvcs/tests/Simple_Naming/clnt.cpp
+++ /dev/null
@@ -1,178 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/orbsvcs/bin/Naming_Service/TAO
-//
-// = FILENAME
-//    clnt.cpp
-//
-// = DESCRIPTION
-//      This class implements a simple "cube" CORBA client for the CosNaming 
-//      example using stubs generated by the TAO ORB IDL compiler.
-//
-// = AUTHORS
-//      Sergio Flores-Gaitan <sergio@cs.wustl.edu>
-//
-// ============================================================================
-
-#include "clnt.h"
-
-// constructor
-
-CosNaming_Client::CosNaming_Client (void)
-  : hostname_ ("localhost"),
-    portnum_ (TAO_DEFAULT_SERVER_PORT),
-    exit_later_ (0),
-    factory_ (CORBA::Object::_nil ()),
-    objref_ (CORBA::Object::_nil ()),
-    CosNaming_ (CosNaming::NamingContext::_nil ()),
-    cosnaming_factory_key_ ("naming_context")
-{
-}
-
-// Parses the command line arguments and returns an error status.
-
-int
-CosNaming_Client::parse_args (void)
-{
-  ACE_Get_Opt get_opts (argc_, argv_, "dn:h:p:k:x");
-  int c;
-
-  while ((c = get_opts ()) != -1)
-    switch (c)
-      {
-      case 'd':  // debug flag
-	TAO_debug_level++;
-	break;
-      case 'h':
-        hostname_ = ACE_OS::strdup (get_opts.optarg);
-        break;
-      case 'p':
-        portnum_ = ACE_OS::atoi (get_opts.optarg);
-        break;
-      case 'x':
-	this->exit_later_++;
-	break;
-      case '?':
-      default:
-	ACE_ERROR_RETURN ((LM_ERROR,
-			   "usage:  %s"
-			   " [-d]"
-                           " [-h hostname]"
-                           " [-p port]"
-			   " [-x]"
-			   "\n",
-                           this->argv_ [0]), 
-                          -1);
-      }
-
-  // Indicates successful parsing of command line.
-  return 0;  
-}
-
-// Execute client example code.
-
-int
-CosNaming_Client::run (void)
-{
-
-
-  if (this->exit_later_)
-    {
-      //  this->please_exit (this->env_);
-      dexc (this->env_, "server, please ACE_OS::exit");
-    }
-
-  return 0;
-}
-
-CosNaming_Client::~CosNaming_Client (void)
-{
-  CORBA::release (this->CosNaming_);
-  CORBA::release (this->factory_);
-}
-
-int
-CosNaming_Client::init (int argc, char **argv)
-{
-  this->argc_ = argc;
-  this->argv_ = argv;
-
-  // retrieve the ORB
-  CORBA::ORB_init (this->argc_,
-                   this->argv_,
-                   "internet",
-                   this->env_);
-
-  if (this->env_.exception () != 0)
-    {
-      this->env_.print_exception ("ORB initialization");
-      return 1;
-    }
-
-  // Parse command line and verify parameters.
-  if (this->parse_args () == -1)
-    return 1;
-
-  // Retrieve a factory objref.
-  this->objref_ = CosNaming::NamingContext::_bind (this->hostname_,
-						   this->portnum_,
-						   this->cosnaming_factory_key_,
-						   this->env_);
-
-  if (this->env_.exception () != 0)
-    {
-      this->env_.print_exception ("CosNaming_Factory::_bind");
-      return 1;
-    }
-
-  if (CORBA::is_nil (this->objref_) == CORBA::B_TRUE)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       " _bind returned null object for key (%s) host (%s), port (%d)\n",
-		       this->cosnaming_factory_key_,
-                       this->hostname_,
-                       this->portnum_),
-                      1);
-
-  // Narrow the CORBA::Object reference to the stub object, checking
-  // the type along the way using _is_a.  There is really no need to
-  // narrow <objref> because <_bind> will return us the
-  // <CosNaming_Factory> pointer.  However, we do it so that we can
-  // explicitly test the _narrow function.
-
-  this->CosNaming_ = CosNaming::NamingContext::_narrow (this->objref_,
-							this->env_);
-
-  if (this->CosNaming_ == 0)
-    ACE_ERROR_RETURN ((LM_ERROR,
-		       " (%P|%t) Unable to narrow object reference to a CosNaming_ptr.\n"),
-		      1);
-
-  if (this->env_.exception () != 0)
-    {
-      this->env_.print_exception ("CosNaming::NamingContext::_narrow");
-      return 1;
-    }
-
-  if (CORBA::is_nil (this->CosNaming_))
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "null CosNaming objref returned by factory\n"),
-                      1);
-
-  return 0;
-}
-
-// This function runs the test.
-
-int
-main (int argc, char **argv)
-{
-  CosNaming_Client cosnaming_client;
-  
-  if (cosnaming_client.init (argc, argv) == -1)
-    return 1;
-  else
-    return cosnaming_client.run ();
-}
diff --git a/TAO/orbsvcs/tests/Simple_Naming/clnt.h b/TAO/orbsvcs/tests/Simple_Naming/clnt.h
deleted file mode 100644
index 001aaea1996..00000000000
--- a/TAO/orbsvcs/tests/Simple_Naming/clnt.h
+++ /dev/null
@@ -1,82 +0,0 @@
-/* -*- C++ -*- */
-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/orbsvcs/tests
-//
-// = FILENAME
-//    clnt.h
-//
-// = DESCRIPTION
-//      This class implements naming service according to the CORBA
-//      spec.
-//
-// = AUTHORS
-//      Sergio Flores-Gaitan <sergio@cs.wustl.edu>
-//
-// ============================================================================
-
-#include "ace/Get_Opt.h"
-#include "tao/corba.h"
-#include "CosNamingC.h"
-
-class CosNaming_Client 
-  // = TITLE
-  //    Defines a class that encapsulates behaviour of the CosNaming client
-  //    example.  Provides a better understanding of the logic in an 
-  //    object oriented way.
-  //
-  // = DESCRIPTION
-  //    This class declares an interface to run the example client for
-  //    CosNaming CORBA server.  All the complexity for initializing the 
-  //    server is hidden in the class.  Just the run() interface is needed.
-{
-public:
-  // = Constructor and destructor.
-  CosNaming_Client (void);
-  ~CosNaming_Client (void);
-
-  int run (void);
-  // Execute client example code.
-
-  int init (int argc, char **argv);
-  // Initialize the client communication endpoint with server.
-
-private:
-  int parse_args (void);
-  // Parses the arguments passed on the command line.
-
-  int argc_;
-  // # of arguments on the command line.
-
-  char **argv_;
-  // arguments from command line.
-
-  char *hostname_;
-  // Hostname of server.
-
-  CORBA::ULong portnum_;
-  // default port number of server.
-
-  int exit_later_;
-  // Flag to tell server to not exit immediately
-
-  CORBA::Object_ptr factory_;
-  // factory pointer for CosNaming.
-
-  CORBA::Object_ptr objref_;
-  // storage of the factory objref
-  
-  CORBA::Environment env_;
-  // Environment variable
-
-  //  CORBA::Object_ptr CosNaming_;
-  CosNaming::NamingContext_ptr CosNaming_;
-  // CosNaming obj ref
-
-  char *cosnaming_factory_key_;
-  // CosNaming key.
-};
diff --git a/TAO/orbsvcs/tests/Simple_Naming/svc.conf b/TAO/orbsvcs/tests/Simple_Naming/svc.conf
deleted file mode 100644
index 43c6a486c92..00000000000
--- a/TAO/orbsvcs/tests/Simple_Naming/svc.conf
+++ /dev/null
@@ -1,49 +0,0 @@
-# $Id$
-#
-# This file contains a sample ACE_Service_Config configuration
-# file specifying the strategy factories utilized by an application
-# using TAO.  There are currently only two possible factories:
-# Client_Strategy_Factory and Server_Strategy_Factory.  These names
-# must be used as the second argument to their corresponding line,
-# because that's what the ORB uses to find the desired factory.
-#
-# Note that there are two unordinary characteristics of the way *this*
-# file is set up:
-#   - both client and server strategies are specified in the same
-#     file, which would only make sense for co-located clients & servers
-#   - both of the factories are actually sourced out of libTAO.so
-#     (TAO.DLL on Win32), and they would normally be in a separate
-#     dll from the TAO ORB Core.
-#
-# The options which can be passed to the Resource Factory are:
-#
-#   -ORBresources <which>
-#       where <which> can be 'global' to specify globally-held resources,
-#       or 'tss' to specify thread-specific resources.
-#
-# The options which can be passed to the Client are:
-#     <none currently>
-#
-# The options which can be passed to the Server are:
-#
-#   -ORBconcurrency <which>
-#       where <which> can be 'thread-per-connection' to specify
-#       use of the ACE_Threaded_Strategy concurrency strategy,
-#       or 'reactive' to specify use of the ACE_Reactive_Strategy
-#       concurrency strategy.
-#
-#   -ORBthreadflags  <flags>
-#       specifies the default thread flags to use, where <flags> is a
-#       logical OR'ing of the flags THR_DETACHED, THR_BOUND, THR_NEW_LWP,
-#       THR_SUSPENDED, or THR_DAEMON.  Note that not every flag may be valid
-#       on every platform.
-#
-#   -ORBdemuxstrategy <which>
-#       where <which> can be one of 'dynamic', 'linear', 'active', or 'user',
-#       and specifies the type of object lookup strategy used internally.
-#   -ORBtablesize <unsigned>
-#       specifies the size of the object table
-#
-dynamic Resource_Factory Service_Object * TAO:_make_TAO_Resource_Factory() "-ORBresources global"
-dynamic Client_Strategy_Factory Service_Object * TAO:_make_TAO_Default_Client_Strategy_Factory()
-dynamic Server_Strategy_Factory Service_Object * TAO:_make_TAO_Default_Server_Strategy_Factory() "-ORBconcurrency reactive -ORBdemuxstrategy dynamic -ORBtablesize 128"
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Makefile b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Makefile
deleted file mode 100644
index 2d391b27ad6..00000000000
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Makefile
+++ /dev/null
@@ -1,23 +0,0 @@
-#----------------------------------------------------------------------------
-#	@(#)Makefile	1.1	10/18/96
-#
-#	Makefile for the TAO MT-Cubit tests
-#----------------------------------------------------------------------------
-
-#----------------------------------------------------------------------------
-#	Local macros
-#----------------------------------------------------------------------------
-
-DIRS  = client \
-        server
-
-#----------------------------------------------------------------------------
-#	Include macros and targets
-#----------------------------------------------------------------------------
-
-include	$(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-include	$(ACE_ROOT)/include/makeinclude/macros.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.common.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.nested.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.nolocal.GNU
-
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/README b/TAO/performance-tests/Cubit/TAO/MT_Cubit/README
deleted file mode 100644
index b21889d1c19..00000000000
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/README
+++ /dev/null
@@ -1,58 +0,0 @@
-The MT-Cubit example
---------------------
-
-Compiling
----------
-
-Makefiles are provided. Use make to compile.
-
-You can either run the server in the background in the same window as
-the client or open a separate window for the client and server.
-
-server:
--------
-
-./svr -p <port_num> -h <my_hostname>
-
-port_num is the port number at which the server will start the high
-priority servant. The low priority servant will be created at
-(port_num+1).
-
-The server will print the IOR of the high and low priority servants,
-but it is not required by the client.
-
-client:
--------
-
-./client -d <datatype> -p <port_num> -h <server_hostname> -n <num_calls> -t <num_threads>
-
-<datatype> is one of the following:
-
-0 Octet
-1 Short
-2 Long
-3 Struct of the above 3 types
-
-<port_num> is the port number of the high priority servant. The low
-priority servant is assumed to be at (port_num+1).
-
-<server_hostname> is the hostname of the server.
-
-Based on the server_hostname and the port_num, the client constructs
-the IOR's for the high priority servant and the low priority servant.
-
-<num_calls> is the number of CORBA twoway calls to be made
-
-<num_threads> is the total number of concurrent clients to be
-created. One of these clients will be a high priority client (and thus
-send requests to the high priority servant), and the rest will have
-low priority.
-
-The high priority client makes requests at 20Hz, and the low priority
-clients make requests at 10Hz.
-
-Results
--------
-
-The client prints the latency observed by the high priority client,
-and the average latency observed by the low priority client.
diff --git a/TAO/tao/Makefile b/TAO/tao/Makefile
deleted file mode 100644
index d18059d1029..00000000000
--- a/TAO/tao/Makefile
+++ /dev/null
@@ -1,5885 +0,0 @@
-#----------------------------------------------------------------------------
-#	$Id$
-#
-#	Makefile for TAO
-#----------------------------------------------------------------------------
-
-MAKEFILE = Makefile
-LIBNAME  = libTAO
-LIB      = $(LIBNAME).a
-SHLIB    = $(LIBNAME).$(SOEXT)
-
-# @@ Need to clean up this makefile...it's a MESS!!!! (cjc)
-# These are components that are only headers and must be installed
-CORBA_HDRS = orb sequence stub orbconf objtable optable $(CORBA_SRCS)
-CORBA_SRCS = any corbacom except nvlist object orbobj poa \
-	     principa request svrrqst typecode
-
-# These are components that are only headers and must be installed
-OTHERS_HDRS = align cdr giop iiopobj iioporb xdr connect params marshal debug \
-              default_client default_server server_factory client_factory orb_core \
-			  managed_types.h
-OTHERS_INLN = any poa cdr connect iiopobj iioporb object orbobj params svrrqst typecode marshal \
-              default_client default_server server_factory client_factory orb_core \
-			  managed_types.i
-# These are components that are either header & source or source-only
-OTHERS_SRCS = \
-	arg_shifter \
-	cdr \
-	client_factory \
-	connect \
-	debug \
-	decode \
-	deep_copy \
-	deep_free \
-	default_client \
-	default_server \
-	encode \
-	giop \
-	iiopobj \
-	iioporb \
-	interp \
-	invoke \
-	managed_types \
-	marshal \
-	objtable \
-	optable \
-	orb_core \
-	params \
-	server_factory \
-	tao_internals \
-	tc_const
-
-FILES	 = $(OTHERS_SRCS) $(CORBA_SRCS)
-
-ifndef TAO_ROOT
-TAO_ROOT = $(ACE_ROOT)/TAO
-endif
-
-COMPATDIR = $(TAO_ROOT)/tao/compat
-COMPATFILES = objbase.h initguid.h
-
-BIN = # t-xdr t-sizes
-
-TEMPLATE_FILES =
-
-DEFS  	= $(addsuffix .h,$(OTHERS_HDRS))
-LSRC	= $(addsuffix .cpp,$(FILES))
-LSRC2	= $(addsuffix .cpp,$(TEMPLATE_FILES))
-
-LDLIBS = -lACE
-LIBS = -lACE
-VLDLIBS = $(LDLIBS:%=%$(VAR))
-
-BUILD	= $(VSHLIB) $(VLIB) $(VBIN)
-
-
-#----------------------------------------------------------------------------
-#	Include macros and targets
-#----------------------------------------------------------------------------
-
-include	$(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-#VSHDIR = obj/
-#VSHOBJS = $(LSRC:%.cpp=$(VSHDIR)/$(notdir %).so)
-include	$(ACE_ROOT)/include/makeinclude/macros.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.common.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.lib.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.bin.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
-
-#----------------------------------------------------------------------------
-#	Local targets (and local hacks)
-#----------------------------------------------------------------------------
-
-#RLDFLAGS := $(subst -L,-Wl\,-rpath ,$(LDFLAGS))
-#CPPFLAGS += -D__IIOP_BUILD -I$(COMPATDIR) -DDEBUG
-CPPFLAGS += -I$(TAO_ROOT) -I$(COMPATDIR) #-H
-LDFLAGS += $(RLDFLAGS)
-
-INSINC = ../proto/include
-INSLIB = ../proto/lib
-
-# The first value is a nasty hack because $(VSHLIB) was not working
-# for some reason :-(
-INSTALL = $(INSLIB)/libTAO.$(SOEXT) \
-	$(addprefix $(INSINC)/,$(addsuffix .h,$(OTHERS_HDRS)) $(addsuffix .i,$(OTHERS_INLN)) $(addsuffix .h,$(basename $(COMPATFILES)) ) ) \
-	$(addprefix $(INSINC)/corba/, $(addsuffix .h,$(CORBA_SRCS) $(CORBA_HDRS) debug)) \
-
-
-INST = install -c
-INSTALL_BY_COPY = $(INST) $^ $@
-
-$(INSINC)/%:	%
-	test -d $(@D) || mkdir -p $(@D)
-	$(INSTALL_BY_COPY)
-$(INSINC)/%:	$(COMPATDIR)/%
-	test -d $(@D) || mkdir -p $(@D)
-	$(INSTALL_BY_COPY)
-$(INSLIB)/%:	%
-	test -d $(@D) || mkdir -p $(@D)
-	$(INSTALL_BY_COPY)
-$(INSINC)/corba/%:	%
-	test -d $(@D) || mkdir -p $(@D)
-	$(INSTALL_BY_COPY)
-
-copy:	$(INSTALL)
-
-
-# DO NOT DELETE THIS LINE -- g++dep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-
-.obj/giop.o .shobj/giop.so: giop.cpp \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/stdcpp.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/Task_T.i \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Svc_Handler.i \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(TAO_ROOT)/tao/orbconf.h \
- $(TAO_ROOT)/tao/orb.h \
- $(TAO_ROOT)/tao/corbacom.h \
- $(TAO_ROOT)/tao/object.h \
- $(TAO_ROOT)/tao/align.h \
- $(TAO_ROOT)/tao/sequence.h \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/any.h \
- $(TAO_ROOT)/tao/poa.h \
- $(TAO_ROOT)/tao/tao_internals.h \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/client_factory.h \
- $(TAO_ROOT)/tao/server_factory.h \
- $(TAO_ROOT)/tao/default_client.h \
- $(TAO_ROOT)/tao/default_server.h \
- $(TAO_ROOT)/tao/except.h \
- $(TAO_ROOT)/tao/orbobj.h \
- $(TAO_ROOT)/tao/nvlist.h \
- $(TAO_ROOT)/tao/principa.h \
- $(TAO_ROOT)/tao/request.h \
- $(TAO_ROOT)/tao/svrrqst.h \
- $(TAO_ROOT)/tao/typecode.h \
- $(TAO_ROOT)/tao/marshal.h \
- $(TAO_ROOT)/tao/cdr.h \
- $(TAO_ROOT)/tao/stub.h \
- $(TAO_ROOT)/tao/connect.h \
- $(TAO_ROOT)/tao/orb_core.h \
- $(TAO_ROOT)/tao/objtable.h \
- $(TAO_ROOT)/tao/optable.h \
- $(TAO_ROOT)/tao/debug.h \
- $(TAO_ROOT)/tao/managed_types.h \
- $(TAO_ROOT)/tao/iiopobj.h \
- $(TAO_ROOT)/tao/iioporb.h \
- $(TAO_ROOT)/tao/giop.h \
- $(TAO_ROOT)/tao/orb_core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(TAO_ROOT)/tao/corbacom.i \
- $(TAO_ROOT)/tao/sequence.i \
- $(TAO_ROOT)/tao/typecode.i \
- $(TAO_ROOT)/tao/any.i \
- $(TAO_ROOT)/tao/cdr.i \
- $(TAO_ROOT)/tao/stub.i \
- $(TAO_ROOT)/tao/object.i \
- $(TAO_ROOT)/tao/orbobj.i \
- $(TAO_ROOT)/tao/marshal.i \
- $(TAO_ROOT)/tao/poa.i \
- $(TAO_ROOT)/tao/giop.i \
- $(TAO_ROOT)/tao/iioporb.i \
- $(TAO_ROOT)/tao/iiopobj.i \
- $(TAO_ROOT)/tao/managed_types.i \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/server_factory.i \
- $(TAO_ROOT)/tao/default_client.i \
- $(TAO_ROOT)/tao/default_server.i \
- $(TAO_ROOT)/tao/connect.i \
- $(TAO_ROOT)/tao/singletons.h
-.obj/iiopobj.o .shobj/iiopobj.so: iiopobj.cpp \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/stdcpp.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/Task_T.i \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Svc_Handler.i \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(TAO_ROOT)/tao/orbconf.h \
- $(TAO_ROOT)/tao/orb.h \
- $(TAO_ROOT)/tao/corbacom.h \
- $(TAO_ROOT)/tao/object.h \
- $(TAO_ROOT)/tao/align.h \
- $(TAO_ROOT)/tao/sequence.h \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/any.h \
- $(TAO_ROOT)/tao/poa.h \
- $(TAO_ROOT)/tao/tao_internals.h \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/client_factory.h \
- $(TAO_ROOT)/tao/server_factory.h \
- $(TAO_ROOT)/tao/default_client.h \
- $(TAO_ROOT)/tao/default_server.h \
- $(TAO_ROOT)/tao/except.h \
- $(TAO_ROOT)/tao/orbobj.h \
- $(TAO_ROOT)/tao/nvlist.h \
- $(TAO_ROOT)/tao/principa.h \
- $(TAO_ROOT)/tao/request.h \
- $(TAO_ROOT)/tao/svrrqst.h \
- $(TAO_ROOT)/tao/typecode.h \
- $(TAO_ROOT)/tao/marshal.h \
- $(TAO_ROOT)/tao/cdr.h \
- $(TAO_ROOT)/tao/stub.h \
- $(TAO_ROOT)/tao/connect.h \
- $(TAO_ROOT)/tao/orb_core.h \
- $(TAO_ROOT)/tao/objtable.h \
- $(TAO_ROOT)/tao/optable.h \
- $(TAO_ROOT)/tao/debug.h \
- $(TAO_ROOT)/tao/managed_types.h \
- $(TAO_ROOT)/tao/iiopobj.h \
- $(TAO_ROOT)/tao/iioporb.h \
- $(TAO_ROOT)/tao/giop.h \
- $(TAO_ROOT)/tao/orb_core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(TAO_ROOT)/tao/corbacom.i \
- $(TAO_ROOT)/tao/sequence.i \
- $(TAO_ROOT)/tao/typecode.i \
- $(TAO_ROOT)/tao/any.i \
- $(TAO_ROOT)/tao/cdr.i \
- $(TAO_ROOT)/tao/stub.i \
- $(TAO_ROOT)/tao/object.i \
- $(TAO_ROOT)/tao/orbobj.i \
- $(TAO_ROOT)/tao/marshal.i \
- $(TAO_ROOT)/tao/poa.i \
- $(TAO_ROOT)/tao/giop.i \
- $(TAO_ROOT)/tao/iioporb.i \
- $(TAO_ROOT)/tao/iiopobj.i \
- $(TAO_ROOT)/tao/managed_types.i \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/server_factory.i \
- $(TAO_ROOT)/tao/default_client.i \
- $(TAO_ROOT)/tao/default_server.i \
- $(TAO_ROOT)/tao/connect.i \
- $(TAO_ROOT)/tao/singletons.h
-.obj/iioporb.o .shobj/iioporb.so: iioporb.cpp \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/stdcpp.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/Task_T.i \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Svc_Handler.i \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(TAO_ROOT)/tao/orbconf.h \
- $(TAO_ROOT)/tao/orb.h \
- $(TAO_ROOT)/tao/corbacom.h \
- $(TAO_ROOT)/tao/object.h \
- $(TAO_ROOT)/tao/align.h \
- $(TAO_ROOT)/tao/sequence.h \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/any.h \
- $(TAO_ROOT)/tao/poa.h \
- $(TAO_ROOT)/tao/tao_internals.h \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/client_factory.h \
- $(TAO_ROOT)/tao/server_factory.h \
- $(TAO_ROOT)/tao/default_client.h \
- $(TAO_ROOT)/tao/default_server.h \
- $(TAO_ROOT)/tao/except.h \
- $(TAO_ROOT)/tao/orbobj.h \
- $(TAO_ROOT)/tao/nvlist.h \
- $(TAO_ROOT)/tao/principa.h \
- $(TAO_ROOT)/tao/request.h \
- $(TAO_ROOT)/tao/svrrqst.h \
- $(TAO_ROOT)/tao/typecode.h \
- $(TAO_ROOT)/tao/marshal.h \
- $(TAO_ROOT)/tao/cdr.h \
- $(TAO_ROOT)/tao/stub.h \
- $(TAO_ROOT)/tao/connect.h \
- $(TAO_ROOT)/tao/orb_core.h \
- $(TAO_ROOT)/tao/objtable.h \
- $(TAO_ROOT)/tao/optable.h \
- $(TAO_ROOT)/tao/debug.h \
- $(TAO_ROOT)/tao/managed_types.h \
- $(TAO_ROOT)/tao/iiopobj.h \
- $(TAO_ROOT)/tao/iioporb.h \
- $(TAO_ROOT)/tao/giop.h \
- $(TAO_ROOT)/tao/orb_core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(TAO_ROOT)/tao/corbacom.i \
- $(TAO_ROOT)/tao/sequence.i \
- $(TAO_ROOT)/tao/typecode.i \
- $(TAO_ROOT)/tao/any.i \
- $(TAO_ROOT)/tao/cdr.i \
- $(TAO_ROOT)/tao/stub.i \
- $(TAO_ROOT)/tao/object.i \
- $(TAO_ROOT)/tao/orbobj.i \
- $(TAO_ROOT)/tao/marshal.i \
- $(TAO_ROOT)/tao/poa.i \
- $(TAO_ROOT)/tao/giop.i \
- $(TAO_ROOT)/tao/iioporb.i \
- $(TAO_ROOT)/tao/iiopobj.i \
- $(TAO_ROOT)/tao/managed_types.i \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/server_factory.i \
- $(TAO_ROOT)/tao/default_client.i \
- $(TAO_ROOT)/tao/default_server.i \
- $(TAO_ROOT)/tao/connect.i \
- $(TAO_ROOT)/tao/singletons.h
-.obj/invoke.o .shobj/invoke.so: invoke.cpp \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/stdcpp.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/Task_T.i \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Svc_Handler.i \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(TAO_ROOT)/tao/orbconf.h \
- $(TAO_ROOT)/tao/orb.h \
- $(TAO_ROOT)/tao/corbacom.h \
- $(TAO_ROOT)/tao/object.h \
- $(TAO_ROOT)/tao/align.h \
- $(TAO_ROOT)/tao/sequence.h \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/any.h \
- $(TAO_ROOT)/tao/poa.h \
- $(TAO_ROOT)/tao/tao_internals.h \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/client_factory.h \
- $(TAO_ROOT)/tao/server_factory.h \
- $(TAO_ROOT)/tao/default_client.h \
- $(TAO_ROOT)/tao/default_server.h \
- $(TAO_ROOT)/tao/except.h \
- $(TAO_ROOT)/tao/orbobj.h \
- $(TAO_ROOT)/tao/nvlist.h \
- $(TAO_ROOT)/tao/principa.h \
- $(TAO_ROOT)/tao/request.h \
- $(TAO_ROOT)/tao/svrrqst.h \
- $(TAO_ROOT)/tao/typecode.h \
- $(TAO_ROOT)/tao/marshal.h \
- $(TAO_ROOT)/tao/cdr.h \
- $(TAO_ROOT)/tao/stub.h \
- $(TAO_ROOT)/tao/connect.h \
- $(TAO_ROOT)/tao/orb_core.h \
- $(TAO_ROOT)/tao/objtable.h \
- $(TAO_ROOT)/tao/optable.h \
- $(TAO_ROOT)/tao/debug.h \
- $(TAO_ROOT)/tao/managed_types.h \
- $(TAO_ROOT)/tao/iiopobj.h \
- $(TAO_ROOT)/tao/iioporb.h \
- $(TAO_ROOT)/tao/giop.h \
- $(TAO_ROOT)/tao/orb_core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(TAO_ROOT)/tao/corbacom.i \
- $(TAO_ROOT)/tao/sequence.i \
- $(TAO_ROOT)/tao/typecode.i \
- $(TAO_ROOT)/tao/any.i \
- $(TAO_ROOT)/tao/cdr.i \
- $(TAO_ROOT)/tao/stub.i \
- $(TAO_ROOT)/tao/object.i \
- $(TAO_ROOT)/tao/orbobj.i \
- $(TAO_ROOT)/tao/marshal.i \
- $(TAO_ROOT)/tao/poa.i \
- $(TAO_ROOT)/tao/giop.i \
- $(TAO_ROOT)/tao/iioporb.i \
- $(TAO_ROOT)/tao/iiopobj.i \
- $(TAO_ROOT)/tao/managed_types.i \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/server_factory.i \
- $(TAO_ROOT)/tao/default_client.i \
- $(TAO_ROOT)/tao/default_server.i \
- $(TAO_ROOT)/tao/connect.i \
- $(TAO_ROOT)/tao/singletons.h
-.obj/params.o .shobj/params.so: params.cpp \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/stdcpp.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/Task_T.i \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Svc_Handler.i \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(TAO_ROOT)/tao/orbconf.h \
- $(TAO_ROOT)/tao/orb.h \
- $(TAO_ROOT)/tao/corbacom.h \
- $(TAO_ROOT)/tao/object.h \
- $(TAO_ROOT)/tao/align.h \
- $(TAO_ROOT)/tao/sequence.h \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/any.h \
- $(TAO_ROOT)/tao/poa.h \
- $(TAO_ROOT)/tao/tao_internals.h \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/client_factory.h \
- $(TAO_ROOT)/tao/server_factory.h \
- $(TAO_ROOT)/tao/default_client.h \
- $(TAO_ROOT)/tao/default_server.h \
- $(TAO_ROOT)/tao/except.h \
- $(TAO_ROOT)/tao/orbobj.h \
- $(TAO_ROOT)/tao/nvlist.h \
- $(TAO_ROOT)/tao/principa.h \
- $(TAO_ROOT)/tao/request.h \
- $(TAO_ROOT)/tao/svrrqst.h \
- $(TAO_ROOT)/tao/typecode.h \
- $(TAO_ROOT)/tao/marshal.h \
- $(TAO_ROOT)/tao/cdr.h \
- $(TAO_ROOT)/tao/stub.h \
- $(TAO_ROOT)/tao/connect.h \
- $(TAO_ROOT)/tao/orb_core.h \
- $(TAO_ROOT)/tao/objtable.h \
- $(TAO_ROOT)/tao/optable.h \
- $(TAO_ROOT)/tao/debug.h \
- $(TAO_ROOT)/tao/managed_types.h \
- $(TAO_ROOT)/tao/iiopobj.h \
- $(TAO_ROOT)/tao/iioporb.h \
- $(TAO_ROOT)/tao/giop.h \
- $(TAO_ROOT)/tao/orb_core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(TAO_ROOT)/tao/corbacom.i \
- $(TAO_ROOT)/tao/sequence.i \
- $(TAO_ROOT)/tao/typecode.i \
- $(TAO_ROOT)/tao/any.i \
- $(TAO_ROOT)/tao/cdr.i \
- $(TAO_ROOT)/tao/stub.i \
- $(TAO_ROOT)/tao/object.i \
- $(TAO_ROOT)/tao/orbobj.i \
- $(TAO_ROOT)/tao/marshal.i \
- $(TAO_ROOT)/tao/poa.i \
- $(TAO_ROOT)/tao/giop.i \
- $(TAO_ROOT)/tao/iioporb.i \
- $(TAO_ROOT)/tao/iiopobj.i \
- $(TAO_ROOT)/tao/managed_types.i \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/server_factory.i \
- $(TAO_ROOT)/tao/default_client.i \
- $(TAO_ROOT)/tao/default_server.i \
- $(TAO_ROOT)/tao/connect.i \
- $(TAO_ROOT)/tao/singletons.h
-.obj/default_client.o .shobj/default_client.so: default_client.cpp \
- $(TAO_ROOT)/tao/default_client.h \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/stdcpp.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/Task_T.i \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Svc_Handler.i \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(TAO_ROOT)/tao/orbconf.h \
- $(TAO_ROOT)/tao/orb.h \
- $(TAO_ROOT)/tao/corbacom.h \
- $(TAO_ROOT)/tao/object.h \
- $(TAO_ROOT)/tao/align.h \
- $(TAO_ROOT)/tao/sequence.h \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/any.h \
- $(TAO_ROOT)/tao/poa.h \
- $(TAO_ROOT)/tao/tao_internals.h \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/client_factory.h \
- $(TAO_ROOT)/tao/server_factory.h \
- $(TAO_ROOT)/tao/default_server.h \
- $(TAO_ROOT)/tao/except.h \
- $(TAO_ROOT)/tao/orbobj.h \
- $(TAO_ROOT)/tao/nvlist.h \
- $(TAO_ROOT)/tao/principa.h \
- $(TAO_ROOT)/tao/request.h \
- $(TAO_ROOT)/tao/svrrqst.h \
- $(TAO_ROOT)/tao/typecode.h \
- $(TAO_ROOT)/tao/marshal.h \
- $(TAO_ROOT)/tao/cdr.h \
- $(TAO_ROOT)/tao/stub.h \
- $(TAO_ROOT)/tao/connect.h \
- $(TAO_ROOT)/tao/orb_core.h \
- $(TAO_ROOT)/tao/objtable.h \
- $(TAO_ROOT)/tao/optable.h \
- $(TAO_ROOT)/tao/debug.h \
- $(TAO_ROOT)/tao/managed_types.h \
- $(TAO_ROOT)/tao/iiopobj.h \
- $(TAO_ROOT)/tao/iioporb.h \
- $(TAO_ROOT)/tao/giop.h \
- $(TAO_ROOT)/tao/orb_core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(TAO_ROOT)/tao/corbacom.i \
- $(TAO_ROOT)/tao/sequence.i \
- $(TAO_ROOT)/tao/typecode.i \
- $(TAO_ROOT)/tao/any.i \
- $(TAO_ROOT)/tao/cdr.i \
- $(TAO_ROOT)/tao/stub.i \
- $(TAO_ROOT)/tao/object.i \
- $(TAO_ROOT)/tao/orbobj.i \
- $(TAO_ROOT)/tao/marshal.i \
- $(TAO_ROOT)/tao/poa.i \
- $(TAO_ROOT)/tao/giop.i \
- $(TAO_ROOT)/tao/iioporb.i \
- $(TAO_ROOT)/tao/iiopobj.i \
- $(TAO_ROOT)/tao/managed_types.i \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/server_factory.i \
- $(TAO_ROOT)/tao/default_client.i \
- $(TAO_ROOT)/tao/default_server.i \
- $(TAO_ROOT)/tao/connect.i \
- $(TAO_ROOT)/tao/singletons.h
-.obj/default_server.o .shobj/default_server.so: default_server.cpp \
- $(TAO_ROOT)/tao/default_server.h \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/stdcpp.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/Task_T.i \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Svc_Handler.i \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(TAO_ROOT)/tao/orbconf.h \
- $(TAO_ROOT)/tao/orb.h \
- $(TAO_ROOT)/tao/corbacom.h \
- $(TAO_ROOT)/tao/object.h \
- $(TAO_ROOT)/tao/align.h \
- $(TAO_ROOT)/tao/sequence.h \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/any.h \
- $(TAO_ROOT)/tao/poa.h \
- $(TAO_ROOT)/tao/tao_internals.h \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/client_factory.h \
- $(TAO_ROOT)/tao/server_factory.h \
- $(TAO_ROOT)/tao/default_client.h \
- $(TAO_ROOT)/tao/except.h \
- $(TAO_ROOT)/tao/orbobj.h \
- $(TAO_ROOT)/tao/nvlist.h \
- $(TAO_ROOT)/tao/principa.h \
- $(TAO_ROOT)/tao/request.h \
- $(TAO_ROOT)/tao/svrrqst.h \
- $(TAO_ROOT)/tao/typecode.h \
- $(TAO_ROOT)/tao/marshal.h \
- $(TAO_ROOT)/tao/cdr.h \
- $(TAO_ROOT)/tao/stub.h \
- $(TAO_ROOT)/tao/connect.h \
- $(TAO_ROOT)/tao/orb_core.h \
- $(TAO_ROOT)/tao/objtable.h \
- $(TAO_ROOT)/tao/optable.h \
- $(TAO_ROOT)/tao/debug.h \
- $(TAO_ROOT)/tao/managed_types.h \
- $(TAO_ROOT)/tao/iiopobj.h \
- $(TAO_ROOT)/tao/iioporb.h \
- $(TAO_ROOT)/tao/giop.h \
- $(TAO_ROOT)/tao/orb_core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(TAO_ROOT)/tao/corbacom.i \
- $(TAO_ROOT)/tao/sequence.i \
- $(TAO_ROOT)/tao/typecode.i \
- $(TAO_ROOT)/tao/any.i \
- $(TAO_ROOT)/tao/cdr.i \
- $(TAO_ROOT)/tao/stub.i \
- $(TAO_ROOT)/tao/object.i \
- $(TAO_ROOT)/tao/orbobj.i \
- $(TAO_ROOT)/tao/marshal.i \
- $(TAO_ROOT)/tao/poa.i \
- $(TAO_ROOT)/tao/giop.i \
- $(TAO_ROOT)/tao/iioporb.i \
- $(TAO_ROOT)/tao/iiopobj.i \
- $(TAO_ROOT)/tao/managed_types.i \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/server_factory.i \
- $(TAO_ROOT)/tao/default_client.i \
- $(TAO_ROOT)/tao/default_server.i \
- $(TAO_ROOT)/tao/connect.i \
- $(TAO_ROOT)/tao/singletons.h
-.obj/server_factory.o .shobj/server_factory.so: server_factory.cpp \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/stdcpp.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/Task_T.i \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Svc_Handler.i \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(TAO_ROOT)/tao/orbconf.h \
- $(TAO_ROOT)/tao/orb.h \
- $(TAO_ROOT)/tao/corbacom.h \
- $(TAO_ROOT)/tao/object.h \
- $(TAO_ROOT)/tao/align.h \
- $(TAO_ROOT)/tao/sequence.h \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/any.h \
- $(TAO_ROOT)/tao/poa.h \
- $(TAO_ROOT)/tao/tao_internals.h \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/client_factory.h \
- $(TAO_ROOT)/tao/server_factory.h \
- $(TAO_ROOT)/tao/default_client.h \
- $(TAO_ROOT)/tao/default_server.h \
- $(TAO_ROOT)/tao/except.h \
- $(TAO_ROOT)/tao/orbobj.h \
- $(TAO_ROOT)/tao/nvlist.h \
- $(TAO_ROOT)/tao/principa.h \
- $(TAO_ROOT)/tao/request.h \
- $(TAO_ROOT)/tao/svrrqst.h \
- $(TAO_ROOT)/tao/typecode.h \
- $(TAO_ROOT)/tao/marshal.h \
- $(TAO_ROOT)/tao/cdr.h \
- $(TAO_ROOT)/tao/stub.h \
- $(TAO_ROOT)/tao/connect.h \
- $(TAO_ROOT)/tao/orb_core.h \
- $(TAO_ROOT)/tao/objtable.h \
- $(TAO_ROOT)/tao/optable.h \
- $(TAO_ROOT)/tao/debug.h \
- $(TAO_ROOT)/tao/managed_types.h \
- $(TAO_ROOT)/tao/iiopobj.h \
- $(TAO_ROOT)/tao/iioporb.h \
- $(TAO_ROOT)/tao/giop.h \
- $(TAO_ROOT)/tao/orb_core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(TAO_ROOT)/tao/corbacom.i \
- $(TAO_ROOT)/tao/sequence.i \
- $(TAO_ROOT)/tao/typecode.i \
- $(TAO_ROOT)/tao/any.i \
- $(TAO_ROOT)/tao/cdr.i \
- $(TAO_ROOT)/tao/stub.i \
- $(TAO_ROOT)/tao/object.i \
- $(TAO_ROOT)/tao/orbobj.i \
- $(TAO_ROOT)/tao/marshal.i \
- $(TAO_ROOT)/tao/poa.i \
- $(TAO_ROOT)/tao/giop.i \
- $(TAO_ROOT)/tao/iioporb.i \
- $(TAO_ROOT)/tao/iiopobj.i \
- $(TAO_ROOT)/tao/managed_types.i \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/server_factory.i \
- $(TAO_ROOT)/tao/default_client.i \
- $(TAO_ROOT)/tao/default_server.i \
- $(TAO_ROOT)/tao/connect.i \
- $(TAO_ROOT)/tao/singletons.h
-.obj/client_factory.o .shobj/client_factory.so: client_factory.cpp \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/stdcpp.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/Task_T.i \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Svc_Handler.i \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(TAO_ROOT)/tao/orbconf.h \
- $(TAO_ROOT)/tao/orb.h \
- $(TAO_ROOT)/tao/corbacom.h \
- $(TAO_ROOT)/tao/object.h \
- $(TAO_ROOT)/tao/align.h \
- $(TAO_ROOT)/tao/sequence.h \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/any.h \
- $(TAO_ROOT)/tao/poa.h \
- $(TAO_ROOT)/tao/tao_internals.h \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/client_factory.h \
- $(TAO_ROOT)/tao/server_factory.h \
- $(TAO_ROOT)/tao/default_client.h \
- $(TAO_ROOT)/tao/default_server.h \
- $(TAO_ROOT)/tao/except.h \
- $(TAO_ROOT)/tao/orbobj.h \
- $(TAO_ROOT)/tao/nvlist.h \
- $(TAO_ROOT)/tao/principa.h \
- $(TAO_ROOT)/tao/request.h \
- $(TAO_ROOT)/tao/svrrqst.h \
- $(TAO_ROOT)/tao/typecode.h \
- $(TAO_ROOT)/tao/marshal.h \
- $(TAO_ROOT)/tao/cdr.h \
- $(TAO_ROOT)/tao/stub.h \
- $(TAO_ROOT)/tao/connect.h \
- $(TAO_ROOT)/tao/orb_core.h \
- $(TAO_ROOT)/tao/objtable.h \
- $(TAO_ROOT)/tao/optable.h \
- $(TAO_ROOT)/tao/debug.h \
- $(TAO_ROOT)/tao/managed_types.h \
- $(TAO_ROOT)/tao/iiopobj.h \
- $(TAO_ROOT)/tao/iioporb.h \
- $(TAO_ROOT)/tao/giop.h \
- $(TAO_ROOT)/tao/orb_core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(TAO_ROOT)/tao/corbacom.i \
- $(TAO_ROOT)/tao/sequence.i \
- $(TAO_ROOT)/tao/typecode.i \
- $(TAO_ROOT)/tao/any.i \
- $(TAO_ROOT)/tao/cdr.i \
- $(TAO_ROOT)/tao/stub.i \
- $(TAO_ROOT)/tao/object.i \
- $(TAO_ROOT)/tao/orbobj.i \
- $(TAO_ROOT)/tao/marshal.i \
- $(TAO_ROOT)/tao/poa.i \
- $(TAO_ROOT)/tao/giop.i \
- $(TAO_ROOT)/tao/iioporb.i \
- $(TAO_ROOT)/tao/iiopobj.i \
- $(TAO_ROOT)/tao/managed_types.i \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/server_factory.i \
- $(TAO_ROOT)/tao/default_client.i \
- $(TAO_ROOT)/tao/default_server.i \
- $(TAO_ROOT)/tao/connect.i \
- $(TAO_ROOT)/tao/singletons.h
-.obj/orb_core.o .shobj/orb_core.so: orb_core.cpp \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/stdcpp.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/Task_T.i \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Svc_Handler.i \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(TAO_ROOT)/tao/orbconf.h \
- $(TAO_ROOT)/tao/orb.h \
- $(TAO_ROOT)/tao/corbacom.h \
- $(TAO_ROOT)/tao/object.h \
- $(TAO_ROOT)/tao/align.h \
- $(TAO_ROOT)/tao/sequence.h \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/any.h \
- $(TAO_ROOT)/tao/poa.h \
- $(TAO_ROOT)/tao/tao_internals.h \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/client_factory.h \
- $(TAO_ROOT)/tao/server_factory.h \
- $(TAO_ROOT)/tao/default_client.h \
- $(TAO_ROOT)/tao/default_server.h \
- $(TAO_ROOT)/tao/except.h \
- $(TAO_ROOT)/tao/orbobj.h \
- $(TAO_ROOT)/tao/nvlist.h \
- $(TAO_ROOT)/tao/principa.h \
- $(TAO_ROOT)/tao/request.h \
- $(TAO_ROOT)/tao/svrrqst.h \
- $(TAO_ROOT)/tao/typecode.h \
- $(TAO_ROOT)/tao/marshal.h \
- $(TAO_ROOT)/tao/cdr.h \
- $(TAO_ROOT)/tao/stub.h \
- $(TAO_ROOT)/tao/connect.h \
- $(TAO_ROOT)/tao/orb_core.h \
- $(TAO_ROOT)/tao/objtable.h \
- $(TAO_ROOT)/tao/optable.h \
- $(TAO_ROOT)/tao/debug.h \
- $(TAO_ROOT)/tao/managed_types.h \
- $(TAO_ROOT)/tao/iiopobj.h \
- $(TAO_ROOT)/tao/iioporb.h \
- $(TAO_ROOT)/tao/giop.h \
- $(TAO_ROOT)/tao/orb_core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(TAO_ROOT)/tao/corbacom.i \
- $(TAO_ROOT)/tao/sequence.i \
- $(TAO_ROOT)/tao/typecode.i \
- $(TAO_ROOT)/tao/any.i \
- $(TAO_ROOT)/tao/cdr.i \
- $(TAO_ROOT)/tao/stub.i \
- $(TAO_ROOT)/tao/object.i \
- $(TAO_ROOT)/tao/orbobj.i \
- $(TAO_ROOT)/tao/marshal.i \
- $(TAO_ROOT)/tao/poa.i \
- $(TAO_ROOT)/tao/giop.i \
- $(TAO_ROOT)/tao/iioporb.i \
- $(TAO_ROOT)/tao/iiopobj.i \
- $(TAO_ROOT)/tao/managed_types.i \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/server_factory.i \
- $(TAO_ROOT)/tao/default_client.i \
- $(TAO_ROOT)/tao/default_server.i \
- $(TAO_ROOT)/tao/connect.i \
- $(TAO_ROOT)/tao/singletons.h \
- $(ACE_ROOT)/ace/Service_Repository.h \
- $(ACE_ROOT)/ace/Service_Types.h \
- $(ACE_ROOT)/ace/Service_Types.i \
- $(ACE_ROOT)/ace/Service_Repository.i
-.obj/objtable.o .shobj/objtable.so: objtable.cpp \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/stdcpp.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/Task_T.i \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Svc_Handler.i \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(TAO_ROOT)/tao/orbconf.h \
- $(TAO_ROOT)/tao/orb.h \
- $(TAO_ROOT)/tao/corbacom.h \
- $(TAO_ROOT)/tao/object.h \
- $(TAO_ROOT)/tao/align.h \
- $(TAO_ROOT)/tao/sequence.h \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/any.h \
- $(TAO_ROOT)/tao/poa.h \
- $(TAO_ROOT)/tao/tao_internals.h \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/client_factory.h \
- $(TAO_ROOT)/tao/server_factory.h \
- $(TAO_ROOT)/tao/default_client.h \
- $(TAO_ROOT)/tao/default_server.h \
- $(TAO_ROOT)/tao/except.h \
- $(TAO_ROOT)/tao/orbobj.h \
- $(TAO_ROOT)/tao/nvlist.h \
- $(TAO_ROOT)/tao/principa.h \
- $(TAO_ROOT)/tao/request.h \
- $(TAO_ROOT)/tao/svrrqst.h \
- $(TAO_ROOT)/tao/typecode.h \
- $(TAO_ROOT)/tao/marshal.h \
- $(TAO_ROOT)/tao/cdr.h \
- $(TAO_ROOT)/tao/stub.h \
- $(TAO_ROOT)/tao/connect.h \
- $(TAO_ROOT)/tao/orb_core.h \
- $(TAO_ROOT)/tao/objtable.h \
- $(TAO_ROOT)/tao/optable.h \
- $(TAO_ROOT)/tao/debug.h \
- $(TAO_ROOT)/tao/managed_types.h \
- $(TAO_ROOT)/tao/iiopobj.h \
- $(TAO_ROOT)/tao/iioporb.h \
- $(TAO_ROOT)/tao/giop.h \
- $(TAO_ROOT)/tao/orb_core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(TAO_ROOT)/tao/corbacom.i \
- $(TAO_ROOT)/tao/sequence.i \
- $(TAO_ROOT)/tao/typecode.i \
- $(TAO_ROOT)/tao/any.i \
- $(TAO_ROOT)/tao/cdr.i \
- $(TAO_ROOT)/tao/stub.i \
- $(TAO_ROOT)/tao/object.i \
- $(TAO_ROOT)/tao/orbobj.i \
- $(TAO_ROOT)/tao/marshal.i \
- $(TAO_ROOT)/tao/poa.i \
- $(TAO_ROOT)/tao/giop.i \
- $(TAO_ROOT)/tao/iioporb.i \
- $(TAO_ROOT)/tao/iiopobj.i \
- $(TAO_ROOT)/tao/managed_types.i \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/server_factory.i \
- $(TAO_ROOT)/tao/default_client.i \
- $(TAO_ROOT)/tao/default_server.i \
- $(TAO_ROOT)/tao/connect.i \
- $(TAO_ROOT)/tao/singletons.h
-.obj/optable.o .shobj/optable.so: optable.cpp \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/stdcpp.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/Task_T.i \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Svc_Handler.i \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(TAO_ROOT)/tao/orbconf.h \
- $(TAO_ROOT)/tao/orb.h \
- $(TAO_ROOT)/tao/corbacom.h \
- $(TAO_ROOT)/tao/object.h \
- $(TAO_ROOT)/tao/align.h \
- $(TAO_ROOT)/tao/sequence.h \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/any.h \
- $(TAO_ROOT)/tao/poa.h \
- $(TAO_ROOT)/tao/tao_internals.h \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/client_factory.h \
- $(TAO_ROOT)/tao/server_factory.h \
- $(TAO_ROOT)/tao/default_client.h \
- $(TAO_ROOT)/tao/default_server.h \
- $(TAO_ROOT)/tao/except.h \
- $(TAO_ROOT)/tao/orbobj.h \
- $(TAO_ROOT)/tao/nvlist.h \
- $(TAO_ROOT)/tao/principa.h \
- $(TAO_ROOT)/tao/request.h \
- $(TAO_ROOT)/tao/svrrqst.h \
- $(TAO_ROOT)/tao/typecode.h \
- $(TAO_ROOT)/tao/marshal.h \
- $(TAO_ROOT)/tao/cdr.h \
- $(TAO_ROOT)/tao/stub.h \
- $(TAO_ROOT)/tao/connect.h \
- $(TAO_ROOT)/tao/orb_core.h \
- $(TAO_ROOT)/tao/objtable.h \
- $(TAO_ROOT)/tao/optable.h \
- $(TAO_ROOT)/tao/debug.h \
- $(TAO_ROOT)/tao/managed_types.h \
- $(TAO_ROOT)/tao/iiopobj.h \
- $(TAO_ROOT)/tao/iioporb.h \
- $(TAO_ROOT)/tao/giop.h \
- $(TAO_ROOT)/tao/orb_core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(TAO_ROOT)/tao/corbacom.i \
- $(TAO_ROOT)/tao/sequence.i \
- $(TAO_ROOT)/tao/typecode.i \
- $(TAO_ROOT)/tao/any.i \
- $(TAO_ROOT)/tao/cdr.i \
- $(TAO_ROOT)/tao/stub.i \
- $(TAO_ROOT)/tao/object.i \
- $(TAO_ROOT)/tao/orbobj.i \
- $(TAO_ROOT)/tao/marshal.i \
- $(TAO_ROOT)/tao/poa.i \
- $(TAO_ROOT)/tao/giop.i \
- $(TAO_ROOT)/tao/iioporb.i \
- $(TAO_ROOT)/tao/iiopobj.i \
- $(TAO_ROOT)/tao/managed_types.i \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/server_factory.i \
- $(TAO_ROOT)/tao/default_client.i \
- $(TAO_ROOT)/tao/default_server.i \
- $(TAO_ROOT)/tao/connect.i \
- $(TAO_ROOT)/tao/singletons.h
-.obj/connect.o .shobj/connect.so: connect.cpp \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/stdcpp.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/Task_T.i \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Svc_Handler.i \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(TAO_ROOT)/tao/orbconf.h \
- $(TAO_ROOT)/tao/orb.h \
- $(TAO_ROOT)/tao/corbacom.h \
- $(TAO_ROOT)/tao/object.h \
- $(TAO_ROOT)/tao/align.h \
- $(TAO_ROOT)/tao/sequence.h \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/any.h \
- $(TAO_ROOT)/tao/poa.h \
- $(TAO_ROOT)/tao/tao_internals.h \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/client_factory.h \
- $(TAO_ROOT)/tao/server_factory.h \
- $(TAO_ROOT)/tao/default_client.h \
- $(TAO_ROOT)/tao/default_server.h \
- $(TAO_ROOT)/tao/except.h \
- $(TAO_ROOT)/tao/orbobj.h \
- $(TAO_ROOT)/tao/nvlist.h \
- $(TAO_ROOT)/tao/principa.h \
- $(TAO_ROOT)/tao/request.h \
- $(TAO_ROOT)/tao/svrrqst.h \
- $(TAO_ROOT)/tao/typecode.h \
- $(TAO_ROOT)/tao/marshal.h \
- $(TAO_ROOT)/tao/cdr.h \
- $(TAO_ROOT)/tao/stub.h \
- $(TAO_ROOT)/tao/connect.h \
- $(TAO_ROOT)/tao/orb_core.h \
- $(TAO_ROOT)/tao/objtable.h \
- $(TAO_ROOT)/tao/optable.h \
- $(TAO_ROOT)/tao/debug.h \
- $(TAO_ROOT)/tao/managed_types.h \
- $(TAO_ROOT)/tao/iiopobj.h \
- $(TAO_ROOT)/tao/iioporb.h \
- $(TAO_ROOT)/tao/giop.h \
- $(TAO_ROOT)/tao/orb_core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(TAO_ROOT)/tao/corbacom.i \
- $(TAO_ROOT)/tao/sequence.i \
- $(TAO_ROOT)/tao/typecode.i \
- $(TAO_ROOT)/tao/any.i \
- $(TAO_ROOT)/tao/cdr.i \
- $(TAO_ROOT)/tao/stub.i \
- $(TAO_ROOT)/tao/object.i \
- $(TAO_ROOT)/tao/orbobj.i \
- $(TAO_ROOT)/tao/marshal.i \
- $(TAO_ROOT)/tao/poa.i \
- $(TAO_ROOT)/tao/giop.i \
- $(TAO_ROOT)/tao/iioporb.i \
- $(TAO_ROOT)/tao/iiopobj.i \
- $(TAO_ROOT)/tao/managed_types.i \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/server_factory.i \
- $(TAO_ROOT)/tao/default_client.i \
- $(TAO_ROOT)/tao/default_server.i \
- $(TAO_ROOT)/tao/connect.i \
- $(TAO_ROOT)/tao/singletons.h
-.obj/cdr.o .shobj/cdr.so: cdr.cpp \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/stdcpp.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/Task_T.i \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Svc_Handler.i \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(TAO_ROOT)/tao/orbconf.h \
- $(TAO_ROOT)/tao/orb.h \
- $(TAO_ROOT)/tao/corbacom.h \
- $(TAO_ROOT)/tao/object.h \
- $(TAO_ROOT)/tao/align.h \
- $(TAO_ROOT)/tao/sequence.h \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/any.h \
- $(TAO_ROOT)/tao/poa.h \
- $(TAO_ROOT)/tao/tao_internals.h \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/client_factory.h \
- $(TAO_ROOT)/tao/server_factory.h \
- $(TAO_ROOT)/tao/default_client.h \
- $(TAO_ROOT)/tao/default_server.h \
- $(TAO_ROOT)/tao/except.h \
- $(TAO_ROOT)/tao/orbobj.h \
- $(TAO_ROOT)/tao/nvlist.h \
- $(TAO_ROOT)/tao/principa.h \
- $(TAO_ROOT)/tao/request.h \
- $(TAO_ROOT)/tao/svrrqst.h \
- $(TAO_ROOT)/tao/typecode.h \
- $(TAO_ROOT)/tao/marshal.h \
- $(TAO_ROOT)/tao/cdr.h \
- $(TAO_ROOT)/tao/stub.h \
- $(TAO_ROOT)/tao/connect.h \
- $(TAO_ROOT)/tao/orb_core.h \
- $(TAO_ROOT)/tao/objtable.h \
- $(TAO_ROOT)/tao/optable.h \
- $(TAO_ROOT)/tao/debug.h \
- $(TAO_ROOT)/tao/managed_types.h \
- $(TAO_ROOT)/tao/iiopobj.h \
- $(TAO_ROOT)/tao/iioporb.h \
- $(TAO_ROOT)/tao/giop.h \
- $(TAO_ROOT)/tao/orb_core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(TAO_ROOT)/tao/corbacom.i \
- $(TAO_ROOT)/tao/sequence.i \
- $(TAO_ROOT)/tao/typecode.i \
- $(TAO_ROOT)/tao/any.i \
- $(TAO_ROOT)/tao/cdr.i \
- $(TAO_ROOT)/tao/stub.i \
- $(TAO_ROOT)/tao/object.i \
- $(TAO_ROOT)/tao/orbobj.i \
- $(TAO_ROOT)/tao/marshal.i \
- $(TAO_ROOT)/tao/poa.i \
- $(TAO_ROOT)/tao/giop.i \
- $(TAO_ROOT)/tao/iioporb.i \
- $(TAO_ROOT)/tao/iiopobj.i \
- $(TAO_ROOT)/tao/managed_types.i \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/server_factory.i \
- $(TAO_ROOT)/tao/default_client.i \
- $(TAO_ROOT)/tao/default_server.i \
- $(TAO_ROOT)/tao/connect.i \
- $(TAO_ROOT)/tao/singletons.h
-.obj/debug.o .shobj/debug.so: debug.cpp \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/stdcpp.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/Task_T.i \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Svc_Handler.i \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(TAO_ROOT)/tao/orbconf.h \
- $(TAO_ROOT)/tao/orb.h \
- $(TAO_ROOT)/tao/corbacom.h \
- $(TAO_ROOT)/tao/object.h \
- $(TAO_ROOT)/tao/align.h \
- $(TAO_ROOT)/tao/sequence.h \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/any.h \
- $(TAO_ROOT)/tao/poa.h \
- $(TAO_ROOT)/tao/tao_internals.h \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/client_factory.h \
- $(TAO_ROOT)/tao/server_factory.h \
- $(TAO_ROOT)/tao/default_client.h \
- $(TAO_ROOT)/tao/default_server.h \
- $(TAO_ROOT)/tao/except.h \
- $(TAO_ROOT)/tao/orbobj.h \
- $(TAO_ROOT)/tao/nvlist.h \
- $(TAO_ROOT)/tao/principa.h \
- $(TAO_ROOT)/tao/request.h \
- $(TAO_ROOT)/tao/svrrqst.h \
- $(TAO_ROOT)/tao/typecode.h \
- $(TAO_ROOT)/tao/marshal.h \
- $(TAO_ROOT)/tao/cdr.h \
- $(TAO_ROOT)/tao/stub.h \
- $(TAO_ROOT)/tao/connect.h \
- $(TAO_ROOT)/tao/orb_core.h \
- $(TAO_ROOT)/tao/objtable.h \
- $(TAO_ROOT)/tao/optable.h \
- $(TAO_ROOT)/tao/debug.h \
- $(TAO_ROOT)/tao/managed_types.h \
- $(TAO_ROOT)/tao/iiopobj.h \
- $(TAO_ROOT)/tao/iioporb.h \
- $(TAO_ROOT)/tao/giop.h \
- $(TAO_ROOT)/tao/orb_core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(TAO_ROOT)/tao/corbacom.i \
- $(TAO_ROOT)/tao/sequence.i \
- $(TAO_ROOT)/tao/typecode.i \
- $(TAO_ROOT)/tao/any.i \
- $(TAO_ROOT)/tao/cdr.i \
- $(TAO_ROOT)/tao/stub.i \
- $(TAO_ROOT)/tao/object.i \
- $(TAO_ROOT)/tao/orbobj.i \
- $(TAO_ROOT)/tao/marshal.i \
- $(TAO_ROOT)/tao/poa.i \
- $(TAO_ROOT)/tao/giop.i \
- $(TAO_ROOT)/tao/iioporb.i \
- $(TAO_ROOT)/tao/iiopobj.i \
- $(TAO_ROOT)/tao/managed_types.i \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/server_factory.i \
- $(TAO_ROOT)/tao/default_client.i \
- $(TAO_ROOT)/tao/default_server.i \
- $(TAO_ROOT)/tao/connect.i \
- $(TAO_ROOT)/tao/singletons.h
-.obj/interp.o .shobj/interp.so: interp.cpp \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/stdcpp.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/Task_T.i \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Svc_Handler.i \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(TAO_ROOT)/tao/orbconf.h \
- $(TAO_ROOT)/tao/orb.h \
- $(TAO_ROOT)/tao/corbacom.h \
- $(TAO_ROOT)/tao/object.h \
- $(TAO_ROOT)/tao/align.h \
- $(TAO_ROOT)/tao/sequence.h \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/any.h \
- $(TAO_ROOT)/tao/poa.h \
- $(TAO_ROOT)/tao/tao_internals.h \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/client_factory.h \
- $(TAO_ROOT)/tao/server_factory.h \
- $(TAO_ROOT)/tao/default_client.h \
- $(TAO_ROOT)/tao/default_server.h \
- $(TAO_ROOT)/tao/except.h \
- $(TAO_ROOT)/tao/orbobj.h \
- $(TAO_ROOT)/tao/nvlist.h \
- $(TAO_ROOT)/tao/principa.h \
- $(TAO_ROOT)/tao/request.h \
- $(TAO_ROOT)/tao/svrrqst.h \
- $(TAO_ROOT)/tao/typecode.h \
- $(TAO_ROOT)/tao/marshal.h \
- $(TAO_ROOT)/tao/cdr.h \
- $(TAO_ROOT)/tao/stub.h \
- $(TAO_ROOT)/tao/connect.h \
- $(TAO_ROOT)/tao/orb_core.h \
- $(TAO_ROOT)/tao/objtable.h \
- $(TAO_ROOT)/tao/optable.h \
- $(TAO_ROOT)/tao/debug.h \
- $(TAO_ROOT)/tao/managed_types.h \
- $(TAO_ROOT)/tao/iiopobj.h \
- $(TAO_ROOT)/tao/iioporb.h \
- $(TAO_ROOT)/tao/giop.h \
- $(TAO_ROOT)/tao/orb_core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(TAO_ROOT)/tao/corbacom.i \
- $(TAO_ROOT)/tao/sequence.i \
- $(TAO_ROOT)/tao/typecode.i \
- $(TAO_ROOT)/tao/any.i \
- $(TAO_ROOT)/tao/cdr.i \
- $(TAO_ROOT)/tao/stub.i \
- $(TAO_ROOT)/tao/object.i \
- $(TAO_ROOT)/tao/orbobj.i \
- $(TAO_ROOT)/tao/marshal.i \
- $(TAO_ROOT)/tao/poa.i \
- $(TAO_ROOT)/tao/giop.i \
- $(TAO_ROOT)/tao/iioporb.i \
- $(TAO_ROOT)/tao/iiopobj.i \
- $(TAO_ROOT)/tao/managed_types.i \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/server_factory.i \
- $(TAO_ROOT)/tao/default_client.i \
- $(TAO_ROOT)/tao/default_server.i \
- $(TAO_ROOT)/tao/connect.i \
- $(TAO_ROOT)/tao/singletons.h
-.obj/marshal.o .shobj/marshal.so: marshal.cpp \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/stdcpp.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/Task_T.i \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Svc_Handler.i \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(TAO_ROOT)/tao/orbconf.h \
- $(TAO_ROOT)/tao/orb.h \
- $(TAO_ROOT)/tao/corbacom.h \
- $(TAO_ROOT)/tao/object.h \
- $(TAO_ROOT)/tao/align.h \
- $(TAO_ROOT)/tao/sequence.h \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/any.h \
- $(TAO_ROOT)/tao/poa.h \
- $(TAO_ROOT)/tao/tao_internals.h \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/client_factory.h \
- $(TAO_ROOT)/tao/server_factory.h \
- $(TAO_ROOT)/tao/default_client.h \
- $(TAO_ROOT)/tao/default_server.h \
- $(TAO_ROOT)/tao/except.h \
- $(TAO_ROOT)/tao/orbobj.h \
- $(TAO_ROOT)/tao/nvlist.h \
- $(TAO_ROOT)/tao/principa.h \
- $(TAO_ROOT)/tao/request.h \
- $(TAO_ROOT)/tao/svrrqst.h \
- $(TAO_ROOT)/tao/typecode.h \
- $(TAO_ROOT)/tao/marshal.h \
- $(TAO_ROOT)/tao/cdr.h \
- $(TAO_ROOT)/tao/stub.h \
- $(TAO_ROOT)/tao/connect.h \
- $(TAO_ROOT)/tao/orb_core.h \
- $(TAO_ROOT)/tao/objtable.h \
- $(TAO_ROOT)/tao/optable.h \
- $(TAO_ROOT)/tao/debug.h \
- $(TAO_ROOT)/tao/managed_types.h \
- $(TAO_ROOT)/tao/iiopobj.h \
- $(TAO_ROOT)/tao/iioporb.h \
- $(TAO_ROOT)/tao/giop.h \
- $(TAO_ROOT)/tao/orb_core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(TAO_ROOT)/tao/corbacom.i \
- $(TAO_ROOT)/tao/sequence.i \
- $(TAO_ROOT)/tao/typecode.i \
- $(TAO_ROOT)/tao/any.i \
- $(TAO_ROOT)/tao/cdr.i \
- $(TAO_ROOT)/tao/stub.i \
- $(TAO_ROOT)/tao/object.i \
- $(TAO_ROOT)/tao/orbobj.i \
- $(TAO_ROOT)/tao/marshal.i \
- $(TAO_ROOT)/tao/poa.i \
- $(TAO_ROOT)/tao/giop.i \
- $(TAO_ROOT)/tao/iioporb.i \
- $(TAO_ROOT)/tao/iiopobj.i \
- $(TAO_ROOT)/tao/managed_types.i \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/server_factory.i \
- $(TAO_ROOT)/tao/default_client.i \
- $(TAO_ROOT)/tao/default_server.i \
- $(TAO_ROOT)/tao/connect.i \
- $(TAO_ROOT)/tao/singletons.h
-.obj/encode.o .shobj/encode.so: encode.cpp \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/stdcpp.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/Task_T.i \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Svc_Handler.i \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(TAO_ROOT)/tao/orbconf.h \
- $(TAO_ROOT)/tao/orb.h \
- $(TAO_ROOT)/tao/corbacom.h \
- $(TAO_ROOT)/tao/object.h \
- $(TAO_ROOT)/tao/align.h \
- $(TAO_ROOT)/tao/sequence.h \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/any.h \
- $(TAO_ROOT)/tao/poa.h \
- $(TAO_ROOT)/tao/tao_internals.h \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/client_factory.h \
- $(TAO_ROOT)/tao/server_factory.h \
- $(TAO_ROOT)/tao/default_client.h \
- $(TAO_ROOT)/tao/default_server.h \
- $(TAO_ROOT)/tao/except.h \
- $(TAO_ROOT)/tao/orbobj.h \
- $(TAO_ROOT)/tao/nvlist.h \
- $(TAO_ROOT)/tao/principa.h \
- $(TAO_ROOT)/tao/request.h \
- $(TAO_ROOT)/tao/svrrqst.h \
- $(TAO_ROOT)/tao/typecode.h \
- $(TAO_ROOT)/tao/marshal.h \
- $(TAO_ROOT)/tao/cdr.h \
- $(TAO_ROOT)/tao/stub.h \
- $(TAO_ROOT)/tao/connect.h \
- $(TAO_ROOT)/tao/orb_core.h \
- $(TAO_ROOT)/tao/objtable.h \
- $(TAO_ROOT)/tao/optable.h \
- $(TAO_ROOT)/tao/debug.h \
- $(TAO_ROOT)/tao/managed_types.h \
- $(TAO_ROOT)/tao/iiopobj.h \
- $(TAO_ROOT)/tao/iioporb.h \
- $(TAO_ROOT)/tao/giop.h \
- $(TAO_ROOT)/tao/orb_core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(TAO_ROOT)/tao/corbacom.i \
- $(TAO_ROOT)/tao/sequence.i \
- $(TAO_ROOT)/tao/typecode.i \
- $(TAO_ROOT)/tao/any.i \
- $(TAO_ROOT)/tao/cdr.i \
- $(TAO_ROOT)/tao/stub.i \
- $(TAO_ROOT)/tao/object.i \
- $(TAO_ROOT)/tao/orbobj.i \
- $(TAO_ROOT)/tao/marshal.i \
- $(TAO_ROOT)/tao/poa.i \
- $(TAO_ROOT)/tao/giop.i \
- $(TAO_ROOT)/tao/iioporb.i \
- $(TAO_ROOT)/tao/iiopobj.i \
- $(TAO_ROOT)/tao/managed_types.i \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/server_factory.i \
- $(TAO_ROOT)/tao/default_client.i \
- $(TAO_ROOT)/tao/default_server.i \
- $(TAO_ROOT)/tao/connect.i \
- $(TAO_ROOT)/tao/singletons.h
-.obj/decode.o .shobj/decode.so: decode.cpp \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/stdcpp.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/Task_T.i \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Svc_Handler.i \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(TAO_ROOT)/tao/orbconf.h \
- $(TAO_ROOT)/tao/orb.h \
- $(TAO_ROOT)/tao/corbacom.h \
- $(TAO_ROOT)/tao/object.h \
- $(TAO_ROOT)/tao/align.h \
- $(TAO_ROOT)/tao/sequence.h \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/any.h \
- $(TAO_ROOT)/tao/poa.h \
- $(TAO_ROOT)/tao/tao_internals.h \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/client_factory.h \
- $(TAO_ROOT)/tao/server_factory.h \
- $(TAO_ROOT)/tao/default_client.h \
- $(TAO_ROOT)/tao/default_server.h \
- $(TAO_ROOT)/tao/except.h \
- $(TAO_ROOT)/tao/orbobj.h \
- $(TAO_ROOT)/tao/nvlist.h \
- $(TAO_ROOT)/tao/principa.h \
- $(TAO_ROOT)/tao/request.h \
- $(TAO_ROOT)/tao/svrrqst.h \
- $(TAO_ROOT)/tao/typecode.h \
- $(TAO_ROOT)/tao/marshal.h \
- $(TAO_ROOT)/tao/cdr.h \
- $(TAO_ROOT)/tao/stub.h \
- $(TAO_ROOT)/tao/connect.h \
- $(TAO_ROOT)/tao/orb_core.h \
- $(TAO_ROOT)/tao/objtable.h \
- $(TAO_ROOT)/tao/optable.h \
- $(TAO_ROOT)/tao/debug.h \
- $(TAO_ROOT)/tao/managed_types.h \
- $(TAO_ROOT)/tao/iiopobj.h \
- $(TAO_ROOT)/tao/iioporb.h \
- $(TAO_ROOT)/tao/giop.h \
- $(TAO_ROOT)/tao/orb_core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(TAO_ROOT)/tao/corbacom.i \
- $(TAO_ROOT)/tao/sequence.i \
- $(TAO_ROOT)/tao/typecode.i \
- $(TAO_ROOT)/tao/any.i \
- $(TAO_ROOT)/tao/cdr.i \
- $(TAO_ROOT)/tao/stub.i \
- $(TAO_ROOT)/tao/object.i \
- $(TAO_ROOT)/tao/orbobj.i \
- $(TAO_ROOT)/tao/marshal.i \
- $(TAO_ROOT)/tao/poa.i \
- $(TAO_ROOT)/tao/giop.i \
- $(TAO_ROOT)/tao/iioporb.i \
- $(TAO_ROOT)/tao/iiopobj.i \
- $(TAO_ROOT)/tao/managed_types.i \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/server_factory.i \
- $(TAO_ROOT)/tao/default_client.i \
- $(TAO_ROOT)/tao/default_server.i \
- $(TAO_ROOT)/tao/connect.i \
- $(TAO_ROOT)/tao/singletons.h
-.obj/deep_copy.o .shobj/deep_copy.so: deep_copy.cpp \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/stdcpp.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/Task_T.i \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Svc_Handler.i \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(TAO_ROOT)/tao/orbconf.h \
- $(TAO_ROOT)/tao/orb.h \
- $(TAO_ROOT)/tao/corbacom.h \
- $(TAO_ROOT)/tao/object.h \
- $(TAO_ROOT)/tao/align.h \
- $(TAO_ROOT)/tao/sequence.h \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/any.h \
- $(TAO_ROOT)/tao/poa.h \
- $(TAO_ROOT)/tao/tao_internals.h \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/client_factory.h \
- $(TAO_ROOT)/tao/server_factory.h \
- $(TAO_ROOT)/tao/default_client.h \
- $(TAO_ROOT)/tao/default_server.h \
- $(TAO_ROOT)/tao/except.h \
- $(TAO_ROOT)/tao/orbobj.h \
- $(TAO_ROOT)/tao/nvlist.h \
- $(TAO_ROOT)/tao/principa.h \
- $(TAO_ROOT)/tao/request.h \
- $(TAO_ROOT)/tao/svrrqst.h \
- $(TAO_ROOT)/tao/typecode.h \
- $(TAO_ROOT)/tao/marshal.h \
- $(TAO_ROOT)/tao/cdr.h \
- $(TAO_ROOT)/tao/stub.h \
- $(TAO_ROOT)/tao/connect.h \
- $(TAO_ROOT)/tao/orb_core.h \
- $(TAO_ROOT)/tao/objtable.h \
- $(TAO_ROOT)/tao/optable.h \
- $(TAO_ROOT)/tao/debug.h \
- $(TAO_ROOT)/tao/managed_types.h \
- $(TAO_ROOT)/tao/iiopobj.h \
- $(TAO_ROOT)/tao/iioporb.h \
- $(TAO_ROOT)/tao/giop.h \
- $(TAO_ROOT)/tao/orb_core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(TAO_ROOT)/tao/corbacom.i \
- $(TAO_ROOT)/tao/sequence.i \
- $(TAO_ROOT)/tao/typecode.i \
- $(TAO_ROOT)/tao/any.i \
- $(TAO_ROOT)/tao/cdr.i \
- $(TAO_ROOT)/tao/stub.i \
- $(TAO_ROOT)/tao/object.i \
- $(TAO_ROOT)/tao/orbobj.i \
- $(TAO_ROOT)/tao/marshal.i \
- $(TAO_ROOT)/tao/poa.i \
- $(TAO_ROOT)/tao/giop.i \
- $(TAO_ROOT)/tao/iioporb.i \
- $(TAO_ROOT)/tao/iiopobj.i \
- $(TAO_ROOT)/tao/managed_types.i \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/server_factory.i \
- $(TAO_ROOT)/tao/default_client.i \
- $(TAO_ROOT)/tao/default_server.i \
- $(TAO_ROOT)/tao/connect.i \
- $(TAO_ROOT)/tao/singletons.h
-.obj/deep_free.o .shobj/deep_free.so: deep_free.cpp \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/stdcpp.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/Task_T.i \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Svc_Handler.i \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(TAO_ROOT)/tao/orbconf.h \
- $(TAO_ROOT)/tao/orb.h \
- $(TAO_ROOT)/tao/corbacom.h \
- $(TAO_ROOT)/tao/object.h \
- $(TAO_ROOT)/tao/align.h \
- $(TAO_ROOT)/tao/sequence.h \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/any.h \
- $(TAO_ROOT)/tao/poa.h \
- $(TAO_ROOT)/tao/tao_internals.h \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/client_factory.h \
- $(TAO_ROOT)/tao/server_factory.h \
- $(TAO_ROOT)/tao/default_client.h \
- $(TAO_ROOT)/tao/default_server.h \
- $(TAO_ROOT)/tao/except.h \
- $(TAO_ROOT)/tao/orbobj.h \
- $(TAO_ROOT)/tao/nvlist.h \
- $(TAO_ROOT)/tao/principa.h \
- $(TAO_ROOT)/tao/request.h \
- $(TAO_ROOT)/tao/svrrqst.h \
- $(TAO_ROOT)/tao/typecode.h \
- $(TAO_ROOT)/tao/marshal.h \
- $(TAO_ROOT)/tao/cdr.h \
- $(TAO_ROOT)/tao/stub.h \
- $(TAO_ROOT)/tao/connect.h \
- $(TAO_ROOT)/tao/orb_core.h \
- $(TAO_ROOT)/tao/objtable.h \
- $(TAO_ROOT)/tao/optable.h \
- $(TAO_ROOT)/tao/debug.h \
- $(TAO_ROOT)/tao/managed_types.h \
- $(TAO_ROOT)/tao/iiopobj.h \
- $(TAO_ROOT)/tao/iioporb.h \
- $(TAO_ROOT)/tao/giop.h \
- $(TAO_ROOT)/tao/orb_core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(TAO_ROOT)/tao/corbacom.i \
- $(TAO_ROOT)/tao/sequence.i \
- $(TAO_ROOT)/tao/typecode.i \
- $(TAO_ROOT)/tao/any.i \
- $(TAO_ROOT)/tao/cdr.i \
- $(TAO_ROOT)/tao/stub.i \
- $(TAO_ROOT)/tao/object.i \
- $(TAO_ROOT)/tao/orbobj.i \
- $(TAO_ROOT)/tao/marshal.i \
- $(TAO_ROOT)/tao/poa.i \
- $(TAO_ROOT)/tao/giop.i \
- $(TAO_ROOT)/tao/iioporb.i \
- $(TAO_ROOT)/tao/iiopobj.i \
- $(TAO_ROOT)/tao/managed_types.i \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/server_factory.i \
- $(TAO_ROOT)/tao/default_client.i \
- $(TAO_ROOT)/tao/default_server.i \
- $(TAO_ROOT)/tao/connect.i \
- $(TAO_ROOT)/tao/singletons.h
-.obj/tao_internals.o .shobj/tao_internals.so: tao_internals.cpp \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/stdcpp.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/Task_T.i \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Svc_Handler.i \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(TAO_ROOT)/tao/orbconf.h \
- $(TAO_ROOT)/tao/orb.h \
- $(TAO_ROOT)/tao/corbacom.h \
- $(TAO_ROOT)/tao/object.h \
- $(TAO_ROOT)/tao/align.h \
- $(TAO_ROOT)/tao/sequence.h \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/any.h \
- $(TAO_ROOT)/tao/poa.h \
- $(TAO_ROOT)/tao/tao_internals.h \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/client_factory.h \
- $(TAO_ROOT)/tao/server_factory.h \
- $(TAO_ROOT)/tao/default_client.h \
- $(TAO_ROOT)/tao/default_server.h \
- $(TAO_ROOT)/tao/except.h \
- $(TAO_ROOT)/tao/orbobj.h \
- $(TAO_ROOT)/tao/nvlist.h \
- $(TAO_ROOT)/tao/principa.h \
- $(TAO_ROOT)/tao/request.h \
- $(TAO_ROOT)/tao/svrrqst.h \
- $(TAO_ROOT)/tao/typecode.h \
- $(TAO_ROOT)/tao/marshal.h \
- $(TAO_ROOT)/tao/cdr.h \
- $(TAO_ROOT)/tao/stub.h \
- $(TAO_ROOT)/tao/connect.h \
- $(TAO_ROOT)/tao/orb_core.h \
- $(TAO_ROOT)/tao/objtable.h \
- $(TAO_ROOT)/tao/optable.h \
- $(TAO_ROOT)/tao/debug.h \
- $(TAO_ROOT)/tao/managed_types.h \
- $(TAO_ROOT)/tao/iiopobj.h \
- $(TAO_ROOT)/tao/iioporb.h \
- $(TAO_ROOT)/tao/giop.h \
- $(TAO_ROOT)/tao/orb_core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(TAO_ROOT)/tao/corbacom.i \
- $(TAO_ROOT)/tao/sequence.i \
- $(TAO_ROOT)/tao/typecode.i \
- $(TAO_ROOT)/tao/any.i \
- $(TAO_ROOT)/tao/cdr.i \
- $(TAO_ROOT)/tao/stub.i \
- $(TAO_ROOT)/tao/object.i \
- $(TAO_ROOT)/tao/orbobj.i \
- $(TAO_ROOT)/tao/marshal.i \
- $(TAO_ROOT)/tao/poa.i \
- $(TAO_ROOT)/tao/giop.i \
- $(TAO_ROOT)/tao/iioporb.i \
- $(TAO_ROOT)/tao/iiopobj.i \
- $(TAO_ROOT)/tao/managed_types.i \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/server_factory.i \
- $(TAO_ROOT)/tao/default_client.i \
- $(TAO_ROOT)/tao/default_server.i \
- $(TAO_ROOT)/tao/connect.i \
- $(TAO_ROOT)/tao/singletons.h
-.obj/managed_types.o .shobj/managed_types.so: managed_types.cpp \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/stdcpp.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/Task_T.i \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Svc_Handler.i \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(TAO_ROOT)/tao/orbconf.h \
- $(TAO_ROOT)/tao/orb.h \
- $(TAO_ROOT)/tao/corbacom.h \
- $(TAO_ROOT)/tao/object.h \
- $(TAO_ROOT)/tao/align.h \
- $(TAO_ROOT)/tao/sequence.h \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/any.h \
- $(TAO_ROOT)/tao/poa.h \
- $(TAO_ROOT)/tao/tao_internals.h \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/client_factory.h \
- $(TAO_ROOT)/tao/server_factory.h \
- $(TAO_ROOT)/tao/default_client.h \
- $(TAO_ROOT)/tao/default_server.h \
- $(TAO_ROOT)/tao/except.h \
- $(TAO_ROOT)/tao/orbobj.h \
- $(TAO_ROOT)/tao/nvlist.h \
- $(TAO_ROOT)/tao/principa.h \
- $(TAO_ROOT)/tao/request.h \
- $(TAO_ROOT)/tao/svrrqst.h \
- $(TAO_ROOT)/tao/typecode.h \
- $(TAO_ROOT)/tao/marshal.h \
- $(TAO_ROOT)/tao/cdr.h \
- $(TAO_ROOT)/tao/stub.h \
- $(TAO_ROOT)/tao/connect.h \
- $(TAO_ROOT)/tao/orb_core.h \
- $(TAO_ROOT)/tao/objtable.h \
- $(TAO_ROOT)/tao/optable.h \
- $(TAO_ROOT)/tao/debug.h \
- $(TAO_ROOT)/tao/managed_types.h \
- $(TAO_ROOT)/tao/iiopobj.h \
- $(TAO_ROOT)/tao/iioporb.h \
- $(TAO_ROOT)/tao/giop.h \
- $(TAO_ROOT)/tao/orb_core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(TAO_ROOT)/tao/corbacom.i \
- $(TAO_ROOT)/tao/sequence.i \
- $(TAO_ROOT)/tao/typecode.i \
- $(TAO_ROOT)/tao/any.i \
- $(TAO_ROOT)/tao/cdr.i \
- $(TAO_ROOT)/tao/stub.i \
- $(TAO_ROOT)/tao/object.i \
- $(TAO_ROOT)/tao/orbobj.i \
- $(TAO_ROOT)/tao/marshal.i \
- $(TAO_ROOT)/tao/poa.i \
- $(TAO_ROOT)/tao/giop.i \
- $(TAO_ROOT)/tao/iioporb.i \
- $(TAO_ROOT)/tao/iiopobj.i \
- $(TAO_ROOT)/tao/managed_types.i \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/server_factory.i \
- $(TAO_ROOT)/tao/default_client.i \
- $(TAO_ROOT)/tao/default_server.i \
- $(TAO_ROOT)/tao/connect.i \
- $(TAO_ROOT)/tao/singletons.h
-.obj/tc_const.o .shobj/tc_const.so: tc_const.cpp \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/stdcpp.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/Task_T.i \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Svc_Handler.i \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(TAO_ROOT)/tao/orbconf.h \
- $(TAO_ROOT)/tao/orb.h \
- $(TAO_ROOT)/tao/corbacom.h \
- $(TAO_ROOT)/tao/object.h \
- $(TAO_ROOT)/tao/align.h \
- $(TAO_ROOT)/tao/sequence.h \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/any.h \
- $(TAO_ROOT)/tao/poa.h \
- $(TAO_ROOT)/tao/tao_internals.h \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/client_factory.h \
- $(TAO_ROOT)/tao/server_factory.h \
- $(TAO_ROOT)/tao/default_client.h \
- $(TAO_ROOT)/tao/default_server.h \
- $(TAO_ROOT)/tao/except.h \
- $(TAO_ROOT)/tao/orbobj.h \
- $(TAO_ROOT)/tao/nvlist.h \
- $(TAO_ROOT)/tao/principa.h \
- $(TAO_ROOT)/tao/request.h \
- $(TAO_ROOT)/tao/svrrqst.h \
- $(TAO_ROOT)/tao/typecode.h \
- $(TAO_ROOT)/tao/marshal.h \
- $(TAO_ROOT)/tao/cdr.h \
- $(TAO_ROOT)/tao/stub.h \
- $(TAO_ROOT)/tao/connect.h \
- $(TAO_ROOT)/tao/orb_core.h \
- $(TAO_ROOT)/tao/objtable.h \
- $(TAO_ROOT)/tao/optable.h \
- $(TAO_ROOT)/tao/debug.h \
- $(TAO_ROOT)/tao/managed_types.h \
- $(TAO_ROOT)/tao/iiopobj.h \
- $(TAO_ROOT)/tao/iioporb.h \
- $(TAO_ROOT)/tao/giop.h \
- $(TAO_ROOT)/tao/orb_core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(TAO_ROOT)/tao/corbacom.i \
- $(TAO_ROOT)/tao/sequence.i \
- $(TAO_ROOT)/tao/typecode.i \
- $(TAO_ROOT)/tao/any.i \
- $(TAO_ROOT)/tao/cdr.i \
- $(TAO_ROOT)/tao/stub.i \
- $(TAO_ROOT)/tao/object.i \
- $(TAO_ROOT)/tao/orbobj.i \
- $(TAO_ROOT)/tao/marshal.i \
- $(TAO_ROOT)/tao/poa.i \
- $(TAO_ROOT)/tao/giop.i \
- $(TAO_ROOT)/tao/iioporb.i \
- $(TAO_ROOT)/tao/iiopobj.i \
- $(TAO_ROOT)/tao/managed_types.i \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/server_factory.i \
- $(TAO_ROOT)/tao/default_client.i \
- $(TAO_ROOT)/tao/default_server.i \
- $(TAO_ROOT)/tao/connect.i \
- $(TAO_ROOT)/tao/singletons.h
-.obj/any.o .shobj/any.so: any.cpp \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/stdcpp.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/Task_T.i \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Svc_Handler.i \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(TAO_ROOT)/tao/orbconf.h \
- $(TAO_ROOT)/tao/orb.h \
- $(TAO_ROOT)/tao/corbacom.h \
- $(TAO_ROOT)/tao/object.h \
- $(TAO_ROOT)/tao/align.h \
- $(TAO_ROOT)/tao/sequence.h \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/any.h \
- $(TAO_ROOT)/tao/poa.h \
- $(TAO_ROOT)/tao/tao_internals.h \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/client_factory.h \
- $(TAO_ROOT)/tao/server_factory.h \
- $(TAO_ROOT)/tao/default_client.h \
- $(TAO_ROOT)/tao/default_server.h \
- $(TAO_ROOT)/tao/except.h \
- $(TAO_ROOT)/tao/orbobj.h \
- $(TAO_ROOT)/tao/nvlist.h \
- $(TAO_ROOT)/tao/principa.h \
- $(TAO_ROOT)/tao/request.h \
- $(TAO_ROOT)/tao/svrrqst.h \
- $(TAO_ROOT)/tao/typecode.h \
- $(TAO_ROOT)/tao/marshal.h \
- $(TAO_ROOT)/tao/cdr.h \
- $(TAO_ROOT)/tao/stub.h \
- $(TAO_ROOT)/tao/connect.h \
- $(TAO_ROOT)/tao/orb_core.h \
- $(TAO_ROOT)/tao/objtable.h \
- $(TAO_ROOT)/tao/optable.h \
- $(TAO_ROOT)/tao/debug.h \
- $(TAO_ROOT)/tao/managed_types.h \
- $(TAO_ROOT)/tao/iiopobj.h \
- $(TAO_ROOT)/tao/iioporb.h \
- $(TAO_ROOT)/tao/giop.h \
- $(TAO_ROOT)/tao/orb_core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(TAO_ROOT)/tao/corbacom.i \
- $(TAO_ROOT)/tao/sequence.i \
- $(TAO_ROOT)/tao/typecode.i \
- $(TAO_ROOT)/tao/any.i \
- $(TAO_ROOT)/tao/cdr.i \
- $(TAO_ROOT)/tao/stub.i \
- $(TAO_ROOT)/tao/object.i \
- $(TAO_ROOT)/tao/orbobj.i \
- $(TAO_ROOT)/tao/marshal.i \
- $(TAO_ROOT)/tao/poa.i \
- $(TAO_ROOT)/tao/giop.i \
- $(TAO_ROOT)/tao/iioporb.i \
- $(TAO_ROOT)/tao/iiopobj.i \
- $(TAO_ROOT)/tao/managed_types.i \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/server_factory.i \
- $(TAO_ROOT)/tao/default_client.i \
- $(TAO_ROOT)/tao/default_server.i \
- $(TAO_ROOT)/tao/connect.i \
- $(TAO_ROOT)/tao/singletons.h
-.obj/corbacom.o .shobj/corbacom.so: corbacom.cpp \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/stdcpp.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/Task_T.i \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Svc_Handler.i \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(TAO_ROOT)/tao/orbconf.h \
- $(TAO_ROOT)/tao/orb.h \
- $(TAO_ROOT)/tao/corbacom.h \
- $(TAO_ROOT)/tao/object.h \
- $(TAO_ROOT)/tao/align.h \
- $(TAO_ROOT)/tao/sequence.h \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/any.h \
- $(TAO_ROOT)/tao/poa.h \
- $(TAO_ROOT)/tao/tao_internals.h \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/client_factory.h \
- $(TAO_ROOT)/tao/server_factory.h \
- $(TAO_ROOT)/tao/default_client.h \
- $(TAO_ROOT)/tao/default_server.h \
- $(TAO_ROOT)/tao/except.h \
- $(TAO_ROOT)/tao/orbobj.h \
- $(TAO_ROOT)/tao/nvlist.h \
- $(TAO_ROOT)/tao/principa.h \
- $(TAO_ROOT)/tao/request.h \
- $(TAO_ROOT)/tao/svrrqst.h \
- $(TAO_ROOT)/tao/typecode.h \
- $(TAO_ROOT)/tao/marshal.h \
- $(TAO_ROOT)/tao/cdr.h \
- $(TAO_ROOT)/tao/stub.h \
- $(TAO_ROOT)/tao/connect.h \
- $(TAO_ROOT)/tao/orb_core.h \
- $(TAO_ROOT)/tao/objtable.h \
- $(TAO_ROOT)/tao/optable.h \
- $(TAO_ROOT)/tao/debug.h \
- $(TAO_ROOT)/tao/managed_types.h \
- $(TAO_ROOT)/tao/iiopobj.h \
- $(TAO_ROOT)/tao/iioporb.h \
- $(TAO_ROOT)/tao/giop.h \
- $(TAO_ROOT)/tao/orb_core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(TAO_ROOT)/tao/corbacom.i \
- $(TAO_ROOT)/tao/sequence.i \
- $(TAO_ROOT)/tao/typecode.i \
- $(TAO_ROOT)/tao/any.i \
- $(TAO_ROOT)/tao/cdr.i \
- $(TAO_ROOT)/tao/stub.i \
- $(TAO_ROOT)/tao/object.i \
- $(TAO_ROOT)/tao/orbobj.i \
- $(TAO_ROOT)/tao/marshal.i \
- $(TAO_ROOT)/tao/poa.i \
- $(TAO_ROOT)/tao/giop.i \
- $(TAO_ROOT)/tao/iioporb.i \
- $(TAO_ROOT)/tao/iiopobj.i \
- $(TAO_ROOT)/tao/managed_types.i \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/server_factory.i \
- $(TAO_ROOT)/tao/default_client.i \
- $(TAO_ROOT)/tao/default_server.i \
- $(TAO_ROOT)/tao/connect.i \
- $(TAO_ROOT)/tao/singletons.h
-.obj/except.o .shobj/except.so: except.cpp \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/stdcpp.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/Task_T.i \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Svc_Handler.i \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(TAO_ROOT)/tao/orbconf.h \
- $(TAO_ROOT)/tao/orb.h \
- $(TAO_ROOT)/tao/corbacom.h \
- $(TAO_ROOT)/tao/object.h \
- $(TAO_ROOT)/tao/align.h \
- $(TAO_ROOT)/tao/sequence.h \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/any.h \
- $(TAO_ROOT)/tao/poa.h \
- $(TAO_ROOT)/tao/tao_internals.h \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/client_factory.h \
- $(TAO_ROOT)/tao/server_factory.h \
- $(TAO_ROOT)/tao/default_client.h \
- $(TAO_ROOT)/tao/default_server.h \
- $(TAO_ROOT)/tao/except.h \
- $(TAO_ROOT)/tao/orbobj.h \
- $(TAO_ROOT)/tao/nvlist.h \
- $(TAO_ROOT)/tao/principa.h \
- $(TAO_ROOT)/tao/request.h \
- $(TAO_ROOT)/tao/svrrqst.h \
- $(TAO_ROOT)/tao/typecode.h \
- $(TAO_ROOT)/tao/marshal.h \
- $(TAO_ROOT)/tao/cdr.h \
- $(TAO_ROOT)/tao/stub.h \
- $(TAO_ROOT)/tao/connect.h \
- $(TAO_ROOT)/tao/orb_core.h \
- $(TAO_ROOT)/tao/objtable.h \
- $(TAO_ROOT)/tao/optable.h \
- $(TAO_ROOT)/tao/debug.h \
- $(TAO_ROOT)/tao/managed_types.h \
- $(TAO_ROOT)/tao/iiopobj.h \
- $(TAO_ROOT)/tao/iioporb.h \
- $(TAO_ROOT)/tao/giop.h \
- $(TAO_ROOT)/tao/orb_core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(TAO_ROOT)/tao/corbacom.i \
- $(TAO_ROOT)/tao/sequence.i \
- $(TAO_ROOT)/tao/typecode.i \
- $(TAO_ROOT)/tao/any.i \
- $(TAO_ROOT)/tao/cdr.i \
- $(TAO_ROOT)/tao/stub.i \
- $(TAO_ROOT)/tao/object.i \
- $(TAO_ROOT)/tao/orbobj.i \
- $(TAO_ROOT)/tao/marshal.i \
- $(TAO_ROOT)/tao/poa.i \
- $(TAO_ROOT)/tao/giop.i \
- $(TAO_ROOT)/tao/iioporb.i \
- $(TAO_ROOT)/tao/iiopobj.i \
- $(TAO_ROOT)/tao/managed_types.i \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/server_factory.i \
- $(TAO_ROOT)/tao/default_client.i \
- $(TAO_ROOT)/tao/default_server.i \
- $(TAO_ROOT)/tao/connect.i \
- $(TAO_ROOT)/tao/singletons.h
-.obj/nvlist.o .shobj/nvlist.so: nvlist.cpp \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/stdcpp.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/Task_T.i \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Svc_Handler.i \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(TAO_ROOT)/tao/orbconf.h \
- $(TAO_ROOT)/tao/orb.h \
- $(TAO_ROOT)/tao/corbacom.h \
- $(TAO_ROOT)/tao/object.h \
- $(TAO_ROOT)/tao/align.h \
- $(TAO_ROOT)/tao/sequence.h \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/any.h \
- $(TAO_ROOT)/tao/poa.h \
- $(TAO_ROOT)/tao/tao_internals.h \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/client_factory.h \
- $(TAO_ROOT)/tao/server_factory.h \
- $(TAO_ROOT)/tao/default_client.h \
- $(TAO_ROOT)/tao/default_server.h \
- $(TAO_ROOT)/tao/except.h \
- $(TAO_ROOT)/tao/orbobj.h \
- $(TAO_ROOT)/tao/nvlist.h \
- $(TAO_ROOT)/tao/principa.h \
- $(TAO_ROOT)/tao/request.h \
- $(TAO_ROOT)/tao/svrrqst.h \
- $(TAO_ROOT)/tao/typecode.h \
- $(TAO_ROOT)/tao/marshal.h \
- $(TAO_ROOT)/tao/cdr.h \
- $(TAO_ROOT)/tao/stub.h \
- $(TAO_ROOT)/tao/connect.h \
- $(TAO_ROOT)/tao/orb_core.h \
- $(TAO_ROOT)/tao/objtable.h \
- $(TAO_ROOT)/tao/optable.h \
- $(TAO_ROOT)/tao/debug.h \
- $(TAO_ROOT)/tao/managed_types.h \
- $(TAO_ROOT)/tao/iiopobj.h \
- $(TAO_ROOT)/tao/iioporb.h \
- $(TAO_ROOT)/tao/giop.h \
- $(TAO_ROOT)/tao/orb_core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(TAO_ROOT)/tao/corbacom.i \
- $(TAO_ROOT)/tao/sequence.i \
- $(TAO_ROOT)/tao/typecode.i \
- $(TAO_ROOT)/tao/any.i \
- $(TAO_ROOT)/tao/cdr.i \
- $(TAO_ROOT)/tao/stub.i \
- $(TAO_ROOT)/tao/object.i \
- $(TAO_ROOT)/tao/orbobj.i \
- $(TAO_ROOT)/tao/marshal.i \
- $(TAO_ROOT)/tao/poa.i \
- $(TAO_ROOT)/tao/giop.i \
- $(TAO_ROOT)/tao/iioporb.i \
- $(TAO_ROOT)/tao/iiopobj.i \
- $(TAO_ROOT)/tao/managed_types.i \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/server_factory.i \
- $(TAO_ROOT)/tao/default_client.i \
- $(TAO_ROOT)/tao/default_server.i \
- $(TAO_ROOT)/tao/connect.i \
- $(TAO_ROOT)/tao/singletons.h
-.obj/object.o .shobj/object.so: object.cpp \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/stdcpp.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/Task_T.i \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Svc_Handler.i \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(TAO_ROOT)/tao/orbconf.h \
- $(TAO_ROOT)/tao/orb.h \
- $(TAO_ROOT)/tao/corbacom.h \
- $(TAO_ROOT)/tao/object.h \
- $(TAO_ROOT)/tao/align.h \
- $(TAO_ROOT)/tao/sequence.h \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/any.h \
- $(TAO_ROOT)/tao/poa.h \
- $(TAO_ROOT)/tao/tao_internals.h \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/client_factory.h \
- $(TAO_ROOT)/tao/server_factory.h \
- $(TAO_ROOT)/tao/default_client.h \
- $(TAO_ROOT)/tao/default_server.h \
- $(TAO_ROOT)/tao/except.h \
- $(TAO_ROOT)/tao/orbobj.h \
- $(TAO_ROOT)/tao/nvlist.h \
- $(TAO_ROOT)/tao/principa.h \
- $(TAO_ROOT)/tao/request.h \
- $(TAO_ROOT)/tao/svrrqst.h \
- $(TAO_ROOT)/tao/typecode.h \
- $(TAO_ROOT)/tao/marshal.h \
- $(TAO_ROOT)/tao/cdr.h \
- $(TAO_ROOT)/tao/stub.h \
- $(TAO_ROOT)/tao/connect.h \
- $(TAO_ROOT)/tao/orb_core.h \
- $(TAO_ROOT)/tao/objtable.h \
- $(TAO_ROOT)/tao/optable.h \
- $(TAO_ROOT)/tao/debug.h \
- $(TAO_ROOT)/tao/managed_types.h \
- $(TAO_ROOT)/tao/iiopobj.h \
- $(TAO_ROOT)/tao/iioporb.h \
- $(TAO_ROOT)/tao/giop.h \
- $(TAO_ROOT)/tao/orb_core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(TAO_ROOT)/tao/corbacom.i \
- $(TAO_ROOT)/tao/sequence.i \
- $(TAO_ROOT)/tao/typecode.i \
- $(TAO_ROOT)/tao/any.i \
- $(TAO_ROOT)/tao/cdr.i \
- $(TAO_ROOT)/tao/stub.i \
- $(TAO_ROOT)/tao/object.i \
- $(TAO_ROOT)/tao/orbobj.i \
- $(TAO_ROOT)/tao/marshal.i \
- $(TAO_ROOT)/tao/poa.i \
- $(TAO_ROOT)/tao/giop.i \
- $(TAO_ROOT)/tao/iioporb.i \
- $(TAO_ROOT)/tao/iiopobj.i \
- $(TAO_ROOT)/tao/managed_types.i \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/server_factory.i \
- $(TAO_ROOT)/tao/default_client.i \
- $(TAO_ROOT)/tao/default_server.i \
- $(TAO_ROOT)/tao/connect.i \
- $(TAO_ROOT)/tao/singletons.h
-.obj/orbobj.o .shobj/orbobj.so: orbobj.cpp \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/stdcpp.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/Task_T.i \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Svc_Handler.i \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(TAO_ROOT)/tao/orbconf.h \
- $(TAO_ROOT)/tao/orb.h \
- $(TAO_ROOT)/tao/corbacom.h \
- $(TAO_ROOT)/tao/object.h \
- $(TAO_ROOT)/tao/align.h \
- $(TAO_ROOT)/tao/sequence.h \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/any.h \
- $(TAO_ROOT)/tao/poa.h \
- $(TAO_ROOT)/tao/tao_internals.h \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/client_factory.h \
- $(TAO_ROOT)/tao/server_factory.h \
- $(TAO_ROOT)/tao/default_client.h \
- $(TAO_ROOT)/tao/default_server.h \
- $(TAO_ROOT)/tao/except.h \
- $(TAO_ROOT)/tao/orbobj.h \
- $(TAO_ROOT)/tao/nvlist.h \
- $(TAO_ROOT)/tao/principa.h \
- $(TAO_ROOT)/tao/request.h \
- $(TAO_ROOT)/tao/svrrqst.h \
- $(TAO_ROOT)/tao/typecode.h \
- $(TAO_ROOT)/tao/marshal.h \
- $(TAO_ROOT)/tao/cdr.h \
- $(TAO_ROOT)/tao/stub.h \
- $(TAO_ROOT)/tao/connect.h \
- $(TAO_ROOT)/tao/orb_core.h \
- $(TAO_ROOT)/tao/objtable.h \
- $(TAO_ROOT)/tao/optable.h \
- $(TAO_ROOT)/tao/debug.h \
- $(TAO_ROOT)/tao/managed_types.h \
- $(TAO_ROOT)/tao/iiopobj.h \
- $(TAO_ROOT)/tao/iioporb.h \
- $(TAO_ROOT)/tao/giop.h \
- $(TAO_ROOT)/tao/orb_core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(TAO_ROOT)/tao/corbacom.i \
- $(TAO_ROOT)/tao/sequence.i \
- $(TAO_ROOT)/tao/typecode.i \
- $(TAO_ROOT)/tao/any.i \
- $(TAO_ROOT)/tao/cdr.i \
- $(TAO_ROOT)/tao/stub.i \
- $(TAO_ROOT)/tao/object.i \
- $(TAO_ROOT)/tao/orbobj.i \
- $(TAO_ROOT)/tao/marshal.i \
- $(TAO_ROOT)/tao/poa.i \
- $(TAO_ROOT)/tao/giop.i \
- $(TAO_ROOT)/tao/iioporb.i \
- $(TAO_ROOT)/tao/iiopobj.i \
- $(TAO_ROOT)/tao/managed_types.i \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/server_factory.i \
- $(TAO_ROOT)/tao/default_client.i \
- $(TAO_ROOT)/tao/default_server.i \
- $(TAO_ROOT)/tao/connect.i \
- $(TAO_ROOT)/tao/singletons.h \
- $(ACE_ROOT)/ace/Service_Repository.h \
- $(ACE_ROOT)/ace/Service_Types.h \
- $(ACE_ROOT)/ace/Service_Types.i \
- $(ACE_ROOT)/ace/Service_Repository.i \
- $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.h \
- $(ACE_ROOT)/ace/SOCK_Dgram.h \
- $(ACE_ROOT)/ace/SOCK_Dgram.i \
- $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.i
-.obj/principa.o .shobj/principa.so: principa.cpp \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/stdcpp.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/Task_T.i \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Svc_Handler.i \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(TAO_ROOT)/tao/orbconf.h \
- $(TAO_ROOT)/tao/orb.h \
- $(TAO_ROOT)/tao/corbacom.h \
- $(TAO_ROOT)/tao/object.h \
- $(TAO_ROOT)/tao/align.h \
- $(TAO_ROOT)/tao/sequence.h \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/any.h \
- $(TAO_ROOT)/tao/poa.h \
- $(TAO_ROOT)/tao/tao_internals.h \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/client_factory.h \
- $(TAO_ROOT)/tao/server_factory.h \
- $(TAO_ROOT)/tao/default_client.h \
- $(TAO_ROOT)/tao/default_server.h \
- $(TAO_ROOT)/tao/except.h \
- $(TAO_ROOT)/tao/orbobj.h \
- $(TAO_ROOT)/tao/nvlist.h \
- $(TAO_ROOT)/tao/principa.h \
- $(TAO_ROOT)/tao/request.h \
- $(TAO_ROOT)/tao/svrrqst.h \
- $(TAO_ROOT)/tao/typecode.h \
- $(TAO_ROOT)/tao/marshal.h \
- $(TAO_ROOT)/tao/cdr.h \
- $(TAO_ROOT)/tao/stub.h \
- $(TAO_ROOT)/tao/connect.h \
- $(TAO_ROOT)/tao/orb_core.h \
- $(TAO_ROOT)/tao/objtable.h \
- $(TAO_ROOT)/tao/optable.h \
- $(TAO_ROOT)/tao/debug.h \
- $(TAO_ROOT)/tao/managed_types.h \
- $(TAO_ROOT)/tao/iiopobj.h \
- $(TAO_ROOT)/tao/iioporb.h \
- $(TAO_ROOT)/tao/giop.h \
- $(TAO_ROOT)/tao/orb_core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(TAO_ROOT)/tao/corbacom.i \
- $(TAO_ROOT)/tao/sequence.i \
- $(TAO_ROOT)/tao/typecode.i \
- $(TAO_ROOT)/tao/any.i \
- $(TAO_ROOT)/tao/cdr.i \
- $(TAO_ROOT)/tao/stub.i \
- $(TAO_ROOT)/tao/object.i \
- $(TAO_ROOT)/tao/orbobj.i \
- $(TAO_ROOT)/tao/marshal.i \
- $(TAO_ROOT)/tao/poa.i \
- $(TAO_ROOT)/tao/giop.i \
- $(TAO_ROOT)/tao/iioporb.i \
- $(TAO_ROOT)/tao/iiopobj.i \
- $(TAO_ROOT)/tao/managed_types.i \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/server_factory.i \
- $(TAO_ROOT)/tao/default_client.i \
- $(TAO_ROOT)/tao/default_server.i \
- $(TAO_ROOT)/tao/connect.i \
- $(TAO_ROOT)/tao/singletons.h
-.obj/request.o .shobj/request.so: request.cpp \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/stdcpp.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/Task_T.i \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Svc_Handler.i \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(TAO_ROOT)/tao/orbconf.h \
- $(TAO_ROOT)/tao/orb.h \
- $(TAO_ROOT)/tao/corbacom.h \
- $(TAO_ROOT)/tao/object.h \
- $(TAO_ROOT)/tao/align.h \
- $(TAO_ROOT)/tao/sequence.h \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/any.h \
- $(TAO_ROOT)/tao/poa.h \
- $(TAO_ROOT)/tao/tao_internals.h \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/client_factory.h \
- $(TAO_ROOT)/tao/server_factory.h \
- $(TAO_ROOT)/tao/default_client.h \
- $(TAO_ROOT)/tao/default_server.h \
- $(TAO_ROOT)/tao/except.h \
- $(TAO_ROOT)/tao/orbobj.h \
- $(TAO_ROOT)/tao/nvlist.h \
- $(TAO_ROOT)/tao/principa.h \
- $(TAO_ROOT)/tao/request.h \
- $(TAO_ROOT)/tao/svrrqst.h \
- $(TAO_ROOT)/tao/typecode.h \
- $(TAO_ROOT)/tao/marshal.h \
- $(TAO_ROOT)/tao/cdr.h \
- $(TAO_ROOT)/tao/stub.h \
- $(TAO_ROOT)/tao/connect.h \
- $(TAO_ROOT)/tao/orb_core.h \
- $(TAO_ROOT)/tao/objtable.h \
- $(TAO_ROOT)/tao/optable.h \
- $(TAO_ROOT)/tao/debug.h \
- $(TAO_ROOT)/tao/managed_types.h \
- $(TAO_ROOT)/tao/iiopobj.h \
- $(TAO_ROOT)/tao/iioporb.h \
- $(TAO_ROOT)/tao/giop.h \
- $(TAO_ROOT)/tao/orb_core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(TAO_ROOT)/tao/corbacom.i \
- $(TAO_ROOT)/tao/sequence.i \
- $(TAO_ROOT)/tao/typecode.i \
- $(TAO_ROOT)/tao/any.i \
- $(TAO_ROOT)/tao/cdr.i \
- $(TAO_ROOT)/tao/stub.i \
- $(TAO_ROOT)/tao/object.i \
- $(TAO_ROOT)/tao/orbobj.i \
- $(TAO_ROOT)/tao/marshal.i \
- $(TAO_ROOT)/tao/poa.i \
- $(TAO_ROOT)/tao/giop.i \
- $(TAO_ROOT)/tao/iioporb.i \
- $(TAO_ROOT)/tao/iiopobj.i \
- $(TAO_ROOT)/tao/managed_types.i \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/server_factory.i \
- $(TAO_ROOT)/tao/default_client.i \
- $(TAO_ROOT)/tao/default_server.i \
- $(TAO_ROOT)/tao/connect.i \
- $(TAO_ROOT)/tao/singletons.h
-.obj/svrrqst.o .shobj/svrrqst.so: svrrqst.cpp \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/stdcpp.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/Task_T.i \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Svc_Handler.i \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(TAO_ROOT)/tao/orbconf.h \
- $(TAO_ROOT)/tao/orb.h \
- $(TAO_ROOT)/tao/corbacom.h \
- $(TAO_ROOT)/tao/object.h \
- $(TAO_ROOT)/tao/align.h \
- $(TAO_ROOT)/tao/sequence.h \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/any.h \
- $(TAO_ROOT)/tao/poa.h \
- $(TAO_ROOT)/tao/tao_internals.h \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/client_factory.h \
- $(TAO_ROOT)/tao/server_factory.h \
- $(TAO_ROOT)/tao/default_client.h \
- $(TAO_ROOT)/tao/default_server.h \
- $(TAO_ROOT)/tao/except.h \
- $(TAO_ROOT)/tao/orbobj.h \
- $(TAO_ROOT)/tao/nvlist.h \
- $(TAO_ROOT)/tao/principa.h \
- $(TAO_ROOT)/tao/request.h \
- $(TAO_ROOT)/tao/svrrqst.h \
- $(TAO_ROOT)/tao/typecode.h \
- $(TAO_ROOT)/tao/marshal.h \
- $(TAO_ROOT)/tao/cdr.h \
- $(TAO_ROOT)/tao/stub.h \
- $(TAO_ROOT)/tao/connect.h \
- $(TAO_ROOT)/tao/orb_core.h \
- $(TAO_ROOT)/tao/objtable.h \
- $(TAO_ROOT)/tao/optable.h \
- $(TAO_ROOT)/tao/debug.h \
- $(TAO_ROOT)/tao/managed_types.h \
- $(TAO_ROOT)/tao/iiopobj.h \
- $(TAO_ROOT)/tao/iioporb.h \
- $(TAO_ROOT)/tao/giop.h \
- $(TAO_ROOT)/tao/orb_core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(TAO_ROOT)/tao/corbacom.i \
- $(TAO_ROOT)/tao/sequence.i \
- $(TAO_ROOT)/tao/typecode.i \
- $(TAO_ROOT)/tao/any.i \
- $(TAO_ROOT)/tao/cdr.i \
- $(TAO_ROOT)/tao/stub.i \
- $(TAO_ROOT)/tao/object.i \
- $(TAO_ROOT)/tao/orbobj.i \
- $(TAO_ROOT)/tao/marshal.i \
- $(TAO_ROOT)/tao/poa.i \
- $(TAO_ROOT)/tao/giop.i \
- $(TAO_ROOT)/tao/iioporb.i \
- $(TAO_ROOT)/tao/iiopobj.i \
- $(TAO_ROOT)/tao/managed_types.i \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/server_factory.i \
- $(TAO_ROOT)/tao/default_client.i \
- $(TAO_ROOT)/tao/default_server.i \
- $(TAO_ROOT)/tao/connect.i \
- $(TAO_ROOT)/tao/singletons.h
-.obj/poa.o .shobj/poa.so: poa.cpp \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/stdcpp.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/Task_T.i \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Svc_Handler.i \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(TAO_ROOT)/tao/orbconf.h \
- $(TAO_ROOT)/tao/orb.h \
- $(TAO_ROOT)/tao/corbacom.h \
- $(TAO_ROOT)/tao/object.h \
- $(TAO_ROOT)/tao/align.h \
- $(TAO_ROOT)/tao/sequence.h \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/any.h \
- $(TAO_ROOT)/tao/poa.h \
- $(TAO_ROOT)/tao/tao_internals.h \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/client_factory.h \
- $(TAO_ROOT)/tao/server_factory.h \
- $(TAO_ROOT)/tao/default_client.h \
- $(TAO_ROOT)/tao/default_server.h \
- $(TAO_ROOT)/tao/except.h \
- $(TAO_ROOT)/tao/orbobj.h \
- $(TAO_ROOT)/tao/nvlist.h \
- $(TAO_ROOT)/tao/principa.h \
- $(TAO_ROOT)/tao/request.h \
- $(TAO_ROOT)/tao/svrrqst.h \
- $(TAO_ROOT)/tao/typecode.h \
- $(TAO_ROOT)/tao/marshal.h \
- $(TAO_ROOT)/tao/cdr.h \
- $(TAO_ROOT)/tao/stub.h \
- $(TAO_ROOT)/tao/connect.h \
- $(TAO_ROOT)/tao/orb_core.h \
- $(TAO_ROOT)/tao/objtable.h \
- $(TAO_ROOT)/tao/optable.h \
- $(TAO_ROOT)/tao/debug.h \
- $(TAO_ROOT)/tao/managed_types.h \
- $(TAO_ROOT)/tao/iiopobj.h \
- $(TAO_ROOT)/tao/iioporb.h \
- $(TAO_ROOT)/tao/giop.h \
- $(TAO_ROOT)/tao/orb_core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(TAO_ROOT)/tao/corbacom.i \
- $(TAO_ROOT)/tao/sequence.i \
- $(TAO_ROOT)/tao/typecode.i \
- $(TAO_ROOT)/tao/any.i \
- $(TAO_ROOT)/tao/cdr.i \
- $(TAO_ROOT)/tao/stub.i \
- $(TAO_ROOT)/tao/object.i \
- $(TAO_ROOT)/tao/orbobj.i \
- $(TAO_ROOT)/tao/marshal.i \
- $(TAO_ROOT)/tao/poa.i \
- $(TAO_ROOT)/tao/giop.i \
- $(TAO_ROOT)/tao/iioporb.i \
- $(TAO_ROOT)/tao/iiopobj.i \
- $(TAO_ROOT)/tao/managed_types.i \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/server_factory.i \
- $(TAO_ROOT)/tao/default_client.i \
- $(TAO_ROOT)/tao/default_server.i \
- $(TAO_ROOT)/tao/connect.i \
- $(TAO_ROOT)/tao/singletons.h
-.obj/typecode.o .shobj/typecode.so: typecode.cpp \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/stdcpp.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/Task_T.i \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Svc_Handler.i \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(TAO_ROOT)/tao/orbconf.h \
- $(TAO_ROOT)/tao/orb.h \
- $(TAO_ROOT)/tao/corbacom.h \
- $(TAO_ROOT)/tao/object.h \
- $(TAO_ROOT)/tao/align.h \
- $(TAO_ROOT)/tao/sequence.h \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/any.h \
- $(TAO_ROOT)/tao/poa.h \
- $(TAO_ROOT)/tao/tao_internals.h \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/client_factory.h \
- $(TAO_ROOT)/tao/server_factory.h \
- $(TAO_ROOT)/tao/default_client.h \
- $(TAO_ROOT)/tao/default_server.h \
- $(TAO_ROOT)/tao/except.h \
- $(TAO_ROOT)/tao/orbobj.h \
- $(TAO_ROOT)/tao/nvlist.h \
- $(TAO_ROOT)/tao/principa.h \
- $(TAO_ROOT)/tao/request.h \
- $(TAO_ROOT)/tao/svrrqst.h \
- $(TAO_ROOT)/tao/typecode.h \
- $(TAO_ROOT)/tao/marshal.h \
- $(TAO_ROOT)/tao/cdr.h \
- $(TAO_ROOT)/tao/stub.h \
- $(TAO_ROOT)/tao/connect.h \
- $(TAO_ROOT)/tao/orb_core.h \
- $(TAO_ROOT)/tao/objtable.h \
- $(TAO_ROOT)/tao/optable.h \
- $(TAO_ROOT)/tao/debug.h \
- $(TAO_ROOT)/tao/managed_types.h \
- $(TAO_ROOT)/tao/iiopobj.h \
- $(TAO_ROOT)/tao/iioporb.h \
- $(TAO_ROOT)/tao/giop.h \
- $(TAO_ROOT)/tao/orb_core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(TAO_ROOT)/tao/corbacom.i \
- $(TAO_ROOT)/tao/sequence.i \
- $(TAO_ROOT)/tao/typecode.i \
- $(TAO_ROOT)/tao/any.i \
- $(TAO_ROOT)/tao/cdr.i \
- $(TAO_ROOT)/tao/stub.i \
- $(TAO_ROOT)/tao/object.i \
- $(TAO_ROOT)/tao/orbobj.i \
- $(TAO_ROOT)/tao/marshal.i \
- $(TAO_ROOT)/tao/poa.i \
- $(TAO_ROOT)/tao/giop.i \
- $(TAO_ROOT)/tao/iioporb.i \
- $(TAO_ROOT)/tao/iiopobj.i \
- $(TAO_ROOT)/tao/managed_types.i \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/server_factory.i \
- $(TAO_ROOT)/tao/default_client.i \
- $(TAO_ROOT)/tao/default_server.i \
- $(TAO_ROOT)/tao/connect.i \
- $(TAO_ROOT)/tao/singletons.h
-
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/tao/TAO.dsp b/TAO/tao/TAO.dsp
deleted file mode 100644
index 910ab528dbd..00000000000
--- a/TAO/tao/TAO.dsp
+++ /dev/null
@@ -1,415 +0,0 @@
-# Microsoft Developer Studio Project File - Name="TAO" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 5.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102

-

-CFG=TAO - Win32 Release

-!MESSAGE This is not a valid makefile. To build this project using NMAKE,

-!MESSAGE use the Export Makefile command and run

-!MESSAGE 

-!MESSAGE NMAKE /f "TAO.mak".

-!MESSAGE 

-!MESSAGE You can specify a configuration when running NMAKE

-!MESSAGE by defining the macro CFG on the command line. For example:

-!MESSAGE 

-!MESSAGE NMAKE /f "TAO.mak" CFG="TAO - Win32 Release"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "TAO - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")

-!MESSAGE "TAO - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")

-!MESSAGE 

-

-# Begin Project

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-CPP=cl.exe

-MTL=midl.exe

-RSC=rc.exe

-

-!IF  "$(CFG)" == "TAO - Win32 Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir ".\Release"

-# PROP BASE Intermediate_Dir ".\Release"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir ""

-# PROP Intermediate_Dir ".\Release"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /I "..\\" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__IIOP_BUILD" /D "TAO_BUILD_DLL" /YX /FD /c

-# ADD BASE MTL /nologo /D "NDEBUG" /win32

-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386

-# ADD LINK32 ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386 /libpath:"..\..\ace"

-# SUBTRACT LINK32 /incremental:yes

-

-!ELSEIF  "$(CFG)" == "TAO - Win32 Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir ".\Debug"

-# PROP BASE Intermediate_Dir ".\Debug"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir ""

-# PROP Intermediate_Dir ".\Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /I "..\\" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "__IIOP_BUILD" /D "TAO_BUILD_DLL" /YX /FD /c

-# ADD BASE MTL /nologo /D "_DEBUG" /win32

-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386

-# ADD LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /libpath:"..\..\ace"

-

-!ENDIF 

-

-# Begin Target

-

-# Name "TAO - Win32 Release"

-# Name "TAO - Win32 Debug"

-# Begin Group "Source Files"

-

-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

-# Begin Source File

-

-SOURCE=.\any.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\arg_shifter.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\cdr.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\client_factory.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\connect.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\corbacom.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\debug.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\decode.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\deep_copy.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\deep_free.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\default_client.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\default_server.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\encode.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\except.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\giop.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\iiopobj.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\iioporb.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\interp.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\invoke.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\marshal.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\nvlist.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\object.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\objtable.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\optable.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\orb_core.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\orbobj.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\params.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\poa.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\principa.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\request.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\server_factory.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\svrrqst.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\tao_internals.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\tc_const.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\typecode.cpp

-# End Source File

-# End Group

-# Begin Group "Header Files"

-

-# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"

-# Begin Source File

-

-SOURCE=.\align.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\any.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\boa.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\cdr.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\connect.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\corbacom.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\debug.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\except.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\factories.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\giop.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\iiopobj.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\iioporb.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\marshal.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\nvlist.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\object.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\objtable.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\optable.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\orb.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\orbconf.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\orbobj.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\params.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\principa.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\request.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\roa.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\sequence.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\stub.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\svrrqst.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\typecode.h

-# End Source File

-# End Group

-# Begin Group "Include Files"

-

-# PROP Default_Filter "*.i"

-# Begin Source File

-

-SOURCE=.\any.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\boa.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\cdr.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\connect.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\factories.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\iiopobj.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\iioporb.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\marshal.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\object.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\orbobj.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\params.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\roa.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\svrrqst.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\typecode.i

-# End Source File

-# End Group

-# Begin Group "Resource Files"

-

-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe"

-# End Group

-# End Target

-# End Project

diff --git a/TAO/tao/TAO.dsw b/TAO/tao/TAO.dsw
deleted file mode 100644
index c6eef81be49..00000000000
--- a/TAO/tao/TAO.dsw
+++ /dev/null
@@ -1,29 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 5.00

-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!

-

-###############################################################################

-

-Project: "TAO"=.\TAO.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Global:

-

-Package=<5>

-{{{

-}}}

-

-Package=<3>

-{{{

-}}}

-

-###############################################################################

-

diff --git a/TAO/tao/TAO.mak b/TAO/tao/TAO.mak
deleted file mode 100644
index 47a45917467..00000000000
--- a/TAO/tao/TAO.mak
+++ /dev/null
@@ -1,13080 +0,0 @@
-# Microsoft Developer Studio Generated NMAKE File, Format Version 4.20

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102

-

-!IF "$(CFG)" == ""

-CFG=TAO - Win32 Debug

-!MESSAGE No configuration specified.  Defaulting to TAO - Win32 Debug.

-!ENDIF 

-

-!IF "$(CFG)" != "TAO - Win32 Release" && "$(CFG)" != "TAO - Win32 Debug"

-!MESSAGE Invalid configuration "$(CFG)" specified.

-!MESSAGE You can specify a configuration when running NMAKE on this makefile

-!MESSAGE by defining the macro CFG on the command line.  For example:

-!MESSAGE 

-!MESSAGE NMAKE /f "TAO.mak" CFG="TAO - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "TAO - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")

-!MESSAGE "TAO - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")

-!MESSAGE 

-!ERROR An invalid configuration is specified.

-!ENDIF 

-

-!IF "$(OS)" == "Windows_NT"

-NULL=

-!ELSE 

-NULL=nul

-!ENDIF 

-################################################################################

-# Begin Project

-# PROP Target_Last_Scanned "TAO - Win32 Debug"

-MTL=mktyplib.exe

-RSC=rc.exe

-CPP=cl.exe

-

-!IF  "$(CFG)" == "TAO - Win32 Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Release"

-# PROP BASE Intermediate_Dir "Release"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir ""

-# PROP Intermediate_Dir "Release"

-# PROP Target_Dir ""

-OUTDIR=.

-INTDIR=.\Release

-

-ALL : "$(OUTDIR)\TAO.dll"

-

-CLEAN : 

-	-@erase "$(INTDIR)\any.obj"

-	-@erase "$(INTDIR)\cdr.obj"

-	-@erase "$(INTDIR)\client_factory.obj"

-	-@erase "$(INTDIR)\connect.obj"

-	-@erase "$(INTDIR)\corbacom.obj"

-	-@erase "$(INTDIR)\debug.obj"

-	-@erase "$(INTDIR)\decode.obj"

-	-@erase "$(INTDIR)\deep_copy.obj"

-	-@erase "$(INTDIR)\deep_free.obj"

-	-@erase "$(INTDIR)\default_client.obj"

-	-@erase "$(INTDIR)\default_server.obj"

-	-@erase "$(INTDIR)\encode.obj"

-	-@erase "$(INTDIR)\except.obj"

-	-@erase "$(INTDIR)\giop.obj"

-	-@erase "$(INTDIR)\iiopobj.obj"

-	-@erase "$(INTDIR)\iioporb.obj"

-	-@erase "$(INTDIR)\interp.obj"

-	-@erase "$(INTDIR)\invoke.obj"

-	-@erase "$(INTDIR)\marshal.obj"

-	-@erase "$(INTDIR)\nvlist.obj"

-	-@erase "$(INTDIR)\object.obj"

-	-@erase "$(INTDIR)\objtable.obj"

-	-@erase "$(INTDIR)\optable.obj"

-	-@erase "$(INTDIR)\orb_core.obj"

-	-@erase "$(INTDIR)\orbobj.obj"

-	-@erase "$(INTDIR)\params.obj"

-	-@erase "$(INTDIR)\poa.obj"

-	-@erase "$(INTDIR)\principa.obj"

-	-@erase "$(INTDIR)\request.obj"

-	-@erase "$(INTDIR)\server_factory.obj"

-	-@erase "$(INTDIR)\svrrqst.obj"

-	-@erase "$(INTDIR)\tao_internals.obj"

-	-@erase "$(INTDIR)\tc_const.obj"

-	-@erase "$(INTDIR)\typecode.obj"

-	-@erase "$(OUTDIR)\TAO.dll"

-	-@erase "$(OUTDIR)\TAO.exp"

-	-@erase "$(OUTDIR)\TAO.lib"

-

-"$(INTDIR)" :

-    if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"

-

-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "." /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__IIOP_BUILD" /D "ACE_BUILD_SVC_DLL" /D "__ACE_INLINE__" /YX /c

-CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "." /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D\

- "__IIOP_BUILD" /D "ACE_BUILD_SVC_DLL" /D "__ACE_INLINE__"\

- /Fp"$(INTDIR)/TAO.pch" /YX /Fo"$(INTDIR)/" /c 

-CPP_OBJS=.\Release/

-CPP_SBRS=.\.

-# ADD BASE MTL /nologo /D "NDEBUG" /win32

-# ADD MTL /nologo /D "NDEBUG" /win32

-MTL_PROJ=/nologo /D "NDEBUG" /win32 

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-BSC32_FLAGS=/nologo /o"$(OUTDIR)/TAO.bsc" 

-BSC32_SBRS= \

-	

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386

-# ADD LINK32 ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386

-LINK32_FLAGS=ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib\

- comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib\

- odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /incremental:no\

- /pdb:"$(OUTDIR)/TAO.pdb" /machine:I386 /out:"$(OUTDIR)/TAO.dll"\

- /implib:"$(OUTDIR)/TAO.lib" 

-LINK32_OBJS= \

-	"$(INTDIR)\any.obj" \

-	"$(INTDIR)\cdr.obj" \

-	"$(INTDIR)\client_factory.obj" \

-	"$(INTDIR)\connect.obj" \

-	"$(INTDIR)\corbacom.obj" \

-	"$(INTDIR)\debug.obj" \

-	"$(INTDIR)\decode.obj" \

-	"$(INTDIR)\deep_copy.obj" \

-	"$(INTDIR)\deep_free.obj" \

-	"$(INTDIR)\default_client.obj" \

-	"$(INTDIR)\default_server.obj" \

-	"$(INTDIR)\encode.obj" \

-	"$(INTDIR)\except.obj" \

-	"$(INTDIR)\giop.obj" \

-	"$(INTDIR)\iiopobj.obj" \

-	"$(INTDIR)\iioporb.obj" \

-	"$(INTDIR)\interp.obj" \

-	"$(INTDIR)\invoke.obj" \

-	"$(INTDIR)\marshal.obj" \

-	"$(INTDIR)\nvlist.obj" \

-	"$(INTDIR)\object.obj" \

-	"$(INTDIR)\objtable.obj" \

-	"$(INTDIR)\optable.obj" \

-	"$(INTDIR)\orb_core.obj" \

-	"$(INTDIR)\orbobj.obj" \

-	"$(INTDIR)\params.obj" \

-	"$(INTDIR)\poa.obj" \

-	"$(INTDIR)\principa.obj" \

-	"$(INTDIR)\request.obj" \

-	"$(INTDIR)\server_factory.obj" \

-	"$(INTDIR)\svrrqst.obj" \

-	"$(INTDIR)\tao_internals.obj" \

-	"$(INTDIR)\tc_const.obj" \

-	"$(INTDIR)\typecode.obj"

-

-"$(OUTDIR)\TAO.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)

-    $(LINK32) @<<

-  $(LINK32_FLAGS) $(LINK32_OBJS)

-<<

-

-!ELSEIF  "$(CFG)" == "TAO - Win32 Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Debug"

-# PROP BASE Intermediate_Dir "Debug"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir ""

-# PROP Intermediate_Dir "Debug"

-# PROP Target_Dir ""

-OUTDIR=.

-INTDIR=.\Debug

-

-ALL : "$(OUTDIR)\TAO.dll"

-

-CLEAN : 

-	-@erase "$(INTDIR)\any.obj"

-	-@erase "$(INTDIR)\cdr.obj"

-	-@erase "$(INTDIR)\client_factory.obj"

-	-@erase "$(INTDIR)\connect.obj"

-	-@erase "$(INTDIR)\corbacom.obj"

-	-@erase "$(INTDIR)\debug.obj"

-	-@erase "$(INTDIR)\decode.obj"

-	-@erase "$(INTDIR)\deep_copy.obj"

-	-@erase "$(INTDIR)\deep_free.obj"

-	-@erase "$(INTDIR)\default_client.obj"

-	-@erase "$(INTDIR)\default_server.obj"

-	-@erase "$(INTDIR)\encode.obj"

-	-@erase "$(INTDIR)\except.obj"

-	-@erase "$(INTDIR)\giop.obj"

-	-@erase "$(INTDIR)\iiopobj.obj"

-	-@erase "$(INTDIR)\iioporb.obj"

-	-@erase "$(INTDIR)\interp.obj"

-	-@erase "$(INTDIR)\invoke.obj"

-	-@erase "$(INTDIR)\marshal.obj"

-	-@erase "$(INTDIR)\nvlist.obj"

-	-@erase "$(INTDIR)\object.obj"

-	-@erase "$(INTDIR)\objtable.obj"

-	-@erase "$(INTDIR)\optable.obj"

-	-@erase "$(INTDIR)\orb_core.obj"

-	-@erase "$(INTDIR)\orbobj.obj"

-	-@erase "$(INTDIR)\params.obj"

-	-@erase "$(INTDIR)\poa.obj"

-	-@erase "$(INTDIR)\principa.obj"

-	-@erase "$(INTDIR)\request.obj"

-	-@erase "$(INTDIR)\server_factory.obj"

-	-@erase "$(INTDIR)\svrrqst.obj"

-	-@erase "$(INTDIR)\tao_internals.obj"

-	-@erase "$(INTDIR)\tc_const.obj"

-	-@erase "$(INTDIR)\typecode.obj"

-	-@erase "$(INTDIR)\vc40.idb"

-	-@erase "$(INTDIR)\vc40.pdb"

-	-@erase "$(OUTDIR)\TAO.dll"

-	-@erase "$(OUTDIR)\TAO.exp"

-	-@erase "$(OUTDIR)\TAO.ilk"

-	-@erase "$(OUTDIR)\TAO.lib"

-	-@erase "$(OUTDIR)\TAO.pdb"

-

-"$(INTDIR)" :

-    if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"

-

-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "." /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "__IIOP_BUILD" /D "ACE_BUILD_SVC_DLL" /YX /c

-CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "." /D "_DEBUG" /D "WIN32" /D\

- "_WINDOWS" /D "__IIOP_BUILD" /D "ACE_BUILD_SVC_DLL" /Fp"$(INTDIR)/TAO.pch" /YX\

- /Fo"$(INTDIR)/" /Fd"$(INTDIR)/" /c 

-CPP_OBJS=.\Debug/

-CPP_SBRS=.\.

-# ADD BASE MTL /nologo /D "_DEBUG" /win32

-# ADD MTL /nologo /D "_DEBUG" /win32

-MTL_PROJ=/nologo /D "_DEBUG" /win32 

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-BSC32_FLAGS=/nologo /o"$(OUTDIR)/TAO.bsc" 

-BSC32_SBRS= \

-	

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386

-# ADD LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386

-LINK32_FLAGS=aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib\

- comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib\

- odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /incremental:yes\

- /pdb:"$(OUTDIR)/TAO.pdb" /debug /machine:I386 /out:"$(OUTDIR)/TAO.dll"\

- /implib:"$(OUTDIR)/TAO.lib" 

-LINK32_OBJS= \

-	"$(INTDIR)\any.obj" \

-	"$(INTDIR)\cdr.obj" \

-	"$(INTDIR)\client_factory.obj" \

-	"$(INTDIR)\connect.obj" \

-	"$(INTDIR)\corbacom.obj" \

-	"$(INTDIR)\debug.obj" \

-	"$(INTDIR)\decode.obj" \

-	"$(INTDIR)\deep_copy.obj" \

-	"$(INTDIR)\deep_free.obj" \

-	"$(INTDIR)\default_client.obj" \

-	"$(INTDIR)\default_server.obj" \

-	"$(INTDIR)\encode.obj" \

-	"$(INTDIR)\except.obj" \

-	"$(INTDIR)\giop.obj" \

-	"$(INTDIR)\iiopobj.obj" \

-	"$(INTDIR)\iioporb.obj" \

-	"$(INTDIR)\interp.obj" \

-	"$(INTDIR)\invoke.obj" \

-	"$(INTDIR)\marshal.obj" \

-	"$(INTDIR)\nvlist.obj" \

-	"$(INTDIR)\object.obj" \

-	"$(INTDIR)\objtable.obj" \

-	"$(INTDIR)\optable.obj" \

-	"$(INTDIR)\orb_core.obj" \

-	"$(INTDIR)\orbobj.obj" \

-	"$(INTDIR)\params.obj" \

-	"$(INTDIR)\poa.obj" \

-	"$(INTDIR)\principa.obj" \

-	"$(INTDIR)\request.obj" \

-	"$(INTDIR)\server_factory.obj" \

-	"$(INTDIR)\svrrqst.obj" \

-	"$(INTDIR)\tao_internals.obj" \

-	"$(INTDIR)\tc_const.obj" \

-	"$(INTDIR)\typecode.obj"

-

-"$(OUTDIR)\TAO.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)

-    $(LINK32) @<<

-  $(LINK32_FLAGS) $(LINK32_OBJS)

-<<

-

-!ENDIF 

-

-.c{$(CPP_OBJS)}.obj:

-   $(CPP) $(CPP_PROJ) $<  

-

-.cpp{$(CPP_OBJS)}.obj:

-   $(CPP) $(CPP_PROJ) $<  

-

-.cxx{$(CPP_OBJS)}.obj:

-   $(CPP) $(CPP_PROJ) $<  

-

-.c{$(CPP_SBRS)}.sbr:

-   $(CPP) $(CPP_PROJ) $<  

-

-.cpp{$(CPP_SBRS)}.sbr:

-   $(CPP) $(CPP_PROJ) $<  

-

-.cxx{$(CPP_SBRS)}.sbr:

-   $(CPP) $(CPP_PROJ) $<  

-

-################################################################################

-# Begin Target

-

-# Name "TAO - Win32 Release"

-# Name "TAO - Win32 Debug"

-

-!IF  "$(CFG)" == "TAO - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "TAO - Win32 Debug"

-

-!ENDIF 

-

-################################################################################

-# Begin Source File

-

-SOURCE=.\typecode.cpp

-

-!IF  "$(CFG)" == "TAO - Win32 Release"

-

-DEP_CPP_TYPEC=\

-	"..\..\ace\config-win32.h"\

-	{$(INCLUDE)}"\.\align.h"\

-	{$(INCLUDE)}"\.\any.h"\

-	{$(INCLUDE)}"\.\any.i"\

-	{$(INCLUDE)}"\.\cdr.h"\

-	{$(INCLUDE)}"\.\cdr.i"\

-	{$(INCLUDE)}"\.\client_factory.h"\

-	{$(INCLUDE)}"\.\connect.h"\

-	{$(INCLUDE)}"\.\connect.i"\

-	{$(INCLUDE)}"\.\corba.h"\

-	{$(INCLUDE)}"\.\corbacom.h"\

-	{$(INCLUDE)}"\.\corbacom.i"\

-	{$(INCLUDE)}"\.\debug.h"\

-	{$(INCLUDE)}"\.\default_client.h"\

-	{$(INCLUDE)}"\.\default_client.i"\

-	{$(INCLUDE)}"\.\default_server.h"\

-	{$(INCLUDE)}"\.\default_server.i"\

-	{$(INCLUDE)}"\.\except.h"\

-	{$(INCLUDE)}"\.\giop.h"\

-	{$(INCLUDE)}"\.\giop.i"\

-	{$(INCLUDE)}"\.\iiopobj.h"\

-	{$(INCLUDE)}"\.\iiopobj.i"\

-	{$(INCLUDE)}"\.\iioporb.h"\

-	{$(INCLUDE)}"\.\iioporb.i"\

-	{$(INCLUDE)}"\.\marshal.h"\

-	{$(INCLUDE)}"\.\marshal.i"\

-	{$(INCLUDE)}"\.\nvlist.h"\

-	{$(INCLUDE)}"\.\object.h"\

-	{$(INCLUDE)}"\.\object.i"\

-	{$(INCLUDE)}"\.\objtable.h"\

-	{$(INCLUDE)}"\.\optable.h"\

-	{$(INCLUDE)}"\.\orb.h"\

-	{$(INCLUDE)}"\.\orb_core.h"\

-	{$(INCLUDE)}"\.\orb_core.i"\

-	{$(INCLUDE)}"\.\orbconf.h"\

-	{$(INCLUDE)}"\.\orbobj.h"\

-	{$(INCLUDE)}"\.\orbobj.i"\

-	{$(INCLUDE)}"\.\params.h"\

-	{$(INCLUDE)}"\.\params.i"\

-	{$(INCLUDE)}"\.\poa.h"\

-	{$(INCLUDE)}"\.\poa.i"\

-	{$(INCLUDE)}"\.\principa.h"\

-	{$(INCLUDE)}"\.\request.h"\

-	{$(INCLUDE)}"\.\sequence.h"\

-	{$(INCLUDE)}"\.\sequence.i"\

-	{$(INCLUDE)}"\.\server_factory.h"\

-	{$(INCLUDE)}"\.\server_factory.i"\

-	{$(INCLUDE)}"\.\singletons.h"\

-	{$(INCLUDE)}"\.\stub.h"\

-	{$(INCLUDE)}"\.\stub.i"\

-	{$(INCLUDE)}"\.\svrrqst.h"\

-	{$(INCLUDE)}"\.\typecode.h"\

-	{$(INCLUDE)}"\.\typecode.i"\

-	{$(INCLUDE)}"\.\varout.h"\

-	{$(INCLUDE)}"\ace\Acceptor.cpp"\

-	{$(INCLUDE)}"\ace\Acceptor.h"\

-	{$(INCLUDE)}"\ace\Acceptor.i"\

-	{$(INCLUDE)}"\ace\ACE.h"\

-	{$(INCLUDE)}"\ace\ACE.i"\

-	{$(INCLUDE)}"\ace\Addr.h"\

-	{$(INCLUDE)}"\ace\Addr.i"\

-	{$(INCLUDE)}"\ace\Atomic_Op.i"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.cpp"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.h"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.i"\

-	{$(INCLUDE)}"\ace\config-win32-common.h"\

-	{$(INCLUDE)}"\ace\Config.h"\

-	{$(INCLUDE)}"\ace\Connector.cpp"\

-	{$(INCLUDE)}"\ace\Connector.h"\

-	{$(INCLUDE)}"\ace\Connector.i"\

-	{$(INCLUDE)}"\ace\Containers.cpp"\

-	{$(INCLUDE)}"\ace\Containers.h"\

-	{$(INCLUDE)}"\ace\Containers.i"\

-	{$(INCLUDE)}"\ace\Dynamic.h"\

-	{$(INCLUDE)}"\ace\Dynamic.i"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.cpp"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.i"\

-	{$(INCLUDE)}"\ace\Free_List.cpp"\

-	{$(INCLUDE)}"\ace\Free_List.h"\

-	{$(INCLUDE)}"\ace\Free_List.i"\

-	{$(INCLUDE)}"\ace\Get_Opt.h"\

-	{$(INCLUDE)}"\ace\Get_Opt.i"\

-	{$(INCLUDE)}"\ace\Handle_Set.h"\

-	{$(INCLUDE)}"\ace\Handle_Set.i"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.i"\

-	{$(INCLUDE)}"\ace\IO_Cntl_Msg.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.i"\

-	{$(INCLUDE)}"\ace\Log_Msg.h"\

-	{$(INCLUDE)}"\ace\Log_Priority.h"\

-	{$(INCLUDE)}"\ace\Log_Record.h"\

-	{$(INCLUDE)}"\ace\Log_Record.i"\

-	{$(INCLUDE)}"\ace\Malloc.h"\

-	{$(INCLUDE)}"\ace\Malloc.i"\

-	{$(INCLUDE)}"\ace\Malloc_T.cpp"\

-	{$(INCLUDE)}"\ace\Malloc_T.h"\

-	{$(INCLUDE)}"\ace\Malloc_T.i"\

-	{$(INCLUDE)}"\ace\Managed_Object.cpp"\

-	{$(INCLUDE)}"\ace\Managed_Object.h"\

-	{$(INCLUDE)}"\ace\Managed_Object.i"\

-	{$(INCLUDE)}"\ace\Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Map_Manager.h"\

-	{$(INCLUDE)}"\ace\Map_Manager.i"\

-	{$(INCLUDE)}"\ace\Mem_Map.h"\

-	{$(INCLUDE)}"\ace\Mem_Map.i"\

-	{$(INCLUDE)}"\ace\Memory_Pool.h"\

-	{$(INCLUDE)}"\ace\Memory_Pool.i"\

-	{$(INCLUDE)}"\ace\Message_Block.h"\

-	{$(INCLUDE)}"\ace\Message_Block.i"\

-	{$(INCLUDE)}"\ace\Message_Queue.cpp"\

-	{$(INCLUDE)}"\ace\Message_Queue.h"\

-	{$(INCLUDE)}"\ace\Message_Queue.i"\

-	{$(INCLUDE)}"\ace\Module.cpp"\

-	{$(INCLUDE)}"\ace\Module.h"\

-	{$(INCLUDE)}"\ace\Module.i"\

-	{$(INCLUDE)}"\ace\Object_Manager.h"\

-	{$(INCLUDE)}"\ace\Object_Manager.i"\

-	{$(INCLUDE)}"\ace\OS.h"\

-	{$(INCLUDE)}"\ace\OS.i"\

-	{$(INCLUDE)}"\ace\Reactor.h"\

-	{$(INCLUDE)}"\ace\Reactor.i"\

-	{$(INCLUDE)}"\ace\Reactor_Impl.h"\

-	{$(INCLUDE)}"\ace\Service_Config.h"\

-	{$(INCLUDE)}"\ace\Service_Config.i"\

-	{$(INCLUDE)}"\ace\Service_Object.h"\

-	{$(INCLUDE)}"\ace\Service_Object.i"\

-	{$(INCLUDE)}"\ace\Service_Repository.h"\

-	{$(INCLUDE)}"\ace\Service_Repository.i"\

-	{$(INCLUDE)}"\ace\Service_Types.h"\

-	{$(INCLUDE)}"\ace\Service_Types.i"\

-	{$(INCLUDE)}"\ace\Shared_Object.h"\

-	{$(INCLUDE)}"\ace\Shared_Object.i"\

-	{$(INCLUDE)}"\ace\Signal.h"\

-	{$(INCLUDE)}"\ace\Signal.i"\

-	{$(INCLUDE)}"\ace\Singleton.cpp"\

-	{$(INCLUDE)}"\ace\Singleton.h"\

-	{$(INCLUDE)}"\ace\Singleton.i"\

-	{$(INCLUDE)}"\ace\SOCK.h"\

-	{$(INCLUDE)}"\ace\SOCK.i"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.h"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.i"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.h"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.i"\

-	{$(INCLUDE)}"\ace\SOCK_IO.h"\

-	{$(INCLUDE)}"\ace\SOCK_IO.i"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.h"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.i"\

-	{$(INCLUDE)}"\ace\SString.h"\

-	{$(INCLUDE)}"\ace\SString.i"\

-	{$(INCLUDE)}"\ace\stdcpp.h"\

-	{$(INCLUDE)}"\ace\Strategies.h"\

-	{$(INCLUDE)}"\ace\Strategies_T.cpp"\

-	{$(INCLUDE)}"\ace\Strategies_T.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.cpp"\

-	{$(INCLUDE)}"\ace\Stream_Modules.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.i"\

-	{$(INCLUDE)}"\ace\Svc_Conf_Tokens.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.cpp"\

-	{$(INCLUDE)}"\ace\Svc_Handler.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.i"\

-	{$(INCLUDE)}"\ace\Synch.h"\

-	{$(INCLUDE)}"\ace\Synch.i"\

-	{$(INCLUDE)}"\ace\Synch_Options.h"\

-	{$(INCLUDE)}"\ace\Synch_T.cpp"\

-	{$(INCLUDE)}"\ace\Synch_T.h"\

-	{$(INCLUDE)}"\ace\Synch_T.i"\

-	{$(INCLUDE)}"\ace\Task.h"\

-	{$(INCLUDE)}"\ace\Task.i"\

-	{$(INCLUDE)}"\ace\Task_T.cpp"\

-	{$(INCLUDE)}"\ace\Task_T.h"\

-	{$(INCLUDE)}"\ace\Task_T.i"\

-	{$(INCLUDE)}"\ace\Thread.h"\

-	{$(INCLUDE)}"\ace\Thread.i"\

-	{$(INCLUDE)}"\ace\Thread_Manager.h"\

-	{$(INCLUDE)}"\ace\Thread_Manager.i"\

-	{$(INCLUDE)}"\ace\Time_Value.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.cpp"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.i"\

-	{$(INCLUDE)}"\ace\Trace.h"\

-	{$(INCLUDE)}"\ace\Version.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.i"\

-	{$(INCLUDE)}"\ace\ws2tcpip.h"\

-	

-

-"$(INTDIR)\typecode.obj" : $(SOURCE) $(DEP_CPP_TYPEC) "$(INTDIR)"

-

-

-!ELSEIF  "$(CFG)" == "TAO - Win32 Debug"

-

-DEP_CPP_TYPEC=\

-	"..\..\ace\config-win32.h"\

-	{$(INCLUDE)}"\.\align.h"\

-	{$(INCLUDE)}"\.\any.h"\

-	{$(INCLUDE)}"\.\any.i"\

-	{$(INCLUDE)}"\.\cdr.h"\

-	{$(INCLUDE)}"\.\cdr.i"\

-	{$(INCLUDE)}"\.\client_factory.h"\

-	{$(INCLUDE)}"\.\connect.h"\

-	{$(INCLUDE)}"\.\connect.i"\

-	{$(INCLUDE)}"\.\corba.h"\

-	{$(INCLUDE)}"\.\corbacom.h"\

-	{$(INCLUDE)}"\.\corbacom.i"\

-	{$(INCLUDE)}"\.\debug.h"\

-	{$(INCLUDE)}"\.\default_client.h"\

-	{$(INCLUDE)}"\.\default_client.i"\

-	{$(INCLUDE)}"\.\default_server.h"\

-	{$(INCLUDE)}"\.\default_server.i"\

-	{$(INCLUDE)}"\.\except.h"\

-	{$(INCLUDE)}"\.\giop.h"\

-	{$(INCLUDE)}"\.\giop.i"\

-	{$(INCLUDE)}"\.\iiopobj.h"\

-	{$(INCLUDE)}"\.\iiopobj.i"\

-	{$(INCLUDE)}"\.\iioporb.h"\

-	{$(INCLUDE)}"\.\iioporb.i"\

-	{$(INCLUDE)}"\.\marshal.h"\

-	{$(INCLUDE)}"\.\marshal.i"\

-	{$(INCLUDE)}"\.\nvlist.h"\

-	{$(INCLUDE)}"\.\object.h"\

-	{$(INCLUDE)}"\.\object.i"\

-	{$(INCLUDE)}"\.\objtable.h"\

-	{$(INCLUDE)}"\.\optable.h"\

-	{$(INCLUDE)}"\.\orb.h"\

-	{$(INCLUDE)}"\.\orb_core.h"\

-	{$(INCLUDE)}"\.\orb_core.i"\

-	{$(INCLUDE)}"\.\orbconf.h"\

-	{$(INCLUDE)}"\.\orbobj.h"\

-	{$(INCLUDE)}"\.\orbobj.i"\

-	{$(INCLUDE)}"\.\params.h"\

-	{$(INCLUDE)}"\.\params.i"\

-	{$(INCLUDE)}"\.\poa.h"\

-	{$(INCLUDE)}"\.\poa.i"\

-	{$(INCLUDE)}"\.\principa.h"\

-	{$(INCLUDE)}"\.\request.h"\

-	{$(INCLUDE)}"\.\sequence.h"\

-	{$(INCLUDE)}"\.\sequence.i"\

-	{$(INCLUDE)}"\.\server_factory.h"\

-	{$(INCLUDE)}"\.\server_factory.i"\

-	{$(INCLUDE)}"\.\singletons.h"\

-	{$(INCLUDE)}"\.\stub.h"\

-	{$(INCLUDE)}"\.\stub.i"\

-	{$(INCLUDE)}"\.\svrrqst.h"\

-	{$(INCLUDE)}"\.\typecode.h"\

-	{$(INCLUDE)}"\.\typecode.i"\

-	{$(INCLUDE)}"\.\varout.h"\

-	{$(INCLUDE)}"\ace\Acceptor.cpp"\

-	{$(INCLUDE)}"\ace\Acceptor.h"\

-	{$(INCLUDE)}"\ace\Acceptor.i"\

-	{$(INCLUDE)}"\ace\ACE.h"\

-	{$(INCLUDE)}"\ace\ACE.i"\

-	{$(INCLUDE)}"\ace\Addr.h"\

-	{$(INCLUDE)}"\ace\Addr.i"\

-	{$(INCLUDE)}"\ace\Atomic_Op.i"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.cpp"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.h"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.i"\

-	{$(INCLUDE)}"\ace\config-win32-common.h"\

-	{$(INCLUDE)}"\ace\Config.h"\

-	{$(INCLUDE)}"\ace\Connector.cpp"\

-	{$(INCLUDE)}"\ace\Connector.h"\

-	{$(INCLUDE)}"\ace\Connector.i"\

-	{$(INCLUDE)}"\ace\Containers.cpp"\

-	{$(INCLUDE)}"\ace\Containers.h"\

-	{$(INCLUDE)}"\ace\Containers.i"\

-	{$(INCLUDE)}"\ace\Dynamic.h"\

-	{$(INCLUDE)}"\ace\Dynamic.i"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.cpp"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.i"\

-	{$(INCLUDE)}"\ace\Free_List.cpp"\

-	{$(INCLUDE)}"\ace\Free_List.h"\

-	{$(INCLUDE)}"\ace\Free_List.i"\

-	{$(INCLUDE)}"\ace\Get_Opt.h"\

-	{$(INCLUDE)}"\ace\Get_Opt.i"\

-	{$(INCLUDE)}"\ace\Handle_Set.h"\

-	{$(INCLUDE)}"\ace\Handle_Set.i"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.i"\

-	{$(INCLUDE)}"\ace\IO_Cntl_Msg.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.i"\

-	{$(INCLUDE)}"\ace\Log_Msg.h"\

-	{$(INCLUDE)}"\ace\Log_Priority.h"\

-	{$(INCLUDE)}"\ace\Log_Record.h"\

-	{$(INCLUDE)}"\ace\Log_Record.i"\

-	{$(INCLUDE)}"\ace\Malloc.h"\

-	{$(INCLUDE)}"\ace\Malloc.i"\

-	{$(INCLUDE)}"\ace\Malloc_T.cpp"\

-	{$(INCLUDE)}"\ace\Malloc_T.h"\

-	{$(INCLUDE)}"\ace\Malloc_T.i"\

-	{$(INCLUDE)}"\ace\Managed_Object.cpp"\

-	{$(INCLUDE)}"\ace\Managed_Object.h"\

-	{$(INCLUDE)}"\ace\Managed_Object.i"\

-	{$(INCLUDE)}"\ace\Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Map_Manager.h"\

-	{$(INCLUDE)}"\ace\Map_Manager.i"\

-	{$(INCLUDE)}"\ace\Mem_Map.h"\

-	{$(INCLUDE)}"\ace\Mem_Map.i"\

-	{$(INCLUDE)}"\ace\Memory_Pool.h"\

-	{$(INCLUDE)}"\ace\Memory_Pool.i"\

-	{$(INCLUDE)}"\ace\Message_Block.h"\

-	{$(INCLUDE)}"\ace\Message_Block.i"\

-	{$(INCLUDE)}"\ace\Message_Queue.cpp"\

-	{$(INCLUDE)}"\ace\Message_Queue.h"\

-	{$(INCLUDE)}"\ace\Message_Queue.i"\

-	{$(INCLUDE)}"\ace\Module.cpp"\

-	{$(INCLUDE)}"\ace\Module.h"\

-	{$(INCLUDE)}"\ace\Module.i"\

-	{$(INCLUDE)}"\ace\Object_Manager.h"\

-	{$(INCLUDE)}"\ace\Object_Manager.i"\

-	{$(INCLUDE)}"\ace\OS.h"\

-	{$(INCLUDE)}"\ace\OS.i"\

-	{$(INCLUDE)}"\ace\Reactor.h"\

-	{$(INCLUDE)}"\ace\Reactor.i"\

-	{$(INCLUDE)}"\ace\Reactor_Impl.h"\

-	{$(INCLUDE)}"\ace\Service_Config.h"\

-	{$(INCLUDE)}"\ace\Service_Config.i"\

-	{$(INCLUDE)}"\ace\Service_Object.h"\

-	{$(INCLUDE)}"\ace\Service_Object.i"\

-	{$(INCLUDE)}"\ace\Service_Repository.h"\

-	{$(INCLUDE)}"\ace\Service_Repository.i"\

-	{$(INCLUDE)}"\ace\Service_Types.h"\

-	{$(INCLUDE)}"\ace\Service_Types.i"\

-	{$(INCLUDE)}"\ace\Shared_Object.h"\

-	{$(INCLUDE)}"\ace\Shared_Object.i"\

-	{$(INCLUDE)}"\ace\Signal.h"\

-	{$(INCLUDE)}"\ace\Signal.i"\

-	{$(INCLUDE)}"\ace\Singleton.cpp"\

-	{$(INCLUDE)}"\ace\Singleton.h"\

-	{$(INCLUDE)}"\ace\Singleton.i"\

-	{$(INCLUDE)}"\ace\SOCK.h"\

-	{$(INCLUDE)}"\ace\SOCK.i"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.h"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.i"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.h"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.i"\

-	{$(INCLUDE)}"\ace\SOCK_IO.h"\

-	{$(INCLUDE)}"\ace\SOCK_IO.i"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.h"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.i"\

-	{$(INCLUDE)}"\ace\SString.h"\

-	{$(INCLUDE)}"\ace\SString.i"\

-	{$(INCLUDE)}"\ace\stdcpp.h"\

-	{$(INCLUDE)}"\ace\Strategies.h"\

-	{$(INCLUDE)}"\ace\Strategies_T.cpp"\

-	{$(INCLUDE)}"\ace\Strategies_T.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.cpp"\

-	{$(INCLUDE)}"\ace\Stream_Modules.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.i"\

-	{$(INCLUDE)}"\ace\Svc_Conf_Tokens.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.cpp"\

-	{$(INCLUDE)}"\ace\Svc_Handler.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.i"\

-	{$(INCLUDE)}"\ace\Synch.h"\

-	{$(INCLUDE)}"\ace\Synch.i"\

-	{$(INCLUDE)}"\ace\Synch_Options.h"\

-	{$(INCLUDE)}"\ace\Synch_T.cpp"\

-	{$(INCLUDE)}"\ace\Synch_T.h"\

-	{$(INCLUDE)}"\ace\Synch_T.i"\

-	{$(INCLUDE)}"\ace\Task.h"\

-	{$(INCLUDE)}"\ace\Task.i"\

-	{$(INCLUDE)}"\ace\Task_T.cpp"\

-	{$(INCLUDE)}"\ace\Task_T.h"\

-	{$(INCLUDE)}"\ace\Task_T.i"\

-	{$(INCLUDE)}"\ace\Thread.h"\

-	{$(INCLUDE)}"\ace\Thread.i"\

-	{$(INCLUDE)}"\ace\Thread_Manager.h"\

-	{$(INCLUDE)}"\ace\Thread_Manager.i"\

-	{$(INCLUDE)}"\ace\Time_Value.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.cpp"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.i"\

-	{$(INCLUDE)}"\ace\Trace.h"\

-	{$(INCLUDE)}"\ace\Version.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.i"\

-	{$(INCLUDE)}"\ace\ws2tcpip.h"\

-	

-

-"$(INTDIR)\typecode.obj" : $(SOURCE) $(DEP_CPP_TYPEC) "$(INTDIR)"

-

-

-!ENDIF 

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\cdr.cpp

-

-!IF  "$(CFG)" == "TAO - Win32 Release"

-

-DEP_CPP_CDR_C=\

-	"..\..\ace\config-win32.h"\

-	{$(INCLUDE)}"\.\align.h"\

-	{$(INCLUDE)}"\.\any.h"\

-	{$(INCLUDE)}"\.\any.i"\

-	{$(INCLUDE)}"\.\cdr.h"\

-	{$(INCLUDE)}"\.\cdr.i"\

-	{$(INCLUDE)}"\.\client_factory.h"\

-	{$(INCLUDE)}"\.\client_factory.i"\

-	{$(INCLUDE)}"\.\connect.h"\

-	{$(INCLUDE)}"\.\connect.i"\

-	{$(INCLUDE)}"\.\corba.h"\

-	{$(INCLUDE)}"\.\corbacom.h"\

-	{$(INCLUDE)}"\.\corbacom.i"\

-	{$(INCLUDE)}"\.\debug.h"\

-	{$(INCLUDE)}"\.\default_client.h"\

-	{$(INCLUDE)}"\.\default_client.i"\

-	{$(INCLUDE)}"\.\default_server.h"\

-	{$(INCLUDE)}"\.\default_server.i"\

-	{$(INCLUDE)}"\.\except.h"\

-	{$(INCLUDE)}"\.\giop.h"\

-	{$(INCLUDE)}"\.\giop.i"\

-	{$(INCLUDE)}"\.\iiopobj.h"\

-	{$(INCLUDE)}"\.\iiopobj.i"\

-	{$(INCLUDE)}"\.\iioporb.h"\

-	{$(INCLUDE)}"\.\iioporb.i"\

-	{$(INCLUDE)}"\.\marshal.h"\

-	{$(INCLUDE)}"\.\marshal.i"\

-	{$(INCLUDE)}"\.\nvlist.h"\

-	{$(INCLUDE)}"\.\object.h"\

-	{$(INCLUDE)}"\.\object.i"\

-	{$(INCLUDE)}"\.\objtable.h"\

-	{$(INCLUDE)}"\.\optable.h"\

-	{$(INCLUDE)}"\.\orb.h"\

-	{$(INCLUDE)}"\.\orb_core.h"\

-	{$(INCLUDE)}"\.\orb_core.i"\

-	{$(INCLUDE)}"\.\orbconf.h"\

-	{$(INCLUDE)}"\.\orbobj.h"\

-	{$(INCLUDE)}"\.\orbobj.i"\

-	{$(INCLUDE)}"\.\params.h"\

-	{$(INCLUDE)}"\.\params.i"\

-	{$(INCLUDE)}"\.\poa.h"\

-	{$(INCLUDE)}"\.\poa.i"\

-	{$(INCLUDE)}"\.\principa.h"\

-	{$(INCLUDE)}"\.\request.h"\

-	{$(INCLUDE)}"\.\sequence.h"\

-	{$(INCLUDE)}"\.\sequence.i"\

-	{$(INCLUDE)}"\.\server_factory.h"\

-	{$(INCLUDE)}"\.\server_factory.i"\

-	{$(INCLUDE)}"\.\singletons.h"\

-	{$(INCLUDE)}"\.\stub.h"\

-	{$(INCLUDE)}"\.\stub.i"\

-	{$(INCLUDE)}"\.\svrrqst.h"\

-	{$(INCLUDE)}"\.\svrrqst.i"\

-	{$(INCLUDE)}"\.\typecode.h"\

-	{$(INCLUDE)}"\.\typecode.i"\

-	{$(INCLUDE)}"\.\varout.h"\

-	{$(INCLUDE)}"\ace\Acceptor.cpp"\

-	{$(INCLUDE)}"\ace\Acceptor.h"\

-	{$(INCLUDE)}"\ace\Acceptor.i"\

-	{$(INCLUDE)}"\ace\ACE.h"\

-	{$(INCLUDE)}"\ace\ACE.i"\

-	{$(INCLUDE)}"\ace\Addr.h"\

-	{$(INCLUDE)}"\ace\Addr.i"\

-	{$(INCLUDE)}"\ace\Atomic_Op.i"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.cpp"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.h"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.i"\

-	{$(INCLUDE)}"\ace\config-win32-common.h"\

-	{$(INCLUDE)}"\ace\Config.h"\

-	{$(INCLUDE)}"\ace\Connector.cpp"\

-	{$(INCLUDE)}"\ace\Connector.h"\

-	{$(INCLUDE)}"\ace\Connector.i"\

-	{$(INCLUDE)}"\ace\Containers.cpp"\

-	{$(INCLUDE)}"\ace\Containers.h"\

-	{$(INCLUDE)}"\ace\Containers.i"\

-	{$(INCLUDE)}"\ace\Dynamic.h"\

-	{$(INCLUDE)}"\ace\Dynamic.i"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.cpp"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.i"\

-	{$(INCLUDE)}"\ace\Free_List.cpp"\

-	{$(INCLUDE)}"\ace\Free_List.h"\

-	{$(INCLUDE)}"\ace\Free_List.i"\

-	{$(INCLUDE)}"\ace\Get_Opt.h"\

-	{$(INCLUDE)}"\ace\Get_Opt.i"\

-	{$(INCLUDE)}"\ace\Handle_Set.h"\

-	{$(INCLUDE)}"\ace\Handle_Set.i"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.i"\

-	{$(INCLUDE)}"\ace\IO_Cntl_Msg.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.i"\

-	{$(INCLUDE)}"\ace\Log_Msg.h"\

-	{$(INCLUDE)}"\ace\Log_Priority.h"\

-	{$(INCLUDE)}"\ace\Log_Record.h"\

-	{$(INCLUDE)}"\ace\Log_Record.i"\

-	{$(INCLUDE)}"\ace\Malloc.h"\

-	{$(INCLUDE)}"\ace\Malloc.i"\

-	{$(INCLUDE)}"\ace\Malloc_T.cpp"\

-	{$(INCLUDE)}"\ace\Malloc_T.h"\

-	{$(INCLUDE)}"\ace\Malloc_T.i"\

-	{$(INCLUDE)}"\ace\Managed_Object.cpp"\

-	{$(INCLUDE)}"\ace\Managed_Object.h"\

-	{$(INCLUDE)}"\ace\Managed_Object.i"\

-	{$(INCLUDE)}"\ace\Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Map_Manager.h"\

-	{$(INCLUDE)}"\ace\Map_Manager.i"\

-	{$(INCLUDE)}"\ace\Mem_Map.h"\

-	{$(INCLUDE)}"\ace\Mem_Map.i"\

-	{$(INCLUDE)}"\ace\Memory_Pool.h"\

-	{$(INCLUDE)}"\ace\Memory_Pool.i"\

-	{$(INCLUDE)}"\ace\Message_Block.h"\

-	{$(INCLUDE)}"\ace\Message_Block.i"\

-	{$(INCLUDE)}"\ace\Message_Queue.cpp"\

-	{$(INCLUDE)}"\ace\Message_Queue.h"\

-	{$(INCLUDE)}"\ace\Message_Queue.i"\

-	{$(INCLUDE)}"\ace\Module.cpp"\

-	{$(INCLUDE)}"\ace\Module.h"\

-	{$(INCLUDE)}"\ace\Module.i"\

-	{$(INCLUDE)}"\ace\Object_Manager.h"\

-	{$(INCLUDE)}"\ace\Object_Manager.i"\

-	{$(INCLUDE)}"\ace\OS.h"\

-	{$(INCLUDE)}"\ace\OS.i"\

-	{$(INCLUDE)}"\ace\Reactor.h"\

-	{$(INCLUDE)}"\ace\Reactor.i"\

-	{$(INCLUDE)}"\ace\Reactor_Impl.h"\

-	{$(INCLUDE)}"\ace\Service_Config.h"\

-	{$(INCLUDE)}"\ace\Service_Config.i"\

-	{$(INCLUDE)}"\ace\Service_Object.h"\

-	{$(INCLUDE)}"\ace\Service_Object.i"\

-	{$(INCLUDE)}"\ace\Service_Repository.h"\

-	{$(INCLUDE)}"\ace\Service_Repository.i"\

-	{$(INCLUDE)}"\ace\Service_Types.h"\

-	{$(INCLUDE)}"\ace\Service_Types.i"\

-	{$(INCLUDE)}"\ace\Shared_Object.h"\

-	{$(INCLUDE)}"\ace\Shared_Object.i"\

-	{$(INCLUDE)}"\ace\Signal.h"\

-	{$(INCLUDE)}"\ace\Signal.i"\

-	{$(INCLUDE)}"\ace\Singleton.cpp"\

-	{$(INCLUDE)}"\ace\Singleton.h"\

-	{$(INCLUDE)}"\ace\Singleton.i"\

-	{$(INCLUDE)}"\ace\SOCK.h"\

-	{$(INCLUDE)}"\ace\SOCK.i"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.h"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.i"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.h"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.i"\

-	{$(INCLUDE)}"\ace\SOCK_IO.h"\

-	{$(INCLUDE)}"\ace\SOCK_IO.i"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.h"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.i"\

-	{$(INCLUDE)}"\ace\SString.h"\

-	{$(INCLUDE)}"\ace\SString.i"\

-	{$(INCLUDE)}"\ace\stdcpp.h"\

-	{$(INCLUDE)}"\ace\Strategies.h"\

-	{$(INCLUDE)}"\ace\Strategies_T.cpp"\

-	{$(INCLUDE)}"\ace\Strategies_T.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.cpp"\

-	{$(INCLUDE)}"\ace\Stream_Modules.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.i"\

-	{$(INCLUDE)}"\ace\Svc_Conf_Tokens.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.cpp"\

-	{$(INCLUDE)}"\ace\Svc_Handler.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.i"\

-	{$(INCLUDE)}"\ace\Synch.h"\

-	{$(INCLUDE)}"\ace\Synch.i"\

-	{$(INCLUDE)}"\ace\Synch_Options.h"\

-	{$(INCLUDE)}"\ace\Synch_T.cpp"\

-	{$(INCLUDE)}"\ace\Synch_T.h"\

-	{$(INCLUDE)}"\ace\Synch_T.i"\

-	{$(INCLUDE)}"\ace\Task.h"\

-	{$(INCLUDE)}"\ace\Task.i"\

-	{$(INCLUDE)}"\ace\Task_T.cpp"\

-	{$(INCLUDE)}"\ace\Task_T.h"\

-	{$(INCLUDE)}"\ace\Task_T.i"\

-	{$(INCLUDE)}"\ace\Thread.h"\

-	{$(INCLUDE)}"\ace\Thread.i"\

-	{$(INCLUDE)}"\ace\Thread_Manager.h"\

-	{$(INCLUDE)}"\ace\Thread_Manager.i"\

-	{$(INCLUDE)}"\ace\Time_Value.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.cpp"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.i"\

-	{$(INCLUDE)}"\ace\Trace.h"\

-	{$(INCLUDE)}"\ace\Version.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.i"\

-	{$(INCLUDE)}"\ace\ws2tcpip.h"\

-	

-NODEP_CPP_CDR_C=\

-	".\tao\factories.h"\

-	

-

-"$(INTDIR)\cdr.obj" : $(SOURCE) $(DEP_CPP_CDR_C) "$(INTDIR)"

-

-

-!ELSEIF  "$(CFG)" == "TAO - Win32 Debug"

-

-DEP_CPP_CDR_C=\

-	{$(INCLUDE)}"\.\corba.h"\

-	

-

-"$(INTDIR)\cdr.obj" : $(SOURCE) $(DEP_CPP_CDR_C) "$(INTDIR)"

-

-

-!ENDIF 

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\client_factory.cpp

-

-!IF  "$(CFG)" == "TAO - Win32 Release"

-

-DEP_CPP_CLIEN=\

-	"..\..\ace\config-win32.h"\

-	{$(INCLUDE)}"\.\align.h"\

-	{$(INCLUDE)}"\.\any.h"\

-	{$(INCLUDE)}"\.\any.i"\

-	{$(INCLUDE)}"\.\cdr.h"\

-	{$(INCLUDE)}"\.\cdr.i"\

-	{$(INCLUDE)}"\.\client_factory.h"\

-	{$(INCLUDE)}"\.\client_factory.i"\

-	{$(INCLUDE)}"\.\connect.h"\

-	{$(INCLUDE)}"\.\connect.i"\

-	{$(INCLUDE)}"\.\corba.h"\

-	{$(INCLUDE)}"\.\corbacom.h"\

-	{$(INCLUDE)}"\.\corbacom.i"\

-	{$(INCLUDE)}"\.\debug.h"\

-	{$(INCLUDE)}"\.\default_client.h"\

-	{$(INCLUDE)}"\.\default_client.i"\

-	{$(INCLUDE)}"\.\default_server.h"\

-	{$(INCLUDE)}"\.\default_server.i"\

-	{$(INCLUDE)}"\.\except.h"\

-	{$(INCLUDE)}"\.\giop.h"\

-	{$(INCLUDE)}"\.\giop.i"\

-	{$(INCLUDE)}"\.\iiopobj.h"\

-	{$(INCLUDE)}"\.\iiopobj.i"\

-	{$(INCLUDE)}"\.\iioporb.h"\

-	{$(INCLUDE)}"\.\iioporb.i"\

-	{$(INCLUDE)}"\.\marshal.h"\

-	{$(INCLUDE)}"\.\marshal.i"\

-	{$(INCLUDE)}"\.\nvlist.h"\

-	{$(INCLUDE)}"\.\object.h"\

-	{$(INCLUDE)}"\.\object.i"\

-	{$(INCLUDE)}"\.\objtable.h"\

-	{$(INCLUDE)}"\.\optable.h"\

-	{$(INCLUDE)}"\.\orb.h"\

-	{$(INCLUDE)}"\.\orb_core.h"\

-	{$(INCLUDE)}"\.\orb_core.i"\

-	{$(INCLUDE)}"\.\orbconf.h"\

-	{$(INCLUDE)}"\.\orbobj.h"\

-	{$(INCLUDE)}"\.\orbobj.i"\

-	{$(INCLUDE)}"\.\params.h"\

-	{$(INCLUDE)}"\.\params.i"\

-	{$(INCLUDE)}"\.\poa.h"\

-	{$(INCLUDE)}"\.\poa.i"\

-	{$(INCLUDE)}"\.\principa.h"\

-	{$(INCLUDE)}"\.\request.h"\

-	{$(INCLUDE)}"\.\sequence.h"\

-	{$(INCLUDE)}"\.\sequence.i"\

-	{$(INCLUDE)}"\.\server_factory.h"\

-	{$(INCLUDE)}"\.\server_factory.i"\

-	{$(INCLUDE)}"\.\singletons.h"\

-	{$(INCLUDE)}"\.\stub.h"\

-	{$(INCLUDE)}"\.\stub.i"\

-	{$(INCLUDE)}"\.\svrrqst.h"\

-	{$(INCLUDE)}"\.\svrrqst.i"\

-	{$(INCLUDE)}"\.\typecode.h"\

-	{$(INCLUDE)}"\.\typecode.i"\

-	{$(INCLUDE)}"\.\varout.h"\

-	{$(INCLUDE)}"\ace\Acceptor.cpp"\

-	{$(INCLUDE)}"\ace\Acceptor.h"\

-	{$(INCLUDE)}"\ace\Acceptor.i"\

-	{$(INCLUDE)}"\ace\ACE.h"\

-	{$(INCLUDE)}"\ace\ACE.i"\

-	{$(INCLUDE)}"\ace\Addr.h"\

-	{$(INCLUDE)}"\ace\Addr.i"\

-	{$(INCLUDE)}"\ace\Atomic_Op.i"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.cpp"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.h"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.i"\

-	{$(INCLUDE)}"\ace\config-win32-common.h"\

-	{$(INCLUDE)}"\ace\Config.h"\

-	{$(INCLUDE)}"\ace\Connector.cpp"\

-	{$(INCLUDE)}"\ace\Connector.h"\

-	{$(INCLUDE)}"\ace\Connector.i"\

-	{$(INCLUDE)}"\ace\Containers.cpp"\

-	{$(INCLUDE)}"\ace\Containers.h"\

-	{$(INCLUDE)}"\ace\Containers.i"\

-	{$(INCLUDE)}"\ace\Dynamic.h"\

-	{$(INCLUDE)}"\ace\Dynamic.i"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.cpp"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.i"\

-	{$(INCLUDE)}"\ace\Free_List.cpp"\

-	{$(INCLUDE)}"\ace\Free_List.h"\

-	{$(INCLUDE)}"\ace\Free_List.i"\

-	{$(INCLUDE)}"\ace\Get_Opt.h"\

-	{$(INCLUDE)}"\ace\Get_Opt.i"\

-	{$(INCLUDE)}"\ace\Handle_Set.h"\

-	{$(INCLUDE)}"\ace\Handle_Set.i"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.i"\

-	{$(INCLUDE)}"\ace\IO_Cntl_Msg.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.i"\

-	{$(INCLUDE)}"\ace\Log_Msg.h"\

-	{$(INCLUDE)}"\ace\Log_Priority.h"\

-	{$(INCLUDE)}"\ace\Log_Record.h"\

-	{$(INCLUDE)}"\ace\Log_Record.i"\

-	{$(INCLUDE)}"\ace\Malloc.h"\

-	{$(INCLUDE)}"\ace\Malloc.i"\

-	{$(INCLUDE)}"\ace\Malloc_T.cpp"\

-	{$(INCLUDE)}"\ace\Malloc_T.h"\

-	{$(INCLUDE)}"\ace\Malloc_T.i"\

-	{$(INCLUDE)}"\ace\Managed_Object.cpp"\

-	{$(INCLUDE)}"\ace\Managed_Object.h"\

-	{$(INCLUDE)}"\ace\Managed_Object.i"\

-	{$(INCLUDE)}"\ace\Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Map_Manager.h"\

-	{$(INCLUDE)}"\ace\Map_Manager.i"\

-	{$(INCLUDE)}"\ace\Mem_Map.h"\

-	{$(INCLUDE)}"\ace\Mem_Map.i"\

-	{$(INCLUDE)}"\ace\Memory_Pool.h"\

-	{$(INCLUDE)}"\ace\Memory_Pool.i"\

-	{$(INCLUDE)}"\ace\Message_Block.h"\

-	{$(INCLUDE)}"\ace\Message_Block.i"\

-	{$(INCLUDE)}"\ace\Message_Queue.cpp"\

-	{$(INCLUDE)}"\ace\Message_Queue.h"\

-	{$(INCLUDE)}"\ace\Message_Queue.i"\

-	{$(INCLUDE)}"\ace\Module.cpp"\

-	{$(INCLUDE)}"\ace\Module.h"\

-	{$(INCLUDE)}"\ace\Module.i"\

-	{$(INCLUDE)}"\ace\Object_Manager.h"\

-	{$(INCLUDE)}"\ace\Object_Manager.i"\

-	{$(INCLUDE)}"\ace\OS.h"\

-	{$(INCLUDE)}"\ace\OS.i"\

-	{$(INCLUDE)}"\ace\Reactor.h"\

-	{$(INCLUDE)}"\ace\Reactor.i"\

-	{$(INCLUDE)}"\ace\Reactor_Impl.h"\

-	{$(INCLUDE)}"\ace\Service_Config.h"\

-	{$(INCLUDE)}"\ace\Service_Config.i"\

-	{$(INCLUDE)}"\ace\Service_Object.h"\

-	{$(INCLUDE)}"\ace\Service_Object.i"\

-	{$(INCLUDE)}"\ace\Service_Repository.h"\

-	{$(INCLUDE)}"\ace\Service_Repository.i"\

-	{$(INCLUDE)}"\ace\Service_Types.h"\

-	{$(INCLUDE)}"\ace\Service_Types.i"\

-	{$(INCLUDE)}"\ace\Shared_Object.h"\

-	{$(INCLUDE)}"\ace\Shared_Object.i"\

-	{$(INCLUDE)}"\ace\Signal.h"\

-	{$(INCLUDE)}"\ace\Signal.i"\

-	{$(INCLUDE)}"\ace\Singleton.cpp"\

-	{$(INCLUDE)}"\ace\Singleton.h"\

-	{$(INCLUDE)}"\ace\Singleton.i"\

-	{$(INCLUDE)}"\ace\SOCK.h"\

-	{$(INCLUDE)}"\ace\SOCK.i"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.h"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.i"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.h"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.i"\

-	{$(INCLUDE)}"\ace\SOCK_IO.h"\

-	{$(INCLUDE)}"\ace\SOCK_IO.i"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.h"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.i"\

-	{$(INCLUDE)}"\ace\SString.h"\

-	{$(INCLUDE)}"\ace\SString.i"\

-	{$(INCLUDE)}"\ace\stdcpp.h"\

-	{$(INCLUDE)}"\ace\Strategies.h"\

-	{$(INCLUDE)}"\ace\Strategies_T.cpp"\

-	{$(INCLUDE)}"\ace\Strategies_T.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.cpp"\

-	{$(INCLUDE)}"\ace\Stream_Modules.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.i"\

-	{$(INCLUDE)}"\ace\Svc_Conf_Tokens.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.cpp"\

-	{$(INCLUDE)}"\ace\Svc_Handler.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.i"\

-	{$(INCLUDE)}"\ace\Synch.h"\

-	{$(INCLUDE)}"\ace\Synch.i"\

-	{$(INCLUDE)}"\ace\Synch_Options.h"\

-	{$(INCLUDE)}"\ace\Synch_T.cpp"\

-	{$(INCLUDE)}"\ace\Synch_T.h"\

-	{$(INCLUDE)}"\ace\Synch_T.i"\

-	{$(INCLUDE)}"\ace\Task.h"\

-	{$(INCLUDE)}"\ace\Task.i"\

-	{$(INCLUDE)}"\ace\Task_T.cpp"\

-	{$(INCLUDE)}"\ace\Task_T.h"\

-	{$(INCLUDE)}"\ace\Task_T.i"\

-	{$(INCLUDE)}"\ace\Thread.h"\

-	{$(INCLUDE)}"\ace\Thread.i"\

-	{$(INCLUDE)}"\ace\Thread_Manager.h"\

-	{$(INCLUDE)}"\ace\Thread_Manager.i"\

-	{$(INCLUDE)}"\ace\Time_Value.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.cpp"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.i"\

-	{$(INCLUDE)}"\ace\Trace.h"\

-	{$(INCLUDE)}"\ace\Version.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.i"\

-	{$(INCLUDE)}"\ace\ws2tcpip.h"\

-	

-NODEP_CPP_CLIEN=\

-	".\tao\factories.h"\

-	

-

-"$(INTDIR)\client_factory.obj" : $(SOURCE) $(DEP_CPP_CLIEN) "$(INTDIR)"

-

-

-!ELSEIF  "$(CFG)" == "TAO - Win32 Debug"

-

-DEP_CPP_CLIEN=\

-	{$(INCLUDE)}"\.\corba.h"\

-	

-

-"$(INTDIR)\client_factory.obj" : $(SOURCE) $(DEP_CPP_CLIEN) "$(INTDIR)"

-

-

-!ENDIF 

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\connect.cpp

-

-!IF  "$(CFG)" == "TAO - Win32 Release"

-

-DEP_CPP_CONNE=\

-	"..\..\ace\config-win32.h"\

-	{$(INCLUDE)}"\.\align.h"\

-	{$(INCLUDE)}"\.\any.h"\

-	{$(INCLUDE)}"\.\any.i"\

-	{$(INCLUDE)}"\.\cdr.h"\

-	{$(INCLUDE)}"\.\cdr.i"\

-	{$(INCLUDE)}"\.\client_factory.h"\

-	{$(INCLUDE)}"\.\connect.h"\

-	{$(INCLUDE)}"\.\connect.i"\

-	{$(INCLUDE)}"\.\corba.h"\

-	{$(INCLUDE)}"\.\corbacom.h"\

-	{$(INCLUDE)}"\.\corbacom.i"\

-	{$(INCLUDE)}"\.\debug.h"\

-	{$(INCLUDE)}"\.\default_client.h"\

-	{$(INCLUDE)}"\.\default_client.i"\

-	{$(INCLUDE)}"\.\default_server.h"\

-	{$(INCLUDE)}"\.\default_server.i"\

-	{$(INCLUDE)}"\.\except.h"\

-	{$(INCLUDE)}"\.\giop.h"\

-	{$(INCLUDE)}"\.\giop.i"\

-	{$(INCLUDE)}"\.\iiopobj.h"\

-	{$(INCLUDE)}"\.\iiopobj.i"\

-	{$(INCLUDE)}"\.\iioporb.h"\

-	{$(INCLUDE)}"\.\iioporb.i"\

-	{$(INCLUDE)}"\.\marshal.h"\

-	{$(INCLUDE)}"\.\marshal.i"\

-	{$(INCLUDE)}"\.\nvlist.h"\

-	{$(INCLUDE)}"\.\object.h"\

-	{$(INCLUDE)}"\.\object.i"\

-	{$(INCLUDE)}"\.\objtable.h"\

-	{$(INCLUDE)}"\.\optable.h"\

-	{$(INCLUDE)}"\.\orb.h"\

-	{$(INCLUDE)}"\.\orb_core.h"\

-	{$(INCLUDE)}"\.\orb_core.i"\

-	{$(INCLUDE)}"\.\orbconf.h"\

-	{$(INCLUDE)}"\.\orbobj.h"\

-	{$(INCLUDE)}"\.\orbobj.i"\

-	{$(INCLUDE)}"\.\params.h"\

-	{$(INCLUDE)}"\.\params.i"\

-	{$(INCLUDE)}"\.\poa.h"\

-	{$(INCLUDE)}"\.\poa.i"\

-	{$(INCLUDE)}"\.\principa.h"\

-	{$(INCLUDE)}"\.\request.h"\

-	{$(INCLUDE)}"\.\sequence.h"\

-	{$(INCLUDE)}"\.\sequence.i"\

-	{$(INCLUDE)}"\.\server_factory.h"\

-	{$(INCLUDE)}"\.\server_factory.i"\

-	{$(INCLUDE)}"\.\singletons.h"\

-	{$(INCLUDE)}"\.\stub.h"\

-	{$(INCLUDE)}"\.\stub.i"\

-	{$(INCLUDE)}"\.\svrrqst.h"\

-	{$(INCLUDE)}"\.\typecode.h"\

-	{$(INCLUDE)}"\.\typecode.i"\

-	{$(INCLUDE)}"\.\varout.h"\

-	{$(INCLUDE)}"\ace\Acceptor.cpp"\

-	{$(INCLUDE)}"\ace\Acceptor.h"\

-	{$(INCLUDE)}"\ace\Acceptor.i"\

-	{$(INCLUDE)}"\ace\ACE.h"\

-	{$(INCLUDE)}"\ace\ACE.i"\

-	{$(INCLUDE)}"\ace\Addr.h"\

-	{$(INCLUDE)}"\ace\Addr.i"\

-	{$(INCLUDE)}"\ace\Atomic_Op.i"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.cpp"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.h"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.i"\

-	{$(INCLUDE)}"\ace\config-win32-common.h"\

-	{$(INCLUDE)}"\ace\Config.h"\

-	{$(INCLUDE)}"\ace\Connector.cpp"\

-	{$(INCLUDE)}"\ace\Connector.h"\

-	{$(INCLUDE)}"\ace\Connector.i"\

-	{$(INCLUDE)}"\ace\Containers.cpp"\

-	{$(INCLUDE)}"\ace\Containers.h"\

-	{$(INCLUDE)}"\ace\Containers.i"\

-	{$(INCLUDE)}"\ace\Dynamic.h"\

-	{$(INCLUDE)}"\ace\Dynamic.i"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.cpp"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.i"\

-	{$(INCLUDE)}"\ace\Free_List.cpp"\

-	{$(INCLUDE)}"\ace\Free_List.h"\

-	{$(INCLUDE)}"\ace\Free_List.i"\

-	{$(INCLUDE)}"\ace\Get_Opt.h"\

-	{$(INCLUDE)}"\ace\Get_Opt.i"\

-	{$(INCLUDE)}"\ace\Handle_Set.h"\

-	{$(INCLUDE)}"\ace\Handle_Set.i"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.i"\

-	{$(INCLUDE)}"\ace\IO_Cntl_Msg.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.i"\

-	{$(INCLUDE)}"\ace\Log_Msg.h"\

-	{$(INCLUDE)}"\ace\Log_Priority.h"\

-	{$(INCLUDE)}"\ace\Log_Record.h"\

-	{$(INCLUDE)}"\ace\Log_Record.i"\

-	{$(INCLUDE)}"\ace\Malloc.h"\

-	{$(INCLUDE)}"\ace\Malloc.i"\

-	{$(INCLUDE)}"\ace\Malloc_T.cpp"\

-	{$(INCLUDE)}"\ace\Malloc_T.h"\

-	{$(INCLUDE)}"\ace\Malloc_T.i"\

-	{$(INCLUDE)}"\ace\Managed_Object.cpp"\

-	{$(INCLUDE)}"\ace\Managed_Object.h"\

-	{$(INCLUDE)}"\ace\Managed_Object.i"\

-	{$(INCLUDE)}"\ace\Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Map_Manager.h"\

-	{$(INCLUDE)}"\ace\Map_Manager.i"\

-	{$(INCLUDE)}"\ace\Mem_Map.h"\

-	{$(INCLUDE)}"\ace\Mem_Map.i"\

-	{$(INCLUDE)}"\ace\Memory_Pool.h"\

-	{$(INCLUDE)}"\ace\Memory_Pool.i"\

-	{$(INCLUDE)}"\ace\Message_Block.h"\

-	{$(INCLUDE)}"\ace\Message_Block.i"\

-	{$(INCLUDE)}"\ace\Message_Queue.cpp"\

-	{$(INCLUDE)}"\ace\Message_Queue.h"\

-	{$(INCLUDE)}"\ace\Message_Queue.i"\

-	{$(INCLUDE)}"\ace\Module.cpp"\

-	{$(INCLUDE)}"\ace\Module.h"\

-	{$(INCLUDE)}"\ace\Module.i"\

-	{$(INCLUDE)}"\ace\Object_Manager.h"\

-	{$(INCLUDE)}"\ace\Object_Manager.i"\

-	{$(INCLUDE)}"\ace\OS.h"\

-	{$(INCLUDE)}"\ace\OS.i"\

-	{$(INCLUDE)}"\ace\Reactor.h"\

-	{$(INCLUDE)}"\ace\Reactor.i"\

-	{$(INCLUDE)}"\ace\Reactor_Impl.h"\

-	{$(INCLUDE)}"\ace\Service_Config.h"\

-	{$(INCLUDE)}"\ace\Service_Config.i"\

-	{$(INCLUDE)}"\ace\Service_Object.h"\

-	{$(INCLUDE)}"\ace\Service_Object.i"\

-	{$(INCLUDE)}"\ace\Service_Repository.h"\

-	{$(INCLUDE)}"\ace\Service_Repository.i"\

-	{$(INCLUDE)}"\ace\Service_Types.h"\

-	{$(INCLUDE)}"\ace\Service_Types.i"\

-	{$(INCLUDE)}"\ace\Shared_Object.h"\

-	{$(INCLUDE)}"\ace\Shared_Object.i"\

-	{$(INCLUDE)}"\ace\Signal.h"\

-	{$(INCLUDE)}"\ace\Signal.i"\

-	{$(INCLUDE)}"\ace\Singleton.cpp"\

-	{$(INCLUDE)}"\ace\Singleton.h"\

-	{$(INCLUDE)}"\ace\Singleton.i"\

-	{$(INCLUDE)}"\ace\SOCK.h"\

-	{$(INCLUDE)}"\ace\SOCK.i"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.h"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.i"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.h"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.i"\

-	{$(INCLUDE)}"\ace\SOCK_IO.h"\

-	{$(INCLUDE)}"\ace\SOCK_IO.i"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.h"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.i"\

-	{$(INCLUDE)}"\ace\SString.h"\

-	{$(INCLUDE)}"\ace\SString.i"\

-	{$(INCLUDE)}"\ace\stdcpp.h"\

-	{$(INCLUDE)}"\ace\Strategies.h"\

-	{$(INCLUDE)}"\ace\Strategies_T.cpp"\

-	{$(INCLUDE)}"\ace\Strategies_T.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.cpp"\

-	{$(INCLUDE)}"\ace\Stream_Modules.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.i"\

-	{$(INCLUDE)}"\ace\Svc_Conf_Tokens.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.cpp"\

-	{$(INCLUDE)}"\ace\Svc_Handler.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.i"\

-	{$(INCLUDE)}"\ace\Synch.h"\

-	{$(INCLUDE)}"\ace\Synch.i"\

-	{$(INCLUDE)}"\ace\Synch_Options.h"\

-	{$(INCLUDE)}"\ace\Synch_T.cpp"\

-	{$(INCLUDE)}"\ace\Synch_T.h"\

-	{$(INCLUDE)}"\ace\Synch_T.i"\

-	{$(INCLUDE)}"\ace\Task.h"\

-	{$(INCLUDE)}"\ace\Task.i"\

-	{$(INCLUDE)}"\ace\Task_T.cpp"\

-	{$(INCLUDE)}"\ace\Task_T.h"\

-	{$(INCLUDE)}"\ace\Task_T.i"\

-	{$(INCLUDE)}"\ace\Thread.h"\

-	{$(INCLUDE)}"\ace\Thread.i"\

-	{$(INCLUDE)}"\ace\Thread_Manager.h"\

-	{$(INCLUDE)}"\ace\Thread_Manager.i"\

-	{$(INCLUDE)}"\ace\Time_Value.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.cpp"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.i"\

-	{$(INCLUDE)}"\ace\Trace.h"\

-	{$(INCLUDE)}"\ace\Version.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.i"\

-	{$(INCLUDE)}"\ace\ws2tcpip.h"\

-	

-

-"$(INTDIR)\connect.obj" : $(SOURCE) $(DEP_CPP_CONNE) "$(INTDIR)"

-

-

-!ELSEIF  "$(CFG)" == "TAO - Win32 Debug"

-

-DEP_CPP_CONNE=\

-	"..\..\ace\config-win32.h"\

-	{$(INCLUDE)}"\.\align.h"\

-	{$(INCLUDE)}"\.\any.h"\

-	{$(INCLUDE)}"\.\any.i"\

-	{$(INCLUDE)}"\.\cdr.h"\

-	{$(INCLUDE)}"\.\cdr.i"\

-	{$(INCLUDE)}"\.\client_factory.h"\

-	{$(INCLUDE)}"\.\connect.h"\

-	{$(INCLUDE)}"\.\connect.i"\

-	{$(INCLUDE)}"\.\corba.h"\

-	{$(INCLUDE)}"\.\corbacom.h"\

-	{$(INCLUDE)}"\.\corbacom.i"\

-	{$(INCLUDE)}"\.\debug.h"\

-	{$(INCLUDE)}"\.\default_client.h"\

-	{$(INCLUDE)}"\.\default_client.i"\

-	{$(INCLUDE)}"\.\default_server.h"\

-	{$(INCLUDE)}"\.\default_server.i"\

-	{$(INCLUDE)}"\.\except.h"\

-	{$(INCLUDE)}"\.\giop.h"\

-	{$(INCLUDE)}"\.\giop.i"\

-	{$(INCLUDE)}"\.\iiopobj.h"\

-	{$(INCLUDE)}"\.\iiopobj.i"\

-	{$(INCLUDE)}"\.\iioporb.h"\

-	{$(INCLUDE)}"\.\iioporb.i"\

-	{$(INCLUDE)}"\.\marshal.h"\

-	{$(INCLUDE)}"\.\marshal.i"\

-	{$(INCLUDE)}"\.\nvlist.h"\

-	{$(INCLUDE)}"\.\object.h"\

-	{$(INCLUDE)}"\.\object.i"\

-	{$(INCLUDE)}"\.\objtable.h"\

-	{$(INCLUDE)}"\.\optable.h"\

-	{$(INCLUDE)}"\.\orb.h"\

-	{$(INCLUDE)}"\.\orb_core.h"\

-	{$(INCLUDE)}"\.\orb_core.i"\

-	{$(INCLUDE)}"\.\orbconf.h"\

-	{$(INCLUDE)}"\.\orbobj.h"\

-	{$(INCLUDE)}"\.\orbobj.i"\

-	{$(INCLUDE)}"\.\params.h"\

-	{$(INCLUDE)}"\.\params.i"\

-	{$(INCLUDE)}"\.\poa.h"\

-	{$(INCLUDE)}"\.\poa.i"\

-	{$(INCLUDE)}"\.\principa.h"\

-	{$(INCLUDE)}"\.\request.h"\

-	{$(INCLUDE)}"\.\sequence.h"\

-	{$(INCLUDE)}"\.\sequence.i"\

-	{$(INCLUDE)}"\.\server_factory.h"\

-	{$(INCLUDE)}"\.\server_factory.i"\

-	{$(INCLUDE)}"\.\singletons.h"\

-	{$(INCLUDE)}"\.\stub.h"\

-	{$(INCLUDE)}"\.\stub.i"\

-	{$(INCLUDE)}"\.\svrrqst.h"\

-	{$(INCLUDE)}"\.\typecode.h"\

-	{$(INCLUDE)}"\.\typecode.i"\

-	{$(INCLUDE)}"\.\varout.h"\

-	{$(INCLUDE)}"\ace\Acceptor.cpp"\

-	{$(INCLUDE)}"\ace\Acceptor.h"\

-	{$(INCLUDE)}"\ace\Acceptor.i"\

-	{$(INCLUDE)}"\ace\ACE.h"\

-	{$(INCLUDE)}"\ace\ACE.i"\

-	{$(INCLUDE)}"\ace\Addr.h"\

-	{$(INCLUDE)}"\ace\Addr.i"\

-	{$(INCLUDE)}"\ace\Atomic_Op.i"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.cpp"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.h"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.i"\

-	{$(INCLUDE)}"\ace\config-win32-common.h"\

-	{$(INCLUDE)}"\ace\Config.h"\

-	{$(INCLUDE)}"\ace\Connector.cpp"\

-	{$(INCLUDE)}"\ace\Connector.h"\

-	{$(INCLUDE)}"\ace\Connector.i"\

-	{$(INCLUDE)}"\ace\Containers.cpp"\

-	{$(INCLUDE)}"\ace\Containers.h"\

-	{$(INCLUDE)}"\ace\Containers.i"\

-	{$(INCLUDE)}"\ace\Dynamic.h"\

-	{$(INCLUDE)}"\ace\Dynamic.i"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.cpp"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.i"\

-	{$(INCLUDE)}"\ace\Free_List.cpp"\

-	{$(INCLUDE)}"\ace\Free_List.h"\

-	{$(INCLUDE)}"\ace\Free_List.i"\

-	{$(INCLUDE)}"\ace\Get_Opt.h"\

-	{$(INCLUDE)}"\ace\Get_Opt.i"\

-	{$(INCLUDE)}"\ace\Handle_Set.h"\

-	{$(INCLUDE)}"\ace\Handle_Set.i"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.i"\

-	{$(INCLUDE)}"\ace\IO_Cntl_Msg.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.i"\

-	{$(INCLUDE)}"\ace\Log_Msg.h"\

-	{$(INCLUDE)}"\ace\Log_Priority.h"\

-	{$(INCLUDE)}"\ace\Log_Record.h"\

-	{$(INCLUDE)}"\ace\Log_Record.i"\

-	{$(INCLUDE)}"\ace\Malloc.h"\

-	{$(INCLUDE)}"\ace\Malloc.i"\

-	{$(INCLUDE)}"\ace\Malloc_T.cpp"\

-	{$(INCLUDE)}"\ace\Malloc_T.h"\

-	{$(INCLUDE)}"\ace\Malloc_T.i"\

-	{$(INCLUDE)}"\ace\Managed_Object.cpp"\

-	{$(INCLUDE)}"\ace\Managed_Object.h"\

-	{$(INCLUDE)}"\ace\Managed_Object.i"\

-	{$(INCLUDE)}"\ace\Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Map_Manager.h"\

-	{$(INCLUDE)}"\ace\Map_Manager.i"\

-	{$(INCLUDE)}"\ace\Mem_Map.h"\

-	{$(INCLUDE)}"\ace\Mem_Map.i"\

-	{$(INCLUDE)}"\ace\Memory_Pool.h"\

-	{$(INCLUDE)}"\ace\Memory_Pool.i"\

-	{$(INCLUDE)}"\ace\Message_Block.h"\

-	{$(INCLUDE)}"\ace\Message_Block.i"\

-	{$(INCLUDE)}"\ace\Message_Queue.cpp"\

-	{$(INCLUDE)}"\ace\Message_Queue.h"\

-	{$(INCLUDE)}"\ace\Message_Queue.i"\

-	{$(INCLUDE)}"\ace\Module.cpp"\

-	{$(INCLUDE)}"\ace\Module.h"\

-	{$(INCLUDE)}"\ace\Module.i"\

-	{$(INCLUDE)}"\ace\Object_Manager.h"\

-	{$(INCLUDE)}"\ace\Object_Manager.i"\

-	{$(INCLUDE)}"\ace\OS.h"\

-	{$(INCLUDE)}"\ace\OS.i"\

-	{$(INCLUDE)}"\ace\Reactor.h"\

-	{$(INCLUDE)}"\ace\Reactor.i"\

-	{$(INCLUDE)}"\ace\Reactor_Impl.h"\

-	{$(INCLUDE)}"\ace\Service_Config.h"\

-	{$(INCLUDE)}"\ace\Service_Config.i"\

-	{$(INCLUDE)}"\ace\Service_Object.h"\

-	{$(INCLUDE)}"\ace\Service_Object.i"\

-	{$(INCLUDE)}"\ace\Service_Repository.h"\

-	{$(INCLUDE)}"\ace\Service_Repository.i"\

-	{$(INCLUDE)}"\ace\Service_Types.h"\

-	{$(INCLUDE)}"\ace\Service_Types.i"\

-	{$(INCLUDE)}"\ace\Shared_Object.h"\

-	{$(INCLUDE)}"\ace\Shared_Object.i"\

-	{$(INCLUDE)}"\ace\Signal.h"\

-	{$(INCLUDE)}"\ace\Signal.i"\

-	{$(INCLUDE)}"\ace\Singleton.cpp"\

-	{$(INCLUDE)}"\ace\Singleton.h"\

-	{$(INCLUDE)}"\ace\Singleton.i"\

-	{$(INCLUDE)}"\ace\SOCK.h"\

-	{$(INCLUDE)}"\ace\SOCK.i"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.h"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.i"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.h"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.i"\

-	{$(INCLUDE)}"\ace\SOCK_IO.h"\

-	{$(INCLUDE)}"\ace\SOCK_IO.i"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.h"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.i"\

-	{$(INCLUDE)}"\ace\SString.h"\

-	{$(INCLUDE)}"\ace\SString.i"\

-	{$(INCLUDE)}"\ace\stdcpp.h"\

-	{$(INCLUDE)}"\ace\Strategies.h"\

-	{$(INCLUDE)}"\ace\Strategies_T.cpp"\

-	{$(INCLUDE)}"\ace\Strategies_T.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.cpp"\

-	{$(INCLUDE)}"\ace\Stream_Modules.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.i"\

-	{$(INCLUDE)}"\ace\Svc_Conf_Tokens.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.cpp"\

-	{$(INCLUDE)}"\ace\Svc_Handler.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.i"\

-	{$(INCLUDE)}"\ace\Synch.h"\

-	{$(INCLUDE)}"\ace\Synch.i"\

-	{$(INCLUDE)}"\ace\Synch_Options.h"\

-	{$(INCLUDE)}"\ace\Synch_T.cpp"\

-	{$(INCLUDE)}"\ace\Synch_T.h"\

-	{$(INCLUDE)}"\ace\Synch_T.i"\

-	{$(INCLUDE)}"\ace\Task.h"\

-	{$(INCLUDE)}"\ace\Task.i"\

-	{$(INCLUDE)}"\ace\Task_T.cpp"\

-	{$(INCLUDE)}"\ace\Task_T.h"\

-	{$(INCLUDE)}"\ace\Task_T.i"\

-	{$(INCLUDE)}"\ace\Thread.h"\

-	{$(INCLUDE)}"\ace\Thread.i"\

-	{$(INCLUDE)}"\ace\Thread_Manager.h"\

-	{$(INCLUDE)}"\ace\Thread_Manager.i"\

-	{$(INCLUDE)}"\ace\Time_Value.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.cpp"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.i"\

-	{$(INCLUDE)}"\ace\Trace.h"\

-	{$(INCLUDE)}"\ace\Version.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.i"\

-	{$(INCLUDE)}"\ace\ws2tcpip.h"\

-	

-

-"$(INTDIR)\connect.obj" : $(SOURCE) $(DEP_CPP_CONNE) "$(INTDIR)"

-

-

-!ENDIF 

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\corbacom.cpp

-DEP_CPP_CORBA=\

-	"..\..\ace\config-win32.h"\

-	{$(INCLUDE)}"\.\align.h"\

-	{$(INCLUDE)}"\.\any.h"\

-	{$(INCLUDE)}"\.\any.i"\

-	{$(INCLUDE)}"\.\cdr.h"\

-	{$(INCLUDE)}"\.\cdr.i"\

-	{$(INCLUDE)}"\.\client_factory.h"\

-	{$(INCLUDE)}"\.\connect.h"\

-	{$(INCLUDE)}"\.\connect.i"\

-	{$(INCLUDE)}"\.\corba.h"\

-	{$(INCLUDE)}"\.\corbacom.h"\

-	{$(INCLUDE)}"\.\corbacom.i"\

-	{$(INCLUDE)}"\.\debug.h"\

-	{$(INCLUDE)}"\.\default_client.h"\

-	{$(INCLUDE)}"\.\default_client.i"\

-	{$(INCLUDE)}"\.\default_server.h"\

-	{$(INCLUDE)}"\.\default_server.i"\

-	{$(INCLUDE)}"\.\except.h"\

-	{$(INCLUDE)}"\.\giop.h"\

-	{$(INCLUDE)}"\.\giop.i"\

-	{$(INCLUDE)}"\.\iiopobj.h"\

-	{$(INCLUDE)}"\.\iiopobj.i"\

-	{$(INCLUDE)}"\.\iioporb.h"\

-	{$(INCLUDE)}"\.\iioporb.i"\

-	{$(INCLUDE)}"\.\marshal.h"\

-	{$(INCLUDE)}"\.\marshal.i"\

-	{$(INCLUDE)}"\.\nvlist.h"\

-	{$(INCLUDE)}"\.\object.h"\

-	{$(INCLUDE)}"\.\object.i"\

-	{$(INCLUDE)}"\.\objtable.h"\

-	{$(INCLUDE)}"\.\optable.h"\

-	{$(INCLUDE)}"\.\orb.h"\

-	{$(INCLUDE)}"\.\orb_core.h"\

-	{$(INCLUDE)}"\.\orb_core.i"\

-	{$(INCLUDE)}"\.\orbconf.h"\

-	{$(INCLUDE)}"\.\orbobj.h"\

-	{$(INCLUDE)}"\.\orbobj.i"\

-	{$(INCLUDE)}"\.\params.h"\

-	{$(INCLUDE)}"\.\params.i"\

-	{$(INCLUDE)}"\.\poa.h"\

-	{$(INCLUDE)}"\.\poa.i"\

-	{$(INCLUDE)}"\.\principa.h"\

-	{$(INCLUDE)}"\.\request.h"\

-	{$(INCLUDE)}"\.\sequence.h"\

-	{$(INCLUDE)}"\.\sequence.i"\

-	{$(INCLUDE)}"\.\server_factory.h"\

-	{$(INCLUDE)}"\.\server_factory.i"\

-	{$(INCLUDE)}"\.\singletons.h"\

-	{$(INCLUDE)}"\.\stub.h"\

-	{$(INCLUDE)}"\.\stub.i"\

-	{$(INCLUDE)}"\.\svrrqst.h"\

-	{$(INCLUDE)}"\.\typecode.h"\

-	{$(INCLUDE)}"\.\typecode.i"\

-	{$(INCLUDE)}"\.\varout.h"\

-	{$(INCLUDE)}"\ace\Acceptor.cpp"\

-	{$(INCLUDE)}"\ace\Acceptor.h"\

-	{$(INCLUDE)}"\ace\Acceptor.i"\

-	{$(INCLUDE)}"\ace\ACE.h"\

-	{$(INCLUDE)}"\ace\ACE.i"\

-	{$(INCLUDE)}"\ace\Addr.h"\

-	{$(INCLUDE)}"\ace\Addr.i"\

-	{$(INCLUDE)}"\ace\Atomic_Op.i"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.cpp"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.h"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.i"\

-	{$(INCLUDE)}"\ace\config-win32-common.h"\

-	{$(INCLUDE)}"\ace\Config.h"\

-	{$(INCLUDE)}"\ace\Connector.cpp"\

-	{$(INCLUDE)}"\ace\Connector.h"\

-	{$(INCLUDE)}"\ace\Connector.i"\

-	{$(INCLUDE)}"\ace\Containers.cpp"\

-	{$(INCLUDE)}"\ace\Containers.h"\

-	{$(INCLUDE)}"\ace\Containers.i"\

-	{$(INCLUDE)}"\ace\Dynamic.h"\

-	{$(INCLUDE)}"\ace\Dynamic.i"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.cpp"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.i"\

-	{$(INCLUDE)}"\ace\Free_List.cpp"\

-	{$(INCLUDE)}"\ace\Free_List.h"\

-	{$(INCLUDE)}"\ace\Free_List.i"\

-	{$(INCLUDE)}"\ace\Get_Opt.h"\

-	{$(INCLUDE)}"\ace\Get_Opt.i"\

-	{$(INCLUDE)}"\ace\Handle_Set.h"\

-	{$(INCLUDE)}"\ace\Handle_Set.i"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.i"\

-	{$(INCLUDE)}"\ace\IO_Cntl_Msg.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.i"\

-	{$(INCLUDE)}"\ace\Log_Msg.h"\

-	{$(INCLUDE)}"\ace\Log_Priority.h"\

-	{$(INCLUDE)}"\ace\Log_Record.h"\

-	{$(INCLUDE)}"\ace\Log_Record.i"\

-	{$(INCLUDE)}"\ace\Malloc.h"\

-	{$(INCLUDE)}"\ace\Malloc.i"\

-	{$(INCLUDE)}"\ace\Malloc_T.cpp"\

-	{$(INCLUDE)}"\ace\Malloc_T.h"\

-	{$(INCLUDE)}"\ace\Malloc_T.i"\

-	{$(INCLUDE)}"\ace\Managed_Object.cpp"\

-	{$(INCLUDE)}"\ace\Managed_Object.h"\

-	{$(INCLUDE)}"\ace\Managed_Object.i"\

-	{$(INCLUDE)}"\ace\Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Map_Manager.h"\

-	{$(INCLUDE)}"\ace\Map_Manager.i"\

-	{$(INCLUDE)}"\ace\Mem_Map.h"\

-	{$(INCLUDE)}"\ace\Mem_Map.i"\

-	{$(INCLUDE)}"\ace\Memory_Pool.h"\

-	{$(INCLUDE)}"\ace\Memory_Pool.i"\

-	{$(INCLUDE)}"\ace\Message_Block.h"\

-	{$(INCLUDE)}"\ace\Message_Block.i"\

-	{$(INCLUDE)}"\ace\Message_Queue.cpp"\

-	{$(INCLUDE)}"\ace\Message_Queue.h"\

-	{$(INCLUDE)}"\ace\Message_Queue.i"\

-	{$(INCLUDE)}"\ace\Module.cpp"\

-	{$(INCLUDE)}"\ace\Module.h"\

-	{$(INCLUDE)}"\ace\Module.i"\

-	{$(INCLUDE)}"\ace\Object_Manager.h"\

-	{$(INCLUDE)}"\ace\Object_Manager.i"\

-	{$(INCLUDE)}"\ace\OS.h"\

-	{$(INCLUDE)}"\ace\OS.i"\

-	{$(INCLUDE)}"\ace\Reactor.h"\

-	{$(INCLUDE)}"\ace\Reactor.i"\

-	{$(INCLUDE)}"\ace\Reactor_Impl.h"\

-	{$(INCLUDE)}"\ace\Service_Config.h"\

-	{$(INCLUDE)}"\ace\Service_Config.i"\

-	{$(INCLUDE)}"\ace\Service_Object.h"\

-	{$(INCLUDE)}"\ace\Service_Object.i"\

-	{$(INCLUDE)}"\ace\Service_Repository.h"\

-	{$(INCLUDE)}"\ace\Service_Repository.i"\

-	{$(INCLUDE)}"\ace\Service_Types.h"\

-	{$(INCLUDE)}"\ace\Service_Types.i"\

-	{$(INCLUDE)}"\ace\Shared_Object.h"\

-	{$(INCLUDE)}"\ace\Shared_Object.i"\

-	{$(INCLUDE)}"\ace\Signal.h"\

-	{$(INCLUDE)}"\ace\Signal.i"\

-	{$(INCLUDE)}"\ace\Singleton.cpp"\

-	{$(INCLUDE)}"\ace\Singleton.h"\

-	{$(INCLUDE)}"\ace\Singleton.i"\

-	{$(INCLUDE)}"\ace\SOCK.h"\

-	{$(INCLUDE)}"\ace\SOCK.i"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.h"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.i"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.h"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.i"\

-	{$(INCLUDE)}"\ace\SOCK_IO.h"\

-	{$(INCLUDE)}"\ace\SOCK_IO.i"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.h"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.i"\

-	{$(INCLUDE)}"\ace\SString.h"\

-	{$(INCLUDE)}"\ace\SString.i"\

-	{$(INCLUDE)}"\ace\stdcpp.h"\

-	{$(INCLUDE)}"\ace\Strategies.h"\

-	{$(INCLUDE)}"\ace\Strategies_T.cpp"\

-	{$(INCLUDE)}"\ace\Strategies_T.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.cpp"\

-	{$(INCLUDE)}"\ace\Stream_Modules.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.i"\

-	{$(INCLUDE)}"\ace\Svc_Conf_Tokens.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.cpp"\

-	{$(INCLUDE)}"\ace\Svc_Handler.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.i"\

-	{$(INCLUDE)}"\ace\Synch.h"\

-	{$(INCLUDE)}"\ace\Synch.i"\

-	{$(INCLUDE)}"\ace\Synch_Options.h"\

-	{$(INCLUDE)}"\ace\Synch_T.cpp"\

-	{$(INCLUDE)}"\ace\Synch_T.h"\

-	{$(INCLUDE)}"\ace\Synch_T.i"\

-	{$(INCLUDE)}"\ace\Task.h"\

-	{$(INCLUDE)}"\ace\Task.i"\

-	{$(INCLUDE)}"\ace\Task_T.cpp"\

-	{$(INCLUDE)}"\ace\Task_T.h"\

-	{$(INCLUDE)}"\ace\Task_T.i"\

-	{$(INCLUDE)}"\ace\Thread.h"\

-	{$(INCLUDE)}"\ace\Thread.i"\

-	{$(INCLUDE)}"\ace\Thread_Manager.h"\

-	{$(INCLUDE)}"\ace\Thread_Manager.i"\

-	{$(INCLUDE)}"\ace\Time_Value.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.cpp"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.i"\

-	{$(INCLUDE)}"\ace\Trace.h"\

-	{$(INCLUDE)}"\ace\Version.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.i"\

-	{$(INCLUDE)}"\ace\ws2tcpip.h"\

-	

-NODEP_CPP_CORBA=\

-	".\tao\factories.h"\

-	

-

-"$(INTDIR)\corbacom.obj" : $(SOURCE) $(DEP_CPP_CORBA) "$(INTDIR)"

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\debug.cpp

-

-!IF  "$(CFG)" == "TAO - Win32 Release"

-

-DEP_CPP_DEBUG=\

-	"..\..\ace\config-win32.h"\

-	{$(INCLUDE)}"\.\align.h"\

-	{$(INCLUDE)}"\.\any.h"\

-	{$(INCLUDE)}"\.\any.i"\

-	{$(INCLUDE)}"\.\cdr.h"\

-	{$(INCLUDE)}"\.\cdr.i"\

-	{$(INCLUDE)}"\.\client_factory.h"\

-	{$(INCLUDE)}"\.\connect.h"\

-	{$(INCLUDE)}"\.\connect.i"\

-	{$(INCLUDE)}"\.\corba.h"\

-	{$(INCLUDE)}"\.\corbacom.h"\

-	{$(INCLUDE)}"\.\corbacom.i"\

-	{$(INCLUDE)}"\.\debug.h"\

-	{$(INCLUDE)}"\.\default_client.h"\

-	{$(INCLUDE)}"\.\default_client.i"\

-	{$(INCLUDE)}"\.\default_server.h"\

-	{$(INCLUDE)}"\.\default_server.i"\

-	{$(INCLUDE)}"\.\except.h"\

-	{$(INCLUDE)}"\.\giop.h"\

-	{$(INCLUDE)}"\.\giop.i"\

-	{$(INCLUDE)}"\.\iiopobj.h"\

-	{$(INCLUDE)}"\.\iiopobj.i"\

-	{$(INCLUDE)}"\.\iioporb.h"\

-	{$(INCLUDE)}"\.\iioporb.i"\

-	{$(INCLUDE)}"\.\marshal.h"\

-	{$(INCLUDE)}"\.\marshal.i"\

-	{$(INCLUDE)}"\.\nvlist.h"\

-	{$(INCLUDE)}"\.\object.h"\

-	{$(INCLUDE)}"\.\object.i"\

-	{$(INCLUDE)}"\.\objtable.h"\

-	{$(INCLUDE)}"\.\optable.h"\

-	{$(INCLUDE)}"\.\orb.h"\

-	{$(INCLUDE)}"\.\orb_core.h"\

-	{$(INCLUDE)}"\.\orb_core.i"\

-	{$(INCLUDE)}"\.\orbconf.h"\

-	{$(INCLUDE)}"\.\orbobj.h"\

-	{$(INCLUDE)}"\.\orbobj.i"\

-	{$(INCLUDE)}"\.\params.h"\

-	{$(INCLUDE)}"\.\params.i"\

-	{$(INCLUDE)}"\.\poa.h"\

-	{$(INCLUDE)}"\.\poa.i"\

-	{$(INCLUDE)}"\.\principa.h"\

-	{$(INCLUDE)}"\.\request.h"\

-	{$(INCLUDE)}"\.\sequence.h"\

-	{$(INCLUDE)}"\.\sequence.i"\

-	{$(INCLUDE)}"\.\server_factory.h"\

-	{$(INCLUDE)}"\.\server_factory.i"\

-	{$(INCLUDE)}"\.\singletons.h"\

-	{$(INCLUDE)}"\.\stub.h"\

-	{$(INCLUDE)}"\.\stub.i"\

-	{$(INCLUDE)}"\.\svrrqst.h"\

-	{$(INCLUDE)}"\.\typecode.h"\

-	{$(INCLUDE)}"\.\typecode.i"\

-	{$(INCLUDE)}"\.\varout.h"\

-	{$(INCLUDE)}"\ace\Acceptor.cpp"\

-	{$(INCLUDE)}"\ace\Acceptor.h"\

-	{$(INCLUDE)}"\ace\Acceptor.i"\

-	{$(INCLUDE)}"\ace\ACE.h"\

-	{$(INCLUDE)}"\ace\ACE.i"\

-	{$(INCLUDE)}"\ace\Addr.h"\

-	{$(INCLUDE)}"\ace\Addr.i"\

-	{$(INCLUDE)}"\ace\Atomic_Op.i"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.cpp"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.h"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.i"\

-	{$(INCLUDE)}"\ace\config-win32-common.h"\

-	{$(INCLUDE)}"\ace\Config.h"\

-	{$(INCLUDE)}"\ace\Connector.cpp"\

-	{$(INCLUDE)}"\ace\Connector.h"\

-	{$(INCLUDE)}"\ace\Connector.i"\

-	{$(INCLUDE)}"\ace\Containers.cpp"\

-	{$(INCLUDE)}"\ace\Containers.h"\

-	{$(INCLUDE)}"\ace\Containers.i"\

-	{$(INCLUDE)}"\ace\Dynamic.h"\

-	{$(INCLUDE)}"\ace\Dynamic.i"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.cpp"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.i"\

-	{$(INCLUDE)}"\ace\Free_List.cpp"\

-	{$(INCLUDE)}"\ace\Free_List.h"\

-	{$(INCLUDE)}"\ace\Free_List.i"\

-	{$(INCLUDE)}"\ace\Get_Opt.h"\

-	{$(INCLUDE)}"\ace\Get_Opt.i"\

-	{$(INCLUDE)}"\ace\Handle_Set.h"\

-	{$(INCLUDE)}"\ace\Handle_Set.i"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.i"\

-	{$(INCLUDE)}"\ace\IO_Cntl_Msg.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.i"\

-	{$(INCLUDE)}"\ace\Log_Msg.h"\

-	{$(INCLUDE)}"\ace\Log_Priority.h"\

-	{$(INCLUDE)}"\ace\Log_Record.h"\

-	{$(INCLUDE)}"\ace\Log_Record.i"\

-	{$(INCLUDE)}"\ace\Malloc.h"\

-	{$(INCLUDE)}"\ace\Malloc.i"\

-	{$(INCLUDE)}"\ace\Malloc_T.cpp"\

-	{$(INCLUDE)}"\ace\Malloc_T.h"\

-	{$(INCLUDE)}"\ace\Malloc_T.i"\

-	{$(INCLUDE)}"\ace\Managed_Object.cpp"\

-	{$(INCLUDE)}"\ace\Managed_Object.h"\

-	{$(INCLUDE)}"\ace\Managed_Object.i"\

-	{$(INCLUDE)}"\ace\Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Map_Manager.h"\

-	{$(INCLUDE)}"\ace\Map_Manager.i"\

-	{$(INCLUDE)}"\ace\Mem_Map.h"\

-	{$(INCLUDE)}"\ace\Mem_Map.i"\

-	{$(INCLUDE)}"\ace\Memory_Pool.h"\

-	{$(INCLUDE)}"\ace\Memory_Pool.i"\

-	{$(INCLUDE)}"\ace\Message_Block.h"\

-	{$(INCLUDE)}"\ace\Message_Block.i"\

-	{$(INCLUDE)}"\ace\Message_Queue.cpp"\

-	{$(INCLUDE)}"\ace\Message_Queue.h"\

-	{$(INCLUDE)}"\ace\Message_Queue.i"\

-	{$(INCLUDE)}"\ace\Module.cpp"\

-	{$(INCLUDE)}"\ace\Module.h"\

-	{$(INCLUDE)}"\ace\Module.i"\

-	{$(INCLUDE)}"\ace\Object_Manager.h"\

-	{$(INCLUDE)}"\ace\Object_Manager.i"\

-	{$(INCLUDE)}"\ace\OS.h"\

-	{$(INCLUDE)}"\ace\OS.i"\

-	{$(INCLUDE)}"\ace\Reactor.h"\

-	{$(INCLUDE)}"\ace\Reactor.i"\

-	{$(INCLUDE)}"\ace\Reactor_Impl.h"\

-	{$(INCLUDE)}"\ace\Service_Config.h"\

-	{$(INCLUDE)}"\ace\Service_Config.i"\

-	{$(INCLUDE)}"\ace\Service_Object.h"\

-	{$(INCLUDE)}"\ace\Service_Object.i"\

-	{$(INCLUDE)}"\ace\Service_Repository.h"\

-	{$(INCLUDE)}"\ace\Service_Repository.i"\

-	{$(INCLUDE)}"\ace\Service_Types.h"\

-	{$(INCLUDE)}"\ace\Service_Types.i"\

-	{$(INCLUDE)}"\ace\Shared_Object.h"\

-	{$(INCLUDE)}"\ace\Shared_Object.i"\

-	{$(INCLUDE)}"\ace\Signal.h"\

-	{$(INCLUDE)}"\ace\Signal.i"\

-	{$(INCLUDE)}"\ace\Singleton.cpp"\

-	{$(INCLUDE)}"\ace\Singleton.h"\

-	{$(INCLUDE)}"\ace\Singleton.i"\

-	{$(INCLUDE)}"\ace\SOCK.h"\

-	{$(INCLUDE)}"\ace\SOCK.i"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.h"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.i"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.h"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.i"\

-	{$(INCLUDE)}"\ace\SOCK_IO.h"\

-	{$(INCLUDE)}"\ace\SOCK_IO.i"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.h"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.i"\

-	{$(INCLUDE)}"\ace\SString.h"\

-	{$(INCLUDE)}"\ace\SString.i"\

-	{$(INCLUDE)}"\ace\stdcpp.h"\

-	{$(INCLUDE)}"\ace\Strategies.h"\

-	{$(INCLUDE)}"\ace\Strategies_T.cpp"\

-	{$(INCLUDE)}"\ace\Strategies_T.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.cpp"\

-	{$(INCLUDE)}"\ace\Stream_Modules.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.i"\

-	{$(INCLUDE)}"\ace\Svc_Conf_Tokens.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.cpp"\

-	{$(INCLUDE)}"\ace\Svc_Handler.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.i"\

-	{$(INCLUDE)}"\ace\Synch.h"\

-	{$(INCLUDE)}"\ace\Synch.i"\

-	{$(INCLUDE)}"\ace\Synch_Options.h"\

-	{$(INCLUDE)}"\ace\Synch_T.cpp"\

-	{$(INCLUDE)}"\ace\Synch_T.h"\

-	{$(INCLUDE)}"\ace\Synch_T.i"\

-	{$(INCLUDE)}"\ace\Task.h"\

-	{$(INCLUDE)}"\ace\Task.i"\

-	{$(INCLUDE)}"\ace\Task_T.cpp"\

-	{$(INCLUDE)}"\ace\Task_T.h"\

-	{$(INCLUDE)}"\ace\Task_T.i"\

-	{$(INCLUDE)}"\ace\Thread.h"\

-	{$(INCLUDE)}"\ace\Thread.i"\

-	{$(INCLUDE)}"\ace\Thread_Manager.h"\

-	{$(INCLUDE)}"\ace\Thread_Manager.i"\

-	{$(INCLUDE)}"\ace\Time_Value.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.cpp"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.i"\

-	{$(INCLUDE)}"\ace\Trace.h"\

-	{$(INCLUDE)}"\ace\Version.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.i"\

-	{$(INCLUDE)}"\ace\ws2tcpip.h"\

-	

-NODEP_CPP_DEBUG=\

-	".\tao\factories.h"\

-	

-

-"$(INTDIR)\debug.obj" : $(SOURCE) $(DEP_CPP_DEBUG) "$(INTDIR)"

-

-

-!ELSEIF  "$(CFG)" == "TAO - Win32 Debug"

-

-DEP_CPP_DEBUG=\

-	"..\..\ace\config-win32.h"\

-	{$(INCLUDE)}"\.\align.h"\

-	{$(INCLUDE)}"\.\any.h"\

-	{$(INCLUDE)}"\.\any.i"\

-	{$(INCLUDE)}"\.\cdr.h"\

-	{$(INCLUDE)}"\.\cdr.i"\

-	{$(INCLUDE)}"\.\client_factory.h"\

-	{$(INCLUDE)}"\.\connect.h"\

-	{$(INCLUDE)}"\.\connect.i"\

-	{$(INCLUDE)}"\.\corba.h"\

-	{$(INCLUDE)}"\.\corbacom.h"\

-	{$(INCLUDE)}"\.\corbacom.i"\

-	{$(INCLUDE)}"\.\debug.h"\

-	{$(INCLUDE)}"\.\default_client.h"\

-	{$(INCLUDE)}"\.\default_client.i"\

-	{$(INCLUDE)}"\.\default_server.h"\

-	{$(INCLUDE)}"\.\default_server.i"\

-	{$(INCLUDE)}"\.\except.h"\

-	{$(INCLUDE)}"\.\giop.h"\

-	{$(INCLUDE)}"\.\giop.i"\

-	{$(INCLUDE)}"\.\iiopobj.h"\

-	{$(INCLUDE)}"\.\iiopobj.i"\

-	{$(INCLUDE)}"\.\iioporb.h"\

-	{$(INCLUDE)}"\.\iioporb.i"\

-	{$(INCLUDE)}"\.\marshal.h"\

-	{$(INCLUDE)}"\.\marshal.i"\

-	{$(INCLUDE)}"\.\nvlist.h"\

-	{$(INCLUDE)}"\.\object.h"\

-	{$(INCLUDE)}"\.\object.i"\

-	{$(INCLUDE)}"\.\objtable.h"\

-	{$(INCLUDE)}"\.\optable.h"\

-	{$(INCLUDE)}"\.\orb.h"\

-	{$(INCLUDE)}"\.\orb_core.h"\

-	{$(INCLUDE)}"\.\orb_core.i"\

-	{$(INCLUDE)}"\.\orbconf.h"\

-	{$(INCLUDE)}"\.\orbobj.h"\

-	{$(INCLUDE)}"\.\orbobj.i"\

-	{$(INCLUDE)}"\.\params.h"\

-	{$(INCLUDE)}"\.\params.i"\

-	{$(INCLUDE)}"\.\poa.h"\

-	{$(INCLUDE)}"\.\poa.i"\

-	{$(INCLUDE)}"\.\principa.h"\

-	{$(INCLUDE)}"\.\request.h"\

-	{$(INCLUDE)}"\.\sequence.h"\

-	{$(INCLUDE)}"\.\sequence.i"\

-	{$(INCLUDE)}"\.\server_factory.h"\

-	{$(INCLUDE)}"\.\server_factory.i"\

-	{$(INCLUDE)}"\.\singletons.h"\

-	{$(INCLUDE)}"\.\stub.h"\

-	{$(INCLUDE)}"\.\stub.i"\

-	{$(INCLUDE)}"\.\svrrqst.h"\

-	{$(INCLUDE)}"\.\typecode.h"\

-	{$(INCLUDE)}"\.\typecode.i"\

-	{$(INCLUDE)}"\.\varout.h"\

-	{$(INCLUDE)}"\ace\Acceptor.cpp"\

-	{$(INCLUDE)}"\ace\Acceptor.h"\

-	{$(INCLUDE)}"\ace\Acceptor.i"\

-	{$(INCLUDE)}"\ace\ACE.h"\

-	{$(INCLUDE)}"\ace\ACE.i"\

-	{$(INCLUDE)}"\ace\Addr.h"\

-	{$(INCLUDE)}"\ace\Addr.i"\

-	{$(INCLUDE)}"\ace\Atomic_Op.i"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.cpp"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.h"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.i"\

-	{$(INCLUDE)}"\ace\config-win32-common.h"\

-	{$(INCLUDE)}"\ace\Config.h"\

-	{$(INCLUDE)}"\ace\Connector.cpp"\

-	{$(INCLUDE)}"\ace\Connector.h"\

-	{$(INCLUDE)}"\ace\Connector.i"\

-	{$(INCLUDE)}"\ace\Containers.cpp"\

-	{$(INCLUDE)}"\ace\Containers.h"\

-	{$(INCLUDE)}"\ace\Containers.i"\

-	{$(INCLUDE)}"\ace\Dynamic.h"\

-	{$(INCLUDE)}"\ace\Dynamic.i"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.cpp"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.i"\

-	{$(INCLUDE)}"\ace\Free_List.cpp"\

-	{$(INCLUDE)}"\ace\Free_List.h"\

-	{$(INCLUDE)}"\ace\Free_List.i"\

-	{$(INCLUDE)}"\ace\Get_Opt.h"\

-	{$(INCLUDE)}"\ace\Get_Opt.i"\

-	{$(INCLUDE)}"\ace\Handle_Set.h"\

-	{$(INCLUDE)}"\ace\Handle_Set.i"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.i"\

-	{$(INCLUDE)}"\ace\IO_Cntl_Msg.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.i"\

-	{$(INCLUDE)}"\ace\Log_Msg.h"\

-	{$(INCLUDE)}"\ace\Log_Priority.h"\

-	{$(INCLUDE)}"\ace\Log_Record.h"\

-	{$(INCLUDE)}"\ace\Log_Record.i"\

-	{$(INCLUDE)}"\ace\Malloc.h"\

-	{$(INCLUDE)}"\ace\Malloc.i"\

-	{$(INCLUDE)}"\ace\Malloc_T.cpp"\

-	{$(INCLUDE)}"\ace\Malloc_T.h"\

-	{$(INCLUDE)}"\ace\Malloc_T.i"\

-	{$(INCLUDE)}"\ace\Managed_Object.cpp"\

-	{$(INCLUDE)}"\ace\Managed_Object.h"\

-	{$(INCLUDE)}"\ace\Managed_Object.i"\

-	{$(INCLUDE)}"\ace\Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Map_Manager.h"\

-	{$(INCLUDE)}"\ace\Map_Manager.i"\

-	{$(INCLUDE)}"\ace\Mem_Map.h"\

-	{$(INCLUDE)}"\ace\Mem_Map.i"\

-	{$(INCLUDE)}"\ace\Memory_Pool.h"\

-	{$(INCLUDE)}"\ace\Memory_Pool.i"\

-	{$(INCLUDE)}"\ace\Message_Block.h"\

-	{$(INCLUDE)}"\ace\Message_Block.i"\

-	{$(INCLUDE)}"\ace\Message_Queue.cpp"\

-	{$(INCLUDE)}"\ace\Message_Queue.h"\

-	{$(INCLUDE)}"\ace\Message_Queue.i"\

-	{$(INCLUDE)}"\ace\Module.cpp"\

-	{$(INCLUDE)}"\ace\Module.h"\

-	{$(INCLUDE)}"\ace\Module.i"\

-	{$(INCLUDE)}"\ace\Object_Manager.h"\

-	{$(INCLUDE)}"\ace\Object_Manager.i"\

-	{$(INCLUDE)}"\ace\OS.h"\

-	{$(INCLUDE)}"\ace\OS.i"\

-	{$(INCLUDE)}"\ace\Reactor.h"\

-	{$(INCLUDE)}"\ace\Reactor.i"\

-	{$(INCLUDE)}"\ace\Reactor_Impl.h"\

-	{$(INCLUDE)}"\ace\Service_Config.h"\

-	{$(INCLUDE)}"\ace\Service_Config.i"\

-	{$(INCLUDE)}"\ace\Service_Object.h"\

-	{$(INCLUDE)}"\ace\Service_Object.i"\

-	{$(INCLUDE)}"\ace\Service_Repository.h"\

-	{$(INCLUDE)}"\ace\Service_Repository.i"\

-	{$(INCLUDE)}"\ace\Service_Types.h"\

-	{$(INCLUDE)}"\ace\Service_Types.i"\

-	{$(INCLUDE)}"\ace\Shared_Object.h"\

-	{$(INCLUDE)}"\ace\Shared_Object.i"\

-	{$(INCLUDE)}"\ace\Signal.h"\

-	{$(INCLUDE)}"\ace\Signal.i"\

-	{$(INCLUDE)}"\ace\Singleton.cpp"\

-	{$(INCLUDE)}"\ace\Singleton.h"\

-	{$(INCLUDE)}"\ace\Singleton.i"\

-	{$(INCLUDE)}"\ace\SOCK.h"\

-	{$(INCLUDE)}"\ace\SOCK.i"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.h"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.i"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.h"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.i"\

-	{$(INCLUDE)}"\ace\SOCK_IO.h"\

-	{$(INCLUDE)}"\ace\SOCK_IO.i"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.h"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.i"\

-	{$(INCLUDE)}"\ace\SString.h"\

-	{$(INCLUDE)}"\ace\SString.i"\

-	{$(INCLUDE)}"\ace\stdcpp.h"\

-	{$(INCLUDE)}"\ace\Strategies.h"\

-	{$(INCLUDE)}"\ace\Strategies_T.cpp"\

-	{$(INCLUDE)}"\ace\Strategies_T.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.cpp"\

-	{$(INCLUDE)}"\ace\Stream_Modules.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.i"\

-	{$(INCLUDE)}"\ace\Svc_Conf_Tokens.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.cpp"\

-	{$(INCLUDE)}"\ace\Svc_Handler.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.i"\

-	{$(INCLUDE)}"\ace\Synch.h"\

-	{$(INCLUDE)}"\ace\Synch.i"\

-	{$(INCLUDE)}"\ace\Synch_Options.h"\

-	{$(INCLUDE)}"\ace\Synch_T.cpp"\

-	{$(INCLUDE)}"\ace\Synch_T.h"\

-	{$(INCLUDE)}"\ace\Synch_T.i"\

-	{$(INCLUDE)}"\ace\Task.h"\

-	{$(INCLUDE)}"\ace\Task.i"\

-	{$(INCLUDE)}"\ace\Task_T.cpp"\

-	{$(INCLUDE)}"\ace\Task_T.h"\

-	{$(INCLUDE)}"\ace\Task_T.i"\

-	{$(INCLUDE)}"\ace\Thread.h"\

-	{$(INCLUDE)}"\ace\Thread.i"\

-	{$(INCLUDE)}"\ace\Thread_Manager.h"\

-	{$(INCLUDE)}"\ace\Thread_Manager.i"\

-	{$(INCLUDE)}"\ace\Time_Value.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.cpp"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.i"\

-	{$(INCLUDE)}"\ace\Trace.h"\

-	{$(INCLUDE)}"\ace\Version.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.i"\

-	{$(INCLUDE)}"\ace\ws2tcpip.h"\

-	

-NODEP_CPP_DEBUG=\

-	".\tao\factories.h"\

-	

-

-"$(INTDIR)\debug.obj" : $(SOURCE) $(DEP_CPP_DEBUG) "$(INTDIR)"

-

-

-!ENDIF 

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\decode.cpp

-

-!IF  "$(CFG)" == "TAO - Win32 Release"

-

-DEP_CPP_DECOD=\

-	"..\..\ace\config-win32.h"\

-	{$(INCLUDE)}"\.\align.h"\

-	{$(INCLUDE)}"\.\any.h"\

-	{$(INCLUDE)}"\.\any.i"\

-	{$(INCLUDE)}"\.\cdr.h"\

-	{$(INCLUDE)}"\.\cdr.i"\

-	{$(INCLUDE)}"\.\client_factory.h"\

-	{$(INCLUDE)}"\.\connect.h"\

-	{$(INCLUDE)}"\.\connect.i"\

-	{$(INCLUDE)}"\.\corba.h"\

-	{$(INCLUDE)}"\.\corbacom.h"\

-	{$(INCLUDE)}"\.\corbacom.i"\

-	{$(INCLUDE)}"\.\debug.h"\

-	{$(INCLUDE)}"\.\default_client.h"\

-	{$(INCLUDE)}"\.\default_client.i"\

-	{$(INCLUDE)}"\.\default_server.h"\

-	{$(INCLUDE)}"\.\default_server.i"\

-	{$(INCLUDE)}"\.\except.h"\

-	{$(INCLUDE)}"\.\giop.h"\

-	{$(INCLUDE)}"\.\giop.i"\

-	{$(INCLUDE)}"\.\iiopobj.h"\

-	{$(INCLUDE)}"\.\iiopobj.i"\

-	{$(INCLUDE)}"\.\iioporb.h"\

-	{$(INCLUDE)}"\.\iioporb.i"\

-	{$(INCLUDE)}"\.\marshal.h"\

-	{$(INCLUDE)}"\.\marshal.i"\

-	{$(INCLUDE)}"\.\nvlist.h"\

-	{$(INCLUDE)}"\.\object.h"\

-	{$(INCLUDE)}"\.\object.i"\

-	{$(INCLUDE)}"\.\objtable.h"\

-	{$(INCLUDE)}"\.\optable.h"\

-	{$(INCLUDE)}"\.\orb.h"\

-	{$(INCLUDE)}"\.\orb_core.h"\

-	{$(INCLUDE)}"\.\orb_core.i"\

-	{$(INCLUDE)}"\.\orbconf.h"\

-	{$(INCLUDE)}"\.\orbobj.h"\

-	{$(INCLUDE)}"\.\orbobj.i"\

-	{$(INCLUDE)}"\.\params.h"\

-	{$(INCLUDE)}"\.\params.i"\

-	{$(INCLUDE)}"\.\poa.h"\

-	{$(INCLUDE)}"\.\poa.i"\

-	{$(INCLUDE)}"\.\principa.h"\

-	{$(INCLUDE)}"\.\request.h"\

-	{$(INCLUDE)}"\.\sequence.h"\

-	{$(INCLUDE)}"\.\sequence.i"\

-	{$(INCLUDE)}"\.\server_factory.h"\

-	{$(INCLUDE)}"\.\server_factory.i"\

-	{$(INCLUDE)}"\.\singletons.h"\

-	{$(INCLUDE)}"\.\stub.h"\

-	{$(INCLUDE)}"\.\stub.i"\

-	{$(INCLUDE)}"\.\svrrqst.h"\

-	{$(INCLUDE)}"\.\typecode.h"\

-	{$(INCLUDE)}"\.\typecode.i"\

-	{$(INCLUDE)}"\.\varout.h"\

-	{$(INCLUDE)}"\ace\Acceptor.cpp"\

-	{$(INCLUDE)}"\ace\Acceptor.h"\

-	{$(INCLUDE)}"\ace\Acceptor.i"\

-	{$(INCLUDE)}"\ace\ACE.h"\

-	{$(INCLUDE)}"\ace\ACE.i"\

-	{$(INCLUDE)}"\ace\Addr.h"\

-	{$(INCLUDE)}"\ace\Addr.i"\

-	{$(INCLUDE)}"\ace\Atomic_Op.i"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.cpp"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.h"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.i"\

-	{$(INCLUDE)}"\ace\config-win32-common.h"\

-	{$(INCLUDE)}"\ace\Config.h"\

-	{$(INCLUDE)}"\ace\Connector.cpp"\

-	{$(INCLUDE)}"\ace\Connector.h"\

-	{$(INCLUDE)}"\ace\Connector.i"\

-	{$(INCLUDE)}"\ace\Containers.cpp"\

-	{$(INCLUDE)}"\ace\Containers.h"\

-	{$(INCLUDE)}"\ace\Containers.i"\

-	{$(INCLUDE)}"\ace\Dynamic.h"\

-	{$(INCLUDE)}"\ace\Dynamic.i"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.cpp"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.i"\

-	{$(INCLUDE)}"\ace\Free_List.cpp"\

-	{$(INCLUDE)}"\ace\Free_List.h"\

-	{$(INCLUDE)}"\ace\Free_List.i"\

-	{$(INCLUDE)}"\ace\Get_Opt.h"\

-	{$(INCLUDE)}"\ace\Get_Opt.i"\

-	{$(INCLUDE)}"\ace\Handle_Set.h"\

-	{$(INCLUDE)}"\ace\Handle_Set.i"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.i"\

-	{$(INCLUDE)}"\ace\IO_Cntl_Msg.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.i"\

-	{$(INCLUDE)}"\ace\Log_Msg.h"\

-	{$(INCLUDE)}"\ace\Log_Priority.h"\

-	{$(INCLUDE)}"\ace\Log_Record.h"\

-	{$(INCLUDE)}"\ace\Log_Record.i"\

-	{$(INCLUDE)}"\ace\Malloc.h"\

-	{$(INCLUDE)}"\ace\Malloc.i"\

-	{$(INCLUDE)}"\ace\Malloc_T.cpp"\

-	{$(INCLUDE)}"\ace\Malloc_T.h"\

-	{$(INCLUDE)}"\ace\Malloc_T.i"\

-	{$(INCLUDE)}"\ace\Managed_Object.cpp"\

-	{$(INCLUDE)}"\ace\Managed_Object.h"\

-	{$(INCLUDE)}"\ace\Managed_Object.i"\

-	{$(INCLUDE)}"\ace\Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Map_Manager.h"\

-	{$(INCLUDE)}"\ace\Map_Manager.i"\

-	{$(INCLUDE)}"\ace\Mem_Map.h"\

-	{$(INCLUDE)}"\ace\Mem_Map.i"\

-	{$(INCLUDE)}"\ace\Memory_Pool.h"\

-	{$(INCLUDE)}"\ace\Memory_Pool.i"\

-	{$(INCLUDE)}"\ace\Message_Block.h"\

-	{$(INCLUDE)}"\ace\Message_Block.i"\

-	{$(INCLUDE)}"\ace\Message_Queue.cpp"\

-	{$(INCLUDE)}"\ace\Message_Queue.h"\

-	{$(INCLUDE)}"\ace\Message_Queue.i"\

-	{$(INCLUDE)}"\ace\Module.cpp"\

-	{$(INCLUDE)}"\ace\Module.h"\

-	{$(INCLUDE)}"\ace\Module.i"\

-	{$(INCLUDE)}"\ace\Object_Manager.h"\

-	{$(INCLUDE)}"\ace\Object_Manager.i"\

-	{$(INCLUDE)}"\ace\OS.h"\

-	{$(INCLUDE)}"\ace\OS.i"\

-	{$(INCLUDE)}"\ace\Reactor.h"\

-	{$(INCLUDE)}"\ace\Reactor.i"\

-	{$(INCLUDE)}"\ace\Reactor_Impl.h"\

-	{$(INCLUDE)}"\ace\Service_Config.h"\

-	{$(INCLUDE)}"\ace\Service_Config.i"\

-	{$(INCLUDE)}"\ace\Service_Object.h"\

-	{$(INCLUDE)}"\ace\Service_Object.i"\

-	{$(INCLUDE)}"\ace\Service_Repository.h"\

-	{$(INCLUDE)}"\ace\Service_Repository.i"\

-	{$(INCLUDE)}"\ace\Service_Types.h"\

-	{$(INCLUDE)}"\ace\Service_Types.i"\

-	{$(INCLUDE)}"\ace\Shared_Object.h"\

-	{$(INCLUDE)}"\ace\Shared_Object.i"\

-	{$(INCLUDE)}"\ace\Signal.h"\

-	{$(INCLUDE)}"\ace\Signal.i"\

-	{$(INCLUDE)}"\ace\Singleton.cpp"\

-	{$(INCLUDE)}"\ace\Singleton.h"\

-	{$(INCLUDE)}"\ace\Singleton.i"\

-	{$(INCLUDE)}"\ace\SOCK.h"\

-	{$(INCLUDE)}"\ace\SOCK.i"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.h"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.i"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.h"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.i"\

-	{$(INCLUDE)}"\ace\SOCK_IO.h"\

-	{$(INCLUDE)}"\ace\SOCK_IO.i"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.h"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.i"\

-	{$(INCLUDE)}"\ace\SString.h"\

-	{$(INCLUDE)}"\ace\SString.i"\

-	{$(INCLUDE)}"\ace\stdcpp.h"\

-	{$(INCLUDE)}"\ace\Strategies.h"\

-	{$(INCLUDE)}"\ace\Strategies_T.cpp"\

-	{$(INCLUDE)}"\ace\Strategies_T.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.cpp"\

-	{$(INCLUDE)}"\ace\Stream_Modules.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.i"\

-	{$(INCLUDE)}"\ace\Svc_Conf_Tokens.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.cpp"\

-	{$(INCLUDE)}"\ace\Svc_Handler.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.i"\

-	{$(INCLUDE)}"\ace\Synch.h"\

-	{$(INCLUDE)}"\ace\Synch.i"\

-	{$(INCLUDE)}"\ace\Synch_Options.h"\

-	{$(INCLUDE)}"\ace\Synch_T.cpp"\

-	{$(INCLUDE)}"\ace\Synch_T.h"\

-	{$(INCLUDE)}"\ace\Synch_T.i"\

-	{$(INCLUDE)}"\ace\Task.h"\

-	{$(INCLUDE)}"\ace\Task.i"\

-	{$(INCLUDE)}"\ace\Task_T.cpp"\

-	{$(INCLUDE)}"\ace\Task_T.h"\

-	{$(INCLUDE)}"\ace\Task_T.i"\

-	{$(INCLUDE)}"\ace\Thread.h"\

-	{$(INCLUDE)}"\ace\Thread.i"\

-	{$(INCLUDE)}"\ace\Thread_Manager.h"\

-	{$(INCLUDE)}"\ace\Thread_Manager.i"\

-	{$(INCLUDE)}"\ace\Time_Value.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.cpp"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.i"\

-	{$(INCLUDE)}"\ace\Trace.h"\

-	{$(INCLUDE)}"\ace\Version.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.i"\

-	{$(INCLUDE)}"\ace\ws2tcpip.h"\

-	

-NODEP_CPP_DECOD=\

-	".\tao\factories.h"\

-	

-

-"$(INTDIR)\decode.obj" : $(SOURCE) $(DEP_CPP_DECOD) "$(INTDIR)"

-

-

-!ELSEIF  "$(CFG)" == "TAO - Win32 Debug"

-

-DEP_CPP_DECOD=\

-	"..\..\ace\config-win32.h"\

-	{$(INCLUDE)}"\.\align.h"\

-	{$(INCLUDE)}"\.\any.h"\

-	{$(INCLUDE)}"\.\any.i"\

-	{$(INCLUDE)}"\.\cdr.h"\

-	{$(INCLUDE)}"\.\cdr.i"\

-	{$(INCLUDE)}"\.\client_factory.h"\

-	{$(INCLUDE)}"\.\connect.h"\

-	{$(INCLUDE)}"\.\connect.i"\

-	{$(INCLUDE)}"\.\corba.h"\

-	{$(INCLUDE)}"\.\corbacom.h"\

-	{$(INCLUDE)}"\.\corbacom.i"\

-	{$(INCLUDE)}"\.\debug.h"\

-	{$(INCLUDE)}"\.\default_client.h"\

-	{$(INCLUDE)}"\.\default_client.i"\

-	{$(INCLUDE)}"\.\default_server.h"\

-	{$(INCLUDE)}"\.\default_server.i"\

-	{$(INCLUDE)}"\.\except.h"\

-	{$(INCLUDE)}"\.\giop.h"\

-	{$(INCLUDE)}"\.\giop.i"\

-	{$(INCLUDE)}"\.\iiopobj.h"\

-	{$(INCLUDE)}"\.\iiopobj.i"\

-	{$(INCLUDE)}"\.\iioporb.h"\

-	{$(INCLUDE)}"\.\iioporb.i"\

-	{$(INCLUDE)}"\.\marshal.h"\

-	{$(INCLUDE)}"\.\marshal.i"\

-	{$(INCLUDE)}"\.\nvlist.h"\

-	{$(INCLUDE)}"\.\object.h"\

-	{$(INCLUDE)}"\.\object.i"\

-	{$(INCLUDE)}"\.\objtable.h"\

-	{$(INCLUDE)}"\.\optable.h"\

-	{$(INCLUDE)}"\.\orb.h"\

-	{$(INCLUDE)}"\.\orb_core.h"\

-	{$(INCLUDE)}"\.\orb_core.i"\

-	{$(INCLUDE)}"\.\orbconf.h"\

-	{$(INCLUDE)}"\.\orbobj.h"\

-	{$(INCLUDE)}"\.\orbobj.i"\

-	{$(INCLUDE)}"\.\params.h"\

-	{$(INCLUDE)}"\.\params.i"\

-	{$(INCLUDE)}"\.\poa.h"\

-	{$(INCLUDE)}"\.\poa.i"\

-	{$(INCLUDE)}"\.\principa.h"\

-	{$(INCLUDE)}"\.\request.h"\

-	{$(INCLUDE)}"\.\sequence.h"\

-	{$(INCLUDE)}"\.\sequence.i"\

-	{$(INCLUDE)}"\.\server_factory.h"\

-	{$(INCLUDE)}"\.\server_factory.i"\

-	{$(INCLUDE)}"\.\singletons.h"\

-	{$(INCLUDE)}"\.\stub.h"\

-	{$(INCLUDE)}"\.\stub.i"\

-	{$(INCLUDE)}"\.\svrrqst.h"\

-	{$(INCLUDE)}"\.\typecode.h"\

-	{$(INCLUDE)}"\.\typecode.i"\

-	{$(INCLUDE)}"\.\varout.h"\

-	{$(INCLUDE)}"\ace\Acceptor.cpp"\

-	{$(INCLUDE)}"\ace\Acceptor.h"\

-	{$(INCLUDE)}"\ace\Acceptor.i"\

-	{$(INCLUDE)}"\ace\ACE.h"\

-	{$(INCLUDE)}"\ace\ACE.i"\

-	{$(INCLUDE)}"\ace\Addr.h"\

-	{$(INCLUDE)}"\ace\Addr.i"\

-	{$(INCLUDE)}"\ace\Atomic_Op.i"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.cpp"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.h"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.i"\

-	{$(INCLUDE)}"\ace\config-win32-common.h"\

-	{$(INCLUDE)}"\ace\Config.h"\

-	{$(INCLUDE)}"\ace\Connector.cpp"\

-	{$(INCLUDE)}"\ace\Connector.h"\

-	{$(INCLUDE)}"\ace\Connector.i"\

-	{$(INCLUDE)}"\ace\Containers.cpp"\

-	{$(INCLUDE)}"\ace\Containers.h"\

-	{$(INCLUDE)}"\ace\Containers.i"\

-	{$(INCLUDE)}"\ace\Dynamic.h"\

-	{$(INCLUDE)}"\ace\Dynamic.i"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.cpp"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.i"\

-	{$(INCLUDE)}"\ace\Free_List.cpp"\

-	{$(INCLUDE)}"\ace\Free_List.h"\

-	{$(INCLUDE)}"\ace\Free_List.i"\

-	{$(INCLUDE)}"\ace\Get_Opt.h"\

-	{$(INCLUDE)}"\ace\Get_Opt.i"\

-	{$(INCLUDE)}"\ace\Handle_Set.h"\

-	{$(INCLUDE)}"\ace\Handle_Set.i"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.i"\

-	{$(INCLUDE)}"\ace\IO_Cntl_Msg.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.i"\

-	{$(INCLUDE)}"\ace\Log_Msg.h"\

-	{$(INCLUDE)}"\ace\Log_Priority.h"\

-	{$(INCLUDE)}"\ace\Log_Record.h"\

-	{$(INCLUDE)}"\ace\Log_Record.i"\

-	{$(INCLUDE)}"\ace\Malloc.h"\

-	{$(INCLUDE)}"\ace\Malloc.i"\

-	{$(INCLUDE)}"\ace\Malloc_T.cpp"\

-	{$(INCLUDE)}"\ace\Malloc_T.h"\

-	{$(INCLUDE)}"\ace\Malloc_T.i"\

-	{$(INCLUDE)}"\ace\Managed_Object.cpp"\

-	{$(INCLUDE)}"\ace\Managed_Object.h"\

-	{$(INCLUDE)}"\ace\Managed_Object.i"\

-	{$(INCLUDE)}"\ace\Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Map_Manager.h"\

-	{$(INCLUDE)}"\ace\Map_Manager.i"\

-	{$(INCLUDE)}"\ace\Mem_Map.h"\

-	{$(INCLUDE)}"\ace\Mem_Map.i"\

-	{$(INCLUDE)}"\ace\Memory_Pool.h"\

-	{$(INCLUDE)}"\ace\Memory_Pool.i"\

-	{$(INCLUDE)}"\ace\Message_Block.h"\

-	{$(INCLUDE)}"\ace\Message_Block.i"\

-	{$(INCLUDE)}"\ace\Message_Queue.cpp"\

-	{$(INCLUDE)}"\ace\Message_Queue.h"\

-	{$(INCLUDE)}"\ace\Message_Queue.i"\

-	{$(INCLUDE)}"\ace\Module.cpp"\

-	{$(INCLUDE)}"\ace\Module.h"\

-	{$(INCLUDE)}"\ace\Module.i"\

-	{$(INCLUDE)}"\ace\Object_Manager.h"\

-	{$(INCLUDE)}"\ace\Object_Manager.i"\

-	{$(INCLUDE)}"\ace\OS.h"\

-	{$(INCLUDE)}"\ace\OS.i"\

-	{$(INCLUDE)}"\ace\Reactor.h"\

-	{$(INCLUDE)}"\ace\Reactor.i"\

-	{$(INCLUDE)}"\ace\Reactor_Impl.h"\

-	{$(INCLUDE)}"\ace\Service_Config.h"\

-	{$(INCLUDE)}"\ace\Service_Config.i"\

-	{$(INCLUDE)}"\ace\Service_Object.h"\

-	{$(INCLUDE)}"\ace\Service_Object.i"\

-	{$(INCLUDE)}"\ace\Service_Repository.h"\

-	{$(INCLUDE)}"\ace\Service_Repository.i"\

-	{$(INCLUDE)}"\ace\Service_Types.h"\

-	{$(INCLUDE)}"\ace\Service_Types.i"\

-	{$(INCLUDE)}"\ace\Shared_Object.h"\

-	{$(INCLUDE)}"\ace\Shared_Object.i"\

-	{$(INCLUDE)}"\ace\Signal.h"\

-	{$(INCLUDE)}"\ace\Signal.i"\

-	{$(INCLUDE)}"\ace\Singleton.cpp"\

-	{$(INCLUDE)}"\ace\Singleton.h"\

-	{$(INCLUDE)}"\ace\Singleton.i"\

-	{$(INCLUDE)}"\ace\SOCK.h"\

-	{$(INCLUDE)}"\ace\SOCK.i"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.h"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.i"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.h"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.i"\

-	{$(INCLUDE)}"\ace\SOCK_IO.h"\

-	{$(INCLUDE)}"\ace\SOCK_IO.i"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.h"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.i"\

-	{$(INCLUDE)}"\ace\SString.h"\

-	{$(INCLUDE)}"\ace\SString.i"\

-	{$(INCLUDE)}"\ace\stdcpp.h"\

-	{$(INCLUDE)}"\ace\Strategies.h"\

-	{$(INCLUDE)}"\ace\Strategies_T.cpp"\

-	{$(INCLUDE)}"\ace\Strategies_T.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.cpp"\

-	{$(INCLUDE)}"\ace\Stream_Modules.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.i"\

-	{$(INCLUDE)}"\ace\Svc_Conf_Tokens.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.cpp"\

-	{$(INCLUDE)}"\ace\Svc_Handler.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.i"\

-	{$(INCLUDE)}"\ace\Synch.h"\

-	{$(INCLUDE)}"\ace\Synch.i"\

-	{$(INCLUDE)}"\ace\Synch_Options.h"\

-	{$(INCLUDE)}"\ace\Synch_T.cpp"\

-	{$(INCLUDE)}"\ace\Synch_T.h"\

-	{$(INCLUDE)}"\ace\Synch_T.i"\

-	{$(INCLUDE)}"\ace\Task.h"\

-	{$(INCLUDE)}"\ace\Task.i"\

-	{$(INCLUDE)}"\ace\Task_T.cpp"\

-	{$(INCLUDE)}"\ace\Task_T.h"\

-	{$(INCLUDE)}"\ace\Task_T.i"\

-	{$(INCLUDE)}"\ace\Thread.h"\

-	{$(INCLUDE)}"\ace\Thread.i"\

-	{$(INCLUDE)}"\ace\Thread_Manager.h"\

-	{$(INCLUDE)}"\ace\Thread_Manager.i"\

-	{$(INCLUDE)}"\ace\Time_Value.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.cpp"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.i"\

-	{$(INCLUDE)}"\ace\Trace.h"\

-	{$(INCLUDE)}"\ace\Version.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.i"\

-	{$(INCLUDE)}"\ace\ws2tcpip.h"\

-	

-NODEP_CPP_DECOD=\

-	".\tao\factories.h"\

-	

-

-"$(INTDIR)\decode.obj" : $(SOURCE) $(DEP_CPP_DECOD) "$(INTDIR)"

-

-

-!ENDIF 

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\deep_copy.cpp

-

-!IF  "$(CFG)" == "TAO - Win32 Release"

-

-DEP_CPP_DEEP_=\

-	"..\..\ace\config-win32.h"\

-	{$(INCLUDE)}"\.\align.h"\

-	{$(INCLUDE)}"\.\any.h"\

-	{$(INCLUDE)}"\.\any.i"\

-	{$(INCLUDE)}"\.\cdr.h"\

-	{$(INCLUDE)}"\.\cdr.i"\

-	{$(INCLUDE)}"\.\client_factory.h"\

-	{$(INCLUDE)}"\.\connect.h"\

-	{$(INCLUDE)}"\.\connect.i"\

-	{$(INCLUDE)}"\.\corba.h"\

-	{$(INCLUDE)}"\.\corbacom.h"\

-	{$(INCLUDE)}"\.\corbacom.i"\

-	{$(INCLUDE)}"\.\debug.h"\

-	{$(INCLUDE)}"\.\default_client.h"\

-	{$(INCLUDE)}"\.\default_client.i"\

-	{$(INCLUDE)}"\.\default_server.h"\

-	{$(INCLUDE)}"\.\default_server.i"\

-	{$(INCLUDE)}"\.\except.h"\

-	{$(INCLUDE)}"\.\giop.h"\

-	{$(INCLUDE)}"\.\giop.i"\

-	{$(INCLUDE)}"\.\iiopobj.h"\

-	{$(INCLUDE)}"\.\iiopobj.i"\

-	{$(INCLUDE)}"\.\iioporb.h"\

-	{$(INCLUDE)}"\.\iioporb.i"\

-	{$(INCLUDE)}"\.\marshal.h"\

-	{$(INCLUDE)}"\.\marshal.i"\

-	{$(INCLUDE)}"\.\nvlist.h"\

-	{$(INCLUDE)}"\.\object.h"\

-	{$(INCLUDE)}"\.\object.i"\

-	{$(INCLUDE)}"\.\objtable.h"\

-	{$(INCLUDE)}"\.\optable.h"\

-	{$(INCLUDE)}"\.\orb.h"\

-	{$(INCLUDE)}"\.\orb_core.h"\

-	{$(INCLUDE)}"\.\orb_core.i"\

-	{$(INCLUDE)}"\.\orbconf.h"\

-	{$(INCLUDE)}"\.\orbobj.h"\

-	{$(INCLUDE)}"\.\orbobj.i"\

-	{$(INCLUDE)}"\.\params.h"\

-	{$(INCLUDE)}"\.\params.i"\

-	{$(INCLUDE)}"\.\poa.h"\

-	{$(INCLUDE)}"\.\poa.i"\

-	{$(INCLUDE)}"\.\principa.h"\

-	{$(INCLUDE)}"\.\request.h"\

-	{$(INCLUDE)}"\.\sequence.h"\

-	{$(INCLUDE)}"\.\sequence.i"\

-	{$(INCLUDE)}"\.\server_factory.h"\

-	{$(INCLUDE)}"\.\server_factory.i"\

-	{$(INCLUDE)}"\.\singletons.h"\

-	{$(INCLUDE)}"\.\stub.h"\

-	{$(INCLUDE)}"\.\stub.i"\

-	{$(INCLUDE)}"\.\svrrqst.h"\

-	{$(INCLUDE)}"\.\typecode.h"\

-	{$(INCLUDE)}"\.\typecode.i"\

-	{$(INCLUDE)}"\.\varout.h"\

-	{$(INCLUDE)}"\ace\Acceptor.cpp"\

-	{$(INCLUDE)}"\ace\Acceptor.h"\

-	{$(INCLUDE)}"\ace\Acceptor.i"\

-	{$(INCLUDE)}"\ace\ACE.h"\

-	{$(INCLUDE)}"\ace\ACE.i"\

-	{$(INCLUDE)}"\ace\Addr.h"\

-	{$(INCLUDE)}"\ace\Addr.i"\

-	{$(INCLUDE)}"\ace\Atomic_Op.i"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.cpp"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.h"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.i"\

-	{$(INCLUDE)}"\ace\config-win32-common.h"\

-	{$(INCLUDE)}"\ace\Config.h"\

-	{$(INCLUDE)}"\ace\Connector.cpp"\

-	{$(INCLUDE)}"\ace\Connector.h"\

-	{$(INCLUDE)}"\ace\Connector.i"\

-	{$(INCLUDE)}"\ace\Containers.cpp"\

-	{$(INCLUDE)}"\ace\Containers.h"\

-	{$(INCLUDE)}"\ace\Containers.i"\

-	{$(INCLUDE)}"\ace\Dynamic.h"\

-	{$(INCLUDE)}"\ace\Dynamic.i"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.cpp"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.i"\

-	{$(INCLUDE)}"\ace\Free_List.cpp"\

-	{$(INCLUDE)}"\ace\Free_List.h"\

-	{$(INCLUDE)}"\ace\Free_List.i"\

-	{$(INCLUDE)}"\ace\Get_Opt.h"\

-	{$(INCLUDE)}"\ace\Get_Opt.i"\

-	{$(INCLUDE)}"\ace\Handle_Set.h"\

-	{$(INCLUDE)}"\ace\Handle_Set.i"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.i"\

-	{$(INCLUDE)}"\ace\IO_Cntl_Msg.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.i"\

-	{$(INCLUDE)}"\ace\Log_Msg.h"\

-	{$(INCLUDE)}"\ace\Log_Priority.h"\

-	{$(INCLUDE)}"\ace\Log_Record.h"\

-	{$(INCLUDE)}"\ace\Log_Record.i"\

-	{$(INCLUDE)}"\ace\Malloc.h"\

-	{$(INCLUDE)}"\ace\Malloc.i"\

-	{$(INCLUDE)}"\ace\Malloc_T.cpp"\

-	{$(INCLUDE)}"\ace\Malloc_T.h"\

-	{$(INCLUDE)}"\ace\Malloc_T.i"\

-	{$(INCLUDE)}"\ace\Managed_Object.cpp"\

-	{$(INCLUDE)}"\ace\Managed_Object.h"\

-	{$(INCLUDE)}"\ace\Managed_Object.i"\

-	{$(INCLUDE)}"\ace\Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Map_Manager.h"\

-	{$(INCLUDE)}"\ace\Map_Manager.i"\

-	{$(INCLUDE)}"\ace\Mem_Map.h"\

-	{$(INCLUDE)}"\ace\Mem_Map.i"\

-	{$(INCLUDE)}"\ace\Memory_Pool.h"\

-	{$(INCLUDE)}"\ace\Memory_Pool.i"\

-	{$(INCLUDE)}"\ace\Message_Block.h"\

-	{$(INCLUDE)}"\ace\Message_Block.i"\

-	{$(INCLUDE)}"\ace\Message_Queue.cpp"\

-	{$(INCLUDE)}"\ace\Message_Queue.h"\

-	{$(INCLUDE)}"\ace\Message_Queue.i"\

-	{$(INCLUDE)}"\ace\Module.cpp"\

-	{$(INCLUDE)}"\ace\Module.h"\

-	{$(INCLUDE)}"\ace\Module.i"\

-	{$(INCLUDE)}"\ace\Object_Manager.h"\

-	{$(INCLUDE)}"\ace\Object_Manager.i"\

-	{$(INCLUDE)}"\ace\OS.h"\

-	{$(INCLUDE)}"\ace\OS.i"\

-	{$(INCLUDE)}"\ace\Reactor.h"\

-	{$(INCLUDE)}"\ace\Reactor.i"\

-	{$(INCLUDE)}"\ace\Reactor_Impl.h"\

-	{$(INCLUDE)}"\ace\Service_Config.h"\

-	{$(INCLUDE)}"\ace\Service_Config.i"\

-	{$(INCLUDE)}"\ace\Service_Object.h"\

-	{$(INCLUDE)}"\ace\Service_Object.i"\

-	{$(INCLUDE)}"\ace\Service_Repository.h"\

-	{$(INCLUDE)}"\ace\Service_Repository.i"\

-	{$(INCLUDE)}"\ace\Service_Types.h"\

-	{$(INCLUDE)}"\ace\Service_Types.i"\

-	{$(INCLUDE)}"\ace\Shared_Object.h"\

-	{$(INCLUDE)}"\ace\Shared_Object.i"\

-	{$(INCLUDE)}"\ace\Signal.h"\

-	{$(INCLUDE)}"\ace\Signal.i"\

-	{$(INCLUDE)}"\ace\Singleton.cpp"\

-	{$(INCLUDE)}"\ace\Singleton.h"\

-	{$(INCLUDE)}"\ace\Singleton.i"\

-	{$(INCLUDE)}"\ace\SOCK.h"\

-	{$(INCLUDE)}"\ace\SOCK.i"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.h"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.i"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.h"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.i"\

-	{$(INCLUDE)}"\ace\SOCK_IO.h"\

-	{$(INCLUDE)}"\ace\SOCK_IO.i"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.h"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.i"\

-	{$(INCLUDE)}"\ace\SString.h"\

-	{$(INCLUDE)}"\ace\SString.i"\

-	{$(INCLUDE)}"\ace\stdcpp.h"\

-	{$(INCLUDE)}"\ace\Strategies.h"\

-	{$(INCLUDE)}"\ace\Strategies_T.cpp"\

-	{$(INCLUDE)}"\ace\Strategies_T.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.cpp"\

-	{$(INCLUDE)}"\ace\Stream_Modules.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.i"\

-	{$(INCLUDE)}"\ace\Svc_Conf_Tokens.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.cpp"\

-	{$(INCLUDE)}"\ace\Svc_Handler.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.i"\

-	{$(INCLUDE)}"\ace\Synch.h"\

-	{$(INCLUDE)}"\ace\Synch.i"\

-	{$(INCLUDE)}"\ace\Synch_Options.h"\

-	{$(INCLUDE)}"\ace\Synch_T.cpp"\

-	{$(INCLUDE)}"\ace\Synch_T.h"\

-	{$(INCLUDE)}"\ace\Synch_T.i"\

-	{$(INCLUDE)}"\ace\Task.h"\

-	{$(INCLUDE)}"\ace\Task.i"\

-	{$(INCLUDE)}"\ace\Task_T.cpp"\

-	{$(INCLUDE)}"\ace\Task_T.h"\

-	{$(INCLUDE)}"\ace\Task_T.i"\

-	{$(INCLUDE)}"\ace\Thread.h"\

-	{$(INCLUDE)}"\ace\Thread.i"\

-	{$(INCLUDE)}"\ace\Thread_Manager.h"\

-	{$(INCLUDE)}"\ace\Thread_Manager.i"\

-	{$(INCLUDE)}"\ace\Time_Value.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.cpp"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.i"\

-	{$(INCLUDE)}"\ace\Trace.h"\

-	{$(INCLUDE)}"\ace\Version.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.i"\

-	{$(INCLUDE)}"\ace\ws2tcpip.h"\

-	

-NODEP_CPP_DEEP_=\

-	".\tao\factories.h"\

-	

-

-"$(INTDIR)\deep_copy.obj" : $(SOURCE) $(DEP_CPP_DEEP_) "$(INTDIR)"

-

-

-!ELSEIF  "$(CFG)" == "TAO - Win32 Debug"

-

-DEP_CPP_DEEP_=\

-	"..\..\ace\config-win32.h"\

-	{$(INCLUDE)}"\.\align.h"\

-	{$(INCLUDE)}"\.\any.h"\

-	{$(INCLUDE)}"\.\any.i"\

-	{$(INCLUDE)}"\.\cdr.h"\

-	{$(INCLUDE)}"\.\cdr.i"\

-	{$(INCLUDE)}"\.\client_factory.h"\

-	{$(INCLUDE)}"\.\connect.h"\

-	{$(INCLUDE)}"\.\connect.i"\

-	{$(INCLUDE)}"\.\corba.h"\

-	{$(INCLUDE)}"\.\corbacom.h"\

-	{$(INCLUDE)}"\.\corbacom.i"\

-	{$(INCLUDE)}"\.\debug.h"\

-	{$(INCLUDE)}"\.\default_client.h"\

-	{$(INCLUDE)}"\.\default_client.i"\

-	{$(INCLUDE)}"\.\default_server.h"\

-	{$(INCLUDE)}"\.\default_server.i"\

-	{$(INCLUDE)}"\.\except.h"\

-	{$(INCLUDE)}"\.\giop.h"\

-	{$(INCLUDE)}"\.\giop.i"\

-	{$(INCLUDE)}"\.\iiopobj.h"\

-	{$(INCLUDE)}"\.\iiopobj.i"\

-	{$(INCLUDE)}"\.\iioporb.h"\

-	{$(INCLUDE)}"\.\iioporb.i"\

-	{$(INCLUDE)}"\.\marshal.h"\

-	{$(INCLUDE)}"\.\marshal.i"\

-	{$(INCLUDE)}"\.\nvlist.h"\

-	{$(INCLUDE)}"\.\object.h"\

-	{$(INCLUDE)}"\.\object.i"\

-	{$(INCLUDE)}"\.\objtable.h"\

-	{$(INCLUDE)}"\.\optable.h"\

-	{$(INCLUDE)}"\.\orb.h"\

-	{$(INCLUDE)}"\.\orb_core.h"\

-	{$(INCLUDE)}"\.\orb_core.i"\

-	{$(INCLUDE)}"\.\orbconf.h"\

-	{$(INCLUDE)}"\.\orbobj.h"\

-	{$(INCLUDE)}"\.\orbobj.i"\

-	{$(INCLUDE)}"\.\params.h"\

-	{$(INCLUDE)}"\.\params.i"\

-	{$(INCLUDE)}"\.\poa.h"\

-	{$(INCLUDE)}"\.\poa.i"\

-	{$(INCLUDE)}"\.\principa.h"\

-	{$(INCLUDE)}"\.\request.h"\

-	{$(INCLUDE)}"\.\sequence.h"\

-	{$(INCLUDE)}"\.\sequence.i"\

-	{$(INCLUDE)}"\.\server_factory.h"\

-	{$(INCLUDE)}"\.\server_factory.i"\

-	{$(INCLUDE)}"\.\singletons.h"\

-	{$(INCLUDE)}"\.\stub.h"\

-	{$(INCLUDE)}"\.\stub.i"\

-	{$(INCLUDE)}"\.\svrrqst.h"\

-	{$(INCLUDE)}"\.\typecode.h"\

-	{$(INCLUDE)}"\.\typecode.i"\

-	{$(INCLUDE)}"\.\varout.h"\

-	{$(INCLUDE)}"\ace\Acceptor.cpp"\

-	{$(INCLUDE)}"\ace\Acceptor.h"\

-	{$(INCLUDE)}"\ace\Acceptor.i"\

-	{$(INCLUDE)}"\ace\ACE.h"\

-	{$(INCLUDE)}"\ace\ACE.i"\

-	{$(INCLUDE)}"\ace\Addr.h"\

-	{$(INCLUDE)}"\ace\Addr.i"\

-	{$(INCLUDE)}"\ace\Atomic_Op.i"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.cpp"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.h"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.i"\

-	{$(INCLUDE)}"\ace\config-win32-common.h"\

-	{$(INCLUDE)}"\ace\Config.h"\

-	{$(INCLUDE)}"\ace\Connector.cpp"\

-	{$(INCLUDE)}"\ace\Connector.h"\

-	{$(INCLUDE)}"\ace\Connector.i"\

-	{$(INCLUDE)}"\ace\Containers.cpp"\

-	{$(INCLUDE)}"\ace\Containers.h"\

-	{$(INCLUDE)}"\ace\Containers.i"\

-	{$(INCLUDE)}"\ace\Dynamic.h"\

-	{$(INCLUDE)}"\ace\Dynamic.i"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.cpp"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.i"\

-	{$(INCLUDE)}"\ace\Free_List.cpp"\

-	{$(INCLUDE)}"\ace\Free_List.h"\

-	{$(INCLUDE)}"\ace\Free_List.i"\

-	{$(INCLUDE)}"\ace\Get_Opt.h"\

-	{$(INCLUDE)}"\ace\Get_Opt.i"\

-	{$(INCLUDE)}"\ace\Handle_Set.h"\

-	{$(INCLUDE)}"\ace\Handle_Set.i"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.i"\

-	{$(INCLUDE)}"\ace\IO_Cntl_Msg.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.i"\

-	{$(INCLUDE)}"\ace\Log_Msg.h"\

-	{$(INCLUDE)}"\ace\Log_Priority.h"\

-	{$(INCLUDE)}"\ace\Log_Record.h"\

-	{$(INCLUDE)}"\ace\Log_Record.i"\

-	{$(INCLUDE)}"\ace\Malloc.h"\

-	{$(INCLUDE)}"\ace\Malloc.i"\

-	{$(INCLUDE)}"\ace\Malloc_T.cpp"\

-	{$(INCLUDE)}"\ace\Malloc_T.h"\

-	{$(INCLUDE)}"\ace\Malloc_T.i"\

-	{$(INCLUDE)}"\ace\Managed_Object.cpp"\

-	{$(INCLUDE)}"\ace\Managed_Object.h"\

-	{$(INCLUDE)}"\ace\Managed_Object.i"\

-	{$(INCLUDE)}"\ace\Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Map_Manager.h"\

-	{$(INCLUDE)}"\ace\Map_Manager.i"\

-	{$(INCLUDE)}"\ace\Mem_Map.h"\

-	{$(INCLUDE)}"\ace\Mem_Map.i"\

-	{$(INCLUDE)}"\ace\Memory_Pool.h"\

-	{$(INCLUDE)}"\ace\Memory_Pool.i"\

-	{$(INCLUDE)}"\ace\Message_Block.h"\

-	{$(INCLUDE)}"\ace\Message_Block.i"\

-	{$(INCLUDE)}"\ace\Message_Queue.cpp"\

-	{$(INCLUDE)}"\ace\Message_Queue.h"\

-	{$(INCLUDE)}"\ace\Message_Queue.i"\

-	{$(INCLUDE)}"\ace\Module.cpp"\

-	{$(INCLUDE)}"\ace\Module.h"\

-	{$(INCLUDE)}"\ace\Module.i"\

-	{$(INCLUDE)}"\ace\Object_Manager.h"\

-	{$(INCLUDE)}"\ace\Object_Manager.i"\

-	{$(INCLUDE)}"\ace\OS.h"\

-	{$(INCLUDE)}"\ace\OS.i"\

-	{$(INCLUDE)}"\ace\Reactor.h"\

-	{$(INCLUDE)}"\ace\Reactor.i"\

-	{$(INCLUDE)}"\ace\Reactor_Impl.h"\

-	{$(INCLUDE)}"\ace\Service_Config.h"\

-	{$(INCLUDE)}"\ace\Service_Config.i"\

-	{$(INCLUDE)}"\ace\Service_Object.h"\

-	{$(INCLUDE)}"\ace\Service_Object.i"\

-	{$(INCLUDE)}"\ace\Service_Repository.h"\

-	{$(INCLUDE)}"\ace\Service_Repository.i"\

-	{$(INCLUDE)}"\ace\Service_Types.h"\

-	{$(INCLUDE)}"\ace\Service_Types.i"\

-	{$(INCLUDE)}"\ace\Shared_Object.h"\

-	{$(INCLUDE)}"\ace\Shared_Object.i"\

-	{$(INCLUDE)}"\ace\Signal.h"\

-	{$(INCLUDE)}"\ace\Signal.i"\

-	{$(INCLUDE)}"\ace\Singleton.cpp"\

-	{$(INCLUDE)}"\ace\Singleton.h"\

-	{$(INCLUDE)}"\ace\Singleton.i"\

-	{$(INCLUDE)}"\ace\SOCK.h"\

-	{$(INCLUDE)}"\ace\SOCK.i"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.h"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.i"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.h"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.i"\

-	{$(INCLUDE)}"\ace\SOCK_IO.h"\

-	{$(INCLUDE)}"\ace\SOCK_IO.i"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.h"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.i"\

-	{$(INCLUDE)}"\ace\SString.h"\

-	{$(INCLUDE)}"\ace\SString.i"\

-	{$(INCLUDE)}"\ace\stdcpp.h"\

-	{$(INCLUDE)}"\ace\Strategies.h"\

-	{$(INCLUDE)}"\ace\Strategies_T.cpp"\

-	{$(INCLUDE)}"\ace\Strategies_T.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.cpp"\

-	{$(INCLUDE)}"\ace\Stream_Modules.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.i"\

-	{$(INCLUDE)}"\ace\Svc_Conf_Tokens.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.cpp"\

-	{$(INCLUDE)}"\ace\Svc_Handler.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.i"\

-	{$(INCLUDE)}"\ace\Synch.h"\

-	{$(INCLUDE)}"\ace\Synch.i"\

-	{$(INCLUDE)}"\ace\Synch_Options.h"\

-	{$(INCLUDE)}"\ace\Synch_T.cpp"\

-	{$(INCLUDE)}"\ace\Synch_T.h"\

-	{$(INCLUDE)}"\ace\Synch_T.i"\

-	{$(INCLUDE)}"\ace\Task.h"\

-	{$(INCLUDE)}"\ace\Task.i"\

-	{$(INCLUDE)}"\ace\Task_T.cpp"\

-	{$(INCLUDE)}"\ace\Task_T.h"\

-	{$(INCLUDE)}"\ace\Task_T.i"\

-	{$(INCLUDE)}"\ace\Thread.h"\

-	{$(INCLUDE)}"\ace\Thread.i"\

-	{$(INCLUDE)}"\ace\Thread_Manager.h"\

-	{$(INCLUDE)}"\ace\Thread_Manager.i"\

-	{$(INCLUDE)}"\ace\Time_Value.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.cpp"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.i"\

-	{$(INCLUDE)}"\ace\Trace.h"\

-	{$(INCLUDE)}"\ace\Version.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.i"\

-	{$(INCLUDE)}"\ace\ws2tcpip.h"\

-	

-NODEP_CPP_DEEP_=\

-	".\tao\factories.h"\

-	

-

-"$(INTDIR)\deep_copy.obj" : $(SOURCE) $(DEP_CPP_DEEP_) "$(INTDIR)"

-

-

-!ENDIF 

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\deep_free.cpp

-

-!IF  "$(CFG)" == "TAO - Win32 Release"

-

-DEP_CPP_DEEP_F=\

-	"..\..\ace\config-win32.h"\

-	{$(INCLUDE)}"\.\align.h"\

-	{$(INCLUDE)}"\.\any.h"\

-	{$(INCLUDE)}"\.\any.i"\

-	{$(INCLUDE)}"\.\cdr.h"\

-	{$(INCLUDE)}"\.\cdr.i"\

-	{$(INCLUDE)}"\.\client_factory.h"\

-	{$(INCLUDE)}"\.\connect.h"\

-	{$(INCLUDE)}"\.\connect.i"\

-	{$(INCLUDE)}"\.\corba.h"\

-	{$(INCLUDE)}"\.\corbacom.h"\

-	{$(INCLUDE)}"\.\corbacom.i"\

-	{$(INCLUDE)}"\.\debug.h"\

-	{$(INCLUDE)}"\.\default_client.h"\

-	{$(INCLUDE)}"\.\default_client.i"\

-	{$(INCLUDE)}"\.\default_server.h"\

-	{$(INCLUDE)}"\.\default_server.i"\

-	{$(INCLUDE)}"\.\except.h"\

-	{$(INCLUDE)}"\.\giop.h"\

-	{$(INCLUDE)}"\.\giop.i"\

-	{$(INCLUDE)}"\.\iiopobj.h"\

-	{$(INCLUDE)}"\.\iiopobj.i"\

-	{$(INCLUDE)}"\.\iioporb.h"\

-	{$(INCLUDE)}"\.\iioporb.i"\

-	{$(INCLUDE)}"\.\marshal.h"\

-	{$(INCLUDE)}"\.\marshal.i"\

-	{$(INCLUDE)}"\.\nvlist.h"\

-	{$(INCLUDE)}"\.\object.h"\

-	{$(INCLUDE)}"\.\object.i"\

-	{$(INCLUDE)}"\.\objtable.h"\

-	{$(INCLUDE)}"\.\optable.h"\

-	{$(INCLUDE)}"\.\orb.h"\

-	{$(INCLUDE)}"\.\orb_core.h"\

-	{$(INCLUDE)}"\.\orb_core.i"\

-	{$(INCLUDE)}"\.\orbconf.h"\

-	{$(INCLUDE)}"\.\orbobj.h"\

-	{$(INCLUDE)}"\.\orbobj.i"\

-	{$(INCLUDE)}"\.\params.h"\

-	{$(INCLUDE)}"\.\params.i"\

-	{$(INCLUDE)}"\.\poa.h"\

-	{$(INCLUDE)}"\.\poa.i"\

-	{$(INCLUDE)}"\.\principa.h"\

-	{$(INCLUDE)}"\.\request.h"\

-	{$(INCLUDE)}"\.\sequence.h"\

-	{$(INCLUDE)}"\.\sequence.i"\

-	{$(INCLUDE)}"\.\server_factory.h"\

-	{$(INCLUDE)}"\.\server_factory.i"\

-	{$(INCLUDE)}"\.\singletons.h"\

-	{$(INCLUDE)}"\.\stub.h"\

-	{$(INCLUDE)}"\.\stub.i"\

-	{$(INCLUDE)}"\.\svrrqst.h"\

-	{$(INCLUDE)}"\.\typecode.h"\

-	{$(INCLUDE)}"\.\typecode.i"\

-	{$(INCLUDE)}"\.\varout.h"\

-	{$(INCLUDE)}"\ace\Acceptor.cpp"\

-	{$(INCLUDE)}"\ace\Acceptor.h"\

-	{$(INCLUDE)}"\ace\Acceptor.i"\

-	{$(INCLUDE)}"\ace\ACE.h"\

-	{$(INCLUDE)}"\ace\ACE.i"\

-	{$(INCLUDE)}"\ace\Addr.h"\

-	{$(INCLUDE)}"\ace\Addr.i"\

-	{$(INCLUDE)}"\ace\Atomic_Op.i"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.cpp"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.h"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.i"\

-	{$(INCLUDE)}"\ace\config-win32-common.h"\

-	{$(INCLUDE)}"\ace\Config.h"\

-	{$(INCLUDE)}"\ace\Connector.cpp"\

-	{$(INCLUDE)}"\ace\Connector.h"\

-	{$(INCLUDE)}"\ace\Connector.i"\

-	{$(INCLUDE)}"\ace\Containers.cpp"\

-	{$(INCLUDE)}"\ace\Containers.h"\

-	{$(INCLUDE)}"\ace\Containers.i"\

-	{$(INCLUDE)}"\ace\Dynamic.h"\

-	{$(INCLUDE)}"\ace\Dynamic.i"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.cpp"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.i"\

-	{$(INCLUDE)}"\ace\Free_List.cpp"\

-	{$(INCLUDE)}"\ace\Free_List.h"\

-	{$(INCLUDE)}"\ace\Free_List.i"\

-	{$(INCLUDE)}"\ace\Get_Opt.h"\

-	{$(INCLUDE)}"\ace\Get_Opt.i"\

-	{$(INCLUDE)}"\ace\Handle_Set.h"\

-	{$(INCLUDE)}"\ace\Handle_Set.i"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.i"\

-	{$(INCLUDE)}"\ace\IO_Cntl_Msg.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.i"\

-	{$(INCLUDE)}"\ace\Log_Msg.h"\

-	{$(INCLUDE)}"\ace\Log_Priority.h"\

-	{$(INCLUDE)}"\ace\Log_Record.h"\

-	{$(INCLUDE)}"\ace\Log_Record.i"\

-	{$(INCLUDE)}"\ace\Malloc.h"\

-	{$(INCLUDE)}"\ace\Malloc.i"\

-	{$(INCLUDE)}"\ace\Malloc_T.cpp"\

-	{$(INCLUDE)}"\ace\Malloc_T.h"\

-	{$(INCLUDE)}"\ace\Malloc_T.i"\

-	{$(INCLUDE)}"\ace\Managed_Object.cpp"\

-	{$(INCLUDE)}"\ace\Managed_Object.h"\

-	{$(INCLUDE)}"\ace\Managed_Object.i"\

-	{$(INCLUDE)}"\ace\Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Map_Manager.h"\

-	{$(INCLUDE)}"\ace\Map_Manager.i"\

-	{$(INCLUDE)}"\ace\Mem_Map.h"\

-	{$(INCLUDE)}"\ace\Mem_Map.i"\

-	{$(INCLUDE)}"\ace\Memory_Pool.h"\

-	{$(INCLUDE)}"\ace\Memory_Pool.i"\

-	{$(INCLUDE)}"\ace\Message_Block.h"\

-	{$(INCLUDE)}"\ace\Message_Block.i"\

-	{$(INCLUDE)}"\ace\Message_Queue.cpp"\

-	{$(INCLUDE)}"\ace\Message_Queue.h"\

-	{$(INCLUDE)}"\ace\Message_Queue.i"\

-	{$(INCLUDE)}"\ace\Module.cpp"\

-	{$(INCLUDE)}"\ace\Module.h"\

-	{$(INCLUDE)}"\ace\Module.i"\

-	{$(INCLUDE)}"\ace\Object_Manager.h"\

-	{$(INCLUDE)}"\ace\Object_Manager.i"\

-	{$(INCLUDE)}"\ace\OS.h"\

-	{$(INCLUDE)}"\ace\OS.i"\

-	{$(INCLUDE)}"\ace\Reactor.h"\

-	{$(INCLUDE)}"\ace\Reactor.i"\

-	{$(INCLUDE)}"\ace\Reactor_Impl.h"\

-	{$(INCLUDE)}"\ace\Service_Config.h"\

-	{$(INCLUDE)}"\ace\Service_Config.i"\

-	{$(INCLUDE)}"\ace\Service_Object.h"\

-	{$(INCLUDE)}"\ace\Service_Object.i"\

-	{$(INCLUDE)}"\ace\Service_Repository.h"\

-	{$(INCLUDE)}"\ace\Service_Repository.i"\

-	{$(INCLUDE)}"\ace\Service_Types.h"\

-	{$(INCLUDE)}"\ace\Service_Types.i"\

-	{$(INCLUDE)}"\ace\Shared_Object.h"\

-	{$(INCLUDE)}"\ace\Shared_Object.i"\

-	{$(INCLUDE)}"\ace\Signal.h"\

-	{$(INCLUDE)}"\ace\Signal.i"\

-	{$(INCLUDE)}"\ace\Singleton.cpp"\

-	{$(INCLUDE)}"\ace\Singleton.h"\

-	{$(INCLUDE)}"\ace\Singleton.i"\

-	{$(INCLUDE)}"\ace\SOCK.h"\

-	{$(INCLUDE)}"\ace\SOCK.i"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.h"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.i"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.h"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.i"\

-	{$(INCLUDE)}"\ace\SOCK_IO.h"\

-	{$(INCLUDE)}"\ace\SOCK_IO.i"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.h"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.i"\

-	{$(INCLUDE)}"\ace\SString.h"\

-	{$(INCLUDE)}"\ace\SString.i"\

-	{$(INCLUDE)}"\ace\stdcpp.h"\

-	{$(INCLUDE)}"\ace\Strategies.h"\

-	{$(INCLUDE)}"\ace\Strategies_T.cpp"\

-	{$(INCLUDE)}"\ace\Strategies_T.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.cpp"\

-	{$(INCLUDE)}"\ace\Stream_Modules.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.i"\

-	{$(INCLUDE)}"\ace\Svc_Conf_Tokens.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.cpp"\

-	{$(INCLUDE)}"\ace\Svc_Handler.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.i"\

-	{$(INCLUDE)}"\ace\Synch.h"\

-	{$(INCLUDE)}"\ace\Synch.i"\

-	{$(INCLUDE)}"\ace\Synch_Options.h"\

-	{$(INCLUDE)}"\ace\Synch_T.cpp"\

-	{$(INCLUDE)}"\ace\Synch_T.h"\

-	{$(INCLUDE)}"\ace\Synch_T.i"\

-	{$(INCLUDE)}"\ace\Task.h"\

-	{$(INCLUDE)}"\ace\Task.i"\

-	{$(INCLUDE)}"\ace\Task_T.cpp"\

-	{$(INCLUDE)}"\ace\Task_T.h"\

-	{$(INCLUDE)}"\ace\Task_T.i"\

-	{$(INCLUDE)}"\ace\Thread.h"\

-	{$(INCLUDE)}"\ace\Thread.i"\

-	{$(INCLUDE)}"\ace\Thread_Manager.h"\

-	{$(INCLUDE)}"\ace\Thread_Manager.i"\

-	{$(INCLUDE)}"\ace\Time_Value.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.cpp"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.i"\

-	{$(INCLUDE)}"\ace\Trace.h"\

-	{$(INCLUDE)}"\ace\Version.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.i"\

-	{$(INCLUDE)}"\ace\ws2tcpip.h"\

-	

-NODEP_CPP_DEEP_F=\

-	".\tao\factories.h"\

-	

-

-"$(INTDIR)\deep_free.obj" : $(SOURCE) $(DEP_CPP_DEEP_F) "$(INTDIR)"

-

-

-!ELSEIF  "$(CFG)" == "TAO - Win32 Debug"

-

-DEP_CPP_DEEP_F=\

-	"..\..\ace\config-win32.h"\

-	{$(INCLUDE)}"\.\align.h"\

-	{$(INCLUDE)}"\.\any.h"\

-	{$(INCLUDE)}"\.\any.i"\

-	{$(INCLUDE)}"\.\cdr.h"\

-	{$(INCLUDE)}"\.\cdr.i"\

-	{$(INCLUDE)}"\.\client_factory.h"\

-	{$(INCLUDE)}"\.\connect.h"\

-	{$(INCLUDE)}"\.\connect.i"\

-	{$(INCLUDE)}"\.\corba.h"\

-	{$(INCLUDE)}"\.\corbacom.h"\

-	{$(INCLUDE)}"\.\corbacom.i"\

-	{$(INCLUDE)}"\.\debug.h"\

-	{$(INCLUDE)}"\.\default_client.h"\

-	{$(INCLUDE)}"\.\default_client.i"\

-	{$(INCLUDE)}"\.\default_server.h"\

-	{$(INCLUDE)}"\.\default_server.i"\

-	{$(INCLUDE)}"\.\except.h"\

-	{$(INCLUDE)}"\.\giop.h"\

-	{$(INCLUDE)}"\.\giop.i"\

-	{$(INCLUDE)}"\.\iiopobj.h"\

-	{$(INCLUDE)}"\.\iiopobj.i"\

-	{$(INCLUDE)}"\.\iioporb.h"\

-	{$(INCLUDE)}"\.\iioporb.i"\

-	{$(INCLUDE)}"\.\marshal.h"\

-	{$(INCLUDE)}"\.\marshal.i"\

-	{$(INCLUDE)}"\.\nvlist.h"\

-	{$(INCLUDE)}"\.\object.h"\

-	{$(INCLUDE)}"\.\object.i"\

-	{$(INCLUDE)}"\.\objtable.h"\

-	{$(INCLUDE)}"\.\optable.h"\

-	{$(INCLUDE)}"\.\orb.h"\

-	{$(INCLUDE)}"\.\orb_core.h"\

-	{$(INCLUDE)}"\.\orb_core.i"\

-	{$(INCLUDE)}"\.\orbconf.h"\

-	{$(INCLUDE)}"\.\orbobj.h"\

-	{$(INCLUDE)}"\.\orbobj.i"\

-	{$(INCLUDE)}"\.\params.h"\

-	{$(INCLUDE)}"\.\params.i"\

-	{$(INCLUDE)}"\.\poa.h"\

-	{$(INCLUDE)}"\.\poa.i"\

-	{$(INCLUDE)}"\.\principa.h"\

-	{$(INCLUDE)}"\.\request.h"\

-	{$(INCLUDE)}"\.\sequence.h"\

-	{$(INCLUDE)}"\.\sequence.i"\

-	{$(INCLUDE)}"\.\server_factory.h"\

-	{$(INCLUDE)}"\.\server_factory.i"\

-	{$(INCLUDE)}"\.\singletons.h"\

-	{$(INCLUDE)}"\.\stub.h"\

-	{$(INCLUDE)}"\.\stub.i"\

-	{$(INCLUDE)}"\.\svrrqst.h"\

-	{$(INCLUDE)}"\.\typecode.h"\

-	{$(INCLUDE)}"\.\typecode.i"\

-	{$(INCLUDE)}"\.\varout.h"\

-	{$(INCLUDE)}"\ace\Acceptor.cpp"\

-	{$(INCLUDE)}"\ace\Acceptor.h"\

-	{$(INCLUDE)}"\ace\Acceptor.i"\

-	{$(INCLUDE)}"\ace\ACE.h"\

-	{$(INCLUDE)}"\ace\ACE.i"\

-	{$(INCLUDE)}"\ace\Addr.h"\

-	{$(INCLUDE)}"\ace\Addr.i"\

-	{$(INCLUDE)}"\ace\Atomic_Op.i"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.cpp"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.h"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.i"\

-	{$(INCLUDE)}"\ace\config-win32-common.h"\

-	{$(INCLUDE)}"\ace\Config.h"\

-	{$(INCLUDE)}"\ace\Connector.cpp"\

-	{$(INCLUDE)}"\ace\Connector.h"\

-	{$(INCLUDE)}"\ace\Connector.i"\

-	{$(INCLUDE)}"\ace\Containers.cpp"\

-	{$(INCLUDE)}"\ace\Containers.h"\

-	{$(INCLUDE)}"\ace\Containers.i"\

-	{$(INCLUDE)}"\ace\Dynamic.h"\

-	{$(INCLUDE)}"\ace\Dynamic.i"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.cpp"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.i"\

-	{$(INCLUDE)}"\ace\Free_List.cpp"\

-	{$(INCLUDE)}"\ace\Free_List.h"\

-	{$(INCLUDE)}"\ace\Free_List.i"\

-	{$(INCLUDE)}"\ace\Get_Opt.h"\

-	{$(INCLUDE)}"\ace\Get_Opt.i"\

-	{$(INCLUDE)}"\ace\Handle_Set.h"\

-	{$(INCLUDE)}"\ace\Handle_Set.i"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.i"\

-	{$(INCLUDE)}"\ace\IO_Cntl_Msg.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.i"\

-	{$(INCLUDE)}"\ace\Log_Msg.h"\

-	{$(INCLUDE)}"\ace\Log_Priority.h"\

-	{$(INCLUDE)}"\ace\Log_Record.h"\

-	{$(INCLUDE)}"\ace\Log_Record.i"\

-	{$(INCLUDE)}"\ace\Malloc.h"\

-	{$(INCLUDE)}"\ace\Malloc.i"\

-	{$(INCLUDE)}"\ace\Malloc_T.cpp"\

-	{$(INCLUDE)}"\ace\Malloc_T.h"\

-	{$(INCLUDE)}"\ace\Malloc_T.i"\

-	{$(INCLUDE)}"\ace\Managed_Object.cpp"\

-	{$(INCLUDE)}"\ace\Managed_Object.h"\

-	{$(INCLUDE)}"\ace\Managed_Object.i"\

-	{$(INCLUDE)}"\ace\Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Map_Manager.h"\

-	{$(INCLUDE)}"\ace\Map_Manager.i"\

-	{$(INCLUDE)}"\ace\Mem_Map.h"\

-	{$(INCLUDE)}"\ace\Mem_Map.i"\

-	{$(INCLUDE)}"\ace\Memory_Pool.h"\

-	{$(INCLUDE)}"\ace\Memory_Pool.i"\

-	{$(INCLUDE)}"\ace\Message_Block.h"\

-	{$(INCLUDE)}"\ace\Message_Block.i"\

-	{$(INCLUDE)}"\ace\Message_Queue.cpp"\

-	{$(INCLUDE)}"\ace\Message_Queue.h"\

-	{$(INCLUDE)}"\ace\Message_Queue.i"\

-	{$(INCLUDE)}"\ace\Module.cpp"\

-	{$(INCLUDE)}"\ace\Module.h"\

-	{$(INCLUDE)}"\ace\Module.i"\

-	{$(INCLUDE)}"\ace\Object_Manager.h"\

-	{$(INCLUDE)}"\ace\Object_Manager.i"\

-	{$(INCLUDE)}"\ace\OS.h"\

-	{$(INCLUDE)}"\ace\OS.i"\

-	{$(INCLUDE)}"\ace\Reactor.h"\

-	{$(INCLUDE)}"\ace\Reactor.i"\

-	{$(INCLUDE)}"\ace\Reactor_Impl.h"\

-	{$(INCLUDE)}"\ace\Service_Config.h"\

-	{$(INCLUDE)}"\ace\Service_Config.i"\

-	{$(INCLUDE)}"\ace\Service_Object.h"\

-	{$(INCLUDE)}"\ace\Service_Object.i"\

-	{$(INCLUDE)}"\ace\Service_Repository.h"\

-	{$(INCLUDE)}"\ace\Service_Repository.i"\

-	{$(INCLUDE)}"\ace\Service_Types.h"\

-	{$(INCLUDE)}"\ace\Service_Types.i"\

-	{$(INCLUDE)}"\ace\Shared_Object.h"\

-	{$(INCLUDE)}"\ace\Shared_Object.i"\

-	{$(INCLUDE)}"\ace\Signal.h"\

-	{$(INCLUDE)}"\ace\Signal.i"\

-	{$(INCLUDE)}"\ace\Singleton.cpp"\

-	{$(INCLUDE)}"\ace\Singleton.h"\

-	{$(INCLUDE)}"\ace\Singleton.i"\

-	{$(INCLUDE)}"\ace\SOCK.h"\

-	{$(INCLUDE)}"\ace\SOCK.i"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.h"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.i"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.h"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.i"\

-	{$(INCLUDE)}"\ace\SOCK_IO.h"\

-	{$(INCLUDE)}"\ace\SOCK_IO.i"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.h"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.i"\

-	{$(INCLUDE)}"\ace\SString.h"\

-	{$(INCLUDE)}"\ace\SString.i"\

-	{$(INCLUDE)}"\ace\stdcpp.h"\

-	{$(INCLUDE)}"\ace\Strategies.h"\

-	{$(INCLUDE)}"\ace\Strategies_T.cpp"\

-	{$(INCLUDE)}"\ace\Strategies_T.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.cpp"\

-	{$(INCLUDE)}"\ace\Stream_Modules.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.i"\

-	{$(INCLUDE)}"\ace\Svc_Conf_Tokens.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.cpp"\

-	{$(INCLUDE)}"\ace\Svc_Handler.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.i"\

-	{$(INCLUDE)}"\ace\Synch.h"\

-	{$(INCLUDE)}"\ace\Synch.i"\

-	{$(INCLUDE)}"\ace\Synch_Options.h"\

-	{$(INCLUDE)}"\ace\Synch_T.cpp"\

-	{$(INCLUDE)}"\ace\Synch_T.h"\

-	{$(INCLUDE)}"\ace\Synch_T.i"\

-	{$(INCLUDE)}"\ace\Task.h"\

-	{$(INCLUDE)}"\ace\Task.i"\

-	{$(INCLUDE)}"\ace\Task_T.cpp"\

-	{$(INCLUDE)}"\ace\Task_T.h"\

-	{$(INCLUDE)}"\ace\Task_T.i"\

-	{$(INCLUDE)}"\ace\Thread.h"\

-	{$(INCLUDE)}"\ace\Thread.i"\

-	{$(INCLUDE)}"\ace\Thread_Manager.h"\

-	{$(INCLUDE)}"\ace\Thread_Manager.i"\

-	{$(INCLUDE)}"\ace\Time_Value.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.cpp"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.i"\

-	{$(INCLUDE)}"\ace\Trace.h"\

-	{$(INCLUDE)}"\ace\Version.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.i"\

-	{$(INCLUDE)}"\ace\ws2tcpip.h"\

-	

-NODEP_CPP_DEEP_F=\

-	".\tao\factories.h"\

-	

-

-"$(INTDIR)\deep_free.obj" : $(SOURCE) $(DEP_CPP_DEEP_F) "$(INTDIR)"

-

-

-!ENDIF 

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\default_client.cpp

-

-!IF  "$(CFG)" == "TAO - Win32 Release"

-

-DEP_CPP_DEFAU=\

-	"..\..\ace\config-win32.h"\

-	{$(INCLUDE)}"\.\align.h"\

-	{$(INCLUDE)}"\.\any.h"\

-	{$(INCLUDE)}"\.\any.i"\

-	{$(INCLUDE)}"\.\cdr.h"\

-	{$(INCLUDE)}"\.\cdr.i"\

-	{$(INCLUDE)}"\.\client_factory.h"\

-	{$(INCLUDE)}"\.\connect.h"\

-	{$(INCLUDE)}"\.\connect.i"\

-	{$(INCLUDE)}"\.\corba.h"\

-	{$(INCLUDE)}"\.\corbacom.h"\

-	{$(INCLUDE)}"\.\corbacom.i"\

-	{$(INCLUDE)}"\.\debug.h"\

-	{$(INCLUDE)}"\.\default_client.h"\

-	{$(INCLUDE)}"\.\default_client.i"\

-	{$(INCLUDE)}"\.\default_server.h"\

-	{$(INCLUDE)}"\.\default_server.i"\

-	{$(INCLUDE)}"\.\except.h"\

-	{$(INCLUDE)}"\.\giop.h"\

-	{$(INCLUDE)}"\.\giop.i"\

-	{$(INCLUDE)}"\.\iiopobj.h"\

-	{$(INCLUDE)}"\.\iiopobj.i"\

-	{$(INCLUDE)}"\.\iioporb.h"\

-	{$(INCLUDE)}"\.\iioporb.i"\

-	{$(INCLUDE)}"\.\marshal.h"\

-	{$(INCLUDE)}"\.\marshal.i"\

-	{$(INCLUDE)}"\.\nvlist.h"\

-	{$(INCLUDE)}"\.\object.h"\

-	{$(INCLUDE)}"\.\object.i"\

-	{$(INCLUDE)}"\.\objtable.h"\

-	{$(INCLUDE)}"\.\optable.h"\

-	{$(INCLUDE)}"\.\orb.h"\

-	{$(INCLUDE)}"\.\orb_core.h"\

-	{$(INCLUDE)}"\.\orb_core.i"\

-	{$(INCLUDE)}"\.\orbconf.h"\

-	{$(INCLUDE)}"\.\orbobj.h"\

-	{$(INCLUDE)}"\.\orbobj.i"\

-	{$(INCLUDE)}"\.\params.h"\

-	{$(INCLUDE)}"\.\params.i"\

-	{$(INCLUDE)}"\.\poa.h"\

-	{$(INCLUDE)}"\.\poa.i"\

-	{$(INCLUDE)}"\.\principa.h"\

-	{$(INCLUDE)}"\.\request.h"\

-	{$(INCLUDE)}"\.\sequence.h"\

-	{$(INCLUDE)}"\.\sequence.i"\

-	{$(INCLUDE)}"\.\server_factory.h"\

-	{$(INCLUDE)}"\.\server_factory.i"\

-	{$(INCLUDE)}"\.\singletons.h"\

-	{$(INCLUDE)}"\.\stub.h"\

-	{$(INCLUDE)}"\.\stub.i"\

-	{$(INCLUDE)}"\.\svrrqst.h"\

-	{$(INCLUDE)}"\.\typecode.h"\

-	{$(INCLUDE)}"\.\typecode.i"\

-	{$(INCLUDE)}"\.\varout.h"\

-	{$(INCLUDE)}"\ace\Acceptor.cpp"\

-	{$(INCLUDE)}"\ace\Acceptor.h"\

-	{$(INCLUDE)}"\ace\Acceptor.i"\

-	{$(INCLUDE)}"\ace\ACE.h"\

-	{$(INCLUDE)}"\ace\ACE.i"\

-	{$(INCLUDE)}"\ace\Addr.h"\

-	{$(INCLUDE)}"\ace\Addr.i"\

-	{$(INCLUDE)}"\ace\Atomic_Op.i"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.cpp"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.h"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.i"\

-	{$(INCLUDE)}"\ace\config-win32-common.h"\

-	{$(INCLUDE)}"\ace\Config.h"\

-	{$(INCLUDE)}"\ace\Connector.cpp"\

-	{$(INCLUDE)}"\ace\Connector.h"\

-	{$(INCLUDE)}"\ace\Connector.i"\

-	{$(INCLUDE)}"\ace\Containers.cpp"\

-	{$(INCLUDE)}"\ace\Containers.h"\

-	{$(INCLUDE)}"\ace\Containers.i"\

-	{$(INCLUDE)}"\ace\Dynamic.h"\

-	{$(INCLUDE)}"\ace\Dynamic.i"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.cpp"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.i"\

-	{$(INCLUDE)}"\ace\Free_List.cpp"\

-	{$(INCLUDE)}"\ace\Free_List.h"\

-	{$(INCLUDE)}"\ace\Free_List.i"\

-	{$(INCLUDE)}"\ace\Get_Opt.h"\

-	{$(INCLUDE)}"\ace\Get_Opt.i"\

-	{$(INCLUDE)}"\ace\Handle_Set.h"\

-	{$(INCLUDE)}"\ace\Handle_Set.i"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.i"\

-	{$(INCLUDE)}"\ace\IO_Cntl_Msg.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.i"\

-	{$(INCLUDE)}"\ace\Log_Msg.h"\

-	{$(INCLUDE)}"\ace\Log_Priority.h"\

-	{$(INCLUDE)}"\ace\Log_Record.h"\

-	{$(INCLUDE)}"\ace\Log_Record.i"\

-	{$(INCLUDE)}"\ace\Malloc.h"\

-	{$(INCLUDE)}"\ace\Malloc.i"\

-	{$(INCLUDE)}"\ace\Malloc_T.cpp"\

-	{$(INCLUDE)}"\ace\Malloc_T.h"\

-	{$(INCLUDE)}"\ace\Malloc_T.i"\

-	{$(INCLUDE)}"\ace\Managed_Object.cpp"\

-	{$(INCLUDE)}"\ace\Managed_Object.h"\

-	{$(INCLUDE)}"\ace\Managed_Object.i"\

-	{$(INCLUDE)}"\ace\Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Map_Manager.h"\

-	{$(INCLUDE)}"\ace\Map_Manager.i"\

-	{$(INCLUDE)}"\ace\Mem_Map.h"\

-	{$(INCLUDE)}"\ace\Mem_Map.i"\

-	{$(INCLUDE)}"\ace\Memory_Pool.h"\

-	{$(INCLUDE)}"\ace\Memory_Pool.i"\

-	{$(INCLUDE)}"\ace\Message_Block.h"\

-	{$(INCLUDE)}"\ace\Message_Block.i"\

-	{$(INCLUDE)}"\ace\Message_Queue.cpp"\

-	{$(INCLUDE)}"\ace\Message_Queue.h"\

-	{$(INCLUDE)}"\ace\Message_Queue.i"\

-	{$(INCLUDE)}"\ace\Module.cpp"\

-	{$(INCLUDE)}"\ace\Module.h"\

-	{$(INCLUDE)}"\ace\Module.i"\

-	{$(INCLUDE)}"\ace\Object_Manager.h"\

-	{$(INCLUDE)}"\ace\Object_Manager.i"\

-	{$(INCLUDE)}"\ace\OS.h"\

-	{$(INCLUDE)}"\ace\OS.i"\

-	{$(INCLUDE)}"\ace\Reactor.h"\

-	{$(INCLUDE)}"\ace\Reactor.i"\

-	{$(INCLUDE)}"\ace\Reactor_Impl.h"\

-	{$(INCLUDE)}"\ace\Service_Config.h"\

-	{$(INCLUDE)}"\ace\Service_Config.i"\

-	{$(INCLUDE)}"\ace\Service_Object.h"\

-	{$(INCLUDE)}"\ace\Service_Object.i"\

-	{$(INCLUDE)}"\ace\Service_Repository.h"\

-	{$(INCLUDE)}"\ace\Service_Repository.i"\

-	{$(INCLUDE)}"\ace\Service_Types.h"\

-	{$(INCLUDE)}"\ace\Service_Types.i"\

-	{$(INCLUDE)}"\ace\Shared_Object.h"\

-	{$(INCLUDE)}"\ace\Shared_Object.i"\

-	{$(INCLUDE)}"\ace\Signal.h"\

-	{$(INCLUDE)}"\ace\Signal.i"\

-	{$(INCLUDE)}"\ace\Singleton.cpp"\

-	{$(INCLUDE)}"\ace\Singleton.h"\

-	{$(INCLUDE)}"\ace\Singleton.i"\

-	{$(INCLUDE)}"\ace\SOCK.h"\

-	{$(INCLUDE)}"\ace\SOCK.i"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.h"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.i"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.h"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.i"\

-	{$(INCLUDE)}"\ace\SOCK_IO.h"\

-	{$(INCLUDE)}"\ace\SOCK_IO.i"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.h"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.i"\

-	{$(INCLUDE)}"\ace\SString.h"\

-	{$(INCLUDE)}"\ace\SString.i"\

-	{$(INCLUDE)}"\ace\stdcpp.h"\

-	{$(INCLUDE)}"\ace\Strategies.h"\

-	{$(INCLUDE)}"\ace\Strategies_T.cpp"\

-	{$(INCLUDE)}"\ace\Strategies_T.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.cpp"\

-	{$(INCLUDE)}"\ace\Stream_Modules.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.i"\

-	{$(INCLUDE)}"\ace\Svc_Conf_Tokens.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.cpp"\

-	{$(INCLUDE)}"\ace\Svc_Handler.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.i"\

-	{$(INCLUDE)}"\ace\Synch.h"\

-	{$(INCLUDE)}"\ace\Synch.i"\

-	{$(INCLUDE)}"\ace\Synch_Options.h"\

-	{$(INCLUDE)}"\ace\Synch_T.cpp"\

-	{$(INCLUDE)}"\ace\Synch_T.h"\

-	{$(INCLUDE)}"\ace\Synch_T.i"\

-	{$(INCLUDE)}"\ace\Task.h"\

-	{$(INCLUDE)}"\ace\Task.i"\

-	{$(INCLUDE)}"\ace\Task_T.cpp"\

-	{$(INCLUDE)}"\ace\Task_T.h"\

-	{$(INCLUDE)}"\ace\Task_T.i"\

-	{$(INCLUDE)}"\ace\Thread.h"\

-	{$(INCLUDE)}"\ace\Thread.i"\

-	{$(INCLUDE)}"\ace\Thread_Manager.h"\

-	{$(INCLUDE)}"\ace\Thread_Manager.i"\

-	{$(INCLUDE)}"\ace\Time_Value.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.cpp"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.i"\

-	{$(INCLUDE)}"\ace\Trace.h"\

-	{$(INCLUDE)}"\ace\Version.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.i"\

-	{$(INCLUDE)}"\ace\ws2tcpip.h"\

-	

-NODEP_CPP_DEFAU=\

-	".\tao\factories.h"\

-	

-

-"$(INTDIR)\default_client.obj" : $(SOURCE) $(DEP_CPP_DEFAU) "$(INTDIR)"

-

-

-!ELSEIF  "$(CFG)" == "TAO - Win32 Debug"

-

-DEP_CPP_DEFAU=\

-	"..\..\ace\config-win32.h"\

-	{$(INCLUDE)}"\.\align.h"\

-	{$(INCLUDE)}"\.\any.h"\

-	{$(INCLUDE)}"\.\any.i"\

-	{$(INCLUDE)}"\.\cdr.h"\

-	{$(INCLUDE)}"\.\cdr.i"\

-	{$(INCLUDE)}"\.\client_factory.h"\

-	{$(INCLUDE)}"\.\connect.h"\

-	{$(INCLUDE)}"\.\connect.i"\

-	{$(INCLUDE)}"\.\corba.h"\

-	{$(INCLUDE)}"\.\corbacom.h"\

-	{$(INCLUDE)}"\.\corbacom.i"\

-	{$(INCLUDE)}"\.\debug.h"\

-	{$(INCLUDE)}"\.\default_client.h"\

-	{$(INCLUDE)}"\.\default_client.i"\

-	{$(INCLUDE)}"\.\default_server.h"\

-	{$(INCLUDE)}"\.\default_server.i"\

-	{$(INCLUDE)}"\.\except.h"\

-	{$(INCLUDE)}"\.\giop.h"\

-	{$(INCLUDE)}"\.\giop.i"\

-	{$(INCLUDE)}"\.\iiopobj.h"\

-	{$(INCLUDE)}"\.\iiopobj.i"\

-	{$(INCLUDE)}"\.\iioporb.h"\

-	{$(INCLUDE)}"\.\iioporb.i"\

-	{$(INCLUDE)}"\.\marshal.h"\

-	{$(INCLUDE)}"\.\marshal.i"\

-	{$(INCLUDE)}"\.\nvlist.h"\

-	{$(INCLUDE)}"\.\object.h"\

-	{$(INCLUDE)}"\.\object.i"\

-	{$(INCLUDE)}"\.\objtable.h"\

-	{$(INCLUDE)}"\.\optable.h"\

-	{$(INCLUDE)}"\.\orb.h"\

-	{$(INCLUDE)}"\.\orb_core.h"\

-	{$(INCLUDE)}"\.\orb_core.i"\

-	{$(INCLUDE)}"\.\orbconf.h"\

-	{$(INCLUDE)}"\.\orbobj.h"\

-	{$(INCLUDE)}"\.\orbobj.i"\

-	{$(INCLUDE)}"\.\params.h"\

-	{$(INCLUDE)}"\.\params.i"\

-	{$(INCLUDE)}"\.\poa.h"\

-	{$(INCLUDE)}"\.\poa.i"\

-	{$(INCLUDE)}"\.\principa.h"\

-	{$(INCLUDE)}"\.\request.h"\

-	{$(INCLUDE)}"\.\sequence.h"\

-	{$(INCLUDE)}"\.\sequence.i"\

-	{$(INCLUDE)}"\.\server_factory.h"\

-	{$(INCLUDE)}"\.\server_factory.i"\

-	{$(INCLUDE)}"\.\singletons.h"\

-	{$(INCLUDE)}"\.\stub.h"\

-	{$(INCLUDE)}"\.\stub.i"\

-	{$(INCLUDE)}"\.\svrrqst.h"\

-	{$(INCLUDE)}"\.\typecode.h"\

-	{$(INCLUDE)}"\.\typecode.i"\

-	{$(INCLUDE)}"\.\varout.h"\

-	{$(INCLUDE)}"\ace\Acceptor.cpp"\

-	{$(INCLUDE)}"\ace\Acceptor.h"\

-	{$(INCLUDE)}"\ace\Acceptor.i"\

-	{$(INCLUDE)}"\ace\ACE.h"\

-	{$(INCLUDE)}"\ace\ACE.i"\

-	{$(INCLUDE)}"\ace\Addr.h"\

-	{$(INCLUDE)}"\ace\Addr.i"\

-	{$(INCLUDE)}"\ace\Atomic_Op.i"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.cpp"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.h"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.i"\

-	{$(INCLUDE)}"\ace\config-win32-common.h"\

-	{$(INCLUDE)}"\ace\Config.h"\

-	{$(INCLUDE)}"\ace\Connector.cpp"\

-	{$(INCLUDE)}"\ace\Connector.h"\

-	{$(INCLUDE)}"\ace\Connector.i"\

-	{$(INCLUDE)}"\ace\Containers.cpp"\

-	{$(INCLUDE)}"\ace\Containers.h"\

-	{$(INCLUDE)}"\ace\Containers.i"\

-	{$(INCLUDE)}"\ace\Dynamic.h"\

-	{$(INCLUDE)}"\ace\Dynamic.i"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.cpp"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.i"\

-	{$(INCLUDE)}"\ace\Free_List.cpp"\

-	{$(INCLUDE)}"\ace\Free_List.h"\

-	{$(INCLUDE)}"\ace\Free_List.i"\

-	{$(INCLUDE)}"\ace\Get_Opt.h"\

-	{$(INCLUDE)}"\ace\Get_Opt.i"\

-	{$(INCLUDE)}"\ace\Handle_Set.h"\

-	{$(INCLUDE)}"\ace\Handle_Set.i"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.i"\

-	{$(INCLUDE)}"\ace\IO_Cntl_Msg.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.i"\

-	{$(INCLUDE)}"\ace\Log_Msg.h"\

-	{$(INCLUDE)}"\ace\Log_Priority.h"\

-	{$(INCLUDE)}"\ace\Log_Record.h"\

-	{$(INCLUDE)}"\ace\Log_Record.i"\

-	{$(INCLUDE)}"\ace\Malloc.h"\

-	{$(INCLUDE)}"\ace\Malloc.i"\

-	{$(INCLUDE)}"\ace\Malloc_T.cpp"\

-	{$(INCLUDE)}"\ace\Malloc_T.h"\

-	{$(INCLUDE)}"\ace\Malloc_T.i"\

-	{$(INCLUDE)}"\ace\Managed_Object.cpp"\

-	{$(INCLUDE)}"\ace\Managed_Object.h"\

-	{$(INCLUDE)}"\ace\Managed_Object.i"\

-	{$(INCLUDE)}"\ace\Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Map_Manager.h"\

-	{$(INCLUDE)}"\ace\Map_Manager.i"\

-	{$(INCLUDE)}"\ace\Mem_Map.h"\

-	{$(INCLUDE)}"\ace\Mem_Map.i"\

-	{$(INCLUDE)}"\ace\Memory_Pool.h"\

-	{$(INCLUDE)}"\ace\Memory_Pool.i"\

-	{$(INCLUDE)}"\ace\Message_Block.h"\

-	{$(INCLUDE)}"\ace\Message_Block.i"\

-	{$(INCLUDE)}"\ace\Message_Queue.cpp"\

-	{$(INCLUDE)}"\ace\Message_Queue.h"\

-	{$(INCLUDE)}"\ace\Message_Queue.i"\

-	{$(INCLUDE)}"\ace\Module.cpp"\

-	{$(INCLUDE)}"\ace\Module.h"\

-	{$(INCLUDE)}"\ace\Module.i"\

-	{$(INCLUDE)}"\ace\Object_Manager.h"\

-	{$(INCLUDE)}"\ace\Object_Manager.i"\

-	{$(INCLUDE)}"\ace\OS.h"\

-	{$(INCLUDE)}"\ace\OS.i"\

-	{$(INCLUDE)}"\ace\Reactor.h"\

-	{$(INCLUDE)}"\ace\Reactor.i"\

-	{$(INCLUDE)}"\ace\Reactor_Impl.h"\

-	{$(INCLUDE)}"\ace\Service_Config.h"\

-	{$(INCLUDE)}"\ace\Service_Config.i"\

-	{$(INCLUDE)}"\ace\Service_Object.h"\

-	{$(INCLUDE)}"\ace\Service_Object.i"\

-	{$(INCLUDE)}"\ace\Service_Repository.h"\

-	{$(INCLUDE)}"\ace\Service_Repository.i"\

-	{$(INCLUDE)}"\ace\Service_Types.h"\

-	{$(INCLUDE)}"\ace\Service_Types.i"\

-	{$(INCLUDE)}"\ace\Shared_Object.h"\

-	{$(INCLUDE)}"\ace\Shared_Object.i"\

-	{$(INCLUDE)}"\ace\Signal.h"\

-	{$(INCLUDE)}"\ace\Signal.i"\

-	{$(INCLUDE)}"\ace\Singleton.cpp"\

-	{$(INCLUDE)}"\ace\Singleton.h"\

-	{$(INCLUDE)}"\ace\Singleton.i"\

-	{$(INCLUDE)}"\ace\SOCK.h"\

-	{$(INCLUDE)}"\ace\SOCK.i"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.h"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.i"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.h"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.i"\

-	{$(INCLUDE)}"\ace\SOCK_IO.h"\

-	{$(INCLUDE)}"\ace\SOCK_IO.i"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.h"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.i"\

-	{$(INCLUDE)}"\ace\SString.h"\

-	{$(INCLUDE)}"\ace\SString.i"\

-	{$(INCLUDE)}"\ace\stdcpp.h"\

-	{$(INCLUDE)}"\ace\Strategies.h"\

-	{$(INCLUDE)}"\ace\Strategies_T.cpp"\

-	{$(INCLUDE)}"\ace\Strategies_T.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.cpp"\

-	{$(INCLUDE)}"\ace\Stream_Modules.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.i"\

-	{$(INCLUDE)}"\ace\Svc_Conf_Tokens.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.cpp"\

-	{$(INCLUDE)}"\ace\Svc_Handler.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.i"\

-	{$(INCLUDE)}"\ace\Synch.h"\

-	{$(INCLUDE)}"\ace\Synch.i"\

-	{$(INCLUDE)}"\ace\Synch_Options.h"\

-	{$(INCLUDE)}"\ace\Synch_T.cpp"\

-	{$(INCLUDE)}"\ace\Synch_T.h"\

-	{$(INCLUDE)}"\ace\Synch_T.i"\

-	{$(INCLUDE)}"\ace\Task.h"\

-	{$(INCLUDE)}"\ace\Task.i"\

-	{$(INCLUDE)}"\ace\Task_T.cpp"\

-	{$(INCLUDE)}"\ace\Task_T.h"\

-	{$(INCLUDE)}"\ace\Task_T.i"\

-	{$(INCLUDE)}"\ace\Thread.h"\

-	{$(INCLUDE)}"\ace\Thread.i"\

-	{$(INCLUDE)}"\ace\Thread_Manager.h"\

-	{$(INCLUDE)}"\ace\Thread_Manager.i"\

-	{$(INCLUDE)}"\ace\Time_Value.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.cpp"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.i"\

-	{$(INCLUDE)}"\ace\Trace.h"\

-	{$(INCLUDE)}"\ace\Version.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.i"\

-	{$(INCLUDE)}"\ace\ws2tcpip.h"\

-	

-NODEP_CPP_DEFAU=\

-	".\tao\factories.h"\

-	

-

-"$(INTDIR)\default_client.obj" : $(SOURCE) $(DEP_CPP_DEFAU) "$(INTDIR)"

-

-

-!ENDIF 

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\default_server.cpp

-

-!IF  "$(CFG)" == "TAO - Win32 Release"

-

-DEP_CPP_DEFAUL=\

-	"..\..\ace\config-win32.h"\

-	{$(INCLUDE)}"\.\align.h"\

-	{$(INCLUDE)}"\.\any.h"\

-	{$(INCLUDE)}"\.\any.i"\

-	{$(INCLUDE)}"\.\cdr.h"\

-	{$(INCLUDE)}"\.\cdr.i"\

-	{$(INCLUDE)}"\.\client_factory.h"\

-	{$(INCLUDE)}"\.\connect.h"\

-	{$(INCLUDE)}"\.\connect.i"\

-	{$(INCLUDE)}"\.\corba.h"\

-	{$(INCLUDE)}"\.\corbacom.h"\

-	{$(INCLUDE)}"\.\corbacom.i"\

-	{$(INCLUDE)}"\.\debug.h"\

-	{$(INCLUDE)}"\.\default_client.h"\

-	{$(INCLUDE)}"\.\default_client.i"\

-	{$(INCLUDE)}"\.\default_server.h"\

-	{$(INCLUDE)}"\.\default_server.i"\

-	{$(INCLUDE)}"\.\except.h"\

-	{$(INCLUDE)}"\.\giop.h"\

-	{$(INCLUDE)}"\.\giop.i"\

-	{$(INCLUDE)}"\.\iiopobj.h"\

-	{$(INCLUDE)}"\.\iiopobj.i"\

-	{$(INCLUDE)}"\.\iioporb.h"\

-	{$(INCLUDE)}"\.\iioporb.i"\

-	{$(INCLUDE)}"\.\marshal.h"\

-	{$(INCLUDE)}"\.\marshal.i"\

-	{$(INCLUDE)}"\.\nvlist.h"\

-	{$(INCLUDE)}"\.\object.h"\

-	{$(INCLUDE)}"\.\object.i"\

-	{$(INCLUDE)}"\.\objtable.h"\

-	{$(INCLUDE)}"\.\optable.h"\

-	{$(INCLUDE)}"\.\orb.h"\

-	{$(INCLUDE)}"\.\orb_core.h"\

-	{$(INCLUDE)}"\.\orb_core.i"\

-	{$(INCLUDE)}"\.\orbconf.h"\

-	{$(INCLUDE)}"\.\orbobj.h"\

-	{$(INCLUDE)}"\.\orbobj.i"\

-	{$(INCLUDE)}"\.\params.h"\

-	{$(INCLUDE)}"\.\params.i"\

-	{$(INCLUDE)}"\.\poa.h"\

-	{$(INCLUDE)}"\.\poa.i"\

-	{$(INCLUDE)}"\.\principa.h"\

-	{$(INCLUDE)}"\.\request.h"\

-	{$(INCLUDE)}"\.\sequence.h"\

-	{$(INCLUDE)}"\.\sequence.i"\

-	{$(INCLUDE)}"\.\server_factory.h"\

-	{$(INCLUDE)}"\.\server_factory.i"\

-	{$(INCLUDE)}"\.\singletons.h"\

-	{$(INCLUDE)}"\.\stub.h"\

-	{$(INCLUDE)}"\.\stub.i"\

-	{$(INCLUDE)}"\.\svrrqst.h"\

-	{$(INCLUDE)}"\.\typecode.h"\

-	{$(INCLUDE)}"\.\typecode.i"\

-	{$(INCLUDE)}"\.\varout.h"\

-	{$(INCLUDE)}"\ace\Acceptor.cpp"\

-	{$(INCLUDE)}"\ace\Acceptor.h"\

-	{$(INCLUDE)}"\ace\Acceptor.i"\

-	{$(INCLUDE)}"\ace\ACE.h"\

-	{$(INCLUDE)}"\ace\ACE.i"\

-	{$(INCLUDE)}"\ace\Addr.h"\

-	{$(INCLUDE)}"\ace\Addr.i"\

-	{$(INCLUDE)}"\ace\Atomic_Op.i"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.cpp"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.h"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.i"\

-	{$(INCLUDE)}"\ace\config-win32-common.h"\

-	{$(INCLUDE)}"\ace\Config.h"\

-	{$(INCLUDE)}"\ace\Connector.cpp"\

-	{$(INCLUDE)}"\ace\Connector.h"\

-	{$(INCLUDE)}"\ace\Connector.i"\

-	{$(INCLUDE)}"\ace\Containers.cpp"\

-	{$(INCLUDE)}"\ace\Containers.h"\

-	{$(INCLUDE)}"\ace\Containers.i"\

-	{$(INCLUDE)}"\ace\Dynamic.h"\

-	{$(INCLUDE)}"\ace\Dynamic.i"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.cpp"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.i"\

-	{$(INCLUDE)}"\ace\Free_List.cpp"\

-	{$(INCLUDE)}"\ace\Free_List.h"\

-	{$(INCLUDE)}"\ace\Free_List.i"\

-	{$(INCLUDE)}"\ace\Get_Opt.h"\

-	{$(INCLUDE)}"\ace\Get_Opt.i"\

-	{$(INCLUDE)}"\ace\Handle_Set.h"\

-	{$(INCLUDE)}"\ace\Handle_Set.i"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.i"\

-	{$(INCLUDE)}"\ace\IO_Cntl_Msg.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.i"\

-	{$(INCLUDE)}"\ace\Log_Msg.h"\

-	{$(INCLUDE)}"\ace\Log_Priority.h"\

-	{$(INCLUDE)}"\ace\Log_Record.h"\

-	{$(INCLUDE)}"\ace\Log_Record.i"\

-	{$(INCLUDE)}"\ace\Malloc.h"\

-	{$(INCLUDE)}"\ace\Malloc.i"\

-	{$(INCLUDE)}"\ace\Malloc_T.cpp"\

-	{$(INCLUDE)}"\ace\Malloc_T.h"\

-	{$(INCLUDE)}"\ace\Malloc_T.i"\

-	{$(INCLUDE)}"\ace\Managed_Object.cpp"\

-	{$(INCLUDE)}"\ace\Managed_Object.h"\

-	{$(INCLUDE)}"\ace\Managed_Object.i"\

-	{$(INCLUDE)}"\ace\Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Map_Manager.h"\

-	{$(INCLUDE)}"\ace\Map_Manager.i"\

-	{$(INCLUDE)}"\ace\Mem_Map.h"\

-	{$(INCLUDE)}"\ace\Mem_Map.i"\

-	{$(INCLUDE)}"\ace\Memory_Pool.h"\

-	{$(INCLUDE)}"\ace\Memory_Pool.i"\

-	{$(INCLUDE)}"\ace\Message_Block.h"\

-	{$(INCLUDE)}"\ace\Message_Block.i"\

-	{$(INCLUDE)}"\ace\Message_Queue.cpp"\

-	{$(INCLUDE)}"\ace\Message_Queue.h"\

-	{$(INCLUDE)}"\ace\Message_Queue.i"\

-	{$(INCLUDE)}"\ace\Module.cpp"\

-	{$(INCLUDE)}"\ace\Module.h"\

-	{$(INCLUDE)}"\ace\Module.i"\

-	{$(INCLUDE)}"\ace\Object_Manager.h"\

-	{$(INCLUDE)}"\ace\Object_Manager.i"\

-	{$(INCLUDE)}"\ace\OS.h"\

-	{$(INCLUDE)}"\ace\OS.i"\

-	{$(INCLUDE)}"\ace\Reactor.h"\

-	{$(INCLUDE)}"\ace\Reactor.i"\

-	{$(INCLUDE)}"\ace\Reactor_Impl.h"\

-	{$(INCLUDE)}"\ace\Service_Config.h"\

-	{$(INCLUDE)}"\ace\Service_Config.i"\

-	{$(INCLUDE)}"\ace\Service_Object.h"\

-	{$(INCLUDE)}"\ace\Service_Object.i"\

-	{$(INCLUDE)}"\ace\Service_Repository.h"\

-	{$(INCLUDE)}"\ace\Service_Repository.i"\

-	{$(INCLUDE)}"\ace\Service_Types.h"\

-	{$(INCLUDE)}"\ace\Service_Types.i"\

-	{$(INCLUDE)}"\ace\Shared_Object.h"\

-	{$(INCLUDE)}"\ace\Shared_Object.i"\

-	{$(INCLUDE)}"\ace\Signal.h"\

-	{$(INCLUDE)}"\ace\Signal.i"\

-	{$(INCLUDE)}"\ace\Singleton.cpp"\

-	{$(INCLUDE)}"\ace\Singleton.h"\

-	{$(INCLUDE)}"\ace\Singleton.i"\

-	{$(INCLUDE)}"\ace\SOCK.h"\

-	{$(INCLUDE)}"\ace\SOCK.i"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.h"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.i"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.h"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.i"\

-	{$(INCLUDE)}"\ace\SOCK_IO.h"\

-	{$(INCLUDE)}"\ace\SOCK_IO.i"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.h"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.i"\

-	{$(INCLUDE)}"\ace\SString.h"\

-	{$(INCLUDE)}"\ace\SString.i"\

-	{$(INCLUDE)}"\ace\stdcpp.h"\

-	{$(INCLUDE)}"\ace\Strategies.h"\

-	{$(INCLUDE)}"\ace\Strategies_T.cpp"\

-	{$(INCLUDE)}"\ace\Strategies_T.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.cpp"\

-	{$(INCLUDE)}"\ace\Stream_Modules.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.i"\

-	{$(INCLUDE)}"\ace\Svc_Conf_Tokens.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.cpp"\

-	{$(INCLUDE)}"\ace\Svc_Handler.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.i"\

-	{$(INCLUDE)}"\ace\Synch.h"\

-	{$(INCLUDE)}"\ace\Synch.i"\

-	{$(INCLUDE)}"\ace\Synch_Options.h"\

-	{$(INCLUDE)}"\ace\Synch_T.cpp"\

-	{$(INCLUDE)}"\ace\Synch_T.h"\

-	{$(INCLUDE)}"\ace\Synch_T.i"\

-	{$(INCLUDE)}"\ace\Task.h"\

-	{$(INCLUDE)}"\ace\Task.i"\

-	{$(INCLUDE)}"\ace\Task_T.cpp"\

-	{$(INCLUDE)}"\ace\Task_T.h"\

-	{$(INCLUDE)}"\ace\Task_T.i"\

-	{$(INCLUDE)}"\ace\Thread.h"\

-	{$(INCLUDE)}"\ace\Thread.i"\

-	{$(INCLUDE)}"\ace\Thread_Manager.h"\

-	{$(INCLUDE)}"\ace\Thread_Manager.i"\

-	{$(INCLUDE)}"\ace\Time_Value.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.cpp"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.i"\

-	{$(INCLUDE)}"\ace\Trace.h"\

-	{$(INCLUDE)}"\ace\Version.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.i"\

-	{$(INCLUDE)}"\ace\ws2tcpip.h"\

-	

-NODEP_CPP_DEFAUL=\

-	".\tao\factories.h"\

-	

-

-"$(INTDIR)\default_server.obj" : $(SOURCE) $(DEP_CPP_DEFAUL) "$(INTDIR)"

-

-

-!ELSEIF  "$(CFG)" == "TAO - Win32 Debug"

-

-DEP_CPP_DEFAUL=\

-	"..\..\ace\config-win32.h"\

-	{$(INCLUDE)}"\.\align.h"\

-	{$(INCLUDE)}"\.\any.h"\

-	{$(INCLUDE)}"\.\any.i"\

-	{$(INCLUDE)}"\.\cdr.h"\

-	{$(INCLUDE)}"\.\cdr.i"\

-	{$(INCLUDE)}"\.\client_factory.h"\

-	{$(INCLUDE)}"\.\connect.h"\

-	{$(INCLUDE)}"\.\connect.i"\

-	{$(INCLUDE)}"\.\corba.h"\

-	{$(INCLUDE)}"\.\corbacom.h"\

-	{$(INCLUDE)}"\.\corbacom.i"\

-	{$(INCLUDE)}"\.\debug.h"\

-	{$(INCLUDE)}"\.\default_client.h"\

-	{$(INCLUDE)}"\.\default_client.i"\

-	{$(INCLUDE)}"\.\default_server.h"\

-	{$(INCLUDE)}"\.\default_server.i"\

-	{$(INCLUDE)}"\.\except.h"\

-	{$(INCLUDE)}"\.\giop.h"\

-	{$(INCLUDE)}"\.\giop.i"\

-	{$(INCLUDE)}"\.\iiopobj.h"\

-	{$(INCLUDE)}"\.\iiopobj.i"\

-	{$(INCLUDE)}"\.\iioporb.h"\

-	{$(INCLUDE)}"\.\iioporb.i"\

-	{$(INCLUDE)}"\.\marshal.h"\

-	{$(INCLUDE)}"\.\marshal.i"\

-	{$(INCLUDE)}"\.\nvlist.h"\

-	{$(INCLUDE)}"\.\object.h"\

-	{$(INCLUDE)}"\.\object.i"\

-	{$(INCLUDE)}"\.\objtable.h"\

-	{$(INCLUDE)}"\.\optable.h"\

-	{$(INCLUDE)}"\.\orb.h"\

-	{$(INCLUDE)}"\.\orb_core.h"\

-	{$(INCLUDE)}"\.\orb_core.i"\

-	{$(INCLUDE)}"\.\orbconf.h"\

-	{$(INCLUDE)}"\.\orbobj.h"\

-	{$(INCLUDE)}"\.\orbobj.i"\

-	{$(INCLUDE)}"\.\params.h"\

-	{$(INCLUDE)}"\.\params.i"\

-	{$(INCLUDE)}"\.\poa.h"\

-	{$(INCLUDE)}"\.\poa.i"\

-	{$(INCLUDE)}"\.\principa.h"\

-	{$(INCLUDE)}"\.\request.h"\

-	{$(INCLUDE)}"\.\sequence.h"\

-	{$(INCLUDE)}"\.\sequence.i"\

-	{$(INCLUDE)}"\.\server_factory.h"\

-	{$(INCLUDE)}"\.\server_factory.i"\

-	{$(INCLUDE)}"\.\singletons.h"\

-	{$(INCLUDE)}"\.\stub.h"\

-	{$(INCLUDE)}"\.\stub.i"\

-	{$(INCLUDE)}"\.\svrrqst.h"\

-	{$(INCLUDE)}"\.\typecode.h"\

-	{$(INCLUDE)}"\.\typecode.i"\

-	{$(INCLUDE)}"\.\varout.h"\

-	{$(INCLUDE)}"\ace\Acceptor.cpp"\

-	{$(INCLUDE)}"\ace\Acceptor.h"\

-	{$(INCLUDE)}"\ace\Acceptor.i"\

-	{$(INCLUDE)}"\ace\ACE.h"\

-	{$(INCLUDE)}"\ace\ACE.i"\

-	{$(INCLUDE)}"\ace\Addr.h"\

-	{$(INCLUDE)}"\ace\Addr.i"\

-	{$(INCLUDE)}"\ace\Atomic_Op.i"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.cpp"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.h"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.i"\

-	{$(INCLUDE)}"\ace\config-win32-common.h"\

-	{$(INCLUDE)}"\ace\Config.h"\

-	{$(INCLUDE)}"\ace\Connector.cpp"\

-	{$(INCLUDE)}"\ace\Connector.h"\

-	{$(INCLUDE)}"\ace\Connector.i"\

-	{$(INCLUDE)}"\ace\Containers.cpp"\

-	{$(INCLUDE)}"\ace\Containers.h"\

-	{$(INCLUDE)}"\ace\Containers.i"\

-	{$(INCLUDE)}"\ace\Dynamic.h"\

-	{$(INCLUDE)}"\ace\Dynamic.i"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.cpp"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.i"\

-	{$(INCLUDE)}"\ace\Free_List.cpp"\

-	{$(INCLUDE)}"\ace\Free_List.h"\

-	{$(INCLUDE)}"\ace\Free_List.i"\

-	{$(INCLUDE)}"\ace\Get_Opt.h"\

-	{$(INCLUDE)}"\ace\Get_Opt.i"\

-	{$(INCLUDE)}"\ace\Handle_Set.h"\

-	{$(INCLUDE)}"\ace\Handle_Set.i"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.i"\

-	{$(INCLUDE)}"\ace\IO_Cntl_Msg.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.i"\

-	{$(INCLUDE)}"\ace\Log_Msg.h"\

-	{$(INCLUDE)}"\ace\Log_Priority.h"\

-	{$(INCLUDE)}"\ace\Log_Record.h"\

-	{$(INCLUDE)}"\ace\Log_Record.i"\

-	{$(INCLUDE)}"\ace\Malloc.h"\

-	{$(INCLUDE)}"\ace\Malloc.i"\

-	{$(INCLUDE)}"\ace\Malloc_T.cpp"\

-	{$(INCLUDE)}"\ace\Malloc_T.h"\

-	{$(INCLUDE)}"\ace\Malloc_T.i"\

-	{$(INCLUDE)}"\ace\Managed_Object.cpp"\

-	{$(INCLUDE)}"\ace\Managed_Object.h"\

-	{$(INCLUDE)}"\ace\Managed_Object.i"\

-	{$(INCLUDE)}"\ace\Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Map_Manager.h"\

-	{$(INCLUDE)}"\ace\Map_Manager.i"\

-	{$(INCLUDE)}"\ace\Mem_Map.h"\

-	{$(INCLUDE)}"\ace\Mem_Map.i"\

-	{$(INCLUDE)}"\ace\Memory_Pool.h"\

-	{$(INCLUDE)}"\ace\Memory_Pool.i"\

-	{$(INCLUDE)}"\ace\Message_Block.h"\

-	{$(INCLUDE)}"\ace\Message_Block.i"\

-	{$(INCLUDE)}"\ace\Message_Queue.cpp"\

-	{$(INCLUDE)}"\ace\Message_Queue.h"\

-	{$(INCLUDE)}"\ace\Message_Queue.i"\

-	{$(INCLUDE)}"\ace\Module.cpp"\

-	{$(INCLUDE)}"\ace\Module.h"\

-	{$(INCLUDE)}"\ace\Module.i"\

-	{$(INCLUDE)}"\ace\Object_Manager.h"\

-	{$(INCLUDE)}"\ace\Object_Manager.i"\

-	{$(INCLUDE)}"\ace\OS.h"\

-	{$(INCLUDE)}"\ace\OS.i"\

-	{$(INCLUDE)}"\ace\Reactor.h"\

-	{$(INCLUDE)}"\ace\Reactor.i"\

-	{$(INCLUDE)}"\ace\Reactor_Impl.h"\

-	{$(INCLUDE)}"\ace\Service_Config.h"\

-	{$(INCLUDE)}"\ace\Service_Config.i"\

-	{$(INCLUDE)}"\ace\Service_Object.h"\

-	{$(INCLUDE)}"\ace\Service_Object.i"\

-	{$(INCLUDE)}"\ace\Service_Repository.h"\

-	{$(INCLUDE)}"\ace\Service_Repository.i"\

-	{$(INCLUDE)}"\ace\Service_Types.h"\

-	{$(INCLUDE)}"\ace\Service_Types.i"\

-	{$(INCLUDE)}"\ace\Shared_Object.h"\

-	{$(INCLUDE)}"\ace\Shared_Object.i"\

-	{$(INCLUDE)}"\ace\Signal.h"\

-	{$(INCLUDE)}"\ace\Signal.i"\

-	{$(INCLUDE)}"\ace\Singleton.cpp"\

-	{$(INCLUDE)}"\ace\Singleton.h"\

-	{$(INCLUDE)}"\ace\Singleton.i"\

-	{$(INCLUDE)}"\ace\SOCK.h"\

-	{$(INCLUDE)}"\ace\SOCK.i"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.h"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.i"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.h"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.i"\

-	{$(INCLUDE)}"\ace\SOCK_IO.h"\

-	{$(INCLUDE)}"\ace\SOCK_IO.i"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.h"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.i"\

-	{$(INCLUDE)}"\ace\SString.h"\

-	{$(INCLUDE)}"\ace\SString.i"\

-	{$(INCLUDE)}"\ace\stdcpp.h"\

-	{$(INCLUDE)}"\ace\Strategies.h"\

-	{$(INCLUDE)}"\ace\Strategies_T.cpp"\

-	{$(INCLUDE)}"\ace\Strategies_T.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.cpp"\

-	{$(INCLUDE)}"\ace\Stream_Modules.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.i"\

-	{$(INCLUDE)}"\ace\Svc_Conf_Tokens.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.cpp"\

-	{$(INCLUDE)}"\ace\Svc_Handler.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.i"\

-	{$(INCLUDE)}"\ace\Synch.h"\

-	{$(INCLUDE)}"\ace\Synch.i"\

-	{$(INCLUDE)}"\ace\Synch_Options.h"\

-	{$(INCLUDE)}"\ace\Synch_T.cpp"\

-	{$(INCLUDE)}"\ace\Synch_T.h"\

-	{$(INCLUDE)}"\ace\Synch_T.i"\

-	{$(INCLUDE)}"\ace\Task.h"\

-	{$(INCLUDE)}"\ace\Task.i"\

-	{$(INCLUDE)}"\ace\Task_T.cpp"\

-	{$(INCLUDE)}"\ace\Task_T.h"\

-	{$(INCLUDE)}"\ace\Task_T.i"\

-	{$(INCLUDE)}"\ace\Thread.h"\

-	{$(INCLUDE)}"\ace\Thread.i"\

-	{$(INCLUDE)}"\ace\Thread_Manager.h"\

-	{$(INCLUDE)}"\ace\Thread_Manager.i"\

-	{$(INCLUDE)}"\ace\Time_Value.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.cpp"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.i"\

-	{$(INCLUDE)}"\ace\Trace.h"\

-	{$(INCLUDE)}"\ace\Version.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.i"\

-	{$(INCLUDE)}"\ace\ws2tcpip.h"\

-	

-NODEP_CPP_DEFAUL=\

-	".\tao\factories.h"\

-	

-

-"$(INTDIR)\default_server.obj" : $(SOURCE) $(DEP_CPP_DEFAUL) "$(INTDIR)"

-

-

-!ENDIF 

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\encode.cpp

-

-!IF  "$(CFG)" == "TAO - Win32 Release"

-

-DEP_CPP_ENCOD=\

-	"..\..\ace\config-win32.h"\

-	{$(INCLUDE)}"\.\align.h"\

-	{$(INCLUDE)}"\.\any.h"\

-	{$(INCLUDE)}"\.\any.i"\

-	{$(INCLUDE)}"\.\cdr.h"\

-	{$(INCLUDE)}"\.\cdr.i"\

-	{$(INCLUDE)}"\.\client_factory.h"\

-	{$(INCLUDE)}"\.\connect.h"\

-	{$(INCLUDE)}"\.\connect.i"\

-	{$(INCLUDE)}"\.\corba.h"\

-	{$(INCLUDE)}"\.\corbacom.h"\

-	{$(INCLUDE)}"\.\corbacom.i"\

-	{$(INCLUDE)}"\.\debug.h"\

-	{$(INCLUDE)}"\.\default_client.h"\

-	{$(INCLUDE)}"\.\default_client.i"\

-	{$(INCLUDE)}"\.\default_server.h"\

-	{$(INCLUDE)}"\.\default_server.i"\

-	{$(INCLUDE)}"\.\except.h"\

-	{$(INCLUDE)}"\.\giop.h"\

-	{$(INCLUDE)}"\.\giop.i"\

-	{$(INCLUDE)}"\.\iiopobj.h"\

-	{$(INCLUDE)}"\.\iiopobj.i"\

-	{$(INCLUDE)}"\.\iioporb.h"\

-	{$(INCLUDE)}"\.\iioporb.i"\

-	{$(INCLUDE)}"\.\marshal.h"\

-	{$(INCLUDE)}"\.\marshal.i"\

-	{$(INCLUDE)}"\.\nvlist.h"\

-	{$(INCLUDE)}"\.\object.h"\

-	{$(INCLUDE)}"\.\object.i"\

-	{$(INCLUDE)}"\.\objtable.h"\

-	{$(INCLUDE)}"\.\optable.h"\

-	{$(INCLUDE)}"\.\orb.h"\

-	{$(INCLUDE)}"\.\orb_core.h"\

-	{$(INCLUDE)}"\.\orb_core.i"\

-	{$(INCLUDE)}"\.\orbconf.h"\

-	{$(INCLUDE)}"\.\orbobj.h"\

-	{$(INCLUDE)}"\.\orbobj.i"\

-	{$(INCLUDE)}"\.\params.h"\

-	{$(INCLUDE)}"\.\params.i"\

-	{$(INCLUDE)}"\.\poa.h"\

-	{$(INCLUDE)}"\.\poa.i"\

-	{$(INCLUDE)}"\.\principa.h"\

-	{$(INCLUDE)}"\.\request.h"\

-	{$(INCLUDE)}"\.\sequence.h"\

-	{$(INCLUDE)}"\.\sequence.i"\

-	{$(INCLUDE)}"\.\server_factory.h"\

-	{$(INCLUDE)}"\.\server_factory.i"\

-	{$(INCLUDE)}"\.\singletons.h"\

-	{$(INCLUDE)}"\.\stub.h"\

-	{$(INCLUDE)}"\.\stub.i"\

-	{$(INCLUDE)}"\.\svrrqst.h"\

-	{$(INCLUDE)}"\.\typecode.h"\

-	{$(INCLUDE)}"\.\typecode.i"\

-	{$(INCLUDE)}"\.\varout.h"\

-	{$(INCLUDE)}"\ace\Acceptor.cpp"\

-	{$(INCLUDE)}"\ace\Acceptor.h"\

-	{$(INCLUDE)}"\ace\Acceptor.i"\

-	{$(INCLUDE)}"\ace\ACE.h"\

-	{$(INCLUDE)}"\ace\ACE.i"\

-	{$(INCLUDE)}"\ace\Addr.h"\

-	{$(INCLUDE)}"\ace\Addr.i"\

-	{$(INCLUDE)}"\ace\Atomic_Op.i"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.cpp"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.h"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.i"\

-	{$(INCLUDE)}"\ace\config-win32-common.h"\

-	{$(INCLUDE)}"\ace\Config.h"\

-	{$(INCLUDE)}"\ace\Connector.cpp"\

-	{$(INCLUDE)}"\ace\Connector.h"\

-	{$(INCLUDE)}"\ace\Connector.i"\

-	{$(INCLUDE)}"\ace\Containers.cpp"\

-	{$(INCLUDE)}"\ace\Containers.h"\

-	{$(INCLUDE)}"\ace\Containers.i"\

-	{$(INCLUDE)}"\ace\Dynamic.h"\

-	{$(INCLUDE)}"\ace\Dynamic.i"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.cpp"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.i"\

-	{$(INCLUDE)}"\ace\Free_List.cpp"\

-	{$(INCLUDE)}"\ace\Free_List.h"\

-	{$(INCLUDE)}"\ace\Free_List.i"\

-	{$(INCLUDE)}"\ace\Get_Opt.h"\

-	{$(INCLUDE)}"\ace\Get_Opt.i"\

-	{$(INCLUDE)}"\ace\Handle_Set.h"\

-	{$(INCLUDE)}"\ace\Handle_Set.i"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.i"\

-	{$(INCLUDE)}"\ace\IO_Cntl_Msg.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.i"\

-	{$(INCLUDE)}"\ace\Log_Msg.h"\

-	{$(INCLUDE)}"\ace\Log_Priority.h"\

-	{$(INCLUDE)}"\ace\Log_Record.h"\

-	{$(INCLUDE)}"\ace\Log_Record.i"\

-	{$(INCLUDE)}"\ace\Malloc.h"\

-	{$(INCLUDE)}"\ace\Malloc.i"\

-	{$(INCLUDE)}"\ace\Malloc_T.cpp"\

-	{$(INCLUDE)}"\ace\Malloc_T.h"\

-	{$(INCLUDE)}"\ace\Malloc_T.i"\

-	{$(INCLUDE)}"\ace\Managed_Object.cpp"\

-	{$(INCLUDE)}"\ace\Managed_Object.h"\

-	{$(INCLUDE)}"\ace\Managed_Object.i"\

-	{$(INCLUDE)}"\ace\Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Map_Manager.h"\

-	{$(INCLUDE)}"\ace\Map_Manager.i"\

-	{$(INCLUDE)}"\ace\Mem_Map.h"\

-	{$(INCLUDE)}"\ace\Mem_Map.i"\

-	{$(INCLUDE)}"\ace\Memory_Pool.h"\

-	{$(INCLUDE)}"\ace\Memory_Pool.i"\

-	{$(INCLUDE)}"\ace\Message_Block.h"\

-	{$(INCLUDE)}"\ace\Message_Block.i"\

-	{$(INCLUDE)}"\ace\Message_Queue.cpp"\

-	{$(INCLUDE)}"\ace\Message_Queue.h"\

-	{$(INCLUDE)}"\ace\Message_Queue.i"\

-	{$(INCLUDE)}"\ace\Module.cpp"\

-	{$(INCLUDE)}"\ace\Module.h"\

-	{$(INCLUDE)}"\ace\Module.i"\

-	{$(INCLUDE)}"\ace\Object_Manager.h"\

-	{$(INCLUDE)}"\ace\Object_Manager.i"\

-	{$(INCLUDE)}"\ace\OS.h"\

-	{$(INCLUDE)}"\ace\OS.i"\

-	{$(INCLUDE)}"\ace\Reactor.h"\

-	{$(INCLUDE)}"\ace\Reactor.i"\

-	{$(INCLUDE)}"\ace\Reactor_Impl.h"\

-	{$(INCLUDE)}"\ace\Service_Config.h"\

-	{$(INCLUDE)}"\ace\Service_Config.i"\

-	{$(INCLUDE)}"\ace\Service_Object.h"\

-	{$(INCLUDE)}"\ace\Service_Object.i"\

-	{$(INCLUDE)}"\ace\Service_Repository.h"\

-	{$(INCLUDE)}"\ace\Service_Repository.i"\

-	{$(INCLUDE)}"\ace\Service_Types.h"\

-	{$(INCLUDE)}"\ace\Service_Types.i"\

-	{$(INCLUDE)}"\ace\Shared_Object.h"\

-	{$(INCLUDE)}"\ace\Shared_Object.i"\

-	{$(INCLUDE)}"\ace\Signal.h"\

-	{$(INCLUDE)}"\ace\Signal.i"\

-	{$(INCLUDE)}"\ace\Singleton.cpp"\

-	{$(INCLUDE)}"\ace\Singleton.h"\

-	{$(INCLUDE)}"\ace\Singleton.i"\

-	{$(INCLUDE)}"\ace\SOCK.h"\

-	{$(INCLUDE)}"\ace\SOCK.i"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.h"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.i"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.h"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.i"\

-	{$(INCLUDE)}"\ace\SOCK_IO.h"\

-	{$(INCLUDE)}"\ace\SOCK_IO.i"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.h"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.i"\

-	{$(INCLUDE)}"\ace\SString.h"\

-	{$(INCLUDE)}"\ace\SString.i"\

-	{$(INCLUDE)}"\ace\stdcpp.h"\

-	{$(INCLUDE)}"\ace\Strategies.h"\

-	{$(INCLUDE)}"\ace\Strategies_T.cpp"\

-	{$(INCLUDE)}"\ace\Strategies_T.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.cpp"\

-	{$(INCLUDE)}"\ace\Stream_Modules.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.i"\

-	{$(INCLUDE)}"\ace\Svc_Conf_Tokens.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.cpp"\

-	{$(INCLUDE)}"\ace\Svc_Handler.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.i"\

-	{$(INCLUDE)}"\ace\Synch.h"\

-	{$(INCLUDE)}"\ace\Synch.i"\

-	{$(INCLUDE)}"\ace\Synch_Options.h"\

-	{$(INCLUDE)}"\ace\Synch_T.cpp"\

-	{$(INCLUDE)}"\ace\Synch_T.h"\

-	{$(INCLUDE)}"\ace\Synch_T.i"\

-	{$(INCLUDE)}"\ace\Task.h"\

-	{$(INCLUDE)}"\ace\Task.i"\

-	{$(INCLUDE)}"\ace\Task_T.cpp"\

-	{$(INCLUDE)}"\ace\Task_T.h"\

-	{$(INCLUDE)}"\ace\Task_T.i"\

-	{$(INCLUDE)}"\ace\Thread.h"\

-	{$(INCLUDE)}"\ace\Thread.i"\

-	{$(INCLUDE)}"\ace\Thread_Manager.h"\

-	{$(INCLUDE)}"\ace\Thread_Manager.i"\

-	{$(INCLUDE)}"\ace\Time_Value.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.cpp"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.i"\

-	{$(INCLUDE)}"\ace\Trace.h"\

-	{$(INCLUDE)}"\ace\Version.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.i"\

-	{$(INCLUDE)}"\ace\ws2tcpip.h"\

-	

-NODEP_CPP_ENCOD=\

-	".\tao\factories.h"\

-	

-

-"$(INTDIR)\encode.obj" : $(SOURCE) $(DEP_CPP_ENCOD) "$(INTDIR)"

-

-

-!ELSEIF  "$(CFG)" == "TAO - Win32 Debug"

-

-DEP_CPP_ENCOD=\

-	"..\..\ace\config-win32.h"\

-	{$(INCLUDE)}"\.\align.h"\

-	{$(INCLUDE)}"\.\any.h"\

-	{$(INCLUDE)}"\.\any.i"\

-	{$(INCLUDE)}"\.\cdr.h"\

-	{$(INCLUDE)}"\.\cdr.i"\

-	{$(INCLUDE)}"\.\client_factory.h"\

-	{$(INCLUDE)}"\.\connect.h"\

-	{$(INCLUDE)}"\.\connect.i"\

-	{$(INCLUDE)}"\.\corba.h"\

-	{$(INCLUDE)}"\.\corbacom.h"\

-	{$(INCLUDE)}"\.\corbacom.i"\

-	{$(INCLUDE)}"\.\debug.h"\

-	{$(INCLUDE)}"\.\default_client.h"\

-	{$(INCLUDE)}"\.\default_client.i"\

-	{$(INCLUDE)}"\.\default_server.h"\

-	{$(INCLUDE)}"\.\default_server.i"\

-	{$(INCLUDE)}"\.\except.h"\

-	{$(INCLUDE)}"\.\giop.h"\

-	{$(INCLUDE)}"\.\giop.i"\

-	{$(INCLUDE)}"\.\iiopobj.h"\

-	{$(INCLUDE)}"\.\iiopobj.i"\

-	{$(INCLUDE)}"\.\iioporb.h"\

-	{$(INCLUDE)}"\.\iioporb.i"\

-	{$(INCLUDE)}"\.\marshal.h"\

-	{$(INCLUDE)}"\.\marshal.i"\

-	{$(INCLUDE)}"\.\nvlist.h"\

-	{$(INCLUDE)}"\.\object.h"\

-	{$(INCLUDE)}"\.\object.i"\

-	{$(INCLUDE)}"\.\objtable.h"\

-	{$(INCLUDE)}"\.\optable.h"\

-	{$(INCLUDE)}"\.\orb.h"\

-	{$(INCLUDE)}"\.\orb_core.h"\

-	{$(INCLUDE)}"\.\orb_core.i"\

-	{$(INCLUDE)}"\.\orbconf.h"\

-	{$(INCLUDE)}"\.\orbobj.h"\

-	{$(INCLUDE)}"\.\orbobj.i"\

-	{$(INCLUDE)}"\.\params.h"\

-	{$(INCLUDE)}"\.\params.i"\

-	{$(INCLUDE)}"\.\poa.h"\

-	{$(INCLUDE)}"\.\poa.i"\

-	{$(INCLUDE)}"\.\principa.h"\

-	{$(INCLUDE)}"\.\request.h"\

-	{$(INCLUDE)}"\.\sequence.h"\

-	{$(INCLUDE)}"\.\sequence.i"\

-	{$(INCLUDE)}"\.\server_factory.h"\

-	{$(INCLUDE)}"\.\server_factory.i"\

-	{$(INCLUDE)}"\.\singletons.h"\

-	{$(INCLUDE)}"\.\stub.h"\

-	{$(INCLUDE)}"\.\stub.i"\

-	{$(INCLUDE)}"\.\svrrqst.h"\

-	{$(INCLUDE)}"\.\typecode.h"\

-	{$(INCLUDE)}"\.\typecode.i"\

-	{$(INCLUDE)}"\.\varout.h"\

-	{$(INCLUDE)}"\ace\Acceptor.cpp"\

-	{$(INCLUDE)}"\ace\Acceptor.h"\

-	{$(INCLUDE)}"\ace\Acceptor.i"\

-	{$(INCLUDE)}"\ace\ACE.h"\

-	{$(INCLUDE)}"\ace\ACE.i"\

-	{$(INCLUDE)}"\ace\Addr.h"\

-	{$(INCLUDE)}"\ace\Addr.i"\

-	{$(INCLUDE)}"\ace\Atomic_Op.i"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.cpp"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.h"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.i"\

-	{$(INCLUDE)}"\ace\config-win32-common.h"\

-	{$(INCLUDE)}"\ace\Config.h"\

-	{$(INCLUDE)}"\ace\Connector.cpp"\

-	{$(INCLUDE)}"\ace\Connector.h"\

-	{$(INCLUDE)}"\ace\Connector.i"\

-	{$(INCLUDE)}"\ace\Containers.cpp"\

-	{$(INCLUDE)}"\ace\Containers.h"\

-	{$(INCLUDE)}"\ace\Containers.i"\

-	{$(INCLUDE)}"\ace\Dynamic.h"\

-	{$(INCLUDE)}"\ace\Dynamic.i"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.cpp"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.i"\

-	{$(INCLUDE)}"\ace\Free_List.cpp"\

-	{$(INCLUDE)}"\ace\Free_List.h"\

-	{$(INCLUDE)}"\ace\Free_List.i"\

-	{$(INCLUDE)}"\ace\Get_Opt.h"\

-	{$(INCLUDE)}"\ace\Get_Opt.i"\

-	{$(INCLUDE)}"\ace\Handle_Set.h"\

-	{$(INCLUDE)}"\ace\Handle_Set.i"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.i"\

-	{$(INCLUDE)}"\ace\IO_Cntl_Msg.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.i"\

-	{$(INCLUDE)}"\ace\Log_Msg.h"\

-	{$(INCLUDE)}"\ace\Log_Priority.h"\

-	{$(INCLUDE)}"\ace\Log_Record.h"\

-	{$(INCLUDE)}"\ace\Log_Record.i"\

-	{$(INCLUDE)}"\ace\Malloc.h"\

-	{$(INCLUDE)}"\ace\Malloc.i"\

-	{$(INCLUDE)}"\ace\Malloc_T.cpp"\

-	{$(INCLUDE)}"\ace\Malloc_T.h"\

-	{$(INCLUDE)}"\ace\Malloc_T.i"\

-	{$(INCLUDE)}"\ace\Managed_Object.cpp"\

-	{$(INCLUDE)}"\ace\Managed_Object.h"\

-	{$(INCLUDE)}"\ace\Managed_Object.i"\

-	{$(INCLUDE)}"\ace\Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Map_Manager.h"\

-	{$(INCLUDE)}"\ace\Map_Manager.i"\

-	{$(INCLUDE)}"\ace\Mem_Map.h"\

-	{$(INCLUDE)}"\ace\Mem_Map.i"\

-	{$(INCLUDE)}"\ace\Memory_Pool.h"\

-	{$(INCLUDE)}"\ace\Memory_Pool.i"\

-	{$(INCLUDE)}"\ace\Message_Block.h"\

-	{$(INCLUDE)}"\ace\Message_Block.i"\

-	{$(INCLUDE)}"\ace\Message_Queue.cpp"\

-	{$(INCLUDE)}"\ace\Message_Queue.h"\

-	{$(INCLUDE)}"\ace\Message_Queue.i"\

-	{$(INCLUDE)}"\ace\Module.cpp"\

-	{$(INCLUDE)}"\ace\Module.h"\

-	{$(INCLUDE)}"\ace\Module.i"\

-	{$(INCLUDE)}"\ace\Object_Manager.h"\

-	{$(INCLUDE)}"\ace\Object_Manager.i"\

-	{$(INCLUDE)}"\ace\OS.h"\

-	{$(INCLUDE)}"\ace\OS.i"\

-	{$(INCLUDE)}"\ace\Reactor.h"\

-	{$(INCLUDE)}"\ace\Reactor.i"\

-	{$(INCLUDE)}"\ace\Reactor_Impl.h"\

-	{$(INCLUDE)}"\ace\Service_Config.h"\

-	{$(INCLUDE)}"\ace\Service_Config.i"\

-	{$(INCLUDE)}"\ace\Service_Object.h"\

-	{$(INCLUDE)}"\ace\Service_Object.i"\

-	{$(INCLUDE)}"\ace\Service_Repository.h"\

-	{$(INCLUDE)}"\ace\Service_Repository.i"\

-	{$(INCLUDE)}"\ace\Service_Types.h"\

-	{$(INCLUDE)}"\ace\Service_Types.i"\

-	{$(INCLUDE)}"\ace\Shared_Object.h"\

-	{$(INCLUDE)}"\ace\Shared_Object.i"\

-	{$(INCLUDE)}"\ace\Signal.h"\

-	{$(INCLUDE)}"\ace\Signal.i"\

-	{$(INCLUDE)}"\ace\Singleton.cpp"\

-	{$(INCLUDE)}"\ace\Singleton.h"\

-	{$(INCLUDE)}"\ace\Singleton.i"\

-	{$(INCLUDE)}"\ace\SOCK.h"\

-	{$(INCLUDE)}"\ace\SOCK.i"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.h"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.i"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.h"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.i"\

-	{$(INCLUDE)}"\ace\SOCK_IO.h"\

-	{$(INCLUDE)}"\ace\SOCK_IO.i"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.h"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.i"\

-	{$(INCLUDE)}"\ace\SString.h"\

-	{$(INCLUDE)}"\ace\SString.i"\

-	{$(INCLUDE)}"\ace\stdcpp.h"\

-	{$(INCLUDE)}"\ace\Strategies.h"\

-	{$(INCLUDE)}"\ace\Strategies_T.cpp"\

-	{$(INCLUDE)}"\ace\Strategies_T.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.cpp"\

-	{$(INCLUDE)}"\ace\Stream_Modules.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.i"\

-	{$(INCLUDE)}"\ace\Svc_Conf_Tokens.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.cpp"\

-	{$(INCLUDE)}"\ace\Svc_Handler.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.i"\

-	{$(INCLUDE)}"\ace\Synch.h"\

-	{$(INCLUDE)}"\ace\Synch.i"\

-	{$(INCLUDE)}"\ace\Synch_Options.h"\

-	{$(INCLUDE)}"\ace\Synch_T.cpp"\

-	{$(INCLUDE)}"\ace\Synch_T.h"\

-	{$(INCLUDE)}"\ace\Synch_T.i"\

-	{$(INCLUDE)}"\ace\Task.h"\

-	{$(INCLUDE)}"\ace\Task.i"\

-	{$(INCLUDE)}"\ace\Task_T.cpp"\

-	{$(INCLUDE)}"\ace\Task_T.h"\

-	{$(INCLUDE)}"\ace\Task_T.i"\

-	{$(INCLUDE)}"\ace\Thread.h"\

-	{$(INCLUDE)}"\ace\Thread.i"\

-	{$(INCLUDE)}"\ace\Thread_Manager.h"\

-	{$(INCLUDE)}"\ace\Thread_Manager.i"\

-	{$(INCLUDE)}"\ace\Time_Value.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.cpp"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.i"\

-	{$(INCLUDE)}"\ace\Trace.h"\

-	{$(INCLUDE)}"\ace\Version.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.i"\

-	{$(INCLUDE)}"\ace\ws2tcpip.h"\

-	

-NODEP_CPP_ENCOD=\

-	".\tao\factories.h"\

-	

-

-"$(INTDIR)\encode.obj" : $(SOURCE) $(DEP_CPP_ENCOD) "$(INTDIR)"

-

-

-!ENDIF 

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\except.cpp

-

-!IF  "$(CFG)" == "TAO - Win32 Release"

-

-DEP_CPP_EXCEP=\

-	"..\..\ace\config-win32.h"\

-	{$(INCLUDE)}"\.\align.h"\

-	{$(INCLUDE)}"\.\any.h"\

-	{$(INCLUDE)}"\.\any.i"\

-	{$(INCLUDE)}"\.\cdr.h"\

-	{$(INCLUDE)}"\.\cdr.i"\

-	{$(INCLUDE)}"\.\client_factory.h"\

-	{$(INCLUDE)}"\.\connect.h"\

-	{$(INCLUDE)}"\.\connect.i"\

-	{$(INCLUDE)}"\.\corba.h"\

-	{$(INCLUDE)}"\.\corbacom.h"\

-	{$(INCLUDE)}"\.\corbacom.i"\

-	{$(INCLUDE)}"\.\debug.h"\

-	{$(INCLUDE)}"\.\default_client.h"\

-	{$(INCLUDE)}"\.\default_client.i"\

-	{$(INCLUDE)}"\.\default_server.h"\

-	{$(INCLUDE)}"\.\default_server.i"\

-	{$(INCLUDE)}"\.\except.h"\

-	{$(INCLUDE)}"\.\giop.h"\

-	{$(INCLUDE)}"\.\giop.i"\

-	{$(INCLUDE)}"\.\iiopobj.h"\

-	{$(INCLUDE)}"\.\iiopobj.i"\

-	{$(INCLUDE)}"\.\iioporb.h"\

-	{$(INCLUDE)}"\.\iioporb.i"\

-	{$(INCLUDE)}"\.\marshal.h"\

-	{$(INCLUDE)}"\.\marshal.i"\

-	{$(INCLUDE)}"\.\nvlist.h"\

-	{$(INCLUDE)}"\.\object.h"\

-	{$(INCLUDE)}"\.\object.i"\

-	{$(INCLUDE)}"\.\objtable.h"\

-	{$(INCLUDE)}"\.\optable.h"\

-	{$(INCLUDE)}"\.\orb.h"\

-	{$(INCLUDE)}"\.\orb_core.h"\

-	{$(INCLUDE)}"\.\orb_core.i"\

-	{$(INCLUDE)}"\.\orbconf.h"\

-	{$(INCLUDE)}"\.\orbobj.h"\

-	{$(INCLUDE)}"\.\orbobj.i"\

-	{$(INCLUDE)}"\.\params.h"\

-	{$(INCLUDE)}"\.\params.i"\

-	{$(INCLUDE)}"\.\poa.h"\

-	{$(INCLUDE)}"\.\poa.i"\

-	{$(INCLUDE)}"\.\principa.h"\

-	{$(INCLUDE)}"\.\request.h"\

-	{$(INCLUDE)}"\.\sequence.h"\

-	{$(INCLUDE)}"\.\sequence.i"\

-	{$(INCLUDE)}"\.\server_factory.h"\

-	{$(INCLUDE)}"\.\server_factory.i"\

-	{$(INCLUDE)}"\.\singletons.h"\

-	{$(INCLUDE)}"\.\stub.h"\

-	{$(INCLUDE)}"\.\stub.i"\

-	{$(INCLUDE)}"\.\svrrqst.h"\

-	{$(INCLUDE)}"\.\typecode.h"\

-	{$(INCLUDE)}"\.\typecode.i"\

-	{$(INCLUDE)}"\.\varout.h"\

-	{$(INCLUDE)}"\ace\Acceptor.cpp"\

-	{$(INCLUDE)}"\ace\Acceptor.h"\

-	{$(INCLUDE)}"\ace\Acceptor.i"\

-	{$(INCLUDE)}"\ace\ACE.h"\

-	{$(INCLUDE)}"\ace\ACE.i"\

-	{$(INCLUDE)}"\ace\Addr.h"\

-	{$(INCLUDE)}"\ace\Addr.i"\

-	{$(INCLUDE)}"\ace\Atomic_Op.i"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.cpp"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.h"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.i"\

-	{$(INCLUDE)}"\ace\config-win32-common.h"\

-	{$(INCLUDE)}"\ace\Config.h"\

-	{$(INCLUDE)}"\ace\Connector.cpp"\

-	{$(INCLUDE)}"\ace\Connector.h"\

-	{$(INCLUDE)}"\ace\Connector.i"\

-	{$(INCLUDE)}"\ace\Containers.cpp"\

-	{$(INCLUDE)}"\ace\Containers.h"\

-	{$(INCLUDE)}"\ace\Containers.i"\

-	{$(INCLUDE)}"\ace\Dynamic.h"\

-	{$(INCLUDE)}"\ace\Dynamic.i"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.cpp"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.i"\

-	{$(INCLUDE)}"\ace\Free_List.cpp"\

-	{$(INCLUDE)}"\ace\Free_List.h"\

-	{$(INCLUDE)}"\ace\Free_List.i"\

-	{$(INCLUDE)}"\ace\Get_Opt.h"\

-	{$(INCLUDE)}"\ace\Get_Opt.i"\

-	{$(INCLUDE)}"\ace\Handle_Set.h"\

-	{$(INCLUDE)}"\ace\Handle_Set.i"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.i"\

-	{$(INCLUDE)}"\ace\IO_Cntl_Msg.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.i"\

-	{$(INCLUDE)}"\ace\Log_Msg.h"\

-	{$(INCLUDE)}"\ace\Log_Priority.h"\

-	{$(INCLUDE)}"\ace\Log_Record.h"\

-	{$(INCLUDE)}"\ace\Log_Record.i"\

-	{$(INCLUDE)}"\ace\Malloc.h"\

-	{$(INCLUDE)}"\ace\Malloc.i"\

-	{$(INCLUDE)}"\ace\Malloc_T.cpp"\

-	{$(INCLUDE)}"\ace\Malloc_T.h"\

-	{$(INCLUDE)}"\ace\Malloc_T.i"\

-	{$(INCLUDE)}"\ace\Managed_Object.cpp"\

-	{$(INCLUDE)}"\ace\Managed_Object.h"\

-	{$(INCLUDE)}"\ace\Managed_Object.i"\

-	{$(INCLUDE)}"\ace\Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Map_Manager.h"\

-	{$(INCLUDE)}"\ace\Map_Manager.i"\

-	{$(INCLUDE)}"\ace\Mem_Map.h"\

-	{$(INCLUDE)}"\ace\Mem_Map.i"\

-	{$(INCLUDE)}"\ace\Memory_Pool.h"\

-	{$(INCLUDE)}"\ace\Memory_Pool.i"\

-	{$(INCLUDE)}"\ace\Message_Block.h"\

-	{$(INCLUDE)}"\ace\Message_Block.i"\

-	{$(INCLUDE)}"\ace\Message_Queue.cpp"\

-	{$(INCLUDE)}"\ace\Message_Queue.h"\

-	{$(INCLUDE)}"\ace\Message_Queue.i"\

-	{$(INCLUDE)}"\ace\Module.cpp"\

-	{$(INCLUDE)}"\ace\Module.h"\

-	{$(INCLUDE)}"\ace\Module.i"\

-	{$(INCLUDE)}"\ace\Object_Manager.h"\

-	{$(INCLUDE)}"\ace\Object_Manager.i"\

-	{$(INCLUDE)}"\ace\OS.h"\

-	{$(INCLUDE)}"\ace\OS.i"\

-	{$(INCLUDE)}"\ace\Reactor.h"\

-	{$(INCLUDE)}"\ace\Reactor.i"\

-	{$(INCLUDE)}"\ace\Reactor_Impl.h"\

-	{$(INCLUDE)}"\ace\Service_Config.h"\

-	{$(INCLUDE)}"\ace\Service_Config.i"\

-	{$(INCLUDE)}"\ace\Service_Object.h"\

-	{$(INCLUDE)}"\ace\Service_Object.i"\

-	{$(INCLUDE)}"\ace\Service_Repository.h"\

-	{$(INCLUDE)}"\ace\Service_Repository.i"\

-	{$(INCLUDE)}"\ace\Service_Types.h"\

-	{$(INCLUDE)}"\ace\Service_Types.i"\

-	{$(INCLUDE)}"\ace\Shared_Object.h"\

-	{$(INCLUDE)}"\ace\Shared_Object.i"\

-	{$(INCLUDE)}"\ace\Signal.h"\

-	{$(INCLUDE)}"\ace\Signal.i"\

-	{$(INCLUDE)}"\ace\Singleton.cpp"\

-	{$(INCLUDE)}"\ace\Singleton.h"\

-	{$(INCLUDE)}"\ace\Singleton.i"\

-	{$(INCLUDE)}"\ace\SOCK.h"\

-	{$(INCLUDE)}"\ace\SOCK.i"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.h"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.i"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.h"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.i"\

-	{$(INCLUDE)}"\ace\SOCK_IO.h"\

-	{$(INCLUDE)}"\ace\SOCK_IO.i"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.h"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.i"\

-	{$(INCLUDE)}"\ace\SString.h"\

-	{$(INCLUDE)}"\ace\SString.i"\

-	{$(INCLUDE)}"\ace\stdcpp.h"\

-	{$(INCLUDE)}"\ace\Strategies.h"\

-	{$(INCLUDE)}"\ace\Strategies_T.cpp"\

-	{$(INCLUDE)}"\ace\Strategies_T.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.cpp"\

-	{$(INCLUDE)}"\ace\Stream_Modules.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.i"\

-	{$(INCLUDE)}"\ace\Svc_Conf_Tokens.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.cpp"\

-	{$(INCLUDE)}"\ace\Svc_Handler.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.i"\

-	{$(INCLUDE)}"\ace\Synch.h"\

-	{$(INCLUDE)}"\ace\Synch.i"\

-	{$(INCLUDE)}"\ace\Synch_Options.h"\

-	{$(INCLUDE)}"\ace\Synch_T.cpp"\

-	{$(INCLUDE)}"\ace\Synch_T.h"\

-	{$(INCLUDE)}"\ace\Synch_T.i"\

-	{$(INCLUDE)}"\ace\Task.h"\

-	{$(INCLUDE)}"\ace\Task.i"\

-	{$(INCLUDE)}"\ace\Task_T.cpp"\

-	{$(INCLUDE)}"\ace\Task_T.h"\

-	{$(INCLUDE)}"\ace\Task_T.i"\

-	{$(INCLUDE)}"\ace\Thread.h"\

-	{$(INCLUDE)}"\ace\Thread.i"\

-	{$(INCLUDE)}"\ace\Thread_Manager.h"\

-	{$(INCLUDE)}"\ace\Thread_Manager.i"\

-	{$(INCLUDE)}"\ace\Time_Value.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.cpp"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.i"\

-	{$(INCLUDE)}"\ace\Trace.h"\

-	{$(INCLUDE)}"\ace\Version.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.i"\

-	{$(INCLUDE)}"\ace\ws2tcpip.h"\

-	

-NODEP_CPP_EXCEP=\

-	".\tao\factories.h"\

-	

-

-"$(INTDIR)\except.obj" : $(SOURCE) $(DEP_CPP_EXCEP) "$(INTDIR)"

-

-

-!ELSEIF  "$(CFG)" == "TAO - Win32 Debug"

-

-DEP_CPP_EXCEP=\

-	"..\..\ace\config-win32.h"\

-	{$(INCLUDE)}"\.\align.h"\

-	{$(INCLUDE)}"\.\any.h"\

-	{$(INCLUDE)}"\.\any.i"\

-	{$(INCLUDE)}"\.\cdr.h"\

-	{$(INCLUDE)}"\.\cdr.i"\

-	{$(INCLUDE)}"\.\client_factory.h"\

-	{$(INCLUDE)}"\.\connect.h"\

-	{$(INCLUDE)}"\.\connect.i"\

-	{$(INCLUDE)}"\.\corba.h"\

-	{$(INCLUDE)}"\.\corbacom.h"\

-	{$(INCLUDE)}"\.\corbacom.i"\

-	{$(INCLUDE)}"\.\debug.h"\

-	{$(INCLUDE)}"\.\default_client.h"\

-	{$(INCLUDE)}"\.\default_client.i"\

-	{$(INCLUDE)}"\.\default_server.h"\

-	{$(INCLUDE)}"\.\default_server.i"\

-	{$(INCLUDE)}"\.\except.h"\

-	{$(INCLUDE)}"\.\giop.h"\

-	{$(INCLUDE)}"\.\giop.i"\

-	{$(INCLUDE)}"\.\iiopobj.h"\

-	{$(INCLUDE)}"\.\iiopobj.i"\

-	{$(INCLUDE)}"\.\iioporb.h"\

-	{$(INCLUDE)}"\.\iioporb.i"\

-	{$(INCLUDE)}"\.\marshal.h"\

-	{$(INCLUDE)}"\.\marshal.i"\

-	{$(INCLUDE)}"\.\nvlist.h"\

-	{$(INCLUDE)}"\.\object.h"\

-	{$(INCLUDE)}"\.\object.i"\

-	{$(INCLUDE)}"\.\objtable.h"\

-	{$(INCLUDE)}"\.\optable.h"\

-	{$(INCLUDE)}"\.\orb.h"\

-	{$(INCLUDE)}"\.\orb_core.h"\

-	{$(INCLUDE)}"\.\orb_core.i"\

-	{$(INCLUDE)}"\.\orbconf.h"\

-	{$(INCLUDE)}"\.\orbobj.h"\

-	{$(INCLUDE)}"\.\orbobj.i"\

-	{$(INCLUDE)}"\.\params.h"\

-	{$(INCLUDE)}"\.\params.i"\

-	{$(INCLUDE)}"\.\poa.h"\

-	{$(INCLUDE)}"\.\poa.i"\

-	{$(INCLUDE)}"\.\principa.h"\

-	{$(INCLUDE)}"\.\request.h"\

-	{$(INCLUDE)}"\.\sequence.h"\

-	{$(INCLUDE)}"\.\sequence.i"\

-	{$(INCLUDE)}"\.\server_factory.h"\

-	{$(INCLUDE)}"\.\server_factory.i"\

-	{$(INCLUDE)}"\.\singletons.h"\

-	{$(INCLUDE)}"\.\stub.h"\

-	{$(INCLUDE)}"\.\stub.i"\

-	{$(INCLUDE)}"\.\svrrqst.h"\

-	{$(INCLUDE)}"\.\typecode.h"\

-	{$(INCLUDE)}"\.\typecode.i"\

-	{$(INCLUDE)}"\.\varout.h"\

-	{$(INCLUDE)}"\ace\Acceptor.cpp"\

-	{$(INCLUDE)}"\ace\Acceptor.h"\

-	{$(INCLUDE)}"\ace\Acceptor.i"\

-	{$(INCLUDE)}"\ace\ACE.h"\

-	{$(INCLUDE)}"\ace\ACE.i"\

-	{$(INCLUDE)}"\ace\Addr.h"\

-	{$(INCLUDE)}"\ace\Addr.i"\

-	{$(INCLUDE)}"\ace\Atomic_Op.i"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.cpp"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.h"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.i"\

-	{$(INCLUDE)}"\ace\config-win32-common.h"\

-	{$(INCLUDE)}"\ace\Config.h"\

-	{$(INCLUDE)}"\ace\Connector.cpp"\

-	{$(INCLUDE)}"\ace\Connector.h"\

-	{$(INCLUDE)}"\ace\Connector.i"\

-	{$(INCLUDE)}"\ace\Containers.cpp"\

-	{$(INCLUDE)}"\ace\Containers.h"\

-	{$(INCLUDE)}"\ace\Containers.i"\

-	{$(INCLUDE)}"\ace\Dynamic.h"\

-	{$(INCLUDE)}"\ace\Dynamic.i"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.cpp"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.i"\

-	{$(INCLUDE)}"\ace\Free_List.cpp"\

-	{$(INCLUDE)}"\ace\Free_List.h"\

-	{$(INCLUDE)}"\ace\Free_List.i"\

-	{$(INCLUDE)}"\ace\Get_Opt.h"\

-	{$(INCLUDE)}"\ace\Get_Opt.i"\

-	{$(INCLUDE)}"\ace\Handle_Set.h"\

-	{$(INCLUDE)}"\ace\Handle_Set.i"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.i"\

-	{$(INCLUDE)}"\ace\IO_Cntl_Msg.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.i"\

-	{$(INCLUDE)}"\ace\Log_Msg.h"\

-	{$(INCLUDE)}"\ace\Log_Priority.h"\

-	{$(INCLUDE)}"\ace\Log_Record.h"\

-	{$(INCLUDE)}"\ace\Log_Record.i"\

-	{$(INCLUDE)}"\ace\Malloc.h"\

-	{$(INCLUDE)}"\ace\Malloc.i"\

-	{$(INCLUDE)}"\ace\Malloc_T.cpp"\

-	{$(INCLUDE)}"\ace\Malloc_T.h"\

-	{$(INCLUDE)}"\ace\Malloc_T.i"\

-	{$(INCLUDE)}"\ace\Managed_Object.cpp"\

-	{$(INCLUDE)}"\ace\Managed_Object.h"\

-	{$(INCLUDE)}"\ace\Managed_Object.i"\

-	{$(INCLUDE)}"\ace\Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Map_Manager.h"\

-	{$(INCLUDE)}"\ace\Map_Manager.i"\

-	{$(INCLUDE)}"\ace\Mem_Map.h"\

-	{$(INCLUDE)}"\ace\Mem_Map.i"\

-	{$(INCLUDE)}"\ace\Memory_Pool.h"\

-	{$(INCLUDE)}"\ace\Memory_Pool.i"\

-	{$(INCLUDE)}"\ace\Message_Block.h"\

-	{$(INCLUDE)}"\ace\Message_Block.i"\

-	{$(INCLUDE)}"\ace\Message_Queue.cpp"\

-	{$(INCLUDE)}"\ace\Message_Queue.h"\

-	{$(INCLUDE)}"\ace\Message_Queue.i"\

-	{$(INCLUDE)}"\ace\Module.cpp"\

-	{$(INCLUDE)}"\ace\Module.h"\

-	{$(INCLUDE)}"\ace\Module.i"\

-	{$(INCLUDE)}"\ace\Object_Manager.h"\

-	{$(INCLUDE)}"\ace\Object_Manager.i"\

-	{$(INCLUDE)}"\ace\OS.h"\

-	{$(INCLUDE)}"\ace\OS.i"\

-	{$(INCLUDE)}"\ace\Reactor.h"\

-	{$(INCLUDE)}"\ace\Reactor.i"\

-	{$(INCLUDE)}"\ace\Reactor_Impl.h"\

-	{$(INCLUDE)}"\ace\Service_Config.h"\

-	{$(INCLUDE)}"\ace\Service_Config.i"\

-	{$(INCLUDE)}"\ace\Service_Object.h"\

-	{$(INCLUDE)}"\ace\Service_Object.i"\

-	{$(INCLUDE)}"\ace\Service_Repository.h"\

-	{$(INCLUDE)}"\ace\Service_Repository.i"\

-	{$(INCLUDE)}"\ace\Service_Types.h"\

-	{$(INCLUDE)}"\ace\Service_Types.i"\

-	{$(INCLUDE)}"\ace\Shared_Object.h"\

-	{$(INCLUDE)}"\ace\Shared_Object.i"\

-	{$(INCLUDE)}"\ace\Signal.h"\

-	{$(INCLUDE)}"\ace\Signal.i"\

-	{$(INCLUDE)}"\ace\Singleton.cpp"\

-	{$(INCLUDE)}"\ace\Singleton.h"\

-	{$(INCLUDE)}"\ace\Singleton.i"\

-	{$(INCLUDE)}"\ace\SOCK.h"\

-	{$(INCLUDE)}"\ace\SOCK.i"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.h"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.i"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.h"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.i"\

-	{$(INCLUDE)}"\ace\SOCK_IO.h"\

-	{$(INCLUDE)}"\ace\SOCK_IO.i"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.h"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.i"\

-	{$(INCLUDE)}"\ace\SString.h"\

-	{$(INCLUDE)}"\ace\SString.i"\

-	{$(INCLUDE)}"\ace\stdcpp.h"\

-	{$(INCLUDE)}"\ace\Strategies.h"\

-	{$(INCLUDE)}"\ace\Strategies_T.cpp"\

-	{$(INCLUDE)}"\ace\Strategies_T.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.cpp"\

-	{$(INCLUDE)}"\ace\Stream_Modules.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.i"\

-	{$(INCLUDE)}"\ace\Svc_Conf_Tokens.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.cpp"\

-	{$(INCLUDE)}"\ace\Svc_Handler.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.i"\

-	{$(INCLUDE)}"\ace\Synch.h"\

-	{$(INCLUDE)}"\ace\Synch.i"\

-	{$(INCLUDE)}"\ace\Synch_Options.h"\

-	{$(INCLUDE)}"\ace\Synch_T.cpp"\

-	{$(INCLUDE)}"\ace\Synch_T.h"\

-	{$(INCLUDE)}"\ace\Synch_T.i"\

-	{$(INCLUDE)}"\ace\Task.h"\

-	{$(INCLUDE)}"\ace\Task.i"\

-	{$(INCLUDE)}"\ace\Task_T.cpp"\

-	{$(INCLUDE)}"\ace\Task_T.h"\

-	{$(INCLUDE)}"\ace\Task_T.i"\

-	{$(INCLUDE)}"\ace\Thread.h"\

-	{$(INCLUDE)}"\ace\Thread.i"\

-	{$(INCLUDE)}"\ace\Thread_Manager.h"\

-	{$(INCLUDE)}"\ace\Thread_Manager.i"\

-	{$(INCLUDE)}"\ace\Time_Value.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.cpp"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.i"\

-	{$(INCLUDE)}"\ace\Trace.h"\

-	{$(INCLUDE)}"\ace\Version.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.i"\

-	{$(INCLUDE)}"\ace\ws2tcpip.h"\

-	

-NODEP_CPP_EXCEP=\

-	".\tao\factories.h"\

-	

-

-"$(INTDIR)\except.obj" : $(SOURCE) $(DEP_CPP_EXCEP) "$(INTDIR)"

-

-

-!ENDIF 

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\giop.cpp

-

-!IF  "$(CFG)" == "TAO - Win32 Release"

-

-DEP_CPP_GIOP_=\

-	"..\..\ace\config-win32.h"\

-	{$(INCLUDE)}"\.\align.h"\

-	{$(INCLUDE)}"\.\any.h"\

-	{$(INCLUDE)}"\.\any.i"\

-	{$(INCLUDE)}"\.\cdr.h"\

-	{$(INCLUDE)}"\.\cdr.i"\

-	{$(INCLUDE)}"\.\client_factory.h"\

-	{$(INCLUDE)}"\.\connect.h"\

-	{$(INCLUDE)}"\.\connect.i"\

-	{$(INCLUDE)}"\.\corba.h"\

-	{$(INCLUDE)}"\.\corbacom.h"\

-	{$(INCLUDE)}"\.\corbacom.i"\

-	{$(INCLUDE)}"\.\debug.h"\

-	{$(INCLUDE)}"\.\default_client.h"\

-	{$(INCLUDE)}"\.\default_client.i"\

-	{$(INCLUDE)}"\.\default_server.h"\

-	{$(INCLUDE)}"\.\default_server.i"\

-	{$(INCLUDE)}"\.\except.h"\

-	{$(INCLUDE)}"\.\giop.h"\

-	{$(INCLUDE)}"\.\giop.i"\

-	{$(INCLUDE)}"\.\iiopobj.h"\

-	{$(INCLUDE)}"\.\iiopobj.i"\

-	{$(INCLUDE)}"\.\iioporb.h"\

-	{$(INCLUDE)}"\.\iioporb.i"\

-	{$(INCLUDE)}"\.\marshal.h"\

-	{$(INCLUDE)}"\.\marshal.i"\

-	{$(INCLUDE)}"\.\nvlist.h"\

-	{$(INCLUDE)}"\.\object.h"\

-	{$(INCLUDE)}"\.\object.i"\

-	{$(INCLUDE)}"\.\objtable.h"\

-	{$(INCLUDE)}"\.\optable.h"\

-	{$(INCLUDE)}"\.\orb.h"\

-	{$(INCLUDE)}"\.\orb_core.h"\

-	{$(INCLUDE)}"\.\orb_core.i"\

-	{$(INCLUDE)}"\.\orbconf.h"\

-	{$(INCLUDE)}"\.\orbobj.h"\

-	{$(INCLUDE)}"\.\orbobj.i"\

-	{$(INCLUDE)}"\.\params.h"\

-	{$(INCLUDE)}"\.\params.i"\

-	{$(INCLUDE)}"\.\poa.h"\

-	{$(INCLUDE)}"\.\poa.i"\

-	{$(INCLUDE)}"\.\principa.h"\

-	{$(INCLUDE)}"\.\request.h"\

-	{$(INCLUDE)}"\.\sequence.h"\

-	{$(INCLUDE)}"\.\sequence.i"\

-	{$(INCLUDE)}"\.\server_factory.h"\

-	{$(INCLUDE)}"\.\server_factory.i"\

-	{$(INCLUDE)}"\.\singletons.h"\

-	{$(INCLUDE)}"\.\stub.h"\

-	{$(INCLUDE)}"\.\stub.i"\

-	{$(INCLUDE)}"\.\svrrqst.h"\

-	{$(INCLUDE)}"\.\typecode.h"\

-	{$(INCLUDE)}"\.\typecode.i"\

-	{$(INCLUDE)}"\.\varout.h"\

-	{$(INCLUDE)}"\ace\Acceptor.cpp"\

-	{$(INCLUDE)}"\ace\Acceptor.h"\

-	{$(INCLUDE)}"\ace\Acceptor.i"\

-	{$(INCLUDE)}"\ace\ACE.h"\

-	{$(INCLUDE)}"\ace\ACE.i"\

-	{$(INCLUDE)}"\ace\Addr.h"\

-	{$(INCLUDE)}"\ace\Addr.i"\

-	{$(INCLUDE)}"\ace\Atomic_Op.i"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.cpp"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.h"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.i"\

-	{$(INCLUDE)}"\ace\config-win32-common.h"\

-	{$(INCLUDE)}"\ace\Config.h"\

-	{$(INCLUDE)}"\ace\Connector.cpp"\

-	{$(INCLUDE)}"\ace\Connector.h"\

-	{$(INCLUDE)}"\ace\Connector.i"\

-	{$(INCLUDE)}"\ace\Containers.cpp"\

-	{$(INCLUDE)}"\ace\Containers.h"\

-	{$(INCLUDE)}"\ace\Containers.i"\

-	{$(INCLUDE)}"\ace\Dynamic.h"\

-	{$(INCLUDE)}"\ace\Dynamic.i"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.cpp"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.i"\

-	{$(INCLUDE)}"\ace\Free_List.cpp"\

-	{$(INCLUDE)}"\ace\Free_List.h"\

-	{$(INCLUDE)}"\ace\Free_List.i"\

-	{$(INCLUDE)}"\ace\Get_Opt.h"\

-	{$(INCLUDE)}"\ace\Get_Opt.i"\

-	{$(INCLUDE)}"\ace\Handle_Set.h"\

-	{$(INCLUDE)}"\ace\Handle_Set.i"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.i"\

-	{$(INCLUDE)}"\ace\IO_Cntl_Msg.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.i"\

-	{$(INCLUDE)}"\ace\Log_Msg.h"\

-	{$(INCLUDE)}"\ace\Log_Priority.h"\

-	{$(INCLUDE)}"\ace\Log_Record.h"\

-	{$(INCLUDE)}"\ace\Log_Record.i"\

-	{$(INCLUDE)}"\ace\Malloc.h"\

-	{$(INCLUDE)}"\ace\Malloc.i"\

-	{$(INCLUDE)}"\ace\Malloc_T.cpp"\

-	{$(INCLUDE)}"\ace\Malloc_T.h"\

-	{$(INCLUDE)}"\ace\Malloc_T.i"\

-	{$(INCLUDE)}"\ace\Managed_Object.cpp"\

-	{$(INCLUDE)}"\ace\Managed_Object.h"\

-	{$(INCLUDE)}"\ace\Managed_Object.i"\

-	{$(INCLUDE)}"\ace\Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Map_Manager.h"\

-	{$(INCLUDE)}"\ace\Map_Manager.i"\

-	{$(INCLUDE)}"\ace\Mem_Map.h"\

-	{$(INCLUDE)}"\ace\Mem_Map.i"\

-	{$(INCLUDE)}"\ace\Memory_Pool.h"\

-	{$(INCLUDE)}"\ace\Memory_Pool.i"\

-	{$(INCLUDE)}"\ace\Message_Block.h"\

-	{$(INCLUDE)}"\ace\Message_Block.i"\

-	{$(INCLUDE)}"\ace\Message_Queue.cpp"\

-	{$(INCLUDE)}"\ace\Message_Queue.h"\

-	{$(INCLUDE)}"\ace\Message_Queue.i"\

-	{$(INCLUDE)}"\ace\Module.cpp"\

-	{$(INCLUDE)}"\ace\Module.h"\

-	{$(INCLUDE)}"\ace\Module.i"\

-	{$(INCLUDE)}"\ace\Object_Manager.h"\

-	{$(INCLUDE)}"\ace\Object_Manager.i"\

-	{$(INCLUDE)}"\ace\OS.h"\

-	{$(INCLUDE)}"\ace\OS.i"\

-	{$(INCLUDE)}"\ace\Reactor.h"\

-	{$(INCLUDE)}"\ace\Reactor.i"\

-	{$(INCLUDE)}"\ace\Reactor_Impl.h"\

-	{$(INCLUDE)}"\ace\Service_Config.h"\

-	{$(INCLUDE)}"\ace\Service_Config.i"\

-	{$(INCLUDE)}"\ace\Service_Object.h"\

-	{$(INCLUDE)}"\ace\Service_Object.i"\

-	{$(INCLUDE)}"\ace\Service_Repository.h"\

-	{$(INCLUDE)}"\ace\Service_Repository.i"\

-	{$(INCLUDE)}"\ace\Service_Types.h"\

-	{$(INCLUDE)}"\ace\Service_Types.i"\

-	{$(INCLUDE)}"\ace\Shared_Object.h"\

-	{$(INCLUDE)}"\ace\Shared_Object.i"\

-	{$(INCLUDE)}"\ace\Signal.h"\

-	{$(INCLUDE)}"\ace\Signal.i"\

-	{$(INCLUDE)}"\ace\Singleton.cpp"\

-	{$(INCLUDE)}"\ace\Singleton.h"\

-	{$(INCLUDE)}"\ace\Singleton.i"\

-	{$(INCLUDE)}"\ace\SOCK.h"\

-	{$(INCLUDE)}"\ace\SOCK.i"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.h"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.i"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.h"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.i"\

-	{$(INCLUDE)}"\ace\SOCK_IO.h"\

-	{$(INCLUDE)}"\ace\SOCK_IO.i"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.h"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.i"\

-	{$(INCLUDE)}"\ace\SString.h"\

-	{$(INCLUDE)}"\ace\SString.i"\

-	{$(INCLUDE)}"\ace\stdcpp.h"\

-	{$(INCLUDE)}"\ace\Strategies.h"\

-	{$(INCLUDE)}"\ace\Strategies_T.cpp"\

-	{$(INCLUDE)}"\ace\Strategies_T.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.cpp"\

-	{$(INCLUDE)}"\ace\Stream_Modules.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.i"\

-	{$(INCLUDE)}"\ace\Svc_Conf_Tokens.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.cpp"\

-	{$(INCLUDE)}"\ace\Svc_Handler.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.i"\

-	{$(INCLUDE)}"\ace\Synch.h"\

-	{$(INCLUDE)}"\ace\Synch.i"\

-	{$(INCLUDE)}"\ace\Synch_Options.h"\

-	{$(INCLUDE)}"\ace\Synch_T.cpp"\

-	{$(INCLUDE)}"\ace\Synch_T.h"\

-	{$(INCLUDE)}"\ace\Synch_T.i"\

-	{$(INCLUDE)}"\ace\Task.h"\

-	{$(INCLUDE)}"\ace\Task.i"\

-	{$(INCLUDE)}"\ace\Task_T.cpp"\

-	{$(INCLUDE)}"\ace\Task_T.h"\

-	{$(INCLUDE)}"\ace\Task_T.i"\

-	{$(INCLUDE)}"\ace\Thread.h"\

-	{$(INCLUDE)}"\ace\Thread.i"\

-	{$(INCLUDE)}"\ace\Thread_Manager.h"\

-	{$(INCLUDE)}"\ace\Thread_Manager.i"\

-	{$(INCLUDE)}"\ace\Time_Value.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.cpp"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.i"\

-	{$(INCLUDE)}"\ace\Trace.h"\

-	{$(INCLUDE)}"\ace\Version.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.i"\

-	{$(INCLUDE)}"\ace\ws2tcpip.h"\

-	

-NODEP_CPP_GIOP_=\

-	".\tao\factories.h"\

-	

-

-"$(INTDIR)\giop.obj" : $(SOURCE) $(DEP_CPP_GIOP_) "$(INTDIR)"

-

-

-!ELSEIF  "$(CFG)" == "TAO - Win32 Debug"

-

-DEP_CPP_GIOP_=\

-	"..\..\ace\config-win32.h"\

-	{$(INCLUDE)}"\.\align.h"\

-	{$(INCLUDE)}"\.\any.h"\

-	{$(INCLUDE)}"\.\any.i"\

-	{$(INCLUDE)}"\.\cdr.h"\

-	{$(INCLUDE)}"\.\cdr.i"\

-	{$(INCLUDE)}"\.\client_factory.h"\

-	{$(INCLUDE)}"\.\connect.h"\

-	{$(INCLUDE)}"\.\connect.i"\

-	{$(INCLUDE)}"\.\corba.h"\

-	{$(INCLUDE)}"\.\corbacom.h"\

-	{$(INCLUDE)}"\.\corbacom.i"\

-	{$(INCLUDE)}"\.\debug.h"\

-	{$(INCLUDE)}"\.\default_client.h"\

-	{$(INCLUDE)}"\.\default_client.i"\

-	{$(INCLUDE)}"\.\default_server.h"\

-	{$(INCLUDE)}"\.\default_server.i"\

-	{$(INCLUDE)}"\.\except.h"\

-	{$(INCLUDE)}"\.\giop.h"\

-	{$(INCLUDE)}"\.\giop.i"\

-	{$(INCLUDE)}"\.\iiopobj.h"\

-	{$(INCLUDE)}"\.\iiopobj.i"\

-	{$(INCLUDE)}"\.\iioporb.h"\

-	{$(INCLUDE)}"\.\iioporb.i"\

-	{$(INCLUDE)}"\.\marshal.h"\

-	{$(INCLUDE)}"\.\marshal.i"\

-	{$(INCLUDE)}"\.\nvlist.h"\

-	{$(INCLUDE)}"\.\object.h"\

-	{$(INCLUDE)}"\.\object.i"\

-	{$(INCLUDE)}"\.\objtable.h"\

-	{$(INCLUDE)}"\.\optable.h"\

-	{$(INCLUDE)}"\.\orb.h"\

-	{$(INCLUDE)}"\.\orb_core.h"\

-	{$(INCLUDE)}"\.\orb_core.i"\

-	{$(INCLUDE)}"\.\orbconf.h"\

-	{$(INCLUDE)}"\.\orbobj.h"\

-	{$(INCLUDE)}"\.\orbobj.i"\

-	{$(INCLUDE)}"\.\params.h"\

-	{$(INCLUDE)}"\.\params.i"\

-	{$(INCLUDE)}"\.\poa.h"\

-	{$(INCLUDE)}"\.\poa.i"\

-	{$(INCLUDE)}"\.\principa.h"\

-	{$(INCLUDE)}"\.\request.h"\

-	{$(INCLUDE)}"\.\sequence.h"\

-	{$(INCLUDE)}"\.\sequence.i"\

-	{$(INCLUDE)}"\.\server_factory.h"\

-	{$(INCLUDE)}"\.\server_factory.i"\

-	{$(INCLUDE)}"\.\singletons.h"\

-	{$(INCLUDE)}"\.\stub.h"\

-	{$(INCLUDE)}"\.\stub.i"\

-	{$(INCLUDE)}"\.\svrrqst.h"\

-	{$(INCLUDE)}"\.\typecode.h"\

-	{$(INCLUDE)}"\.\typecode.i"\

-	{$(INCLUDE)}"\.\varout.h"\

-	{$(INCLUDE)}"\ace\Acceptor.cpp"\

-	{$(INCLUDE)}"\ace\Acceptor.h"\

-	{$(INCLUDE)}"\ace\Acceptor.i"\

-	{$(INCLUDE)}"\ace\ACE.h"\

-	{$(INCLUDE)}"\ace\ACE.i"\

-	{$(INCLUDE)}"\ace\Addr.h"\

-	{$(INCLUDE)}"\ace\Addr.i"\

-	{$(INCLUDE)}"\ace\Atomic_Op.i"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.cpp"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.h"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.i"\

-	{$(INCLUDE)}"\ace\config-win32-common.h"\

-	{$(INCLUDE)}"\ace\Config.h"\

-	{$(INCLUDE)}"\ace\Connector.cpp"\

-	{$(INCLUDE)}"\ace\Connector.h"\

-	{$(INCLUDE)}"\ace\Connector.i"\

-	{$(INCLUDE)}"\ace\Containers.cpp"\

-	{$(INCLUDE)}"\ace\Containers.h"\

-	{$(INCLUDE)}"\ace\Containers.i"\

-	{$(INCLUDE)}"\ace\Dynamic.h"\

-	{$(INCLUDE)}"\ace\Dynamic.i"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.cpp"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.i"\

-	{$(INCLUDE)}"\ace\Free_List.cpp"\

-	{$(INCLUDE)}"\ace\Free_List.h"\

-	{$(INCLUDE)}"\ace\Free_List.i"\

-	{$(INCLUDE)}"\ace\Get_Opt.h"\

-	{$(INCLUDE)}"\ace\Get_Opt.i"\

-	{$(INCLUDE)}"\ace\Handle_Set.h"\

-	{$(INCLUDE)}"\ace\Handle_Set.i"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.i"\

-	{$(INCLUDE)}"\ace\IO_Cntl_Msg.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.i"\

-	{$(INCLUDE)}"\ace\Log_Msg.h"\

-	{$(INCLUDE)}"\ace\Log_Priority.h"\

-	{$(INCLUDE)}"\ace\Log_Record.h"\

-	{$(INCLUDE)}"\ace\Log_Record.i"\

-	{$(INCLUDE)}"\ace\Malloc.h"\

-	{$(INCLUDE)}"\ace\Malloc.i"\

-	{$(INCLUDE)}"\ace\Malloc_T.cpp"\

-	{$(INCLUDE)}"\ace\Malloc_T.h"\

-	{$(INCLUDE)}"\ace\Malloc_T.i"\

-	{$(INCLUDE)}"\ace\Managed_Object.cpp"\

-	{$(INCLUDE)}"\ace\Managed_Object.h"\

-	{$(INCLUDE)}"\ace\Managed_Object.i"\

-	{$(INCLUDE)}"\ace\Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Map_Manager.h"\

-	{$(INCLUDE)}"\ace\Map_Manager.i"\

-	{$(INCLUDE)}"\ace\Mem_Map.h"\

-	{$(INCLUDE)}"\ace\Mem_Map.i"\

-	{$(INCLUDE)}"\ace\Memory_Pool.h"\

-	{$(INCLUDE)}"\ace\Memory_Pool.i"\

-	{$(INCLUDE)}"\ace\Message_Block.h"\

-	{$(INCLUDE)}"\ace\Message_Block.i"\

-	{$(INCLUDE)}"\ace\Message_Queue.cpp"\

-	{$(INCLUDE)}"\ace\Message_Queue.h"\

-	{$(INCLUDE)}"\ace\Message_Queue.i"\

-	{$(INCLUDE)}"\ace\Module.cpp"\

-	{$(INCLUDE)}"\ace\Module.h"\

-	{$(INCLUDE)}"\ace\Module.i"\

-	{$(INCLUDE)}"\ace\Object_Manager.h"\

-	{$(INCLUDE)}"\ace\Object_Manager.i"\

-	{$(INCLUDE)}"\ace\OS.h"\

-	{$(INCLUDE)}"\ace\OS.i"\

-	{$(INCLUDE)}"\ace\Reactor.h"\

-	{$(INCLUDE)}"\ace\Reactor.i"\

-	{$(INCLUDE)}"\ace\Reactor_Impl.h"\

-	{$(INCLUDE)}"\ace\Service_Config.h"\

-	{$(INCLUDE)}"\ace\Service_Config.i"\

-	{$(INCLUDE)}"\ace\Service_Object.h"\

-	{$(INCLUDE)}"\ace\Service_Object.i"\

-	{$(INCLUDE)}"\ace\Service_Repository.h"\

-	{$(INCLUDE)}"\ace\Service_Repository.i"\

-	{$(INCLUDE)}"\ace\Service_Types.h"\

-	{$(INCLUDE)}"\ace\Service_Types.i"\

-	{$(INCLUDE)}"\ace\Shared_Object.h"\

-	{$(INCLUDE)}"\ace\Shared_Object.i"\

-	{$(INCLUDE)}"\ace\Signal.h"\

-	{$(INCLUDE)}"\ace\Signal.i"\

-	{$(INCLUDE)}"\ace\Singleton.cpp"\

-	{$(INCLUDE)}"\ace\Singleton.h"\

-	{$(INCLUDE)}"\ace\Singleton.i"\

-	{$(INCLUDE)}"\ace\SOCK.h"\

-	{$(INCLUDE)}"\ace\SOCK.i"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.h"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.i"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.h"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.i"\

-	{$(INCLUDE)}"\ace\SOCK_IO.h"\

-	{$(INCLUDE)}"\ace\SOCK_IO.i"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.h"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.i"\

-	{$(INCLUDE)}"\ace\SString.h"\

-	{$(INCLUDE)}"\ace\SString.i"\

-	{$(INCLUDE)}"\ace\stdcpp.h"\

-	{$(INCLUDE)}"\ace\Strategies.h"\

-	{$(INCLUDE)}"\ace\Strategies_T.cpp"\

-	{$(INCLUDE)}"\ace\Strategies_T.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.cpp"\

-	{$(INCLUDE)}"\ace\Stream_Modules.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.i"\

-	{$(INCLUDE)}"\ace\Svc_Conf_Tokens.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.cpp"\

-	{$(INCLUDE)}"\ace\Svc_Handler.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.i"\

-	{$(INCLUDE)}"\ace\Synch.h"\

-	{$(INCLUDE)}"\ace\Synch.i"\

-	{$(INCLUDE)}"\ace\Synch_Options.h"\

-	{$(INCLUDE)}"\ace\Synch_T.cpp"\

-	{$(INCLUDE)}"\ace\Synch_T.h"\

-	{$(INCLUDE)}"\ace\Synch_T.i"\

-	{$(INCLUDE)}"\ace\Task.h"\

-	{$(INCLUDE)}"\ace\Task.i"\

-	{$(INCLUDE)}"\ace\Task_T.cpp"\

-	{$(INCLUDE)}"\ace\Task_T.h"\

-	{$(INCLUDE)}"\ace\Task_T.i"\

-	{$(INCLUDE)}"\ace\Thread.h"\

-	{$(INCLUDE)}"\ace\Thread.i"\

-	{$(INCLUDE)}"\ace\Thread_Manager.h"\

-	{$(INCLUDE)}"\ace\Thread_Manager.i"\

-	{$(INCLUDE)}"\ace\Time_Value.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.cpp"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.i"\

-	{$(INCLUDE)}"\ace\Trace.h"\

-	{$(INCLUDE)}"\ace\Version.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.i"\

-	{$(INCLUDE)}"\ace\ws2tcpip.h"\

-	

-NODEP_CPP_GIOP_=\

-	".\tao\factories.h"\

-	

-

-"$(INTDIR)\giop.obj" : $(SOURCE) $(DEP_CPP_GIOP_) "$(INTDIR)"

-

-

-!ENDIF 

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\iiopobj.cpp

-

-!IF  "$(CFG)" == "TAO - Win32 Release"

-

-DEP_CPP_IIOPO=\

-	"..\..\ace\config-win32.h"\

-	{$(INCLUDE)}"\.\align.h"\

-	{$(INCLUDE)}"\.\any.h"\

-	{$(INCLUDE)}"\.\any.i"\

-	{$(INCLUDE)}"\.\cdr.h"\

-	{$(INCLUDE)}"\.\cdr.i"\

-	{$(INCLUDE)}"\.\client_factory.h"\

-	{$(INCLUDE)}"\.\connect.h"\

-	{$(INCLUDE)}"\.\connect.i"\

-	{$(INCLUDE)}"\.\corba.h"\

-	{$(INCLUDE)}"\.\corbacom.h"\

-	{$(INCLUDE)}"\.\corbacom.i"\

-	{$(INCLUDE)}"\.\debug.h"\

-	{$(INCLUDE)}"\.\default_client.h"\

-	{$(INCLUDE)}"\.\default_client.i"\

-	{$(INCLUDE)}"\.\default_server.h"\

-	{$(INCLUDE)}"\.\default_server.i"\

-	{$(INCLUDE)}"\.\except.h"\

-	{$(INCLUDE)}"\.\giop.h"\

-	{$(INCLUDE)}"\.\giop.i"\

-	{$(INCLUDE)}"\.\iiopobj.h"\

-	{$(INCLUDE)}"\.\iiopobj.i"\

-	{$(INCLUDE)}"\.\iioporb.h"\

-	{$(INCLUDE)}"\.\iioporb.i"\

-	{$(INCLUDE)}"\.\marshal.h"\

-	{$(INCLUDE)}"\.\marshal.i"\

-	{$(INCLUDE)}"\.\nvlist.h"\

-	{$(INCLUDE)}"\.\object.h"\

-	{$(INCLUDE)}"\.\object.i"\

-	{$(INCLUDE)}"\.\objtable.h"\

-	{$(INCLUDE)}"\.\optable.h"\

-	{$(INCLUDE)}"\.\orb.h"\

-	{$(INCLUDE)}"\.\orb_core.h"\

-	{$(INCLUDE)}"\.\orb_core.i"\

-	{$(INCLUDE)}"\.\orbconf.h"\

-	{$(INCLUDE)}"\.\orbobj.h"\

-	{$(INCLUDE)}"\.\orbobj.i"\

-	{$(INCLUDE)}"\.\params.h"\

-	{$(INCLUDE)}"\.\params.i"\

-	{$(INCLUDE)}"\.\poa.h"\

-	{$(INCLUDE)}"\.\poa.i"\

-	{$(INCLUDE)}"\.\principa.h"\

-	{$(INCLUDE)}"\.\request.h"\

-	{$(INCLUDE)}"\.\sequence.h"\

-	{$(INCLUDE)}"\.\sequence.i"\

-	{$(INCLUDE)}"\.\server_factory.h"\

-	{$(INCLUDE)}"\.\server_factory.i"\

-	{$(INCLUDE)}"\.\singletons.h"\

-	{$(INCLUDE)}"\.\stub.h"\

-	{$(INCLUDE)}"\.\stub.i"\

-	{$(INCLUDE)}"\.\svrrqst.h"\

-	{$(INCLUDE)}"\.\typecode.h"\

-	{$(INCLUDE)}"\.\typecode.i"\

-	{$(INCLUDE)}"\.\varout.h"\

-	{$(INCLUDE)}"\ace\Acceptor.cpp"\

-	{$(INCLUDE)}"\ace\Acceptor.h"\

-	{$(INCLUDE)}"\ace\Acceptor.i"\

-	{$(INCLUDE)}"\ace\ACE.h"\

-	{$(INCLUDE)}"\ace\ACE.i"\

-	{$(INCLUDE)}"\ace\Addr.h"\

-	{$(INCLUDE)}"\ace\Addr.i"\

-	{$(INCLUDE)}"\ace\Atomic_Op.i"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.cpp"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.h"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.i"\

-	{$(INCLUDE)}"\ace\config-win32-common.h"\

-	{$(INCLUDE)}"\ace\Config.h"\

-	{$(INCLUDE)}"\ace\Connector.cpp"\

-	{$(INCLUDE)}"\ace\Connector.h"\

-	{$(INCLUDE)}"\ace\Connector.i"\

-	{$(INCLUDE)}"\ace\Containers.cpp"\

-	{$(INCLUDE)}"\ace\Containers.h"\

-	{$(INCLUDE)}"\ace\Containers.i"\

-	{$(INCLUDE)}"\ace\Dynamic.h"\

-	{$(INCLUDE)}"\ace\Dynamic.i"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.cpp"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.i"\

-	{$(INCLUDE)}"\ace\Free_List.cpp"\

-	{$(INCLUDE)}"\ace\Free_List.h"\

-	{$(INCLUDE)}"\ace\Free_List.i"\

-	{$(INCLUDE)}"\ace\Get_Opt.h"\

-	{$(INCLUDE)}"\ace\Get_Opt.i"\

-	{$(INCLUDE)}"\ace\Handle_Set.h"\

-	{$(INCLUDE)}"\ace\Handle_Set.i"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.i"\

-	{$(INCLUDE)}"\ace\IO_Cntl_Msg.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.i"\

-	{$(INCLUDE)}"\ace\Log_Msg.h"\

-	{$(INCLUDE)}"\ace\Log_Priority.h"\

-	{$(INCLUDE)}"\ace\Log_Record.h"\

-	{$(INCLUDE)}"\ace\Log_Record.i"\

-	{$(INCLUDE)}"\ace\Malloc.h"\

-	{$(INCLUDE)}"\ace\Malloc.i"\

-	{$(INCLUDE)}"\ace\Malloc_T.cpp"\

-	{$(INCLUDE)}"\ace\Malloc_T.h"\

-	{$(INCLUDE)}"\ace\Malloc_T.i"\

-	{$(INCLUDE)}"\ace\Managed_Object.cpp"\

-	{$(INCLUDE)}"\ace\Managed_Object.h"\

-	{$(INCLUDE)}"\ace\Managed_Object.i"\

-	{$(INCLUDE)}"\ace\Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Map_Manager.h"\

-	{$(INCLUDE)}"\ace\Map_Manager.i"\

-	{$(INCLUDE)}"\ace\Mem_Map.h"\

-	{$(INCLUDE)}"\ace\Mem_Map.i"\

-	{$(INCLUDE)}"\ace\Memory_Pool.h"\

-	{$(INCLUDE)}"\ace\Memory_Pool.i"\

-	{$(INCLUDE)}"\ace\Message_Block.h"\

-	{$(INCLUDE)}"\ace\Message_Block.i"\

-	{$(INCLUDE)}"\ace\Message_Queue.cpp"\

-	{$(INCLUDE)}"\ace\Message_Queue.h"\

-	{$(INCLUDE)}"\ace\Message_Queue.i"\

-	{$(INCLUDE)}"\ace\Module.cpp"\

-	{$(INCLUDE)}"\ace\Module.h"\

-	{$(INCLUDE)}"\ace\Module.i"\

-	{$(INCLUDE)}"\ace\Object_Manager.h"\

-	{$(INCLUDE)}"\ace\Object_Manager.i"\

-	{$(INCLUDE)}"\ace\OS.h"\

-	{$(INCLUDE)}"\ace\OS.i"\

-	{$(INCLUDE)}"\ace\Reactor.h"\

-	{$(INCLUDE)}"\ace\Reactor.i"\

-	{$(INCLUDE)}"\ace\Reactor_Impl.h"\

-	{$(INCLUDE)}"\ace\Service_Config.h"\

-	{$(INCLUDE)}"\ace\Service_Config.i"\

-	{$(INCLUDE)}"\ace\Service_Object.h"\

-	{$(INCLUDE)}"\ace\Service_Object.i"\

-	{$(INCLUDE)}"\ace\Service_Repository.h"\

-	{$(INCLUDE)}"\ace\Service_Repository.i"\

-	{$(INCLUDE)}"\ace\Service_Types.h"\

-	{$(INCLUDE)}"\ace\Service_Types.i"\

-	{$(INCLUDE)}"\ace\Shared_Object.h"\

-	{$(INCLUDE)}"\ace\Shared_Object.i"\

-	{$(INCLUDE)}"\ace\Signal.h"\

-	{$(INCLUDE)}"\ace\Signal.i"\

-	{$(INCLUDE)}"\ace\Singleton.cpp"\

-	{$(INCLUDE)}"\ace\Singleton.h"\

-	{$(INCLUDE)}"\ace\Singleton.i"\

-	{$(INCLUDE)}"\ace\SOCK.h"\

-	{$(INCLUDE)}"\ace\SOCK.i"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.h"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.i"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.h"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.i"\

-	{$(INCLUDE)}"\ace\SOCK_IO.h"\

-	{$(INCLUDE)}"\ace\SOCK_IO.i"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.h"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.i"\

-	{$(INCLUDE)}"\ace\SString.h"\

-	{$(INCLUDE)}"\ace\SString.i"\

-	{$(INCLUDE)}"\ace\stdcpp.h"\

-	{$(INCLUDE)}"\ace\Strategies.h"\

-	{$(INCLUDE)}"\ace\Strategies_T.cpp"\

-	{$(INCLUDE)}"\ace\Strategies_T.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.cpp"\

-	{$(INCLUDE)}"\ace\Stream_Modules.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.i"\

-	{$(INCLUDE)}"\ace\Svc_Conf_Tokens.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.cpp"\

-	{$(INCLUDE)}"\ace\Svc_Handler.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.i"\

-	{$(INCLUDE)}"\ace\Synch.h"\

-	{$(INCLUDE)}"\ace\Synch.i"\

-	{$(INCLUDE)}"\ace\Synch_Options.h"\

-	{$(INCLUDE)}"\ace\Synch_T.cpp"\

-	{$(INCLUDE)}"\ace\Synch_T.h"\

-	{$(INCLUDE)}"\ace\Synch_T.i"\

-	{$(INCLUDE)}"\ace\Task.h"\

-	{$(INCLUDE)}"\ace\Task.i"\

-	{$(INCLUDE)}"\ace\Task_T.cpp"\

-	{$(INCLUDE)}"\ace\Task_T.h"\

-	{$(INCLUDE)}"\ace\Task_T.i"\

-	{$(INCLUDE)}"\ace\Thread.h"\

-	{$(INCLUDE)}"\ace\Thread.i"\

-	{$(INCLUDE)}"\ace\Thread_Manager.h"\

-	{$(INCLUDE)}"\ace\Thread_Manager.i"\

-	{$(INCLUDE)}"\ace\Time_Value.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.cpp"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.i"\

-	{$(INCLUDE)}"\ace\Trace.h"\

-	{$(INCLUDE)}"\ace\Version.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.i"\

-	{$(INCLUDE)}"\ace\ws2tcpip.h"\

-	

-NODEP_CPP_IIOPO=\

-	".\tao\factories.h"\

-	

-

-"$(INTDIR)\iiopobj.obj" : $(SOURCE) $(DEP_CPP_IIOPO) "$(INTDIR)"

-

-

-!ELSEIF  "$(CFG)" == "TAO - Win32 Debug"

-

-DEP_CPP_IIOPO=\

-	"..\..\ace\config-win32.h"\

-	{$(INCLUDE)}"\.\align.h"\

-	{$(INCLUDE)}"\.\any.h"\

-	{$(INCLUDE)}"\.\any.i"\

-	{$(INCLUDE)}"\.\cdr.h"\

-	{$(INCLUDE)}"\.\cdr.i"\

-	{$(INCLUDE)}"\.\client_factory.h"\

-	{$(INCLUDE)}"\.\connect.h"\

-	{$(INCLUDE)}"\.\connect.i"\

-	{$(INCLUDE)}"\.\corba.h"\

-	{$(INCLUDE)}"\.\corbacom.h"\

-	{$(INCLUDE)}"\.\corbacom.i"\

-	{$(INCLUDE)}"\.\debug.h"\

-	{$(INCLUDE)}"\.\default_client.h"\

-	{$(INCLUDE)}"\.\default_client.i"\

-	{$(INCLUDE)}"\.\default_server.h"\

-	{$(INCLUDE)}"\.\default_server.i"\

-	{$(INCLUDE)}"\.\except.h"\

-	{$(INCLUDE)}"\.\giop.h"\

-	{$(INCLUDE)}"\.\giop.i"\

-	{$(INCLUDE)}"\.\iiopobj.h"\

-	{$(INCLUDE)}"\.\iiopobj.i"\

-	{$(INCLUDE)}"\.\iioporb.h"\

-	{$(INCLUDE)}"\.\iioporb.i"\

-	{$(INCLUDE)}"\.\marshal.h"\

-	{$(INCLUDE)}"\.\marshal.i"\

-	{$(INCLUDE)}"\.\nvlist.h"\

-	{$(INCLUDE)}"\.\object.h"\

-	{$(INCLUDE)}"\.\object.i"\

-	{$(INCLUDE)}"\.\objtable.h"\

-	{$(INCLUDE)}"\.\optable.h"\

-	{$(INCLUDE)}"\.\orb.h"\

-	{$(INCLUDE)}"\.\orb_core.h"\

-	{$(INCLUDE)}"\.\orb_core.i"\

-	{$(INCLUDE)}"\.\orbconf.h"\

-	{$(INCLUDE)}"\.\orbobj.h"\

-	{$(INCLUDE)}"\.\orbobj.i"\

-	{$(INCLUDE)}"\.\params.h"\

-	{$(INCLUDE)}"\.\params.i"\

-	{$(INCLUDE)}"\.\poa.h"\

-	{$(INCLUDE)}"\.\poa.i"\

-	{$(INCLUDE)}"\.\principa.h"\

-	{$(INCLUDE)}"\.\request.h"\

-	{$(INCLUDE)}"\.\sequence.h"\

-	{$(INCLUDE)}"\.\sequence.i"\

-	{$(INCLUDE)}"\.\server_factory.h"\

-	{$(INCLUDE)}"\.\server_factory.i"\

-	{$(INCLUDE)}"\.\singletons.h"\

-	{$(INCLUDE)}"\.\stub.h"\

-	{$(INCLUDE)}"\.\stub.i"\

-	{$(INCLUDE)}"\.\svrrqst.h"\

-	{$(INCLUDE)}"\.\typecode.h"\

-	{$(INCLUDE)}"\.\typecode.i"\

-	{$(INCLUDE)}"\.\varout.h"\

-	{$(INCLUDE)}"\ace\Acceptor.cpp"\

-	{$(INCLUDE)}"\ace\Acceptor.h"\

-	{$(INCLUDE)}"\ace\Acceptor.i"\

-	{$(INCLUDE)}"\ace\ACE.h"\

-	{$(INCLUDE)}"\ace\ACE.i"\

-	{$(INCLUDE)}"\ace\Addr.h"\

-	{$(INCLUDE)}"\ace\Addr.i"\

-	{$(INCLUDE)}"\ace\Atomic_Op.i"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.cpp"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.h"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.i"\

-	{$(INCLUDE)}"\ace\config-win32-common.h"\

-	{$(INCLUDE)}"\ace\Config.h"\

-	{$(INCLUDE)}"\ace\Connector.cpp"\

-	{$(INCLUDE)}"\ace\Connector.h"\

-	{$(INCLUDE)}"\ace\Connector.i"\

-	{$(INCLUDE)}"\ace\Containers.cpp"\

-	{$(INCLUDE)}"\ace\Containers.h"\

-	{$(INCLUDE)}"\ace\Containers.i"\

-	{$(INCLUDE)}"\ace\Dynamic.h"\

-	{$(INCLUDE)}"\ace\Dynamic.i"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.cpp"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.i"\

-	{$(INCLUDE)}"\ace\Free_List.cpp"\

-	{$(INCLUDE)}"\ace\Free_List.h"\

-	{$(INCLUDE)}"\ace\Free_List.i"\

-	{$(INCLUDE)}"\ace\Get_Opt.h"\

-	{$(INCLUDE)}"\ace\Get_Opt.i"\

-	{$(INCLUDE)}"\ace\Handle_Set.h"\

-	{$(INCLUDE)}"\ace\Handle_Set.i"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.i"\

-	{$(INCLUDE)}"\ace\IO_Cntl_Msg.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.i"\

-	{$(INCLUDE)}"\ace\Log_Msg.h"\

-	{$(INCLUDE)}"\ace\Log_Priority.h"\

-	{$(INCLUDE)}"\ace\Log_Record.h"\

-	{$(INCLUDE)}"\ace\Log_Record.i"\

-	{$(INCLUDE)}"\ace\Malloc.h"\

-	{$(INCLUDE)}"\ace\Malloc.i"\

-	{$(INCLUDE)}"\ace\Malloc_T.cpp"\

-	{$(INCLUDE)}"\ace\Malloc_T.h"\

-	{$(INCLUDE)}"\ace\Malloc_T.i"\

-	{$(INCLUDE)}"\ace\Managed_Object.cpp"\

-	{$(INCLUDE)}"\ace\Managed_Object.h"\

-	{$(INCLUDE)}"\ace\Managed_Object.i"\

-	{$(INCLUDE)}"\ace\Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Map_Manager.h"\

-	{$(INCLUDE)}"\ace\Map_Manager.i"\

-	{$(INCLUDE)}"\ace\Mem_Map.h"\

-	{$(INCLUDE)}"\ace\Mem_Map.i"\

-	{$(INCLUDE)}"\ace\Memory_Pool.h"\

-	{$(INCLUDE)}"\ace\Memory_Pool.i"\

-	{$(INCLUDE)}"\ace\Message_Block.h"\

-	{$(INCLUDE)}"\ace\Message_Block.i"\

-	{$(INCLUDE)}"\ace\Message_Queue.cpp"\

-	{$(INCLUDE)}"\ace\Message_Queue.h"\

-	{$(INCLUDE)}"\ace\Message_Queue.i"\

-	{$(INCLUDE)}"\ace\Module.cpp"\

-	{$(INCLUDE)}"\ace\Module.h"\

-	{$(INCLUDE)}"\ace\Module.i"\

-	{$(INCLUDE)}"\ace\Object_Manager.h"\

-	{$(INCLUDE)}"\ace\Object_Manager.i"\

-	{$(INCLUDE)}"\ace\OS.h"\

-	{$(INCLUDE)}"\ace\OS.i"\

-	{$(INCLUDE)}"\ace\Reactor.h"\

-	{$(INCLUDE)}"\ace\Reactor.i"\

-	{$(INCLUDE)}"\ace\Reactor_Impl.h"\

-	{$(INCLUDE)}"\ace\Service_Config.h"\

-	{$(INCLUDE)}"\ace\Service_Config.i"\

-	{$(INCLUDE)}"\ace\Service_Object.h"\

-	{$(INCLUDE)}"\ace\Service_Object.i"\

-	{$(INCLUDE)}"\ace\Service_Repository.h"\

-	{$(INCLUDE)}"\ace\Service_Repository.i"\

-	{$(INCLUDE)}"\ace\Service_Types.h"\

-	{$(INCLUDE)}"\ace\Service_Types.i"\

-	{$(INCLUDE)}"\ace\Shared_Object.h"\

-	{$(INCLUDE)}"\ace\Shared_Object.i"\

-	{$(INCLUDE)}"\ace\Signal.h"\

-	{$(INCLUDE)}"\ace\Signal.i"\

-	{$(INCLUDE)}"\ace\Singleton.cpp"\

-	{$(INCLUDE)}"\ace\Singleton.h"\

-	{$(INCLUDE)}"\ace\Singleton.i"\

-	{$(INCLUDE)}"\ace\SOCK.h"\

-	{$(INCLUDE)}"\ace\SOCK.i"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.h"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.i"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.h"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.i"\

-	{$(INCLUDE)}"\ace\SOCK_IO.h"\

-	{$(INCLUDE)}"\ace\SOCK_IO.i"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.h"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.i"\

-	{$(INCLUDE)}"\ace\SString.h"\

-	{$(INCLUDE)}"\ace\SString.i"\

-	{$(INCLUDE)}"\ace\stdcpp.h"\

-	{$(INCLUDE)}"\ace\Strategies.h"\

-	{$(INCLUDE)}"\ace\Strategies_T.cpp"\

-	{$(INCLUDE)}"\ace\Strategies_T.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.cpp"\

-	{$(INCLUDE)}"\ace\Stream_Modules.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.i"\

-	{$(INCLUDE)}"\ace\Svc_Conf_Tokens.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.cpp"\

-	{$(INCLUDE)}"\ace\Svc_Handler.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.i"\

-	{$(INCLUDE)}"\ace\Synch.h"\

-	{$(INCLUDE)}"\ace\Synch.i"\

-	{$(INCLUDE)}"\ace\Synch_Options.h"\

-	{$(INCLUDE)}"\ace\Synch_T.cpp"\

-	{$(INCLUDE)}"\ace\Synch_T.h"\

-	{$(INCLUDE)}"\ace\Synch_T.i"\

-	{$(INCLUDE)}"\ace\Task.h"\

-	{$(INCLUDE)}"\ace\Task.i"\

-	{$(INCLUDE)}"\ace\Task_T.cpp"\

-	{$(INCLUDE)}"\ace\Task_T.h"\

-	{$(INCLUDE)}"\ace\Task_T.i"\

-	{$(INCLUDE)}"\ace\Thread.h"\

-	{$(INCLUDE)}"\ace\Thread.i"\

-	{$(INCLUDE)}"\ace\Thread_Manager.h"\

-	{$(INCLUDE)}"\ace\Thread_Manager.i"\

-	{$(INCLUDE)}"\ace\Time_Value.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.cpp"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.i"\

-	{$(INCLUDE)}"\ace\Trace.h"\

-	{$(INCLUDE)}"\ace\Version.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.i"\

-	{$(INCLUDE)}"\ace\ws2tcpip.h"\

-	

-NODEP_CPP_IIOPO=\

-	".\tao\factories.h"\

-	

-

-"$(INTDIR)\iiopobj.obj" : $(SOURCE) $(DEP_CPP_IIOPO) "$(INTDIR)"

-

-

-!ENDIF 

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\iioporb.cpp

-

-!IF  "$(CFG)" == "TAO - Win32 Release"

-

-DEP_CPP_IIOPOR=\

-	"..\..\ace\config-win32.h"\

-	{$(INCLUDE)}"\.\align.h"\

-	{$(INCLUDE)}"\.\any.h"\

-	{$(INCLUDE)}"\.\any.i"\

-	{$(INCLUDE)}"\.\cdr.h"\

-	{$(INCLUDE)}"\.\cdr.i"\

-	{$(INCLUDE)}"\.\client_factory.h"\

-	{$(INCLUDE)}"\.\connect.h"\

-	{$(INCLUDE)}"\.\connect.i"\

-	{$(INCLUDE)}"\.\corba.h"\

-	{$(INCLUDE)}"\.\corbacom.h"\

-	{$(INCLUDE)}"\.\corbacom.i"\

-	{$(INCLUDE)}"\.\debug.h"\

-	{$(INCLUDE)}"\.\default_client.h"\

-	{$(INCLUDE)}"\.\default_client.i"\

-	{$(INCLUDE)}"\.\default_server.h"\

-	{$(INCLUDE)}"\.\default_server.i"\

-	{$(INCLUDE)}"\.\except.h"\

-	{$(INCLUDE)}"\.\giop.h"\

-	{$(INCLUDE)}"\.\giop.i"\

-	{$(INCLUDE)}"\.\iiopobj.h"\

-	{$(INCLUDE)}"\.\iiopobj.i"\

-	{$(INCLUDE)}"\.\iioporb.h"\

-	{$(INCLUDE)}"\.\iioporb.i"\

-	{$(INCLUDE)}"\.\marshal.h"\

-	{$(INCLUDE)}"\.\marshal.i"\

-	{$(INCLUDE)}"\.\nvlist.h"\

-	{$(INCLUDE)}"\.\object.h"\

-	{$(INCLUDE)}"\.\object.i"\

-	{$(INCLUDE)}"\.\objtable.h"\

-	{$(INCLUDE)}"\.\optable.h"\

-	{$(INCLUDE)}"\.\orb.h"\

-	{$(INCLUDE)}"\.\orb_core.h"\

-	{$(INCLUDE)}"\.\orb_core.i"\

-	{$(INCLUDE)}"\.\orbconf.h"\

-	{$(INCLUDE)}"\.\orbobj.h"\

-	{$(INCLUDE)}"\.\orbobj.i"\

-	{$(INCLUDE)}"\.\params.h"\

-	{$(INCLUDE)}"\.\params.i"\

-	{$(INCLUDE)}"\.\poa.h"\

-	{$(INCLUDE)}"\.\poa.i"\

-	{$(INCLUDE)}"\.\principa.h"\

-	{$(INCLUDE)}"\.\request.h"\

-	{$(INCLUDE)}"\.\sequence.h"\

-	{$(INCLUDE)}"\.\sequence.i"\

-	{$(INCLUDE)}"\.\server_factory.h"\

-	{$(INCLUDE)}"\.\server_factory.i"\

-	{$(INCLUDE)}"\.\singletons.h"\

-	{$(INCLUDE)}"\.\stub.h"\

-	{$(INCLUDE)}"\.\stub.i"\

-	{$(INCLUDE)}"\.\svrrqst.h"\

-	{$(INCLUDE)}"\.\typecode.h"\

-	{$(INCLUDE)}"\.\typecode.i"\

-	{$(INCLUDE)}"\.\varout.h"\

-	{$(INCLUDE)}"\ace\Acceptor.cpp"\

-	{$(INCLUDE)}"\ace\Acceptor.h"\

-	{$(INCLUDE)}"\ace\Acceptor.i"\

-	{$(INCLUDE)}"\ace\ACE.h"\

-	{$(INCLUDE)}"\ace\ACE.i"\

-	{$(INCLUDE)}"\ace\Addr.h"\

-	{$(INCLUDE)}"\ace\Addr.i"\

-	{$(INCLUDE)}"\ace\Atomic_Op.i"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.cpp"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.h"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.i"\

-	{$(INCLUDE)}"\ace\config-win32-common.h"\

-	{$(INCLUDE)}"\ace\Config.h"\

-	{$(INCLUDE)}"\ace\Connector.cpp"\

-	{$(INCLUDE)}"\ace\Connector.h"\

-	{$(INCLUDE)}"\ace\Connector.i"\

-	{$(INCLUDE)}"\ace\Containers.cpp"\

-	{$(INCLUDE)}"\ace\Containers.h"\

-	{$(INCLUDE)}"\ace\Containers.i"\

-	{$(INCLUDE)}"\ace\Dynamic.h"\

-	{$(INCLUDE)}"\ace\Dynamic.i"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.cpp"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.i"\

-	{$(INCLUDE)}"\ace\Free_List.cpp"\

-	{$(INCLUDE)}"\ace\Free_List.h"\

-	{$(INCLUDE)}"\ace\Free_List.i"\

-	{$(INCLUDE)}"\ace\Get_Opt.h"\

-	{$(INCLUDE)}"\ace\Get_Opt.i"\

-	{$(INCLUDE)}"\ace\Handle_Set.h"\

-	{$(INCLUDE)}"\ace\Handle_Set.i"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.i"\

-	{$(INCLUDE)}"\ace\IO_Cntl_Msg.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.i"\

-	{$(INCLUDE)}"\ace\Log_Msg.h"\

-	{$(INCLUDE)}"\ace\Log_Priority.h"\

-	{$(INCLUDE)}"\ace\Log_Record.h"\

-	{$(INCLUDE)}"\ace\Log_Record.i"\

-	{$(INCLUDE)}"\ace\Malloc.h"\

-	{$(INCLUDE)}"\ace\Malloc.i"\

-	{$(INCLUDE)}"\ace\Malloc_T.cpp"\

-	{$(INCLUDE)}"\ace\Malloc_T.h"\

-	{$(INCLUDE)}"\ace\Malloc_T.i"\

-	{$(INCLUDE)}"\ace\Managed_Object.cpp"\

-	{$(INCLUDE)}"\ace\Managed_Object.h"\

-	{$(INCLUDE)}"\ace\Managed_Object.i"\

-	{$(INCLUDE)}"\ace\Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Map_Manager.h"\

-	{$(INCLUDE)}"\ace\Map_Manager.i"\

-	{$(INCLUDE)}"\ace\Mem_Map.h"\

-	{$(INCLUDE)}"\ace\Mem_Map.i"\

-	{$(INCLUDE)}"\ace\Memory_Pool.h"\

-	{$(INCLUDE)}"\ace\Memory_Pool.i"\

-	{$(INCLUDE)}"\ace\Message_Block.h"\

-	{$(INCLUDE)}"\ace\Message_Block.i"\

-	{$(INCLUDE)}"\ace\Message_Queue.cpp"\

-	{$(INCLUDE)}"\ace\Message_Queue.h"\

-	{$(INCLUDE)}"\ace\Message_Queue.i"\

-	{$(INCLUDE)}"\ace\Module.cpp"\

-	{$(INCLUDE)}"\ace\Module.h"\

-	{$(INCLUDE)}"\ace\Module.i"\

-	{$(INCLUDE)}"\ace\Object_Manager.h"\

-	{$(INCLUDE)}"\ace\Object_Manager.i"\

-	{$(INCLUDE)}"\ace\OS.h"\

-	{$(INCLUDE)}"\ace\OS.i"\

-	{$(INCLUDE)}"\ace\Reactor.h"\

-	{$(INCLUDE)}"\ace\Reactor.i"\

-	{$(INCLUDE)}"\ace\Reactor_Impl.h"\

-	{$(INCLUDE)}"\ace\Service_Config.h"\

-	{$(INCLUDE)}"\ace\Service_Config.i"\

-	{$(INCLUDE)}"\ace\Service_Object.h"\

-	{$(INCLUDE)}"\ace\Service_Object.i"\

-	{$(INCLUDE)}"\ace\Service_Repository.h"\

-	{$(INCLUDE)}"\ace\Service_Repository.i"\

-	{$(INCLUDE)}"\ace\Service_Types.h"\

-	{$(INCLUDE)}"\ace\Service_Types.i"\

-	{$(INCLUDE)}"\ace\Shared_Object.h"\

-	{$(INCLUDE)}"\ace\Shared_Object.i"\

-	{$(INCLUDE)}"\ace\Signal.h"\

-	{$(INCLUDE)}"\ace\Signal.i"\

-	{$(INCLUDE)}"\ace\Singleton.cpp"\

-	{$(INCLUDE)}"\ace\Singleton.h"\

-	{$(INCLUDE)}"\ace\Singleton.i"\

-	{$(INCLUDE)}"\ace\SOCK.h"\

-	{$(INCLUDE)}"\ace\SOCK.i"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.h"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.i"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.h"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.i"\

-	{$(INCLUDE)}"\ace\SOCK_IO.h"\

-	{$(INCLUDE)}"\ace\SOCK_IO.i"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.h"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.i"\

-	{$(INCLUDE)}"\ace\SString.h"\

-	{$(INCLUDE)}"\ace\SString.i"\

-	{$(INCLUDE)}"\ace\stdcpp.h"\

-	{$(INCLUDE)}"\ace\Strategies.h"\

-	{$(INCLUDE)}"\ace\Strategies_T.cpp"\

-	{$(INCLUDE)}"\ace\Strategies_T.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.cpp"\

-	{$(INCLUDE)}"\ace\Stream_Modules.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.i"\

-	{$(INCLUDE)}"\ace\Svc_Conf_Tokens.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.cpp"\

-	{$(INCLUDE)}"\ace\Svc_Handler.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.i"\

-	{$(INCLUDE)}"\ace\Synch.h"\

-	{$(INCLUDE)}"\ace\Synch.i"\

-	{$(INCLUDE)}"\ace\Synch_Options.h"\

-	{$(INCLUDE)}"\ace\Synch_T.cpp"\

-	{$(INCLUDE)}"\ace\Synch_T.h"\

-	{$(INCLUDE)}"\ace\Synch_T.i"\

-	{$(INCLUDE)}"\ace\Task.h"\

-	{$(INCLUDE)}"\ace\Task.i"\

-	{$(INCLUDE)}"\ace\Task_T.cpp"\

-	{$(INCLUDE)}"\ace\Task_T.h"\

-	{$(INCLUDE)}"\ace\Task_T.i"\

-	{$(INCLUDE)}"\ace\Thread.h"\

-	{$(INCLUDE)}"\ace\Thread.i"\

-	{$(INCLUDE)}"\ace\Thread_Manager.h"\

-	{$(INCLUDE)}"\ace\Thread_Manager.i"\

-	{$(INCLUDE)}"\ace\Time_Value.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.cpp"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.i"\

-	{$(INCLUDE)}"\ace\Trace.h"\

-	{$(INCLUDE)}"\ace\Version.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.i"\

-	{$(INCLUDE)}"\ace\ws2tcpip.h"\

-	

-NODEP_CPP_IIOPOR=\

-	".\tao\factories.h"\

-	

-

-"$(INTDIR)\iioporb.obj" : $(SOURCE) $(DEP_CPP_IIOPOR) "$(INTDIR)"

-

-

-!ELSEIF  "$(CFG)" == "TAO - Win32 Debug"

-

-DEP_CPP_IIOPOR=\

-	"..\..\ace\config-win32.h"\

-	{$(INCLUDE)}"\.\align.h"\

-	{$(INCLUDE)}"\.\any.h"\

-	{$(INCLUDE)}"\.\any.i"\

-	{$(INCLUDE)}"\.\cdr.h"\

-	{$(INCLUDE)}"\.\cdr.i"\

-	{$(INCLUDE)}"\.\client_factory.h"\

-	{$(INCLUDE)}"\.\connect.h"\

-	{$(INCLUDE)}"\.\connect.i"\

-	{$(INCLUDE)}"\.\corba.h"\

-	{$(INCLUDE)}"\.\corbacom.h"\

-	{$(INCLUDE)}"\.\corbacom.i"\

-	{$(INCLUDE)}"\.\debug.h"\

-	{$(INCLUDE)}"\.\default_client.h"\

-	{$(INCLUDE)}"\.\default_client.i"\

-	{$(INCLUDE)}"\.\default_server.h"\

-	{$(INCLUDE)}"\.\default_server.i"\

-	{$(INCLUDE)}"\.\except.h"\

-	{$(INCLUDE)}"\.\giop.h"\

-	{$(INCLUDE)}"\.\giop.i"\

-	{$(INCLUDE)}"\.\iiopobj.h"\

-	{$(INCLUDE)}"\.\iiopobj.i"\

-	{$(INCLUDE)}"\.\iioporb.h"\

-	{$(INCLUDE)}"\.\iioporb.i"\

-	{$(INCLUDE)}"\.\marshal.h"\

-	{$(INCLUDE)}"\.\marshal.i"\

-	{$(INCLUDE)}"\.\nvlist.h"\

-	{$(INCLUDE)}"\.\object.h"\

-	{$(INCLUDE)}"\.\object.i"\

-	{$(INCLUDE)}"\.\objtable.h"\

-	{$(INCLUDE)}"\.\optable.h"\

-	{$(INCLUDE)}"\.\orb.h"\

-	{$(INCLUDE)}"\.\orb_core.h"\

-	{$(INCLUDE)}"\.\orb_core.i"\

-	{$(INCLUDE)}"\.\orbconf.h"\

-	{$(INCLUDE)}"\.\orbobj.h"\

-	{$(INCLUDE)}"\.\orbobj.i"\

-	{$(INCLUDE)}"\.\params.h"\

-	{$(INCLUDE)}"\.\params.i"\

-	{$(INCLUDE)}"\.\poa.h"\

-	{$(INCLUDE)}"\.\poa.i"\

-	{$(INCLUDE)}"\.\principa.h"\

-	{$(INCLUDE)}"\.\request.h"\

-	{$(INCLUDE)}"\.\sequence.h"\

-	{$(INCLUDE)}"\.\sequence.i"\

-	{$(INCLUDE)}"\.\server_factory.h"\

-	{$(INCLUDE)}"\.\server_factory.i"\

-	{$(INCLUDE)}"\.\singletons.h"\

-	{$(INCLUDE)}"\.\stub.h"\

-	{$(INCLUDE)}"\.\stub.i"\

-	{$(INCLUDE)}"\.\svrrqst.h"\

-	{$(INCLUDE)}"\.\typecode.h"\

-	{$(INCLUDE)}"\.\typecode.i"\

-	{$(INCLUDE)}"\.\varout.h"\

-	{$(INCLUDE)}"\ace\Acceptor.cpp"\

-	{$(INCLUDE)}"\ace\Acceptor.h"\

-	{$(INCLUDE)}"\ace\Acceptor.i"\

-	{$(INCLUDE)}"\ace\ACE.h"\

-	{$(INCLUDE)}"\ace\ACE.i"\

-	{$(INCLUDE)}"\ace\Addr.h"\

-	{$(INCLUDE)}"\ace\Addr.i"\

-	{$(INCLUDE)}"\ace\Atomic_Op.i"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.cpp"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.h"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.i"\

-	{$(INCLUDE)}"\ace\config-win32-common.h"\

-	{$(INCLUDE)}"\ace\Config.h"\

-	{$(INCLUDE)}"\ace\Connector.cpp"\

-	{$(INCLUDE)}"\ace\Connector.h"\

-	{$(INCLUDE)}"\ace\Connector.i"\

-	{$(INCLUDE)}"\ace\Containers.cpp"\

-	{$(INCLUDE)}"\ace\Containers.h"\

-	{$(INCLUDE)}"\ace\Containers.i"\

-	{$(INCLUDE)}"\ace\Dynamic.h"\

-	{$(INCLUDE)}"\ace\Dynamic.i"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.cpp"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.i"\

-	{$(INCLUDE)}"\ace\Free_List.cpp"\

-	{$(INCLUDE)}"\ace\Free_List.h"\

-	{$(INCLUDE)}"\ace\Free_List.i"\

-	{$(INCLUDE)}"\ace\Get_Opt.h"\

-	{$(INCLUDE)}"\ace\Get_Opt.i"\

-	{$(INCLUDE)}"\ace\Handle_Set.h"\

-	{$(INCLUDE)}"\ace\Handle_Set.i"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.i"\

-	{$(INCLUDE)}"\ace\IO_Cntl_Msg.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.i"\

-	{$(INCLUDE)}"\ace\Log_Msg.h"\

-	{$(INCLUDE)}"\ace\Log_Priority.h"\

-	{$(INCLUDE)}"\ace\Log_Record.h"\

-	{$(INCLUDE)}"\ace\Log_Record.i"\

-	{$(INCLUDE)}"\ace\Malloc.h"\

-	{$(INCLUDE)}"\ace\Malloc.i"\

-	{$(INCLUDE)}"\ace\Malloc_T.cpp"\

-	{$(INCLUDE)}"\ace\Malloc_T.h"\

-	{$(INCLUDE)}"\ace\Malloc_T.i"\

-	{$(INCLUDE)}"\ace\Managed_Object.cpp"\

-	{$(INCLUDE)}"\ace\Managed_Object.h"\

-	{$(INCLUDE)}"\ace\Managed_Object.i"\

-	{$(INCLUDE)}"\ace\Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Map_Manager.h"\

-	{$(INCLUDE)}"\ace\Map_Manager.i"\

-	{$(INCLUDE)}"\ace\Mem_Map.h"\

-	{$(INCLUDE)}"\ace\Mem_Map.i"\

-	{$(INCLUDE)}"\ace\Memory_Pool.h"\

-	{$(INCLUDE)}"\ace\Memory_Pool.i"\

-	{$(INCLUDE)}"\ace\Message_Block.h"\

-	{$(INCLUDE)}"\ace\Message_Block.i"\

-	{$(INCLUDE)}"\ace\Message_Queue.cpp"\

-	{$(INCLUDE)}"\ace\Message_Queue.h"\

-	{$(INCLUDE)}"\ace\Message_Queue.i"\

-	{$(INCLUDE)}"\ace\Module.cpp"\

-	{$(INCLUDE)}"\ace\Module.h"\

-	{$(INCLUDE)}"\ace\Module.i"\

-	{$(INCLUDE)}"\ace\Object_Manager.h"\

-	{$(INCLUDE)}"\ace\Object_Manager.i"\

-	{$(INCLUDE)}"\ace\OS.h"\

-	{$(INCLUDE)}"\ace\OS.i"\

-	{$(INCLUDE)}"\ace\Reactor.h"\

-	{$(INCLUDE)}"\ace\Reactor.i"\

-	{$(INCLUDE)}"\ace\Reactor_Impl.h"\

-	{$(INCLUDE)}"\ace\Service_Config.h"\

-	{$(INCLUDE)}"\ace\Service_Config.i"\

-	{$(INCLUDE)}"\ace\Service_Object.h"\

-	{$(INCLUDE)}"\ace\Service_Object.i"\

-	{$(INCLUDE)}"\ace\Service_Repository.h"\

-	{$(INCLUDE)}"\ace\Service_Repository.i"\

-	{$(INCLUDE)}"\ace\Service_Types.h"\

-	{$(INCLUDE)}"\ace\Service_Types.i"\

-	{$(INCLUDE)}"\ace\Shared_Object.h"\

-	{$(INCLUDE)}"\ace\Shared_Object.i"\

-	{$(INCLUDE)}"\ace\Signal.h"\

-	{$(INCLUDE)}"\ace\Signal.i"\

-	{$(INCLUDE)}"\ace\Singleton.cpp"\

-	{$(INCLUDE)}"\ace\Singleton.h"\

-	{$(INCLUDE)}"\ace\Singleton.i"\

-	{$(INCLUDE)}"\ace\SOCK.h"\

-	{$(INCLUDE)}"\ace\SOCK.i"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.h"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.i"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.h"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.i"\

-	{$(INCLUDE)}"\ace\SOCK_IO.h"\

-	{$(INCLUDE)}"\ace\SOCK_IO.i"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.h"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.i"\

-	{$(INCLUDE)}"\ace\SString.h"\

-	{$(INCLUDE)}"\ace\SString.i"\

-	{$(INCLUDE)}"\ace\stdcpp.h"\

-	{$(INCLUDE)}"\ace\Strategies.h"\

-	{$(INCLUDE)}"\ace\Strategies_T.cpp"\

-	{$(INCLUDE)}"\ace\Strategies_T.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.cpp"\

-	{$(INCLUDE)}"\ace\Stream_Modules.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.i"\

-	{$(INCLUDE)}"\ace\Svc_Conf_Tokens.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.cpp"\

-	{$(INCLUDE)}"\ace\Svc_Handler.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.i"\

-	{$(INCLUDE)}"\ace\Synch.h"\

-	{$(INCLUDE)}"\ace\Synch.i"\

-	{$(INCLUDE)}"\ace\Synch_Options.h"\

-	{$(INCLUDE)}"\ace\Synch_T.cpp"\

-	{$(INCLUDE)}"\ace\Synch_T.h"\

-	{$(INCLUDE)}"\ace\Synch_T.i"\

-	{$(INCLUDE)}"\ace\Task.h"\

-	{$(INCLUDE)}"\ace\Task.i"\

-	{$(INCLUDE)}"\ace\Task_T.cpp"\

-	{$(INCLUDE)}"\ace\Task_T.h"\

-	{$(INCLUDE)}"\ace\Task_T.i"\

-	{$(INCLUDE)}"\ace\Thread.h"\

-	{$(INCLUDE)}"\ace\Thread.i"\

-	{$(INCLUDE)}"\ace\Thread_Manager.h"\

-	{$(INCLUDE)}"\ace\Thread_Manager.i"\

-	{$(INCLUDE)}"\ace\Time_Value.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.cpp"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.i"\

-	{$(INCLUDE)}"\ace\Trace.h"\

-	{$(INCLUDE)}"\ace\Version.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.i"\

-	{$(INCLUDE)}"\ace\ws2tcpip.h"\

-	

-NODEP_CPP_IIOPOR=\

-	".\tao\factories.h"\

-	

-

-"$(INTDIR)\iioporb.obj" : $(SOURCE) $(DEP_CPP_IIOPOR) "$(INTDIR)"

-

-

-!ENDIF 

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\interp.cpp

-

-!IF  "$(CFG)" == "TAO - Win32 Release"

-

-DEP_CPP_INTER=\

-	"..\..\ace\config-win32.h"\

-	{$(INCLUDE)}"\.\align.h"\

-	{$(INCLUDE)}"\.\any.h"\

-	{$(INCLUDE)}"\.\any.i"\

-	{$(INCLUDE)}"\.\cdr.h"\

-	{$(INCLUDE)}"\.\cdr.i"\

-	{$(INCLUDE)}"\.\client_factory.h"\

-	{$(INCLUDE)}"\.\connect.h"\

-	{$(INCLUDE)}"\.\connect.i"\

-	{$(INCLUDE)}"\.\corba.h"\

-	{$(INCLUDE)}"\.\corbacom.h"\

-	{$(INCLUDE)}"\.\corbacom.i"\

-	{$(INCLUDE)}"\.\debug.h"\

-	{$(INCLUDE)}"\.\default_client.h"\

-	{$(INCLUDE)}"\.\default_client.i"\

-	{$(INCLUDE)}"\.\default_server.h"\

-	{$(INCLUDE)}"\.\default_server.i"\

-	{$(INCLUDE)}"\.\except.h"\

-	{$(INCLUDE)}"\.\giop.h"\

-	{$(INCLUDE)}"\.\giop.i"\

-	{$(INCLUDE)}"\.\iiopobj.h"\

-	{$(INCLUDE)}"\.\iiopobj.i"\

-	{$(INCLUDE)}"\.\iioporb.h"\

-	{$(INCLUDE)}"\.\iioporb.i"\

-	{$(INCLUDE)}"\.\marshal.h"\

-	{$(INCLUDE)}"\.\marshal.i"\

-	{$(INCLUDE)}"\.\nvlist.h"\

-	{$(INCLUDE)}"\.\object.h"\

-	{$(INCLUDE)}"\.\object.i"\

-	{$(INCLUDE)}"\.\objtable.h"\

-	{$(INCLUDE)}"\.\optable.h"\

-	{$(INCLUDE)}"\.\orb.h"\

-	{$(INCLUDE)}"\.\orb_core.h"\

-	{$(INCLUDE)}"\.\orb_core.i"\

-	{$(INCLUDE)}"\.\orbconf.h"\

-	{$(INCLUDE)}"\.\orbobj.h"\

-	{$(INCLUDE)}"\.\orbobj.i"\

-	{$(INCLUDE)}"\.\params.h"\

-	{$(INCLUDE)}"\.\params.i"\

-	{$(INCLUDE)}"\.\poa.h"\

-	{$(INCLUDE)}"\.\poa.i"\

-	{$(INCLUDE)}"\.\principa.h"\

-	{$(INCLUDE)}"\.\request.h"\

-	{$(INCLUDE)}"\.\sequence.h"\

-	{$(INCLUDE)}"\.\sequence.i"\

-	{$(INCLUDE)}"\.\server_factory.h"\

-	{$(INCLUDE)}"\.\server_factory.i"\

-	{$(INCLUDE)}"\.\singletons.h"\

-	{$(INCLUDE)}"\.\stub.h"\

-	{$(INCLUDE)}"\.\stub.i"\

-	{$(INCLUDE)}"\.\svrrqst.h"\

-	{$(INCLUDE)}"\.\typecode.h"\

-	{$(INCLUDE)}"\.\typecode.i"\

-	{$(INCLUDE)}"\.\varout.h"\

-	{$(INCLUDE)}"\ace\Acceptor.cpp"\

-	{$(INCLUDE)}"\ace\Acceptor.h"\

-	{$(INCLUDE)}"\ace\Acceptor.i"\

-	{$(INCLUDE)}"\ace\ACE.h"\

-	{$(INCLUDE)}"\ace\ACE.i"\

-	{$(INCLUDE)}"\ace\Addr.h"\

-	{$(INCLUDE)}"\ace\Addr.i"\

-	{$(INCLUDE)}"\ace\Atomic_Op.i"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.cpp"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.h"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.i"\

-	{$(INCLUDE)}"\ace\config-win32-common.h"\

-	{$(INCLUDE)}"\ace\Config.h"\

-	{$(INCLUDE)}"\ace\Connector.cpp"\

-	{$(INCLUDE)}"\ace\Connector.h"\

-	{$(INCLUDE)}"\ace\Connector.i"\

-	{$(INCLUDE)}"\ace\Containers.cpp"\

-	{$(INCLUDE)}"\ace\Containers.h"\

-	{$(INCLUDE)}"\ace\Containers.i"\

-	{$(INCLUDE)}"\ace\Dynamic.h"\

-	{$(INCLUDE)}"\ace\Dynamic.i"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.cpp"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.i"\

-	{$(INCLUDE)}"\ace\Free_List.cpp"\

-	{$(INCLUDE)}"\ace\Free_List.h"\

-	{$(INCLUDE)}"\ace\Free_List.i"\

-	{$(INCLUDE)}"\ace\Get_Opt.h"\

-	{$(INCLUDE)}"\ace\Get_Opt.i"\

-	{$(INCLUDE)}"\ace\Handle_Set.h"\

-	{$(INCLUDE)}"\ace\Handle_Set.i"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.i"\

-	{$(INCLUDE)}"\ace\IO_Cntl_Msg.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.i"\

-	{$(INCLUDE)}"\ace\Log_Msg.h"\

-	{$(INCLUDE)}"\ace\Log_Priority.h"\

-	{$(INCLUDE)}"\ace\Log_Record.h"\

-	{$(INCLUDE)}"\ace\Log_Record.i"\

-	{$(INCLUDE)}"\ace\Malloc.h"\

-	{$(INCLUDE)}"\ace\Malloc.i"\

-	{$(INCLUDE)}"\ace\Malloc_T.cpp"\

-	{$(INCLUDE)}"\ace\Malloc_T.h"\

-	{$(INCLUDE)}"\ace\Malloc_T.i"\

-	{$(INCLUDE)}"\ace\Managed_Object.cpp"\

-	{$(INCLUDE)}"\ace\Managed_Object.h"\

-	{$(INCLUDE)}"\ace\Managed_Object.i"\

-	{$(INCLUDE)}"\ace\Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Map_Manager.h"\

-	{$(INCLUDE)}"\ace\Map_Manager.i"\

-	{$(INCLUDE)}"\ace\Mem_Map.h"\

-	{$(INCLUDE)}"\ace\Mem_Map.i"\

-	{$(INCLUDE)}"\ace\Memory_Pool.h"\

-	{$(INCLUDE)}"\ace\Memory_Pool.i"\

-	{$(INCLUDE)}"\ace\Message_Block.h"\

-	{$(INCLUDE)}"\ace\Message_Block.i"\

-	{$(INCLUDE)}"\ace\Message_Queue.cpp"\

-	{$(INCLUDE)}"\ace\Message_Queue.h"\

-	{$(INCLUDE)}"\ace\Message_Queue.i"\

-	{$(INCLUDE)}"\ace\Module.cpp"\

-	{$(INCLUDE)}"\ace\Module.h"\

-	{$(INCLUDE)}"\ace\Module.i"\

-	{$(INCLUDE)}"\ace\Object_Manager.h"\

-	{$(INCLUDE)}"\ace\Object_Manager.i"\

-	{$(INCLUDE)}"\ace\OS.h"\

-	{$(INCLUDE)}"\ace\OS.i"\

-	{$(INCLUDE)}"\ace\Reactor.h"\

-	{$(INCLUDE)}"\ace\Reactor.i"\

-	{$(INCLUDE)}"\ace\Reactor_Impl.h"\

-	{$(INCLUDE)}"\ace\Service_Config.h"\

-	{$(INCLUDE)}"\ace\Service_Config.i"\

-	{$(INCLUDE)}"\ace\Service_Object.h"\

-	{$(INCLUDE)}"\ace\Service_Object.i"\

-	{$(INCLUDE)}"\ace\Service_Repository.h"\

-	{$(INCLUDE)}"\ace\Service_Repository.i"\

-	{$(INCLUDE)}"\ace\Service_Types.h"\

-	{$(INCLUDE)}"\ace\Service_Types.i"\

-	{$(INCLUDE)}"\ace\Shared_Object.h"\

-	{$(INCLUDE)}"\ace\Shared_Object.i"\

-	{$(INCLUDE)}"\ace\Signal.h"\

-	{$(INCLUDE)}"\ace\Signal.i"\

-	{$(INCLUDE)}"\ace\Singleton.cpp"\

-	{$(INCLUDE)}"\ace\Singleton.h"\

-	{$(INCLUDE)}"\ace\Singleton.i"\

-	{$(INCLUDE)}"\ace\SOCK.h"\

-	{$(INCLUDE)}"\ace\SOCK.i"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.h"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.i"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.h"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.i"\

-	{$(INCLUDE)}"\ace\SOCK_IO.h"\

-	{$(INCLUDE)}"\ace\SOCK_IO.i"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.h"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.i"\

-	{$(INCLUDE)}"\ace\SString.h"\

-	{$(INCLUDE)}"\ace\SString.i"\

-	{$(INCLUDE)}"\ace\stdcpp.h"\

-	{$(INCLUDE)}"\ace\Strategies.h"\

-	{$(INCLUDE)}"\ace\Strategies_T.cpp"\

-	{$(INCLUDE)}"\ace\Strategies_T.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.cpp"\

-	{$(INCLUDE)}"\ace\Stream_Modules.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.i"\

-	{$(INCLUDE)}"\ace\Svc_Conf_Tokens.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.cpp"\

-	{$(INCLUDE)}"\ace\Svc_Handler.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.i"\

-	{$(INCLUDE)}"\ace\Synch.h"\

-	{$(INCLUDE)}"\ace\Synch.i"\

-	{$(INCLUDE)}"\ace\Synch_Options.h"\

-	{$(INCLUDE)}"\ace\Synch_T.cpp"\

-	{$(INCLUDE)}"\ace\Synch_T.h"\

-	{$(INCLUDE)}"\ace\Synch_T.i"\

-	{$(INCLUDE)}"\ace\Task.h"\

-	{$(INCLUDE)}"\ace\Task.i"\

-	{$(INCLUDE)}"\ace\Task_T.cpp"\

-	{$(INCLUDE)}"\ace\Task_T.h"\

-	{$(INCLUDE)}"\ace\Task_T.i"\

-	{$(INCLUDE)}"\ace\Thread.h"\

-	{$(INCLUDE)}"\ace\Thread.i"\

-	{$(INCLUDE)}"\ace\Thread_Manager.h"\

-	{$(INCLUDE)}"\ace\Thread_Manager.i"\

-	{$(INCLUDE)}"\ace\Time_Value.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.cpp"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.i"\

-	{$(INCLUDE)}"\ace\Trace.h"\

-	{$(INCLUDE)}"\ace\Version.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.i"\

-	{$(INCLUDE)}"\ace\ws2tcpip.h"\

-	

-

-"$(INTDIR)\interp.obj" : $(SOURCE) $(DEP_CPP_INTER) "$(INTDIR)"

-

-

-!ELSEIF  "$(CFG)" == "TAO - Win32 Debug"

-

-DEP_CPP_INTER=\

-	"..\..\ace\config-win32.h"\

-	{$(INCLUDE)}"\.\align.h"\

-	{$(INCLUDE)}"\.\any.h"\

-	{$(INCLUDE)}"\.\any.i"\

-	{$(INCLUDE)}"\.\cdr.h"\

-	{$(INCLUDE)}"\.\cdr.i"\

-	{$(INCLUDE)}"\.\client_factory.h"\

-	{$(INCLUDE)}"\.\connect.h"\

-	{$(INCLUDE)}"\.\connect.i"\

-	{$(INCLUDE)}"\.\corba.h"\

-	{$(INCLUDE)}"\.\corbacom.h"\

-	{$(INCLUDE)}"\.\corbacom.i"\

-	{$(INCLUDE)}"\.\debug.h"\

-	{$(INCLUDE)}"\.\default_client.h"\

-	{$(INCLUDE)}"\.\default_client.i"\

-	{$(INCLUDE)}"\.\default_server.h"\

-	{$(INCLUDE)}"\.\default_server.i"\

-	{$(INCLUDE)}"\.\except.h"\

-	{$(INCLUDE)}"\.\giop.h"\

-	{$(INCLUDE)}"\.\giop.i"\

-	{$(INCLUDE)}"\.\iiopobj.h"\

-	{$(INCLUDE)}"\.\iiopobj.i"\

-	{$(INCLUDE)}"\.\iioporb.h"\

-	{$(INCLUDE)}"\.\iioporb.i"\

-	{$(INCLUDE)}"\.\marshal.h"\

-	{$(INCLUDE)}"\.\marshal.i"\

-	{$(INCLUDE)}"\.\nvlist.h"\

-	{$(INCLUDE)}"\.\object.h"\

-	{$(INCLUDE)}"\.\object.i"\

-	{$(INCLUDE)}"\.\objtable.h"\

-	{$(INCLUDE)}"\.\optable.h"\

-	{$(INCLUDE)}"\.\orb.h"\

-	{$(INCLUDE)}"\.\orb_core.h"\

-	{$(INCLUDE)}"\.\orb_core.i"\

-	{$(INCLUDE)}"\.\orbconf.h"\

-	{$(INCLUDE)}"\.\orbobj.h"\

-	{$(INCLUDE)}"\.\orbobj.i"\

-	{$(INCLUDE)}"\.\params.h"\

-	{$(INCLUDE)}"\.\params.i"\

-	{$(INCLUDE)}"\.\poa.h"\

-	{$(INCLUDE)}"\.\poa.i"\

-	{$(INCLUDE)}"\.\principa.h"\

-	{$(INCLUDE)}"\.\request.h"\

-	{$(INCLUDE)}"\.\sequence.h"\

-	{$(INCLUDE)}"\.\sequence.i"\

-	{$(INCLUDE)}"\.\server_factory.h"\

-	{$(INCLUDE)}"\.\server_factory.i"\

-	{$(INCLUDE)}"\.\singletons.h"\

-	{$(INCLUDE)}"\.\stub.h"\

-	{$(INCLUDE)}"\.\stub.i"\

-	{$(INCLUDE)}"\.\svrrqst.h"\

-	{$(INCLUDE)}"\.\typecode.h"\

-	{$(INCLUDE)}"\.\typecode.i"\

-	{$(INCLUDE)}"\.\varout.h"\

-	{$(INCLUDE)}"\ace\Acceptor.cpp"\

-	{$(INCLUDE)}"\ace\Acceptor.h"\

-	{$(INCLUDE)}"\ace\Acceptor.i"\

-	{$(INCLUDE)}"\ace\ACE.h"\

-	{$(INCLUDE)}"\ace\ACE.i"\

-	{$(INCLUDE)}"\ace\Addr.h"\

-	{$(INCLUDE)}"\ace\Addr.i"\

-	{$(INCLUDE)}"\ace\Atomic_Op.i"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.cpp"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.h"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.i"\

-	{$(INCLUDE)}"\ace\config-win32-common.h"\

-	{$(INCLUDE)}"\ace\Config.h"\

-	{$(INCLUDE)}"\ace\Connector.cpp"\

-	{$(INCLUDE)}"\ace\Connector.h"\

-	{$(INCLUDE)}"\ace\Connector.i"\

-	{$(INCLUDE)}"\ace\Containers.cpp"\

-	{$(INCLUDE)}"\ace\Containers.h"\

-	{$(INCLUDE)}"\ace\Containers.i"\

-	{$(INCLUDE)}"\ace\Dynamic.h"\

-	{$(INCLUDE)}"\ace\Dynamic.i"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.cpp"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.i"\

-	{$(INCLUDE)}"\ace\Free_List.cpp"\

-	{$(INCLUDE)}"\ace\Free_List.h"\

-	{$(INCLUDE)}"\ace\Free_List.i"\

-	{$(INCLUDE)}"\ace\Get_Opt.h"\

-	{$(INCLUDE)}"\ace\Get_Opt.i"\

-	{$(INCLUDE)}"\ace\Handle_Set.h"\

-	{$(INCLUDE)}"\ace\Handle_Set.i"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.i"\

-	{$(INCLUDE)}"\ace\IO_Cntl_Msg.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.i"\

-	{$(INCLUDE)}"\ace\Log_Msg.h"\

-	{$(INCLUDE)}"\ace\Log_Priority.h"\

-	{$(INCLUDE)}"\ace\Log_Record.h"\

-	{$(INCLUDE)}"\ace\Log_Record.i"\

-	{$(INCLUDE)}"\ace\Malloc.h"\

-	{$(INCLUDE)}"\ace\Malloc.i"\

-	{$(INCLUDE)}"\ace\Malloc_T.cpp"\

-	{$(INCLUDE)}"\ace\Malloc_T.h"\

-	{$(INCLUDE)}"\ace\Malloc_T.i"\

-	{$(INCLUDE)}"\ace\Managed_Object.cpp"\

-	{$(INCLUDE)}"\ace\Managed_Object.h"\

-	{$(INCLUDE)}"\ace\Managed_Object.i"\

-	{$(INCLUDE)}"\ace\Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Map_Manager.h"\

-	{$(INCLUDE)}"\ace\Map_Manager.i"\

-	{$(INCLUDE)}"\ace\Mem_Map.h"\

-	{$(INCLUDE)}"\ace\Mem_Map.i"\

-	{$(INCLUDE)}"\ace\Memory_Pool.h"\

-	{$(INCLUDE)}"\ace\Memory_Pool.i"\

-	{$(INCLUDE)}"\ace\Message_Block.h"\

-	{$(INCLUDE)}"\ace\Message_Block.i"\

-	{$(INCLUDE)}"\ace\Message_Queue.cpp"\

-	{$(INCLUDE)}"\ace\Message_Queue.h"\

-	{$(INCLUDE)}"\ace\Message_Queue.i"\

-	{$(INCLUDE)}"\ace\Module.cpp"\

-	{$(INCLUDE)}"\ace\Module.h"\

-	{$(INCLUDE)}"\ace\Module.i"\

-	{$(INCLUDE)}"\ace\Object_Manager.h"\

-	{$(INCLUDE)}"\ace\Object_Manager.i"\

-	{$(INCLUDE)}"\ace\OS.h"\

-	{$(INCLUDE)}"\ace\OS.i"\

-	{$(INCLUDE)}"\ace\Reactor.h"\

-	{$(INCLUDE)}"\ace\Reactor.i"\

-	{$(INCLUDE)}"\ace\Reactor_Impl.h"\

-	{$(INCLUDE)}"\ace\Service_Config.h"\

-	{$(INCLUDE)}"\ace\Service_Config.i"\

-	{$(INCLUDE)}"\ace\Service_Object.h"\

-	{$(INCLUDE)}"\ace\Service_Object.i"\

-	{$(INCLUDE)}"\ace\Service_Repository.h"\

-	{$(INCLUDE)}"\ace\Service_Repository.i"\

-	{$(INCLUDE)}"\ace\Service_Types.h"\

-	{$(INCLUDE)}"\ace\Service_Types.i"\

-	{$(INCLUDE)}"\ace\Shared_Object.h"\

-	{$(INCLUDE)}"\ace\Shared_Object.i"\

-	{$(INCLUDE)}"\ace\Signal.h"\

-	{$(INCLUDE)}"\ace\Signal.i"\

-	{$(INCLUDE)}"\ace\Singleton.cpp"\

-	{$(INCLUDE)}"\ace\Singleton.h"\

-	{$(INCLUDE)}"\ace\Singleton.i"\

-	{$(INCLUDE)}"\ace\SOCK.h"\

-	{$(INCLUDE)}"\ace\SOCK.i"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.h"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.i"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.h"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.i"\

-	{$(INCLUDE)}"\ace\SOCK_IO.h"\

-	{$(INCLUDE)}"\ace\SOCK_IO.i"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.h"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.i"\

-	{$(INCLUDE)}"\ace\SString.h"\

-	{$(INCLUDE)}"\ace\SString.i"\

-	{$(INCLUDE)}"\ace\stdcpp.h"\

-	{$(INCLUDE)}"\ace\Strategies.h"\

-	{$(INCLUDE)}"\ace\Strategies_T.cpp"\

-	{$(INCLUDE)}"\ace\Strategies_T.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.cpp"\

-	{$(INCLUDE)}"\ace\Stream_Modules.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.i"\

-	{$(INCLUDE)}"\ace\Svc_Conf_Tokens.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.cpp"\

-	{$(INCLUDE)}"\ace\Svc_Handler.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.i"\

-	{$(INCLUDE)}"\ace\Synch.h"\

-	{$(INCLUDE)}"\ace\Synch.i"\

-	{$(INCLUDE)}"\ace\Synch_Options.h"\

-	{$(INCLUDE)}"\ace\Synch_T.cpp"\

-	{$(INCLUDE)}"\ace\Synch_T.h"\

-	{$(INCLUDE)}"\ace\Synch_T.i"\

-	{$(INCLUDE)}"\ace\Task.h"\

-	{$(INCLUDE)}"\ace\Task.i"\

-	{$(INCLUDE)}"\ace\Task_T.cpp"\

-	{$(INCLUDE)}"\ace\Task_T.h"\

-	{$(INCLUDE)}"\ace\Task_T.i"\

-	{$(INCLUDE)}"\ace\Thread.h"\

-	{$(INCLUDE)}"\ace\Thread.i"\

-	{$(INCLUDE)}"\ace\Thread_Manager.h"\

-	{$(INCLUDE)}"\ace\Thread_Manager.i"\

-	{$(INCLUDE)}"\ace\Time_Value.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.cpp"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.i"\

-	{$(INCLUDE)}"\ace\Trace.h"\

-	{$(INCLUDE)}"\ace\Version.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.i"\

-	{$(INCLUDE)}"\ace\ws2tcpip.h"\

-	

-

-"$(INTDIR)\interp.obj" : $(SOURCE) $(DEP_CPP_INTER) "$(INTDIR)"

-

-

-!ENDIF 

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\invoke.cpp

-

-!IF  "$(CFG)" == "TAO - Win32 Release"

-

-DEP_CPP_INVOK=\

-	"..\..\ace\config-win32.h"\

-	{$(INCLUDE)}"\.\align.h"\

-	{$(INCLUDE)}"\.\any.h"\

-	{$(INCLUDE)}"\.\any.i"\

-	{$(INCLUDE)}"\.\cdr.h"\

-	{$(INCLUDE)}"\.\cdr.i"\

-	{$(INCLUDE)}"\.\client_factory.h"\

-	{$(INCLUDE)}"\.\connect.h"\

-	{$(INCLUDE)}"\.\connect.i"\

-	{$(INCLUDE)}"\.\corba.h"\

-	{$(INCLUDE)}"\.\corbacom.h"\

-	{$(INCLUDE)}"\.\corbacom.i"\

-	{$(INCLUDE)}"\.\debug.h"\

-	{$(INCLUDE)}"\.\default_client.h"\

-	{$(INCLUDE)}"\.\default_client.i"\

-	{$(INCLUDE)}"\.\default_server.h"\

-	{$(INCLUDE)}"\.\default_server.i"\

-	{$(INCLUDE)}"\.\except.h"\

-	{$(INCLUDE)}"\.\giop.h"\

-	{$(INCLUDE)}"\.\giop.i"\

-	{$(INCLUDE)}"\.\iiopobj.h"\

-	{$(INCLUDE)}"\.\iiopobj.i"\

-	{$(INCLUDE)}"\.\iioporb.h"\

-	{$(INCLUDE)}"\.\iioporb.i"\

-	{$(INCLUDE)}"\.\marshal.h"\

-	{$(INCLUDE)}"\.\marshal.i"\

-	{$(INCLUDE)}"\.\nvlist.h"\

-	{$(INCLUDE)}"\.\object.h"\

-	{$(INCLUDE)}"\.\object.i"\

-	{$(INCLUDE)}"\.\objtable.h"\

-	{$(INCLUDE)}"\.\optable.h"\

-	{$(INCLUDE)}"\.\orb.h"\

-	{$(INCLUDE)}"\.\orb_core.h"\

-	{$(INCLUDE)}"\.\orb_core.i"\

-	{$(INCLUDE)}"\.\orbconf.h"\

-	{$(INCLUDE)}"\.\orbobj.h"\

-	{$(INCLUDE)}"\.\orbobj.i"\

-	{$(INCLUDE)}"\.\params.h"\

-	{$(INCLUDE)}"\.\params.i"\

-	{$(INCLUDE)}"\.\poa.h"\

-	{$(INCLUDE)}"\.\poa.i"\

-	{$(INCLUDE)}"\.\principa.h"\

-	{$(INCLUDE)}"\.\request.h"\

-	{$(INCLUDE)}"\.\sequence.h"\

-	{$(INCLUDE)}"\.\sequence.i"\

-	{$(INCLUDE)}"\.\server_factory.h"\

-	{$(INCLUDE)}"\.\server_factory.i"\

-	{$(INCLUDE)}"\.\singletons.h"\

-	{$(INCLUDE)}"\.\stub.h"\

-	{$(INCLUDE)}"\.\stub.i"\

-	{$(INCLUDE)}"\.\svrrqst.h"\

-	{$(INCLUDE)}"\.\typecode.h"\

-	{$(INCLUDE)}"\.\typecode.i"\

-	{$(INCLUDE)}"\.\varout.h"\

-	{$(INCLUDE)}"\ace\Acceptor.cpp"\

-	{$(INCLUDE)}"\ace\Acceptor.h"\

-	{$(INCLUDE)}"\ace\Acceptor.i"\

-	{$(INCLUDE)}"\ace\ACE.h"\

-	{$(INCLUDE)}"\ace\ACE.i"\

-	{$(INCLUDE)}"\ace\Addr.h"\

-	{$(INCLUDE)}"\ace\Addr.i"\

-	{$(INCLUDE)}"\ace\Atomic_Op.i"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.cpp"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.h"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.i"\

-	{$(INCLUDE)}"\ace\config-win32-common.h"\

-	{$(INCLUDE)}"\ace\Config.h"\

-	{$(INCLUDE)}"\ace\Connector.cpp"\

-	{$(INCLUDE)}"\ace\Connector.h"\

-	{$(INCLUDE)}"\ace\Connector.i"\

-	{$(INCLUDE)}"\ace\Containers.cpp"\

-	{$(INCLUDE)}"\ace\Containers.h"\

-	{$(INCLUDE)}"\ace\Containers.i"\

-	{$(INCLUDE)}"\ace\Dynamic.h"\

-	{$(INCLUDE)}"\ace\Dynamic.i"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.cpp"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.i"\

-	{$(INCLUDE)}"\ace\Free_List.cpp"\

-	{$(INCLUDE)}"\ace\Free_List.h"\

-	{$(INCLUDE)}"\ace\Free_List.i"\

-	{$(INCLUDE)}"\ace\Get_Opt.h"\

-	{$(INCLUDE)}"\ace\Get_Opt.i"\

-	{$(INCLUDE)}"\ace\Handle_Set.h"\

-	{$(INCLUDE)}"\ace\Handle_Set.i"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.i"\

-	{$(INCLUDE)}"\ace\IO_Cntl_Msg.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.i"\

-	{$(INCLUDE)}"\ace\Log_Msg.h"\

-	{$(INCLUDE)}"\ace\Log_Priority.h"\

-	{$(INCLUDE)}"\ace\Log_Record.h"\

-	{$(INCLUDE)}"\ace\Log_Record.i"\

-	{$(INCLUDE)}"\ace\Malloc.h"\

-	{$(INCLUDE)}"\ace\Malloc.i"\

-	{$(INCLUDE)}"\ace\Malloc_T.cpp"\

-	{$(INCLUDE)}"\ace\Malloc_T.h"\

-	{$(INCLUDE)}"\ace\Malloc_T.i"\

-	{$(INCLUDE)}"\ace\Managed_Object.cpp"\

-	{$(INCLUDE)}"\ace\Managed_Object.h"\

-	{$(INCLUDE)}"\ace\Managed_Object.i"\

-	{$(INCLUDE)}"\ace\Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Map_Manager.h"\

-	{$(INCLUDE)}"\ace\Map_Manager.i"\

-	{$(INCLUDE)}"\ace\Mem_Map.h"\

-	{$(INCLUDE)}"\ace\Mem_Map.i"\

-	{$(INCLUDE)}"\ace\Memory_Pool.h"\

-	{$(INCLUDE)}"\ace\Memory_Pool.i"\

-	{$(INCLUDE)}"\ace\Message_Block.h"\

-	{$(INCLUDE)}"\ace\Message_Block.i"\

-	{$(INCLUDE)}"\ace\Message_Queue.cpp"\

-	{$(INCLUDE)}"\ace\Message_Queue.h"\

-	{$(INCLUDE)}"\ace\Message_Queue.i"\

-	{$(INCLUDE)}"\ace\Module.cpp"\

-	{$(INCLUDE)}"\ace\Module.h"\

-	{$(INCLUDE)}"\ace\Module.i"\

-	{$(INCLUDE)}"\ace\Object_Manager.h"\

-	{$(INCLUDE)}"\ace\Object_Manager.i"\

-	{$(INCLUDE)}"\ace\OS.h"\

-	{$(INCLUDE)}"\ace\OS.i"\

-	{$(INCLUDE)}"\ace\Reactor.h"\

-	{$(INCLUDE)}"\ace\Reactor.i"\

-	{$(INCLUDE)}"\ace\Reactor_Impl.h"\

-	{$(INCLUDE)}"\ace\Service_Config.h"\

-	{$(INCLUDE)}"\ace\Service_Config.i"\

-	{$(INCLUDE)}"\ace\Service_Object.h"\

-	{$(INCLUDE)}"\ace\Service_Object.i"\

-	{$(INCLUDE)}"\ace\Service_Repository.h"\

-	{$(INCLUDE)}"\ace\Service_Repository.i"\

-	{$(INCLUDE)}"\ace\Service_Types.h"\

-	{$(INCLUDE)}"\ace\Service_Types.i"\

-	{$(INCLUDE)}"\ace\Shared_Object.h"\

-	{$(INCLUDE)}"\ace\Shared_Object.i"\

-	{$(INCLUDE)}"\ace\Signal.h"\

-	{$(INCLUDE)}"\ace\Signal.i"\

-	{$(INCLUDE)}"\ace\Singleton.cpp"\

-	{$(INCLUDE)}"\ace\Singleton.h"\

-	{$(INCLUDE)}"\ace\Singleton.i"\

-	{$(INCLUDE)}"\ace\SOCK.h"\

-	{$(INCLUDE)}"\ace\SOCK.i"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.h"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.i"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.h"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.i"\

-	{$(INCLUDE)}"\ace\SOCK_IO.h"\

-	{$(INCLUDE)}"\ace\SOCK_IO.i"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.h"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.i"\

-	{$(INCLUDE)}"\ace\SString.h"\

-	{$(INCLUDE)}"\ace\SString.i"\

-	{$(INCLUDE)}"\ace\stdcpp.h"\

-	{$(INCLUDE)}"\ace\Strategies.h"\

-	{$(INCLUDE)}"\ace\Strategies_T.cpp"\

-	{$(INCLUDE)}"\ace\Strategies_T.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.cpp"\

-	{$(INCLUDE)}"\ace\Stream_Modules.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.i"\

-	{$(INCLUDE)}"\ace\Svc_Conf_Tokens.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.cpp"\

-	{$(INCLUDE)}"\ace\Svc_Handler.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.i"\

-	{$(INCLUDE)}"\ace\Synch.h"\

-	{$(INCLUDE)}"\ace\Synch.i"\

-	{$(INCLUDE)}"\ace\Synch_Options.h"\

-	{$(INCLUDE)}"\ace\Synch_T.cpp"\

-	{$(INCLUDE)}"\ace\Synch_T.h"\

-	{$(INCLUDE)}"\ace\Synch_T.i"\

-	{$(INCLUDE)}"\ace\Task.h"\

-	{$(INCLUDE)}"\ace\Task.i"\

-	{$(INCLUDE)}"\ace\Task_T.cpp"\

-	{$(INCLUDE)}"\ace\Task_T.h"\

-	{$(INCLUDE)}"\ace\Task_T.i"\

-	{$(INCLUDE)}"\ace\Thread.h"\

-	{$(INCLUDE)}"\ace\Thread.i"\

-	{$(INCLUDE)}"\ace\Thread_Manager.h"\

-	{$(INCLUDE)}"\ace\Thread_Manager.i"\

-	{$(INCLUDE)}"\ace\Time_Value.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.cpp"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.i"\

-	{$(INCLUDE)}"\ace\Trace.h"\

-	{$(INCLUDE)}"\ace\Version.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.i"\

-	{$(INCLUDE)}"\ace\ws2tcpip.h"\

-	

-NODEP_CPP_INVOK=\

-	".\tao\factories.h"\

-	

-

-"$(INTDIR)\invoke.obj" : $(SOURCE) $(DEP_CPP_INVOK) "$(INTDIR)"

-

-

-!ELSEIF  "$(CFG)" == "TAO - Win32 Debug"

-

-DEP_CPP_INVOK=\

-	"..\..\ace\config-win32.h"\

-	{$(INCLUDE)}"\.\align.h"\

-	{$(INCLUDE)}"\.\any.h"\

-	{$(INCLUDE)}"\.\any.i"\

-	{$(INCLUDE)}"\.\cdr.h"\

-	{$(INCLUDE)}"\.\cdr.i"\

-	{$(INCLUDE)}"\.\client_factory.h"\

-	{$(INCLUDE)}"\.\connect.h"\

-	{$(INCLUDE)}"\.\connect.i"\

-	{$(INCLUDE)}"\.\corba.h"\

-	{$(INCLUDE)}"\.\corbacom.h"\

-	{$(INCLUDE)}"\.\corbacom.i"\

-	{$(INCLUDE)}"\.\debug.h"\

-	{$(INCLUDE)}"\.\default_client.h"\

-	{$(INCLUDE)}"\.\default_client.i"\

-	{$(INCLUDE)}"\.\default_server.h"\

-	{$(INCLUDE)}"\.\default_server.i"\

-	{$(INCLUDE)}"\.\except.h"\

-	{$(INCLUDE)}"\.\giop.h"\

-	{$(INCLUDE)}"\.\giop.i"\

-	{$(INCLUDE)}"\.\iiopobj.h"\

-	{$(INCLUDE)}"\.\iiopobj.i"\

-	{$(INCLUDE)}"\.\iioporb.h"\

-	{$(INCLUDE)}"\.\iioporb.i"\

-	{$(INCLUDE)}"\.\marshal.h"\

-	{$(INCLUDE)}"\.\marshal.i"\

-	{$(INCLUDE)}"\.\nvlist.h"\

-	{$(INCLUDE)}"\.\object.h"\

-	{$(INCLUDE)}"\.\object.i"\

-	{$(INCLUDE)}"\.\objtable.h"\

-	{$(INCLUDE)}"\.\optable.h"\

-	{$(INCLUDE)}"\.\orb.h"\

-	{$(INCLUDE)}"\.\orb_core.h"\

-	{$(INCLUDE)}"\.\orb_core.i"\

-	{$(INCLUDE)}"\.\orbconf.h"\

-	{$(INCLUDE)}"\.\orbobj.h"\

-	{$(INCLUDE)}"\.\orbobj.i"\

-	{$(INCLUDE)}"\.\params.h"\

-	{$(INCLUDE)}"\.\params.i"\

-	{$(INCLUDE)}"\.\poa.h"\

-	{$(INCLUDE)}"\.\poa.i"\

-	{$(INCLUDE)}"\.\principa.h"\

-	{$(INCLUDE)}"\.\request.h"\

-	{$(INCLUDE)}"\.\sequence.h"\

-	{$(INCLUDE)}"\.\sequence.i"\

-	{$(INCLUDE)}"\.\server_factory.h"\

-	{$(INCLUDE)}"\.\server_factory.i"\

-	{$(INCLUDE)}"\.\singletons.h"\

-	{$(INCLUDE)}"\.\stub.h"\

-	{$(INCLUDE)}"\.\stub.i"\

-	{$(INCLUDE)}"\.\svrrqst.h"\

-	{$(INCLUDE)}"\.\typecode.h"\

-	{$(INCLUDE)}"\.\typecode.i"\

-	{$(INCLUDE)}"\.\varout.h"\

-	{$(INCLUDE)}"\ace\Acceptor.cpp"\

-	{$(INCLUDE)}"\ace\Acceptor.h"\

-	{$(INCLUDE)}"\ace\Acceptor.i"\

-	{$(INCLUDE)}"\ace\ACE.h"\

-	{$(INCLUDE)}"\ace\ACE.i"\

-	{$(INCLUDE)}"\ace\Addr.h"\

-	{$(INCLUDE)}"\ace\Addr.i"\

-	{$(INCLUDE)}"\ace\Atomic_Op.i"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.cpp"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.h"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.i"\

-	{$(INCLUDE)}"\ace\config-win32-common.h"\

-	{$(INCLUDE)}"\ace\Config.h"\

-	{$(INCLUDE)}"\ace\Connector.cpp"\

-	{$(INCLUDE)}"\ace\Connector.h"\

-	{$(INCLUDE)}"\ace\Connector.i"\

-	{$(INCLUDE)}"\ace\Containers.cpp"\

-	{$(INCLUDE)}"\ace\Containers.h"\

-	{$(INCLUDE)}"\ace\Containers.i"\

-	{$(INCLUDE)}"\ace\Dynamic.h"\

-	{$(INCLUDE)}"\ace\Dynamic.i"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.cpp"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.i"\

-	{$(INCLUDE)}"\ace\Free_List.cpp"\

-	{$(INCLUDE)}"\ace\Free_List.h"\

-	{$(INCLUDE)}"\ace\Free_List.i"\

-	{$(INCLUDE)}"\ace\Get_Opt.h"\

-	{$(INCLUDE)}"\ace\Get_Opt.i"\

-	{$(INCLUDE)}"\ace\Handle_Set.h"\

-	{$(INCLUDE)}"\ace\Handle_Set.i"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.i"\

-	{$(INCLUDE)}"\ace\IO_Cntl_Msg.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.i"\

-	{$(INCLUDE)}"\ace\Log_Msg.h"\

-	{$(INCLUDE)}"\ace\Log_Priority.h"\

-	{$(INCLUDE)}"\ace\Log_Record.h"\

-	{$(INCLUDE)}"\ace\Log_Record.i"\

-	{$(INCLUDE)}"\ace\Malloc.h"\

-	{$(INCLUDE)}"\ace\Malloc.i"\

-	{$(INCLUDE)}"\ace\Malloc_T.cpp"\

-	{$(INCLUDE)}"\ace\Malloc_T.h"\

-	{$(INCLUDE)}"\ace\Malloc_T.i"\

-	{$(INCLUDE)}"\ace\Managed_Object.cpp"\

-	{$(INCLUDE)}"\ace\Managed_Object.h"\

-	{$(INCLUDE)}"\ace\Managed_Object.i"\

-	{$(INCLUDE)}"\ace\Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Map_Manager.h"\

-	{$(INCLUDE)}"\ace\Map_Manager.i"\

-	{$(INCLUDE)}"\ace\Mem_Map.h"\

-	{$(INCLUDE)}"\ace\Mem_Map.i"\

-	{$(INCLUDE)}"\ace\Memory_Pool.h"\

-	{$(INCLUDE)}"\ace\Memory_Pool.i"\

-	{$(INCLUDE)}"\ace\Message_Block.h"\

-	{$(INCLUDE)}"\ace\Message_Block.i"\

-	{$(INCLUDE)}"\ace\Message_Queue.cpp"\

-	{$(INCLUDE)}"\ace\Message_Queue.h"\

-	{$(INCLUDE)}"\ace\Message_Queue.i"\

-	{$(INCLUDE)}"\ace\Module.cpp"\

-	{$(INCLUDE)}"\ace\Module.h"\

-	{$(INCLUDE)}"\ace\Module.i"\

-	{$(INCLUDE)}"\ace\Object_Manager.h"\

-	{$(INCLUDE)}"\ace\Object_Manager.i"\

-	{$(INCLUDE)}"\ace\OS.h"\

-	{$(INCLUDE)}"\ace\OS.i"\

-	{$(INCLUDE)}"\ace\Reactor.h"\

-	{$(INCLUDE)}"\ace\Reactor.i"\

-	{$(INCLUDE)}"\ace\Reactor_Impl.h"\

-	{$(INCLUDE)}"\ace\Service_Config.h"\

-	{$(INCLUDE)}"\ace\Service_Config.i"\

-	{$(INCLUDE)}"\ace\Service_Object.h"\

-	{$(INCLUDE)}"\ace\Service_Object.i"\

-	{$(INCLUDE)}"\ace\Service_Repository.h"\

-	{$(INCLUDE)}"\ace\Service_Repository.i"\

-	{$(INCLUDE)}"\ace\Service_Types.h"\

-	{$(INCLUDE)}"\ace\Service_Types.i"\

-	{$(INCLUDE)}"\ace\Shared_Object.h"\

-	{$(INCLUDE)}"\ace\Shared_Object.i"\

-	{$(INCLUDE)}"\ace\Signal.h"\

-	{$(INCLUDE)}"\ace\Signal.i"\

-	{$(INCLUDE)}"\ace\Singleton.cpp"\

-	{$(INCLUDE)}"\ace\Singleton.h"\

-	{$(INCLUDE)}"\ace\Singleton.i"\

-	{$(INCLUDE)}"\ace\SOCK.h"\

-	{$(INCLUDE)}"\ace\SOCK.i"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.h"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.i"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.h"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.i"\

-	{$(INCLUDE)}"\ace\SOCK_IO.h"\

-	{$(INCLUDE)}"\ace\SOCK_IO.i"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.h"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.i"\

-	{$(INCLUDE)}"\ace\SString.h"\

-	{$(INCLUDE)}"\ace\SString.i"\

-	{$(INCLUDE)}"\ace\stdcpp.h"\

-	{$(INCLUDE)}"\ace\Strategies.h"\

-	{$(INCLUDE)}"\ace\Strategies_T.cpp"\

-	{$(INCLUDE)}"\ace\Strategies_T.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.cpp"\

-	{$(INCLUDE)}"\ace\Stream_Modules.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.i"\

-	{$(INCLUDE)}"\ace\Svc_Conf_Tokens.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.cpp"\

-	{$(INCLUDE)}"\ace\Svc_Handler.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.i"\

-	{$(INCLUDE)}"\ace\Synch.h"\

-	{$(INCLUDE)}"\ace\Synch.i"\

-	{$(INCLUDE)}"\ace\Synch_Options.h"\

-	{$(INCLUDE)}"\ace\Synch_T.cpp"\

-	{$(INCLUDE)}"\ace\Synch_T.h"\

-	{$(INCLUDE)}"\ace\Synch_T.i"\

-	{$(INCLUDE)}"\ace\Task.h"\

-	{$(INCLUDE)}"\ace\Task.i"\

-	{$(INCLUDE)}"\ace\Task_T.cpp"\

-	{$(INCLUDE)}"\ace\Task_T.h"\

-	{$(INCLUDE)}"\ace\Task_T.i"\

-	{$(INCLUDE)}"\ace\Thread.h"\

-	{$(INCLUDE)}"\ace\Thread.i"\

-	{$(INCLUDE)}"\ace\Thread_Manager.h"\

-	{$(INCLUDE)}"\ace\Thread_Manager.i"\

-	{$(INCLUDE)}"\ace\Time_Value.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.cpp"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.i"\

-	{$(INCLUDE)}"\ace\Trace.h"\

-	{$(INCLUDE)}"\ace\Version.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.i"\

-	{$(INCLUDE)}"\ace\ws2tcpip.h"\

-	

-NODEP_CPP_INVOK=\

-	".\tao\factories.h"\

-	

-

-"$(INTDIR)\invoke.obj" : $(SOURCE) $(DEP_CPP_INVOK) "$(INTDIR)"

-

-

-!ENDIF 

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\marshal.cpp

-

-!IF  "$(CFG)" == "TAO - Win32 Release"

-

-DEP_CPP_MARSH=\

-	"..\..\ace\config-win32.h"\

-	{$(INCLUDE)}"\.\align.h"\

-	{$(INCLUDE)}"\.\any.h"\

-	{$(INCLUDE)}"\.\any.i"\

-	{$(INCLUDE)}"\.\cdr.h"\

-	{$(INCLUDE)}"\.\cdr.i"\

-	{$(INCLUDE)}"\.\client_factory.h"\

-	{$(INCLUDE)}"\.\connect.h"\

-	{$(INCLUDE)}"\.\connect.i"\

-	{$(INCLUDE)}"\.\corba.h"\

-	{$(INCLUDE)}"\.\corbacom.h"\

-	{$(INCLUDE)}"\.\corbacom.i"\

-	{$(INCLUDE)}"\.\debug.h"\

-	{$(INCLUDE)}"\.\default_client.h"\

-	{$(INCLUDE)}"\.\default_client.i"\

-	{$(INCLUDE)}"\.\default_server.h"\

-	{$(INCLUDE)}"\.\default_server.i"\

-	{$(INCLUDE)}"\.\except.h"\

-	{$(INCLUDE)}"\.\giop.h"\

-	{$(INCLUDE)}"\.\giop.i"\

-	{$(INCLUDE)}"\.\iiopobj.h"\

-	{$(INCLUDE)}"\.\iiopobj.i"\

-	{$(INCLUDE)}"\.\iioporb.h"\

-	{$(INCLUDE)}"\.\iioporb.i"\

-	{$(INCLUDE)}"\.\marshal.h"\

-	{$(INCLUDE)}"\.\marshal.i"\

-	{$(INCLUDE)}"\.\nvlist.h"\

-	{$(INCLUDE)}"\.\object.h"\

-	{$(INCLUDE)}"\.\object.i"\

-	{$(INCLUDE)}"\.\objtable.h"\

-	{$(INCLUDE)}"\.\optable.h"\

-	{$(INCLUDE)}"\.\orb.h"\

-	{$(INCLUDE)}"\.\orb_core.h"\

-	{$(INCLUDE)}"\.\orb_core.i"\

-	{$(INCLUDE)}"\.\orbconf.h"\

-	{$(INCLUDE)}"\.\orbobj.h"\

-	{$(INCLUDE)}"\.\orbobj.i"\

-	{$(INCLUDE)}"\.\params.h"\

-	{$(INCLUDE)}"\.\params.i"\

-	{$(INCLUDE)}"\.\poa.h"\

-	{$(INCLUDE)}"\.\poa.i"\

-	{$(INCLUDE)}"\.\principa.h"\

-	{$(INCLUDE)}"\.\request.h"\

-	{$(INCLUDE)}"\.\sequence.h"\

-	{$(INCLUDE)}"\.\sequence.i"\

-	{$(INCLUDE)}"\.\server_factory.h"\

-	{$(INCLUDE)}"\.\server_factory.i"\

-	{$(INCLUDE)}"\.\singletons.h"\

-	{$(INCLUDE)}"\.\stub.h"\

-	{$(INCLUDE)}"\.\stub.i"\

-	{$(INCLUDE)}"\.\svrrqst.h"\

-	{$(INCLUDE)}"\.\typecode.h"\

-	{$(INCLUDE)}"\.\typecode.i"\

-	{$(INCLUDE)}"\.\varout.h"\

-	{$(INCLUDE)}"\ace\Acceptor.cpp"\

-	{$(INCLUDE)}"\ace\Acceptor.h"\

-	{$(INCLUDE)}"\ace\Acceptor.i"\

-	{$(INCLUDE)}"\ace\ACE.h"\

-	{$(INCLUDE)}"\ace\ACE.i"\

-	{$(INCLUDE)}"\ace\Addr.h"\

-	{$(INCLUDE)}"\ace\Addr.i"\

-	{$(INCLUDE)}"\ace\Atomic_Op.i"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.cpp"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.h"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.i"\

-	{$(INCLUDE)}"\ace\config-win32-common.h"\

-	{$(INCLUDE)}"\ace\Config.h"\

-	{$(INCLUDE)}"\ace\Connector.cpp"\

-	{$(INCLUDE)}"\ace\Connector.h"\

-	{$(INCLUDE)}"\ace\Connector.i"\

-	{$(INCLUDE)}"\ace\Containers.cpp"\

-	{$(INCLUDE)}"\ace\Containers.h"\

-	{$(INCLUDE)}"\ace\Containers.i"\

-	{$(INCLUDE)}"\ace\Dynamic.h"\

-	{$(INCLUDE)}"\ace\Dynamic.i"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.cpp"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.i"\

-	{$(INCLUDE)}"\ace\Free_List.cpp"\

-	{$(INCLUDE)}"\ace\Free_List.h"\

-	{$(INCLUDE)}"\ace\Free_List.i"\

-	{$(INCLUDE)}"\ace\Get_Opt.h"\

-	{$(INCLUDE)}"\ace\Get_Opt.i"\

-	{$(INCLUDE)}"\ace\Handle_Set.h"\

-	{$(INCLUDE)}"\ace\Handle_Set.i"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.i"\

-	{$(INCLUDE)}"\ace\IO_Cntl_Msg.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.i"\

-	{$(INCLUDE)}"\ace\Log_Msg.h"\

-	{$(INCLUDE)}"\ace\Log_Priority.h"\

-	{$(INCLUDE)}"\ace\Log_Record.h"\

-	{$(INCLUDE)}"\ace\Log_Record.i"\

-	{$(INCLUDE)}"\ace\Malloc.h"\

-	{$(INCLUDE)}"\ace\Malloc.i"\

-	{$(INCLUDE)}"\ace\Malloc_T.cpp"\

-	{$(INCLUDE)}"\ace\Malloc_T.h"\

-	{$(INCLUDE)}"\ace\Malloc_T.i"\

-	{$(INCLUDE)}"\ace\Managed_Object.cpp"\

-	{$(INCLUDE)}"\ace\Managed_Object.h"\

-	{$(INCLUDE)}"\ace\Managed_Object.i"\

-	{$(INCLUDE)}"\ace\Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Map_Manager.h"\

-	{$(INCLUDE)}"\ace\Map_Manager.i"\

-	{$(INCLUDE)}"\ace\Mem_Map.h"\

-	{$(INCLUDE)}"\ace\Mem_Map.i"\

-	{$(INCLUDE)}"\ace\Memory_Pool.h"\

-	{$(INCLUDE)}"\ace\Memory_Pool.i"\

-	{$(INCLUDE)}"\ace\Message_Block.h"\

-	{$(INCLUDE)}"\ace\Message_Block.i"\

-	{$(INCLUDE)}"\ace\Message_Queue.cpp"\

-	{$(INCLUDE)}"\ace\Message_Queue.h"\

-	{$(INCLUDE)}"\ace\Message_Queue.i"\

-	{$(INCLUDE)}"\ace\Module.cpp"\

-	{$(INCLUDE)}"\ace\Module.h"\

-	{$(INCLUDE)}"\ace\Module.i"\

-	{$(INCLUDE)}"\ace\Object_Manager.h"\

-	{$(INCLUDE)}"\ace\Object_Manager.i"\

-	{$(INCLUDE)}"\ace\OS.h"\

-	{$(INCLUDE)}"\ace\OS.i"\

-	{$(INCLUDE)}"\ace\Reactor.h"\

-	{$(INCLUDE)}"\ace\Reactor.i"\

-	{$(INCLUDE)}"\ace\Reactor_Impl.h"\

-	{$(INCLUDE)}"\ace\Service_Config.h"\

-	{$(INCLUDE)}"\ace\Service_Config.i"\

-	{$(INCLUDE)}"\ace\Service_Object.h"\

-	{$(INCLUDE)}"\ace\Service_Object.i"\

-	{$(INCLUDE)}"\ace\Service_Repository.h"\

-	{$(INCLUDE)}"\ace\Service_Repository.i"\

-	{$(INCLUDE)}"\ace\Service_Types.h"\

-	{$(INCLUDE)}"\ace\Service_Types.i"\

-	{$(INCLUDE)}"\ace\Shared_Object.h"\

-	{$(INCLUDE)}"\ace\Shared_Object.i"\

-	{$(INCLUDE)}"\ace\Signal.h"\

-	{$(INCLUDE)}"\ace\Signal.i"\

-	{$(INCLUDE)}"\ace\Singleton.cpp"\

-	{$(INCLUDE)}"\ace\Singleton.h"\

-	{$(INCLUDE)}"\ace\Singleton.i"\

-	{$(INCLUDE)}"\ace\SOCK.h"\

-	{$(INCLUDE)}"\ace\SOCK.i"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.h"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.i"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.h"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.i"\

-	{$(INCLUDE)}"\ace\SOCK_IO.h"\

-	{$(INCLUDE)}"\ace\SOCK_IO.i"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.h"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.i"\

-	{$(INCLUDE)}"\ace\SString.h"\

-	{$(INCLUDE)}"\ace\SString.i"\

-	{$(INCLUDE)}"\ace\stdcpp.h"\

-	{$(INCLUDE)}"\ace\Strategies.h"\

-	{$(INCLUDE)}"\ace\Strategies_T.cpp"\

-	{$(INCLUDE)}"\ace\Strategies_T.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.cpp"\

-	{$(INCLUDE)}"\ace\Stream_Modules.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.i"\

-	{$(INCLUDE)}"\ace\Svc_Conf_Tokens.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.cpp"\

-	{$(INCLUDE)}"\ace\Svc_Handler.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.i"\

-	{$(INCLUDE)}"\ace\Synch.h"\

-	{$(INCLUDE)}"\ace\Synch.i"\

-	{$(INCLUDE)}"\ace\Synch_Options.h"\

-	{$(INCLUDE)}"\ace\Synch_T.cpp"\

-	{$(INCLUDE)}"\ace\Synch_T.h"\

-	{$(INCLUDE)}"\ace\Synch_T.i"\

-	{$(INCLUDE)}"\ace\Task.h"\

-	{$(INCLUDE)}"\ace\Task.i"\

-	{$(INCLUDE)}"\ace\Task_T.cpp"\

-	{$(INCLUDE)}"\ace\Task_T.h"\

-	{$(INCLUDE)}"\ace\Task_T.i"\

-	{$(INCLUDE)}"\ace\Thread.h"\

-	{$(INCLUDE)}"\ace\Thread.i"\

-	{$(INCLUDE)}"\ace\Thread_Manager.h"\

-	{$(INCLUDE)}"\ace\Thread_Manager.i"\

-	{$(INCLUDE)}"\ace\Time_Value.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.cpp"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.i"\

-	{$(INCLUDE)}"\ace\Trace.h"\

-	{$(INCLUDE)}"\ace\Version.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.i"\

-	{$(INCLUDE)}"\ace\ws2tcpip.h"\

-	

-NODEP_CPP_MARSH=\

-	".\tao\factories.h"\

-	

-

-"$(INTDIR)\marshal.obj" : $(SOURCE) $(DEP_CPP_MARSH) "$(INTDIR)"

-

-

-!ELSEIF  "$(CFG)" == "TAO - Win32 Debug"

-

-DEP_CPP_MARSH=\

-	"..\..\ace\config-win32.h"\

-	{$(INCLUDE)}"\.\align.h"\

-	{$(INCLUDE)}"\.\any.h"\

-	{$(INCLUDE)}"\.\any.i"\

-	{$(INCLUDE)}"\.\cdr.h"\

-	{$(INCLUDE)}"\.\cdr.i"\

-	{$(INCLUDE)}"\.\client_factory.h"\

-	{$(INCLUDE)}"\.\connect.h"\

-	{$(INCLUDE)}"\.\connect.i"\

-	{$(INCLUDE)}"\.\corba.h"\

-	{$(INCLUDE)}"\.\corbacom.h"\

-	{$(INCLUDE)}"\.\corbacom.i"\

-	{$(INCLUDE)}"\.\debug.h"\

-	{$(INCLUDE)}"\.\default_client.h"\

-	{$(INCLUDE)}"\.\default_client.i"\

-	{$(INCLUDE)}"\.\default_server.h"\

-	{$(INCLUDE)}"\.\default_server.i"\

-	{$(INCLUDE)}"\.\except.h"\

-	{$(INCLUDE)}"\.\giop.h"\

-	{$(INCLUDE)}"\.\giop.i"\

-	{$(INCLUDE)}"\.\iiopobj.h"\

-	{$(INCLUDE)}"\.\iiopobj.i"\

-	{$(INCLUDE)}"\.\iioporb.h"\

-	{$(INCLUDE)}"\.\iioporb.i"\

-	{$(INCLUDE)}"\.\marshal.h"\

-	{$(INCLUDE)}"\.\marshal.i"\

-	{$(INCLUDE)}"\.\nvlist.h"\

-	{$(INCLUDE)}"\.\object.h"\

-	{$(INCLUDE)}"\.\object.i"\

-	{$(INCLUDE)}"\.\objtable.h"\

-	{$(INCLUDE)}"\.\optable.h"\

-	{$(INCLUDE)}"\.\orb.h"\

-	{$(INCLUDE)}"\.\orb_core.h"\

-	{$(INCLUDE)}"\.\orb_core.i"\

-	{$(INCLUDE)}"\.\orbconf.h"\

-	{$(INCLUDE)}"\.\orbobj.h"\

-	{$(INCLUDE)}"\.\orbobj.i"\

-	{$(INCLUDE)}"\.\params.h"\

-	{$(INCLUDE)}"\.\params.i"\

-	{$(INCLUDE)}"\.\poa.h"\

-	{$(INCLUDE)}"\.\poa.i"\

-	{$(INCLUDE)}"\.\principa.h"\

-	{$(INCLUDE)}"\.\request.h"\

-	{$(INCLUDE)}"\.\sequence.h"\

-	{$(INCLUDE)}"\.\sequence.i"\

-	{$(INCLUDE)}"\.\server_factory.h"\

-	{$(INCLUDE)}"\.\server_factory.i"\

-	{$(INCLUDE)}"\.\singletons.h"\

-	{$(INCLUDE)}"\.\stub.h"\

-	{$(INCLUDE)}"\.\stub.i"\

-	{$(INCLUDE)}"\.\svrrqst.h"\

-	{$(INCLUDE)}"\.\typecode.h"\

-	{$(INCLUDE)}"\.\typecode.i"\

-	{$(INCLUDE)}"\.\varout.h"\

-	{$(INCLUDE)}"\ace\Acceptor.cpp"\

-	{$(INCLUDE)}"\ace\Acceptor.h"\

-	{$(INCLUDE)}"\ace\Acceptor.i"\

-	{$(INCLUDE)}"\ace\ACE.h"\

-	{$(INCLUDE)}"\ace\ACE.i"\

-	{$(INCLUDE)}"\ace\Addr.h"\

-	{$(INCLUDE)}"\ace\Addr.i"\

-	{$(INCLUDE)}"\ace\Atomic_Op.i"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.cpp"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.h"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.i"\

-	{$(INCLUDE)}"\ace\config-win32-common.h"\

-	{$(INCLUDE)}"\ace\Config.h"\

-	{$(INCLUDE)}"\ace\Connector.cpp"\

-	{$(INCLUDE)}"\ace\Connector.h"\

-	{$(INCLUDE)}"\ace\Connector.i"\

-	{$(INCLUDE)}"\ace\Containers.cpp"\

-	{$(INCLUDE)}"\ace\Containers.h"\

-	{$(INCLUDE)}"\ace\Containers.i"\

-	{$(INCLUDE)}"\ace\Dynamic.h"\

-	{$(INCLUDE)}"\ace\Dynamic.i"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.cpp"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.i"\

-	{$(INCLUDE)}"\ace\Free_List.cpp"\

-	{$(INCLUDE)}"\ace\Free_List.h"\

-	{$(INCLUDE)}"\ace\Free_List.i"\

-	{$(INCLUDE)}"\ace\Get_Opt.h"\

-	{$(INCLUDE)}"\ace\Get_Opt.i"\

-	{$(INCLUDE)}"\ace\Handle_Set.h"\

-	{$(INCLUDE)}"\ace\Handle_Set.i"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.i"\

-	{$(INCLUDE)}"\ace\IO_Cntl_Msg.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.i"\

-	{$(INCLUDE)}"\ace\Log_Msg.h"\

-	{$(INCLUDE)}"\ace\Log_Priority.h"\

-	{$(INCLUDE)}"\ace\Log_Record.h"\

-	{$(INCLUDE)}"\ace\Log_Record.i"\

-	{$(INCLUDE)}"\ace\Malloc.h"\

-	{$(INCLUDE)}"\ace\Malloc.i"\

-	{$(INCLUDE)}"\ace\Malloc_T.cpp"\

-	{$(INCLUDE)}"\ace\Malloc_T.h"\

-	{$(INCLUDE)}"\ace\Malloc_T.i"\

-	{$(INCLUDE)}"\ace\Managed_Object.cpp"\

-	{$(INCLUDE)}"\ace\Managed_Object.h"\

-	{$(INCLUDE)}"\ace\Managed_Object.i"\

-	{$(INCLUDE)}"\ace\Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Map_Manager.h"\

-	{$(INCLUDE)}"\ace\Map_Manager.i"\

-	{$(INCLUDE)}"\ace\Mem_Map.h"\

-	{$(INCLUDE)}"\ace\Mem_Map.i"\

-	{$(INCLUDE)}"\ace\Memory_Pool.h"\

-	{$(INCLUDE)}"\ace\Memory_Pool.i"\

-	{$(INCLUDE)}"\ace\Message_Block.h"\

-	{$(INCLUDE)}"\ace\Message_Block.i"\

-	{$(INCLUDE)}"\ace\Message_Queue.cpp"\

-	{$(INCLUDE)}"\ace\Message_Queue.h"\

-	{$(INCLUDE)}"\ace\Message_Queue.i"\

-	{$(INCLUDE)}"\ace\Module.cpp"\

-	{$(INCLUDE)}"\ace\Module.h"\

-	{$(INCLUDE)}"\ace\Module.i"\

-	{$(INCLUDE)}"\ace\Object_Manager.h"\

-	{$(INCLUDE)}"\ace\Object_Manager.i"\

-	{$(INCLUDE)}"\ace\OS.h"\

-	{$(INCLUDE)}"\ace\OS.i"\

-	{$(INCLUDE)}"\ace\Reactor.h"\

-	{$(INCLUDE)}"\ace\Reactor.i"\

-	{$(INCLUDE)}"\ace\Reactor_Impl.h"\

-	{$(INCLUDE)}"\ace\Service_Config.h"\

-	{$(INCLUDE)}"\ace\Service_Config.i"\

-	{$(INCLUDE)}"\ace\Service_Object.h"\

-	{$(INCLUDE)}"\ace\Service_Object.i"\

-	{$(INCLUDE)}"\ace\Service_Repository.h"\

-	{$(INCLUDE)}"\ace\Service_Repository.i"\

-	{$(INCLUDE)}"\ace\Service_Types.h"\

-	{$(INCLUDE)}"\ace\Service_Types.i"\

-	{$(INCLUDE)}"\ace\Shared_Object.h"\

-	{$(INCLUDE)}"\ace\Shared_Object.i"\

-	{$(INCLUDE)}"\ace\Signal.h"\

-	{$(INCLUDE)}"\ace\Signal.i"\

-	{$(INCLUDE)}"\ace\Singleton.cpp"\

-	{$(INCLUDE)}"\ace\Singleton.h"\

-	{$(INCLUDE)}"\ace\Singleton.i"\

-	{$(INCLUDE)}"\ace\SOCK.h"\

-	{$(INCLUDE)}"\ace\SOCK.i"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.h"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.i"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.h"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.i"\

-	{$(INCLUDE)}"\ace\SOCK_IO.h"\

-	{$(INCLUDE)}"\ace\SOCK_IO.i"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.h"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.i"\

-	{$(INCLUDE)}"\ace\SString.h"\

-	{$(INCLUDE)}"\ace\SString.i"\

-	{$(INCLUDE)}"\ace\stdcpp.h"\

-	{$(INCLUDE)}"\ace\Strategies.h"\

-	{$(INCLUDE)}"\ace\Strategies_T.cpp"\

-	{$(INCLUDE)}"\ace\Strategies_T.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.cpp"\

-	{$(INCLUDE)}"\ace\Stream_Modules.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.i"\

-	{$(INCLUDE)}"\ace\Svc_Conf_Tokens.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.cpp"\

-	{$(INCLUDE)}"\ace\Svc_Handler.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.i"\

-	{$(INCLUDE)}"\ace\Synch.h"\

-	{$(INCLUDE)}"\ace\Synch.i"\

-	{$(INCLUDE)}"\ace\Synch_Options.h"\

-	{$(INCLUDE)}"\ace\Synch_T.cpp"\

-	{$(INCLUDE)}"\ace\Synch_T.h"\

-	{$(INCLUDE)}"\ace\Synch_T.i"\

-	{$(INCLUDE)}"\ace\Task.h"\

-	{$(INCLUDE)}"\ace\Task.i"\

-	{$(INCLUDE)}"\ace\Task_T.cpp"\

-	{$(INCLUDE)}"\ace\Task_T.h"\

-	{$(INCLUDE)}"\ace\Task_T.i"\

-	{$(INCLUDE)}"\ace\Thread.h"\

-	{$(INCLUDE)}"\ace\Thread.i"\

-	{$(INCLUDE)}"\ace\Thread_Manager.h"\

-	{$(INCLUDE)}"\ace\Thread_Manager.i"\

-	{$(INCLUDE)}"\ace\Time_Value.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.cpp"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.i"\

-	{$(INCLUDE)}"\ace\Trace.h"\

-	{$(INCLUDE)}"\ace\Version.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.i"\

-	{$(INCLUDE)}"\ace\ws2tcpip.h"\

-	

-NODEP_CPP_MARSH=\

-	".\tao\factories.h"\

-	

-

-"$(INTDIR)\marshal.obj" : $(SOURCE) $(DEP_CPP_MARSH) "$(INTDIR)"

-

-

-!ENDIF 

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\nvlist.cpp

-

-!IF  "$(CFG)" == "TAO - Win32 Release"

-

-DEP_CPP_NVLIS=\

-	"..\..\ace\config-win32.h"\

-	{$(INCLUDE)}"\.\align.h"\

-	{$(INCLUDE)}"\.\any.h"\

-	{$(INCLUDE)}"\.\any.i"\

-	{$(INCLUDE)}"\.\cdr.h"\

-	{$(INCLUDE)}"\.\cdr.i"\

-	{$(INCLUDE)}"\.\client_factory.h"\

-	{$(INCLUDE)}"\.\connect.h"\

-	{$(INCLUDE)}"\.\connect.i"\

-	{$(INCLUDE)}"\.\corba.h"\

-	{$(INCLUDE)}"\.\corbacom.h"\

-	{$(INCLUDE)}"\.\corbacom.i"\

-	{$(INCLUDE)}"\.\debug.h"\

-	{$(INCLUDE)}"\.\default_client.h"\

-	{$(INCLUDE)}"\.\default_client.i"\

-	{$(INCLUDE)}"\.\default_server.h"\

-	{$(INCLUDE)}"\.\default_server.i"\

-	{$(INCLUDE)}"\.\except.h"\

-	{$(INCLUDE)}"\.\giop.h"\

-	{$(INCLUDE)}"\.\giop.i"\

-	{$(INCLUDE)}"\.\iiopobj.h"\

-	{$(INCLUDE)}"\.\iiopobj.i"\

-	{$(INCLUDE)}"\.\iioporb.h"\

-	{$(INCLUDE)}"\.\iioporb.i"\

-	{$(INCLUDE)}"\.\marshal.h"\

-	{$(INCLUDE)}"\.\marshal.i"\

-	{$(INCLUDE)}"\.\nvlist.h"\

-	{$(INCLUDE)}"\.\object.h"\

-	{$(INCLUDE)}"\.\object.i"\

-	{$(INCLUDE)}"\.\objtable.h"\

-	{$(INCLUDE)}"\.\optable.h"\

-	{$(INCLUDE)}"\.\orb.h"\

-	{$(INCLUDE)}"\.\orb_core.h"\

-	{$(INCLUDE)}"\.\orb_core.i"\

-	{$(INCLUDE)}"\.\orbconf.h"\

-	{$(INCLUDE)}"\.\orbobj.h"\

-	{$(INCLUDE)}"\.\orbobj.i"\

-	{$(INCLUDE)}"\.\params.h"\

-	{$(INCLUDE)}"\.\params.i"\

-	{$(INCLUDE)}"\.\poa.h"\

-	{$(INCLUDE)}"\.\poa.i"\

-	{$(INCLUDE)}"\.\principa.h"\

-	{$(INCLUDE)}"\.\request.h"\

-	{$(INCLUDE)}"\.\sequence.h"\

-	{$(INCLUDE)}"\.\sequence.i"\

-	{$(INCLUDE)}"\.\server_factory.h"\

-	{$(INCLUDE)}"\.\server_factory.i"\

-	{$(INCLUDE)}"\.\singletons.h"\

-	{$(INCLUDE)}"\.\stub.h"\

-	{$(INCLUDE)}"\.\stub.i"\

-	{$(INCLUDE)}"\.\svrrqst.h"\

-	{$(INCLUDE)}"\.\typecode.h"\

-	{$(INCLUDE)}"\.\typecode.i"\

-	{$(INCLUDE)}"\.\varout.h"\

-	{$(INCLUDE)}"\ace\Acceptor.cpp"\

-	{$(INCLUDE)}"\ace\Acceptor.h"\

-	{$(INCLUDE)}"\ace\Acceptor.i"\

-	{$(INCLUDE)}"\ace\ACE.h"\

-	{$(INCLUDE)}"\ace\ACE.i"\

-	{$(INCLUDE)}"\ace\Addr.h"\

-	{$(INCLUDE)}"\ace\Addr.i"\

-	{$(INCLUDE)}"\ace\Atomic_Op.i"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.cpp"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.h"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.i"\

-	{$(INCLUDE)}"\ace\config-win32-common.h"\

-	{$(INCLUDE)}"\ace\Config.h"\

-	{$(INCLUDE)}"\ace\Connector.cpp"\

-	{$(INCLUDE)}"\ace\Connector.h"\

-	{$(INCLUDE)}"\ace\Connector.i"\

-	{$(INCLUDE)}"\ace\Containers.cpp"\

-	{$(INCLUDE)}"\ace\Containers.h"\

-	{$(INCLUDE)}"\ace\Containers.i"\

-	{$(INCLUDE)}"\ace\Dynamic.h"\

-	{$(INCLUDE)}"\ace\Dynamic.i"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.cpp"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.i"\

-	{$(INCLUDE)}"\ace\Free_List.cpp"\

-	{$(INCLUDE)}"\ace\Free_List.h"\

-	{$(INCLUDE)}"\ace\Free_List.i"\

-	{$(INCLUDE)}"\ace\Get_Opt.h"\

-	{$(INCLUDE)}"\ace\Get_Opt.i"\

-	{$(INCLUDE)}"\ace\Handle_Set.h"\

-	{$(INCLUDE)}"\ace\Handle_Set.i"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.i"\

-	{$(INCLUDE)}"\ace\IO_Cntl_Msg.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.i"\

-	{$(INCLUDE)}"\ace\Log_Msg.h"\

-	{$(INCLUDE)}"\ace\Log_Priority.h"\

-	{$(INCLUDE)}"\ace\Log_Record.h"\

-	{$(INCLUDE)}"\ace\Log_Record.i"\

-	{$(INCLUDE)}"\ace\Malloc.h"\

-	{$(INCLUDE)}"\ace\Malloc.i"\

-	{$(INCLUDE)}"\ace\Malloc_T.cpp"\

-	{$(INCLUDE)}"\ace\Malloc_T.h"\

-	{$(INCLUDE)}"\ace\Malloc_T.i"\

-	{$(INCLUDE)}"\ace\Managed_Object.cpp"\

-	{$(INCLUDE)}"\ace\Managed_Object.h"\

-	{$(INCLUDE)}"\ace\Managed_Object.i"\

-	{$(INCLUDE)}"\ace\Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Map_Manager.h"\

-	{$(INCLUDE)}"\ace\Map_Manager.i"\

-	{$(INCLUDE)}"\ace\Mem_Map.h"\

-	{$(INCLUDE)}"\ace\Mem_Map.i"\

-	{$(INCLUDE)}"\ace\Memory_Pool.h"\

-	{$(INCLUDE)}"\ace\Memory_Pool.i"\

-	{$(INCLUDE)}"\ace\Message_Block.h"\

-	{$(INCLUDE)}"\ace\Message_Block.i"\

-	{$(INCLUDE)}"\ace\Message_Queue.cpp"\

-	{$(INCLUDE)}"\ace\Message_Queue.h"\

-	{$(INCLUDE)}"\ace\Message_Queue.i"\

-	{$(INCLUDE)}"\ace\Module.cpp"\

-	{$(INCLUDE)}"\ace\Module.h"\

-	{$(INCLUDE)}"\ace\Module.i"\

-	{$(INCLUDE)}"\ace\Object_Manager.h"\

-	{$(INCLUDE)}"\ace\Object_Manager.i"\

-	{$(INCLUDE)}"\ace\OS.h"\

-	{$(INCLUDE)}"\ace\OS.i"\

-	{$(INCLUDE)}"\ace\Reactor.h"\

-	{$(INCLUDE)}"\ace\Reactor.i"\

-	{$(INCLUDE)}"\ace\Reactor_Impl.h"\

-	{$(INCLUDE)}"\ace\Service_Config.h"\

-	{$(INCLUDE)}"\ace\Service_Config.i"\

-	{$(INCLUDE)}"\ace\Service_Object.h"\

-	{$(INCLUDE)}"\ace\Service_Object.i"\

-	{$(INCLUDE)}"\ace\Service_Repository.h"\

-	{$(INCLUDE)}"\ace\Service_Repository.i"\

-	{$(INCLUDE)}"\ace\Service_Types.h"\

-	{$(INCLUDE)}"\ace\Service_Types.i"\

-	{$(INCLUDE)}"\ace\Shared_Object.h"\

-	{$(INCLUDE)}"\ace\Shared_Object.i"\

-	{$(INCLUDE)}"\ace\Signal.h"\

-	{$(INCLUDE)}"\ace\Signal.i"\

-	{$(INCLUDE)}"\ace\Singleton.cpp"\

-	{$(INCLUDE)}"\ace\Singleton.h"\

-	{$(INCLUDE)}"\ace\Singleton.i"\

-	{$(INCLUDE)}"\ace\SOCK.h"\

-	{$(INCLUDE)}"\ace\SOCK.i"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.h"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.i"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.h"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.i"\

-	{$(INCLUDE)}"\ace\SOCK_IO.h"\

-	{$(INCLUDE)}"\ace\SOCK_IO.i"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.h"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.i"\

-	{$(INCLUDE)}"\ace\SString.h"\

-	{$(INCLUDE)}"\ace\SString.i"\

-	{$(INCLUDE)}"\ace\stdcpp.h"\

-	{$(INCLUDE)}"\ace\Strategies.h"\

-	{$(INCLUDE)}"\ace\Strategies_T.cpp"\

-	{$(INCLUDE)}"\ace\Strategies_T.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.cpp"\

-	{$(INCLUDE)}"\ace\Stream_Modules.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.i"\

-	{$(INCLUDE)}"\ace\Svc_Conf_Tokens.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.cpp"\

-	{$(INCLUDE)}"\ace\Svc_Handler.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.i"\

-	{$(INCLUDE)}"\ace\Synch.h"\

-	{$(INCLUDE)}"\ace\Synch.i"\

-	{$(INCLUDE)}"\ace\Synch_Options.h"\

-	{$(INCLUDE)}"\ace\Synch_T.cpp"\

-	{$(INCLUDE)}"\ace\Synch_T.h"\

-	{$(INCLUDE)}"\ace\Synch_T.i"\

-	{$(INCLUDE)}"\ace\Task.h"\

-	{$(INCLUDE)}"\ace\Task.i"\

-	{$(INCLUDE)}"\ace\Task_T.cpp"\

-	{$(INCLUDE)}"\ace\Task_T.h"\

-	{$(INCLUDE)}"\ace\Task_T.i"\

-	{$(INCLUDE)}"\ace\Thread.h"\

-	{$(INCLUDE)}"\ace\Thread.i"\

-	{$(INCLUDE)}"\ace\Thread_Manager.h"\

-	{$(INCLUDE)}"\ace\Thread_Manager.i"\

-	{$(INCLUDE)}"\ace\Time_Value.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.cpp"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.i"\

-	{$(INCLUDE)}"\ace\Trace.h"\

-	{$(INCLUDE)}"\ace\Version.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.i"\

-	{$(INCLUDE)}"\ace\ws2tcpip.h"\

-	

-NODEP_CPP_NVLIS=\

-	".\tao\factories.h"\

-	

-

-"$(INTDIR)\nvlist.obj" : $(SOURCE) $(DEP_CPP_NVLIS) "$(INTDIR)"

-

-

-!ELSEIF  "$(CFG)" == "TAO - Win32 Debug"

-

-DEP_CPP_NVLIS=\

-	"..\..\ace\config-win32.h"\

-	{$(INCLUDE)}"\.\align.h"\

-	{$(INCLUDE)}"\.\any.h"\

-	{$(INCLUDE)}"\.\any.i"\

-	{$(INCLUDE)}"\.\cdr.h"\

-	{$(INCLUDE)}"\.\cdr.i"\

-	{$(INCLUDE)}"\.\client_factory.h"\

-	{$(INCLUDE)}"\.\connect.h"\

-	{$(INCLUDE)}"\.\connect.i"\

-	{$(INCLUDE)}"\.\corba.h"\

-	{$(INCLUDE)}"\.\corbacom.h"\

-	{$(INCLUDE)}"\.\corbacom.i"\

-	{$(INCLUDE)}"\.\debug.h"\

-	{$(INCLUDE)}"\.\default_client.h"\

-	{$(INCLUDE)}"\.\default_client.i"\

-	{$(INCLUDE)}"\.\default_server.h"\

-	{$(INCLUDE)}"\.\default_server.i"\

-	{$(INCLUDE)}"\.\except.h"\

-	{$(INCLUDE)}"\.\giop.h"\

-	{$(INCLUDE)}"\.\giop.i"\

-	{$(INCLUDE)}"\.\iiopobj.h"\

-	{$(INCLUDE)}"\.\iiopobj.i"\

-	{$(INCLUDE)}"\.\iioporb.h"\

-	{$(INCLUDE)}"\.\iioporb.i"\

-	{$(INCLUDE)}"\.\marshal.h"\

-	{$(INCLUDE)}"\.\marshal.i"\

-	{$(INCLUDE)}"\.\nvlist.h"\

-	{$(INCLUDE)}"\.\object.h"\

-	{$(INCLUDE)}"\.\object.i"\

-	{$(INCLUDE)}"\.\objtable.h"\

-	{$(INCLUDE)}"\.\optable.h"\

-	{$(INCLUDE)}"\.\orb.h"\

-	{$(INCLUDE)}"\.\orb_core.h"\

-	{$(INCLUDE)}"\.\orb_core.i"\

-	{$(INCLUDE)}"\.\orbconf.h"\

-	{$(INCLUDE)}"\.\orbobj.h"\

-	{$(INCLUDE)}"\.\orbobj.i"\

-	{$(INCLUDE)}"\.\params.h"\

-	{$(INCLUDE)}"\.\params.i"\

-	{$(INCLUDE)}"\.\poa.h"\

-	{$(INCLUDE)}"\.\poa.i"\

-	{$(INCLUDE)}"\.\principa.h"\

-	{$(INCLUDE)}"\.\request.h"\

-	{$(INCLUDE)}"\.\sequence.h"\

-	{$(INCLUDE)}"\.\sequence.i"\

-	{$(INCLUDE)}"\.\server_factory.h"\

-	{$(INCLUDE)}"\.\server_factory.i"\

-	{$(INCLUDE)}"\.\singletons.h"\

-	{$(INCLUDE)}"\.\stub.h"\

-	{$(INCLUDE)}"\.\stub.i"\

-	{$(INCLUDE)}"\.\svrrqst.h"\

-	{$(INCLUDE)}"\.\typecode.h"\

-	{$(INCLUDE)}"\.\typecode.i"\

-	{$(INCLUDE)}"\.\varout.h"\

-	{$(INCLUDE)}"\ace\Acceptor.cpp"\

-	{$(INCLUDE)}"\ace\Acceptor.h"\

-	{$(INCLUDE)}"\ace\Acceptor.i"\

-	{$(INCLUDE)}"\ace\ACE.h"\

-	{$(INCLUDE)}"\ace\ACE.i"\

-	{$(INCLUDE)}"\ace\Addr.h"\

-	{$(INCLUDE)}"\ace\Addr.i"\

-	{$(INCLUDE)}"\ace\Atomic_Op.i"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.cpp"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.h"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.i"\

-	{$(INCLUDE)}"\ace\config-win32-common.h"\

-	{$(INCLUDE)}"\ace\Config.h"\

-	{$(INCLUDE)}"\ace\Connector.cpp"\

-	{$(INCLUDE)}"\ace\Connector.h"\

-	{$(INCLUDE)}"\ace\Connector.i"\

-	{$(INCLUDE)}"\ace\Containers.cpp"\

-	{$(INCLUDE)}"\ace\Containers.h"\

-	{$(INCLUDE)}"\ace\Containers.i"\

-	{$(INCLUDE)}"\ace\Dynamic.h"\

-	{$(INCLUDE)}"\ace\Dynamic.i"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.cpp"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.i"\

-	{$(INCLUDE)}"\ace\Free_List.cpp"\

-	{$(INCLUDE)}"\ace\Free_List.h"\

-	{$(INCLUDE)}"\ace\Free_List.i"\

-	{$(INCLUDE)}"\ace\Get_Opt.h"\

-	{$(INCLUDE)}"\ace\Get_Opt.i"\

-	{$(INCLUDE)}"\ace\Handle_Set.h"\

-	{$(INCLUDE)}"\ace\Handle_Set.i"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.i"\

-	{$(INCLUDE)}"\ace\IO_Cntl_Msg.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.i"\

-	{$(INCLUDE)}"\ace\Log_Msg.h"\

-	{$(INCLUDE)}"\ace\Log_Priority.h"\

-	{$(INCLUDE)}"\ace\Log_Record.h"\

-	{$(INCLUDE)}"\ace\Log_Record.i"\

-	{$(INCLUDE)}"\ace\Malloc.h"\

-	{$(INCLUDE)}"\ace\Malloc.i"\

-	{$(INCLUDE)}"\ace\Malloc_T.cpp"\

-	{$(INCLUDE)}"\ace\Malloc_T.h"\

-	{$(INCLUDE)}"\ace\Malloc_T.i"\

-	{$(INCLUDE)}"\ace\Managed_Object.cpp"\

-	{$(INCLUDE)}"\ace\Managed_Object.h"\

-	{$(INCLUDE)}"\ace\Managed_Object.i"\

-	{$(INCLUDE)}"\ace\Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Map_Manager.h"\

-	{$(INCLUDE)}"\ace\Map_Manager.i"\

-	{$(INCLUDE)}"\ace\Mem_Map.h"\

-	{$(INCLUDE)}"\ace\Mem_Map.i"\

-	{$(INCLUDE)}"\ace\Memory_Pool.h"\

-	{$(INCLUDE)}"\ace\Memory_Pool.i"\

-	{$(INCLUDE)}"\ace\Message_Block.h"\

-	{$(INCLUDE)}"\ace\Message_Block.i"\

-	{$(INCLUDE)}"\ace\Message_Queue.cpp"\

-	{$(INCLUDE)}"\ace\Message_Queue.h"\

-	{$(INCLUDE)}"\ace\Message_Queue.i"\

-	{$(INCLUDE)}"\ace\Module.cpp"\

-	{$(INCLUDE)}"\ace\Module.h"\

-	{$(INCLUDE)}"\ace\Module.i"\

-	{$(INCLUDE)}"\ace\Object_Manager.h"\

-	{$(INCLUDE)}"\ace\Object_Manager.i"\

-	{$(INCLUDE)}"\ace\OS.h"\

-	{$(INCLUDE)}"\ace\OS.i"\

-	{$(INCLUDE)}"\ace\Reactor.h"\

-	{$(INCLUDE)}"\ace\Reactor.i"\

-	{$(INCLUDE)}"\ace\Reactor_Impl.h"\

-	{$(INCLUDE)}"\ace\Service_Config.h"\

-	{$(INCLUDE)}"\ace\Service_Config.i"\

-	{$(INCLUDE)}"\ace\Service_Object.h"\

-	{$(INCLUDE)}"\ace\Service_Object.i"\

-	{$(INCLUDE)}"\ace\Service_Repository.h"\

-	{$(INCLUDE)}"\ace\Service_Repository.i"\

-	{$(INCLUDE)}"\ace\Service_Types.h"\

-	{$(INCLUDE)}"\ace\Service_Types.i"\

-	{$(INCLUDE)}"\ace\Shared_Object.h"\

-	{$(INCLUDE)}"\ace\Shared_Object.i"\

-	{$(INCLUDE)}"\ace\Signal.h"\

-	{$(INCLUDE)}"\ace\Signal.i"\

-	{$(INCLUDE)}"\ace\Singleton.cpp"\

-	{$(INCLUDE)}"\ace\Singleton.h"\

-	{$(INCLUDE)}"\ace\Singleton.i"\

-	{$(INCLUDE)}"\ace\SOCK.h"\

-	{$(INCLUDE)}"\ace\SOCK.i"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.h"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.i"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.h"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.i"\

-	{$(INCLUDE)}"\ace\SOCK_IO.h"\

-	{$(INCLUDE)}"\ace\SOCK_IO.i"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.h"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.i"\

-	{$(INCLUDE)}"\ace\SString.h"\

-	{$(INCLUDE)}"\ace\SString.i"\

-	{$(INCLUDE)}"\ace\stdcpp.h"\

-	{$(INCLUDE)}"\ace\Strategies.h"\

-	{$(INCLUDE)}"\ace\Strategies_T.cpp"\

-	{$(INCLUDE)}"\ace\Strategies_T.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.cpp"\

-	{$(INCLUDE)}"\ace\Stream_Modules.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.i"\

-	{$(INCLUDE)}"\ace\Svc_Conf_Tokens.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.cpp"\

-	{$(INCLUDE)}"\ace\Svc_Handler.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.i"\

-	{$(INCLUDE)}"\ace\Synch.h"\

-	{$(INCLUDE)}"\ace\Synch.i"\

-	{$(INCLUDE)}"\ace\Synch_Options.h"\

-	{$(INCLUDE)}"\ace\Synch_T.cpp"\

-	{$(INCLUDE)}"\ace\Synch_T.h"\

-	{$(INCLUDE)}"\ace\Synch_T.i"\

-	{$(INCLUDE)}"\ace\Task.h"\

-	{$(INCLUDE)}"\ace\Task.i"\

-	{$(INCLUDE)}"\ace\Task_T.cpp"\

-	{$(INCLUDE)}"\ace\Task_T.h"\

-	{$(INCLUDE)}"\ace\Task_T.i"\

-	{$(INCLUDE)}"\ace\Thread.h"\

-	{$(INCLUDE)}"\ace\Thread.i"\

-	{$(INCLUDE)}"\ace\Thread_Manager.h"\

-	{$(INCLUDE)}"\ace\Thread_Manager.i"\

-	{$(INCLUDE)}"\ace\Time_Value.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.cpp"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.i"\

-	{$(INCLUDE)}"\ace\Trace.h"\

-	{$(INCLUDE)}"\ace\Version.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.i"\

-	{$(INCLUDE)}"\ace\ws2tcpip.h"\

-	

-NODEP_CPP_NVLIS=\

-	".\tao\factories.h"\

-	

-

-"$(INTDIR)\nvlist.obj" : $(SOURCE) $(DEP_CPP_NVLIS) "$(INTDIR)"

-

-

-!ENDIF 

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\object.cpp

-

-!IF  "$(CFG)" == "TAO - Win32 Release"

-

-DEP_CPP_OBJEC=\

-	"..\..\ace\config-win32.h"\

-	{$(INCLUDE)}"\.\align.h"\

-	{$(INCLUDE)}"\.\any.h"\

-	{$(INCLUDE)}"\.\any.i"\

-	{$(INCLUDE)}"\.\cdr.h"\

-	{$(INCLUDE)}"\.\cdr.i"\

-	{$(INCLUDE)}"\.\client_factory.h"\

-	{$(INCLUDE)}"\.\connect.h"\

-	{$(INCLUDE)}"\.\connect.i"\

-	{$(INCLUDE)}"\.\corba.h"\

-	{$(INCLUDE)}"\.\corbacom.h"\

-	{$(INCLUDE)}"\.\corbacom.i"\

-	{$(INCLUDE)}"\.\debug.h"\

-	{$(INCLUDE)}"\.\default_client.h"\

-	{$(INCLUDE)}"\.\default_client.i"\

-	{$(INCLUDE)}"\.\default_server.h"\

-	{$(INCLUDE)}"\.\default_server.i"\

-	{$(INCLUDE)}"\.\except.h"\

-	{$(INCLUDE)}"\.\giop.h"\

-	{$(INCLUDE)}"\.\giop.i"\

-	{$(INCLUDE)}"\.\iiopobj.h"\

-	{$(INCLUDE)}"\.\iiopobj.i"\

-	{$(INCLUDE)}"\.\iioporb.h"\

-	{$(INCLUDE)}"\.\iioporb.i"\

-	{$(INCLUDE)}"\.\marshal.h"\

-	{$(INCLUDE)}"\.\marshal.i"\

-	{$(INCLUDE)}"\.\nvlist.h"\

-	{$(INCLUDE)}"\.\object.h"\

-	{$(INCLUDE)}"\.\object.i"\

-	{$(INCLUDE)}"\.\objtable.h"\

-	{$(INCLUDE)}"\.\optable.h"\

-	{$(INCLUDE)}"\.\orb.h"\

-	{$(INCLUDE)}"\.\orb_core.h"\

-	{$(INCLUDE)}"\.\orb_core.i"\

-	{$(INCLUDE)}"\.\orbconf.h"\

-	{$(INCLUDE)}"\.\orbobj.h"\

-	{$(INCLUDE)}"\.\orbobj.i"\

-	{$(INCLUDE)}"\.\params.h"\

-	{$(INCLUDE)}"\.\params.i"\

-	{$(INCLUDE)}"\.\poa.h"\

-	{$(INCLUDE)}"\.\poa.i"\

-	{$(INCLUDE)}"\.\principa.h"\

-	{$(INCLUDE)}"\.\request.h"\

-	{$(INCLUDE)}"\.\sequence.h"\

-	{$(INCLUDE)}"\.\sequence.i"\

-	{$(INCLUDE)}"\.\server_factory.h"\

-	{$(INCLUDE)}"\.\server_factory.i"\

-	{$(INCLUDE)}"\.\singletons.h"\

-	{$(INCLUDE)}"\.\stub.h"\

-	{$(INCLUDE)}"\.\stub.i"\

-	{$(INCLUDE)}"\.\svrrqst.h"\

-	{$(INCLUDE)}"\.\typecode.h"\

-	{$(INCLUDE)}"\.\typecode.i"\

-	{$(INCLUDE)}"\.\varout.h"\

-	{$(INCLUDE)}"\ace\Acceptor.cpp"\

-	{$(INCLUDE)}"\ace\Acceptor.h"\

-	{$(INCLUDE)}"\ace\Acceptor.i"\

-	{$(INCLUDE)}"\ace\ACE.h"\

-	{$(INCLUDE)}"\ace\ACE.i"\

-	{$(INCLUDE)}"\ace\Addr.h"\

-	{$(INCLUDE)}"\ace\Addr.i"\

-	{$(INCLUDE)}"\ace\Atomic_Op.i"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.cpp"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.h"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.i"\

-	{$(INCLUDE)}"\ace\config-win32-common.h"\

-	{$(INCLUDE)}"\ace\Config.h"\

-	{$(INCLUDE)}"\ace\Connector.cpp"\

-	{$(INCLUDE)}"\ace\Connector.h"\

-	{$(INCLUDE)}"\ace\Connector.i"\

-	{$(INCLUDE)}"\ace\Containers.cpp"\

-	{$(INCLUDE)}"\ace\Containers.h"\

-	{$(INCLUDE)}"\ace\Containers.i"\

-	{$(INCLUDE)}"\ace\Dynamic.h"\

-	{$(INCLUDE)}"\ace\Dynamic.i"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.cpp"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.i"\

-	{$(INCLUDE)}"\ace\Free_List.cpp"\

-	{$(INCLUDE)}"\ace\Free_List.h"\

-	{$(INCLUDE)}"\ace\Free_List.i"\

-	{$(INCLUDE)}"\ace\Get_Opt.h"\

-	{$(INCLUDE)}"\ace\Get_Opt.i"\

-	{$(INCLUDE)}"\ace\Handle_Set.h"\

-	{$(INCLUDE)}"\ace\Handle_Set.i"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.i"\

-	{$(INCLUDE)}"\ace\IO_Cntl_Msg.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.i"\

-	{$(INCLUDE)}"\ace\Log_Msg.h"\

-	{$(INCLUDE)}"\ace\Log_Priority.h"\

-	{$(INCLUDE)}"\ace\Log_Record.h"\

-	{$(INCLUDE)}"\ace\Log_Record.i"\

-	{$(INCLUDE)}"\ace\Malloc.h"\

-	{$(INCLUDE)}"\ace\Malloc.i"\

-	{$(INCLUDE)}"\ace\Malloc_T.cpp"\

-	{$(INCLUDE)}"\ace\Malloc_T.h"\

-	{$(INCLUDE)}"\ace\Malloc_T.i"\

-	{$(INCLUDE)}"\ace\Managed_Object.cpp"\

-	{$(INCLUDE)}"\ace\Managed_Object.h"\

-	{$(INCLUDE)}"\ace\Managed_Object.i"\

-	{$(INCLUDE)}"\ace\Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Map_Manager.h"\

-	{$(INCLUDE)}"\ace\Map_Manager.i"\

-	{$(INCLUDE)}"\ace\Mem_Map.h"\

-	{$(INCLUDE)}"\ace\Mem_Map.i"\

-	{$(INCLUDE)}"\ace\Memory_Pool.h"\

-	{$(INCLUDE)}"\ace\Memory_Pool.i"\

-	{$(INCLUDE)}"\ace\Message_Block.h"\

-	{$(INCLUDE)}"\ace\Message_Block.i"\

-	{$(INCLUDE)}"\ace\Message_Queue.cpp"\

-	{$(INCLUDE)}"\ace\Message_Queue.h"\

-	{$(INCLUDE)}"\ace\Message_Queue.i"\

-	{$(INCLUDE)}"\ace\Module.cpp"\

-	{$(INCLUDE)}"\ace\Module.h"\

-	{$(INCLUDE)}"\ace\Module.i"\

-	{$(INCLUDE)}"\ace\Object_Manager.h"\

-	{$(INCLUDE)}"\ace\Object_Manager.i"\

-	{$(INCLUDE)}"\ace\OS.h"\

-	{$(INCLUDE)}"\ace\OS.i"\

-	{$(INCLUDE)}"\ace\Reactor.h"\

-	{$(INCLUDE)}"\ace\Reactor.i"\

-	{$(INCLUDE)}"\ace\Reactor_Impl.h"\

-	{$(INCLUDE)}"\ace\Service_Config.h"\

-	{$(INCLUDE)}"\ace\Service_Config.i"\

-	{$(INCLUDE)}"\ace\Service_Object.h"\

-	{$(INCLUDE)}"\ace\Service_Object.i"\

-	{$(INCLUDE)}"\ace\Service_Repository.h"\

-	{$(INCLUDE)}"\ace\Service_Repository.i"\

-	{$(INCLUDE)}"\ace\Service_Types.h"\

-	{$(INCLUDE)}"\ace\Service_Types.i"\

-	{$(INCLUDE)}"\ace\Shared_Object.h"\

-	{$(INCLUDE)}"\ace\Shared_Object.i"\

-	{$(INCLUDE)}"\ace\Signal.h"\

-	{$(INCLUDE)}"\ace\Signal.i"\

-	{$(INCLUDE)}"\ace\Singleton.cpp"\

-	{$(INCLUDE)}"\ace\Singleton.h"\

-	{$(INCLUDE)}"\ace\Singleton.i"\

-	{$(INCLUDE)}"\ace\SOCK.h"\

-	{$(INCLUDE)}"\ace\SOCK.i"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.h"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.i"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.h"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.i"\

-	{$(INCLUDE)}"\ace\SOCK_IO.h"\

-	{$(INCLUDE)}"\ace\SOCK_IO.i"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.h"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.i"\

-	{$(INCLUDE)}"\ace\SString.h"\

-	{$(INCLUDE)}"\ace\SString.i"\

-	{$(INCLUDE)}"\ace\stdcpp.h"\

-	{$(INCLUDE)}"\ace\Strategies.h"\

-	{$(INCLUDE)}"\ace\Strategies_T.cpp"\

-	{$(INCLUDE)}"\ace\Strategies_T.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.cpp"\

-	{$(INCLUDE)}"\ace\Stream_Modules.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.i"\

-	{$(INCLUDE)}"\ace\Svc_Conf_Tokens.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.cpp"\

-	{$(INCLUDE)}"\ace\Svc_Handler.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.i"\

-	{$(INCLUDE)}"\ace\Synch.h"\

-	{$(INCLUDE)}"\ace\Synch.i"\

-	{$(INCLUDE)}"\ace\Synch_Options.h"\

-	{$(INCLUDE)}"\ace\Synch_T.cpp"\

-	{$(INCLUDE)}"\ace\Synch_T.h"\

-	{$(INCLUDE)}"\ace\Synch_T.i"\

-	{$(INCLUDE)}"\ace\Task.h"\

-	{$(INCLUDE)}"\ace\Task.i"\

-	{$(INCLUDE)}"\ace\Task_T.cpp"\

-	{$(INCLUDE)}"\ace\Task_T.h"\

-	{$(INCLUDE)}"\ace\Task_T.i"\

-	{$(INCLUDE)}"\ace\Thread.h"\

-	{$(INCLUDE)}"\ace\Thread.i"\

-	{$(INCLUDE)}"\ace\Thread_Manager.h"\

-	{$(INCLUDE)}"\ace\Thread_Manager.i"\

-	{$(INCLUDE)}"\ace\Time_Value.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.cpp"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.i"\

-	{$(INCLUDE)}"\ace\Trace.h"\

-	{$(INCLUDE)}"\ace\Version.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.i"\

-	{$(INCLUDE)}"\ace\ws2tcpip.h"\

-	

-NODEP_CPP_OBJEC=\

-	".\tao\factories.h"\

-	

-

-"$(INTDIR)\object.obj" : $(SOURCE) $(DEP_CPP_OBJEC) "$(INTDIR)"

-

-

-!ELSEIF  "$(CFG)" == "TAO - Win32 Debug"

-

-DEP_CPP_OBJEC=\

-	"..\..\ace\config-win32.h"\

-	{$(INCLUDE)}"\.\align.h"\

-	{$(INCLUDE)}"\.\any.h"\

-	{$(INCLUDE)}"\.\any.i"\

-	{$(INCLUDE)}"\.\cdr.h"\

-	{$(INCLUDE)}"\.\cdr.i"\

-	{$(INCLUDE)}"\.\client_factory.h"\

-	{$(INCLUDE)}"\.\connect.h"\

-	{$(INCLUDE)}"\.\connect.i"\

-	{$(INCLUDE)}"\.\corba.h"\

-	{$(INCLUDE)}"\.\corbacom.h"\

-	{$(INCLUDE)}"\.\corbacom.i"\

-	{$(INCLUDE)}"\.\debug.h"\

-	{$(INCLUDE)}"\.\default_client.h"\

-	{$(INCLUDE)}"\.\default_client.i"\

-	{$(INCLUDE)}"\.\default_server.h"\

-	{$(INCLUDE)}"\.\default_server.i"\

-	{$(INCLUDE)}"\.\except.h"\

-	{$(INCLUDE)}"\.\giop.h"\

-	{$(INCLUDE)}"\.\giop.i"\

-	{$(INCLUDE)}"\.\iiopobj.h"\

-	{$(INCLUDE)}"\.\iiopobj.i"\

-	{$(INCLUDE)}"\.\iioporb.h"\

-	{$(INCLUDE)}"\.\iioporb.i"\

-	{$(INCLUDE)}"\.\marshal.h"\

-	{$(INCLUDE)}"\.\marshal.i"\

-	{$(INCLUDE)}"\.\nvlist.h"\

-	{$(INCLUDE)}"\.\object.h"\

-	{$(INCLUDE)}"\.\object.i"\

-	{$(INCLUDE)}"\.\objtable.h"\

-	{$(INCLUDE)}"\.\optable.h"\

-	{$(INCLUDE)}"\.\orb.h"\

-	{$(INCLUDE)}"\.\orb_core.h"\

-	{$(INCLUDE)}"\.\orb_core.i"\

-	{$(INCLUDE)}"\.\orbconf.h"\

-	{$(INCLUDE)}"\.\orbobj.h"\

-	{$(INCLUDE)}"\.\orbobj.i"\

-	{$(INCLUDE)}"\.\params.h"\

-	{$(INCLUDE)}"\.\params.i"\

-	{$(INCLUDE)}"\.\poa.h"\

-	{$(INCLUDE)}"\.\poa.i"\

-	{$(INCLUDE)}"\.\principa.h"\

-	{$(INCLUDE)}"\.\request.h"\

-	{$(INCLUDE)}"\.\sequence.h"\

-	{$(INCLUDE)}"\.\sequence.i"\

-	{$(INCLUDE)}"\.\server_factory.h"\

-	{$(INCLUDE)}"\.\server_factory.i"\

-	{$(INCLUDE)}"\.\singletons.h"\

-	{$(INCLUDE)}"\.\stub.h"\

-	{$(INCLUDE)}"\.\stub.i"\

-	{$(INCLUDE)}"\.\svrrqst.h"\

-	{$(INCLUDE)}"\.\typecode.h"\

-	{$(INCLUDE)}"\.\typecode.i"\

-	{$(INCLUDE)}"\.\varout.h"\

-	{$(INCLUDE)}"\ace\Acceptor.cpp"\

-	{$(INCLUDE)}"\ace\Acceptor.h"\

-	{$(INCLUDE)}"\ace\Acceptor.i"\

-	{$(INCLUDE)}"\ace\ACE.h"\

-	{$(INCLUDE)}"\ace\ACE.i"\

-	{$(INCLUDE)}"\ace\Addr.h"\

-	{$(INCLUDE)}"\ace\Addr.i"\

-	{$(INCLUDE)}"\ace\Atomic_Op.i"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.cpp"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.h"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.i"\

-	{$(INCLUDE)}"\ace\config-win32-common.h"\

-	{$(INCLUDE)}"\ace\Config.h"\

-	{$(INCLUDE)}"\ace\Connector.cpp"\

-	{$(INCLUDE)}"\ace\Connector.h"\

-	{$(INCLUDE)}"\ace\Connector.i"\

-	{$(INCLUDE)}"\ace\Containers.cpp"\

-	{$(INCLUDE)}"\ace\Containers.h"\

-	{$(INCLUDE)}"\ace\Containers.i"\

-	{$(INCLUDE)}"\ace\Dynamic.h"\

-	{$(INCLUDE)}"\ace\Dynamic.i"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.cpp"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.i"\

-	{$(INCLUDE)}"\ace\Free_List.cpp"\

-	{$(INCLUDE)}"\ace\Free_List.h"\

-	{$(INCLUDE)}"\ace\Free_List.i"\

-	{$(INCLUDE)}"\ace\Get_Opt.h"\

-	{$(INCLUDE)}"\ace\Get_Opt.i"\

-	{$(INCLUDE)}"\ace\Handle_Set.h"\

-	{$(INCLUDE)}"\ace\Handle_Set.i"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.i"\

-	{$(INCLUDE)}"\ace\IO_Cntl_Msg.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.i"\

-	{$(INCLUDE)}"\ace\Log_Msg.h"\

-	{$(INCLUDE)}"\ace\Log_Priority.h"\

-	{$(INCLUDE)}"\ace\Log_Record.h"\

-	{$(INCLUDE)}"\ace\Log_Record.i"\

-	{$(INCLUDE)}"\ace\Malloc.h"\

-	{$(INCLUDE)}"\ace\Malloc.i"\

-	{$(INCLUDE)}"\ace\Malloc_T.cpp"\

-	{$(INCLUDE)}"\ace\Malloc_T.h"\

-	{$(INCLUDE)}"\ace\Malloc_T.i"\

-	{$(INCLUDE)}"\ace\Managed_Object.cpp"\

-	{$(INCLUDE)}"\ace\Managed_Object.h"\

-	{$(INCLUDE)}"\ace\Managed_Object.i"\

-	{$(INCLUDE)}"\ace\Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Map_Manager.h"\

-	{$(INCLUDE)}"\ace\Map_Manager.i"\

-	{$(INCLUDE)}"\ace\Mem_Map.h"\

-	{$(INCLUDE)}"\ace\Mem_Map.i"\

-	{$(INCLUDE)}"\ace\Memory_Pool.h"\

-	{$(INCLUDE)}"\ace\Memory_Pool.i"\

-	{$(INCLUDE)}"\ace\Message_Block.h"\

-	{$(INCLUDE)}"\ace\Message_Block.i"\

-	{$(INCLUDE)}"\ace\Message_Queue.cpp"\

-	{$(INCLUDE)}"\ace\Message_Queue.h"\

-	{$(INCLUDE)}"\ace\Message_Queue.i"\

-	{$(INCLUDE)}"\ace\Module.cpp"\

-	{$(INCLUDE)}"\ace\Module.h"\

-	{$(INCLUDE)}"\ace\Module.i"\

-	{$(INCLUDE)}"\ace\Object_Manager.h"\

-	{$(INCLUDE)}"\ace\Object_Manager.i"\

-	{$(INCLUDE)}"\ace\OS.h"\

-	{$(INCLUDE)}"\ace\OS.i"\

-	{$(INCLUDE)}"\ace\Reactor.h"\

-	{$(INCLUDE)}"\ace\Reactor.i"\

-	{$(INCLUDE)}"\ace\Reactor_Impl.h"\

-	{$(INCLUDE)}"\ace\Service_Config.h"\

-	{$(INCLUDE)}"\ace\Service_Config.i"\

-	{$(INCLUDE)}"\ace\Service_Object.h"\

-	{$(INCLUDE)}"\ace\Service_Object.i"\

-	{$(INCLUDE)}"\ace\Service_Repository.h"\

-	{$(INCLUDE)}"\ace\Service_Repository.i"\

-	{$(INCLUDE)}"\ace\Service_Types.h"\

-	{$(INCLUDE)}"\ace\Service_Types.i"\

-	{$(INCLUDE)}"\ace\Shared_Object.h"\

-	{$(INCLUDE)}"\ace\Shared_Object.i"\

-	{$(INCLUDE)}"\ace\Signal.h"\

-	{$(INCLUDE)}"\ace\Signal.i"\

-	{$(INCLUDE)}"\ace\Singleton.cpp"\

-	{$(INCLUDE)}"\ace\Singleton.h"\

-	{$(INCLUDE)}"\ace\Singleton.i"\

-	{$(INCLUDE)}"\ace\SOCK.h"\

-	{$(INCLUDE)}"\ace\SOCK.i"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.h"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.i"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.h"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.i"\

-	{$(INCLUDE)}"\ace\SOCK_IO.h"\

-	{$(INCLUDE)}"\ace\SOCK_IO.i"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.h"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.i"\

-	{$(INCLUDE)}"\ace\SString.h"\

-	{$(INCLUDE)}"\ace\SString.i"\

-	{$(INCLUDE)}"\ace\stdcpp.h"\

-	{$(INCLUDE)}"\ace\Strategies.h"\

-	{$(INCLUDE)}"\ace\Strategies_T.cpp"\

-	{$(INCLUDE)}"\ace\Strategies_T.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.cpp"\

-	{$(INCLUDE)}"\ace\Stream_Modules.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.i"\

-	{$(INCLUDE)}"\ace\Svc_Conf_Tokens.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.cpp"\

-	{$(INCLUDE)}"\ace\Svc_Handler.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.i"\

-	{$(INCLUDE)}"\ace\Synch.h"\

-	{$(INCLUDE)}"\ace\Synch.i"\

-	{$(INCLUDE)}"\ace\Synch_Options.h"\

-	{$(INCLUDE)}"\ace\Synch_T.cpp"\

-	{$(INCLUDE)}"\ace\Synch_T.h"\

-	{$(INCLUDE)}"\ace\Synch_T.i"\

-	{$(INCLUDE)}"\ace\Task.h"\

-	{$(INCLUDE)}"\ace\Task.i"\

-	{$(INCLUDE)}"\ace\Task_T.cpp"\

-	{$(INCLUDE)}"\ace\Task_T.h"\

-	{$(INCLUDE)}"\ace\Task_T.i"\

-	{$(INCLUDE)}"\ace\Thread.h"\

-	{$(INCLUDE)}"\ace\Thread.i"\

-	{$(INCLUDE)}"\ace\Thread_Manager.h"\

-	{$(INCLUDE)}"\ace\Thread_Manager.i"\

-	{$(INCLUDE)}"\ace\Time_Value.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.cpp"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.i"\

-	{$(INCLUDE)}"\ace\Trace.h"\

-	{$(INCLUDE)}"\ace\Version.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.i"\

-	{$(INCLUDE)}"\ace\ws2tcpip.h"\

-	

-NODEP_CPP_OBJEC=\

-	".\tao\factories.h"\

-	

-

-"$(INTDIR)\object.obj" : $(SOURCE) $(DEP_CPP_OBJEC) "$(INTDIR)"

-

-

-!ENDIF 

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\objtable.cpp

-

-!IF  "$(CFG)" == "TAO - Win32 Release"

-

-DEP_CPP_OBJTA=\

-	"..\..\ace\config-win32.h"\

-	{$(INCLUDE)}"\.\align.h"\

-	{$(INCLUDE)}"\.\any.h"\

-	{$(INCLUDE)}"\.\any.i"\

-	{$(INCLUDE)}"\.\cdr.h"\

-	{$(INCLUDE)}"\.\cdr.i"\

-	{$(INCLUDE)}"\.\client_factory.h"\

-	{$(INCLUDE)}"\.\client_factory.i"\

-	{$(INCLUDE)}"\.\connect.h"\

-	{$(INCLUDE)}"\.\connect.i"\

-	{$(INCLUDE)}"\.\corba.h"\

-	{$(INCLUDE)}"\.\corbacom.h"\

-	{$(INCLUDE)}"\.\corbacom.i"\

-	{$(INCLUDE)}"\.\debug.h"\

-	{$(INCLUDE)}"\.\default_client.h"\

-	{$(INCLUDE)}"\.\default_client.i"\

-	{$(INCLUDE)}"\.\default_server.h"\

-	{$(INCLUDE)}"\.\default_server.i"\

-	{$(INCLUDE)}"\.\except.h"\

-	{$(INCLUDE)}"\.\giop.h"\

-	{$(INCLUDE)}"\.\giop.i"\

-	{$(INCLUDE)}"\.\iiopobj.h"\

-	{$(INCLUDE)}"\.\iiopobj.i"\

-	{$(INCLUDE)}"\.\iioporb.h"\

-	{$(INCLUDE)}"\.\iioporb.i"\

-	{$(INCLUDE)}"\.\marshal.h"\

-	{$(INCLUDE)}"\.\marshal.i"\

-	{$(INCLUDE)}"\.\nvlist.h"\

-	{$(INCLUDE)}"\.\object.h"\

-	{$(INCLUDE)}"\.\object.i"\

-	{$(INCLUDE)}"\.\objtable.h"\

-	{$(INCLUDE)}"\.\optable.h"\

-	{$(INCLUDE)}"\.\orb.h"\

-	{$(INCLUDE)}"\.\orb_core.h"\

-	{$(INCLUDE)}"\.\orb_core.i"\

-	{$(INCLUDE)}"\.\orbconf.h"\

-	{$(INCLUDE)}"\.\orbobj.h"\

-	{$(INCLUDE)}"\.\orbobj.i"\

-	{$(INCLUDE)}"\.\params.h"\

-	{$(INCLUDE)}"\.\params.i"\

-	{$(INCLUDE)}"\.\poa.h"\

-	{$(INCLUDE)}"\.\poa.i"\

-	{$(INCLUDE)}"\.\principa.h"\

-	{$(INCLUDE)}"\.\request.h"\

-	{$(INCLUDE)}"\.\sequence.h"\

-	{$(INCLUDE)}"\.\sequence.i"\

-	{$(INCLUDE)}"\.\server_factory.h"\

-	{$(INCLUDE)}"\.\server_factory.i"\

-	{$(INCLUDE)}"\.\singletons.h"\

-	{$(INCLUDE)}"\.\stub.h"\

-	{$(INCLUDE)}"\.\stub.i"\

-	{$(INCLUDE)}"\.\svrrqst.h"\

-	{$(INCLUDE)}"\.\svrrqst.i"\

-	{$(INCLUDE)}"\.\typecode.h"\

-	{$(INCLUDE)}"\.\typecode.i"\

-	{$(INCLUDE)}"\.\varout.h"\

-	{$(INCLUDE)}"\ace\Acceptor.cpp"\

-	{$(INCLUDE)}"\ace\Acceptor.h"\

-	{$(INCLUDE)}"\ace\Acceptor.i"\

-	{$(INCLUDE)}"\ace\ACE.h"\

-	{$(INCLUDE)}"\ace\ACE.i"\

-	{$(INCLUDE)}"\ace\Addr.h"\

-	{$(INCLUDE)}"\ace\Addr.i"\

-	{$(INCLUDE)}"\ace\Atomic_Op.i"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.cpp"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.h"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.i"\

-	{$(INCLUDE)}"\ace\config-win32-common.h"\

-	{$(INCLUDE)}"\ace\Config.h"\

-	{$(INCLUDE)}"\ace\Connector.cpp"\

-	{$(INCLUDE)}"\ace\Connector.h"\

-	{$(INCLUDE)}"\ace\Connector.i"\

-	{$(INCLUDE)}"\ace\Containers.cpp"\

-	{$(INCLUDE)}"\ace\Containers.h"\

-	{$(INCLUDE)}"\ace\Containers.i"\

-	{$(INCLUDE)}"\ace\Dynamic.h"\

-	{$(INCLUDE)}"\ace\Dynamic.i"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.cpp"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.i"\

-	{$(INCLUDE)}"\ace\Free_List.cpp"\

-	{$(INCLUDE)}"\ace\Free_List.h"\

-	{$(INCLUDE)}"\ace\Free_List.i"\

-	{$(INCLUDE)}"\ace\Get_Opt.h"\

-	{$(INCLUDE)}"\ace\Get_Opt.i"\

-	{$(INCLUDE)}"\ace\Handle_Set.h"\

-	{$(INCLUDE)}"\ace\Handle_Set.i"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.i"\

-	{$(INCLUDE)}"\ace\IO_Cntl_Msg.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.i"\

-	{$(INCLUDE)}"\ace\Log_Msg.h"\

-	{$(INCLUDE)}"\ace\Log_Priority.h"\

-	{$(INCLUDE)}"\ace\Log_Record.h"\

-	{$(INCLUDE)}"\ace\Log_Record.i"\

-	{$(INCLUDE)}"\ace\Malloc.h"\

-	{$(INCLUDE)}"\ace\Malloc.i"\

-	{$(INCLUDE)}"\ace\Malloc_T.cpp"\

-	{$(INCLUDE)}"\ace\Malloc_T.h"\

-	{$(INCLUDE)}"\ace\Malloc_T.i"\

-	{$(INCLUDE)}"\ace\Managed_Object.cpp"\

-	{$(INCLUDE)}"\ace\Managed_Object.h"\

-	{$(INCLUDE)}"\ace\Managed_Object.i"\

-	{$(INCLUDE)}"\ace\Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Map_Manager.h"\

-	{$(INCLUDE)}"\ace\Map_Manager.i"\

-	{$(INCLUDE)}"\ace\Mem_Map.h"\

-	{$(INCLUDE)}"\ace\Mem_Map.i"\

-	{$(INCLUDE)}"\ace\Memory_Pool.h"\

-	{$(INCLUDE)}"\ace\Memory_Pool.i"\

-	{$(INCLUDE)}"\ace\Message_Block.h"\

-	{$(INCLUDE)}"\ace\Message_Block.i"\

-	{$(INCLUDE)}"\ace\Message_Queue.cpp"\

-	{$(INCLUDE)}"\ace\Message_Queue.h"\

-	{$(INCLUDE)}"\ace\Message_Queue.i"\

-	{$(INCLUDE)}"\ace\Module.cpp"\

-	{$(INCLUDE)}"\ace\Module.h"\

-	{$(INCLUDE)}"\ace\Module.i"\

-	{$(INCLUDE)}"\ace\Object_Manager.h"\

-	{$(INCLUDE)}"\ace\Object_Manager.i"\

-	{$(INCLUDE)}"\ace\OS.h"\

-	{$(INCLUDE)}"\ace\OS.i"\

-	{$(INCLUDE)}"\ace\Reactor.h"\

-	{$(INCLUDE)}"\ace\Reactor.i"\

-	{$(INCLUDE)}"\ace\Reactor_Impl.h"\

-	{$(INCLUDE)}"\ace\Service_Config.h"\

-	{$(INCLUDE)}"\ace\Service_Config.i"\

-	{$(INCLUDE)}"\ace\Service_Object.h"\

-	{$(INCLUDE)}"\ace\Service_Object.i"\

-	{$(INCLUDE)}"\ace\Service_Repository.h"\

-	{$(INCLUDE)}"\ace\Service_Repository.i"\

-	{$(INCLUDE)}"\ace\Service_Types.h"\

-	{$(INCLUDE)}"\ace\Service_Types.i"\

-	{$(INCLUDE)}"\ace\Shared_Object.h"\

-	{$(INCLUDE)}"\ace\Shared_Object.i"\

-	{$(INCLUDE)}"\ace\Signal.h"\

-	{$(INCLUDE)}"\ace\Signal.i"\

-	{$(INCLUDE)}"\ace\Singleton.cpp"\

-	{$(INCLUDE)}"\ace\Singleton.h"\

-	{$(INCLUDE)}"\ace\Singleton.i"\

-	{$(INCLUDE)}"\ace\SOCK.h"\

-	{$(INCLUDE)}"\ace\SOCK.i"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.h"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.i"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.h"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.i"\

-	{$(INCLUDE)}"\ace\SOCK_IO.h"\

-	{$(INCLUDE)}"\ace\SOCK_IO.i"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.h"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.i"\

-	{$(INCLUDE)}"\ace\SString.h"\

-	{$(INCLUDE)}"\ace\SString.i"\

-	{$(INCLUDE)}"\ace\stdcpp.h"\

-	{$(INCLUDE)}"\ace\Strategies.h"\

-	{$(INCLUDE)}"\ace\Strategies_T.cpp"\

-	{$(INCLUDE)}"\ace\Strategies_T.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.cpp"\

-	{$(INCLUDE)}"\ace\Stream_Modules.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.i"\

-	{$(INCLUDE)}"\ace\Svc_Conf_Tokens.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.cpp"\

-	{$(INCLUDE)}"\ace\Svc_Handler.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.i"\

-	{$(INCLUDE)}"\ace\Synch.h"\

-	{$(INCLUDE)}"\ace\Synch.i"\

-	{$(INCLUDE)}"\ace\Synch_Options.h"\

-	{$(INCLUDE)}"\ace\Synch_T.cpp"\

-	{$(INCLUDE)}"\ace\Synch_T.h"\

-	{$(INCLUDE)}"\ace\Synch_T.i"\

-	{$(INCLUDE)}"\ace\Task.h"\

-	{$(INCLUDE)}"\ace\Task.i"\

-	{$(INCLUDE)}"\ace\Task_T.cpp"\

-	{$(INCLUDE)}"\ace\Task_T.h"\

-	{$(INCLUDE)}"\ace\Task_T.i"\

-	{$(INCLUDE)}"\ace\Thread.h"\

-	{$(INCLUDE)}"\ace\Thread.i"\

-	{$(INCLUDE)}"\ace\Thread_Manager.h"\

-	{$(INCLUDE)}"\ace\Thread_Manager.i"\

-	{$(INCLUDE)}"\ace\Time_Value.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.cpp"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.i"\

-	{$(INCLUDE)}"\ace\Trace.h"\

-	{$(INCLUDE)}"\ace\Version.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.i"\

-	{$(INCLUDE)}"\ace\ws2tcpip.h"\

-	

-NODEP_CPP_OBJTA=\

-	".\tao\factories.h"\

-	

-

-"$(INTDIR)\objtable.obj" : $(SOURCE) $(DEP_CPP_OBJTA) "$(INTDIR)"

-

-

-!ELSEIF  "$(CFG)" == "TAO - Win32 Debug"

-

-DEP_CPP_OBJTA=\

-	"..\..\ace\config-win32.h"\

-	{$(INCLUDE)}"\.\align.h"\

-	{$(INCLUDE)}"\.\any.h"\

-	{$(INCLUDE)}"\.\any.i"\

-	{$(INCLUDE)}"\.\cdr.h"\

-	{$(INCLUDE)}"\.\cdr.i"\

-	{$(INCLUDE)}"\.\client_factory.h"\

-	{$(INCLUDE)}"\.\client_factory.i"\

-	{$(INCLUDE)}"\.\connect.h"\

-	{$(INCLUDE)}"\.\connect.i"\

-	{$(INCLUDE)}"\.\corba.h"\

-	{$(INCLUDE)}"\.\corbacom.h"\

-	{$(INCLUDE)}"\.\corbacom.i"\

-	{$(INCLUDE)}"\.\debug.h"\

-	{$(INCLUDE)}"\.\default_client.h"\

-	{$(INCLUDE)}"\.\default_client.i"\

-	{$(INCLUDE)}"\.\default_server.h"\

-	{$(INCLUDE)}"\.\default_server.i"\

-	{$(INCLUDE)}"\.\except.h"\

-	{$(INCLUDE)}"\.\giop.h"\

-	{$(INCLUDE)}"\.\giop.i"\

-	{$(INCLUDE)}"\.\iiopobj.h"\

-	{$(INCLUDE)}"\.\iiopobj.i"\

-	{$(INCLUDE)}"\.\iioporb.h"\

-	{$(INCLUDE)}"\.\iioporb.i"\

-	{$(INCLUDE)}"\.\marshal.h"\

-	{$(INCLUDE)}"\.\marshal.i"\

-	{$(INCLUDE)}"\.\nvlist.h"\

-	{$(INCLUDE)}"\.\object.h"\

-	{$(INCLUDE)}"\.\object.i"\

-	{$(INCLUDE)}"\.\objtable.h"\

-	{$(INCLUDE)}"\.\optable.h"\

-	{$(INCLUDE)}"\.\orb.h"\

-	{$(INCLUDE)}"\.\orb_core.h"\

-	{$(INCLUDE)}"\.\orb_core.i"\

-	{$(INCLUDE)}"\.\orbconf.h"\

-	{$(INCLUDE)}"\.\orbobj.h"\

-	{$(INCLUDE)}"\.\orbobj.i"\

-	{$(INCLUDE)}"\.\params.h"\

-	{$(INCLUDE)}"\.\params.i"\

-	{$(INCLUDE)}"\.\poa.h"\

-	{$(INCLUDE)}"\.\poa.i"\

-	{$(INCLUDE)}"\.\principa.h"\

-	{$(INCLUDE)}"\.\request.h"\

-	{$(INCLUDE)}"\.\sequence.h"\

-	{$(INCLUDE)}"\.\sequence.i"\

-	{$(INCLUDE)}"\.\server_factory.h"\

-	{$(INCLUDE)}"\.\server_factory.i"\

-	{$(INCLUDE)}"\.\singletons.h"\

-	{$(INCLUDE)}"\.\stub.h"\

-	{$(INCLUDE)}"\.\stub.i"\

-	{$(INCLUDE)}"\.\svrrqst.h"\

-	{$(INCLUDE)}"\.\svrrqst.i"\

-	{$(INCLUDE)}"\.\typecode.h"\

-	{$(INCLUDE)}"\.\typecode.i"\

-	{$(INCLUDE)}"\.\varout.h"\

-	{$(INCLUDE)}"\ace\Acceptor.cpp"\

-	{$(INCLUDE)}"\ace\Acceptor.h"\

-	{$(INCLUDE)}"\ace\Acceptor.i"\

-	{$(INCLUDE)}"\ace\ACE.h"\

-	{$(INCLUDE)}"\ace\ACE.i"\

-	{$(INCLUDE)}"\ace\Addr.h"\

-	{$(INCLUDE)}"\ace\Addr.i"\

-	{$(INCLUDE)}"\ace\Atomic_Op.i"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.cpp"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.h"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.i"\

-	{$(INCLUDE)}"\ace\config-win32-common.h"\

-	{$(INCLUDE)}"\ace\Config.h"\

-	{$(INCLUDE)}"\ace\Connector.cpp"\

-	{$(INCLUDE)}"\ace\Connector.h"\

-	{$(INCLUDE)}"\ace\Connector.i"\

-	{$(INCLUDE)}"\ace\Containers.cpp"\

-	{$(INCLUDE)}"\ace\Containers.h"\

-	{$(INCLUDE)}"\ace\Containers.i"\

-	{$(INCLUDE)}"\ace\Dynamic.h"\

-	{$(INCLUDE)}"\ace\Dynamic.i"\

-	{$(INCLUDE)}"\ace\Event_Handler.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.i"\

-	{$(INCLUDE)}"\ace\Free_List.cpp"\

-	{$(INCLUDE)}"\ace\Free_List.h"\

-	{$(INCLUDE)}"\ace\Free_List.i"\

-	{$(INCLUDE)}"\ace\Get_Opt.h"\

-	{$(INCLUDE)}"\ace\Get_Opt.i"\

-	{$(INCLUDE)}"\ace\Handle_Set.h"\

-	{$(INCLUDE)}"\ace\Handle_Set.i"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.i"\

-	{$(INCLUDE)}"\ace\IO_Cntl_Msg.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.i"\

-	{$(INCLUDE)}"\ace\Log_Msg.h"\

-	{$(INCLUDE)}"\ace\Log_Priority.h"\

-	{$(INCLUDE)}"\ace\Log_Record.h"\

-	{$(INCLUDE)}"\ace\Log_Record.i"\

-	{$(INCLUDE)}"\ace\Malloc.h"\

-	{$(INCLUDE)}"\ace\Malloc.i"\

-	{$(INCLUDE)}"\ace\Malloc_T.cpp"\

-	{$(INCLUDE)}"\ace\Malloc_T.h"\

-	{$(INCLUDE)}"\ace\Malloc_T.i"\

-	{$(INCLUDE)}"\ace\Managed_Object.cpp"\

-	{$(INCLUDE)}"\ace\Managed_Object.h"\

-	{$(INCLUDE)}"\ace\Managed_Object.i"\

-	{$(INCLUDE)}"\ace\Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Map_Manager.h"\

-	{$(INCLUDE)}"\ace\Map_Manager.i"\

-	{$(INCLUDE)}"\ace\Mem_Map.h"\

-	{$(INCLUDE)}"\ace\Mem_Map.i"\

-	{$(INCLUDE)}"\ace\Memory_Pool.h"\

-	{$(INCLUDE)}"\ace\Memory_Pool.i"\

-	{$(INCLUDE)}"\ace\Message_Block.h"\

-	{$(INCLUDE)}"\ace\Message_Block.i"\

-	{$(INCLUDE)}"\ace\Message_Queue.cpp"\

-	{$(INCLUDE)}"\ace\Message_Queue.h"\

-	{$(INCLUDE)}"\ace\Message_Queue.i"\

-	{$(INCLUDE)}"\ace\Module.cpp"\

-	{$(INCLUDE)}"\ace\Module.h"\

-	{$(INCLUDE)}"\ace\Module.i"\

-	{$(INCLUDE)}"\ace\Object_Manager.h"\

-	{$(INCLUDE)}"\ace\Object_Manager.i"\

-	{$(INCLUDE)}"\ace\OS.h"\

-	{$(INCLUDE)}"\ace\OS.i"\

-	{$(INCLUDE)}"\ace\Reactor.h"\

-	{$(INCLUDE)}"\ace\Reactor.i"\

-	{$(INCLUDE)}"\ace\Reactor_Impl.h"\

-	{$(INCLUDE)}"\ace\Service_Config.h"\

-	{$(INCLUDE)}"\ace\Service_Config.i"\

-	{$(INCLUDE)}"\ace\Service_Object.h"\

-	{$(INCLUDE)}"\ace\Service_Object.i"\

-	{$(INCLUDE)}"\ace\Service_Types.h"\

-	{$(INCLUDE)}"\ace\Service_Types.i"\

-	{$(INCLUDE)}"\ace\Shared_Object.h"\

-	{$(INCLUDE)}"\ace\Shared_Object.i"\

-	{$(INCLUDE)}"\ace\Signal.h"\

-	{$(INCLUDE)}"\ace\Signal.i"\

-	{$(INCLUDE)}"\ace\Singleton.cpp"\

-	{$(INCLUDE)}"\ace\Singleton.h"\

-	{$(INCLUDE)}"\ace\Singleton.i"\

-	{$(INCLUDE)}"\ace\SOCK.h"\

-	{$(INCLUDE)}"\ace\SOCK.i"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.h"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.i"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.h"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.i"\

-	{$(INCLUDE)}"\ace\SOCK_IO.h"\

-	{$(INCLUDE)}"\ace\SOCK_IO.i"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.h"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.i"\

-	{$(INCLUDE)}"\ace\SString.h"\

-	{$(INCLUDE)}"\ace\SString.i"\

-	{$(INCLUDE)}"\ace\stdcpp.h"\

-	{$(INCLUDE)}"\ace\Strategies.h"\

-	{$(INCLUDE)}"\ace\Strategies_T.cpp"\

-	{$(INCLUDE)}"\ace\Strategies_T.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.cpp"\

-	{$(INCLUDE)}"\ace\Stream_Modules.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.i"\

-	{$(INCLUDE)}"\ace\Svc_Conf_Tokens.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.cpp"\

-	{$(INCLUDE)}"\ace\Svc_Handler.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.i"\

-	{$(INCLUDE)}"\ace\Synch.h"\

-	{$(INCLUDE)}"\ace\Synch.i"\

-	{$(INCLUDE)}"\ace\Synch_Options.h"\

-	{$(INCLUDE)}"\ace\Synch_T.cpp"\

-	{$(INCLUDE)}"\ace\Synch_T.h"\

-	{$(INCLUDE)}"\ace\Synch_T.i"\

-	{$(INCLUDE)}"\ace\Task.h"\

-	{$(INCLUDE)}"\ace\Task.i"\

-	{$(INCLUDE)}"\ace\Task_T.cpp"\

-	{$(INCLUDE)}"\ace\Task_T.h"\

-	{$(INCLUDE)}"\ace\Task_T.i"\

-	{$(INCLUDE)}"\ace\Thread.h"\

-	{$(INCLUDE)}"\ace\Thread.i"\

-	{$(INCLUDE)}"\ace\Thread_Manager.h"\

-	{$(INCLUDE)}"\ace\Thread_Manager.i"\

-	{$(INCLUDE)}"\ace\Time_Value.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.cpp"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.i"\

-	{$(INCLUDE)}"\ace\Trace.h"\

-	{$(INCLUDE)}"\ace\Version.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.i"\

-	{$(INCLUDE)}"\ace\ws2tcpip.h"\

-	

-NODEP_CPP_OBJTA=\

-	".\tao\factories.h"\

-	

-

-"$(INTDIR)\objtable.obj" : $(SOURCE) $(DEP_CPP_OBJTA) "$(INTDIR)"

-

-

-!ENDIF 

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\optable.cpp

-DEP_CPP_OPTAB=\

-	"..\..\ace\config-win32.h"\

-	{$(INCLUDE)}"\.\align.h"\

-	{$(INCLUDE)}"\.\any.h"\

-	{$(INCLUDE)}"\.\any.i"\

-	{$(INCLUDE)}"\.\cdr.h"\

-	{$(INCLUDE)}"\.\cdr.i"\

-	{$(INCLUDE)}"\.\client_factory.h"\

-	{$(INCLUDE)}"\.\connect.h"\

-	{$(INCLUDE)}"\.\connect.i"\

-	{$(INCLUDE)}"\.\corba.h"\

-	{$(INCLUDE)}"\.\corbacom.h"\

-	{$(INCLUDE)}"\.\corbacom.i"\

-	{$(INCLUDE)}"\.\debug.h"\

-	{$(INCLUDE)}"\.\default_client.h"\

-	{$(INCLUDE)}"\.\default_client.i"\

-	{$(INCLUDE)}"\.\default_server.h"\

-	{$(INCLUDE)}"\.\default_server.i"\

-	{$(INCLUDE)}"\.\except.h"\

-	{$(INCLUDE)}"\.\giop.h"\

-	{$(INCLUDE)}"\.\giop.i"\

-	{$(INCLUDE)}"\.\iiopobj.h"\

-	{$(INCLUDE)}"\.\iiopobj.i"\

-	{$(INCLUDE)}"\.\iioporb.h"\

-	{$(INCLUDE)}"\.\iioporb.i"\

-	{$(INCLUDE)}"\.\marshal.h"\

-	{$(INCLUDE)}"\.\marshal.i"\

-	{$(INCLUDE)}"\.\nvlist.h"\

-	{$(INCLUDE)}"\.\object.h"\

-	{$(INCLUDE)}"\.\object.i"\

-	{$(INCLUDE)}"\.\objtable.h"\

-	{$(INCLUDE)}"\.\optable.h"\

-	{$(INCLUDE)}"\.\orb.h"\

-	{$(INCLUDE)}"\.\orb_core.h"\

-	{$(INCLUDE)}"\.\orb_core.i"\

-	{$(INCLUDE)}"\.\orbconf.h"\

-	{$(INCLUDE)}"\.\orbobj.h"\

-	{$(INCLUDE)}"\.\orbobj.i"\

-	{$(INCLUDE)}"\.\params.h"\

-	{$(INCLUDE)}"\.\params.i"\

-	{$(INCLUDE)}"\.\poa.h"\

-	{$(INCLUDE)}"\.\poa.i"\

-	{$(INCLUDE)}"\.\principa.h"\

-	{$(INCLUDE)}"\.\request.h"\

-	{$(INCLUDE)}"\.\sequence.h"\

-	{$(INCLUDE)}"\.\sequence.i"\

-	{$(INCLUDE)}"\.\server_factory.h"\

-	{$(INCLUDE)}"\.\server_factory.i"\

-	{$(INCLUDE)}"\.\singletons.h"\

-	{$(INCLUDE)}"\.\stub.h"\

-	{$(INCLUDE)}"\.\stub.i"\

-	{$(INCLUDE)}"\.\svrrqst.h"\

-	{$(INCLUDE)}"\.\typecode.h"\

-	{$(INCLUDE)}"\.\typecode.i"\

-	{$(INCLUDE)}"\.\varout.h"\

-	{$(INCLUDE)}"\ace\Acceptor.cpp"\

-	{$(INCLUDE)}"\ace\Acceptor.h"\

-	{$(INCLUDE)}"\ace\Acceptor.i"\

-	{$(INCLUDE)}"\ace\ACE.h"\

-	{$(INCLUDE)}"\ace\ACE.i"\

-	{$(INCLUDE)}"\ace\Addr.h"\

-	{$(INCLUDE)}"\ace\Addr.i"\

-	{$(INCLUDE)}"\ace\Atomic_Op.i"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.cpp"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.h"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.i"\

-	{$(INCLUDE)}"\ace\config-win32-common.h"\

-	{$(INCLUDE)}"\ace\Config.h"\

-	{$(INCLUDE)}"\ace\Connector.cpp"\

-	{$(INCLUDE)}"\ace\Connector.h"\

-	{$(INCLUDE)}"\ace\Connector.i"\

-	{$(INCLUDE)}"\ace\Containers.cpp"\

-	{$(INCLUDE)}"\ace\Containers.h"\

-	{$(INCLUDE)}"\ace\Containers.i"\

-	{$(INCLUDE)}"\ace\Dynamic.h"\

-	{$(INCLUDE)}"\ace\Dynamic.i"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.cpp"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.i"\

-	{$(INCLUDE)}"\ace\Free_List.cpp"\

-	{$(INCLUDE)}"\ace\Free_List.h"\

-	{$(INCLUDE)}"\ace\Free_List.i"\

-	{$(INCLUDE)}"\ace\Get_Opt.h"\

-	{$(INCLUDE)}"\ace\Get_Opt.i"\

-	{$(INCLUDE)}"\ace\Handle_Set.h"\

-	{$(INCLUDE)}"\ace\Handle_Set.i"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.i"\

-	{$(INCLUDE)}"\ace\IO_Cntl_Msg.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.i"\

-	{$(INCLUDE)}"\ace\Log_Msg.h"\

-	{$(INCLUDE)}"\ace\Log_Priority.h"\

-	{$(INCLUDE)}"\ace\Log_Record.h"\

-	{$(INCLUDE)}"\ace\Log_Record.i"\

-	{$(INCLUDE)}"\ace\Malloc.h"\

-	{$(INCLUDE)}"\ace\Malloc.i"\

-	{$(INCLUDE)}"\ace\Malloc_T.cpp"\

-	{$(INCLUDE)}"\ace\Malloc_T.h"\

-	{$(INCLUDE)}"\ace\Malloc_T.i"\

-	{$(INCLUDE)}"\ace\Managed_Object.cpp"\

-	{$(INCLUDE)}"\ace\Managed_Object.h"\

-	{$(INCLUDE)}"\ace\Managed_Object.i"\

-	{$(INCLUDE)}"\ace\Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Map_Manager.h"\

-	{$(INCLUDE)}"\ace\Map_Manager.i"\

-	{$(INCLUDE)}"\ace\Mem_Map.h"\

-	{$(INCLUDE)}"\ace\Mem_Map.i"\

-	{$(INCLUDE)}"\ace\Memory_Pool.h"\

-	{$(INCLUDE)}"\ace\Memory_Pool.i"\

-	{$(INCLUDE)}"\ace\Message_Block.h"\

-	{$(INCLUDE)}"\ace\Message_Block.i"\

-	{$(INCLUDE)}"\ace\Message_Queue.cpp"\

-	{$(INCLUDE)}"\ace\Message_Queue.h"\

-	{$(INCLUDE)}"\ace\Message_Queue.i"\

-	{$(INCLUDE)}"\ace\Module.cpp"\

-	{$(INCLUDE)}"\ace\Module.h"\

-	{$(INCLUDE)}"\ace\Module.i"\

-	{$(INCLUDE)}"\ace\Object_Manager.h"\

-	{$(INCLUDE)}"\ace\Object_Manager.i"\

-	{$(INCLUDE)}"\ace\OS.h"\

-	{$(INCLUDE)}"\ace\OS.i"\

-	{$(INCLUDE)}"\ace\Reactor.h"\

-	{$(INCLUDE)}"\ace\Reactor.i"\

-	{$(INCLUDE)}"\ace\Reactor_Impl.h"\

-	{$(INCLUDE)}"\ace\Service_Config.h"\

-	{$(INCLUDE)}"\ace\Service_Config.i"\

-	{$(INCLUDE)}"\ace\Service_Object.h"\

-	{$(INCLUDE)}"\ace\Service_Object.i"\

-	{$(INCLUDE)}"\ace\Service_Repository.h"\

-	{$(INCLUDE)}"\ace\Service_Repository.i"\

-	{$(INCLUDE)}"\ace\Service_Types.h"\

-	{$(INCLUDE)}"\ace\Service_Types.i"\

-	{$(INCLUDE)}"\ace\Shared_Object.h"\

-	{$(INCLUDE)}"\ace\Shared_Object.i"\

-	{$(INCLUDE)}"\ace\Signal.h"\

-	{$(INCLUDE)}"\ace\Signal.i"\

-	{$(INCLUDE)}"\ace\Singleton.cpp"\

-	{$(INCLUDE)}"\ace\Singleton.h"\

-	{$(INCLUDE)}"\ace\Singleton.i"\

-	{$(INCLUDE)}"\ace\SOCK.h"\

-	{$(INCLUDE)}"\ace\SOCK.i"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.h"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.i"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.h"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.i"\

-	{$(INCLUDE)}"\ace\SOCK_IO.h"\

-	{$(INCLUDE)}"\ace\SOCK_IO.i"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.h"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.i"\

-	{$(INCLUDE)}"\ace\SString.h"\

-	{$(INCLUDE)}"\ace\SString.i"\

-	{$(INCLUDE)}"\ace\stdcpp.h"\

-	{$(INCLUDE)}"\ace\Strategies.h"\

-	{$(INCLUDE)}"\ace\Strategies_T.cpp"\

-	{$(INCLUDE)}"\ace\Strategies_T.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.cpp"\

-	{$(INCLUDE)}"\ace\Stream_Modules.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.i"\

-	{$(INCLUDE)}"\ace\Svc_Conf_Tokens.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.cpp"\

-	{$(INCLUDE)}"\ace\Svc_Handler.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.i"\

-	{$(INCLUDE)}"\ace\Synch.h"\

-	{$(INCLUDE)}"\ace\Synch.i"\

-	{$(INCLUDE)}"\ace\Synch_Options.h"\

-	{$(INCLUDE)}"\ace\Synch_T.cpp"\

-	{$(INCLUDE)}"\ace\Synch_T.h"\

-	{$(INCLUDE)}"\ace\Synch_T.i"\

-	{$(INCLUDE)}"\ace\Task.h"\

-	{$(INCLUDE)}"\ace\Task.i"\

-	{$(INCLUDE)}"\ace\Task_T.cpp"\

-	{$(INCLUDE)}"\ace\Task_T.h"\

-	{$(INCLUDE)}"\ace\Task_T.i"\

-	{$(INCLUDE)}"\ace\Thread.h"\

-	{$(INCLUDE)}"\ace\Thread.i"\

-	{$(INCLUDE)}"\ace\Thread_Manager.h"\

-	{$(INCLUDE)}"\ace\Thread_Manager.i"\

-	{$(INCLUDE)}"\ace\Time_Value.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.cpp"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.i"\

-	{$(INCLUDE)}"\ace\Trace.h"\

-	{$(INCLUDE)}"\ace\Version.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.i"\

-	{$(INCLUDE)}"\ace\ws2tcpip.h"\

-	

-NODEP_CPP_OPTAB=\

-	".\tao\factories.h"\

-	

-

-"$(INTDIR)\optable.obj" : $(SOURCE) $(DEP_CPP_OPTAB) "$(INTDIR)"

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\orb_core.cpp

-

-!IF  "$(CFG)" == "TAO - Win32 Release"

-

-DEP_CPP_ORB_C=\

-	"..\..\ace\config-win32.h"\

-	{$(INCLUDE)}"\.\align.h"\

-	{$(INCLUDE)}"\.\any.h"\

-	{$(INCLUDE)}"\.\any.i"\

-	{$(INCLUDE)}"\.\cdr.h"\

-	{$(INCLUDE)}"\.\cdr.i"\

-	{$(INCLUDE)}"\.\client_factory.h"\

-	{$(INCLUDE)}"\.\connect.h"\

-	{$(INCLUDE)}"\.\connect.i"\

-	{$(INCLUDE)}"\.\corba.h"\

-	{$(INCLUDE)}"\.\corbacom.h"\

-	{$(INCLUDE)}"\.\corbacom.i"\

-	{$(INCLUDE)}"\.\debug.h"\

-	{$(INCLUDE)}"\.\default_client.h"\

-	{$(INCLUDE)}"\.\default_client.i"\

-	{$(INCLUDE)}"\.\default_server.h"\

-	{$(INCLUDE)}"\.\default_server.i"\

-	{$(INCLUDE)}"\.\except.h"\

-	{$(INCLUDE)}"\.\giop.h"\

-	{$(INCLUDE)}"\.\giop.i"\

-	{$(INCLUDE)}"\.\iiopobj.h"\

-	{$(INCLUDE)}"\.\iiopobj.i"\

-	{$(INCLUDE)}"\.\iioporb.h"\

-	{$(INCLUDE)}"\.\iioporb.i"\

-	{$(INCLUDE)}"\.\marshal.h"\

-	{$(INCLUDE)}"\.\marshal.i"\

-	{$(INCLUDE)}"\.\nvlist.h"\

-	{$(INCLUDE)}"\.\object.h"\

-	{$(INCLUDE)}"\.\object.i"\

-	{$(INCLUDE)}"\.\objtable.h"\

-	{$(INCLUDE)}"\.\optable.h"\

-	{$(INCLUDE)}"\.\orb.h"\

-	{$(INCLUDE)}"\.\orb_core.h"\

-	{$(INCLUDE)}"\.\orb_core.i"\

-	{$(INCLUDE)}"\.\orbconf.h"\

-	{$(INCLUDE)}"\.\orbobj.h"\

-	{$(INCLUDE)}"\.\orbobj.i"\

-	{$(INCLUDE)}"\.\params.h"\

-	{$(INCLUDE)}"\.\params.i"\

-	{$(INCLUDE)}"\.\poa.h"\

-	{$(INCLUDE)}"\.\poa.i"\

-	{$(INCLUDE)}"\.\principa.h"\

-	{$(INCLUDE)}"\.\request.h"\

-	{$(INCLUDE)}"\.\sequence.h"\

-	{$(INCLUDE)}"\.\sequence.i"\

-	{$(INCLUDE)}"\.\server_factory.h"\

-	{$(INCLUDE)}"\.\server_factory.i"\

-	{$(INCLUDE)}"\.\singletons.h"\

-	{$(INCLUDE)}"\.\stub.h"\

-	{$(INCLUDE)}"\.\stub.i"\

-	{$(INCLUDE)}"\.\svrrqst.h"\

-	{$(INCLUDE)}"\.\tao_internals.h"\

-	{$(INCLUDE)}"\.\typecode.h"\

-	{$(INCLUDE)}"\.\typecode.i"\

-	{$(INCLUDE)}"\.\varout.h"\

-	{$(INCLUDE)}"\ace\Acceptor.cpp"\

-	{$(INCLUDE)}"\ace\Acceptor.h"\

-	{$(INCLUDE)}"\ace\Acceptor.i"\

-	{$(INCLUDE)}"\ace\ACE.h"\

-	{$(INCLUDE)}"\ace\ACE.i"\

-	{$(INCLUDE)}"\ace\Addr.h"\

-	{$(INCLUDE)}"\ace\Addr.i"\

-	{$(INCLUDE)}"\ace\Atomic_Op.i"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.cpp"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.h"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.i"\

-	{$(INCLUDE)}"\ace\config-win32-common.h"\

-	{$(INCLUDE)}"\ace\Config.h"\

-	{$(INCLUDE)}"\ace\Connector.cpp"\

-	{$(INCLUDE)}"\ace\Connector.h"\

-	{$(INCLUDE)}"\ace\Connector.i"\

-	{$(INCLUDE)}"\ace\Containers.cpp"\

-	{$(INCLUDE)}"\ace\Containers.h"\

-	{$(INCLUDE)}"\ace\Containers.i"\

-	{$(INCLUDE)}"\ace\Dynamic.h"\

-	{$(INCLUDE)}"\ace\Dynamic.i"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.cpp"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.i"\

-	{$(INCLUDE)}"\ace\Free_List.cpp"\

-	{$(INCLUDE)}"\ace\Free_List.h"\

-	{$(INCLUDE)}"\ace\Free_List.i"\

-	{$(INCLUDE)}"\ace\Get_Opt.h"\

-	{$(INCLUDE)}"\ace\Get_Opt.i"\

-	{$(INCLUDE)}"\ace\Handle_Set.h"\

-	{$(INCLUDE)}"\ace\Handle_Set.i"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.i"\

-	{$(INCLUDE)}"\ace\IO_Cntl_Msg.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.i"\

-	{$(INCLUDE)}"\ace\Log_Msg.h"\

-	{$(INCLUDE)}"\ace\Log_Priority.h"\

-	{$(INCLUDE)}"\ace\Log_Record.h"\

-	{$(INCLUDE)}"\ace\Log_Record.i"\

-	{$(INCLUDE)}"\ace\Malloc.h"\

-	{$(INCLUDE)}"\ace\Malloc.i"\

-	{$(INCLUDE)}"\ace\Malloc_T.cpp"\

-	{$(INCLUDE)}"\ace\Malloc_T.h"\

-	{$(INCLUDE)}"\ace\Malloc_T.i"\

-	{$(INCLUDE)}"\ace\Managed_Object.cpp"\

-	{$(INCLUDE)}"\ace\Managed_Object.h"\

-	{$(INCLUDE)}"\ace\Managed_Object.i"\

-	{$(INCLUDE)}"\ace\Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Map_Manager.h"\

-	{$(INCLUDE)}"\ace\Map_Manager.i"\

-	{$(INCLUDE)}"\ace\Mem_Map.h"\

-	{$(INCLUDE)}"\ace\Mem_Map.i"\

-	{$(INCLUDE)}"\ace\Memory_Pool.h"\

-	{$(INCLUDE)}"\ace\Memory_Pool.i"\

-	{$(INCLUDE)}"\ace\Message_Block.h"\

-	{$(INCLUDE)}"\ace\Message_Block.i"\

-	{$(INCLUDE)}"\ace\Message_Queue.cpp"\

-	{$(INCLUDE)}"\ace\Message_Queue.h"\

-	{$(INCLUDE)}"\ace\Message_Queue.i"\

-	{$(INCLUDE)}"\ace\Module.cpp"\

-	{$(INCLUDE)}"\ace\Module.h"\

-	{$(INCLUDE)}"\ace\Module.i"\

-	{$(INCLUDE)}"\ace\Object_Manager.h"\

-	{$(INCLUDE)}"\ace\Object_Manager.i"\

-	{$(INCLUDE)}"\ace\OS.h"\

-	{$(INCLUDE)}"\ace\OS.i"\

-	{$(INCLUDE)}"\ace\Reactor.h"\

-	{$(INCLUDE)}"\ace\Reactor.i"\

-	{$(INCLUDE)}"\ace\Reactor_Impl.h"\

-	{$(INCLUDE)}"\ace\Service_Config.h"\

-	{$(INCLUDE)}"\ace\Service_Config.i"\

-	{$(INCLUDE)}"\ace\Service_Object.h"\

-	{$(INCLUDE)}"\ace\Service_Object.i"\

-	{$(INCLUDE)}"\ace\Service_Repository.h"\

-	{$(INCLUDE)}"\ace\Service_Repository.i"\

-	{$(INCLUDE)}"\ace\Service_Types.h"\

-	{$(INCLUDE)}"\ace\Service_Types.i"\

-	{$(INCLUDE)}"\ace\Shared_Object.h"\

-	{$(INCLUDE)}"\ace\Shared_Object.i"\

-	{$(INCLUDE)}"\ace\Signal.h"\

-	{$(INCLUDE)}"\ace\Signal.i"\

-	{$(INCLUDE)}"\ace\Singleton.cpp"\

-	{$(INCLUDE)}"\ace\Singleton.h"\

-	{$(INCLUDE)}"\ace\Singleton.i"\

-	{$(INCLUDE)}"\ace\SOCK.h"\

-	{$(INCLUDE)}"\ace\SOCK.i"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.h"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.i"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.h"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.i"\

-	{$(INCLUDE)}"\ace\SOCK_IO.h"\

-	{$(INCLUDE)}"\ace\SOCK_IO.i"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.h"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.i"\

-	{$(INCLUDE)}"\ace\SString.h"\

-	{$(INCLUDE)}"\ace\SString.i"\

-	{$(INCLUDE)}"\ace\stdcpp.h"\

-	{$(INCLUDE)}"\ace\Strategies.h"\

-	{$(INCLUDE)}"\ace\Strategies_T.cpp"\

-	{$(INCLUDE)}"\ace\Strategies_T.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.cpp"\

-	{$(INCLUDE)}"\ace\Stream_Modules.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.i"\

-	{$(INCLUDE)}"\ace\Svc_Conf_Tokens.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.cpp"\

-	{$(INCLUDE)}"\ace\Svc_Handler.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.i"\

-	{$(INCLUDE)}"\ace\Synch.h"\

-	{$(INCLUDE)}"\ace\Synch.i"\

-	{$(INCLUDE)}"\ace\Synch_Options.h"\

-	{$(INCLUDE)}"\ace\Synch_T.cpp"\

-	{$(INCLUDE)}"\ace\Synch_T.h"\

-	{$(INCLUDE)}"\ace\Synch_T.i"\

-	{$(INCLUDE)}"\ace\Task.h"\

-	{$(INCLUDE)}"\ace\Task.i"\

-	{$(INCLUDE)}"\ace\Task_T.cpp"\

-	{$(INCLUDE)}"\ace\Task_T.h"\

-	{$(INCLUDE)}"\ace\Task_T.i"\

-	{$(INCLUDE)}"\ace\Thread.h"\

-	{$(INCLUDE)}"\ace\Thread.i"\

-	{$(INCLUDE)}"\ace\Thread_Manager.h"\

-	{$(INCLUDE)}"\ace\Thread_Manager.i"\

-	{$(INCLUDE)}"\ace\Time_Value.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.cpp"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.i"\

-	{$(INCLUDE)}"\ace\Trace.h"\

-	{$(INCLUDE)}"\ace\Version.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.i"\

-	{$(INCLUDE)}"\ace\ws2tcpip.h"\

-	

-

-"$(INTDIR)\orb_core.obj" : $(SOURCE) $(DEP_CPP_ORB_C) "$(INTDIR)"

-

-

-!ELSEIF  "$(CFG)" == "TAO - Win32 Debug"

-

-DEP_CPP_ORB_C=\

-	"..\..\ace\config-win32.h"\

-	{$(INCLUDE)}"\.\align.h"\

-	{$(INCLUDE)}"\.\any.h"\

-	{$(INCLUDE)}"\.\any.i"\

-	{$(INCLUDE)}"\.\cdr.h"\

-	{$(INCLUDE)}"\.\cdr.i"\

-	{$(INCLUDE)}"\.\client_factory.h"\

-	{$(INCLUDE)}"\.\connect.h"\

-	{$(INCLUDE)}"\.\connect.i"\

-	{$(INCLUDE)}"\.\corba.h"\

-	{$(INCLUDE)}"\.\corbacom.h"\

-	{$(INCLUDE)}"\.\corbacom.i"\

-	{$(INCLUDE)}"\.\debug.h"\

-	{$(INCLUDE)}"\.\default_client.h"\

-	{$(INCLUDE)}"\.\default_client.i"\

-	{$(INCLUDE)}"\.\default_server.h"\

-	{$(INCLUDE)}"\.\default_server.i"\

-	{$(INCLUDE)}"\.\except.h"\

-	{$(INCLUDE)}"\.\giop.h"\

-	{$(INCLUDE)}"\.\giop.i"\

-	{$(INCLUDE)}"\.\iiopobj.h"\

-	{$(INCLUDE)}"\.\iiopobj.i"\

-	{$(INCLUDE)}"\.\iioporb.h"\

-	{$(INCLUDE)}"\.\iioporb.i"\

-	{$(INCLUDE)}"\.\marshal.h"\

-	{$(INCLUDE)}"\.\marshal.i"\

-	{$(INCLUDE)}"\.\nvlist.h"\

-	{$(INCLUDE)}"\.\object.h"\

-	{$(INCLUDE)}"\.\object.i"\

-	{$(INCLUDE)}"\.\objtable.h"\

-	{$(INCLUDE)}"\.\optable.h"\

-	{$(INCLUDE)}"\.\orb.h"\

-	{$(INCLUDE)}"\.\orb_core.h"\

-	{$(INCLUDE)}"\.\orb_core.i"\

-	{$(INCLUDE)}"\.\orbconf.h"\

-	{$(INCLUDE)}"\.\orbobj.h"\

-	{$(INCLUDE)}"\.\orbobj.i"\

-	{$(INCLUDE)}"\.\params.h"\

-	{$(INCLUDE)}"\.\params.i"\

-	{$(INCLUDE)}"\.\poa.h"\

-	{$(INCLUDE)}"\.\poa.i"\

-	{$(INCLUDE)}"\.\principa.h"\

-	{$(INCLUDE)}"\.\request.h"\

-	{$(INCLUDE)}"\.\sequence.h"\

-	{$(INCLUDE)}"\.\sequence.i"\

-	{$(INCLUDE)}"\.\server_factory.h"\

-	{$(INCLUDE)}"\.\server_factory.i"\

-	{$(INCLUDE)}"\.\singletons.h"\

-	{$(INCLUDE)}"\.\stub.h"\

-	{$(INCLUDE)}"\.\stub.i"\

-	{$(INCLUDE)}"\.\svrrqst.h"\

-	{$(INCLUDE)}"\.\tao_internals.h"\

-	{$(INCLUDE)}"\.\typecode.h"\

-	{$(INCLUDE)}"\.\typecode.i"\

-	{$(INCLUDE)}"\.\varout.h"\

-	{$(INCLUDE)}"\ace\Acceptor.cpp"\

-	{$(INCLUDE)}"\ace\Acceptor.h"\

-	{$(INCLUDE)}"\ace\Acceptor.i"\

-	{$(INCLUDE)}"\ace\ACE.h"\

-	{$(INCLUDE)}"\ace\ACE.i"\

-	{$(INCLUDE)}"\ace\Addr.h"\

-	{$(INCLUDE)}"\ace\Addr.i"\

-	{$(INCLUDE)}"\ace\Atomic_Op.i"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.cpp"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.h"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.i"\

-	{$(INCLUDE)}"\ace\config-win32-common.h"\

-	{$(INCLUDE)}"\ace\Config.h"\

-	{$(INCLUDE)}"\ace\Connector.cpp"\

-	{$(INCLUDE)}"\ace\Connector.h"\

-	{$(INCLUDE)}"\ace\Connector.i"\

-	{$(INCLUDE)}"\ace\Containers.cpp"\

-	{$(INCLUDE)}"\ace\Containers.h"\

-	{$(INCLUDE)}"\ace\Containers.i"\

-	{$(INCLUDE)}"\ace\Dynamic.h"\

-	{$(INCLUDE)}"\ace\Dynamic.i"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.cpp"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.i"\

-	{$(INCLUDE)}"\ace\Free_List.cpp"\

-	{$(INCLUDE)}"\ace\Free_List.h"\

-	{$(INCLUDE)}"\ace\Free_List.i"\

-	{$(INCLUDE)}"\ace\Get_Opt.h"\

-	{$(INCLUDE)}"\ace\Get_Opt.i"\

-	{$(INCLUDE)}"\ace\Handle_Set.h"\

-	{$(INCLUDE)}"\ace\Handle_Set.i"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.i"\

-	{$(INCLUDE)}"\ace\IO_Cntl_Msg.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.i"\

-	{$(INCLUDE)}"\ace\Log_Msg.h"\

-	{$(INCLUDE)}"\ace\Log_Priority.h"\

-	{$(INCLUDE)}"\ace\Log_Record.h"\

-	{$(INCLUDE)}"\ace\Log_Record.i"\

-	{$(INCLUDE)}"\ace\Malloc.h"\

-	{$(INCLUDE)}"\ace\Malloc.i"\

-	{$(INCLUDE)}"\ace\Malloc_T.cpp"\

-	{$(INCLUDE)}"\ace\Malloc_T.h"\

-	{$(INCLUDE)}"\ace\Malloc_T.i"\

-	{$(INCLUDE)}"\ace\Managed_Object.cpp"\

-	{$(INCLUDE)}"\ace\Managed_Object.h"\

-	{$(INCLUDE)}"\ace\Managed_Object.i"\

-	{$(INCLUDE)}"\ace\Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Map_Manager.h"\

-	{$(INCLUDE)}"\ace\Map_Manager.i"\

-	{$(INCLUDE)}"\ace\Mem_Map.h"\

-	{$(INCLUDE)}"\ace\Mem_Map.i"\

-	{$(INCLUDE)}"\ace\Memory_Pool.h"\

-	{$(INCLUDE)}"\ace\Memory_Pool.i"\

-	{$(INCLUDE)}"\ace\Message_Block.h"\

-	{$(INCLUDE)}"\ace\Message_Block.i"\

-	{$(INCLUDE)}"\ace\Message_Queue.cpp"\

-	{$(INCLUDE)}"\ace\Message_Queue.h"\

-	{$(INCLUDE)}"\ace\Message_Queue.i"\

-	{$(INCLUDE)}"\ace\Module.cpp"\

-	{$(INCLUDE)}"\ace\Module.h"\

-	{$(INCLUDE)}"\ace\Module.i"\

-	{$(INCLUDE)}"\ace\Object_Manager.h"\

-	{$(INCLUDE)}"\ace\Object_Manager.i"\

-	{$(INCLUDE)}"\ace\OS.h"\

-	{$(INCLUDE)}"\ace\OS.i"\

-	{$(INCLUDE)}"\ace\Reactor.h"\

-	{$(INCLUDE)}"\ace\Reactor.i"\

-	{$(INCLUDE)}"\ace\Reactor_Impl.h"\

-	{$(INCLUDE)}"\ace\Service_Config.h"\

-	{$(INCLUDE)}"\ace\Service_Config.i"\

-	{$(INCLUDE)}"\ace\Service_Object.h"\

-	{$(INCLUDE)}"\ace\Service_Object.i"\

-	{$(INCLUDE)}"\ace\Service_Repository.h"\

-	{$(INCLUDE)}"\ace\Service_Repository.i"\

-	{$(INCLUDE)}"\ace\Service_Types.h"\

-	{$(INCLUDE)}"\ace\Service_Types.i"\

-	{$(INCLUDE)}"\ace\Shared_Object.h"\

-	{$(INCLUDE)}"\ace\Shared_Object.i"\

-	{$(INCLUDE)}"\ace\Signal.h"\

-	{$(INCLUDE)}"\ace\Signal.i"\

-	{$(INCLUDE)}"\ace\Singleton.cpp"\

-	{$(INCLUDE)}"\ace\Singleton.h"\

-	{$(INCLUDE)}"\ace\Singleton.i"\

-	{$(INCLUDE)}"\ace\SOCK.h"\

-	{$(INCLUDE)}"\ace\SOCK.i"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.h"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.i"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.h"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.i"\

-	{$(INCLUDE)}"\ace\SOCK_IO.h"\

-	{$(INCLUDE)}"\ace\SOCK_IO.i"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.h"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.i"\

-	{$(INCLUDE)}"\ace\SString.h"\

-	{$(INCLUDE)}"\ace\SString.i"\

-	{$(INCLUDE)}"\ace\stdcpp.h"\

-	{$(INCLUDE)}"\ace\Strategies.h"\

-	{$(INCLUDE)}"\ace\Strategies_T.cpp"\

-	{$(INCLUDE)}"\ace\Strategies_T.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.cpp"\

-	{$(INCLUDE)}"\ace\Stream_Modules.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.i"\

-	{$(INCLUDE)}"\ace\Svc_Conf_Tokens.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.cpp"\

-	{$(INCLUDE)}"\ace\Svc_Handler.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.i"\

-	{$(INCLUDE)}"\ace\Synch.h"\

-	{$(INCLUDE)}"\ace\Synch.i"\

-	{$(INCLUDE)}"\ace\Synch_Options.h"\

-	{$(INCLUDE)}"\ace\Synch_T.cpp"\

-	{$(INCLUDE)}"\ace\Synch_T.h"\

-	{$(INCLUDE)}"\ace\Synch_T.i"\

-	{$(INCLUDE)}"\ace\Task.h"\

-	{$(INCLUDE)}"\ace\Task.i"\

-	{$(INCLUDE)}"\ace\Task_T.cpp"\

-	{$(INCLUDE)}"\ace\Task_T.h"\

-	{$(INCLUDE)}"\ace\Task_T.i"\

-	{$(INCLUDE)}"\ace\Thread.h"\

-	{$(INCLUDE)}"\ace\Thread.i"\

-	{$(INCLUDE)}"\ace\Thread_Manager.h"\

-	{$(INCLUDE)}"\ace\Thread_Manager.i"\

-	{$(INCLUDE)}"\ace\Time_Value.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.cpp"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.i"\

-	{$(INCLUDE)}"\ace\Trace.h"\

-	{$(INCLUDE)}"\ace\Version.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.i"\

-	{$(INCLUDE)}"\ace\ws2tcpip.h"\

-	

-

-"$(INTDIR)\orb_core.obj" : $(SOURCE) $(DEP_CPP_ORB_C) "$(INTDIR)"

-

-

-!ENDIF 

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\orbobj.cpp

-

-!IF  "$(CFG)" == "TAO - Win32 Release"

-

-DEP_CPP_ORBOB=\

-	"..\..\ace\config-win32.h"\

-	{$(INCLUDE)}"\.\align.h"\

-	{$(INCLUDE)}"\.\any.h"\

-	{$(INCLUDE)}"\.\any.i"\

-	{$(INCLUDE)}"\.\cdr.h"\

-	{$(INCLUDE)}"\.\cdr.i"\

-	{$(INCLUDE)}"\.\client_factory.h"\

-	{$(INCLUDE)}"\.\connect.h"\

-	{$(INCLUDE)}"\.\connect.i"\

-	{$(INCLUDE)}"\.\corba.h"\

-	{$(INCLUDE)}"\.\corbacom.h"\

-	{$(INCLUDE)}"\.\corbacom.i"\

-	{$(INCLUDE)}"\.\debug.h"\

-	{$(INCLUDE)}"\.\default_client.h"\

-	{$(INCLUDE)}"\.\default_client.i"\

-	{$(INCLUDE)}"\.\default_server.h"\

-	{$(INCLUDE)}"\.\default_server.i"\

-	{$(INCLUDE)}"\.\except.h"\

-	{$(INCLUDE)}"\.\giop.h"\

-	{$(INCLUDE)}"\.\giop.i"\

-	{$(INCLUDE)}"\.\iiopobj.h"\

-	{$(INCLUDE)}"\.\iiopobj.i"\

-	{$(INCLUDE)}"\.\iioporb.h"\

-	{$(INCLUDE)}"\.\iioporb.i"\

-	{$(INCLUDE)}"\.\marshal.h"\

-	{$(INCLUDE)}"\.\marshal.i"\

-	{$(INCLUDE)}"\.\nvlist.h"\

-	{$(INCLUDE)}"\.\object.h"\

-	{$(INCLUDE)}"\.\object.i"\

-	{$(INCLUDE)}"\.\objtable.h"\

-	{$(INCLUDE)}"\.\optable.h"\

-	{$(INCLUDE)}"\.\orb.h"\

-	{$(INCLUDE)}"\.\orb_core.h"\

-	{$(INCLUDE)}"\.\orb_core.i"\

-	{$(INCLUDE)}"\.\orbconf.h"\

-	{$(INCLUDE)}"\.\orbobj.h"\

-	{$(INCLUDE)}"\.\orbobj.i"\

-	{$(INCLUDE)}"\.\params.h"\

-	{$(INCLUDE)}"\.\params.i"\

-	{$(INCLUDE)}"\.\poa.h"\

-	{$(INCLUDE)}"\.\poa.i"\

-	{$(INCLUDE)}"\.\principa.h"\

-	{$(INCLUDE)}"\.\request.h"\

-	{$(INCLUDE)}"\.\sequence.h"\

-	{$(INCLUDE)}"\.\sequence.i"\

-	{$(INCLUDE)}"\.\server_factory.h"\

-	{$(INCLUDE)}"\.\server_factory.i"\

-	{$(INCLUDE)}"\.\singletons.h"\

-	{$(INCLUDE)}"\.\stub.h"\

-	{$(INCLUDE)}"\.\stub.i"\

-	{$(INCLUDE)}"\.\svrrqst.h"\

-	{$(INCLUDE)}"\.\tao_internals.h"\

-	{$(INCLUDE)}"\.\typecode.h"\

-	{$(INCLUDE)}"\.\typecode.i"\

-	{$(INCLUDE)}"\.\varout.h"\

-	{$(INCLUDE)}"\ace\Acceptor.cpp"\

-	{$(INCLUDE)}"\ace\Acceptor.h"\

-	{$(INCLUDE)}"\ace\Acceptor.i"\

-	{$(INCLUDE)}"\ace\ACE.h"\

-	{$(INCLUDE)}"\ace\ACE.i"\

-	{$(INCLUDE)}"\ace\Addr.h"\

-	{$(INCLUDE)}"\ace\Addr.i"\

-	{$(INCLUDE)}"\ace\Atomic_Op.i"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.cpp"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.h"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.i"\

-	{$(INCLUDE)}"\ace\config-win32-common.h"\

-	{$(INCLUDE)}"\ace\Config.h"\

-	{$(INCLUDE)}"\ace\Connector.cpp"\

-	{$(INCLUDE)}"\ace\Connector.h"\

-	{$(INCLUDE)}"\ace\Connector.i"\

-	{$(INCLUDE)}"\ace\Containers.cpp"\

-	{$(INCLUDE)}"\ace\Containers.h"\

-	{$(INCLUDE)}"\ace\Containers.i"\

-	{$(INCLUDE)}"\ace\Dynamic.h"\

-	{$(INCLUDE)}"\ace\Dynamic.i"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.cpp"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.i"\

-	{$(INCLUDE)}"\ace\Free_List.cpp"\

-	{$(INCLUDE)}"\ace\Free_List.h"\

-	{$(INCLUDE)}"\ace\Free_List.i"\

-	{$(INCLUDE)}"\ace\Get_Opt.h"\

-	{$(INCLUDE)}"\ace\Get_Opt.i"\

-	{$(INCLUDE)}"\ace\Handle_Set.h"\

-	{$(INCLUDE)}"\ace\Handle_Set.i"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.i"\

-	{$(INCLUDE)}"\ace\IO_Cntl_Msg.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.i"\

-	{$(INCLUDE)}"\ace\Log_Msg.h"\

-	{$(INCLUDE)}"\ace\Log_Priority.h"\

-	{$(INCLUDE)}"\ace\Log_Record.h"\

-	{$(INCLUDE)}"\ace\Log_Record.i"\

-	{$(INCLUDE)}"\ace\Malloc.h"\

-	{$(INCLUDE)}"\ace\Malloc.i"\

-	{$(INCLUDE)}"\ace\Malloc_T.cpp"\

-	{$(INCLUDE)}"\ace\Malloc_T.h"\

-	{$(INCLUDE)}"\ace\Malloc_T.i"\

-	{$(INCLUDE)}"\ace\Managed_Object.cpp"\

-	{$(INCLUDE)}"\ace\Managed_Object.h"\

-	{$(INCLUDE)}"\ace\Managed_Object.i"\

-	{$(INCLUDE)}"\ace\Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Map_Manager.h"\

-	{$(INCLUDE)}"\ace\Map_Manager.i"\

-	{$(INCLUDE)}"\ace\Mem_Map.h"\

-	{$(INCLUDE)}"\ace\Mem_Map.i"\

-	{$(INCLUDE)}"\ace\Memory_Pool.h"\

-	{$(INCLUDE)}"\ace\Memory_Pool.i"\

-	{$(INCLUDE)}"\ace\Message_Block.h"\

-	{$(INCLUDE)}"\ace\Message_Block.i"\

-	{$(INCLUDE)}"\ace\Message_Queue.cpp"\

-	{$(INCLUDE)}"\ace\Message_Queue.h"\

-	{$(INCLUDE)}"\ace\Message_Queue.i"\

-	{$(INCLUDE)}"\ace\Module.cpp"\

-	{$(INCLUDE)}"\ace\Module.h"\

-	{$(INCLUDE)}"\ace\Module.i"\

-	{$(INCLUDE)}"\ace\Object_Manager.h"\

-	{$(INCLUDE)}"\ace\Object_Manager.i"\

-	{$(INCLUDE)}"\ace\OS.h"\

-	{$(INCLUDE)}"\ace\OS.i"\

-	{$(INCLUDE)}"\ace\Reactor.h"\

-	{$(INCLUDE)}"\ace\Reactor.i"\

-	{$(INCLUDE)}"\ace\Reactor_Impl.h"\

-	{$(INCLUDE)}"\ace\Service_Config.h"\

-	{$(INCLUDE)}"\ace\Service_Config.i"\

-	{$(INCLUDE)}"\ace\Service_Object.h"\

-	{$(INCLUDE)}"\ace\Service_Object.i"\

-	{$(INCLUDE)}"\ace\Service_Repository.h"\

-	{$(INCLUDE)}"\ace\Service_Repository.i"\

-	{$(INCLUDE)}"\ace\Service_Types.h"\

-	{$(INCLUDE)}"\ace\Service_Types.i"\

-	{$(INCLUDE)}"\ace\Shared_Object.h"\

-	{$(INCLUDE)}"\ace\Shared_Object.i"\

-	{$(INCLUDE)}"\ace\Signal.h"\

-	{$(INCLUDE)}"\ace\Signal.i"\

-	{$(INCLUDE)}"\ace\Singleton.cpp"\

-	{$(INCLUDE)}"\ace\Singleton.h"\

-	{$(INCLUDE)}"\ace\Singleton.i"\

-	{$(INCLUDE)}"\ace\SOCK.h"\

-	{$(INCLUDE)}"\ace\SOCK.i"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.h"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.i"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.h"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.i"\

-	{$(INCLUDE)}"\ace\SOCK_Dgram.h"\

-	{$(INCLUDE)}"\ace\SOCK_Dgram.i"\

-	{$(INCLUDE)}"\ace\SOCK_Dgram_Mcast.h"\

-	{$(INCLUDE)}"\ace\SOCK_Dgram_Mcast.i"\

-	{$(INCLUDE)}"\ace\SOCK_IO.h"\

-	{$(INCLUDE)}"\ace\SOCK_IO.i"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.h"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.i"\

-	{$(INCLUDE)}"\ace\SString.h"\

-	{$(INCLUDE)}"\ace\SString.i"\

-	{$(INCLUDE)}"\ace\stdcpp.h"\

-	{$(INCLUDE)}"\ace\Strategies.h"\

-	{$(INCLUDE)}"\ace\Strategies_T.cpp"\

-	{$(INCLUDE)}"\ace\Strategies_T.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.cpp"\

-	{$(INCLUDE)}"\ace\Stream_Modules.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.i"\

-	{$(INCLUDE)}"\ace\Svc_Conf_Tokens.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.cpp"\

-	{$(INCLUDE)}"\ace\Svc_Handler.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.i"\

-	{$(INCLUDE)}"\ace\Synch.h"\

-	{$(INCLUDE)}"\ace\Synch.i"\

-	{$(INCLUDE)}"\ace\Synch_Options.h"\

-	{$(INCLUDE)}"\ace\Synch_T.cpp"\

-	{$(INCLUDE)}"\ace\Synch_T.h"\

-	{$(INCLUDE)}"\ace\Synch_T.i"\

-	{$(INCLUDE)}"\ace\Task.h"\

-	{$(INCLUDE)}"\ace\Task.i"\

-	{$(INCLUDE)}"\ace\Task_T.cpp"\

-	{$(INCLUDE)}"\ace\Task_T.h"\

-	{$(INCLUDE)}"\ace\Task_T.i"\

-	{$(INCLUDE)}"\ace\Thread.h"\

-	{$(INCLUDE)}"\ace\Thread.i"\

-	{$(INCLUDE)}"\ace\Thread_Manager.h"\

-	{$(INCLUDE)}"\ace\Thread_Manager.i"\

-	{$(INCLUDE)}"\ace\Time_Value.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.cpp"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.i"\

-	{$(INCLUDE)}"\ace\Trace.h"\

-	{$(INCLUDE)}"\ace\Version.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.i"\

-	{$(INCLUDE)}"\ace\ws2tcpip.h"\

-	

-

-"$(INTDIR)\orbobj.obj" : $(SOURCE) $(DEP_CPP_ORBOB) "$(INTDIR)"

-

-

-!ELSEIF  "$(CFG)" == "TAO - Win32 Debug"

-

-DEP_CPP_ORBOB=\

-	"..\..\ace\config-win32.h"\

-	{$(INCLUDE)}"\.\align.h"\

-	{$(INCLUDE)}"\.\any.h"\

-	{$(INCLUDE)}"\.\any.i"\

-	{$(INCLUDE)}"\.\cdr.h"\

-	{$(INCLUDE)}"\.\cdr.i"\

-	{$(INCLUDE)}"\.\client_factory.h"\

-	{$(INCLUDE)}"\.\connect.h"\

-	{$(INCLUDE)}"\.\connect.i"\

-	{$(INCLUDE)}"\.\corba.h"\

-	{$(INCLUDE)}"\.\corbacom.h"\

-	{$(INCLUDE)}"\.\corbacom.i"\

-	{$(INCLUDE)}"\.\debug.h"\

-	{$(INCLUDE)}"\.\default_client.h"\

-	{$(INCLUDE)}"\.\default_client.i"\

-	{$(INCLUDE)}"\.\default_server.h"\

-	{$(INCLUDE)}"\.\default_server.i"\

-	{$(INCLUDE)}"\.\except.h"\

-	{$(INCLUDE)}"\.\giop.h"\

-	{$(INCLUDE)}"\.\giop.i"\

-	{$(INCLUDE)}"\.\iiopobj.h"\

-	{$(INCLUDE)}"\.\iiopobj.i"\

-	{$(INCLUDE)}"\.\iioporb.h"\

-	{$(INCLUDE)}"\.\iioporb.i"\

-	{$(INCLUDE)}"\.\marshal.h"\

-	{$(INCLUDE)}"\.\marshal.i"\

-	{$(INCLUDE)}"\.\nvlist.h"\

-	{$(INCLUDE)}"\.\object.h"\

-	{$(INCLUDE)}"\.\object.i"\

-	{$(INCLUDE)}"\.\objtable.h"\

-	{$(INCLUDE)}"\.\optable.h"\

-	{$(INCLUDE)}"\.\orb.h"\

-	{$(INCLUDE)}"\.\orb_core.h"\

-	{$(INCLUDE)}"\.\orb_core.i"\

-	{$(INCLUDE)}"\.\orbconf.h"\

-	{$(INCLUDE)}"\.\orbobj.h"\

-	{$(INCLUDE)}"\.\orbobj.i"\

-	{$(INCLUDE)}"\.\params.h"\

-	{$(INCLUDE)}"\.\params.i"\

-	{$(INCLUDE)}"\.\poa.h"\

-	{$(INCLUDE)}"\.\poa.i"\

-	{$(INCLUDE)}"\.\principa.h"\

-	{$(INCLUDE)}"\.\request.h"\

-	{$(INCLUDE)}"\.\sequence.h"\

-	{$(INCLUDE)}"\.\sequence.i"\

-	{$(INCLUDE)}"\.\server_factory.h"\

-	{$(INCLUDE)}"\.\server_factory.i"\

-	{$(INCLUDE)}"\.\singletons.h"\

-	{$(INCLUDE)}"\.\stub.h"\

-	{$(INCLUDE)}"\.\stub.i"\

-	{$(INCLUDE)}"\.\svrrqst.h"\

-	{$(INCLUDE)}"\.\tao_internals.h"\

-	{$(INCLUDE)}"\.\typecode.h"\

-	{$(INCLUDE)}"\.\typecode.i"\

-	{$(INCLUDE)}"\.\varout.h"\

-	{$(INCLUDE)}"\ace\Acceptor.cpp"\

-	{$(INCLUDE)}"\ace\Acceptor.h"\

-	{$(INCLUDE)}"\ace\Acceptor.i"\

-	{$(INCLUDE)}"\ace\ACE.h"\

-	{$(INCLUDE)}"\ace\ACE.i"\

-	{$(INCLUDE)}"\ace\Addr.h"\

-	{$(INCLUDE)}"\ace\Addr.i"\

-	{$(INCLUDE)}"\ace\Atomic_Op.i"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.cpp"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.h"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.i"\

-	{$(INCLUDE)}"\ace\config-win32-common.h"\

-	{$(INCLUDE)}"\ace\Config.h"\

-	{$(INCLUDE)}"\ace\Connector.cpp"\

-	{$(INCLUDE)}"\ace\Connector.h"\

-	{$(INCLUDE)}"\ace\Connector.i"\

-	{$(INCLUDE)}"\ace\Containers.cpp"\

-	{$(INCLUDE)}"\ace\Containers.h"\

-	{$(INCLUDE)}"\ace\Containers.i"\

-	{$(INCLUDE)}"\ace\Dynamic.h"\

-	{$(INCLUDE)}"\ace\Dynamic.i"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.cpp"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.i"\

-	{$(INCLUDE)}"\ace\Free_List.cpp"\

-	{$(INCLUDE)}"\ace\Free_List.h"\

-	{$(INCLUDE)}"\ace\Free_List.i"\

-	{$(INCLUDE)}"\ace\Get_Opt.h"\

-	{$(INCLUDE)}"\ace\Get_Opt.i"\

-	{$(INCLUDE)}"\ace\Handle_Set.h"\

-	{$(INCLUDE)}"\ace\Handle_Set.i"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.i"\

-	{$(INCLUDE)}"\ace\IO_Cntl_Msg.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.i"\

-	{$(INCLUDE)}"\ace\Log_Msg.h"\

-	{$(INCLUDE)}"\ace\Log_Priority.h"\

-	{$(INCLUDE)}"\ace\Log_Record.h"\

-	{$(INCLUDE)}"\ace\Log_Record.i"\

-	{$(INCLUDE)}"\ace\Malloc.h"\

-	{$(INCLUDE)}"\ace\Malloc.i"\

-	{$(INCLUDE)}"\ace\Malloc_T.cpp"\

-	{$(INCLUDE)}"\ace\Malloc_T.h"\

-	{$(INCLUDE)}"\ace\Malloc_T.i"\

-	{$(INCLUDE)}"\ace\Managed_Object.cpp"\

-	{$(INCLUDE)}"\ace\Managed_Object.h"\

-	{$(INCLUDE)}"\ace\Managed_Object.i"\

-	{$(INCLUDE)}"\ace\Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Map_Manager.h"\

-	{$(INCLUDE)}"\ace\Map_Manager.i"\

-	{$(INCLUDE)}"\ace\Mem_Map.h"\

-	{$(INCLUDE)}"\ace\Mem_Map.i"\

-	{$(INCLUDE)}"\ace\Memory_Pool.h"\

-	{$(INCLUDE)}"\ace\Memory_Pool.i"\

-	{$(INCLUDE)}"\ace\Message_Block.h"\

-	{$(INCLUDE)}"\ace\Message_Block.i"\

-	{$(INCLUDE)}"\ace\Message_Queue.cpp"\

-	{$(INCLUDE)}"\ace\Message_Queue.h"\

-	{$(INCLUDE)}"\ace\Message_Queue.i"\

-	{$(INCLUDE)}"\ace\Module.cpp"\

-	{$(INCLUDE)}"\ace\Module.h"\

-	{$(INCLUDE)}"\ace\Module.i"\

-	{$(INCLUDE)}"\ace\Object_Manager.h"\

-	{$(INCLUDE)}"\ace\Object_Manager.i"\

-	{$(INCLUDE)}"\ace\OS.h"\

-	{$(INCLUDE)}"\ace\OS.i"\

-	{$(INCLUDE)}"\ace\Reactor.h"\

-	{$(INCLUDE)}"\ace\Reactor.i"\

-	{$(INCLUDE)}"\ace\Reactor_Impl.h"\

-	{$(INCLUDE)}"\ace\Service_Config.h"\

-	{$(INCLUDE)}"\ace\Service_Config.i"\

-	{$(INCLUDE)}"\ace\Service_Object.h"\

-	{$(INCLUDE)}"\ace\Service_Object.i"\

-	{$(INCLUDE)}"\ace\Service_Repository.h"\

-	{$(INCLUDE)}"\ace\Service_Repository.i"\

-	{$(INCLUDE)}"\ace\Service_Types.h"\

-	{$(INCLUDE)}"\ace\Service_Types.i"\

-	{$(INCLUDE)}"\ace\Shared_Object.h"\

-	{$(INCLUDE)}"\ace\Shared_Object.i"\

-	{$(INCLUDE)}"\ace\Signal.h"\

-	{$(INCLUDE)}"\ace\Signal.i"\

-	{$(INCLUDE)}"\ace\Singleton.cpp"\

-	{$(INCLUDE)}"\ace\Singleton.h"\

-	{$(INCLUDE)}"\ace\Singleton.i"\

-	{$(INCLUDE)}"\ace\SOCK.h"\

-	{$(INCLUDE)}"\ace\SOCK.i"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.h"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.i"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.h"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.i"\

-	{$(INCLUDE)}"\ace\SOCK_Dgram.h"\

-	{$(INCLUDE)}"\ace\SOCK_Dgram.i"\

-	{$(INCLUDE)}"\ace\SOCK_Dgram_Mcast.h"\

-	{$(INCLUDE)}"\ace\SOCK_Dgram_Mcast.i"\

-	{$(INCLUDE)}"\ace\SOCK_IO.h"\

-	{$(INCLUDE)}"\ace\SOCK_IO.i"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.h"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.i"\

-	{$(INCLUDE)}"\ace\SString.h"\

-	{$(INCLUDE)}"\ace\SString.i"\

-	{$(INCLUDE)}"\ace\stdcpp.h"\

-	{$(INCLUDE)}"\ace\Strategies.h"\

-	{$(INCLUDE)}"\ace\Strategies_T.cpp"\

-	{$(INCLUDE)}"\ace\Strategies_T.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.cpp"\

-	{$(INCLUDE)}"\ace\Stream_Modules.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.i"\

-	{$(INCLUDE)}"\ace\Svc_Conf_Tokens.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.cpp"\

-	{$(INCLUDE)}"\ace\Svc_Handler.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.i"\

-	{$(INCLUDE)}"\ace\Synch.h"\

-	{$(INCLUDE)}"\ace\Synch.i"\

-	{$(INCLUDE)}"\ace\Synch_Options.h"\

-	{$(INCLUDE)}"\ace\Synch_T.cpp"\

-	{$(INCLUDE)}"\ace\Synch_T.h"\

-	{$(INCLUDE)}"\ace\Synch_T.i"\

-	{$(INCLUDE)}"\ace\Task.h"\

-	{$(INCLUDE)}"\ace\Task.i"\

-	{$(INCLUDE)}"\ace\Task_T.cpp"\

-	{$(INCLUDE)}"\ace\Task_T.h"\

-	{$(INCLUDE)}"\ace\Task_T.i"\

-	{$(INCLUDE)}"\ace\Thread.h"\

-	{$(INCLUDE)}"\ace\Thread.i"\

-	{$(INCLUDE)}"\ace\Thread_Manager.h"\

-	{$(INCLUDE)}"\ace\Thread_Manager.i"\

-	{$(INCLUDE)}"\ace\Time_Value.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.cpp"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.i"\

-	{$(INCLUDE)}"\ace\Trace.h"\

-	{$(INCLUDE)}"\ace\Version.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.i"\

-	{$(INCLUDE)}"\ace\ws2tcpip.h"\

-	

-

-"$(INTDIR)\orbobj.obj" : $(SOURCE) $(DEP_CPP_ORBOB) "$(INTDIR)"

-

-

-!ENDIF 

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\params.cpp

-

-!IF  "$(CFG)" == "TAO - Win32 Release"

-

-DEP_CPP_PARAM=\

-	"..\..\ace\config-win32.h"\

-	{$(INCLUDE)}"\.\align.h"\

-	{$(INCLUDE)}"\.\any.h"\

-	{$(INCLUDE)}"\.\any.i"\

-	{$(INCLUDE)}"\.\cdr.h"\

-	{$(INCLUDE)}"\.\cdr.i"\

-	{$(INCLUDE)}"\.\client_factory.h"\

-	{$(INCLUDE)}"\.\client_factory.i"\

-	{$(INCLUDE)}"\.\connect.h"\

-	{$(INCLUDE)}"\.\connect.i"\

-	{$(INCLUDE)}"\.\corba.h"\

-	{$(INCLUDE)}"\.\corbacom.h"\

-	{$(INCLUDE)}"\.\corbacom.i"\

-	{$(INCLUDE)}"\.\debug.h"\

-	{$(INCLUDE)}"\.\default_client.h"\

-	{$(INCLUDE)}"\.\default_client.i"\

-	{$(INCLUDE)}"\.\default_server.h"\

-	{$(INCLUDE)}"\.\default_server.i"\

-	{$(INCLUDE)}"\.\except.h"\

-	{$(INCLUDE)}"\.\giop.h"\

-	{$(INCLUDE)}"\.\giop.i"\

-	{$(INCLUDE)}"\.\iiopobj.h"\

-	{$(INCLUDE)}"\.\iiopobj.i"\

-	{$(INCLUDE)}"\.\iioporb.h"\

-	{$(INCLUDE)}"\.\iioporb.i"\

-	{$(INCLUDE)}"\.\marshal.h"\

-	{$(INCLUDE)}"\.\marshal.i"\

-	{$(INCLUDE)}"\.\nvlist.h"\

-	{$(INCLUDE)}"\.\object.h"\

-	{$(INCLUDE)}"\.\object.i"\

-	{$(INCLUDE)}"\.\objtable.h"\

-	{$(INCLUDE)}"\.\optable.h"\

-	{$(INCLUDE)}"\.\orb.h"\

-	{$(INCLUDE)}"\.\orb_core.h"\

-	{$(INCLUDE)}"\.\orb_core.i"\

-	{$(INCLUDE)}"\.\orbconf.h"\

-	{$(INCLUDE)}"\.\orbobj.h"\

-	{$(INCLUDE)}"\.\orbobj.i"\

-	{$(INCLUDE)}"\.\params.h"\

-	{$(INCLUDE)}"\.\params.i"\

-	{$(INCLUDE)}"\.\poa.h"\

-	{$(INCLUDE)}"\.\poa.i"\

-	{$(INCLUDE)}"\.\principa.h"\

-	{$(INCLUDE)}"\.\request.h"\

-	{$(INCLUDE)}"\.\sequence.h"\

-	{$(INCLUDE)}"\.\sequence.i"\

-	{$(INCLUDE)}"\.\server_factory.h"\

-	{$(INCLUDE)}"\.\server_factory.i"\

-	{$(INCLUDE)}"\.\singletons.h"\

-	{$(INCLUDE)}"\.\stub.h"\

-	{$(INCLUDE)}"\.\stub.i"\

-	{$(INCLUDE)}"\.\svrrqst.h"\

-	{$(INCLUDE)}"\.\svrrqst.i"\

-	{$(INCLUDE)}"\.\typecode.h"\

-	{$(INCLUDE)}"\.\typecode.i"\

-	{$(INCLUDE)}"\.\varout.h"\

-	{$(INCLUDE)}"\ace\Acceptor.cpp"\

-	{$(INCLUDE)}"\ace\Acceptor.h"\

-	{$(INCLUDE)}"\ace\Acceptor.i"\

-	{$(INCLUDE)}"\ace\ACE.h"\

-	{$(INCLUDE)}"\ace\ACE.i"\

-	{$(INCLUDE)}"\ace\Addr.h"\

-	{$(INCLUDE)}"\ace\Addr.i"\

-	{$(INCLUDE)}"\ace\Atomic_Op.i"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.cpp"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.h"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.i"\

-	{$(INCLUDE)}"\ace\config-win32-common.h"\

-	{$(INCLUDE)}"\ace\Config.h"\

-	{$(INCLUDE)}"\ace\Connector.cpp"\

-	{$(INCLUDE)}"\ace\Connector.h"\

-	{$(INCLUDE)}"\ace\Connector.i"\

-	{$(INCLUDE)}"\ace\Containers.cpp"\

-	{$(INCLUDE)}"\ace\Containers.h"\

-	{$(INCLUDE)}"\ace\Containers.i"\

-	{$(INCLUDE)}"\ace\Dynamic.h"\

-	{$(INCLUDE)}"\ace\Dynamic.i"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.cpp"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.i"\

-	{$(INCLUDE)}"\ace\Free_List.cpp"\

-	{$(INCLUDE)}"\ace\Free_List.h"\

-	{$(INCLUDE)}"\ace\Free_List.i"\

-	{$(INCLUDE)}"\ace\Get_Opt.h"\

-	{$(INCLUDE)}"\ace\Get_Opt.i"\

-	{$(INCLUDE)}"\ace\Handle_Set.h"\

-	{$(INCLUDE)}"\ace\Handle_Set.i"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.i"\

-	{$(INCLUDE)}"\ace\IO_Cntl_Msg.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.i"\

-	{$(INCLUDE)}"\ace\Log_Msg.h"\

-	{$(INCLUDE)}"\ace\Log_Priority.h"\

-	{$(INCLUDE)}"\ace\Log_Record.h"\

-	{$(INCLUDE)}"\ace\Log_Record.i"\

-	{$(INCLUDE)}"\ace\Malloc.h"\

-	{$(INCLUDE)}"\ace\Malloc.i"\

-	{$(INCLUDE)}"\ace\Malloc_T.cpp"\

-	{$(INCLUDE)}"\ace\Malloc_T.h"\

-	{$(INCLUDE)}"\ace\Malloc_T.i"\

-	{$(INCLUDE)}"\ace\Managed_Object.cpp"\

-	{$(INCLUDE)}"\ace\Managed_Object.h"\

-	{$(INCLUDE)}"\ace\Managed_Object.i"\

-	{$(INCLUDE)}"\ace\Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Map_Manager.h"\

-	{$(INCLUDE)}"\ace\Map_Manager.i"\

-	{$(INCLUDE)}"\ace\Mem_Map.h"\

-	{$(INCLUDE)}"\ace\Mem_Map.i"\

-	{$(INCLUDE)}"\ace\Memory_Pool.h"\

-	{$(INCLUDE)}"\ace\Memory_Pool.i"\

-	{$(INCLUDE)}"\ace\Message_Block.h"\

-	{$(INCLUDE)}"\ace\Message_Block.i"\

-	{$(INCLUDE)}"\ace\Message_Queue.cpp"\

-	{$(INCLUDE)}"\ace\Message_Queue.h"\

-	{$(INCLUDE)}"\ace\Message_Queue.i"\

-	{$(INCLUDE)}"\ace\Module.cpp"\

-	{$(INCLUDE)}"\ace\Module.h"\

-	{$(INCLUDE)}"\ace\Module.i"\

-	{$(INCLUDE)}"\ace\Object_Manager.h"\

-	{$(INCLUDE)}"\ace\Object_Manager.i"\

-	{$(INCLUDE)}"\ace\OS.h"\

-	{$(INCLUDE)}"\ace\OS.i"\

-	{$(INCLUDE)}"\ace\Reactor.h"\

-	{$(INCLUDE)}"\ace\Reactor.i"\

-	{$(INCLUDE)}"\ace\Reactor_Impl.h"\

-	{$(INCLUDE)}"\ace\Service_Config.h"\

-	{$(INCLUDE)}"\ace\Service_Config.i"\

-	{$(INCLUDE)}"\ace\Service_Object.h"\

-	{$(INCLUDE)}"\ace\Service_Object.i"\

-	{$(INCLUDE)}"\ace\Service_Repository.h"\

-	{$(INCLUDE)}"\ace\Service_Repository.i"\

-	{$(INCLUDE)}"\ace\Service_Types.h"\

-	{$(INCLUDE)}"\ace\Service_Types.i"\

-	{$(INCLUDE)}"\ace\Shared_Object.h"\

-	{$(INCLUDE)}"\ace\Shared_Object.i"\

-	{$(INCLUDE)}"\ace\Signal.h"\

-	{$(INCLUDE)}"\ace\Signal.i"\

-	{$(INCLUDE)}"\ace\Singleton.cpp"\

-	{$(INCLUDE)}"\ace\Singleton.h"\

-	{$(INCLUDE)}"\ace\Singleton.i"\

-	{$(INCLUDE)}"\ace\SOCK.h"\

-	{$(INCLUDE)}"\ace\SOCK.i"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.h"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.i"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.h"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.i"\

-	{$(INCLUDE)}"\ace\SOCK_IO.h"\

-	{$(INCLUDE)}"\ace\SOCK_IO.i"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.h"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.i"\

-	{$(INCLUDE)}"\ace\SString.h"\

-	{$(INCLUDE)}"\ace\SString.i"\

-	{$(INCLUDE)}"\ace\stdcpp.h"\

-	{$(INCLUDE)}"\ace\Strategies.h"\

-	{$(INCLUDE)}"\ace\Strategies_T.cpp"\

-	{$(INCLUDE)}"\ace\Strategies_T.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.cpp"\

-	{$(INCLUDE)}"\ace\Stream_Modules.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.i"\

-	{$(INCLUDE)}"\ace\Svc_Conf_Tokens.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.cpp"\

-	{$(INCLUDE)}"\ace\Svc_Handler.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.i"\

-	{$(INCLUDE)}"\ace\Synch.h"\

-	{$(INCLUDE)}"\ace\Synch.i"\

-	{$(INCLUDE)}"\ace\Synch_Options.h"\

-	{$(INCLUDE)}"\ace\Synch_T.cpp"\

-	{$(INCLUDE)}"\ace\Synch_T.h"\

-	{$(INCLUDE)}"\ace\Synch_T.i"\

-	{$(INCLUDE)}"\ace\Task.h"\

-	{$(INCLUDE)}"\ace\Task.i"\

-	{$(INCLUDE)}"\ace\Task_T.cpp"\

-	{$(INCLUDE)}"\ace\Task_T.h"\

-	{$(INCLUDE)}"\ace\Task_T.i"\

-	{$(INCLUDE)}"\ace\Thread.h"\

-	{$(INCLUDE)}"\ace\Thread.i"\

-	{$(INCLUDE)}"\ace\Thread_Manager.h"\

-	{$(INCLUDE)}"\ace\Thread_Manager.i"\

-	{$(INCLUDE)}"\ace\Time_Value.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.cpp"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.i"\

-	{$(INCLUDE)}"\ace\Trace.h"\

-	{$(INCLUDE)}"\ace\Version.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.i"\

-	{$(INCLUDE)}"\ace\ws2tcpip.h"\

-	

-NODEP_CPP_PARAM=\

-	".\tao\factories.h"\

-	

-

-"$(INTDIR)\params.obj" : $(SOURCE) $(DEP_CPP_PARAM) "$(INTDIR)"

-

-

-!ELSEIF  "$(CFG)" == "TAO - Win32 Debug"

-

-DEP_CPP_PARAM=\

-	{$(INCLUDE)}"\.\corba.h"\

-	{$(INCLUDE)}"\.\params.i"\

-	

-

-"$(INTDIR)\params.obj" : $(SOURCE) $(DEP_CPP_PARAM) "$(INTDIR)"

-

-

-!ENDIF 

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\poa.cpp

-

-!IF  "$(CFG)" == "TAO - Win32 Release"

-

-DEP_CPP_POA_C=\

-	"..\..\ace\config-win32.h"\

-	{$(INCLUDE)}"\.\align.h"\

-	{$(INCLUDE)}"\.\any.h"\

-	{$(INCLUDE)}"\.\any.i"\

-	{$(INCLUDE)}"\.\cdr.h"\

-	{$(INCLUDE)}"\.\cdr.i"\

-	{$(INCLUDE)}"\.\client_factory.h"\

-	{$(INCLUDE)}"\.\connect.h"\

-	{$(INCLUDE)}"\.\connect.i"\

-	{$(INCLUDE)}"\.\corba.h"\

-	{$(INCLUDE)}"\.\corbacom.h"\

-	{$(INCLUDE)}"\.\corbacom.i"\

-	{$(INCLUDE)}"\.\debug.h"\

-	{$(INCLUDE)}"\.\default_client.h"\

-	{$(INCLUDE)}"\.\default_client.i"\

-	{$(INCLUDE)}"\.\default_server.h"\

-	{$(INCLUDE)}"\.\default_server.i"\

-	{$(INCLUDE)}"\.\except.h"\

-	{$(INCLUDE)}"\.\giop.h"\

-	{$(INCLUDE)}"\.\giop.i"\

-	{$(INCLUDE)}"\.\iiopobj.h"\

-	{$(INCLUDE)}"\.\iiopobj.i"\

-	{$(INCLUDE)}"\.\iioporb.h"\

-	{$(INCLUDE)}"\.\iioporb.i"\

-	{$(INCLUDE)}"\.\marshal.h"\

-	{$(INCLUDE)}"\.\marshal.i"\

-	{$(INCLUDE)}"\.\nvlist.h"\

-	{$(INCLUDE)}"\.\object.h"\

-	{$(INCLUDE)}"\.\object.i"\

-	{$(INCLUDE)}"\.\objtable.h"\

-	{$(INCLUDE)}"\.\optable.h"\

-	{$(INCLUDE)}"\.\orb.h"\

-	{$(INCLUDE)}"\.\orb_core.h"\

-	{$(INCLUDE)}"\.\orb_core.i"\

-	{$(INCLUDE)}"\.\orbconf.h"\

-	{$(INCLUDE)}"\.\orbobj.h"\

-	{$(INCLUDE)}"\.\orbobj.i"\

-	{$(INCLUDE)}"\.\params.h"\

-	{$(INCLUDE)}"\.\params.i"\

-	{$(INCLUDE)}"\.\poa.h"\

-	{$(INCLUDE)}"\.\poa.i"\

-	{$(INCLUDE)}"\.\principa.h"\

-	{$(INCLUDE)}"\.\request.h"\

-	{$(INCLUDE)}"\.\sequence.h"\

-	{$(INCLUDE)}"\.\sequence.i"\

-	{$(INCLUDE)}"\.\server_factory.h"\

-	{$(INCLUDE)}"\.\server_factory.i"\

-	{$(INCLUDE)}"\.\singletons.h"\

-	{$(INCLUDE)}"\.\stub.h"\

-	{$(INCLUDE)}"\.\stub.i"\

-	{$(INCLUDE)}"\.\svrrqst.h"\

-	{$(INCLUDE)}"\.\typecode.h"\

-	{$(INCLUDE)}"\.\typecode.i"\

-	{$(INCLUDE)}"\.\varout.h"\

-	{$(INCLUDE)}"\ace\Acceptor.cpp"\

-	{$(INCLUDE)}"\ace\Acceptor.h"\

-	{$(INCLUDE)}"\ace\Acceptor.i"\

-	{$(INCLUDE)}"\ace\ACE.h"\

-	{$(INCLUDE)}"\ace\ACE.i"\

-	{$(INCLUDE)}"\ace\Addr.h"\

-	{$(INCLUDE)}"\ace\Addr.i"\

-	{$(INCLUDE)}"\ace\Atomic_Op.i"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.cpp"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.h"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.i"\

-	{$(INCLUDE)}"\ace\config-win32-common.h"\

-	{$(INCLUDE)}"\ace\Config.h"\

-	{$(INCLUDE)}"\ace\Connector.cpp"\

-	{$(INCLUDE)}"\ace\Connector.h"\

-	{$(INCLUDE)}"\ace\Connector.i"\

-	{$(INCLUDE)}"\ace\Containers.cpp"\

-	{$(INCLUDE)}"\ace\Containers.h"\

-	{$(INCLUDE)}"\ace\Containers.i"\

-	{$(INCLUDE)}"\ace\Dynamic.h"\

-	{$(INCLUDE)}"\ace\Dynamic.i"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.cpp"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.i"\

-	{$(INCLUDE)}"\ace\Free_List.cpp"\

-	{$(INCLUDE)}"\ace\Free_List.h"\

-	{$(INCLUDE)}"\ace\Free_List.i"\

-	{$(INCLUDE)}"\ace\Get_Opt.h"\

-	{$(INCLUDE)}"\ace\Get_Opt.i"\

-	{$(INCLUDE)}"\ace\Handle_Set.h"\

-	{$(INCLUDE)}"\ace\Handle_Set.i"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.i"\

-	{$(INCLUDE)}"\ace\IO_Cntl_Msg.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.i"\

-	{$(INCLUDE)}"\ace\Log_Msg.h"\

-	{$(INCLUDE)}"\ace\Log_Priority.h"\

-	{$(INCLUDE)}"\ace\Log_Record.h"\

-	{$(INCLUDE)}"\ace\Log_Record.i"\

-	{$(INCLUDE)}"\ace\Malloc.h"\

-	{$(INCLUDE)}"\ace\Malloc.i"\

-	{$(INCLUDE)}"\ace\Malloc_T.cpp"\

-	{$(INCLUDE)}"\ace\Malloc_T.h"\

-	{$(INCLUDE)}"\ace\Malloc_T.i"\

-	{$(INCLUDE)}"\ace\Managed_Object.cpp"\

-	{$(INCLUDE)}"\ace\Managed_Object.h"\

-	{$(INCLUDE)}"\ace\Managed_Object.i"\

-	{$(INCLUDE)}"\ace\Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Map_Manager.h"\

-	{$(INCLUDE)}"\ace\Map_Manager.i"\

-	{$(INCLUDE)}"\ace\Mem_Map.h"\

-	{$(INCLUDE)}"\ace\Mem_Map.i"\

-	{$(INCLUDE)}"\ace\Memory_Pool.h"\

-	{$(INCLUDE)}"\ace\Memory_Pool.i"\

-	{$(INCLUDE)}"\ace\Message_Block.h"\

-	{$(INCLUDE)}"\ace\Message_Block.i"\

-	{$(INCLUDE)}"\ace\Message_Queue.cpp"\

-	{$(INCLUDE)}"\ace\Message_Queue.h"\

-	{$(INCLUDE)}"\ace\Message_Queue.i"\

-	{$(INCLUDE)}"\ace\Module.cpp"\

-	{$(INCLUDE)}"\ace\Module.h"\

-	{$(INCLUDE)}"\ace\Module.i"\

-	{$(INCLUDE)}"\ace\Object_Manager.h"\

-	{$(INCLUDE)}"\ace\Object_Manager.i"\

-	{$(INCLUDE)}"\ace\OS.h"\

-	{$(INCLUDE)}"\ace\OS.i"\

-	{$(INCLUDE)}"\ace\Reactor.h"\

-	{$(INCLUDE)}"\ace\Reactor.i"\

-	{$(INCLUDE)}"\ace\Reactor_Impl.h"\

-	{$(INCLUDE)}"\ace\Service_Config.h"\

-	{$(INCLUDE)}"\ace\Service_Config.i"\

-	{$(INCLUDE)}"\ace\Service_Object.h"\

-	{$(INCLUDE)}"\ace\Service_Object.i"\

-	{$(INCLUDE)}"\ace\Service_Repository.h"\

-	{$(INCLUDE)}"\ace\Service_Repository.i"\

-	{$(INCLUDE)}"\ace\Service_Types.h"\

-	{$(INCLUDE)}"\ace\Service_Types.i"\

-	{$(INCLUDE)}"\ace\Shared_Object.h"\

-	{$(INCLUDE)}"\ace\Shared_Object.i"\

-	{$(INCLUDE)}"\ace\Signal.h"\

-	{$(INCLUDE)}"\ace\Signal.i"\

-	{$(INCLUDE)}"\ace\Singleton.cpp"\

-	{$(INCLUDE)}"\ace\Singleton.h"\

-	{$(INCLUDE)}"\ace\Singleton.i"\

-	{$(INCLUDE)}"\ace\SOCK.h"\

-	{$(INCLUDE)}"\ace\SOCK.i"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.h"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.i"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.h"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.i"\

-	{$(INCLUDE)}"\ace\SOCK_IO.h"\

-	{$(INCLUDE)}"\ace\SOCK_IO.i"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.h"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.i"\

-	{$(INCLUDE)}"\ace\SString.h"\

-	{$(INCLUDE)}"\ace\SString.i"\

-	{$(INCLUDE)}"\ace\stdcpp.h"\

-	{$(INCLUDE)}"\ace\Strategies.h"\

-	{$(INCLUDE)}"\ace\Strategies_T.cpp"\

-	{$(INCLUDE)}"\ace\Strategies_T.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.cpp"\

-	{$(INCLUDE)}"\ace\Stream_Modules.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.i"\

-	{$(INCLUDE)}"\ace\Svc_Conf_Tokens.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.cpp"\

-	{$(INCLUDE)}"\ace\Svc_Handler.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.i"\

-	{$(INCLUDE)}"\ace\Synch.h"\

-	{$(INCLUDE)}"\ace\Synch.i"\

-	{$(INCLUDE)}"\ace\Synch_Options.h"\

-	{$(INCLUDE)}"\ace\Synch_T.cpp"\

-	{$(INCLUDE)}"\ace\Synch_T.h"\

-	{$(INCLUDE)}"\ace\Synch_T.i"\

-	{$(INCLUDE)}"\ace\Task.h"\

-	{$(INCLUDE)}"\ace\Task.i"\

-	{$(INCLUDE)}"\ace\Task_T.cpp"\

-	{$(INCLUDE)}"\ace\Task_T.h"\

-	{$(INCLUDE)}"\ace\Task_T.i"\

-	{$(INCLUDE)}"\ace\Thread.h"\

-	{$(INCLUDE)}"\ace\Thread.i"\

-	{$(INCLUDE)}"\ace\Thread_Manager.h"\

-	{$(INCLUDE)}"\ace\Thread_Manager.i"\

-	{$(INCLUDE)}"\ace\Time_Value.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.cpp"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.i"\

-	{$(INCLUDE)}"\ace\Trace.h"\

-	{$(INCLUDE)}"\ace\Version.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.i"\

-	{$(INCLUDE)}"\ace\ws2tcpip.h"\

-	

-

-"$(INTDIR)\poa.obj" : $(SOURCE) $(DEP_CPP_POA_C) "$(INTDIR)"

-

-

-!ELSEIF  "$(CFG)" == "TAO - Win32 Debug"

-

-DEP_CPP_POA_C=\

-	"..\..\ace\config-win32.h"\

-	{$(INCLUDE)}"\.\align.h"\

-	{$(INCLUDE)}"\.\any.h"\

-	{$(INCLUDE)}"\.\any.i"\

-	{$(INCLUDE)}"\.\cdr.h"\

-	{$(INCLUDE)}"\.\cdr.i"\

-	{$(INCLUDE)}"\.\client_factory.h"\

-	{$(INCLUDE)}"\.\connect.h"\

-	{$(INCLUDE)}"\.\connect.i"\

-	{$(INCLUDE)}"\.\corba.h"\

-	{$(INCLUDE)}"\.\corbacom.h"\

-	{$(INCLUDE)}"\.\corbacom.i"\

-	{$(INCLUDE)}"\.\debug.h"\

-	{$(INCLUDE)}"\.\default_client.h"\

-	{$(INCLUDE)}"\.\default_client.i"\

-	{$(INCLUDE)}"\.\default_server.h"\

-	{$(INCLUDE)}"\.\default_server.i"\

-	{$(INCLUDE)}"\.\except.h"\

-	{$(INCLUDE)}"\.\giop.h"\

-	{$(INCLUDE)}"\.\giop.i"\

-	{$(INCLUDE)}"\.\iiopobj.h"\

-	{$(INCLUDE)}"\.\iiopobj.i"\

-	{$(INCLUDE)}"\.\iioporb.h"\

-	{$(INCLUDE)}"\.\iioporb.i"\

-	{$(INCLUDE)}"\.\marshal.h"\

-	{$(INCLUDE)}"\.\marshal.i"\

-	{$(INCLUDE)}"\.\nvlist.h"\

-	{$(INCLUDE)}"\.\object.h"\

-	{$(INCLUDE)}"\.\object.i"\

-	{$(INCLUDE)}"\.\objtable.h"\

-	{$(INCLUDE)}"\.\optable.h"\

-	{$(INCLUDE)}"\.\orb.h"\

-	{$(INCLUDE)}"\.\orb_core.h"\

-	{$(INCLUDE)}"\.\orb_core.i"\

-	{$(INCLUDE)}"\.\orbconf.h"\

-	{$(INCLUDE)}"\.\orbobj.h"\

-	{$(INCLUDE)}"\.\orbobj.i"\

-	{$(INCLUDE)}"\.\params.h"\

-	{$(INCLUDE)}"\.\params.i"\

-	{$(INCLUDE)}"\.\poa.h"\

-	{$(INCLUDE)}"\.\poa.i"\

-	{$(INCLUDE)}"\.\principa.h"\

-	{$(INCLUDE)}"\.\request.h"\

-	{$(INCLUDE)}"\.\sequence.h"\

-	{$(INCLUDE)}"\.\sequence.i"\

-	{$(INCLUDE)}"\.\server_factory.h"\

-	{$(INCLUDE)}"\.\server_factory.i"\

-	{$(INCLUDE)}"\.\singletons.h"\

-	{$(INCLUDE)}"\.\stub.h"\

-	{$(INCLUDE)}"\.\stub.i"\

-	{$(INCLUDE)}"\.\svrrqst.h"\

-	{$(INCLUDE)}"\.\typecode.h"\

-	{$(INCLUDE)}"\.\typecode.i"\

-	{$(INCLUDE)}"\.\varout.h"\

-	{$(INCLUDE)}"\ace\Acceptor.cpp"\

-	{$(INCLUDE)}"\ace\Acceptor.h"\

-	{$(INCLUDE)}"\ace\Acceptor.i"\

-	{$(INCLUDE)}"\ace\ACE.h"\

-	{$(INCLUDE)}"\ace\ACE.i"\

-	{$(INCLUDE)}"\ace\Addr.h"\

-	{$(INCLUDE)}"\ace\Addr.i"\

-	{$(INCLUDE)}"\ace\Atomic_Op.i"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.cpp"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.h"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.i"\

-	{$(INCLUDE)}"\ace\config-win32-common.h"\

-	{$(INCLUDE)}"\ace\Config.h"\

-	{$(INCLUDE)}"\ace\Connector.cpp"\

-	{$(INCLUDE)}"\ace\Connector.h"\

-	{$(INCLUDE)}"\ace\Connector.i"\

-	{$(INCLUDE)}"\ace\Containers.cpp"\

-	{$(INCLUDE)}"\ace\Containers.h"\

-	{$(INCLUDE)}"\ace\Containers.i"\

-	{$(INCLUDE)}"\ace\Dynamic.h"\

-	{$(INCLUDE)}"\ace\Dynamic.i"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.cpp"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.i"\

-	{$(INCLUDE)}"\ace\Free_List.cpp"\

-	{$(INCLUDE)}"\ace\Free_List.h"\

-	{$(INCLUDE)}"\ace\Free_List.i"\

-	{$(INCLUDE)}"\ace\Get_Opt.h"\

-	{$(INCLUDE)}"\ace\Get_Opt.i"\

-	{$(INCLUDE)}"\ace\Handle_Set.h"\

-	{$(INCLUDE)}"\ace\Handle_Set.i"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.i"\

-	{$(INCLUDE)}"\ace\IO_Cntl_Msg.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.i"\

-	{$(INCLUDE)}"\ace\Log_Msg.h"\

-	{$(INCLUDE)}"\ace\Log_Priority.h"\

-	{$(INCLUDE)}"\ace\Log_Record.h"\

-	{$(INCLUDE)}"\ace\Log_Record.i"\

-	{$(INCLUDE)}"\ace\Malloc.h"\

-	{$(INCLUDE)}"\ace\Malloc.i"\

-	{$(INCLUDE)}"\ace\Malloc_T.cpp"\

-	{$(INCLUDE)}"\ace\Malloc_T.h"\

-	{$(INCLUDE)}"\ace\Malloc_T.i"\

-	{$(INCLUDE)}"\ace\Managed_Object.cpp"\

-	{$(INCLUDE)}"\ace\Managed_Object.h"\

-	{$(INCLUDE)}"\ace\Managed_Object.i"\

-	{$(INCLUDE)}"\ace\Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Map_Manager.h"\

-	{$(INCLUDE)}"\ace\Map_Manager.i"\

-	{$(INCLUDE)}"\ace\Mem_Map.h"\

-	{$(INCLUDE)}"\ace\Mem_Map.i"\

-	{$(INCLUDE)}"\ace\Memory_Pool.h"\

-	{$(INCLUDE)}"\ace\Memory_Pool.i"\

-	{$(INCLUDE)}"\ace\Message_Block.h"\

-	{$(INCLUDE)}"\ace\Message_Block.i"\

-	{$(INCLUDE)}"\ace\Message_Queue.cpp"\

-	{$(INCLUDE)}"\ace\Message_Queue.h"\

-	{$(INCLUDE)}"\ace\Message_Queue.i"\

-	{$(INCLUDE)}"\ace\Module.cpp"\

-	{$(INCLUDE)}"\ace\Module.h"\

-	{$(INCLUDE)}"\ace\Module.i"\

-	{$(INCLUDE)}"\ace\Object_Manager.h"\

-	{$(INCLUDE)}"\ace\Object_Manager.i"\

-	{$(INCLUDE)}"\ace\OS.h"\

-	{$(INCLUDE)}"\ace\OS.i"\

-	{$(INCLUDE)}"\ace\Reactor.h"\

-	{$(INCLUDE)}"\ace\Reactor.i"\

-	{$(INCLUDE)}"\ace\Reactor_Impl.h"\

-	{$(INCLUDE)}"\ace\Service_Config.h"\

-	{$(INCLUDE)}"\ace\Service_Config.i"\

-	{$(INCLUDE)}"\ace\Service_Object.h"\

-	{$(INCLUDE)}"\ace\Service_Object.i"\

-	{$(INCLUDE)}"\ace\Service_Repository.h"\

-	{$(INCLUDE)}"\ace\Service_Repository.i"\

-	{$(INCLUDE)}"\ace\Service_Types.h"\

-	{$(INCLUDE)}"\ace\Service_Types.i"\

-	{$(INCLUDE)}"\ace\Shared_Object.h"\

-	{$(INCLUDE)}"\ace\Shared_Object.i"\

-	{$(INCLUDE)}"\ace\Signal.h"\

-	{$(INCLUDE)}"\ace\Signal.i"\

-	{$(INCLUDE)}"\ace\Singleton.cpp"\

-	{$(INCLUDE)}"\ace\Singleton.h"\

-	{$(INCLUDE)}"\ace\Singleton.i"\

-	{$(INCLUDE)}"\ace\SOCK.h"\

-	{$(INCLUDE)}"\ace\SOCK.i"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.h"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.i"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.h"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.i"\

-	{$(INCLUDE)}"\ace\SOCK_IO.h"\

-	{$(INCLUDE)}"\ace\SOCK_IO.i"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.h"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.i"\

-	{$(INCLUDE)}"\ace\SString.h"\

-	{$(INCLUDE)}"\ace\SString.i"\

-	{$(INCLUDE)}"\ace\stdcpp.h"\

-	{$(INCLUDE)}"\ace\Strategies.h"\

-	{$(INCLUDE)}"\ace\Strategies_T.cpp"\

-	{$(INCLUDE)}"\ace\Strategies_T.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.cpp"\

-	{$(INCLUDE)}"\ace\Stream_Modules.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.i"\

-	{$(INCLUDE)}"\ace\Svc_Conf_Tokens.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.cpp"\

-	{$(INCLUDE)}"\ace\Svc_Handler.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.i"\

-	{$(INCLUDE)}"\ace\Synch.h"\

-	{$(INCLUDE)}"\ace\Synch.i"\

-	{$(INCLUDE)}"\ace\Synch_Options.h"\

-	{$(INCLUDE)}"\ace\Synch_T.cpp"\

-	{$(INCLUDE)}"\ace\Synch_T.h"\

-	{$(INCLUDE)}"\ace\Synch_T.i"\

-	{$(INCLUDE)}"\ace\Task.h"\

-	{$(INCLUDE)}"\ace\Task.i"\

-	{$(INCLUDE)}"\ace\Task_T.cpp"\

-	{$(INCLUDE)}"\ace\Task_T.h"\

-	{$(INCLUDE)}"\ace\Task_T.i"\

-	{$(INCLUDE)}"\ace\Thread.h"\

-	{$(INCLUDE)}"\ace\Thread.i"\

-	{$(INCLUDE)}"\ace\Thread_Manager.h"\

-	{$(INCLUDE)}"\ace\Thread_Manager.i"\

-	{$(INCLUDE)}"\ace\Time_Value.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.cpp"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.i"\

-	{$(INCLUDE)}"\ace\Trace.h"\

-	{$(INCLUDE)}"\ace\Version.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.i"\

-	{$(INCLUDE)}"\ace\ws2tcpip.h"\

-	

-

-"$(INTDIR)\poa.obj" : $(SOURCE) $(DEP_CPP_POA_C) "$(INTDIR)"

-

-

-!ENDIF 

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\principa.cpp

-

-!IF  "$(CFG)" == "TAO - Win32 Release"

-

-DEP_CPP_PRINC=\

-	"..\..\ace\config-win32.h"\

-	{$(INCLUDE)}"\.\align.h"\

-	{$(INCLUDE)}"\.\any.h"\

-	{$(INCLUDE)}"\.\any.i"\

-	{$(INCLUDE)}"\.\cdr.h"\

-	{$(INCLUDE)}"\.\cdr.i"\

-	{$(INCLUDE)}"\.\client_factory.h"\

-	{$(INCLUDE)}"\.\connect.h"\

-	{$(INCLUDE)}"\.\connect.i"\

-	{$(INCLUDE)}"\.\corba.h"\

-	{$(INCLUDE)}"\.\corbacom.h"\

-	{$(INCLUDE)}"\.\corbacom.i"\

-	{$(INCLUDE)}"\.\debug.h"\

-	{$(INCLUDE)}"\.\default_client.h"\

-	{$(INCLUDE)}"\.\default_client.i"\

-	{$(INCLUDE)}"\.\default_server.h"\

-	{$(INCLUDE)}"\.\default_server.i"\

-	{$(INCLUDE)}"\.\except.h"\

-	{$(INCLUDE)}"\.\giop.h"\

-	{$(INCLUDE)}"\.\giop.i"\

-	{$(INCLUDE)}"\.\iiopobj.h"\

-	{$(INCLUDE)}"\.\iiopobj.i"\

-	{$(INCLUDE)}"\.\iioporb.h"\

-	{$(INCLUDE)}"\.\iioporb.i"\

-	{$(INCLUDE)}"\.\marshal.h"\

-	{$(INCLUDE)}"\.\marshal.i"\

-	{$(INCLUDE)}"\.\nvlist.h"\

-	{$(INCLUDE)}"\.\object.h"\

-	{$(INCLUDE)}"\.\object.i"\

-	{$(INCLUDE)}"\.\objtable.h"\

-	{$(INCLUDE)}"\.\optable.h"\

-	{$(INCLUDE)}"\.\orb.h"\

-	{$(INCLUDE)}"\.\orb_core.h"\

-	{$(INCLUDE)}"\.\orb_core.i"\

-	{$(INCLUDE)}"\.\orbconf.h"\

-	{$(INCLUDE)}"\.\orbobj.h"\

-	{$(INCLUDE)}"\.\orbobj.i"\

-	{$(INCLUDE)}"\.\params.h"\

-	{$(INCLUDE)}"\.\params.i"\

-	{$(INCLUDE)}"\.\poa.h"\

-	{$(INCLUDE)}"\.\poa.i"\

-	{$(INCLUDE)}"\.\principa.h"\

-	{$(INCLUDE)}"\.\request.h"\

-	{$(INCLUDE)}"\.\sequence.h"\

-	{$(INCLUDE)}"\.\sequence.i"\

-	{$(INCLUDE)}"\.\server_factory.h"\

-	{$(INCLUDE)}"\.\server_factory.i"\

-	{$(INCLUDE)}"\.\singletons.h"\

-	{$(INCLUDE)}"\.\stub.h"\

-	{$(INCLUDE)}"\.\stub.i"\

-	{$(INCLUDE)}"\.\svrrqst.h"\

-	{$(INCLUDE)}"\.\typecode.h"\

-	{$(INCLUDE)}"\.\typecode.i"\

-	{$(INCLUDE)}"\.\varout.h"\

-	{$(INCLUDE)}"\ace\Acceptor.cpp"\

-	{$(INCLUDE)}"\ace\Acceptor.h"\

-	{$(INCLUDE)}"\ace\Acceptor.i"\

-	{$(INCLUDE)}"\ace\ACE.h"\

-	{$(INCLUDE)}"\ace\ACE.i"\

-	{$(INCLUDE)}"\ace\Addr.h"\

-	{$(INCLUDE)}"\ace\Addr.i"\

-	{$(INCLUDE)}"\ace\Atomic_Op.i"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.cpp"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.h"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.i"\

-	{$(INCLUDE)}"\ace\config-win32-common.h"\

-	{$(INCLUDE)}"\ace\Config.h"\

-	{$(INCLUDE)}"\ace\Connector.cpp"\

-	{$(INCLUDE)}"\ace\Connector.h"\

-	{$(INCLUDE)}"\ace\Connector.i"\

-	{$(INCLUDE)}"\ace\Containers.cpp"\

-	{$(INCLUDE)}"\ace\Containers.h"\

-	{$(INCLUDE)}"\ace\Containers.i"\

-	{$(INCLUDE)}"\ace\Dynamic.h"\

-	{$(INCLUDE)}"\ace\Dynamic.i"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.cpp"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.i"\

-	{$(INCLUDE)}"\ace\Free_List.cpp"\

-	{$(INCLUDE)}"\ace\Free_List.h"\

-	{$(INCLUDE)}"\ace\Free_List.i"\

-	{$(INCLUDE)}"\ace\Get_Opt.h"\

-	{$(INCLUDE)}"\ace\Get_Opt.i"\

-	{$(INCLUDE)}"\ace\Handle_Set.h"\

-	{$(INCLUDE)}"\ace\Handle_Set.i"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.i"\

-	{$(INCLUDE)}"\ace\IO_Cntl_Msg.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.i"\

-	{$(INCLUDE)}"\ace\Log_Msg.h"\

-	{$(INCLUDE)}"\ace\Log_Priority.h"\

-	{$(INCLUDE)}"\ace\Log_Record.h"\

-	{$(INCLUDE)}"\ace\Log_Record.i"\

-	{$(INCLUDE)}"\ace\Malloc.h"\

-	{$(INCLUDE)}"\ace\Malloc.i"\

-	{$(INCLUDE)}"\ace\Malloc_T.cpp"\

-	{$(INCLUDE)}"\ace\Malloc_T.h"\

-	{$(INCLUDE)}"\ace\Malloc_T.i"\

-	{$(INCLUDE)}"\ace\Managed_Object.cpp"\

-	{$(INCLUDE)}"\ace\Managed_Object.h"\

-	{$(INCLUDE)}"\ace\Managed_Object.i"\

-	{$(INCLUDE)}"\ace\Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Map_Manager.h"\

-	{$(INCLUDE)}"\ace\Map_Manager.i"\

-	{$(INCLUDE)}"\ace\Mem_Map.h"\

-	{$(INCLUDE)}"\ace\Mem_Map.i"\

-	{$(INCLUDE)}"\ace\Memory_Pool.h"\

-	{$(INCLUDE)}"\ace\Memory_Pool.i"\

-	{$(INCLUDE)}"\ace\Message_Block.h"\

-	{$(INCLUDE)}"\ace\Message_Block.i"\

-	{$(INCLUDE)}"\ace\Message_Queue.cpp"\

-	{$(INCLUDE)}"\ace\Message_Queue.h"\

-	{$(INCLUDE)}"\ace\Message_Queue.i"\

-	{$(INCLUDE)}"\ace\Module.cpp"\

-	{$(INCLUDE)}"\ace\Module.h"\

-	{$(INCLUDE)}"\ace\Module.i"\

-	{$(INCLUDE)}"\ace\Object_Manager.h"\

-	{$(INCLUDE)}"\ace\Object_Manager.i"\

-	{$(INCLUDE)}"\ace\OS.h"\

-	{$(INCLUDE)}"\ace\OS.i"\

-	{$(INCLUDE)}"\ace\Reactor.h"\

-	{$(INCLUDE)}"\ace\Reactor.i"\

-	{$(INCLUDE)}"\ace\Reactor_Impl.h"\

-	{$(INCLUDE)}"\ace\Service_Config.h"\

-	{$(INCLUDE)}"\ace\Service_Config.i"\

-	{$(INCLUDE)}"\ace\Service_Object.h"\

-	{$(INCLUDE)}"\ace\Service_Object.i"\

-	{$(INCLUDE)}"\ace\Service_Repository.h"\

-	{$(INCLUDE)}"\ace\Service_Repository.i"\

-	{$(INCLUDE)}"\ace\Service_Types.h"\

-	{$(INCLUDE)}"\ace\Service_Types.i"\

-	{$(INCLUDE)}"\ace\Shared_Object.h"\

-	{$(INCLUDE)}"\ace\Shared_Object.i"\

-	{$(INCLUDE)}"\ace\Signal.h"\

-	{$(INCLUDE)}"\ace\Signal.i"\

-	{$(INCLUDE)}"\ace\Singleton.cpp"\

-	{$(INCLUDE)}"\ace\Singleton.h"\

-	{$(INCLUDE)}"\ace\Singleton.i"\

-	{$(INCLUDE)}"\ace\SOCK.h"\

-	{$(INCLUDE)}"\ace\SOCK.i"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.h"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.i"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.h"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.i"\

-	{$(INCLUDE)}"\ace\SOCK_IO.h"\

-	{$(INCLUDE)}"\ace\SOCK_IO.i"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.h"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.i"\

-	{$(INCLUDE)}"\ace\SString.h"\

-	{$(INCLUDE)}"\ace\SString.i"\

-	{$(INCLUDE)}"\ace\stdcpp.h"\

-	{$(INCLUDE)}"\ace\Strategies.h"\

-	{$(INCLUDE)}"\ace\Strategies_T.cpp"\

-	{$(INCLUDE)}"\ace\Strategies_T.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.cpp"\

-	{$(INCLUDE)}"\ace\Stream_Modules.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.i"\

-	{$(INCLUDE)}"\ace\Svc_Conf_Tokens.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.cpp"\

-	{$(INCLUDE)}"\ace\Svc_Handler.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.i"\

-	{$(INCLUDE)}"\ace\Synch.h"\

-	{$(INCLUDE)}"\ace\Synch.i"\

-	{$(INCLUDE)}"\ace\Synch_Options.h"\

-	{$(INCLUDE)}"\ace\Synch_T.cpp"\

-	{$(INCLUDE)}"\ace\Synch_T.h"\

-	{$(INCLUDE)}"\ace\Synch_T.i"\

-	{$(INCLUDE)}"\ace\Task.h"\

-	{$(INCLUDE)}"\ace\Task.i"\

-	{$(INCLUDE)}"\ace\Task_T.cpp"\

-	{$(INCLUDE)}"\ace\Task_T.h"\

-	{$(INCLUDE)}"\ace\Task_T.i"\

-	{$(INCLUDE)}"\ace\Thread.h"\

-	{$(INCLUDE)}"\ace\Thread.i"\

-	{$(INCLUDE)}"\ace\Thread_Manager.h"\

-	{$(INCLUDE)}"\ace\Thread_Manager.i"\

-	{$(INCLUDE)}"\ace\Time_Value.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.cpp"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.i"\

-	{$(INCLUDE)}"\ace\Trace.h"\

-	{$(INCLUDE)}"\ace\Version.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.i"\

-	{$(INCLUDE)}"\ace\ws2tcpip.h"\

-	

-

-"$(INTDIR)\principa.obj" : $(SOURCE) $(DEP_CPP_PRINC) "$(INTDIR)"

-

-

-!ELSEIF  "$(CFG)" == "TAO - Win32 Debug"

-

-DEP_CPP_PRINC=\

-	"..\..\ace\config-win32.h"\

-	{$(INCLUDE)}"\.\align.h"\

-	{$(INCLUDE)}"\.\any.h"\

-	{$(INCLUDE)}"\.\any.i"\

-	{$(INCLUDE)}"\.\cdr.h"\

-	{$(INCLUDE)}"\.\cdr.i"\

-	{$(INCLUDE)}"\.\client_factory.h"\

-	{$(INCLUDE)}"\.\connect.h"\

-	{$(INCLUDE)}"\.\connect.i"\

-	{$(INCLUDE)}"\.\corba.h"\

-	{$(INCLUDE)}"\.\corbacom.h"\

-	{$(INCLUDE)}"\.\corbacom.i"\

-	{$(INCLUDE)}"\.\debug.h"\

-	{$(INCLUDE)}"\.\default_client.h"\

-	{$(INCLUDE)}"\.\default_client.i"\

-	{$(INCLUDE)}"\.\default_server.h"\

-	{$(INCLUDE)}"\.\default_server.i"\

-	{$(INCLUDE)}"\.\except.h"\

-	{$(INCLUDE)}"\.\giop.h"\

-	{$(INCLUDE)}"\.\giop.i"\

-	{$(INCLUDE)}"\.\iiopobj.h"\

-	{$(INCLUDE)}"\.\iiopobj.i"\

-	{$(INCLUDE)}"\.\iioporb.h"\

-	{$(INCLUDE)}"\.\iioporb.i"\

-	{$(INCLUDE)}"\.\marshal.h"\

-	{$(INCLUDE)}"\.\marshal.i"\

-	{$(INCLUDE)}"\.\nvlist.h"\

-	{$(INCLUDE)}"\.\object.h"\

-	{$(INCLUDE)}"\.\object.i"\

-	{$(INCLUDE)}"\.\objtable.h"\

-	{$(INCLUDE)}"\.\optable.h"\

-	{$(INCLUDE)}"\.\orb.h"\

-	{$(INCLUDE)}"\.\orb_core.h"\

-	{$(INCLUDE)}"\.\orb_core.i"\

-	{$(INCLUDE)}"\.\orbconf.h"\

-	{$(INCLUDE)}"\.\orbobj.h"\

-	{$(INCLUDE)}"\.\orbobj.i"\

-	{$(INCLUDE)}"\.\params.h"\

-	{$(INCLUDE)}"\.\params.i"\

-	{$(INCLUDE)}"\.\poa.h"\

-	{$(INCLUDE)}"\.\poa.i"\

-	{$(INCLUDE)}"\.\principa.h"\

-	{$(INCLUDE)}"\.\request.h"\

-	{$(INCLUDE)}"\.\sequence.h"\

-	{$(INCLUDE)}"\.\sequence.i"\

-	{$(INCLUDE)}"\.\server_factory.h"\

-	{$(INCLUDE)}"\.\server_factory.i"\

-	{$(INCLUDE)}"\.\singletons.h"\

-	{$(INCLUDE)}"\.\stub.h"\

-	{$(INCLUDE)}"\.\stub.i"\

-	{$(INCLUDE)}"\.\svrrqst.h"\

-	{$(INCLUDE)}"\.\typecode.h"\

-	{$(INCLUDE)}"\.\typecode.i"\

-	{$(INCLUDE)}"\.\varout.h"\

-	{$(INCLUDE)}"\ace\Acceptor.cpp"\

-	{$(INCLUDE)}"\ace\Acceptor.h"\

-	{$(INCLUDE)}"\ace\Acceptor.i"\

-	{$(INCLUDE)}"\ace\ACE.h"\

-	{$(INCLUDE)}"\ace\ACE.i"\

-	{$(INCLUDE)}"\ace\Addr.h"\

-	{$(INCLUDE)}"\ace\Addr.i"\

-	{$(INCLUDE)}"\ace\Atomic_Op.i"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.cpp"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.h"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.i"\

-	{$(INCLUDE)}"\ace\config-win32-common.h"\

-	{$(INCLUDE)}"\ace\Config.h"\

-	{$(INCLUDE)}"\ace\Connector.cpp"\

-	{$(INCLUDE)}"\ace\Connector.h"\

-	{$(INCLUDE)}"\ace\Connector.i"\

-	{$(INCLUDE)}"\ace\Containers.cpp"\

-	{$(INCLUDE)}"\ace\Containers.h"\

-	{$(INCLUDE)}"\ace\Containers.i"\

-	{$(INCLUDE)}"\ace\Dynamic.h"\

-	{$(INCLUDE)}"\ace\Dynamic.i"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.cpp"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.i"\

-	{$(INCLUDE)}"\ace\Free_List.cpp"\

-	{$(INCLUDE)}"\ace\Free_List.h"\

-	{$(INCLUDE)}"\ace\Free_List.i"\

-	{$(INCLUDE)}"\ace\Get_Opt.h"\

-	{$(INCLUDE)}"\ace\Get_Opt.i"\

-	{$(INCLUDE)}"\ace\Handle_Set.h"\

-	{$(INCLUDE)}"\ace\Handle_Set.i"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.i"\

-	{$(INCLUDE)}"\ace\IO_Cntl_Msg.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.i"\

-	{$(INCLUDE)}"\ace\Log_Msg.h"\

-	{$(INCLUDE)}"\ace\Log_Priority.h"\

-	{$(INCLUDE)}"\ace\Log_Record.h"\

-	{$(INCLUDE)}"\ace\Log_Record.i"\

-	{$(INCLUDE)}"\ace\Malloc.h"\

-	{$(INCLUDE)}"\ace\Malloc.i"\

-	{$(INCLUDE)}"\ace\Malloc_T.cpp"\

-	{$(INCLUDE)}"\ace\Malloc_T.h"\

-	{$(INCLUDE)}"\ace\Malloc_T.i"\

-	{$(INCLUDE)}"\ace\Managed_Object.cpp"\

-	{$(INCLUDE)}"\ace\Managed_Object.h"\

-	{$(INCLUDE)}"\ace\Managed_Object.i"\

-	{$(INCLUDE)}"\ace\Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Map_Manager.h"\

-	{$(INCLUDE)}"\ace\Map_Manager.i"\

-	{$(INCLUDE)}"\ace\Mem_Map.h"\

-	{$(INCLUDE)}"\ace\Mem_Map.i"\

-	{$(INCLUDE)}"\ace\Memory_Pool.h"\

-	{$(INCLUDE)}"\ace\Memory_Pool.i"\

-	{$(INCLUDE)}"\ace\Message_Block.h"\

-	{$(INCLUDE)}"\ace\Message_Block.i"\

-	{$(INCLUDE)}"\ace\Message_Queue.cpp"\

-	{$(INCLUDE)}"\ace\Message_Queue.h"\

-	{$(INCLUDE)}"\ace\Message_Queue.i"\

-	{$(INCLUDE)}"\ace\Module.cpp"\

-	{$(INCLUDE)}"\ace\Module.h"\

-	{$(INCLUDE)}"\ace\Module.i"\

-	{$(INCLUDE)}"\ace\Object_Manager.h"\

-	{$(INCLUDE)}"\ace\Object_Manager.i"\

-	{$(INCLUDE)}"\ace\OS.h"\

-	{$(INCLUDE)}"\ace\OS.i"\

-	{$(INCLUDE)}"\ace\Reactor.h"\

-	{$(INCLUDE)}"\ace\Reactor.i"\

-	{$(INCLUDE)}"\ace\Reactor_Impl.h"\

-	{$(INCLUDE)}"\ace\Service_Config.h"\

-	{$(INCLUDE)}"\ace\Service_Config.i"\

-	{$(INCLUDE)}"\ace\Service_Object.h"\

-	{$(INCLUDE)}"\ace\Service_Object.i"\

-	{$(INCLUDE)}"\ace\Service_Repository.h"\

-	{$(INCLUDE)}"\ace\Service_Repository.i"\

-	{$(INCLUDE)}"\ace\Service_Types.h"\

-	{$(INCLUDE)}"\ace\Service_Types.i"\

-	{$(INCLUDE)}"\ace\Shared_Object.h"\

-	{$(INCLUDE)}"\ace\Shared_Object.i"\

-	{$(INCLUDE)}"\ace\Signal.h"\

-	{$(INCLUDE)}"\ace\Signal.i"\

-	{$(INCLUDE)}"\ace\Singleton.cpp"\

-	{$(INCLUDE)}"\ace\Singleton.h"\

-	{$(INCLUDE)}"\ace\Singleton.i"\

-	{$(INCLUDE)}"\ace\SOCK.h"\

-	{$(INCLUDE)}"\ace\SOCK.i"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.h"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.i"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.h"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.i"\

-	{$(INCLUDE)}"\ace\SOCK_IO.h"\

-	{$(INCLUDE)}"\ace\SOCK_IO.i"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.h"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.i"\

-	{$(INCLUDE)}"\ace\SString.h"\

-	{$(INCLUDE)}"\ace\SString.i"\

-	{$(INCLUDE)}"\ace\stdcpp.h"\

-	{$(INCLUDE)}"\ace\Strategies.h"\

-	{$(INCLUDE)}"\ace\Strategies_T.cpp"\

-	{$(INCLUDE)}"\ace\Strategies_T.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.cpp"\

-	{$(INCLUDE)}"\ace\Stream_Modules.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.i"\

-	{$(INCLUDE)}"\ace\Svc_Conf_Tokens.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.cpp"\

-	{$(INCLUDE)}"\ace\Svc_Handler.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.i"\

-	{$(INCLUDE)}"\ace\Synch.h"\

-	{$(INCLUDE)}"\ace\Synch.i"\

-	{$(INCLUDE)}"\ace\Synch_Options.h"\

-	{$(INCLUDE)}"\ace\Synch_T.cpp"\

-	{$(INCLUDE)}"\ace\Synch_T.h"\

-	{$(INCLUDE)}"\ace\Synch_T.i"\

-	{$(INCLUDE)}"\ace\Task.h"\

-	{$(INCLUDE)}"\ace\Task.i"\

-	{$(INCLUDE)}"\ace\Task_T.cpp"\

-	{$(INCLUDE)}"\ace\Task_T.h"\

-	{$(INCLUDE)}"\ace\Task_T.i"\

-	{$(INCLUDE)}"\ace\Thread.h"\

-	{$(INCLUDE)}"\ace\Thread.i"\

-	{$(INCLUDE)}"\ace\Thread_Manager.h"\

-	{$(INCLUDE)}"\ace\Thread_Manager.i"\

-	{$(INCLUDE)}"\ace\Time_Value.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.cpp"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.i"\

-	{$(INCLUDE)}"\ace\Trace.h"\

-	{$(INCLUDE)}"\ace\Version.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.i"\

-	{$(INCLUDE)}"\ace\ws2tcpip.h"\

-	

-

-"$(INTDIR)\principa.obj" : $(SOURCE) $(DEP_CPP_PRINC) "$(INTDIR)"

-

-

-!ENDIF 

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\request.cpp

-

-!IF  "$(CFG)" == "TAO - Win32 Release"

-

-DEP_CPP_REQUE=\

-	"..\..\ace\config-win32.h"\

-	{$(INCLUDE)}"\.\align.h"\

-	{$(INCLUDE)}"\.\any.h"\

-	{$(INCLUDE)}"\.\any.i"\

-	{$(INCLUDE)}"\.\cdr.h"\

-	{$(INCLUDE)}"\.\cdr.i"\

-	{$(INCLUDE)}"\.\client_factory.h"\

-	{$(INCLUDE)}"\.\connect.h"\

-	{$(INCLUDE)}"\.\connect.i"\

-	{$(INCLUDE)}"\.\corba.h"\

-	{$(INCLUDE)}"\.\corbacom.h"\

-	{$(INCLUDE)}"\.\corbacom.i"\

-	{$(INCLUDE)}"\.\debug.h"\

-	{$(INCLUDE)}"\.\default_client.h"\

-	{$(INCLUDE)}"\.\default_client.i"\

-	{$(INCLUDE)}"\.\default_server.h"\

-	{$(INCLUDE)}"\.\default_server.i"\

-	{$(INCLUDE)}"\.\except.h"\

-	{$(INCLUDE)}"\.\giop.h"\

-	{$(INCLUDE)}"\.\giop.i"\

-	{$(INCLUDE)}"\.\iiopobj.h"\

-	{$(INCLUDE)}"\.\iiopobj.i"\

-	{$(INCLUDE)}"\.\iioporb.h"\

-	{$(INCLUDE)}"\.\iioporb.i"\

-	{$(INCLUDE)}"\.\marshal.h"\

-	{$(INCLUDE)}"\.\marshal.i"\

-	{$(INCLUDE)}"\.\nvlist.h"\

-	{$(INCLUDE)}"\.\object.h"\

-	{$(INCLUDE)}"\.\object.i"\

-	{$(INCLUDE)}"\.\objtable.h"\

-	{$(INCLUDE)}"\.\optable.h"\

-	{$(INCLUDE)}"\.\orb.h"\

-	{$(INCLUDE)}"\.\orb_core.h"\

-	{$(INCLUDE)}"\.\orb_core.i"\

-	{$(INCLUDE)}"\.\orbconf.h"\

-	{$(INCLUDE)}"\.\orbobj.h"\

-	{$(INCLUDE)}"\.\orbobj.i"\

-	{$(INCLUDE)}"\.\params.h"\

-	{$(INCLUDE)}"\.\params.i"\

-	{$(INCLUDE)}"\.\poa.h"\

-	{$(INCLUDE)}"\.\poa.i"\

-	{$(INCLUDE)}"\.\principa.h"\

-	{$(INCLUDE)}"\.\request.h"\

-	{$(INCLUDE)}"\.\sequence.h"\

-	{$(INCLUDE)}"\.\sequence.i"\

-	{$(INCLUDE)}"\.\server_factory.h"\

-	{$(INCLUDE)}"\.\server_factory.i"\

-	{$(INCLUDE)}"\.\singletons.h"\

-	{$(INCLUDE)}"\.\stub.h"\

-	{$(INCLUDE)}"\.\stub.i"\

-	{$(INCLUDE)}"\.\svrrqst.h"\

-	{$(INCLUDE)}"\.\typecode.h"\

-	{$(INCLUDE)}"\.\typecode.i"\

-	{$(INCLUDE)}"\.\varout.h"\

-	{$(INCLUDE)}"\ace\Acceptor.cpp"\

-	{$(INCLUDE)}"\ace\Acceptor.h"\

-	{$(INCLUDE)}"\ace\Acceptor.i"\

-	{$(INCLUDE)}"\ace\ACE.h"\

-	{$(INCLUDE)}"\ace\ACE.i"\

-	{$(INCLUDE)}"\ace\Addr.h"\

-	{$(INCLUDE)}"\ace\Addr.i"\

-	{$(INCLUDE)}"\ace\Atomic_Op.i"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.cpp"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.h"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.i"\

-	{$(INCLUDE)}"\ace\config-win32-common.h"\

-	{$(INCLUDE)}"\ace\Config.h"\

-	{$(INCLUDE)}"\ace\Connector.cpp"\

-	{$(INCLUDE)}"\ace\Connector.h"\

-	{$(INCLUDE)}"\ace\Connector.i"\

-	{$(INCLUDE)}"\ace\Containers.cpp"\

-	{$(INCLUDE)}"\ace\Containers.h"\

-	{$(INCLUDE)}"\ace\Containers.i"\

-	{$(INCLUDE)}"\ace\Dynamic.h"\

-	{$(INCLUDE)}"\ace\Dynamic.i"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.cpp"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.i"\

-	{$(INCLUDE)}"\ace\Free_List.cpp"\

-	{$(INCLUDE)}"\ace\Free_List.h"\

-	{$(INCLUDE)}"\ace\Free_List.i"\

-	{$(INCLUDE)}"\ace\Get_Opt.h"\

-	{$(INCLUDE)}"\ace\Get_Opt.i"\

-	{$(INCLUDE)}"\ace\Handle_Set.h"\

-	{$(INCLUDE)}"\ace\Handle_Set.i"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.i"\

-	{$(INCLUDE)}"\ace\IO_Cntl_Msg.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.i"\

-	{$(INCLUDE)}"\ace\Log_Msg.h"\

-	{$(INCLUDE)}"\ace\Log_Priority.h"\

-	{$(INCLUDE)}"\ace\Log_Record.h"\

-	{$(INCLUDE)}"\ace\Log_Record.i"\

-	{$(INCLUDE)}"\ace\Malloc.h"\

-	{$(INCLUDE)}"\ace\Malloc.i"\

-	{$(INCLUDE)}"\ace\Malloc_T.cpp"\

-	{$(INCLUDE)}"\ace\Malloc_T.h"\

-	{$(INCLUDE)}"\ace\Malloc_T.i"\

-	{$(INCLUDE)}"\ace\Managed_Object.cpp"\

-	{$(INCLUDE)}"\ace\Managed_Object.h"\

-	{$(INCLUDE)}"\ace\Managed_Object.i"\

-	{$(INCLUDE)}"\ace\Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Map_Manager.h"\

-	{$(INCLUDE)}"\ace\Map_Manager.i"\

-	{$(INCLUDE)}"\ace\Mem_Map.h"\

-	{$(INCLUDE)}"\ace\Mem_Map.i"\

-	{$(INCLUDE)}"\ace\Memory_Pool.h"\

-	{$(INCLUDE)}"\ace\Memory_Pool.i"\

-	{$(INCLUDE)}"\ace\Message_Block.h"\

-	{$(INCLUDE)}"\ace\Message_Block.i"\

-	{$(INCLUDE)}"\ace\Message_Queue.cpp"\

-	{$(INCLUDE)}"\ace\Message_Queue.h"\

-	{$(INCLUDE)}"\ace\Message_Queue.i"\

-	{$(INCLUDE)}"\ace\Module.cpp"\

-	{$(INCLUDE)}"\ace\Module.h"\

-	{$(INCLUDE)}"\ace\Module.i"\

-	{$(INCLUDE)}"\ace\Object_Manager.h"\

-	{$(INCLUDE)}"\ace\Object_Manager.i"\

-	{$(INCLUDE)}"\ace\OS.h"\

-	{$(INCLUDE)}"\ace\OS.i"\

-	{$(INCLUDE)}"\ace\Reactor.h"\

-	{$(INCLUDE)}"\ace\Reactor.i"\

-	{$(INCLUDE)}"\ace\Reactor_Impl.h"\

-	{$(INCLUDE)}"\ace\Service_Config.h"\

-	{$(INCLUDE)}"\ace\Service_Config.i"\

-	{$(INCLUDE)}"\ace\Service_Object.h"\

-	{$(INCLUDE)}"\ace\Service_Object.i"\

-	{$(INCLUDE)}"\ace\Service_Repository.h"\

-	{$(INCLUDE)}"\ace\Service_Repository.i"\

-	{$(INCLUDE)}"\ace\Service_Types.h"\

-	{$(INCLUDE)}"\ace\Service_Types.i"\

-	{$(INCLUDE)}"\ace\Shared_Object.h"\

-	{$(INCLUDE)}"\ace\Shared_Object.i"\

-	{$(INCLUDE)}"\ace\Signal.h"\

-	{$(INCLUDE)}"\ace\Signal.i"\

-	{$(INCLUDE)}"\ace\Singleton.cpp"\

-	{$(INCLUDE)}"\ace\Singleton.h"\

-	{$(INCLUDE)}"\ace\Singleton.i"\

-	{$(INCLUDE)}"\ace\SOCK.h"\

-	{$(INCLUDE)}"\ace\SOCK.i"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.h"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.i"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.h"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.i"\

-	{$(INCLUDE)}"\ace\SOCK_IO.h"\

-	{$(INCLUDE)}"\ace\SOCK_IO.i"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.h"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.i"\

-	{$(INCLUDE)}"\ace\SString.h"\

-	{$(INCLUDE)}"\ace\SString.i"\

-	{$(INCLUDE)}"\ace\stdcpp.h"\

-	{$(INCLUDE)}"\ace\Strategies.h"\

-	{$(INCLUDE)}"\ace\Strategies_T.cpp"\

-	{$(INCLUDE)}"\ace\Strategies_T.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.cpp"\

-	{$(INCLUDE)}"\ace\Stream_Modules.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.i"\

-	{$(INCLUDE)}"\ace\Svc_Conf_Tokens.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.cpp"\

-	{$(INCLUDE)}"\ace\Svc_Handler.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.i"\

-	{$(INCLUDE)}"\ace\Synch.h"\

-	{$(INCLUDE)}"\ace\Synch.i"\

-	{$(INCLUDE)}"\ace\Synch_Options.h"\

-	{$(INCLUDE)}"\ace\Synch_T.cpp"\

-	{$(INCLUDE)}"\ace\Synch_T.h"\

-	{$(INCLUDE)}"\ace\Synch_T.i"\

-	{$(INCLUDE)}"\ace\Task.h"\

-	{$(INCLUDE)}"\ace\Task.i"\

-	{$(INCLUDE)}"\ace\Task_T.cpp"\

-	{$(INCLUDE)}"\ace\Task_T.h"\

-	{$(INCLUDE)}"\ace\Task_T.i"\

-	{$(INCLUDE)}"\ace\Thread.h"\

-	{$(INCLUDE)}"\ace\Thread.i"\

-	{$(INCLUDE)}"\ace\Thread_Manager.h"\

-	{$(INCLUDE)}"\ace\Thread_Manager.i"\

-	{$(INCLUDE)}"\ace\Time_Value.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.cpp"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.i"\

-	{$(INCLUDE)}"\ace\Trace.h"\

-	{$(INCLUDE)}"\ace\Version.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.i"\

-	{$(INCLUDE)}"\ace\ws2tcpip.h"\

-	

-

-"$(INTDIR)\request.obj" : $(SOURCE) $(DEP_CPP_REQUE) "$(INTDIR)"

-

-

-!ELSEIF  "$(CFG)" == "TAO - Win32 Debug"

-

-DEP_CPP_REQUE=\

-	"..\..\ace\config-win32.h"\

-	{$(INCLUDE)}"\.\align.h"\

-	{$(INCLUDE)}"\.\any.h"\

-	{$(INCLUDE)}"\.\any.i"\

-	{$(INCLUDE)}"\.\cdr.h"\

-	{$(INCLUDE)}"\.\cdr.i"\

-	{$(INCLUDE)}"\.\client_factory.h"\

-	{$(INCLUDE)}"\.\connect.h"\

-	{$(INCLUDE)}"\.\connect.i"\

-	{$(INCLUDE)}"\.\corba.h"\

-	{$(INCLUDE)}"\.\corbacom.h"\

-	{$(INCLUDE)}"\.\corbacom.i"\

-	{$(INCLUDE)}"\.\debug.h"\

-	{$(INCLUDE)}"\.\default_client.h"\

-	{$(INCLUDE)}"\.\default_client.i"\

-	{$(INCLUDE)}"\.\default_server.h"\

-	{$(INCLUDE)}"\.\default_server.i"\

-	{$(INCLUDE)}"\.\except.h"\

-	{$(INCLUDE)}"\.\giop.h"\

-	{$(INCLUDE)}"\.\giop.i"\

-	{$(INCLUDE)}"\.\iiopobj.h"\

-	{$(INCLUDE)}"\.\iiopobj.i"\

-	{$(INCLUDE)}"\.\iioporb.h"\

-	{$(INCLUDE)}"\.\iioporb.i"\

-	{$(INCLUDE)}"\.\marshal.h"\

-	{$(INCLUDE)}"\.\marshal.i"\

-	{$(INCLUDE)}"\.\nvlist.h"\

-	{$(INCLUDE)}"\.\object.h"\

-	{$(INCLUDE)}"\.\object.i"\

-	{$(INCLUDE)}"\.\objtable.h"\

-	{$(INCLUDE)}"\.\optable.h"\

-	{$(INCLUDE)}"\.\orb.h"\

-	{$(INCLUDE)}"\.\orb_core.h"\

-	{$(INCLUDE)}"\.\orb_core.i"\

-	{$(INCLUDE)}"\.\orbconf.h"\

-	{$(INCLUDE)}"\.\orbobj.h"\

-	{$(INCLUDE)}"\.\orbobj.i"\

-	{$(INCLUDE)}"\.\params.h"\

-	{$(INCLUDE)}"\.\params.i"\

-	{$(INCLUDE)}"\.\poa.h"\

-	{$(INCLUDE)}"\.\poa.i"\

-	{$(INCLUDE)}"\.\principa.h"\

-	{$(INCLUDE)}"\.\request.h"\

-	{$(INCLUDE)}"\.\sequence.h"\

-	{$(INCLUDE)}"\.\sequence.i"\

-	{$(INCLUDE)}"\.\server_factory.h"\

-	{$(INCLUDE)}"\.\server_factory.i"\

-	{$(INCLUDE)}"\.\singletons.h"\

-	{$(INCLUDE)}"\.\stub.h"\

-	{$(INCLUDE)}"\.\stub.i"\

-	{$(INCLUDE)}"\.\svrrqst.h"\

-	{$(INCLUDE)}"\.\typecode.h"\

-	{$(INCLUDE)}"\.\typecode.i"\

-	{$(INCLUDE)}"\.\varout.h"\

-	{$(INCLUDE)}"\ace\Acceptor.cpp"\

-	{$(INCLUDE)}"\ace\Acceptor.h"\

-	{$(INCLUDE)}"\ace\Acceptor.i"\

-	{$(INCLUDE)}"\ace\ACE.h"\

-	{$(INCLUDE)}"\ace\ACE.i"\

-	{$(INCLUDE)}"\ace\Addr.h"\

-	{$(INCLUDE)}"\ace\Addr.i"\

-	{$(INCLUDE)}"\ace\Atomic_Op.i"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.cpp"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.h"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.i"\

-	{$(INCLUDE)}"\ace\config-win32-common.h"\

-	{$(INCLUDE)}"\ace\Config.h"\

-	{$(INCLUDE)}"\ace\Connector.cpp"\

-	{$(INCLUDE)}"\ace\Connector.h"\

-	{$(INCLUDE)}"\ace\Connector.i"\

-	{$(INCLUDE)}"\ace\Containers.cpp"\

-	{$(INCLUDE)}"\ace\Containers.h"\

-	{$(INCLUDE)}"\ace\Containers.i"\

-	{$(INCLUDE)}"\ace\Dynamic.h"\

-	{$(INCLUDE)}"\ace\Dynamic.i"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.cpp"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.i"\

-	{$(INCLUDE)}"\ace\Free_List.cpp"\

-	{$(INCLUDE)}"\ace\Free_List.h"\

-	{$(INCLUDE)}"\ace\Free_List.i"\

-	{$(INCLUDE)}"\ace\Get_Opt.h"\

-	{$(INCLUDE)}"\ace\Get_Opt.i"\

-	{$(INCLUDE)}"\ace\Handle_Set.h"\

-	{$(INCLUDE)}"\ace\Handle_Set.i"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.i"\

-	{$(INCLUDE)}"\ace\IO_Cntl_Msg.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.i"\

-	{$(INCLUDE)}"\ace\Log_Msg.h"\

-	{$(INCLUDE)}"\ace\Log_Priority.h"\

-	{$(INCLUDE)}"\ace\Log_Record.h"\

-	{$(INCLUDE)}"\ace\Log_Record.i"\

-	{$(INCLUDE)}"\ace\Malloc.h"\

-	{$(INCLUDE)}"\ace\Malloc.i"\

-	{$(INCLUDE)}"\ace\Malloc_T.cpp"\

-	{$(INCLUDE)}"\ace\Malloc_T.h"\

-	{$(INCLUDE)}"\ace\Malloc_T.i"\

-	{$(INCLUDE)}"\ace\Managed_Object.cpp"\

-	{$(INCLUDE)}"\ace\Managed_Object.h"\

-	{$(INCLUDE)}"\ace\Managed_Object.i"\

-	{$(INCLUDE)}"\ace\Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Map_Manager.h"\

-	{$(INCLUDE)}"\ace\Map_Manager.i"\

-	{$(INCLUDE)}"\ace\Mem_Map.h"\

-	{$(INCLUDE)}"\ace\Mem_Map.i"\

-	{$(INCLUDE)}"\ace\Memory_Pool.h"\

-	{$(INCLUDE)}"\ace\Memory_Pool.i"\

-	{$(INCLUDE)}"\ace\Message_Block.h"\

-	{$(INCLUDE)}"\ace\Message_Block.i"\

-	{$(INCLUDE)}"\ace\Message_Queue.cpp"\

-	{$(INCLUDE)}"\ace\Message_Queue.h"\

-	{$(INCLUDE)}"\ace\Message_Queue.i"\

-	{$(INCLUDE)}"\ace\Module.cpp"\

-	{$(INCLUDE)}"\ace\Module.h"\

-	{$(INCLUDE)}"\ace\Module.i"\

-	{$(INCLUDE)}"\ace\Object_Manager.h"\

-	{$(INCLUDE)}"\ace\Object_Manager.i"\

-	{$(INCLUDE)}"\ace\OS.h"\

-	{$(INCLUDE)}"\ace\OS.i"\

-	{$(INCLUDE)}"\ace\Reactor.h"\

-	{$(INCLUDE)}"\ace\Reactor.i"\

-	{$(INCLUDE)}"\ace\Reactor_Impl.h"\

-	{$(INCLUDE)}"\ace\Service_Config.h"\

-	{$(INCLUDE)}"\ace\Service_Config.i"\

-	{$(INCLUDE)}"\ace\Service_Object.h"\

-	{$(INCLUDE)}"\ace\Service_Object.i"\

-	{$(INCLUDE)}"\ace\Service_Repository.h"\

-	{$(INCLUDE)}"\ace\Service_Repository.i"\

-	{$(INCLUDE)}"\ace\Service_Types.h"\

-	{$(INCLUDE)}"\ace\Service_Types.i"\

-	{$(INCLUDE)}"\ace\Shared_Object.h"\

-	{$(INCLUDE)}"\ace\Shared_Object.i"\

-	{$(INCLUDE)}"\ace\Signal.h"\

-	{$(INCLUDE)}"\ace\Signal.i"\

-	{$(INCLUDE)}"\ace\Singleton.cpp"\

-	{$(INCLUDE)}"\ace\Singleton.h"\

-	{$(INCLUDE)}"\ace\Singleton.i"\

-	{$(INCLUDE)}"\ace\SOCK.h"\

-	{$(INCLUDE)}"\ace\SOCK.i"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.h"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.i"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.h"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.i"\

-	{$(INCLUDE)}"\ace\SOCK_IO.h"\

-	{$(INCLUDE)}"\ace\SOCK_IO.i"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.h"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.i"\

-	{$(INCLUDE)}"\ace\SString.h"\

-	{$(INCLUDE)}"\ace\SString.i"\

-	{$(INCLUDE)}"\ace\stdcpp.h"\

-	{$(INCLUDE)}"\ace\Strategies.h"\

-	{$(INCLUDE)}"\ace\Strategies_T.cpp"\

-	{$(INCLUDE)}"\ace\Strategies_T.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.cpp"\

-	{$(INCLUDE)}"\ace\Stream_Modules.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.i"\

-	{$(INCLUDE)}"\ace\Svc_Conf_Tokens.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.cpp"\

-	{$(INCLUDE)}"\ace\Svc_Handler.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.i"\

-	{$(INCLUDE)}"\ace\Synch.h"\

-	{$(INCLUDE)}"\ace\Synch.i"\

-	{$(INCLUDE)}"\ace\Synch_Options.h"\

-	{$(INCLUDE)}"\ace\Synch_T.cpp"\

-	{$(INCLUDE)}"\ace\Synch_T.h"\

-	{$(INCLUDE)}"\ace\Synch_T.i"\

-	{$(INCLUDE)}"\ace\Task.h"\

-	{$(INCLUDE)}"\ace\Task.i"\

-	{$(INCLUDE)}"\ace\Task_T.cpp"\

-	{$(INCLUDE)}"\ace\Task_T.h"\

-	{$(INCLUDE)}"\ace\Task_T.i"\

-	{$(INCLUDE)}"\ace\Thread.h"\

-	{$(INCLUDE)}"\ace\Thread.i"\

-	{$(INCLUDE)}"\ace\Thread_Manager.h"\

-	{$(INCLUDE)}"\ace\Thread_Manager.i"\

-	{$(INCLUDE)}"\ace\Time_Value.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.cpp"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.i"\

-	{$(INCLUDE)}"\ace\Trace.h"\

-	{$(INCLUDE)}"\ace\Version.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.i"\

-	{$(INCLUDE)}"\ace\ws2tcpip.h"\

-	

-

-"$(INTDIR)\request.obj" : $(SOURCE) $(DEP_CPP_REQUE) "$(INTDIR)"

-

-

-!ENDIF 

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\server_factory.cpp

-DEP_CPP_SERVE=\

-	"..\..\ace\config-win32.h"\

-	{$(INCLUDE)}"\.\align.h"\

-	{$(INCLUDE)}"\.\any.h"\

-	{$(INCLUDE)}"\.\any.i"\

-	{$(INCLUDE)}"\.\cdr.h"\

-	{$(INCLUDE)}"\.\cdr.i"\

-	{$(INCLUDE)}"\.\client_factory.h"\

-	{$(INCLUDE)}"\.\connect.h"\

-	{$(INCLUDE)}"\.\connect.i"\

-	{$(INCLUDE)}"\.\corba.h"\

-	{$(INCLUDE)}"\.\corbacom.h"\

-	{$(INCLUDE)}"\.\corbacom.i"\

-	{$(INCLUDE)}"\.\debug.h"\

-	{$(INCLUDE)}"\.\default_client.h"\

-	{$(INCLUDE)}"\.\default_client.i"\

-	{$(INCLUDE)}"\.\default_server.h"\

-	{$(INCLUDE)}"\.\default_server.i"\

-	{$(INCLUDE)}"\.\except.h"\

-	{$(INCLUDE)}"\.\giop.h"\

-	{$(INCLUDE)}"\.\giop.i"\

-	{$(INCLUDE)}"\.\iiopobj.h"\

-	{$(INCLUDE)}"\.\iiopobj.i"\

-	{$(INCLUDE)}"\.\iioporb.h"\

-	{$(INCLUDE)}"\.\iioporb.i"\

-	{$(INCLUDE)}"\.\marshal.h"\

-	{$(INCLUDE)}"\.\marshal.i"\

-	{$(INCLUDE)}"\.\nvlist.h"\

-	{$(INCLUDE)}"\.\object.h"\

-	{$(INCLUDE)}"\.\object.i"\

-	{$(INCLUDE)}"\.\objtable.h"\

-	{$(INCLUDE)}"\.\optable.h"\

-	{$(INCLUDE)}"\.\orb.h"\

-	{$(INCLUDE)}"\.\orb_core.h"\

-	{$(INCLUDE)}"\.\orb_core.i"\

-	{$(INCLUDE)}"\.\orbconf.h"\

-	{$(INCLUDE)}"\.\orbobj.h"\

-	{$(INCLUDE)}"\.\orbobj.i"\

-	{$(INCLUDE)}"\.\params.h"\

-	{$(INCLUDE)}"\.\params.i"\

-	{$(INCLUDE)}"\.\poa.h"\

-	{$(INCLUDE)}"\.\poa.i"\

-	{$(INCLUDE)}"\.\principa.h"\

-	{$(INCLUDE)}"\.\request.h"\

-	{$(INCLUDE)}"\.\sequence.h"\

-	{$(INCLUDE)}"\.\sequence.i"\

-	{$(INCLUDE)}"\.\server_factory.h"\

-	{$(INCLUDE)}"\.\server_factory.i"\

-	{$(INCLUDE)}"\.\singletons.h"\

-	{$(INCLUDE)}"\.\stub.h"\

-	{$(INCLUDE)}"\.\stub.i"\

-	{$(INCLUDE)}"\.\svrrqst.h"\

-	{$(INCLUDE)}"\.\typecode.h"\

-	{$(INCLUDE)}"\.\typecode.i"\

-	{$(INCLUDE)}"\.\varout.h"\

-	{$(INCLUDE)}"\ace\Acceptor.cpp"\

-	{$(INCLUDE)}"\ace\Acceptor.h"\

-	{$(INCLUDE)}"\ace\Acceptor.i"\

-	{$(INCLUDE)}"\ace\ACE.h"\

-	{$(INCLUDE)}"\ace\ACE.i"\

-	{$(INCLUDE)}"\ace\Addr.h"\

-	{$(INCLUDE)}"\ace\Addr.i"\

-	{$(INCLUDE)}"\ace\Atomic_Op.i"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.cpp"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.h"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.i"\

-	{$(INCLUDE)}"\ace\config-win32-common.h"\

-	{$(INCLUDE)}"\ace\Config.h"\

-	{$(INCLUDE)}"\ace\Connector.cpp"\

-	{$(INCLUDE)}"\ace\Connector.h"\

-	{$(INCLUDE)}"\ace\Connector.i"\

-	{$(INCLUDE)}"\ace\Containers.cpp"\

-	{$(INCLUDE)}"\ace\Containers.h"\

-	{$(INCLUDE)}"\ace\Containers.i"\

-	{$(INCLUDE)}"\ace\Dynamic.h"\

-	{$(INCLUDE)}"\ace\Dynamic.i"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.cpp"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.i"\

-	{$(INCLUDE)}"\ace\Free_List.cpp"\

-	{$(INCLUDE)}"\ace\Free_List.h"\

-	{$(INCLUDE)}"\ace\Free_List.i"\

-	{$(INCLUDE)}"\ace\Get_Opt.h"\

-	{$(INCLUDE)}"\ace\Get_Opt.i"\

-	{$(INCLUDE)}"\ace\Handle_Set.h"\

-	{$(INCLUDE)}"\ace\Handle_Set.i"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.i"\

-	{$(INCLUDE)}"\ace\IO_Cntl_Msg.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.i"\

-	{$(INCLUDE)}"\ace\Log_Msg.h"\

-	{$(INCLUDE)}"\ace\Log_Priority.h"\

-	{$(INCLUDE)}"\ace\Log_Record.h"\

-	{$(INCLUDE)}"\ace\Log_Record.i"\

-	{$(INCLUDE)}"\ace\Malloc.h"\

-	{$(INCLUDE)}"\ace\Malloc.i"\

-	{$(INCLUDE)}"\ace\Malloc_T.cpp"\

-	{$(INCLUDE)}"\ace\Malloc_T.h"\

-	{$(INCLUDE)}"\ace\Malloc_T.i"\

-	{$(INCLUDE)}"\ace\Managed_Object.cpp"\

-	{$(INCLUDE)}"\ace\Managed_Object.h"\

-	{$(INCLUDE)}"\ace\Managed_Object.i"\

-	{$(INCLUDE)}"\ace\Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Map_Manager.h"\

-	{$(INCLUDE)}"\ace\Map_Manager.i"\

-	{$(INCLUDE)}"\ace\Mem_Map.h"\

-	{$(INCLUDE)}"\ace\Mem_Map.i"\

-	{$(INCLUDE)}"\ace\Memory_Pool.h"\

-	{$(INCLUDE)}"\ace\Memory_Pool.i"\

-	{$(INCLUDE)}"\ace\Message_Block.h"\

-	{$(INCLUDE)}"\ace\Message_Block.i"\

-	{$(INCLUDE)}"\ace\Message_Queue.cpp"\

-	{$(INCLUDE)}"\ace\Message_Queue.h"\

-	{$(INCLUDE)}"\ace\Message_Queue.i"\

-	{$(INCLUDE)}"\ace\Module.cpp"\

-	{$(INCLUDE)}"\ace\Module.h"\

-	{$(INCLUDE)}"\ace\Module.i"\

-	{$(INCLUDE)}"\ace\Object_Manager.h"\

-	{$(INCLUDE)}"\ace\Object_Manager.i"\

-	{$(INCLUDE)}"\ace\OS.h"\

-	{$(INCLUDE)}"\ace\OS.i"\

-	{$(INCLUDE)}"\ace\Reactor.h"\

-	{$(INCLUDE)}"\ace\Reactor.i"\

-	{$(INCLUDE)}"\ace\Reactor_Impl.h"\

-	{$(INCLUDE)}"\ace\Service_Config.h"\

-	{$(INCLUDE)}"\ace\Service_Config.i"\

-	{$(INCLUDE)}"\ace\Service_Object.h"\

-	{$(INCLUDE)}"\ace\Service_Object.i"\

-	{$(INCLUDE)}"\ace\Service_Repository.h"\

-	{$(INCLUDE)}"\ace\Service_Repository.i"\

-	{$(INCLUDE)}"\ace\Service_Types.h"\

-	{$(INCLUDE)}"\ace\Service_Types.i"\

-	{$(INCLUDE)}"\ace\Shared_Object.h"\

-	{$(INCLUDE)}"\ace\Shared_Object.i"\

-	{$(INCLUDE)}"\ace\Signal.h"\

-	{$(INCLUDE)}"\ace\Signal.i"\

-	{$(INCLUDE)}"\ace\Singleton.cpp"\

-	{$(INCLUDE)}"\ace\Singleton.h"\

-	{$(INCLUDE)}"\ace\Singleton.i"\

-	{$(INCLUDE)}"\ace\SOCK.h"\

-	{$(INCLUDE)}"\ace\SOCK.i"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.h"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.i"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.h"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.i"\

-	{$(INCLUDE)}"\ace\SOCK_IO.h"\

-	{$(INCLUDE)}"\ace\SOCK_IO.i"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.h"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.i"\

-	{$(INCLUDE)}"\ace\SString.h"\

-	{$(INCLUDE)}"\ace\SString.i"\

-	{$(INCLUDE)}"\ace\stdcpp.h"\

-	{$(INCLUDE)}"\ace\Strategies.h"\

-	{$(INCLUDE)}"\ace\Strategies_T.cpp"\

-	{$(INCLUDE)}"\ace\Strategies_T.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.cpp"\

-	{$(INCLUDE)}"\ace\Stream_Modules.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.i"\

-	{$(INCLUDE)}"\ace\Svc_Conf_Tokens.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.cpp"\

-	{$(INCLUDE)}"\ace\Svc_Handler.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.i"\

-	{$(INCLUDE)}"\ace\Synch.h"\

-	{$(INCLUDE)}"\ace\Synch.i"\

-	{$(INCLUDE)}"\ace\Synch_Options.h"\

-	{$(INCLUDE)}"\ace\Synch_T.cpp"\

-	{$(INCLUDE)}"\ace\Synch_T.h"\

-	{$(INCLUDE)}"\ace\Synch_T.i"\

-	{$(INCLUDE)}"\ace\Task.h"\

-	{$(INCLUDE)}"\ace\Task.i"\

-	{$(INCLUDE)}"\ace\Task_T.cpp"\

-	{$(INCLUDE)}"\ace\Task_T.h"\

-	{$(INCLUDE)}"\ace\Task_T.i"\

-	{$(INCLUDE)}"\ace\Thread.h"\

-	{$(INCLUDE)}"\ace\Thread.i"\

-	{$(INCLUDE)}"\ace\Thread_Manager.h"\

-	{$(INCLUDE)}"\ace\Thread_Manager.i"\

-	{$(INCLUDE)}"\ace\Time_Value.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.cpp"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.i"\

-	{$(INCLUDE)}"\ace\Trace.h"\

-	{$(INCLUDE)}"\ace\Version.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.i"\

-	{$(INCLUDE)}"\ace\ws2tcpip.h"\

-	

-

-"$(INTDIR)\server_factory.obj" : $(SOURCE) $(DEP_CPP_SERVE) "$(INTDIR)"

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\svrrqst.cpp

-

-!IF  "$(CFG)" == "TAO - Win32 Release"

-

-DEP_CPP_SVRRQ=\

-	"..\..\ace\config-win32.h"\

-	{$(INCLUDE)}"\.\align.h"\

-	{$(INCLUDE)}"\.\any.h"\

-	{$(INCLUDE)}"\.\any.i"\

-	{$(INCLUDE)}"\.\cdr.h"\

-	{$(INCLUDE)}"\.\cdr.i"\

-	{$(INCLUDE)}"\.\client_factory.h"\

-	{$(INCLUDE)}"\.\connect.h"\

-	{$(INCLUDE)}"\.\connect.i"\

-	{$(INCLUDE)}"\.\corba.h"\

-	{$(INCLUDE)}"\.\corbacom.h"\

-	{$(INCLUDE)}"\.\corbacom.i"\

-	{$(INCLUDE)}"\.\debug.h"\

-	{$(INCLUDE)}"\.\default_client.h"\

-	{$(INCLUDE)}"\.\default_client.i"\

-	{$(INCLUDE)}"\.\default_server.h"\

-	{$(INCLUDE)}"\.\default_server.i"\

-	{$(INCLUDE)}"\.\except.h"\

-	{$(INCLUDE)}"\.\giop.h"\

-	{$(INCLUDE)}"\.\giop.i"\

-	{$(INCLUDE)}"\.\iiopobj.h"\

-	{$(INCLUDE)}"\.\iiopobj.i"\

-	{$(INCLUDE)}"\.\iioporb.h"\

-	{$(INCLUDE)}"\.\iioporb.i"\

-	{$(INCLUDE)}"\.\marshal.h"\

-	{$(INCLUDE)}"\.\marshal.i"\

-	{$(INCLUDE)}"\.\nvlist.h"\

-	{$(INCLUDE)}"\.\object.h"\

-	{$(INCLUDE)}"\.\object.i"\

-	{$(INCLUDE)}"\.\objtable.h"\

-	{$(INCLUDE)}"\.\optable.h"\

-	{$(INCLUDE)}"\.\orb.h"\

-	{$(INCLUDE)}"\.\orb_core.h"\

-	{$(INCLUDE)}"\.\orb_core.i"\

-	{$(INCLUDE)}"\.\orbconf.h"\

-	{$(INCLUDE)}"\.\orbobj.h"\

-	{$(INCLUDE)}"\.\orbobj.i"\

-	{$(INCLUDE)}"\.\params.h"\

-	{$(INCLUDE)}"\.\params.i"\

-	{$(INCLUDE)}"\.\poa.h"\

-	{$(INCLUDE)}"\.\poa.i"\

-	{$(INCLUDE)}"\.\principa.h"\

-	{$(INCLUDE)}"\.\request.h"\

-	{$(INCLUDE)}"\.\sequence.h"\

-	{$(INCLUDE)}"\.\sequence.i"\

-	{$(INCLUDE)}"\.\server_factory.h"\

-	{$(INCLUDE)}"\.\server_factory.i"\

-	{$(INCLUDE)}"\.\singletons.h"\

-	{$(INCLUDE)}"\.\stub.h"\

-	{$(INCLUDE)}"\.\stub.i"\

-	{$(INCLUDE)}"\.\svrrqst.h"\

-	{$(INCLUDE)}"\.\typecode.h"\

-	{$(INCLUDE)}"\.\typecode.i"\

-	{$(INCLUDE)}"\.\varout.h"\

-	{$(INCLUDE)}"\ace\Acceptor.cpp"\

-	{$(INCLUDE)}"\ace\Acceptor.h"\

-	{$(INCLUDE)}"\ace\Acceptor.i"\

-	{$(INCLUDE)}"\ace\ACE.h"\

-	{$(INCLUDE)}"\ace\ACE.i"\

-	{$(INCLUDE)}"\ace\Addr.h"\

-	{$(INCLUDE)}"\ace\Addr.i"\

-	{$(INCLUDE)}"\ace\Atomic_Op.i"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.cpp"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.h"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.i"\

-	{$(INCLUDE)}"\ace\config-win32-common.h"\

-	{$(INCLUDE)}"\ace\Config.h"\

-	{$(INCLUDE)}"\ace\Connector.cpp"\

-	{$(INCLUDE)}"\ace\Connector.h"\

-	{$(INCLUDE)}"\ace\Connector.i"\

-	{$(INCLUDE)}"\ace\Containers.cpp"\

-	{$(INCLUDE)}"\ace\Containers.h"\

-	{$(INCLUDE)}"\ace\Containers.i"\

-	{$(INCLUDE)}"\ace\Dynamic.h"\

-	{$(INCLUDE)}"\ace\Dynamic.i"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.cpp"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.i"\

-	{$(INCLUDE)}"\ace\Free_List.cpp"\

-	{$(INCLUDE)}"\ace\Free_List.h"\

-	{$(INCLUDE)}"\ace\Free_List.i"\

-	{$(INCLUDE)}"\ace\Get_Opt.h"\

-	{$(INCLUDE)}"\ace\Get_Opt.i"\

-	{$(INCLUDE)}"\ace\Handle_Set.h"\

-	{$(INCLUDE)}"\ace\Handle_Set.i"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.i"\

-	{$(INCLUDE)}"\ace\IO_Cntl_Msg.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.i"\

-	{$(INCLUDE)}"\ace\Log_Msg.h"\

-	{$(INCLUDE)}"\ace\Log_Priority.h"\

-	{$(INCLUDE)}"\ace\Log_Record.h"\

-	{$(INCLUDE)}"\ace\Log_Record.i"\

-	{$(INCLUDE)}"\ace\Malloc.h"\

-	{$(INCLUDE)}"\ace\Malloc.i"\

-	{$(INCLUDE)}"\ace\Malloc_T.cpp"\

-	{$(INCLUDE)}"\ace\Malloc_T.h"\

-	{$(INCLUDE)}"\ace\Malloc_T.i"\

-	{$(INCLUDE)}"\ace\Managed_Object.cpp"\

-	{$(INCLUDE)}"\ace\Managed_Object.h"\

-	{$(INCLUDE)}"\ace\Managed_Object.i"\

-	{$(INCLUDE)}"\ace\Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Map_Manager.h"\

-	{$(INCLUDE)}"\ace\Map_Manager.i"\

-	{$(INCLUDE)}"\ace\Mem_Map.h"\

-	{$(INCLUDE)}"\ace\Mem_Map.i"\

-	{$(INCLUDE)}"\ace\Memory_Pool.h"\

-	{$(INCLUDE)}"\ace\Memory_Pool.i"\

-	{$(INCLUDE)}"\ace\Message_Block.h"\

-	{$(INCLUDE)}"\ace\Message_Block.i"\

-	{$(INCLUDE)}"\ace\Message_Queue.cpp"\

-	{$(INCLUDE)}"\ace\Message_Queue.h"\

-	{$(INCLUDE)}"\ace\Message_Queue.i"\

-	{$(INCLUDE)}"\ace\Module.cpp"\

-	{$(INCLUDE)}"\ace\Module.h"\

-	{$(INCLUDE)}"\ace\Module.i"\

-	{$(INCLUDE)}"\ace\Object_Manager.h"\

-	{$(INCLUDE)}"\ace\Object_Manager.i"\

-	{$(INCLUDE)}"\ace\OS.h"\

-	{$(INCLUDE)}"\ace\OS.i"\

-	{$(INCLUDE)}"\ace\Reactor.h"\

-	{$(INCLUDE)}"\ace\Reactor.i"\

-	{$(INCLUDE)}"\ace\Reactor_Impl.h"\

-	{$(INCLUDE)}"\ace\Service_Config.h"\

-	{$(INCLUDE)}"\ace\Service_Config.i"\

-	{$(INCLUDE)}"\ace\Service_Object.h"\

-	{$(INCLUDE)}"\ace\Service_Object.i"\

-	{$(INCLUDE)}"\ace\Service_Repository.h"\

-	{$(INCLUDE)}"\ace\Service_Repository.i"\

-	{$(INCLUDE)}"\ace\Service_Types.h"\

-	{$(INCLUDE)}"\ace\Service_Types.i"\

-	{$(INCLUDE)}"\ace\Shared_Object.h"\

-	{$(INCLUDE)}"\ace\Shared_Object.i"\

-	{$(INCLUDE)}"\ace\Signal.h"\

-	{$(INCLUDE)}"\ace\Signal.i"\

-	{$(INCLUDE)}"\ace\Singleton.cpp"\

-	{$(INCLUDE)}"\ace\Singleton.h"\

-	{$(INCLUDE)}"\ace\Singleton.i"\

-	{$(INCLUDE)}"\ace\SOCK.h"\

-	{$(INCLUDE)}"\ace\SOCK.i"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.h"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.i"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.h"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.i"\

-	{$(INCLUDE)}"\ace\SOCK_IO.h"\

-	{$(INCLUDE)}"\ace\SOCK_IO.i"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.h"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.i"\

-	{$(INCLUDE)}"\ace\SString.h"\

-	{$(INCLUDE)}"\ace\SString.i"\

-	{$(INCLUDE)}"\ace\stdcpp.h"\

-	{$(INCLUDE)}"\ace\Strategies.h"\

-	{$(INCLUDE)}"\ace\Strategies_T.cpp"\

-	{$(INCLUDE)}"\ace\Strategies_T.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.cpp"\

-	{$(INCLUDE)}"\ace\Stream_Modules.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.i"\

-	{$(INCLUDE)}"\ace\Svc_Conf_Tokens.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.cpp"\

-	{$(INCLUDE)}"\ace\Svc_Handler.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.i"\

-	{$(INCLUDE)}"\ace\Synch.h"\

-	{$(INCLUDE)}"\ace\Synch.i"\

-	{$(INCLUDE)}"\ace\Synch_Options.h"\

-	{$(INCLUDE)}"\ace\Synch_T.cpp"\

-	{$(INCLUDE)}"\ace\Synch_T.h"\

-	{$(INCLUDE)}"\ace\Synch_T.i"\

-	{$(INCLUDE)}"\ace\Task.h"\

-	{$(INCLUDE)}"\ace\Task.i"\

-	{$(INCLUDE)}"\ace\Task_T.cpp"\

-	{$(INCLUDE)}"\ace\Task_T.h"\

-	{$(INCLUDE)}"\ace\Task_T.i"\

-	{$(INCLUDE)}"\ace\Thread.h"\

-	{$(INCLUDE)}"\ace\Thread.i"\

-	{$(INCLUDE)}"\ace\Thread_Manager.h"\

-	{$(INCLUDE)}"\ace\Thread_Manager.i"\

-	{$(INCLUDE)}"\ace\Time_Value.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.cpp"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.i"\

-	{$(INCLUDE)}"\ace\Trace.h"\

-	{$(INCLUDE)}"\ace\Version.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.i"\

-	{$(INCLUDE)}"\ace\ws2tcpip.h"\

-	

-

-"$(INTDIR)\svrrqst.obj" : $(SOURCE) $(DEP_CPP_SVRRQ) "$(INTDIR)"

-

-

-!ELSEIF  "$(CFG)" == "TAO - Win32 Debug"

-

-DEP_CPP_SVRRQ=\

-	"..\..\ace\config-win32.h"\

-	{$(INCLUDE)}"\.\align.h"\

-	{$(INCLUDE)}"\.\any.h"\

-	{$(INCLUDE)}"\.\any.i"\

-	{$(INCLUDE)}"\.\cdr.h"\

-	{$(INCLUDE)}"\.\cdr.i"\

-	{$(INCLUDE)}"\.\client_factory.h"\

-	{$(INCLUDE)}"\.\connect.h"\

-	{$(INCLUDE)}"\.\connect.i"\

-	{$(INCLUDE)}"\.\corba.h"\

-	{$(INCLUDE)}"\.\corbacom.h"\

-	{$(INCLUDE)}"\.\corbacom.i"\

-	{$(INCLUDE)}"\.\debug.h"\

-	{$(INCLUDE)}"\.\default_client.h"\

-	{$(INCLUDE)}"\.\default_client.i"\

-	{$(INCLUDE)}"\.\default_server.h"\

-	{$(INCLUDE)}"\.\default_server.i"\

-	{$(INCLUDE)}"\.\except.h"\

-	{$(INCLUDE)}"\.\giop.h"\

-	{$(INCLUDE)}"\.\giop.i"\

-	{$(INCLUDE)}"\.\iiopobj.h"\

-	{$(INCLUDE)}"\.\iiopobj.i"\

-	{$(INCLUDE)}"\.\iioporb.h"\

-	{$(INCLUDE)}"\.\iioporb.i"\

-	{$(INCLUDE)}"\.\marshal.h"\

-	{$(INCLUDE)}"\.\marshal.i"\

-	{$(INCLUDE)}"\.\nvlist.h"\

-	{$(INCLUDE)}"\.\object.h"\

-	{$(INCLUDE)}"\.\object.i"\

-	{$(INCLUDE)}"\.\objtable.h"\

-	{$(INCLUDE)}"\.\optable.h"\

-	{$(INCLUDE)}"\.\orb.h"\

-	{$(INCLUDE)}"\.\orb_core.h"\

-	{$(INCLUDE)}"\.\orb_core.i"\

-	{$(INCLUDE)}"\.\orbconf.h"\

-	{$(INCLUDE)}"\.\orbobj.h"\

-	{$(INCLUDE)}"\.\orbobj.i"\

-	{$(INCLUDE)}"\.\params.h"\

-	{$(INCLUDE)}"\.\params.i"\

-	{$(INCLUDE)}"\.\poa.h"\

-	{$(INCLUDE)}"\.\poa.i"\

-	{$(INCLUDE)}"\.\principa.h"\

-	{$(INCLUDE)}"\.\request.h"\

-	{$(INCLUDE)}"\.\sequence.h"\

-	{$(INCLUDE)}"\.\sequence.i"\

-	{$(INCLUDE)}"\.\server_factory.h"\

-	{$(INCLUDE)}"\.\server_factory.i"\

-	{$(INCLUDE)}"\.\singletons.h"\

-	{$(INCLUDE)}"\.\stub.h"\

-	{$(INCLUDE)}"\.\stub.i"\

-	{$(INCLUDE)}"\.\svrrqst.h"\

-	{$(INCLUDE)}"\.\typecode.h"\

-	{$(INCLUDE)}"\.\typecode.i"\

-	{$(INCLUDE)}"\.\varout.h"\

-	{$(INCLUDE)}"\ace\Acceptor.cpp"\

-	{$(INCLUDE)}"\ace\Acceptor.h"\

-	{$(INCLUDE)}"\ace\Acceptor.i"\

-	{$(INCLUDE)}"\ace\ACE.h"\

-	{$(INCLUDE)}"\ace\ACE.i"\

-	{$(INCLUDE)}"\ace\Addr.h"\

-	{$(INCLUDE)}"\ace\Addr.i"\

-	{$(INCLUDE)}"\ace\Atomic_Op.i"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.cpp"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.h"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.i"\

-	{$(INCLUDE)}"\ace\config-win32-common.h"\

-	{$(INCLUDE)}"\ace\Config.h"\

-	{$(INCLUDE)}"\ace\Connector.cpp"\

-	{$(INCLUDE)}"\ace\Connector.h"\

-	{$(INCLUDE)}"\ace\Connector.i"\

-	{$(INCLUDE)}"\ace\Containers.cpp"\

-	{$(INCLUDE)}"\ace\Containers.h"\

-	{$(INCLUDE)}"\ace\Containers.i"\

-	{$(INCLUDE)}"\ace\Dynamic.h"\

-	{$(INCLUDE)}"\ace\Dynamic.i"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.cpp"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.i"\

-	{$(INCLUDE)}"\ace\Free_List.cpp"\

-	{$(INCLUDE)}"\ace\Free_List.h"\

-	{$(INCLUDE)}"\ace\Free_List.i"\

-	{$(INCLUDE)}"\ace\Get_Opt.h"\

-	{$(INCLUDE)}"\ace\Get_Opt.i"\

-	{$(INCLUDE)}"\ace\Handle_Set.h"\

-	{$(INCLUDE)}"\ace\Handle_Set.i"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.i"\

-	{$(INCLUDE)}"\ace\IO_Cntl_Msg.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.i"\

-	{$(INCLUDE)}"\ace\Log_Msg.h"\

-	{$(INCLUDE)}"\ace\Log_Priority.h"\

-	{$(INCLUDE)}"\ace\Log_Record.h"\

-	{$(INCLUDE)}"\ace\Log_Record.i"\

-	{$(INCLUDE)}"\ace\Malloc.h"\

-	{$(INCLUDE)}"\ace\Malloc.i"\

-	{$(INCLUDE)}"\ace\Malloc_T.cpp"\

-	{$(INCLUDE)}"\ace\Malloc_T.h"\

-	{$(INCLUDE)}"\ace\Malloc_T.i"\

-	{$(INCLUDE)}"\ace\Managed_Object.cpp"\

-	{$(INCLUDE)}"\ace\Managed_Object.h"\

-	{$(INCLUDE)}"\ace\Managed_Object.i"\

-	{$(INCLUDE)}"\ace\Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Map_Manager.h"\

-	{$(INCLUDE)}"\ace\Map_Manager.i"\

-	{$(INCLUDE)}"\ace\Mem_Map.h"\

-	{$(INCLUDE)}"\ace\Mem_Map.i"\

-	{$(INCLUDE)}"\ace\Memory_Pool.h"\

-	{$(INCLUDE)}"\ace\Memory_Pool.i"\

-	{$(INCLUDE)}"\ace\Message_Block.h"\

-	{$(INCLUDE)}"\ace\Message_Block.i"\

-	{$(INCLUDE)}"\ace\Message_Queue.cpp"\

-	{$(INCLUDE)}"\ace\Message_Queue.h"\

-	{$(INCLUDE)}"\ace\Message_Queue.i"\

-	{$(INCLUDE)}"\ace\Module.cpp"\

-	{$(INCLUDE)}"\ace\Module.h"\

-	{$(INCLUDE)}"\ace\Module.i"\

-	{$(INCLUDE)}"\ace\Object_Manager.h"\

-	{$(INCLUDE)}"\ace\Object_Manager.i"\

-	{$(INCLUDE)}"\ace\OS.h"\

-	{$(INCLUDE)}"\ace\OS.i"\

-	{$(INCLUDE)}"\ace\Reactor.h"\

-	{$(INCLUDE)}"\ace\Reactor.i"\

-	{$(INCLUDE)}"\ace\Reactor_Impl.h"\

-	{$(INCLUDE)}"\ace\Service_Config.h"\

-	{$(INCLUDE)}"\ace\Service_Config.i"\

-	{$(INCLUDE)}"\ace\Service_Object.h"\

-	{$(INCLUDE)}"\ace\Service_Object.i"\

-	{$(INCLUDE)}"\ace\Service_Repository.h"\

-	{$(INCLUDE)}"\ace\Service_Repository.i"\

-	{$(INCLUDE)}"\ace\Service_Types.h"\

-	{$(INCLUDE)}"\ace\Service_Types.i"\

-	{$(INCLUDE)}"\ace\Shared_Object.h"\

-	{$(INCLUDE)}"\ace\Shared_Object.i"\

-	{$(INCLUDE)}"\ace\Signal.h"\

-	{$(INCLUDE)}"\ace\Signal.i"\

-	{$(INCLUDE)}"\ace\Singleton.cpp"\

-	{$(INCLUDE)}"\ace\Singleton.h"\

-	{$(INCLUDE)}"\ace\Singleton.i"\

-	{$(INCLUDE)}"\ace\SOCK.h"\

-	{$(INCLUDE)}"\ace\SOCK.i"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.h"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.i"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.h"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.i"\

-	{$(INCLUDE)}"\ace\SOCK_IO.h"\

-	{$(INCLUDE)}"\ace\SOCK_IO.i"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.h"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.i"\

-	{$(INCLUDE)}"\ace\SString.h"\

-	{$(INCLUDE)}"\ace\SString.i"\

-	{$(INCLUDE)}"\ace\stdcpp.h"\

-	{$(INCLUDE)}"\ace\Strategies.h"\

-	{$(INCLUDE)}"\ace\Strategies_T.cpp"\

-	{$(INCLUDE)}"\ace\Strategies_T.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.cpp"\

-	{$(INCLUDE)}"\ace\Stream_Modules.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.i"\

-	{$(INCLUDE)}"\ace\Svc_Conf_Tokens.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.cpp"\

-	{$(INCLUDE)}"\ace\Svc_Handler.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.i"\

-	{$(INCLUDE)}"\ace\Synch.h"\

-	{$(INCLUDE)}"\ace\Synch.i"\

-	{$(INCLUDE)}"\ace\Synch_Options.h"\

-	{$(INCLUDE)}"\ace\Synch_T.cpp"\

-	{$(INCLUDE)}"\ace\Synch_T.h"\

-	{$(INCLUDE)}"\ace\Synch_T.i"\

-	{$(INCLUDE)}"\ace\Task.h"\

-	{$(INCLUDE)}"\ace\Task.i"\

-	{$(INCLUDE)}"\ace\Task_T.cpp"\

-	{$(INCLUDE)}"\ace\Task_T.h"\

-	{$(INCLUDE)}"\ace\Task_T.i"\

-	{$(INCLUDE)}"\ace\Thread.h"\

-	{$(INCLUDE)}"\ace\Thread.i"\

-	{$(INCLUDE)}"\ace\Thread_Manager.h"\

-	{$(INCLUDE)}"\ace\Thread_Manager.i"\

-	{$(INCLUDE)}"\ace\Time_Value.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.cpp"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.i"\

-	{$(INCLUDE)}"\ace\Trace.h"\

-	{$(INCLUDE)}"\ace\Version.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.i"\

-	{$(INCLUDE)}"\ace\ws2tcpip.h"\

-	

-

-"$(INTDIR)\svrrqst.obj" : $(SOURCE) $(DEP_CPP_SVRRQ) "$(INTDIR)"

-

-

-!ENDIF 

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\tao_internals.cpp

-

-!IF  "$(CFG)" == "TAO - Win32 Release"

-

-DEP_CPP_TAO_I=\

-	"..\..\ace\config-win32.h"\

-	{$(INCLUDE)}"\.\align.h"\

-	{$(INCLUDE)}"\.\any.h"\

-	{$(INCLUDE)}"\.\any.i"\

-	{$(INCLUDE)}"\.\cdr.h"\

-	{$(INCLUDE)}"\.\cdr.i"\

-	{$(INCLUDE)}"\.\client_factory.h"\

-	{$(INCLUDE)}"\.\connect.h"\

-	{$(INCLUDE)}"\.\connect.i"\

-	{$(INCLUDE)}"\.\corba.h"\

-	{$(INCLUDE)}"\.\corbacom.h"\

-	{$(INCLUDE)}"\.\corbacom.i"\

-	{$(INCLUDE)}"\.\debug.h"\

-	{$(INCLUDE)}"\.\default_client.h"\

-	{$(INCLUDE)}"\.\default_client.i"\

-	{$(INCLUDE)}"\.\default_server.h"\

-	{$(INCLUDE)}"\.\default_server.i"\

-	{$(INCLUDE)}"\.\except.h"\

-	{$(INCLUDE)}"\.\giop.h"\

-	{$(INCLUDE)}"\.\giop.i"\

-	{$(INCLUDE)}"\.\iiopobj.h"\

-	{$(INCLUDE)}"\.\iiopobj.i"\

-	{$(INCLUDE)}"\.\iioporb.h"\

-	{$(INCLUDE)}"\.\iioporb.i"\

-	{$(INCLUDE)}"\.\marshal.h"\

-	{$(INCLUDE)}"\.\marshal.i"\

-	{$(INCLUDE)}"\.\nvlist.h"\

-	{$(INCLUDE)}"\.\object.h"\

-	{$(INCLUDE)}"\.\object.i"\

-	{$(INCLUDE)}"\.\objtable.h"\

-	{$(INCLUDE)}"\.\optable.h"\

-	{$(INCLUDE)}"\.\orb.h"\

-	{$(INCLUDE)}"\.\orb_core.h"\

-	{$(INCLUDE)}"\.\orb_core.i"\

-	{$(INCLUDE)}"\.\orbconf.h"\

-	{$(INCLUDE)}"\.\orbobj.h"\

-	{$(INCLUDE)}"\.\orbobj.i"\

-	{$(INCLUDE)}"\.\params.h"\

-	{$(INCLUDE)}"\.\params.i"\

-	{$(INCLUDE)}"\.\poa.h"\

-	{$(INCLUDE)}"\.\poa.i"\

-	{$(INCLUDE)}"\.\principa.h"\

-	{$(INCLUDE)}"\.\request.h"\

-	{$(INCLUDE)}"\.\sequence.h"\

-	{$(INCLUDE)}"\.\sequence.i"\

-	{$(INCLUDE)}"\.\server_factory.h"\

-	{$(INCLUDE)}"\.\server_factory.i"\

-	{$(INCLUDE)}"\.\singletons.h"\

-	{$(INCLUDE)}"\.\stub.h"\

-	{$(INCLUDE)}"\.\stub.i"\

-	{$(INCLUDE)}"\.\svrrqst.h"\

-	{$(INCLUDE)}"\.\tao_internals.h"\

-	{$(INCLUDE)}"\.\typecode.h"\

-	{$(INCLUDE)}"\.\typecode.i"\

-	{$(INCLUDE)}"\.\varout.h"\

-	{$(INCLUDE)}"\ace\Acceptor.cpp"\

-	{$(INCLUDE)}"\ace\Acceptor.h"\

-	{$(INCLUDE)}"\ace\Acceptor.i"\

-	{$(INCLUDE)}"\ace\ACE.h"\

-	{$(INCLUDE)}"\ace\ACE.i"\

-	{$(INCLUDE)}"\ace\Addr.h"\

-	{$(INCLUDE)}"\ace\Addr.i"\

-	{$(INCLUDE)}"\ace\Atomic_Op.i"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.cpp"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.h"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.i"\

-	{$(INCLUDE)}"\ace\config-win32-common.h"\

-	{$(INCLUDE)}"\ace\Config.h"\

-	{$(INCLUDE)}"\ace\Connector.cpp"\

-	{$(INCLUDE)}"\ace\Connector.h"\

-	{$(INCLUDE)}"\ace\Connector.i"\

-	{$(INCLUDE)}"\ace\Containers.cpp"\

-	{$(INCLUDE)}"\ace\Containers.h"\

-	{$(INCLUDE)}"\ace\Containers.i"\

-	{$(INCLUDE)}"\ace\Dynamic.h"\

-	{$(INCLUDE)}"\ace\Dynamic.i"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.cpp"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.i"\

-	{$(INCLUDE)}"\ace\Free_List.cpp"\

-	{$(INCLUDE)}"\ace\Free_List.h"\

-	{$(INCLUDE)}"\ace\Free_List.i"\

-	{$(INCLUDE)}"\ace\Get_Opt.h"\

-	{$(INCLUDE)}"\ace\Get_Opt.i"\

-	{$(INCLUDE)}"\ace\Handle_Set.h"\

-	{$(INCLUDE)}"\ace\Handle_Set.i"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.i"\

-	{$(INCLUDE)}"\ace\IO_Cntl_Msg.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.i"\

-	{$(INCLUDE)}"\ace\Log_Msg.h"\

-	{$(INCLUDE)}"\ace\Log_Priority.h"\

-	{$(INCLUDE)}"\ace\Log_Record.h"\

-	{$(INCLUDE)}"\ace\Log_Record.i"\

-	{$(INCLUDE)}"\ace\Malloc.h"\

-	{$(INCLUDE)}"\ace\Malloc.i"\

-	{$(INCLUDE)}"\ace\Malloc_T.cpp"\

-	{$(INCLUDE)}"\ace\Malloc_T.h"\

-	{$(INCLUDE)}"\ace\Malloc_T.i"\

-	{$(INCLUDE)}"\ace\Managed_Object.cpp"\

-	{$(INCLUDE)}"\ace\Managed_Object.h"\

-	{$(INCLUDE)}"\ace\Managed_Object.i"\

-	{$(INCLUDE)}"\ace\Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Map_Manager.h"\

-	{$(INCLUDE)}"\ace\Map_Manager.i"\

-	{$(INCLUDE)}"\ace\Mem_Map.h"\

-	{$(INCLUDE)}"\ace\Mem_Map.i"\

-	{$(INCLUDE)}"\ace\Memory_Pool.h"\

-	{$(INCLUDE)}"\ace\Memory_Pool.i"\

-	{$(INCLUDE)}"\ace\Message_Block.h"\

-	{$(INCLUDE)}"\ace\Message_Block.i"\

-	{$(INCLUDE)}"\ace\Message_Queue.cpp"\

-	{$(INCLUDE)}"\ace\Message_Queue.h"\

-	{$(INCLUDE)}"\ace\Message_Queue.i"\

-	{$(INCLUDE)}"\ace\Module.cpp"\

-	{$(INCLUDE)}"\ace\Module.h"\

-	{$(INCLUDE)}"\ace\Module.i"\

-	{$(INCLUDE)}"\ace\Object_Manager.h"\

-	{$(INCLUDE)}"\ace\Object_Manager.i"\

-	{$(INCLUDE)}"\ace\OS.h"\

-	{$(INCLUDE)}"\ace\OS.i"\

-	{$(INCLUDE)}"\ace\Reactor.h"\

-	{$(INCLUDE)}"\ace\Reactor.i"\

-	{$(INCLUDE)}"\ace\Reactor_Impl.h"\

-	{$(INCLUDE)}"\ace\Service_Config.h"\

-	{$(INCLUDE)}"\ace\Service_Config.i"\

-	{$(INCLUDE)}"\ace\Service_Object.h"\

-	{$(INCLUDE)}"\ace\Service_Object.i"\

-	{$(INCLUDE)}"\ace\Service_Repository.h"\

-	{$(INCLUDE)}"\ace\Service_Repository.i"\

-	{$(INCLUDE)}"\ace\Service_Types.h"\

-	{$(INCLUDE)}"\ace\Service_Types.i"\

-	{$(INCLUDE)}"\ace\Shared_Object.h"\

-	{$(INCLUDE)}"\ace\Shared_Object.i"\

-	{$(INCLUDE)}"\ace\Signal.h"\

-	{$(INCLUDE)}"\ace\Signal.i"\

-	{$(INCLUDE)}"\ace\Singleton.cpp"\

-	{$(INCLUDE)}"\ace\Singleton.h"\

-	{$(INCLUDE)}"\ace\Singleton.i"\

-	{$(INCLUDE)}"\ace\SOCK.h"\

-	{$(INCLUDE)}"\ace\SOCK.i"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.h"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.i"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.h"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.i"\

-	{$(INCLUDE)}"\ace\SOCK_IO.h"\

-	{$(INCLUDE)}"\ace\SOCK_IO.i"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.h"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.i"\

-	{$(INCLUDE)}"\ace\SString.h"\

-	{$(INCLUDE)}"\ace\SString.i"\

-	{$(INCLUDE)}"\ace\stdcpp.h"\

-	{$(INCLUDE)}"\ace\Strategies.h"\

-	{$(INCLUDE)}"\ace\Strategies_T.cpp"\

-	{$(INCLUDE)}"\ace\Strategies_T.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.cpp"\

-	{$(INCLUDE)}"\ace\Stream_Modules.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.i"\

-	{$(INCLUDE)}"\ace\Svc_Conf_Tokens.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.cpp"\

-	{$(INCLUDE)}"\ace\Svc_Handler.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.i"\

-	{$(INCLUDE)}"\ace\Synch.h"\

-	{$(INCLUDE)}"\ace\Synch.i"\

-	{$(INCLUDE)}"\ace\Synch_Options.h"\

-	{$(INCLUDE)}"\ace\Synch_T.cpp"\

-	{$(INCLUDE)}"\ace\Synch_T.h"\

-	{$(INCLUDE)}"\ace\Synch_T.i"\

-	{$(INCLUDE)}"\ace\Task.h"\

-	{$(INCLUDE)}"\ace\Task.i"\

-	{$(INCLUDE)}"\ace\Task_T.cpp"\

-	{$(INCLUDE)}"\ace\Task_T.h"\

-	{$(INCLUDE)}"\ace\Task_T.i"\

-	{$(INCLUDE)}"\ace\Thread.h"\

-	{$(INCLUDE)}"\ace\Thread.i"\

-	{$(INCLUDE)}"\ace\Thread_Manager.h"\

-	{$(INCLUDE)}"\ace\Thread_Manager.i"\

-	{$(INCLUDE)}"\ace\Time_Value.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.cpp"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.i"\

-	{$(INCLUDE)}"\ace\Trace.h"\

-	{$(INCLUDE)}"\ace\Version.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.i"\

-	{$(INCLUDE)}"\ace\ws2tcpip.h"\

-	

-

-"$(INTDIR)\tao_internals.obj" : $(SOURCE) $(DEP_CPP_TAO_I) "$(INTDIR)"

-

-

-!ELSEIF  "$(CFG)" == "TAO - Win32 Debug"

-

-DEP_CPP_TAO_I=\

-	"..\..\ace\config-win32.h"\

-	{$(INCLUDE)}"\.\align.h"\

-	{$(INCLUDE)}"\.\any.h"\

-	{$(INCLUDE)}"\.\any.i"\

-	{$(INCLUDE)}"\.\cdr.h"\

-	{$(INCLUDE)}"\.\cdr.i"\

-	{$(INCLUDE)}"\.\client_factory.h"\

-	{$(INCLUDE)}"\.\connect.h"\

-	{$(INCLUDE)}"\.\connect.i"\

-	{$(INCLUDE)}"\.\corba.h"\

-	{$(INCLUDE)}"\.\corbacom.h"\

-	{$(INCLUDE)}"\.\corbacom.i"\

-	{$(INCLUDE)}"\.\debug.h"\

-	{$(INCLUDE)}"\.\default_client.h"\

-	{$(INCLUDE)}"\.\default_client.i"\

-	{$(INCLUDE)}"\.\default_server.h"\

-	{$(INCLUDE)}"\.\default_server.i"\

-	{$(INCLUDE)}"\.\except.h"\

-	{$(INCLUDE)}"\.\giop.h"\

-	{$(INCLUDE)}"\.\giop.i"\

-	{$(INCLUDE)}"\.\iiopobj.h"\

-	{$(INCLUDE)}"\.\iiopobj.i"\

-	{$(INCLUDE)}"\.\iioporb.h"\

-	{$(INCLUDE)}"\.\iioporb.i"\

-	{$(INCLUDE)}"\.\marshal.h"\

-	{$(INCLUDE)}"\.\marshal.i"\

-	{$(INCLUDE)}"\.\nvlist.h"\

-	{$(INCLUDE)}"\.\object.h"\

-	{$(INCLUDE)}"\.\object.i"\

-	{$(INCLUDE)}"\.\objtable.h"\

-	{$(INCLUDE)}"\.\optable.h"\

-	{$(INCLUDE)}"\.\orb.h"\

-	{$(INCLUDE)}"\.\orb_core.h"\

-	{$(INCLUDE)}"\.\orb_core.i"\

-	{$(INCLUDE)}"\.\orbconf.h"\

-	{$(INCLUDE)}"\.\orbobj.h"\

-	{$(INCLUDE)}"\.\orbobj.i"\

-	{$(INCLUDE)}"\.\params.h"\

-	{$(INCLUDE)}"\.\params.i"\

-	{$(INCLUDE)}"\.\poa.h"\

-	{$(INCLUDE)}"\.\poa.i"\

-	{$(INCLUDE)}"\.\principa.h"\

-	{$(INCLUDE)}"\.\request.h"\

-	{$(INCLUDE)}"\.\sequence.h"\

-	{$(INCLUDE)}"\.\sequence.i"\

-	{$(INCLUDE)}"\.\server_factory.h"\

-	{$(INCLUDE)}"\.\server_factory.i"\

-	{$(INCLUDE)}"\.\singletons.h"\

-	{$(INCLUDE)}"\.\stub.h"\

-	{$(INCLUDE)}"\.\stub.i"\

-	{$(INCLUDE)}"\.\svrrqst.h"\

-	{$(INCLUDE)}"\.\tao_internals.h"\

-	{$(INCLUDE)}"\.\typecode.h"\

-	{$(INCLUDE)}"\.\typecode.i"\

-	{$(INCLUDE)}"\.\varout.h"\

-	{$(INCLUDE)}"\ace\Acceptor.cpp"\

-	{$(INCLUDE)}"\ace\Acceptor.h"\

-	{$(INCLUDE)}"\ace\Acceptor.i"\

-	{$(INCLUDE)}"\ace\ACE.h"\

-	{$(INCLUDE)}"\ace\ACE.i"\

-	{$(INCLUDE)}"\ace\Addr.h"\

-	{$(INCLUDE)}"\ace\Addr.i"\

-	{$(INCLUDE)}"\ace\Atomic_Op.i"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.cpp"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.h"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.i"\

-	{$(INCLUDE)}"\ace\config-win32-common.h"\

-	{$(INCLUDE)}"\ace\Config.h"\

-	{$(INCLUDE)}"\ace\Connector.cpp"\

-	{$(INCLUDE)}"\ace\Connector.h"\

-	{$(INCLUDE)}"\ace\Connector.i"\

-	{$(INCLUDE)}"\ace\Containers.cpp"\

-	{$(INCLUDE)}"\ace\Containers.h"\

-	{$(INCLUDE)}"\ace\Containers.i"\

-	{$(INCLUDE)}"\ace\Dynamic.h"\

-	{$(INCLUDE)}"\ace\Dynamic.i"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.cpp"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.i"\

-	{$(INCLUDE)}"\ace\Free_List.cpp"\

-	{$(INCLUDE)}"\ace\Free_List.h"\

-	{$(INCLUDE)}"\ace\Free_List.i"\

-	{$(INCLUDE)}"\ace\Get_Opt.h"\

-	{$(INCLUDE)}"\ace\Get_Opt.i"\

-	{$(INCLUDE)}"\ace\Handle_Set.h"\

-	{$(INCLUDE)}"\ace\Handle_Set.i"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.i"\

-	{$(INCLUDE)}"\ace\IO_Cntl_Msg.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.i"\

-	{$(INCLUDE)}"\ace\Log_Msg.h"\

-	{$(INCLUDE)}"\ace\Log_Priority.h"\

-	{$(INCLUDE)}"\ace\Log_Record.h"\

-	{$(INCLUDE)}"\ace\Log_Record.i"\

-	{$(INCLUDE)}"\ace\Malloc.h"\

-	{$(INCLUDE)}"\ace\Malloc.i"\

-	{$(INCLUDE)}"\ace\Malloc_T.cpp"\

-	{$(INCLUDE)}"\ace\Malloc_T.h"\

-	{$(INCLUDE)}"\ace\Malloc_T.i"\

-	{$(INCLUDE)}"\ace\Managed_Object.cpp"\

-	{$(INCLUDE)}"\ace\Managed_Object.h"\

-	{$(INCLUDE)}"\ace\Managed_Object.i"\

-	{$(INCLUDE)}"\ace\Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Map_Manager.h"\

-	{$(INCLUDE)}"\ace\Map_Manager.i"\

-	{$(INCLUDE)}"\ace\Mem_Map.h"\

-	{$(INCLUDE)}"\ace\Mem_Map.i"\

-	{$(INCLUDE)}"\ace\Memory_Pool.h"\

-	{$(INCLUDE)}"\ace\Memory_Pool.i"\

-	{$(INCLUDE)}"\ace\Message_Block.h"\

-	{$(INCLUDE)}"\ace\Message_Block.i"\

-	{$(INCLUDE)}"\ace\Message_Queue.cpp"\

-	{$(INCLUDE)}"\ace\Message_Queue.h"\

-	{$(INCLUDE)}"\ace\Message_Queue.i"\

-	{$(INCLUDE)}"\ace\Module.cpp"\

-	{$(INCLUDE)}"\ace\Module.h"\

-	{$(INCLUDE)}"\ace\Module.i"\

-	{$(INCLUDE)}"\ace\Object_Manager.h"\

-	{$(INCLUDE)}"\ace\Object_Manager.i"\

-	{$(INCLUDE)}"\ace\OS.h"\

-	{$(INCLUDE)}"\ace\OS.i"\

-	{$(INCLUDE)}"\ace\Reactor.h"\

-	{$(INCLUDE)}"\ace\Reactor.i"\

-	{$(INCLUDE)}"\ace\Reactor_Impl.h"\

-	{$(INCLUDE)}"\ace\Service_Config.h"\

-	{$(INCLUDE)}"\ace\Service_Config.i"\

-	{$(INCLUDE)}"\ace\Service_Object.h"\

-	{$(INCLUDE)}"\ace\Service_Object.i"\

-	{$(INCLUDE)}"\ace\Service_Repository.h"\

-	{$(INCLUDE)}"\ace\Service_Repository.i"\

-	{$(INCLUDE)}"\ace\Service_Types.h"\

-	{$(INCLUDE)}"\ace\Service_Types.i"\

-	{$(INCLUDE)}"\ace\Shared_Object.h"\

-	{$(INCLUDE)}"\ace\Shared_Object.i"\

-	{$(INCLUDE)}"\ace\Signal.h"\

-	{$(INCLUDE)}"\ace\Signal.i"\

-	{$(INCLUDE)}"\ace\Singleton.cpp"\

-	{$(INCLUDE)}"\ace\Singleton.h"\

-	{$(INCLUDE)}"\ace\Singleton.i"\

-	{$(INCLUDE)}"\ace\SOCK.h"\

-	{$(INCLUDE)}"\ace\SOCK.i"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.h"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.i"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.h"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.i"\

-	{$(INCLUDE)}"\ace\SOCK_IO.h"\

-	{$(INCLUDE)}"\ace\SOCK_IO.i"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.h"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.i"\

-	{$(INCLUDE)}"\ace\SString.h"\

-	{$(INCLUDE)}"\ace\SString.i"\

-	{$(INCLUDE)}"\ace\stdcpp.h"\

-	{$(INCLUDE)}"\ace\Strategies.h"\

-	{$(INCLUDE)}"\ace\Strategies_T.cpp"\

-	{$(INCLUDE)}"\ace\Strategies_T.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.cpp"\

-	{$(INCLUDE)}"\ace\Stream_Modules.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.i"\

-	{$(INCLUDE)}"\ace\Svc_Conf_Tokens.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.cpp"\

-	{$(INCLUDE)}"\ace\Svc_Handler.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.i"\

-	{$(INCLUDE)}"\ace\Synch.h"\

-	{$(INCLUDE)}"\ace\Synch.i"\

-	{$(INCLUDE)}"\ace\Synch_Options.h"\

-	{$(INCLUDE)}"\ace\Synch_T.cpp"\

-	{$(INCLUDE)}"\ace\Synch_T.h"\

-	{$(INCLUDE)}"\ace\Synch_T.i"\

-	{$(INCLUDE)}"\ace\Task.h"\

-	{$(INCLUDE)}"\ace\Task.i"\

-	{$(INCLUDE)}"\ace\Task_T.cpp"\

-	{$(INCLUDE)}"\ace\Task_T.h"\

-	{$(INCLUDE)}"\ace\Task_T.i"\

-	{$(INCLUDE)}"\ace\Thread.h"\

-	{$(INCLUDE)}"\ace\Thread.i"\

-	{$(INCLUDE)}"\ace\Thread_Manager.h"\

-	{$(INCLUDE)}"\ace\Thread_Manager.i"\

-	{$(INCLUDE)}"\ace\Time_Value.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.cpp"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.i"\

-	{$(INCLUDE)}"\ace\Trace.h"\

-	{$(INCLUDE)}"\ace\Version.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.i"\

-	{$(INCLUDE)}"\ace\ws2tcpip.h"\

-	

-

-"$(INTDIR)\tao_internals.obj" : $(SOURCE) $(DEP_CPP_TAO_I) "$(INTDIR)"

-

-

-!ENDIF 

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\tc_const.cpp

-

-!IF  "$(CFG)" == "TAO - Win32 Release"

-

-DEP_CPP_TC_CO=\

-	"..\..\ace\config-win32.h"\

-	{$(INCLUDE)}"\.\align.h"\

-	{$(INCLUDE)}"\.\any.h"\

-	{$(INCLUDE)}"\.\any.i"\

-	{$(INCLUDE)}"\.\cdr.h"\

-	{$(INCLUDE)}"\.\cdr.i"\

-	{$(INCLUDE)}"\.\client_factory.h"\

-	{$(INCLUDE)}"\.\connect.h"\

-	{$(INCLUDE)}"\.\connect.i"\

-	{$(INCLUDE)}"\.\corba.h"\

-	{$(INCLUDE)}"\.\corbacom.h"\

-	{$(INCLUDE)}"\.\corbacom.i"\

-	{$(INCLUDE)}"\.\debug.h"\

-	{$(INCLUDE)}"\.\default_client.h"\

-	{$(INCLUDE)}"\.\default_client.i"\

-	{$(INCLUDE)}"\.\default_server.h"\

-	{$(INCLUDE)}"\.\default_server.i"\

-	{$(INCLUDE)}"\.\except.h"\

-	{$(INCLUDE)}"\.\giop.h"\

-	{$(INCLUDE)}"\.\giop.i"\

-	{$(INCLUDE)}"\.\iiopobj.h"\

-	{$(INCLUDE)}"\.\iiopobj.i"\

-	{$(INCLUDE)}"\.\iioporb.h"\

-	{$(INCLUDE)}"\.\iioporb.i"\

-	{$(INCLUDE)}"\.\marshal.h"\

-	{$(INCLUDE)}"\.\marshal.i"\

-	{$(INCLUDE)}"\.\nvlist.h"\

-	{$(INCLUDE)}"\.\object.h"\

-	{$(INCLUDE)}"\.\object.i"\

-	{$(INCLUDE)}"\.\objtable.h"\

-	{$(INCLUDE)}"\.\optable.h"\

-	{$(INCLUDE)}"\.\orb.h"\

-	{$(INCLUDE)}"\.\orb_core.h"\

-	{$(INCLUDE)}"\.\orb_core.i"\

-	{$(INCLUDE)}"\.\orbconf.h"\

-	{$(INCLUDE)}"\.\orbobj.h"\

-	{$(INCLUDE)}"\.\orbobj.i"\

-	{$(INCLUDE)}"\.\params.h"\

-	{$(INCLUDE)}"\.\params.i"\

-	{$(INCLUDE)}"\.\poa.h"\

-	{$(INCLUDE)}"\.\poa.i"\

-	{$(INCLUDE)}"\.\principa.h"\

-	{$(INCLUDE)}"\.\request.h"\

-	{$(INCLUDE)}"\.\sequence.h"\

-	{$(INCLUDE)}"\.\sequence.i"\

-	{$(INCLUDE)}"\.\server_factory.h"\

-	{$(INCLUDE)}"\.\server_factory.i"\

-	{$(INCLUDE)}"\.\singletons.h"\

-	{$(INCLUDE)}"\.\stub.h"\

-	{$(INCLUDE)}"\.\stub.i"\

-	{$(INCLUDE)}"\.\svrrqst.h"\

-	{$(INCLUDE)}"\.\typecode.h"\

-	{$(INCLUDE)}"\.\typecode.i"\

-	{$(INCLUDE)}"\.\varout.h"\

-	{$(INCLUDE)}"\ace\Acceptor.cpp"\

-	{$(INCLUDE)}"\ace\Acceptor.h"\

-	{$(INCLUDE)}"\ace\Acceptor.i"\

-	{$(INCLUDE)}"\ace\ACE.h"\

-	{$(INCLUDE)}"\ace\ACE.i"\

-	{$(INCLUDE)}"\ace\Addr.h"\

-	{$(INCLUDE)}"\ace\Addr.i"\

-	{$(INCLUDE)}"\ace\Atomic_Op.i"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.cpp"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.h"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.i"\

-	{$(INCLUDE)}"\ace\config-win32-common.h"\

-	{$(INCLUDE)}"\ace\Config.h"\

-	{$(INCLUDE)}"\ace\Connector.cpp"\

-	{$(INCLUDE)}"\ace\Connector.h"\

-	{$(INCLUDE)}"\ace\Connector.i"\

-	{$(INCLUDE)}"\ace\Containers.cpp"\

-	{$(INCLUDE)}"\ace\Containers.h"\

-	{$(INCLUDE)}"\ace\Containers.i"\

-	{$(INCLUDE)}"\ace\Dynamic.h"\

-	{$(INCLUDE)}"\ace\Dynamic.i"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.cpp"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.i"\

-	{$(INCLUDE)}"\ace\Free_List.cpp"\

-	{$(INCLUDE)}"\ace\Free_List.h"\

-	{$(INCLUDE)}"\ace\Free_List.i"\

-	{$(INCLUDE)}"\ace\Get_Opt.h"\

-	{$(INCLUDE)}"\ace\Get_Opt.i"\

-	{$(INCLUDE)}"\ace\Handle_Set.h"\

-	{$(INCLUDE)}"\ace\Handle_Set.i"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.i"\

-	{$(INCLUDE)}"\ace\IO_Cntl_Msg.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.i"\

-	{$(INCLUDE)}"\ace\Log_Msg.h"\

-	{$(INCLUDE)}"\ace\Log_Priority.h"\

-	{$(INCLUDE)}"\ace\Log_Record.h"\

-	{$(INCLUDE)}"\ace\Log_Record.i"\

-	{$(INCLUDE)}"\ace\Malloc.h"\

-	{$(INCLUDE)}"\ace\Malloc.i"\

-	{$(INCLUDE)}"\ace\Malloc_T.cpp"\

-	{$(INCLUDE)}"\ace\Malloc_T.h"\

-	{$(INCLUDE)}"\ace\Malloc_T.i"\

-	{$(INCLUDE)}"\ace\Managed_Object.cpp"\

-	{$(INCLUDE)}"\ace\Managed_Object.h"\

-	{$(INCLUDE)}"\ace\Managed_Object.i"\

-	{$(INCLUDE)}"\ace\Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Map_Manager.h"\

-	{$(INCLUDE)}"\ace\Map_Manager.i"\

-	{$(INCLUDE)}"\ace\Mem_Map.h"\

-	{$(INCLUDE)}"\ace\Mem_Map.i"\

-	{$(INCLUDE)}"\ace\Memory_Pool.h"\

-	{$(INCLUDE)}"\ace\Memory_Pool.i"\

-	{$(INCLUDE)}"\ace\Message_Block.h"\

-	{$(INCLUDE)}"\ace\Message_Block.i"\

-	{$(INCLUDE)}"\ace\Message_Queue.cpp"\

-	{$(INCLUDE)}"\ace\Message_Queue.h"\

-	{$(INCLUDE)}"\ace\Message_Queue.i"\

-	{$(INCLUDE)}"\ace\Module.cpp"\

-	{$(INCLUDE)}"\ace\Module.h"\

-	{$(INCLUDE)}"\ace\Module.i"\

-	{$(INCLUDE)}"\ace\Object_Manager.h"\

-	{$(INCLUDE)}"\ace\Object_Manager.i"\

-	{$(INCLUDE)}"\ace\OS.h"\

-	{$(INCLUDE)}"\ace\OS.i"\

-	{$(INCLUDE)}"\ace\Reactor.h"\

-	{$(INCLUDE)}"\ace\Reactor.i"\

-	{$(INCLUDE)}"\ace\Reactor_Impl.h"\

-	{$(INCLUDE)}"\ace\Service_Config.h"\

-	{$(INCLUDE)}"\ace\Service_Config.i"\

-	{$(INCLUDE)}"\ace\Service_Object.h"\

-	{$(INCLUDE)}"\ace\Service_Object.i"\

-	{$(INCLUDE)}"\ace\Service_Repository.h"\

-	{$(INCLUDE)}"\ace\Service_Repository.i"\

-	{$(INCLUDE)}"\ace\Service_Types.h"\

-	{$(INCLUDE)}"\ace\Service_Types.i"\

-	{$(INCLUDE)}"\ace\Shared_Object.h"\

-	{$(INCLUDE)}"\ace\Shared_Object.i"\

-	{$(INCLUDE)}"\ace\Signal.h"\

-	{$(INCLUDE)}"\ace\Signal.i"\

-	{$(INCLUDE)}"\ace\Singleton.cpp"\

-	{$(INCLUDE)}"\ace\Singleton.h"\

-	{$(INCLUDE)}"\ace\Singleton.i"\

-	{$(INCLUDE)}"\ace\SOCK.h"\

-	{$(INCLUDE)}"\ace\SOCK.i"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.h"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.i"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.h"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.i"\

-	{$(INCLUDE)}"\ace\SOCK_IO.h"\

-	{$(INCLUDE)}"\ace\SOCK_IO.i"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.h"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.i"\

-	{$(INCLUDE)}"\ace\SString.h"\

-	{$(INCLUDE)}"\ace\SString.i"\

-	{$(INCLUDE)}"\ace\stdcpp.h"\

-	{$(INCLUDE)}"\ace\Strategies.h"\

-	{$(INCLUDE)}"\ace\Strategies_T.cpp"\

-	{$(INCLUDE)}"\ace\Strategies_T.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.cpp"\

-	{$(INCLUDE)}"\ace\Stream_Modules.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.i"\

-	{$(INCLUDE)}"\ace\Svc_Conf_Tokens.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.cpp"\

-	{$(INCLUDE)}"\ace\Svc_Handler.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.i"\

-	{$(INCLUDE)}"\ace\Synch.h"\

-	{$(INCLUDE)}"\ace\Synch.i"\

-	{$(INCLUDE)}"\ace\Synch_Options.h"\

-	{$(INCLUDE)}"\ace\Synch_T.cpp"\

-	{$(INCLUDE)}"\ace\Synch_T.h"\

-	{$(INCLUDE)}"\ace\Synch_T.i"\

-	{$(INCLUDE)}"\ace\Task.h"\

-	{$(INCLUDE)}"\ace\Task.i"\

-	{$(INCLUDE)}"\ace\Task_T.cpp"\

-	{$(INCLUDE)}"\ace\Task_T.h"\

-	{$(INCLUDE)}"\ace\Task_T.i"\

-	{$(INCLUDE)}"\ace\Thread.h"\

-	{$(INCLUDE)}"\ace\Thread.i"\

-	{$(INCLUDE)}"\ace\Thread_Manager.h"\

-	{$(INCLUDE)}"\ace\Thread_Manager.i"\

-	{$(INCLUDE)}"\ace\Time_Value.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.cpp"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.i"\

-	{$(INCLUDE)}"\ace\Trace.h"\

-	{$(INCLUDE)}"\ace\Version.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.i"\

-	{$(INCLUDE)}"\ace\ws2tcpip.h"\

-	

-

-"$(INTDIR)\tc_const.obj" : $(SOURCE) $(DEP_CPP_TC_CO) "$(INTDIR)"

-

-

-!ELSEIF  "$(CFG)" == "TAO - Win32 Debug"

-

-DEP_CPP_TC_CO=\

-	"..\..\ace\config-win32.h"\

-	{$(INCLUDE)}"\.\align.h"\

-	{$(INCLUDE)}"\.\any.h"\

-	{$(INCLUDE)}"\.\any.i"\

-	{$(INCLUDE)}"\.\cdr.h"\

-	{$(INCLUDE)}"\.\cdr.i"\

-	{$(INCLUDE)}"\.\client_factory.h"\

-	{$(INCLUDE)}"\.\connect.h"\

-	{$(INCLUDE)}"\.\connect.i"\

-	{$(INCLUDE)}"\.\corba.h"\

-	{$(INCLUDE)}"\.\corbacom.h"\

-	{$(INCLUDE)}"\.\corbacom.i"\

-	{$(INCLUDE)}"\.\debug.h"\

-	{$(INCLUDE)}"\.\default_client.h"\

-	{$(INCLUDE)}"\.\default_client.i"\

-	{$(INCLUDE)}"\.\default_server.h"\

-	{$(INCLUDE)}"\.\default_server.i"\

-	{$(INCLUDE)}"\.\except.h"\

-	{$(INCLUDE)}"\.\giop.h"\

-	{$(INCLUDE)}"\.\giop.i"\

-	{$(INCLUDE)}"\.\iiopobj.h"\

-	{$(INCLUDE)}"\.\iiopobj.i"\

-	{$(INCLUDE)}"\.\iioporb.h"\

-	{$(INCLUDE)}"\.\iioporb.i"\

-	{$(INCLUDE)}"\.\marshal.h"\

-	{$(INCLUDE)}"\.\marshal.i"\

-	{$(INCLUDE)}"\.\nvlist.h"\

-	{$(INCLUDE)}"\.\object.h"\

-	{$(INCLUDE)}"\.\object.i"\

-	{$(INCLUDE)}"\.\objtable.h"\

-	{$(INCLUDE)}"\.\optable.h"\

-	{$(INCLUDE)}"\.\orb.h"\

-	{$(INCLUDE)}"\.\orb_core.h"\

-	{$(INCLUDE)}"\.\orb_core.i"\

-	{$(INCLUDE)}"\.\orbconf.h"\

-	{$(INCLUDE)}"\.\orbobj.h"\

-	{$(INCLUDE)}"\.\orbobj.i"\

-	{$(INCLUDE)}"\.\params.h"\

-	{$(INCLUDE)}"\.\params.i"\

-	{$(INCLUDE)}"\.\poa.h"\

-	{$(INCLUDE)}"\.\poa.i"\

-	{$(INCLUDE)}"\.\principa.h"\

-	{$(INCLUDE)}"\.\request.h"\

-	{$(INCLUDE)}"\.\sequence.h"\

-	{$(INCLUDE)}"\.\sequence.i"\

-	{$(INCLUDE)}"\.\server_factory.h"\

-	{$(INCLUDE)}"\.\server_factory.i"\

-	{$(INCLUDE)}"\.\singletons.h"\

-	{$(INCLUDE)}"\.\stub.h"\

-	{$(INCLUDE)}"\.\stub.i"\

-	{$(INCLUDE)}"\.\svrrqst.h"\

-	{$(INCLUDE)}"\.\typecode.h"\

-	{$(INCLUDE)}"\.\typecode.i"\

-	{$(INCLUDE)}"\.\varout.h"\

-	{$(INCLUDE)}"\ace\Acceptor.cpp"\

-	{$(INCLUDE)}"\ace\Acceptor.h"\

-	{$(INCLUDE)}"\ace\Acceptor.i"\

-	{$(INCLUDE)}"\ace\ACE.h"\

-	{$(INCLUDE)}"\ace\ACE.i"\

-	{$(INCLUDE)}"\ace\Addr.h"\

-	{$(INCLUDE)}"\ace\Addr.i"\

-	{$(INCLUDE)}"\ace\Atomic_Op.i"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.cpp"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.h"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.i"\

-	{$(INCLUDE)}"\ace\config-win32-common.h"\

-	{$(INCLUDE)}"\ace\Config.h"\

-	{$(INCLUDE)}"\ace\Connector.cpp"\

-	{$(INCLUDE)}"\ace\Connector.h"\

-	{$(INCLUDE)}"\ace\Connector.i"\

-	{$(INCLUDE)}"\ace\Containers.cpp"\

-	{$(INCLUDE)}"\ace\Containers.h"\

-	{$(INCLUDE)}"\ace\Containers.i"\

-	{$(INCLUDE)}"\ace\Dynamic.h"\

-	{$(INCLUDE)}"\ace\Dynamic.i"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.cpp"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.i"\

-	{$(INCLUDE)}"\ace\Free_List.cpp"\

-	{$(INCLUDE)}"\ace\Free_List.h"\

-	{$(INCLUDE)}"\ace\Free_List.i"\

-	{$(INCLUDE)}"\ace\Get_Opt.h"\

-	{$(INCLUDE)}"\ace\Get_Opt.i"\

-	{$(INCLUDE)}"\ace\Handle_Set.h"\

-	{$(INCLUDE)}"\ace\Handle_Set.i"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.i"\

-	{$(INCLUDE)}"\ace\IO_Cntl_Msg.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.i"\

-	{$(INCLUDE)}"\ace\Log_Msg.h"\

-	{$(INCLUDE)}"\ace\Log_Priority.h"\

-	{$(INCLUDE)}"\ace\Log_Record.h"\

-	{$(INCLUDE)}"\ace\Log_Record.i"\

-	{$(INCLUDE)}"\ace\Malloc.h"\

-	{$(INCLUDE)}"\ace\Malloc.i"\

-	{$(INCLUDE)}"\ace\Malloc_T.cpp"\

-	{$(INCLUDE)}"\ace\Malloc_T.h"\

-	{$(INCLUDE)}"\ace\Malloc_T.i"\

-	{$(INCLUDE)}"\ace\Managed_Object.cpp"\

-	{$(INCLUDE)}"\ace\Managed_Object.h"\

-	{$(INCLUDE)}"\ace\Managed_Object.i"\

-	{$(INCLUDE)}"\ace\Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Map_Manager.h"\

-	{$(INCLUDE)}"\ace\Map_Manager.i"\

-	{$(INCLUDE)}"\ace\Mem_Map.h"\

-	{$(INCLUDE)}"\ace\Mem_Map.i"\

-	{$(INCLUDE)}"\ace\Memory_Pool.h"\

-	{$(INCLUDE)}"\ace\Memory_Pool.i"\

-	{$(INCLUDE)}"\ace\Message_Block.h"\

-	{$(INCLUDE)}"\ace\Message_Block.i"\

-	{$(INCLUDE)}"\ace\Message_Queue.cpp"\

-	{$(INCLUDE)}"\ace\Message_Queue.h"\

-	{$(INCLUDE)}"\ace\Message_Queue.i"\

-	{$(INCLUDE)}"\ace\Module.cpp"\

-	{$(INCLUDE)}"\ace\Module.h"\

-	{$(INCLUDE)}"\ace\Module.i"\

-	{$(INCLUDE)}"\ace\Object_Manager.h"\

-	{$(INCLUDE)}"\ace\Object_Manager.i"\

-	{$(INCLUDE)}"\ace\OS.h"\

-	{$(INCLUDE)}"\ace\OS.i"\

-	{$(INCLUDE)}"\ace\Reactor.h"\

-	{$(INCLUDE)}"\ace\Reactor.i"\

-	{$(INCLUDE)}"\ace\Reactor_Impl.h"\

-	{$(INCLUDE)}"\ace\Service_Config.h"\

-	{$(INCLUDE)}"\ace\Service_Config.i"\

-	{$(INCLUDE)}"\ace\Service_Object.h"\

-	{$(INCLUDE)}"\ace\Service_Object.i"\

-	{$(INCLUDE)}"\ace\Service_Repository.h"\

-	{$(INCLUDE)}"\ace\Service_Repository.i"\

-	{$(INCLUDE)}"\ace\Service_Types.h"\

-	{$(INCLUDE)}"\ace\Service_Types.i"\

-	{$(INCLUDE)}"\ace\Shared_Object.h"\

-	{$(INCLUDE)}"\ace\Shared_Object.i"\

-	{$(INCLUDE)}"\ace\Signal.h"\

-	{$(INCLUDE)}"\ace\Signal.i"\

-	{$(INCLUDE)}"\ace\Singleton.cpp"\

-	{$(INCLUDE)}"\ace\Singleton.h"\

-	{$(INCLUDE)}"\ace\Singleton.i"\

-	{$(INCLUDE)}"\ace\SOCK.h"\

-	{$(INCLUDE)}"\ace\SOCK.i"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.h"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.i"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.h"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.i"\

-	{$(INCLUDE)}"\ace\SOCK_IO.h"\

-	{$(INCLUDE)}"\ace\SOCK_IO.i"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.h"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.i"\

-	{$(INCLUDE)}"\ace\SString.h"\

-	{$(INCLUDE)}"\ace\SString.i"\

-	{$(INCLUDE)}"\ace\stdcpp.h"\

-	{$(INCLUDE)}"\ace\Strategies.h"\

-	{$(INCLUDE)}"\ace\Strategies_T.cpp"\

-	{$(INCLUDE)}"\ace\Strategies_T.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.cpp"\

-	{$(INCLUDE)}"\ace\Stream_Modules.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.i"\

-	{$(INCLUDE)}"\ace\Svc_Conf_Tokens.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.cpp"\

-	{$(INCLUDE)}"\ace\Svc_Handler.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.i"\

-	{$(INCLUDE)}"\ace\Synch.h"\

-	{$(INCLUDE)}"\ace\Synch.i"\

-	{$(INCLUDE)}"\ace\Synch_Options.h"\

-	{$(INCLUDE)}"\ace\Synch_T.cpp"\

-	{$(INCLUDE)}"\ace\Synch_T.h"\

-	{$(INCLUDE)}"\ace\Synch_T.i"\

-	{$(INCLUDE)}"\ace\Task.h"\

-	{$(INCLUDE)}"\ace\Task.i"\

-	{$(INCLUDE)}"\ace\Task_T.cpp"\

-	{$(INCLUDE)}"\ace\Task_T.h"\

-	{$(INCLUDE)}"\ace\Task_T.i"\

-	{$(INCLUDE)}"\ace\Thread.h"\

-	{$(INCLUDE)}"\ace\Thread.i"\

-	{$(INCLUDE)}"\ace\Thread_Manager.h"\

-	{$(INCLUDE)}"\ace\Thread_Manager.i"\

-	{$(INCLUDE)}"\ace\Time_Value.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.cpp"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.i"\

-	{$(INCLUDE)}"\ace\Trace.h"\

-	{$(INCLUDE)}"\ace\Version.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.i"\

-	{$(INCLUDE)}"\ace\ws2tcpip.h"\

-	

-

-"$(INTDIR)\tc_const.obj" : $(SOURCE) $(DEP_CPP_TC_CO) "$(INTDIR)"

-

-

-!ENDIF 

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\any.cpp

-

-!IF  "$(CFG)" == "TAO - Win32 Release"

-

-DEP_CPP_ANY_C=\

-	"..\..\ace\config-win32.h"\

-	{$(INCLUDE)}"\.\align.h"\

-	{$(INCLUDE)}"\.\any.h"\

-	{$(INCLUDE)}"\.\any.i"\

-	{$(INCLUDE)}"\.\cdr.h"\

-	{$(INCLUDE)}"\.\cdr.i"\

-	{$(INCLUDE)}"\.\client_factory.h"\

-	{$(INCLUDE)}"\.\client_factory.i"\

-	{$(INCLUDE)}"\.\connect.h"\

-	{$(INCLUDE)}"\.\connect.i"\

-	{$(INCLUDE)}"\.\corba.h"\

-	{$(INCLUDE)}"\.\corbacom.h"\

-	{$(INCLUDE)}"\.\corbacom.i"\

-	{$(INCLUDE)}"\.\debug.h"\

-	{$(INCLUDE)}"\.\default_client.h"\

-	{$(INCLUDE)}"\.\default_client.i"\

-	{$(INCLUDE)}"\.\default_server.h"\

-	{$(INCLUDE)}"\.\default_server.i"\

-	{$(INCLUDE)}"\.\except.h"\

-	{$(INCLUDE)}"\.\giop.h"\

-	{$(INCLUDE)}"\.\giop.i"\

-	{$(INCLUDE)}"\.\iiopobj.h"\

-	{$(INCLUDE)}"\.\iiopobj.i"\

-	{$(INCLUDE)}"\.\iioporb.h"\

-	{$(INCLUDE)}"\.\iioporb.i"\

-	{$(INCLUDE)}"\.\marshal.h"\

-	{$(INCLUDE)}"\.\marshal.i"\

-	{$(INCLUDE)}"\.\nvlist.h"\

-	{$(INCLUDE)}"\.\object.h"\

-	{$(INCLUDE)}"\.\object.i"\

-	{$(INCLUDE)}"\.\objtable.h"\

-	{$(INCLUDE)}"\.\optable.h"\

-	{$(INCLUDE)}"\.\orb.h"\

-	{$(INCLUDE)}"\.\orb_core.h"\

-	{$(INCLUDE)}"\.\orb_core.i"\

-	{$(INCLUDE)}"\.\orbconf.h"\

-	{$(INCLUDE)}"\.\orbobj.h"\

-	{$(INCLUDE)}"\.\orbobj.i"\

-	{$(INCLUDE)}"\.\params.h"\

-	{$(INCLUDE)}"\.\params.i"\

-	{$(INCLUDE)}"\.\poa.h"\

-	{$(INCLUDE)}"\.\poa.i"\

-	{$(INCLUDE)}"\.\principa.h"\

-	{$(INCLUDE)}"\.\request.h"\

-	{$(INCLUDE)}"\.\sequence.h"\

-	{$(INCLUDE)}"\.\sequence.i"\

-	{$(INCLUDE)}"\.\server_factory.h"\

-	{$(INCLUDE)}"\.\server_factory.i"\

-	{$(INCLUDE)}"\.\singletons.h"\

-	{$(INCLUDE)}"\.\stub.h"\

-	{$(INCLUDE)}"\.\stub.i"\

-	{$(INCLUDE)}"\.\svrrqst.h"\

-	{$(INCLUDE)}"\.\svrrqst.i"\

-	{$(INCLUDE)}"\.\typecode.h"\

-	{$(INCLUDE)}"\.\typecode.i"\

-	{$(INCLUDE)}"\.\varout.h"\

-	{$(INCLUDE)}"\ace\Acceptor.cpp"\

-	{$(INCLUDE)}"\ace\Acceptor.h"\

-	{$(INCLUDE)}"\ace\Acceptor.i"\

-	{$(INCLUDE)}"\ace\ACE.h"\

-	{$(INCLUDE)}"\ace\ACE.i"\

-	{$(INCLUDE)}"\ace\Addr.h"\

-	{$(INCLUDE)}"\ace\Addr.i"\

-	{$(INCLUDE)}"\ace\Atomic_Op.i"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.cpp"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.h"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.i"\

-	{$(INCLUDE)}"\ace\config-win32-common.h"\

-	{$(INCLUDE)}"\ace\Config.h"\

-	{$(INCLUDE)}"\ace\Connector.cpp"\

-	{$(INCLUDE)}"\ace\Connector.h"\

-	{$(INCLUDE)}"\ace\Connector.i"\

-	{$(INCLUDE)}"\ace\Containers.cpp"\

-	{$(INCLUDE)}"\ace\Containers.h"\

-	{$(INCLUDE)}"\ace\Containers.i"\

-	{$(INCLUDE)}"\ace\Dynamic.h"\

-	{$(INCLUDE)}"\ace\Dynamic.i"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.cpp"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.i"\

-	{$(INCLUDE)}"\ace\Free_List.cpp"\

-	{$(INCLUDE)}"\ace\Free_List.h"\

-	{$(INCLUDE)}"\ace\Free_List.i"\

-	{$(INCLUDE)}"\ace\Get_Opt.h"\

-	{$(INCLUDE)}"\ace\Get_Opt.i"\

-	{$(INCLUDE)}"\ace\Handle_Set.h"\

-	{$(INCLUDE)}"\ace\Handle_Set.i"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.i"\

-	{$(INCLUDE)}"\ace\IO_Cntl_Msg.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.i"\

-	{$(INCLUDE)}"\ace\Log_Msg.h"\

-	{$(INCLUDE)}"\ace\Log_Priority.h"\

-	{$(INCLUDE)}"\ace\Log_Record.h"\

-	{$(INCLUDE)}"\ace\Log_Record.i"\

-	{$(INCLUDE)}"\ace\Malloc.h"\

-	{$(INCLUDE)}"\ace\Malloc.i"\

-	{$(INCLUDE)}"\ace\Malloc_T.cpp"\

-	{$(INCLUDE)}"\ace\Malloc_T.h"\

-	{$(INCLUDE)}"\ace\Malloc_T.i"\

-	{$(INCLUDE)}"\ace\Managed_Object.cpp"\

-	{$(INCLUDE)}"\ace\Managed_Object.h"\

-	{$(INCLUDE)}"\ace\Managed_Object.i"\

-	{$(INCLUDE)}"\ace\Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Map_Manager.h"\

-	{$(INCLUDE)}"\ace\Map_Manager.i"\

-	{$(INCLUDE)}"\ace\Mem_Map.h"\

-	{$(INCLUDE)}"\ace\Mem_Map.i"\

-	{$(INCLUDE)}"\ace\Memory_Pool.h"\

-	{$(INCLUDE)}"\ace\Memory_Pool.i"\

-	{$(INCLUDE)}"\ace\Message_Block.h"\

-	{$(INCLUDE)}"\ace\Message_Block.i"\

-	{$(INCLUDE)}"\ace\Message_Queue.cpp"\

-	{$(INCLUDE)}"\ace\Message_Queue.h"\

-	{$(INCLUDE)}"\ace\Message_Queue.i"\

-	{$(INCLUDE)}"\ace\Module.cpp"\

-	{$(INCLUDE)}"\ace\Module.h"\

-	{$(INCLUDE)}"\ace\Module.i"\

-	{$(INCLUDE)}"\ace\Object_Manager.h"\

-	{$(INCLUDE)}"\ace\Object_Manager.i"\

-	{$(INCLUDE)}"\ace\OS.h"\

-	{$(INCLUDE)}"\ace\OS.i"\

-	{$(INCLUDE)}"\ace\Reactor.h"\

-	{$(INCLUDE)}"\ace\Reactor.i"\

-	{$(INCLUDE)}"\ace\Reactor_Impl.h"\

-	{$(INCLUDE)}"\ace\Service_Config.h"\

-	{$(INCLUDE)}"\ace\Service_Config.i"\

-	{$(INCLUDE)}"\ace\Service_Object.h"\

-	{$(INCLUDE)}"\ace\Service_Object.i"\

-	{$(INCLUDE)}"\ace\Service_Repository.h"\

-	{$(INCLUDE)}"\ace\Service_Repository.i"\

-	{$(INCLUDE)}"\ace\Service_Types.h"\

-	{$(INCLUDE)}"\ace\Service_Types.i"\

-	{$(INCLUDE)}"\ace\Shared_Object.h"\

-	{$(INCLUDE)}"\ace\Shared_Object.i"\

-	{$(INCLUDE)}"\ace\Signal.h"\

-	{$(INCLUDE)}"\ace\Signal.i"\

-	{$(INCLUDE)}"\ace\Singleton.cpp"\

-	{$(INCLUDE)}"\ace\Singleton.h"\

-	{$(INCLUDE)}"\ace\Singleton.i"\

-	{$(INCLUDE)}"\ace\SOCK.h"\

-	{$(INCLUDE)}"\ace\SOCK.i"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.h"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.i"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.h"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.i"\

-	{$(INCLUDE)}"\ace\SOCK_IO.h"\

-	{$(INCLUDE)}"\ace\SOCK_IO.i"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.h"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.i"\

-	{$(INCLUDE)}"\ace\SString.h"\

-	{$(INCLUDE)}"\ace\SString.i"\

-	{$(INCLUDE)}"\ace\stdcpp.h"\

-	{$(INCLUDE)}"\ace\Strategies.h"\

-	{$(INCLUDE)}"\ace\Strategies_T.cpp"\

-	{$(INCLUDE)}"\ace\Strategies_T.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.cpp"\

-	{$(INCLUDE)}"\ace\Stream_Modules.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.i"\

-	{$(INCLUDE)}"\ace\Svc_Conf_Tokens.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.cpp"\

-	{$(INCLUDE)}"\ace\Svc_Handler.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.i"\

-	{$(INCLUDE)}"\ace\Synch.h"\

-	{$(INCLUDE)}"\ace\Synch.i"\

-	{$(INCLUDE)}"\ace\Synch_Options.h"\

-	{$(INCLUDE)}"\ace\Synch_T.cpp"\

-	{$(INCLUDE)}"\ace\Synch_T.h"\

-	{$(INCLUDE)}"\ace\Synch_T.i"\

-	{$(INCLUDE)}"\ace\Task.h"\

-	{$(INCLUDE)}"\ace\Task.i"\

-	{$(INCLUDE)}"\ace\Task_T.cpp"\

-	{$(INCLUDE)}"\ace\Task_T.h"\

-	{$(INCLUDE)}"\ace\Task_T.i"\

-	{$(INCLUDE)}"\ace\Thread.h"\

-	{$(INCLUDE)}"\ace\Thread.i"\

-	{$(INCLUDE)}"\ace\Thread_Manager.h"\

-	{$(INCLUDE)}"\ace\Thread_Manager.i"\

-	{$(INCLUDE)}"\ace\Time_Value.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.cpp"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.i"\

-	{$(INCLUDE)}"\ace\Trace.h"\

-	{$(INCLUDE)}"\ace\Version.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.i"\

-	{$(INCLUDE)}"\ace\ws2tcpip.h"\

-	

-NODEP_CPP_ANY_C=\

-	".\tao\factories.h"\

-	

-

-"$(INTDIR)\any.obj" : $(SOURCE) $(DEP_CPP_ANY_C) "$(INTDIR)"

-

-

-!ELSEIF  "$(CFG)" == "TAO - Win32 Debug"

-

-DEP_CPP_ANY_C=\

-	{$(INCLUDE)}"\.\corba.h"\

-	

-

-"$(INTDIR)\any.obj" : $(SOURCE) $(DEP_CPP_ANY_C) "$(INTDIR)"

-

-

-!ENDIF 

-

-# End Source File

-# End Target

-# End Project

-################################################################################

diff --git a/TAO/tao/TAO.mdp b/TAO/tao/TAO.mdp
deleted file mode 100644
index dc9e91d5139..00000000000
--- a/TAO/tao/TAO.mdp
+++ /dev/null
diff --git a/TAO/tao/align.h b/TAO/tao/align.h
deleted file mode 100644
index ad689f33e63..00000000000
--- a/TAO/tao/align.h
+++ /dev/null
@@ -1,80 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-// @(#) $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO
-// 
-// = FILENAME
-//    align.h
-//
-// = DESCRIPTION
-//    Pointer alignment utilities
-//
-//    A "ptr_arith_t" type is defined for doing numerical operations
-//    on pointers, such as aligning them.  Pointer sizes vary from 2
-//    to 8 bytes in today's environments; a portable data type is much
-//    needed.
-//
-// = AUTHOR
-//     Copyright 1994-1995 by Sun Microsystems, Inc.
-// 
-// ============================================================================
-
-#if !defined (TAO_ALIGN_H)
-#define	TAO_ALIGN_H
-
-// Type for doing arithmetic on pointers ... as elsewhere, we assume
-// that "unsigned" versions of a type are the same size as the
-// "signed" version of the same type.
-
-#if	SIZEOF_VOID_P == SIZEOF_INT
-typedef u_int ptr_arith_t;
-
-#elif	SIZEOF_VOID_P == SIZEOF_LONG
-typedef u_long ptr_arith_t;
-
-#elif	SIZEOF_VOID_P == SIZEOF_LONG_LONG
-typedef u_long long ptr_arith_t;
-
-#else
-#	error "Can't find a suitable type for doing pointer arithmetic."
-#endif /* error */
-
-// Efficiently align "value" up to "alignment", knowing that all such
-// boundaries are binary powers and that we're using two's complement
-// arithmetic.
-
-#if 0
-static inline ptr_arith_t
-align_binary (const ptr_arith_t value,
-	      size_t alignment)
-{
-  ptr_arith_t temp = alignment - 1;
-
-  return (value + temp) & ~temp;
-}
-#endif /* 0 */
-#define align_binary(ptr, alignment) \
-    ((ptr + ((ptr_arith_t)((alignment)-1))) & (~((ptr_arith_t)((alignment)-1))))
-
-// Efficiently round "ptr" up to an "alignment" boundary, knowing that
-// all such boundaries are binary powers and that we're using two's
-// complement arithmetic.
-//
-// XXX Returned as "byte pointer" -- CDR module would change to be
-// seen as a "void *".  May want to change this to add XDR cleanly.
-
-#if 0
-static inline u_char *
-ptr_align_binary (const u_char *ptr, 
-		  size_t alignment)
-{
-  return (u_char *) align_binary ((ptr_arith_t) ptr, alignment);
-}
-#endif /* 0 */
-#define ptr_align_binary(ptr, alignment) \
-        ((u_char *) align_binary(((ptr_arith_t) (ptr)), (alignment)))
-
-#endif /* TAO_ALIGN_H */
diff --git a/TAO/tao/any.cpp b/TAO/tao/any.cpp
deleted file mode 100644
index 2ca3df9feab..00000000000
--- a/TAO/tao/any.cpp
+++ /dev/null
@@ -1,678 +0,0 @@
-// @ (#) $Id$
-//
-// Copyright 1994-1995 by Sun Microsystems Inc.
-// All Rights Reserved
-//
-// ORB:         Implementation of CORBA_Any
-//
-// This includes three constructors, a destructor, and a "replace"
-// method for the "Any" data type.  "Any" values pair a pointer to a
-// data structure in the native binary representation (e.g. C struct)
-// with a TypeCode that describes that data structure.
-//
-// The copy constructor and the destructor each use the TypeCode
-// interpreter with specialized "visit" callback routines.  The
-// "visit" routines are used respectively to make "deep copies" and
-// perform "deep frees" of the aritrary values as described by the
-// "Any" value's typecode.
-//
-// Note that these "visit" routines are called directly, and they
-// choose whether or not to use the TypeCode interpreter to examine
-// constituents.  In the simple cases, the "visit" routines can do
-// their work without any further calls; only for constructed types is
-// the interpreter's knowledge really required.
-//
-// THREADING NOTE: "Any" is a data structure which must be protected
-// by external critical sections.  Like simpler numeric types, "Any"
-// instances are accessed and modified atomically.  This
-// implementation is reentrant, so that independent "Any" values may
-// be manipulated concurrently when the underlying programming
-// environment is itself reentrant.
-//
-// COM NOTE: Yes, this is a utility data type whose implementation is
-// fully exposed.  Factories for these are not normally used in C++.
-
-#include "tao/corba.h"
-
-CORBA::TypeCode_ptr
-CORBA_Any::type (void) const
-{
-  return this->type_;
-}
-
-const void *
-CORBA_Any::value (void) const
-{
-  return this->value_;
-}
-
-// Default "Any" constructor -- initializes to nulls per the
-// OMG C++ mapping.
-//
-// NOTE:  null (zero) typecode pointers are also treated as
-// the null typecode ...
-
-CORBA_Any::CORBA_Any (void)
-  : type_ (CORBA::_tc_null),
-    value_ (0),
-    orb_owns_data_ (CORBA::B_FALSE),
-    refcount_ (1)
-{
-}
-
-// The more common "Any" constructor has its own copy of a
-// typecode, and either holds or "consumes" an arbitrary data
-// value satisfying the normal binary interface rules.
-
-CORBA_Any::CORBA_Any (CORBA::TypeCode_ptr tc,
-                      void *value,
-                      CORBA::Boolean orb_owns_data)
-  : type_ (tc),
-    value_ (value),
-    orb_owns_data_ (orb_owns_data),
-    refcount_ (1)
-{
-  tc->AddRef ();
-}
-
-// Helper routine for "Any" copy constructor ...
-//
-// "Deep Copy" from source to dest.  Memory is always there to be
-// copied to ... if this calls itself recursively, it ensures that
-// this remains true (only really an issue for sequences) .
-//
-// This shows the main reason to pass two values to the "visit"
-// function used by the TypeCode interpreter: it allows the copy to be
-// made without using any additional temporary memory.  Most other
-// such "visit" routines use only a single value.  This is also
-// slightly atypical in that it doesn't use the "context".
-
-static CORBA::TypeCode::traverse_status
-deep_copy (CORBA::TypeCode_ptr tc,
-           const void *source,
-           const void *dest,
-           void *, // no context
-           CORBA::Environment &env)
-{
-  CORBA::TypeCode::traverse_status retval;
-  CORBA::TCKind my_kind;
-
-  if (!tc)
-    {
-      env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO) );
-      return CORBA::TypeCode::TRAVERSE_STOP;
-    }
-
-  my_kind = tc->kind (env);
-
-  if (env.exception_type () != CORBA::NO_EXCEPTION)
-    return CORBA::TypeCode::TRAVERSE_STOP;
-
-  // Deep copy from "source" to "dest" ... this code "knows" a bit
-  // about representations, verify it when porting to oddball
-  // platforms with non-IEEE floating point values or atypical byte
-  // and word sizes.
-  //
-  // See the TypeCode interpreter code for more details about the
-  // representational assumptions here.
-
-  retval = CORBA::TypeCode::TRAVERSE_CONTINUE;
-
-  switch (my_kind)
-    {
-    case CORBA::tk_null:
-    case CORBA::tk_void:
-      break;
-
-    case CORBA::tk_char:
-    case CORBA::tk_octet:
-      *(CORBA::Octet *) dest = *(CORBA::Octet *) source;
-      break;
-
-    case CORBA::tk_short:
-    case CORBA::tk_ushort:
-      *(CORBA::Short *) dest = *(CORBA::Short *) source;
-      break;
-
-    case CORBA::tk_wchar:
-      *(CORBA::WChar *) dest = *(CORBA::WChar *) source;
-      break;
-
-    case CORBA::tk_long:
-    case CORBA::tk_ulong:
-    case CORBA::tk_float:
-      *(CORBA::Long *) dest = *(CORBA::Long *) source;
-      break;
-
-    case CORBA::tk_longlong:
-    case CORBA::tk_ulonglong:
-    case CORBA::tk_double:
-      *(CORBA::LongLong *) dest = *(CORBA::LongLong *) source;
-      break;
-
-    case CORBA::tk_longdouble:
-      *(CORBA::LongDouble *) dest = *(CORBA::LongDouble *) source;
-      break;
-
-    case CORBA::tk_boolean:
-      *(CORBA::Boolean *) dest = *(CORBA::Boolean *) source;
-      break;
-
-    case CORBA::tk_any:
-      (void) new (dest) CORBA_Any (*(CORBA_Any*) source);
-      break;
-
-    case CORBA::tk_TypeCode:
-      if ((*(CORBA::TypeCode_ptr *) source) != 0)
-        dest = source;
-      else
-        dest = CORBA::_tc_null;
-      ((CORBA::TypeCode_ptr) dest)->AddRef ();
-      break;
-
-    case CORBA::tk_Principal:
-      {
-        CORBA::Principal_ptr src, dst;
-
-        src = *(CORBA::Principal_ptr *) source;
-	// @@ Andy, please make sure to check for memory failure.
-        dst = *(CORBA::Principal_ptr *) dest = new CORBA::Principal;
-
-        // Principals are just opaque IDs ... copy them
-
-        assert (src->id.length <= UINT_MAX);
-        dst->id.length = dst->id.maximum = src->id.length;
-
-        if (dst->id.length > 0)
-	  {
-	    // @@ Andy, please make sure to check for memory failure.
-	    dst->id.buffer = new CORBA::Octet [(unsigned) dst->id.length];
-	    ACE_OS::memcpy (dst->id.buffer, src->id.buffer,
-			    (size_t) dst->id.length);
-	  }
-	else
-          dst->id.buffer = 0;
-      }
-    break;
-
-    case CORBA::tk_objref:
-      *(CORBA::Object_ptr *) dest = CORBA::Object::
-        _duplicate (*(CORBA::Object_ptr *) source);
-      break;
-
-    case CORBA::tk_sequence:
-      {
-        CORBA::OctetSeq          *src, *dst;
-        CORBA::TypeCode_ptr      tcp;
-        size_t                  size;
-
-        // Rely on binary format of sequences -- all are the same
-        // except for the type pointed to by "buffer"
-
-        src = (CORBA::OctetSeq *) source;
-        dst = (CORBA::OctetSeq *) dest;
-
-        assert (src->length <= UINT_MAX);
-        dst->length = dst->maximum = src->length;
-
-        // Get the size of each "buffer" element
-
-        tcp = tc->typecode_param (0, env);
-
-        if (env.exception () != 0)
-	  {
-	    retval = CORBA::TypeCode::TRAVERSE_STOP;
-	    break;
-	  }
-
-        size = tcp->size (env);
-
-        if (env.exception () != 0)
-	  {
-	    retval = CORBA::TypeCode::TRAVERSE_STOP;
-	    break;
-	  }
-        tcp->Release ();
-
-        // Now allocate a new (uninitialized) buffer of the right size
-        // to hold that many elements ... fall through and let a
-        // general traverse fill in those buffer elements.
-
-        size *= (size_t) src->length;
-        dst->buffer = new CORBA::Octet[size];
-      }
-    // FALLTHROUGH
-
-    case CORBA::tk_struct:
-    case CORBA::tk_union:
-    case CORBA::tk_array:
-    case CORBA::tk_alias:
-      return tc->traverse (source,
-			   dest,
-                           (CORBA::TypeCode::VisitRoutine) deep_copy,
-			   0,
-			   env);
-
-    case CORBA::tk_except:
-      // Exceptions in memory have a "hidden" typecode up front, used
-      // to ensure that memory is appropriately freed and to hold the
-      // exception ID.  We just copy that typecode, the traverse code
-      // ignores it completely.
-
-      *(CORBA::TypeCode_ptr *) dest = *(CORBA::TypeCode_ptr *) source;
-      (void) (*(CORBA::TypeCode_ptr *) dest)->AddRef ();
-
-      return tc->traverse (source,
-			   dest,
-			   (CORBA::TypeCode::VisitRoutine) deep_copy,
-			   0,
-			   env);
-
-    case CORBA::tk_enum:
-      *(int *) dest = *(int *) source;
-      break;
-
-    case CORBA::tk_string:
-      *(CORBA::String *) dest =
-	CORBA::string_copy (*(CORBA::String *) source);
-      break;
-
-    case CORBA::tk_wstring:
-      *(CORBA::WString *) dest =
-	CORBA::wstring_copy (*(CORBA::WString *) source);
-      break;
-
-    default:
-      dmsg ("deep copy default case ?");
-      env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO) );
-      retval = CORBA::TypeCode::TRAVERSE_STOP;
-      break;
-    }
-  return retval;
-}
-
-// Copy constructor for "Any".
-
-CORBA_Any::CORBA_Any (const CORBA_Any &src)
-  : type_ (src.type_ != 0 ? src.type_ : CORBA::_tc_null),
-    orb_owns_data_ (CORBA::B_TRUE),
-    refcount_ (1)
-{
-  CORBA::Environment env;
-  size_t size;
-
-  type_->AddRef ();
-
-  size = type_->size (env);           // XXX check error status
-  value_ = (char *) calloc (1, size);
-
-#if 0
-  (void) type_->traverse (src.value_,
-			  value_,
-			  (CORBA::TypeCode::VisitRoutine) deep_copy,
-			  0,
-			  env);
-#endif /* replaced by our optimizations */
-
-  (void) DEEP_COPY (type_, src.value_, value_, env);
-}
-
-// Helper routine for "Any" destructor.
-//
-// This frees all the memory pointed to by any given value held inside
-// of an "Any".  For most data types it does nothing, since most data
-// types don't hold any memory.  For a few, it recurses.
-//
-// This is one of the simplest typecode interpreter callbacks, since
-// in most cases it does nothing.  Also, it uses neither the second
-// value nor the context parameter.
-
-static CORBA::TypeCode::traverse_status
-deep_free (CORBA::TypeCode_ptr tc,
-	   const void *value,
-	   const void *,      // value2 unused
-	   void *,      // context unused
-	   CORBA::Environment &env)
-{
-  // Don't do anything if the value is a null pointer.
-
-  if (!value)
-    return CORBA::TypeCode::TRAVERSE_CONTINUE;
-
-  CORBA::TypeCode::traverse_status retval;
-  CORBA::TCKind my_kind;
-
-  if (!tc)
-    {
-      env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO) );
-      return CORBA::TypeCode::TRAVERSE_STOP;
-    }
-
-  my_kind = tc->kind (env);
-
-  if (env.exception_type () != CORBA::NO_EXCEPTION)
-    return CORBA::TypeCode::TRAVERSE_STOP;
-
-  // Free only embedded pointers ... which don't exist in most
-  // primitive types.
-
-  retval = CORBA::TypeCode::TRAVERSE_CONTINUE;
-  switch (my_kind)
-    {
-    case CORBA::tk_struct:
-    case CORBA::tk_union:
-    case CORBA::tk_array:
-    case CORBA::tk_alias:
-      return tc->traverse (value,
-			   0,
-			   (CORBA::TypeCode::VisitRoutine) deep_free,
-			   0,
-			   env);
-
-      // XXX: Exceptions are currently leaked because of bugs lurking
-      // in this area.  Keep in mind that there are two things to
-      // free: (a) the typecode in the exception base class; (b) any
-      // pointers held by a user-defined exception, such as an objref
-      // or string.
-      //
-      // Since this code does nothing, it should leak BOTH of those
-      // kinds of memory.  Since it's not supposed to be called except
-      // when the exception really is being freed, it should only be
-      // called when the reference count in the exception base class
-      // is zero.
-      //
-      // It's not clear which of those assertions actually hold.
-      //
-      // The code SHOULD be just like the traverse () call for a
-      // structure, with (a) a precondition that the reference count
-      // is zero, (b) an assertion that the typecode in the exception
-      // and "tc" are equivalent, (c) releasing that typecode found
-      // within the exception.
-      //
-    case CORBA::tk_except:
-      return retval;
-
-    case CORBA::tk_sequence:
-      retval = tc->traverse (value,
-			     0,
-			     (CORBA::TypeCode::VisitRoutine) deep_free,
-			     0,
-			     env);
-      // @@ This better be allocated via new[].
-      delete [] ((CORBA::OctetSeq *) value)->buffer;
-      break;
-
-    case CORBA::tk_TypeCode:
-      if ((*(CORBA::TypeCode_ptr *) value) != 0)
-	 (*(CORBA::TypeCode_ptr *) value)->Release ();
-      break;
-
-    case CORBA::tk_Principal:
-      CORBA::release (*(CORBA::Principal_ptr *) value);
-      break;
-
-    case CORBA::tk_objref:
-      CORBA::release (*(CORBA::Object_ptr *) value);
-      break;
-
-    case CORBA::tk_string:
-      CORBA::string_free (*(CORBA::String *) value);
-      break;
-
-    case CORBA::tk_wstring:
-      CORBA::wstring_free (*(CORBA::WString *) value);
-      break;
-
-    case CORBA::tk_any:
-#ifdef  __BORLANDC__
-      // XXX BC++ doesn't yet accept explicit calls to destructors
-      // with this syntax.  A simple workaround must exist, though;
-      // other explicit destructor calls work.
-
-      dmsg ("Delete Any-in-Any ... memory leak with BC++ 4.5");
-#else
-      ((CORBA_Any *) value)->~CORBA_Any ();
-#endif /* __BORLANDC__ */
-      break;
-
-    default:
-      return CORBA::TypeCode::TRAVERSE_CONTINUE;
-    }
-
-  if (env.exception_type () != CORBA::NO_EXCEPTION)
-    return CORBA::TypeCode::TRAVERSE_STOP;
-  else
-    return retval;
-}
-
-// Destructor for an "Any" deep-frees memory if needed.
-//
-// NOTE that the assertion below will fire on application programmer
-// errors, such as using AddRef/Release out of sync with the true
-// lifetime of an Any value allocated on the stack.  BUT it involves
-// changing the refcounting policy so that it's initialized to zero,
-// not one ... which policy affects the whole source base, and not
-// just this data type.  Get to this later.
-
-CORBA_Any::~CORBA_Any (void)
-{
-  CORBA::Environment env;
-
-  // assert (refcount_ == 0);
-
-  if (this->orb_owns_data_)
-    {
-      //      (void) deep_free (type_, value_, 0, 0, env);
-      DEEP_FREE (this->type_, this->value_, 0, env);
-      // TODO: This crashes the server on NT, apparently the previous
-      // DEEP_FREE does the job and make the delete operator uneeded.
-      // delete value_;
-    }
-
-  if (this->type_)
-    this->type_->Release ();
-}
-
-// all-at-once replacement of the contents of an "Any"
-
-void
-CORBA_Any::replace (CORBA::TypeCode_ptr tc,
-		    const void *v,
-		    CORBA::Boolean orb_owns_data,
-		    CORBA::Environment &env)
-{
-  if (orb_owns_data_)
-    {
-      //      (void) deep_free (type_, value_, 0, 0, env);
-      if (value_)
-	DEEP_FREE (type_, value_, 0, env);
-      delete value_;
-    }
-
-  if (type_ != 0)
-    type_->Release ();
-
-  env.clear ();
-
-  type_ = tc;
-  tc->AddRef ();
-  value_ = (void *) v;
-  orb_owns_data_ = orb_owns_data;
-}
-
-// For COM -- IUnKnown operations
-
-// {A201E4C8-F258-11ce-9598-0000C07CA898}
-DEFINE_GUID (IID_CORBA_Any,
-0xa201e4c8, 0xf258, 0x11ce, 0x95, 0x98, 0x0, 0x0, 0xc0, 0x7c, 0xa8, 0x98);
-
-ULONG
-__stdcall
-CORBA_Any::AddRef (void)
-{
-  ACE_MT (ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, guard, lock_, 0));
-
-  return ++refcount_;
-}
-
-ULONG __stdcall
-CORBA_Any::Release (void)
-{
-  {
-    ACE_MT (ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, mon, this->lock_, 0));
-
-    ACE_ASSERT (this != 0);
-
-    if (--refcount_ != 0)
-      return refcount_;
-  }
-
-  delete this;
-  return 0;
-}
-
-HRESULT __stdcall
-CORBA_Any::QueryInterface (REFIID riid,
-			   void **ppv)
-{
-  *ppv = 0;
-
-  if (IID_CORBA_Any == riid || IID_IUnknown == riid)
-    *ppv = this;
-
-  if (*ppv == 0)
-    return ResultFromScode (E_NOINTERFACE);
-
- (void) AddRef ();
-  return NOERROR;
-}
-
-// VARIANT conversions
-
-// copy constructor
-
-CORBA_Any::CORBA_Any (const VARIANT &src)
-{
-  orb_owns_data_ = CORBA::B_TRUE;
-  refcount_ = 1;
-  type_ = CORBA::_tc_void;
-  value_ = 0;
-
-  *this = src;
-}
-
-// assignment operator
-CORBA_Any &
-CORBA_Any::operator = (const VARIANT &src)
-{
-  this->~CORBA_Any ();
-
-  // XXX better, report exception
-  assert (ACE_BIT_DISABLED (src.vt, 0xB000));
-
-  switch (src.vt & 0x0fff)
-    {
-    case VT_EMPTY:
-      type_ = CORBA::_tc_void;
-      value_ = 0;
-      break;
-
-    case VT_NULL:
-      type_ = CORBA::_tc_null;
-      value_ = 0;
-      break;
-
-    case VT_I2:
-      type_ = CORBA::_tc_short;
-      value_ =
-        new CORBA::Short ((src.vt & VT_BYREF) ? (*src.piVal) : src.iVal);
-      break;
-
-    case VT_I4:
-      type_ = CORBA::_tc_long;
-      value_ =
-        new CORBA::Long ((src.vt & VT_BYREF) ? (*src.plVal) : src.lVal);
-      break;
-
-    case VT_R4:
-      type_ = CORBA::_tc_float;
-      value_ =
-        new CORBA::Float ((src.vt & VT_BYREF) ? (*src.pfltVal) : src.fltVal);
-      break;
-
-    case VT_R8:
-      type_ = CORBA::_tc_double;
-      value_ =
-        new CORBA::Double ((src.vt & VT_BYREF) ? (*src.pdblVal) : src.dblVal);
-      break;
-
-      // case VT_CY:
-      // case VT_DATE:
-      // XXX convert currency and date to TBD CORBA conventions
-
-      // case VT_BSTR:
-      // XXX convert to CORBA string
-
-      // case VT_DISPATCH:
-      // case VT_UNKNOWN:
-      // case VT_VARIANT:
-      // XXX convert to CORBA objref or appropriate pseudo-objref
-
-      // case VT_BOOL:
-      // XXX convert to CORBA boolean
-
-      // case VT_ERROR:
-      // XXX what to do?
-
-    case VT_UI1:
-      type_ = CORBA::_tc_octet;
-      value_ =
-        new CORBA::Octet ((src.vt & VT_BYREF) ? (*src.pbVal) : src.bVal);
-      break;
-
-    default:
-      // XXX report some exception ... throw it?
-      type_ = CORBA::_tc_void;
-      value_ = 0;
-      break;
-    }
-
-  return *this;
-}
-
-CORBA_Any::operator VARIANT (void)
-{
-  VARIANT retval;
-
-  // XXX convert it ... or report exception somehow!
-
-  retval.vt = VT_EMPTY;
-  return retval;
-}
-
-// ----------------------------------------------------------------------
-// Any_var type
-// ----------------------------------------------------------------------
-
-CORBA::Any_var &
-CORBA_Any_var::operator= (CORBA::Any *p)
-{
-  if (this->ptr_ != p)
-    {
-      if (this->ptr_ != 0)
-	delete (this->ptr_);
-
-      this->ptr_ = p;
-    }
-  return *this;
-}
-
-CORBA::Any_var &
-CORBA_Any_var::operator= (const CORBA::Any_var& r)
-{
-  if (this->ptr_ != 0)
-    delete (this->ptr_);
-
-  this->ptr_ = new CORBA::Any (*r.ptr_);
-  return *this;
-}
diff --git a/TAO/tao/any.h b/TAO/tao/any.h
deleted file mode 100644
index a0e0212b50e..00000000000
--- a/TAO/tao/any.h
+++ /dev/null
@@ -1,341 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO
-// 
-// = FILENAME
-//    any.h
-//
-// = DESCRIPTION
-//     Header file for Win32 C/C++/COM interface to CORBA's "Any" type.
-//
-// = AUTHOR
-//     Copyright 1994-1995 by Sun Microsystems, Inc.
-//
-//     Remaining CORBA compliant functions added by Aniruddha Gokhale
-// 
-// ============================================================================
-
-#if !defined (TAO_ANY_H)
-#define TAO_ANY_H
-
-class TAO_Export CORBA_Any : public IUnknown
-  // = TITLE
-  //   Class "Any" can wrap values of any type, with the assistance
-  //   of a TypeCode to describe that type.
-  //
-  // = DESCRIPTION
-  //   XXX should find a way to make its memory allocation always go
-  //   within the appropriate OLE heap...
-{
-public:
-  // = Minor codes for exceptional returns
-  enum 
-  {
-    UNINITIALIZED_type = 0xf000,
-    VALUE_WITHOUT_TYPE,
-    UNSUPPORTED_OPERATION
-  };
-
-  // = Initialization and termination operations.
-  CORBA_Any (void);
-  // Default constructor.
-
-  CORBA_Any (CORBA::TypeCode_ptr type,
-	     void *value = 0,
-	     CORBA::Boolean orb_owns_data = CORBA::B_FALSE);
-  // Constructor.
-
-  CORBA_Any (const CORBA_Any &a);
-  // Copy constructor.
-
-  virtual ~CORBA_Any (void);
-  // Destructor.
-
-  CORBA_Any &operator= (const CORBA_Any &);
-  // assignment operator
-
-  // = NOTE: 94-9-14 has assignment operator plus many insertion, as specified
-  // below 
-
-  // =type safe insertion
-
-  void operator<<= (CORBA::Short);
-  // insert a short
-
-  void operator<<= (CORBA::UShort);
-  // insert an unsigned short
-
-  void operator<<= (CORBA::Long);
-  // insert a long
-
-  void operator<<= (CORBA::ULong);
-  // insert an unsigned long
-
-  void operator<<= (CORBA::Float);
-  // insert a float
-
-  void operator<<= (CORBA::Double);
-  // insert a double
-
-  void operator<<= (const CORBA_Any&);
-  // insert an Any
-
-  void operator<<= (const char*);
-  // insert unbounded strings
-
-  // =type safe extraction
-
-  CORBA::Boolean operator>>= (CORBA::Short&) const;
-  // extract a short
-
-  CORBA::Boolean operator>>= (CORBA::UShort&) const;
-  // extract an unsigned short
-
-  CORBA::Boolean operator>>= (CORBA::Long&) const;
-  // extract a long
-
-  CORBA::Boolean operator>>= (CORBA::ULong&) const;
-  // extract an unsigned long
-
-  CORBA::Boolean operator>>= (CORBA::Float&) const;
-  // extract a float
-
-  CORBA::Boolean operator>>= (CORBA::Double&) const;
-  // extract a double
-
-  CORBA::Boolean operator>>= (CORBA_Any&) const;
-  // extract an Any
-
-  CORBA::Boolean operator>>= (char*&) const;
-  // extract an unbounded string
-
-  // special types needed for insertion and extraction of booleans, octets,
-  // chars, and bounded strings
-
-  struct from_boolean
-  {
-    from_boolean (CORBA::Boolean b);
-    CORBA::Boolean val_;
-  };
-
-  struct from_octet
-  {
-    from_octet (CORBA::Octet o);
-    CORBA::Octet val_;
-  };
-
-  struct from_char
-  {
-    from_char (CORBA::Char c);
-    CORBA::Char val_;
-  };
-
-  struct from_string
-  {
-    from_string (char* s, CORBA::ULong b, CORBA::Boolean nocopy = CORBA::B_FALSE);
-    char *val_;
-    CORBA::ULong bound_;
-    CORBA::Boolean nocopy_;
-  };
-
-  void operator<<= (from_boolean);
-  // insert a boolean
-
-  void operator<<= (from_char);
-  // insert a char
-
-  void operator<<= (from_octet);
-  // insert an octet
-
-  void operator<<= (from_string);
-  // insert a bounded string
-
-  // special types for extracting octets, chars, booleans, and bounded strings
-
-  struct to_boolean
-  {
-    to_boolean (CORBA::Boolean &b);
-    CORBA::Boolean &ref_;
-  };
-
-  struct to_char
-  {
-    to_char (CORBA::Char &c);
-    CORBA::Char &ref_;
-  };
-
-  struct to_octet
-  {
-    to_octet (CORBA::Octet &o);
-    CORBA::Octet &ref_;
-  };
-
-  struct to_string
-  {
-    to_string (char *&s, CORBA::ULong b);
-    char *&ref_;
-    CORBA::ULong bound_;
-  };
-
-  // extraction of the special types
-  CORBA::Boolean operator>>= (to_boolean) const;
-  CORBA::Boolean operator>>= (to_octet) const;
-  CORBA::Boolean operator>>= (to_char) const;
-  CORBA::Boolean operator>>= (to_string) const;
-
-  // = ALLOCATION
-  void *operator new (size_t, const void *p);
-  // Placement new.
-  void *operator new (size_t s);
-  // Default new.
-  void operator delete (void *p);
-  // Default delete
-
-  void replace (CORBA::TypeCode_ptr type,
-		const void *value,
-		CORBA::Boolean orb_owns_data,
-		CORBA::Environment &env);
-  // replace the current typecode and data with the specified one - unsafe
-
-  CORBA::TypeCode_ptr type (void) const;
-  // Return <type> of <Any>.
-
-  const void *value (void) const;
-  // Return <value> of <Any>.
-
-  // = Methods required for COM <IUnknown> support.
-
-  ULONG __stdcall AddRef (void);
-  ULONG __stdcall Release (void);
-  HRESULT __stdcall QueryInterface (REFIID riid,
-				    void **ppv);
-
-  // = Conversion to/from COM Variant types: 
-
-  CORBA_Any (const VARIANT &src);
-  // copy constructor,
-
-  CORBA_Any &operator = (const VARIANT &src);
-  // assignment operator
-
-  operator VARIANT (void);
-  // cast operator.
-
-private:
-  CORBA::TypeCode_ptr type_;
-  // Typecode for the <Any>.
-
-  void *value_;
-  // Value for the <Any>.
-
-  CORBA::Boolean orb_owns_data_;
-  // Flag that indicates the ORB is responsible for deleting the data.
-
-  u_int refcount_;
-  // Reference count the <Any> to reduce copying costs.
-
-  ACE_SYNCH_MUTEX lock_;
-  // Serialize access to the reference count.
-
-  void replace (CORBA::TypeCode_ptr type,
-		const void *value,
-		CORBA::Boolean orb_owns_data);
-  // Helper for extraction operators that don't pass an environment
-  // parameter.  94-9-14 hides unsigned char insert/extract
-  void operator<<= (unsigned char);
-  CORBA::Boolean operator>>= (unsigned char&) const;
-};
-
-class TAO_Export CORBA_Any_var
-  // = TITLE
-  //   Provide for automatic storage deallocation on going out of scope. 
-{
-public:
-  CORBA_Any_var (void);
-  // default constructor
-
-  CORBA_Any_var (CORBA_Any *a);
-  // construct from an Any pointer
-
-  CORBA_Any_var (const CORBA_Any_var &a);
-  // copy constructor
-
-  ~CORBA_Any_var (void);
-  // destructor
-
-  CORBA_Any_var &operator= (CORBA_Any *a);
-  // assignment from a pointer to Any
-
-  CORBA_Any_var &operator= (const CORBA_Any_var &a);
-  // assignment from an Any_var
-
-  CORBA_Any *operator-> (void);
-  // arrow operator (smart pointer)
-
-  operator const CORBA_Any *() const;
-  // cast
-
-  operator CORBA_Any *&();
-  // cast
-
-  const CORBA_Any &in (void) const;
-  // for in Any parameter
-
-  CORBA_Any &inout (void);
-  // for inout Any parameter
-
-  CORBA_Any *&out (void);
-  // for out Any parameter
-
-  CORBA_Any *_retn (void);
-  // for Any return types
-
-private:
-  CORBA_Any *ptr_;
-};
-
-class TAO_Export CORBA_Any_out
-  // = TITLE
-  //   @@ Please document me.
-{
-public:
-  // = operations.
-
-  CORBA_Any_out (CORBA_Any *&p);
-  // construction from a reference to a CORBA_Any
-
-  CORBA_Any_out (CORBA_Any_var &p);
-  // construction from a var
-
-  CORBA_Any_out (CORBA_Any_out &s);
-  // copy constructor
-
-  CORBA_Any_out &operator= (CORBA_Any_out &s);
-  // assignment from a CORBA_Any_out
-
-  CORBA_Any_out &operator= (CORBA_Any *p);
-  // assignment from a CORBA_Any
-
-  CORBA_Any_out &operator= (const CORBA_Any *p);
-  // assignment from a const CORBA_Any
-
-  operator CORBA_Any *&();
-  // cast
-
-  CORBA_Any *& ptr (void);
-  // return underlying instance
-   
-private:
-  CORBA_Any *&ptr_;
-  // instance
-
-  void operator= (const CORBA_Any_var &);
-  // assignment from _var disallowed
-};
-
-#endif /* TAO_ANY_H */
-
-
diff --git a/TAO/tao/any.i b/TAO/tao/any.i
deleted file mode 100644
index 7a3d679dbca..00000000000
--- a/TAO/tao/any.i
+++ /dev/null
@@ -1,310 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-
-ACE_INLINE void *
-CORBA_Any::operator new (size_t, const void *p)
-{
-  return (void *) p;
-}
-
-ACE_INLINE void *
-CORBA_Any::operator new (size_t s)
-{
-  return ::operator new (s);
-}
-
-ACE_INLINE void
-CORBA_Any::operator delete (void *p)
-{
-  ::operator delete (p);
-}
-
-// insertion from special types
-
-// @@ Andy, please take a look at this method and make sure it's what
-// you intended.  I couldn't find it defined anywhere.  --cjc
-ACE_INLINE void
-CORBA_Any::replace (CORBA::TypeCode_ptr type,
-                    const void *value,
-                    CORBA::Boolean orb_owns_data)
-{
-  CORBA_Environment e;
-  this->replace (type, value, orb_owns_data, e);
-}
-
-// insertion operators
-
-ACE_INLINE void
-CORBA_Any::operator<<= (CORBA::Short s)
-{
-  replace (CORBA::_tc_short, new CORBA::Short (s), CORBA::B_TRUE);
-}
-
-ACE_INLINE void
-CORBA_Any::operator<<= (CORBA::UShort s)
-{
-  replace (CORBA::_tc_ushort, new CORBA::UShort (s), CORBA::B_TRUE);
-}
-
-ACE_INLINE void
-CORBA_Any::operator<<= (CORBA::Long l)
-{
-  replace (CORBA::_tc_long, new CORBA::Long (l), CORBA::B_TRUE);
-}
-
-ACE_INLINE void
-CORBA_Any::operator<<= (CORBA::ULong l)
-{
-  replace (CORBA::_tc_ulong, new CORBA::ULong (l), CORBA::B_TRUE);
-}
-
-ACE_INLINE void
-CORBA_Any::operator<<= (CORBA::Float f)
-{
-  replace (CORBA::_tc_float, new CORBA::Float (f), CORBA::B_TRUE);
-}
-
-ACE_INLINE void
-CORBA_Any::operator<<= (CORBA::Double d)
-{
-  replace (CORBA::_tc_double, new CORBA::Double (d), CORBA::B_TRUE);
-}
-
-ACE_INLINE void
-CORBA_Any::operator<<= (const CORBA_Any& a)
-{
-  replace (CORBA::_tc_any, new CORBA_Any (a), CORBA::B_TRUE);
-}
-
-ACE_INLINE void
-CORBA_Any::operator<<= (const char* s)
-{
-  replace (CORBA::_tc_string, CORBA::string_dup (s), CORBA::B_TRUE);
-}
-
-// implementing the special types
-ACE_INLINE
-CORBA_Any::from_boolean::from_boolean (CORBA::Boolean b)
-  : val_ (b)
-{
-}
-
-ACE_INLINE
-CORBA_Any::to_boolean::to_boolean (CORBA::Boolean &b)
-  : ref_ (b)
-{
-}
-
-ACE_INLINE
-CORBA_Any::from_octet::from_octet (CORBA::Octet o)
-  : val_ (o)
-{
-}
-
-ACE_INLINE
-CORBA_Any::to_octet::to_octet (CORBA::Octet &o)
-  : ref_ (o)
-{
-}
-
-ACE_INLINE
-CORBA_Any::from_char::from_char (CORBA::Char c)
-  : val_ (c)
-{
-}
-
-ACE_INLINE
-CORBA_Any::to_char::to_char (CORBA::Char &c)
-  : ref_ (c)
-{
-}
-
-ACE_INLINE
-CORBA_Any::from_string::from_string (char *s, CORBA::ULong b, CORBA::Boolean nocopy)
-  : val_ (s),
-    bound_ (b),
-    nocopy_ (nocopy)
-{
-}
-
-ACE_INLINE
-CORBA_Any::to_string::to_string (char *&s, CORBA::ULong b)
-  : ref_ (s),
-    bound_ (b)
-{
-}
-
-ACE_INLINE void
-CORBA_Any::operator<<= (from_boolean b)
-{
-  replace (CORBA::_tc_boolean, new CORBA::Boolean (b.val_), CORBA::B_TRUE);
-}
-
-ACE_INLINE void
-CORBA_Any::operator<<= (from_octet o)
-{
-  replace (CORBA::_tc_octet, new CORBA::Octet (o.val_), CORBA::B_TRUE);
-}
-
-ACE_INLINE void
-CORBA_Any::operator<<= (from_char c)
-{
-  replace (CORBA::_tc_char, new CORBA::Char (c.val_), CORBA::B_TRUE);
-}
-
-ACE_INLINE void
-CORBA_Any::operator<<= (from_string s)
-{
-  if (s.nocopy_)
-    replace (CORBA::_tc_string,  s.val_, CORBA::B_TRUE);
-  else
-    replace (CORBA::_tc_string, CORBA::string_dup (s.val_), CORBA::B_TRUE);
-}
-
-// extraction: these are safe and hence we have to check that the typecode of
-// the Any is equal to the one we are trying to extract into
-
-ACE_INLINE CORBA::Boolean
-CORBA_Any::operator>>= (CORBA::Short &s) const
-{
-  CORBA::Environment env;
-
-  if (type_->equal (CORBA::_tc_short, env))
-    {
-      s = *(CORBA::Short *) value_;
-      return CORBA::B_TRUE;
-    }
-  else
-    return CORBA::B_FALSE;
-}
-
-
-// ----------------------------------------------------------------------
-// CORBA_Any_var type
-// ----------------------------------------------------------------------
-
-ACE_INLINE 
-CORBA_Any_var::CORBA_Any_var (void)
-  : ptr_ (0)
-{
-}
-
-ACE_INLINE 
-CORBA_Any_var::CORBA_Any_var (CORBA_Any *p)
-  : ptr_ (p)
-{
-}
-
-ACE_INLINE
-CORBA_Any_var::CORBA_Any_var (const CORBA_Any_var& r)
-  : ptr_ (new CORBA::Any (*r.ptr_))
-{
-}
-
-ACE_INLINE 
-CORBA_Any_var::~CORBA_Any_var (void)
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE
-CORBA_Any_var::operator CORBA_Any *&()
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA_Any_var::operator const CORBA_Any *() const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::Any *
-CORBA_Any_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE const CORBA_Any &
-CORBA_Any_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE CORBA_Any &
-CORBA_Any_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE CORBA_Any *&
-CORBA_Any_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_Any *
-CORBA_Any_var::_retn (void)
-{
-  CORBA_Any *temp = this->ptr_;
-  this->ptr_ = 0;
-  return temp;
-}
-
-// ----------------------------------------------------------------------
-// CORBA_Any_out type
-// ----------------------------------------------------------------------
-
-ACE_INLINE
-CORBA_Any_out::CORBA_Any_out (CORBA_Any *&s)
-  : ptr_ (s)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA_Any_out::CORBA_Any_out (CORBA_Any_var &s)
-  : ptr_ (s.out ()) 
-{
-}
-
-ACE_INLINE
-CORBA_Any_out::CORBA_Any_out (CORBA_Any_out &s)
-  : ptr_ (s.ptr_)
-{
-}
-
-ACE_INLINE CORBA_Any_out &
-CORBA_Any_out::operator= (CORBA_Any_out &s)
-{
-  this->ptr_ = s.ptr_;
-  return *this;
-}
-
-ACE_INLINE CORBA_Any_out &
-CORBA_Any_out::operator= (CORBA_Any *s)
-{
-  this->ptr_ = s;
-  return *this;
-}
-
-ACE_INLINE CORBA_Any_out &
-CORBA_Any_out::operator= (const CORBA_Any *s)
-{
-  this->ptr_ = new CORBA::Any (*s);
-  return *this;
-}
-
-ACE_INLINE
-CORBA_Any_out::operator CORBA_Any *&()
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_Any *&
-CORBA_Any_out::ptr (void)
-{
-  return this->ptr_;
-}
-
diff --git a/TAO/tao/arg_shifter.cpp b/TAO/tao/arg_shifter.cpp
deleted file mode 100644
index 0b9d1f8170d..00000000000
--- a/TAO/tao/arg_shifter.cpp
+++ /dev/null
@@ -1,117 +0,0 @@
-// $Id$
-
-#include "arg_shifter.h"
-
-Arg_Shifter::Arg_Shifter (int &argc, char **argv, char **temp)
-  : argc_ (argc),
-    total_size_ (argc),
-    temp_ (temp),
-    argv_ (argv),
-    current_index_ (0),
-    back_ (argc - 1),
-    front_ (0)
-{
-  // If not provided with one, allocate a temporary array.
-  if (this->temp_ == 0)
-    this->temp_ = new char *[this->total_size_];
-  
-  if (this->temp_ != 0)
-    {
-      // Fill the temporary array.
-      this->argc_ = 0;
-      for (int i = 0; i < this->total_size_; i++)
-	{
-	  this->temp_[i] = this->argv_[i];
-	  this->argv_[i] = 0;
-	}
-    }
-  else
-    {
-      // Allocation failed, prohibit iteration.
-      this->current_index_ = this->argc_;
-      this->front_ = this->argc_;
-    }
-}
-
-Arg_Shifter::~Arg_Shifter (void)
-{
-  // Delete the temporary vector.
-  delete [] temp_;
-}
-
-char * 
-Arg_Shifter::get_current (void) const
-{
-  char *return_value = 0;
-  
-  if (this->is_anything_left ())
-    return_value =  this->temp_[current_index_];
-
-  return return_value;
-}
-
-int
-Arg_Shifter::consume_arg (int number)
-{
-  int return_value = 0;
-
-  // Stick knowns at the end of the vector (consumed).
-  if (this->is_anything_left() >= number)
-    {
-      for (int i = 0, j = this->back_ - (number - 1);
-	   i < number;
-	   i++, j++, this->current_index_++)
-	this->argv_[j] = this->temp_[this->current_index_];
-      
-      this->back_ -= number;
-      return_value = 1;
-    }
-
-  return return_value;
-}
-
-int
-Arg_Shifter::ignore_arg (int number)
-{
-  int return_value = 0;
-
-  // Keep unknowns at the head of the vector.
-  if (this->is_anything_left () >= number)
-    {
-      for (int i = 0;
-	   i < number;
-	   i++, this->current_index_++, this->front_++)
-	this->argv_[this->front_] = this->temp_[this->current_index_];
-
-      return_value = 1;
-      this->argc_ += number;
-    }
-
-  return return_value;
-}
-
-int
-Arg_Shifter::is_anything_left (void) const
-{
-  return this->total_size_ - this->current_index_;
-}
-
-int
-Arg_Shifter::is_option_next (void) const
-{
-  return this->is_anything_left () &&
-    this->temp_[this->current_index_][0] == '-';
-}
-
-int
-Arg_Shifter::is_parameter_next (void) const
-{
-  return this->is_anything_left () &&
-    this->temp_[this->current_index_][0] != '-';
-}
-
-int
-Arg_Shifter::num_ignored_args (void) const
-{
-  return this->front_;
-}
diff --git a/TAO/tao/arg_shifter.h b/TAO/tao/arg_shifter.h
deleted file mode 100644
index 4b1017828fa..00000000000
--- a/TAO/tao/arg_shifter.h
+++ /dev/null
@@ -1,99 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-
-// ========================================================================
-//
-// = LIBRARY 
-//     TAO 
-//  
-// = FILENAME 
-//     arg_shifter
-// 
-// = AUTHOR 
-//     Seth Widoff 
-// 
-// = VERSION 
-//     $Id$
-// ========================================================================
-
-#if !defined (TAO_ARG_SHIFTER_H)
-#define TAO_ARG_SHIFTER_H
-
-class Arg_Shifter
-  // = TITLE
-  //    Happy ADT to shift known args to the back of the argv vector,
-  //    so deeper levels of argument parsing can locate the yet
-  //    unprocessed arguments at the beginning of the vector.
-  //
-  // = DESCRIPTION
-  //    The Arg_Shifter copies the pointers of the argv vector into a
-  //    temporary array. As the Arg_Shifter iterates over the temp, is
-  //    places known arguments in the rear of the argv and unknown
-  //    ones in the beginning. So, after having visited all the
-  //    arguments in the temp vector, Arg_Shifter has placed all the
-  //    unknown arguments in their original order at the front of
-  //    argv.
-{
-public:
-
-  Arg_Shifter (int &argc, char **argv, char **temp = 0);
-  // Sumbit to the Arg_Shifter the vector over which to iterate, also
-  // providing the temporary array if the client doesn't want the
-  // arg_shifter to dynamically allocate its own. If internal dynamic
-  // allocation fails, the Arg_Shifter will set all the indices to the
-  // end of the vector, forbidding iteration. Following iteration over
-  // argv, the argc value will contain the number of unconsumed
-  // arguments.
-  
-  ~Arg_Shifter (void);
-  
-  char* get_current (void) const;
-  // Get the current head of the vector.
-
-  int consume_arg (int number = 1);
-  // Consume <number> argument(s) by sticking them/it on the end of
-  // the vector.
-
-  int ignore_arg (int number = 1);
-  // Place <number> arguments in the same relative order ahead of the
-  // known arguemnts in the vector.
-
-  int is_anything_left (void) const;
-  // Returns the number of args left to see in the vector.
-
-  int is_option_next (void) const;
-  // Returns 1 if there's a next item in the vector and it begins with
-  // '-'.
-  
-  int is_parameter_next (void) const;
-  // Returns 1 if there's a next item in the vector and it doesn't
-  // begin with '-'.
-  
-  int num_ignored_args (void) const;
-  // Returns the number of irrelevant args seen.
-  
-private:
-  int &argc_;
-  // The size of the argument vector.
-
-  int total_size_;
-  // The size of argv_.
-  
-  char **temp_;
-  // The temporary array over which we traverse.
-  
-  char **argv_;
-  // The array in which the arguments are reordered.
-
-  int current_index_;
-  // The element in <temp_> we're currently examining.
-
-  int back_;
-  // The index of <argv_> in which we'll stick the next unknown
-  // argument.
-  
-  int front_;
-  // The index of <argv_> in which we'll stick the next known
-  // argument. 
-};
-
-#endif /* TAO_ARG_SHIFTER_H */
diff --git a/TAO/tao/client_factory.cpp b/TAO/tao/client_factory.cpp
deleted file mode 100644
index a15184198a4..00000000000
--- a/TAO/tao/client_factory.cpp
+++ /dev/null
@@ -1,25 +0,0 @@
-// ============================================================================
-//
-// = LIBRARY
-//     TAO
-// 
-// = FILENAME
-//     client_factory.cpp
-//
-// = AUTHOR
-//     Chris Cleeland
-//
-// = VERSION
-//     $Id$
-// ============================================================================
-
-#include "tao/corba.h"
-
-TAO_Client_Strategy_Factory::TAO_Client_Strategy_Factory (void)
-{
-}
-
-TAO_Client_Strategy_Factory::~TAO_Client_Strategy_Factory (void)
-{
-}
-
diff --git a/TAO/tao/client_factory.h b/TAO/tao/client_factory.h
deleted file mode 100644
index 6f5c683ab47..00000000000
--- a/TAO/tao/client_factory.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-
-// ============================================================================
-//
-// = LIBRARY
-//     TAO
-// 
-// = FILENAME
-//     client_factory.h
-//
-// = AUTHOR
-//     Chris Cleeland
-//
-// = VERSION
-//     $Id$
-// ============================================================================
-
-#if !defined (TAO_CLIENT_FACTORY_H)
-#  define TAO_CLIENT_FACTORY_H
-
-class TAO_Client_Strategy_Factory : public ACE_Service_Object
-  // = TITLE
-  //    Abstract factory used by the client to manufacture various
-  //    strategies used on the client-side.
-{
-public:
-  // = Intialization and termination methods.
-  TAO_Client_Strategy_Factory (void);
-  // Constructor.
-  
-  virtual ~TAO_Client_Strategy_Factory (void);
-  // Destructor
-
-#if 0
-  // @@ Please remove me if possible.
-  virtual TAO_CONNECTOR *connector (void);
-  // Return a pointer to a connector using appropriate strategies.
-#endif /* 0 */
-};
-
-#endif /* TAO_CLIENT_FACTORY_H */
diff --git a/TAO/tao/client_factory.i b/TAO/tao/client_factory.i
deleted file mode 100644
index 3ea29ff2ca3..00000000000
--- a/TAO/tao/client_factory.i
+++ /dev/null
@@ -1,8 +0,0 @@
-#if 0
-ACE_INLINE TAO_CONNECTOR *
-TAO_Client_Strategy_Factory::connector (void)
-{
-  return 0;
-}
-#endif /* 0 */
-
diff --git a/TAO/tao/compat/initguid.h b/TAO/tao/compat/initguid.h
deleted file mode 100644
index b9315574ca7..00000000000
--- a/TAO/tao/compat/initguid.h
+++ /dev/null
@@ -1,15 +0,0 @@
-/* This may look like C, but it's really -*- C++ -*- */
-#ifndef TAO_COMPAT_INITGUID_H
-#  define TAO_COMPAT_INITGUID_H
-
-/* Insure proper inclusion order */
-#ifndef DEFINE_GUID
-#error initguid: must include objbase.h first.
-#endif
-
-/* assert DEFINE_GUID is defined */
-#undef	DEFINE_GUID
-
-#define DEFINE_GUID(name,b,c,d,e,f,g,h,i,j,k,l) EXTERN_C const IID name = { 0 }
-
-#endif /* TAO_COMPAT_INITGUID_H */
diff --git a/TAO/tao/compat/objbase.h b/TAO/tao/compat/objbase.h
deleted file mode 100644
index 1307b5aec24..00000000000
--- a/TAO/tao/compat/objbase.h
+++ /dev/null
@@ -1,175 +0,0 @@
-/* This may look like C, but it's really -*- C++ -*- */
-// @(#)objbase.h        1.4 95/09/25
-// Copyright 1995 by Sun Microsystems, Inc.
-//
-// COM          Basic Component Object Model definitions
-//
-// This has "enough COM" to compile (on UNIX) a recent version of the
-// IIOP engine code, which more or less uses COM as a source standard.
-//
-// (It's unknown whether the C++ compilers on UNIX put vtables as the first
-// member or not; that matters to folk writing "objects in C", relying on the
-// COM ABI.  In any case, the API to a pure C++ programmer is the same.)
-//
-// Note that Microsoft changed the header file structure so that some
-// development environments now prefer "objbase.h" not "compobj.h".
-//
-
-#ifndef _compobj_h
-#define _compobj_h
-
-#  if !defined(ACE_OS_H)
-#    error You did not include "ace/OS.h" before objbase.h.  This will break on WIN32 platforms.
-#  endif
-
-//
-// Random data types that come from Microsoft's APIs.
-//
-typedef u_long ULONG;
-typedef u_long HRESULT;
-
-//
-// Details of the procedure calling convention matter.
-//
-#define __stdcall               // MS-Windows non-varargs call convention
-
-#if defined(__cplusplus)
-#  define EXTERN_C extern "C"
-#else
-#  define EXTERN_C extern
-#endif
-
-//
-// IDs come built from UUIDs
-//      IID -- interface ID
-//      CLSID -- implementation ID
-//
-typedef char IID [16];          // XXX actually a struct
-typedef const IID &REFIID;
-#if !defined(INITGUID)
-#  define DEFINE_GUID(name,b,c,d,e,f,g,h,i,j,k,l) extern "C" const IID name
-#else
-#  define DEFINE_GUID(name,b,c,d,e,f,g,h,i,j,k,l) extern "C" const IID name = { 0 }
-#endif
-
-
-//
-// All objects in the "Component Object Model" (COM) inherit from
-// this pure virtual base class.
-//
-DEFINE_GUID (IID_IUnknown, b,c,d,e,f,g,h,i,j,k,l);
-
-class IUnknown 
-{
-public:
-  virtual HRESULT __stdcall QueryInterface (REFIID riid,
-                                            void **ppv) = 0;
-  virtual ULONG __stdcall AddRef (void) = 0;
-  virtual ULONG __stdcall Release (void) = 0;
-};
-
-// XXX haven't looked closely at COM's fault reporting yet ...
-
-typedef u_long SCODE;
-
-inline HRESULT ResultFromScode(SCODE scode) { return scode; }
-
-#define NOERROR         ((SCODE) 0)
-#define E_NOINTERFACE   ((SCODE) 17)
-
-
-// VARIANT is OLE's extremely limited version of "Any".  There are
-// numerous definitions of this type in different MS environments;
-// this one's the Win32 version.  We need it here because part of the
-// CORBA-COM mapping is conversions between Any and VARIANT.
-//
-// XXX not all of these types are worth trying to support portably,
-// and even those that are worth supporting portably aren't fully
-// supported at this writing.
-
-typedef u_short         VARTYPE;
-enum VARENUM 
-{                  // only types suitable for VARIANTs
-  VT_EMPTY    = 0,            // nothing
-  VT_NULL     = 1,            // SQL style ull (XXX)
-  VT_I2       = 2,            // signed 2 byte integer
-  VT_I4       = 3,            // signed 4 byte integer
-  VT_R4       = 4,            // IEEE "single" floating point
-  VT_R8       = 5,            // IEEE "double" floating point
-  VT_CY       = 6,            // currency
-  VT_DATE     = 7,            // date
-  VT_BSTR     = 8,            // counted string
-  VT_DISPATCH = 9,            // IDispatch COM object
-  VT_ERROR    = 10,           // SCODE
-  VT_BOOL     = 11,           // true=1, false=0
-  VT_VARIANT  = 12,           // variant pointer
-  VT_UNKNOWN  = 13,           // IUnknown COM object
-  VT_UI1      = 17,           // octet
-  VT_ARRAY    = 0x2000,       // SAFEARRAY * of more primitive type
-  VT_BYREF    = 0x4000        // pointer to more primitive type
-};
-
-struct CY 
-  // = TITLE
-  //   Currency is an eight byte fixed point number (could be "long long").  
-{
-#if defined (WORDS_BIGENDIAN)
-    long Hi;
-    u_long Lo;
-#else
-    u_long Lo;
-    long Hi;
-#endif /* WORDS_BIGENDIAN */
-};
-
-// DATE format is days since 30-Dec-1889 ... days in the "whole"
-// part, time in the fractional part (part of a day).
-
-typedef double DATE;
-
-struct VARIANT 
-{
-  VARTYPE               vt;             // type ID
-  u_short       wReserved1, wReserved2, wReserved3;
-  union 
-  {
-    //
-    // By-Value fields
-    //
-    long                lVal;                   // VT_I4
-    u_char      bVal;                   // VT_UI1
-    short               iVal;                   // VT_I2
-    float               fltVal;                 // VT_R4
-    double              dblVal;                 // VT_R8
-    // VARIANT_BOOL     bool;                   // VT_BOOL
-    SCODE               scode;                  // VT_ERROR
-    CY          cyVal;                  // VT_CY
-    DATE                date;                   // VT_DATE
-    // BSTR             bstrVal;                // VT_BSTR
-    IUnknown    *punkVal;               // VT_UNKNOWN
-    // IDispatch        *pdispVal;              // VT_DISPATCH
-    // SAFEARRAY        *parray;                // VT_ARRAY
-
-    //
-    // By-Reference fields (for VARIANTARG)
-    //
-    u_char      *pbVal;                 // VT_BYREF|VT_UI1
-    short               *piVal;                 // VT_BYREF|VT_I2
-    long                *plVal;                 // VT_BYREF|VT_I4
-    float               *pfltVal;               // VT_BYREF|VT_R4
-    double              *pdblVal;               // VT_BYREF|VT_R8
-    // VARIANT_BOOL     *pbool;                 // VT_BYREF|VT_BOOL
-    SCODE               *pscode;                // VT_BYREF|VT_ERROR
-    CY          *pcyVal;                // VT_BYREF|VT_CY
-    DATE                *pdate;                 // VT_BYREF|VT_DATE
-    // BSTR             *pbstrVal;              // VT_BYREF|VT_BSTR
-    IUnknown    **ppunkVal;             // VT_BYREF|VT_UNKNOWN
-    // IDispatch        **ppdisVal;             // VT_BYREF|VT_DISPATCH
-    // SAFEARRAY        *pparray;               // VT_BYREF|VT_ARRAY
-
-    VARIANT             *pvarVal;               // VT_BYREF|VT_VARIANT
-    void                *byref;                 // generic VT_BYREF
-  };
-};
-
-#endif  // _compobj_h
diff --git a/TAO/tao/connect.h b/TAO/tao/connect.h
deleted file mode 100644
index 510b27c591a..00000000000
--- a/TAO/tao/connect.h
+++ /dev/null
@@ -1,102 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-
-#if !defined (TAO_CONNECT_H)
-#  define TAO_CONNECT_H
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO
-// 
-// = FILENAME
-//    connect.h
-//
-// = AUTHOR
-//     Chris Cleeland
-// 
-// ============================================================================
-
-#  include "ace/Reactor.h"
-#  include "ace/Acceptor.h"
-#  include "ace/SOCK_Acceptor.h"
-#  include "ace/Synch.h"
-#  include "ace/Svc_Handler.h"
-
-// Forward Decls
-class TAO_OA_Parameters;
-
-typedef ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> 
-        TAO_SVC_HANDLER;
-
-class TAO_Client_Connection_Handler : public TAO_SVC_HANDLER
-  // = TITLE
-  //      <Svc_Handler> used on the client side and returned by the
-  //      <TAO_CONNECTOR>.  
-  // @@ (CJC) Should this be in here or in the default_client.*?
-{
-public:
-  // = Intialization method.
-  TAO_Client_Connection_Handler (ACE_Thread_Manager * = 0);
-  // Do-nothing constructor.
-
-  // = <Connector> hook.
-  virtual int open (void *);
-  // Initialization hook.
-};
-
-class TAO_Server_Connection_Handler : public TAO_SVC_HANDLER
-  // = TITLE
-  //   Handles requests on a single connection in a server.
-{
-public:
-  TAO_Server_Connection_Handler (ACE_Thread_Manager *t = ACE_Thread_Manager::instance ());
-  // Constructor.
-  
-  virtual int open (void *);
-  // Called by the framework when the handler is completely set up.
-  // Argument is unused.
-  
-  virtual int svc (void);
-  // Only used when the handler is turned into an active object by
-  // calling <activate>.  This serves as the event loop in such cases.
-
-  TAO_OA_Parameters *params (void);
-  void params (TAO_OA_Parameters *p);
-
-  // = Template Methods Called by <handle_input>
-
-  virtual int recv_request (CDR &msg, CORBA::Environment &env);
-  // Extract a message from the stream associated with <peer()> and
-  // place it into <msg>.  Return 0 if success, -1 with <errno> and
-  // <env> set if problems.
-
-  virtual int handle_message (CDR &msg, int &response_required,
-                              CDR &response, CORBA::Environment &env);
-  // Handle processing of the request residing in <msg>, setting
-  // <response_required> to zero if the request is for a oneway or
-  // non-zero if for a two-way and <response> to any necessary
-  // response (including errors).  In case of errors, -1 is returned
-  // and additional information carried in <env>.
-
-  virtual void send_response (CDR &response);
-  // @@ (CJC) Please document me...
-
-protected:
-  // @@ (CJC) Please document all these methods and fields.
-  virtual int handle_input (ACE_HANDLE = ACE_INVALID_HANDLE);
-  virtual int handle_close (ACE_HANDLE, ACE_Reactor_Mask);
-
-  TAO_OA_Parameters *params_;
-};
-
-typedef ACE_Strategy_Acceptor<TAO_Server_Connection_Handler, ACE_SOCK_ACCEPTOR> 
-	TAO_ACCEPTOR;
-
-// Declare that the following method should be specialized.
-
-#if defined (ACE_WIN32)
-extern template size_t
-ACE_Hash_Addr<ACE_INET_Addr>::hash_i (const ACE_INET_Addr &addr) const;
-#endif /* ACE_WIN32 */
-
-#endif /* TAO_CONNECT_H */
diff --git a/TAO/tao/connect.i b/TAO/tao/connect.i
deleted file mode 100644
index 9c85c376b4f..00000000000
--- a/TAO/tao/connect.i
+++ /dev/null
@@ -1,12 +0,0 @@
-ACE_INLINE TAO_OA_Parameters *
-TAO_Server_Connection_Handler::params (void)
-{
-  return this->params_;
-}
-
-ACE_INLINE void
-TAO_Server_Connection_Handler::params (TAO_OA_Parameters *p)
-{
-  this->params_ = p;
-}
-
diff --git a/TAO/tao/corba.h b/TAO/tao/corba.h
deleted file mode 100644
index 15bac5be041..00000000000
--- a/TAO/tao/corba.h
+++ /dev/null
@@ -1,278 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-//
-// ============================================================================
-//
-// = LIBRARY
-//    TAO
-//
-// = FILENAME
-//    corba.h
-//
-// = DESCRIPTION
-//     MASTER HEADER file for C/C++ Win32 interface to a CORBA 2.0 ORB.
-//     Include only this file, to see all ORB interfaces declared.
-//
-//     This interface uses COM as the basis for its binary standard,
-//     and follows the OMG C++ mapping for compilers which don't
-//     support C++ exceptions (COM doesn't use them) or namespaces.
-//     Objects which are implemented using this source base support
-//     OLE Automation.
-//
-//     XXX Note re status of this as reference, cosubmitted with RFP?
-//
-// = AUTHOR
-//     Copyright 1994-1995 by Sun Microsystems Inc.
-//
-// ============================================================================
-
-#if !defined(TAO_CORBA_H)
-#define TAO_CORBA_H
-
-// ACE specific includes
-#include "ace/OS.h"
-#include "ace/Get_Opt.h"
-#include "ace/Log_Msg.h"
-#include "ace/SOCK_Stream.h"
-#include "ace/Synch_T.h"
-#include "ace/ACE.h"
-#include "ace/Synch.h"
-#include "ace/Hash_Map_Manager.h"
-#include "ace/SString.h"
-#include "ace/INET_Addr.h"
-#include "ace/SOCK_Acceptor.h"
-#include "ace/SOCK_Connector.h"
-#include "ace/Strategies.h"
-#include "ace/Connector.h"
-#include "ace/Singleton.h"
-#include "ace/Reactor.h"
-#include "ace/Acceptor.h"
-#include "ace/SOCK_Acceptor.h"
-#include "ace/Synch.h"
-#include "ace/Svc_Handler.h"
-
-#if !defined (TAO_HAS_DLL)
-// Default is to build TAO DLL library on NT.
-#  define TAO_HAS_DLL 1
-#endif /* TAO_HAS_DLL */
-
-// Here are definition for TAO library.
-#if defined (TAO_HAS_DLL) && (TAO_HAS_DLL == 1)
-#  if defined (TAO_BUILD_DLL)
-#    define TAO_Export ACE_Proper_Export_Flag
-#    define TAO_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define TAO_SINGLETON_INSTANTIATION(T) ACE_PROPER_SINGLETON_INSTANTIATION (T)
-#  else
-#    define TAO_Export ACE_Proper_Import_Flag
-#    define TAO_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define TAO_SINGLETON_INSTANTIATION(T)
-#  endif /* TAO_BUILD_DLL */
-#else /* TAO_HAS_DLL */
-#  define TAO_Export
-#  define TAO_SINGLETON_DECLARATION(T)
-#  define TAO_SINGLETON_INSTANTIATION(T)
-#endif /* TAO_HAS_DLL */
-
-// COM stuff
-#include <objbase.h>
-#include <initguid.h>
-
-// ORB configuration
-#include "tao/orbconf.h"
-
-#include "tao/orb.h"
-
-// Alignment macros
-#include "tao/align.h"
-
-// Defines CORBA namespace
-#include "tao/corbacom.h"
-
-// individual CORBA classes
-#include "tao/sequence.h"
-#include "tao/varout.h"
-#include "tao/any.h"
-#include "tao/poa.h"
-
-#include "tao/params.h"
-#include "tao/client_factory.h"
-#include "tao/client_factory.h"
-#include "tao/server_factory.h"
-#include "tao/default_client.h"
-#include "tao/default_server.h"
-
-#include "tao/except.h"
-#include "tao/orbobj.h"
-#include "tao/nvlist.h"
-#include "tao/object.h"
-#include "tao/orbobj.h"
-#include "tao/principa.h"
-#include "tao/request.h"
-#include "tao/svrrqst.h"
-#include "tao/typecode.h"
-
-// Marshaling
-#include "tao/marshal.h"
-#include "tao/cdr.h"
-#include "tao/stub.h"
-
-// TAO specific includes
-#include "tao/connect.h"
-#include "tao/orb_core.h"
-#include "tao/objtable.h"
-#include "tao/optable.h"
-#include "tao/debug.h"
-#include "tao/managed_types.h"
-
-// GIOP - IIOP related includes
-#include "tao/iiopobj.h"
-#include "tao/iioporb.h"
-#include "tao/giop.h"
-
-//#include "tao/xdr.h"
-
-// The following *.i files are always included here
-#  if !defined(__ACE_INLINE__)
-#    undef ACE_INLINE
-#    define ACE_INLINE inline
-#    define do_undef_on_ACE_INLINE
-#  endif
-
-#include "tao/orb_core.i"
-#include "tao/corbacom.i"
-#include "tao/sequence.i"
-#include "tao/typecode.i"
-#include "tao/any.i"
-#include "tao/stub.i"
-#include "tao/object.i"
-#include "tao/orbobj.i"
-#include "tao/marshal.i"
-#include "tao/cdr.i"
-#include "tao/poa.i"
-#include "tao/giop.i"
-#include "tao/iioporb.i"
-#include "tao/iiopobj.i"
-#include "tao/managed_types.i"
-
-#  if defined (do_undef_on_ACE_INLINE)
-#    undef do_undef_on_ACE_INLINE
-#    undef ACE_INLINE
-#    define ACE_INLINE
-#  endif /* do_undef_on_ACE_INLINE */
-
-// the following *.i files are conditionally included here
-#if defined (__ACE_INLINE__)
-#include "tao/params.i"
-#include "tao/server_factory.i"
-#include "tao/default_client.i"
-#include "tao/default_server.i"
-#include "tao/connect.i"
-#endif /* __ACE_INLINE__ */
-
-#if defined (__ACE_INLINE__)
-#endif /* __ACE_INLINE__ */
-
-#include "tao/singletons.h"
-
-#if !defined (ACE_NESTED_CLASS)
-#if defined (ACE_WIN32)
-#define ACE_NESTED_CLASS(SCOPE,CLASS) CLASS
-#else /* !ACE_WIN32 */
-#define ACE_NESTED_CLASS(SCOPE,CLASS) SCOPE::CLASS
-#endif /* ACE_WIN32 */
-#endif /* ACE_NESTED_CLASS */
-
-//
-// These macros can be used to write "portable" code between platforms
-// supporting CORBA exceptions natively (using the C++ exceptions) or
-// through the Enviroment parameter.
-// Their use requires some discipline, but they certainly help...
-//
-// TODO: Currently the IDL compiler does not support C++ exceptions, so we
-// cannot use them even if the platform has them.
-//
-#if defined (ACE_HAS_EXCEPTIONS) && defined (TAO_IDL_COMPILER_HAS_EXCEPTIONS)
-
-#define ACE_TRY_ENV __env
-// The first "do" scope is for the env.
-// The second "do" scope is for the ACE_CHECK_ENV continues.
-#define ACE_TRY \
-try { CORBA::Environment ACE_TRY_ENV;
-#define ACE_CATCH(TYPE,VAR) \
-} catch (TYPE VAR) {
-#define ACE_CATCHANY \
-} catch (...) {
-#define ACE_ENDTRY }
-
-// No need to do checking, exception handling does it for us.
-#define ACE_CHECK_ENV
-#define ACE_CHECK_ENV_RETURN(X, Y)
-
-#define ACE_THROW(EXCEPTION) throw EXCEPTION;
-#define ACE_THROW_RETURN(EXCEPTION, RETURN) throw EXCEPTION
-#define ACE_RETHROW throw;
-
-#define ACE_THROW_SPEC(X) throw X
-
-#else /* ACE_HAS_EXCEPTIONS && TAO_IDL_COMPILES_HAS_EXCEPTIONS */
-
-#define ACE_TRY_ENV __env
-// The first "do" scope is for the env.
-// The second "do" scope is for the ACE_CHECK_ENV continues.
-
-#define ACE_TRY \
-do { CORBA::Environment ACE_TRY_ENV; \
-int ACE_TRY_FLAG = 1; \
-ACE_TRY_LABEL: \
-if (ACE_TRY_FLAG) \
-do {
-
-// Each CATCH statement ends the previous scope and starts a new one.
-// Since all CATCH statements can end the ACE_TRY macro, they must all
-// start a new scope for the next potential ACE_CATCH.  The ACE_ENDTRY
-// will finish them all.  Cool, eh?
-#define ACE_CATCH(TYPE,VAR) \
-} while (0); \
-do { \
-if (ACE_TRY_ENV.exception () != 0)
-
-
-#define ACE_CATCHANY \
-} while (0); \
-do { \
-if (ACE_TRY_ENV.exception () != 0)
-
-// The first "while" closes the local scope.  The second "while"
-// closes the ACE_TRY_ENV scope.
-#define ACE_ENDTRY } while (0); } while (0)
-
-// If continue is called, control will skip to the next ACE_CATCHANY
-// statement.
-#define ACE_CHECK_ENV \
-{\
-if (ACE_TRY_ENV.exception () != 0) \
-  { \
-    ACE_TRY_FLAG = 0; \
-    goto ACE_TRY_LABEL; \
-  } \
-}
-
-#define ACE_CHECK_ENV_RETURN(X, Y) \
-if ( X . exception () != 0) return Y
-
-#define ACE_THROW(EXCEPTION) \
-do {\
- _env.exception (new EXCEPTION); \
- return; } while (0)
-
-#define ACE_THROW_RETURN(EXCEPTION, RETURN) \
-do {\
- _env.exception (new EXCEPTION); \
- return RETURN; } while (0)
-
-#define ACE_RETHROW _env.exception (ACE_TRY_ENV.exception ())
-
-#define ACE_THROW_SPEC(X)
-
-#endif /* ACE_HAS_EXCEPTIONS */
-
-#endif /* TAO_CORBA_H */
diff --git a/TAO/tao/corbacom.cpp b/TAO/tao/corbacom.cpp
deleted file mode 100644
index 84592e7cb07..00000000000
--- a/TAO/tao/corbacom.cpp
+++ /dev/null
@@ -1,80 +0,0 @@
-// @(#)corbacom.cpp	1.1 95/08/31
-// Copyright 1994-1995 by Sun Microsystems Inc.
-// All Rights Reserved
-//
-// ORB:		support for primitive data types
-
-#include "tao/corba.h"
-
-// String utility support; this can need to be integrated with the
-// ORB's own memory allocation subsystem.
-
-CORBA::String
-CORBA::string_copy (const CORBA::Char *str)
-{
-  if (!str)
-    return 0;
-
-  CORBA::String	retval = CORBA::string_alloc (ACE_OS::strlen (str));
-  // clear the contents of the allocated string
-  ACE_OS::memset(retval, '\0', ACE_OS::strlen (str));
-
-  return ACE_OS::strcpy (retval, str);
-}
-
-CORBA::String_var &
-CORBA::String_var::operator= (char *p)
-{
-  if (this->ptr_ != p)
-    {
-      if (this->ptr_ != 0)
-	CORBA::string_free (this->ptr_);
-      this->ptr_ = p;
-    }
-  return *this;
-}
-
-CORBA::String_var &
-CORBA::String_var::operator= (const char *p)
-{
-  if (this->ptr_ != 0)
-    CORBA::string_free (this->ptr_);
-
-  this->ptr_ = CORBA::string_dup (p);
-  return *this;
-}
-
-CORBA::String_var &
-CORBA::String_var::operator= (const CORBA::String_var& r)
-{
-  if (this->ptr_ != 0)
-    CORBA::string_free (this->ptr_);
-  this->ptr_ = CORBA::string_dup (r.ptr_);
-  return *this;
-}
-
-// Wide Character string utility support; this can need to be
-// integrated with the ORB's own memory allocation subsystem.
-
-CORBA::WString
-CORBA::wstring_alloc (CORBA::ULong len)
-{
-  return new CORBA::WChar [(size_t) (len + 1)];
-}
-
-CORBA::WString
-CORBA::wstring_copy (const CORBA::WChar *const str)
-{
-  if (*str)
-    return 0;
-
-  CORBA::WString retval = CORBA::wstring_alloc (ACE_OS::strlen (str));
-  return ACE_OS::strcpy (retval, str);
-}
-
-void
-CORBA::wstring_free (CORBA::WChar *const str)
-{
-  delete str;
-}
-
diff --git a/TAO/tao/corbacom.h b/TAO/tao/corbacom.h
deleted file mode 100644
index b6bcbc522c6..00000000000
--- a/TAO/tao/corbacom.h
+++ /dev/null
@@ -1,692 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO
-// 
-// = FILENAME
-//    corbacom.h
-//
-// = DESCRIPTION
-//    CORBA C/C++/COM mapping for Win32
-//
-// = AUTHOR
-//     Copyright 1994-1995 by Sun Microsystems Inc. and Andy Gokhale
-//     <gokhale@cs.wustl.edu>. 
-// 
-// ============================================================================
-
-#if !defined (TAO_CORBACOM_H)
-#define TAO_CORBACOM_H
-
-// For some reason, PC compilers don't implement "natural" alignment,
-// but only use fixed alignment policies.  The following #pragmas
-// configure fixed one-byte alignment policy, since some fixed policy
-// needs to apply throughout an ORB.
-
-#if	defined (_MSC_VER)
-#	pragma	pack (push, 1)		// VC++, stack 1-byte alignment policy
-
-#	ifdef	_DEBUG			// convert from VC++ convention ...
-#		define	DEBUG		// ... to normal convention
-#	endif
-
-#elif	defined (__BORLANDC__)
-#	pragma option -a		// BC++, use 1 byte alignment
-
-#endif
-
-#if !defined (TAO_CONST)
-//Something to document the fact that we want to put 'const' in front
-// of a type, but that it won't turn out the way we want, e.g., we
-// really want to express that a CORBA_String is const, but since CORBA_String
-// is a char*, the const modifies the pointer and not the pointed-to, and
-// some compilers (like SGI's EDG-derived thang) complain.
-#define TAO_CONST
-#endif /* TAO_CONST */
-
-// Forward declarations of some data types are needed.
-
-class CORBA_Any;
-class CORBA_Any_var;
-class CORBA_Any_out;
-//typedef class CORBA_Any *CORBA_Any_ptr;
-
-class CORBA_TypeCode;
-//typedef class CORBA_TypeCode *CORBA_TypeCode_ptr;
-
-class CORBA_POA;
-//typedef class CORBA_POA *CORBA_BOA_ptr;
-
-class CORBA_Exception;
-//typedef class CORBA_Exception *CORBA_Exception_ptr;
-
-class CORBA_Request;
-//typedef class CORBA_Request *CORBA_Request_ptr;
-
-class CORBA_NamedValue;
-//typedef class CORBA_NamedValue *CORBA_NamedValue_ptr;
-
-class CORBA_NVList;
-//typedef class CORBA_NVList *CORBA_NVList_ptr;
-
-class CORBA_ORB;
-//typedef class CORBA_ORB *CORBA_ORB_ptr;
-
-class CORBA_Object;
-//typedef class CORBA_Object *CORBA_Object_ptr;
-
-class CORBA_ServerRequest;
-//typedef class CORBA_ServerRequest *CORBA_ServerRequest_ptr;
-
-class CORBA_Environment;
-//typedef class CORBA_Environment *CORBA_Environment_ptr;
-
-class CORBA_Principal;
-//typedef class CORBA_Principal *CORBA_Principal_ptr;
-
-class CORBA_SystemException;
-class CORBA_UserException;
-
-// forward declarations of system exceptions
-#define TAO_SYSTEM_EXCEPTION(name) class CORBA_ ## name
-
-TAO_SYSTEM_EXCEPTION(UNKNOWN);
-TAO_SYSTEM_EXCEPTION(BAD_PARAM);
-TAO_SYSTEM_EXCEPTION(NO_MEMORY);
-TAO_SYSTEM_EXCEPTION(IMP_LIMIT);
-TAO_SYSTEM_EXCEPTION(COMM_FAILURE);
-TAO_SYSTEM_EXCEPTION(INV_OBJREF);
-TAO_SYSTEM_EXCEPTION(OBJECT_NOT_EXIST);
-TAO_SYSTEM_EXCEPTION(NO_PERMISSION);
-TAO_SYSTEM_EXCEPTION(INTERNAL);
-TAO_SYSTEM_EXCEPTION(MARSHAL);
-TAO_SYSTEM_EXCEPTION(INITIALIZE);
-TAO_SYSTEM_EXCEPTION(NO_IMPLEMENT);
-TAO_SYSTEM_EXCEPTION(BAD_TYPECODE);
-TAO_SYSTEM_EXCEPTION(BAD_OPERATION);
-TAO_SYSTEM_EXCEPTION(NO_RESOURCES);
-TAO_SYSTEM_EXCEPTION(NO_RESPONSE);
-TAO_SYSTEM_EXCEPTION(PERSIST_STORE);
-TAO_SYSTEM_EXCEPTION(BAD_INV_ORDER);
-TAO_SYSTEM_EXCEPTION(TRANSIENT);
-TAO_SYSTEM_EXCEPTION(FREE_MEM);
-TAO_SYSTEM_EXCEPTION(INV_IDENT);
-TAO_SYSTEM_EXCEPTION(INV_FLAG);
-TAO_SYSTEM_EXCEPTION(INTF_REPOS);
-TAO_SYSTEM_EXCEPTION(BAD_CONTEXT);
-TAO_SYSTEM_EXCEPTION(OBJ_ADAPTER);
-TAO_SYSTEM_EXCEPTION(DATA_CONVERSION);
-#undef TAO_SYSTEM_EXCEPTION
-
-typedef class CORBA_ImplementationDef *
-        CORBA_ImplementationDef_ptr;
-
-typedef class CORBA_InterfaceDef *
-        CORBA_InterfaceDef_ptr;
-
-// =Forward declarations
-struct TAO_Dispatch_Context;
-class TAO_Object_Table;
-class TAO_Operation_Table;
-class TAO_Client_Strategy_Factory;
-class TAO_Server_Strategy_Factory;
-class TAO_ORB_Parameters;
-struct CDR;
-
-// enum values defined in nvlist.h, bitwise ORed.
-typedef u_int CORBA_Flags; 
-
-template <class T>
-struct CORBA_SEQUENCE 
-  // = TITLE
-  //    Utility template class.
-  //
-  // = DESCRIPTION
-{
-#if SIZEOF_LONG == 4
-  u_long maximum;
-  u_long length;
-#else
-  // = Just assume "int" is four bytes long ...
-  u_int maximum;
-  u_int length;
-#endif /* SIZEOF_LONG */
-  T *buffer;
-
-  CORBA_SEQUENCE (void)
-    : maximum (0), length (0), buffer (0) { }
-
-  // XXX destructor should free buffer, elements!!
-  ~CORBA_SEQUENCE (void) { }
-};
-
-class TAO_Export CORBA 
-  // = TITLE
-  //    Provides the CORBA namespace. 
-  //
-  // = DESCRIPTION
-  //    This class allows the use of CORBA::Foo, as well as CORBA_Foo
-  //    for all standard types Foo.
-{
-public:
-#  if	SIZEOF_BOOL != 0
-  typedef bool			Boolean;
-#    define B_FALSE false
-#    define B_TRUE true
-  
-#  else	/* "bool" not builtin to this compiler */
-  typedef int			Boolean;
-  enum { B_FALSE = 0, B_TRUE = 1 };
-#  endif /* "bool" not builtin */
-
-  typedef Boolean &Boolean_out; // out type for boolean
-
-  typedef u_char Octet;
-  typedef Octet  &Octet_out;  // out type for octet
-
-  typedef short Short;
-  typedef Short &Short_out;   // out type for short
-
-  typedef u_short UShort;
-  typedef UShort &UShort_out; // out type for unsigned short
-
-  // CORBA "Long" (and its unsigned cousin) are 32 bits, just like on
-  // almost all C/C++ compilers.
-
-#  if	SIZEOF_LONG == 4
-  typedef long Long;
-  typedef u_long ULong;
-#  else
-  // just assume "int" is 4 bytes long ...
-  typedef int Long;
-  typedef u_int ULong;
-#  endif	/* SIZEOF_LONG != 4 */
-
-  // 94-9-32 Appendix A, also the OMG C++ mapping, stipulate that 64
-  // bit integers are "LongLong".
-  typedef Long &Long_out; // out type for long
-  typedef ULong &ULong_out; // out type for unsigned long
-
-  //
-  // NOTE:  those are IDL extensions, not yet standard.
-
-#  if	SIZEOF_LONG_LONG == 8
-  typedef long long LongLong;
-  typedef unsigned long long ULongLong;
-#  elif	SIZEOF_LONG == 8
-  typedef long LongLong;
-  typedef u_long ULongLong;
-#  elif	defined (_MSC_VER) && _MSC_VER >= 900
-  typedef __int64 LongLong;
-  typedef unsigned __int64 ULongLong;
-#  else
-
-  // If "long long" isn't native, programs can't use these data types
-  // in normal arithmetic expressions.  If any particular application
-  // can cope with the loss of range it can define conversion
-  // operators itself.
-
-#    define	NONNATIVE_LONGLONG
-#    if	defined (TAO_WORDS_BIGENDIAN)
-  struct LongLong { Long h, l; };
-  struct ULongLong { Long h, l; };
-#    else
-  struct LongLong { Long l, h; };
-  struct ULongLong { ULong l, h; };
-#    endif /* !TAO_WORDS_BIGENDIAN */
-#  endif /* no native 64 bit integer type */
-
-  typedef LongLong &LongLong_out;  // out type for long long
-  typedef ULongLong &ULongLong_out; // out type for unsigned long long
-
-  typedef float Float;
-  typedef Float &Float_out; // out type for float
-
-  typedef double Double;
-  typedef Double &Double_out; // out type for double
-
-  // 94-9-32 Appendix A defines a 128 bit floating point "long double"
-  // data type, with greatly extended precision and four more bits of
-  // exponent (compared to "double").
-  //
-  // NOTE:  that is an IDL extension, not yet standard.
-
-#  if	SIZEOF_LONG_DOUBLE == 16
-  typedef long double LongDouble;
-#  else
-#    define	NONNATIVE_LONGDOUBLE
-  struct LongDouble 
-  {
-    char ld[16];
-  };
-#  endif /* SIZEOF_LONG_DOUBLE != 16 */
-
-  typedef LongDouble &LongDouble_out; // out type for long doubles
-
-  typedef char Char;
-  typedef Char &Char_out; // out type for char
-
-  typedef CORBA_SEQUENCE<Octet> OctetSeq;
-
-  typedef Char *String;
-
-  static String string_alloc (ULong len);
-  static String string_copy (const Char *);
-  static String string_dup (const Char *);
-  static void string_free (Char *);
-
-  class TAO_Export String_var
-    // = TITLE
-    //   String var class. Provides automatic deallocation of storage
-    //   for the string once it goes out of scope.
-  {
-  public:
-    String_var (void);
-    // default constructor
-
-    String_var (char *p);
-    // constructor, owns p
-
-    String_var (const char *p);
-    // constructor. Makes a copy of p
-
-    String_var (const String_var &s);
-    // copy constructor
-
-    ~String_var (void);
-    // destructor
-
-    String_var &operator= (char *p);
-    // assignment operator
-
-    String_var &operator= (const char *p);
-    // assignment to a const char*. Makes a copy.
-
-    String_var &operator= (const String_var &s);
-    // assignment operator
-
-    operator char *();
-    // access and modify
-
-    operator const char *() const;
-    // only read privileges
-
-    char &operator[] (ULong index);
-    // allows access and modification using an index
-
-    char operator[] (ULong index) const;
-    // allows only accessing thru an index
-
-    // = in, out, out, and _retn operations.
-    // ORBOS/97-05-15, Appendix C.2
-
-    const char *in (void) const;
-    // for in parameter
-
-    char *&inout (void);
-    // for inout parameter
-
-    char *&out (void);
-    // for out parameter
-
-    char *_retn (void);
-    // for string of return type
-
-  private:
-    char *ptr_;
-    // instance.
-  };
-
-  // ORBOS/97-05-15, Appendix C.2 defines a String_out class
-
-  class String_out
-  {
-    //=TITLE
-    // String_out
-    // =DESCRIPTION
-    // To support the memory management for "out" parameter passing mode.
-    
-  public:
-    // =operations
-
-    String_out (char *&p);
-    // construction from a reference to a string
-
-    String_out (String_var &p);
-    // construction from a var
-
-    String_out (String_out &s);
-    // copy constructor
-
-    String_out &operator= (String_out &s);
-    // assignment from a string_out
-
-    String_out &operator= (char *p);
-    // assignment from a string
-
-    String_out &operator= (const char *p);
-    // assignment from a const string
-
-    operator char *&();
-    // cast
-
-    char *&ptr (void);
-    // return underlying instance
-   
-  private:
-    char *&ptr_;
-    // instance
-
-    // assignment from _var disallowed
-    void operator= (const String_var &);
-  };
-
-  // 94-9-32 Appendix A defines 16-bit UNICODE characters as
-  // "WChar", and null-terminated strings of them as "WString".
-  //
-  // NOTE:  those are IDL extensions, not yet standard.
-
-#if defined(VXWORKS) && defined(ghs)
-  typedef short WChar;
-#else
-  typedef wchar_t WChar;
-#endif
-  typedef WChar *WString;
-  
-  typedef WChar &WChar_out; // out type for WChar
-
-  static WString wstring_alloc (ULong len);
-  static WString wstring_copy (const WChar *const);
-  static void wstring_free (WChar *const);
-
-  // various CORBA defined classes 
-
-  typedef CORBA_Any         Any;
-  typedef CORBA_Any_var     Any_var;
-  typedef CORBA_Any_out     Any_out;
-  typedef Any               *Any_ptr;
-
-  typedef CORBA_POA POA;
-  typedef POA *POA_ptr;
-
-  typedef CORBA_Environment Environment;
-  typedef Environment *Environment_ptr;
-
-  typedef CORBA_Exception Exception;
-  typedef Exception *Exception_ptr;
-
-  typedef CORBA_NamedValue NamedValue;
-  typedef NamedValue *NamedValue_ptr;
-
-  typedef CORBA_NVList NVList;
-  typedef NVList *NVList_ptr;
-
-  typedef CORBA_Object Object;
-  typedef CORBA_Object *Object_ptr;
-
-  typedef CORBA_Principal Principal;
-  typedef CORBA_Principal *Principal_ptr;
-
-  typedef CORBA_ORB ORB;
-  typedef ORB *ORB_ptr;
-
-  typedef CORBA_Request Request;
-  typedef Request *Request_ptr;
-
-  typedef CORBA_ServerRequest ServerRequest;
-  typedef ServerRequest *ServerRequest_ptr;
-
-  typedef CORBA_SystemException
-  SystemException;
-
-  typedef CORBA_TypeCode TypeCode;
-  typedef TypeCode *TypeCode_ptr;
-
-  typedef CORBA_UserException  UserException;
-  
-  typedef CORBA_SEQUENCE <TypeCode_ptr> ExceptionList;
-  typedef ExceptionList *ExceptionList_ptr;
-
-  typedef CORBA_ImplementationDef *ImplementationDef_ptr;
-  
-  typedef class CORBA_InterfaceDef *InterfaceDef_ptr;
-
-  // enum values defined in nvlist.hh, bitwise ORed.
-  typedef u_int Flags; 
-  
-  // Completion Status for System exceptions
-  enum CompletionStatus 
-  {
-    COMPLETED_YES,     // successful or exceptional completion
-    COMPLETED_NO,      // didn't change any state; retry is OK
-    COMPLETED_MAYBE    // can't say what happened; retry unsafe
-  };
-  
-  // exception type
-  enum ExceptionType 
-  {
-    NO_EXCEPTION,
-    SYSTEM_EXCEPTION,
-    USER_EXCEPTION
-  };
-
-  // all the system exception classes
-#define TAO_SYSTEM_EXCEPTION(name) \
-  typedef CORBA_ ## name      name
-  TAO_SYSTEM_EXCEPTION(UNKNOWN);
-  TAO_SYSTEM_EXCEPTION(BAD_PARAM);
-  TAO_SYSTEM_EXCEPTION(NO_MEMORY);
-  TAO_SYSTEM_EXCEPTION(IMP_LIMIT);
-  TAO_SYSTEM_EXCEPTION(COMM_FAILURE);
-  TAO_SYSTEM_EXCEPTION(INV_OBJREF);
-  TAO_SYSTEM_EXCEPTION(OBJECT_NOT_EXIST);
-  TAO_SYSTEM_EXCEPTION(NO_PERMISSION);
-  TAO_SYSTEM_EXCEPTION(INTERNAL);
-  TAO_SYSTEM_EXCEPTION(MARSHAL);
-  TAO_SYSTEM_EXCEPTION(INITIALIZE);
-  TAO_SYSTEM_EXCEPTION(NO_IMPLEMENT);
-  TAO_SYSTEM_EXCEPTION(BAD_TYPECODE);
-  TAO_SYSTEM_EXCEPTION(BAD_OPERATION);
-  TAO_SYSTEM_EXCEPTION(NO_RESOURCES);
-  TAO_SYSTEM_EXCEPTION(NO_RESPONSE);
-  TAO_SYSTEM_EXCEPTION(PERSIST_STORE);
-  TAO_SYSTEM_EXCEPTION(BAD_INV_ORDER);
-  TAO_SYSTEM_EXCEPTION(TRANSIENT);
-  TAO_SYSTEM_EXCEPTION(FREE_MEM);
-  TAO_SYSTEM_EXCEPTION(INV_IDENT);
-  TAO_SYSTEM_EXCEPTION(INV_FLAG);
-  TAO_SYSTEM_EXCEPTION(INTF_REPOS);
-  TAO_SYSTEM_EXCEPTION(BAD_CONTEXT);
-  TAO_SYSTEM_EXCEPTION(OBJ_ADAPTER);
-  TAO_SYSTEM_EXCEPTION(DATA_CONVERSION);
-#undef TAO_SYSTEM_EXCEPTION
-
-  // = all the CORBA::is_nil methods
-  static Boolean is_nil (POA_ptr);
-  static Boolean is_nil (Object_ptr);
-  static Boolean is_nil (Environment_ptr);
-  static Boolean is_nil (NamedValue_ptr);
-  static Boolean is_nil (NVList_ptr);
-  static Boolean is_nil (Request_ptr);
-  //  static Boolean is_nil (Context_ptr);
-  static Boolean is_nil (TypeCode_ptr);
-  static Boolean is_nil (ORB_ptr);
-  static Boolean is_nil (Principal_ptr);
-  static Boolean is_nil (ServerRequest_ptr req);
-  
-  // = all the CORBA release methods
-  static void release (POA_ptr);
-  static void release (Object_ptr);
-  static void release (Environment_ptr);
-  static void release (NamedValue_ptr);
-  static void release (NVList_ptr);
-  static void release (Request_ptr);
-  static void release (Principal_ptr);
-  //  static Boolean release (Context_ptr);
-  static void release (TypeCode_ptr);
-  static void release (ORB_ptr);
-  static void release (ServerRequest_ptr req);
-
-  enum TCKind 
-  {
-    tk_null               = 0,
-    tk_void               = 1,
-    tk_short              = 2,
-    tk_long               = 3,
-    tk_ushort             = 4,
-    tk_ulong              = 5,
-    tk_float              = 6,
-    tk_double             = 7,
-    tk_boolean            = 8,
-    tk_char               = 9,
-    tk_octet              = 10,
-    tk_any                = 11,
-    tk_TypeCode           = 12,
-    tk_Principal          = 13,
-    tk_objref             = 14,
-    tk_struct             = 15,
-    tk_union              = 16,
-    tk_enum               = 17,
-    tk_string             = 18,
-    tk_sequence           = 19,
-    tk_array              = 20,
-    tk_alias              = 21,           // 94-11-7
-    tk_except             = 22,           // 94-11-7
-    
-    // these five are OMG-IDL data type extensions
-    tk_longlong           = 23,           // 94-9-32 Appendix A (+ 2)
-    tk_ulonglong          = 24,           // 94-9-32 Appendix A (+ 2)
-    tk_longdouble         = 25,           // 94-9-32 Appendix A (+ 2)
-    tk_wchar              = 26,           // 94-9-32 Appendix A (+ 2)
-    tk_wstring            = 27,           // 94-9-32 Appendix A (+ 2)
-    
-    // This symbol is not defined by CORBA 2.0.  It's used to speed up
-    // dispatch based on TCKind values, and lets many important ones
-    // just be table lookups.  It must always be the last enum value!!
-    
-    TC_KIND_COUNT
-  };
-  
-  // All the typecode constants
-  static TypeCode_ptr          _tc_null;
-  static TypeCode_ptr          _tc_void;
-  static TypeCode_ptr          _tc_short;
-  static TypeCode_ptr          _tc_long;
-  static TypeCode_ptr          _tc_ushort;
-  static TypeCode_ptr          _tc_ulong;
-  static TypeCode_ptr          _tc_float;
-  static TypeCode_ptr          _tc_double;
-  static TypeCode_ptr          _tc_boolean;
-  static TypeCode_ptr          _tc_char;
-  static TypeCode_ptr          _tc_octet;
-  static TypeCode_ptr          _tc_any;
-  static TypeCode_ptr          _tc_TypeCode;
-  static TypeCode_ptr          _tc_Principal;
-  static TypeCode_ptr          _tc_Object;
-  static TypeCode_ptr          _tc_struct;
-  static TypeCode_ptr          _tc_union;
-  static TypeCode_ptr          _tc_enum;
-  static TypeCode_ptr          _tc_string;
-  static TypeCode_ptr          _tc_sequence;
-  static TypeCode_ptr          _tc_array;
-  static TypeCode_ptr          _tc_alias;
-  static TypeCode_ptr          _tc_except;
-  static TypeCode_ptr          _tc_longlong;
-  static TypeCode_ptr          _tc_ulonglong;
-  static TypeCode_ptr          _tc_longdouble;
-  static TypeCode_ptr          _tc_wchar;
-  static TypeCode_ptr          _tc_wstring;
-
-  // typecode constants for system exceptions
-#define TAO_SYSTEM_EXCEPTION(name) \
-  static TypeCode_ptr          _tc_ ## name
-
-  TAO_SYSTEM_EXCEPTION(UNKNOWN);
-  TAO_SYSTEM_EXCEPTION(BAD_PARAM);
-  TAO_SYSTEM_EXCEPTION(NO_MEMORY);
-  TAO_SYSTEM_EXCEPTION(IMP_LIMIT);
-  TAO_SYSTEM_EXCEPTION(COMM_FAILURE);
-  TAO_SYSTEM_EXCEPTION(INV_OBJREF);
-  TAO_SYSTEM_EXCEPTION(OBJECT_NOT_EXIST);
-  TAO_SYSTEM_EXCEPTION(NO_PERMISSION);
-  TAO_SYSTEM_EXCEPTION(INTERNAL);
-  TAO_SYSTEM_EXCEPTION(MARSHAL);
-  TAO_SYSTEM_EXCEPTION(INITIALIZE);
-  TAO_SYSTEM_EXCEPTION(NO_IMPLEMENT);
-  TAO_SYSTEM_EXCEPTION(BAD_TYPECODE);
-  TAO_SYSTEM_EXCEPTION(BAD_OPERATION);
-  TAO_SYSTEM_EXCEPTION(NO_RESOURCES);
-  TAO_SYSTEM_EXCEPTION(NO_RESPONSE);
-  TAO_SYSTEM_EXCEPTION(PERSIST_STORE);
-  TAO_SYSTEM_EXCEPTION(BAD_INV_ORDER);
-  TAO_SYSTEM_EXCEPTION(TRANSIENT);
-  TAO_SYSTEM_EXCEPTION(FREE_MEM);
-  TAO_SYSTEM_EXCEPTION(INV_IDENT);
-  TAO_SYSTEM_EXCEPTION(INV_FLAG);
-  TAO_SYSTEM_EXCEPTION(INTF_REPOS);
-  TAO_SYSTEM_EXCEPTION(BAD_CONTEXT);
-  TAO_SYSTEM_EXCEPTION(OBJ_ADAPTER);
-  TAO_SYSTEM_EXCEPTION(DATA_CONVERSION);
-#undef	TAO_SYSTEM_EXCEPTION
-
-  static TypeCode_ptr _tc_Bounds;
-  static TypeCode_ptr _tc_BadKind;
-
-  static ORB_ptr ORB_init (int &argc,
-			   char *const *argv,
-			   char *orb_name,
-			   Environment &env);
-  // ORB initialisation, per OMG document 94-9-46.
-  
-  // Define flags for NVList add methods
-  enum 
-  { 
-    ARG_IN = 0x01,
-    ARG_OUT = 0x02,
-    ARG_INOUT = 0x04,
-    IN_COPY_VALUE = 0x08,
-    OUT_LIST_MEMORY = 0x10
-  };
-};
-
-typedef CORBA::OctetSeq TAO_opaque;
-extern CORBA::TypeCode TC_opaque;
-
-typedef void (*TAO_Skeleton)(CORBA::ServerRequest &,
-			     CORBA::Object_ptr, 
-			     CORBA::Environment &);
-// signature of a skeleton for every operation of an interface
-
-// COM interface IIDs
-extern "C" TAO_Export const IID IID_CORBA_Any;
-extern "C" TAO_Export const IID IID_BOA;
-extern "C" TAO_Export const IID IID_CORBA_Exception;
-extern "C" TAO_Export const IID IID_CORBA_UserException;
-extern "C" TAO_Export const IID IID_CORBA_SystemException;
-extern "C" TAO_Export const IID IID_CORBA_Request;
-extern "C" TAO_Export const IID IID_CORBA_Object;
-extern "C" TAO_Export const IID IID_CORBA_ORB;
-extern "C" TAO_Export const IID IID_CORBA_NVList;
-extern "C" TAO_Export const IID IID_CORBA_Principal;
-extern "C" TAO_Export const IID IID_CORBA_TypeCode;
-extern "C" TAO_Export const IID IID_CORBA_ServerRequest;
-extern "C" TAO_Export const IID IID_IIOP_ServerRequest;
-extern "C" TAO_Export const IID IID_STUB_Object;
-extern "C" TAO_Export const IID IID_IIOP_Object;
-extern "C" TAO_Export const IID IID_IIOP_ORB;
-extern "C" TAO_Export const IID IID_POA;
-
-// NOTE: stub APIs are nonportable, and must be explicitly #included
-// by code emitted from an IDL compiler.
-
-#if	defined (_MSC_VER)
-#	pragma pack (pop)		// VC++, goes back to other padding rules
-#endif /* VC++ */
-
-// BC++ we leave with 1-byte padding rules...
-
-#endif /* TAO_CORBA_COM_H */
diff --git a/TAO/tao/corbacom.i b/TAO/tao/corbacom.i
deleted file mode 100644
index 4a64e173eee..00000000000
--- a/TAO/tao/corbacom.i
+++ /dev/null
@@ -1,184 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO
-//
-// = FILENAME
-//    corbacom.i
-//
-// = DESCRIPTION
-//    CORBA C/C++/COM mapping for Win32
-//
-// = AUTHOR
-//     Copyright 1994-1995 by Sun Microsystems Inc.
-//
-// ============================================================================
-
-// String utility support
-
-ACE_INLINE TAO_Export CORBA::String
-CORBA::string_alloc (CORBA::ULong len)
-{
-  // allocate 1 + strlen to accomodate the null terminating character
-  return new CORBA::Char[size_t (len + 1)];
-}
-
-ACE_INLINE TAO_Export CORBA::String
-CORBA::string_dup (const CORBA::Char *str)
-{
-  return CORBA::string_copy (str);
-}
-
-ACE_INLINE TAO_Export void
-CORBA::string_free (CORBA::Char *str)
-{
-  delete [] str;
-}
-
-// ----------------------------------------------------------------------
-// String_var type
-// ----------------------------------------------------------------------
-
-ACE_INLINE
-CORBA::String_var::String_var (void)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::String_var::~String_var (void)
-{
-  if (this->ptr_ != 0)
-    CORBA::string_free (this->ptr_);
-}
-
-ACE_INLINE
-CORBA::String_var::String_var (char *p)
-  : ptr_ (CORBA::string_dup (p))
-{
-  // argument is consumed. p should never be NULL
-}
-
-ACE_INLINE
-CORBA::String_var::String_var (const char *p)
-  : ptr_ (CORBA::string_dup ((char *) p))
-{
-}
-
-ACE_INLINE
-CORBA::String_var::String_var (const CORBA::String_var& r)
-{
-  this->ptr_ = CORBA::string_dup (r.ptr_);
-}
-
-ACE_INLINE CORBA::Char &
-CORBA::String_var::operator[] (CORBA::ULong index)
-{
-  // we need to verify bounds else raise some exception
-  return this->ptr_[index];
-}
-
-ACE_INLINE CORBA::Char
-CORBA::String_var::operator[] (CORBA::ULong index) const
-{
-  // we need to verify bounds else raise some exception
-  return this->ptr_[index];
-}
-
-ACE_INLINE
-CORBA::String_var::operator char *()
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA::String_var::operator const char *() const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE const char *
-CORBA::String_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE char *&
-CORBA::String_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE char *&
-CORBA::String_var::out (void)
-{
-  CORBA::string_free (this->ptr_);
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE char *
-CORBA::String_var::_retn (void)
-{
-  char *temp = this->ptr_;
-  this->ptr_ = 0;
-  return temp;
-}
-
-// ----------------------------------------------------
-//  String_out type
-// ----------------------------------------------------
-
-ACE_INLINE
-CORBA::String_out::String_out (char *&s)
-  : ptr_ (s)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::String_out::String_out (CORBA::String_var &s)
-  : ptr_ (s.out ())
-{
-}
-
-ACE_INLINE
-CORBA::String_out::String_out (CORBA::String_out &s)
-  : ptr_ (s.ptr_)
-{
-}
-
-ACE_INLINE CORBA::String_out &
-CORBA::String_out::operator= (CORBA::String_out &s)
-{
-  this->ptr_ = s.ptr_;
-  return *this;
-}
-
-ACE_INLINE CORBA::String_out &
-CORBA::String_out::operator= (char *s)
-{
-  this->ptr_ = s;
-  return *this;
-}
-
-ACE_INLINE CORBA::String_out &
-CORBA::String_out::operator= (const char *s)
-{
-  this->ptr_ = CORBA::string_dup (s);
-  return *this;
-}
-
-ACE_INLINE
-CORBA::String_out::operator char *&()
-{
-  return this->ptr_;
-}
-
-ACE_INLINE char *&
-CORBA::String_out::ptr (void)
-{
-  return this->ptr_;
-}
diff --git a/TAO/tao/debug.cpp b/TAO/tao/debug.cpp
deleted file mode 100644
index 5f277247988..00000000000
--- a/TAO/tao/debug.cpp
+++ /dev/null
@@ -1,322 +0,0 @@
-// @ (#)debug.cpp	1.3 95/10/02
-// Copyright 1994-1995 by Sun Microsystems Inc.
-// All Rights Reserved
-//
-// ORB:		Simple debug/trace support
-//
-// THREADING NOTE: the global values here  (debug_{level,filter,stream)
-// are assumed to be modified "safely", e.g. in the main thread as
-// part of process initialization.  They are treated as immutable
-// values through all of this debuging package.
-//
-// XXX on Windows, make it always use OutputDebugString () instead of stdio
-
-#include "tao/corba.h"
-
-#if !defined (ACE_HAS_PTHREADS)		// _POSIX_THREAD_SAFE_FUNCTIONS implied
-#define	flockfile(f)
-#define funlockfile(f)
-#endif /* ACE_HAS_PTHREADS */
-
-u_int TAO_Export TAO_debug_level	= 0;
-char * TAO_Export TAO_debug_filter	= "l";
-
-static FILE *debug_stream = stderr;
-
-void use_debug_stream_to_get_rid_of_warning (void) {ACE_UNUSED_ARG (debug_stream);}
-// Dummy function to get rid of "'debug_stream' defined but not used" warning
-
-// The rest of this file is not needed without -DDEBUG, and unless the
-// vfprintf () call is available it can't work.
-//
-// NOTE:  some older platforms have "_doprnt" that provides much the
-// same functionality ... this could be modified to use that routine
-// where it's available.
-
-#if	defined (DEBUG) && defined (HAVE_VPRINTF)
-
-// Support for prefixing debug messages with process ID and, if
-// threaded, the thread ID.  This lets messages from different sources
-// be safely disentangled, even though they're interspersed in the
-// output stream.
-static pid_t my_pid;
-
-#if defined (unix) || defined (VXWORKS)
-
-#if defined (ACE_HAS_PTHREADS)
-
-// Use POSIX initialization support to initialize just once.
-
-static pthread_once_t debug_init = PTHREAD_ONCE_INIT;
-
-#define setup() pthread_once (&debug_init, setup_once)
-
-static void
-setup_once ()
-{
-  my_pid = ACE_OS::getpid ();
-}
-
-static void
-emit_prefix (FILE *stream)
-{
-  pthread_t self = pthread_self ();
-
-  ACE_OS::fprintf (stream, "p%ld t%ld:  ", (long) my_pid, (long) self);
-}
-
-// !defined (ACE_HAS_PTHREADS)
-#else	
-
-// Without threads, guard initialization so it can be repeated,
-// and don't emit the thread ID in the messages.
-
-static void
-setup (void)
-{
-  if (my_pid == 0) 
-    {
-      my_pid = ACE_OS::getpid ();
-      // other setup goes here
-    }
-}
-
-#define	emit_prefix(stream) fprintf (stream, "p%ld:  ", (long) my_pid)
-#endif	/* !ACE_HAS_PTHREADS */
-
-#elif	defined (_WIN32)
-
-// Not all implementations of Win32 have threads, but in any case this
-// code doesn't yet support Win32 threads.
-
-static void
-setup (void)
-{
-  if (my_pid == 0) 
-    my_pid = GetCurrentProcessId ();
-  // other setup goes here
-}
-
-#define	emit_prefix(stream) fprintf (stream, "p%ld:  ", my_pid)
-
-#else
-
-#	error "unknown OS platform"
-#endif /* OS-specific initialization */
-
-void TAO_Export
-dmsg_filter (const char *_FAR categories,
-	     const char *_FAR fmt,
-	     ...)
-{
-  const char *cp = 0;
-
-  if (!categories || !TAO_debug_filter)
-    return;
-  else if (*TAO_debug_filter != '*') 
-    {		// filter with "*" --> all pass
-      for (cp = categories; *cp; cp++)
-	if (strchr (TAO_debug_filter, *cp) != 0)
-	  break;
-
-      if (!*cp)
-	return;
-    }
-
-  va_list ap;
-
-  setup ();
-  flockfile (debug_stream);
-  emit_prefix (debug_stream);
-
-  switch (*cp) 
-    {			// standard categories
-    case 'l':		ACE_OS::fprintf (debug_stream, " (LEAK) "); break;
-    }
-
-  va_start (ap, fmt);
-  vfprintf (debug_stream, fmt, ap);
-  va_end (ap);
-  if (strchr (fmt, '\n') == 0)
-    ACE_OS::fprintf (debug_stream, "\n");
-  funlockfile (debug_stream);
-
-#if defined (_WIN32)
-  OutputDebugString ("called dmsg_filter\n");	// experimental
-#endif /* _WIN32 */
-}
-
-void TAO_Export
-dmsg_filter (u_int level, 
-	     const char *_FAR fmt, 
-	     ...)
-{
-  if (level > TAO_debug_level)
-    return;
-
-  va_list ap;
-
-  setup ();
-  flockfile (debug_stream);
-  emit_prefix (debug_stream);
-  va_start (ap, fmt);
-  vfprintf (debug_stream, fmt, ap);
-  va_end (ap);
-  if (strchr (fmt, '\n') == 0)
-    ACE_OS::fprintf (debug_stream, "\n");
-  funlockfile (debug_stream);
-
-#if defined (_WIN32)
-  OutputDebugString ("called dmsg_filter\n");	// experimental
-#endif /* _WIN32 */
-}
-
-void TAO_Export
-dmsg_v (const char *_FAR fmt, 
-	...)
-{
-  va_list ap;
-
-  setup ();
-  flockfile (debug_stream);
-  emit_prefix (debug_stream);
-  va_start (ap, fmt);
-  vfprintf (debug_stream, fmt, ap);
-  va_end (ap);
-  if (strchr (fmt, '\n') == 0)
-    ACE_OS::fprintf (debug_stream, "\n");
-  funlockfile (debug_stream);
-
-#if defined (_WIN32)
-  OutputDebugString ("called dmsg_v\n");	// experimental
-#endif /* _WIN32 */
-}
-
-void TAO_Export
-_dmsg_x (CORBA::Environment _FAR	&env,
-	 const char *_FAR info)
-{
-  const CORBA::Exception	*ex = env.exception ();
-
-  setup ();
-  flockfile (debug_stream);
-  emit_prefix (debug_stream);
-  ACE_OS::fprintf (debug_stream, "exception '%s' at '%s'\n", ex->id (), info);
-  if (env.exception_type () == CORBA::SYSTEM_EXCEPTION) 
-    {
-      CORBA::SystemException *sysex = (CORBA::SystemException *) ex;
-
-      emit_prefix (debug_stream);
-      ACE_OS::fprintf (debug_stream, "minor %#lx, completion %#lx\n",
-		       sysex->minor (), (long) sysex->completion ());
-    }
-  funlockfile (debug_stream);
-
-#if defined (_WIN32)
-  OutputDebugString ("called _dmsg_x\n");	// experimental
-#endif /* _WIN32 */
-}
-
-void TAO_Export
-dmsg_opaque (char *_FAR label,
-	     u_char *_FAR buffer,
-	     u_long len)
-{
-  setup ();
-  flockfile (debug_stream);
-  emit_prefix (debug_stream);
-  ACE_OS::fprintf (debug_stream, "%s ", label);
-
-  if (len == 0 || !buffer)
-    ACE_OS::fprintf (debug_stream, " (empty)");
-  else if (len > UINT_MAX)
-    ACE_OS::fprintf (debug_stream, "Oversized opaque data:  %ld bytes", len);
-  else 
-    {
-      u_int i;
-
-      for (i = 0; i < len; i++)
-	if (!isprint (buffer [i]))
-	  break;
-	
-      if (i < len) 
-	{
-	  if (len >= 20)
-	    ACE_OS::fprintf (debug_stream, "%ld bytes binary data", len);
-	  else 
-	    {
-	      ACE_OS::fprintf (debug_stream, "binary data {%2X", buffer [0]);
-	      for (i = 1; i < len; i++)
-		ACE_OS::fprintf (debug_stream, ", %2x", buffer [i]);
-	      ACE_OS::fprintf (debug_stream, "}");
-	    }
-	} 
-      else 
-	{
-	  if (len >= 50)
-	    ACE_OS::fprintf (debug_stream, "%ld bytes string data", len);
-	  else
-	    ACE_OS::fprintf (debug_stream, "string data { \"%.*s\" }",
- (int) len, buffer);
-	}
-    }
-  ACE_OS::fprintf (debug_stream, "\n");
-  funlockfile (debug_stream);
-
-#if defined (_WIN32)
-  OutputDebugString ("called dmsg_opaque\n");	// experimental
-#endif /* _WIN32 */
-}
-
-void TAO_Export
-dmsg_opaque_full (char *_FAR label,
-		  const u_char *_FAR buffer,
-		  u_long len)
-{
-  setup ();
-  flockfile (debug_stream);
-
-  emit_prefix (debug_stream);
-  ACE_OS::fprintf (debug_stream, "%s ", label);
-
-  if (len == 0 || !buffer)
-    ACE_OS::fprintf (debug_stream, " (empty)");
-  else 
-    {
-      u_int i;
-
-      for (i = 0; i < len; i++)
-	{
-	  if (i == 0)
-	    ACE_OS::fprintf (debug_stream, "\nhex:   ");
-	  else if ((i % 32) == 0)
-	    ACE_OS::fprintf (debug_stream, "\n       ");
-	  else if ((i % 4) == 0)
-	    ACE_OS::fprintf (debug_stream, " ");
-	  ACE_OS::fprintf (debug_stream, "%02x", buffer[i]);
-	}
-
-      for (i = 0; i < len; i++)
-	{
-	  if (i == 0)
-	    ACE_OS::fprintf (debug_stream, "\nchars: ");
-	  else if ((i % 32) == 0)
-	    ACE_OS::fprintf (debug_stream, "\n       ");
-	  else if ((i % 4) == 0)
-	    ACE_OS::fprintf (debug_stream, " ");
-	  ACE_OS::fprintf (debug_stream, "%c ",
-			   (isprint (buffer[i]) ? buffer[i] : '?'));
-
-	}
-
-      ACE_OS::fprintf (debug_stream, "\n");
-    }
-  ACE_OS::fprintf (debug_stream, "\n");
-  funlockfile (debug_stream);
-
-#if defined (_WIN32)
-  OutputDebugString ("called dmsg_opaque_full\n");	// experimental
-#endif /* _WIN32 */
-}
-
-#endif /* DEBUG && HAVE_VPRINTF */
diff --git a/TAO/tao/debug.h b/TAO/tao/debug.h
deleted file mode 100644
index 83b4e55c726..00000000000
--- a/TAO/tao/debug.h
+++ /dev/null
@@ -1,107 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO
-// 
-// = FILENAME
-//    debug.h
-//
-// = DESCRIPTION
-//     debug/trace support.
-//
-// = AUTHOR
-//     Copyright 1994-1995 by Sun Microsystems Inc.
-// 
-// ============================================================================
-
-#if !defined (TAO_DEBUG_H)
-#define	TAO_DEBUG_H
-
-// These are global to simplify is use by other code, very much in
-// particular by getopt and related argument-parsing code
-//
-// THREADING NOTE: don't set them except in an unthreaded environment
-// such as process initialization.  They're treated as immutable.
-
-// 0 to ??; higher == more
-extern u_int TAO_Export TAO_debug_level;	
-
-// set by getopt
-extern char * TAO_Export TAO_debug_filter;
-
-// These are just simple 0, 1, and 2 argument messages that will
-// appear when debugging's enabled, regardless of category.  They also
-// just compile out painlessly.
-
-#if defined (DEBUG)
-#include <stdio.h>
-#include <errno.h>
-#include <string.h>
-
-// 1, 2, 3 argument messages -- generic
-#define dmsg(s)		{ if (TAO_debug_level) dmsg_v (s); }
-#define dmsg1(s,a1)	{ if (TAO_debug_level) dmsg_v (s, a1); }
-#define dmsg2(s,a1,a2)	{ if (TAO_debug_level) dmsg_v (s, a1, a2); }
-
-// dump CORBA_Exception, if any, with id tag
-#define dexc(env,s)	{ if (TAO_debug_level && env.exception ()) \
-				_dmsg_x (env, s); }
-
-// dump POSIX error indication, if any, with ID tag
-#define dperror(str)	{ if (TAO_debug_level) dmsg_v ("%s: %s", \
-				str, strerror (errno)); }
-
-// dump socket error indication, if any, with ID tag
-#if defined (_WINSOCKAPI_)
-#define	dsockerr(s)	{ if (TAO_debug_level) dmsg_v ("%s:  winsock error %d", \
-				s, WSAGetLastError()); }
-#else
-#define	dsockerr(s)	dperror(s)
-#endif /* _WINSOCKAPI_ */
-
-#else	/* !DEBUG */
-#define dmsg(s)		{ }
-#define dmsg1(s,a1)	{ }
-#define dmsg2(s,a1,a2)	{ }
-
-#define dexc(env, s)	{ }
-#define	dperror(s)	{ }
-#define	dsockerr(s)	{ }
-#endif	/* DEBUG */
-
-// These don't compile out; you must #ifdef them.  This is done
-// intentionally since CPP macros have severe limits, and varargs _(or
-// lack thereof) is one of them.
-
-#if defined (DEBUG)
-
-// This is like an fprintf statement except the filter is a set of
-// characters (string).  If TAO_debug_level is nonzero and any
-// characters in that string are in the "TAO_debug_filter" string, the
-// message is then printed.  Assign thosee characters as needed.
-
-extern void TAO_Export dmsg_filter (const char *_FAR filter,
-                                        const char *_FAR fmt, ...);
-
-// Filter according to TAO_debug_level instead of category.  (For
-// speed, test against TAO_debug_level directly.)
-
-extern void TAO_Export dmsg_filter (u_int level, 
-                                        const char *_FAR fmt, ...);
-
-// General varargs debug message printer, no filtering
-
-extern void TAO_Export dmsg_v (const char *_FAR fmt, ...);
-extern void TAO_Export _dmsg_x (CORBA_Environment _FAR &env,
-                                    const char *_FAR info);
-extern void TAO_Export dmsg_opaque (char *_FAR label,
-                                        u_char *_FAR buffer,
-                                        u_long len);
-extern void TAO_Export dmsg_opaque_full (char *_FAR label,
-                                             const u_char *_FAR buffer,
-                                             u_long len);
-#endif /* DEBUG */
-
-#endif /* TAO_DEBUG_H */
diff --git a/TAO/tao/decode.cpp b/TAO/tao/decode.cpp
deleted file mode 100644
index e01a804f817..00000000000
--- a/TAO/tao/decode.cpp
+++ /dev/null
@@ -1,1559 +0,0 @@
-// ============================================================================
-//
-// = LIBRARY
-//    TAO
-//
-// = FILENAME
-//    decode.cpp
-//
-// = DESCRIPTION
-//   Code for decoding different data types
-//
-//   The original code had a single static decoder function defined on the CDR
-//   class that called traverse to interpret the data types. This version
-//   defines a virtual method "decode" on each class and avoids calling traverse.
-//
-// = AUTHOR
-//     Copyright 1994-1995 by Sun Microsystems Inc.
-//     and
-//     Aniruddha Gokhale
-//
-// ============================================================================
-
-#include "tao/corba.h"
-
-extern CORBA::TypeCode TC_opaque;
-
-// The decoder is exactly the reverse of the encoder, except that:
-//
-//      * Unmarshaling some data types involve allocating memory.  Such
-//        types include sequences (the buffer), objrefs, Principals, Anys,
-//        TypeCodes, and strings.
-//
-//      * The decoder is used when retrieving typecode parameters from
-//        encapsulations.  This means it must deal with "CORBA::tk_indirect",
-//        the magic value (~0) signifying typecode indirection.
-//
-// This second case is identified by a bit of a hack: the second
-// "data" value is used to hold the parent typecode, rather than being
-// ignored.  This means that all other invocations of decoder () **
-// MUST ** pass zero for the second data parameter, in case they
-// decode a TypeCode.  If they didn't, this case might be signified
-// inappropriately.
-//
-// XXX desirable to have a less hacky solution to that ... pull that
-// code out into a separate routine called both by CDR::decoder () and
-// by the code retrieving typecode parameters from encapsulations.
-
-CORBA::TypeCode_ptr __tc_consts [CORBA::TC_KIND_COUNT] =
-{
-  CORBA::_tc_null,
-  CORBA::_tc_void,
-  CORBA::_tc_short,
-  CORBA::_tc_long,
-  CORBA::_tc_ushort,
-
-  CORBA::_tc_ulong,
-  CORBA::_tc_float,
-  CORBA::_tc_double,
-  CORBA::_tc_boolean,
-  CORBA::_tc_char,
-
-  CORBA::_tc_octet,
-  CORBA::_tc_any,
-  CORBA::_tc_TypeCode,
-  CORBA::_tc_Principal,
-
-  0, // CORBA::_tc_Object ... type ID is CORBA_Object
-  0, // CORBA_tk_struct
-  0, // CORBA_tk_union
-  0, // CORBA_tk_enum
-  0, // CORBA::_tc_string ... unbounded
-  0, // CORBA_tk_sequence
-  0, // CORBA_tk_array
-  0, // CORBA_tk_alias
-  0, // CORBA_tk_except
-
-  CORBA::_tc_longlong,
-  CORBA::_tc_ulonglong,
-  CORBA::_tc_longdouble,
-  CORBA::_tc_wchar,
-  0           // CORBA::_tc_wstring ... unbounded
-};
-
-CORBA::TypeCode::traverse_status
-TAO_Marshal_Primitive::decode (CORBA::TypeCode_ptr  tc,
-                               const void *data,
-                               const void *,
-                               void *context,
-                               CORBA::Environment &env)
-{
-  CORBA::Boolean continue_decoding = CORBA::B_TRUE;
-  CDR *stream = (CDR *) context;  // context is the CDR stream
-  CORBA::TypeCode::traverse_status   retval =
-    CORBA::TypeCode::TRAVERSE_CONTINUE; // status of encode operation
-
-  switch (tc->kind_)
-    {
-    case CORBA::tk_null:
-    case CORBA::tk_void:
-      break;
-    case CORBA::tk_short:
-    case CORBA::tk_ushort:
-      continue_decoding = stream->get_short (*(CORBA::Short *) data);
-      break;
-    case CORBA::tk_long:
-    case CORBA::tk_ulong:
-    case CORBA::tk_float:
-    case CORBA::tk_enum:
-      continue_decoding = stream->get_long (*(CORBA::Long *) data);
-      break;
-    case CORBA::tk_double:
-    case CORBA::tk_longlong:
-    case CORBA::tk_ulonglong:
-      continue_decoding = stream->get_longlong (*(CORBA::LongLong *) data);
-      break;
-    case CORBA::tk_boolean:
-      continue_decoding = stream->get_boolean (*(CORBA::Boolean *) data);
-      break;
-    case CORBA::tk_char:
-    case CORBA::tk_octet:
-      continue_decoding = stream->get_char (*(CORBA::Char *) data);
-      break;
-    case CORBA::tk_longdouble:
-      continue_decoding = stream->get_longdouble (*(CORBA::LongDouble *) data);
-      break;
-    case CORBA::tk_wchar:
-      continue_decoding = stream->get_wchar (*(CORBA::WChar *) data);
-      break;
-    default:
-      retval = CORBA::TypeCode::TRAVERSE_STOP;
-      // we are not a primitive type
-    }
-  if (retval == CORBA::TypeCode::TRAVERSE_CONTINUE
-      && continue_decoding == CORBA::B_TRUE)
-    return CORBA::TypeCode::TRAVERSE_CONTINUE;
-  else
-    {
-      env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE));
-      dmsg ("TAO_Marshal_Primitive::decode detected error");
-      return CORBA::TypeCode::TRAVERSE_STOP;
-    }
-}
-
-CORBA::TypeCode::traverse_status
-TAO_Marshal_Any::decode (CORBA::TypeCode_ptr,
-                         const void *data,
-                         const void *,
-                         void *context,
-                         CORBA::Environment &env)
-{
-  CORBA::Any *any = (CORBA::Any *) data;
-  CORBA::TypeCode_ptr elem_tc; // typecode of the element that makes the Any
-  void *value = 0;   // value maintained by the Any
-  CORBA::Boolean continue_decoding = CORBA::B_TRUE;
-  CDR *stream = (CDR *) context;  // context is the CDR stream
-  CORBA::TypeCode::traverse_status retval =
-    CORBA::TypeCode::TRAVERSE_CONTINUE; // status of encode operation
-
-  // decode the typecode description for the element
-  if (stream->decode (CORBA::_tc_TypeCode,
-                      &elem_tc,
-                      this,
-                      env) == CORBA::TypeCode::TRAVERSE_CONTINUE)
-    {
-      value = new CORBA::Octet[elem_tc->size (env)];
-      if (env.exception () == 0)
-        {
-          // switch on the data type and handle the cases for
-          // primitives here for efficiency rather than calling
-          switch (elem_tc->kind_)
-            {
-            case CORBA::tk_null:
-            case CORBA::tk_void:
-              break;
-            case CORBA::tk_short:
-            case CORBA::tk_ushort:
-              continue_decoding = stream->get_short (*(CORBA::Short *) value);
-              break;
-            case CORBA::tk_long:
-            case CORBA::tk_ulong:
-            case CORBA::tk_float:
-            case CORBA::tk_enum:
-              continue_decoding = stream->get_long (*(CORBA::Long *) value);
-              break;
-            case CORBA::tk_double:
-            case CORBA::tk_longlong:
-            case CORBA::tk_ulonglong:
-              continue_decoding = stream->get_longlong (*(CORBA::LongLong *) value);
-              break;
-            case CORBA::tk_boolean:
-              continue_decoding = stream->get_boolean (*(CORBA::Boolean *) value);
-              break;
-            case CORBA::tk_char:
-            case CORBA::tk_octet:
-              continue_decoding = stream->get_char (*(CORBA::Char *) value);
-              break;
-            case CORBA::tk_longdouble:
-              continue_decoding = stream->get_longdouble (*(CORBA::LongDouble *) value);
-              break;
-            case CORBA::tk_wchar:
-              continue_decoding = stream->get_wchar (*(CORBA::WChar *) value);
-              break;
-            case CORBA::tk_any:
-            case CORBA::tk_TypeCode:
-            case CORBA::tk_Principal:
-            case CORBA::tk_objref:
-            case CORBA::tk_struct:
-            case CORBA::tk_union:
-            case CORBA::tk_string:
-            case CORBA::tk_sequence:
-            case CORBA::tk_array:
-            case CORBA::tk_alias:
-            case CORBA::tk_except:
-            case CORBA::tk_wstring:
-              retval = stream->decode (elem_tc, value, 0, env);
-              break;
-            default:
-              // anything else is an error
-              retval = CORBA::TypeCode::TRAVERSE_STOP;
-            }
-        }
-      else
-        retval = CORBA::TypeCode::TRAVERSE_STOP;
-    }
-  if (retval == CORBA::TypeCode::TRAVERSE_CONTINUE
-      && continue_decoding == CORBA::B_TRUE)
-    {
-      // allocate an Any and populate it with the value and typecode. This
-      // eventually appears as "data"
-      (void) new (any) CORBA::Any (elem_tc, value, CORBA::B_TRUE);
-      return CORBA::TypeCode::TRAVERSE_CONTINUE;
-    }
-  else
-    {
-      // free the allocated storage and release the typecode
-      delete [] value;
-      CORBA::release (elem_tc);
-      env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE));
-      dmsg ("TAO_Marshal_Any::decode detected error");
-      return CORBA::TypeCode::TRAVERSE_STOP;
-    }
-}
-
-CORBA::TypeCode::traverse_status
-TAO_Marshal_TypeCode::decode (CORBA::TypeCode_ptr,
-                              const void *data,
-                              const void *parent_typecode,
-                              void *context,
-                              CORBA::Environment  &env)
-{
-  CORBA::Boolean continue_decoding = CORBA::B_TRUE;
-  CDR *stream = (CDR *) context;  // context is the CDR stream
-  CORBA::TypeCode_ptr *tcp;        // typecode to be decoded
-  CORBA::ULong kind;               // typecode kind
-  CORBA::TypeCode_ptr parent = (CORBA::TypeCode_ptr) parent_typecode; // TypeCode
-								    // for the
-								    // parent
-
-  // decode the "kind" field of the typecode from the stream
-  continue_decoding = stream->get_ulong (kind);
-
-  if (continue_decoding == CORBA::B_TRUE)
-    {
-      tcp = (CORBA::TypeCode_ptr *) data;  // the data has to be a TypeCode_ptr*
-
-      // Typecodes with empty parameter lists all have preallocated
-      // constants.  We use those to reduce memory consumption and
-      // heap access ... also, to speed things up!
-      if (kind < CORBA::TC_KIND_COUNT
-          && (*tcp = __tc_consts [(u_int) kind]) != 0)
-        *tcp = __tc_consts [(u_int) kind];
-      else
-        {
-          if (kind == ~(CORBA::ULong)0 || kind < CORBA::TC_KIND_COUNT)
-            {
-	      // either a non-constant typecode or an indirected typecode
-              switch (kind)
-                {
-                  // Need special handling for all kinds of typecodes
-                  // that have nonempty parameter lists ...
-                default:                        // error: missed a case!
-                  env.exception (new CORBA::INTERNAL (CORBA::COMPLETED_MAYBE));
-                  return CORBA::TypeCode::TRAVERSE_STOP;
-
-                  // Some have "simple" parameter lists ... some of these also
-                  // have preallocated constants that could be used.
-                case CORBA::tk_string:
-                case CORBA::tk_wstring:
-                  {
-                    CORBA::ULong bound;
-
-                    continue_decoding = stream->get_ulong (bound);
-                    if (continue_decoding)
-                      {
-                        if (bound == 0)
-                          {
-                            if (kind == CORBA::tk_string)
-                              *tcp = CORBA::_tc_string;
-                            else
-                              *tcp = CORBA::_tc_wstring;
-                          }
-                        else
-                          {
-			    // bounded string. Save the bounds
-                            *tcp = new CORBA::TypeCode ((CORBA::TCKind) kind,
-                                                       bound, 0, CORBA::B_FALSE,
-						       parent);
-			    //                            (*tcp)->parent_ = parent;
-                          }
-                      }
-                  }
-                break;
-
-                // Indirected typecodes, illegal at "top level" but we
-                // allow unmarshaling of them here because we use the
-                // same code to read "off the wire" (where they're
-                // illegal) and to read out of an encapsulation
-                // stream.  We distinguish the case where this is
-                // legal as described above.
-                case ~0:
-                  {
-                    if (parent_typecode == 0)
-                      {
-                        env.exception (new CORBA::INTERNAL (CORBA::COMPLETED_MAYBE));
-                        return CORBA::TypeCode::TRAVERSE_STOP;
-                      }
-
-                    // Get the long indicating the encapsulation offset,
-                    // then set up indirection stream that's like "stream"
-                    // but has space enough only for the typecode and the
-                    // length for the encapsulated parameters.
-                    CDR indir_stream;
-                    CORBA::Long offset;
-
-                    continue_decoding = stream->get_long (offset);
-                    if (continue_decoding)
-		      {
-			// Since indirected typecodes cannot occur at the
-			// topmost level, they can occur starting only at the
-			// second and subsequent levels. This means that a
-			// normal encoding of that typecode occurred somewhere
-			// before in the stream. As a result the offset field
-			// must always be negative. See the CORBA spec for details.
-			continue_decoding = (offset < 0);
-		      }
-                    if (continue_decoding)
-                      {
-			// the offset must be such that the indir_stream.next
-			// should point to the TypeCode kind value of the
-			// TypeCode to which we are referring to.
-                        indir_stream.buffer = indir_stream.next
-                          = stream->next + offset;
-                        indir_stream.remaining = indir_stream.length = 8;
-
-                        // Reject indirections outside parent's scope.
-                        if (indir_stream.next < parent->buffer_)
-                          continue_decoding = CORBA::B_FALSE;
-                      }
-
-                    // Get "kind" and length of target typecode
-                    //
-                    // XXX this currently assumes the TCKind to which we
-                    // indirect is the same byte order as the "parent"
-                    // typecode -- not the right assumption; see how the
-                    // TypeCode interpreter does it.
-
-                    CORBA::ULong indir_kind;
-                    CORBA::ULong indir_len;
-
-		    // retrieve the typecode kind
-                    if (continue_decoding)
-                      continue_decoding = indir_stream.get_ulong (indir_kind);
-
-                    if (continue_decoding
-                        && indir_kind >= CORBA::TC_KIND_COUNT)
-                      continue_decoding = CORBA::B_FALSE;
-
-		    // now retrieve the encapsulation length
-                    if (continue_decoding)
-                      continue_decoding = indir_stream.get_ulong (indir_len);
-
-                    // Now construct indirected typecode.  This shares the
-                    // typecode octets with the "parent" typecode,
-                    // increasing the amount of memory sharing and
-                    // reducing the cost of getting typecodes.
-                    if (continue_decoding)
-                      {
-                        *tcp = new CORBA::TypeCode ((CORBA::TCKind) indir_kind,
-                                                   indir_len,  // length of encapsulation
-                                                   indir_stream.next, // octet buffer
-                                                   CORBA::B_FALSE, // ORB
-								  // doesn't own
-						   parent); // this is our parent
-#if 0
-                        (*tcp)->parent_ = parent;
-                        parent->AddRef ();
-#endif /* 0 */
-                      }
-                  }
-                break;
-
-                // The rest have "complex" parameter lists that are
-                // encoded as bulk octets ...
-                case CORBA::tk_objref:
-                case CORBA::tk_struct:
-                case CORBA::tk_union:
-                case CORBA::tk_enum:
-                case CORBA::tk_sequence:
-                case CORBA::tk_array:
-                case CORBA::tk_alias:
-                case CORBA::tk_except:
-                  {
-                    CORBA::ULong length;
-#if defined(TAO_NEEDS_UNUSED_VARIABLES)
-                    CORBA::Octet *buffer;
-#endif
-
-                    continue_decoding = stream->get_ulong (length);
-                    if (!continue_decoding)
-                      break;
-
-                    // if length > MAXUNSIGNED, error ...
-                    u_int len = (u_int) length;
-
-#if 0
-		    buffer = new CORBA::Octet[len];
-
-                    for (u_int i = 0; i < len && continue_decoding; i++)
-                      continue_decoding = stream->get_octet (buffer [i]);
-#endif
-
-                    if (!continue_decoding)
-                      {
-			//  delete [] buffer;
-                        break;
-                      }
-                    *tcp = new CORBA::TypeCode ((CORBA::TCKind) kind,
-                                               len,
-					       //                     buffer,
-					       stream->next,
-                                               CORBA::B_FALSE,
-					       parent);
-		    // skip length number of bytes in the stream, else we may
-		    // leave the stream in an undefined state
-		    (void) stream->skip_bytes (length);
-		    //                    (*tcp)->parent_ = parent;
-                  }
-                } // end of switch
-            }
-          else // bad kind_ value to be decoded
-            {
-              env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO));
-              dmsg ("TAO_Marshal_TypeCode: Bad kind_ value in CDR stream");
-              return CORBA::TypeCode::TRAVERSE_STOP;
-            }
-        }
-
-    }
-  if (continue_decoding == CORBA::B_TRUE)
-    return CORBA::TypeCode::TRAVERSE_CONTINUE;
-  else
-    {
-      env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE));
-      dmsg ("TAO_Marshal_TypeCode::decode detected error");
-      return CORBA::TypeCode::TRAVERSE_STOP;
-    }
-}
-
-// encode Principal
-CORBA::TypeCode::traverse_status
-TAO_Marshal_Principal::decode (CORBA::TypeCode_ptr,
-                               const void *data,
-                               const void *,
-                               void *context,
-                               CORBA::Environment &env)
-{
-  CORBA::Boolean continue_decoding = CORBA::B_TRUE;
-  CDR *stream = (CDR *) context;  // context is the CDR stream
-  CORBA::Principal_ptr *pp = (CORBA::Principal_ptr *) data;
-  CORBA::ULong len;
-
-  continue_decoding = stream->get_ulong (len);
-  if (len == 0)
-    *pp = 0;  // null principal
-  else
-    {
-      // allocate storage for Principal and its buffer
-      *pp = new CORBA::Principal;
-      (*pp)->id.buffer = new CORBA::Octet [ (size_t) len];
-      (*pp)->id.maximum = (*pp)->id.length = len;
-
-      for (u_int i = 0;
-           continue_decoding != CORBA::B_FALSE && i < len;
-           i++)
-        continue_decoding = stream->get_octet ((*pp)->id.buffer [i]);
-    }
-
-  if (continue_decoding == CORBA::B_TRUE)
-    return CORBA::TypeCode::TRAVERSE_CONTINUE;
-  else
-    {
-      env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE));
-      dmsg ("TAO_Marshal_Principal::decode detected error");
-      return CORBA::TypeCode::TRAVERSE_STOP;
-    }
-}
-
-// decode obj ref
-CORBA::TypeCode::traverse_status
-TAO_Marshal_ObjRef::decode (CORBA::TypeCode_ptr,
-                            const void *data, // where the result will go
-                            const void *,
-                            void *context, // the CDR stream (cast to CDR*)
-                            CORBA::Environment &env)
-{
-  CORBA::Boolean continue_decoding = CORBA::B_TRUE;
-  CDR *stream = (CDR *) context;  // context is the CDR stream
-  CORBA::TypeCode::traverse_status retval = CORBA::TypeCode::TRAVERSE_CONTINUE;
-  CORBA::String type_hint;
-
-  // First, read the type hint. This will be the type_id encoded in an
-  // object reference.
-  stream->decode (CORBA::_tc_string, &type_hint, 0, env);
-
-  // Read the profiles, discarding all until an IIOP profile comes by.
-  // Once we see an IIOP profile, ignore any further ones.
-  //
-  // XXX this will need to change someday to let different protocol
-  // code be accessed, not just IIOP.  Protocol modules will be
-  // dynamically loaded from shared libraries via ORB_init (), and we
-  // just need to be able to access such preloaded libraries here as
-  // we unmarshal objrefs.
-
-  CORBA::ULong profiles;
-  IIOP_Object *objdata = 0;
-
-  // get the count of profiles that follow
-  continue_decoding = stream->get_ulong (profiles);
-
-  // No profiles means a NIL objref.
-
-  if (profiles == 0)
-    {
-      *(CORBA::Object_ptr *) data = CORBA::Object::_nil ();
-      CORBA::string_free (type_hint);
-    }
-  else
-    {
-      while (profiles-- != 0 && continue_decoding)
-        {
-          CORBA::ULong tmp;
-
-          // get the profile ID tag
-          stream->get_ulong (tmp);
-
-          if (tmp != TAO_IOP_TAG_INTERNET_IOP || objdata != 0)
-            {
-              continue_decoding = stream->skip_string ();
-              continue;
-            }
-
-          // OK, we've got an IIOP profile.  It's going to be
-          // encapsulated ProfileData.  Create a new decoding stream
-          // and context for it, and tell the "parent" stream that
-          // this data isn't part of it any more.
-
-          // ProfileData is encoded as a sequence of octet. So first get the
-          // length of the sequence
-          continue_decoding = stream->get_ulong (tmp);
-          assert (stream->remaining >= tmp);
-
-          // Create the decoding stream from the encapsulation in
-          // the buffer, and skip the encapsulation.
-          CDR str;
-
-          str.setup_encapsulation (stream->next, (size_t) tmp);
-
-          stream->next += (u_int) tmp;
-          stream->remaining -= (u_int) tmp;
-
-          // @@ (CJC) Does IIOP_Object duplicate 'type_hint' below so that
-          // we can safely free it?  It does now!
-          objdata = new IIOP_Object (type_hint);
-          CORBA::string_free (type_hint);
-
-          IIOP::Profile     *profile = &objdata->profile;
-
-          // Read and verify major, minor versions, ignoring IIOP
-          // profiles whose versions we don't understand.
-          //
-          // XXX this doesn't actually go back and skip the whole
-          // encapsulation...
-          if (! (str.get_octet (profile->iiop_version.major)
-                && profile->iiop_version.major == IIOP::MY_MAJOR
-                && str.get_octet (profile->iiop_version.minor)
-                && profile->iiop_version.minor <= IIOP::MY_MINOR))
-            {
-              dmsg2 ("detected new v%d.%d IIOP profile",
-                     profile->iiop_version.major,
-                     profile->iiop_version.minor);
-              objdata->type_id = (const char *) 0;
-              objdata->Release ();
-              objdata = 0;
-              continue;
-            }
-
-          // Get host and port
-          if (str.decode (CORBA::_tc_string, &profile->host, 0, env)
-              != CORBA::TypeCode::TRAVERSE_CONTINUE
-              || !str.get_ushort (profile->port))
-            {
-              env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE));
-              dmsg ("error decoding IIOP host/port");
-              objdata->Release ();
-              return CORBA::TypeCode::TRAVERSE_STOP;
-            }
-
-          profile->object_addr (0);
-
-          // ... and object key
-
-          continue_decoding = str.decode (&TC_opaque,
-                                          &profile->object_key,
-                                          0,
-                                          env) == CORBA::TypeCode::TRAVERSE_CONTINUE;
-
-          if (str.remaining != 0)
-            {
-              env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE));
-              dmsg ("extra data at end of IIOP profile data");
-              objdata->Release ();
-              return CORBA::TypeCode::TRAVERSE_STOP;
-            }
-        }
-    }
-  if (objdata == 0)
-    {
-      env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE));
-      dmsg2 ("no IIOP v%d.%d (or earlier) profile in IOR!",
-             IIOP::MY_MAJOR, IIOP::MY_MINOR);
-      return CORBA::TypeCode::TRAVERSE_STOP;
-    }
-  else
-    {
-      // retrieve the CORBA::Object from the IIOP_Object we created before.
-      if (objdata->QueryInterface (IID_CORBA_Object,
-                                   (void **) data) != NOERROR)
-        continue_decoding = CORBA::B_FALSE;
-      objdata->Release ();
-    }
-  if (retval == CORBA::TypeCode::TRAVERSE_CONTINUE
-      && continue_decoding == CORBA::B_TRUE)
-    return CORBA::TypeCode::TRAVERSE_CONTINUE;
-  else
-    {
-      env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE));
-      dmsg ("marshaling encode_struct detected error");
-      return CORBA::TypeCode::TRAVERSE_STOP;
-    }
-}
-
-// decode structs
-CORBA::TypeCode::traverse_status
-TAO_Marshal_Struct::decode (CORBA::TypeCode_ptr  tc,
-                            const void *data,
-                            const void *,
-                            void *context,
-                            CORBA::Environment &env)
-{
-  CDR *stream = (CDR *) context;
-  CORBA::TypeCode::traverse_status retval = CORBA::TypeCode::TRAVERSE_CONTINUE;
-  CORBA::Boolean continue_decoding = CORBA::B_TRUE;
-  CORBA::TypeCode_ptr param;
-  CORBA::Long size, alignment;
-
-  // number of fields in the struct
-  int member_count = tc->member_count (env);
-
-  if (env.exception () == 0)
-    {
-      for (int i = 0; i < member_count
-	     && retval == CORBA::TypeCode::TRAVERSE_CONTINUE
-	     && continue_decoding == CORBA::B_TRUE;
-	   i++)
-	{
-	  param = tc->member_type (i, env);
-	  if (env.exception () == 0)
-	    {
-	      size = param->size (env);
-	      if (env.exception () == 0)
-		{
-		  alignment = param->alignment (env);
-		  if (env.exception () == 0)
-		    {
-		      data = ptr_align_binary (data, alignment);
-		      switch (param->kind_)
-			{
-			case CORBA::tk_null:
-			case CORBA::tk_void:
-			  break;
-			case CORBA::tk_short:
-			case CORBA::tk_ushort:
-			  continue_decoding = stream->get_short (*(CORBA::Short *) data);
-			  break;
-			case CORBA::tk_long:
-			case CORBA::tk_ulong:
-			case CORBA::tk_float:
-			case CORBA::tk_enum:
-			  continue_decoding = stream->get_long (*(CORBA::Long *) data);
-			  break;
-			case CORBA::tk_double:
-			case CORBA::tk_longlong:
-			case CORBA::tk_ulonglong:
-			  continue_decoding = stream->get_longlong (*(CORBA::LongLong *) data);
-			  break;
-			case CORBA::tk_boolean:
-			  continue_decoding = stream->get_boolean (*(CORBA::Boolean *) data);
-			  break;
-			case CORBA::tk_char:
-			case CORBA::tk_octet:
-			  continue_decoding = stream->get_char (*(CORBA::Char *) data);
-			  break;
-			case CORBA::tk_longdouble:
-			  continue_decoding = stream->get_longdouble (*(CORBA::LongDouble *) data);
-			  break;
-			case CORBA::tk_wchar:
-			  continue_decoding = stream->get_wchar (*(CORBA::WChar *) data);
-			  break;
-			case CORBA::tk_any:
-			case CORBA::tk_TypeCode:
-			case CORBA::tk_Principal:
-			case CORBA::tk_objref:
-			case CORBA::tk_struct:
-			case CORBA::tk_union:
-			case CORBA::tk_string:
-			case CORBA::tk_sequence:
-			case CORBA::tk_array:
-			case CORBA::tk_alias:
-			case CORBA::tk_except:
-			case CORBA::tk_wstring:
-			  retval = stream->decode (param, data, 0, env);
-			  break;
-			default:
-			  break;
-			}
-		      data = (char *) data + size;
-		    }
-		  else
-		    return CORBA::TypeCode::TRAVERSE_STOP;
-		}
-	      else
-		return CORBA::TypeCode::TRAVERSE_STOP;
-	    }
-	  else
-	    return CORBA::TypeCode::TRAVERSE_STOP;
-	}
-    }
-  else
-    return CORBA::TypeCode::TRAVERSE_STOP;
-
-  if (retval == CORBA::TypeCode::TRAVERSE_CONTINUE
-      && continue_decoding == CORBA::B_TRUE)
-    return CORBA::TypeCode::TRAVERSE_CONTINUE;
-  else
-    {
-      env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE));
-      dmsg ("marshaling encode_struct detected error");
-      return CORBA::TypeCode::TRAVERSE_STOP;
-    }
-}
-
-// encode unions
-CORBA::TypeCode::traverse_status
-TAO_Marshal_Union::decode (CORBA::TypeCode_ptr  tc,
-                           const void *data,
-                           const void *data2,
-                           void *context,
-                           CORBA::Environment &env)
-{
-  CDR *stream = (CDR *) context;  // context is the CDR stream
-  CORBA::TypeCode::traverse_status retval = CORBA::TypeCode::TRAVERSE_CONTINUE;
-
-  CORBA::TypeCode_ptr discrim_tc;
-  CORBA::TypeCode_ptr member_tc;
-  CORBA::Any_ptr member_label;
-  CORBA::ULong discrim_size_with_pad;
-  const void *discrim_val;
-  CORBA::ULong member_count;
-  CORBA::Long  default_index;
-  CORBA::ULong i;
-  CORBA::TypeCode_ptr default_tc = 0;
-  CORBA::Boolean discrim_matched = CORBA::B_FALSE;
-
-  discrim_tc = tc->discriminator_type (env);
-  // get the discriminator type
-
-  if (env.exception () == 0)
-    {
-      // decode the discriminator value
-      retval = stream->decode (discrim_tc, data, data2, env);
-      if (retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
-        {
-          discrim_size_with_pad = tc->TAO_discrim_pad_size (env);
-
-          if (env.exception () == 0)
-            {
-              discrim_val = data; // save the pointer to the discriminator
-                                  // value
-              // move the pointer to point to the actual value
-              data = (char *) data + discrim_size_with_pad;
-              data2 = (char *) data2 + discrim_size_with_pad;
-              // now get ready to marshal the actual union value
-              default_index = tc->default_index (env);
-
-              if (env.exception () == 0)
-                {
-                  member_count = tc->member_count (env);
-                  if (env.exception () == 0)
-                    {
-                      // check which label value matches with the discriminator
-                      // value. Accordingly, marshal the corresponding
-                      // member_type. If none match, check if default exists
-                      // and marshal accordingly. Otherwise it is an error.
-
-                      for (i = 0; member_count-- != 0; i++)
-                        {
-                          member_label = tc->member_label (i, env);
-                          if (env.exception () == 0)
-                            {
-                              // do the matching
-                              switch (member_label->type ()->kind (env))
-                                {
-                                case CORBA::tk_short:
-                                case CORBA::tk_ushort:
-                                  if (*(CORBA::Short *) member_label->value () ==
-                                      *(CORBA::Short *) discrim_val)
-				    discrim_matched = CORBA::B_TRUE;
-                                  break;
-                                case CORBA::tk_long:
-                                case CORBA::tk_ulong:
-                                case CORBA::tk_enum:
-                                  if (*(CORBA::ULong *) member_label->value () ==
-                                      *(CORBA::ULong *) discrim_val)
-				    discrim_matched = CORBA::B_TRUE;
-                                  break;
-                                case CORBA::tk_char:
-                                  if (*(CORBA::Char *) member_label->value () ==
-                                      *(CORBA::Char *) discrim_val)
-				    discrim_matched = CORBA::B_TRUE;
-                                  break;
-                                case CORBA::tk_wchar:
-                                  if (*(CORBA::WChar *) member_label->value () ==
-                                      *(CORBA::WChar *) discrim_val)
-				    discrim_matched = CORBA::B_TRUE;
-                                  break;
-                                case CORBA::tk_boolean:
-                                  if (*(CORBA::Boolean *) member_label->value () ==
-                                      *(CORBA::Boolean *) discrim_val)
-				    discrim_matched = CORBA::B_TRUE;
-                                  break;
-                                default:
-                                  env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO));
-                                  return CORBA::TypeCode::TRAVERSE_STOP;
-                                }// end of switch
-
-                              // get the member typecode
-                              member_tc = tc->member_type (i, env);
-                              if (env.exception () == 0)
-                                {
-                                  if (default_index >= 0 && default_index-- == 0)
-				    // have we reached the default label?, if so,
-				    // save a handle to the typecode for the default
-				    default_tc = member_tc;
-                                  if (discrim_matched)
-				    // marshal according to the matched typecode
-				    return stream->decode (member_tc, data,
-							   data2, env);
-                                }
-                              else
-                                {
-                                  env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE));
-                                  return CORBA::TypeCode::TRAVERSE_STOP;
-                                }
-                            }
-                          else
-                            {
-                              env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE));
-                              return CORBA::TypeCode::TRAVERSE_STOP;
-                            }
-                        } // end of for loop
-                      // we are here only if there was no match
-                      if (default_tc)
-			return stream->decode (default_tc, data, data2, env);
-                      else
-			return CORBA::TypeCode::TRAVERSE_CONTINUE;
-                    }
-                  else
-                    {
-                      env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE));
-                      return CORBA::TypeCode::TRAVERSE_STOP;
-                    }
-                }
-              else
-                {
-                  env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE));
-                  return CORBA::TypeCode::TRAVERSE_STOP;
-                }
-            }
-          else
-            {
-              env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE));
-              return CORBA::TypeCode::TRAVERSE_STOP;
-            }
-        }
-      else
-        {
-          env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE));
-          return CORBA::TypeCode::TRAVERSE_STOP;
-        }
-    }
-  else
-    {
-      env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE));
-      return CORBA::TypeCode::TRAVERSE_STOP;
-    }
-}
-
-// decode string
-CORBA::TypeCode::traverse_status
-TAO_Marshal_String::decode (CORBA::TypeCode_ptr,
-                            const void *data,
-                            const void *,
-                            void *context,
-                            CORBA::Environment &env)
-{
-  CORBA::Boolean continue_decoding = CORBA::B_TRUE;
-  CDR *stream = (CDR *) context;  // context is the CDR stream
-  CORBA::ULong len = 0;
-  CORBA::String str;
-
-  // On decode, omit the check against specified string bounds, and
-  // cope with illegal "zero length" strings (all lengths on the wire
-  // must include a NUL).
-  //
-  // This is on the principle of being gracious in what we accept; we
-  // don't generate messages that fail to comply with protocol specs,
-  // but we will accept them when it's clear how to do so.
-
-  continue_decoding = stream->get_ulong (len);
-  // note that the encoded length is 1 more than the length of the string
-  // because it also accounts for the terminating NULL character
-  *((CORBA::String *) data) = str = CORBA::string_alloc (len - 1);
-
-  if (len != 0)
-    {
-    while (continue_decoding != CORBA::B_FALSE && len-- != 0)
-      {
-        continue_decoding = stream->get_char (*(CORBA::Char *) str);
-        str++;
-      }
-    }
-  if (continue_decoding == CORBA::B_TRUE)
-    return CORBA::TypeCode::TRAVERSE_CONTINUE;
-  else
-    {
-      env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE));
-      dmsg ("TAO_Marshal_TypeCode::decode detected error");
-      return CORBA::TypeCode::TRAVERSE_STOP;
-    }
-}
-
-// decode sequence
-CORBA::TypeCode::traverse_status
-TAO_Marshal_Sequence::decode (CORBA::TypeCode_ptr  tc,
-                              const void *data,
-                              const void *,
-                              void *context,
-                              CORBA::Environment &env)
-{
-  CORBA::Boolean continue_decoding = CORBA::B_TRUE;
-  CDR *stream = (CDR *) context;
-  CORBA::OctetSeq *seq = (CORBA::OctetSeq *) data;
-  CORBA::TypeCode::traverse_status retval =
-    CORBA::TypeCode::TRAVERSE_CONTINUE;  // return status
-  CORBA::TypeCode_ptr    tc2;  // typecode of the element
-  size_t  size; // size of element
-  CORBA::ULong  bounds;
-  char *value;
-
-  // First unmarshal the sequence length ... we trust it to be right
-  // here, on the "be gracious in what you accept" principle.  We
-  // don't generate illegal sequences (i.e. length > bounds).
-
-  continue_decoding = stream->get_ulong (seq->length);
-  seq->maximum = seq->length;
-  seq->buffer = 0;
-
-  if (continue_decoding)
-    {
-      // no point decoding an empty sequence
-      if (seq->length > 0)
-        {
-          // get element typecode
-          tc2 = tc->content_type (env);
-
-          if (env.exception () == 0)
-            {
-              size = tc2->size (env);
-
-              if (env.exception () == 0)
-                {
-                  bounds = seq->length;
-                  // allocate a buffer to hold the sequence
-                  seq->buffer = new CORBA::Octet [size *(size_t) seq->maximum];
-                  // @@ Who will free this memory?
-                  value = (char *) seq->buffer;
-                  switch (tc2->kind_)
-                    {
-                    case CORBA::tk_null:
-                    case CORBA::tk_void:
-                      return CORBA::TypeCode::TRAVERSE_CONTINUE;
-                    case CORBA::tk_short:
-                    case CORBA::tk_ushort:
-                      // For primitives, compute the size only once
-                      while (bounds-- && continue_decoding == CORBA::B_TRUE)
-                        {
-                          continue_decoding = stream->get_short (*(CORBA::Short *) value);
-                          value += size;
-                        }
-                      //                      CORBA::release (tc2);
-                      if (continue_decoding == CORBA::B_TRUE)
-			return CORBA::TypeCode::TRAVERSE_CONTINUE;
-                      break;
-                    case CORBA::tk_long:
-                    case CORBA::tk_ulong:
-                    case CORBA::tk_float:
-                      // For primitives, compute the size only once
-                      while (bounds-- && continue_decoding == CORBA::B_TRUE)
-                        {
-                          continue_decoding = stream->get_long (*(CORBA::Long *) value);
-                          value += size;
-                        }
-                      //                      CORBA::release (tc2);
-                      if (continue_decoding == CORBA::B_TRUE)
-			return CORBA::TypeCode::TRAVERSE_CONTINUE;
-                      break;
-                    case CORBA::tk_double:
-                    case CORBA::tk_longlong:
-                    case CORBA::tk_ulonglong:
-                      // For primitives, compute the size only once
-                      while (bounds-- && continue_decoding == CORBA::B_TRUE)
-                        {
-                          continue_decoding = stream->get_longlong (*(CORBA::LongLong *) value);
-                          value += size;
-                        }
-                      //                      CORBA::release (tc2);
-                      if (continue_decoding == CORBA::B_TRUE)
-			return CORBA::TypeCode::TRAVERSE_CONTINUE;
-                      break;
-                    case CORBA::tk_boolean:
-                      // For primitives, compute the size only once
-                      while (bounds-- && continue_decoding == CORBA::B_TRUE)
-                        {
-                          continue_decoding = stream->get_boolean (*(CORBA::Boolean *) value);
-                          value += size;
-                        }
-                      //                      CORBA::release (tc2);
-                      if (continue_decoding == CORBA::B_TRUE)
-			return CORBA::TypeCode::TRAVERSE_CONTINUE;
-                      break;
-                    case CORBA::tk_char:
-                    case CORBA::tk_octet:
-                      // For primitives, compute the size only once
-                      while (bounds-- && continue_decoding == CORBA::B_TRUE)
-                        {
-                          continue_decoding = stream->get_char (*(CORBA::Char *) value);
-                          value += size;
-                        }
-                      //                      CORBA::release (tc2);
-                      if (continue_decoding == CORBA::B_TRUE)
-			return CORBA::TypeCode::TRAVERSE_CONTINUE;
-                      break;
-                    case CORBA::tk_longdouble:
-                      // For primitives, compute the size only once
-                      while (bounds-- && continue_decoding == CORBA::B_TRUE)
-                        {
-                          continue_decoding = stream->get_longdouble (*(CORBA::LongDouble *) value);
-                          value += size;
-                        }
-                      //                      CORBA::release (tc2);
-                      if (continue_decoding == CORBA::B_TRUE)
-			return CORBA::TypeCode::TRAVERSE_CONTINUE;
-                      break;
-                    case CORBA::tk_wchar:
-                      // For primitives, compute the size only once
-                      while (bounds-- && continue_decoding == CORBA::B_TRUE)
-                        {
-                          continue_decoding = stream->get_wchar (*(CORBA::WChar *) value);
-                          value += size;
-                        }
-                      //                      CORBA::release (tc2);
-                      if (continue_decoding == CORBA::B_TRUE)
-			return CORBA::TypeCode::TRAVERSE_CONTINUE;
-                      break;
-                    case CORBA::tk_enum:
-                      // For primitives, compute the size only once
-                      while (bounds-- && continue_decoding == CORBA::B_TRUE)
-                        {
-                          continue_decoding = stream->get_long (*(CORBA::Long *) value);
-                          value += size;
-                        }
-                      //                      CORBA::release (tc2);
-                      if (continue_decoding == CORBA::B_TRUE)
-			return CORBA::TypeCode::TRAVERSE_CONTINUE;
-                      break;
-                      // handle all aggregate types here
-                    case CORBA::tk_any:
-                    case CORBA::tk_TypeCode:
-                    case CORBA::tk_Principal:
-                    case CORBA::tk_objref:
-                    case CORBA::tk_struct:
-                    case CORBA::tk_union:
-                    case CORBA::tk_string:
-                    case CORBA::tk_sequence:
-                    case CORBA::tk_array:
-                    case CORBA::tk_alias:
-                    case CORBA::tk_except:
-                    case CORBA::tk_wstring:
-                      // For those aggregate types whose size is constant, we
-                      // compute it only once
-                      while (bounds-- && retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
-                        {
-                          retval = stream->decode (tc2, value, 0, env);
-                          value += size;
-                        }
-                      //                      CORBA::release (tc2);
-                      if (retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
-                        return CORBA::TypeCode::TRAVERSE_CONTINUE;
-                      break;
-                    default:
-                      break;
-                    } // end of switch
-                } // no exception computing size
-            } // no exception computing content type
-        } // length is > 0
-      else
-	return CORBA::TypeCode::TRAVERSE_CONTINUE;
-    }
-  // error exit
-  env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_NO));
-  dmsg ("marshaling TAO_Marshal_Sequence::decode detected error");
-  return CORBA::TypeCode::TRAVERSE_STOP;
-}
-
-// decode array
-CORBA::TypeCode::traverse_status
-TAO_Marshal_Array::decode (CORBA::TypeCode_ptr  tc,
-                           const void *data,
-                           const void *,
-                           void *context,
-                           CORBA::Environment &env)
-{
-  CORBA::Boolean continue_decoding = CORBA::B_TRUE;
-  CDR *stream = (CDR *) context;
-  CORBA::TypeCode::traverse_status retval =
-    CORBA::TypeCode::TRAVERSE_CONTINUE;  // return status
-  CORBA::TypeCode_ptr    tc2;  // typecode of the element
-  size_t  size; // size of element
-  CORBA::ULong  bounds;
-  char *value = (char *) data;
-
-  // retrieve the bounds of the array
-  bounds = tc->length (env);
-  if (env.exception () == 0)
-    {
-
-      // get element typecode
-      tc2 = tc->content_type (env);
-      if (env.exception () == 0)
-        {
-          size = tc2->size (env);
-          if (env.exception () == 0)
-            {
-              switch (tc2->kind_)
-                {
-                case CORBA::tk_null:
-                case CORBA::tk_void:
-                  return CORBA::TypeCode::TRAVERSE_CONTINUE;
-                case CORBA::tk_short:
-                case CORBA::tk_ushort:
-                  // For primitives, compute the size only once
-                  while (bounds-- && continue_decoding == CORBA::B_TRUE)
-                    {
-                      continue_decoding = stream->get_short (*(CORBA::Short *) value);
-                      value += size;
-                    }
-                  //              CORBA::release (tc2);
-                  if (continue_decoding == CORBA::B_TRUE)
-		    return CORBA::TypeCode::TRAVERSE_CONTINUE;
-                  break;
-                case CORBA::tk_long:
-                case CORBA::tk_ulong:
-                case CORBA::tk_float:
-                  // For primitives, compute the size only once
-                  while (bounds-- && continue_decoding == CORBA::B_TRUE)
-                    {
-                      continue_decoding = stream->get_long (*(CORBA::Long *) value);
-                      value += size;
-                    }
-                  //              CORBA::release (tc2);
-                  if (continue_decoding == CORBA::B_TRUE)
-		    return CORBA::TypeCode::TRAVERSE_CONTINUE;
-                  break;
-                case CORBA::tk_double:
-                case CORBA::tk_longlong:
-                case CORBA::tk_ulonglong:
-                  // For primitives, compute the size only once
-                  while (bounds-- && continue_decoding == CORBA::B_TRUE)
-                    {
-                      continue_decoding = stream->get_longlong (*(CORBA::LongLong *) value);
-                      value += size;
-                    }
-                  //              CORBA::release (tc2);
-                  if (continue_decoding == CORBA::B_TRUE)
-		    return CORBA::TypeCode::TRAVERSE_CONTINUE;
-                  break;
-                case CORBA::tk_boolean:
-                  // For primitives, compute the size only once
-                  while (bounds-- && continue_decoding == CORBA::B_TRUE)
-                    {
-                      continue_decoding = stream->get_boolean (*(CORBA::Boolean *) value);
-                      value += size;
-                    }
-                  //              CORBA::release (tc2);
-                  if (continue_decoding == CORBA::B_TRUE)
-		    return CORBA::TypeCode::TRAVERSE_CONTINUE;
-                  break;
-                case CORBA::tk_char:
-                case CORBA::tk_octet:
-                  // For primitives, compute the size only once
-                  while (bounds-- && continue_decoding == CORBA::B_TRUE)
-                    {
-                      continue_decoding = stream->get_char (*(CORBA::Char *) value);
-                      value += size;
-                    }
-                  //              CORBA::release (tc2);
-                  if (continue_decoding == CORBA::B_TRUE)
-		    return CORBA::TypeCode::TRAVERSE_CONTINUE;
-                  break;
-                case CORBA::tk_longdouble:
-                  // For primitives, compute the size only once
-                  while (bounds-- && continue_decoding == CORBA::B_TRUE)
-                    {
-                      continue_decoding = stream->get_longdouble (*(CORBA::LongDouble *) value);
-                      value += size;
-                    }
-                  //              CORBA::release (tc2);
-                  if (continue_decoding == CORBA::B_TRUE)
-		    return CORBA::TypeCode::TRAVERSE_CONTINUE;
-                  break;
-                case CORBA::tk_wchar:
-                  // For primitives, compute the size only once
-                  while (bounds-- && continue_decoding == CORBA::B_TRUE)
-                    {
-                      continue_decoding = stream->get_wchar (*(CORBA::WChar *) value);
-                      value += size;
-                    }
-                  //              CORBA::release (tc2);
-                  if (continue_decoding == CORBA::B_TRUE)
-		    return CORBA::TypeCode::TRAVERSE_CONTINUE;
-                  break;
-                case CORBA::tk_enum:
-                  // For primitives, compute the size only once
-                  while (bounds-- && continue_decoding == CORBA::B_TRUE)
-                    {
-                      continue_decoding = stream->get_long (*(CORBA::Long *) value);
-                      value += size;
-                    }
-                  //              CORBA::release (tc2);
-                  if (continue_decoding == CORBA::B_TRUE)
-		    return CORBA::TypeCode::TRAVERSE_CONTINUE;
-                  break;
-                  // handle all aggregate types here
-                case CORBA::tk_any:
-                case CORBA::tk_TypeCode:
-                case CORBA::tk_Principal:
-                case CORBA::tk_objref:
-                case CORBA::tk_struct:
-                case CORBA::tk_union:
-                case CORBA::tk_string:
-                case CORBA::tk_sequence:
-                case CORBA::tk_array:
-                case CORBA::tk_alias:
-                case CORBA::tk_except:
-                case CORBA::tk_wstring:
-                  // For those aggregate types whose size is constant, we
-                  // compute it only once
-                  while (bounds-- && retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
-                    {
-                      retval = stream->decode (tc2, value, 0, env);
-                      value += size;
-                    }
-                  //              CORBA::release (tc2);
-                  if (retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
-                    return CORBA::TypeCode::TRAVERSE_CONTINUE;
-                  break;
-                default:
-                  break;
-                } // end of switch
-            } // no exception computing size
-        } // no exception computing content type
-    } // no exception computing bounds
-  // error exit
-  env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_NO));
-  dmsg ("marshaling TAO_Marshal_Sequence::decode detected error");
-  return CORBA::TypeCode::TRAVERSE_STOP;
-}
-
-// decode alias
-CORBA::TypeCode::traverse_status
-TAO_Marshal_Alias::decode (CORBA::TypeCode_ptr  tc,
-                           const void *data,
-                           const void *,
-                           void *context,
-                           CORBA::Environment &env)
-{
-  CORBA::TypeCode_ptr    tc2;  // typecode of the aliased type
-  CORBA::Boolean continue_decoding = CORBA::B_TRUE;
-  CDR *stream = (CDR *) context;  // context is the CDR stream
-  CORBA::TypeCode::traverse_status   retval =
-    CORBA::TypeCode::TRAVERSE_CONTINUE; // status of decode operation
-  char *value = (char *) data;
-
-  tc2 = tc->content_type (env);
-  if (env.exception () == 0)
-    {
-    // switch on the data type and handle the cases for primitives here for
-    // efficiency rather than calling
-    switch (tc2->kind_)
-      {
-      case CORBA::tk_null:
-      case CORBA::tk_void:
-        break;
-      case CORBA::tk_short:
-      case CORBA::tk_ushort:
-        continue_decoding = stream->get_short (*(CORBA::Short *) value);
-        break;
-      case CORBA::tk_long:
-      case CORBA::tk_ulong:
-      case CORBA::tk_float:
-      case CORBA::tk_enum:
-        continue_decoding = stream->get_long (*(CORBA::Long *) value);
-        break;
-      case CORBA::tk_double:
-      case CORBA::tk_longlong:
-      case CORBA::tk_ulonglong:
-        continue_decoding = stream->get_longlong (*(CORBA::LongLong *) value);
-        break;
-      case CORBA::tk_boolean:
-        continue_decoding = stream->get_boolean (*(CORBA::Boolean *) value);
-        break;
-      case CORBA::tk_char:
-      case CORBA::tk_octet:
-        continue_decoding = stream->get_char (*(CORBA::Char *) value);
-        break;
-      case CORBA::tk_longdouble:
-        continue_decoding = stream->get_longdouble (*(CORBA::LongDouble *) value);
-        break;
-      case CORBA::tk_wchar:
-        continue_decoding = stream->get_wchar (*(CORBA::WChar *) value);
-        break;
-      case CORBA::tk_any:
-      case CORBA::tk_TypeCode:
-      case CORBA::tk_Principal:
-      case CORBA::tk_objref:
-      case CORBA::tk_struct:
-      case CORBA::tk_union:
-      case CORBA::tk_string:
-      case CORBA::tk_sequence:
-      case CORBA::tk_array:
-      case CORBA::tk_alias:
-      case CORBA::tk_except:
-      case CORBA::tk_wstring:
-        retval = stream->decode (tc2, value, 0, env);
-        break;
-      default:
-        // anything else is an error
-        retval = CORBA::TypeCode::TRAVERSE_STOP;
-      }
-  }
-  //  tc2->Release ();
-  if (retval == CORBA::TypeCode::TRAVERSE_CONTINUE
-      && continue_decoding == CORBA::B_TRUE)
-    return CORBA::TypeCode::TRAVERSE_CONTINUE;
-  else
-    {
-      env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE));
-      dmsg ("TAO_Marshal_Alias::decode detected error");
-      return CORBA::TypeCode::TRAVERSE_STOP;
-    }
-}
-
-// decode exception For exceptions, the "hidden" type ID near the
-// front of the on-wire representation was previously unmarshaled and
-// mapped to the "tc" typcode we're using to traverse the memory ...
-// at the same time its vtable, refcount, and other state was
-// established.
-//
-// NOTE:  This is asymmetric with respect to encoding exceptions.
-CORBA::TypeCode::traverse_status
-TAO_Marshal_Except::decode (CORBA::TypeCode_ptr  tc,
-                            const void *data,
-                            const void *,
-                            void *context,
-                            CORBA::Environment   &env)
-{
-  CDR *stream = (CDR *) context;
-  CORBA::TypeCode::traverse_status retval = CORBA::TypeCode::TRAVERSE_CONTINUE;
-  CORBA::Boolean continue_decoding = CORBA::B_TRUE;
-  CORBA::TypeCode_ptr param;
-  CORBA::Long size, alignment;
-
-  data = (char *) data + sizeof (CORBA::Exception);
-
-  // number of fields in the struct
-  int member_count = tc->member_count (env);
-  if (env.exception () == 0)
-    {
-      for (int i = 0; i < member_count
-	     && retval == CORBA::TypeCode::TRAVERSE_CONTINUE
-	     && continue_decoding == CORBA::B_TRUE; i++)
-	{
-	  param = tc->member_type (i, env);
-	  if (env.exception () == 0)
-	    {
-	      size = param->size (env);
-	      if (env.exception () == 0)
-		{
-		  alignment = param->alignment (env);
-		  if (env.exception () == 0)
-		    {
-		      data = ptr_align_binary (data, alignment);
-		      switch (param->kind_)
-			{
-			case CORBA::tk_null:
-			case CORBA::tk_void:
-			  break;
-			case CORBA::tk_short:
-			case CORBA::tk_ushort:
-			  continue_decoding = stream->get_short (*(CORBA::Short *) data);
-			  break;
-			case CORBA::tk_long:
-			case CORBA::tk_ulong:
-			case CORBA::tk_float:
-			case CORBA::tk_enum:
-			  continue_decoding = stream->get_long (*(CORBA::Long *) data);
-			  break;
-			case CORBA::tk_double:
-			case CORBA::tk_longlong:
-			case CORBA::tk_ulonglong:
-			  continue_decoding = stream->get_longlong (*(CORBA::LongLong *) data);
-			  break;
-			case CORBA::tk_boolean:
-			  continue_decoding = stream->get_boolean (*(CORBA::Boolean *) data);
-			  break;
-			case CORBA::tk_char:
-			case CORBA::tk_octet:
-			  continue_decoding = stream->get_char (*(CORBA::Char *) data);
-			  break;
-			case CORBA::tk_longdouble:
-			  continue_decoding = stream->get_longdouble (*(CORBA::LongDouble *) data);
-			  break;
-			case CORBA::tk_wchar:
-			  continue_decoding = stream->get_wchar (*(CORBA::WChar *) data);
-			  break;
-			case CORBA::tk_any:
-			case CORBA::tk_TypeCode:
-			case CORBA::tk_Principal:
-			case CORBA::tk_objref:
-			case CORBA::tk_struct:
-			case CORBA::tk_union:
-			case CORBA::tk_string:
-			case CORBA::tk_sequence:
-			case CORBA::tk_array:
-			case CORBA::tk_alias:
-			case CORBA::tk_except:
-			case CORBA::tk_wstring:
-			  retval = stream->decode (param, data, 0, env);
-			  break;
-			default:
-			  break;
-			}
-		      data = (char *) data + size;
-		    }
-		  else
-		    return CORBA::TypeCode::TRAVERSE_STOP;
-		}
-	      else
-		return CORBA::TypeCode::TRAVERSE_STOP;
-	    }
-	  else
-	    return CORBA::TypeCode::TRAVERSE_STOP;
-	}
-    }
-  else
-      return CORBA::TypeCode::TRAVERSE_STOP;
-
-  if (retval == CORBA::TypeCode::TRAVERSE_CONTINUE
-      && continue_decoding == CORBA::B_TRUE)
-    return CORBA::TypeCode::TRAVERSE_CONTINUE;
-  else
-    {
-      env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE));
-      dmsg ("TAO_Marshal_Except detected error");
-      return CORBA::TypeCode::TRAVERSE_STOP;
-    }
-}
-
-// decode wstring
-CORBA::TypeCode::traverse_status
-TAO_Marshal_WString::decode (CORBA::TypeCode_ptr,
-                             const void *data,
-                             const void *,
-                             void *context,
-                             CORBA::Environment &env)
-{
-  CORBA::Boolean continue_decoding = CORBA::B_TRUE;
-  CDR *stream = (CDR *) context;  // context is the CDR stream
-  CORBA::WChar *str = *(CORBA::WChar **) data;
-  CORBA::ULong len;
-
-  // On decode, omit the check against specified wstring bounds, and
-  // cope with illegal "zero length" strings (all lengths on the wire
-  // must include a NUL).
-  //
-  // This is on the principle of being gracious in what we accept; we
-  // don't generate messages that fail to comply with protocol specs,
-  // but we will accept them when it's clear how to do so.
-
-  continue_decoding = stream->get_ulong (len);
-
-  *((CORBA::WChar **) data) = str = new CORBA::WChar [(size_t) (len)];
-
-  if (len != 0)
-    while (continue_decoding != CORBA::B_FALSE && len--)
-      {
-        continue_decoding = stream->get_wchar (*str);
-        str++;
-      }
-
-  if (continue_decoding == CORBA::B_TRUE)
-      return CORBA::TypeCode::TRAVERSE_CONTINUE;
-  else
-    {
-      env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE));
-      dmsg ("TAO_Marshal_TypeCode::decode detected error");
-      return CORBA::TypeCode::TRAVERSE_STOP;
-    }
-}
diff --git a/TAO/tao/deep_copy.cpp b/TAO/tao/deep_copy.cpp
deleted file mode 100644
index 00b199cf777..00000000000
--- a/TAO/tao/deep_copy.cpp
+++ /dev/null
@@ -1,1213 +0,0 @@
-// ============================================================================
-//
-// = LIBRARY
-//    TAO
-// 
-// = FILENAME
-//    deep_copy.cpp
-//
-// = DESCRIPTION
-//   Code for deep_copy
-//   The original code had a single static deep_copy function that called
-//   traverse to interpret the data types. This version defines a static method
-//   "deep_copy" on each class and avoids calling traverse.
-//
-//
-//   Helper routine for "Any" copy constructor ...
-//
-//   "Deep Copy" from source to dest.  Memory is always there to be
-//   copied to ... if this calls other deep_copy methods, it ensures that
-//   this remains true (only really an issue for sequences) .
-//
-// = AUTHOR
-//     Copyright 1994-1995 by Sun Microsystems Inc.
-//     and 
-//     Aniruddha Gokhale
-// 
-// ============================================================================
-
-#include "tao/corba.h"
-
-extern CORBA::TypeCode TC_opaque;
-
-// Deep copy from "source" to "dest" ... this code "knows" a bit about
-// representations, verify it when porting to oddball platforms with
-// non-IEEE floating point values or atypical byte and word sizes.
-
-CORBA::TypeCode::traverse_status
-DEEP_COPY (CORBA::TypeCode_ptr  param,
-           const void *source,
-           const void *dest,
-           CORBA::Environment &env)
-{
-  CORBA::TypeCode::traverse_status retval = CORBA::TypeCode::TRAVERSE_CONTINUE;
-
-  switch (param->kind_)
-    {
-    case CORBA::tk_null:
-    case CORBA::tk_void:
-      break;
-    case CORBA::tk_short:
-    case CORBA::tk_ushort:
-      *(CORBA::Short *) dest = *(CORBA::Short *) source;
-      break;
-    case CORBA::tk_long:
-    case CORBA::tk_ulong:
-    case CORBA::tk_float:
-    case CORBA::tk_enum:
-      *(CORBA::Long *) dest = *(CORBA::Long *) source;
-      break;
-    case CORBA::tk_double:
-    case CORBA::tk_longlong:
-    case CORBA::tk_ulonglong:
-      *(CORBA::LongLong *) dest = *(CORBA::LongLong *) source;
-      break;
-    case CORBA::tk_boolean:
-      *(CORBA::Boolean *) dest = *(CORBA::Boolean *) source;
-      break;
-    case CORBA::tk_char:
-    case CORBA::tk_octet:
-      *(CORBA::Char *) dest = *(CORBA::Char *) source;
-      break;
-    case CORBA::tk_longdouble:
-      *(CORBA::LongDouble *) dest = *(CORBA::LongDouble *) source;
-      break;
-    case CORBA::tk_wchar:
-      *(CORBA::WChar *) dest = *(CORBA::WChar *) source;
-      break;
-    case CORBA::tk_any:
-      retval = TAO_Marshal_Any::deep_copy (param, source, dest, env);
-      break;
-    case CORBA::tk_TypeCode:
-      retval = TAO_Marshal_TypeCode::deep_copy (param, source, dest, env);
-      break;
-    case CORBA::tk_Principal:
-      retval = TAO_Marshal_Principal::deep_copy (param, source, dest, env);
-      break;
-    case CORBA::tk_objref:
-      retval = TAO_Marshal_ObjRef::deep_copy (param, source, dest, env);
-      break;
-    case CORBA::tk_struct:
-      retval = TAO_Marshal_Struct::deep_copy (param, source, dest, env);
-      break;
-    case CORBA::tk_union:
-      retval = TAO_Marshal_Union::deep_copy (param, source, dest, env);
-      break;
-    case CORBA::tk_string:
-      retval = TAO_Marshal_String::deep_copy (param, source, dest, env);
-      break;
-    case CORBA::tk_sequence:
-      retval = TAO_Marshal_Sequence::deep_copy (param, source, dest, env);
-      break;
-    case CORBA::tk_array:
-      retval = TAO_Marshal_Array::deep_copy (param, source, dest, env);
-      break;
-    case CORBA::tk_alias:
-      retval = TAO_Marshal_Alias::deep_copy (param, source, dest, env);
-      break;
-    case CORBA::tk_except:
-      retval = TAO_Marshal_Except::deep_copy (param, source, dest, env);
-      break;
-    case CORBA::tk_wstring:
-      retval = TAO_Marshal_WString::deep_copy (param, source, dest, env);
-      break;
-    default:
-      retval = CORBA::TypeCode::TRAVERSE_STOP;
-    } // end of switch
-  return retval;
-}
-
-// deep copy for primitives
-CORBA::TypeCode::traverse_status
-TAO_Marshal_Primitive::deep_copy (CORBA::TypeCode_ptr  tc,
-                                  const void *source,
-                                  const void *dest,
-                                  CORBA::Environment &env)
-{
-  if (tc) 
-    {
-      CORBA::TCKind mykind_ = tc->kind (env);
-
-      if (env.exception () == 0)
-        {
-          switch (mykind_) 
-            {
-            case CORBA::tk_null:
-            case CORBA::tk_void:
-	      // @@ I assume this should be an error...
-              break;
-      
-            case CORBA::tk_char:
-            case CORBA::tk_octet:
-              *(CORBA::Octet *) dest = *(CORBA::Octet *) source;
-              return CORBA::TypeCode::TRAVERSE_CONTINUE;
-
-            case CORBA::tk_short:
-            case CORBA::tk_ushort:
-              *(CORBA::Short *) dest = *(CORBA::Short *) source;
-              return CORBA::TypeCode::TRAVERSE_CONTINUE;
-
-            case CORBA::tk_wchar:
-              *(CORBA::WChar *) dest = *(CORBA::WChar *) source;
-              return CORBA::TypeCode::TRAVERSE_CONTINUE;
-
-            case CORBA::tk_long:
-            case CORBA::tk_ulong:
-            case CORBA::tk_float:
-            case CORBA::tk_enum:
-              *(CORBA::Long *) dest = *(CORBA::Long *) source;
-              return CORBA::TypeCode::TRAVERSE_CONTINUE;
-
-            case CORBA::tk_longlong:
-            case CORBA::tk_ulonglong:
-            case CORBA::tk_double:
-              *(CORBA::LongLong *) dest = *(CORBA::LongLong *) source;
-              return CORBA::TypeCode::TRAVERSE_CONTINUE;
-
-            case CORBA::tk_longdouble:
-              *(CORBA::LongDouble *) dest = *(CORBA::LongDouble *) source;
-              return CORBA::TypeCode::TRAVERSE_CONTINUE;
-
-            case CORBA::tk_boolean:
-              *(CORBA::Boolean *) dest = *(CORBA::Boolean *) source;
-              return CORBA::TypeCode::TRAVERSE_CONTINUE;
-            default:
-              env.exception (new CORBA::BAD_TYPECODE  (CORBA::COMPLETED_MAYBE));
-              dmsg ("TAO_Marshal_Primitive::deep_copy detected error");
-              return CORBA::TypeCode::TRAVERSE_STOP;
-            }
-        }
-      else
-        {
-          dmsg ("TAO_Marshal_Primitive::deep_copy detected error");
-          return CORBA::TypeCode::TRAVERSE_STOP;
-        }
-    }
-
-  env.exception (new CORBA::BAD_TYPECODE  (CORBA::COMPLETED_MAYBE) );
-  dmsg ("TAO_Marshal_Primitive::deep_copy detected error");
-  return CORBA::TypeCode::TRAVERSE_STOP;
-}
-
-// deep_copy for Principal
-CORBA::TypeCode::traverse_status
-TAO_Marshal_Principal::deep_copy (CORBA::TypeCode_ptr  tc,
-                                  const void *source,
-                                  const void *dest,
-                                  CORBA::Environment &env)
-{
-  if (tc)
-    {
-      CORBA::Principal_ptr src = *(CORBA::Principal_ptr *) source;
-      CORBA::Principal_ptr dst = *(CORBA::Principal_ptr *) dest = new CORBA::Principal;
-      
-      if (dst)
-        {
-          // Principals are just opaque IDs ... copy them
-          assert (src->id.length <= UINT_MAX);
-          dst->id.length = dst->id.maximum = src->id.length;
-
-          if (dst->id.length > 0) 
-            {
-              dst->id.buffer = new CORBA::Octet [(u_int) dst->id.length];
-              if (dst->id.buffer)
-                {
-                  ACE_OS::memcpy (dst->id.buffer,
-				  src->id.buffer,
-				  (size_t) dst->id.length);
-                  return CORBA::TypeCode::TRAVERSE_CONTINUE;
-                }
-              else
-                {
-                  env.exception (new CORBA::NO_MEMORY  (CORBA::COMPLETED_MAYBE) );
-                  dmsg ("TAO_Marshal_Principal::deep_copy detected error");
-                  return CORBA::TypeCode::TRAVERSE_STOP;
-                }
-            } 
-          else
-            {
-              dst->id.buffer = 0;
-              return CORBA::TypeCode::TRAVERSE_CONTINUE;
-            }
-        }
-      else
-        {
-          env.exception (new CORBA::NO_MEMORY  (CORBA::COMPLETED_MAYBE) );
-          dmsg ("TAO_Marshal_Principal::deep_copy detected error");
-          return CORBA::TypeCode::TRAVERSE_STOP;
-        }
-    }
-  else 
-    {
-      env.exception (new CORBA::BAD_TYPECODE  (CORBA::COMPLETED_MAYBE) );
-      dmsg ("TAO_Marshal_Primitive::deep_copy detected error");
-      return CORBA::TypeCode::TRAVERSE_STOP;
-    }
-}
-
-// deep_copy structs
-CORBA::TypeCode::traverse_status
-TAO_Marshal_Struct::deep_copy (CORBA::TypeCode_ptr  tc,
-                               const void *source,
-                               const void *dest,
-                               CORBA::Environment &env)
-{
-  if (tc)
-    {
-      // compute the number of fields in the struct
-      int member_count = tc->member_count (env);
-
-      if (env.exception () == 0)
-        {
-	  CORBA::TypeCode::traverse_status retval =
-	    CORBA::TypeCode::TRAVERSE_CONTINUE;
-
-          for (int i = 0; i < member_count 
-		 && retval == CORBA::TypeCode::TRAVERSE_CONTINUE;
-	       i++)
-            {
-              // get the typecode for the ith field
-	      CORBA::TypeCode_ptr param = tc->member_type (i, env);
-              if (env.exception () == 0)
-                {
-                  // get the size of the field
-                  CORBA::Long size = param->size (env);
-                  if (env.exception () == 0)
-                    {
-                      // get the alignment of the field
-#if defined(TAO_NEEDS_UNUSED_VARIABLES)                      
-                      CORBA::Long alignment = param->alignment (env);
-#endif                      
-                      if (env.exception () == 0)
-                        {
-                          switch (param->kind_)
-                            {
-                            case CORBA::tk_null:
-                            case CORBA::tk_void:
-                              break;
-                            case CORBA::tk_short:
-                            case CORBA::tk_ushort:
-                              *(CORBA::Short *) dest = *(CORBA::Short *) source;
-                              break;
-                            case CORBA::tk_long:
-                            case CORBA::tk_ulong:
-                            case CORBA::tk_float:
-                            case CORBA::tk_enum:
-                              *(CORBA::Long *) dest = *(CORBA::Long *) source;
-                              break;
-                            case CORBA::tk_double:
-                            case CORBA::tk_longlong:
-                            case CORBA::tk_ulonglong:
-                              *(CORBA::LongLong *) dest = *(CORBA::LongLong *) source;
-                              break;
-                            case CORBA::tk_boolean:
-                              *(CORBA::Boolean *) dest = *(CORBA::Boolean *) source;
-                              break;
-                            case CORBA::tk_char:
-                            case CORBA::tk_octet:
-                              *(CORBA::Char *) dest = *(CORBA::Char *) source;
-                              break;
-                            case CORBA::tk_longdouble:
-                              *(CORBA::LongDouble *) dest = *(CORBA::LongDouble *) source;
-                              break;
-                            case CORBA::tk_wchar:
-                              *(CORBA::WChar *) dest = *(CORBA::WChar *) source;
-                              break;
-                            case CORBA::tk_any:
-                              retval = TAO_Marshal_Any::deep_copy (param, source, dest, env);
-                              break;
-                            case CORBA::tk_TypeCode:
-                              retval = TAO_Marshal_TypeCode::deep_copy (param, source, dest, env);
-                              break;
-                            case CORBA::tk_Principal:
-                              retval = TAO_Marshal_Principal::deep_copy (param, source, dest, env);
-                              break;
-                            case CORBA::tk_objref:
-                              retval = TAO_Marshal_ObjRef::deep_copy (param, source, dest, env);
-                              break;
-                            case CORBA::tk_struct:
-                              retval = TAO_Marshal_Struct::deep_copy (param, source, dest, env);
-                              break;
-                            case CORBA::tk_union:
-                              retval = TAO_Marshal_Union::deep_copy (param, source, dest, env);
-                              break;
-                            case CORBA::tk_string:
-                              retval = TAO_Marshal_String::deep_copy (param, source, dest, env);
-                              break;
-                            case CORBA::tk_sequence:
-                              retval = TAO_Marshal_Sequence::deep_copy (param, source, dest, env);
-                              break;
-                            case CORBA::tk_array:
-                              retval = TAO_Marshal_Array::deep_copy (param, source, dest, env);
-                              break;
-                            case CORBA::tk_alias:
-                              retval = TAO_Marshal_Alias::deep_copy (param, source, dest, env);
-                              break;
-                            case CORBA::tk_except:
-                              retval = TAO_Marshal_Except::deep_copy (param, source, dest, env);
-                              break;
-                            case CORBA::tk_wstring:
-                              retval = TAO_Marshal_WString::deep_copy (param, source, dest, env);
-                              break;
-                            default:
-                              retval = CORBA::TypeCode::TRAVERSE_STOP;
-                            } // end of switch
-                          source = (char *) source + size;
-                          dest = (char *) dest + size;
-                        }  
-                      else  // exception computing alignment 
-                        {
-                          dmsg ("TAO_Marshal_Struct::deep_copy detected error");
-                          return CORBA::TypeCode::TRAVERSE_STOP;
-                        }
-                    } 
-                  else  // exception computing size 
-                    {
-                      dmsg ("TAO_Marshal_Struct::deep_copy detected error");
-                      return CORBA::TypeCode::TRAVERSE_STOP;
-                    }
-                } 
-              else  // exception computing typecode
-                {
-                  dmsg ("TAO_Marshal_Struct::deep_copy detected error");
-                  return CORBA::TypeCode::TRAVERSE_STOP;
-                }
-            } // end of loop
-          if (retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
-	    return CORBA::TypeCode::TRAVERSE_CONTINUE;
-          else
-            {
-              env.exception (new CORBA::MARSHAL  (CORBA::COMPLETED_MAYBE));
-              dmsg ("TAO_Marshal_Struct::deep_copy detected error");
-              return CORBA::TypeCode::TRAVERSE_STOP;
-            }
-        } 
-      else // exception getting member count 
-        {
-          dmsg ("TAO_Marshal_Struct::deep_copy detected error");
-          return CORBA::TypeCode::TRAVERSE_STOP;
-        }
-    }
-  else // no typecode
-    {
-      env.exception (new CORBA::BAD_TYPECODE  (CORBA::COMPLETED_MAYBE));
-      dmsg ("TAO_Marshal_Struct::deep_copy detected error");
-      return CORBA::TypeCode::TRAVERSE_STOP;
-    }
-}
-
-// deep_copy for union
-CORBA::TypeCode::traverse_status
-TAO_Marshal_Union::deep_copy (CORBA::TypeCode_ptr  tc,
-                              const void *data,
-                              const void *data2,
-                              CORBA::Environment &env)
-{
-  CORBA::TypeCode_ptr discrim_tc = tc->discriminator_type (env);
-
-  // Get the discriminator type.
-  if (env.exception () == 0)
-    {
-      // deep_copy the discriminator value
-      CORBA::TypeCode::traverse_status retval =
-	DEEP_COPY (discrim_tc, data, data2, env);
-
-      if (retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
-        {
-	  CORBA::ULong discrim_size_with_pad =
-	    tc->TAO_discrim_pad_size (env);
-
-          if (env.exception () == 0)
-            {
-	      CORBA::TypeCode_ptr default_tc = 0;
-
-	      const void *discrim_val = data; // save the pointer to the discriminator
-	      // value 
-              // move the pointer to point to the actual value
-              data = (char *) data + discrim_size_with_pad;
-              data2 = (char *) data2 + discrim_size_with_pad;
-              // now get ready to marshal the actual union value
-              CORBA::Long default_index = tc->default_index (env);
-              if (env.exception () == 0)
-                {
-                  int member_count = tc->member_count (env);
-                  if (env.exception () == 0)
-                    {
-                      // check which label value matches with the discriminator
-                      // value. Accordingly, marshal the corresponding
-                      // member_type. If none match, check if default exists
-                      // and marshal accordingly. Otherwise it is an error.
-                      for (int i = 0; member_count-- != 0; i++)
-			{
-			  CORBA::Any_ptr member_label = tc->member_label (i, env);
-			  if (env.exception () == 0)
-			    {
-			      CORBA::Boolean discrim_matched = CORBA::B_FALSE;
-
-			      // do the matching
-			      switch (member_label->type ()->kind (env))
-				{
-				case CORBA::tk_short:
-				case CORBA::tk_ushort:
-				  if (*(CORBA::Short *) member_label->value () ==
-				      *(CORBA::Short *) discrim_val)
-				    discrim_matched = CORBA::B_TRUE;
-				  break;
-				case CORBA::tk_long:
-				case CORBA::tk_ulong:
-				case CORBA::tk_enum:
-				  if (*(CORBA::ULong *) member_label->value () ==
-				      *(CORBA::ULong *) discrim_val)
-				    discrim_matched = CORBA::B_TRUE;
-				  break;
-				case CORBA::tk_char:
-				  if (*(CORBA::Char *) member_label->value () ==
-				      *(CORBA::Char *) discrim_val)
-				    discrim_matched = CORBA::B_TRUE;
-				  break;
-				case CORBA::tk_wchar:
-				  if (*(CORBA::WChar *) member_label->value () ==
-				      *(CORBA::WChar *) discrim_val)
-				    discrim_matched = CORBA::B_TRUE;
-				  break;
-				case CORBA::tk_boolean:
-				  if (*(CORBA::Boolean *) member_label->value () ==
-				      *(CORBA::Boolean *) discrim_val)
-				    discrim_matched = CORBA::B_TRUE;
-				  break;
-				default:
-				  env.exception (new CORBA::BAD_TYPECODE  (CORBA::COMPLETED_NO));
-				  return CORBA::TypeCode::TRAVERSE_STOP;
-				}// end of switch
-
-			      // get the member typecode
-			      CORBA::TypeCode_ptr member_tc = tc->member_type (i, env);
-			      if (env.exception () == 0)
-				{
-				  if (default_index >= 0 && default_index-- == 0)
-				    // have we reached the default label?, if so,
-				    // save a handle to the typecode for the default
-				    default_tc = member_tc;
-				  if (discrim_matched)
-				    // marshal according to the matched typecode
-				    return DEEP_COPY (member_tc, data,
-						      data2, env);
-				}
-			      else
-				{
-				  env.exception (new CORBA::MARSHAL  (CORBA::COMPLETED_MAYBE));
-				  return CORBA::TypeCode::TRAVERSE_STOP;
-				}
-			    }
-			  else
-			    {
-			      env.exception (new CORBA::MARSHAL  (CORBA::COMPLETED_MAYBE));
-			      return CORBA::TypeCode::TRAVERSE_STOP;
-			    }
-			} // end of while
-		      
-		      // we are here only if there was no match
-		      if (default_tc)
-			return DEEP_COPY (default_tc, data, data2, env);
-		      else
-			return CORBA::TypeCode::TRAVERSE_CONTINUE;
-		    }
-                  else
-                    {
-                      env.exception (new CORBA::MARSHAL  (CORBA::COMPLETED_MAYBE));
-                      return CORBA::TypeCode::TRAVERSE_STOP;
-                    }
-                }
-              else
-                {
-                  env.exception (new CORBA::MARSHAL  (CORBA::COMPLETED_MAYBE));
-                  return CORBA::TypeCode::TRAVERSE_STOP;
-                }
-            }
-          else
-            {
-              env.exception (new CORBA::MARSHAL  (CORBA::COMPLETED_MAYBE));
-              return CORBA::TypeCode::TRAVERSE_STOP;
-            }
-        }
-      else
-        {
-          env.exception (new CORBA::MARSHAL  (CORBA::COMPLETED_MAYBE));
-          return CORBA::TypeCode::TRAVERSE_STOP;
-        }
-    }
-  else
-    {
-      env.exception (new CORBA::MARSHAL  (CORBA::COMPLETED_MAYBE));
-      return CORBA::TypeCode::TRAVERSE_STOP;
-    }
-}
-
-// deep_copy for Sequence
-CORBA::TypeCode::traverse_status
-TAO_Marshal_Sequence::deep_copy (CORBA::TypeCode_ptr  tc,
-                                 const void *source,
-                                 const void *dest,
-                                 CORBA::Environment &env)
-{
-  CORBA::TypeCode::traverse_status retval =
-    CORBA::TypeCode::TRAVERSE_CONTINUE;  // return status
-  CORBA::TypeCode_ptr    tc2;  // typecode of the element
-  size_t  size; // size of element
-  CORBA::ULong  bounds;
-  char *value1, *value2;
-  CORBA::OctetSeq          *src, *dst;
-  CDR stream;  // used only to access the marshal_object factory
-
-  // Rely on binary format of sequences -- all are the same
-  // except for the type pointed to by "buffer"
-
-  if (tc)
-    {
-      src = (CORBA::OctetSeq *) source;
-      dst = (CORBA::OctetSeq *) dest;
-
-      assert (src->length <= UINT_MAX);
-      dst->length = dst->maximum = src->length;
-
-      // get element typecode
-      tc2 = tc->content_type (env);  
-      if (env.exception () == 0)
-        {
-          // get the size of the element
-          size = tc2->size (env);
-          if (env.exception () == 0)
-            {
-              // compute the length of the sequence
-              bounds = src->length;
-
-              // allocate a buffer to hold the sequence
-              dst->buffer = new CORBA::Octet [size *(size_t) src->maximum];
-              if (dst->buffer)
-                {
-                  value1 = (char *) src->buffer;
-                  value2 = (char *) dst->buffer;
-
-                  switch (tc2->kind_)
-                    {
-                    case CORBA::tk_null:
-                    case CORBA::tk_void:
-                      //                      CORBA::release (tc2);
-                      return CORBA::TypeCode::TRAVERSE_CONTINUE;
-                    case CORBA::tk_short:
-                    case CORBA::tk_ushort:
-                    case CORBA::tk_long:
-                    case CORBA::tk_ulong:
-                    case CORBA::tk_float:
-                    case CORBA::tk_double:
-                    case CORBA::tk_longlong:
-                    case CORBA::tk_ulonglong:
-                    case CORBA::tk_boolean:
-                    case CORBA::tk_char:
-                    case CORBA::tk_octet:
-                    case CORBA::tk_longdouble:
-                    case CORBA::tk_wchar:
-                    case CORBA::tk_enum:
-                      // just do a memcpy rather than copying each element
-                      ACE_OS::memcpy (value2, value1, size*bounds);
-                      //                      CORBA::release (tc2);
-                      return CORBA::TypeCode::TRAVERSE_CONTINUE;
-
-                      // handle all aggregate types here
-                    case CORBA::tk_any:
-                      while (bounds-- && retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
-                        {
-                          retval = TAO_Marshal_Any::deep_copy (tc2, source, dest, env);
-                          value1 = (char *) value1 + size;
-                          value2 = (char *) value2 + size;
-                        }
-                      break;
-                    case CORBA::tk_TypeCode:
-                      while (bounds-- && retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
-                        {
-                          retval = TAO_Marshal_TypeCode::deep_copy (tc2, source, dest, env);
-                          value1 = (char *) value1 + size;
-                          value2 = (char *) value2 + size;
-                        }
-                      break;
-                    case CORBA::tk_Principal:
-                      while (bounds-- && retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
-                        {
-                          retval = TAO_Marshal_Principal::deep_copy (tc2, source, dest, env);
-                          value1 = (char *) value1 + size;
-                          value2 = (char *) value2 + size;
-                        }
-                      break;
-                    case CORBA::tk_objref:
-                      while (bounds-- && retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
-                        {
-                          retval = TAO_Marshal_ObjRef::deep_copy (tc2, source, dest, env);
-                          value1 = (char *) value1 + size;
-                          value2 = (char *) value2 + size;
-                        }
-                      break;
-                    case CORBA::tk_struct:
-                      while (bounds-- && retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
-                        {
-                          retval = TAO_Marshal_Struct::deep_copy (tc2, source, dest, env);
-                          value1 = (char *) value1 + size;
-                          value2 = (char *) value2 + size;
-                        }
-                      break;
-                    case CORBA::tk_union:
-                      while (bounds-- && retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
-                        {
-                          retval = TAO_Marshal_Union::deep_copy (tc2, source, dest, env);
-                          value1 = (char *) value1 + size;
-                          value2 = (char *) value2 + size;
-                        }
-                      break;
-                    case CORBA::tk_string:
-                      while (bounds-- && retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
-                        {
-                          retval = TAO_Marshal_Any::deep_copy (tc2, source, dest, env);
-                          value1 = (char *) value1 + size;
-                          value2 = (char *) value2 + size;
-                        }
-                      retval = TAO_Marshal_String::deep_copy (tc2, source, dest, env);
-                      break;
-                    case CORBA::tk_sequence:
-                      while (bounds-- && retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
-                        {
-                          retval = TAO_Marshal_Sequence::deep_copy (tc2, source, dest, env);
-                          value1 = (char *) value1 + size;
-                          value2 = (char *) value2 + size;
-                        }
-                      break;
-                    case CORBA::tk_array:
-                      while (bounds-- && retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
-                        {
-                          retval = TAO_Marshal_Array::deep_copy (tc2, source, dest, env);
-                          value1 = (char *) value1 + size;
-                          value2 = (char *) value2 + size;
-                        }
-                      break;
-                    case CORBA::tk_alias:
-                      while (bounds-- && retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
-                        {
-                          retval = TAO_Marshal_Alias::deep_copy (tc2, source, dest, env);
-                          value1 = (char *) value1 + size;
-                          value2 = (char *) value2 + size;
-                        }
-                      break;
-                    case CORBA::tk_except:
-                      while (bounds-- && retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
-                        {
-                          retval = TAO_Marshal_Except::deep_copy (tc2, source, dest, env);
-                          value1 = (char *) value1 + size;
-                          value2 = (char *) value2 + size;
-                        }
-                      break;
-                    case CORBA::tk_wstring:
-                      while (bounds-- && retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
-                        {
-                          retval = TAO_Marshal_WString::deep_copy (tc2, source, dest, env);
-                          value1 = (char *) value1 + size;
-                          value2 = (char *) value2 + size;
-                        }
-                      break;
-                    default:
-                      retval = CORBA::TypeCode::TRAVERSE_STOP;
-                      break;
-                    } // end of switch
-                  //              CORBA::release (tc2);
-                  if (retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
-		    return CORBA::TypeCode::TRAVERSE_CONTINUE;
-                  else
-                    {
-                      // error exit
-                      env.exception (new CORBA::MARSHAL  (CORBA::COMPLETED_NO));
-                      dmsg ("marshaling TAO_Marshal_Sequence::deep_copy detected error");
-                      return CORBA::TypeCode::TRAVERSE_STOP;
-                    }
-                }
-              else 
-                {
-                  // error exit
-                  //              CORBA::release (tc2);
-                  env.exception (new CORBA::NO_MEMORY  (CORBA::COMPLETED_MAYBE));
-                  dmsg ("marshaling TAO_Marshal_Sequence::deep_copy detected error");
-                  return CORBA::TypeCode::TRAVERSE_STOP;
-                }
-            } 
-          else // exception computing size
-            {
-              //              CORBA::release (tc2);
-              dmsg ("marshaling TAO_Marshal_Sequence::deep_copy detected error");
-              return CORBA::TypeCode::TRAVERSE_STOP;
-            }
-        } 
-      else // exception computing content type
-        {
-          dmsg ("marshaling TAO_Marshal_Sequence::deep_copy detected error");
-          return CORBA::TypeCode::TRAVERSE_STOP;
-        }
-    }
-  else // no typecode
-    {
-      env.exception (new CORBA::BAD_TYPECODE  (CORBA::COMPLETED_MAYBE));
-      dmsg ("TAO_Marshal_Struct::deep_copy detected error");
-      return CORBA::TypeCode::TRAVERSE_STOP;
-    }
-}
-
-// deep_copy for Array
-CORBA::TypeCode::traverse_status
-TAO_Marshal_Array::deep_copy (CORBA::TypeCode_ptr  tc,
-                              const void *source,
-                              const void *dest,
-                              CORBA::Environment &env)
-{
-  CORBA::TypeCode::traverse_status retval =
-    CORBA::TypeCode::TRAVERSE_CONTINUE;  // return status
-  CORBA::TypeCode_ptr    tc2;  // typecode of the element
-  size_t  size; // size of element
-  CORBA::ULong  bounds;
-  CDR stream;  // used only to access the marshal_object factory
-
-  // Rely on binary format of sequences -- all are the same
-  // except for the type pointed to by "buffer"
-
-  if (tc)
-    {
-      bounds = tc->length (env);
-      if (env.exception () == 0)
-        {
-          // get element typecode
-          tc2 = tc->content_type (env);  
-          if (env.exception () == 0)
-            {
-              // get the size of the element type
-              size = tc2->size (env);
-              if (env.exception () == 0)
-                {
-                  switch (tc2->kind_)
-                    {
-                    case CORBA::tk_null:
-                    case CORBA::tk_void:
-                      //                      CORBA::release (tc2);
-                      return CORBA::TypeCode::TRAVERSE_CONTINUE;
-                    case CORBA::tk_short:
-                    case CORBA::tk_ushort:
-                    case CORBA::tk_long:
-                    case CORBA::tk_ulong:
-                    case CORBA::tk_float:
-                    case CORBA::tk_double:
-                    case CORBA::tk_longlong:
-                    case CORBA::tk_ulonglong:
-                    case CORBA::tk_boolean:
-                    case CORBA::tk_char:
-                    case CORBA::tk_octet:
-                    case CORBA::tk_longdouble:
-                    case CORBA::tk_wchar:
-                    case CORBA::tk_enum:
-                      // just do a memcpy rather than copying each element
-                      ACE_OS::memcpy ((char *) dest, (char *) source, size*bounds);
-                      //                      CORBA::release (tc2);
-                      return CORBA::TypeCode::TRAVERSE_CONTINUE;
-                      // handle all aggregate types here
-                    case CORBA::tk_any:
-                      while (bounds-- && retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
-                        {
-                          retval = TAO_Marshal_Any::deep_copy (tc2, source, dest, env);
-                          source = (char *) source + size;
-                          dest = (char *) dest + size;
-                        }
-                      break;
-                    case CORBA::tk_TypeCode:
-                      while (bounds-- && retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
-                        {
-                          retval = TAO_Marshal_TypeCode::deep_copy (tc2, source, dest, env);
-                          source = (char *) source + size;
-                          dest = (char *) dest + size;
-                        }
-                      break;
-                    case CORBA::tk_Principal:
-                      while (bounds-- && retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
-                        {
-                          retval = TAO_Marshal_Principal::deep_copy (tc2, source, dest, env);
-                          source = (char *) source + size;
-                          dest = (char *) dest + size;
-                        }
-                      break;
-                    case CORBA::tk_objref:
-                      while (bounds-- && retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
-                        {
-                          retval = TAO_Marshal_ObjRef::deep_copy (tc2, source, dest, env);
-                          source = (char *) source + size;
-                          dest = (char *) dest + size;
-                        }
-                      break;
-                    case CORBA::tk_struct:
-                      while (bounds-- && retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
-                        {
-                          retval = TAO_Marshal_Struct::deep_copy (tc2, source, dest, env);
-                          source = (char *) source + size;
-                          dest = (char *) dest + size;
-                        }
-                      break;
-                    case CORBA::tk_union:
-                      while (bounds-- && retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
-                        {
-                          retval = TAO_Marshal_Union::deep_copy (tc2, source, dest, env);
-                          source = (char *) source + size;
-                          dest = (char *) dest + size;
-                        }
-                      break;
-                    case CORBA::tk_string:
-                      while (bounds-- && retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
-                        {
-                          retval = TAO_Marshal_Any::deep_copy (tc2, source, dest, env);
-                          source = (char *) source + size;
-                          dest = (char *) dest + size;
-                        }
-                      retval = TAO_Marshal_String::deep_copy (tc2, source, dest, env);
-                      break;
-                    case CORBA::tk_sequence:
-                      while (bounds-- && retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
-                        {
-                          retval = TAO_Marshal_Sequence::deep_copy (tc2, source, dest, env);
-                          source = (char *) source + size;
-                          dest = (char *) dest + size;
-                        }
-                      break;
-                    case CORBA::tk_array:
-                      while (bounds-- && retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
-                        {
-                          retval = TAO_Marshal_Array::deep_copy (tc2, source, dest, env);
-                          source = (char *) source + size;
-                          dest = (char *) dest + size;
-                        }
-                      break;
-                    case CORBA::tk_alias:
-                      while (bounds-- && retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
-                        {
-                          retval = TAO_Marshal_Alias::deep_copy (tc2, source, dest, env);
-                          source = (char *) source + size;
-                          dest = (char *) dest + size;
-                        }
-                      break;
-                    case CORBA::tk_except:
-                      while (bounds-- && retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
-                        {
-                          retval = TAO_Marshal_Except::deep_copy (tc2, source, dest, env);
-                          source = (char *) source + size;
-                          dest = (char *) dest + size;
-                        }
-                      break;
-                    case CORBA::tk_wstring:
-                      while (bounds-- && retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
-                        {
-                          retval = TAO_Marshal_WString::deep_copy (tc2, source, dest, env);
-                          source = (char *) source + size;
-                          dest = (char *) dest + size;
-                        }
-                      break;
-                    default:
-                      retval = CORBA::TypeCode::TRAVERSE_STOP;
-                      break;
-                    } // end of switch
-                  //              CORBA::release (tc2);
-                  if (retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
-		    return CORBA::TypeCode::TRAVERSE_CONTINUE;
-                  else
-                    {
-                      // error exit
-                      env.exception (new CORBA::MARSHAL  (CORBA::COMPLETED_NO));
-                      dmsg ("marshaling TAO_Marshal_Sequence::deep_copy detected error");
-                      return CORBA::TypeCode::TRAVERSE_STOP;
-                    }
-                } // no exception computing size
-              else
-		//              CORBA::release (tc2);
-		return CORBA::TypeCode::TRAVERSE_STOP;
-            } // no exception computing content type
-          else
-	    return CORBA::TypeCode::TRAVERSE_STOP;
-        } // bounds are fine
-      else
-	return CORBA::TypeCode::TRAVERSE_STOP;
-    }
-  else // no typecode
-    {
-      env.exception (new CORBA::BAD_TYPECODE  (CORBA::COMPLETED_MAYBE));
-      dmsg ("TAO_Marshal_Struct::deep_copy detected error");
-      return CORBA::TypeCode::TRAVERSE_STOP;
-    }
-}
-
-// deep_copy alias
-CORBA::TypeCode::traverse_status
-TAO_Marshal_Alias::deep_copy (CORBA::TypeCode_ptr  tc,
-                              const void *source,
-                              const void *dest,
-                              CORBA::Environment &env)
-{
-  CORBA::TypeCode_ptr    tc2;  // typecode of the aliased type
-  CDR stream;  // to access the marshal object
-  CORBA::TypeCode::traverse_status   retval =
-    CORBA::TypeCode::TRAVERSE_CONTINUE; // status of deep_copy operation 
-
-  if (tc)
-    {
-      // get element type
-      tc2 = tc->content_type (env);
-      if (env.exception () == 0)
-        {
-          // switch on the data type and handle the cases for primitives here for
-          // efficiency
-          switch (tc2->kind_)
-            {
-            case CORBA::tk_null:
-            case CORBA::tk_void:
-              //              CORBA::release (tc2);
-              return CORBA::TypeCode::TRAVERSE_CONTINUE;
-            case CORBA::tk_short:
-            case CORBA::tk_ushort:
-              *(CORBA::Short *) dest = *(CORBA::Short *) source;
-              //              CORBA::release (tc2);
-              return CORBA::TypeCode::TRAVERSE_CONTINUE;
-            case CORBA::tk_long:
-            case CORBA::tk_ulong:
-            case CORBA::tk_float:
-            case CORBA::tk_enum:
-              *(CORBA::Long *) dest = *(CORBA::Long *) source;
-              //              CORBA::release (tc2);
-              return CORBA::TypeCode::TRAVERSE_CONTINUE;
-            case CORBA::tk_double:
-            case CORBA::tk_longlong:
-            case CORBA::tk_ulonglong:
-              *(CORBA::LongLong *) dest = *(CORBA::LongLong *) source;
-              //              CORBA::release (tc2);
-              return CORBA::TypeCode::TRAVERSE_CONTINUE;
-            case CORBA::tk_boolean:
-              *(CORBA::Boolean *) dest = *(CORBA::Boolean *) source;
-              //              CORBA::release (tc2);
-              return CORBA::TypeCode::TRAVERSE_CONTINUE;
-            case CORBA::tk_char:
-            case CORBA::tk_octet:
-              *(CORBA::Char *) dest = *(CORBA::Char *) source;
-              //              CORBA::release (tc2);
-              return CORBA::TypeCode::TRAVERSE_CONTINUE;
-            case CORBA::tk_longdouble:
-              *(CORBA::LongDouble *) dest = *(CORBA::LongDouble *) source;
-              //              CORBA::release (tc2);
-              return CORBA::TypeCode::TRAVERSE_CONTINUE;
-            case CORBA::tk_wchar:
-              *(CORBA::WChar *) dest = *(CORBA::WChar *) source;
-              //              CORBA::release (tc2);
-              return CORBA::TypeCode::TRAVERSE_CONTINUE;
-            case CORBA::tk_any:
-              retval = TAO_Marshal_Any::deep_copy (tc2, source, dest, env);
-              break;
-            case CORBA::tk_TypeCode:
-              retval = TAO_Marshal_TypeCode::deep_copy (tc2, source, dest, env);
-              break;
-            case CORBA::tk_Principal:
-              retval = TAO_Marshal_Principal::deep_copy (tc2, source, dest, env);
-              break;
-            case CORBA::tk_objref:
-              retval = TAO_Marshal_ObjRef::deep_copy (tc2, source, dest, env);
-              break;
-            case CORBA::tk_struct:
-              retval = TAO_Marshal_Struct::deep_copy (tc2, source, dest, env);
-              break;
-            case CORBA::tk_union:
-              retval = TAO_Marshal_Union::deep_copy (tc2, source, dest, env);
-              break;
-            case CORBA::tk_string:
-              retval = TAO_Marshal_String::deep_copy (tc2, source, dest, env);
-              break;
-            case CORBA::tk_sequence:
-              retval = TAO_Marshal_Sequence::deep_copy (tc2, source, dest, env);
-              break;
-            case CORBA::tk_array:
-              retval = TAO_Marshal_Array::deep_copy (tc2, source, dest, env);
-              break;
-            case CORBA::tk_alias:
-              retval = TAO_Marshal_Alias::deep_copy (tc2, source, dest, env);
-              break;
-            case CORBA::tk_except:
-              retval = TAO_Marshal_Except::deep_copy (tc2, source, dest, env);
-              break;
-            case CORBA::tk_wstring:
-              retval = TAO_Marshal_WString::deep_copy (tc2, source, dest, env);
-              break;
-            default:
-              // anything else is an error
-              retval = CORBA::TypeCode::TRAVERSE_STOP;
-            }
-          //      CORBA::release (tc2);
-          if (retval == CORBA::TypeCode::TRAVERSE_CONTINUE) 
-	    return CORBA::TypeCode::TRAVERSE_CONTINUE;
-          else 
-            {
-              env.exception (new CORBA::MARSHAL  (CORBA::COMPLETED_MAYBE));
-              dmsg ("TAO_Marshal_Alias::decode detected error");
-              return CORBA::TypeCode::TRAVERSE_STOP;
-            }
-        }
-      else // exception getting content_type
-	return CORBA::TypeCode::TRAVERSE_STOP;
-    }
-  else // no typecode
-    {
-      env.exception (new CORBA::BAD_TYPECODE  (CORBA::COMPLETED_MAYBE));
-      dmsg ("TAO_Marshal_Struct::deep_copy detected error");
-      return CORBA::TypeCode::TRAVERSE_STOP;
-    }
-}
-
-// deep_copy structs
-CORBA::TypeCode::traverse_status
-TAO_Marshal_Except::deep_copy (CORBA::TypeCode_ptr  tc,
-                               const void *source,
-                               const void *dest,
-                               CORBA::Environment &env)
-{
-  CORBA::TypeCode::traverse_status retval = CORBA::TypeCode::TRAVERSE_CONTINUE;
-  CORBA::TypeCode_ptr param;
-  CORBA::Long size;
-  
-  CDR stream;
-
-  if (tc)
-    {
-      // Exceptions in memory have a "hidden" typecode up front, used
-      // to ensure that memory is appropriately freed and to hold the
-      // exception ID.  We just copy that typecode
-
-      *(CORBA::TypeCode_ptr *) dest = *(CORBA::TypeCode_ptr *) source;
-      (void) (*(CORBA::TypeCode_ptr *) dest)->AddRef ();
-
-      // compute the number of fields in the struct
-      int member_count = tc->member_count (env);
-      if (env.exception () == 0)
-        {
-          for (int i = 0;
-	       i < member_count 
-		 && retval == CORBA::TypeCode::TRAVERSE_CONTINUE;
-	       i++)
-            {
-              // get the typecode for the ith field
-              param = tc->member_type (i, env);
-              if (env.exception () == 0)
-                {
-                  // get the size of the field
-                  size = param->size (env);
-                  if (env.exception () == 0)
-                    {
-                      switch (param->kind_)
-                        {
-                        case CORBA::tk_null:
-                        case CORBA::tk_void:
-                          break;
-                        case CORBA::tk_short:
-                        case CORBA::tk_ushort:
-                          *(CORBA::Short *) dest = *(CORBA::Short *) source;
-                          break;
-                        case CORBA::tk_long:
-                        case CORBA::tk_ulong:
-                        case CORBA::tk_float:
-                        case CORBA::tk_enum:
-                          *(CORBA::Long *) dest = *(CORBA::Long *) source;
-                          break;
-                        case CORBA::tk_double:
-                        case CORBA::tk_longlong:
-                        case CORBA::tk_ulonglong:
-                          *(CORBA::LongLong *) dest = *(CORBA::LongLong *) source;
-                          break;
-                        case CORBA::tk_boolean:
-                          *(CORBA::Boolean *) dest = *(CORBA::Boolean *) source;
-                          break;
-                        case CORBA::tk_char:
-                        case CORBA::tk_octet:
-                          *(CORBA::Char *) dest = *(CORBA::Char *) source;
-                          break;
-                        case CORBA::tk_longdouble:
-                          *(CORBA::LongDouble *) dest = *(CORBA::LongDouble *) source;
-                          break;
-                        case CORBA::tk_wchar:
-                          *(CORBA::WChar *) dest = *(CORBA::WChar *) source;
-                          break;
-                        case CORBA::tk_any:
-                          retval = TAO_Marshal_Any::deep_copy (param, source, dest, env);
-                          break;
-                        case CORBA::tk_TypeCode:
-                          retval = TAO_Marshal_TypeCode::deep_copy (param, source, dest, env);
-                          break;
-                        case CORBA::tk_Principal:
-                          retval = TAO_Marshal_Principal::deep_copy (param, source, dest, env);
-                          break;
-                        case CORBA::tk_objref:
-                          retval = TAO_Marshal_ObjRef::deep_copy (param, source, dest, env);
-                          break;
-                        case CORBA::tk_struct:
-                          retval = TAO_Marshal_Struct::deep_copy (param, source, dest, env);
-                          break;
-                        case CORBA::tk_union:
-                          retval = TAO_Marshal_Union::deep_copy (param, source, dest, env);
-                          break;
-                        case CORBA::tk_string:
-                          retval = TAO_Marshal_String::deep_copy (param, source, dest, env);
-                          break;
-                        case CORBA::tk_sequence:
-                          retval = TAO_Marshal_Sequence::deep_copy (param, source, dest, env);
-                          break;
-                        case CORBA::tk_array:
-                          retval = TAO_Marshal_Array::deep_copy (param, source, dest, env);
-                          break;
-                        case CORBA::tk_alias:
-                          retval = TAO_Marshal_Alias::deep_copy (param, source, dest, env);
-                          break;
-                        case CORBA::tk_except:
-                          retval = TAO_Marshal_Except::deep_copy (param, source, dest, env);
-                          break;
-                        case CORBA::tk_wstring:
-                          retval = TAO_Marshal_WString::deep_copy (param, source, dest, env);
-                          break;
-                        default:
-                          retval = CORBA::TypeCode::TRAVERSE_STOP;
-                        } // end of switch
-                      source = (char *) source + size;
-                      dest = (char *) dest + size;
-                    }
-                  else  // exception computing size 
-                    {
-                      dmsg ("TAO_Marshal_Struct::deep_copy detected error");
-                      return CORBA::TypeCode::TRAVERSE_STOP;
-                    }
-                } 
-              else  // exception computing typecode
-                {
-                  dmsg ("TAO_Marshal_Struct::deep_copy detected error");
-                  return CORBA::TypeCode::TRAVERSE_STOP;
-                }
-            } // end of loop
-          if (retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
-	    return CORBA::TypeCode::TRAVERSE_CONTINUE;
-          else
-            {
-              env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE));
-              dmsg ("TAO_Marshal_Struct::deep_copy detected error");
-              return CORBA::TypeCode::TRAVERSE_STOP;
-            }
-        } 
-      else // exception getting member count 
-        {
-          dmsg ("TAO_Marshal_Struct::deep_copy detected error");
-          return CORBA::TypeCode::TRAVERSE_STOP;
-        }
-    }
-  else // no typecode
-    {
-      env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_MAYBE));
-      dmsg ("TAO_Marshal_Struct::deep_copy detected error");
-      return CORBA::TypeCode::TRAVERSE_STOP;
-    }
-}
diff --git a/TAO/tao/deep_free.cpp b/TAO/tao/deep_free.cpp
deleted file mode 100644
index b932715be69..00000000000
--- a/TAO/tao/deep_free.cpp
+++ /dev/null
@@ -1,934 +0,0 @@
-// ============================================================================
-//
-// = LIBRARY
-//    TAO
-// 
-// = FILENAME
-//    deep_free.cpp
-//
-// = DESCRIPTION
-//   Code for deep_free
-//   The original code had a single static deep_free function that called
-//   traverse to interpret the data types. This version defines a static method
-//   "deep_free" on each class and avoids calling traverse.
-//
-//   Helper routine for "Any" destructor.
-//
-//   This frees all the memory pointed to by any given value held inside
-//   of an "Any".  For most data types it does nothing, since most data
-//   types don't hold any memory.  For a few, it calls other deep_free methods
-//   to free the memory
-//
-
-//
-// = AUTHOR
-//     Copyright 1994-1995 by Sun Microsystems Inc.
-//     and 
-//     Aniruddha Gokhale
-// 
-// ============================================================================
-
-#include "tao/corba.h"
-
-extern CORBA::TypeCode TC_opaque;
-
-// Deep copy from "source" to "dest" ... this code "knows" a bit about
-// representations, verify it when porting to oddball platforms with
-// non-IEEE floating point values or atypical byte and word sizes.
-
-CORBA::TypeCode::traverse_status
-DEEP_FREE (CORBA::TypeCode_ptr  param,
-	   const void *source,
-	   const void *dest,
-	   CORBA::Environment &env)
-{
-  CORBA::TypeCode::traverse_status retval = CORBA::TypeCode::TRAVERSE_CONTINUE;
-
-  switch (param->kind_)
-    {
-    case CORBA::tk_null:
-    case CORBA::tk_void:
-    case CORBA::tk_short:
-    case CORBA::tk_ushort:
-    case CORBA::tk_long:
-    case CORBA::tk_ulong:
-    case CORBA::tk_float:
-    case CORBA::tk_enum:
-    case CORBA::tk_double:
-    case CORBA::tk_longlong:
-    case CORBA::tk_ulonglong:
-    case CORBA::tk_boolean:
-    case CORBA::tk_char:
-    case CORBA::tk_octet:
-    case CORBA::tk_longdouble:
-    case CORBA::tk_wchar:
-      break;
-    case CORBA::tk_any:
-      retval = TAO_Marshal_Any::deep_free (param, source, dest, env);
-      break;
-    case CORBA::tk_TypeCode:
-      retval = TAO_Marshal_TypeCode::deep_free (param, source, dest, env);
-      break;
-    case CORBA::tk_Principal:
-      retval = TAO_Marshal_Principal::deep_free (param, source, dest, env);
-      break;
-    case CORBA::tk_objref:
-      retval = TAO_Marshal_ObjRef::deep_free (param, source, dest, env);
-      break;
-    case CORBA::tk_struct:
-      retval = TAO_Marshal_Struct::deep_free (param, source, dest, env);
-      break;
-    case CORBA::tk_union:
-      retval = TAO_Marshal_Union::deep_free (param, source, dest, env);
-      break;
-    case CORBA::tk_string:
-      retval = TAO_Marshal_String::deep_free (param, source, dest, env);
-      break;
-    case CORBA::tk_sequence:
-      retval = TAO_Marshal_Sequence::deep_free (param, source, dest, env);
-      break;
-    case CORBA::tk_array:
-      retval = TAO_Marshal_Array::deep_free (param, source, dest, env);
-      break;
-    case CORBA::tk_alias:
-      retval = TAO_Marshal_Alias::deep_free (param, source, dest, env);
-      break;
-    case CORBA::tk_except:
-      retval = TAO_Marshal_Except::deep_free (param, source, dest, env);
-      break;
-    case CORBA::tk_wstring:
-      retval = TAO_Marshal_WString::deep_free (param, source, dest, env);
-      break;
-    default:
-      retval = CORBA::TypeCode::TRAVERSE_STOP;
-    } // end of switch
-  return retval;
-}
-
-// deep copy for primitives
-CORBA::TypeCode::traverse_status
-TAO_Marshal_Primitive::deep_free (CORBA::TypeCode_ptr  tc,
-				  const void *,
-				  const void *,
-				  CORBA::Environment &env)
-{
-  CORBA::TCKind my_kind;
-
-  if (tc) 
-    {
-      my_kind = tc->kind (env);
-
-      if (env.exception () == 0)
-	{
-	  switch (my_kind) 
-	    {
-	    case CORBA::tk_null:
-	    case CORBA::tk_void:
-	    case CORBA::tk_char:
-	    case CORBA::tk_octet:
-	    case CORBA::tk_short:
-	    case CORBA::tk_ushort:
-	    case CORBA::tk_wchar:
-	    case CORBA::tk_long:
-	    case CORBA::tk_ulong:
-	    case CORBA::tk_float:
-	    case CORBA::tk_enum:
-	    case CORBA::tk_longlong:
-	    case CORBA::tk_ulonglong:
-	    case CORBA::tk_double:
-	    case CORBA::tk_longdouble:
-	    case CORBA::tk_boolean:
-	      return CORBA::TypeCode::TRAVERSE_CONTINUE;
-	    default:
-	      env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_MAYBE));
-	      dmsg ("TAO_Marshal_Primitive::deep_free detected error");
-	      return CORBA::TypeCode::TRAVERSE_STOP;
-	    }
-	}
-      else
-	{
-	  dmsg ("TAO_Marshal_Primitive::deep_free detected error");
-	  return CORBA::TypeCode::TRAVERSE_STOP;
-	}
-    }
-  else 
-    {
-      env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_MAYBE) );
-      dmsg ("TAO_Marshal_Primitive::deep_free detected error");
-      return CORBA::TypeCode::TRAVERSE_STOP;
-    }
-}
-
-// deep_free structs
-CORBA::TypeCode::traverse_status
-TAO_Marshal_Struct::deep_free (CORBA::TypeCode_ptr  tc,
-			       const void *source,
-			       const void *dest,
-			       CORBA::Environment &env)
-{
-  CORBA::TypeCode::traverse_status retval = CORBA::TypeCode::TRAVERSE_CONTINUE;
-  CORBA::TypeCode_ptr param;
-  CORBA::Long size;
-  CDR stream;
-
-  if (tc)
-    {
-      // compute the number of fields in the struct
-      int member_count = tc->member_count (env);
-      if (env.exception () == 0)
-	{
-	  for (int i = 0; i < member_count && retval ==
-                 CORBA::TypeCode::TRAVERSE_CONTINUE; i++)
-	    {
-	      // get the typecode for the ith field
-	      param = tc->member_type (i, env);
-	      if (env.exception () == 0)
-		{
-		  // get the size of the field
-		  size = param->size (env);
-		  if (env.exception () == 0)
-		    {
-                      switch (param->kind_)
-                        {
-                        case CORBA::tk_null:
-                        case CORBA::tk_void:
-                        case CORBA::tk_short:
-                        case CORBA::tk_ushort:
-                        case CORBA::tk_long:
-                        case CORBA::tk_ulong:
-                        case CORBA::tk_float:
-                        case CORBA::tk_enum:
-                        case CORBA::tk_double:
-                        case CORBA::tk_longlong:
-                        case CORBA::tk_ulonglong:
-                        case CORBA::tk_boolean:
-                        case CORBA::tk_char:
-                        case CORBA::tk_octet:
-                        case CORBA::tk_longdouble:
-                        case CORBA::tk_wchar:
-                          break;
-                        case CORBA::tk_any:
-                          retval = TAO_Marshal_Any::deep_free (param, source, dest, env);
-                          break;
-                        case CORBA::tk_TypeCode:
-                          retval = TAO_Marshal_TypeCode::deep_free (param, source, dest, env);
-                          break;
-                        case CORBA::tk_Principal:
-                          retval = TAO_Marshal_Principal::deep_free (param, source, dest, env);
-                          break;
-                        case CORBA::tk_objref:
-                          retval = TAO_Marshal_ObjRef::deep_free (param, source, dest, env);
-                          break;
-                        case CORBA::tk_struct:
-                          retval = TAO_Marshal_Struct::deep_free (param, source, dest, env);
-                          break;
-                        case CORBA::tk_union:
-                          retval = TAO_Marshal_Union::deep_free (param, source, dest, env);
-                          break;
-                        case CORBA::tk_string:
-                          retval = TAO_Marshal_String::deep_free (param, source, dest, env);
-                          break;
-                        case CORBA::tk_sequence:
-                          retval = TAO_Marshal_Sequence::deep_free (param, source, dest, env);
-                          break;
-                        case CORBA::tk_array:
-                          retval = TAO_Marshal_Array::deep_free (param, source, dest, env);
-                          break;
-                        case CORBA::tk_alias:
-                          retval = TAO_Marshal_Alias::deep_free (param, source, dest, env);
-                          break;
-                        case CORBA::tk_except:
-                          retval = TAO_Marshal_Except::deep_free (param, source, dest, env);
-                          break;
-                        case CORBA::tk_wstring:
-                          retval = TAO_Marshal_WString::deep_free (param, source, dest, env);
-                          break;
-                        default:
-                          retval = CORBA::TypeCode::TRAVERSE_STOP;
-                        } // end of switch
-                      source = (char *)source + size;
-		    } 
-		  else  // exception computing size 
-		    {
-		      dmsg ("TAO_Marshal_Struct::deep_free detected error");
-		      return CORBA::TypeCode::TRAVERSE_STOP;
-		    }
-		} 
-	      else  // exception computing typecode
-		{
-		  dmsg ("TAO_Marshal_Struct::deep_free detected error");
-		  return CORBA::TypeCode::TRAVERSE_STOP;
-		}
-	    } // end of loop
-	  if (retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
-	    return CORBA::TypeCode::TRAVERSE_CONTINUE;
-	  else
-	    {
-	      env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE));
-	      dmsg ("TAO_Marshal_Struct::deep_free detected error");
-	      return CORBA::TypeCode::TRAVERSE_STOP;
-	    }
-	} 
-      else // exception getting member count 
-	{
-	  dmsg ("TAO_Marshal_Struct::deep_free detected error");
-	  return CORBA::TypeCode::TRAVERSE_STOP;
-	}
-    }
-  else // no typecode
-    {
-      env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_MAYBE));
-      dmsg ("TAO_Marshal_Struct::deep_free detected error");
-      return CORBA::TypeCode::TRAVERSE_STOP;
-    }
-}
-
-// deep_free for union
-CORBA::TypeCode::traverse_status
-TAO_Marshal_Union::deep_free (CORBA::TypeCode_ptr  tc,
-			      const void *data,
-			      const void *data2,
-			      CORBA::Environment &env)
-{
-  CORBA::TypeCode::traverse_status retval = CORBA::TypeCode::TRAVERSE_CONTINUE;
-  CORBA::TypeCode_ptr discrim_tc;
-  CORBA::TypeCode_ptr member_tc;
-  CORBA::Any_ptr member_label;
-  CORBA::ULong discrim_size_with_pad;
-  const void *discrim_val;
-  CORBA::ULong member_count;
-  CORBA::Long  default_index;
-  CORBA::ULong i;
-  CORBA::TypeCode_ptr default_tc = 0;
-  CORBA::Boolean discrim_matched = CORBA::B_FALSE;
-
-  discrim_tc = tc->discriminator_type (env);
-  // get the discriminator type
-  if (env.exception () == 0)
-    {
-      // deep_free the discriminator value
-      retval = DEEP_FREE (discrim_tc, data, data2, env);
-      if (retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
-	{
-	  discrim_size_with_pad = tc->TAO_discrim_pad_size (env);
-	  if (env.exception () == 0)
-	    {
-	      discrim_val = data; // save the pointer to the discriminator
-				  // value 
-	      // move the pointer to point to the actual value
-	      data = (char *)data + discrim_size_with_pad;
-	      data2 = (char *)data2 + discrim_size_with_pad;
-	      // now get ready to marshal the actual union value
-	      default_index = tc->default_index (env);
-	      if (env.exception () == 0)
-		{
-		  member_count = tc->member_count (env);
-		  if (env.exception () == 0)
-		    {
-		      // check which label value matches with the discriminator
-		      // value. Accordingly, marshal the corresponding
-		      // member_type. If none match, check if default exists
-		      // and marshal accordingly. Otherwise it is an error.
-		      for (i = 0; member_count-- != 0; i++)
-			{
-			  member_label = tc->member_label (i, env);
-			  if (env.exception () == 0)
-			    {
-			      // do the matching
-			      switch (member_label->type ()->kind (env))
-				{
-				case CORBA::tk_short:
-				case CORBA::tk_ushort:
-				  if (*(CORBA::Short *)member_label->value () ==
-				      *(CORBA::Short *)discrim_val)
-				    discrim_matched = CORBA::B_TRUE;
-				  break;
-				case CORBA::tk_long:
-				case CORBA::tk_ulong:
-				case CORBA::tk_enum:
-				  if (*(CORBA::ULong *)member_label->value () ==
-				      *(CORBA::ULong *)discrim_val)
-				      discrim_matched = CORBA::B_TRUE;
-				  break;
-				case CORBA::tk_char:
-				  if (*(CORBA::Char *)member_label->value () ==
-				      *(CORBA::Char *)discrim_val)
-				    discrim_matched = CORBA::B_TRUE;
-				  break;
-				case CORBA::tk_wchar:
-				  if (*(CORBA::WChar *)member_label->value () ==
-				      *(CORBA::WChar *)discrim_val)
-				    discrim_matched = CORBA::B_TRUE;
-				  break;
-				case CORBA::tk_boolean:
-				  if (*(CORBA::Boolean *)member_label->value () ==
-				      *(CORBA::Boolean *)discrim_val)
-				    discrim_matched = CORBA::B_TRUE;
-				  break;
-				default:
-				  env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO));
-				  return CORBA::TypeCode::TRAVERSE_STOP;
-				}// end of switch
-
-			      // get the member typecode
-			      member_tc = tc->member_type (i, env);
-			      if (env.exception () == 0)
-				{
-				  if (default_index >= 0 && default_index-- == 0)
-				    {
-				      // have we reached the default label?, if so,
-				      // save a handle to the typecode for the default
-				      default_tc = member_tc;
-				    }
-				  if (discrim_matched)
-				    // marshal according to the matched typecode
-				    return DEEP_FREE (member_tc, data,
-						      data2, env);
-				}
-			      else
-				{
-				  env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE));
-				  return CORBA::TypeCode::TRAVERSE_STOP;
-				}
-			      
-			    }
-			  else
-			    {
-			      env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE));
-			      return CORBA::TypeCode::TRAVERSE_STOP;
-			    }
-			} // end of while
-		      // we are here only if there was no match
-		      if (default_tc)
-			return DEEP_FREE (default_tc, data, data2, env);
-		      else
-			return CORBA::TypeCode::TRAVERSE_CONTINUE;
-		    }
-		  else
-		    {
-		      env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE));
-		      return CORBA::TypeCode::TRAVERSE_STOP;
-		    }
-		}
-	      else
-		{
-		  env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE));
-		  return CORBA::TypeCode::TRAVERSE_STOP;
-		}
-	    }
-	  else
-	    {
-	      env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE));
-	      return CORBA::TypeCode::TRAVERSE_STOP;
-	    }
-	}
-      else
-	{
-	  env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE));
-	  return CORBA::TypeCode::TRAVERSE_STOP;
-	}
-    }
-  else
-    {
-      env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE));
-      return CORBA::TypeCode::TRAVERSE_STOP;
-    }
-}
-
-// deep_free for Sequence
-CORBA::TypeCode::traverse_status
-TAO_Marshal_Sequence::deep_free (CORBA::TypeCode_ptr  tc,
-				 const void *source,
-				 const void *dest,
-				 CORBA::Environment &env)
-{
-  CORBA::TypeCode::traverse_status retval =
-    CORBA::TypeCode::TRAVERSE_CONTINUE;  // return status
-  CORBA::TypeCode_ptr	tc2;  // typecode of the element
-  size_t  size; // size of element
-  CORBA::ULong  bounds;
-  char *value1;
-  CORBA::OctetSeq          *src;
-  CDR stream;  // used only to access the marshal_object factory
-
-  // Rely on binary format of sequences -- all are the same
-  // except for the type pointed to by "buffer"
-
-  if (tc)
-    {
-      src = (CORBA::OctetSeq *) source;
-
-      // get element typecode
-      tc2 = tc->content_type (env);  
-      if (env.exception () == 0)
-	{
-	  // get the size of the element
-	  size = tc2->size (env);
-	  if (env.exception () == 0)
-	    {
-	      // compute the length of the sequence
-	      bounds = src->length;
-
-		  value1 = (char *)src->buffer;
-		  switch (tc2->kind_)
-		    {
-		    case CORBA::tk_null:
-		    case CORBA::tk_void:
-		    case CORBA::tk_short:
-		    case CORBA::tk_ushort:
-		    case CORBA::tk_long:
-		    case CORBA::tk_ulong:
-		    case CORBA::tk_float:
-		    case CORBA::tk_double:
-		    case CORBA::tk_longlong:
-		    case CORBA::tk_ulonglong:
-		    case CORBA::tk_boolean:
-		    case CORBA::tk_char:
-		    case CORBA::tk_octet:
-		    case CORBA::tk_longdouble:
-		    case CORBA::tk_wchar:
-		    case CORBA::tk_enum:
-		      delete [] src->buffer;
-		      //		      CORBA::release (tc2);
-		      return CORBA::TypeCode::TRAVERSE_CONTINUE;
-
-		      // handle all aggregate types here
-		    case CORBA::tk_any:
-		      while (bounds-- && retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
-			{
-			  retval = TAO_Marshal_Any::deep_free (tc2, source, dest, env);
-			  value1 = (char *)value1 + size;
-			}
-		      break;
-		    case CORBA::tk_TypeCode:
-		      while (bounds-- && retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
-			{
-			  retval = TAO_Marshal_TypeCode::deep_free (tc2, source, dest, env);
-			  value1 = (char *)value1 + size;
-			}
-		      break;
-		    case CORBA::tk_Principal:
-		      while (bounds-- && retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
-			{
-			  retval = TAO_Marshal_Principal::deep_free (tc2, source, dest, env);
-			  value1 = (char *)value1 + size;
-			}
-		      break;
-		    case CORBA::tk_objref:
-		      while (bounds-- && retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
-			{
-			  retval = TAO_Marshal_ObjRef::deep_free (tc2, source, dest, env);
-			  value1 = (char *)value1 + size;
-			}
-		      break;
-		    case CORBA::tk_struct:
-		      while (bounds-- && retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
-			{
-			  retval = TAO_Marshal_Struct::deep_free (tc2, source, dest, env);
-			  value1 = (char *)value1 + size;
-			}
-		      break;
-		    case CORBA::tk_union:
-		      while (bounds-- && retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
-			{
-			  retval = TAO_Marshal_Union::deep_free (tc2, source, dest, env);
-			  value1 = (char *)value1 + size;
-			}
-		      break;
-		    case CORBA::tk_string:
-		      while (bounds-- && retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
-			{
-			  retval = TAO_Marshal_Any::deep_free (tc2, source, dest, env);
-			  value1 = (char *)value1 + size;
-			}
-		      retval = TAO_Marshal_String::deep_free (tc2, source, dest, env);
-		      break;
-		    case CORBA::tk_sequence:
-		      while (bounds-- && retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
-			{
-			  retval = TAO_Marshal_Sequence::deep_free (tc2, source, dest, env);
-			  value1 = (char *)value1 + size;
-			}
-		      break;
-		    case CORBA::tk_array:
-		      while (bounds-- && retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
-			{
-			  retval = TAO_Marshal_Array::deep_free (tc2, source, dest, env);
-			  value1 = (char *)value1 + size;
-			}
-		      break;
-		    case CORBA::tk_alias:
-		      while (bounds-- && retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
-			{
-			  retval = TAO_Marshal_Alias::deep_free (tc2, source, dest, env);
-			  value1 = (char *)value1 + size;
-			}
-		      break;
-		    case CORBA::tk_except:
-		      while (bounds-- && retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
-			{
-			  retval = TAO_Marshal_Except::deep_free (tc2, source, dest, env);
-			  value1 = (char *)value1 + size;
-			}
-		      break;
-		    case CORBA::tk_wstring:
-		      while (bounds-- && retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
-			{
-			  retval = TAO_Marshal_WString::deep_free (tc2, source, dest, env);
-			  value1 = (char *)value1 + size;
-			}
-		      break;
-		    default:
-		      retval = CORBA::TypeCode::TRAVERSE_STOP;
-		      break;
-		    } // end of switch
-		  //		  CORBA::release (tc2);
-		  if (retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
-		    return CORBA::TypeCode::TRAVERSE_CONTINUE;
-		  else
-		    {
-		      // error exit
-		      env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_NO));
-		      dmsg ("marshaling TAO_Marshal_Sequence::deep_free detected error");
-		      return CORBA::TypeCode::TRAVERSE_STOP;
-		    }
-	    } 
-	  else // exception computing size
-	    {
-	      //	      CORBA::release (tc2);
-	      env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_MAYBE));
-	      dmsg ("marshaling TAO_Marshal_Sequence::deep_free detected error");
-	      return CORBA::TypeCode::TRAVERSE_STOP;
-	    }
-	} 
-      else // exception computing content type
-	{
-	  env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_MAYBE));
-	  dmsg ("marshaling TAO_Marshal_Sequence::deep_free detected error");
-	  return CORBA::TypeCode::TRAVERSE_STOP;
-	}
-    }
-  else // no typecode
-    {
-      env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_MAYBE));
-      dmsg ("TAO_Marshal_Struct::deep_free detected error");
-      return CORBA::TypeCode::TRAVERSE_STOP;
-    }
-}
-
-// deep_free for Array
-CORBA::TypeCode::traverse_status
-TAO_Marshal_Array::deep_free (CORBA::TypeCode_ptr  tc,
-			      const void *source,
-			      const void *dest,
-			      CORBA::Environment &env)
-{
-  CORBA::TypeCode::traverse_status retval =
-    CORBA::TypeCode::TRAVERSE_CONTINUE;  // return status
-  CORBA::TypeCode_ptr	tc2;  // typecode of the element
-  size_t  size; // size of element
-  CORBA::ULong  bounds;
-  CDR stream;  // used only to access the marshal_object factory
-
-  // Rely on binary format of sequences -- all are the same
-  // except for the type pointed to by "buffer"
-
-  if (tc)
-    {
-      bounds = tc->length (env);
-      if (env.exception () == 0)
-	{
-	  // get element typecode
-	  tc2 = tc->content_type (env);  
-	  if (env.exception () == 0)
-	    {
-	      // get the size of the element type
-	      size = tc2->size (env);
-	      if (env.exception () == 0)
-		{
-		  switch (tc2->kind_)
-		    {
-		    case CORBA::tk_null:
-		    case CORBA::tk_void:
-		    case CORBA::tk_short:
-		    case CORBA::tk_ushort:
-		    case CORBA::tk_long:
-		    case CORBA::tk_ulong:
-		    case CORBA::tk_float:
-		    case CORBA::tk_double:
-		    case CORBA::tk_longlong:
-		    case CORBA::tk_ulonglong:
-		    case CORBA::tk_boolean:
-		    case CORBA::tk_char:
-		    case CORBA::tk_octet:
-		    case CORBA::tk_longdouble:
-		    case CORBA::tk_wchar:
-		    case CORBA::tk_enum:
-		      //		      CORBA::release (tc2);
-		      return CORBA::TypeCode::TRAVERSE_CONTINUE;
-
-		      // handle all aggregate types here
-		    case CORBA::tk_any:
-		      while (bounds-- && retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
-			{
-			  retval = TAO_Marshal_Any::deep_free (tc2, source, dest, env);
-			  source = (char *)source + size;
-			}
-		      break;
-		    case CORBA::tk_TypeCode:
-		      while (bounds-- && retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
-			{
-			  retval = TAO_Marshal_TypeCode::deep_free (tc2, source, dest, env);
-			  source = (char *)source + size;
-			}
-		      break;
-		    case CORBA::tk_Principal:
-		      while (bounds-- && retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
-			{
-			  retval = TAO_Marshal_Principal::deep_free (tc2, source, dest, env);
-			  source = (char *)source + size;
-			}
-		      break;
-		    case CORBA::tk_objref:
-		      while (bounds-- && retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
-			{
-			  retval = TAO_Marshal_ObjRef::deep_free (tc2, source, dest, env);
-			  source = (char *)source + size;
-			}
-		      break;
-		    case CORBA::tk_struct:
-		      while (bounds-- && retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
-			{
-			  retval = TAO_Marshal_Struct::deep_free (tc2, source, dest, env);
-			  source = (char *)source + size;
-			}
-		      break;
-		    case CORBA::tk_union:
-		      while (bounds-- && retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
-			{
-			  retval = TAO_Marshal_Union::deep_free (tc2, source, dest, env);
-			  source = (char *)source + size;
-			}
-		      break;
-		    case CORBA::tk_string:
-		      while (bounds-- && retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
-			{
-			  retval = TAO_Marshal_String::deep_free (tc2, source, dest, env);
-			  source = (char *)source + size;
-			}
-		      break;
-		    case CORBA::tk_sequence:
-		      while (bounds-- && retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
-			{
-			  retval = TAO_Marshal_Sequence::deep_free (tc2, source, dest, env);
-			  source = (char *)source + size;
-			}
-		      break;
-		    case CORBA::tk_array:
-		      while (bounds-- && retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
-			{
-			  retval = TAO_Marshal_Array::deep_free (tc2, source, dest, env);
-			  source = (char *)source + size;
-			}
-		      break;
-		    case CORBA::tk_alias:
-		      while (bounds-- && retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
-			{
-			  retval = TAO_Marshal_Alias::deep_free (tc2, source, dest, env);
-			  source = (char *)source + size;
-			}
-		      break;
-		    case CORBA::tk_except:
-		      while (bounds-- && retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
-			{
-			  retval = TAO_Marshal_Except::deep_free (tc2, source, dest, env);
-			  source = (char *)source + size;
-			}
-		      break;
-		    case CORBA::tk_wstring:
-		      while (bounds-- && retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
-			{
-			  retval = TAO_Marshal_WString::deep_free (tc2, source, dest, env);
-			  source = (char *)source + size;
-			}
-		      break;
-		    default:
-		      retval = CORBA::TypeCode::TRAVERSE_STOP;
-		      break;
-		    } // end of switch
-		  //		  CORBA::release (tc2);
- 		  if (retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
-		    return CORBA::TypeCode::TRAVERSE_CONTINUE;
-		  else
-		    {
-		      // error exit
-		      env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_NO));
-		      dmsg ("marshaling TAO_Marshal_Sequence::deep_free detected error");
-		      return CORBA::TypeCode::TRAVERSE_STOP;
-		    }
-		} // no exception computing size
-	      else
-		//		  CORBA::release (tc2);
-		return CORBA::TypeCode::TRAVERSE_STOP;
-	    } 
-	  else // exception computing content type
-	    return CORBA::TypeCode::TRAVERSE_STOP;
-	} 
-      else // exception getting bounds
-	return CORBA::TypeCode::TRAVERSE_STOP;
-    }
-  else // no typecode
-    {
-      env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_MAYBE));
-      dmsg ("TAO_Marshal_Struct::deep_free detected error");
-      return CORBA::TypeCode::TRAVERSE_STOP;
-    }
-}
-
-// deep_free alias
-CORBA::TypeCode::traverse_status
-TAO_Marshal_Alias::deep_free (CORBA::TypeCode_ptr  tc,
-			      const void *source,
-			      const void *dest,
-			      CORBA::Environment &env)
-{
-  CORBA::TypeCode_ptr	tc2;  // typecode of the aliased type
-  CDR stream;  // to access the marshal object
-  CORBA::TypeCode::traverse_status   retval =
-    CORBA::TypeCode::TRAVERSE_CONTINUE; // status of encode operation 
-
-  if (tc)
-    {
-      // get element type
-      tc2 = tc->content_type (env);
-      if (env.exception () == 0)
-	{
-	  // switch on the data type and handle the cases for primitives here for
-	  // efficiency
-	  switch (tc2->kind_)
-	    {
-	    case CORBA::tk_null:
-	    case CORBA::tk_void:
-	    case CORBA::tk_short:
-	    case CORBA::tk_ushort:
-	    case CORBA::tk_long:
-	    case CORBA::tk_ulong:
-	    case CORBA::tk_float:
-	    case CORBA::tk_enum:
-	    case CORBA::tk_double:
-	    case CORBA::tk_longlong:
-	    case CORBA::tk_ulonglong:
-	    case CORBA::tk_boolean:
-	    case CORBA::tk_char:
-	    case CORBA::tk_octet:
-	    case CORBA::tk_longdouble:
-	    case CORBA::tk_wchar:
-	      //	      CORBA::release (tc2);
-	      return CORBA::TypeCode::TRAVERSE_CONTINUE;
-	    case CORBA::tk_any:
-	      retval = TAO_Marshal_Any::deep_free (tc2, source, dest, env);
-	      break;
-	    case CORBA::tk_TypeCode:
-	      retval = TAO_Marshal_TypeCode::deep_free (tc2, source, dest, env);
-	      break;
-	    case CORBA::tk_Principal:
-	      retval = TAO_Marshal_Principal::deep_free (tc2, source, dest, env);
-	      break;
-	    case CORBA::tk_objref:
-	      retval = TAO_Marshal_ObjRef::deep_free (tc2, source, dest, env);
-	      break;
-	    case CORBA::tk_struct:
-	      retval = TAO_Marshal_Struct::deep_free (tc2, source, dest, env);
-	      break;
-	    case CORBA::tk_union:
-	      retval = TAO_Marshal_Union::deep_free (tc2, source, dest, env);
-	      break;
-	    case CORBA::tk_string:
-	      retval = TAO_Marshal_String::deep_free (tc2, source, dest, env);
-	      break;
-	    case CORBA::tk_sequence:
-	      retval = TAO_Marshal_Sequence::deep_free (tc2, source, dest, env);
-	      break;
-	    case CORBA::tk_array:
-	      retval = TAO_Marshal_Array::deep_free (tc2, source, dest, env);
-	      break;
-	    case CORBA::tk_alias:
-	      retval = TAO_Marshal_Alias::deep_free (tc2, source, dest, env);
-	      break;
-	    case CORBA::tk_except:
-	      retval = TAO_Marshal_Except::deep_free (tc2, source, dest, env);
-	      break;
-	    case CORBA::tk_wstring:
-	      retval = TAO_Marshal_WString::deep_free (tc2, source, dest, env);
-	      break;
-	    default:
-	      // anything else is an error
-	      retval = CORBA::TypeCode::TRAVERSE_STOP;
-	    }
-	  //	  CORBA::release (tc2);
-	  if (retval == CORBA::TypeCode::TRAVERSE_CONTINUE) 
-	    return CORBA::TypeCode::TRAVERSE_CONTINUE;
-	  else 
-	    {
-	      env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE));
-	      dmsg ("TAO_Marshal_Alias::decode detected error");
-	      return CORBA::TypeCode::TRAVERSE_STOP;
-	    }
-	}
-      else // exception getting content_type
-	return CORBA::TypeCode::TRAVERSE_STOP;
-    }
-  else // no typecode
-    {
-      env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_MAYBE));
-      dmsg ("TAO_Marshal_Struct::deep_free detected error");
-      return CORBA::TypeCode::TRAVERSE_STOP;
-    }
-}
-
-// deep_free structs
-CORBA::TypeCode::traverse_status
-TAO_Marshal_Except::deep_free (CORBA::TypeCode_ptr  tc,
-			       const void *,
-			       const void *,
-			       CORBA::Environment &env)
-{
-#if 0
-  // temporarily commented out to make compiler happy
-  CORBA::Long i, 
-    member_count;      // number of fields in the struct
-  CORBA::TypeCode::traverse_status retval = CORBA::TypeCode::TRAVERSE_CONTINUE;
-  CORBA::TypeCode_ptr param;
-  CORBA::Long size, alignment;
-  CDR stream;
-#endif /* 0 */
-
-  if (tc)
-    // XXX: Exceptions are currently leaked because of bugs lurking
-    // in this area.  Keep in mind that there are two things to
-    // free: (a) the typecode in the exception base class; (b) any
-    // pointers held by a user-defined exception, such as an objref
-    // or string.
-    //
-    // Since this code does nothing, it should leak BOTH of those
-    // kinds of memory.  Since it's not supposed to be called except
-    // when the exception really is being freed, it should only be
-    // called when the reference count in the exception base class
-    // is zero.
-    //
-    // It's not clear which of those assertions actually hold.
-    //
-    // The code SHOULD be just like the traverse () call for a
-    // structure, with (a) a precondition that the reference count
-    // is zero, (b) an assertion that the typecode in the exception
-    // and "tc" are equivalent, (c) releasing that typecode found
-    // within the exception.
-    //
-    return CORBA::TypeCode::TRAVERSE_CONTINUE;
-  else // no typecode
-    {
-      env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_MAYBE));
-      dmsg ("TAO_Marshal_Struct::deep_free detected error");
-      return CORBA::TypeCode::TRAVERSE_STOP;
-    }
-}
diff --git a/TAO/tao/default.bld b/TAO/tao/default.bld
deleted file mode 100644
index 6feb286cf89..00000000000
--- a/TAO/tao/default.bld
+++ /dev/null
@@ -1,24 +0,0 @@
-#!build
-default:
-	nobuild
-	:cx_template_option=noautomatic
-	:optimize=standard
-	:optimize=memory
-	:optimize=loop
-	:debuglevel=multi
-	:cx_template=never
-	:defines=TAO_PLATFORM_SVC_CONF_FILE_NOTSUP
-tao.bld
-	library
-	:cx_e_option=msgnumbers
-	:dependency=nodepend
-	:object_dir=./.obj
-	:cx_silent=21
-	:cx_silent=191
-	:cx_silent=610
-	:sourcedirs=/home/ace/ACE_wrappers.vxworks
-	:sourcedirs=..
-	:sourcedirs=./compat
-	:libraries=/appl/newgreen/vxppc603/ghsbltin.o
-	:libraries=/appl/newgreen/vxppc603/ghsmath.o
-	:defines=DEBUG
diff --git a/TAO/tao/default_client.cpp b/TAO/tao/default_client.cpp
deleted file mode 100644
index 7f7c5513cd8..00000000000
--- a/TAO/tao/default_client.cpp
+++ /dev/null
@@ -1,40 +0,0 @@
-// ============================================================================
-//
-// = LIBRARY
-//    TAO
-// 
-// = FILENAME
-//     default_client.cpp
-//
-// = AUTHOR
-//     Chris Cleeland
-//
-// = VERSION
-//     $Id$
-// ============================================================================
-
-#include "tao/default_client.h"
-#include "tao/orb_core.h"
-
-TAO_Default_Client_Strategy_Factory::TAO_Default_Client_Strategy_Factory (void)
-{
-}
-
-TAO_Default_Client_Strategy_Factory::~TAO_Default_Client_Strategy_Factory (void)
-{
-}
-
-int
-TAO_Default_Client_Strategy_Factory::init (int argc, char *argv[])
-{
-  return this->parse_args (argc, argv);
-}
-
-int
-TAO_Default_Client_Strategy_Factory::parse_args (int /* argc */, char ** /* argv */)
-{
-  // no args to parse at this time
-  return 0;
-}
-
-ACE_FACTORY_DEFINE (TAO, TAO_Default_Client_Strategy_Factory)
diff --git a/TAO/tao/default_client.h b/TAO/tao/default_client.h
deleted file mode 100644
index 27b3980e792..00000000000
--- a/TAO/tao/default_client.h
+++ /dev/null
@@ -1,48 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO
-// 
-// = FILENAME
-//     default_client.h
-//
-// = AUTHOR
-//     Chris Cleeland
-//
-// = VERSION
-//     $Id$
-// ============================================================================
-
-#if !defined (TAO_DEFAULT_CLIENT_H)
-#  define TAO_DEFAULT_CLIENT_H
-
-#include "tao/corba.h"
-
-class TAO_Default_Client_Strategy_Factory : public TAO_Client_Strategy_Factory
-  // = TITLE
-  //   This is the "default" client strategy factor for TAO.  It
-  //   includes strategies that are configured through command-line
-  //   options so that everything operates as if there were no
-  //   dynamically-linkable strategies.
-{
-public:
-  // = Initialization and termination methods.
-  TAO_Default_Client_Strategy_Factory (void);
-  // Constructor.
-
-  virtual ~TAO_Default_Client_Strategy_Factory (void);
-  // Destructor.
-  
-  // = Service Configurator hooks.
-  virtual int init (int argc, char* argv[]);
-  // Dynamic linking hook
-
-  int parse_args(int argc, char* argv[]);
-  // Parse svc.conf arguments
-};
-
-ACE_FACTORY_DECLARE (TAO, TAO_Default_Client_Strategy_Factory)
-
-#endif /* TAO_DEFAULT_CLIENT_H */
diff --git a/TAO/tao/default_client.i b/TAO/tao/default_client.i
deleted file mode 100644
index fa599c50301..00000000000
--- a/TAO/tao/default_client.i
+++ /dev/null
@@ -1,2 +0,0 @@
-// This is the inline file, which probably shouldn't be used since all
-// the methods are virtual and will be dynamically linked in anyway.
diff --git a/TAO/tao/default_server.cpp b/TAO/tao/default_server.cpp
deleted file mode 100644
index 02543e30466..00000000000
--- a/TAO/tao/default_server.cpp
+++ /dev/null
@@ -1,191 +0,0 @@
-// ============================================================================
-//
-// = FILENAME
-//     default_server.cpp
-//
-// = AUTHOR
-//     Chris Cleeland
-//
-// = VERSION
-//     $Id$
-// ============================================================================
-
-#include "tao/default_server.h"
-#include "tao/orb_core.h"
-
-TAO_Default_Server_Strategy_Factory::TAO_Default_Server_Strategy_Factory (void)
-  : thread_flags_ (0),
-    object_table_size_ (TAO_DEFAULT_SERVER_OBJECT_TABLE_SIZE),
-    concurrency_strategy_ (0)
-{
-}
-
-TAO_Default_Server_Strategy_Factory::~TAO_Default_Server_Strategy_Factory (void)
-{
-  // Perform appropriate cleanup.
-}
-
-TAO_Default_Server_Strategy_Factory::CONCURRENCY_STRATEGY *
-TAO_Default_Server_Strategy_Factory::concurrency_strategy (void)
-{
-  return this->concurrency_strategy_;
-}
-
-TAO_Object_Table *
-TAO_Default_Server_Strategy_Factory::create_object_table (void)
-{
-  // Create the appropriate-sized object table based on passed
-  // arguments.
-  TAO_Object_Table *objtable = 0;
-
-  switch (this->object_lookup_strategy_)
-    {
-    case TAO_LINEAR:
-      ACE_NEW_RETURN (objtable,
-		      TAO_Linear_ObjTable (this->object_table_size_),
-		      0);
-      break;
-      // Don't do this one right now until we determine how to deal
-      // with its reliance on a global singleton.
-    case TAO_USER_DEFINED:
-      // it is assumed that the user would have used the hooks to
-      // supply a user-defined instance of the object table
-      //
-      // @@ Note that the usage below doesn't really fit very well
-      // now.  We need for the userdef stuff to provide a creation
-      // hook--IF we decide to keep the whole demultiplexing strategy
-      // creation the way it is.  IMHO, the way that userdef stuff
-      // should be done is to create the User_Server_Strategy_Factory
-      // and just link it in.  The default server would only encompass
-      // the strategies that are "shipped", so to speak. --cjc
-      objtable = TAO_ORB_Core_instance()->oa_params()->userdef_lookup_strategy ();
-      break;
-    case TAO_ACTIVE_DEMUX:
-      ACE_NEW_RETURN (objtable,
-		      TAO_Active_Demux_ObjTable (this->object_table_size_),
-		      0);
-      break;
-    case TAO_DYNAMIC_HASH:
-    case TAO_NONE:
-    default:
-      ACE_NEW_RETURN (objtable,
-		      TAO_Dynamic_Hash_ObjTable (this->object_table_size_),
-		      0);
-      break;
-    }
-
-  return objtable;
-}
-
-// Evil macros b/c I'm lazy!
-#define TAO_BEGINCHECK  if (0)
-#define TAO_CHECKANDSET(sym) else if (ACE_OS::strcmp (flag, #sym) == 0) ACE_SET_BITS (this->thread_flags_, sym)
-#define TAO_ENDCHECK
-
-void
-TAO_Default_Server_Strategy_Factory::tokenize (char *flag_string)
-{
-  // @@ Danger!  strtok not re-entrant...need to find a re-entrant
-  // version!  @@ Chris, please see ACE_OS::strtok_r ().  There are
-  // some examples of how to use this in JAWS.
-
-  for (char *flag = ACE_OS::strtok (flag_string, "|");
-       flag != 0;
-       flag = ACE_OS::strtok (0, "|"))
-    {
-      TAO_BEGINCHECK;
-      TAO_CHECKANDSET (THR_DETACHED);
-      TAO_CHECKANDSET (THR_BOUND);
-      TAO_CHECKANDSET (THR_NEW_LWP);
-      TAO_CHECKANDSET (THR_SUSPENDED);
-#if !defined (ACE_WIN32)
-      TAO_CHECKANDSET (THR_DAEMON);
-#endif /* ACE_WIN32 */
-      TAO_ENDCHECK;
-    }
-}
-
-int
-TAO_Default_Server_Strategy_Factory::init (int argc, char *argv[])
-{
-  return this->parse_args (argc, argv);
-}
-
-int
-TAO_Default_Server_Strategy_Factory::open (void)
-{
-  TAO_ORB_Core *orb_core = TAO_ORB_Core_instance ();
-
-  if (reactive_strategy_.open (orb_core->reactor ()) == 0
-      && threaded_strategy_.open (orb_core->thr_mgr (),
-                                  this->thread_flags_) == 0)
-    return 0;
-  else
-    return -1;
-}
-
-int
-TAO_Default_Server_Strategy_Factory::parse_args (int argc, char *argv[])
-{
-  ACE_TRACE ("TAO_Default_Server_Strategy_Factory::parse_args");
-
-  int curarg;
-  for (curarg = 0; curarg < argc && argv[curarg]; curarg++)
-    {
-      if (ACE_OS::strcmp (argv[curarg], "-ORBconcurrency") == 0)
-        {
-          curarg++;
-          if (curarg < argc)
-            {
-              char *name = argv[curarg];
-
-              if (ACE_OS::strcasecmp (name, "reactive") == 0)
-                this->concurrency_strategy_ = &reactive_strategy_;
-              else if (ACE_OS::strcasecmp (name, "thread-per-connection") == 0)
-                this->concurrency_strategy_ = &threaded_strategy_;
-            }
-        }
-      else if (ACE_OS::strcmp (argv[curarg], "-ORBtablesize") == 0)
-        {
-          curarg++;
-          if (curarg < argc)
-            this->object_table_size_ = ACE_OS::strtoul (argv[curarg], 0, 10);
-        }
-      else if (ACE_OS::strcmp (argv[curarg], "-ORBdemuxstrategy") == 0)
-        {
-          curarg++;
-          if (curarg < argc)
-            {
-              char *name = argv[curarg];
-
-              if (ACE_OS::strcasecmp (name, "dynamic") == 0)
-                this->object_lookup_strategy_ = TAO_DYNAMIC_HASH;
-              else if (ACE_OS::strcasecmp (name, "linear") == 0)
-                this->object_lookup_strategy_ = TAO_LINEAR;
-              else if (ACE_OS::strcasecmp (name, "active") == 0)
-                this->object_lookup_strategy_ = TAO_ACTIVE_DEMUX;
-              else if (ACE_OS::strcasecmp (name, "user") == 0)
-                this->object_lookup_strategy_ = TAO_USER_DEFINED;
-            }
-        }
-      else if (ACE_OS::strcmp (argv[curarg], "-ORBthreadflags") == 0)
-        {
-          curarg++;
-
-          if (curarg < argc)
-            this->tokenize (argv[curarg]);
-        }
-    }
-
-  return 0;
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Reactive_Strategy<TAO_Server_Connection_Handler>;
-template class ACE_Thread_Strategy<TAO_Server_Connection_Handler>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Reactive_Strategy<TAO_Server_Connection_Handler>
-#pragma instantiate ACE_Thread_Strategy<TAO_Server_Connection_Handler>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-ACE_FACTORY_DEFINE (TAO, TAO_Default_Server_Strategy_Factory)
diff --git a/TAO/tao/default_server.h b/TAO/tao/default_server.h
deleted file mode 100644
index ff3b5a47a2e..00000000000
--- a/TAO/tao/default_server.h
+++ /dev/null
@@ -1,89 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//     TAO
-// 
-// = FILENAME
-//     default_server.h
-//
-// = AUTHOR
-//     Chris Cleeland
-//
-// ============================================================================
-
-#if !defined (TAO_DEFAULT_SERVER_FACTORY_H)
-#  define TAO_DEFAULT_SERVER_FACTORY_H
-
-#include "tao/corba.h"
-
-class TAO_Default_Server_Strategy_Factory : public TAO_Server_Strategy_Factory
-  // = TITLE
-  //   This is the default strategy factory for CORBA servers.  It
-  //   allows developers to choose strategies via argument flags.
-  //   This design gives substantial freedom for experimentation.
-{
-public:
-  // = Initialization and termination methods.
-  TAO_Default_Server_Strategy_Factory (void);
-  virtual ~TAO_Default_Server_Strategy_Factory (void);
-
-  virtual int open (void);
-  // Call <open> for our strategies.
-
-  // = Server-side ORB Strategy Factory Methods.
-  virtual CONCURRENCY_STRATEGY *concurrency_strategy (void);
-
-  virtual TAO_Object_Table *create_object_table (void);
-  // Factory method for object tables.
-
-  // = Service Configurator hooks.
-  virtual int init (int argc, char *argv[]);
-  // Initialize the ORB when it's linked dynamically.
-
-  int parse_args (int argc, char *argv[]);
-  // Arguments are in the form of -ORBxxx.  Valid arguments are:
-  // <-ORBconcurrency> <{which}>
-  //   where <{which}> is one of <reactive> or <thread-per-connection>.
-  // <-ORBtablesize> <{num}>
-  //   to set the table size
-  // <-ORBdemuxstrategy> <{which}>
-  //   where <{which}> is one of <dynamic>, <linear>, or <active>.
-  
-private:
-  void tokenize (char *flag_string);
-
-  u_long thread_flags_;
-  // Default thread flags passed to thr_create().
-  
-  u_long object_table_size_;
-  // Default size of object lookup table.
-  
-  TAO_Demux_Strategy object_lookup_strategy_;
-  // The type of lookup/demultiplexing strategy being used
-
-  // = Strategies Used.
-  ACE_Reactive_Strategy<TAO_Server_Connection_Handler> reactive_strategy_;
-  // A strategy for passively establishing connections which utilizes
-  // the Reactor.
-
-  ACE_Thread_Strategy<TAO_Server_Connection_Handler> threaded_strategy_;
-  // The threaded strategy used for passively establishing
-  // connections.
-  
-  CONCURRENCY_STRATEGY *concurrency_strategy_;
-  // concrete concurrency strategy.
-
-#if 0
-  // Someday we'll need these!
-  CREATION_STRATEGY *creation_strategy_;
-  ACCEPT_STRATEGY *accept_strategy_;
-  SCHEDULING_STRATEGY *scheduling_strategy_;
-#endif /* 0 */
-};
-
-ACE_FACTORY_DECLARE (TAO, TAO_Default_Server_Strategy_Factory)
-
-#endif /* TAO_DEFAULT_SERVER_FACTORY_H */
diff --git a/TAO/tao/default_server.i b/TAO/tao/default_server.i
deleted file mode 100644
index fa599c50301..00000000000
--- a/TAO/tao/default_server.i
+++ /dev/null
@@ -1,2 +0,0 @@
-// This is the inline file, which probably shouldn't be used since all
-// the methods are virtual and will be dynamically linked in anyway.
diff --git a/TAO/tao/encode.cpp b/TAO/tao/encode.cpp
deleted file mode 100644
index 09b74bba667..00000000000
--- a/TAO/tao/encode.cpp
+++ /dev/null
@@ -1,1325 +0,0 @@
-// ============================================================================
-//
-// = LIBRARY
-//    TAO
-//
-// = FILENAME
-//    encode.cpp
-//
-// = DESCRIPTION
-//   Code for encoding different data types
-//
-//   The original code had a single static encoder function defined on the CDR
-//   class that called traverse to interpret the data types. This version
-//   defines a virtual method "encode" on each class and avoids calling traverse.
-//
-// = AUTHOR
-//     Copyright 1994-1995 by Sun Microsystems Inc.
-//     and Aniruddha Gokhale
-//
-// ============================================================================
-
-#include "tao/corba.h"
-
-extern CORBA::TypeCode TC_opaque;
-
-// Encode instances of arbitrary data types based only on typecode.
-// "data" points to the data type; if it's not a primitve data type,
-// the TypeCode interpreter is used to recursively encode its
-// components.  "context" is the marshaling stream on which to encode
-// the data value.
-
-CORBA::TypeCode::traverse_status
-TAO_Marshal_Primitive::encode (CORBA::TypeCode_ptr tc,
-			       const void *data,
-			       const void *,
-			       void *context,
-			       CORBA::Environment &env)
-{
-  CORBA::Boolean continue_encoding = CORBA::B_TRUE;
-  CDR *stream = (CDR *) context;  // context is the CDR stream
-  CORBA::TypeCode::traverse_status retval =
-    CORBA::TypeCode::TRAVERSE_CONTINUE; // status of encode operation
-
-  switch (tc->kind_)
-    {
-    case CORBA::tk_null:
-    case CORBA::tk_void:
-      break;
-    case CORBA::tk_short:
-    case CORBA::tk_ushort:
-      continue_encoding = stream->put_short (*(CORBA::Short *) data);
-      break;
-    case CORBA::tk_long:
-    case CORBA::tk_ulong:
-    case CORBA::tk_float:
-    case CORBA::tk_enum:
-      continue_encoding = stream->put_long (*(CORBA::Long *) data);
-      break;
-    case CORBA::tk_double:
-    case CORBA::tk_longlong:
-    case CORBA::tk_ulonglong:
-      continue_encoding = stream->put_longlong (*(CORBA::LongLong *) data);
-      break;
-    case CORBA::tk_boolean:
-      continue_encoding = stream->put_boolean (*(CORBA::Boolean *) data);
-      break;
-    case CORBA::tk_char:
-    case CORBA::tk_octet:
-      continue_encoding = stream->put_char (*(CORBA::Char *) data);
-      break;
-    case CORBA::tk_longdouble:
-      continue_encoding = stream->put_longdouble (*(CORBA::LongDouble *) data);
-      break;
-    case CORBA::tk_wchar:
-      continue_encoding = stream->put_wchar (*(wchar_t *) data);
-      break;
-    default:
-      retval = CORBA::TypeCode::TRAVERSE_STOP;
-      // we are not a primitive type
-    }
-
-  if (retval == CORBA::TypeCode::TRAVERSE_CONTINUE
-      && continue_encoding == CORBA::B_TRUE)
-    return CORBA::TypeCode::TRAVERSE_CONTINUE;
-  else
-    {
-      env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE));
-      dmsg ("TAO_Marshal_Primitive::encode detected error");
-      return CORBA::TypeCode::TRAVERSE_STOP;
-    }
-}
-
-CORBA::TypeCode::traverse_status
-TAO_Marshal_Any::encode (CORBA::TypeCode_ptr,
-			 const void *data,
-			 const void *,
-			 void *context,
-			 CORBA::Environment &env)
-{
-  CORBA::Any *any = (CORBA::Any *) data;
-
-  // Typecode of the element that makes the Any.
-  CORBA::TypeCode_ptr elem_tc;
-
-  // Value maintained by the Any.
-  void *value;
-
-  CORBA::Boolean continue_encoding = CORBA::B_TRUE;
-
-  // Context is the CDR stream.
-  CDR *stream = (CDR *) context;
-
-  // Status of encode operation
-  CORBA::TypeCode::traverse_status retval =
-    CORBA::TypeCode::TRAVERSE_CONTINUE;
-
-  elem_tc = any->type ();
-
-  // Encode the typecode description for the element.
-  if (stream->encode (CORBA::_tc_TypeCode, &elem_tc, 0, env)
-      == CORBA::TypeCode::TRAVERSE_CONTINUE) {
-    value = (void *) any->value ();
-
-    // Switch on the data type and handle the cases for primitives
-    // here for efficiency rather than calling.
-    switch (elem_tc->kind_)
-      {
-      case CORBA::tk_null:
-      case CORBA::tk_void:
-        break;
-      case CORBA::tk_short:
-      case CORBA::tk_ushort:
-        continue_encoding = stream->put_short (*(CORBA::Short *) value);
-        break;
-      case CORBA::tk_long:
-      case CORBA::tk_ulong:
-      case CORBA::tk_float:
-      case CORBA::tk_enum:
-        continue_encoding = stream->put_long (*(CORBA::Long *) value);
-        break;
-      case CORBA::tk_double:
-      case CORBA::tk_longlong:
-      case CORBA::tk_ulonglong:
-        continue_encoding = stream->put_longlong (*(CORBA::LongLong *) value);
-        break;
-      case CORBA::tk_boolean:
-        continue_encoding = stream->put_boolean (*(CORBA::Boolean *) value);
-        break;
-      case CORBA::tk_char:
-      case CORBA::tk_octet:
-        continue_encoding = stream->put_char (*(CORBA::Char *) value);
-        break;
-      case CORBA::tk_longdouble:
-        continue_encoding = stream->put_longdouble (*(CORBA::LongDouble *) value);
-        break;
-      case CORBA::tk_wchar:
-        continue_encoding = stream->put_wchar (*(wchar_t *) value);
-        break;
-      case CORBA::tk_any:
-      case CORBA::tk_TypeCode:
-      case CORBA::tk_Principal:
-      case CORBA::tk_objref:
-      case CORBA::tk_struct:
-      case CORBA::tk_union:
-      case CORBA::tk_string:
-      case CORBA::tk_sequence:
-      case CORBA::tk_array:
-      case CORBA::tk_alias:
-      case CORBA::tk_except:
-      case CORBA::tk_wstring:
-        retval = stream->encode (elem_tc, value, 0, env);
-        break;
-      default:
-        // anything else is an error
-        retval = CORBA::TypeCode::TRAVERSE_STOP;
-      }
-  }
-
-  if (retval == CORBA::TypeCode::TRAVERSE_CONTINUE
-      && continue_encoding == CORBA::B_TRUE)
-    return CORBA::TypeCode::TRAVERSE_CONTINUE;
-  else
-    {
-      env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE));
-      dmsg ("TAO_Marshal_Any::encode detected error");
-      return CORBA::TypeCode::TRAVERSE_STOP;
-    }
-}
-
-CORBA::TypeCode::traverse_status
-TAO_Marshal_TypeCode::encode (CORBA::TypeCode_ptr,
-			      const void *data,
-			      const void *,
-			      void *context,
-			      CORBA::Environment &env)
-{
-  CORBA::Boolean continue_encoding = CORBA::B_TRUE;
-  CDR *stream = (CDR *) context;  // context is the CDR stream
-  CORBA::TypeCode_ptr tc2;         // typecode to be encoded
-
-  tc2 = *(CORBA::TypeCode_ptr *) data;  // the data has to be a TypeCode_ptr
-
-  // encode the "kind" field of the typecode
-  continue_encoding = stream->put_ulong ((CORBA::ULong) tc2->kind_);
-  if (continue_encoding == CORBA::B_TRUE)
-    {
-      // now encode the parameters, if any
-      switch (tc2->kind_)
-        {
-          // Most TypeCodes have empty parameter lists
-        default:
-          break;
-
-          // A few have "simple" parameter lists
-        case CORBA::tk_string:
-        case CORBA::tk_wstring:
-          continue_encoding = stream->put_ulong (tc2->length_);
-          break;
-
-          // Indirected typecodes can't occur at "top level" like
-          // this, only nested inside others!
-        case ~0:
-          dmsg ("indirected typecode at top level!");
-          continue_encoding = CORBA::B_FALSE;
-          break;
-
-          // The rest have "complex" parameter lists that are
-          // already encoded as bulk octets ... put length, then
-          // octets.
-        case CORBA::tk_objref:
-        case CORBA::tk_struct:
-        case CORBA::tk_union:
-        case CORBA::tk_enum:
-        case CORBA::tk_sequence:
-        case CORBA::tk_array:
-        case CORBA::tk_alias:
-        case CORBA::tk_except:
-          {
-            continue_encoding = stream->put_ulong (tc2->length_);
-
-            for (u_int i = 0; i < tc2->length_ && continue_encoding; i++)
-              continue_encoding = stream->put_octet (tc2->buffer_ [i]);
-          }
-        }
-    }
-  if (continue_encoding == CORBA::B_TRUE)
-    return CORBA::TypeCode::TRAVERSE_CONTINUE;
-  else
-    {
-      env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE));
-      dmsg ("TAO_Marshal_TypeCode::encode detected error");
-      return CORBA::TypeCode::TRAVERSE_STOP;
-    }
-}
-
-// encode Principal
-CORBA::TypeCode::traverse_status
-TAO_Marshal_Principal::encode (CORBA::TypeCode_ptr,
-			       const void *data,
-			       const void *,
-			       void *context,
-			       CORBA::Environment &env)
-{
-  CORBA::Boolean continue_encoding = CORBA::B_TRUE;
-  CDR *stream = (CDR *) context;  // context is the CDR stream
-
-  CORBA::Principal_ptr p = *(CORBA::Principal_ptr *) data;
-
-  if (p != 0)
-    {
-      continue_encoding = stream->put_long (p->id.length);
-
-      for (u_int i = 0;
-	   continue_encoding && i < p->id.length;
-	   i++)
-        continue_encoding = stream->put_octet (p->id.buffer [i]);
-    }
-  else
-    continue_encoding = stream->put_long (0);
-  if (continue_encoding == CORBA::B_TRUE)
-    return CORBA::TypeCode::TRAVERSE_CONTINUE;
-  else
-    {
-      env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE));
-      dmsg ("TAO_Marshal_Principal::encode detected error");
-      return CORBA::TypeCode::TRAVERSE_STOP;
-    }
-}
-
-// encode obj ref
-CORBA::TypeCode::traverse_status
-TAO_Marshal_ObjRef::encode (CORBA::TypeCode_ptr,
-			    const void *data,
-			    const void *,
-			    void *context,
-			    CORBA::Environment &env)
-{
-  CDR *stream = (CDR *) context;  // context is the CDR stream
-
-  // Current version:  objref is really an IIOP_Object.
-  //
-  // This will change in the future; STUB_Object knows how to
-  // marshal itself, that will be used.
-  //
-  // XXX this doesn't actually verify that the stuff got written
-  // OK to the "wire" ...
-  CORBA::Object_ptr obj = *(CORBA::Object_ptr*) data;
-
-  // NIL objrefs ... marshal as empty type hint, no elements.
-
-  if (CORBA::is_nil (obj))
-    {
-      return CORBA::TypeCode::TRAVERSE_CONTINUE;
-    }
-  else
-    {
-
-      // All other objrefs ... narrow to a "real type" that we
-      // recognize, then marshal.
-      //
-      // XXX this will be changed so it narrows to STUB_Object and
-      // then asks that surrogate/proxy to marshal itself.
-      //
-      // For now, the original code is minimally changed.
-
-      IIOP_Object *objdata;
-      IIOP::Profile *profile;
-
-      if (obj->QueryInterface (IID_IIOP_Object, (void **) &objdata) != NOERROR)
-        {
-          env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_NO));
-          return CORBA::TypeCode::TRAVERSE_STOP;
-        }
-      obj->Release ();
-      profile = &objdata->profile;
-
-      // STRING, a type ID hint
-      stream->encode (CORBA::_tc_string, &objdata->type_id, 0, env);
-
-      // UNSIGNED LONG, value one, count of the sequence of
-      // encapsulated protocol profiles;
-      stream->put_ulong (1);
-
-      // UNSIGNED LONG, tag for this protocol profile;
-      stream->put_ulong (TAO_IOP_TAG_INTERNET_IOP);
-
-      // UNSIGNED LONG, number of succeeding bytes in the
-      // encapsulation.  We don't actually need to make the
-      // encapsulation, as nothing needs stronger alignment than
-      // this longword; it guarantees the rest is aligned for us.
-      u_int hostlen;
-
-      hostlen = ACE_OS::strlen ((char *) profile->host);
-      stream->put_ulong (1                              // byte order
-                         + 3                            // version + pad byte
-                         + 4                            // sizeof (strlen)
-                         + hostlen + 1                  // strlen + null
-                         + (~hostlen & 01)              // optional pad byte
-                         + 2                            // port
-                         + (hostlen & 02)               // optional pad short
-                         + 4                            // sizeof (key length)
-                         + profile->object_key.length); // key length
-
-      // CHAR describing byte order, starting the encapsulation
-
-      stream->put_char (TAO_ENCAP_BYTE_ORDER);
-
-      // IIOP::Version, two characters (version 1.0) padding
-      stream->put_char (profile->iiop_version.major);
-      stream->put_char (profile->iiop_version.minor);
-
-      // STRING hostname from profile
-      stream->encode (CORBA::_tc_string, &profile->host, 0, env);
-
-      // UNSIGNED SHORT port number
-      stream->put_ushort (profile->port);
-
-      // OCTET SEQUENCE for object key
-      stream->encode (&TC_opaque, &profile->object_key, 0, env);
-      return CORBA::TypeCode::TRAVERSE_CONTINUE;
-    }
-}
-
-// encode structs
-CORBA::TypeCode::traverse_status
-TAO_Marshal_Struct::encode (CORBA::TypeCode_ptr tc,
-			    const void *data,
-			    const void *,
-			    void *context,
-			    CORBA::Environment &env)
-{
-  CDR *stream = (CDR *) context;
-  CORBA::TypeCode::traverse_status retval = CORBA::TypeCode::TRAVERSE_CONTINUE;
-  CORBA::Boolean continue_encoding = CORBA::B_TRUE;
-  CORBA::TypeCode_ptr param;
-  CORBA::Long size, alignment;
-
-  if (env.exception () == 0)
-    {
-      int member_count = tc->member_count (env);
-
-      for (int i = 0;
-	   i < member_count && retval == CORBA::TypeCode::TRAVERSE_CONTINUE
-	     && continue_encoding == CORBA::B_TRUE;
-	   i++)
-	{
-	  param = tc->member_type (i, env);
-	  if (env.exception () == 0)
-	    {
-	      size = param->size (env);
-	      if (env.exception () == 0)
-		{
-		  alignment = param->alignment (env);
-		  if (env.exception () == 0)
-		    {
-		      data = ptr_align_binary (data, alignment);
-		      switch (param->kind_)
-			{
-			case CORBA::tk_null:
-			case CORBA::tk_void:
-			  break;
-			case CORBA::tk_short:
-			case CORBA::tk_ushort:
-			  continue_encoding = stream->put_short (*(CORBA::Short *) data);
-			  break;
-			case CORBA::tk_long:
-			case CORBA::tk_ulong:
-			case CORBA::tk_float:
-			case CORBA::tk_enum:
-			  continue_encoding = stream->put_long (*(CORBA::Long *) data);
-			  break;
-			case CORBA::tk_double:
-			case CORBA::tk_longlong:
-			case CORBA::tk_ulonglong:
-			  continue_encoding = stream->put_longlong (*(CORBA::LongLong *) data);
-			  break;
-			case CORBA::tk_boolean:
-			  continue_encoding = stream->put_boolean (*(CORBA::Boolean *) data);
-			  break;
-			case CORBA::tk_char:
-			case CORBA::tk_octet:
-			  continue_encoding = stream->put_char (*(CORBA::Char *) data);
-			  break;
-			case CORBA::tk_longdouble:
-			  continue_encoding = stream->put_longdouble (*(CORBA::LongDouble *) data);
-			  break;
-			case CORBA::tk_wchar:
-			  continue_encoding = stream->put_wchar (*(wchar_t *) data);
-			  break;
-			case CORBA::tk_any:
-			case CORBA::tk_TypeCode:
-			case CORBA::tk_Principal:
-			case CORBA::tk_objref:
-			case CORBA::tk_struct:
-			case CORBA::tk_union:
-			case CORBA::tk_string:
-			case CORBA::tk_sequence:
-			case CORBA::tk_array:
-			case CORBA::tk_alias:
-			case CORBA::tk_except:
-			case CORBA::tk_wstring:
-			  retval = stream->encode (param, data, 0, env);
-			  break;
-			default:
-			  break;
-			}
-		      data = (char *) data + size;
-		    }
-		  else
-		    return CORBA::TypeCode::TRAVERSE_STOP;
-		}
-	      else
-		return CORBA::TypeCode::TRAVERSE_STOP;
-	    }
-	  else
-	    return CORBA::TypeCode::TRAVERSE_STOP;
-	}
-    }
-  else
-      return CORBA::TypeCode::TRAVERSE_STOP;
-
-  if (retval == CORBA::TypeCode::TRAVERSE_CONTINUE
-      && continue_encoding == CORBA::B_TRUE)
-    return CORBA::TypeCode::TRAVERSE_CONTINUE;
-  else
-    {
-      env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE));
-      dmsg ("marshaling encode_struct detected error");
-      return CORBA::TypeCode::TRAVERSE_STOP;
-    }
-}
-
-// encode unions
-CORBA::TypeCode::traverse_status
-TAO_Marshal_Union::encode (CORBA::TypeCode_ptr tc,
-			   const void *data,
-			   const void *data2,
-			   void *context,
-			   CORBA::Environment &env)
-{
-  CDR *stream = (CDR *) context;  // context is the CDR stream
-
-  CORBA::TypeCode_ptr discrim_tc = tc->discriminator_type (env);
-  // get the discriminator type
-
-  if (env.exception () == 0)
-    {
-      CORBA::TypeCode_ptr member_tc;
-      CORBA::Any_ptr member_label;
-      CORBA::ULong discrim_size_with_pad;
-      const void *discrim_val;
-      CORBA::ULong member_count;
-      CORBA::Long default_index;
-      CORBA::TypeCode_ptr default_tc = 0;
-      CORBA::Boolean discrim_matched = CORBA::B_FALSE;
-
-      // encode the discriminator value
-      CORBA::TypeCode::traverse_status retval =
-	stream->encode (discrim_tc, data, data2, env);
-
-      if (retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
-        {
-          discrim_size_with_pad = tc->TAO_discrim_pad_size (env);
-          if (env.exception () == 0)
-            {
-              discrim_val = data; // save the pointer to the discriminator
-				  // value
-              // move the pointer to point to the actual value
-              data = (char *) data + discrim_size_with_pad;
-              data2 = (char *) data2 + discrim_size_with_pad;
-              // now get ready to marshal the actual union value
-              default_index = tc->default_index (env);
-              if (env.exception () == 0)
-                {
-		  // get the member count
-                  member_count = tc->member_count (env);
-                  if (env.exception () == 0)
-                    {
-                      // Check which label value matches with the
-                      // discriminator value. Accordingly, marshal the
-                      // corresponding member_type. If none match,
-                      // check if default exists and marshal
-                      // accordingly. Otherwise it is an error.
-                      for (int i = 0; member_count-- != 0; i++)
-                        {
-                          member_label = tc->member_label (i, env);
-                          if (env.exception () == 0)
-                            {
-                              // do the matching
-                              switch (member_label->type ()->kind (env))
-                                {
-                                case CORBA::tk_short:
-                                case CORBA::tk_ushort:
-                                  if (*(CORBA::Short *) member_label->value () == *(CORBA::Short *) discrim_val)
-				    discrim_matched = CORBA::B_TRUE;
-                                  break;
-                                case CORBA::tk_long:
-                                case CORBA::tk_ulong:
-                                case CORBA::tk_enum:
-                                  if (*(CORBA::ULong *) member_label->value () == *(CORBA::ULong *) discrim_val)
-				    discrim_matched = CORBA::B_TRUE;
-                                  break;
-                                case CORBA::tk_char:
-                                  if (*(CORBA::Char *) member_label->value () == *(CORBA::Char *) discrim_val)
-				    discrim_matched = CORBA::B_TRUE;
-                                  break;
-                                case CORBA::tk_wchar:
-                                  if (*(CORBA::WChar *) member_label->value () == *(CORBA::WChar *) discrim_val)
-				    discrim_matched = CORBA::B_TRUE;
-                                  break;
-                                case CORBA::tk_boolean:
-                                  if (*(CORBA::Boolean *) member_label->value () == *(CORBA::Boolean *) discrim_val)
-				    discrim_matched = CORBA::B_TRUE;
-                                  break;
-                                default:
-                                  env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO));
-                                  dmsg ("Union::encode - Bad discriminant type");
-                                  return CORBA::TypeCode::TRAVERSE_STOP;
-                                }// end of switch
-
-                              // get the member typecode
-                              member_tc = tc->member_type (i, env);
-                              if (env.exception () == 0)
-                                {
-                                  if (default_index >= 0 && default_index-- == 0)
-                                    {
-                                      // have we reached the default label?, if so,
-                                      // save a handle to the typecode for the default
-                                      default_tc = member_tc;
-                                    }
-                                  if (discrim_matched)
-				    // marshal according to the matched typecode
-				    return stream->encode (member_tc, data,
-							   data2, env);
-                                }
-                              else // error getting member type
-                                {
-                                  env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO));
-                                  dmsg1 ("Union::encode - error getting member type:%d",i);
-                                  return CORBA::TypeCode::TRAVERSE_STOP;
-                                }
-
-                            }
-                          else // error getting member label
-                            {
-                              env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO));
-                              dmsg1 ("Union::encode - error member label : %d", i);
-                              return CORBA::TypeCode::TRAVERSE_STOP;
-                            }
-                        } // end of while
-                      // we are here only if there was no match
-                      if (default_tc)
-			return stream->encode (default_tc, data, data2, env);
-                      else
-			{
-			  env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_NO));
-			  dmsg ("Union::encode - failed. No match and no default case");
-			  return CORBA::TypeCode::TRAVERSE_STOP;
-			}
-                    }
-                  else // error getting member count
-                    {
-                      env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_NO));
-                      dmsg ("Union::encode - error getting member count");
-                      return CORBA::TypeCode::TRAVERSE_STOP;
-                    }
-                }
-              else // error getting default index
-                {
-                  env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO));
-                  dmsg ("Union::encode - error getting default used");
-                  return CORBA::TypeCode::TRAVERSE_STOP;
-                }
-            }
-          else // error getting discrim_pad_size
-            {
-              env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO));
-              dmsg ("Union::encode - error getting discrim padded size");
-              return CORBA::TypeCode::TRAVERSE_STOP;
-            }
-        }
-      else // error encoding discriminant
-        {
-          env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE));
-          dmsg ("Union::encode - error encoding discriminant");
-          return CORBA::TypeCode::TRAVERSE_STOP;
-        }
-    }
-  else // error getting the discriminant
-    {
-      env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO));
-      dmsg ("Union::encode - error getting the discriminant typecode");
-      return CORBA::TypeCode::TRAVERSE_STOP;
-    }
-}
-
-// encode string
-CORBA::TypeCode::traverse_status
-TAO_Marshal_String::encode (CORBA::TypeCode_ptr tc,
-			    const void *data,
-			    const void *,
-			    void *context,
-			    CORBA::Environment &env)
-{
-  CORBA::Boolean continue_encoding = CORBA::B_TRUE;
-  CDR *stream = (CDR *) context;  // context is the CDR stream
-  CORBA::String str = *(CORBA::String *) data;
-
-  // Be nice to programmers: treat nulls as empty strings not
-  // errors. (OMG-IDL supports languages that don't use the C/C++
-  // notion of null v. empty strings; nulls aren't part of the OMG-IDL
-  // string model.)
-  if (str != 0)
-    {
-      // Verify string satisfies bounds requirements.  We're not so
-      // permissive as to send messages violating the interface spec
-      // by having excessively long strings!
-      CORBA::ULong bounds = tc->length (env);
-
-      if (env.exception () == 0)
-        {
-          // get the actual length of the string
-	  CORBA::ULong len = ACE_OS::strlen ((char *) str);
-
-          // if it is an unbounded string or if the length is less
-          // than the bounds for an unbounded string
-          if (bounds == 0 || len <= bounds)
-            {
-
-              // Encode the string, followed by a NUL character.
-
-              for (continue_encoding = stream->put_ulong (len + 1); // length +
-								    // 1 for
-								    // the NULL
-								    // character
-                   continue_encoding != CORBA::B_FALSE && *str;
-                   continue_encoding = stream->put_char (*str++))
-                continue;
-	      // put a NULL terminating character
-              stream->put_char (0);
-              return CORBA::TypeCode::TRAVERSE_CONTINUE;
-            }
-          else
-	    return CORBA::TypeCode::TRAVERSE_STOP;
-        }
-      else
-	return CORBA::TypeCode::TRAVERSE_STOP;
-    }
-  else
-    {
-      // empty string
-      stream->put_ulong (1);
-      stream->put_char (0);
-      return CORBA::TypeCode::TRAVERSE_CONTINUE;
-    }
-}
-
-// encode sequence
-CORBA::TypeCode::traverse_status
-TAO_Marshal_Sequence::encode (CORBA::TypeCode_ptr tc,
-                              const void *data,
-                              const void *,
-                              void *context,
-                              CORBA::Environment &env)
-{
-  CORBA::Boolean continue_encoding = CORBA::B_TRUE;
-  CDR *stream = (CDR *) context;
-  CORBA::OctetSeq *seq = (CORBA::OctetSeq *) data;
-  CORBA::TypeCode::traverse_status retval =
-    CORBA::TypeCode::TRAVERSE_CONTINUE;  // return status
-  CORBA::TypeCode_ptr    tc2;  // typecode of the element
-  size_t  size; // size of element
-  CORBA::ULong  len = seq ? seq->length : 0;
-  char *value;
-
-  // First marshal the sequence length, verifying that it's within the
-  // sequence bounds ...
-
-  if (len > 0)
-    {
-      // retrieve the bounds of the sequence
-      CORBA::ULong bounds = tc->length (env);
-      if (env.exception () == 0)
-        {
-          // encode only if it is an unbounded sequence or if length is
-          // less/equal to the bounds
-          if (bounds == 0 || len <= bounds)
-            {
-              bounds = len;  // number of times you encode
-              continue_encoding = stream->put_ulong (seq->length);
-              if (continue_encoding && seq->length != 0)
-                {
-                  // get element typecode
-                  tc2 = tc->content_type (env);
-                  if (env.exception () == 0)
-                    {
-                      size = tc2->size (env);
-                      if (env.exception () == 0)
-                        {
-                          value = (char *) seq->buffer;
-                          switch (tc2->kind_)
-                            {
-                            case CORBA::tk_null:
-                            case CORBA::tk_void:
-                              return CORBA::TypeCode::TRAVERSE_CONTINUE;
-                            case CORBA::tk_short:
-                            case CORBA::tk_ushort:
-                              // For primitives, compute the size only once
-                              while (bounds-- && continue_encoding == CORBA::B_TRUE)
-                                {
-                                  continue_encoding = stream->put_short (*(CORBA::Short *) value);
-                                  value += size;
-                                }
-                              //                              CORBA::release (tc2);
-                              if (continue_encoding == CORBA::B_TRUE)
-				return CORBA::TypeCode::TRAVERSE_CONTINUE;
-                              break;
-                            case CORBA::tk_long:
-                            case CORBA::tk_ulong:
-                            case CORBA::tk_float:
-                              // For primitives, compute the size only once
-                              while (bounds-- && continue_encoding == CORBA::B_TRUE)
-                                {
-                                  continue_encoding = stream->put_long (*(CORBA::Long *) value);
-                                  value += size;
-                                }
-                              //                              CORBA::release (tc2);
-                              if (continue_encoding == CORBA::B_TRUE)
-				return CORBA::TypeCode::TRAVERSE_CONTINUE;
-                              break;
-                            case CORBA::tk_double:
-                            case CORBA::tk_longlong:
-                            case CORBA::tk_ulonglong:
-                              // For primitives, compute the size only once
-                              while (bounds-- && continue_encoding == CORBA::B_TRUE)
-                                {
-                                  continue_encoding = stream->put_longlong (*(CORBA::LongLong *) value);
-                                  value += size;
-                                }
-                              //                              CORBA::release (tc2);
-                              if (continue_encoding == CORBA::B_TRUE)
-				return CORBA::TypeCode::TRAVERSE_CONTINUE;
-                              break;
-                            case CORBA::tk_boolean:
-                              // For primitives, compute the size only once
-                              while (bounds-- && continue_encoding == CORBA::B_TRUE)
-                                {
-                                  continue_encoding = stream->put_boolean (*(CORBA::Boolean *) value);
-                                  value += size;
-                                }
-                              //                              CORBA::release (tc2);
-                              if (continue_encoding == CORBA::B_TRUE)
-				return CORBA::TypeCode::TRAVERSE_CONTINUE;
-                              break;
-                            case CORBA::tk_char:
-                            case CORBA::tk_octet:
-                              // For primitives, compute the size only once
-                              while (bounds-- && continue_encoding == CORBA::B_TRUE)
-                                {
-                                  continue_encoding = stream->put_char (*(CORBA::Char *) value);
-                                  value += size;
-                                }
-                              //                              CORBA::release (tc2);
-                              if (continue_encoding == CORBA::B_TRUE)
-				return CORBA::TypeCode::TRAVERSE_CONTINUE;
-                              break;
-                            case CORBA::tk_longdouble:
-                              // For primitives, compute the size only once
-                              while (bounds-- && continue_encoding == CORBA::B_TRUE)
-                                {
-                                  continue_encoding = stream->put_longdouble (*(CORBA::LongDouble *) value);
-                                  value += size;
-                                }
-                              //                              CORBA::release (tc2);
-                              if (continue_encoding == CORBA::B_TRUE)
-				return CORBA::TypeCode::TRAVERSE_CONTINUE;
-                              break;
-                            case CORBA::tk_wchar:
-                              // For primitives, compute the size only once
-                              while (bounds-- && continue_encoding == CORBA::B_TRUE)
-                                {
-                                  continue_encoding = stream->put_wchar (*(CORBA::WChar *) value);
-                                  value += size;
-                                }
-                              //                              CORBA::release (tc2);
-                              if (continue_encoding == CORBA::B_TRUE)
-				return CORBA::TypeCode::TRAVERSE_CONTINUE;
-                              break;
-                            case CORBA::tk_enum:
-                              // For primitives, compute the size only once
-                              while (bounds-- && continue_encoding == CORBA::B_TRUE)
-                                {
-                                  continue_encoding = stream->put_long (*(CORBA::Long *) value);
-                                  value += size;
-                                }
-                              //                              CORBA::release (tc2);
-                              if (continue_encoding == CORBA::B_TRUE)
-				return CORBA::TypeCode::TRAVERSE_CONTINUE;
-                              break;
-                              // handle all aggregate types here
-                            case CORBA::tk_any:
-                            case CORBA::tk_TypeCode:
-                            case CORBA::tk_Principal:
-                            case CORBA::tk_objref:
-                            case CORBA::tk_struct:
-                            case CORBA::tk_union:
-                            case CORBA::tk_string:
-                            case CORBA::tk_sequence:
-                            case CORBA::tk_array:
-                            case CORBA::tk_alias:
-                            case CORBA::tk_except:
-                            case CORBA::tk_wstring:
-                              // For those aggregate types whose size is constant, we
-                              // compute it only once
-                              while (bounds-- && retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
-                                {
-                                  retval = stream->encode (tc2, value, 0, env);
-                                  value += size;
-                                }
-                              //                              CORBA::release (tc2);
-                              if (retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
-                                return CORBA::TypeCode::TRAVERSE_CONTINUE;
-                              break;
-                            default:
-                              break;
-                            } // end of switch
-                        } // no exception computing size
-                    } // no exception computing content type
-                } // seq length not 0
-            } // within bounds or unbounded
-        } // no exception computing bounds
-    } // length is > 0
-  else
-    {
-      // length is 0, encode it
-      continue_encoding = stream->put_ulong (len);
-      if (continue_encoding == CORBA::B_TRUE)
-        return CORBA::TypeCode::TRAVERSE_CONTINUE;
-
-    }
-  // error exit
-  env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_NO));
-  dmsg ("marshaling TAO_Marshal_Sequence::encode detected error");
-  return CORBA::TypeCode::TRAVERSE_STOP;
-}
-
-// encode array
-CORBA::TypeCode::traverse_status
-TAO_Marshal_Array::encode (CORBA::TypeCode_ptr tc,
-                           const void *data,
-                           const void *,
-                           void *context,
-                           CORBA::Environment &env)
-{
-  CORBA::Boolean continue_encoding = CORBA::B_TRUE;
-  CDR *stream = (CDR *) context;
-  CORBA::TypeCode::traverse_status retval =
-    CORBA::TypeCode::TRAVERSE_CONTINUE;  // return status
-  size_t  size; // size of element
-  CORBA::ULong  bounds;
-  char *value = (char *) data;
-
-  // retrieve the bounds of the array
-  bounds = tc->length (env);
-  if (env.exception () == 0)
-    {
-      // get element typecode.
-      CORBA::TypeCode_ptr tc2 = tc->content_type (env);
-
-      if (env.exception () == 0)
-        {
-          size = tc2->size (env);
-          if (env.exception () == 0)
-            {
-              switch (tc2->kind_)
-                {
-                case CORBA::tk_null:
-                case CORBA::tk_void:
-                  return CORBA::TypeCode::TRAVERSE_CONTINUE;
-                case CORBA::tk_short:
-                case CORBA::tk_ushort:
-                  // For primitives, compute the size only once
-                  while (bounds-- && continue_encoding == CORBA::B_TRUE)
-                    {
-                      continue_encoding = stream->put_short (*(CORBA::Short *) value);
-                      value += size;
-                    }
-                  //              CORBA::release (tc2);
-                  if (continue_encoding == CORBA::B_TRUE)
-		    return CORBA::TypeCode::TRAVERSE_CONTINUE;
-                  break;
-                case CORBA::tk_long:
-                case CORBA::tk_ulong:
-                case CORBA::tk_float:
-                  // For primitives, compute the size only once
-                  while (bounds-- && continue_encoding == CORBA::B_TRUE)
-                    {
-                      continue_encoding = stream->put_long (*(CORBA::Long *) value);
-                      value += size;
-                    }
-                  //              CORBA::release (tc2);
-                  if (continue_encoding == CORBA::B_TRUE)
-		    return CORBA::TypeCode::TRAVERSE_CONTINUE;
-                  break;
-                case CORBA::tk_double:
-                case CORBA::tk_longlong:
-                case CORBA::tk_ulonglong:
-                  // For primitives, compute the size only once
-                  while (bounds-- && continue_encoding == CORBA::B_TRUE)
-                    {
-                      continue_encoding = stream->put_longlong (*(CORBA::LongLong *) value);
-                      value += size;
-                    }
-                  //              CORBA::release (tc2);
-                  if (continue_encoding == CORBA::B_TRUE)
-		    return CORBA::TypeCode::TRAVERSE_CONTINUE;
-                  break;
-                case CORBA::tk_boolean:
-                  // For primitives, compute the size only once
-                  while (bounds-- && continue_encoding == CORBA::B_TRUE)
-                    {
-                      continue_encoding = stream->put_boolean (*(CORBA::Boolean *) value);
-                      value += size;
-                    }
-                  //              CORBA::release (tc2);
-                  if (continue_encoding == CORBA::B_TRUE)
-		    return CORBA::TypeCode::TRAVERSE_CONTINUE;
-                  break;
-                case CORBA::tk_char:
-                case CORBA::tk_octet:
-                  // For primitives, compute the size only once
-                  while (bounds-- && continue_encoding == CORBA::B_TRUE)
-                    {
-                      continue_encoding = stream->put_char (*(CORBA::Char *) value);
-                      value += size;
-                    }
-                  //              CORBA::release (tc2);
-                  if (continue_encoding == CORBA::B_TRUE)
-		    return CORBA::TypeCode::TRAVERSE_CONTINUE;
-                  break;
-                case CORBA::tk_longdouble:
-                  // For primitives, compute the size only once
-                  while (bounds-- && continue_encoding == CORBA::B_TRUE)
-                    {
-                      continue_encoding = stream->put_longdouble (*(CORBA::LongDouble *) value);
-                      value += size;
-                    }
-                  //              CORBA::release (tc2);
-                  if (continue_encoding == CORBA::B_TRUE)
-                    {
-                      return CORBA::TypeCode::TRAVERSE_CONTINUE;
-                    }
-                  break;
-                case CORBA::tk_wchar:
-                  // For primitives, compute the size only once
-                  while (bounds-- && continue_encoding == CORBA::B_TRUE)
-                    {
-                      continue_encoding = stream->put_wchar (*(CORBA::WChar *) value);
-                      value += size;
-                    }
-                  //              CORBA::release (tc2);
-                  if (continue_encoding == CORBA::B_TRUE)
-		    return CORBA::TypeCode::TRAVERSE_CONTINUE;
-                  break;
-                case CORBA::tk_enum:
-                  // For primitives, compute the size only once
-                  while (bounds-- && continue_encoding == CORBA::B_TRUE)
-                    {
-                      continue_encoding = stream->put_long (*(CORBA::Long *) value);
-                      value += size;
-                    }
-                  //              CORBA::release (tc2);
-                  if (continue_encoding == CORBA::B_TRUE)
-		    return CORBA::TypeCode::TRAVERSE_CONTINUE;
-                  break;
-                  // handle all aggregate types here
-                case CORBA::tk_any:
-                case CORBA::tk_TypeCode:
-                case CORBA::tk_Principal:
-                case CORBA::tk_objref:
-                case CORBA::tk_struct:
-                case CORBA::tk_union:
-                case CORBA::tk_string:
-                case CORBA::tk_sequence:
-                case CORBA::tk_array:
-                case CORBA::tk_alias:
-                case CORBA::tk_except:
-                case CORBA::tk_wstring:
-                  // For those aggregate types whose size is constant, we
-                  // compute it only once
-                  while (bounds-- && retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
-                    {
-                      retval = stream->encode (tc2, value, 0, env);
-                      value += size;
-                    }
-                  //              CORBA::release (tc2);
-                  if (retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
-                    return CORBA::TypeCode::TRAVERSE_CONTINUE;
-                  break;
-                default:
-                  break;
-                } // end of switch
-            } // no exception computing size
-        } // no exception computing content type
-    } // no exception computing bounds
-  // error exit
-  env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_NO));
-  dmsg ("marshaling TAO_Marshal_Sequence::encode detected error");
-  return CORBA::TypeCode::TRAVERSE_STOP;
-}
-
-CORBA::TypeCode::traverse_status
-TAO_Marshal_Alias::encode (CORBA::TypeCode_ptr tc,
-			   const void *data,
-			   const void *,
-			   void *context,
-			   CORBA::Environment &env)
-{
-  CORBA::TypeCode_ptr tc2;  // typecode of the aliased type
-  CORBA::Boolean continue_encoding = CORBA::B_TRUE;
-  CDR *stream = (CDR *) context;  // context is the CDR stream
-  CORBA::TypeCode::traverse_status   retval =
-    CORBA::TypeCode::TRAVERSE_CONTINUE; // status of encode operation
-  char *value = (char *) data;
-
-  tc2 = tc->content_type (env);
-  if (env.exception () == 0)
-    {
-    // switch on the data type and handle the cases for primitives here for
-    // efficiency rather than calling
-    switch (tc2->kind_)
-      {
-      case CORBA::tk_null:
-      case CORBA::tk_void:
-        break;
-      case CORBA::tk_short:
-      case CORBA::tk_ushort:
-        continue_encoding = stream->put_short (*(CORBA::Short *) value);
-        break;
-      case CORBA::tk_long:
-      case CORBA::tk_ulong:
-      case CORBA::tk_float:
-      case CORBA::tk_enum:
-        continue_encoding = stream->put_long (*(CORBA::Long *) value);
-        break;
-      case CORBA::tk_double:
-      case CORBA::tk_longlong:
-      case CORBA::tk_ulonglong:
-        continue_encoding = stream->put_longlong (*(CORBA::LongLong *) value);
-        break;
-      case CORBA::tk_boolean:
-        continue_encoding = stream->put_boolean (*(CORBA::Boolean *) value);
-        break;
-      case CORBA::tk_char:
-      case CORBA::tk_octet:
-        continue_encoding = stream->put_char (*(CORBA::Char *) value);
-        break;
-      case CORBA::tk_longdouble:
-        continue_encoding = stream->put_longdouble (*(CORBA::LongDouble *) value);
-        break;
-      case CORBA::tk_wchar:
-        continue_encoding = stream->put_wchar (*(wchar_t *) value);
-        break;
-      case CORBA::tk_any:
-      case CORBA::tk_TypeCode:
-      case CORBA::tk_Principal:
-      case CORBA::tk_objref:
-      case CORBA::tk_struct:
-      case CORBA::tk_union:
-      case CORBA::tk_string:
-      case CORBA::tk_sequence:
-      case CORBA::tk_array:
-      case CORBA::tk_alias:
-      case CORBA::tk_except:
-      case CORBA::tk_wstring:
-        retval = stream->encode (tc2, value, 0, env);
-        break;
-      default:
-        // anything else is an error
-        retval = CORBA::TypeCode::TRAVERSE_STOP;
-      }
-  }
-  //  tc2->Release ();
-  if (retval == CORBA::TypeCode::TRAVERSE_CONTINUE
-      && continue_encoding == CORBA::B_TRUE)
-    return CORBA::TypeCode::TRAVERSE_CONTINUE;
-  else
-    {
-      env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE));
-      dmsg ("TAO_Marshal_Alias::encode detected error");
-      return CORBA::TypeCode::TRAVERSE_STOP;
-    }
-}
-
-
-// encode exception
-CORBA::TypeCode::traverse_status
-TAO_Marshal_Except::encode (CORBA::TypeCode_ptr tc,
-			    const void *data,
-			    const void *,
-			    void *context,
-			    CORBA::Environment &env)
-{
-  CORBA::TypeCode::traverse_status retval = CORBA::TypeCode::TRAVERSE_CONTINUE;
-  CORBA::Boolean continue_encoding = CORBA::B_TRUE;
-
-  if (env.exception () == 0)
-    {
-      CDR *stream = (CDR *) context;
-      CORBA::TypeCode_ptr param;
-      CORBA::Long size, alignment;
-
-      data = (char *) data + sizeof (CORBA::Exception);
-
-      int member_count = tc->member_count (env);
-
-      for (int i = 0;
-	   i < member_count && retval == CORBA::TypeCode::TRAVERSE_CONTINUE
-	     && continue_encoding == CORBA::B_TRUE;
-	   i++)
-	{
-	  param = tc->member_type (i, env);
-	  if (env.exception () == 0)
-	    {
-	      size = param->size (env);
-	      if (env.exception () == 0)
-		{
-		  alignment = param->alignment (env);
-		  if (env.exception () == 0)
-		    {
-		      data = ptr_align_binary (data, alignment);
-		      switch (param->kind_){
-		      case CORBA::tk_null:
-		      case CORBA::tk_void:
-			break;
-		      case CORBA::tk_short:
-		      case CORBA::tk_ushort:
-			continue_encoding = stream->put_short (*(CORBA::Short *) data);
-			break;
-		      case CORBA::tk_long:
-		      case CORBA::tk_ulong:
-		      case CORBA::tk_float:
-		      case CORBA::tk_enum:
-			continue_encoding = stream->put_long (*(CORBA::Long *) data);
-			break;
-		      case CORBA::tk_double:
-		      case CORBA::tk_longlong:
-		      case CORBA::tk_ulonglong:
-			continue_encoding = stream->put_longlong (*(CORBA::LongLong *) data);
-			break;
-		      case CORBA::tk_boolean:
-			continue_encoding = stream->put_boolean (*(CORBA::Boolean *) data);
-			break;
-		      case CORBA::tk_char:
-		      case CORBA::tk_octet:
-			continue_encoding = stream->put_char (*(CORBA::Char *) data);
-			break;
-		      case CORBA::tk_longdouble:
-			continue_encoding = stream->put_longdouble (*(CORBA::LongDouble *) data);
-			break;
-		      case CORBA::tk_wchar:
-			continue_encoding = stream->put_wchar (*(wchar_t *) data);
-			break;
-		      case CORBA::tk_any:
-		      case CORBA::tk_TypeCode:
-		      case CORBA::tk_Principal:
-		      case CORBA::tk_objref:
-		      case CORBA::tk_struct:
-		      case CORBA::tk_union:
-		      case CORBA::tk_string:
-		      case CORBA::tk_sequence:
-		      case CORBA::tk_array:
-		      case CORBA::tk_alias:
-		      case CORBA::tk_except:
-		      case CORBA::tk_wstring:
-			retval = stream->encode (param, data, 0, env);
-			break;
-		      default:
-			break;
-		      }
-		      data = (char *) data + size;
-		    }
-		  else
-		    return CORBA::TypeCode::TRAVERSE_STOP;
-		}
-	      else
-		return CORBA::TypeCode::TRAVERSE_STOP;
-	    }
-	  else
-	    return CORBA::TypeCode::TRAVERSE_STOP;
-	}
-    }
-  else
-    return CORBA::TypeCode::TRAVERSE_STOP;
-
-  if (retval == CORBA::TypeCode::TRAVERSE_CONTINUE
-      && continue_encoding == CORBA::B_TRUE)
-    return CORBA::TypeCode::TRAVERSE_CONTINUE;
-  else
-    {
-      env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE));
-      dmsg ("TAO_Marshal_Except detected error");
-      return CORBA::TypeCode::TRAVERSE_STOP;
-    }
-}
-
-
-// encode wstring
-CORBA::TypeCode::traverse_status
-TAO_Marshal_WString::encode (CORBA::TypeCode_ptr tc,
-			     const void *data,
-			     const void *,
-			     void *context,
-			     CORBA::Environment &env)
-{
-  CORBA::Boolean continue_encoding = CORBA::B_TRUE;
-
-  CORBA::WChar *str = *(CORBA::WChar **) data;
-  CDR *stream = (CDR *) context;  // context is the CDR stream
-
-  // Be nice to programmers: treat nulls as empty strings not
-  // errors. (OMG-IDL supports languages that don't use the
-  // C/C++ notion of null v. empty strings; nulls aren't part of
-  // the OMG-IDL string model.)
-  if (str != 0)
-    {
-      // Verify string satisfies bounds requirements.  We're not so
-      // permissive as to send messages violating the interface spec
-      // by having excessively long strings!
-      CORBA::ULong bounds = tc->length (env);
-
-      if (env.exception () == 0)
-        {
-          // get the actual length of the string
-	  CORBA::ULong len = ACE_OS::strlen (str);
-
-          // if it is an unbounded string or if the length is less than the
-          // bounds for an unbounded string
-          if ((bounds == 0) || (len <= bounds))
-            {
-
-              // Encode the string, followed by a NUL character.
-
-              for (continue_encoding = stream->put_ulong (len + 1);
-                   continue_encoding != CORBA::B_FALSE && *str;
-                   continue_encoding = stream->put_wchar (*str++))
-                continue;
-
-              stream->put_wchar (0);
-              return CORBA::TypeCode::TRAVERSE_CONTINUE;
-            }
-          else
-	    return CORBA::TypeCode::TRAVERSE_STOP;
-        }
-      else
-	return CORBA::TypeCode::TRAVERSE_STOP;
-    }
-  else
-    {
-      // empty string
-      stream->put_ulong (1);
-      stream->put_wchar (0);
-      return CORBA::TypeCode::TRAVERSE_CONTINUE;
-    }
-}
diff --git a/TAO/tao/except.cpp b/TAO/tao/except.cpp
deleted file mode 100644
index 504dfd259f3..00000000000
--- a/TAO/tao/except.cpp
+++ /dev/null
@@ -1,448 +0,0 @@
-// @(#)except.cpp	1.11 95/11/04
-// Copyright 1994-1995 by Sun Microsystems Inc.
-// All Rights Reserved
-//
-// ORB:		Exception handling support
-//
-// THREADING NOTE:  calling thread handles mutual exclusion policy
-// on all of these data structures.
-
-#include "tao/corba.h"
-
-// {77420082-F276-11ce-9598-0000C07CA898}
-DEFINE_GUID (IID_CORBA_Exception,
-0x77420082, 0xf276, 0x11ce, 0x95, 0x98, 0x0, 0x0, 0xc0, 0x7c, 0xa8, 0x98);
-
-// {77420083-F276-11ce-9598-0000C07CA898}
-DEFINE_GUID (IID_CORBA_UserException,
-0x77420083, 0xf276, 0x11ce, 0x95, 0x98, 0x0, 0x0, 0xc0, 0x7c, 0xa8, 0x98);
-
-// {77420084-F276-11ce-9598-0000C07CA898}
-DEFINE_GUID (IID_CORBA_SystemException,
-0x77420084, 0xf276, 0x11ce, 0x95, 0x98, 0x0, 0x0, 0xc0, 0x7c, 0xa8, 0x98);
-
-CORBA_Exception::CORBA_Exception (CORBA::TypeCode_ptr tc)
-  : _type (tc),
-    refcount_ (1)
-{
-  if (_type)
-    _type->AddRef ();
-  assert (_type != 0);
-  assert (refcount_ > 0);
-}
-
-CORBA_Exception::CORBA_Exception (const CORBA_Exception	&src)
-  : _type (src._type),
-    refcount_ (1)
-{
-  if (_type)
-    _type->AddRef ();
-  assert (_type != 0);
-  assert (refcount_ > 0);
-}
-
-// NOTE:  It's this code, not anything defined in a subclass, which
-// is responsible for releasing any storage owned by the exception.
-// It can do this because it's got the typecode.
-
-CORBA_Exception::~CORBA_Exception (void)
-{
-  assert (refcount_ == 0);
-  assert (_type != 0);
-
-  assert (1 == 2);
-}
-
-CORBA_Exception &
-CORBA_Exception::operator = (const CORBA_Exception &src)
-{
-  if (_type)
-    _type->Release ();
-  _type = src._type;
-  if (_type)
-    _type->AddRef ();
-  assert (_type != 0);
-  assert (refcount_ > 0);
-
-  return *this;
-}
-
-TAO_CONST CORBA::String
-CORBA_Exception::id (void) const
-{
-  CORBA::Environment env;
-
-  assert (refcount_ > 0);
-  if (_type)
-    return _type->id (env);
-  else
-    return 0;
-}
-
-TAO_CONST CORBA::TypeCode_ptr
-CORBA_Exception::type (void) const
-{
-  assert (refcount_ > 0);
-  return _type;
-}
-
-// For COM -- IUnKnown operations
-
-ULONG __stdcall
-CORBA_Exception::AddRef (void)
-{
-  ACE_MT (ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, guard, lock_, 0));
-
-  assert (refcount_ > 0);
-  return ++refcount_;
-}
-
-ULONG __stdcall
-CORBA_Exception::Release (void)
-{
-  {
-    ACE_MT (ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, guard, lock_, 0));
-
-    assert (refcount_ > 0);
-    refcount_--;
-    if (refcount_ != 0)
-      return refcount_;
-
-  }
-
-  // CORBA::TypeCode_ptr		tc = _type->_duplicate ();
-
-  CORBA::Any free_it_all (_type, this, CORBA::B_TRUE);
-
-  // tc->Release ();
-
-  return 0;
-}
-
-HRESULT __stdcall
-CORBA_Exception::QueryInterface (REFIID	riid,
-				 void **ppv)
-{
-  assert (refcount_ > 0);
-  *ppv = 0;
-
-  if (IID_CORBA_Exception == riid || IID_IUnknown == riid)
-    *ppv = this;
-
-  // XXX this approach needs modifying to enable returning
-  // UserException, SystemException, and other kinds of pointers.
-
-  if (*ppv == 0)
-    return ResultFromScode (E_NOINTERFACE);
-
- (void) AddRef ();
-  return NOERROR;
-}
-
-// Avoid zillions of not-quite-inlined copies of utilities.
-
-CORBA_UserException::CORBA_UserException (CORBA::TypeCode_ptr tc)
-  : CORBA_Exception (tc)
-{
-}
-
-CORBA_UserException::~CORBA_UserException (void)
-{
-}
-
-CORBA_SystemException::CORBA_SystemException (CORBA::TypeCode_ptr tc,
-					      CORBA::ULong code,
-					      CORBA::CompletionStatus completed)
-  : CORBA_Exception (tc),
-    _minor (code),
-    _completed (completed)
-{
-}
-
-CORBA_SystemException::~CORBA_SystemException (void)
-{
-}
-
-#define	NUM_SYS_EXCEPTIONS 26		// update correctly!
-#define	TC_BUFLEN 160		// preallocated tc buffer
-
-static CORBA::TypeCode_ptr sys_exceptions [NUM_SYS_EXCEPTIONS];
-CORBA::ExceptionList __system_exceptions;
-
-// Make the TypeCode for a standard exception ... note that "buffer"
-// holds the (unscoped) name originally, and is then overwritten.
-//
-// When used correctly, initializing system exceptions is only an
-// exercise in CPU time; it allocates no new memory.
-
-static void
-make_standard_typecode (CORBA::TypeCode_ptr tcp,
-			const char *name,
-			unsigned char *buffer,
-			size_t buflen,
-			CORBA::Environment &env)
-{
-  static const char *minor = "minor";
-  static const char *completion = "completion";
-
-  static const unsigned long oc_completion_status [] =
-  {
-    TAO_ENCAP_BYTE_ORDER,		// byte order flag, tricky
-    0, 0,		// type ID omitted
-    3,		// three members
-    0, 0,		// ... whose names are all omitted
-    0, 0,
-    0, 0
-  };
-  static CORBA::TypeCode
-    tc_completion_status (CORBA::tk_enum,
-			  sizeof oc_completion_status,
- (unsigned char *) &oc_completion_status,
-			  CORBA::B_FALSE);
-
-  static const CORBA::TypeCode_ptr completion_status = &tc_completion_status;
-
-  // Create a CDR stream ... juggle the alignment here a bit, we
-  // know it's good enough for tye typecode.
-
-  CDR stream (0, buflen);
-
-  stream.next = stream.buffer = buffer;
-
-  // into CDR stream, stuff (in order):
-  //	- byte order flag [4 bytes]
-  //	- exception ID [27 + N bytes]
-  //	- exception name [4 + N bytes ]
-  //	- number of members (2) [4 bytes ]
-  //	- foreach member, { name string, typecode } [~40 bytes]
-
-  char	full_id [100], *strptr = (char *) &full_id;
-
- (void) ACE_OS::sprintf (full_id, "IDL:omg.org/CORBA/%s:1.0", name);
-  assert (strlen (full_id) <= sizeof full_id);
-
-  if (stream.put_byte (TAO_ENCAP_BYTE_ORDER) != CORBA::B_TRUE
-      || stream.encode (CORBA::_tc_string,
-		       &strptr, 0,
-		       env) != CORBA::TypeCode::TRAVERSE_CONTINUE
-      || stream.encode (CORBA::_tc_string,
-		       &name, 0,
-		       env) != CORBA::TypeCode::TRAVERSE_CONTINUE
-      || stream.put_ulong (2L) != CORBA::B_TRUE
-      || stream.encode (CORBA::_tc_string,
-		       &minor, 0,
-		       env) != CORBA::TypeCode::TRAVERSE_CONTINUE
-      || stream.encode (CORBA::_tc_TypeCode,
-		       &CORBA::_tc_ulong, 0,
-		       env) != CORBA::TypeCode::TRAVERSE_CONTINUE
-      || stream.encode (CORBA::_tc_string,
-		       &completion, 0,
-		       env) != CORBA::TypeCode::TRAVERSE_CONTINUE
-      || stream.encode (CORBA::_tc_TypeCode,
-		       &completion_status, 0,
-		       env) != CORBA::TypeCode::TRAVERSE_CONTINUE) {
-    env.exception (new CORBA_INITIALIZE (CORBA::COMPLETED_NO));
-    return;
-  }
-
-  // OK, we stuffed the buffer we were given (or grew a bigger one;
-  // hope to avoid that during initialization).  Now build and return
-  // a TypeCode, saving it away in the list of ones that the ORB will
-  // always accept as part of any operation response!
-
-  sys_exceptions [__system_exceptions.length++]
-    = new (tcp) CORBA::TypeCode (CORBA::tk_except,
-				stream.next - stream.buffer,
-				stream.buffer, CORBA::B_FALSE);
-
-  assert (tcp->length_ <= TC_BUFLEN);
-  return;
-}
-
-// List of standard/system exceptions ... used to create static
-// storage for their typecodes, then later to initialize that storage
-// using the routine above. (It's just too painful to init these
-// typecodes statically in all cases!)
-
-#define	STANDARD_EXCEPTION_LIST \
-    TAO_SYSTEM_EXCEPTION (UNKNOWN) \
-    TAO_SYSTEM_EXCEPTION (BAD_PARAM) \
-    TAO_SYSTEM_EXCEPTION (NO_MEMORY) \
-    TAO_SYSTEM_EXCEPTION (IMP_LIMIT) \
-    TAO_SYSTEM_EXCEPTION (COMM_FAILURE) \
-    TAO_SYSTEM_EXCEPTION (INV_OBJREF) \
-    TAO_SYSTEM_EXCEPTION (OBJECT_NOT_EXIST) \
-    TAO_SYSTEM_EXCEPTION (NO_PERMISSION) \
-    TAO_SYSTEM_EXCEPTION (INTERNAL) \
-    TAO_SYSTEM_EXCEPTION (MARSHAL) \
-    TAO_SYSTEM_EXCEPTION (INITIALIZE) \
-    TAO_SYSTEM_EXCEPTION (NO_IMPLEMENT) \
-    TAO_SYSTEM_EXCEPTION (BAD_TYPECODE) \
-    TAO_SYSTEM_EXCEPTION (BAD_OPERATION) \
-    TAO_SYSTEM_EXCEPTION (NO_RESOURCES) \
-    TAO_SYSTEM_EXCEPTION (NO_RESPONSE) \
-    TAO_SYSTEM_EXCEPTION (PERSIST_STORE) \
-    TAO_SYSTEM_EXCEPTION (BAD_INV_ORDER) \
-    TAO_SYSTEM_EXCEPTION (TRANSIENT) \
-    TAO_SYSTEM_EXCEPTION (FREE_MEM) \
-    TAO_SYSTEM_EXCEPTION (INV_IDENT) \
-    TAO_SYSTEM_EXCEPTION (INV_FLAG) \
-    TAO_SYSTEM_EXCEPTION (INTF_REPOS) \
-    TAO_SYSTEM_EXCEPTION (BAD_CONTEXT) \
-    TAO_SYSTEM_EXCEPTION (OBJ_ADAPTER) \
-    TAO_SYSTEM_EXCEPTION (DATA_CONVERSION)
-
-// Declare static storage for these ... the buffer is "naturally"
-// aligned and overwritten.
-//
-// XXX this actually doesn't guarantee "natural" alignment, but
-// it works that way in most systems.
-
-#define	TAO_SYSTEM_EXCEPTION(name) \
-    static long tc_buf_ ## name [TC_BUFLEN / sizeof (long)]; \
-    static CORBA::TypeCode tc_std_ ## name (CORBA::tk_except); \
-    CORBA::TypeCode_ptr CORBA::_tc_ ## name = &tc_std_ ## name;
-STANDARD_EXCEPTION_LIST
-#undef	TAO_SYSTEM_EXCEPTION
-
-// Runtime initialization of all standard exception typecodes.  Called
-// from CORBA::ORB::init ().
-
-void
-__TC_init_standard_exceptions (CORBA::Environment &env)
-{
-  // Initialize the list of system exceptions, used when
-  // unmarshaling.
-  __system_exceptions.length = 0;
-  __system_exceptions.maximum = NUM_SYS_EXCEPTIONS;
-  __system_exceptions.buffer = &sys_exceptions [0];
-
-  // Initialize the typecodes.
-#define	TAO_SYSTEM_EXCEPTION(name) \
-  if (env.exception () == 0) \
-			       make_standard_typecode (&tc_std_ ## name, #name, \
- (unsigned char *) tc_buf_ ## name, \
-						       sizeof tc_buf_ ## name, env);
-
-  STANDARD_EXCEPTION_LIST
-#undef	TAO_SYSTEM_EXCEPTION
-    }
-
-#undef	STANDARD_EXCEPTION_LIST
-
-// Static initialization of the two user-defined exceptions that
-// are part of the ORB.
-
-static CORBA::Octet tc_buf_Bounds [] =
-{
-  0, 0, 0, 0,		// big endian, padded
-  0, 0, 0, 38,	// strlen (id) + 1
-  'I', 'D', 'L', ':',
-  'o', 'm', 'g', '.',
-  'o', 'r', 'g', '/',
-  'C', 'O', 'R', 'B',
-  'A', '/', 'T', 'y',
-  'p', 'e', 'C', 'o',
-  'd', 'e', '/', 'B',
-  'o', 'u', 'n', 'd',
-  's', ':', '1', '.',
-  '0', '\0', 0, 0,
-  0, 0, 0, 0		// no members to this typecode
-};
-
-static CORBA::TypeCode tc_std_Bounds (CORBA::tk_except,
-				     sizeof tc_buf_Bounds,
-				     tc_buf_Bounds,
-				     CORBA::B_FALSE);
-
-CORBA::TypeCode_ptr CORBA::_tc_Bounds = &tc_std_Bounds;
-
-static CORBA::Octet tc_buf_BadKind [] =
-{
-  0, 0, 0, 0,		// big endian, padded
-  0, 0, 0, 39,	// strlen (id) + 1
-  'I', 'D', 'L', ':',
-  'o', 'm', 'g', '.',
-  'o', 'r', 'g', '/',
-  'C', 'O', 'R', 'B',
-  'A', '/', 'T', 'y',
-  'p', 'e', 'C', 'o',
-  'd', 'e', '/', 'B',
-  'a', 'd', 'K', 'i',
-  'n', 'd', ':', '1',
-  '.', '0', '\0', 0,
-  0, 0, 0, 0		// no members to this typecode
-};
-
-static CORBA::TypeCode tc_std_BadKind (CORBA::tk_except,
-				      sizeof tc_buf_BadKind,
-				      tc_buf_BadKind,
-				      CORBA::B_FALSE);
-CORBA::TypeCode_ptr CORBA::_tc_BadKind = &tc_std_BadKind;
-
-// Convenience -- say if the exception is a system exception or not.
-
-CORBA::ExceptionType
-CORBA::Environment::exception_type (void) const
-{
-  static char sysex_prefix [] = "IDL:omg.org/CORBA/";
-  static char typecode_extra [] = "TypeCode/";
-
-  if (!_exception)
-    return CORBA::NO_EXCEPTION;
-
-  // All exceptions currently (CORBA 2.0) defined in the CORBA
-  // scope are system exceptions ... except for a couple that
-  // are related to TypeCodes.
-
-  char *id = _exception->id ();
-
-  if (ACE_OS::strncmp (id, sysex_prefix, sizeof sysex_prefix - 1) == 0
-      && ACE_OS::strncmp (id + sizeof sysex_prefix - 1,
-			  typecode_extra, sizeof typecode_extra - 1) != 0)
-    return CORBA::SYSTEM_EXCEPTION;
-
-  return CORBA::USER_EXCEPTION;
-}
-
-// Diagnostic utility routine:  describe the exception onto
-// the standard I/O stream passed as a parameter.
-//
-void
-CORBA::Environment::print_exception (const char *info,
-                                     FILE *) const
-{
-  CORBA::String id = this->_exception->id ();
-
-  ACE_DEBUG ((LM_ERROR, "(%P|%t) EXCEPTION, %s\n", info));
-
-  // XXX get rid of this logic, and rely on some member function
-  // on Exception to say if it's user or system exception.
-
-  if (ACE_OS::strncmp ((char *) id, "IDL:omg.org/CORBA/", 10) == 0
-      && ACE_OS::strncmp ((char *) id, "IDL:omg.org/CORBA/TypeCode/", 19) != 0)
-    {
-      // XXX this should be a QueryInterface call instead
-      CORBA::SystemException *x2 = (CORBA::SystemException *) this->_exception;
-
-      // XXX there are a other few "user exceptions" in the CORBA
-      // scope, they're not all standard/system exceptions ... really
-      // need to either compare exhaustively against all those IDs
-      // (yeech) or (preferably) to represent the exception type
-      // directly in the exception value so it can be queried.
-
-      ACE_DEBUG ((LM_ERROR, "(%P|%t) system exception, ID '%s'\n", id));
-      ACE_DEBUG ((LM_ERROR,
-		  "(%P|%t) minor code = %x, completed = %s\n",
-		  x2->minor (),
-                  (x2->completion () == CORBA::COMPLETED_YES) ? "YES" :
-                  (x2->completion () == CORBA::COMPLETED_NO) ? "NO" :
-                  (x2->completion () == CORBA::COMPLETED_MAYBE) ? "MAYBE" :
-                  "garbage"));
-    }
-  else
-    // XXX we can use the exception's typecode to dump all the data
-    // held within it ...
-
-    ACE_DEBUG ((LM_ERROR, "(%P|%t) user exception, ID '%s'\n", id));
-}
diff --git a/TAO/tao/except.h b/TAO/tao/except.h
deleted file mode 100644
index afab6df902a..00000000000
--- a/TAO/tao/except.h
+++ /dev/null
@@ -1,193 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO
-//
-// = FILENAME
-//    except.h
-//
-// = DESCRTION
-//     This file defines way in which CORBA exceptions are reported.
-//
-// = AUTHOR
-//     Copyright 1994-1995 by Sun Microsystems Inc.
-//
-// ============================================================================
-
-#if !defined (TAO_EXCEPT_H)
-#  define TAO_EXCEPT_H
-
-class TAO_Export CORBA_Exception : public IUnknown
-  // = TITLE
-  //   CORBA2-specified exception hierarchy.
-  //
-  // = DESCRIPTION
-  //   All exceptions have a type (represented by a TypeCode) and a
-  //   widely scoped type ID (in the TypeCode) that generated by any
-  //   OMG-IDL compiler and available through the Interface
-  //   Repositories.  Think of it as a "globally scoped" name
-  //   distinguishing each exception.
-{
-public:
-  CORBA_Exception (const CORBA_Exception &src);
-  CORBA_Exception &operator = (const CORBA_Exception &src);
-
-  // @@ All these inline methods should be split off into a *.i file.
-  void *operator new (size_t, const void *p)
-  { return (void *) p; }
-  void *operator new (size_t s)
-  { return ::operator new (s); }
-  void operator delete (void *p)
-  { ::operator delete (p); }
-
-  TAO_CONST CORBA::String id (void) const;
-  TAO_CONST CORBA::TypeCode_ptr type (void) const;
-
-  // = Methods required for COM IUnknown support
-
-  ULONG __stdcall AddRef (void);
-  ULONG __stdcall Release (void);
-  HRESULT __stdcall QueryInterface (REFIID riid,
-				    void **ppv);
-
-  CORBA_Exception (CORBA::TypeCode_ptr type);
-  virtual ~CORBA_Exception (void);
-
-private:
-  CORBA::TypeCode_ptr _type;
-  // Type of the Exception.
-
-  u_int refcount_;
-  // Reference count to avoid copying overhead.
-
-  ACE_SYNCH_MUTEX lock_;
-  // Serialize access to reference count.
-};
-
-class TAO_Export CORBA_UserException : public CORBA_Exception
-  // = TITLE
-  //   User exceptions are those defined by application developers
-  //   using OMG-IDL.
-{
-public:
-  CORBA_UserException (CORBA::TypeCode_ptr tc);
-  ~CORBA_UserException (void);
-
-protected:
-  // Copy and assignment operators.
-};
-
-class TAO_Export CORBA_SystemException : public CORBA_Exception
-  // = TITLE
-  //   System exceptions are those defined in the CORBA spec; OMG-IDL
-  //   defines these.
-{
-public:
-  // 94-9-14 also sez:  public copy constructor
-  // and assignment operator.
-
-  CORBA_SystemException (CORBA::TypeCode_ptr tc,
-			 CORBA::ULong code,
-			 CORBA::CompletionStatus completed);
-
-  ~CORBA_SystemException (void);
-
-  CORBA::ULong minor (void) const { return _minor; }
-  void minor (CORBA::ULong m) { _minor = m; }
-
-  CORBA::CompletionStatus completion (void) const { return _completed; }
-
-  void completion (CORBA::CompletionStatus c)
-  { _completed = c; }
-
-private:
-  CORBA::ULong _minor;
-  CORBA::CompletionStatus _completed;
-};
-
-// Declarations for all of the CORBA standard exceptions.
-//
-// XXX shouldn't have a default minor code, at least for code that's
-// inside the ORB.  All minor codes should be symbolically catalogued.
-
-#define TAO_SYSTEM_EXCEPTION(name) \
-class TAO_Export CORBA_ ## name : public CORBA_SystemException { \
-public: \
-  CORBA_ ## name (CORBA::CompletionStatus completed, \
-                  CORBA::ULong code = 0xffff0000L) \
-    : CORBA_SystemException (CORBA::_tc_ ## name, code, completed) \
-    { } \
-}
-
-TAO_SYSTEM_EXCEPTION(UNKNOWN);
-TAO_SYSTEM_EXCEPTION(BAD_PARAM);
-TAO_SYSTEM_EXCEPTION(NO_MEMORY);
-TAO_SYSTEM_EXCEPTION(IMP_LIMIT);
-TAO_SYSTEM_EXCEPTION(COMM_FAILURE);
-TAO_SYSTEM_EXCEPTION(INV_OBJREF);
-TAO_SYSTEM_EXCEPTION(OBJECT_NOT_EXIST);
-TAO_SYSTEM_EXCEPTION(NO_PERMISSION);
-TAO_SYSTEM_EXCEPTION(INTERNAL);
-TAO_SYSTEM_EXCEPTION(MARSHAL);
-TAO_SYSTEM_EXCEPTION(INITIALIZE);
-TAO_SYSTEM_EXCEPTION(NO_IMPLEMENT);
-TAO_SYSTEM_EXCEPTION(BAD_TYPECODE);
-TAO_SYSTEM_EXCEPTION(BAD_OPERATION);
-TAO_SYSTEM_EXCEPTION(NO_RESOURCES);
-TAO_SYSTEM_EXCEPTION(NO_RESPONSE);
-TAO_SYSTEM_EXCEPTION(PERSIST_STORE);
-TAO_SYSTEM_EXCEPTION(BAD_INV_ORDER);
-TAO_SYSTEM_EXCEPTION(TRANSIENT);
-TAO_SYSTEM_EXCEPTION(FREE_MEM);
-TAO_SYSTEM_EXCEPTION(INV_IDENT);
-TAO_SYSTEM_EXCEPTION(INV_FLAG);
-TAO_SYSTEM_EXCEPTION(INTF_REPOS);
-TAO_SYSTEM_EXCEPTION(BAD_CONTEXT);
-TAO_SYSTEM_EXCEPTION(OBJ_ADAPTER);
-TAO_SYSTEM_EXCEPTION(DATA_CONVERSION);
-
-#undef	TAO_SYSTEM_EXCEPTION
-
-class TAO_Export CORBA_Environment
-{
-  // = TITLE
-  // A CORBA_Environment is a way to automagically ensure that
-  // exception data is freed -- the "var" class for Exceptions.  It
-  // adds just a bit of convenience function support, helping classify
-  // exceptions as well as reducing memory leakage.
-public:
-  CORBA_Environment (void) : _exception (0) { }
-  ~CORBA_Environment (void) { clear (); }
-
-  CORBA::Exception_ptr exception (void) const { return _exception; }
-
-  void exception (CORBA::Exception *ex)
-  { clear (); _exception = ex; }
-
-  CORBA::ExceptionType exception_type (void) const;
-  TAO_CONST CORBA::String exception_id (void) const;
-
-  void clear (void)
-  {
-    if (_exception)
-      {
-	_exception->Release ();
-	_exception = 0;	// XXX
-      }
-  }
-
-  void print_exception (const char *info,
-                        FILE *f=stdout) const;
-  // print the exception to output determined by f
-
-private:
-  CORBA::Exception_ptr _exception;
-
-  // = These are not provided.
-  CORBA_Environment (const CORBA_Environment &src);
-  CORBA_Environment &operator = (const CORBA_Environment &src);
-};
-
-#endif /* TAO_EXCEPT_H */
diff --git a/TAO/tao/factories.h b/TAO/tao/factories.h
deleted file mode 100644
index 496dae62ed2..00000000000
--- a/TAO/tao/factories.h
+++ /dev/null
@@ -1,141 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO
-// 
-// = FILENAME
-//     factories.h
-//
-// = AUTHOR
-//     Chris Cleeland
-//
-// = VERSION
-//     $Id$
-// ============================================================================
-
-#if !defined (TAO_FACTORIES_H)
-#  define TAO_FACTORIES_H
-
-#if 0
-#  include "ace/SOCK_Acceptor.h"
-#  include "ace/SOCK_Connector.h"
-#  include "ace/Strategies_T.h"
-#  include "ace/Connector.h"
-#  include "ace/Synch.h"
-
-#  include "tao/params.h"
-#  include "tao/connect.h"
-#  include "tao/objtable.h"
-#endif
-
-class TAO_Client_Connection_Handler : public ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>
-  // = TITLE
-  //      <Svc_Handler> used on the client side and returned
-  //      by the <TAO_Client_Factory::CONNECTOR>.
-{
-public:
-  TAO_Client_Connection_Handler (ACE_Thread_Manager* = 0);
-  // Do-nothing constructor
-
-  virtual int open (void*);
-  // Initialization hook
-
-  void in_use (CORBA::Boolean);
-  // Set the in-use flag.
-
-  CORBA::Boolean in_use (void);
-  // Return state of the in-use flag.
-
-private:
-  CORBA::Boolean in_use_;
-  // True value indicates that something is using this handler.
-};
-
-class TAO_Client_Factory
-  // = TITLE
-  //    Abstract factory used by the client to turn out various
-  //    strategies used on the client side.
-{
-public:
-  typedef ACE_Strategy_Connector<TAO_Client_Connection_Handler, ACE_SOCK_CONNECTOR> 
-          CONNECTOR;
-  typedef ACE_NOOP_Creation_Strategy<TAO_Client_Connection_Handler> 
-          NULL_CREATION_STRATEGY;
-  typedef ACE_Cached_Connect_Strategy<TAO_Client_Connection_Handler, 
-                                      ACE_SOCK_CONNECTOR,
-				      ACE_SYNCH_RW_MUTEX>
-          CACHED_CONNECT_STRATEGY;
-
-#if defined (TAO_HAS_CLIENT_CONCURRENCY)
-  CONCURRENCY_STRATEGY *concurrency_strategy (void);
-#endif
-  
-  CONNECTOR *connector (void);
-  // Return a pointer to a connector using appropriate strategies.
-
-  TAO_Client_Factory (void);
-  ~TAO_Client_Factory (void);
-  
-private:
-#if defined (TAO_HAS_CLIENT_CONCURRENCY)
-  CONCURRENCY_STRATEGY *concurrency_strategy_;
-#endif
-  CONNECTOR connector_;
-  NULL_CREATION_STRATEGY null_creation_strategy_;
-  CACHED_CONNECT_STRATEGY caching_connect_strategy_;
-};
-
-class TAO_Server_Factory
-  // = TITLE
-  //    Abstract factory used by the server side to turn out various
-  //    strategies of special utility to it.
-{
-public:
-  // = SERVER-SIDE
-  typedef ACE_Creation_Strategy<TAO_OA_Connection_Handler> CREATION_STRATEGY;
-  typedef ACE_Accept_Strategy<TAO_OA_Connection_Handler, ACE_SOCK_ACCEPTOR> ACCEPT_STRATEGY;
-  typedef ACE_Concurrency_Strategy<TAO_OA_Connection_Handler> CONCURRENCY_STRATEGY;
-  typedef ACE_Scheduling_Strategy<TAO_OA_Connection_Handler> SCHEDULING_STRATEGY;
-
-  CREATION_STRATEGY *creation_strategy (void);
-  // return concrete creation strategy
-
-  ACCEPT_STRATEGY *accept_strategy (void);
-  // return concrete acceptor strategy
-
-  CONCURRENCY_STRATEGY *concurrency_strategy (void);
-  // return the concurrency strategy used
-
-  SCHEDULING_STRATEGY *scheduling_strategy (void);
-  // return the scheduling strategy used
-
-  TAO_Object_Table *object_lookup_strategy (void);
-  // return the concrete object lookup strategy
-
-  TAO_Server_Factory (void);
-  // constructor
-  
-private:
-  // = COMMON
-  ACE_Thread_Strategy<TAO_OA_Connection_Handler> threaded_strategy_;
-  // The threaded strategy used for passively establishing connections.
-  ACE_Reactive_Strategy<TAO_OA_Connection_Handler> reactive_strategy_;
-  // A strategy for passively establishing connections which utilizes the Reactor.
-
-  // = SERVER
-  CONCURRENCY_STRATEGY *concurrency_strategy_;
-  // concrete concurrency strategy
-
-  TAO_Object_Table *objtable_;
-  // instance of object table
-#if 0
-  // Someday we'll need these!
-  CREATION_STRATEGY *creation_strategy_;
-  ACCEPT_STRATEGY *accept_strategy_;
-  SCHEDULING_STRATEGY *scheduling_strategy_;
-#endif
-};
-
-#endif /* TAO_FACTORIES_H */
diff --git a/TAO/tao/giop.cpp b/TAO/tao/giop.cpp
deleted file mode 100644
index 4d3f33ed2a9..00000000000
--- a/TAO/tao/giop.cpp
+++ /dev/null
@@ -1,1185 +0,0 @@
-// @(#)giop.cpp	1.10 95/09/21
-// Copyright 1994-1995 by Sun Microsystems Inc.
-// All Rights Reserved
-//
-// GIOP:	Utility routines for sending, receiving GIOP messages
-//
-// Note that the Internet IOP is just the TCP-specific mapping of the
-// General IOP.  Areas where other protocols may map differently
-// include use of record streams (TCP has none), orderly disconnect
-// (TCP has it), endpoint addressing (TCP uses host + port), security
-// (Internet security should be leveraged by IIOP) and more.
-//
-// NOTE: There are a few places where this code knows that it's really
-// talking IIOP instead of GIOP.  No rush to fix this so long as we
-// are really not running atop multiple connection protocols.
-//
-// THREADING NOTE: currently, the connection manager eliminates tricky
-// threading issues by providing this code with the same programming
-// model both in threaded and unthreaded environments.  Since the GIOP
-// APIs were all designed to be reentrant, this makes threading rather
-// simple!
-//
-// That threading model is that the thread making (or handling) a call
-// is given exclusive access to a connection for the duration of a
-// call, so that no multiplexing or demultiplexing is needed.  That
-// is, locking is at the "connection level" rather than "message
-// level".
-//
-// The down side of this simple threading model is that utilization of
-// system resources (mostly connections, but to some extent network
-// I/O) in some kinds of environments can be inefficient.  However,
-// simpler threading models are much easier to get properly debugged,
-// and often perform better.  Also, such environments haven't been
-// seen to be any kind of problem; the model can be changed later if
-// needed, it's just an internal implementation detail.  Any portable
-// ORB client is not allowed to rely on semantic implications of such
-// a model.
-//
-// XXX there is lots of unverified I/O here.  In all cases, if an
-// error is detected when marshaling or unmarshaling, it should be
-// reported.
-
-#include "tao/corba.h"
-
-// Apart from the length word, headers are specified to be arrays of
-// bytes.  They're dealt with as such, rather than using CDR routines,
-// to speed up the critical paths for message read and write.
-
-static inline CORBA::Boolean
-start_message (TAO_GIOP_MsgType type,
-	       CDR &msg)
-{
-  msg.next = msg.buffer;		// for reused streams
-  msg.remaining = msg.length;
-
-  if (msg.bytes_remaining () < TAO_GIOP_HEADER_LEN)
-    return CORBA::B_FALSE;
-
-  msg.next [0] = 'G';
-  msg.next [1] = 'I';
-  msg.next [2] = 'O';
-  msg.next [3] = 'P';
-
-  msg.next [4] = MY_MAJOR;
-  msg.next [5] = MY_MINOR;
-  msg.next [6] = TAO_ENCAP_BYTE_ORDER;
-  msg.next [7] = (u_char) type;
-
-  msg.skip_bytes (TAO_GIOP_HEADER_LEN);
-  return CORBA::B_TRUE;
-}
-
-static const char digits [] = "0123456789ABCD";
-static const char *names [] =
-{
-  "Request",
-  "Reply",
-  "CancelRequest",
-  "LocateRequest",
-  "LocateReply",
-  "CloseConnection",
-  "MessageError",
-  "EndOfFile"
-};
-
-static void
-dump_msg (const char *label,
-	  const u_char *ptr,
-	  size_t len)
-{
-  if (TAO_debug_level >= 2)
-    {
-      ACE_DEBUG ((LM_DEBUG, "%s GIOP v%c.%c msg, %d data bytes, %s endian, %s\n",
-                  label, digits[ptr[4]], digits[ptr[5]],
-                  len - TAO_GIOP_HEADER_LEN,
-                  (ptr[6] == TAO_ENCAP_BYTE_ORDER) ? "my" : "other",
-                  (ptr[7] <= TAO_GIOP_MessageError) ? names [ptr[7]] : "UNKNOWN TYPE"));
-
-      if (TAO_debug_level >= 4)
-        ACE_HEX_DUMP ((LM_DEBUG, (const char*)ptr, len, "(%P|%t) data bytes\n"));
-    }
-}
-
-CORBA::Boolean
-TAO_GIOP::send_request (TAO_SVC_HANDLER *&handler,
-                        CDR &stream)
-{
-  char *buf = (char *) stream.buffer;
-  size_t buflen = stream.next - stream.buffer;
-
-  assert (buflen == (stream.length - stream.remaining));
-
-  // Patch the message length in the GIOP header; it's always at the
-  // same eight byte offset into the message.
-  //
-  // NOTE: Here would also be a fine place to calculate a digital
-  // signature for the message and place it into a preallocated slot
-  // in the "ServiceContext".  Similarly, this is a good spot to
-  // encrypt messages (or just the message bodies) if that's needed in
-  // this particular environment and that isn't handled by the
-  // networking infrastructure (e.g. IPSEC).
-
-  *(CORBA::Long *) (stream.buffer + 8) =
-      (CORBA::Long) (buflen - TAO_GIOP_HEADER_LEN);
-
-  // Strictly speaking, should not need to loop here because the
-  // socket never gets set to a nonblocking mode ... some Linux
-  // versions seem to need it though.  Leaving it costs little.
-
-  dump_msg ("send", stream.buffer, buflen);
-
-  ACE_SOCK_Stream &peer = handler->peer ();
-
-  while (buflen > 0)
-    {
-      if (buflen > stream.length)
-	{
-	  ACE_DEBUG ((LM_DEBUG, "(%P|%t) ?? writebuf, buflen %u > length %u\n",
-                      buflen, stream.length));
-	  return CORBA::B_FALSE;
-	}
-
-      ssize_t writelen = peer.send ((char _FAR *) buf, buflen);
-
-#if defined (DEBUG)
-      //      dmsg_filter (6, "wrote %d bytes to connection %d",
-      //	   writelen, connection);
-      dmsg_filter (6, "wrote %d bytes", writelen);
-#endif	/* DEBUG */
-
-      assert ((writelen >= 0
-	       && ((size_t)writelen) <= buflen) || writelen == -1);
-
-      // On error or EOF, report the fault, close the connection, and
-      // mark it as unusable/defunct.
-      //
-      // XXX on client side write errors, we may hit the case that the
-      // server did a clean shutdown but we've not yet read the
-      // GIOP::CloseConnection message.  If we get an error, we need
-      // to see if there is such a message waiting for us, and if so
-      // we should cause (full) rebinding to take place.
-
-      if (writelen == -1)
-	{
-	  ACE_DEBUG ((LM_ERROR,
-		      "(%P|%t) %p\n", "OutgoingMessage::writebuf ()"));
-	  ACE_DEBUG ((LM_DEBUG,
-		      "(%P|%t) closing conn %d after fault\n", peer.get_handle ()));
-          handler->close ();
-          handler = 0;
-	  return CORBA::B_FALSE;
-	}
-      else if (writelen == 0)
-	{
-	  ACE_DEBUG ((LM_DEBUG,
-		      "(%P|%t) OutgoingMessage::writebuf () ... EOF, closing conn %d\n",
-		      peer.get_handle ()));
-          handler->close ();
-          handler = 0;
-	  return CORBA::B_FALSE;
-	}
-      if ((buflen -= writelen) != 0)
-	buf += writelen;
-
-#if defined (DEBUG)
-      //
-      // NOTE:  this should never be seen.  However, on Linux
-      // it's been seen with UNIX domain sockets.
-      //
-      if (buflen)
-	dmsg_filter (8, "%u more bytes to write...\n", buflen);
-#endif /* DEBUG */
-    }
-  return CORBA::B_TRUE;
-}
-
-// Server sends an "I'm shutting down now, any requests you've sent me
-// can be retried" message to the server.  The message is prefab, for
-// simplicity.
-//
-// NOTE: this is IIOP-specific though it doesn't look like it is.  It
-// relies on a TCP-ism: orderly disconnect, which doesn't exist in all
-// transport protocols.  Versions of GIOP atop some transport that's
-// lacking orderly disconnect must define some transport-specific
-// handshaking (e.g. the XNS/SPP handshake convention) in order to
-// know that the same transport semantics are provided when shutdown
-// is begun with messages "in flight". (IIOP doesn't report false
-// errors in the case of "clean shutdown", because it relies on
-// orderly disconnect as provided by TCP.  This quality of service is
-// required to write robust distributed systems.)
-
-static const char
-close_message [TAO_GIOP_HEADER_LEN] =
-{
-  'G', 'I', 'O', 'P',
-  MY_MAJOR,
-  MY_MINOR,
-  TAO_ENCAP_BYTE_ORDER,
-  TAO_GIOP_CloseConnection,
-  0, 0, 0, 0
-};
-
-void
-TAO_GIOP::close_connection (TAO_Client_Connection_Handler *&handler,
-                            void *)
-{
-  // It's important that we use a reliable shutdown after we send this
-  // message, so we know it's received.
-  //
-  // XXX should recv and discard queued data for portability; note
-  // that this won't block (long) since we never set SO_LINGER
-
-  dump_msg ("send", (const u_char *) close_message, TAO_GIOP_HEADER_LEN);
-
-  handler->peer ().send (close_message, TAO_GIOP_HEADER_LEN);
-  ACE_HANDLE which = handler->peer ().get_handle ();
-  handler->close ();
-  handler = 0;
-  ACE_DEBUG ((LM_DEBUG,
-	      "(%P|%t) shut down socket %d\n", which));
-}
-
-
-// Send an "I can't understand you" message -- again, the message is
-// prefabricated for simplicity.  This implies abortive disconnect (at
-// the application level, if not at the level of TCP).
-//
-// NOTE that IIOP will still benefit from TCP's orderly disconnect.
-
-static const char
-error_message [TAO_GIOP_HEADER_LEN] =
-{
-  'G', 'I', 'O', 'P',
-  MY_MAJOR,
-  MY_MINOR,
-  TAO_ENCAP_BYTE_ORDER,
-  TAO_GIOP_MessageError,
-  0, 0, 0, 0
-};
-
-static inline void
-send_error (TAO_Client_Connection_Handler *&handler)
-{
-  dump_msg ("send", (const u_char *) error_message, TAO_GIOP_HEADER_LEN);
-  handler->peer ().send (error_message, TAO_GIOP_HEADER_LEN);
-  ACE_HANDLE which = handler->peer ().get_handle ();
-  handler->close ();
-  handler = 0;
-  ACE_DEBUG ((LM_DEBUG, "(%P|%t) aborted socket %d\n", which));
-}
-
-// @@ Can't we remove this stuff and replace it with recv_n () on the
-// <peer>?
-
-// Loop on data read ... this is required with some implementations of
-// sockets (e.g. winsock, HP/UX) since even when async mode is not
-// set, recv () won't block until the requested amount of data is
-// available.
-
-static int
-read_buffer (ACE_SOCK_Stream &peer,
-	     char *buf,
-	     size_t len)
-{
-  int bytes_read = 0;
-  bytes_read = peer.recv_n (buf, len);
-  return bytes_read;
-}
-
-// Read the message header, plus any data part of the message, setting
-// stuff up so that CDR byteswaps data as appropriate.  Errors are
-// reported to be MessageError messages.
-//
-// NOTE: this code is structured to issue two read () calls for each
-// incoming message.  Alternative structures (e.g. with a user-space
-// buffer per connection, or networking code handing off entire GIOP
-// messages) can reduce the overhead of these calls to the networking
-// code; correctness and simplicity drove this implementation more
-// than efficiency.
-//
-// NOTE: as always, counting system calls associated with I/O gives
-// you a good basic understanding of the tuning issues.  On the server
-// side, there is normally select/read/read/write per invocation.  The
-// call to select () can be omitted by allocating a thread to each
-// connection; in some cases, that alone has almost doubled
-// performance.  The two read () calls can be made into one by fancy
-// buffering.  How fast could it be with both optimizations applied?
-
-TAO_GIOP_MsgType
-TAO_GIOP::recv_request (TAO_SVC_HANDLER *&handler,
-                        CDR &msg,
-                        CORBA::Environment &env)
-{
-  TAO_GIOP_MsgType	retval;
-  CORBA::ULong message_size;
-  ACE_SOCK_Stream &connection = handler->peer ();
-
-  // Read the message header off the wire.
-  //
-  // THREADING NOTE: the connection manager handed us this connection
-  // for exclusive use, so we need not worry about having two threads
-  // interleave reads of partial messages.  This model is excellent
-  // for "lightly threaded" systems (as will be the majority in the
-  // near future) but makes less effective use of connection resources
-  // as the "duty factor" goes down because of either long calls or
-  // bursty contention during numerous short calls to the same server.
-
-  assert (msg.length > TAO_GIOP_HEADER_LEN);
-
-  msg.next = msg.buffer;
-  msg.remaining = TAO_GIOP_HEADER_LEN;
-
-  char *bufptr = (char _FAR *) msg.buffer;
-  ssize_t len = read_buffer (connection, bufptr, TAO_GIOP_HEADER_LEN);
-  // Read the header into the buffer.
-
-  if (len != TAO_GIOP_HEADER_LEN)
-    {
-      switch (len)
-        {
-        case 0:
-          ACE_DEBUG ((LM_DEBUG,
-                      "(%P|%t) Header EOF ... peer probably aborted connection %d\n",
-                      connection.get_handle ()));
-          return TAO_GIOP_EndOfFile;
-          // XXX should probably find some way to report this without
-          // an exception, since for most servers it's not an error.
-          // Is it _never_ an error?  Not sure ...
-          /* NOTREACHED */
-        case -1: // error
-          ACE_DEBUG ((LM_ERROR,
-                      "(%P|%t) GIOP::recv_request header socket error %p\n",
-                      "read_buffer"));
-          break;
-          /* NOTREACHED */
-        default:
-          ACE_DEBUG ((LM_ERROR,
-                      "(%P|%t) GIOP::recv_request header read failed, only %d of %d bytes\n",
-                      len, TAO_GIOP_HEADER_LEN));
-          break;
-          /* NOTREACHED */
-        }
-
-      env.exception (new CORBA::COMM_FAILURE (CORBA::COMPLETED_MAYBE));
-      return TAO_GIOP_MessageError;
-    }
-
-  // NOTE: if message headers, or whome messages, get encrypted in
-  // application software (rather than by the network infrastructure)
-  // they should be decrypted here ...
-
-  // First make sure it's a GIOP message of any version.
-
-  if (!(msg.buffer [0] == 'G'
-	&& msg.buffer [1] == 'I'
-	&& msg.buffer [2] == 'O'
-	&& msg.buffer [3] == 'P'))
-    {
-      env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE));	// header
-      ACE_DEBUG ((LM_DEBUG, "bad header, magic word\n"));
-      return TAO_GIOP_MessageError;
-    }
-
-  // Then make sure the major version is ours, and the minor version
-  // is one that we understand.
-
-  if (!(msg.buffer [4] == MY_MAJOR && msg.buffer [5] <= MY_MINOR))
-    {
-      env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE));	// header
-      ACE_DEBUG ((LM_DEBUG, "bad header, version\n"));
-      return TAO_GIOP_MessageError;
-    }
-
-  // Get the message type out and adjust the buffer's records to record
-  // that we've read everything except the length.
-
-  retval = (TAO_GIOP_MsgType) msg.buffer[7];
-  msg.skip_bytes (8);
-
-  // Make sure byteswapping is done if needed, and then read the
-  // message size (appropriately byteswapped).
-
-  msg.do_byteswap = (msg.buffer [6] != TAO_ENCAP_BYTE_ORDER);
-  msg.get_ulong (message_size);
-
-  // Make sure we have the full length in memory, growing the buffer
-  // if needed.
-  //
-  // NOTE: We could overwrite these few bytes of header... they're
-  // left around for now as a debugging aid.
-
-  assert (message_size <= UINT_MAX);
-
-  if ((TAO_GIOP_HEADER_LEN + message_size) > msg.length)
-    msg.grow ((size_t) (TAO_GIOP_HEADER_LEN + message_size));
-
-  msg.remaining = (size_t) message_size;
-  bufptr = (char *) & msg.buffer [TAO_GIOP_HEADER_LEN];
-
-  // Read the rest of this message into the buffer.
-
-  len = read_buffer (connection, bufptr, (size_t) message_size);
-
-  if (len != (ssize_t) message_size)
-    {
-      switch (len)
-        {
-        case 0:
-          ACE_DEBUG ((LM_DEBUG,
-                      "(%P|%t) TAO_GIOP::recv_request body, EOF on handle %d\n",
-                      connection.get_handle ()));
-          break;
-          /* NOTREACHED */
-        case -1:
-          ACE_DEBUG ((LM_ERROR,
-                      "(%P|%t) TAO_GIOP::recv_request () body %p\n",
-                      "read_buffer"));
-          break;
-          /* NOTREACHED */
-        default:
-          ACE_DEBUG ((LM_ERROR,
-                      "(%P|%t) short read, only %d of %d bytes\n", len, message_size));
-          break;
-          /* NOTREACHED */
-        }
-
-      // clean up, and ...
-      env.exception (new CORBA::COMM_FAILURE (CORBA::COMPLETED_MAYBE));	// body
-      ACE_DEBUG ((LM_DEBUG, "couldn't read rest of message\n"));
-      return TAO_GIOP_MessageError;
-    }
-
-  dump_msg ("recv", msg.buffer, (size_t) (message_size + TAO_GIOP_HEADER_LEN));
-  return retval;
-}
-
-// Normal invocations don't involve any heap allocation; messages are
-// constructed into stack-based buffers and are read into those
-// buffers too.  Larger buffers are heap-allocated as needed.
-//
-// The constraint on request IDs is that no two requests from the same
-// client with the same ID are outstanding at the same time.  In
-// single threaded environments, this is met by any number whatever.
-// When multiple threads are used, we eliminate the need for any
-// locked state by using the thread ID as the request ID, since any
-// given thread has at most one request outstanding at a time.
-//
-// NOTE: this means that if "deferred synchronous" calls get
-// supported, it's done by creating a thread internally to make the
-// call.  That is less disruptive (and error prone) in general than
-// restructuring an ORB core in terms of asynchrony.
-
-TAO_GIOP_Invocation::TAO_GIOP_Invocation (IIOP_Object *data,
-                                          const char *operation,
-                                          CORBA::Boolean is_roundtrip)
-  : data_ (data),
-    opname_ (operation),
-    do_rsvp_ (is_roundtrip),
-    my_request_id_ (0),
-    stream_ (&buffer [0], sizeof buffer),
-    handler_ (0)
-{
-  // The assumption that thread ids are ints is false and horribly
-  // implementation-dependent, so this code just sucks.  But, at least
-  // it will compile on multiple platforms through the magic of ACE
-  // :-/
-
-  //assert (sizeof (CORBA::ULong) == sizeof (ACE_thread_t));
-  ACE_thread_t me = ACE_OS::thr_self ();
-
-  // Copy in only as many bytes are valid, or only as many as we have
-  // room for, whichever is less.  -------> What a friggin' HACK!?!?!
-  ACE_OS::memcpy (&this->my_request_id_,
-                  &me,
-                  ACE_MIN (sizeof (me), sizeof (this->my_request_id_)));
-}
-
-TAO_GIOP_Invocation::~TAO_GIOP_Invocation (void)
-{
-  if (this->handler_ != 0)
-    this->handler_->idle ();
-}
-
-// Octet codes for the parameters of the "Opaque" (sequence of octet)
-// data type used various places internally ... a CDR encapsulation
-// holding two parameters (like all sequence TypeCodes).
-//
-// NOTE: this **MUST** be longword aligned, which is why it's coded as
-// a longword array not an octet array.  Just sticking a long in for
-// padding won't work with compilers that optimize unused data out of
-// existence.
-
-static const CORBA::Long _oc_opaque [] =
-{	// CDR typecode octets
-  TAO_ENCAP_BYTE_ORDER,				// native endian + padding; "tricky"
-  10,				// ... (sequence of) octets
-  0				// ... unbounded
-};
-
-CORBA::TypeCode
-TC_opaque (CORBA::tk_sequence,
-           sizeof _oc_opaque,
-           (u_char *) &_oc_opaque,
-           CORBA::B_FALSE);
-
-// Octet codes for the parameters of the ServiceContextList TypeCode
-// ...  this is a CDR encapsulation holding two parameters (like all
-// sequences): a TypeCode, and the bounds of the sequence (zero in
-// this case).
-//
-// This is complicated since the Typecode for the data type for the
-// sequence members is complex, a structure that nests two further
-// typecodes (one is a sequence).
-//
-// NOTE:  this must be longword aligned!
-
-static const CORBA::Long _oc_svc_ctx_list [] =
-{
-  // START bytes of encapsulation 0
-  TAO_ENCAP_BYTE_ORDER, // native endian + padding; "tricky"
-
-  //
-  // FIRST sequence param:  typecode for struct is complex,
-  // and so uses a nested encapsulation.
-  //
-  CORBA::tk_struct,
-  72, // length of encapsulation 1
-
-  // START bytes of encapsulation 1 (struct params)
-  1, // native endian + padding; "tricky"
-  1, 0, // type ID omitted:  null string
-  1, 0, // name omitted "ServiceContext"
-
-  2, // two struct elements
-
-  // First structure element:  name, typecode for ULong
-  //
-  // NOTE:  to be more strictly correct this could be a CORBA::tk_alias
-  // typecode ...
-
-  1, 0, // name omitted:  "context_id"
-  CORBA::tk_long,
-
-  // Second structure element: name, typecode for sequence of octet;
-  // the typecode for sequence of octet is complex, there's a second
-  // level of nested encapuslation here.
-
-  1, 0, // name omitted:  "context_data"
-  CORBA::tk_sequence,	// sequence typecode
-  16, // length of encapsulation 2
-
-  // START bytes of encapsulation 2 (sequence params)
-  1, // native endian + padding; "tricky"
-  1, 0, // type ID omitted:  null string
-  CORBA::tk_octet, // (sequence of) octet
-  0, // ... unbounded length
-  // END bytes of encapsulation 2 (sequence params)
-
-  // END bytes of encapsulation 1 (struct params)
-
-  // SECOND sequence param:  bound of sequence (none)
-  0 // unbounded seq of ServiceContext
-  // END bytes of encapsulation 0 (sequence params)
-};
-
-CORBA::TypeCode
-TC_ServiceContextList (CORBA::tk_sequence,
-                       sizeof _oc_svc_ctx_list,
-                       (u_char *) &_oc_svc_ctx_list,
-                       CORBA::B_FALSE);
-
-// The public API involves creating an invocation, starting it, filling
-// in request parameters, actually performing the invocation, getting
-// response parameters, and then cleaning up.  Sometimes they must be
-// restarted (e.g. request forwarding).  This is the start/restart entry.
-
-void
-TAO_GIOP_Invocation::start (CORBA::Environment &env)
-{
-  const TAO_opaque *key;
-
-  // First try to bind to the appropriate address.  We do that here
-  // since we may get forwarded to a different objref in the course of
-  // any given call, with new start () call each time.  It's not
-  // cached in the objref data since the connections change
-  // asynchronously from objref invocations and this simplifies
-  // connection management.
-  //
-  // THREADING NOTE: this connection is reserved to this call.  Also,
-  // starting at this point in the call, new forwarding information
-  // will not be used until/unless the call is reissued.  Correctness
-  // is not affected, the call will just be forwarded later than it
-  // might be in a more complex implementation.
-
-  assert (data_ != 0);
-
-  // @@ Why is this lock here, i.e., what is it protecting?  Can
-  // we remove it?
-  CORBA::Object_ptr obj = 0;
-
-  // Get a CORBA::Object_ptr from _data using <QueryInterface>.
-  (void) this->data_->QueryInterface (IID_CORBA_Object, (void **) &obj);
-
-  // Get a pointer to the connector, which might be in thread-specific
-  // storage, depending on the concurrency model.
-  TAO_CONNECTOR *con = TAO_ORB_Core_instance ()->connector ();
-
-  // Determine the object key and the address to which we'll need a
-  // connection.
-  ACE_INET_Addr *server_addr_p = 0;
-
-  {
-    // Begin a new scope so we keep this lock only as long as
-    // necessary
-#if 0 /* @@ don't delete this, chris */
-    ACE_MT (ACE_GUARD (ACE_SYNCH_MUTEX, guard, data_->fwd_profile_lock ()));
-#endif
-    if (data_->fwd_profile_i () != 0)
-      {
-        key = &data_->fwd_profile_i ()->object_key;
-        server_addr_p = &data_->fwd_profile_i ()->object_addr ();
-      }
-    else
-      {
-        key = &data_->profile.object_key;
-        server_addr_p = &data_->profile.object_addr ();
-      }
-  }
-
-  if (server_addr_p == 0)
-    {
-      env.exception (new CORBA::COMM_FAILURE (CORBA::COMPLETED_NO));
-      return;
-    }
-
-  this->handler_ = 0;
-  // Must reset handler, otherwise, <ACE_Cached_Connect_Strategy> will
-  // complain.
-
-  // Establish the connection and get back a
-  // <Client_Connection_Handler>.
-  if (con->connect (this->handler_,
-                    *server_addr_p) == -1)
-    {
-      // @@ Need to figure out which exception to set...this one is
-      // pretty vague.
-      env.exception (new CORBA::COMM_FAILURE (CORBA::COMPLETED_NO));
-      return;
-    }
-
-  // Use the ACE_SOCK_Stream from the Client_Connection_Handler for
-  // communication inplace of the endpoint used below.
-
-  // POLICY DECISION: If the client expects most agents to forward,
-  // then it could try to make sure that it's been forwarded at least
-  // once by eliciting it with a LocateRequest message. (Further
-  // hinting in the IIOP::ProfileData could help!)
-  //
-  // That scenario does not match an "Inter" ORB Protocol well, since
-  // bridges chain calls rather than forwarding them.  It does match
-  // some kinds of "Intra" ORB scenarios well, with many agents that
-  // spawn new processes talking to their clients across the net.
-  //
-  // At this time, the policy noted above is followed in the sense
-  // that this software does NOT expect most agents to forward, so it
-  // doesn't bother to probe.  Correctness is not affected; this is
-  // only a quality-of-service policy.  It affects mostly performance,
-  // but the "best efforts" semantics for "oneway" messages would also
-  // be impacted in that some (by definition, buggy!) code which used
-  // only "oneway" messages might not work at all.
-
-  // Build the outgoing message, starting with generic GIOP header.
-
-  CORBA::Boolean bt = start_message (TAO_GIOP_Request, this->stream_);
-
-  if (bt != CORBA::B_TRUE)
-    {
-      env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_NO));
-      return;
-    }
-
-  // Then fill in the rest of the RequestHeader
-  //
-  // The first element of header is service context list;
-  // transactional context would be acquired here using the
-  // transaction service APIs.  Other kinds of context are as yet
-  // undefined.
-  //
-  // Last element of request header is the principal; no portable way
-  // to get it, we just pass empty principal (convention: indicates
-  // "anybody").  Steps upward in security include passing an
-  // unverified user ID, and then verifying the message (i.e. a dummy
-  // service context entry is set up to hold a digital signature for
-  // this message, then patched shortly before it's sent).
-
-  static CORBA::Principal_ptr anybody = 0;
-  static TAO_GIOP_ServiceContextList svc_ctx;	// all zeroes
-
-  if (this->stream_.encode (&TC_ServiceContextList, 0, &svc_ctx, env)
-      != CORBA::TypeCode::TRAVERSE_CONTINUE)
-    return;
-
-  if (!this->stream_.put_ulong (this->my_request_id_)
-      || !this->stream_.put_boolean (this->do_rsvp_))
-    {
-      env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_NO));
-      return;
-    }
-
-  if (this->stream_.encode (&TC_opaque,
-                            key,
-                            0,
-                            env) != CORBA::TypeCode::TRAVERSE_CONTINUE
-      || this->stream_.encode (CORBA::_tc_string,
-                               &opname_,
-                               0,
-                               env) != CORBA::TypeCode::TRAVERSE_CONTINUE
-      || this->stream_.encode (CORBA::_tc_Principal,
-                               &anybody,
-                               0,
-                               env) != CORBA::TypeCode::TRAVERSE_CONTINUE)
-    return; // right after fault
-  else
-    return; // no fault reported
-}
-
-extern CORBA::ExceptionList __system_exceptions;
-
-// Send request, block until any reply comes back, and unmarshal reply
-// parameters as appropriate.
-
-TAO_GIOP_ReplyStatusType
-TAO_GIOP_Invocation::invoke (CORBA::ExceptionList &exceptions,
-                             CORBA::Environment &env)
-{
-  // Send Request, return on error or if we're done
-
-  TAO_SVC_HANDLER *handler = this->handler_;
-
-  if (TAO_GIOP::send_request (handler, this->stream_) == 0)
-    {
-      // send_request () closed the connection; we just release it here.
-      //
-      // XXX highly desirable to know whether we wrote _any_ data; if
-      // we wrote none, then there's no chance the call completed and
-      // applications don't have to deal with those nasty
-      // indeterminate states where they can't immediatly tell if
-      // what's safe to do.
-      //
-      // XXX also, there might have been a GIOP::CloseConnection
-      // message in the input queue.  If so, this request should be
-      // treated as a (full) "rebind" case.  Can't do that from this
-      // point in the code however!  Some minor restructuring needs to
-      // happen.
-      //
-      env.exception (new CORBA::COMM_FAILURE (CORBA::COMPLETED_MAYBE));
-      return TAO_GIOP_SYSTEM_EXCEPTION;
-    }
-  if (!this->do_rsvp_)
-    return TAO_GIOP_NO_EXCEPTION;
-
-  // This blocks until the response is read.  In the current version,
-  // there is only one client thread that ever uses this connection,
-  // so most response messages are illegal.
-  //
-  // THREADING NOTE: to make more efficient use of connection
-  // resources, we'd multiplex I/O on connections.  For example, one
-  // thread would write its GIOP::Request (or GIOP::LocateRequest etc)
-  // message and block for the response, then another would do the
-  // same thing.  When a response came back, it would be handed to the
-  // thread which requested it.
-  //
-  // Currently the connection manager doesn't support such fine
-  // grained connection locking, and also this server implementation
-  // wouldn't take advantage of that potential concurrency in requests
-  // either.  There are often performance losses coming from
-  // fine-grained locks being used inappropriately; there's some
-  // evidence that locking at the level of requests loses on at least
-  // some platforms.
-  //
-  // XXX In all MT environments, there's a cancellation point lurking
-  // here; need to investigate.  Client threads would frequently be
-  // canceled sometime during recv_request ... the correct action to
-  // take on being canceled is to issue a CancelRequest message to the
-  // server and then imediately let other client-side cancellation
-  // handlers do their jobs.
-  //
-  // In C++, that basically means to unwind the stack using almost
-  // normal procedures: all destructors should fire, and some "catch"
-  // blocks should probably be able to handle things like releasing
-  // pointers. (Without unwinding the C++ stack, resources that must
-  // be freed by thread cancellation won't be freed, and the process
-  // won't continue to function correctly.)  The tricky part is that
-  // according to POSIX, all C stack frames must also have their
-  // (explicitly coded) handlers called.  We assume a POSIX.1c/C/C++
-  // environment.
-
-  switch (TAO_GIOP::recv_request (handler, this->stream_, env))
-    {
-    case TAO_GIOP_Reply:
-      // handle reply ... must be right one etc
-      break;
-
-    case TAO_GIOP_CloseConnection:
-      // Special case of forwarding -- server was closing the
-      // connection, which just indicates resource constraints, not an
-      // error.  The client is effectively "forwarded" to the same
-      // server!
-      //
-      // However, we must reinitialize the forwarding chain, since the
-      // resource being reclaimed might also have been the process,
-      // not just the connection.  Without reinitializing, we'd give
-      // false error reports to applications.
-      {
-#if 0 /* @@ don't delete this, chris */
-	ACE_MT (ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, guard, data_->fwd_profile_lock (), TAO_GIOP_SYSTEM_EXCEPTION));
-#endif
-
-        IIOP::Profile *old = data_->fwd_profile_i (0);
-	delete old;
-
-        this->handler_->close ();
-        this->handler_ = 0;
-	return TAO_GIOP_LOCATION_FORWARD;
-      }
-
-    case TAO_GIOP_Request:
-    case TAO_GIOP_CancelRequest:
-    case TAO_GIOP_LocateRequest:
-    case TAO_GIOP_LocateReply:
-    default:
-      // These are all illegal messages to find.  If found, they could
-      // be indicative of client bugs (lost track of input stream) or
-      // server bugs; maybe the request was acted on, maybe not, we
-      // can't tell.
-      ACE_DEBUG ((LM_DEBUG, "(%P|%t) illegal message in response to my Request!\n"));
-      env.exception (new CORBA::COMM_FAILURE (CORBA::COMPLETED_MAYBE));
-      // FALLTHROUGH ...
-
-    case TAO_GIOP_MessageError:
-      // Couldn't read it for some reason ... exception's set already,
-      // so just tell the other end about the trouble (closing the
-      // connection) and return.
-      send_error (this->handler_);
-      return TAO_GIOP_SYSTEM_EXCEPTION;
-    }
-
-  // Process reply message.  Again, due to the single threading in
-  // this code, only the reply to this request is allowed to be coming
-  // back.
-  //
-  // NOTE: if the response really _isn't_ for this thread, it's now
-  // treated as an error in which synchronization can't be recovered.
-  // There might be cases where it _could_ be recovered ... e.g. maybe
-  // for some reason the previous call couldn't pick up its response.
-  // It'd be worth investigating (and handling) any such cases.
-  //
-  // NOTE: since this implementation supports no ORB services
-  // (notably, the transaction service, which is the only one that's
-  // currently defined), the reply context is discarded.  Normally
-  // it'd be fed, component at a time, to the relevant services.
-  //
-  // NOTE: As security support kicks in, this is the right place to
-  // verify a digital signature, if that is required in this
-  // particular runtime security environment.  How to know if that's
-  // the case?  It's likely that standard Internet IPSEC
-  // infrastructure (RFC 1825 through 1827, and successors) will be
-  // used to enforce many security policies; integrity and privacy
-  // guarantees may be provided by the network, and need no support
-  // here.
-
-  TAO_GIOP_ServiceContextList reply_ctx;
-  CORBA::ULong request_id;
-  CORBA::ULong reply_status;		// TAO_GIOP_ReplyStatusType
-
-  if (this->stream_.decode (&TC_ServiceContextList, &reply_ctx, 0, env)
-      != CORBA::TypeCode::TRAVERSE_CONTINUE)
-    {
-      send_error (this->handler_);
-      return TAO_GIOP_SYSTEM_EXCEPTION;
-    }
-
-  delete [] reply_ctx.buffer;
-
-  if (!this->stream_.get_ulong (request_id)
-      || request_id != this->my_request_id_
-      || !this->stream_.get_ulong (reply_status)
-      || reply_status > TAO_GIOP_LOCATION_FORWARD)
-    {
-      send_error (this->handler_);
-      env.exception (new CORBA::COMM_FAILURE (CORBA::COMPLETED_MAYBE));
-      ACE_DEBUG ((LM_DEBUG, "(%P|%t) bad Response header\n"));
-      return TAO_GIOP_SYSTEM_EXCEPTION;
-    }
-
-  // If there was no exception, let the caller parse the normal
-  // response.  Otherwise parse and handle the response; we always
-  // know how to deal with the standard exceptions, and the caller
-  // provides a list of allowed user-defined exceptions so that we
-  // know how to unmarshal those too (without IFR consultation).
-  //
-  // When requests are forwarded, we just store the revised profile
-  // data in this objref structure.  The expectation is that the call
-  // will be reissued until someone gives up on a forwarding chain,
-  // and that other calls will reap the benefit of the forwarding work
-  // by this thread.
-  //
-  // NOTE: should ensure that from here on, all system exceptions
-  // return COMPLETED_YES status ... even ones reported by code which
-  // we call.
-
-  switch (reply_status)
-    {
-    case TAO_GIOP_NO_EXCEPTION:
-      break;
-
-    case TAO_GIOP_USER_EXCEPTION:
-    case TAO_GIOP_SYSTEM_EXCEPTION:
-      {
-	CORBA::String exception_id;
-
-	// Pull the exception ID out of the marshaling buffer.
-	{
-	  CORBA::ULong len;
-
-	  //
-	  // Read "length" field of string, so "next" points
-	  // right at the null-terminated ID.  Then get the ID.
-	  //
-	  if (this->stream_.get_ulong (len) != CORBA::B_TRUE
-	      || len > this->stream_.remaining)
-	    {
-	      send_error (this->handler_);
-	      env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_YES));
-	      return TAO_GIOP_SYSTEM_EXCEPTION;
-	    }
-	  exception_id = (CORBA::String) this->stream_.next;
-	  this->stream_.skip_bytes (len);
-	}
-
-	// User and system exceptions differ only in what table of
-	// exception typecodes is searched.
-	CORBA::ExceptionList *xlist;
-
-	if (reply_status == TAO_GIOP_USER_EXCEPTION)
-	  xlist = &exceptions;
-	else
-	  xlist = &__system_exceptions;
-
-	// Find it in the operation description and then use that to get
-	// the typecode.  Use it to unmarshal the exception's value; if
-	// that exception is not allowed by this operation, fail (next).
-
-	u_int i;
-	CORBA::TypeCode_ptr *tcp;
-
-	for (i = 0, tcp = xlist->buffer;
-	     i < xlist->length;
-	     i++, tcp++)
-	  {
-	    CORBA::String xid;
-
-	    xid = (*tcp)->id (env);
-	    if (env.exception () != 0)
-	      {
-		dexc (env, "invoke (), get exception ID");
-		send_error (this->handler_);
-		return TAO_GIOP_SYSTEM_EXCEPTION;
-	      }
-
-	    if (ACE_OS::strcmp ((char *)exception_id, (char *)xid) == 0)
-	      {
-		size_t size;
-		CORBA::Exception *exception;
-
-		size = (*tcp)->size (env);
-		if (env.exception () != 0)
-		  {
-		    dexc (env, "invoke (), get exception size");
-		    send_error (this->handler_);
-		    return TAO_GIOP_SYSTEM_EXCEPTION;
-		  }
-
-		// Create the exception, fill in the generic parts
-		// such as vtable, typecode ptr, refcount ... we need
-		// to clean them all up together, in case of errors
-		// unmarshaling.
-
-		exception = new (new char [size]) CORBA::Exception (*tcp);
-
-		if (this->stream_.decode (*tcp, exception, 0, env)
-		    != CORBA::TypeCode::TRAVERSE_CONTINUE)
-		  {
-		    delete exception;
-		    ACE_DEBUG ((LM_ERROR, "(%P|%t) invoke, unmarshal %s exception %s\n",
-				(reply_status == TAO_GIOP_USER_EXCEPTION) ? "user" : "system",
-                               exception_id));
-		    send_error (this->handler_);
-		    return TAO_GIOP_SYSTEM_EXCEPTION;
-		  }
-		env.exception (exception);
-		return (TAO_GIOP_ReplyStatusType) reply_status;
-	      }
-	  }
-
-	// If we couldn't find this exception's typecode, report it as
-	// an OA error since the skeleton passed an exception that was
-	// not allowed by the operation's IDL definition.  In the case
-	// of a dynamic skeleton it's actually an implementation bug.
-	//
-	// It's known to be _very_ misleading to try reporting this as
-	// any kind of marshaling error (unless minor codes are made
-	// to be _very_ useful) ... folk try to find/fix ORB bugs that
-	// don't exist, not bugs in/near the implementation code.
-
-	if (reply_status == TAO_GIOP_USER_EXCEPTION)
-	  env.exception (new CORBA::OBJ_ADAPTER (CORBA::COMPLETED_YES));
-	else
-	  env.exception (new CORBA::INTERNAL (CORBA::COMPLETED_MAYBE));
-	return TAO_GIOP_SYSTEM_EXCEPTION;
-      }
-    // NOTREACHED
-
-    case TAO_GIOP_LOCATION_FORWARD:
-      {
-	CORBA::Object_ptr obj;
-	IIOP_Object *obj2;
-
-	// Unmarshal the object we _should_ be calling.  We know that
-	// one of the facets of this object will be an IIOP invocation
-	// profile.
-
-	if (this->stream_.decode (CORBA::_tc_Object,
-                                  &obj, 0,
-                                  env) != CORBA::TypeCode::TRAVERSE_CONTINUE
-	    || obj->QueryInterface (IID_IIOP_Object,
-                                    (void **) &obj2) != NOERROR)
-	  {
-	    dexc (env, "invoke, location forward");
-	    send_error (this->handler_);
-	    return TAO_GIOP_SYSTEM_EXCEPTION;
-	  }
-	CORBA::release (obj);
-
-	// Make a copy of the IIOP profile in the forwarded objref,
-	// reusing memory where practical.  Then delete the forwarded
-	// objref, retaining only its profile.
-	//
-	// XXX add and use a "forward count", to prevent loss of data
-	// in forwarding chains during concurrent calls -- only a
-	// forward that's a response to the current fwd_profile should
-	// be recorded here. (This is just an optimization, and is not
-	// related to correctness.)
-
-#if 0 /* @@ don't delete this, chris */
-	ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, guard, data_->fwd_profile_lock (), TAO_GIOP_SYSTEM_EXCEPTION);
-#endif
-
-        IIOP::Profile *old = data_->fwd_profile_i (new IIOP::Profile (obj2->profile));
-        delete old;
-
-	obj2->Release ();
-
-	env.clear ();
-
-	// Make sure a new connection is used next time.
-	this->handler_->close ();
-	this->handler_ = 0; // @@ not sure this is correct!
-        // @@ We shouldn't need to do this b/c TAO_GIOP_Invocations
-        // get created on a per-call basis.  Must check on this.
-      }
-    break;
-    }
-
-  // All standard exceptions from here on in the call path know for
-  // certain that the call "completed" ... except in the case of
-  // system exceptions which say otherwise, and for
-  // TAO_GIOP_LOCATION_FORWARD responses.
-
-  return (TAO_GIOP_ReplyStatusType) reply_status;
-}
-
-void
-TAO_GIOP::make_error (CDR &msg, ...)
-{
-  ACE_UNUSED_ARG (msg);  // just for now
-
-  // This [static] method will be somewhat like send_error() except
-  // that it won't actaully do any sending of data...it'll just stuff
-  // things into the <msg> instance.
-}
-
-// Initialize the request header from <msg>, setting <env> for errors.
-
-CORBA::Boolean
-TAO_GIOP_RequestHeader::init (CDR &msg,
-                              CORBA::Environment &env)
-{
-  CORBA::Boolean hdr_status;
-
-  // Tear out the service context ... we currently ignore it, but it
-  // should probably be passed to each ORB service as appropriate
-  // (e.g. transactions, security).
-  //
-  // NOTE: As security support kicks in, this is a good place to
-  // verify a digital signature, if that is required in this security
-  // environment.  It may be required even when using IPSEC security
-  // infrastructure.
-
-  hdr_status = msg.decode (&TC_ServiceContextList,
-                           &this->service_info,
-                           0,
-                           env);
-
-  // Get the rest of the request header ...
-
-  hdr_status = hdr_status && msg.get_ulong (this->request_id);
-  hdr_status = hdr_status && msg.get_boolean (this->response_expected);
-  hdr_status = hdr_status && msg.decode (&TC_opaque,
-                                         &this->object_key,
-                                         0,
-                                         env);
-  hdr_status = hdr_status && msg.decode (CORBA::_tc_string,
-                                         &this->operation,
-                                         0,
-                                         env);
-  hdr_status = hdr_status && msg.decode (CORBA::_tc_Principal,
-                                         &this->requesting_principal,
-                                         0,
-                                         env);
-  return hdr_status;
-}
-
-CORBA::Boolean
-TAO_GIOP::start_message (TAO_GIOP_MsgType type, CDR &msg)
-{
-  msg.next = msg.buffer;		// for reused streams
-  msg.remaining = msg.length;
-
-  if (msg.bytes_remaining () < TAO_GIOP_HEADER_LEN)
-    return CORBA::B_FALSE;
-
-  msg.next [0] = 'G';
-  msg.next [1] = 'I';
-  msg.next [2] = 'O';
-  msg.next [3] = 'P';
-
-  msg.next [4] = MY_MAJOR;
-  msg.next [5] = MY_MINOR;
-  msg.next [6] = TAO_ENCAP_BYTE_ORDER;
-  msg.next [7] = (u_char) type;
-
-  msg.skip_bytes (TAO_GIOP_HEADER_LEN);
-  return CORBA::B_TRUE;
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class CORBA_SEQUENCE<TAO_GIOP_ServiceContext>;
-template class CORBA_SEQUENCE<CORBA::Octet>;
-template class CORBA_SEQUENCE<CORBA::TypeCode*>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate CORBA_SEQUENCE<TAO_GIOP_ServiceContext>
-#pragma instantiate CORBA_SEQUENCE<CORBA::Octet>
-#pragma instantiate CORBA_SEQUENCE<CORBA::TypeCode*>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/giop.h b/TAO/tao/giop.h
deleted file mode 100644
index b5276d74c2b..00000000000
--- a/TAO/tao/giop.h
+++ /dev/null
@@ -1,387 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO
-// 
-// = FILENAME
-//    giop.h
-//
-// = DESCRIPTION
-//     GIOP data structures and support routines
-//
-//     Note that some symbols in this module are part of the
-//     "Internet" Inter-ORB Protocol (IIOP), not the General IOP.
-//     Only addressing information and certain details of connection
-//     usage are specific to IIOP; all other protocol details can be
-//     reused by ORB protocols that are built atop connection
-//     protocols other than TCP.
-//
-//     THREADING NOTE: Threads should never manipulate another
-//     thread's invocations.  In this implementation, all data
-//     structures used to represent invocations (and parts of them)
-//     are owned by the thread which created them.  Multiple threads
-//     may make of course concurrent invocations safely, since the
-//     GIOP code is reentrant.
-//
-// = AUTHOR
-//     Copyright 1994-1995 by Sun Microsystems Inc., 
-//     Chris Cleeland <cleeland@cs.wustl.edu>
-// 
-// ============================================================================
-
-#if !defined (TAO_GIOP_H)
-#  define TAO_GIOP_H
-
-// namespace TAO_IOP
-
-// Assigned Protocol/Profile tag values.  ORB protcols may be
-// uniquely identified by tags such as these.  This allows each
-// ORB's own objref profiles to be interchanged using IORs.
-//
-// Email to tag-request@omg.org to allocate tags.
-typedef CORBA::ULong TAO_IOP_Profile_ID;
-
-enum 
-{
-  TAO_IOP_TAG_INTERNET_IOP = 0, // IIOP
-  TAO_IOP_TAG_MULTIPLE_COMPONENTS = 1, // DCE-CIOP
-
-  // This is a subset of the list of other profile tags.
-  TAO_IOP_TAG_ONC_IOP = 0x4f4e4300	// ONC IOP
-};
-
-struct TAO_IOP_Tagged_Profile 
-// One per protocol.
-{		
-  TAO_IOP_Profile_ID tag;
-  TAO_opaque profile_data;
-};
-
-typedef CORBA_SEQUENCE <TAO_IOP_Tagged_Profile> 
-        TAO_IOP_Tagged_Profile_Sequence;
-
-struct TAO_IOP_IOR 
-  // = TITLE
-  // InteroperableObjectReference
-  //
-  // = DESCRIPTION
-  // ... a set of protocol-specific protocol profiles, plus a type ID.
-  // Only one object is denoted by all of this information.  It's OK
-  // to delete all profiles except the one for the single protocol
-  // actually being used.
-{
-  char *type_id;
-  TAO_IOP_Tagged_Profile_Sequence profiles;
-};
-
-// Some protocols can be factored into a set of optional components.
-// Use of such components is defined by the protocol's specification.
-//
-// Email to tag-request@omg.org to allocate tags.
-
-typedef CORBA::ULong TAO_IOP_ComponentId;
-
-enum 
-  // = DESCRIPTION
-  // These are all defined by DCE-CIOP in OMG TC document 95-3-10.
-{
-  TAO_IOP_TAG_DCE_STRING_BINDING = 100,// string binding handle
-  TAO_IOP_TAG_DCE_BINDING_NAME = 101, // CDS/GDS/... name
-  TAO_IOP_TAG_DCE_NO_PIPES = 102, // no component data
-  TAO_IOP_TAG_OBJECT_KEY = 10,  // opaque
-  TAO_IOP_TAG_ENDPOINT_ID = 11, // uuid
-  TAO_IOP_TAG_LOCATION_POLICY = 12 // octet/enum
-};
-
-struct TAO_IOP_TaggedComponent 
-  // = DESCRIPTION
-  // One way to represent multicomponent profiles, e.g. as done by the
-  // DCE-CIOP protocol.  One of these gets encapsulated in
-  // Tagged_Profile::profile_data.  TAG_MULTIPLE_COMPONENTS may be used
-  // to represent protocol profiles structured in that way, but
-  // protocol-specific tags facilitate simpler scanning of IORs since
-  // you can be assured that each profile only has data used within a
-  // single ORB protocol.
-{
-  TAO_IOP_ComponentId tag;
-  TAO_opaque component_data;
-};
-
-typedef CORBA_SEQUENCE <TAO_IOP_TaggedComponent> 
-        TAO_IOP_MultipleComponentProfile;
-
-// namespace TAO_GIOP
-
-struct TAO_Version
-{
-  CORBA::Octet major;
-  CORBA::Octet minor;
-};
-
-enum 
-  // = DESCRIPTION 
-  // GIOP protocol version 1.0 information.
-{ 
-  MY_MAJOR = 1,
-  MY_MINOR = 0 
-};
-
-enum TAO_GIOP_MsgType 
-  // = DESCRIPTION
-  // All GIOP messages include a header and message type.
-{
-  // Not really a message type, but needed to bring that information
-  // back somehow
-  TAO_GIOP_EndOfFile = -1, // "discovered" by either
-  TAO_GIOP_Request = 0, // sent by client
-  TAO_GIOP_Reply = 1, // by server
-  TAO_GIOP_CancelRequest = 2, // by client
-  TAO_GIOP_LocateRequest = 3, // by client
-  TAO_GIOP_LocateReply = 4, // by server
-  TAO_GIOP_CloseConnection = 5, // by server
-  TAO_GIOP_MessageError = 6 // by both
-};
-
-struct TAO_GIOP_MessageHeader 
-{
-  CORBA::Char magic [4]; // "GIOP"
-  TAO_Version giop_version;
-  CORBA::Octet byte_order; // 0 = big, 1 = little
-  CORBA::Octet message_type; // MsgType above
-  CORBA::ULong message_size; // in byte_order!
-};
-
-// defined by GIOP 1.0 protocol
-#define	TAO_GIOP_HEADER_LEN sizeof (TAO_GIOP_MessageHeader)
-
-// Support for Implicit ORB Service Context
-typedef CORBA::ULong TAO_GIOP_ServiceID;
-
-enum
-  // = TITLE
-  // Values for TAO_GIOP_ServiceID
-{
-  TAO_GIOP_TransactionService = 0
-
-  // More service IDs may be defined by OMG.
-    
-  // This is where our RIOP service ID will be defined...
-};
-  
-struct TAO_GIOP_ServiceContext 
-{
-  TAO_GIOP_ServiceID context_id;
-  TAO_opaque context_data;
-};
-
-typedef CORBA_SEQUENCE <TAO_GIOP_ServiceContext> 
-        TAO_GIOP_ServiceContextList;
-
-extern CORBA::TypeCode TC_ServiceContextList;
-
-// = Request, Reply headers
-
-class TAO_Export TAO_GIOP_RequestHeader 
-  // = TITLE
-  //   This class embodies the header of a GIOP request.
-  //
-  // = NOTES
-  //   This used to be a <struct>, which is why everything is public.
-{
-public:
-  TAO_GIOP_RequestHeader (void);
-  // Constructor.
-    
-  CORBA::Boolean init (CDR &msg, CORBA::Environment& env);
-  // Initialize the header from the values found in <msg>.
-    
-  //private:
-  TAO_GIOP_ServiceContextList service_info;
-  // The service context for the request (CORBA Reference?)
-    
-  CORBA::ULong request_id;
-  // Unique identifier for a request
-    
-  CORBA::Boolean response_expected;
-  // true if this request requires a response
-    
-  TAO_opaque object_key;
-  // @@ the object key of the destination object (is this right?)
-    
-  CORBA::String operation;
-  // Name of the operation being performed
-
-  CORBA::Principal_ptr requesting_principal;
-  // Identifies the requester
-};
-
-enum TAO_GIOP_ReplyStatusType 
-{
-  TAO_GIOP_NO_EXCEPTION,                 
-  // Request completed successfully
-
-  TAO_GIOP_USER_EXCEPTION,               
-  // Request terminated with user exception
-
-  TAO_GIOP_SYSTEM_EXCEPTION,             
-  // Request terminated with system exception
-
-  TAO_GIOP_LOCATION_FORWARD              
-  // @@ More info
-};
-
-struct TAO_GIOP_ReplyHeader 
-{
-  TAO_GIOP_ServiceContextList service_info; 
-  // Information 
-
-  CORBA::ULong request_id;      
-  // Unique identifier of the request for which this is a reply
-
-  TAO_GIOP_ReplyStatusType reply_status; 
-  // Status of the reply (see above enum)
-};
-
-struct TAO_GIOP_CancelRequestHeader 
-  // = DESCRIPTION
-  //   Cancellation -- applies both to Requests and LocateRequests.
-{
-  CORBA::ULong request_id;      
-  // Unique identifier of the request being cancelled
-};
-
-struct TAO_GIOP_LocateRequestHeader 
-  // = DESCRIPTION
-  //   Location service support
-{
-  CORBA::ULong request_id;
-  TAO_opaque object_key;
-};
-
-enum TAO_GIOP_LocateStatusType 
-{
-  TAO_GIOP_UNKNOWN_OBJECT,
-  TAO_GIOP_OBJECT_HERE,
-  TAO_GIOP_OBJECT_FORWARD
-};
-
-struct TAO_GIOP_LocateReplyHeader 
-{
-  CORBA::ULong request_id;
-  TAO_GIOP_LocateStatusType locate_status;
-};
-
-class TAO_Export TAO_GIOP_Invocation 
-  // = TITLE
-  //   Invocation: Sends a Request, optionally reads associated Reply.
-  //   Uses transport info passed in, doesn't locate anything.
-  //
-  // = NOTES
-  //   This should maybe be moved into its own file (invoke.h?)
-{
-public:
-  TAO_GIOP_Invocation (IIOP_Object *data,
-                       const char *operation,
-                       CORBA::Boolean is_roundtrip);
-
-  ~TAO_GIOP_Invocation (void);
-
-  void start (CORBA::Environment &env);
-  // <start> goes beyond initialising data structures, and makes
-  // calls that may fail -- and thus throw exceptions.
-
-  void put_param (CORBA::TypeCode_ptr tc, 
-                  void *value,
-                  CORBA::Environment &env);
-
-  TAO_GIOP_ReplyStatusType invoke (CORBA::ExceptionList &exceptions,
-                                   CORBA::Environment &env);
-
-  void get_value (CORBA::TypeCode_ptr tc,
-                  void *value,
-                  CORBA::Environment &env);
-  // No CORBA::Context support (deprecated).
-
-private:
-  // @@ Please add comments.
-  IIOP_Object *data_;
-
-  const char *opname_;
-
-  CORBA::Boolean do_rsvp_;
-
-  CORBA::ULong my_request_id_;
-
-  u_char buffer [CDR::DEFAULT_BUFSIZE];
-  CDR stream_;
-
-  TAO_Client_Connection_Handler *handler_;
-  // The handler for the client's connection.
-};
-
-// = Generic server side data dispatch methods
-
-// These methods are called for all file descriptors on which
-// incoming messages are expected.
-
-// The <handle_request> routine is used to handle request messages;
-// its <reply> parameter is null if the request is "oneway" (or the
-// client isn't waiting for the response that this request normally
-// creates).
-//
-// The optional <check_forward> routine is used to verify that the
-// request is to be delivered within this process by <handle_request>.
-// Each call to <handle_request> is preceded by a call to this routine
-// if it's provided.  It's used when handling GIOP "Request" messages
-// as well as GIOP "LocateRequest" messages, and returns an enum to
-// indicate overal status (LocateStatusType) as well as an objref in
-// the case of OBJECT_FORWARD.  That objref is released.
-// 
-// Return: 1==success,0==EOF,-1==error
-
-// deprecated
-typedef TAO_GIOP_LocateStatusType (*TAO_GIOP_ForwardFunc) (TAO_opaque &,
-                                                           CORBA::Object_ptr &,
-                                                           void *);
-
-// deprecated
-typedef void (*TAO_GIOP_RequestHandler) (TAO_GIOP_RequestHeader &,
-                                         CDR &,
-                                         CDR *,
-                                         void *,
-                                         CORBA::Environment &);
-class TAO_Export TAO_GIOP
-  // = TITLE
-  //   A namespace for GIOP-related operations.
-  //
-  // = DESCRIPTION
-  //   Only put static methods within this scope.
-{
-  ACE_CLASS_IS_NAMESPACE (TAO_GIOP);
-    
-public:
-  // = Close a connection, first sending GIOP::CloseConnection
-  static void close_connection (TAO_Client_Connection_Handler *&handle,
-                                void *ctx);
-
-  static CORBA::Boolean start_message (TAO_GIOP_MsgType t,
-                                       CDR &msg);
-  // Build the header for a message of type <t> into stream <msg>.
-  
-  static CORBA::Boolean send_request (TAO_SVC_HANDLER *&handler,
-                                      CDR &stream);
-  // Send message, returns TRUE if success, else FALSE.
-
-  static TAO_GIOP_MsgType recv_request (TAO_SVC_HANDLER *&handler,
-                                        CDR &msg, 
-                                        CORBA::Environment &env);
-  // Reads message, returns message type from header.
-  
-  static void make_error (CDR &msg, ...);
-  // Construct a message containing an error so that it can be sent as
-  // a response to a request.
-};
-
-#endif /* TAO_GIOP_H */
diff --git a/TAO/tao/giop.i b/TAO/tao/giop.i
deleted file mode 100644
index 0c162d3d1e8..00000000000
--- a/TAO/tao/giop.i
+++ /dev/null
@@ -1,23 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-
-ACE_INLINE
-TAO_GIOP_RequestHeader::TAO_GIOP_RequestHeader (void)
-  : request_id (0),
-    response_expected (CORBA::B_FALSE)
-{}
-
-ACE_INLINE void 
-TAO_GIOP_Invocation::get_value (CORBA::TypeCode_ptr tc,
-                                void *value,
-                                CORBA::Environment &env)
-{
-  (void) this->stream_.decode (tc, value, 0, env);
-}
-
-ACE_INLINE void 
-TAO_GIOP_Invocation::put_param (CORBA::TypeCode_ptr tc, 
-                                void *value, 
-                                CORBA::Environment &env)
-{
-  (void) this->stream_.encode (tc, value, 0, env);
-}
diff --git a/TAO/tao/iiopobj.cpp b/TAO/tao/iiopobj.cpp
deleted file mode 100644
index b33452fb0a6..00000000000
--- a/TAO/tao/iiopobj.cpp
+++ /dev/null
@@ -1,336 +0,0 @@
-// @ (#)iiopobj.cpp     1.9 95/11/04
-// Copyright 1995 by Sun Microsystems Inc.
-// All Rights Reserved
-//
-// IIOP Bridge:         CORBA::Object operations
-//
-// Some CORBA::Object and other operations are specific to this IIOP
-// based implementation, and can neither be used by other kinds of
-// objref nor have a default implementation.
-
-#include "tao/corba.h"
-
-int
-IIOP::Profile::set (const char *h,
-                    const CORBA::UShort p,
-                    const ACE_INET_Addr *addr)
-{
-  this->iiop_version.major = IIOP::MY_MAJOR;
-  this->iiop_version.minor = IIOP::MY_MINOR;
-
-  if (this->host)
-    {
-      delete [] this->host;
-      this->host = 0;
-    }
-
-  this->port = p;
-
-  if (h)
-    {
-      ACE_NEW_RETURN (this->host,
-                      char[ACE_OS::strlen(h) + 1],
-                      -1);
-      ACE_OS::strcpy (this->host, h);
-    }
-
-  this->object_addr (addr);
-  return 0;
-}
-
-int
-IIOP::Profile::set (const char *h,
-                    const CORBA::UShort p,
-                    const char *key,
-                    const ACE_INET_Addr *addr)
-{
-  if (this->set (h, p, addr) == -1)
-    return -1;
-      
-  // Enough room as to print a <void*>
-  const int bufs = 32;
-  char buffer[bufs];
-  if (key == 0)
-    {
-      // Use <this> as the key...
-      ACE_OS::sprintf (buffer, "0x%024.24x", this);
-      key = buffer;
-    }
-
-  this->object_key.length = ACE_OS::strlen (key);
-  this->object_key.maximum = this->object_key.length;
-
-  ACE_NEW_RETURN (this->object_key.buffer,
-                  CORBA::Octet[this->object_key.maximum + 1],
-                  -1);
-
-  (void) ACE_OS::strcpy ((char *) this->object_key.buffer, key);
-  return 0;
-}
-
-int
-IIOP::Profile::set (const char *h,
-                    const CORBA::UShort p,
-                    const TAO_opaque &key,
-                    const ACE_INET_Addr *addr)
-{
-  if (this->set (h, p, addr) == -1)
-    return -1;
-
-  this->object_key.length = key.length;
-  this->object_key.maximum = key.length;
-
-  ACE_NEW_RETURN (this->object_key.buffer,
-                  CORBA::Octet[key.maximum + 1],
-                  -1);
-
-  (void) ACE_OS::memcpy ((char *) this->object_key.buffer,
-                         key.buffer,
-                         key.length);
-  // NUL-terminate this guy...
-  this->object_key.buffer[key.length] = '\0';
-  return 0;
-}
-
-IIOP::Profile::Profile (const IIOP::Profile &src)
-  : host (0)
-{
-  (void) this->set (src.host,
-                    src.port,
-                    src.object_key,
-                    &src.object_addr_);
-}
-
-int
-IIOP::Profile::set (const ACE_INET_Addr &addr,
-                    const char *key)
-{
-  // Set up an IIOP object to hold the host name.
-  char tempname[MAXHOSTNAMELEN + 1];
-
-  // Retrieve the host name.
-  if (addr.get_host_name (tempname,
-                          MAXHOSTNAMELEN) == -1)
-    return -1;
-  else
-    return this->set (tempname,
-                      addr.get_port_number (),
-                      key,
-                      &addr);
-}
-
-int
-IIOP::Profile::set (const ACE_INET_Addr &addr,
-                    const TAO_opaque &key)
-{
-  // Set up an IIOP object to hold the host name.
-  char tempname[MAXHOSTNAMELEN + 1];
-
-  // Retrieve the host name.
-  if (addr.get_host_name (tempname,
-                          MAXHOSTNAMELEN) == -1)
-    return -1;
-  else
-    return this->set (tempname,
-                      addr.get_port_number (),
-                      key,
-                      &addr);
-}
-
-IIOP::Profile::Profile (const char *h,
-                        const CORBA::UShort p,
-                        const char *key)
-  : host (0)
-{
-  (void) this->set (h, p, key);
-}
-
-IIOP::Profile::Profile (const char *h,
-                        const CORBA::UShort p,
-                        const char *key,
-                        const ACE_INET_Addr &addr)
-  : host (0)
-{
-  (void) this->set (h, p, key, &addr);
-}
-
-IIOP::Profile::Profile (const ACE_INET_Addr &addr,
-                        const char *key)
-  : host (0)
-{
-  (void) this->set (addr, key);
-}
-
-IIOP::Profile::Profile (const ACE_INET_Addr &addr,
-                        const TAO_opaque &key)
-  : host (0)
-{
-  (void) this->set (addr, key);
-}
-
-// Quick'n'dirty hash of objref data, for partitioning objrefs into
-// sets.
-//
-// NOTE that this must NOT go across the network!
-
-CORBA::ULong
-IIOP_Object::hash (CORBA::ULong max,
-                   CORBA::Environment &env)
-{
-  CORBA::ULong hashval;
-
-  env.clear ();
-
-  // Just grab a bunch of convenient bytes and hash them; could do
-  // more (hostname, full key, exponential hashing) but no real need
-  // to do so except if performance requires a more costly hash.
-
-  hashval = profile.object_key.length * profile.port;
-  hashval += profile.iiop_version.minor;
-
-  if (profile.object_key.length >= 4)
-    {
-      hashval += profile.object_key.buffer [1];
-      hashval += profile.object_key.buffer [3];
-    }
-
-  return hashval % max;
-}
-
-// Expensive comparison of objref data, to see if two objrefs
-// certainly point at the same object. (It's quite OK for this to
-// return FALSE, and yet have the two objrefs really point to the same
-// object.)
-//
-// NOTE that this must NOT go across the network!
-
-CORBA::Boolean
-IIOP_Object::is_equivalent (CORBA::Object_ptr other_obj,
-                            CORBA::Environment &env)
-{
-  IIOP::Profile *body, *body2;
-  IIOP_Object *other_iiop_obj;
-
-  env.clear ();
-
-  if (CORBA::is_nil (other_obj) == CORBA::B_TRUE
-      || other_obj->QueryInterface (IID_IIOP_Object,
-                                    (void **) &other_iiop_obj) != NOERROR)
-    return CORBA::B_FALSE;
-  CORBA::release (other_obj);
-
-  // Compare all the bytes of the object address -- must be the same
-
-  body = &profile;
-  body2 = &other_iiop_obj->profile;
-
-  ACE_ASSERT (body->object_key.length < UINT_MAX);
-
-  return body->object_key.length == body2->object_key.length
-    && ACE_OS::memcmp (body->object_key.buffer,
-                       body2->object_key.buffer,
-                       (size_t) body->object_key.length) == 0
-    && body->port == body2->port
-    && ACE_OS::strcmp (body->host, body2->host) == 0
-    && body->iiop_version.minor == body2->iiop_version.minor
-    && body->iiop_version.major == body2->iiop_version.major;
-}
-
-// For COM -- IUnknown operations
-
-// {A201E4C3-F258-11ce-9598-0000C07CA898}
-DEFINE_GUID (IID_IIOP_Object,
-0xa201e4c3, 0xf258, 0x11ce, 0x95, 0x98, 0x0, 0x0, 0xc0, 0x7c, 0xa8, 0x98);
-
-ULONG __stdcall
-IIOP_Object::AddRef (void)
-{
-  ACE_MT (ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, guard, this->IUnknown_lock_, 0));
-
-  return ++this->refcount_;
-}
-
-ULONG __stdcall
-IIOP_Object::Release (void)
-{
-  {
-    ACE_MT (ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, mon, this->IUnknown_lock_, 0));
-
-    ACE_ASSERT (this != 0);
-
-    if (--this->refcount_ != 0)
-      return this->refcount_;
-  }
-
-  delete this;
-  return 0;
-}
-
-// Note that (as of this writing) this is the only place all the
-// interfaces to an "objref" come together:
-//
-// IUnknown ... this one
-// STUB_OBJECT ... inherited by this one
-// IIOP_OBJECT ... this one
-//
-// CORBA::Object ... contained within this; it delegates back
-//      to this one as its "parent"
-
-HRESULT __stdcall
-IIOP_Object::QueryInterface (REFIID riid,
-                             void **ppv)
-{
-  *ppv = 0;
-
-  if (IID_IIOP_Object == riid
-      || IID_STUB_Object == riid
-      || IID_IUnknown == riid)
-    *ppv = this;
-  else if (IID_CORBA_Object == riid)
-    *ppv = &base;
-
-  if (*ppv == 0)
-    return ResultFromScode (E_NOINTERFACE);
-
- (void) AddRef ();
-  return NOERROR;
-}
-
-//TAO extensions
-const char *
-IIOP_Object::_get_name (CORBA::Environment &)
-{
-  return (const char *) this->profile.object_key.buffer;
-}
-
-// It will usually be used by the _bind call.
-//
-// Note that if the repository ID (typeID) is NULL, it will make
-// narrowing rather expensive, though it does ensure that type-safe
-// narrowing code gets thoroughly exercised/debugged!  Without a
-// typeID, the _narrow will be required to make an expensive remote
-// "is_a" call.
-
-IIOP_Object::IIOP_Object (const char *host,
-                          const CORBA::UShort port,
-                          const char *objkey,
-                          char *repository_id)
-  : STUB_Object (repository_id),
-    profile (host, port, objkey),
-    base (this),
-    refcount_ (1),
-    fwd_profile_ (0)
-{
-}
-
-// Constructor.  It will usually be used by the server side.
-IIOP_Object::IIOP_Object (char *repository_id,
-                          const ACE_INET_Addr &addr,
-                          const char *objkey)
-  : STUB_Object (repository_id),
-    profile (addr, objkey),
-    base (this),
-    refcount_ (1),
-    fwd_profile_ (0)
-{
-}
diff --git a/TAO/tao/iiopobj.h b/TAO/tao/iiopobj.h
deleted file mode 100644
index 01676f9ce09..00000000000
--- a/TAO/tao/iiopobj.h
+++ /dev/null
@@ -1,263 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO
-//
-// = FILENAME
-//    iiopobj.h
-//
-// = DESCRIPTION
-//     IIOP objref representation
-//
-//     This allows stubs which support multiple protocols, since the
-//     stub (and DII) code only work with the parent "STUB_Objref"
-//     class when making calls.
-//
-// = AUTHOR
-//     Copyright 1994-1995 by Sun Microsystems Inc.
-//
-// ============================================================================
-
-#if !defined (TAO_IIOPOBJ_H)
-#  define TAO_IIOPOBJ_H
-
-class TAO_Export IIOP
-  // = TITLE
-  //   This class provides a namespace.
-{
-public:
-  // IIOP Protocol version is distinct from GIOP version.
-  enum
-  {
-    MY_MAJOR = 1,
-    MY_MINOR = 0
-  };
-
-  struct Version
-  {
-    CORBA::Octet major;
-    CORBA::Octet minor;
-
-    Version (CORBA::Octet maj = MY_MAJOR,
-             CORBA::Octet min = MY_MINOR);
-  };
-
-  struct Profile
-    // = TITLE
-    // IOR support ... Profile is encapsulated in an IIOP profile
-    // entry within an IOR.  Note that this structure is specified
-    // by CORBA 2.0, so we can't screw with it too much.
-  {
-    Version iiop_version;
-    TAO_opaque object_key;
-    char *host;
-    CORBA::UShort port;
-
-    Profile (void);
-    // Default constructor.
-
-    Profile (const Profile &src);
-    // Copy constructor.
-
-    Profile (const char *host,
-             const CORBA::UShort port,
-             const char *object_key);
-    // Called by client <_bind>.
-
-    Profile (const char *host,
-             const CORBA::UShort port,
-             const char *object_key,
-             const ACE_INET_Addr &addr);
-    // Called by server.
-
-    Profile (const ACE_INET_Addr &addr,
-             const char *object_key);
-    // Called by client or server.
-
-    Profile (const ACE_INET_Addr &addr,
-             const TAO_opaque &object_key);
-    // Called by client or server.
-
-    ~Profile (void);
-    // Destructor.
-
-    void object_addr (const ACE_INET_Addr *);
-    // Sets <object_addr_> cache from <host> and <port>
-
-    ACE_INET_Addr &object_addr (void);
-    // Returns the <ACE_INET_Addr> for this profile.
-
-  private:
-    int set (const char *host,
-             const CORBA::UShort port,
-             const ACE_INET_Addr *addr);
-    // Internal helper method (called by the next two methods).
-
-    int set (const char *host,
-             const CORBA::UShort port,
-             const char *object_key,
-             const ACE_INET_Addr *addr = 0);
-    // Called by server.
-
-    int set (const char *host,
-             const CORBA::UShort port,
-             const TAO_opaque &object_key,
-             const ACE_INET_Addr *addr = 0);
-    // Called by server.
-
-    int set (const ACE_INET_Addr &addr,
-             const char *object_key);
-    // Called by client or server.
-
-    int set (const ACE_INET_Addr &addr,
-             const TAO_opaque &object_key);
-    // Called by client or server.
-
-    Profile &operator = (const Profile &src);
-    // Disallow copy constructor.
-    
-    ACE_INET_Addr object_addr_;
-    // Cached instance of <ACE_INET_Addr> for use in making
-    // invocations, etc.
-  };
-};
-
-class TAO_Export IIOP_Object : public STUB_Object
-  // = TITLE
-  //   Representation of an IIOP objref: the profile body, and any
-  //   forwarded pointer.  Implementations of basic invocation code;
-  //   how to marshal an objref.  Contains a CORBA::Object interface.
-  //
-  // = DESCRIPTION
-  //   NOTE that this uses (single) implementation inheritance to share
-  //   most of the basic code for an object reference.
-
-  // @@ What does it mean to have an 'extern "C"' object?!  This is so
-  // that it is visible to DCOM, which is a C linkage, I believe.  This
-  // is all holdover from the original DB code, and the COM integration
-  // is the least understood of any of it.
-{
-public:
-  void do_call (CORBA::Environment &env,
-		const TAO_Call_Data *info,
-		...);
-  // SII-based invocation.
-
-  void do_dynamic_call (const char *opname,
-			CORBA::Boolean is_roundtrip,
-			CORBA::NVList_ptr args,
-			CORBA::NamedValue_ptr result,
-			CORBA::Flags flags,
-			CORBA::ExceptionList &exceptions,
-			CORBA::Environment &env);
-  // DII-based invocation.
-
-  // = Support for tables keyed by objrefs.
-
-  CORBA::ULong hash (CORBA::ULong maximum,
-                     CORBA::Environment &env);
-  CORBA::Boolean is_equivalent (CORBA::Object_ptr other_obj,
-                                CORBA::Environment &env);
-  // XXX All objref representations should know how to marshal
-  // themselves.  That will involve ensuring that the IOR that gets
-  // marshaled talks a specific protocol, otherwise the target of a
-  // message would not be invoke using the objref it receives
-  // (compromising functionality in a very basic and mysterious
-  // mannter).  So for example an objref might need to create a proxy
-  // for itself rather than marshaling its own representation.  [ The
-  // IIOP engine does not need to worry about such issues since it
-  // only supports one protocol -- the problem won't show up.
-  // "Multiprotocol ORBs" will need to solve that problem though.  ]
-
-  // = Thread-safe accessors for the forwarding profile
-  IIOP::Profile *fwd_profile (void);
-  // THREAD-SAFE.  Returns the current forwarding profile.
-
-  IIOP::Profile *fwd_profile (IIOP::Profile *new_profile);
-  // THREAD-SAFE.  Sets a new value for the forwarding profile and
-  // returns the current value.
-
-  // = Non-thread-safe accessors for the forwarding profile
-  ACE_SYNCH_MUTEX &fwd_profile_lock (void);
-  // Gives reference to the lock guarding the forwarding profile.
-
-  IIOP::Profile *fwd_profile_i (void);
-  // THREAD-SAFE.  Returns the current forwarding profile.
-
-  IIOP::Profile *fwd_profile_i (IIOP::Profile *new_profile);
-  // THREAD-SAFE.  Sets a new value for the forwarding profile and
-  // returns the current value.
-
-  // = Construction
-  IIOP_Object (char *repository_id);
-  // Construct from a repository (type) ID.
-
-  IIOP_Object (char *repository_id,
-               const IIOP::Profile &profile);
-  // Construct from a repository ID and a profile ID.
-
-  IIOP_Object (const char *host = ACE_DEFAULT_SERVER_HOST,
-               const CORBA::UShort p = TAO_DEFAULT_SERVER_PORT,
-               const char *objkey = "0",
-               char *repository_id = 0);
-  // This constructor will usually be used by a <_bind> call on the
-  // client side.
-
-  IIOP_Object (char *repository_id,
-               const ACE_INET_Addr &addr, 
-               const char *objkey = "0");
-  // Constructor used typically by the server side.
-
-  // = COM stuff
-  ULONG __stdcall AddRef (void);
-  ULONG __stdcall Release (void);
-  HRESULT __stdcall QueryInterface (REFIID type_id,
-				    void **ppv);
-
-  virtual const char *_get_name (CORBA::Environment &env);
-  // Get the underlying object key, which is stored as a
-  // NUL-terminated character string.  Note that this does not
-  // allocate any new memory, so this return value should not be
-  // changed by the caller.
-
-  IIOP::Profile profile;
-  // @@ Please document me (this should be private).
-
-private:
-  CORBA::Object base;
-  // @@ Please document me.
-
-  ACE_SYNCH_MUTEX IUnknown_lock_;
-  // Mutex to protect <IUnknown>-related stuff.
-
-  u_int refcount_;
-  // Number of outstanding references to this object.
-
-  ACE_SYNCH_MUTEX fwd_profile_lock_;
-  // This lock covers the mutable info in all IIOP objref data,
-  // namely the forwarded-to objref.  It must be held when a client
-  // thread is reading or modifying that data, to prevent one from
-  // overwriting data the other's reading or writing.
-
-  IIOP::Profile *fwd_profile_;
-  // This is a pointer to a profile used if the object is not
-  // colocated in the current process.
-
-  ~IIOP_Object (void);
-  // Destructor is to be called only through Release()
-
-  // = Disallow copy constructor and assignment operator
-
-  IIOP_Object (const IIOP_Object &);
-  operator = (const IIOP_Object &);
-
-#if defined (__GNUG__)
-  // G++ (even 2.6.3) stupidly thinks instances can't be created.
-  // This de-warns.
-  friend class everyone_needs_a_friend;
-#endif /* __GNUG__ */
-};
-
-#endif	/* TAO_IIOPOBJ_H */
diff --git a/TAO/tao/iiopobj.i b/TAO/tao/iiopobj.i
deleted file mode 100644
index 8a549c41682..00000000000
--- a/TAO/tao/iiopobj.i
+++ /dev/null
@@ -1,100 +0,0 @@
-ACE_INLINE
-IIOP::Version::Version (CORBA::Octet maj, CORBA::Octet min)
-  : major (maj),
-    minor (min)
-{
-}
-
-ACE_INLINE
-IIOP::Profile::Profile (void)
-  : host (0)
-{
-}
-
-ACE_INLINE
-IIOP::Profile::~Profile (void)
-{
-  delete [] this->host;
-  delete [] this->object_key.buffer;
-}
-
-ACE_INLINE void
-IIOP::Profile::object_addr (const ACE_INET_Addr *addr)
-{
-  if (addr != 0)
-    this->object_addr_ = *addr;
-  else if (this->host)
-    this->object_addr_.set (this->port, this->host);
-}
-
-ACE_INLINE ACE_INET_Addr &
-IIOP::Profile::object_addr (void)
-{
-  return this->object_addr_;
-}
-
-ACE_INLINE
-IIOP_Object::~IIOP_Object (void)
-{
-  assert (this->refcount_ == 0);
-  delete this->fwd_profile_;
-}
-
-ACE_INLINE
-IIOP_Object::IIOP_Object (char *repository_id)
-  : STUB_Object (repository_id),
-    base (this),
-    refcount_ (1),
-    fwd_profile_ (0)
-{
-}
-
-ACE_INLINE
-IIOP_Object::IIOP_Object (char *repository_id,
-			  const IIOP::Profile &a_profile)
-  : STUB_Object (repository_id),
-    profile (a_profile),
-    base (this),
-    refcount_ (1),
-    fwd_profile_ (0)
-{
-}
-
-ACE_INLINE
-IIOP::Profile *
-IIOP_Object::fwd_profile_i (void)
-{
-  return this->fwd_profile_;
-}
-
-ACE_INLINE
-IIOP::Profile *
-IIOP_Object::fwd_profile_i (IIOP::Profile *new_profile)
-{
-  IIOP::Profile *old = this->fwd_profile_;
-  this->fwd_profile_ = new_profile;
-  return old;
-}
-
-ACE_INLINE
-IIOP::Profile *
-IIOP_Object::fwd_profile (void)
-{
-  ACE_MT (ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, guard, this->fwd_profile_lock_, 0));
-  return this->fwd_profile_i ();
-}
-
-ACE_INLINE
-IIOP::Profile *
-IIOP_Object::fwd_profile (IIOP::Profile *new_profile)
-{
-  ACE_MT (ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, guard, this->fwd_profile_lock_, 0));
-  return this->fwd_profile_i (new_profile);
-}
-
-ACE_INLINE
-ACE_SYNCH_MUTEX &
-IIOP_Object::fwd_profile_lock (void)
-{
-  return fwd_profile_lock_;
-}
diff --git a/TAO/tao/iioporb.cpp b/TAO/tao/iioporb.cpp
deleted file mode 100644
index 585220bc577..00000000000
--- a/TAO/tao/iioporb.cpp
+++ /dev/null
@@ -1,375 +0,0 @@
-// @(#)iioporb.cpp	1.8 95/09/19
-// Copyright 1994-1995 by Sun Microsystems Inc.
-// All Rights Reserved
-//
-// IIOP:		ORB pseudo-object
-//
-// This includes objref stringification/destringification for IIOP
-// object references.
-
-#include "tao/corba.h"
-
-static const char ior_prefix [] = "IOR:";
-static const char iiop_prefix [] = "iiop:";
-
-// Objref stringification
-
-CORBA::String
-IIOP_ORB::object_to_string (CORBA::Object_ptr obj,
-                            CORBA::Environment &env)
-{
-  env.clear ();
-
-  // Application writer controls what kind of objref strings they get,
-  // maybe along with other things, by how they initialize the ORB.
-
-  if (use_omg_ior_format_)
-    {
-      // By default, orbs use IOR strings; these are ugly (and error
-      // prone) but specified by CORBA.
-      //
-      // XXX there should be a simple way to reuse this code in other
-      // ORB implementations ...
-
-      u_char *bytes;
-      // @@ Is BUFSIZ the right size here?
-      u_char buf [BUFSIZ];
-      CDR cdr (buf, sizeof buf, TAO_ENCAP_BYTE_ORDER);
-
-      bytes = buf;
-      (void) ACE_OS::memset (bytes, 0, BUFSIZ);	// support limited oref ACE_OS::strcmp
-
-      // Marshal the objref into an encapsulation bytestream.
-      (void) cdr.put_char (TAO_ENCAP_BYTE_ORDER);
-      if (cdr.encode (CORBA::_tc_Object,
-			&obj, 0,
-			env) != CORBA::TypeCode::TRAVERSE_CONTINUE)
-        return 0;
-
-      // Now hexify the encapsulated CDR data into a string, and
-      // return that string.
-
-      CORBA::String cp;
-      size_t len = cdr.length - cdr.remaining;
-
-      CORBA::String string = CORBA::string_alloc (sizeof ior_prefix + 2 * len);
-
-      ACE_OS::strcpy ((char *) string, ior_prefix);
-
-      for (cp = (CORBA::String) ACE_OS::strchr ((char *) string, ':') + 1, bytes = cdr.buffer;
-           len--;
-           bytes++)
-        {
-          *cp++ = ACE::nibble2hex ((*bytes) >> 4);
-          *cp++ = ACE::nibble2hex (*bytes);
-        }
-
-      *cp = 0;
-      return string;
-    }
-  else
-    {
-      // The "internet" ORB uses readable URL style objrefs, as used
-      // in the World Wide Web.
-      //
-      // NOTE: the version ID in the string is ugly but we can't
-      // realistically eliminate it by any "assume 1.0" strategy...
-      // Similarly with the port, because there's no single IIOP port
-      // to which we could default.
-
-      static const char	digits [] = "0123456789";
-
-      // This only works for IIOP objrefs.  If we're handed an objref
-      // that's not an IIOP objref, fail -- application must use an
-      // ORB that's configured differently.
-
-      IIOP_Object *obj2;
-
-      if (obj->QueryInterface (IID_IIOP_Object,
-			       (void **) &obj2) != NOERROR)
-        {
-          env.exception (new CORBA_DATA_CONVERSION (CORBA::COMPLETED_NO));
-          return 0;
-	}
-
-      if (!obj2)			// null?
-        return CORBA::string_copy ((CORBA::String) iiop_prefix);
-
-      char buf [BUFSIZ + 2];
-
-      ACE_OS::sprintf (buf, "%s%c.%c//%s:%d/", iiop_prefix,
-                       digits [obj2->profile.iiop_version.major],
-                       digits [obj2->profile.iiop_version.minor],
-                       obj2->profile.host, obj2->profile.port);
-
-      char *cp = ACE_OS::strchr (buf, 0);
-      u_int len;
-      u_char *byte;
-
-      for (len = (u_int) obj2->profile.object_key.length,
-             byte = obj2->profile.object_key.buffer;
-           cp < &buf [BUFSIZ] && len != 0;
-           len--, byte++)
-        {
-          if (isascii (*byte) && isprint (*byte) && *byte != '\\')
-            {
-              *cp++ = (char) *byte;
-              continue;
-	    }
-
-          // NOTE: this could run two characters past &buf[BUFSIZ],
-          // which is why buf is exactly two characters bigger than
-          // that ... saves coding a test here.
-          *cp++ = '\\';
-          *cp++ = ACE::nibble2hex (*byte & 0x0f);
-          *cp++ = ACE::nibble2hex ((*byte >> 4) & 0x0f);
-	}
-      if (cp >= &buf [BUFSIZ])
-        {
-          env.exception (new CORBA_IMP_LIMIT (CORBA::COMPLETED_NO));
-          return 0;
-	}
-      *cp = 0;
-      return CORBA::string_copy ((CORBA::String) &buf[0]);
-    }
-}
-
-// Destringify OMG-specified "IOR" string.
-//
-// XXX there should be a simple way to reuse this code in other ORB
-// implementations ...
-
-static CORBA::Object_ptr
-ior_string_to_object (CORBA::String str,
-                      CORBA::Environment &env)
-{
-  // Unhex the bytes, and make a CDR deencapsulation stream from the
-  // resulting data.
-
-  u_char *buffer;
-  ACE_NEW_RETURN (buffer,
-                  u_char [1 + ACE_OS::strlen ((char *) str) / 2],
-                  CORBA_Object::_nil ());
-
-  char *tmp = (char *) str;
-  size_t len = 0;
-
-  while (tmp [0] && tmp [1])
-    {
-      u_char byte;
-
-      if (!(isxdigit (tmp [0]) && isxdigit (tmp [1])))
-        break;
-
-      byte = (u_char) (ACE::hex2byte (tmp [0]) << 4);
-      byte |= ACE::hex2byte (tmp [1]);
-
-      buffer [len++] = byte;
-      tmp += 2;
-    }
-
-  if (tmp [0] && !isspace (tmp [0]))
-    {
-      delete [] buffer;
-      env.exception (new CORBA::BAD_PARAM (CORBA::COMPLETED_NO));
-      return 0;
-    }
-
-  // Create deencapsulation stream ... then unmarshal objref from that
-  // stream.
-
-  CDR stream;
-  CORBA::Object_ptr objref;
-
-  stream.setup_encapsulation (buffer, len);
-  if (stream.decode (CORBA::_tc_Object,
-		    &objref, 0,
-		    env) != CORBA::TypeCode::TRAVERSE_CONTINUE)
-    objref = 0;
-
-  delete [] buffer;
-  return objref;
-}
-
-// Destringify URL style IIOP objref.
-
-static CORBA::Object_ptr
-iiop_string_to_object (CORBA::String string,
-                       CORBA::Environment &env)
-{
-  // NIL objref encodes as just "iiop:" ... which has already been
-  // removed, so we see it as an empty string.
-
-  if (!string || !*string)
-    return 0;
-
-  // type ID not encoded in this string ... makes narrowing rather
-  // expensive, though it does ensure that type-safe narrowing code
-  // gets thoroughly excercised/debugged!  Without a typeID, the
-  // _narrow will be required to make an expensive remote "is_a" call.
-
-  IIOP_Object *data;
-
-  // null type ID.
-  ACE_NEW_RETURN (data, IIOP_Object ((char *) 0), 0);
-
-  // Remove the "N.N//" prefix, and verify the version's one
-  // that we accept
-
-  if (isdigit (string [0]) && isdigit (string [2]) && string [1] == '.'
-      && string [3] == '/' && string [4] == '/')
-    {
-      data->profile.iiop_version.major = (char) (string [0] - '0');
-      data->profile.iiop_version.minor = (char) (string [2] - '0');
-      string += 5;
-    }
-  else
-    {
-      env.exception (new CORBA_DATA_CONVERSION (CORBA::COMPLETED_NO));
-      data->Release ();
-      return 0;
-    }
-
-  if (data->profile.iiop_version.major != IIOP::MY_MAJOR
-      || data->profile.iiop_version.minor > IIOP::MY_MINOR)
-    {
-      env.exception (new CORBA_DATA_CONVERSION (CORBA::COMPLETED_NO));
-      data->Release ();
-      return 0;
-    }
-
-  // Pull off the "hostname:port/" part of the objref
-
-  char *cp = ACE_OS::strchr (string, ':');
-  if (cp == 0)
-    {
-      env.exception (new CORBA_DATA_CONVERSION (CORBA::COMPLETED_NO));
-      data->Release ();
-      return 0;
-    }
-
-  data->profile.host = CORBA::string_alloc (1 + cp - string);
-  for (cp = data->profile.host;
-       *string != ':';
-       *cp++ = *string++)
-    continue;
-
-  *cp = 0;
-  string++;
-
-  cp = ACE_OS::strchr ((char *) string, '/');
-
-  if (cp == 0)
-    {
-      env.exception (new CORBA_DATA_CONVERSION (CORBA::COMPLETED_NO));
-      CORBA::string_free (data->profile.host);
-      data->Release ();
-      return 0;
-    }
-
-  data->profile.port = (short) ACE_OS::atoi ((char *) string);
-  data->profile.object_addr (0);
-  string = ++cp;
-
-  // Parse the key ... it's ASCII plus hex escapes for everything
-  // nonprintable.  This assumes that printable ASCII is the common
-  // case ... but since stringification is uncommon, no big deal.
-
-  data->profile.object_key.buffer =
-    (u_char *) CORBA::string_copy (string);
-
-  // Strip out whitespace and adjust length accordingly.
-
-  for (cp = (char *) data->profile.object_key.buffer;
-       *cp;
-       cp++)
-    {
-      if (!isprint (*cp))
-        {
-          *cp = '\0';
-          break;
-        }
-    }
-
-  string = (char *) data->profile.object_key.buffer;
-  data->profile.object_key.length = ACE_OS::strlen (string);
-  data->profile.object_key.maximum = data->profile.object_key.length;
-
-  // Strip out hex escapes and adjust the key's length appropriately.
-
-  while ((cp = ACE_OS::strchr ((char *) data->profile.object_key.buffer, '\\')) != 0)
-    {
-      *cp = (CORBA::Char) (ACE::hex2byte ((char) cp [1]) << 4);
-      *cp |= (CORBA::Char) ACE::hex2byte ((char) cp [2]);
-      cp++;
-
-      size_t len = ACE_OS::strlen (cp);
-
-      ACE_OS::memcpy (cp, cp+2, len - 2);
-      data->profile.object_key.length -= 2;
-    }
-
-  // Return the objref.
-  CORBA::Object_ptr obj;
-
-  (void) data->QueryInterface (IID_CORBA_Object,
-                               (void **) &obj);
-  data->Release ();
-  return obj;
-}
-
-// Destringify arbitrary objrefs.
-
-CORBA::Object_ptr
-IIOP_ORB::string_to_object (const CORBA::String str,
-                            CORBA::Environment &env)
-{
-  env.clear ();
-
-  CORBA::Object_ptr obj = 0;
-
-  // Use the prefix code to choose which destringify algorithm to use.
-  if (ACE_OS::strncmp ((char *)str,
-                       iiop_prefix, sizeof iiop_prefix - 1) == 0)
-    obj = iiop_string_to_object (str + sizeof iiop_prefix - 1, env);
-
-  else if (ACE_OS::strncmp ((char *)str,
-                            ior_prefix,
-                            sizeof ior_prefix - 1) == 0)
-    obj = ior_string_to_object (str + sizeof ior_prefix - 1, env);
-
-  // Return the object
-  return obj;
-}
-
-// COM IUnknown support
-
-// {A201E4C4-F258-11ce-9598-0000C07CA898}
-DEFINE_GUID (IID_IIOP_ORB,
-0xa201e4c4, 0xf258, 0x11ce, 0x95, 0x98, 0x0, 0x0, 0xc0, 0x7c, 0xa8, 0x98);
-
-HRESULT __stdcall
-IIOP_ORB::QueryInterface (REFIID riid,
-                          void **ppv)
-{
-  *ppv = 0;
-
-  if (IID_CORBA_ORB == riid
-      || IID_IIOP_ORB == riid
-      || IID_IUnknown == riid)
-    *ppv = this;
-
-  // XXX gotta aggregate ...
-
-  if (*ppv == 0)
-    return ResultFromScode (E_NOINTERFACE);
-
-  (void) AddRef ();
-  return NOERROR;
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Singleton<IIOP_ORB, ACE_SYNCH_RECURSIVE_MUTEX>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Singleton<IIOP_ORB, ACE_SYNCH_RECURSIVE_MUTEX>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/iioporb.h b/TAO/tao/iioporb.h
deleted file mode 100644
index 3e90b01bed3..00000000000
--- a/TAO/tao/iioporb.h
+++ /dev/null
@@ -1,69 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO
-// 
-// = FILENAME
-//    iiopobj.h
-//
-// = AUTHOR
-//     Copyright 1994-1995 by Sun Microsystems Inc.
-// 
-// ============================================================================
-
-#if !defined (TAO_IIOPORB_H)
-#  define TAO_IIOPORB_H
-
-#include "tao/corba.h"
-
-typedef class IIOP_ORB *IIOP_ORB_ptr;
-
-// ORB pseudo-objref
-
-class TAO_Export IIOP_ORB : public CORBA_ORB
-// = TITLE
-//    Bridge implementation of IIOP_ORB
-//
-// = DESCRIPTION
-//    This is one of the two main hooks into IIOP in this Win32
-//    C/C++/COM based implementation; the other being IIOP_Object.
-{
-public:
-  IIOP_ORB (void);
-  // constructor
-
-  ~IIOP_ORB (void);
-  // destructor
-
-  CORBA::Object_ptr string_to_object (const CORBA::String str,
-                                      CORBA::Environment &env);
-  // Get an object reference from the IOR string
-
-  CORBA::String object_to_string (CORBA::Object_ptr obj,
-                                  CORBA::Environment &env);
-  // Convert an object reference to an IOR stringified form
-
-  HRESULT __stdcall QueryInterface (REFIID riid, 
-				    void **ppv);
-  // COM stuff - get the underlying IUnknown object based on the riid
-
-  // = ACCESSORS
-  void use_omg_ior_format (CORBA::Boolean ior);
-  // Set the IOR flag.
-  CORBA::Boolean use_omg_ior_format (void);
-  // Get the IOR flag.
-  
-private:
-  CORBA::Boolean use_omg_ior_format_;
-  // decides whether to use the URL notation or to use IOR notation
-
-  // These are not provided.
-  IIOP_ORB (const IIOP_ORB &);
-  IIOP_ORB &operator = (const IIOP_ORB &);
-};
-
-typedef IIOP_ORB *IIOP_ORB_ptr;
-
-#endif	/* TAO_IIOPORB_H */
diff --git a/TAO/tao/iioporb.i b/TAO/tao/iioporb.i
deleted file mode 100644
index d992c18a2ea..00000000000
--- a/TAO/tao/iioporb.i
+++ /dev/null
@@ -1,24 +0,0 @@
-// $Id$
-
-ACE_INLINE
-IIOP_ORB::IIOP_ORB(void)
-  : use_omg_ior_format_(CORBA::B_FALSE)
-{
-}
-
-ACE_INLINE
-IIOP_ORB::~IIOP_ORB(void)
-{}
-
-
-ACE_INLINE void
-IIOP_ORB::use_omg_ior_format (CORBA::Boolean ior)
-{
-  use_omg_ior_format_ = ior;
-}
-
-ACE_INLINE CORBA::Boolean
-IIOP_ORB::use_omg_ior_format (void)
-{
-  return use_omg_ior_format_;
-}
diff --git a/TAO/tao/interp.cpp b/TAO/tao/interp.cpp
deleted file mode 100644
index e1d25b20a01..00000000000
--- a/TAO/tao/interp.cpp
+++ /dev/null
@@ -1,1504 +0,0 @@
-// @(#)interp.cpp	1.4 95/11/04
-// Copyright 1994-1995 by Sun Microsystems Inc.
-// All Rights Reserved
-//
-// TYPECODE: interpreter, traverses data structures
-//
-// This uses the standard C/C++ representation for data, and knows how
-// to do things like align and pad according to standard rules.  It is
-// driven by CDR marshaled representations of TypeCodes.
-//
-// It does two key things: (a) calculate size and alignment
-// restrictions for the data type described by any given typecode; and
-// (b) "visits" each element of a data type in the order those
-// elements are defined in the type's IDL definition.
-//
-// A typical use is that some application-specific "visit" function
-// will be called with a typecode and data value.  Then that "visit"
-// function may choose to use the interpreter's knowledge of the
-// environment's size, padding, and alignment rules to help it examine
-// each of the constituents of complex data values.  It does so by
-// making a call to TypeCode::traverse(), and passing itself for
-// future recursive calls.
-//
-// NOTE that this module has system dependent parts, and so should be
-// examined when porting to new CPU architectures, compilers, and so
-// forth to make sure it correctly implements the appropriate binary
-// interfaces.
-//
-// Issues of concern are primarily that sizes and representations of
-// CORBA primitive data types are correct (key issues are verified
-// when the ORB initializes) and that the alignment rules are
-// recognized.
-//
-// Also, exceptions have vtables in them, which may cause trouble if
-// they aren't located at the very beginning by the compiler in
-// question.
-//
-// So for example, moving to another CPU architecture which still uses
-// standard sized two's complement integers and IEEE floating point,
-// and expects "natural" alignment, won't be hard.  Even using PC
-// style tightly packed data is simple; the alignment rules are just
-// simpler.  Most volume microprocessors used in 1995 are correctly
-// supported.
-//
-// Using data representations that are far from the standard C/C++
-// style data layout is probably not practical with this
-// implementation.  LISP systems, as one example, probably won't use
-// "in-memory" representations much like C/C++, even though its "wire
-// form" could directly match CDR.
-//
-// ALSO, the treatment of exceptions may need to be examined in
-// language environments which actually rely on C++ exceptions.  The
-// RTTI data that identifies exceptions can easily be ignored by this
-// interpreter (if it's taught about that compiler's RTTI) but it may
-// not be practical for any code not generated by that specific C++
-// compiler to store such data in the right place to look like a C++
-// exception, or to throw exceptions when that's needed.  (RTTI ==
-// "Run Time Typing Information", needed to make C++ exceptions work
-// correctly and partially exposed to users by the ANSI standards
-// comittee.  It provides type-safe "downcasting" and other features
-// previously unavailable in C++.)
-//
-// THREADING NOTE: Data structures being traversed should only be
-// modified by the thread doing the traversal.  The interpretive code
-// itself is reentrant (recursive!) so presents no threading issues;
-// only the data being fed to the interpreter must be protected
-// against concurrency.
-
-#include "tao/corba.h"
-
-// Utility routines are used to manipulate CDR-encapsulated TypeCode
-// parameter lists, calculating the size and alignment of the data
-// type being described.  The TCKind value has always been removed
-// from the CDR stream when these calculator routines get called.
-
-typedef size_t attribute_calculator (CDR *stream,
-				     size_t &alignment,
-				     CORBA::Environment	&env);
-
-static attribute_calculator calc_struct_attributes;
-static attribute_calculator calc_exception_attributes;
-static attribute_calculator calc_union_attributes;
-static attribute_calculator calc_alias_attributes;
-static attribute_calculator calc_array_attributes;
-
-// Other utility routines are used to skip the parameter lists when
-// they're not needed.
-
-typedef CORBA::Boolean param_skip_rtn (CDR *);
-
-static CORBA::Boolean
-skip_encapsulation (CDR *stream)
-{
-  return stream->skip_string ();
-}
-
-static CORBA::Boolean
-skip_long (CDR *stream)
-{
-  CORBA::ULong	scratch;
-
-  return stream->get_ulong (scratch);
-}
-
-// Table supporting calculation of size and alignment requirements for
-// any one instance of a given data types.
-//
-// This is indexed via CDR's TCKind values, which are "frozen" as part
-// of the CDR standard.  Entries hold either the size and alignment
-// values for that data type, or a pointer to a function that is used
-// to calculate those values.  Function pointers are normally needed
-// only for constructed types.
-//
-// A "skipper" routine is provided for some data types whose size is
-// known statically (e.g. objrefs, structures, strings) but whose
-// typecodes have parameters that sometimes need to be ignored when
-// found in a CDR stream.  Any attribute calculator routine always
-// skips parameters in the CDR input stream, so no type with such a
-// routine also needs a "skipper".
-//
-// Rather than growing a set of processor-specific #ifdefs, we
-// calculate most of this table (except functions) at ORB
-// initialization time.
-
-struct table_element
-{
-  size_t size;
-  size_t alignment;
-  attribute_calculator *calc;
-  param_skip_rtn *skipper;
-};
-
-static table_element table [CORBA::TC_KIND_COUNT] =
-{
-  { 0, 1, 0 },				// CORBA::tk_null
-  { 0, 1, 0 },				// CORBA::tk_void
-
-  { 0, 1, 0, 0 },				// CORBA::tk_short
-  { 0, 1, 0, 0 },				// CORBA::tk_long
-  { 0, 1, 0, 0 },				// CORBA::tk_ushort
-  { 0, 1, 0, 0 },				// CORBA::tk_ulong
-
-  { 0, 1, 0, 0 },				// CORBA::tk_float
-  { 0, 1, 0, 0 },				// CORBA::tk_double
-
-  { 0, 1, 0, 0 },				// CORBA::tk_boolean
-  { 0, 1, 0, 0 },				// CORBA::tk_char
-  { 0, 1, 0, 0 },				// CORBA::tk_octet
-  { 0, 1, 0, 0 },				// CORBA::tk_any
-
-  { 0, 1, 0, 0 },				// CORBA::tk_TypeCode
-  { 0, 1, 0, 0 },				// CORBA::tk_Principal
-  { 0, 1, 0, skip_encapsulation },		// CORBA::tk_objref
-
-  { 0, 1, calc_struct_attributes, 0 },	// CORBA::tk_struct
-  { 0, 1, calc_union_attributes, 0 },		// CORBA::tk_union
-
-  { 0, 1, 0, skip_encapsulation },		// CORBA::tk_enum
-  { 0, 1, 0, skip_long },			// CORBA::tk_string
-  { 0, 1, 0, skip_encapsulation },		// CORBA::tk_sequence
-  { 0, 1, calc_array_attributes, 0 },		// CORBA::tk_array
-
-  //
-  // Two TCKind values added in 94-11-7
-  //
-  { 0, 1, calc_alias_attributes, 0 },		// CORBA::tk_alias
-  { 0, 1, calc_exception_attributes, 0 },	// CORBA::tk_except
-
-  //
-  // Five extended IDL data types, defined in Appendix A of 94-9-32
-  // but here with different numeric TCKind codes.  These types
-  // represent extensions to CORBA (specifically, to IDL) which are
-  // not yet standardized.
-  //
-  { 0, 1, 0, 0 },				// CORBA::tk_longlong
-  { 0, 1, 0, 0 },				// CORBA::tk_ulonglong
-  { 0, 1, 0, 0 },				// CORBA::tk_longdouble
-  { 0, 1, 0, 0 },				// CORBA::tk_wchar
-  { 0, 1, 0, skip_long }			// CORBA::tk_wstring
-};
-
-// Runtime initialization of the table above; note that this compiles
-// down to a set of assignment statements, with the real work done by
-// the C++ compiler when this file gets compiled.
-//
-// "Natural alignment" is a policy that the processor controls the
-// alignment of data based on its type.  There's variation; some CPUs
-// have a maximum alignment requirement of two or four bytes, others
-// have some type-specific exceptions to the normal "alignment ==
-// size" rule.
-//
-// "Fixed" alignment ignores data type when establishing alignment;
-// not all processors support such policies, and those which do often
-// pay a cost to do so (viz. RISC/CISC discussions).  The primary
-// example of an OS family that chose "fixed" alignment is Microsoft's
-// x86 systems, which normally align on one byte boundaries to promote
-// data space efficiency.
-//
-// NOTE: typical PC compiler options let you specify other alignments,
-// but none are "natural".  Also, they don't apply consistently to all
-// data types.  Change the "one byte" assumption with extreme caution!
-// And make sure all header files (e.g. generated by an IDL compiler)
-// make sure that alignment of IDL-defined data types is consistent
-// (one byte).
-
-  enum TCKIND
-  {
-    tk_null               = 0,
-    tk_void               = 1,
-    tk_short              = 2,
-    tk_long               = 3,
-    tk_ushort             = 4,
-    tk_ulong              = 5,
-    tk_float              = 6,
-    tk_double             = 7,
-    tk_boolean            = 8,
-    tk_char               = 9,
-    tk_octet              = 10,
-    tk_any                = 11,
-    tk_TypeCode           = 12,
-    tk_Principal          = 13,
-    tk_objref             = 14,
-    tk_struct             = 15,
-    tk_union              = 16,
-    tk_enum               = 17,
-    tk_string             = 18,
-    tk_sequence           = 19,
-    tk_array              = 20,
-    tk_alias              = 21,           // 94-11-7
-    tk_except             = 22,           // 94-11-7
-
-    // these five are OMG-IDL data type extensions
-    tk_longlong           = 23,           // 94-9-32 Appendix A (+ 2)
-    tk_ulonglong          = 24,           // 94-9-32 Appendix A (+ 2)
-    tk_longdouble         = 25,           // 94-9-32 Appendix A (+ 2)
-    tk_wchar              = 26,           // 94-9-32 Appendix A (+ 2)
-    tk_wstring            = 27,           // 94-9-32 Appendix A (+ 2)
-
-    // This symbol is not defined by CORBA 2.0.  It's used to speed up
-    // dispatch based on TCKind values, and lets many important ones
-    // just be table lookups.  It must always be the last enum value!!
-
-    TC_KIND_COUNT
-  };
-
-#if defined (unix) || defined (VXWORKS) || defined (ACE_WIN32)
-#define declare_entry(x,t) \
-    	struct align_struct_ ## t { \
-    	    x one; \
-      	    char dummy [TAO_ALIGNMENT_MAGIC_NUMBER + 1 - sizeof(x)]; \
-    	    x two; \
-    	}
-
-#define setup_entry(x,t) \
-    { \
-	align_struct_ ## t	 align; \
-	table [t].size = sizeof (x); \
-	table [t].alignment = \
-		(char *) &align.two - (char *) &align.one - TAO_ALIGNMENT_MAGIC_NUMBER; \
-    }
-
-#else	// "Fixed" byte alignment
-// Have a bogus one
-#define declare_entry(x,t) struct align_struct_ ## t { }
-#define setup_entry(x,t) \
-    { \
-	table [t].size = sizeof (x); \
-	table [t].alignment = 1; \
-    }
-
-#endif /* defined (unix) || defined (VXWORKS) || defined (ACE_WIN32) */
-
-// Fills in fixed size and alignment values.
-
-declare_entry (CORBA::Short, tk_short);
-declare_entry (CORBA::Long, tk_long);
-declare_entry (CORBA::UShort, tk_ushort);
-declare_entry (CORBA::ULong, tk_ulong);
-
-declare_entry (CORBA::Float, tk_float);
-declare_entry (CORBA::Double, tk_double);
-
-declare_entry (CORBA::Boolean, tk_boolean);
-declare_entry (CORBA::Char, tk_char);
-declare_entry (CORBA::Octet, tk_octet);
-declare_entry (CORBA::Any, tk_any);
-
-declare_entry (CORBA::TypeCode_ptr, tk_TypeCode);
-declare_entry (CORBA::Principal_ptr, tk_Principal);
-declare_entry (CORBA::Object_ptr, tk_objref);
-
-declare_entry (CORBA::String, tk_string);
-declare_entry (CORBA::OctetSeq, tk_sequence);
-
-declare_entry (CORBA::LongLong, tk_longlong);
-declare_entry (CORBA::ULongLong, tk_ulonglong);
-declare_entry (CORBA::LongDouble, tk_longdouble);
-declare_entry (CORBA::WChar, tk_wchar);
-declare_entry (CORBA::WString, tk_wstring);
-
-void
-__TC_init_table (void)
-{
-  setup_entry (CORBA::Short, tk_short);
-  setup_entry (CORBA::Long, tk_long);
-  setup_entry (CORBA::UShort, tk_ushort);
-  setup_entry (CORBA::ULong, tk_ulong);
-
-  setup_entry (CORBA::Float, tk_float);
-  setup_entry (CORBA::Double, tk_double);
-
-  setup_entry (CORBA::Boolean, tk_boolean);
-  setup_entry (CORBA::Char, tk_char);
-  setup_entry (CORBA::Octet, tk_octet);
-  setup_entry (CORBA::Any, tk_any);
-
-  setup_entry (CORBA::TypeCode_ptr, tk_TypeCode);
-  setup_entry (CORBA::Principal_ptr, tk_Principal);
-  setup_entry (CORBA::Object_ptr, tk_objref);
-
-  enum generic_enum {a, b, c, d};
-
-  // XXX workaround for G++ 2.6.3 bug
-  // setup_entry (generic_enum, CORBA::tk_enum);
-  table [CORBA::tk_enum].size = sizeof (generic_enum);
-  table [CORBA::tk_enum].alignment = sizeof (generic_enum);
-
-  setup_entry (CORBA::String, tk_string);
-  setup_entry (CORBA::OctetSeq, tk_sequence);
-
-  setup_entry (CORBA::LongLong, tk_longlong);
-  setup_entry (CORBA::ULongLong, tk_ulonglong);
-  setup_entry (CORBA::LongDouble, tk_longdouble);
-  setup_entry (CORBA::WChar, tk_wchar);
-  setup_entry (CORBA::WString, tk_wstring);
-}
-
-#undef	setup
-
-// For a given typecode, figure out its size and alignment needs.
-// This version is used mostly when traversing other typecodes, and
-// follows these rules:
-//
-// - Some typecodes are illegal (can't be nested inside others);
-// - Indirections are allowed;
-// - The whole typecode (including TCKind enum) is in the stream
-//
-// When the routine returns, the stream has skipped this TypeCode.
-//
-// "size" is returned, "alignment" is an 'out' parameter.  If it is
-// non-null, "tc" is initialized to hold the contents of the TypeCode;
-// it depends on the contents of the original stream to be valid.
-//
-// XXX explore splitting apart returning the size/alignment data and
-// the TypeCode initialization; union traversal would benefit a bit,
-// but it would need more than that to make it as speedy as struct
-// traversal.
-
-static size_t
-calc_nested_size_and_alignment (CORBA::TypeCode_ptr tc,
-				CDR *original_stream,
-				size_t &alignment,
-				CORBA::Environment &env)
-{
-  // Get the "kind" ... if this is an indirection, this is a guess
-  // which will soon be updated.
-  CORBA::ULong temp;
-  CORBA::TCKind kind;
-
-  if (original_stream->get_ulong (temp) == CORBA::B_FALSE)
-    {
-      env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO));
-      return 0;
-    }
-
-  env.clear ();
-  kind = (CORBA::TCKind) temp;
-
-  // Check for indirection, setting up the right CDR stream to use
-  // when getting the rest of the parameters.  (We rely on the fact
-  // that indirections may not point to indirections.)
-  CDR indirected_stream;
-  CDR *stream;
-
-  if (kind == ~0)
-    {
-      CORBA::Long offset;
-
-      // Get indirection, sanity check it, set up new stream pointing
-      // there.
-      //
-      // XXX access to "real" size limit for this typecode and use it
-      // to check for errors before indirect and to limit the new
-      // stream's length.  ULONG_MAX is too much!
-
-      if (!original_stream->get_long (offset)
-	  || offset >= -8
-	  || ((-offset) & 0x03) != 0)
-	{
-	  env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO));
-	  return 0;
-	}
-      //      offset -= 4;		// correct for get_long update
-
-      indirected_stream.next = original_stream->next + (ptr_arith_t) offset;
-      indirected_stream.remaining = (size_t) ULONG_MAX;
-      stream = &indirected_stream;
-
-      // Fetch indirected-to TCKind, deducing byte order.
-
-      if (*indirected_stream.next == 0)		// big-endian?
-	indirected_stream.do_byteswap = (TAO_ENCAP_BYTE_ORDER != 0);
-      else
-	indirected_stream.do_byteswap = (TAO_ENCAP_BYTE_ORDER == 0);
-
-      if (!indirected_stream.get_ulong (temp))
-	{
-	  env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO));
-	  return 0;
-	}
-      kind = (CORBA::TCKind) temp;
-
-    }
-  else
-    stream = original_stream;
-
-  // Check for illegal TCKind enum values ... out of range, or which
-  // represent data values that can't be nested.  (Some can't even
-  // exist freestanding!)
-
-  if (kind >= TC_KIND_COUNT
-      || kind <= CORBA::tk_void
-      || kind == CORBA::tk_except)
-    {
-      env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO));
-      return 0;
-    }
-
-  // Use attribute calculator routine if it exists; these are needed
-  // only for variable-sized data types, with encapsulated parameter
-  // lists that affect the size and alignment of "top level" memory
-  // needed to hold an instance of this type.
-
-  if (table [kind].calc != 0)
-    {
-      assert (table [kind].size == 0);
-
-      // Pull encapsulation length out of the stream.
-      if (stream->get_ulong (temp) == CORBA::B_FALSE)
-	{
-	  env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO));
-	  return 0;
-	}
-
-      // Initialize the TypeCode if requested
-      if (tc)
-	{
-	  tc->kind_ = kind;
-	  tc->buffer_ = stream->next;
-	  tc->length_ = temp;
-	}
-
-      // Set up a separate stream for the parameters; it may easily
-      // have a different byte order, and this is as simple a way as
-      // any to ensure correctness.  Then use the calculator routine
-      // to calculate size and alignment.
-
-      CDR sub_encapsulation;
-      size_t size;
-
-      assert (temp <= UINT_MAX);
-      sub_encapsulation.setup_encapsulation (stream->next, (size_t) temp);
-      size = table [kind].calc (&sub_encapsulation, alignment, env);
-
-      // Check for garbage at end of parameter lists, or other cases
-      // where parameters and the size allocated to them don't jive.
-
-      stream->skip_bytes ((unsigned) temp);
-      if (stream->next != sub_encapsulation.next)
-	{
-	  env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO));
-	  return 0;
-	}
-      return size;
-    }
-  assert (table [kind].size != 0);		// fixed size data type
-
-  // Reinitialize the TypeCode if requested; this consumes any
-  // TypeCode parameters in the stream.  They only exist for TCKind
-  // values that have parameters, but which represent fixed-size data
-  // types in the binary representation: CORBA::tk_string, CORBA::tk_wstring,
-  // CORBA::tk_objref, CORBA::tk_enum, and CORBA::tk_sequence.
-
-  if (tc)
-    {
-      CORBA::ULong len;
-
-      tc->kind_ = kind;
-      switch (kind)
-	{
-	default:
-	  assert (table [kind].skipper == 0);
-	  break;
-
-	case CORBA::tk_string:
-	case CORBA::tk_wstring:
-	  if (stream->get_ulong (len) == CORBA::B_FALSE)
-	    {
-	      env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO));
-	      return 0;
-	    }
-	  tc->length_ = len;
-	  break;
-
-	case CORBA::tk_enum:
-	case CORBA::tk_objref:
-	case CORBA::tk_sequence:
-	  if (stream->get_ulong (len) == CORBA::B_FALSE)
-	    {
-	      env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO));
-	      return 0;
-	    }
-	  tc->length_ = len;
-
-	  assert (len < UINT_MAX);
-	  tc->buffer_ = stream->next;
-	  stream->skip_bytes ((unsigned) len);
-	  break;
-	}
-
-      // Otherwise, consume any parameters without stuffing them into
-      // a temporary TypeCode.
-    }
-  else if (table [kind].skipper != 0
-	   && table [kind].skipper (stream) == CORBA::B_FALSE)
-    {
-      env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO));
-      return 0;
-    }
-
-  // Return statically known values.
-  alignment = table [kind].alignment;
-  return table [kind].size;
-}
-
-// Given typecode bytes for a structure (or exception), figure out its
-// alignment and size; return size, alignment is an 'out' parameter.
-// Only "CORBA::tk_struct" (or "CORBA::tk_except") has been taken out of the stream
-// parameter holding the bytes.
-//
-// We use a one-pass algorithm, calculating size and inter-element
-// padding while recording the strongest alignment restriction.  Then
-// we correct the size to account for tail-padding.
-//
-// This routine recognizes that exceptions are just structs with some
-// additional information.  Different environments may differ in what
-// that additional information is, so this routine may need to be
-// taught about compiler-specific representation of that additional
-// "RTTI" data.
-
-static size_t
-calc_struct_and_except_attributes (CDR *stream,
-				   size_t &alignment,
-				   CORBA::Boolean is_exception,
-				   CORBA::Environment &env)
-{
-  CORBA::ULong	members;
-  size_t size;
-
-  // Exceptions are like structs, with key additions (all of which
-  // might need to be be applied to structures!): vtable, typecode,
-  // and refcount.  The size must include these "hidden" members.
-  //
-  // NOTE: in environments with "true" C++ exceptions, there may need
-  // to be a slot for additional "RTTI" information; maybe it is part
-  // of the vtable, or maybe not.  Or, that information (needed to
-  // determine which 'catch' clauses apply) may only be provided by
-  // the compiler to the runtime support for the "throw" statement.
-
-  if (is_exception)
-    {
-      size = sizeof (CORBA::Exception);
-      alignment = table [CORBA::tk_TypeCode].alignment;
-    }
-  else
-    {
-      alignment = 1;
-      size = 0;
-    }
-
-  // skip rest of header (type ID and name) and collect the number of
-  // struct members
-
-  if (!stream->skip_string ()
-      || !stream->skip_string ()
-      || !stream->get_ulong (members))
-    {
-      env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO));
-      return 0;
-    }
-
-  // iterate over all the members, skipping their names and looking
-  // only at type data.
-
-  for ( ; members != 0; members--) {
-    size_t member_size;
-    size_t member_alignment;
-
-    // Skip name of the member.
-    if (!stream->skip_string ())
-      {
-	env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO));
-	return 0;
-      }
-
-    // Get size and alignment of the member, accounting for
-    // indirection and the various kinds of parameter encoding.
-
-    member_size = calc_nested_size_and_alignment (0,
-						  stream,
-						  member_alignment,
-						  env);
-    if (env.exception () != 0)
-      return 0;
-
-    // Round up the struct size to handle member alignment (by adding
-    // internal padding), then update the current size to handle the
-    // member's size.
-
-    size = (size_t) align_binary (size, member_alignment);
-    size += member_size;
-
-    // Finally update the overall structure alignment requirement, if
-    // this element must be more strongly aligned.
-
-    if (member_alignment > alignment)
-      alignment = member_alignment;
-  };
-
-  // Round up the structure size to match its overall alignment.  This
-  // adds tail padding, if needed.
-  return (size_t) align_binary (size, alignment);
-}
-
-// Calculate size and alignment for a structure.
-
-static size_t
-calc_struct_attributes (CDR *stream,
-			size_t &alignment,
-			CORBA::Environment &env)
-{
-  return calc_struct_and_except_attributes (stream,
-					    alignment,
-					    CORBA::B_FALSE,
-					    env);
-}
-
-// Calculate size and alignment for an exception.
-
-static size_t
-calc_exception_attributes (CDR *stream,
-			   size_t &alignment,
-			   CORBA::Environment &env)
-{
-  return calc_struct_and_except_attributes (stream,
-					    alignment,
-					    CORBA::B_TRUE,
-					    env);
-}
-
-// Calculate and return sizes for both parts of a union, as needed by
-// other code.  Return value is the overall size.  The padded size of
-// the discriminant is needed to traverse the two values separately.
-// Unfortunately that is not quite practical to do with a single pass
-// over the typecode: the inter-element padding changes depending on
-// the strictest alignment required by _any_ arm of the union.
-
-size_t
-calc_key_union_attributes (CDR *stream,
-			   size_t &overall_alignment,
-			   size_t &discrim_size_with_pad,
-			   CORBA::Environment &env)
-{
-  CORBA::ULong members;
-  CORBA::ULong temp;
-  size_t discrim_size;
-  size_t value_alignment;
-  size_t value_size;
-
-  overall_alignment = value_alignment = 1;
-  value_size = discrim_size_with_pad = 0;
-
-  // Skip initial optional members (type ID and name).
-
-  if (!stream->skip_string ()			// type ID
-      || !stream->skip_string ())
-    {	// typedef name
-      env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO));
-      return 0;
-    }
-
-  // Calculate discriminant size and alignment: it's the first member
-  // of the "struct" representing the union.  We detect illegal
-  // discriminant kinds a bit later.
-
-  CORBA::TypeCode discrim_tc (CORBA::tk_void);
-
-  discrim_size = calc_nested_size_and_alignment (&discrim_tc,
-						 stream,
-						 overall_alignment,
-						 env);
-  if (env.exception () != 0)
-    return 0;
-
-  // skip "default used" indicator, and save "member count"
-
-  if (!stream->get_ulong (temp)           	// default used
-      || !stream->get_ulong (members))
-    {	// member count
-      env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO));
-      return 0;
-    }
-
-  // iterate over the tuples for all the members; all we care about is
-  // their types, which can affect either alignment or padding
-  // requirement for the union part of the construct.
-
-  for ( ; members != 0; members--) {
-    size_t member_size, member_alignment;
-
-    // Skip member label; its size varies with discriminant type, but
-    // here we don't care about its content.  This is where illegal
-    // discriminant kinds are detected.
-    //
-    // NOTE:  This modifies 94-9-32 Appendix A to stipulate that
-    // "long long" values are not legal as discriminants.
-
-    switch (discrim_tc.kind_)
-      {
-      case CORBA::tk_short:
-      case CORBA::tk_ushort:
-      case CORBA::tk_wchar:
-	{
-	  CORBA::Short s;
-
-	  if (!stream->get_short (s))
-	    {
-	      env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO));
-	      return 0;
-	    }
-	}
-      break;
-
-      case CORBA::tk_long:
-      case CORBA::tk_ulong:
-      case CORBA::tk_enum:
-	{
-	  CORBA::Long	l;
-
-	  if (!stream->get_long (l))
-	    {
-	      env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO));
-	      return 0;
-	    }
-	}
-      break;
-
-      case CORBA::tk_boolean:
-      case CORBA::tk_char:
-	{
-	  char		c;
-
-	  if (!stream->get_byte (c))
-	    {
-	      env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO));
-	      return 0;
-	    }
-	}
-      break;
-
-      default:
-	env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO));
-	return 0;
-      }
-
-    // We also don't care about any member name.
-
-    if (!stream->skip_string ())
-      {
-	env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO));
-	return 0;
-      }
-
-    // Get the member size and alignment.
-
-    member_size = calc_nested_size_and_alignment (0,
-						  stream,
-						  member_alignment,
-						  env);
-    if (env.exception () != 0)
-      return 0;
-
-    // Save the largest member and alignment.  They don't need to be
-    // changed in sync -- e.g. "long double" size is larger than its
-    // alignment restriction on SPARC, x86, and some m68k platforms.
-    if (member_size > value_size)
-      value_size = member_size;
-    if (member_alignment > value_alignment)
-      value_alignment = member_alignment;
-  }
-
-  // Round up the discriminator's size to include padding it needs in
-  // order to be followed by the value.
-  discrim_size_with_pad = (size_t) align_binary (discrim_size,
-						 value_alignment);
-
-  // Now calculate the overall size of the structure, which is the
-  // discriminator, inter-element padding, value, and tail padding.
-  // We know all of those except tail padding, which is a function of
-  // the overall alignment.  (Ensures that arrays of these can be
-  // safely allocated and accessed!)
-
-  if (value_alignment > overall_alignment)
-    overall_alignment = value_alignment;
-
-  return (size_t) align_binary (discrim_size_with_pad + value_size,
-				overall_alignment);
-}
-
-// Calculate size and alignment for a CORBA discriminated union.
-//
-// Note that this is really a two-element structure.  The first
-// element is the discriminator; the second is the value.  All normal
-// structure padding/alignment rules apply.  In particular, all arms
-// of the union have the same initial address (adequately aligned for
-// any of the members).
-
-static size_t
-calc_union_attributes (CDR *stream,
-		       size_t &alignment,
-		       CORBA::Environment &env)
-{
-  size_t scratch;
-
-  return calc_key_union_attributes (stream, alignment, scratch, env);
-}
-
-// Calculate size and alignment for a typedeffed type.
-
-static size_t
-calc_alias_attributes (CDR *stream,
-		       size_t &alignment,
-		       CORBA::Environment &env)
-{
-  // Skip type ID and name in the parameter stream
-
-  if (!stream->skip_string ()			// type ID
-      || !stream->skip_string ())		// typedef name
-    {
-      env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO));
-      return 0;
-    }
-
-  // The typedef is identical to the type for which it stands.
-  return calc_nested_size_and_alignment (0, stream, alignment, env);
-}
-
-// Calculate size and alignment of an array.  (All such arrays are
-// described as single dimensional, even though the IDL definition may
-// specify a multidimensional array ... such arrays are treated as
-// nested single dimensional arrays.)
-
-static size_t
-calc_array_attributes (CDR *stream,
-		       size_t &alignment,
-		       CORBA::Environment &env)
-{
-  size_t member_size;
-  CORBA::ULong member_count;
-
-  // get size and alignment of the array member
-
-  member_size = calc_nested_size_and_alignment (0, stream, alignment, env);
-  if (env.exception () != 0)
-    return 0;
-
-  // Get and check count of members.
-
-  if (stream->get_ulong (member_count) == CORBA::B_FALSE
-      || member_count > UINT_MAX)
-    {
-      env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO));
-      return 0;
-    }
-
-  // Array size is a function only of member number and count
-  return member_size * (size_t) member_count;
-}
-
-// Visit each of the elements of a structure.
-
-static CORBA::TypeCode::traverse_status
-struct_traverse (CDR *stream,
-		 const void *value1,
-		 const void *value2,
-		 CORBA::TypeCode::traverse_status (_FAR *visit)
-		 (CORBA::TypeCode_ptr tc,
-		  const void *value1,
-		  const void *value2,
-		  void *context,
-		  CORBA::Environment &env),
-		 void *context,
-		 CORBA::Environment &env)
-{
-  // Skip over the type ID and type name in the parameters, then get
-  // the number of members.
-  CORBA::ULong members;
-
-  if (!stream->skip_string ()			// type ID
-      || !stream->skip_string ()		// type name
-      || !stream->get_ulong (members))
-    {
-      env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO));
-      return CORBA::TypeCode::TRAVERSE_STOP;
-    }
-
-  // Visit each member of the structure/exception.  The initial
-  // pointer(s) point at the first values to visit.  For structs we
-  // could avoid the inter-member padding ... not for the case of
-  // exceptions.  No big deal.
-  //
-  // NOTE: For last element, could turn visit() call into something
-  // subject to compiler's tail call optimization and thus save a
-  // stack frame.
-
-  CORBA::TypeCode::traverse_status retval;
-
-  for (retval = CORBA::TypeCode::TRAVERSE_CONTINUE;
-       members != 0 && retval == CORBA::TypeCode::TRAVERSE_CONTINUE;
-       members--)
-    {
-      CORBA::TypeCode member_tc (CORBA::tk_null);
-      size_t size;
-      size_t alignment;
-
-      // Skip the member's name in the parameter list.
-
-      if (!stream->skip_string ())
-	{
-	  env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO));
-	  return CORBA::TypeCode::TRAVERSE_STOP;
-	}
-
-      // Get the member's size, alignment, and a temporary TypeCode,
-      // skipping that TypeCode in the stream as we do so.
-      //
-      // This accounts for all variations: different or nonexistent
-      // parameter lists, errors such as out-of-range TCKind values or
-      // nested exceptions, and indirected typecodes.
-
-      size = calc_nested_size_and_alignment (&member_tc,
-					     stream,
-					     alignment,
-					     env);
-      if (env.exception () != 0)
-	return CORBA::TypeCode::TRAVERSE_STOP;
-
-      // Pad the value pointers to account for the alignment
-      // requirements of this member, then visit.
-
-      value1 = ptr_align_binary ((const u_char *) value1, alignment);
-      value2 = ptr_align_binary ((const u_char *) value2, alignment);
-
-      retval = visit (&member_tc, value1, value2, context, env);
-
-      // Update 'value' pointers to account for the size of the values
-      // just visited.
-      value1 = size + (char *)value1;
-      value2 = size + (char *)value2;
-
-      if (env.exception () != 0)
-	retval = CORBA::TypeCode::TRAVERSE_STOP;
-    }
-
-  return retval;
-}
-
-// cast the discriminant values to the right type and compare them.
-
-static CORBA::Boolean
-match_value (CORBA::TCKind      kind,
-	     CDR *tc_stream,
-	     const void *value,
-	     CORBA::Environment &env)
-{
-  CORBA::Boolean retval = CORBA::B_FALSE;
-
-  switch (kind)
-    {
-    case CORBA::tk_short:
-    case CORBA::tk_ushort:
-      {
-	CORBA::UShort discrim;
-
-	if (tc_stream->get_ushort (discrim) != CORBA::B_FALSE)
-	  retval = (discrim == *(CORBA::UShort *)value);
-	else
-	  env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO));
-      }
-    break;
-
-    case CORBA::tk_long:
-    case CORBA::tk_ulong:
-      {
-	CORBA::ULong discrim;
-
-	if (tc_stream->get_ulong (discrim) != CORBA::B_FALSE)
-	  retval = (discrim == *(CORBA::ULong *)value);
-	else
-	  env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO));
-      }
-    break;
-
-    case CORBA::tk_enum:
-      {
-	CORBA::ULong discrim;
-
-	if (tc_stream->get_ulong (discrim) != CORBA::B_FALSE)
-	  retval = (discrim == *(unsigned *)value);
-	else
-	  env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO));
-      }
-    break;
-
-    case CORBA::tk_boolean:
-      {
-	CORBA::Boolean discrim;
-
-	if (tc_stream->get_boolean (discrim) != CORBA::B_FALSE)
-	  retval = (discrim == *(CORBA::Boolean *)value);
-	else
-	  env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO));
-      }
-    break;
-
-    case CORBA::tk_char:
-      {
-	CORBA::Char discrim;
-
-	if (tc_stream->get_char (discrim) != CORBA::B_FALSE)
-	  retval = (discrim == *(CORBA::Char *)value);
-	else
-	  env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO));
-      }
-    break;
-
-    case CORBA::tk_wchar:
-      {
-	CORBA::WChar discrim;
-
-	if (tc_stream->get_wchar (discrim) != CORBA::B_FALSE)
-	  retval = (discrim == *(CORBA::WChar *)value);
-	else
-	  env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO));
-      }
-    break;
-
-    default:
-      env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO));
-    }
-
-  return retval;
-}
-
-// Visit the two elements of the union: the discrminant, and then any
-// specific value as indicated by the discriminant of value1.
-
-static CORBA::TypeCode::traverse_status
-union_traverse (CDR *stream,
-		const void *value1,
-		const void *value2,
-		CORBA::TypeCode::traverse_status (_FAR *visit)
-		(CORBA::TypeCode_ptr tc,
-		 const void *value1,
-		 const void *value2,
-		 void *context,
-		 CORBA::Environment &env),
-		void *context,
-		CORBA::Environment &env)
-{
-  size_t discrim_size_with_pad;
-
-  // Figure out size of discriminant plus padding, used to adjust
-  // value pointers later.  This can't be calculated without looking
-  // at all branches of the union ... forcing union traversal to be a
-  // two-pass algorithm, unless/until some data gets squirreled away.
-  {
-    CDR temp_cdr;
-    size_t scratch;
-
-    temp_cdr.next = stream->next;
-    temp_cdr.remaining = stream->remaining;
-    temp_cdr.do_byteswap = stream->do_byteswap;
-    temp_cdr.do_free = 0;
-
-    (void) calc_key_union_attributes (&temp_cdr,
-				      scratch,
-				      discrim_size_with_pad,
-				      env);
-  }
-  if (env.exception() != 0)
-    return CORBA::TypeCode::TRAVERSE_STOP;
-
-  // Skip the optional type ID and type name.
-  if (!stream->skip_string ()			// type ID, hidden
-      || !stream->skip_string ())
-    {	// typedef name
-      env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO));
-      return CORBA::TypeCode::TRAVERSE_STOP;
-    }
-
-  // Get and skip the discriminant's TypeCode.  This allow for
-  // indirection (e.g. a complex enum discriminant).  We use that
-  // TypeCode to visit the discriminant.
-  //
-  // We know the kind is legal and the TypeCode is valid because this
-  // repeats work we did earlier -- so checks are omitted.
-
-  CORBA::TypeCode discrim_tc (CORBA::tk_null);
-
-  {
-    size_t scratch;
-
-    (void) calc_nested_size_and_alignment (&discrim_tc,
-					   stream,
-					   scratch,
-					   env);
-  }
-
-  if (visit (&discrim_tc,
-	     value1,
-	     value2,
-	     context,
-	     env) == CORBA::TypeCode::TRAVERSE_STOP)
-    return CORBA::TypeCode::TRAVERSE_STOP;
-
-  // Adjust the pointers to point to the other member of the union;
-  // this ensures alignment for any of the values.  Save the pointer
-  // to the discriminant though; we need it to find out which member
-  // to visit!
-
-  const void *discrim_ptr = value1;
-
-  value1 = discrim_size_with_pad + (char *) value1;
-  value2 = discrim_size_with_pad + (char *) value2;
-
-  // Get the flag that tells if there's a "default" arm in this union,
-  // then the number of members in the union.
-
-  CORBA::Long default_used = 0;
-  CORBA::ULong member_count;
-
-  if (!stream->get_long (default_used))
-    {
-      // default used
-      env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO));
-      return CORBA::TypeCode::TRAVERSE_STOP;
-    }
-
-  if (!stream->get_ulong (member_count))
-    {  // member count
-      env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO));
-      return CORBA::TypeCode::TRAVERSE_STOP;
-    }
-
-  // Scan to find the tuple whose value matches the discriminator.
-  //
-  // While we're scanning, record any default arm's information.  If
-  // we can't find a match for the discriminant value, that arm will
-  // be used later.
-
-  u_char *default_tc_ptr = 0;
-  size_t default_tc_len = 0;
-
-  while (member_count-- != 0)
-    {
-      // Test to see if the discriminant value matches the one in the
-      // TypeCode; this skips the the discriminant value in this CDR
-      // stream.
-
-      CORBA::Boolean discrim_matched;
-
-      discrim_matched = match_value (discrim_tc.kind_,
-				     stream,
-				     discrim_ptr,
-				     env);
-      if (env.exception () != 0)
-	return CORBA::TypeCode::TRAVERSE_STOP;
-
-      // Skip the name of the member; we never care about it.
-
-      if (!stream->skip_string ())
-	{
-	  env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO));
-	  return CORBA::TypeCode::TRAVERSE_STOP;
-	}
-
-      // If this is the default member, remember where its typecode
-      // data is stored; we'll use it later.
-
-      if (default_used >= 0 && default_used-- == 0)
-	{
-	  default_tc_ptr = stream->next;
-	  default_tc_len = stream->remaining;
-	}
-
-      // Get the TypeCode for this member.
-      //
-      // XXX we really don't care about size and alignment this time,
-      // only that we initialize the TypeCode.
-
-      CORBA::TypeCode tc (CORBA::tk_null);
-      size_t scratch;
-
-      (void) calc_nested_size_and_alignment (&tc, stream, scratch, env);
-      if (env.exception () != 0)
-	return CORBA::TypeCode::TRAVERSE_STOP;
-
-      // If we matched, visit the member and return.
-      if (discrim_matched)
-	return visit (&tc, value1, value2, context, env);
-    }
-
-  // If we get here, it means any default arm should be used.  We know
-  // at least the basic sanity checks passed; we don't repeat.
-
-  if (default_tc_ptr)
-    {
-      CDR temp_str;
-      size_t scratch;
-      CORBA::TypeCode tc (CORBA::tk_null);
-
-      temp_str.next = default_tc_ptr;
-      temp_str.remaining = default_tc_len;
-      temp_str.do_byteswap = stream->do_byteswap;
-
-      // Get and use the TypeCode.
-      //
-      // XXX we really don't care about size and alignment this time,
-      // only that we initialize the TypeCode.
-
-      (void) calc_nested_size_and_alignment (&tc, &temp_str, scratch, env);
-      return visit (&tc, value1, value2, context, env);
-    }
-  return CORBA::TypeCode::TRAVERSE_CONTINUE;
-}
-
-// For each node in "data", visit it.  For singleton nodes that's all
-// but a NOP; for structs, unions, etc it's more interesting.  The
-// visit routine can descend, if it chooses.
-//
-// NOTE: this does no memory allocation or deallocation except through
-// use of the stack.  Or at least, it should do none -- if you find
-// that just traversing a data value allocates any memory, that's a
-// bug to fix!
-
-CORBA::TypeCode::traverse_status
-CORBA::TypeCode::traverse (const void *value1,
-			  const void *value2,
-			  CORBA::TypeCode::traverse_status (_FAR *visit)
-			  (CORBA::TypeCode_ptr tc,
-			   const void *value1,
-			   const void *value2,
-			   void *context,
-			   CORBA::Environment &env),
-			  void *context,
-			  CORBA::Environment &env)
-{
-  env.clear ();
-
-  // Quickly accomodate the bulk of cases, which are just (tail) calls
-  // to the visit() routine.  We take advantage of the fact that these
-  // are largely in a convenient numeric range to work around poor
-  // optimization of "switch" code in some compilers.  This
-  // improvement has in some cases been more than 5% faster
-  // (significant).
-  //
-  // NOTE: if for some reason the constants in the protocol spec
-  // (including Appendix A) change, this logic may need to be verified
-  // again.  Luckily, changing protocol constants is quite rare; they
-  // normally just get added to (at the end).
-  //
-  if (kind_ <= CORBA::tk_objref
-      || (CORBA::tk_longlong <= kind_ && kind_ <= CORBA::tk_wstring))
-    return visit (this, value1, value2, context, env);
-
-  // Handle the cases that aren't in convenient numeric ranges.
-
-  traverse_status retval;
-
-  switch (kind_)
-    {
-    case CORBA::tk_string:
-    case CORBA::tk_enum:
-      return visit (this, value1, value2, context, env);
-
-      // Typedefs just add a delay, while we skip the typedef ID
-      // and name ...
-
-    case CORBA::tk_alias:
-      {
-	CORBA::TypeCode_ptr tcp;
-	CORBA::Environment env2;
-
-	// XXX rework for efficiency, this doesn't need to allocate
-	// memory during the traversal!
-
-	tcp = typecode_param (2, env);
-	if (env.exception () != 0)
-	  return TRAVERSE_STOP;
-
-	retval = tcp->traverse (value1, value2, visit, context, env);
-
-	tcp->Release ();
-      }
-    return retval;
-
-    // Exceptions in-memory are structures, except that there are data
-    // members "hidden" in front: vtable, typecode, refcount.  We skip
-    // them, and allow the traversal code to account for the internal
-    // padding before the other elements of the exception.
-    //
-    // NOTE: see header comment re treatment of these values as "real"
-    // C++ exceptions.  C++ RTTI data might need to be skipped.  Also,
-    // see the comments in unmarshaling code: hard to throw these
-    // values.
-    //
-    // Not enough of the exception runtime is public for binary
-    // standards to exist for C++ exceptions yet.  Compiler-specific
-    // code will need to handle examining, unmarshaling, and throwing
-    // of CORBA exceptions (in C++ environments) for some time.
-    case CORBA::tk_except:
-      value1 = sizeof (CORBA::Exception) + (char *) value1;
-      value2 = sizeof (CORBA::Exception) + (char *) value2;
-      // FALLTHROUGH
-
-    case CORBA::tk_struct:
-      // XXX for OLE Automation, we'll probably need BOTH exceptions
-      // and structs to inherit IUnknown, hence we'll need to be
-      // skipping the vtable pointer ...
-      {
-	// Create the sub-encapsulation stream that holds the
-	// parameters for the typecode.
-
-	CDR stream;
-
-	stream.setup_encapsulation (buffer_, (size_t) length_);
-
-	return struct_traverse (&stream, value1, value2,
-				visit, context, env);
-      }
-
-    case CORBA::tk_union:
-      {
-	// visit the discriminant, then search the typecode for the
-	// relevant union member and then visit that member.
-	CDR stream;
-
-	stream.setup_encapsulation (buffer_, (size_t) length_);
-
-	return union_traverse (&stream, value1, value2,
-			       visit, context, env);
-      }
-
-      // Sequences are just arrays with bound determined at runtime,
-      // rather than compile time.  Multidimensional arrays are nested
-      // C-style: the leftmost dimension in the IDL definition is
-      // "outermost", etc.
-      {
-	CORBA::TypeCode_ptr tc2;
-	size_t size;
-	CORBA::ULong bounds;
-	CORBA::OctetSeq *seq;
-
-      case CORBA::tk_sequence:
-	// Find out how many elements there are, and adjust the data
-	// pointers to point to those elements rather than to the
-	// sequence itself.
-	seq = (CORBA::OctetSeq *)value1;
-
-	bounds = seq->length;
-	value1 = seq->buffer;
-
-	if (value2)
-	  {
-	    seq = (CORBA::OctetSeq *)value2;
-	    value2 = seq->buffer;
-	  }
-	goto shared_seq_array_code;
-
-      case CORBA::tk_array:
-	// Array bounds are in the typecode itself.
-	bounds = ulong_param (1, env);
-	if (env.exception () != 0)
-	  return TRAVERSE_STOP;
-
-      shared_seq_array_code:
-	// Find element's type, and size ...
-	tc2 = typecode_param (0, env);
-	if (env.exception () != 0)
-	  return TRAVERSE_STOP;
-
-	size = tc2->size (env);
-	if (env.exception () != 0)
-	  return TRAVERSE_STOP;
-
-	// ... then visit the elements in order.
-	//
-	// NOTE: for last element, could turn visit() call into
-	// something subject to compiler's tail call optimization and
-	// thus save a stack frame
-	while (bounds--)
-	  {
-	    if (visit (tc2, value1, value2, context, env) == TRAVERSE_STOP)
-	      return TRAVERSE_STOP;
-
-	    value1 = size + (char *) value1;
-	    value2 = size + (char *) value2;
-	  }
-	CORBA::release (tc2);
-	env.clear ();
-      }
-      return TRAVERSE_CONTINUE;
-
-      // case ~0:			// indirection, illegal at top level
-    default:				// invalid/illegal
-      break;
-    } // end switch on typecode "kind"
-
-  env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO));
-  return TRAVERSE_STOP;
-}
-
-// Tell user the size of an instance of the data type described by
-// this typecode ... typically used to allocate memory.
-
-size_t
-CORBA::TypeCode::private_size (CORBA::Environment &env)
-{
-  if (kind_ >= TC_KIND_COUNT)
-    {
-      env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO));
-      return 0;
-    }
-  env.clear ();
-
-  if (table [kind_].calc == 0)
-    {
-      private_state_->tc_size_known_ = CORBA::B_TRUE;
-      private_state_->tc_size_ = table [kind_].size;
-      return private_state_->tc_size_;
-    }
-
-  size_t alignment;
-  CDR stream;
-
-  stream.setup_encapsulation (buffer_, (size_t) length_);
-
-  private_state_->tc_size_known_ = CORBA::B_TRUE;
-  private_state_->tc_size_ = table [kind_].calc (&stream, alignment, env);
-  return private_state_->tc_size_;
-}
-
-// Tell user the alignment restriction for the data type described by
-// an instance of this data type.  Rarely used; provided for
-// completeness.
-
-size_t
-CORBA::TypeCode::private_alignment (CORBA::Environment &env)
-{
-  if (kind_ >= TC_KIND_COUNT)
-    {
-      env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO));
-      return 0;
-    }
-  env.clear ();
-
-  if (table [kind_].calc == 0)
-    {
-        private_state_->tc_alignment_known_ = CORBA::B_TRUE;
-        private_state_->tc_alignment_ = table [kind_].alignment;
-	return private_state_->tc_alignment_;
-    }
-
-  size_t alignment;
-  CDR stream;
-
-  stream.setup_encapsulation (buffer_, (size_t) length_);
-
-  (void) table [kind_].calc (&stream, alignment, env);
-  private_state_->tc_alignment_known_ = CORBA::B_TRUE;
-  private_state_->tc_alignment_ = alignment;
-  return alignment;
-}
diff --git a/TAO/tao/invoke.cpp b/TAO/tao/invoke.cpp
deleted file mode 100644
index 5ab247b2b53..00000000000
--- a/TAO/tao/invoke.cpp
+++ /dev/null
@@ -1,376 +0,0 @@
-// @(#)invoke.cpp	1.3 95/09/24
-// Copyright 1994-1995 by Sun Microsystems Inc.
-// All Rights Reserved
-//
-// IIOP		stub support for static and dynamic invocation
-//
-// This file holds DII support, and an analagous interpreter that let
-// static stubs be very small.  It's specific to objrefs with
-// IIOP::Profile.
-//
-// NOTE: this may someday be moved within an IIOP class so that the
-// public stub interface is completely independent of ORB/protocol
-// internals.
-//
-// THREADING NOTE: Code below this point is of course thread-safe (at
-// least on supported threaded platforms), so the caller of these
-// routines need only ensure that the data being passed in is not
-// being modified by any other thread.
-//
-// As an _experiment_ (to estimate the performance cost) remote calls
-// are currently deemed "cancel-safe".  That means that they can be
-// called by threads when they're in asynchronous cancellation mode.
-// The only effective way to do this is to disable async cancellation
-// for the duration of the call.  There are numerous rude interactions
-// with code generators for C++ ... cancellation handlers just do
-// normal stack unwinding like exceptions, but exceptions are purely
-// synchronous and sophisticated code generators rely on that to
-// generate better code, which in some cases may be very hard to
-// unwind.
-
-#include "tao/corba.h"
-
-class ACE_Synchronous_Cancellation_Required
-  // = TITLE
-  //     ACE_Synchronous_Cancellation_Required
-  //     
-  // = DESCRIPTION
-  //     Stick one of these at the beginning of a block that can't
-  //     support asynchronous cancellation, and which must be
-  //     cancel-safe.
-  // 
-  // = EXAMPLE
-  //     somefunc()
-  //     {
-  //       ACE_Synchronous_Cancellation_Required NOT_USED;
-  //       ...
-  //     }
-{
-public:
-  // These should probably be in a separate inline file, but they're
-  // only used within this one file right now, and we always want them
-  // inlined, so here they sit.
-  ACE_Synchronous_Cancellation_Required (void)
-    {
-      ACE_OS::thr_setcanceltype (THR_CANCEL_DEFERRED, &old_type_);
-    }
-
-  ~ACE_Synchronous_Cancellation_Required (void)
-    {
-      int dont_care;
-      ACE_OS::thr_setcanceltype(old_type_, &dont_care);
-    }
-private:
-  int old_type_;
-};
-
-// "stub interpreter" for static stubs.  IDL compiler (or human
-// equivalent thereof :-) should just dump a read-only description of
-// the call into "calldata" and do varargs calls to this routine,
-// which does all the work.
-//
-// NOTE: This routine includes stub interpreter code, upon which a
-// patent application is pending.
-
-void 
-IIOP_Object::do_call (CORBA::Environment &env,	// exception reporting
-                      const TAO_Call_Data *info,	// call description
-                      ...)                       // ... any parameters
-
-{
-  ACE_Synchronous_Cancellation_Required NOT_USED;
-
-  TAO_GIOP_Invocation call (this,
-                            info->opname,
-                            info->is_roundtrip);
-
-  // We may need to loop through here more than once if we're
-  // forwarded to some other object reference.
-  //
-  // NOTE: A quality-of-service policy may be useful to establish
-  // here, specifically one controlling how many times the call is
-  // reissued before failing the call on the assumption that something
-  // is broken.
-  //
-  // NOTE: something missing is a dynamic way to change the policy of
-  // whether to issue LocateRequest messages or not.  This code uses a
-  // simple, fixed policy: never use LocateRequest messages.
-  //
-  for (;;)
-    {
-      // Start the call by constructing the request message header.
-
-      env.clear ();
-      call.start (env);
-
-      if (env.exception ())
-        {
-          dexc (env, "do_call, start request message");
-          return;
-        }
-
-      // Now, put all "in" and "inout" parameters into the request
-      // message body.
-      //
-      // Some "inout" data have an extra level of indirection,
-      // specified by the language mapping's memory allocation
-      // policies ... the indirection only shows up here when it's
-      // needed later for allocating "out" memory, otherwise there's
-      // just one indirection.
-
-      u_int i;
-      const TAO_Param_Data *pdp;
-      va_list param_vector;
-
-      va_start (param_vector, info);
-
-      for (i = 0, pdp = info->params;
-           i < info->param_count;
-           i++, pdp++)
-        {
-          void *ptr = va_arg (param_vector, void *);
-
-          if (pdp->mode == PARAM_IN)
-            call.put_param (pdp->tc, ptr, env);
-          else if (pdp->mode == PARAM_INOUT)
-            {
-              if (pdp->value_size == 0)
-                call.put_param (pdp->tc, ptr, env);
-              else
-                call.put_param (pdp->tc, *(void **)ptr, env);
-            }
-
-          if (env.exception ())
-            {
-              dexc (env, "do_call, put request parameter");
-              return;
-            }
-        }
-      va_end (param_vector);
-
-      // Make the call ... blocking for response if needed.  Note that
-      // "oneway" calls can't return any exceptions except system
-      // ones.
-
-      TAO_GIOP_ReplyStatusType status;
-      CORBA::ExceptionList exceptions;
-
-      exceptions.length = exceptions.maximum = info->except_count;
-      exceptions.buffer = (CORBA::TypeCode_ptr *) info->excepts;
-
-      status = call.invoke (exceptions, env);
-
-      exceptions.buffer = 0;		// don't free it
-
-      if (env.exception ())
-        {
-          dexc (env, "do_call, invoke");
-          return;
-        }
-      if (!info->is_roundtrip
-          || status == TAO_GIOP_SYSTEM_EXCEPTION
-          || status == TAO_GIOP_USER_EXCEPTION)
-        return;
-
-      // Now, get all the "return", "out", and "inout" parameters from
-      // the response message body.
-
-      if (status == TAO_GIOP_NO_EXCEPTION)
-        {
-          va_start (param_vector, info);
-          for (i = 0, pdp = info->params;
-               i < info->param_count;
-               i++, pdp++)
-            {
-              void *ptr = va_arg (param_vector, void *);
-
-              if (pdp->mode == PARAM_RETURN
-                  || pdp->mode == PARAM_OUT
-                  || pdp->mode == PARAM_INOUT)
-                {
-                  // The language mapping's memory allocation policy
-                  // says that some data is heap-allocated.  This
-                  // interpreter is told about the relevant policy by
-                  // whoever built the operation description (e.g. the
-                  // IDL compiler) so it doesn't have to know the
-                  // policy associated with a particular language
-                  // binding (e.g. C/C++ differ, and C++ even has
-                  // different policies for different kinds of
-                  // structures).
-                  if (pdp->value_size == 0)
-		    call.get_value (pdp->tc, ptr, env);
-                  else
-                    {
-                      // assert (value_size == tc->size());
-                      *(void **)ptr = new CORBA::Octet [pdp->value_size];
-                      call.get_value (pdp->tc, *(void **)ptr, env);
-                    }
-
-                  if (env.exception ())
-                    {
-                      dexc (env, "do_call, get reply parameter");
-                      return;
-                    }
-                }
-            }
-          va_end (param_vector);
-          return;
-        }
-
-      // ... or maybe this request got forwarded to someplace else; send
-      // the request there instead.
-      assert (status == TAO_GIOP_LOCATION_FORWARD);
-    }
-}
-
-// DII analogue of the above.  Differs in how the vararg calling
-// convention is implemented -- DII doesn't use the normal call stack
-// with its implicit typing, but iinstead uses heap-based arguments
-// with explicit typing.
-
-void
-IIOP_Object::do_dynamic_call (const char *opname,       	// operation name
-                              CORBA::Boolean is_roundtrip,	// results required?
-                              CORBA::NVList_ptr args,		// parameters
-                              CORBA::NamedValue_ptr result,	// result
-                              CORBA::Flags flags,		// per-call flag (one!)
-                              CORBA::ExceptionList &exceptions,	// possible user exceptions
-                              CORBA::Environment &env)		// exception reporting
-{
-  ACE_Synchronous_Cancellation_Required NOT_USED;
-
-  TAO_GIOP_Invocation call (this, opname, is_roundtrip);
-
-  // Loop as needed for forwarding; see above.
-
-  for (;;)
-    {
-      // Start the call by constructing the request message header.
-      env.clear ();
-      call.start (env);
-
-      if (env.exception ())
-        {
-          dexc (env, "do_call, start request message");
-          return;
-        }
-
-      // Now, put all "in" and "inout" parameters into the request
-      // message body.
-
-      u_int i;
-
-      for (i = 0; i < args->count (); i++)
-        {
-          CORBA::NamedValue_ptr value = args->item (i);
-
-          if (value->flags () == CORBA::ARG_IN
-              || value->flags () == CORBA::ARG_INOUT)
-            {
-              call.put_param (value->value ()->type (),
-                              (void *) value->value ()->value (), env);
-              if (env.exception ())
-                {
-                  dexc (env, "do_dynamic_call, put request parameter");
-                  return;
-                }
-            }
-        }
-
-      // Make the call ... blocking for response if needed.  Note that
-      // "oneway" calls can't return any exceptions except system ones.
-
-      TAO_GIOP_ReplyStatusType status;
-
-      status = call.invoke (exceptions, env);
-      if (env.exception ())
-        {
-          dexc (env, "do_dynamic_call, invoke");
-          return;
-        }
-      if (!is_roundtrip
-          || status == TAO_GIOP_SYSTEM_EXCEPTION
-          || status == TAO_GIOP_USER_EXCEPTION)
-        return;
-
-      // Now, get all the "return", "out", and "inout" parameters from the
-      // response message body ... return parameter is first, the rest are
-      // in the order defined in the IDL spec (which is also the order that
-      // DII users are required to use).
-
-      if (status == TAO_GIOP_NO_EXCEPTION)
-        {
-          if (result != 0)
-            {
-              // If caller didn't set OUT_LIST_MEMORY flag, allocate
-              // memory for return value ...
-
-              if (!(flags & CORBA::OUT_LIST_MEMORY))
-                {
-                  CORBA::TypeCode_ptr tcp;
-                  size_t size;
-
-                  tcp = result->value ()->type ();
-                  size = tcp->size (env);
-                  dexc (env, "do_dynamic_call, get result size");
-
-                  if (size != 0)
-                    {
-                      void *ptr = new CORBA::Octet [size];
-
-                      tcp->AddRef ();
-                      result->value ()->replace (tcp, ptr,
-                                                 CORBA::B_TRUE, env);
-                      dexc (env, "do_dynamic_call, set result mem");
-                    }
-                }
-
-              call.get_value (result->value ()->type (),
-                              (void *) result->value ()->value (), env);
-            }
-
-          for (i = 0; i < args->count (); i++)
-            {
-              CORBA::NamedValue_ptr	value = args->item (i);
-
-              if (value->flags () == CORBA::ARG_OUT
-                  || value->flags () == CORBA::ARG_INOUT)
-                {
-                  // If caller didn't set OUT_LIST_MEMORY flag, allocate
-                  // memory for this parameter ...
-                  if (!(flags & CORBA::OUT_LIST_MEMORY))
-                    {
-                      CORBA::TypeCode_ptr tcp;
-                      size_t size;
-
-                      tcp = value->value ()->type ();
-                      size = tcp->size (env);
-                      dexc (env, "do_dynamic_call, get param size");
-
-                      if (size != 0)
-                        {
-                          void *ptr = new CORBA::Octet [size];
-
-                          tcp->AddRef ();
-                          value->value ()->replace (tcp, ptr,
-                                                    CORBA::B_TRUE, env);
-                          dexc (env, "do_dynamic_call, set result mem");
-                        }
-                    }
-
-                  call.get_value (value->value ()->type (),
-                                  (void *) value->value ()->value (), env);
-                  if (env.exception ())
-                    {
-                      dexc (env, "do_dynamic_call, get response parameter");
-                      return;
-                    }
-                }
-            }
-          return;
-        }
-
-      // ... or maybe this request got forwarded to someplace else.
-      assert (status == TAO_GIOP_LOCATION_FORWARD);
-    }
-}
diff --git a/TAO/tao/managed_types.cpp b/TAO/tao/managed_types.cpp
deleted file mode 100644
index 0f33927253b..00000000000
--- a/TAO/tao/managed_types.cpp
+++ /dev/null
@@ -1,50 +0,0 @@
-// ============================================================================
-//
-// = LIBRARY
-//    TAO
-//
-// = FILENAME
-//    managed_types.cpp
-//
-// = DESCRIPTION
-//    C++ mapping of sequences of strings/objrefs or struct/union members with
-//    strings/objrefs require a special managed type. These types are define
-//    din this header file.
-
-// = AUTHOR
-//    Aniruddha Gokhale
-//
-// ============================================================================
-
-#include "tao/corba.h"
-
-TAO_String_ManagedType &
-TAO_String_ManagedType::operator= (char *p)
-{
-  if (this->ptr_ != p)
-    {
-      if ((this->ptr_ != 0) && this->release_)
-        CORBA::string_free (this->ptr_);
-      this->ptr_ = p;
-    }
-  return *this;
-}
-
-TAO_String_ManagedType &
-TAO_String_ManagedType::operator= (const char *p)
-{
-  if ((this->ptr_ != 0) && this->release_)
-    CORBA::string_free (this->ptr_);
-
-  this->ptr_ = CORBA::string_dup (p);
-  return *this;
-}
-
-TAO_String_ManagedType &
-TAO_String_ManagedType::operator= (const TAO_String_ManagedType& r)
-{
-  if ((this->ptr_ != 0) && this->release_)
-    CORBA::string_free (this->ptr_);
-  this->ptr_ = CORBA::string_dup (r.ptr_);
-  return *this;
-}
diff --git a/TAO/tao/managed_types.h b/TAO/tao/managed_types.h
deleted file mode 100644
index 6c4ea8f4021..00000000000
--- a/TAO/tao/managed_types.h
+++ /dev/null
@@ -1,162 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-//
-// ============================================================================
-//
-// = LIBRARY
-//    TAO
-//
-// = FILENAME
-//    managed_types.h
-//
-// = DESCRIPTION
-//    C++ mapping of sequences of strings/objrefs or struct/union members with
-//    strings/objrefs require a special managed type. These types are define
-//    din this header file.
-
-// = AUTHOR
-//    Aniruddha Gokhale
-//
-// ============================================================================
-
-#if !defined(TAO_MANAGED_TYPES_H)
-#define TAO_MANAGED_TYPES_H
-
-class ACE_Svc_Export TAO_String_ManagedType
-{
-  // = TITLE
-  //   TAO_String_ManagedType
-  // = DESCRIPTION
-  //   String var class. Provides automatic deallocation of storage
-  //   for the string once it goes out of scope.
-
-public:
-  TAO_String_ManagedType (void);
-  // default constructor
-
-  TAO_String_ManagedType (char *p, CORBA::Boolean release=1);
-  // constructor, owns p
-
-  TAO_String_ManagedType (const char *p, CORBA::Boolean release=1);
-  // constructor. Makes a copy of p
-
-  TAO_String_ManagedType (const TAO_String_ManagedType &s, CORBA::Boolean release=1);
-  // copy constructor
-
-  ~TAO_String_ManagedType (void);
-  // destructor
-
-  TAO_String_ManagedType &operator= (char *p);
-  // assignment operator
-
-  TAO_String_ManagedType &operator= (const char *p);
-  // assignment to a const char*. Makes a copy.
-
-  TAO_String_ManagedType &operator= (const TAO_String_ManagedType &s);
-  // assignment operator
-
-  operator char *();
-  // access and modify
-
-  operator const char *() const;
-  // only read privileges
-
-  char &operator[] (CORBA::ULong index);
-  // allows access and modification using an index
-
-  char operator[] (CORBA::ULong index) const;
-  // allows only accessing thru an index
-
-  // = in, out, out, and _retn operations.
-  // ORBOS/97-05-15, Appendix C.2
-
-  const char *in (void) const;
-  // for in parameter
-
-  char *&inout (void);
-  // for inout parameter
-
-  char *&out (void);
-  // for out parameter
-
-  char *_retn (void);
-  // for string of return type
-
- private:
-  char *ptr_;
-  // instance.
-
-  CORBA::Boolean release_;
-  // do we own it
-};
-
-#if 0
-// TODO: @@@ XXXASG
-template <T_ptr>
-class ACE_Svc_Export TAO_ObjRef_ManagedType
-{
-  // = TITLE
-  //   String var class. Provides automatic deallocation of storage
-  //   for the string once it goes out of scope.
-
-public:
-  TAO_ObjRef_ManagedType (void);
-  // default constructor
-
-  TAO_ObjRef_ManagedType (T_ptr p, CORBA::Boolean release=1);
-  // constructor, owns p
-
-  TAO_ObjRef_ManagedType (const T_ptr p, CORBA::Boolean release=1);
-  // constructor. Makes a copy of p
-
-  TAO_ObjRef_ManagedType (const TAO_ObjRef_ManagedType &s, CORBA::Boolean release=1);
-  // copy constructor
-
-  ~TAO_ObjRef_ManagedType (void);
-  // destructor
-
-  TAO_ObjRef_ManagedType &operator= (T_ptr p);
-  // assignment operator
-
-  TAO_ObjRef_ManagedType &operator= (const T_ptr p);
-  // assignment to a const char*. Makes a copy.
-
-  TAO_ObjRef_ManagedType &operator= (const TAO_ObjRef_ManagedType &s);
-  // assignment operator
-
-  operator T_ptr ();
-  // access and modify
-
-  operator const T_ptr () const;
-  // only read privileges
-
-  char &operator[] (ULong index);
-  // allows access and modification using an index
-
-  char operator[] (ULong index) const;
-  // allows only accessing thru an index
-
-  // = in, out, out, and _retn operations.
-  // ORBOS/97-05-15, Appendix C.2
-
-  const T_ptr in (void) const;
-  // for in parameter
-
-  T_ptr &inout (void);
-  // for inout parameter
-
-  T_ptr &out (void);
-  // for out parameter
-
-  T_ptr _retn (void);
-  // for string of return type
-
- private:
-  CORBA::Boolean release_;
-  // do we own it?
-
-  T_ptr ptr_;
-  // instance.
-};
-#endif /* if 0 */
-
-#endif /* if !defined */
diff --git a/TAO/tao/managed_types.i b/TAO/tao/managed_types.i
deleted file mode 100644
index 18875ac5558..00000000000
--- a/TAO/tao/managed_types.i
+++ /dev/null
@@ -1,124 +0,0 @@
-// ============================================================================
-//
-// = LIBRARY
-//    TAO
-//
-// = FILENAME
-//    managed_types.i
-//
-// = DESCRIPTION
-//    C++ mapping of sequences of strings/objrefs or struct/union members with
-//    strings/objrefs require a special managed type. These types are define
-//    din this header file.
-
-// = AUTHOR
-//    Aniruddha Gokhale
-//
-// ============================================================================
-
-// ----------------------------------------------------------------------
-// TAO_String_ManagedType type
-// ----------------------------------------------------------------------
-
-// default constructor
-ACE_INLINE
-TAO_String_ManagedType::TAO_String_ManagedType (void)
-  : ptr_ (0),
-    release_ (1)
-{
-}
-
-// destructor
-ACE_INLINE
-TAO_String_ManagedType::~TAO_String_ManagedType (void)
-{
-  if ((this->ptr_ != 0) && this->release_)
-    CORBA::string_free (this->ptr_);
-}
-
-// construct from char *
-ACE_INLINE
-TAO_String_ManagedType::TAO_String_ManagedType (char *p, CORBA::Boolean release)
-  : ptr_ (p),
-    release_ (release)
-{
-}
-
-// construct from const char*. Will make a copy. So if release is false, memory
-// will leak
-ACE_INLINE
-TAO_String_ManagedType::TAO_String_ManagedType (const char *p, CORBA::Boolean release)
-  : ptr_ (CORBA::string_dup ((char *) p)),
-    release_ (release)
-{
-}
-
-// copy constructor
-ACE_INLINE
-TAO_String_ManagedType::TAO_String_ManagedType (const TAO_String_ManagedType &r,
-                                                CORBA::Boolean release)
-{
-  this->ptr_ = CORBA::string_dup (r.ptr_);
-  this->release_ = release;
-}
-
-// accesor - read/write
-ACE_INLINE CORBA::Char &
-TAO_String_ManagedType::operator[] (CORBA::ULong index)
-{
-  // we need to verify bounds else raise some exception
-  return this->ptr_[index];
-}
-
-// read only
-ACE_INLINE CORBA::Char
-TAO_String_ManagedType::operator[] (CORBA::ULong index) const
-{
-  // we need to verify bounds else raise some exception
-  return this->ptr_[index];
-}
-
-// cast operator (read/write)
-ACE_INLINE
-TAO_String_ManagedType::operator char *()
-{
-  return this->ptr_;
-}
-
-// cast operator (read only)
-ACE_INLINE
-TAO_String_ManagedType::operator const char *() const
-{
-  return this->ptr_;
-}
-
-// the in, inout, out and _ retn methods for parameter passing
-
-ACE_INLINE const char *
-TAO_String_ManagedType::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE char *&
-TAO_String_ManagedType::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE char *&
-TAO_String_ManagedType::out (void)
-{
-  if (this->release_)
-    CORBA::string_free (this->ptr_);
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE char *
-TAO_String_ManagedType::_retn (void)
-{
-  char *temp = this->ptr_;
-  this->ptr_ = 0;
-  return temp;
-}
diff --git a/TAO/tao/marshal.cpp b/TAO/tao/marshal.cpp
deleted file mode 100644
index adb7601a0e6..00000000000
--- a/TAO/tao/marshal.cpp
+++ /dev/null
@@ -1,182 +0,0 @@
-// ============================================================================
-//
-// = LIBRARY
-//    TAO
-// 
-// = FILENAME
-//    marshal.cpp
-//
-// = DESCRIPTION
-//   Implements the Marshal_Object class and the factory
-//
-//   The original encoder and decoder code now appears in files encode.cpp and
-//   decode.cpp
-//
-// = AUTHOR
-//     Copyright 1994-1995 by Sun Microsystems Inc.
-//     and 
-//     Aniruddha Gokhale
-// 
-// ============================================================================
-
-#include "tao/corba.h"
-
-TAO_Marshal_Factory* TAO_Marshal::DEFAULT_MARSHAL_FACTORY = 0;
-
-void
-TAO_Marshal::initialize (void)
-{
-  DEFAULT_MARSHAL_FACTORY = TAO_MARSHAL_FACTORY::instance();
-}
-
-// cosntructor for the factory
-TAO_Marshal_Factory::TAO_Marshal_Factory (void)
-#if 0
-  : m_primitive_ (TAO_MARSHAL_PRIMITIVE::instance ()),
-    m_any_ (TAO_MARSHAL_ANY::instance ()),
-    m_typecode_ (TAO_MARSHAL_TYPECODE::instance ()),
-    m_principal_ (TAO_MARSHAL_PRINCIPAL::instance ()),
-    m_objref_ (TAO_MARSHAL_OBJREF::instance ()),
-    m_struct_ (TAO_MARSHAL_STRUCT::instance ()),
-    m_union_ (TAO_MARSHAL_UNION::instance ()),
-    m_string_ (TAO_MARSHAL_STRING::instance ()),
-    m_sequence_ (TAO_MARSHAL_SEQUENCE::instance ()),
-    m_array_ (TAO_MARSHAL_ARRAY::instance ()),
-    m_alias_ (TAO_MARSHAL_ALIAS::instance ()),
-    m_except_ (TAO_MARSHAL_EXCEPT::instance ()),
-    m_wstring_ (TAO_MARSHAL_WSTRING::instance ())
-#endif /* 0 */
-{
-  // initialize the mobj table
-  mobj_table_[CORBA::tk_null].obj_ = TAO_MARSHAL_PRIMITIVE::instance ();
-  mobj_table_[CORBA::tk_void].obj_ = TAO_MARSHAL_PRIMITIVE::instance ();
-  mobj_table_[CORBA::tk_short].obj_ = TAO_MARSHAL_PRIMITIVE::instance ();
-  mobj_table_[CORBA::tk_long].obj_ = TAO_MARSHAL_PRIMITIVE::instance ();
-  mobj_table_[CORBA::tk_ushort].obj_ = TAO_MARSHAL_PRIMITIVE::instance ();
-  mobj_table_[CORBA::tk_ulong].obj_ = TAO_MARSHAL_PRIMITIVE::instance ();
-  mobj_table_[CORBA::tk_float].obj_ = TAO_MARSHAL_PRIMITIVE::instance ();
-  mobj_table_[CORBA::tk_double].obj_ = TAO_MARSHAL_PRIMITIVE::instance ();
-  mobj_table_[CORBA::tk_boolean].obj_ = TAO_MARSHAL_PRIMITIVE::instance ();
-  mobj_table_[CORBA::tk_char].obj_ = TAO_MARSHAL_PRIMITIVE::instance ();
-  mobj_table_[CORBA::tk_octet].obj_ = TAO_MARSHAL_PRIMITIVE::instance ();
-  mobj_table_[CORBA::tk_any].obj_ = TAO_MARSHAL_ANY::instance ();
-  mobj_table_[CORBA::tk_TypeCode].obj_ = TAO_MARSHAL_TYPECODE::instance ();
-  mobj_table_[CORBA::tk_Principal].obj_ = TAO_MARSHAL_PRINCIPAL::instance ();
-  mobj_table_[CORBA::tk_objref].obj_ = TAO_MARSHAL_OBJREF::instance ();
-  mobj_table_[CORBA::tk_struct].obj_ = TAO_MARSHAL_STRUCT::instance ();
-  mobj_table_[CORBA::tk_union].obj_ = TAO_MARSHAL_UNION::instance ();
-  mobj_table_[CORBA::tk_enum].obj_ = TAO_MARSHAL_PRIMITIVE::instance ();
-  mobj_table_[CORBA::tk_string].obj_ = TAO_MARSHAL_STRING::instance ();
-  mobj_table_[CORBA::tk_sequence].obj_ = TAO_MARSHAL_SEQUENCE::instance ();
-  mobj_table_[CORBA::tk_array].obj_ = TAO_MARSHAL_ARRAY::instance ();
-  mobj_table_[CORBA::tk_alias].obj_ = TAO_MARSHAL_ALIAS::instance ();
-  mobj_table_[CORBA::tk_except].obj_ = TAO_MARSHAL_EXCEPT::instance ();
-  mobj_table_[CORBA::tk_longlong].obj_ = TAO_MARSHAL_PRIMITIVE::instance ();
-  mobj_table_[CORBA::tk_ulonglong].obj_ = TAO_MARSHAL_PRIMITIVE::instance ();
-  mobj_table_[CORBA::tk_longdouble].obj_ = TAO_MARSHAL_PRIMITIVE::instance ();
-  mobj_table_[CORBA::tk_wchar].obj_ = TAO_MARSHAL_PRIMITIVE::instance ();
-  mobj_table_[CORBA::tk_wstring].obj_ = TAO_MARSHAL_WSTRING::instance ();
-}
-
-TAO_Marshal_Factory::~TAO_Marshal_Factory (void)
-{
-}
-
-#if 0
-// factory method
-//
-// Based on the kind of the typecode, return the appropriate marshal object
-TAO_Marshal_Object* TAO_Marshal_Factory::make_marshal_object (CORBA::TypeCode_ptr tc,
-							      CORBA::Environment &env)
-{
-  env.clear ();
-  if (tc)
-    {
-      switch (tc->kind_)
-	{
-	case CORBA::tk_null:
-	case CORBA::tk_void:
-	case CORBA::tk_short:
-	case CORBA::tk_ushort:
-	case CORBA::tk_long:
-	case CORBA::tk_ulong:
-	case CORBA::tk_float:
-	case CORBA::tk_enum:
-	case CORBA::tk_double:
-	case CORBA::tk_longlong:
-	case CORBA::tk_ulonglong:
-	case CORBA::tk_boolean:
-	case CORBA::tk_char:
-	case CORBA::tk_octet:
-	case CORBA::tk_longdouble:
-	case CORBA::tk_wchar:
-	  return m_primitive_;
-	case CORBA::tk_any:
-	  return m_any_;
-	case CORBA::tk_TypeCode:
-	  return m_typecode_;
-	case CORBA::tk_Principal:
-	  return m_principal_;
-	case CORBA::tk_objref:
-	  return m_objref_;
-	case CORBA::tk_struct:
-	  return m_struct_;
-	case CORBA::tk_union:
-	  return m_union_;
-	case CORBA::tk_string:
-	  return m_string_;
-	case CORBA::tk_sequence:
-	  return m_sequence_;
-	case CORBA::tk_array:
-	  return m_array_;
-	case CORBA::tk_alias:
-	  return m_alias_;
-	case CORBA::tk_except:
-	  return m_except_;
-	case CORBA::tk_wstring:
-	  return m_wstring_;
-	default:
-	  // anything else is an error
-	  env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO));
-	  return (TAO_Marshal_Object *)0;
-	}
-    }
-  else
-    {
-      env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO));
-      return (TAO_Marshal_Object *)0;
-    }
-}
-#endif /* 0 */
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Singleton<TAO_Marshal_Factory, ACE_SYNCH_RECURSIVE_MUTEX>;
-template class ACE_Singleton<TAO_Marshal_Primitive, ACE_SYNCH_RECURSIVE_MUTEX>;
-template class ACE_Singleton<TAO_Marshal_Any, ACE_SYNCH_RECURSIVE_MUTEX>;
-template class ACE_Singleton<TAO_Marshal_TypeCode, ACE_SYNCH_RECURSIVE_MUTEX>;
-template class ACE_Singleton<TAO_Marshal_Principal, ACE_SYNCH_RECURSIVE_MUTEX>;
-template class ACE_Singleton<TAO_Marshal_ObjRef, ACE_SYNCH_RECURSIVE_MUTEX>;
-template class ACE_Singleton<TAO_Marshal_Struct, ACE_SYNCH_RECURSIVE_MUTEX>;
-template class ACE_Singleton<TAO_Marshal_Union, ACE_SYNCH_RECURSIVE_MUTEX>;
-template class ACE_Singleton<TAO_Marshal_String, ACE_SYNCH_RECURSIVE_MUTEX>;
-template class ACE_Singleton<TAO_Marshal_Sequence, ACE_SYNCH_RECURSIVE_MUTEX>;
-template class ACE_Singleton<TAO_Marshal_Array, ACE_SYNCH_RECURSIVE_MUTEX>;
-template class ACE_Singleton<TAO_Marshal_Alias, ACE_SYNCH_RECURSIVE_MUTEX>;
-template class ACE_Singleton<TAO_Marshal_Except, ACE_SYNCH_RECURSIVE_MUTEX>;
-template class ACE_Singleton<TAO_Marshal_WString, ACE_SYNCH_RECURSIVE_MUTEX>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Singleton<TAO_Marshal_Factory, ACE_SYNCH_RECURSIVE_MUTEX>
-#pragma instantiate ACE_Singleton<TAO_Marshal_Primitive, ACE_SYNCH_RECURSIVE_MUTEX>
-#pragma instantiate ACE_Singleton<TAO_Marshal_Any, ACE_SYNCH_RECURSIVE_MUTEX>
-#pragma instantiate ACE_Singleton<TAO_Marshal_TypeCode, ACE_SYNCH_RECURSIVE_MUTEX>
-#pragma instantiate ACE_Singleton<TAO_Marshal_Principal, ACE_SYNCH_RECURSIVE_MUTEX>
-#pragma instantiate ACE_Singleton<TAO_Marshal_ObjRef, ACE_SYNCH_RECURSIVE_MUTEX>
-#pragma instantiate ACE_Singleton<TAO_Marshal_Struct, ACE_SYNCH_RECURSIVE_MUTEX>
-#pragma instantiate ACE_Singleton<TAO_Marshal_Union, ACE_SYNCH_RECURSIVE_MUTEX>
-#pragma instantiate ACE_Singleton<TAO_Marshal_String, ACE_SYNCH_RECURSIVE_MUTEX>
-#pragma instantiate ACE_Singleton<TAO_Marshal_Sequence, ACE_SYNCH_RECURSIVE_MUTEX>
-#pragma instantiate ACE_Singleton<TAO_Marshal_Array, ACE_SYNCH_RECURSIVE_MUTEX>
-#pragma instantiate ACE_Singleton<TAO_Marshal_Alias, ACE_SYNCH_RECURSIVE_MUTEX>
-#pragma instantiate ACE_Singleton<TAO_Marshal_Except, ACE_SYNCH_RECURSIVE_MUTEX>
-#pragma instantiate ACE_Singleton<TAO_Marshal_WString, ACE_SYNCH_RECURSIVE_MUTEX>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/marshal.h b/TAO/tao/marshal.h
deleted file mode 100644
index 64232facbda..00000000000
--- a/TAO/tao/marshal.h
+++ /dev/null
@@ -1,512 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO
-// 
-// = FILENAME
-//    marshal.h
-//
-// = DESCRIPTION
-//     Classes that marshal various IDL data types.
-//
-// = AUTHOR
-//     Aniruddha S. Gokhale
-// 
-// ============================================================================
-
-#if !defined (TAO_MARSHAL_H)
-#define TAO_MARSHAL_H
-
-CORBA::TypeCode::traverse_status
-DEEP_COPY (CORBA::TypeCode_ptr  param,
-	   const void *source,
-	   const void *dest,
-	   CORBA::Environment &env);
-
-CORBA::TypeCode::traverse_status
-DEEP_FREE (CORBA::TypeCode_ptr  param,
-	   const void *source,
-	   const void *dest,
-	   CORBA::Environment &env);
-
-// = Forward declarations.
-class TAO_Marshal_Object;
-class TAO_Marshal_Primitive;
-class TAO_Marshal_Any;
-class TAO_Marshal_TypeCode;
-class TAO_Marshal_Principal;
-class TAO_Marshal_ObjRef;
-class TAO_Marshal_Struct;
-class TAO_Marshal_Union;
-class TAO_Marshal_String;
-class TAO_Marshal_Sequence;
-class TAO_Marshal_Array;
-class TAO_Marshal_Alias;
-class TAO_Marshal_Except;
-class TAO_Marshal_WString;
-
-class TAO_Export TAO_Marshal_Factory
-{
-  // = TITLE
-  // A Factory for generating specialized marshaling objects
-  //
-  // = DESCRIPTION
-public:
-  TAO_Marshal_Factory (void);
-  // constructor
-
-  virtual ~TAO_Marshal_Factory (void);
-  // destructor
-
-  virtual TAO_Marshal_Object *make_marshal_object (CORBA::TypeCode_ptr tc,
-						  CORBA::Environment &env);
-  // Factory method that returns the appropriate marshal object.
-
-private:
-  struct TAO_Marshal_Object_Entry
-  {
-    TAO_Marshal_Object *obj_;  
-  };
-
-  TAO_Marshal_Object_Entry mobj_table_[CORBA::TC_KIND_COUNT];
-  // A table of specialized marshal objects indexed by the kind_ field
-
-#if 0
-  // define data members that are instances of various Marshal_Object classes
-  TAO_Marshal_Primitive *m_primitive_;
-  TAO_Marshal_Any       *m_any_;
-  TAO_Marshal_TypeCode  *m_typecode_;
-  TAO_Marshal_Principal *m_principal_;
-  TAO_Marshal_ObjRef    *m_objref_;
-  TAO_Marshal_Struct    *m_struct_;
-  TAO_Marshal_Union     *m_union_;
-  TAO_Marshal_String    *m_string_;
-  TAO_Marshal_Sequence  *m_sequence_;
-  TAO_Marshal_Array     *m_array_;
-  TAO_Marshal_Alias     *m_alias_;
-  TAO_Marshal_Except    *m_except_;
-  TAO_Marshal_WString   *m_wstring_;
-#endif /* 0 */
-};
-
-class TAO_Export TAO_Marshal
-// = TITLE
-//    Namespace in which to put otherwise "global" methods like
-//    initialize, etc.
-{
-public:
-  static void initialize (void);
-
-  static TAO_Marshal_Factory* DEFAULT_MARSHAL_FACTORY;
-};
-
-class TAO_Export TAO_Marshal_Object
-{
-  // = TITLE
-  //    The Marshaling object that provides a common interface to the
-  //    CDR object for marshaling different IDL data types
-  //
-  // = DESCRIPTION
-  //    Provides a set of virtual methods for encoding, decoding,
-  //    deep_copying, and deep_freeing.
-public:
-  virtual CORBA::TypeCode::traverse_status encode (CORBA::TypeCode_ptr tc,
-                                                  const void *data,
-                                                  const void *,
-                                                  void *context,
-                                                  CORBA::Environment &env) = 0;
-  // encoding operation
-
-  virtual CORBA::TypeCode::traverse_status decode (CORBA::TypeCode_ptr tc,
-                                                  const void *data,
-                                                  const void *parent_typecode,
-                                                  void *context,
-                                                  CORBA::Environment &env) = 0;
-  // decoding operation
-
-  TAO_Marshal_Object (void);
-  // constructor
-
-  virtual ~TAO_Marshal_Object (void);
-  // destructor
-};
-
-class TAO_Export TAO_Marshal_Primitive: public TAO_Marshal_Object
-{
-  // @@ Andy, please fill in here and add comments to this class.
-  // = TITLE
-  // = DESCRIPTION
-public:
-  TAO_Marshal_Primitive (void);
-
-  virtual ~TAO_Marshal_Primitive (void);
-
-  virtual CORBA::TypeCode::traverse_status encode (CORBA::TypeCode_ptr tc,
-                                                  const void *data,
-                                                  const void *,
-                                                  void *context,
-                                                  CORBA::Environment &env);
-  virtual CORBA::TypeCode::traverse_status decode (CORBA::TypeCode_ptr tc,
-                                                  const void *data,
-                                                  const void *parent_typecode,
-                                                  void *context,
-                                                  CORBA::Environment &env);
-  static CORBA::TypeCode::traverse_status deep_copy (CORBA::TypeCode_ptr tc,
-                                                  const void *source,
-                                                  const void *dest,
-                                                  CORBA::Environment &env);
-  static CORBA::TypeCode::traverse_status deep_free (CORBA::TypeCode_ptr tc,
-                                                  const void *data,
-                                                  const void *,
-                                                  CORBA::Environment &env);
-};
-
-class TAO_Export TAO_Marshal_Any: public TAO_Marshal_Object
-{
-  // = TITLE
-  // = DESCRIPTION
-public:
-  TAO_Marshal_Any (void);
-
-  virtual ~TAO_Marshal_Any (void);
-
-  virtual CORBA::TypeCode::traverse_status encode (CORBA::TypeCode_ptr tc,
-                                                  const void *data,
-                                                  const void *,
-                                                  void *context,
-                                                  CORBA::Environment &env);
-  virtual CORBA::TypeCode::traverse_status decode (CORBA::TypeCode_ptr tc,
-                                                  const void *data,
-                                                  const void *parent_typecode,
-                                                  void *context,
-                                                  CORBA::Environment &env);
-  static CORBA::TypeCode::traverse_status deep_copy (CORBA::TypeCode_ptr tc,
-                                                  const void *source,
-                                                  const void *dest,
-                                                  CORBA::Environment &env);
-  static CORBA::TypeCode::traverse_status deep_free (CORBA::TypeCode_ptr tc,
-                                                  const void *source,
-                                                  const void *,
-                                                  CORBA::Environment &env);
-};
-
-class TAO_Export TAO_Marshal_TypeCode: public TAO_Marshal_Object
-{
-  // = TITLE
-  // = DESCRIPTION
-public:
-  TAO_Marshal_TypeCode (void);
-
-  virtual ~TAO_Marshal_TypeCode (void);
-
-  virtual CORBA::TypeCode::traverse_status encode (CORBA::TypeCode_ptr tc,
-                                                  const void *data,
-                                                  const void *,
-                                                  void *context,
-                                                  CORBA::Environment &env);
-  virtual CORBA::TypeCode::traverse_status decode (CORBA::TypeCode_ptr tc,
-                                                  const void *data,
-                                                  const void *parent_typecode,
-                                                  void *context,
-                                                  CORBA::Environment &env);
-  static CORBA::TypeCode::traverse_status deep_copy (CORBA::TypeCode_ptr tc,
-                                                  const void *source,
-                                                  const void *dest,
-                                                  CORBA::Environment &env);
-  static CORBA::TypeCode::traverse_status deep_free (CORBA::TypeCode_ptr tc,
-                                                  const void *data,
-                                                  const void *,
-                                                  CORBA::Environment &env);
-};
-
-class TAO_Export TAO_Marshal_Principal: public TAO_Marshal_Object
-{
-  // = TITLE
-  // = DESCRIPTION
-public:
-  TAO_Marshal_Principal (void);
-
-  virtual ~TAO_Marshal_Principal (void);
-
-  virtual CORBA::TypeCode::traverse_status encode (CORBA::TypeCode_ptr tc,
-                                                  const void *data,
-                                                  const void *,
-                                                  void *context,
-                                                  CORBA::Environment &env);
-  virtual CORBA::TypeCode::traverse_status decode (CORBA::TypeCode_ptr tc,
-                                                  const void *data,
-                                                  const void *parent_typecode,
-                                                  void *context,
-                                                  CORBA::Environment &env);
-  static CORBA::TypeCode::traverse_status deep_copy (CORBA::TypeCode_ptr tc,
-                                                  const void *source,
-                                                  const void *dest,
-                                                  CORBA::Environment &env);
-  static CORBA::TypeCode::traverse_status deep_free (CORBA::TypeCode_ptr tc,
-                                                  const void *data,
-                                                  const void *,
-                                                  CORBA::Environment &env);
-};
-
-class TAO_Export TAO_Marshal_ObjRef: public TAO_Marshal_Object
-{
-  // = TITLE
-  // = DESCRIPTION
-public:
-  TAO_Marshal_ObjRef (void);
-
-  virtual ~TAO_Marshal_ObjRef (void);
-
-  virtual CORBA::TypeCode::traverse_status encode (CORBA::TypeCode_ptr tc,
-                                                  const void *data,
-                                                  const void *,
-                                                  void *context,
-                                                  CORBA::Environment &env);
-  virtual CORBA::TypeCode::traverse_status decode (CORBA::TypeCode_ptr tc,
-                                                  const void *data,
-                                                  const void *parent_typecode,
-                                                  void *context,
-                                                  CORBA::Environment &env);
-  static CORBA::TypeCode::traverse_status deep_copy (CORBA::TypeCode_ptr tc,
-                                                  const void *source,
-                                                  const void *dest,
-                                                  CORBA::Environment &env);
-  static CORBA::TypeCode::traverse_status deep_free (CORBA::TypeCode_ptr tc,
-                                                  const void *data,
-                                                  const void *,
-                                                  CORBA::Environment &env);
-};
-
-class TAO_Export TAO_Marshal_Struct: public TAO_Marshal_Object
-{
-  // = TITLE
-  // = DESCRIPTION
-public:
-  TAO_Marshal_Struct (void);
-
-  virtual ~TAO_Marshal_Struct (void);
-
-  virtual CORBA::TypeCode::traverse_status encode (CORBA::TypeCode_ptr tc,
-                                                  const void *data,
-                                                  const void *,
-                                                  void *context,
-                                                  CORBA::Environment &env);
-  virtual CORBA::TypeCode::traverse_status decode (CORBA::TypeCode_ptr tc,
-                                                  const void *data,
-                                                  const void *parent_typecode,
-                                                  void *context,
-                                                  CORBA::Environment &env);
-  static CORBA::TypeCode::traverse_status deep_copy (CORBA::TypeCode_ptr tc,
-                                                  const void *source,
-                                                  const void *dest,
-                                                  CORBA::Environment &env);
-  static CORBA::TypeCode::traverse_status deep_free (CORBA::TypeCode_ptr tc,
-                                                  const void *data,
-                                                  const void *,
-                                                  CORBA::Environment &env);
-};
-
-class TAO_Export TAO_Marshal_Union: public TAO_Marshal_Object
-{
-  // = TITLE
-  // = DESCRIPTION
-public:
-  TAO_Marshal_Union (void);
-
-  virtual ~TAO_Marshal_Union (void);
-
-  virtual CORBA::TypeCode::traverse_status encode (CORBA::TypeCode_ptr tc,
-                                                  const void *data,
-                                                  const void *,
-                                                  void *context,
-                                                  CORBA::Environment &env);
-  virtual CORBA::TypeCode::traverse_status decode (CORBA::TypeCode_ptr tc,
-                                                  const void *data,
-                                                  const void *parent_typecode,
-                                                  void *context,
-                                                  CORBA::Environment &env);
-  static CORBA::TypeCode::traverse_status deep_copy (CORBA::TypeCode_ptr tc,
-                                                  const void *source,
-                                                  const void *dest,
-                                                  CORBA::Environment &env);
-  static CORBA::TypeCode::traverse_status deep_free (CORBA::TypeCode_ptr tc,
-                                                  const void *data,
-                                                  const void *,
-                                                  CORBA::Environment &env);
-};
-
-class TAO_Export TAO_Marshal_String: public TAO_Marshal_Object
-{
-  // = TITLE
-  // = DESCRIPTION
-public:
-  TAO_Marshal_String (void);
-
-  virtual ~TAO_Marshal_String (void);
-
-  virtual CORBA::TypeCode::traverse_status encode (CORBA::TypeCode_ptr tc,
-                                                  const void *data,
-                                                  const void *,
-                                                  void *context,
-                                                  CORBA::Environment &env);
-  virtual CORBA::TypeCode::traverse_status decode (CORBA::TypeCode_ptr tc,
-                                                  const void *data,
-                                                  const void *parent_typecode,
-                                                  void *context,
-                                                  CORBA::Environment &env);
-  static CORBA::TypeCode::traverse_status deep_copy (CORBA::TypeCode_ptr tc,
-                                                  const void *source,
-                                                  const void *dest,
-                                                  CORBA::Environment &env);
-  static CORBA::TypeCode::traverse_status deep_free (CORBA::TypeCode_ptr tc,
-                                                  const void *data,
-                                                  const void *,
-                                                  CORBA::Environment &env);
-};
-
-class TAO_Export TAO_Marshal_Sequence: public TAO_Marshal_Object
-{
-  // = TITLE
-  // = DESCRIPTION
-public:
-  TAO_Marshal_Sequence (void);
-
-  virtual ~TAO_Marshal_Sequence (void);
-
-  virtual CORBA::TypeCode::traverse_status encode (CORBA::TypeCode_ptr tc,
-                                                  const void *data,
-                                                  const void *,
-                                                  void *context,
-                                                  CORBA::Environment &env);
-  virtual CORBA::TypeCode::traverse_status decode (CORBA::TypeCode_ptr tc,
-                                                  const void *data,
-                                                  const void *parent_typecode,
-                                                  void *context,
-                                                  CORBA::Environment &env);
-  static CORBA::TypeCode::traverse_status deep_copy (CORBA::TypeCode_ptr tc,
-                                                  const void *source,
-                                                  const void *dest,
-                                                  CORBA::Environment &env);
-  static CORBA::TypeCode::traverse_status deep_free (CORBA::TypeCode_ptr tc,
-                                                  const void *data,
-                                                  const void *,
-                                                  CORBA::Environment &env);
-};
-
-class TAO_Export TAO_Marshal_Array: public TAO_Marshal_Object
-{
-  // = TITLE
-  // = DESCRIPTION
-public:
-  TAO_Marshal_Array (void);
-
-  virtual ~TAO_Marshal_Array (void);
-
-  virtual CORBA::TypeCode::traverse_status encode (CORBA::TypeCode_ptr tc,
-                                                  const void *data,
-                                                  const void *,
-                                                  void *context,
-                                                  CORBA::Environment &env);
-  virtual CORBA::TypeCode::traverse_status decode (CORBA::TypeCode_ptr tc,
-                                                  const void *data,
-                                                  const void *parent_typecode,
-                                                  void *context,
-                                                  CORBA::Environment &env);
-  static CORBA::TypeCode::traverse_status deep_copy (CORBA::TypeCode_ptr tc,
-                                                  const void *source,
-                                                  const void *dest,
-                                                  CORBA::Environment &env);
-  static CORBA::TypeCode::traverse_status deep_free (CORBA::TypeCode_ptr tc,
-                                                  const void *data,
-                                                  const void *,
-                                                  CORBA::Environment &env);
-};
-
-class TAO_Export TAO_Marshal_Alias: public TAO_Marshal_Object
-{
-  // = TITLE
-  // = DESCRIPTION
-public:
-  TAO_Marshal_Alias (void);
-
-  virtual ~TAO_Marshal_Alias (void);
-
-  virtual CORBA::TypeCode::traverse_status encode (CORBA::TypeCode_ptr tc,
-                                                  const void *data,
-                                                  const void *,
-                                                  void *context,
-                                                  CORBA::Environment &env);
-  virtual CORBA::TypeCode::traverse_status decode (CORBA::TypeCode_ptr tc,
-                                                  const void *data,
-                                                  const void *parent_typecode,
-                                                  void *context,
-                                                  CORBA::Environment &env);
-  static CORBA::TypeCode::traverse_status deep_copy (CORBA::TypeCode_ptr tc,
-                                                  const void *source,
-                                                  const void *dest,
-                                                  CORBA::Environment &env);
-  static CORBA::TypeCode::traverse_status deep_free (CORBA::TypeCode_ptr tc,
-                                                  const void *data,
-                                                  const void *,
-                                                  CORBA::Environment &env);
-};
-
-class TAO_Export TAO_Marshal_Except: public TAO_Marshal_Object
-{
-  // = TITLE
-  // = DESCRIPTION
-public:
-  TAO_Marshal_Except (void);
-  ~TAO_Marshal_Except (void);
-
-  virtual CORBA::TypeCode::traverse_status encode (CORBA::TypeCode_ptr tc,
-                                                  const void *data,
-                                                  const void *,
-                                                  void *context,
-                                                  CORBA::Environment &env);
-  virtual CORBA::TypeCode::traverse_status decode (CORBA::TypeCode_ptr tc,
-                                                  const void *data,
-                                                  const void *parent_typecode,
-                                                  void *context,
-                                                  CORBA::Environment &env);
-  static CORBA::TypeCode::traverse_status deep_copy (CORBA::TypeCode_ptr tc,
-                                                  const void *source,
-                                                  const void *dest,
-                                                  CORBA::Environment &env);
-  static CORBA::TypeCode::traverse_status deep_free (CORBA::TypeCode_ptr tc,
-                                                  const void *data,
-                                                  const void *,
-                                                  CORBA::Environment &env);
-};
-
-class TAO_Export TAO_Marshal_WString : public TAO_Marshal_Object
-{
-  // = TITLE
-  // = DESCRIPTION
-public:
-  TAO_Marshal_WString (void);
-  ~TAO_Marshal_WString (void);
-
-  virtual CORBA::TypeCode::traverse_status encode (CORBA::TypeCode_ptr tc,
-                                                  const void *data,
-                                                  const void *,
-                                                  void *context,
-                                                  CORBA::Environment &env);
-  virtual CORBA::TypeCode::traverse_status decode (CORBA::TypeCode_ptr tc,
-                                                  const void *data,
-                                                  const void *parent_typecode,
-                                                  void *context,
-                                                  CORBA::Environment &env);
-  static CORBA::TypeCode::traverse_status deep_copy (CORBA::TypeCode_ptr tc,
-                                                  const void *source,
-                                                  const void *dest,
-                                                  CORBA::Environment &env);
-  static CORBA::TypeCode::traverse_status deep_free (CORBA::TypeCode_ptr tc,
-                                                  const void *data,
-                                                  const void *,
-                                                  CORBA::Environment &env);
-};
-
-#endif /* TAO_MARSHAL_H */
diff --git a/TAO/tao/marshal.i b/TAO/tao/marshal.i
deleted file mode 100644
index 30fcfc8a554..00000000000
--- a/TAO/tao/marshal.i
+++ /dev/null
@@ -1,287 +0,0 @@
-ACE_INLINE 
-TAO_Marshal_Object::TAO_Marshal_Object (void)
-{
-}
-
-ACE_INLINE 
-TAO_Marshal_Object::~TAO_Marshal_Object (void)
-{
-}
-
-ACE_INLINE 
-TAO_Marshal_Primitive::TAO_Marshal_Primitive (void)
-{
-}
-
-ACE_INLINE 
-TAO_Marshal_Primitive::~TAO_Marshal_Primitive (void)
-{
-}
-
-ACE_INLINE 
-TAO_Marshal_Any::TAO_Marshal_Any (void)
-{
-}
-
-ACE_INLINE 
-TAO_Marshal_Any::~TAO_Marshal_Any (void)
-{
-}
-
-ACE_INLINE 
-TAO_Marshal_Principal::TAO_Marshal_Principal (void)
-{
-}
-
-ACE_INLINE 
-TAO_Marshal_Principal::~TAO_Marshal_Principal (void)
-{
-}
-
-ACE_INLINE 
-TAO_Marshal_TypeCode::TAO_Marshal_TypeCode (void)
-{
-}
-
-ACE_INLINE 
-TAO_Marshal_TypeCode::~TAO_Marshal_TypeCode (void)
-{
-}
-
-ACE_INLINE 
-TAO_Marshal_ObjRef::TAO_Marshal_ObjRef (void)
-{
-}
-
-ACE_INLINE 
-TAO_Marshal_ObjRef::~TAO_Marshal_ObjRef (void)
-{
-}
-
-ACE_INLINE 
-TAO_Marshal_Struct::TAO_Marshal_Struct (void)
-{
-}
-
-ACE_INLINE 
-TAO_Marshal_Struct::~TAO_Marshal_Struct (void)
-{
-}
-
-ACE_INLINE 
-TAO_Marshal_Union::TAO_Marshal_Union (void)
-{
-}
-
-ACE_INLINE 
-TAO_Marshal_Union::~TAO_Marshal_Union (void)
-{
-}
-
-ACE_INLINE 
-TAO_Marshal_String::TAO_Marshal_String (void)
-{
-}
-
-ACE_INLINE 
-TAO_Marshal_String::~TAO_Marshal_String (void)
-{
-}
-
-ACE_INLINE 
-TAO_Marshal_Sequence::TAO_Marshal_Sequence (void)
-{
-}
-
-ACE_INLINE 
-TAO_Marshal_Sequence::~TAO_Marshal_Sequence (void)
-{
-}
-
-ACE_INLINE 
-TAO_Marshal_Array::TAO_Marshal_Array (void)
-{
-}
-
-ACE_INLINE 
-TAO_Marshal_Array::~TAO_Marshal_Array (void)
-{
-}
-
-ACE_INLINE 
-TAO_Marshal_Alias::TAO_Marshal_Alias (void)
-{
-}
-
-ACE_INLINE 
-TAO_Marshal_Alias::~TAO_Marshal_Alias (void)
-{
-}
-
-ACE_INLINE 
-TAO_Marshal_Except::TAO_Marshal_Except (void)
-{
-}
-
-ACE_INLINE 
-TAO_Marshal_Except::~TAO_Marshal_Except (void)
-{
-}
-
-ACE_INLINE 
-TAO_Marshal_WString::TAO_Marshal_WString (void)
-{
-}
-
-ACE_INLINE 
-TAO_Marshal_WString::~TAO_Marshal_WString (void)
-{
-}
-
-// Factory method that returns the appropriate marshal object based on
-// the kind of the typecode.
-ACE_INLINE TAO_Marshal_Object * 
-TAO_Marshal_Factory::make_marshal_object (CORBA::TypeCode_ptr tc,
-                                          CORBA::Environment &env)
-{
-  if (tc && tc->kind_ >= 0 && tc->kind_ < CORBA::TC_KIND_COUNT)
-    return this->mobj_table_[tc->kind_].obj_;
-  else
-    {
-      env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO));
-      return 0;
-    }
-}
-
-// the deep_copy methods
-
-// deep_copy for any
-ACE_INLINE CORBA::TypeCode::traverse_status
-TAO_Marshal_Any::deep_copy (CORBA::TypeCode_ptr,
-                            const void *source,
-			    const void *dest,
-			    CORBA::Environment &)
-{
-  (void) new (dest) CORBA::Any (*(CORBA::Any *) source);
-  return CORBA::TypeCode::TRAVERSE_CONTINUE;
-}
-
-// deep_copy for TypeCode
-ACE_INLINE CORBA::TypeCode::traverse_status
-TAO_Marshal_TypeCode::deep_copy (CORBA::TypeCode_ptr,
-				 const void *source,
-				 const void *dest,
-				 CORBA::Environment &)
-{
-  if ((*(CORBA::TypeCode_ptr *) source) != 0) 
-    dest = source;
-  else
-    dest = CORBA::_tc_null;
-
-  ((CORBA::TypeCode_ptr) dest)->AddRef ();
-  return CORBA::TypeCode::TRAVERSE_CONTINUE;
-}
-
-// deep_copy for ObjRef
-ACE_INLINE CORBA::TypeCode::traverse_status
-TAO_Marshal_ObjRef::deep_copy (CORBA::TypeCode_ptr,
-			       const void *source,
-			       const void *dest,
-			       CORBA::Environment &)
-{
-  *(CORBA::Object_ptr *) dest = CORBA::Object::_duplicate (*(CORBA::Object_ptr *)
-                                                           source); 
-  return CORBA::TypeCode::TRAVERSE_CONTINUE;
-}
-
-// deep_copy for string
-ACE_INLINE CORBA::TypeCode::traverse_status
-TAO_Marshal_String::deep_copy (CORBA::TypeCode_ptr,
-			       const void *source,
-			       const void *dest,
-			       CORBA::Environment &)
-{
-  *(CORBA::String *) dest = CORBA::string_copy (*(CORBA::String *) source);
-  return CORBA::TypeCode::TRAVERSE_CONTINUE;
-}
-
-// deep_copy for wstring
-ACE_INLINE CORBA::TypeCode::traverse_status
-TAO_Marshal_WString::deep_copy (CORBA::TypeCode_ptr,
-				const void *source,
-				const void *dest,
-				CORBA::Environment &)
-{
-  *(CORBA::WString *) dest = CORBA::wstring_copy (*(CORBA::WString *) source);
-  return CORBA::TypeCode::TRAVERSE_CONTINUE;
-}
-
-// *************** deep_free methods ******************
-
-// deep_free for Any
-ACE_INLINE CORBA::TypeCode::traverse_status
-TAO_Marshal_Any::deep_free (CORBA::TypeCode_ptr,
-			    const void *source,
-			    const void *,
-			    CORBA::Environment &)
-{
- ((CORBA::Any *) source)->~CORBA_Any ();
-  return CORBA::TypeCode::TRAVERSE_CONTINUE;
-}
-
-// deep_free for TypeCode
-ACE_INLINE CORBA::TypeCode::traverse_status
-TAO_Marshal_TypeCode::deep_free (CORBA::TypeCode_ptr,
-                                 const void *source,
-                                 const void *,
-                                 CORBA::Environment &)
-{
-  if ((*(CORBA::TypeCode_ptr *) source) != 0) 
-    (*(CORBA::TypeCode_ptr *) source)->Release ();
-  return CORBA::TypeCode::TRAVERSE_CONTINUE;
-}
-
-// deep_free for Principal
-ACE_INLINE CORBA::TypeCode::traverse_status
-TAO_Marshal_Principal::deep_free (CORBA::TypeCode_ptr,
-				  const void *value,
-				  const void *,
-				  CORBA::Environment &)
-{
-  CORBA::release (*(CORBA::Principal_ptr *) value);
-  return CORBA::TypeCode::TRAVERSE_CONTINUE;
-}
-
-// deep_free for ObjRef
-ACE_INLINE CORBA::TypeCode::traverse_status
-TAO_Marshal_ObjRef::deep_free (CORBA::TypeCode_ptr,
-			       const void *source,
-			       const void *,
-			       CORBA::Environment &)
-{
-  CORBA::release (*(CORBA::Object_ptr *) source);
-  return CORBA::TypeCode::TRAVERSE_CONTINUE;
-}
-
-// deep_free for string 
-ACE_INLINE CORBA::TypeCode::traverse_status
-TAO_Marshal_String::deep_free (CORBA::TypeCode_ptr,
-			       const void *source,
-			       const void *,
-			       CORBA::Environment &)
-{
-  CORBA::string_free (*(CORBA::String *) source);
-  return CORBA::TypeCode::TRAVERSE_CONTINUE;
-}
-
-// deep_free for wstring 
-ACE_INLINE CORBA::TypeCode::traverse_status
-TAO_Marshal_WString::deep_free (CORBA::TypeCode_ptr,
-				const void *source,
-				const void *,
-				CORBA::Environment &)
-{
-  CORBA::wstring_free (*(CORBA::WString *) source);
-  return CORBA::TypeCode::TRAVERSE_CONTINUE;
-}
-
diff --git a/TAO/tao/nvlist.cpp b/TAO/tao/nvlist.cpp
deleted file mode 100644
index 5aedf80d257..00000000000
--- a/TAO/tao/nvlist.cpp
+++ /dev/null
@@ -1,218 +0,0 @@
-// @ (#)nvlist.cpp      
-// 1.6 95/11/04
-// 
-// Copyright 1994-1995 by Sun Microsystems Inc.
-// All Rights Reserved
-//
-// Implementation of Named Value List
-
-#include "tao/corba.h"
-
-// COM's IUnknown support
-
-// {77420087-F276-11ce-9598-0000C07CA898}
-DEFINE_GUID (IID_CORBA_NamedValue, 
-0x77420087, 0xf276, 0x11ce, 0x95, 0x98, 0x0, 0x0, 0xc0, 0x7c, 0xa8, 0x98);
-
-ULONG __stdcall
-CORBA_NamedValue::AddRef (void)
-{
-  ACE_MT (ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, guard, lock_, 0));
- 
-  return refcount_++;
-}
- 
-ULONG __stdcall
-CORBA_NamedValue::Release (void)
-{
-  {
-    ACE_MT (ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, mon, this->lock_, 0));
-
-    ACE_ASSERT (this != 0);
-
-    if (--refcount_ != 0)
-      return refcount_;
-  }
-
-  delete this;
-  return 0;
-}
- 
-HRESULT __stdcall
-CORBA_NamedValue::QueryInterface (REFIID riid,
-                                  void **ppv)
-{
-  *ppv = 0;
- 
-  if (IID_CORBA_NamedValue == riid || IID_IUnknown == riid)
-    *ppv = this;
- 
-  if (*ppv == 0)
-    return ResultFromScode (E_NOINTERFACE);
- 
- (void) AddRef ();
-  return NOERROR;
-}
-
-// Reference counting for DII Request object
-
-void
-CORBA::release (CORBA::NamedValue_ptr nv)
-{
-  if (nv)
-    nv->Release ();
-}
-
-CORBA::Boolean
-CORBA::is_nil (CORBA::NamedValue_ptr nv)
-{
-  return (CORBA::Boolean) nv == 0;
-}
-
-CORBA_NamedValue::~CORBA_NamedValue (void)
-{
-  if (_name)
-    CORBA::string_free ((CORBA::String) _name);
-}
-
-// COM's IUnknown support
-
-// {77420088-F276-11ce-9598-0000C07CA898}
-DEFINE_GUID (IID_CORBA_NVList,
-0x77420088, 0xf276, 0x11ce, 0x95, 0x98, 0x0, 0x0, 0xc0, 0x7c, 0xa8, 0x98);
-
-ULONG __stdcall
-CORBA_NVList::AddRef (void)
-{
-  ACE_MT (ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, guard, lock_, 0));
- 
-  return refcount_++;
-}
- 
-ULONG __stdcall
-CORBA_NVList::Release (void)
-{
-  {
-    ACE_MT (ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, mon, this->lock_, 0));
-
-    ACE_ASSERT (this != 0);
-
-    if (--refcount_ != 0)
-      return refcount_;
-  }
-
-  delete this;
-  return 0;
-}
- 
-HRESULT __stdcall
-CORBA_NVList::QueryInterface (REFIID riid,
-                              void **ppv)
-{
-  *ppv = 0;
- 
-  if (IID_CORBA_NVList == riid || IID_IUnknown == riid)
-    *ppv = this;
- 
-  if (*ppv == 0)
-    return ResultFromScode (E_NOINTERFACE);
- 
- (void) AddRef ();
-  return NOERROR;
-}
-
-// Reference counting for DII Request object
-
-void
-CORBA::release (CORBA::NVList_ptr nvl)
-{
-  if (nvl)
-    nvl->Release ();
-}
-
-CORBA::Boolean
-CORBA::is_nil (CORBA::NVList_ptr nvl)
-{
-  return (CORBA::Boolean) nvl == 0;
-}
-
-CORBA_NVList::~CORBA_NVList (void)
-{
-  for (u_int i = 0; i < len_; i++)
-    (&values_[i])->~CORBA_NamedValue ();
-
-  if (values_)
-    ACE_OS::free ((char *)values_);
-  values_ = 0;
-  len_ = max_ = 0;
-}
-
-CORBA::NamedValue_ptr
-CORBA_NVList::add_value (const CORBA::Char *name,
-                         const CORBA::Any &value,
-                         CORBA::Flags flags,
-                         CORBA::Environment &env)
-{
-  env.clear ();
-
-  if (ACE_BIT_DISABLED (flags, CORBA::ARG_IN | CORBA::ARG_OUT | CORBA::ARG_INOUT))
-    {
-      env.exception (new CORBA::BAD_PARAM (CORBA::COMPLETED_NO));
-      return 0;
-    }
-
-  // We track "len_" and "max_" like sequences do; mixing the
-  // "add_arg" and nvlist[i] style accessors produces undefined
-  // behaviour.
-  u_int len = len_++;
-
-  // Extend the array with an _initialized_ element ... relying on
-  // zeroed memory to be sufficiently initialized.
-  //
-  // XXX report malloc failures as errors -- how?
-
-  if (values_ == 0) 
-    {
-      values_ = (CORBA::NamedValue_ptr)
-        calloc (len_, sizeof (CORBA::NamedValue));
-      max_ = len_;
-    } 
-  else if (len >= max_) 
-    {
-      values_ = (CORBA::NamedValue_ptr) ACE_OS::realloc ((char *)values_,
-                                                        sizeof (CORBA::NamedValue) * len_);
-      (void) ACE_OS::memset (&values_[max_], 0,
-                             sizeof (values_[max_]) * (len_ - max_));
-      max_ = len_;
-    }
-  assert (values_ != 0);
-
-  values_[len]._flags = flags;
-  values_[len]._name = CORBA::string_copy (name);
-
-  if (ACE_BIT_ENABLED (flags, CORBA::IN_COPY_VALUE))
-    // IN_COPY_VALUE means that the parameter is not "borrowed" by
-    // the ORB, but rather that the ORB copies its value.
-    //
-    // Initialize the newly allocated memory using a copy
-    // constructor that places the new "Any" value at just the right
-    // place, and makes a "deep copy" of the data.
-    (void) new (&values_[len]._any) CORBA::Any (value);
-  else 
-    // The normal behaviour for parameters is that the ORB "borrows"
-    // their memory for the duration of calls.
-    //
-    // Initialize the newly allocated "Any" using a normal
-    // constructor that places the new "Any" value at just the right
-    // place, yet doesn't copy the memory (except for duplicating
-    // the typecode).
-    //
-    // NOTE: DSI has yet to be updated so that it's OK to use such
-    // application-allocated memory.  It needs at least a "send the
-    // response now" call.
-    //
-    (void) new (&values_[len]._any) CORBA::Any (value.type (),
-                                                (void *)value.value (), CORBA::B_FALSE);
-
-  return &values_[len];
-}
diff --git a/TAO/tao/nvlist.h b/TAO/tao/nvlist.h
deleted file mode 100644
index eb23cf784b2..00000000000
--- a/TAO/tao/nvlist.h
+++ /dev/null
@@ -1,120 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO
-// 
-// = FILENAME
-//    nvlist.h
-//
-// = AUTHOR
-//     Copyright 1994-1995 by Sun Microsystems Inc.
-// 
-// ============================================================================
-
-#if !defined (TAO_NVLIST_H)
-#  define TAO_NVLIST_H
-
-// @@ IS it necessary to use TAO_Export on a forward decl?  I
-// simply did a global replace of _EXPCLASS with TAO_Export.  I'm
-// not familiar enough with crazy MSVC nuances to know if this is
-// necessary, what it means, etc.  Perhaps Brian can shed some light
-// on the subject? --cjc
-
-class TAO_Export CORBA_NamedValue
-{
-  // = TITLE
-  // NamedValue ... these occur only in "NVList" (named value list) data
-  // structures.  The binary form of the data structure is frozen and
-  // visible to programs using it (e.g. from C).  The C++ class supports
-  // some programming discipline, e.g. to avoid memory leaks.
-  //
-  // They just represent parameters to calls.  The name is optional, and
-  // the value is packaged as an Any.  The flags indicate parameter
-  // mode, and some ownership rules for "top level" memory.
-public:
-  TAO_CONST CORBA::String _FAR name (void) 
-    { return (CORBA::String) _name; }
-
-  CORBA::Any_ptr	_FAR value (void) { return &_any; }
-  CORBA::Flags flags (void) const { return _flags; }
-
-  ~CORBA_NamedValue (void);
-
-  // = Methods required for COM IUnknown support.
-
-  ULONG __stdcall AddRef (void);
-  ULONG __stdcall Release (void);
-  HRESULT __stdcall QueryInterface (REFIID riid,
-				    void **ppv);
-
-private:
-  u_int refcount_;
-  ACE_SYNCH_MUTEX lock_;
-
-  CORBA::Any _any;
-  CORBA::Flags _flags;
-  const CORBA::Char *_FAR _name;
-
-  CORBA_NamedValue (void) : refcount_(0), _flags (0), _name (0) { }
-
-  friend class CORBA_NVList;
-  friend class CORBA_Request;
-};
-
-class TAO_Export CORBA_NVList
-  // = TITLE
-  //   NVList ... this is used in the (client side) DII (Dynamic
-  //   Invocation Interface) to hold parameters, except for the return
-  //   parameter. It's used in the same role in the (server side) DSI
-  //   (Dynamic Skeleton Interface).
-  //
-  // = DESCRIPTION
-  //   Each user (client, server) provides the typecode and memory for
-  //   each parameter using an NVList, then talks to the ORB using a
-  //   Request or ServerRequest pseudo-object.  The ORB copies data
-  //   to/from the IPC messages (e.g. IIOP::Request, IIOP::Response)
-  //   as appropriate.
-{
-public:
-  CORBA::ULong count (void) const
-  { return len_; }
-
-  CORBA::NamedValue_ptr add_value (const CORBA::Char *_FAR ,
-				   const CORBA::Any _FAR &,
-				   CORBA::Flags,
-				   CORBA::Environment _FAR &);
-
-  CORBA::NamedValue_ptr item (CORBA::Long n) const
-  { return &values_ [(u_int) n]; }
-
-  ~CORBA_NVList (void);
-
-  // = Methods required for COM IUnknown support
-
-  ULONG __stdcall AddRef (void);
-  ULONG __stdcall Release (void);
-  HRESULT __stdcall QueryInterface (REFIID riid,
-				    void **ppv);
-
-private:
-  // @@ Do we really need to keep these _FAR macros?
-  CORBA::NamedValue *_FAR values_;
-  u_int max_;
-  u_int len_;
-  ACE_SYNCH_MUTEX lock_;
-  u_int refcount_;
-
-  CORBA_NVList (void)
-    : values_ (0), 
-    max_ (0),
-    len_ (0), 
-    refcount_ (1)
-  { }
-
-  friend class CORBA_ORB;
-  friend class CORBA_Request;
-};
-
-#endif /* TAO_NVLIST_H */
diff --git a/TAO/tao/objtable.cpp b/TAO/tao/objtable.cpp
deleted file mode 100644
index 89a4893eec9..00000000000
--- a/TAO/tao/objtable.cpp
+++ /dev/null
@@ -1,212 +0,0 @@
-#include "tao/corba.h"
-
-// destructor
-TAO_Object_Table::~TAO_Object_Table (void)
-{
-}
-
-// Template Specialization for char*. Needed for the dynamic hash lookup
-int 
-ACE_Hash_Map_Manager<const char *, CORBA::Object_ptr, ACE_SYNCH_RW_MUTEX>::equal (const char *const &id1,
-										 const char *const &id2)
-{
-  // do a string compare
-  return ACE_OS::strcmp (id1, id2) == 0;
-}
-
-// Template Specialization for char *
-u_long
-ACE_Hash_Map_Manager<const char *, CORBA::Object_ptr, ACE_SYNCH_RW_MUTEX>::hash (const char *const &ext_id)
-{
-  // Use the hash_pjw hash function available in the ACE library
-  return ACE::hash_pjw (ext_id);
-}
-
-TAO_Dynamic_Hash_ObjTable::TAO_Dynamic_Hash_ObjTable (CORBA::ULong size)
-{
-  if (size > 0)
-    this->hash_.open (size);
-  // else we already have a default hash map
-}
-
-TAO_Dynamic_Hash_ObjTable::~TAO_Dynamic_Hash_ObjTable (void)
-{
-  // we need to go thru each entry and free the space taken up by the strings
-  OBJ_MAP_MANAGER::ITERATOR iterator (this->hash_);  // initialize an iterator
-
-  for (OBJ_MAP_MANAGER::ENTRY *entry = 0;
-       iterator.next (entry) != 0;
-       iterator.advance ())
-    {
-      CORBA::string_free ((char *)entry->ext_id_); // we had allocated memory and stored
-      // the string. So we free the memory
-      entry->int_id_ = 0;  // we do not own this. So we just set it to 0
-    }
-
-  this->hash_.close ();
-}
-
-int
-TAO_Dynamic_Hash_ObjTable::bind (const CORBA::OctetSeq &key,
-				 CORBA::Object_ptr obj)
-{
-  // the key is an octet sequence. Hence, we cannot simply cast the buffer to a
-  // char* as it may result in an arbitrary name. Hence we must first convert
-  // it to a string and then save a copy of the string in the table.
-  ACE_CString objkey ((char *)key.buffer, key.length);
-  return this->hash_.bind (CORBA::string_dup (objkey.rep ()), obj);
-}
-
-int
-TAO_Dynamic_Hash_ObjTable::find (const CORBA::OctetSeq &key,
-				 CORBA::Object_ptr &obj)
-{
-  // the key is an octet sequence. Hence, we cannot simply cast the buffer to a
-  // char* as it may result in an arbitrary name due to absence of a NULL
-  // terminating character. Hence we must first convert it to a string of the
-  // specified length.
-  ACE_CString objkey ((char *)key.buffer, key.length);
-  return this->hash_.find (objkey.rep(), obj); // no string_dup necessary here
-}
-
-// Linear search strategy
-TAO_Linear_ObjTable::TAO_Linear_ObjTable (CORBA::ULong size)
-  : next_ (0),
-    tablesize_ (size),
-    tbl_ (new TAO_Linear_ObjTable_Entry[size])
-{
-}
-
-TAO_Linear_ObjTable::~TAO_Linear_ObjTable (void)
-{
-  delete [] this->tbl_; // this will delete each entry
-}
-
-int
-TAO_Linear_ObjTable::bind (const CORBA::OctetSeq &key,
-			   CORBA::Object_ptr obj)
-{
-  CORBA::ULong i = this->next_;
-
-  if (i < this->tablesize_)
-    {
-      // store the string and the corresponding object pointer
-      this->tbl_[i].opname_ = CORBA::string_alloc (key.length); // allocates one
-      // more
-      ACE_OS::memset (this->tbl_[i].opname_, '\0', key.length+1);
-      ACE_OS::strncpy (this->tbl_[i].opname_, (char *)key.buffer, key.length);
-      this->tbl_[i].obj_ = obj;
-      this->next_++; // point to the next available slot
-      return 0; // success
-    }
-
-  return -1; // error, size exceeded
-}
-
-// find if the key exists
-int
-TAO_Linear_ObjTable::find (const CORBA::OctetSeq &key,
-			   CORBA::Object_ptr &obj)
-{
-  ACE_ASSERT (this->next_ <= this->tablesize_);
-
-  //  ACE_CString objkey ((char *)key.buffer, key.length);
-  for (CORBA::ULong i = 0; i < this->next_; i++)
-    {
-      // linearly search thru the table
-      if (!ACE_OS::strncmp (this->tbl_[i].opname_, (char *)key.buffer, key.length))
-	{
-	  // keys match. Return the object pointer
-	  obj = this->tbl_[i].obj_;
-	  return 0; // success
-	}
-    }
-  return -1;  // not found
-}
-
-// constructor
-TAO_Linear_ObjTable_Entry::TAO_Linear_ObjTable_Entry (void)
-{
-  this->opname_ = 0;
-  this->obj_ = 0;
-}
-
-TAO_Linear_ObjTable_Entry::~TAO_Linear_ObjTable_Entry (void)
-{
-  CORBA::string_free (this->opname_); // reclaim space consumed by the string
-  this->obj_ = 0;  // cannot delete this as we do not own it
-}
-
-// Active Demux search strategy
-// constructor
-TAO_Active_Demux_ObjTable::TAO_Active_Demux_ObjTable (CORBA::ULong size)
-  : next_ (0),
-    tablesize_ (size),
-    tbl_ (new TAO_Active_Demux_ObjTable_Entry[size])
-{
-}
-
-// destructor
-TAO_Active_Demux_ObjTable::~TAO_Active_Demux_ObjTable ()
-{
-  delete [] this->tbl_;
-}
-
-
-// bind the object based on the key
-int
-TAO_Active_Demux_ObjTable::bind (const CORBA::OctetSeq &key,
-				 CORBA::Object_ptr obj)
-{
-  // The active demux strategy works on the assumption that the key is a
-  // stringified form of an index into the table
-  ACE_CString objkey ((char *)key.buffer, key.length);
-  CORBA::ULong i = ACE_OS::atoi (objkey.rep ());
-
-  if (i < this->tablesize_)
-    {
-      if (this->tbl_[i].obj_ != 0)
-	{
-	  // we are trying to overwrite a previous entry
-	  return 1; // duplicate
-	}
-      else
-	{
-	  this->tbl_[i].obj_ = obj;
-	  return 0;
-	}
-    }
-  return -1; // error
-}
-
-int
-TAO_Active_Demux_ObjTable::find (const CORBA::OctetSeq &key,
-				 CORBA::Object_ptr& obj)
-{
-  ACE_CString objkey ((char *)key.buffer, key.length);
-  CORBA::ULong i = ACE_OS::atoi (objkey.rep ());
-
-  ACE_ASSERT (i < this->tablesize_); // cannot be equal to
-  obj = this->tbl_[i].obj_;
-  return 0; // success
-}
-
-TAO_Active_Demux_ObjTable_Entry::TAO_Active_Demux_ObjTable_Entry (void)
-{
-  this->obj_ = 0;
-}
-
-TAO_Active_Demux_ObjTable_Entry::~TAO_Active_Demux_ObjTable_Entry (void)
-{
-  this->obj_ = 0;  // cannot delete this as we do not own it
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Hash_Map_Iterator<char const*, CORBA::Object_ptr, ACE_SYNCH_RW_MUTEX>;
-template class ACE_Hash_Map_Manager<char const*, CORBA::Object_ptr, ACE_SYNCH_RW_MUTEX>;
-template class ACE_Hash_Map_Entry<char const*, CORBA::Object_ptr>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Hash_Map_Iterator<char const*, CORBA::Object_ptr, ACE_SYNCH_RW_MUTEX>
-#pragma instantiate ACE_Hash_Map_Manager<char const*, CORBA::Object_ptr, ACE_SYNCH_RW_MUTEX>
-#pragma instantiate ACE_Hash_Map_Entry<char const*, CORBA::Object_ptr>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/objtable.h b/TAO/tao/objtable.h
deleted file mode 100644
index 41f889dfb12..00000000000
--- a/TAO/tao/objtable.h
+++ /dev/null
@@ -1,157 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO
-// 
-// = FILENAME
-//    objtable.h
-//
-// = AUTHOR
-//    Aniruddha Gokhale
-// 
-// ============================================================================
-
-#if !defined (TAO_OBJTABLE_H)
-#  define TAO_OBJTABLE_H
-
-class TAO_Object_Table
-  // = TITLE
-  //     Abstract class for maintaining a mapping of CORBA object keys
-  //     to pointers to CORBA objects.
-{
-public:
-  virtual int find (const CORBA::OctetSeq &key, 
-		    CORBA::Object_ptr &obj) = 0;
-  // Find object associated with <{key}>, setting <{obj}> to the
-  // pointer and returning a non-negative integer.  If not found,
-  // <{obj}> is unchanged and the value <-1> is returned.
-
-  virtual int bind (const CORBA::OctetSeq &key, 
-		    CORBA::Object_ptr obj) = 0;
-  // Associated <{key}> with <{obj}>, returning 0 if object is
-  // registered successfully, 1 if it's already registered, and -1 if
-  // a failure occurs during registration.
-
-  virtual ~TAO_Object_Table (void);
-  // Destructor.
-};
-
-// Dynamic Hashing scheme using template specialization for char*
-typedef ACE_Hash_Map_Manager<const char*, CORBA::Object_ptr, ACE_SYNCH_RW_MUTEX> 
-        OBJ_MAP_MANAGER;
-
-class TAO_Dynamic_Hash_ObjTable : public TAO_Object_Table
-  // = TITLE
-  //   Lookup strategy based on dynamic hashing. This works on the
-  //   assumption that the object keys are essentially strings.
-{
-public:
-  TAO_Dynamic_Hash_ObjTable (CORBA::ULong size = 0);
-  // constructor. If size is 0, some default is used.
-
-  ~TAO_Dynamic_Hash_ObjTable (void);
-  // destructor
-
-  virtual int bind (const CORBA::OctetSeq &key, 
-		    CORBA::Object_ptr obj);
-  // Registers a CORBA::Object into the object table and associates
-  // the key with it.  Returns -1 on failure, 0 on success, 1 on
-  // duplicate.
-
-  virtual int find (const CORBA::OctetSeq &key, 
-		    CORBA::Object_ptr &obj);
-  // Looks up an object in the object table using <{key}>.  Returns
-  // non-negative integer on success, or -1 on failure.
-
-private:
-  OBJ_MAP_MANAGER hash_;
-  // internal hash table
-};
-
-struct TAO_Linear_ObjTable_Entry
-  // = TITLE
-  //   Linear strategy table entry. This assumes that the object keys
-  //   will be strings encoded as an octet sequence.
-{
-  CORBA::String opname_;
-  // Stores the object key.
-
-  CORBA::Object_ptr obj_;
-  // Holds the CORBA::Object pointer corresponding to the object key.
-
-  TAO_Linear_ObjTable_Entry (void);
-  // constructor
-
-  ~TAO_Linear_ObjTable_Entry (void);
-  // destructor
-};
-
-class TAO_Linear_ObjTable: public TAO_Object_Table
-// @@ Please comment me.
-{
-public:
-  TAO_Linear_ObjTable (CORBA::ULong size);
-
-  ~TAO_Linear_ObjTable (void);
-
-  virtual int bind (const CORBA::OctetSeq &key,
-		    CORBA::Object_ptr obj);
-  // Registers a CORBA::Object into the object table and associates the
-  // key with it.  Returns -1 on failure, 0 on success, 1 on
-  // duplicate.
-
-  virtual int find (const CORBA::OctetSeq &key, 
-		    CORBA::Object_ptr &obj);
-  // Looks up an object in the object table using <{key}>.  Returns
-  // non-negative integer on success, or -1 on failure.
-
-private:
-  CORBA::ULong next_;
-  CORBA::ULong tablesize_;
-  TAO_Linear_ObjTable_Entry *tbl_;
-};
-
-struct TAO_Active_Demux_ObjTable_Entry
-  // = TITLE
-  //   Active Demux lookup table entry.
-{
-  CORBA::Object_ptr obj_;
-  // CORBA::Object pointer corresponding to the key
-
-  TAO_Active_Demux_ObjTable_Entry (void);
-  // constructor
-
-  ~TAO_Active_Demux_ObjTable_Entry (void);
-  // destructor
-};
-
-class TAO_Active_Demux_ObjTable : public TAO_Object_Table
-// @@ Please comment me.
-{
-public:
-  TAO_Active_Demux_ObjTable (CORBA::ULong size);
-
-  ~TAO_Active_Demux_ObjTable (void);
-
-  virtual int bind (const CORBA::OctetSeq &key,
-		    CORBA::Object_ptr obj);
-  // Registers a CORBA::Object into the object table and associates
-  // the key with it.  Returns -1 on failure, 0 on success, 1 on
-  // duplicate.
-
-  virtual int find (const CORBA::OctetSeq &key,
-		    CORBA::Object_ptr &obj);
-  // Looks up an object in the object table using <{key}>.  Returns
-  // non-negative integer on success, or -1 on failure.
-
-private:
-  CORBA::ULong next_;
-  CORBA::ULong tablesize_;
-  TAO_Active_Demux_ObjTable_Entry *tbl_;
-};
-
-#endif /* TAO_OBJTABLE_H */
-
-
diff --git a/TAO/tao/optable.cpp b/TAO/tao/optable.cpp
deleted file mode 100644
index eb3374622b8..00000000000
--- a/TAO/tao/optable.cpp
+++ /dev/null
@@ -1,269 +0,0 @@
-#include "tao/corba.h"
-
-// destructor
-TAO_Operation_Table::~TAO_Operation_Table (void)
-{
-}
-
-// Template Specialization for char*
-int 
-ACE_Hash_Map_Manager<const char *, TAO_Skeleton, ACE_SYNCH_RW_MUTEX>::equal (const char *const &id1,
-									     const char *const &id2)
-{
-  return ACE_OS::strcmp (id1, id2) == 0;
-}
-
-// Template Specialization for char *
-u_long
-ACE_Hash_Map_Manager<const char *, TAO_Skeleton, ACE_SYNCH_RW_MUTEX>::hash (const char *const &ext_id)
-{
-  return ACE::hash_pjw (ext_id);
-}
-
-// constructor
-TAO_Dynamic_Hash_OpTable::TAO_Dynamic_Hash_OpTable (const TAO_operation_db_entry *db,
-						    CORBA::ULong dbsize,
-						    CORBA::ULong hashtblsize) 
-{
-  if (hashtblsize > 0)
-    this->hash_.open (hashtblsize);
-  // otherwise, some default is chosen by the ACE_Hash_Map_Manager class
-
-  // the job of the constructor is to go thru each entry of the database and
-  // bind the operation name to its corresponding skeleton
-  for (CORBA::ULong i=0; i < dbsize; i++)
-    {
-      // XXXASG: what happens if bind fails ???
-      (void)this->bind (db[i].opname_, db[i].skel_ptr_);
-    }
-}
-
-TAO_Dynamic_Hash_OpTable::~TAO_Dynamic_Hash_OpTable (void)
-{
-  // we need to go thru each entry and free up storage allocated to hold the
-  // external ids. In this case, these are strings.
-  OP_MAP_MANAGER::ITERATOR iterator (this->hash_);  // initialize an iterator
-
-  for (OP_MAP_MANAGER::ENTRY *entry = 0;
-       iterator.next (entry) != 0;
-       iterator.advance ())
-    {
-      CORBA::string_free ((char *)entry->ext_id_); // we had allocated memory and stored
-					  // the string. So we free the memory
-      entry->int_id_ = 0;  // we do not own this. So we just set it to 0
-    }
-
-  this->hash_.close ();
-}
-
-int 
-TAO_Dynamic_Hash_OpTable::bind (const CORBA::String &opname,
-                                const TAO_Skeleton skel_ptr)
-{
-  return this->hash_.bind (CORBA::string_dup (opname), skel_ptr);
-}
-
-int
-TAO_Dynamic_Hash_OpTable::find (const CORBA::String &opname,
-                                TAO_Skeleton& skel_ptr)
-{
-  return this->hash_.find ((const char *)opname, skel_ptr);
-}
-
-// Linear search strategy
-TAO_Linear_OpTable::TAO_Linear_OpTable (const TAO_operation_db_entry *db,
-                                        CORBA::ULong dbsize)
-  : next_ (0),
-    tablesize_ (dbsize),
-    tbl_ (new TAO_Linear_OpTable_Entry[dbsize])
-{
-  // The job of the constructor is to go thru each entry of the
-  // database and bind the operation name to its corresponding
-  // skeleton.
-
-  for (CORBA::ULong i=0; i < dbsize; i++)
-    // XXXASG: what happens if bind fails ???
-    (void)this->bind (db[i].opname_, db[i].skel_ptr_);
-}
-
-TAO_Linear_OpTable::~TAO_Linear_OpTable (void)
-{
-  delete [] this->tbl_;
-}
-
-int 
-TAO_Linear_OpTable::bind (const CORBA::String &opname,
-                          const TAO_Skeleton skel_ptr)
-{
-  CORBA::ULong i = this->next_;
-
-  if (i < this->tablesize_)
-    {
-      this->tbl_[i].opname_ = CORBA::string_dup (opname);
-      this->tbl_[i].skel_ptr_ = skel_ptr;
-      this->next_++;
-      return 0; // success
-    }
-
-  return -1; // error
-}
-
-int
-TAO_Linear_OpTable::find (const CORBA::String &opname,
-                          TAO_Skeleton& skel_ptr)
-{
-  ACE_ASSERT (this->next_ <= this->tablesize_);
-
-  for (CORBA::ULong i = 0; i < this->next_; i++)
-
-    if (ACE_OS::strncmp (this->tbl_[i].opname_,
-                         opname,
-                         ACE_OS::strlen (opname)) == 0)
-      {
-        skel_ptr = this->tbl_[i].skel_ptr_;
-        return 0; // success
-      }
-
-  return -1;  // not found
-}
-
-// constructor
-TAO_Linear_OpTable_Entry::TAO_Linear_OpTable_Entry (void)
-{
-  opname_ = 0;
-  skel_ptr_ = 0;
-}
-
-// destructor
-TAO_Linear_OpTable_Entry::~TAO_Linear_OpTable_Entry (void)
-{
-  CORBA::string_free (opname_);
-  this->skel_ptr_ = 0;  // cannot delete this as we do not own it
-}
-
-// Active Demux search strategy
-TAO_Active_Demux_OpTable::TAO_Active_Demux_OpTable (const
-						    TAO_operation_db_entry *db,
-						    CORBA::ULong dbsize) 
-  : next_ (0),
-    tablesize_ (dbsize),
-    tbl_ (new TAO_Active_Demux_OpTable_Entry[dbsize])
-{
-  // The job of the constructor is to go thru each entry of the
-  // database and bind the operation name to its corresponding
-  // skeleton.
-  for (CORBA::ULong i=0; i < dbsize; i++)
-    // XXXASG: what happens if bind fails ???
-    (void) this->bind (db[i].opname_, db[i].skel_ptr_);
-}
-
-TAO_Active_Demux_OpTable::~TAO_Active_Demux_OpTable (void)
-{
-  delete [] this->tbl_;
-}
-
-int
-TAO_Active_Demux_OpTable::bind (const CORBA::String &opname,
-				const TAO_Skeleton skel_ptr)
-{
-  CORBA::ULong i = ACE_OS::atoi (opname);
-
-  if (i < this->tablesize_)
-    {
-      if (this->tbl_[i].skel_ptr_ != 0)
-        // overwriting previous one
-        return 1;
-      else
-	{
-	  this->tbl_[i].skel_ptr_ = skel_ptr;
-	  return 0;
-	}
-    }
-  return -1; // error
-}
-
-int
-TAO_Active_Demux_OpTable::find (const CORBA::String &opname,
-                                TAO_Skeleton& skel_ptr)
-{
-  CORBA::ULong i = ACE_OS::atoi (opname);
-
-  ACE_ASSERT (i < this->tablesize_);
-  skel_ptr = this->tbl_[i].skel_ptr_;
-  return 0; //success
-}
-
-TAO_Active_Demux_OpTable_Entry::TAO_Active_Demux_OpTable_Entry (void)
-{
-  this->skel_ptr_ = 0;
-}
-
-TAO_Active_Demux_OpTable_Entry::~TAO_Active_Demux_OpTable_Entry (void)
-{
-  this->skel_ptr_ = 0;  // cannot delete this as we do not own it
-}
-
-// constructor
-TAO_Operation_Table_Parameters::TAO_Operation_Table_Parameters (void)
-  : strategy_ (0),
-    type_ (TAO_Operation_Table_Parameters::TAO_DYNAMIC_HASH) // default
-{
-}
-
-TAO_Operation_Table_Parameters::~TAO_Operation_Table_Parameters (void)
-{
-}
-
-void 
-TAO_Operation_Table_Parameters::lookup_strategy (TAO_Operation_Table_Parameters::DEMUX_STRATEGY s)
-{
-  this->type_ = s;
-}
-
-// get the lookup type
-TAO_Operation_Table_Parameters::DEMUX_STRATEGY 
-TAO_Operation_Table_Parameters::lookup_strategy (void) const
-{
-  return this->type_;
-}
-
-// set the concrete strategy
-void 
-TAO_Operation_Table_Parameters::concrete_strategy (TAO_Operation_Table *ot)
-{
-  this->strategy_ = ot;
-}
-
-// return the concrete strategy
-TAO_Operation_Table* TAO_Operation_Table_Parameters::concrete_strategy (void)
-{
-  return this->strategy_;
-}
-
-TAO_Operation_Table_Factory::TAO_Operation_Table_Factory (void)
-{
-}
-
-TAO_Operation_Table_Factory::~TAO_Operation_Table_Factory (void)
-{
-}
-
-TAO_Operation_Table * 
-TAO_Operation_Table_Factory::opname_lookup_strategy (void)
-{
-  TAO_Operation_Table_Parameters *p = TAO_OP_TABLE_PARAMETERS::instance ();
-
-  return p->concrete_strategy ();
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Hash_Map_Iterator<const char*, TAO_Skeleton, ACE_SYNCH_RW_MUTEX>;
-template class ACE_Hash_Map_Manager<const char*, TAO_Skeleton, ACE_SYNCH_RW_MUTEX>;
-template class ACE_Hash_Map_Entry<const char*, TAO_Skeleton>;
-template class ACE_Singleton<TAO_Operation_Table_Parameters, ACE_SYNCH_RECURSIVE_MUTEX>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Hash_Map_Iterator<const char*, TAO_Skeleton, ACE_SYNCH_RW_MUTEX>
-#pragma instantiate ACE_Hash_Map_Manager<const char*, TAO_Skeleton, ACE_SYNCH_RW_MUTEX>
-#pragma instantiate ACE_Hash_Map_Entry<const char*, TAO_Skeleton>
-#pragma instantiate ACE_Singleton<TAO_Operation_Table_Parameters, ACE_SYNCH_RECURSIVE_MUTEX>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/optable.h b/TAO/tao/optable.h
deleted file mode 100644
index 51c1c9cd68b..00000000000
--- a/TAO/tao/optable.h
+++ /dev/null
@@ -1,259 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-//
-// ============================================================================
-//
-// = LIBRARY
-//    TAO
-// 
-// = FILENAME
-//    optable.h
-//
-// = AUTHOR
-//    Aniruddha Gokhale
-// 
-// ============================================================================
-
-#if !defined (TAO_OPTABLE_H)
-#define TAO_OPTABLE_H
-
-struct TAO_operation_db_entry
-  // = TITLE
-  //   Define a table entry that holds an operation name and its
-  //   corresponding skeleton.  A table of such entries is used to
-  //   initialize the different lookup strategies.
-{
-  CORBA::String opname_;
-  // operation name
-
-  TAO_Skeleton skel_ptr_;
-  // skeleton pointer
-};
-
-class TAO_Export TAO_Operation_Table
-  // = TITLE
-  //     Abstract class for maintaining and lookup of CORBA IDL
-  //     operation names. 
-{
-public:
-  virtual int find (const CORBA::String &opname, 
-		   TAO_Skeleton &skelfunc) = 0;
-  // Uses <{opname}> to look up the skeleton function and pass it back
-  // in <{skelfunc}>.  Returns non-negative integer on success, or -1
-  // on failure.
-
-  virtual int bind (const CORBA::String &opname,
-		    const TAO_Skeleton skel_ptr) = 0;
-  // Associate the skeleton <{skel_ptr}> with an operation named
-  // <{opname}>.  Returns -1 on failure, 0 on success, 1 on duplicate.
-
-  virtual ~TAO_Operation_Table (void);
-};
-
-// Dynamic hashing.  We use template specialization here to use const
-// char* as the external ID. The template specialization is needed
-// since the "hash" method is not defined on type "char *".
-typedef ACE_Hash_Map_Manager<const char *, TAO_Skeleton, ACE_SYNCH_RW_MUTEX> 
-        OP_MAP_MANAGER;
-
-class TAO_Export TAO_Dynamic_Hash_OpTable : public TAO_Operation_Table
-  // = TITLE
-  // Dynamic Hashing scheme for CORBA IDL operation name lookup
-{
-public:
-  TAO_Dynamic_Hash_OpTable (const TAO_operation_db_entry *db, CORBA::ULong
-			    dbsize, CORBA::ULong hashtblsize = 0);
-  // Constructor.
-  // Initialize the dynamic hash operation table with a database of operation
-  // names. The hash table size may be different from the size of the
-  // database. Hence we use the third argument to specify the size of the
-  // internal hash table. 
-
-  ~TAO_Dynamic_Hash_OpTable (void);
-  // destructor
-
-  virtual int bind (const CORBA::String &opname, 
-		    const TAO_Skeleton skel_ptr);
-  // Associate the skeleton <{skel_ptr}> with an operation named
-  // <{opname}>.  Returns -1 on failure, 0 on success, 1 on duplicate.
-
-  virtual int find (const CORBA::String &opname,
-		    TAO_Skeleton &skelfunc);
-  // Uses <{opname}> to look up the skeleton function and pass it back
-  // in <{skelfunc}>.  Returns non-negative integer on success, or -1
-  // on failure.
-
-private:
-  OP_MAP_MANAGER hash_;
-  // The hash table data structure
-};
-
-struct TAO_Export TAO_Linear_OpTable_Entry
-  // = TITLE
-  //   Table entry for linear search lookup strategy.
-{
-  CORBA::String opname_;
-  // holds the operation name
-
-  TAO_Skeleton skel_ptr_;
-  // holds a pointer to the skeleton corresponding to the operation name
-
-  TAO_Linear_OpTable_Entry (void);
-  // constructor.
-
-  ~TAO_Linear_OpTable_Entry (void);
-  // destructor
-};
-
-class TAO_Export TAO_Linear_OpTable : public TAO_Operation_Table
-// @@ Please comment me.
-{
-public:
-  TAO_Linear_OpTable (const TAO_operation_db_entry *db, CORBA::ULong dbsize);
-  // constructor.
-  // Initialize the linear search operation table with a database of operation
-  // names 
-
-  ~TAO_Linear_OpTable (void);
-  // destructor
-
-  virtual int find (const CORBA::String &opname,
-		    TAO_Skeleton &skel_ptr);
-  // Uses <{opname}> to look up the skeleton function and pass it back
-  // in <{skelfunc}>.  Returns non-negative integer on success, or -1
-  // on failure.
-
-  virtual int bind (const CORBA::String &opname,
-		    const TAO_Skeleton skelptr);
-  // Associate the skeleton <{skel_ptr}> with an operation named
-  // <{opname}>.  Returns -1 on failure, 0 on success, 1 on duplicate.
-
-private:
-  CORBA::ULong next_;
-  // keeps track of the next available slot to be filled.
-
-  CORBA::ULong tablesize_;
-  // size of the internal table
-
-  TAO_Linear_OpTable_Entry *tbl_;
-  // the table itself
-};
-
-struct TAO_Export TAO_Active_Demux_OpTable_Entry
-  // = TITLE
-  //   Active Demux lookup table entry.
-{
-  TAO_Skeleton skel_ptr_;
-  // skeleton pointer corresponding to the index
-
-  TAO_Active_Demux_OpTable_Entry (void);
-  // constructor
-
-  ~TAO_Active_Demux_OpTable_Entry (void);
-  // destructor
-};
-
-class TAO_Export TAO_Active_Demux_OpTable : public TAO_Operation_Table
-  // = TITLE
-  //   Implements the active demultiplexed lookup strategy. The key is
-  //   assumed to provide an index directly into the internal table.
-{
-public:
-  TAO_Active_Demux_OpTable (const TAO_operation_db_entry *db, CORBA::ULong dbsize);
-  // Constructor
-  // Initializes the internal table with the database of operations
-
-  ~TAO_Active_Demux_OpTable (void);
-  // destructor
-
-  virtual int find (const CORBA::String &opname,
-		    TAO_Skeleton &skel_ptr);
-  // Uses <{opname}> to look up the skeleton function and pass it back
-  // in <{skelfunc}>.  Returns non-negative integer on success, or -1
-  // on failure.
-
-  virtual int bind (const CORBA::String &opname,
-		    const TAO_Skeleton skelptr);
-  // Associate the skeleton <{skel_ptr}> with an operation named
-  // <{opname}>.  Returns -1 on failure, 0 on success, 1 on duplicate.
-
-private:
-  CORBA::ULong next_;
-  // the next available free slot
-
-  CORBA::ULong tablesize_;
-  // size of the internal table
-
-  TAO_Active_Demux_OpTable_Entry *tbl_;
-  // internal lookup table
-};
-
-class TAO_Export TAO_Perfect_Hash_OpTable : public TAO_Operation_Table
-{
-};
-
-class TAO_Export TAO_Operation_Table_Parameters
-// @@ Please comment me.
-{
-public:
-  enum DEMUX_STRATEGY
-  {
-    // various lookup strategies
-    TAO_LINEAR,
-    TAO_DYNAMIC_HASH,
-    TAO_PERFECT_HASH,
-    TAO_ACTIVE_DEMUX,
-    TAO_USER_DEFINED
-  };
-
-  void lookup_strategy (DEMUX_STRATEGY s);
-  // set the lookup strategy from the list of enumerated values
-
-  DEMUX_STRATEGY lookup_strategy (void) const;
-  // return the enumerated value for the lookup strategy. Default is Dynamic
-  // Hashing. 
-
-  void concrete_strategy (TAO_Operation_Table *ot);
-  // Provide a data structure that will do the lookup. This is useful for
-  // user-defined lookup strategies.
-
-  TAO_Operation_Table *concrete_strategy (void);
-  // return the 
-
-  TAO_Operation_Table_Parameters (void);
-  // constructor
-
-  ~TAO_Operation_Table_Parameters (void);
-  // destructor
-private:
-  TAO_Operation_Table *strategy_;
-  // pointer to the object that implements a lookup strategy
-
-  DEMUX_STRATEGY type_;
-  // the enumerated value indicating the lookup strategy
-};
-
-// Define a singleton instance of operation table parameters.
-typedef ACE_Singleton<TAO_Operation_Table_Parameters, ACE_SYNCH_RECURSIVE_MUTEX> 
-        TAO_OP_TABLE_PARAMETERS;
-
-class TAO_Export TAO_Operation_Table_Factory
-  // = TITLE
-  //   Factory for producing operation table lookup objects based on
-  //   the enumerated value of strategy held by the parameters.
-{
-public:
-  TAO_Operation_Table *opname_lookup_strategy (void);
-  // return an instance of the specified lookup strategy
-
-  TAO_Operation_Table_Factory (void);
-  // constructor
-
-  ~TAO_Operation_Table_Factory (void);
-  // destructor
-};
-
-// Define a singleton instance of the operation table factory.
-typedef ACE_Singleton<TAO_Operation_Table_Factory, ACE_SYNCH_RECURSIVE_MUTEX> 
-        TAO_OP_TABLE_FACTORY;
-
-#endif /* TAO_OPTABLE_H */
diff --git a/TAO/tao/orbconf.h b/TAO/tao/orbconf.h
deleted file mode 100644
index de443d2995a..00000000000
--- a/TAO/tao/orbconf.h
+++ /dev/null
@@ -1,168 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-// @ (#) $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//     TAO
-//
-// = FILENAME
-//     default_server.h
-//
-// = DESCRIPTION
-//     Build configuration file for the Inter-ORB Engine, and application
-//     level code using it via <corba.hh>
-//
-// = AUTHOR
-//     Copyright 1995 by Sun Microsystems, Inc.
-//
-//     TAO-specific changes by Chris Cleeland and Douglas C. Schmidt
-//
-// ============================================================================
-
-#if !defined (TAO_ORB_CONFIG_H)
-#define	TAO_ORB_CONFIG_H
-
-#include "ace/OS.h"
-
-// The default size of TAO's server object table.
-#if !defined (TAO_DEFAULT_SERVER_OBJECT_TABLE_SIZE)
-#define TAO_DEFAULT_SERVER_OBJECT_TABLE_SIZE 64
-#endif /* TAO_DEFAULT_SERVER_OBJECT_TABLE_SIZE */
-
-// The default UDP multicast port number for locating the TAO Naming
-// Service.
-#if !defined (TAO_DEFAULT_NAME_SERVER_REQUEST_PORT)
-#define TAO_DEFAULT_NAME_SERVER_REQUEST_PORT 10013
-#endif /* TAO_DEFAULT_NAME_SERVER_REQUEST_PORT */
-
-// The default UDP port number for replying to a location request to
-// the TAO Naming Service.
-#if !defined (TAO_DEFAULT_NAME_SERVER_REPLY_PORT)
-#define TAO_DEFAULT_NAME_SERVER_REPLY_PORT 10014
-#endif /* TAO_DEFAULT_NAME_SERVER_REPLY_PORT */
-
-// The default timeout receiving the location request to
-// the TAO Naming Service.
-#if !defined (TAO_DEFAULT_NAME_SERVER_TIMEOUT)
-#define TAO_DEFAULT_NAME_SERVER_TIMEOUT 5
-#endif /* TAO_DEFAULT_NAME_SERVER_TIMEOUT */
-
-// The default starting port number for TAO servers.
-#if !defined (TAO_DEFAULT_SERVER_PORT)
-#define TAO_DEFAULT_SERVER_PORT 10015
-#endif /* TAO_DEFAULT_SERVER_PORT */
-
-// TAO's max buffer size
-#if !defined (TAO_MAXBUFSIZE)
-#define TAO_MAXBUFSIZE 1024
-#endif /* TAO_MAXBUFSIZE */
-
-// This controls the alignment for TAO structs.
-#define TAO_ALIGNMENT_MAGIC_NUMBER 64
-
-// BC++ seems to have a different convention for detecting Win32 than
-// VC++.
-
-#if defined (__WIN32__)
-#	define _WIN32
-#endif	/* BC++ convention */
-
-// Define to `int' if <sys/types.h> doesn't define.
-/* #undef pid_t */
-
-// Define if your processor does not store words with the most significant
-// byte first.
-#if defined (i386) || defined (__i386) || defined (_M_IX86) || defined (vax) || defined (__alpha)
-#  define TAO_ENCAP_BYTE_ORDER 1  /* little endian encapsulation byte order has
-                                     the value = 1 */
-#else
-#  define TAO_WORDS_BIGENDIAN 1
-#  define TAO_ENCAP_BYTE_ORDER 0  /* big endian encapsulation byte order has
-                                     the value = 1 */
-#endif
-
-#if UINT_MAX == 65535UL
-# define SIZEOF_INT 2
-#elif UINT_MAX == 4294967295UL
-# define SIZEOF_INT 4
-#elif UINT_MAX == 18446744073709551615UL
-# define SIZEOF_INT 8
-#else
-# error: unsupported int size, must be updated for this platform!
-#endif /* UINT_MAX */
-
-#if ULONG_MAX == 65535UL
-# define SIZEOF_LONG 2
-#elif ULONG_MAX == 4294967295UL
-# define SIZEOF_LONG 4
-#elif ULONG_MAX == 18446744073709551615UL
-# define SIZEOF_LONG 8
-#else
-# error: unsupported long size, must be updated for this platform!
-#endif /* ULONG_MAX */
-
-// The number of bytes in a void *.
-#define SIZEOF_VOID_P SIZEOF_LONG
-
-// The number of bytes in a long long.
-#if !defined (_WIN32) && !defined (VXWORKS)
-#define SIZEOF_LONG_LONG 8
-#endif /* !defined (_WIN32) && !defined (VXWORKS) */
-
-// The number of bytes in a long double.
-#if defined (linux) || defined (ACE_NETBSD) || defined (__FreeBSD__) || defined(CHORUS)
-#  define SIZEOF_LONG_DOUBLE 12
-#elif defined (_WIN32) || defined (VXWORKS) || defined (M_UNIX)
-#  define SIZEOF_LONG_DOUBLE 8
-#else
-#  define SIZEOF_LONG_DOUBLE 16
-#endif /* linux */
-
-// The number of bytes in a bool.
-#define SIZEOF_BOOL 0
-
-// Define as the return type of signal handlers (int or void).
-#define RETSIGTYPE void
-
-// Define if you don't have vprintf but do have _doprnt.
-/* #undef HAVE_DOPRNT */
-
-// Define if you have the vprintf function.
-#define HAVE_VPRINTF 1
-
-// Avoid namespace pollution that's common on older UNIXes...
-#if defined (minor)
-#undef minor
-#endif /* minor */
-
-#if defined (major)
-#undef major
-#endif /* major*/
-
-// For Win16, near/far pointers reflect same/other segment addressing.
-// Of course, ACE doesn't support Win16, so why bother?
-
-// For now, we simply set the default to empty definition and let
-// places that it fails bubble up.
-#define _FAR
-
-// Assume DOS/Windows if "configure" didn't get run.
-
-#if !defined (SIZEOF_LONG) || defined (_WIN32)
-//#	if defined (_WIN32) || defined (linux)
-//#		define	SIZEOF_INT	4
-//#	else	// Win16
-//#		define	SIZEOF_INT	2
-//#	endif	// Win32/Win16
-
-#  if !defined (linux) && !defined (_WIN32)
-typedef	unsigned long pid_t;
-#  endif /* !defined (linux) && !defined (_WIN32) */
-
-// "C4355: 'this' : used in base member initializer list"
-#  pragma warning (disable:4355) /* disable C4355 warning */
-
-#endif /* !defined (SIZEOF_LONG) || defined (_WIN32) */
-
-#endif	/* TAO_ORB_CONFIG_H */
diff --git a/TAO/tao/orbobj.cpp b/TAO/tao/orbobj.cpp
deleted file mode 100644
index ec58b79ebe5..00000000000
--- a/TAO/tao/orbobj.cpp
+++ /dev/null
@@ -1,546 +0,0 @@
-// @ (#)orbobj.cpp	1.8 95/09/24
-// Copyright 1994-1995 by Sun Microsystems Inc.
-// All Rights Reserved
-//
-// ORB:		CORBA::ORB operations
-//
-// XXX as with TAO, this has a strong coupling to the Internet ORB
-// (IIOP) code.  We should make it know less about that protocol
-// component and have a loose table-driven coupling to ORB/protocol
-// library components.
-
-#include "tao/corba.h"
-#include "ace/Dynamic_Service.h"
-#include "ace/Service_Repository.h"
-#include "ace/SOCK_Dgram_Mcast.h"
-#include "tao/tao_internals.h"
-
-extern void __TC_init_table (void);
-extern void __TC_init_standard_exceptions (CORBA::Environment &env);
-
-// COM's IUnknown support
-
-// {A201E4C6-F258-11ce-9598-0000C07CA898}
-DEFINE_GUID (IID_CORBA_ORB,
-	     0xa201e4c6, 0xf258, 0x11ce, 0x95, 0x98, 0x0, 0x0, 0xc0, 0x7c, 0xa8, 0x98);
-
-// {A201E4C7-F258-11ce-9598-0000C07CA898}
-DEFINE_GUID (IID_STUB_Object,
-	     0xa201e4c7, 0xf258, 0x11ce, 0x95, 0x98, 0x0, 0x0, 0xc0, 0x7c, 0xa8, 0x98);
-
-CORBA_ORB::CORBA_ORB (void)
-  : refcount_ (1),
-    open_called_(CORBA::B_FALSE),
-    client_factory_ (0),
-    client_factory_from_service_config_ (CORBA::B_FALSE),
-    server_factory_ (0),
-    server_factory_from_service_config_ (CORBA::B_FALSE),
-    should_shutdown_(CORBA::B_FALSE),
-    name_service_ (CORBA_Object::_nil ()),
-    schedule_service_ (CORBA_Object::_nil ()),
-    event_service_ (CORBA_Object::_nil ())
-{
-}
-
-CORBA_ORB::~CORBA_ORB (void)
-{
-  TAO_ORB_Core_instance ()->fini ();
-
-  if (!this->client_factory_from_service_config_)
-    delete client_factory_;
-
-  if (!this->server_factory_from_service_config_)
-    delete server_factory_;
-
-  // This assertion isn't valid because our ORB is a singleton
-  // assert (refcount_ == 0);
-}
-
-// Set up listening endpoints.
-int
-CORBA_ORB::open (void)
-{
-  if (this->open_called_ != CORBA::B_FALSE)
-    return -1;
-
-  this->open_called_ = CORBA::B_TRUE;
-
-  TAO_Server_Strategy_Factory *f = this->server_factory ();
-
-  // Initialize the endpoint ... or try!
-  TAO_ORB_Core *ocp = TAO_ORB_Core_instance ();
-
-  if (ocp->acceptor ()->open (ocp->orb_params ()->addr (),
-                              ocp->reactor(),
-                              f->creation_strategy (),
-                              f->accept_strategy (),
-                              f->concurrency_strategy (),
-                              f->scheduling_strategy ()) == -1)
-    // @@ CJC Need to return an error somehow!!  Maybe set do_exit?
-    return -1;
-
-  if (ocp->acceptor ()->acceptor ().get_local_addr (ocp->addr ()) == -1)
-    return -1;
-
-  return 0;
-}
-
-TAO_Client_Strategy_Factory *
-CORBA_ORB::client_factory (void)
-{
-  if (this->client_factory_ == 0)
-    {
-      // Look in the service repository for an instance.
-      this->client_factory_ =
-        ACE_Dynamic_Service<TAO_Client_Strategy_Factory>::instance ("Client_Strategy_Factory");
-      this->client_factory_from_service_config_ = CORBA::B_TRUE;
-    }
-
-  if (this->client_factory_ == 0)
-    {
-      // Still don't have one, so let's allocate the default.  This
-      // will throw an exception if it fails on exception-throwing
-      // platforms.
-      ACE_NEW_RETURN (this->client_factory_, TAO_Default_Client_Strategy_Factory, 0);
-
-      this->client_factory_from_service_config_ = CORBA::B_FALSE;
-      // @@ At this point we need to register this with the
-      // Service_Repository in order to get it cleaned up properly.
-      // But, for now we let it leak.
-    }
-  return this->client_factory_;
-}
-
-TAO_Server_Strategy_Factory *
-CORBA_ORB::server_factory (void)
-{
-  if (this->server_factory_ == 0)
-    {
-      // Look in the service repository for an instance.
-      this->server_factory_ =
-        ACE_Dynamic_Service<TAO_Server_Strategy_Factory>::instance ("Server_Strategy_Factory");
-
-      this->server_factory_from_service_config_ = CORBA::B_TRUE;
-    }
-
-  if (this->server_factory_ == 0)
-    {
-      // Still don't have one, so let's allocate the default.  This
-      // will throw an exception if it fails on exception-throwing
-      // platforms.
-      ACE_NEW_RETURN (this->server_factory_, TAO_Default_Server_Strategy_Factory, 0);
-
-      this->server_factory_from_service_config_ = CORBA::B_FALSE;
-      // @@ At this point we need to register this with the
-      // Service_Repository in order to get it cleaned up properly.
-      // But, for now we let it leak.
-    }
-  return this->server_factory_;
-}
-
-ULONG __stdcall
-CORBA_ORB::Release (void)
-{
-  {
-    ACE_MT (ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, mon, this->lock_, 0));
-
-    ACE_ASSERT (this != 0);
-
-    if (--refcount_ != 0)
-      return this->refcount_;
-  }
-
-  delete this;
-  return 0;
-}
-
-// ORB initialisation, per OMG document 94-9-46.
-//
-// XXX in addition to the "built in" Internet ORB, there will be ORBs
-// which are added separately, e.g. through a DLL listed in the
-// registry.  Registry will be used to assign orb names and to
-// establish which is the default.
-
-CORBA::ORB_ptr
-CORBA::ORB_init (int &argc,
-		 char *const *argv,
-		 char * /* orb_name */,
-		 CORBA::Environment &env)
-{
-  // Using ACE_Static_Object_Lock::instance() precludes ORB_init from being called
-  // within a static object CTOR.
-  ACE_MT (ACE_GUARD_RETURN (ACE_SYNCH_RECURSIVE_MUTEX, guard,
-                            *ACE_Static_Object_Lock::instance (), 0));
-
-  env.clear ();
-
-  // Verify some of the basic implementation requirements.  This test
-  // gets optimized away by a decent compiler (or else the rest of the
-  // routine does).
-  //
-  // NOTE:  we still "just" assume that native floating point is IEEE.
-
-  if (sizeof (CORBA::Short) != 2
-      || sizeof (CORBA::Long) != 4
-      || sizeof (CORBA::LongLong) != 8
-      || sizeof (CORBA::Float) != 4
-      || sizeof (CORBA::Double) != 8
-      || sizeof (CORBA::LongDouble) != 16
-      || sizeof (CORBA::WChar) < 2
-      || sizeof (void *) != SIZEOF_VOID_P)
-    {
-      ACE_DEBUG ((LM_DEBUG, "s:%d l:%d ll:%d f:%d d:%d ld:%d wc:%d v:%d\n",
-		  sizeof (CORBA::Short),
-		  sizeof (CORBA::Long),
-		  sizeof (CORBA::LongLong),
-		  sizeof (CORBA::Float),
-		  sizeof (CORBA::Double),
-		  sizeof (CORBA::LongDouble),
-		  sizeof (CORBA::WChar),
-		  sizeof (void *)));
-
-      env.exception (new CORBA::INITIALIZE (CORBA::COMPLETED_NO));
-      return 0;
-    }
-
-  TAO_ORB_Core_instance ()->init (argc, (char **)argv);
-
-  // Call various internal initialization routines.
-  // @@ Why are these names prefixed with "__"?  Shouldn't they be in
-  // a class someplace, or at least have the word "TAO" in front of
-  // them?
-  //
-  // @@ (CJC) Far more important that the name is whether or not it's
-  // OK to call these multiple times.  Andy, can you address this?
-  __TC_init_table ();
-  TAO_Marshal::initialize ();
-  __TC_init_standard_exceptions (env);
-
-  if (env.exception () != 0)
-    return 0;
-
-  return TAO_ORB_Core_instance()->orb();
-}
-
-void
-CORBA_ORB::create_list (CORBA::Long count,
-                        CORBA::NVList_ptr &retval)
-{
-  assert (CORBA::ULong (count) <= UINT_MAX);
-
-  retval = new CORBA::NVList;
-
-  if (count != 0)
-    {
-      retval->len_ = 0;
-      retval->max_ = (u_int) count;
-      retval->values_ = (CORBA::NamedValue_ptr) ACE_OS::calloc ((u_int) count,
-								sizeof (CORBA::NamedValue));
-    }
-}
-
-// This is a server-side internal routine; it's not available to any
-// portable code except method code, which moreover may not access the
-// state variable directly since its implemention may differ between
-// ORBs.
-//
-// XXX it's server-side so should be OA-specific and not in this module
-
-CORBA::POA_ptr
-CORBA_ORB::POA_init (int &argc,
-		     char **argv,
-		     const char *poa_identifier)
-{
-  // Parse the arguments looking for options starting with -OA. After
-  // processing these options, move all these to the end of the argv
-  // list and decrement argc appropriately.
-
-  TAO_ORB_Core *oc = TAO_ORB_Core_instance ();
-  CORBA::POA_ptr rp;
-  CORBA::String_var id = poa_identifier;
-  CORBA::Environment env;
-
-  for (int i = 0; i < argc; )
-    {
-      // @@ Can you please add comments describing each of these options? --doug
-      // @@ Andy, could you review these since you wrote the code --cjc
-
-      if (ACE_OS::strcmp (argv[i], "-OAid") == 0)
-        {
-          // Specify the name of the OA
-          i++;
-	  if (i < argc)
-            id = CORBA::string_dup (argv[i++]);
-        }
-      else
-	i++;
-    }
-
-  if (oc->root_poa ())
-    {
-      env.exception (new CORBA::INITIALIZE (CORBA::COMPLETED_NO));
-      return 0;
-    }
-
-#if defined (POA_NEEDS_REQ_KEY)
-  (void) ACE_Thread::keycreate (&req_key_);
-#endif /* POA_NEEDS_REQ_KEY */
-
-  ACE_NEW_RETURN (rp, CORBA::POA (this, env), 0);
-
-  return rp;
-}
-
-int
-CORBA_ORB::perform_work (ACE_Time_Value *tv)
-{
-  return TAO_ORB_Core_instance ()->reactor ()->handle_events (tv);
-}
-
-int
-CORBA_ORB::run (ACE_Time_Value *tv)
-{
-  ACE_Reactor *r = TAO_ORB_Core_instance ()->reactor ();
-
-  // This method should only be called by servers, so now we set up
-  // for listening!
-  if (this->open () == -1)
-    return -1;
-
-  // Loop "forever" handling client requests.
-
-  while (this->should_shutdown_ == 0)
-    switch (r->handle_events (tv))
-      {
-      case 0: // Timed out, so we return to caller.
-	return 0;
-	/* NOTREACHED */
-      case -1: // Something else has gone wrong, so return to caller.
-	return -1;
-	/* NOTREACHED */
-      default: // Some handlers were dispatched, so keep on processing
-	       // requests until we're told to shutdown .
-	break;
-	/* NOTREACHED */
-      }
-
-  /* NOTREACHED */
-  return 0;
-}
-
-CORBA_Object_ptr
-CORBA_ORB::resolve_poa (void)
-{
-  ACE_NOTSUP_RETURN (CORBA_Object::_nil ());
-}
-
-CORBA_Object_ptr
-CORBA_ORB::resolve_name_service (void)
-{
-  // First check to see if we've already initialized this.
-  if (this->name_service_ != CORBA_Object::_nil ())
-    // @@ Someone please double-check this ;-)
-    return CORBA_Object::_duplicate (this->name_service_);
-
-  char *name_service_ior =
-    TAO_ORB_Core_instance ()->orb_params ()->name_service_ior ();
-
-  // Second, check to see if the user has give us a parameter on
-  // the command-line.
-  if (name_service_ior == 0)
-    // Third, check to see if the user has an environment variable.
-    name_service_ior = ACE_OS::getenv ("NameService");
-
-  if (name_service_ior != 0)
-    {
-      CORBA::Environment env;
-      this->name_service_ =
-        this->string_to_object (name_service_ior, env);
-      return this->name_service_;
-    }
-
-  // Fourth, use UDP multicast to locate the naming service.
-  else
-    {
-      // First, see if the user has given us a multicast port number
-      // for the name service on the command-line;
-      u_short port = TAO_ORB_Core_instance ()->orb_params ()->name_service_port ();
-      if (port == 0)
-        {
-          const char *port_number = ACE_OS::getenv ("NameServicePort");
-
-          if (port_number != 0)
-            port = ACE_OS::atoi (port_number);
-        }
-
-      if (port == 0)
-        port = TAO_DEFAULT_NAME_SERVER_REQUEST_PORT;
-
-      // This is the code that implements the multicast
-      // Naming Service locator.
-      ACE_SOCK_Dgram_Mcast multicast;
-
-      ACE_INET_Addr remote_addr;
-      // This starts out initialized to all zeros!
-      ACE_INET_Addr multicast_addr (port,
-                                    ACE_DEFAULT_MULTICAST_ADDR);
-
-      // Subscribe to multicast address.
-      if (multicast.subscribe (multicast_addr) == -1)
-	return CORBA_Object::_nil ();
-
-      // Prepare connection for the reply.
-      ACE_INET_Addr response_addr;
-      ACE_SOCK_Dgram response;
-      
-      // Choose any local port, we don't really care.
-      if (response.open (ACE_Addr::sap_any) == -1)
-        {
-          ACE_ERROR ((LM_ERROR, "open failed.\n"));
-          return CORBA_Object::_nil ();
-        }
-      
-
-      if (response.get_local_addr (response_addr) == -1)
-        {
-          ACE_ERROR ((LM_ERROR, "get_local_addr failed.\n"));
-          return CORBA_Object::_nil ();
-        }
-
-      // Figure out what port to listen on for server replies, 
-      // and convert to network byte order.
-      CORBA::Short reply_port = htons (response_addr.get_port_number ());
-
-      // Send multicast of one byte, enough to wake up server.
-      ssize_t n_bytes = multicast.send ((char *) &reply_port,
-                                        sizeof reply_port);
-      if (n_bytes == -1)
-	return CORBA_Object::_nil ();
-
-      ACE_DEBUG ((LM_DEBUG, 
-		  "Sent multicast.  Reply port is %u.  # of bytes sent is %d.\n", 
-		  response_addr.get_port_number (), 
-		  n_bytes));
-
-      char buf[BUFSIZ];
-      // Wait for response until TAO_DEFAULT_NAME_SERVER_TIMEOUT.
-      ACE_Time_Value timeout (TAO_DEFAULT_NAME_SERVER_TIMEOUT);
-
-      n_bytes = response.recv (buf,
-			       BUFSIZ,
-			       remote_addr,
-			       0,
-			       &timeout);
-
-      // Close endpoint for response.
-      int retval = response.close ();
-
-      if (n_bytes == -1 || retval == -1)
-        return CORBA_Object::_nil ();
-
-      // null terminate message
-      buf[n_bytes] = 0;
-
-      ACE_DEBUG ((LM_DEBUG, 
-                  "Naming service resolved to ior: '%s'\n", 
-                  buf));
-
-      // convert ior to an object reference
-      CORBA::Environment env;
-      this->name_service_ =
-	this->string_to_object ((CORBA::String) buf, env);
-
-      // check for errors
-      if (env.exception () != 0)
-	this->name_service_ = CORBA_Object::_nil ();
-
-      // Return ior.
-      return CORBA_Object::_duplicate (this->name_service_);
-    }
-}
-
-CORBA_Object_ptr
-CORBA_ORB::resolve_schedule_service (void)
-{
-  // First check to see if we've already initialized this.
-  if (this->schedule_service_ != CORBA_Object::_nil ())
-    // @@ Someone please double-check this ;-)
-    return CORBA_Object::_duplicate (this->schedule_service_);
-
-  char *schedule_service_ior =
-    TAO_ORB_Core_instance ()->orb_params ()->schedule_service_ior ();
-
-  // Second, check to see if the user has give us a parameter on
-  // the command-line.
-  if (schedule_service_ior != 0)
-    {
-      CORBA::Environment env;
-      this->schedule_service_ =
-        this->string_to_object (schedule_service_ior, env);
-    }
-
-  return this->schedule_service_;
-}
-
-CORBA_Object_ptr
-CORBA_ORB::resolve_event_service (void)
-{
-  // First check to see if we've already initialized this.
-  if (this->event_service_ != CORBA_Object::_nil ())
-    // @@ Someone please double-check this ;-)
-    return CORBA_Object::_duplicate (this->event_service_);
-
-  char *event_service_ior =
-    TAO_ORB_Core_instance ()->orb_params ()->event_service_ior ();
-
-  // Second, check to see if the user has give us a parameter on
-  // the command-line.
-  if (event_service_ior != 0)
-    {
-      CORBA::Environment env;
-      this->event_service_ =
-        this->string_to_object (event_service_ior, env);
-    }
-
-  return this->event_service_;
-}
-
-CORBA_Object_ptr
-CORBA_ORB::resolve_initial_references (CORBA::String name)
-{
-  if (ACE_OS::strcmp (name, "NameService") == 0)
-    return this->resolve_name_service ();
-  if (ACE_OS::strcmp (name, "ScheduleService") == 0)
-    return this->resolve_schedule_service ();
-  if (ACE_OS::strcmp (name, "EventService") == 0)
-    return this->resolve_event_service ();
-  else if (ACE_OS::strcmp (name, "RootPOA") == 0)
-    return this->resolve_poa ();
-  else
-    return CORBA_Object::_nil ();
-}
-
-#define TAO_HASH_ADDR ACE_Hash_Addr<ACE_INET_Addr>
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Dynamic_Service<TAO_Server_Strategy_Factory>;
-template class ACE_Dynamic_Service<TAO_Client_Strategy_Factory>;
-template class ACE_Cached_Connect_Strategy<TAO_Client_Connection_Handler, ACE_SOCK_CONNECTOR, ACE_SYNCH_RW_MUTEX>;
-template class ACE_Cached_Connect_Strategy<TAO_Client_Connection_Handler, ACE_SOCK_CONNECTOR, ACE_SYNCH_NULL_MUTEX>;
-template class ACE_Atomic_Op<ACE_SYNCH_MUTEX, CORBA::Boolean>;
-template class ACE_Hash_Map_Entry<TAO_HASH_ADDR, TAO_Client_Connection_Handler *>;
-template class ACE_Hash_Map_Iterator<TAO_HASH_ADDR, TAO_Client_Connection_Handler *, ACE_SYNCH_RW_MUTEX>;
-template class ACE_Hash_Map_Manager<TAO_HASH_ADDR, TAO_Client_Connection_Handler *, ACE_SYNCH_RW_MUTEX>;
-template class ACE_Hash_Map_Iterator<TAO_HASH_ADDR, TAO_Client_Connection_Handler *, ACE_SYNCH_NULL_MUTEX>;
-template class ACE_Hash_Map_Manager<TAO_HASH_ADDR, TAO_Client_Connection_Handler *, ACE_SYNCH_NULL_MUTEX>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Dynamic_Service<TAO_Server_Strategy_Factory>
-#pragma instantiate ACE_Dynamic_Service<TAO_Client_Strategy_Factory>
-#pragma instantiate ACE_Cached_Connect_Strategy<TAO_Client_Connection_Handler, ACE_SOCK_CONNECTOR, ACE_SYNCH_RW_MUTEX>
-#pragma instantiate ACE_Cached_Connect_Strategy<TAO_Client_Connection_Handler, ACE_SOCK_CONNECTOR, ACE_SYNCH_NULL_MUTEX>
-//#pragma instantiate TAO_HASH_ADDR
-#pragma instantiate ACE_Hash_Map_Entry<TAO_HASH_ADDR, TAO_Client_Connection_Handler *>
-#pragma instantiate ACE_Hash_Map_Iterator<TAO_HASH_ADDR, TAO_Client_Connection_Handler *, ACE_SYNCH_RW_MUTEX>
-#pragma instantiate ACE_Hash_Map_Manager<TAO_HASH_ADDR, TAO_Client_Connection_Handler *, ACE_SYNCH_RW_MUTEX>
-#pragma instantiate ACE_Hash_Map_Iterator<TAO_HASH_ADDR, TAO_Client_Connection_Handler *, ACE_SYNCH_NULL_MUTEX>
-#pragma instantiate ACE_Hash_Map_Manager<TAO_HASH_ADDR, TAO_Client_Connection_Handler *, ACE_SYNCH_NULL_MUTEX>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/orbobj.h b/TAO/tao/orbobj.h
deleted file mode 100644
index df7665782ac..00000000000
--- a/TAO/tao/orbobj.h
+++ /dev/null
@@ -1,197 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO
-// 
-// = FILENAME
-//    orbobj.h
-//
-// = DESCRIPTION
-//     Header file for Win32 interface to CORBA's "ORB" type.
-//
-//     The "ORB" pseudo-object is used in bootstrapping, such as to
-//     create object references from strings.  It's also used to
-//     create strings from object references.
-//
-// = AUTHOR
-//     Copyright 1994-1995 by Sun Microsystems Inc.
-// 
-// ============================================================================
-
-#if !defined (TAO_ORBOBJ_H)
-#  define TAO_ORBOBJ_H
-
-#include "tao/corba.h"
-
-class TAO_Export CORBA_ORB : public IUnknown
-  // = TITLE
-  // ORB pseudo-objref.
-{
-public:
-  CORBA::POA_ptr POA_init (int &argc, 
-                           char **argv, 
-                           const char *poa_identifier = 0);
-  // Initialize the Portable Object Adapter (POA).
-
-  static CORBA::ORB_ptr _duplicate (CORBA::ORB_ptr orb);
-  // Return a duplicate of <{orb}>.  When work with this duplicate is
-  // complete, it should be freed up using <CORBA::release()>.
-  
-  static CORBA::ORB_ptr _nil (void);
-  // Returns a pointer to a nil ORB, i.e., an non-existent ORB.  This
-  // can be used for initialization or in comparisons.
-
-  virtual CORBA::Object_ptr string_to_object (const CORBA::String str,
-					      CORBA::Environment &env) = 0;
-  // Turn a string-ified object reference back into an object pointer.
-  // Each type of ORB, e.g. an IIOP ORB, must implement this.
-  // Typically these strings are created using <object_to_string()>.
-  virtual CORBA::String object_to_string (CORBA::Object_ptr obj,
-					  CORBA::Environment &env) = 0;
-  // Turn an object reference into a string.  Each type of ORB,
-  // e.g. an IIOP ORB, must implement this.  This can be used by
-  // servers to publish their whereabouts to clients.  The output of
-  // this is typically eventually given to <string_to_object()> as an
-  // argument.
-
-  void create_list (CORBA::Long count,
-                    CORBA::NVList_ptr &retval);
-
-  // = New Things from the POA Specification
-  //
-  // Of all of these operations, only <run> is currently implemented.
-  // Others require clarification of design or more implementation
-  // than is currently available.
-  
-  CORBA::Boolean work_pending (void);
-  // Returns an indication of whether the ORB needs the <{main thread}> to
-  // perform some work.
-  
-  int perform_work (ACE_Time_Value * = 0);
-  // If called by the <{main thread}>, this operation performs an
-  // implementation-defined unit of work. Otherwise, it does nothing.
-  //
-  // It is platform-specific how the application and ORB arrange to
-  // use compatible threading primitives.
-  
-  int run (ACE_Time_Value *tv = 0);
-  // Instructs the ORB to initialize itself and run its event loop in
-  // the current thread, not returning until the ORB has shut down.
-  // If an error occurs during initialization or a run-time this
-  // method will return -1.  If <tv> is non-NULL then if no requests
-  // arrive at this thread before the timeout elapses we return to the
-  // caller with a value of 0 (this allows timeouts).  Otherwise, if
-  // we've returned since we've been asked to shut down the value of 1
-  // is returned.
-  //
-  // <{Note that this interface differs from the POA specification,
-  // which is reproduced below:}> 
-  //
-  // Returns when the ORB has shut down.  If called by the main
-  // thread, it enables the ORB to perform work using the main
-  // thread. Otherwise, it simply waits until the ORB has shut down.
-  //
-  // This operation can be used instead of perform_work() to give the
-  // main thread to the ORB if there are no other activities that need
-  // to share the main thread. Even in a pure multi-threaded server,
-  // calling run() in the main thread is useful to ensure that the
-  // process does not exit until the ORB has been shut down.
-
-  void shutdown (CORBA::Boolean wait_for_completion = CORBA::B_FALSE);
-  // This operation instructs the ORB to shut down. Shutting down the
-  // ORB causes all Object Adapters to be shut down. If
-  // <wait_for_completion> parameter is TRUE, this operation blocks
-  // until all ORB processing (including request processing and object
-  // deactivation or other operations associated with object adapters)
-  // has completed.  <[NOTE]> <wait_for_completion>=TRUE is not
-  // currently supported.
-
-  // = <IUnknown> Support
-  //
-  // Stuff required for COM IUnknown support ... this class is
-  // intended to be inherited by others, which will provide some more
-  // of the CORBA/COM support.  Implementations of this "CORBA::ORB"
-  // class must know how to create stringify/destringify their
-  // objrefs, as well as how to marshal and unmarshal them ... as well
-  // as provide their own QueryInterface.
-
-  ULONG __stdcall AddRef (void);
-  ULONG __stdcall Release (void);
-
-  CORBA_Object_ptr resolve_initial_references (CORBA::String name);
-  // This method acts as a miniature name service provided by the ORB
-  // for certain well-known object references.  TAO will shortly
-  // support the "NameService" and "RootPOA" via this method.
-
-  // = TAO-specific methods.
-  TAO_Client_Strategy_Factory *client_factory (void);
-  // Returns pointer to the client factory.
-  TAO_Server_Strategy_Factory *server_factory (void);
-  // Returns pointer to the server factory.
-
-  int open (void);
-  // Set up the ORB Core's acceptor to listen on the
-  // previously-specified port for requests.  Returns -1 on failure,
-  // else 0.
-
-protected:
-  // We must be created via the <ORB_init> call.
-  CORBA_ORB (void);
-  virtual ~CORBA_ORB (void);
-
-private:
-  CORBA_Object_ptr resolve_name_service (void);
-  // Resolve the name service object reference.
-
-  // @@ TODO: This should go away once the NamingService is working.
-  CORBA_Object_ptr resolve_schedule_service (void);
-  // Resolve the scheduler service object reference.
-
-  CORBA_Object_ptr resolve_event_service (void);
-  // Resolve the event service object reference.
-
-  CORBA_Object_ptr resolve_poa (void);
-  // Resolve the POA.
-
-  ACE_SYNCH_MUTEX lock_;
-  u_int refcount_;
-  ACE_Atomic_Op<ACE_SYNCH_MUTEX, CORBA::Boolean> open_called_;
-
-  // @@ Quite possibly everything btw ORB_CORE_STUFF should go into
-  // the TAO_ORB_Core class...
-
-  // @@ Please document all these fields.
-
-  // = ORB_CORE_STUFF
-  TAO_Client_Strategy_Factory *client_factory_;
-
-  CORBA::Boolean client_factory_from_service_config_;
-
-  TAO_Server_Strategy_Factory *server_factory_;
-
-  CORBA::Boolean server_factory_from_service_config_;
-
-  ACE_Atomic_Op<ACE_SYNCH_MUTEX, CORBA::Boolean> should_shutdown_;
-  // Flag which denotes that the ORB should shut down and <run> should
-  // return.
-
-  CORBA_Object_ptr name_service_;
-  // If this is non-_nil(), then this is the object reference to our
-  // configured Naming Context.
-
-  CORBA_Object_ptr schedule_service_;
-  // If this is non-_nil(), then this is the object reference to our
-  // configured RtecScheduler::Scheduler.
-
-  CORBA_Object_ptr event_service_;
-  // If this is non-_nil(), then this is the object reference to our
-  // configured Event Channel.
-
-  // = NON-PROVIDED METHODS
-  CORBA_ORB (const CORBA_ORB &);
-  CORBA_ORB &operator= (const CORBA_ORB &);
-};
-
-#endif /* TAO_ORBOBJ_H */
diff --git a/TAO/tao/orbobj.i b/TAO/tao/orbobj.i
deleted file mode 100644
index 1f901da8c48..00000000000
--- a/TAO/tao/orbobj.i
+++ /dev/null
@@ -1,59 +0,0 @@
-// -*- c++ -*-
-//
-// $Id$
-
-// CORBA dup/release build on top of COM's (why not).
-
-ACE_INLINE void
-CORBA::release (CORBA::ORB_ptr obj)
-{
-  if (obj)
-    obj->Release ();
-}
-
-ACE_INLINE ULONG __stdcall
-CORBA_ORB::AddRef (void)
-{
-  ACE_MT (ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, guard, lock_, 0));
-
-  return refcount_++;
-}
-
-ACE_INLINE CORBA::ORB_ptr
-CORBA_ORB::_duplicate (CORBA::ORB_ptr obj)
-{
-  if (obj)
-    obj->AddRef ();
-  return obj;
-}
-
-// Null pointers represent nil objects.
-
-ACE_INLINE CORBA::ORB_ptr
-CORBA_ORB::_nil (void)
-{
-  return 0;
-}
-
-ACE_INLINE CORBA::Boolean
-CORBA::is_nil (CORBA::ORB_ptr obj)
-{
-  return (CORBA::Boolean) (obj == 0);
-}
-
-ACE_INLINE CORBA::Boolean
-CORBA_ORB::work_pending (void)
-{
-  // There's ALWAYS work to do ;-)
-  return CORBA::B_TRUE;
-}
-
-ACE_INLINE void
-CORBA_ORB::shutdown (CORBA::Boolean wait_for_completion)
-{
-  ACE_UNUSED_ARG (wait_for_completion);
-  
-  this->should_shutdown_ = CORBA::B_TRUE;
-  TAO_ORB_Core_instance ()->reactor ()->wakeup_all_threads ();
-  return;
-}
diff --git a/TAO/tao/params.cpp b/TAO/tao/params.cpp
deleted file mode 100644
index c3c6c526ef9..00000000000
--- a/TAO/tao/params.cpp
+++ /dev/null
@@ -1,111 +0,0 @@
-#include "tao/corba.h"
-
-TAO_ORB_Parameters::TAO_ORB_Parameters (void)
-  : name_service_ior_ (0),
-    name_service_port_ (0),
-    schedule_service_ior_ (0),
-    event_service_ior_ (0)
-{
-}
-
-TAO_ORB_Parameters::~TAO_ORB_Parameters (void)
-{
-}
-
-void
-TAO_ORB_Parameters::addr (const ACE_INET_Addr &addr)
-{
-  this->addr_ = addr;
-}
-
-// Get the address on which we're listening.
-
-const ACE_INET_Addr &
-TAO_ORB_Parameters::addr (void)
-{
-  return this->addr_;
-}
-
-void 
-TAO_ORB_Parameters::name_service_ior (CORBA::String ns)
-{
-  this->name_service_ior_ = ns;
-}
-
-// Set the IOR of our name service.
-
-CORBA::String 
-TAO_ORB_Parameters::name_service_ior (void)
-{
-  return this->name_service_ior_;
-}
-
-// Get the IOR of our name service.
-
-void 
-TAO_ORB_Parameters::schedule_service_ior (CORBA::String s)
-{
-  this->schedule_service_ior_ = s;
-}
-
-// Set the IOR of our Schedule service.
-
-CORBA::String 
-TAO_ORB_Parameters::schedule_service_ior (void)
-{
-  return this->schedule_service_ior_;
-}
-
-// Get the IOR of our schedule service.
-
-void 
-TAO_ORB_Parameters::event_service_ior (CORBA::String s)
-{
-  this->event_service_ior_ = s;
-}
-
-// Set the IOR of our Schedule service.
-
-CORBA::String 
-TAO_ORB_Parameters::event_service_ior (void)
-{
-  return this->event_service_ior_;
-}
-
-// Get the IOR of our event service.
-
-void 
-TAO_ORB_Parameters::name_service_port (CORBA::UShort port)
-{
-  this->name_service_port_ = port;
-}
-
-// Set the port of our name service.
-
-CORBA::UShort 
-TAO_ORB_Parameters::name_service_port (void)
-{
-  return this->name_service_port_;
-}
-
-void 
-TAO_OA_Parameters::demux_strategy (const char* strategy)
-{
-  // Determine the demux strategy based on the given name
-  if (!ACE_OS::strcmp (strategy, "linear"))
-    this->demux_ = TAO_LINEAR;
-  else if (!ACE_OS::strcmp (strategy, "dynamic_hash"))
-    this->demux_ = TAO_DYNAMIC_HASH;
-  else if (!ACE_OS::strcmp (strategy, "user_def"))
-    this->demux_ = TAO_USER_DEFINED;
-  else if (!ACE_OS::strcmp (strategy, "active_demux"))
-    this->demux_ = TAO_ACTIVE_DEMUX;
-  else
-    // Provide fallback!
-    this->demux_ = TAO_DYNAMIC_HASH;
-}
-
-#if !defined (__ACE_INLINE__)
-#  include "params.i"
-#endif /* __ACE_INLINE__ */
-
diff --git a/TAO/tao/params.h b/TAO/tao/params.h
deleted file mode 100644
index e12277c3ed3..00000000000
--- a/TAO/tao/params.h
+++ /dev/null
@@ -1,162 +0,0 @@
-/* -*- C++ -*- */
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO
-// 
-// = FILENAME
-//    params.h
-//
-// = AUTHOR
-//    Chris Cleeland
-// 
-// ============================================================================
-
-#if !defined (TAO_PARAMS_H)
-#  define TAO_PARAMS_H
-
-// Forward decls.
-
-class TAO_Server_Connection_Handler;
-
-// This is a quick hack to avoid having to unravel the intracacies of
-// the all the hairy order interdepencies that currently exist in TAO.
-#if ! defined (__ACE_INLINE__)
-#define TAO_LOCAL_INLINE
-#else
-#define TAO_LOCAL_INLINE ACE_INLINE
-#endif /* ! __ACE_INLINE__ */
-
-class TAO_Export TAO_ORB_Parameters
-  // = TITLE
-  //    Parameters that are specific to the ORB.  These parameters can
-  //    be for the client, the server, or for both.
-  //
-  // = NOTE
-  // Some of the functions have inline definitions in the class header
-  // below.  Please do not move them back to the .i file.
-  // cygnus-2.7.2-960126, distributed with Tornado 1.0.1, can't deal
-  // with returing a const reference here.  It raises an internal
-  // compiler error at ace/Svc_Handler.cpp:46, of all places.
-{
-public:
-  TAO_ORB_Parameters (void);
-  // Constructor.
-  
-  ~TAO_ORB_Parameters (void);
-  // Destructor.
-  
-  void addr (const ACE_INET_Addr &addr);
-  // Set the address on which we're listening.
-
-  const ACE_INET_Addr &addr (void);
-  // Get the address on which we're listening.
-
-  void name_service_ior (CORBA::String ns);
-  // Set the IOR of our name service.
-
-  CORBA::String name_service_ior (void);
-  // Get the IOR of our name service.
-
-  void name_service_port (CORBA::UShort port);
-  // Set the port of our name service.
-
-  CORBA::UShort name_service_port (void);
-  // Get the port of our name service.
-
-  // @@ TODO: This shouldn't be needed, they were added until the
-  // Naming Service works correctly.
-  CORBA::String schedule_service_ior (void);
-  // Get the IOR of the 
-
-  void schedule_service_ior (CORBA::String ns);
-  // Set the IOR of our schedule service.
-
-  CORBA::String event_service_ior (void);
-  // Get the IOR of the event service
-
-  void event_service_ior (CORBA::String ns);
-  // Set the IOR of our event service.
-
-private:
-  ACE_INET_Addr addr_;          
-  // host + port number we are listening on
-
-  CORBA::String name_service_ior_;
-  // The IOR of our configured Naming Service.
-
-  CORBA::UShort name_service_port_;
-  // The port number of our configured Naming Service.
-
-  CORBA::String schedule_service_ior_;
-  // The IOR of our configured Scheduling Service.
-
-  CORBA::String event_service_ior_;
-  // The IOR of our configured Event Service.
-};
-
-typedef enum 
-{
-  TAO_NONE,
-  TAO_LINEAR,
-  TAO_DYNAMIC_HASH,
-  TAO_ACTIVE_DEMUX,
-  TAO_USER_DEFINED
-} TAO_Demux_Strategy;
-
-class TAO_Export TAO_OA_Parameters
-  // = TITLE
-  //    Parameters specific to an Object Adapter.  By definition, this
-  //    is only on the server side, since a client does not have an
-  //    object adapter.
-  //
-  // = NOTES
-  //    This can be subclassed in order to have OA-specific
-  //    parameters, e.g., the Realtime Object Adapter might subclass
-  //    this and add its own parameters.
-{
-public:
-  TAO_LOCAL_INLINE TAO_OA_Parameters (void);
-  // Constructor
-
-  TAO_LOCAL_INLINE ~TAO_OA_Parameters (void);
-  // Destructor
-  
-  void demux_strategy (const char *strategy);
-  // Specify the demultiplexing strategy to be used via <{strategy}>.
-  // Valid values are one of (case matters) "linear", "dynamic_hash",
-  // "user_def", or "active_demux".  If the value is not valid, then
-  // <Dynamic Hash> is used as a default.
-  
-  TAO_LOCAL_INLINE void demux_strategy (TAO_Demux_Strategy s);
-  // Specify the demultiplexing strategy to be used.
-  
-  TAO_LOCAL_INLINE TAO_Demux_Strategy demux_strategy (void);
-  // Return the demultiplexing strategy being used.
-
-  TAO_LOCAL_INLINE void userdef_lookup_strategy (TAO_Object_Table *&ot);
-  // Provide a way for user defined object key lookup strategies to be
-  // plugged in.
-
-  TAO_LOCAL_INLINE TAO_Object_Table *userdef_lookup_strategy (void);
-  // return the lookup strategy
-
-  TAO_LOCAL_INLINE void tablesize (CORBA::ULong tablesize);
-  // set the table size for lookup table
-
-  TAO_LOCAL_INLINE CORBA::ULong tablesize (void);
-  // get the table size for the lookup table
-
-private:
-  TAO_Demux_Strategy demux_;  
-  // demux strategy
-
-  CORBA::ULong tablesize_;       
-  // size of object lookup table
-
-  TAO_Object_Table *ot_;
-  // concrete lookup table instance
-};
-
-#endif /* TAO_PARAMS_H */
diff --git a/TAO/tao/params.i b/TAO/tao/params.i
deleted file mode 100644
index 344469d59d2..00000000000
--- a/TAO/tao/params.i
+++ /dev/null
@@ -1,67 +0,0 @@
-/* -*- C++ -*- */
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO
-// 
-// = FILENAME
-//    params.i
-//
-// = AUTHOR
-//    Chris Cleeland
-// 
-// ============================================================================
-
-ACE_INLINE
-TAO_OA_Parameters::TAO_OA_Parameters (void)
-{
-}
-
-ACE_INLINE
-TAO_OA_Parameters::~TAO_OA_Parameters (void)
-{
-}
-
-ACE_INLINE void
-TAO_OA_Parameters::demux_strategy (TAO_Demux_Strategy strategy)
-{
-  this->demux_ = strategy;      // Trust that the value is valid!
-}
-
-//ACE_INLINE TAO_OA_Parameters::TAO_Demux_Strategy
-ACE_INLINE TAO_Demux_Strategy
-TAO_OA_Parameters::demux_strategy (void)
-{
-  return this->demux_;
-}
-
-ACE_INLINE void
-TAO_OA_Parameters::tablesize (CORBA::ULong tblsize)
-{
-  this->tablesize_ = tblsize;
-}
-
-ACE_INLINE CORBA::ULong
-TAO_OA_Parameters::tablesize (void)
-{
-  return this->tablesize_;
-}
-
-ACE_INLINE void 
-TAO_OA_Parameters::userdef_lookup_strategy (TAO_Object_Table *&ot)
-{
-  // provide a way for user defined object key lookup strategies to be plugged
-  // in
-  ot_ = ot;
-  ot = 0;  // we own it now
-}
-
-ACE_INLINE TAO_Object_Table *
-TAO_OA_Parameters::userdef_lookup_strategy (void)
-{
-  // return the lookup strategy
-  return ot_;
-}
-
-
diff --git a/TAO/tao/poa.cpp b/TAO/tao/poa.cpp
deleted file mode 100644
index 454d9065bdf..00000000000
--- a/TAO/tao/poa.cpp
+++ /dev/null
@@ -1,465 +0,0 @@
-// @(#) $Id$
-//
-// Copyright 1994-1995 by Sun Microsystems Inc.
-// All Rights Reserved
-//
-// POA initialisation -- both anonymous and (for system bootstrapping) 
-// named POAs.
-//
-// XXX at this time, there's a strong linkage between this code and
-// the modules knowing about IIOP.  In the future, a looser coupling
-// between OA initialiszation and protocol components is desired.
-
-#include "tao/corba.h"
-
-// {A201E4C8-F258-11ce-9598-0000C07CA898}
-DEFINE_GUID (IID_POA,
-0xa201e4c8, 0xf258, 0x11ce, 0x95, 0x98, 0x0, 0x0, 0xc0, 0x7c, 0xa8, 0x98) ;
-
-// CORBA_POA::init() is used in get_poa() and get_named_poa() in order
-// to initialize the OA.  It was originally part of POA, and may no
-// longer be useful.
-
-CORBA::POA_ptr
-CORBA_POA::init (CORBA::ORB_ptr parent,
-                 ACE_INET_Addr &,
-                 CORBA::Environment &env)
-{
-  env.clear ();
-  TAO_ORB_Core *p = TAO_ORB_Core_instance ();
-
-  if (p->root_poa ())
-    {
-      env.exception (new CORBA_INITIALIZE (CORBA::COMPLETED_NO));
-      return 0;
-    }
-
-  CORBA::POA_ptr rp;
-  ACE_NEW_RETURN (rp, CORBA_POA (parent, env), 0);
-  p->root_poa (rp);
-
-  return rp;
-}
-
-CORBA_POA::CORBA_POA (CORBA::ORB_ptr owning_orb,
-                      CORBA::Environment &)
-  : do_exit_ (CORBA::B_FALSE), 
-    orb_ (owning_orb),
-    call_count_ (0),
-    skeleton_ (0)
-{
-  TAO_Server_Strategy_Factory *f = orb_->server_factory ();
-  TAO_ORB_Core* p = TAO_ORB_Core_instance ();
-  
-  this->objtable_ = f->create_object_table ();
-
-  // @@ What is this doing here?  Why is it setting the root poa based
-  // on whether objtable_ is non-zero?  (cjc)
-  if (this->objtable_ != 0)
-    p->root_poa (this);
-}
-
-CORBA_POA::~CORBA_POA (void)
-{
-}
-
-// Create an objref
-
-CORBA::Object_ptr
-CORBA_POA::create (CORBA::OctetSeq &key,
-                   CORBA::String type_id,
-                   CORBA::Environment &env)
-{
-  CORBA::String id;
-  IIOP_Object *data;
-
-  if (type_id)
-    id = CORBA::string_copy (type_id);
-  else
-    id = 0;
-
-  
-
-  data = new IIOP_Object (id,
-                          IIOP::Profile (TAO_ORB_Core_instance ()->orb_params ()->addr (),
-                                         key));
-  if (data != 0)
-    env.clear ();
-  else
-    {
-      env.exception (new CORBA_NO_MEMORY (CORBA::COMPLETED_NO));
-      return 0;
-    }
-
-  // Return the CORBA::Object_ptr interface to this objref.
-  CORBA::Object_ptr new_obj;
-
-  if (data->QueryInterface (IID_CORBA_Object,
-			    (void **) &new_obj) != NOERROR)
-    env.exception (new CORBA::INTERNAL (CORBA::COMPLETED_NO));
-
-  data->Release ();
-  return new_obj;
-}
-
-// Return the key fed into an object at creation time.
-
-CORBA::OctetSeq *
-CORBA_POA::get_key (CORBA::Object_ptr,
-                    CORBA::Environment &env)
-{
-  // XXX implement me ! ... must have been created by this OA.
-  env.exception (new CORBA_IMP_LIMIT (CORBA::COMPLETED_NO));
-  return 0;
-}
-
-#if 0
-// Used by method code to ask the OA to shut down.
-void
-CORBA_POA::please_shutdown (CORBA::Environment &env)
-{
-  ACE_MT (ACE_GUARD (ACE_SYNCH_MUTEX, poa_mon, lock_));
-
-  env.clear ();
-  do_exit_ = CORBA::B_TRUE;
-}
-
-// Used by non-method code to tell the OA to shut down.
-void
-CORBA_POA::clean_shutdown (CORBA::Environment &env)
-{
-  ACE_MT (ACE_GUARD (ACE_SYNCH_MUTEX, poa_mon, lock_));
-
-  env.clear ();
-
-  if (call_count_ != 0)
-    {
-      dmsg ("called clean_shutdown with requests outstanding");
-      env.exception (new CORBA::BAD_INV_ORDER (CORBA::COMPLETED_NO));
-      return;
-    }
-
-  // Here we need to tell all the endpoints to shut down...
-}
-#endif /* 0 */
-
-// For POA -- POA operations for which we provide the vtable entry
-void
-CORBA_POA::register_dir (dsi_handler handler,
-                         void *ctx,
-                         CORBA::Environment &env)
-{
-  if (handler == 0)
-    {
-      env.exception (new CORBA::BAD_PARAM (CORBA::COMPLETED_NO));
-      return;
-    }
-
-  skeleton_ = handler;
-  context_ = ctx;
-
-  env.clear ();
-}
-
-// A "Named POA" is used in bootstrapping some part of the ORB since
-// it's name-to-address binding is managed by the OS.  Examples of
-// such bindings are /etc/services (for TCP) and /etc/rpc (for ONC
-// RPC) .  The name of a POA is only guaranteed to be unique within
-// the domain of a single system, as a rule; two hosts would have
-// distinct "king" POAs.
-//
-// For network endpoints, most such names are manually administered.
-// Some other namespaces (AF_UNIX filesystem names for example) have a
-// more formal underlying name service that can be dynamically updated
-// while not compromising system security.
-//
-// The address family used by the POA is found from the ORB passed in.
-//
-// XXX the coupling could stand to be looser here, so this module did
-// not know specifically about the Internet ORB !!
-
-CORBA::POA_ptr
-CORBA_POA::get_named_poa (CORBA::ORB_ptr orb,
-                          CORBA::String name,
-                          CORBA::Environment &env) 
-{
-  env.clear ();
-
-  // If the ORB is an Internet ORB, we know this must be a TCP OA.
-  {
-    IIOP_ORB *internet;
-
-    if (orb->QueryInterface (IID_IIOP_ORB, (void **) &internet) == NOERROR) 
-      {
-        CORBA::POA_ptr tcp_oa;
-
-        internet->Release ();
-
-        // POA initialization with name specified; it'll come from
-        // /etc/services if it's not a port number.
-
-        ACE_INET_Addr poa_name (name, (ACE_UINT32) INADDR_ANY);
-
-        tcp_oa = CORBA::POA::init (orb, poa_name, env);
-
-        if (env.exception () != 0) 
-          return 0;
-        else
-          return tcp_oa;		// derives from POA
-      }
-  }
-
-  // We don't know how to deal with this kind of ORB.  Report error.
-
-  env.exception (new CORBA::BAD_PARAM (CORBA::COMPLETED_NO) );
-  return 0;
-}
-
-// An "Anonymous" POA is used more routinely.  The name used doesn't
-// matter to anyone; it is only used to create object references with
-// a short lifespan, namely that of the process acquiring this POA.
-
-CORBA::POA_ptr
-CORBA_POA::get_poa (CORBA::ORB_ptr orb,
-		    CORBA::Environment &env) 
-{
-  env.clear ();
-
-  // If the ORB is an Internet ORB, we know this must be a TCP OA.
-  {
-    IIOP_ORB	*internet;
-
-    if (orb->QueryInterface (IID_IIOP_ORB, (void **) &internet) == NOERROR) 
-      {
-        CORBA::POA_ptr tcp_oa;
-
-        internet->Release ();
-
-        // POA initialization with null name means anonymous OA
-
-        ACE_INET_Addr anonymous ((u_short) 0, (ACE_UINT32) INADDR_ANY);
-
-        tcp_oa = CORBA::POA::init (orb, anonymous, env);
-
-        if (env.exception () != 0) 
-          return 0;
-        else
-          return tcp_oa;		// derives from POA
-      }
-  }
-
-  // We don't know how to deal with this kind of ORB.  Report error.
-
-  env.exception (new CORBA::BAD_PARAM (CORBA::COMPLETED_NO) );
-  return 0;
-}
-
-void CORBA_POA::dispatch (CORBA::OctetSeq &key,
-			  CORBA::ServerRequest &req,
-			  void *context,
-			  CORBA::Environment &env) 
-{
-  ACE_UNUSED_ARG(context);
-  
-  TAO_Skeleton skel;  // pointer to function pointer for the operation
-  CORBA::Object_ptr obj;  // object that will be looked up based on the key
-  CORBA::String  opname;
-
-  // Get the skeleton
-
-  // Find the object based on the key
-  if (this->find (key, obj) != -1) 
-    {
-      opname = req.op_name ();
-
-      // Find the skeleton "glue" function based on the operation name
-      if (obj->find (opname, skel) != -1)
-        // Schedule the upcall.  This is the degenerate case of scheduling...
-        // using a "do it now!" scheduler
-	skel (req, obj, env);
-      else
-	{
-	  // Something really bad happened: the operation was not
-	  // found in the object, fortunately there is a standard
-	  // exception for that purpose.
-	  env.exception (new CORBA_BAD_OPERATION (CORBA::COMPLETED_NO));
-	  ACE_ERROR ((LM_ERROR,
-		      "Cannot find operation <%s> in object\n",
-		      opname));
-	}
-    }
-
-  // We need to pass this skel and associated information to the
-  // scheduler. How do we do it??
-}
-
-int
-CORBA_POA::find (const CORBA::OctetSeq &key,
-		 CORBA::Object_ptr &obj)
-{
-  return objtable_->find (key, obj);
-}
-
-int
-CORBA_POA::bind (const CORBA::OctetSeq &key, 
-		 CORBA::Object_ptr obj)
-{
-  return objtable_->bind (key, obj);
-}
-
-void
-CORBA_POA::handle_request (TAO_GIOP_RequestHeader hdr,
-                           CDR &request_body,
-                           CDR &response,
-                           TAO_Dispatch_Context *some_info,
-                           CORBA::Environment &env)
-{
-  ACE_UNUSED_ARG (some_info);
-  
-  IIOP_ServerRequest svr_req (&request_body, this->orb (), this);
-
-  // Why are we copying this when we can just pass in a handle to the
-  // hdr?
-  svr_req.opname_ = hdr.operation; 
-
-  this->dispatch (hdr.object_key,
-                  svr_req,
-                  0, // this is IIOP residue 
-                  env);
-
-  svr_req.release ();
-
-  // If no reply is necessary (i.e., oneway), then return!
-  if (hdr.response_expected == 0)
-    return;
-  
-  // Otherwise check for correct parameter handling, and reply as
-  // appropriate.
-  //
-  // NOTE: if "env" is set, it takes precedence over exceptions
-  // reported using the mechanism of the ServerRequest.  Only system
-  // exceptions are reported that way ...
-  //
-  // XXX Exception reporting is ambiguous; it can be cleaner than
-  // this.  With both language-mapped and dynamic/explicit reporting
-  // mechanisms, one of must be tested "first" ... so an exception
-  // reported using the other mechanism could be "lost".  Perhaps only
-  // the language mapped one should be used for system exceptions.
-
-  TAO_GIOP::start_message (TAO_GIOP_Reply, response);
-  TAO_GIOP_ServiceContextList resp_ctx;
-  resp_ctx.length = 0;
-  response.encode (&TC_ServiceContextList, &resp_ctx, 0, env);
-  response.put_ulong (hdr.request_id);
-  
-  CORBA::TypeCode_ptr tc;
-  const void *value;
-
-  if (!svr_req.params_ && env.exception () == 0) 
-    {
-      dmsg ("DSI user error, didn't supply params");
-      env.exception (new CORBA::BAD_INV_ORDER (CORBA::COMPLETED_NO));
-    }
-
-  // Standard exceptions only.
-  if (env.exception () != 0) 
-    {	
-      CORBA::Environment env2;
-      CORBA::Exception *x = env.exception ();
-      CORBA::TypeCode_ptr except_tc = x->type ();
-
-      response.put_ulong (TAO_GIOP_SYSTEM_EXCEPTION);
-      (void) response.encode (except_tc, x, 0, env2);
-    }
-
-  // Any exception at all.
-  else if (svr_req.exception_)
-    {	
-      CORBA::Exception *x;
-      CORBA::TypeCode_ptr except_tc;
-
-      x = (CORBA::Exception *) svr_req.exception_->value ();
-      except_tc = svr_req.exception_->type ();
-
-      // Finish the GIOP Reply header, then marshal the exception.
-      //
-      // XXX x->type () someday ...
-      if (svr_req.ex_type_ == CORBA::SYSTEM_EXCEPTION)
-	response.put_ulong (TAO_GIOP_SYSTEM_EXCEPTION);
-      else
-	response.put_ulong (TAO_GIOP_USER_EXCEPTION);
-
-      (void) response.encode (except_tc, x, 0, env);
-    }
-
-  // Normal reply.
-  else
-    {				
-      // First finish the GIOP header ...
-      response.put_ulong (TAO_GIOP_NO_EXCEPTION);
-
-      // ... then send any return value ...
-      if (svr_req.retval_)
-	{
-	  tc = svr_req.retval_->type ();
-	  value = svr_req.retval_->value ();
-	  (void) response.encode (tc, value, 0, env);
-	}
-
-      // ... Followed by "inout" and "out" parameters, left to right
-      for (u_int i = 0;
-           i < svr_req.params_->count ();
-           i++)
-	{
-	  CORBA::NamedValue_ptr	nv = svr_req.params_->item (i);
-	  CORBA::Any_ptr any;
-
-	  if (!(nv->flags () & (CORBA::ARG_INOUT|CORBA::ARG_OUT)))
-	    continue;
-
-	  any = nv->value ();
-	  tc = any->type ();
-	  value = any->value ();
-	  (void) response.encode (tc, value, 0, env);
-	}
-    }
-}
-
-// IUnknown calls
-ULONG __stdcall
-CORBA_POA::AddRef (void)
-{
-  ACE_MT (ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, poa_mon, com_lock_, 0));
-  return ++refcount_;
-}
-
-ULONG __stdcall
-CORBA_POA::Release (void)
-{
-  {
-    ACE_MT (ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, poa_mon, com_lock_, 0));
-
-    if (--refcount_ != 0)
-      return refcount_;
-  }
-
-  delete this;
-  return 0;
-}
-
-HRESULT __stdcall
-CORBA_POA::QueryInterface (REFIID riid,
-                           void **ppv)
-{
-  *ppv = 0;
-
-  if (IID_POA == riid
-      || IID_IUnknown == riid)
-    *ppv = this;
-
-  if (*ppv == 0)
-    return ResultFromScode (E_NOINTERFACE);
-
- (void) AddRef ();
-  return NOERROR;
-}
diff --git a/TAO/tao/poa.h b/TAO/tao/poa.h
deleted file mode 100644
index 53c555688ef..00000000000
--- a/TAO/tao/poa.h
+++ /dev/null
@@ -1,286 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO
-// 
-// = FILENAME
-//    poa.h
-//
-// = DESCRIPTION
-//     (Early) POA
-//
-// = AUTHOR
-//     Copyright 1994-1995 by Sun Microsystems, Inc.
-// 
-// ============================================================================
-
-#if !defined (TAO_POA_H)
-#define TAO_POA_H
-
-#include "tao/corba.h"
-
-class TAO_GIOP_RequestHeader;
-
-// @@ Why does this inherit from IUnknown?
-class TAO_Export CORBA_POA : public IUnknown
-  // = TITLE
-  //    The <{TAO}> Basic Object Adapter.
-{
-public:
-  CORBA_POA (CORBA::ORB_ptr orb_arg,
-             CORBA::Environment &env);
-  virtual ~CORBA_POA (void);
-
-  static CORBA::POA_ptr init (CORBA::ORB_ptr which_orb, 
-                              ACE_INET_Addr &addr,
-                              CORBA::Environment &env);
-  // NON-STANDARD CALL.  According to CORBA V2.0, this functionality
-  // should really be <POA_ptr ORB::POA_init (argc,argv,ident)>.
-  //
-  // The current signature is residue from when this code was part of
-  // the SunSoft IIOP reference implementation.
-  //
-  // @@ Hum, does this still make sense now that it's in POA?
-
-  /* virtual */
-  CORBA::Object_ptr create (CORBA::OctetSeq& obj_id,
-                            CORBA::String type_id,
-                            CORBA::Environment& env);
-  // Create a reference to an object, using identifying information
-  // that is fully exposed to applications. (An ORB may use additional
-  // data internally, of course.)
-  //
-  // Object IDs are assigned and used by servers to identify objects.
-  //
-  // Type IDs are repository IDs, assigned as part of OMG-IDL
-  // interface definition to identify specific interfaces and their
-  // relationships to other OMG-IDL interfaces.  It's OK to provide a
-  // null type ID.
-  //
-  // Clients which invoke operations using one of these references
-  // when the server is not active (or after the last reference to the
-  // POA is released) will normally see an OBJECT_NOT_EXIST exception
-  // reported by the ORB.  If the POA is a "Named POA" the client's
-  // ORB will not normally return OBJECT_NOT_EXIST unless the POA
-  // reports that fault.
-  //
-  // NOTE: Since any given POA may have been used in the past, servers
-  // may need to place some data (such as a timestamp) into the object
-  // ID to help distinguish different incarnations of the POA.  "Named
-  // POA" objects won't want those semantics as much as "Anonymous"
-  // ones.
-
-  virtual void handle_request (TAO_GIOP_RequestHeader hdr,
-                               CDR &request_body,
-                               CDR &response,
-                               TAO_Dispatch_Context *some_info,
-                               CORBA::Environment &env);
-  // Entry point for the ORB Core to hand off a request for processing
-  // and eventual dispatch.  Derived classes can override this to
-  // perform their own processing.
-  
-  typedef void (CORBA_POA::*dsi_handler) (CORBA::OctetSeq &obj_id,
-					  CORBA::ServerRequest &request,
-					  void *context,
-					  CORBA::Environment &env);
-  // @@ Please add a comment.  BTW, weren't we planning to rename this
-  // typedef?
-
-  /* virtual */
-  void register_dir (dsi_handler handler,
-                     void *context,
-                     CORBA::Environment &env);
-  // All invocations are handled using DSI ... slightly enhanced from
-  // the original CORBA 2.0 specs, to improve performance by getting
-  // rid of all mallocation for calls with fixed-size parameter lists.
-  //
-  // A single skeleton, also called "Dynamic Implementation Routine",
-  // is provided to the ORB; it is called on all requests, along with
-  // a pointer to context that was provided by the server.
-  //
-  // One could imagine that the DIR would recognize that the context
-  // is a hashtable for per-object state, keyed by the object ID.
-  //
-  // Note that in addition to the operations defined by an object's
-  // IDL interface specification, four operations must be supported by
-  // code layered above the POA.  There are many ways in which these
-  // operations can be hidden from "application" programs, and some
-  // solutions are noted below.
-  //
-  // * "_is_a" is readily handled by skeletons,
-  //
-  // * "_get_interface" similarly, though with more work to allow the
-  //   IFR data structures to be extracted from skeletons.  
-  //
-  // * "_get_implementation" is implementation-specific, a facility
-  //   through which administrative and other information may be
-  //   acquired.  Not all systems provide consistent ways to utilize
-  //   this facility.
-  //
-  // * "_non_existent" asks if the referred-to object still exists.
-  //   This enables solving many "distributed garbage" problems,
-  //   such as maintaining persistent tables keyed by references to
-  //   objects that may no longer exist.
-    
-#if 0
-  // @@ virtual
-  void please_shutdown (CORBA::Environment &env);
-  // Please Shutdown -- reject all further incoming requests, and
-  // allow all currently active calls (e.g. "this one") to complete.
-  // This ensures that OS resources associated with this OA can be
-  // reclaimed even if some buggy applications code mismanages
-  // refcounting on this POA.
-
-  void run (struct timeval *tvp,
-	    CORBA::Environment &env);
-  // Run -- call get_request () in a loop until shutdown completes.
-  // Uses as much concurrency as is provided in this environment.
-  // Initiate shutdown if we've been idle for the specified time.
-  // 
-  // This uses only the public APIs defined above; the function is
-  // defined here purely for convenience, to help some applications
-  // avoid writing that loop.
-#endif /* 0 */
-
-  static CORBA::POA_ptr get_poa (CORBA::ORB_ptr orb,
-				CORBA::Environment &env);
-  // Get an "anonymous" POA pseudo-objref ... this is the API that
-  // most applications will use.  It returns a POA which is not
-  // otherwise in use (though it may have been used in the past).
-  // 
-  // Any given POA (named or otherwise) will create equivalent object
-  // references when POA::create () is called with the same object and
-  // type IDs.  This is not true for two different POAs.
-
-  static CORBA::POA_ptr get_named_poa (CORBA::ORB_ptr orb,
-				      CORBA::String name,
-				      CORBA::Environment &env);
-  // Get a "named" POA ... most applications don't use/need this API.
-  // 
-  // POA names are for ORB/system bootstrapping purposes, and need not
-  // be shared between different systems.  The scope of the name isn't
-  // guaranteed to include more than one system.  The names themselves
-  // are administered using system-specific mechanisms and policies.
-
-  CORBA::OctetSeq *get_key (CORBA::Object_ptr obj,
-			   CORBA::Environment &env);
-  // NON-STANDARD CALL.  When dispatching a request to an object, you
-  // need to be able to get the object key you used to create the
-  // reference.  It's the main way servers distinguish two object
-  // references from each other.
-    
-#if 0
-  /* virtual */
-  void clean_shutdown (CORBA::Environment &env);
-  // NON-STANDARD CALL.  OA user asks for a clean shutdown of the OA
-  // after currently active calls complete.  OA "requester" (calls
-  // <get_request>) asks if we're shutting down, and if so closes down
-  // transport cleanly.
-  // @@ This used to be virtual...does it really need to be any more?
-
-  /* virtual */
-  CORBA::Boolean shutting_down (void);
-  // NON-STANDARD CALL.  Returns <TRUE> if we're in the process of
-  // shutting down.
-#endif /* 0 */
-
-  void dispatch (CORBA::OctetSeq &key, 
-		 CORBA::ServerRequest &req, 
-		 void *context, 
-		 CORBA::Environment &env);
-  // Find the object for the request and pass it up the chain.  Errors
-  // are returned in <env>.
-
-  virtual int bind (const CORBA::OctetSeq &key, 
-		    CORBA::Object_ptr obj);
-  // Registers a CORBA::Object into the object table and associates the
-  // key with it.  Returns -1 on failure, 0 on success, 1 on
-  // duplicate.
-
-  virtual int find (const CORBA::OctetSeq &key, 
-		    CORBA::Object_ptr &obj);
-  // Looks up an object in the object table using <{key}>.  Returns
-  // non-negative integer on success, or -1 on failure.
-
-  virtual CORBA::ORB_ptr orb (void) const;
-  // Returns pointer to the ORB with which this OA is associated.
-
-  // = COM IUnknown Support
-  ULONG __stdcall AddRef (void);
-  ULONG __stdcall Release (void);
-  HRESULT __stdcall QueryInterface (REFIID riid, void** ppv);
-
-protected:
-  // @@ Do we really need protected anymore?
-  TAO_Object_Table *objtable_;
-  // Table of objects registered with this Object Adapter.
-
-private:
-  CORBA::Boolean do_exit_;	
-  // Flag set by <clean_shutdown ()>.
-
-  CORBA::ORB_ptr orb_;		
-  // Pointer to our ORB.
-
-  u_int call_count_;		
-  // Used by COM stuff
-
-  u_int refcount_;		
-  // Used by COM stuff
-
-  CORBA::POA::dsi_handler skeleton_;	
-  // Skeleton function
-
-  void *context_;		
-  // Who knows!?!
-
-  ACE_SYNCH_MUTEX lock_;	
-  // Locks critical sections within POA code methods (was
-  // tcpoa_mutex).
-
-  ACE_SYNCH_MUTEX com_lock_;	
-  // Locks critical sections in COM-related code (was tcpoa_lock).
-
-  // = Copy and assignment: just say no
-  CORBA_POA (const CORBA_POA &src);
-  CORBA_POA &operator= (const CORBA_POA &src);
-};
-
-struct TAO_Dispatch_Context
-  // = TITLE
-  //   Structure holding information necessary for GIOP functionality.
-  //
-  // = DESCRIPTION 
-  //   Data structure passed as "context" to the GIOP code, which then
-  //   calls back one of the two helper routines as part of handling
-  //   any particular incoming request.
-{
-  CORBA::POA::dsi_handler skeleton_;
-  // Function pointer to skeleton glue function.
-
-  void (*check_forward_) (CORBA::OctetSeq& key,
-			  CORBA::Object_ptr& fwd_ref,
-			  void* context,
-			  CORBA::Environment& env);
-  // Function to check if the request should be forwarded (whatever
-  // that means).
-
-  void *context_;
-  // Who knows...another overloading of the word "context".
-  // @@ Can we please try to remove this?
-
-  CORBA::POA_ptr oa_;
-  // This should really be a POA_ptr, but currently it doesn't support
-  // the one call we need to make through here: <handle_message ()>.
-
-  ACE_SOCK_Stream endpoint_;
-  // The communication endpoint from which the data needs to be read.
-  // NOTE!!!  This type MUST match that used for POA_Handler!
-};
-
-#endif	/* TAO_POA_H */
-
-
-
diff --git a/TAO/tao/poa.i b/TAO/tao/poa.i
deleted file mode 100644
index 80a1e0ba437..00000000000
--- a/TAO/tao/poa.i
+++ /dev/null
@@ -1,24 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-
-// CORBA dup/release build on top of COM's (why not).
-
-ACE_INLINE void
-CORBA::release (CORBA::POA_ptr obj)
-{
-  if (obj)
-    obj->Release ();
-}
-
-#if 0
-ACE_INLINE CORBA::Boolean
-CORBA_POA::shutting_down (void)
-{
-  return do_exit_;
-}
-#endif /* 0 */
-
-ACE_INLINE CORBA::ORB_ptr
-CORBA_POA::orb (void) const
-{
-  return orb_;
-}
diff --git a/TAO/tao/principa.cpp b/TAO/tao/principa.cpp
deleted file mode 100644
index 052d9d18743..00000000000
--- a/TAO/tao/principa.cpp
+++ /dev/null
@@ -1,77 +0,0 @@
-// @ (#)principa.cpp	1.4 95/11/04
-// Copyright 1994-1995 by Sun Microsystems Inc.
-// All Rights Reserved
-//
-// ORB:		Principal identifier pseudo-objref
-
-#include "tao/corba.h"
-
-void
-CORBA::release (CORBA::Principal_ptr principal)
-{
-  if (principal)
-    principal->Release ();
-}
-
-CORBA::Boolean
-CORBA::is_nil (CORBA::Principal_ptr principal)
-{
-  return (CORBA::Boolean) (principal == 0);
-}
-
-CORBA_Principal::CORBA_Principal (void)
-{
-}
-
-CORBA_Principal::~CORBA_Principal (void)
-{
-  assert (refcount_ == 0);
-
-  if (id.buffer)
-    delete [] id.buffer;
-}
-
-// For COM -- IUnKnown operations
-
-// {A201E4C0-F258-11ce-9598-0000C07CA898}
-DEFINE_GUID (IID_CORBA_Principal,
-0xa201e4c0, 0xf258, 0x11ce, 0x95, 0x98, 0x0, 0x0, 0xc0, 0x7c, 0xa8, 0x98);
-
-
-ULONG __stdcall
-CORBA_Principal::AddRef (void)
-{
-  ACE_MT (ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, guard, this->lock_, 0));
-
-  return ++refcount_;
-}
-
-ULONG __stdcall
-CORBA_Principal::Release (void)
-{
-  {
-    ACE_MT (ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, mon, this->lock_, 0));
-
-    if (--refcount_ != 0)
-      return refcount_;
-  }
-
-  delete this;
-  return 0;
-}
-
-HRESULT __stdcall
-CORBA_Principal::QueryInterface (REFIID riid,
-				 void **ppv)
-{
-  *ppv = 0;
-
-  if (IID_CORBA_Principal == riid || IID_IUnknown == riid)
-    *ppv = this;
-
-  if (*ppv == 0)
-    return ResultFromScode (E_NOINTERFACE);
-
-  (void) AddRef ();
-  return NOERROR;
-}
diff --git a/TAO/tao/principa.h b/TAO/tao/principa.h
deleted file mode 100644
index df3546b19fb..00000000000
--- a/TAO/tao/principa.h
+++ /dev/null
@@ -1,63 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO
-// 
-// = FILENAME
-//    objtable.hh
-//
-// = DESCRIPTION
-//    Header file for Win32 interface to CORBA's "Principal" type.
-//
-// = AUTHOR
-//     Copyright 1994-1995 by Sun Microsystems Inc.
-// 
-// ============================================================================
-
-#if !defined (TAO_PRINCIPAL_H)
-#  define TAO_PRINCIPAL_H
-
-class TAO_Export CORBA_Principal : public IUnknown
-  // = TITLE
-  //    A "Principal" identifies an authenticated entity in the
-  //    network administration framework.  Identities are used to
-  //    control acccess (authorization) as well as in audit trails
-  //    (accountability).
-{
-public:
-  // To applications, the identifier is an opaque ID.
-
-  //  CORBA::SEQUENCE <CORBA::Octet> id;
-  CORBA::OctetSeq id;
-
-  // XXX add "==", "<", ">" operators
-
-  // Stuff required for COM IUnknown support
-
-  ULONG __stdcall AddRef (void);
-  ULONG __stdcall Release (void);
-  HRESULT __stdcall QueryInterface (REFIID riid,
-				    void **ppv);
-
-  CORBA_Principal (void);
-
-private:
-  ACE_SYNCH_MUTEX lock_;
-  u_int refcount_;
-
-  virtual ~CORBA_Principal (void);
-
-  // = these are not provided
-  CORBA_Principal &operator = (const CORBA::Principal_ptr &);
-  CORBA_Principal (const CORBA::Principal_ptr &);
-
-#if defined (__GNUG__)
-  // @@ Fix this to use the ACE "NAMESPACE" macro?
-  // G++ (even 2.6.3) stupidly thinks instances can't be
-  // created.  This de-warns.
-  friend class everyone_needs_a_friend;
-#endif /* __GNUG__ */
-};
-#endif /* TAO_PRINCIPAL_H */
diff --git a/TAO/tao/request.cpp b/TAO/tao/request.cpp
deleted file mode 100644
index 07ba878ece8..00000000000
--- a/TAO/tao/request.cpp
+++ /dev/null
@@ -1,157 +0,0 @@
-// @(#)request.cpp	1.6 95/09/24
-// Copyright 1994-1995 by Sun Microsystems Inc.
-// All Rights Reserved
-//
-// Implementation of Dynamic Invocation Interface
-
-#include "tao/corba.h"
-
-// {77420085-F276-11ce-9598-0000C07CA898}
-DEFINE_GUID (IID_CORBA_Request,
-0x77420085, 0xf276, 0x11ce, 0x95, 0x98, 0x0, 0x0, 0xc0, 0x7c, 0xa8, 0x98);
-
-ULONG __stdcall
-CORBA_Request::AddRef (void)
-{
-  ACE_MT (ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, guard, lock_, 0));
- 
-  return refcount_++;
-}
- 
-ULONG __stdcall
-CORBA_Request::Release (void)
-{
-  {
-    ACE_MT (ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, mon, this->lock_, 0));
-
-    ACE_ASSERT (this != 0);
-
-    if (--refcount_ != 0)
-      return refcount_;
-  }
-
-  delete this;
-  return 0;
-}
- 
-HRESULT __stdcall
-CORBA_Request::QueryInterface (REFIID riid,
-			       void **ppv)
-{
-  *ppv = 0;
- 
-  if (IID_CORBA_Request == riid || IID_IUnknown == riid)
-    *ppv = this;
- 
-  if (*ppv == 0)
-    return ResultFromScode (E_NOINTERFACE);
- 
-  (void) AddRef ();
-  return NOERROR;
-}
-
-// Reference counting for DII Request object
-
-void
-CORBA::release (CORBA::Request_ptr req)
-{
-  if (req)
-    req->Release ();
-}
-
-CORBA::Boolean
-CORBA::is_nil (CORBA::Request_ptr req)
-{
-  return (CORBA::Boolean) req == 0;
-}
-
-
-// DII Request class implementation
-
-CORBA_Request::CORBA_Request (CORBA::Object_ptr obj,
-			      const CORBA::Char *op,
-			      CORBA::NVList_ptr args,
-			      CORBA::NamedValue_ptr result,
-			      CORBA::Flags flags) 
-  : args_ (args),
-    result_ (result),
-    flags_ (flags),
-    refcount_ (1)
-{
-  target_ = CORBA::Object::_duplicate (obj);
-  opname_ = CORBA::string_copy (op);
-}
-
-CORBA_Request::CORBA_Request (CORBA::Object_ptr obj,
-			      const CORBA::Char *op) 
-  : flags_ (0),
-    refcount_ (1)
-{
-  target_ = CORBA::Object::_duplicate (obj);
-  opname_ = CORBA::string_copy (op);
-
-  args_ = new CORBA::NVList;
-  result_ = new CORBA::NamedValue;
-  result_->AddRef();
-}
-
-CORBA_Request::~CORBA_Request (void)
-{
-  assert (refcount_ == 0);
-
-  CORBA::release (target_);
-  CORBA::string_free ((CORBA::String) opname_);
-  CORBA::release (args_);
-  CORBA::release (result_);
-}
-
-// The public DII interfaces:  normal and oneway calls.
-//
-// NOTE that using DII, programmers can get the special behaviour of
-// discarding the response for normal calls.  This doesn't change the
-// semantics of any OMG-IDL interface, it just streamlines control
-// flow in some exotic situations.
-
-void
-CORBA_Request::invoke (void)
-{
-  STUB_Object *stub;
-
-  if (target_->QueryInterface (IID_STUB_Object,
-			       (void **) &stub) != NOERROR) 
-    {
-      env_.exception (new CORBA::DATA_CONVERSION (CORBA::COMPLETED_NO));
-      return;
-    }
-
-  stub->do_dynamic_call ((char *) opname_,
-			 CORBA::B_TRUE,
-			 args_,
-			 result_,
-			 flags_,
-			 exceptions_,
-			 env_);
-  stub->Release ();
-}
-
-void
-CORBA_Request::send_oneway (void)
-{
-  STUB_Object *stub;
-
-  if (target_->QueryInterface (IID_STUB_Object,
-			       (void **) &stub) != NOERROR) 
-    {
-      env_.exception (new CORBA::DATA_CONVERSION (CORBA::COMPLETED_NO));
-      return;
-    }
-
-  stub->do_dynamic_call ((char *) opname_,
-			 CORBA::B_TRUE,
-			 args_,
-			 result_,
-			 flags_,
-			 exceptions_,
-			 env_);
-  stub->Release ();
-}
diff --git a/TAO/tao/request.h b/TAO/tao/request.h
deleted file mode 100644
index 5927aed294f..00000000000
--- a/TAO/tao/request.h
+++ /dev/null
@@ -1,73 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO
-// 
-// = FILENAME
-//    request.h
-//
-// = DESCRIPTION
-//     
-//    Header file for Win32 C/C++/COM interface to CORBA's Dynamic
-//    Invocation Interface "Request" type.
-//
-// = AUTHOR
-//     Copyright 1994-1995 by Sun Microsystems, Inc.
-// 
-// ============================================================================
-
-#if !defined (TAO_REQUEST_H)
-#  define TAO_REQUEST_ H
-
-// @@ Please comment everything in this file.
-
-class TAO_Export CORBA_Request : public IUnknown
-{
-public:
-  // @@ These inlines should be moved into a *.i file.
-  CORBA::Object_ptr target (void) const { return target_; }
-  const CORBA::Char *operation (void) const { return opname_; }
-  CORBA::NVList_ptr arguments (void) { return args_; }
-  CORBA::NamedValue_ptr result (void) { return result_; }
-  CORBA::ExceptionList_ptr exceptions (void) { return &exceptions_; }
-  CORBA::Environment *env (void) { return &env_; }
-
-  void invoke (void);
-  void send_oneway (void);
-
-  // Stuff required for COM IUnknown support
-
-  ULONG __stdcall AddRef (void);
-  ULONG __stdcall Release (void);
-  HRESULT __stdcall QueryInterface (REFIID riid,
-				    void **ppv);
-
-private:
-  friend class CORBA_Object;
-
-  CORBA_Request (CORBA::Object_ptr obj,
-		 const CORBA::Char *op,
-		 CORBA::NVList_ptr args,
-		 CORBA::NamedValue_ptr result,
-		 CORBA::Flags flags);
-
-  CORBA_Request (CORBA::Object_ptr obj,
-		 const CORBA::Char *op);
-
-  virtual ~CORBA_Request (void);
-
-  CORBA::Object_ptr target_;
-  const CORBA::Char *opname_;
-  CORBA::NVList_ptr args_;
-  CORBA::NamedValue_ptr result_;
-  CORBA::Flags flags_;
-  CORBA::Environment env_;
-  CORBA::ExceptionList exceptions_;
-
-  ACE_SYNCH_MUTEX lock_;
-  u_int refcount_;
-};
-
-#endif /* TAO_REQUEST_H */
diff --git a/TAO/tao/sequence.h b/TAO/tao/sequence.h
deleted file mode 100644
index 4ad094b3032..00000000000
--- a/TAO/tao/sequence.h
+++ /dev/null
@@ -1,155 +0,0 @@
-/* -*- C++ -*- */
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO
-//
-// = FILENAME
-//    sequence.h
-//
-// = AUTHOR
-//    Copyright 1994-1995 by Sun Microsystems Inc.
-//
-//    Aniruddha Gokhale
-//
-// ============================================================================
-
-#if !defined (TAO_SEQUENCE_H)
-#  define TAO_SEQUENCE_H
-
-// unbounded sequences
-template <class T>
-class TAO_UnboundedSeq
-{
-  // =TITLE
-  //  TAO_UnboundedSeq
-  // =DESCRIPTION
-  //  parametrized type for unbounded sequences
-public:
-
-  typedef T ElemType;
-
-  // =operations
-
-  TAO_UnboundedSeq (void);
-  // default constructor
-
-  TAO_UnboundedSeq (CORBA::ULong max);
-  // constructor using a maximum length value
-
-  TAO_UnboundedSeq (CORBA::ULong max, CORBA::ULong length, T *data,
-                    CORBA::Boolean release=0);
-  // constructor using the data and memory management flag
-
-  TAO_UnboundedSeq (const TAO_UnboundedSeq<T> &);
-  // copy constructor
-
-  ~TAO_UnboundedSeq (void);
-  // destructor
-
-  TAO_UnboundedSeq<T> &operator= (const TAO_UnboundedSeq<T> &);
-  // assignment operator
-
-  CORBA::ULong maximum (void) const;
-  // return the max length of the sequence
-
-  void length (CORBA::ULong);
-  // set the length
-
-  CORBA::ULong length (void) const;
-  // return the current length
-
-  T &operator[] (CORBA::ULong);
-  // operator []
-
-  const T &operator[] (CORBA::ULong) const;
-  // operator []
-
-  // =static operations
-
-  static T *allocbuf (CORBA::ULong);
-  // allocate storage for the sequence
-
-  static void freebuf (T *);
-  // free the sequence
-
-private:
-  CORBA::ULong maximum_;
-  // maximum length
-
-  CORBA::ULong length_;
-  // length
-
-  CORBA::Boolean release_;
-  // memory management
-
-  T *buffer_;
-  // buffer
-};
-
-// bounded sequences
-template <class T, CORBA::ULong size>
-class TAO_BoundedSeq
-{
-  // =TITLE
-  //  TAO_BoundedSeq
-  // =DESCRIPTION
-  //  parametrized type for Bounded sequences
-public:
-
-  typedef T ElemType;
-
-  // =operations
-
-  TAO_BoundedSeq (void);
-  // default constructor
-
-  TAO_BoundedSeq (CORBA::ULong length, T *data,
-                    CORBA::Boolean release=0);
-  // constructor using the data and memory management flag
-
-  TAO_BoundedSeq (const TAO_BoundedSeq<T,size> &);
-  // copy constructor
-
-  ~TAO_BoundedSeq (void);
-  // destructor
-
-  TAO_BoundedSeq<T,size> &operator= (const TAO_BoundedSeq<T,size> &);
-  // assignment operator
-
-  CORBA::ULong maximum (void) const;
-  // return the max length of the sequence
-
-  void length (CORBA::ULong);
-  // set the length
-
-  CORBA::ULong length (void) const;
-  // return the current length
-
-  T &operator[] (CORBA::ULong);
-  // operator []
-
-  const T &operator[] (CORBA::ULong) const;
-  // operator []
-
-  // =static operations
-
-  static T *allocbuf (CORBA::ULong);
-  // allocate storage for the sequence
-
-  static void freebuf (T *);
-  // free the sequence
-
-private:
-  CORBA::ULong length_;
-  // length
-
-  CORBA::Boolean release_;
-  // memory management
-
-  T *buffer_;
-  // buffer
-};
-
-#endif /* TAO_SEQUENCE_H */
diff --git a/TAO/tao/sequence.i b/TAO/tao/sequence.i
deleted file mode 100644
index f4b2b6d5968..00000000000
--- a/TAO/tao/sequence.i
+++ /dev/null
@@ -1,213 +0,0 @@
-/* -*- C++ -*- */
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO
-// 
-// = FILENAME
-//    sequence.i
-//
-// = AUTHOR
-//    Copyright 1994-1995 by Sun Microsystems Inc.
-//
-//    Aniruddha Gokhale
-// 
-// ============================================================================
-
-// operations on the unbounded sequence class
-
-template <class T> ACE_INLINE
-TAO_UnboundedSeq<T>::TAO_UnboundedSeq (void)
-  : maximum_ (0),
-    length_ (0),
-    release_ (0),
-    buffer_ (0)
-{
-}
-
-template <class T> ACE_INLINE
-TAO_UnboundedSeq<T>::TAO_UnboundedSeq (CORBA::ULong max)
-  : maximum_ (max),
-    length_ (0),
-    release_ (1) // we own it
-{
-  buffer_ = TAO_UnboundedSeq<T>::allocbuf (max);
-}
-
-template <class T> ACE_INLINE
-TAO_UnboundedSeq<T>::TAO_UnboundedSeq (CORBA::ULong max, CORBA::ULong length, T
-                                    *data, CORBA::Boolean release)
-  : maxium_ (max),
-    length_ (length),
-    buffer_ (data),
-    release_ (release)
-{
-}
-
-template <class T> ACE_INLINE
-TAO_UnboundedSeq<T>::TAO_UnboundedSeq (const TAO_UnboundedSeq<T> &seq)
-  : maximum_ (seq.maximum ()),
-    length_ (seq.length ()),
-    release_ (1) // we own this
-{
-  this->buffer_ = TAO_UnboundedSeq<T>::allocbuf (this->maximum_);
-  for (CORBA::ULong i=0; i < this->length_; i++)
-    this->buffer_[i] = seq[i];
-}
-
-template <class T> ACE_INLINE
-TAO_UnboundedSeq<T>::~TAO_UnboundedSeq (void)
-{
-  if (this->release_)
-    TAO_UnboundedSeq<T>::freebuf (this->buffer_);
-
-}
-
-template <class T> ACE_INLINE TAO_UnboundedSeq<T> &
-TAO_UnboundedSeq<T>::operator= (const TAO_UnboundedSeq<T> &seq)
-{
-  this->maximum_ = seq.maximum_;
-  this->length_ = seq.length_;
-  this->release_ = 1;
-  this->buffer_ = TAO_UnboundedSeq<T>::allocbuf (this->maximum_);
-  for (CORBA::ULong i=0; i < this->length_; i++)
-    this->buffer_[i] = seq[i];
-}
-
-template <class T> ACE_INLINE CORBA::ULong
-TAO_UnboundedSeq<T>::maximum (void) const
-{
-  return this->maximum_;
-}
-
-template <class T> ACE_INLINE void
-TAO_UnboundedSeq<T>::length (CORBA::ULong length)
-{
-  this->length_ = length;
-}
-
-template <class T> ACE_INLINE CORBA::ULong
-TAO_UnboundedSeq<T>::length (void) const
-{
-  return this->length_;
-}
-
-template <class T> ACE_INLINE T &
-TAO_UnboundedSeq<T>::operator[] (CORBA::ULong i)
-{
-  ACE_ASSERT (i < this->length_);
-  return this->buffer_[i];
-}
-
-template <class T> ACE_INLINE const T &
-TAO_UnboundedSeq<T>::operator[] (CORBA::ULong i) const
-{
-  ACE_ASSERT (i < this->length_);
-  return this->buffer_[i];
-}
-
-template <class T> ACE_INLINE T *
-TAO_UnboundedSeq<T>::allocbuf (CORBA::ULong size)
-{
-  return new T[size];
-}
-
-template <class T> ACE_INLINE void
-TAO_UnboundedSeq<T>::freebuf (T *buffer)
-{
-  delete [] buffer;
-}
-
-
-// operations on the Bounded sequence class
-
-template <class T, CORBA::ULong size> ACE_INLINE
-TAO_BoundedSeq<T,size>::TAO_BoundedSeq (void)
-  : length_ (0),
-    release_ (0),
-    buffer_ (0)
-{
-}
-
-template <class T, CORBA::ULong size> ACE_INLINE
-TAO_BoundedSeq<T,size>::TAO_BoundedSeq (CORBA::ULong length, T *data, CORBA::Boolean
-                                   release) 
-  : length_ (length),
-    buffer_ (data),
-    release_ (release)
-{
-}
-
-template <class T, CORBA::ULong size> ACE_INLINE
-TAO_BoundedSeq<T,size>::TAO_BoundedSeq (const TAO_BoundedSeq<T,size> &seq)
-  : length_ (seq.length ()),
-    release_ (1) // we own this
-{
-  this->buffer_ = TAO_BoundedSeq<T,size>::allocbuf (this->length_);
-  for (CORBA::ULong i=0; i < this->length_; i++)
-    this->buffer_[i] = seq[i];
-}
-
-template <class T, CORBA::ULong size> ACE_INLINE
-TAO_BoundedSeq<T,size>::~TAO_BoundedSeq (void)
-{
-  if (this->release_)
-    TAO_BoundedSeq<T,size>::freebuf (this->buffer_);
-
-}
-
-template <class T, CORBA::ULong size> ACE_INLINE TAO_BoundedSeq<T,size> &
-TAO_BoundedSeq<T,size>::operator= (const TAO_BoundedSeq<T,size> &seq)
-{
-  this->length_ = seq.length_;
-  this->release_ = 1;
-  this->buffer_ = TAO_BoundedSeq<T,size>::allocbuf (this->length_);
-  for (CORBA::ULong i=0; i < this->length_; i++)
-    this->buffer_[i] = seq[i];
-}
-
-template <class T, CORBA::ULong size> ACE_INLINE CORBA::ULong
-TAO_BoundedSeq<T,size>::maximum (void) const
-{
-  return this->length_;
-}
-
-template <class T, CORBA::ULong size> ACE_INLINE void
-TAO_BoundedSeq<T,size>::length (CORBA::ULong length)
-{
-  this->length_ = length;
-}
-
-template <class T, CORBA::ULong size> ACE_INLINE CORBA::ULong
-TAO_BoundedSeq<T,size>::length (void) const
-{
-  return this->length_;
-}
-
-template <class T, CORBA::ULong size> ACE_INLINE T &
-TAO_BoundedSeq<T,size>::operator[] (CORBA::ULong i)
-{
-  ACE_ASSERT (i < this->length_);
-  return this->buffer_[i];
-}
-
-template <class T, CORBA::ULong size> ACE_INLINE const T &
-TAO_BoundedSeq<T,size>::operator[] (CORBA::ULong i) const
-{
-  ACE_ASSERT (i < this->length_);
-  return this->buffer_[i];
-}
-
-template <class T, CORBA::ULong size> ACE_INLINE T *
-TAO_BoundedSeq<T,size>::allocbuf (CORBA::ULong size)
-{
-  return new T[size];
-}
-
-template <class T, CORBA::ULong size> ACE_INLINE void
-TAO_BoundedSeq<T,size>::freebuf (T *buffer)
-{
-  delete [] buffer;
-}
-
diff --git a/TAO/tao/server_factory.cpp b/TAO/tao/server_factory.cpp
deleted file mode 100644
index d05ea48f402..00000000000
--- a/TAO/tao/server_factory.cpp
+++ /dev/null
@@ -1,74 +0,0 @@
-// ============================================================================
-//
-// = LIBRARY
-//     TAO
-// 
-// = FILENAME
-//     server_factory.cpp
-//
-// = AUTHOR
-//     Chris Cleeland
-//
-// = VERSION
-//     $Id$
-// ============================================================================
-
-#include "tao/corba.h"
-
-TAO_Server_Strategy_Factory::TAO_Server_Strategy_Factory (void)
-{
-}
-
-TAO_Server_Strategy_Factory::~TAO_Server_Strategy_Factory(void)
-{
-}
-
-int
-TAO_Server_Strategy_Factory::open (void)
-{
-  return 0;
-}
-
-TAO_Server_Strategy_Factory::CREATION_STRATEGY *
-TAO_Server_Strategy_Factory::creation_strategy (void)
-{
-  return 0;
-}
-
-TAO_Server_Strategy_Factory::ACCEPT_STRATEGY *
-TAO_Server_Strategy_Factory::accept_strategy (void)
-{
-  return 0;
-}
-
-TAO_Server_Strategy_Factory::CONCURRENCY_STRATEGY *
-TAO_Server_Strategy_Factory::concurrency_strategy (void)
-{
-  return 0;
-}
-
-TAO_Server_Strategy_Factory::SCHEDULING_STRATEGY *
-TAO_Server_Strategy_Factory::scheduling_strategy (void)
-{
-  return 0;
-}
-
-TAO_Object_Table *
-TAO_Server_Strategy_Factory::create_object_table (void)
-{
-  return 0;
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Creation_Strategy<TAO_Server_Connection_Handler>;
-template class ACE_Acceptor<TAO_Server_Connection_Handler, ACE_SOCK_ACCEPTOR>;
-template class ACE_Accept_Strategy<TAO_Server_Connection_Handler, ACE_SOCK_ACCEPTOR>;
-template class ACE_Concurrency_Strategy<TAO_Server_Connection_Handler>;
-template class ACE_Scheduling_Strategy<TAO_Server_Connection_Handler>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Creation_Strategy<TAO_Server_Connection_Handler>
-#pragma instantiate ACE_Acceptor<TAO_Server_Connection_Handler, ACE_SOCK_ACCEPTOR>
-#pragma instantiate ACE_Accept_Strategy<TAO_Server_Connection_Handler, ACE_SOCK_ACCEPTOR>
-#pragma instantiate ACE_Concurrency_Strategy<TAO_Server_Connection_Handler>
-#pragma instantiate ACE_Scheduling_Strategy<TAO_Server_Connection_Handler>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/server_factory.h b/TAO/tao/server_factory.h
deleted file mode 100644
index 3eb4d7a61f2..00000000000
--- a/TAO/tao/server_factory.h
+++ /dev/null
@@ -1,70 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-
-// ============================================================================
-//
-// = LIBRARY
-//     TAO
-// 
-// = FILENAME
-//     server_factory.h
-//
-// = AUTHOR
-//     Chris Cleeland
-//
-// = VERSION
-//     $Id$
-// ============================================================================
-
-#if !defined (TAO_SERVER_FACTORY_H)
-#  define TAO_SERVER_FACTORY_H
-
-class TAO_Server_Strategy_Factory : public ACE_Service_Object
-  // = TITLE
-  //    Base class for the server's abstract factory that manufactures
-  //    various strategies of special utility to it.  This simply
-  //    serves as an interface to a subclass that REALLY gets
-  //    specified and loaded by the Service Configurator.
-{
-public:
-  // = Initialization and termination methods.
-  TAO_Server_Strategy_Factory (void);
-  // Constructor.
-
-  virtual ~TAO_Server_Strategy_Factory(void);
-  // Destructor.
-
-  virtual int open (void);
-  // Call <open> on various strategies.  This is not performed in
-  // <init> so that the other portions of the ORB have a chance to
-  // "settle" in their initialization since the streategies herein
-  // might need some of that information.
-  
-  // = Server-side factory types.
-  typedef ACE_Creation_Strategy<TAO_Server_Connection_Handler>
-          CREATION_STRATEGY;
-  typedef ACE_Accept_Strategy<TAO_Server_Connection_Handler, ACE_SOCK_ACCEPTOR>
-          ACCEPT_STRATEGY;
-  typedef ACE_Concurrency_Strategy<TAO_Server_Connection_Handler>
-          CONCURRENCY_STRATEGY;
-  typedef ACE_Scheduling_Strategy<TAO_Server_Connection_Handler>
-          SCHEDULING_STRATEGY;
-
-  // = Factory methods for the server-side strategies.
-
-  virtual CREATION_STRATEGY *creation_strategy (void);
-  // Return concrete creation strategy.
-
-  virtual ACCEPT_STRATEGY *accept_strategy (void);
-  // Return concrete acceptor strategy.
-
-  virtual CONCURRENCY_STRATEGY *concurrency_strategy (void);
-  // Return the concurrency strategy used.
-
-  virtual SCHEDULING_STRATEGY *scheduling_strategy (void);
-  // Return the scheduling strategy used.
-
-  virtual TAO_Object_Table *create_object_table (void);
-  // Return a new key-->object table
-};
-
-#endif /* TAO_SERVER_FACTORY_H */
diff --git a/TAO/tao/server_factory.i b/TAO/tao/server_factory.i
deleted file mode 100644
index 8b137891791..00000000000
--- a/TAO/tao/server_factory.i
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/TAO/tao/singletons.h b/TAO/tao/singletons.h
deleted file mode 100644
index fffa41272f8..00000000000
--- a/TAO/tao/singletons.h
+++ /dev/null
@@ -1,40 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO
-// 
-// = FILENAME
-//    singletons.h
-//
-// = DESCRIPTION
-//    Type declarations for singletons used in TAO.
-//
-// = AUTHOR
-//    Chris Cleeland, WU DOC
-//
-// = COPYRIGHT
-//    Copyright 1997
-// 
-// ============================================================================
-
-#if !defined (TAO_SINGLETONS_H)
-#  define TAO_SINGLETONS_H
-
-typedef ACE_Singleton<TAO_Marshal_Factory, ACE_SYNCH_RECURSIVE_MUTEX> TAO_MARSHAL_FACTORY;
-typedef ACE_Singleton<TAO_Marshal_Primitive, ACE_SYNCH_RECURSIVE_MUTEX> TAO_MARSHAL_PRIMITIVE;
-typedef ACE_Singleton<TAO_Marshal_Any, ACE_SYNCH_RECURSIVE_MUTEX> TAO_MARSHAL_ANY;
-typedef ACE_Singleton<TAO_Marshal_TypeCode, ACE_SYNCH_RECURSIVE_MUTEX> TAO_MARSHAL_TYPECODE;
-typedef ACE_Singleton<TAO_Marshal_Principal, ACE_SYNCH_RECURSIVE_MUTEX> TAO_MARSHAL_PRINCIPAL;
-typedef ACE_Singleton<TAO_Marshal_ObjRef, ACE_SYNCH_RECURSIVE_MUTEX> TAO_MARSHAL_OBJREF;
-typedef ACE_Singleton<TAO_Marshal_Struct, ACE_SYNCH_RECURSIVE_MUTEX> TAO_MARSHAL_STRUCT;
-typedef ACE_Singleton<TAO_Marshal_Union, ACE_SYNCH_RECURSIVE_MUTEX> TAO_MARSHAL_UNION;
-typedef ACE_Singleton<TAO_Marshal_String, ACE_SYNCH_RECURSIVE_MUTEX> TAO_MARSHAL_STRING;
-typedef ACE_Singleton<TAO_Marshal_Sequence, ACE_SYNCH_RECURSIVE_MUTEX> TAO_MARSHAL_SEQUENCE;
-typedef ACE_Singleton<TAO_Marshal_Array, ACE_SYNCH_RECURSIVE_MUTEX> TAO_MARSHAL_ARRAY;
-typedef ACE_Singleton<TAO_Marshal_Alias, ACE_SYNCH_RECURSIVE_MUTEX> TAO_MARSHAL_ALIAS;
-typedef ACE_Singleton<TAO_Marshal_Except, ACE_SYNCH_RECURSIVE_MUTEX> TAO_MARSHAL_EXCEPT;
-typedef ACE_Singleton<TAO_Marshal_WString, ACE_SYNCH_RECURSIVE_MUTEX> TAO_MARSHAL_WSTRING;
-
-#endif /* TAO_SINGLETONS_H */
diff --git a/TAO/tao/svrrqst.cpp b/TAO/tao/svrrqst.cpp
deleted file mode 100644
index 0533726f883..00000000000
--- a/TAO/tao/svrrqst.cpp
+++ /dev/null
@@ -1,226 +0,0 @@
-// @(#)svrrqst.cpp	1.9 95/11/04
-// Copyright 1994-1995 by Sun Microsystems Inc.
-// All Rights Reserved
-//
-// Implementation of the Dynamic Server Skeleton Interface
-
-#include "tao/corba.h"
-
-// {77420086-F276-11ce-9598-0000C07CA898}
-DEFINE_GUID (IID_IIOP_ServerRequest,
-0x77420086, 0xf276, 0x11ce, 0x95, 0x98, 0x0, 0x0, 0xc0, 0x7c, 0xa8, 0x98);
-
-// {4B48D881-F7F0-11ce-9598-0000C07CA898}
-DEFINE_GUID (IID_CORBA_ServerRequest,
-0x4b48d881, 0xf7f0, 0x11ce, 0x95, 0x98, 0x0, 0x0, 0xc0, 0x7c, 0xa8, 0x98);
-
-IIOP_ServerRequest::IIOP_ServerRequest (CDR *msg,
-                                        CORBA::ORB_ptr the_orb,
-                                        CORBA::POA_ptr the_poa)
-  : incoming_ (msg),
-    params_ (0), 
-    retval_ (0),
-    exception_ (0),
-    ex_type_ (CORBA::NO_EXCEPTION),
-    refcount_ (1),
-    orb_ (the_orb),
-    poa_ (the_poa)
-{
-}
-
-IIOP_ServerRequest::~IIOP_ServerRequest (void)
-{
-  ACE_ASSERT (refcount_ == 0);
-
-  if (params_)
-    CORBA::release (params_);
-  if (retval_)
-    delete retval_;
-  if (exception_)
-    delete exception_;
-}
-
-ULONG __stdcall
-IIOP_ServerRequest::AddRef (void)
-{
-  ACE_MT (ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, guard, lock_, 0));
-
-  ACE_ASSERT (refcount_ > 0);
-  return refcount_++;
-}
-
-ULONG __stdcall
-IIOP_ServerRequest::Release (void)
-{
-  {
-    ACE_MT (ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, mon, this->lock_, 0));
-
-    ACE_ASSERT (this != 0);
-
-    if (--refcount_ != 0)
-      return refcount_;
-  }
-
-  delete this;
-  return 0;
-}
-
-HRESULT __stdcall
-IIOP_ServerRequest::QueryInterface (REFIID riid,
-				    void **ppv)
-{
-  ACE_ASSERT (refcount_ > 0);
-  *ppv = 0;
-
-  if (IID_IIOP_ServerRequest == riid
-      || IID_CORBA_ServerRequest == riid
-      || IID_IUnknown == riid)
-    *ppv = this;
-
-  if (*ppv == 0)
-    return ResultFromScode (E_NOINTERFACE);
-
- (void) AddRef ();
-  return NOERROR;
-}
-
-// Unmarshal in/inout params, and set up to marshal the appropriate
-// inout/out/return values later on.
-
-void __stdcall
-IIOP_ServerRequest::params (CORBA::NVList_ptr list,
-			    CORBA::Environment &env)
-{
-  env.clear ();
-
-  // Save params for later use when marshaling the reply.
-  this->params_ = list;
-
-  // Then unmarshal each "in" and "inout" parameter.
-  for (u_int i = 0; i < list->count (); i++)
-    {
-      CORBA::NamedValue_ptr nv = list->item (i);
-
-      if (ACE_BIT_DISABLED (nv->flags (), CORBA::ARG_IN | CORBA::ARG_INOUT))
-	continue;
-
-      // First, make sure the memory into which we'll be unmarshaling
-      // exists, and is the right size.
-      //
-      // NOTE: desirable to have a way to let the dynamic
-      // implementation routine preallocate this data, for
-      // environments where DSI is just being used in lieu of a
-      // language mapped server-side API and the size is really
-      // knowable in advance.
-
-      CORBA::Any_ptr any = nv->value ();
-      CORBA::TypeCode_ptr tc = any->type ();
-
-      tc->AddRef ();
-
-      void *value;
-      if (!any->value ())
-        { // not preallocated
-          ACE_NEW (value, char [tc->size (env)]);
-
-          any->replace (tc, value, CORBA::B_TRUE, env);
-
-          // Decrement the refcount of "tc".
-          //
-          // The earlier AddRef is needed since Any::replace () releases
-          // the typecode inside the Any.  Without the dup, the reference
-          // count can go to zero, and the typecode would then be deleted.
-          //
-          // This Release ensures that the reference count is correct so
-          // the typecode can be deleted some other time.
-
-          tc->Release ();
-        }
-      else
-        value = (void *)any->value ();
-
-      // Then just unmarshal the value.
-      (void) incoming_->decode (tc, value, 0, env);
-    }
-
-  // If any data is left over, it'd be context values ... else error.
-  // We don't support context values, so it's always an error.
-
-  if (incoming_->bytes_remaining () != 0)
-    {
-      dmsg1 ("params (), %d bytes remaining (error)",
-	     incoming_->bytes_remaining ());
-      env.exception (new CORBA::BAD_PARAM (CORBA::COMPLETED_NO));
-    }
-}
-
-// Store the result value.  There's either an exception, or a result,
-// but not both of them.  Results (and exceptions) can be reported
-// only after the parameter list has been provided (maybe empty).
-
-void __stdcall
-IIOP_ServerRequest::result (CORBA::Any_ptr value,
-			    CORBA::Environment &env)
-{
-  env.clear ();
-
-  if (!params_ || retval_ || exception_)
-    env.exception (new CORBA::BAD_INV_ORDER (CORBA::COMPLETED_NO));
-  else
-    retval_ = value;
-
-  // XXX send the message now!
-}
-
-// Store the exception value.
-
-void __stdcall
-IIOP_ServerRequest::exception (CORBA::ExceptionType type,
-			       CORBA::Any_ptr value,
-			       CORBA::Environment &env)
-{
-  if (!params_ || retval_ || exception_)
-    env.exception (new CORBA::BAD_INV_ORDER (CORBA::COMPLETED_NO));
-  else
-    {
-      env.clear ();
-      exception_ = value;
-      ex_type_ = type;
-    }
-
-  // XXX send the message now!
-}
-
-// Invocation attributes.
-
-CORBA::String __stdcall
-IIOP_ServerRequest::op_name (void)
-{
-  return opname_;
-}
-
-CORBA::Object_ptr __stdcall
-IIOP_ServerRequest::target (void)
-{
-  // XXX implement me!!  Code from TCP_OA exists ...
-  return 0;
-}
-
-CORBA::Principal_ptr __stdcall
-IIOP_ServerRequest::caller (void)
-{
-  // XXX ... return client's principal
-  return 0;
-}
-
-CORBA::ORB_ptr __stdcall
-IIOP_ServerRequest::orb (void)
-{
-  return orb_;
-}
-
-CORBA::POA_ptr __stdcall
-IIOP_ServerRequest::oa (void)
-{
-  return poa_;
-}
diff --git a/TAO/tao/svrrqst.h b/TAO/tao/svrrqst.h
deleted file mode 100644
index eeb69256c24..00000000000
--- a/TAO/tao/svrrqst.h
+++ /dev/null
@@ -1,137 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO
-// 
-// = FILENAME
-//    svrrqst.h
-//
-// = DESCRIPTION
-//     
-//    Header file for Win32 C/C++/COM interface to CORBA's Dynamic
-//    Server Skeleton Interface's "Server Request" type.
-//
-// = AUTHOR
-//     Copyright 1994-1995 by Sun Microsystems, Inc.
-//
-// = VERSION
-//     $Id$
-// 
-// ============================================================================
-
-#if !defined (TAO_SVRRQST_H)
-#define TAO_SVRRQST_H
-
-class TAO_Export CORBA_ServerRequest : public IUnknown
-  // = TITLE
-  //   XXX this is currently in an intermediate state; this is not
-  //   supposed to be IIOP-specific, or to expose quite so many
-  //   implementation details, but right now it is.
-{
-public:
-  virtual void __stdcall params (CORBA::NVList_ptr list,
-				 CORBA::Environment &env) = 0;
-  // Implementation uses this to provide the ORB with the operation's
-  // parameter list ... on return, their values are available; the
-  // list fed in has typecodes and (perhap) memory assigned.
-
-  virtual void __stdcall result (CORBA::Any_ptr value,
-				 CORBA::Environment &env) = 0;
-  // Implementation uses this to provide the operation result
-  // ... illegal if exception() was called or params() was not called.
-  //
-  // XXX Implementation should be able to assume response has been
-  // sent when this returns, and reclaim memory it allocated.
-
-  virtual void __stdcall exception (CORBA::ExceptionType	type,
-				    CORBA::Any_ptr value,
-				    CORBA::Environment &env) = 0;
-  // Implementation uses this to provide the exception value which is
-  // the only result of this particular invocation.
-  //
-  // XXX Implementation should be able to assume response has been
-  // sent when this returns, and reclaim memory it allocated.
-
-  // = Get various universal call attributes.
-
-  // e.g., who made the call, the target of the call, what ORB and OA
-  // that target object uses.
-  //
-  // NOTE: none of these report exceptions; unavailability of any of
-  // this stuff is a catastrophic error since this is all part of the
-  // basic CORBA Object Model.
-  //
-  // XXX should not be not assuming all OAs implement the POA API !!
-  virtual CORBA::Principal_ptr __stdcall	caller (void) = 0;
-  virtual CORBA::Object_ptr __stdcall target (void) = 0;
-  virtual CORBA::String __stdcall op_name (void) = 0;
-  virtual CORBA::POA_ptr __stdcall oa (void) = 0;
-  virtual CORBA::ORB_ptr __stdcall orb (void) = 0;
-};
-
-class TAO_Export IIOP_ServerRequest : public CORBA_ServerRequest
-  // = TITLE
-  // @@ Please comment me.
-{
-public:
-  // Constructor, destructor
-
-  IIOP_ServerRequest (CDR *msg,
-		      CORBA::ORB_ptr the_orb,
-		      CORBA::POA_ptr the_poa);
-
-  virtual ~IIOP_ServerRequest (void);
-
-  // = General ServerRequest operations
-  void __stdcall params (CORBA::NVList_ptr list,
-			 CORBA::Environment &env);
-
-  void __stdcall result (CORBA::Any_ptr value,
-			 CORBA::Environment &env);
-
-  void __stdcall exception (CORBA::ExceptionType type,
-			    CORBA::Any_ptr value,
-			    CORBA::Environment &env);
-
-  // = Request attributes
-
-  CORBA::String __stdcall op_name (void);
-  CORBA::Principal_ptr __stdcall	caller (void);
-  CORBA::Object_ptr __stdcall target (void);
-  CORBA::ORB_ptr __stdcall orb (void);
-  CORBA::POA_ptr __stdcall oa (void);
-
-  // Stuff required for COM IUnknown support
-
-  ULONG __stdcall AddRef (void);
-  ULONG __stdcall Release (void);
-  HRESULT __stdcall QueryInterface (REFIID riid,
-				    void **ppv);
-
-  // private:
-  // @@ Please comment me.
-  CORBA::String opname_;
-  CDR *incoming_;
-  CORBA::NVList_ptr params_;
-  CORBA::Any_ptr retval_;
-  CORBA::Any_ptr exception_;
-  CORBA::ExceptionType ex_type_;
-
-  void release (void) { refcount_--; }
-  // Just drop the refcount, don't destroy the object; most of these
-  // are stack-allocated.
-
-private:
-  // @@ Please comment all the following.
-  ACE_SYNCH_MUTEX lock_;
-
-  u_int refcount_;
-
-  CORBA::ORB_ptr orb_;
-
-  CORBA::POA_ptr poa_;
-};
-
-#endif /* TAO_SVRRQST_H */
diff --git a/TAO/tao/svrrqst.i b/TAO/tao/svrrqst.i
deleted file mode 100644
index 8b137891791..00000000000
--- a/TAO/tao/svrrqst.i
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/TAO/tao/t-sizes.cpp b/TAO/tao/t-sizes.cpp
deleted file mode 100644
index f791c064c15..00000000000
--- a/TAO/tao/t-sizes.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-#include "tao/orb.h"
-
-#define SHOWSIZE(t) cout << "sizeof(" #t ") = " << sizeof(t) << endl;
-
-int
-main(int argc, char* argv[])
-{
-  SHOWSIZE (CORBA_Short);
-  SHOWSIZE (CORBA_Long);
-  SHOWSIZE (CORBA_LongLong);
-  SHOWSIZE (CORBA_Float);
-  SHOWSIZE (CORBA_Double);
-  SHOWSIZE (CORBA_LongDouble);
-}
diff --git a/TAO/tao/t-xdr.cpp b/TAO/tao/t-xdr.cpp
deleted file mode 100644
index 6847c93ef23..00000000000
--- a/TAO/tao/t-xdr.cpp
+++ /dev/null
@@ -1,233 +0,0 @@
-// XDR record stream ... test encode performance against CDR, using
-// normal kinds of inlining performance hacks
-//
-// XXX as of 3-Nov-95 XDR_stream should only be relied on to marshal
-// the simplest primitives ... not objrefs, typecodes, etc.  Also, the
-// handling of sequences of chars/octets/shorts/wchars is wrong.
-//
-// It's suitable only for a simple performance test just now ...
-
-#include "tao/corba.h"
-#include "tao/xdr.h"
-
-// A structure that's somewhat representative of an IIOP message in
-// terms of overall complexity, so that its encoding cost is
-// "interesting"
-
-typedef CORBA_SEQUENCE <CORBA_Octet> opaque;
-
-struct interesting 
-{
-  // A call that's mostly going to be "on the mark" for IIOP-ish
-  // messages with small numbers of parameters:
-
-  // 4 chars magic
-  // 2 bytes version
-  // 1 byte byte-order
-  // 1 byte message type		---> 8 bytes "pure header"
-  CORBA_Char		hdr_bytes [8];
-  // 1 word message size		--=> end of GIOP::MessageHeader
-  CORBA_ULong		hdr_len;
-
-  // Service Context (1 word min)
-  CORBA_ULong		empty_ctx;
-  // 1 word request id
-  CORBA_ULong		request_id;
-  // 1 byte response-expected flag
-  CORBA_Boolean	response_expected;
-  // [ CDR:  3 bytes padding ]
-  // opaque object key (1 word min; typically less than 16 bytes)
-  opaque		object_key;
-  // string operation name (non-empty ... often less than 10 bytes)
-  CORBA_String	opname;
-  // Principal client (1 word min)
-  opaque		client_id;
-
-  //				--=> END OF GIOP::RequestHeader
-
-  // ... small number of parameters with any significance
-
-  // 2 word parameters
-  CORBA_ULong		param1;
-  CORBA_ULong		param2;
-  // 1 string parameter
-  CORBA_String	param3;
-
-};
-
-// XXX declare CDR typecode for above type ... initialize and use
-// one instance in the test below
-
-extern CORBA_TypeCode	TC_opaque;
-
-static void
-do_test (int use_XDR,
-	 CORBA_TypeCode_ptr tc,
-	 void *data)
-{
-  u_int loopcount = 100 * 1000;
-  u_int i;
-  u_int error_count = 0;
-  ACE_Time_Value before, after;
-  CORBA_String opname = "kill_husband";
-  opaque key;
-  CORBA_Boolean status;
-
-  key.buffer = (CORBA_Octet *) "jacqueline";
-  key.length = key.maximum = 10;
-
-  before = ACE_OS::gettimeofday ();
-
-  if (use_XDR) 
-    {
-      // Using XDR APIs and encoding rules ...  encode the structure
-      // repeatedly
-
-      for (i = 0; i < loopcount; i++) 
-        {
-          CORBA_Environment env;
-          XDR_stream stream (-1);
-
-          // GIOP header plus most of request header
-          status = status
-            && stream.put_long ('GIOP')		// magic
-            && stream.put_long ('\01\01\01\01')	// version etc
-            && stream.put_long (99)		// msg len
-            && stream.put_long (0)		// no svc ctx
-            && stream.put_long (42)		// request ID
-            && stream.put_boolean (CORBA_B_TRUE)// response?
-            ;
-
-          if (status)
-            status = XDR_stream::encoder (&TC_opaque, &key, 0, &stream, env)
-              == CORBA_TypeCode::TRAVERSE_CONTINUE;
-
-          if (status)
-            status = XDR_stream::encoder (_tc_CORBA_String, &opname,
-                                          0, &stream, env)
-              == CORBA_TypeCode::TRAVERSE_CONTINUE;
-
-          // Parameters:  two longs, a string
-          status = status
-            && stream.put_long (99)
-            && stream.put_long (-3455);
-          if (status)
-            status = XDR_stream::encoder (_tc_CORBA_String, &opname,
-                                          0, &stream, env)
-              == CORBA_TypeCode::TRAVERSE_CONTINUE;
-
-          // Gratuitous extra "interesting" data
-          status = XDR_stream::encoder (tc, data, 0, &stream, env)
-            == CORBA_TypeCode::TRAVERSE_CONTINUE;
-
-          if (status != CORBA_B_TRUE)
-            error_count++;
-        }
-    } 
-  else 
-    {
-      // This branch is the same, but using CDR APIs and encoding ...
-      // encode the structure repeatedly
-
-      for (i = 0; i < loopcount; i++) 
-        {
-          CORBA_Environment	env;
-          u_char	buffer [CDR::DEFAULT_BUFSIZE];
-          CDR			stream (buffer, sizeof buffer);
-
-          // GIOP header plus most of request header
-          status = status
-            && stream.put_long ('GIOP')		// magic
-            && stream.put_long ('\01\01\01\01')	// version etc
-            && stream.put_long (99)		// msg len
-            && stream.put_long (0)		// no svc ctx
-            && stream.put_long (42)		// request ID
-            && stream.put_boolean (CORBA_B_TRUE)// response?
-            ;
-
-          if (status)
-            status = stream.encode (&TC_opaque, &key, 0, env)
-              == CORBA_TypeCode::TRAVERSE_CONTINUE;
-
-          if (status)
-            status = stream.encode (_tc_CORBA_String, &opname,
-                                    0, env)
-              == CORBA_TypeCode::TRAVERSE_CONTINUE;
-
-          // Parameters:  two longs, a string
-          status = status
-            && stream.put_long (99)
-            && stream.put_long (-3455);
-          if (status)
-            status = stream.encode (_tc_CORBA_String, &opname,
-                                    0, env)
-              == CORBA_TypeCode::TRAVERSE_CONTINUE;
-
-          // Gratuitous extra "interesting" data
-          status = stream.encode (tc, data, 0, env)
-            == CORBA_TypeCode::TRAVERSE_CONTINUE;
-
-
-          if (status != CORBA_B_TRUE)
-            error_count++;
-        }
-
-    }
-
-  after = ACE_OS::gettimeofday ();
-
-  if (loopcount > 0) 
-    {
-      if (error_count == 0) 
-        {
-          ACE_Time_Value diff = after - before;
-          u_long usecs = diff.sec() * 1000 * 1000 + diff.usec();
-
-          ACE_OS::printf ("%s average encode time\t= %ld.%.03ldms, \t"
-                          "%ld calls/second\n",
-                          use_XDR ? "XDR" : "CDR",
-                          usecs / 1000, usecs % 1000,
-                          1000000L / usecs);
-        }
-
-      ACE_OS::printf ("%d calls, %d errors\n", loopcount, error_count);
-    }
-}
-
-int
-main (int argc,
-      char **argv)
-{
-  int c;
-  int use_XDR = 1;
-  CORBA_TypeCode_ptr tc = _tc_CORBA_TypeCode;
-  void *data = tc;
-
-  while ((c = ACE_OS::getopt (argc, argv, "cx")) != EOF) 
-    {
-      switch (c) 
-	{
-	case 'c':
-	  use_XDR = 0;
-	  continue;
-
-	case 'x':
-	  use_XDR = 1;
-	  continue;
-
-	case '?':
-	default:
-	  // usage:
-	  ACE_OS::fprintf (stderr, "usage:  %s"
-			   , " [-cx]"
-			   , "\n"
-			   , argv [0]);
-	}
-    }
-
-  do_test (1, tc, data);	// XDR-ish
-  do_test (0, tc, data);	// CDR
-
-  return 0;
-}
-
diff --git a/TAO/tao/tao.bld b/TAO/tao/tao.bld
deleted file mode 100644
index 46742df5ee0..00000000000
--- a/TAO/tao/tao.bld
+++ /dev/null
@@ -1,72 +0,0 @@
-#!build
-default:
-	library
-	:defines=DEBUG
-any.cpp
-	C++
-cdr.cpp
-	C++
-client_factory.cpp
-	C++
-connect.cpp
-	C++
-corbacom.cpp
-	C++
-debug.cpp
-	C++
-decode.cpp
-	C++
-deep_copy.cpp
-	C++
-deep_free.cpp
-	C++
-default_client.cpp
-	C++
-default_server.cpp
-	C++
-encode.cpp
-	C++
-except.cpp
-	C++
-giop.cpp
-	C++
-iiopobj.cpp
-	C++
-iioporb.cpp
-	C++
-interp.cpp
-	C++
-invoke.cpp
-	C++
-marshal.cpp
-	C++
-nvlist.cpp
-	C++
-object.cpp
-	C++
-objtable.cpp
-	C++
-optable.cpp
-	C++
-orbobj.cpp
-	C++
-orb_core.cpp
-	C++
-params.cpp
-	C++
-poa.cpp
-	C++
-principa.cpp
-	C++
-request.cpp
-	C++
-server_factory.cpp
-	C++
-svrrqst.cpp
-	C++
-tao_internals.cpp
-	C++
-tc_const.cpp
-	C++
-typecode.cpp
-	C++
diff --git a/TAO/tao/tao_internals.cpp b/TAO/tao/tao_internals.cpp
deleted file mode 100644
index 946a9ada606..00000000000
--- a/TAO/tao/tao_internals.cpp
+++ /dev/null
@@ -1,90 +0,0 @@
-// $Id$
-
-#include "tao/tao_internals.h"
-
-#include "ace/Service_Config.h"
-#include "ace/Service_Repository.h"
-#include "tao/default_server.h"
-#include "tao/default_client.h"
-
-int TAO_Internal::service_open_count_ = 0;
-
-int
-TAO_Internal::fake_service_entries_i (void)
-{
-#if defined (TAO_PLATFORM_SVC_CONF_FILE_NOTSUP)
-#define FAKE_SVC_ENTRY(svcname, svctype, argc, argv) \
-  do \
-    { \
-      ACE_Service_Object *obj = _make_##svctype (); \
-      obj->init (argc, argv); \
-      ACE_Service_Repository::instance()->insert \
-        (new ACE_Service_Type (svcname,\
-                                 new ACE_Service_Object_Type\
-                                 (obj, svcname, \
-                                  (ACE_Service_Type::DELETE_OBJ \
-                                   | ACE_Service_Type::DELETE_THIS)), \
-                                  0, 1));\
-    }\
-  while (0) //;
-
-  char *rfactory_args[] = { "-ORBresources", "global" };
-  FAKE_SVC_ENTRY ("Resource_Factory",
-                  TAO_Resource_Factory,
-                  sizeof rfactory_args / sizeof rfactory_args[0],
-                  rfactory_args);
-
-  char *client_args[] = { 0 };
-  FAKE_SVC_ENTRY ("Client_Strategy_Factory",
-                  TAO_Default_Client_Strategy_Factory,
-                  0,
-                  client_args);
-
-  char* server_args[] = {
-    "-ORBconcurrency", "reactive",
-    "-ORBdemuxstrategy", "dynamic", "-ORBtablesize", "128" };
-  FAKE_SVC_ENTRY ("Server_Strategy_Factory",
-                  TAO_Default_Server_Strategy_Factory,
-                  sizeof server_args / sizeof server_args[0],
-                  server_args);
-#endif /* TAO_PLATFORM_SVC_CONF_FILE_NOTSUP */
-
-  return 0;
-}
-
-int
-TAO_Internal::open_services (int& argc, char** argv)
-{
-  ACE_MT (ACE_GUARD_RETURN (ACE_SYNCH_RECURSIVE_MUTEX, guard, *ACE_Static_Object_Lock::instance (), -1));
-
-  if (TAO_Internal::service_open_count_++ == 0)
-    {
-#if defined (TAO_PLATFORM_SVC_CONF_FILE_NOTSUP)
-      ACE_UNUSED_ARG (argc);
-      ACE_UNUSED_ARG (argv);
-      return fake_service_entries_i ();
-#else
-      return ACE_Service_Config::open (argc, argv);
-#endif /* TAO_PLATFORM_SVC_CONF_FILE_NOTSUP */
-    }
-  else
-    return 0;
-}
-
-TAO_Internal::TAO_Internal (void)
-{
-}
-
-int
-TAO_Internal::close_services (void)
-{
-  ACE_MT (ACE_GUARD_RETURN (ACE_SYNCH_RECURSIVE_MUTEX, guard, *ACE_Static_Object_Lock::instance (), -1));
-
-  if (service_open_count_ == 0)
-    return -1;
-
-  if (--service_open_count_ == 0)
-    return ACE_Service_Config::close ();
-
-  return 0;
-}
diff --git a/TAO/tao/tao_internals.h b/TAO/tao/tao_internals.h
deleted file mode 100644
index e4c15b85761..00000000000
--- a/TAO/tao/tao_internals.h
+++ /dev/null
@@ -1,63 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO
-// 
-// = FILENAME
-//    tao_internals.h
-//
-// = DESCRIPTION
-//    Structures and methods completely internal to TAO.
-//
-// = AUTHOR
-//    Chris Cleeland
-// 
-// ============================================================================
-
-#if !defined (TAO_INTERNALS_H)
-#  define TAO_INTERNALS_H
-
-#  include "tao/corba.h"
-
-class TAO_Export TAO_Internal
-  // = TITLE
-  //    This class encapsulates some private behaviors and global data
-  //    structures used internal to TAO.  No application should EVER
-  //    see this class.
-{
-public:
-  static int open_services (int& argc, char** argv);
-  // Initialize the ACE Service Configurator.  This is a one-shot
-  // method, i.e., it can be called multiple times but it will only do
-  // its work once.  It does, however, track the number of times it's
-  // called (see <open_services>).  It is fully thread-safe.  Return 0
-  // if successful, -1 with errno set if failure.
-
-  static int close_services (void);
-  // The complement to <open_services>, this will perform appropriate
-  // ACE Service Configurator closure operations.  It should be called
-  // as many times as <open_services>, and will only actually close
-  // things down on the last call.  It is fully thread-safe.  Return 0
-  // if successful, -1 with errno set if failure.
-
-protected:
-  static int fake_service_entries_i (void);
-  // If your platform can't support the Service Configurator's model
-  // of loading services found in a file, then you should change the
-  // code in here in order to get service entries into the service
-  // repository.
-  
-private:
-  TAO_Internal (void);
-  // Private CTOR prevents this class from being instantiated.
-
-  static int service_open_count_;
-  // Number of times <open_services> has been called.  Incremented by
-  // <open_services>, and decremented by <close_services>.  Access to
-  // this is protected via the <ACE_Static_Object_Lock>.
-};
-
-#endif /* TAO_INTERNALS_H */
diff --git a/TAO/tao/tao_internals.i b/TAO/tao/tao_internals.i
deleted file mode 100644
index 357b59f4a8d..00000000000
--- a/TAO/tao/tao_internals.i
+++ /dev/null
@@ -1,4 +0,0 @@
-// -*- c++ -*-
-//
-// $Id$
-
diff --git a/TAO/tao/tc_const.cpp b/TAO/tao/tc_const.cpp
deleted file mode 100644
index 7c49a9f5ea7..00000000000
--- a/TAO/tao/tc_const.cpp
+++ /dev/null
@@ -1,143 +0,0 @@
-// @(#)tc_const.cpp	1.3 95/09/12
-// Copyright 1994-1995 by Sun Microsystems Inc.
-// All Rights Reserved
-//
-// ORB:		All the CORBA-specified typecode constants.
-//
-// NOTE:  IFR TypeCode constants aren't here; they're left for an IDL
-// compiler to generate from the appropriate IDL source.
-//
-// NOTE:  it'd be nice to have these not use init sections.  Most can easily
-// be in readonly data (e.g. text segment, ROM) rather than writable data;
-// that speeds program startup and page sharing in shared libraries.
-//
-// THREADING NOTE:  no issues, these are immutable constants
-
-#include "tao/corba.h"
-
-// Null and void
-
-static CORBA::TypeCode tc_null (CORBA::tk_null);
-TAO_Export CORBA::TypeCode_ptr CORBA::_tc_null = (CORBA::TypeCode_ptr) &tc_null;
-
-CORBA::TypeCode_ptr
-CORBA::TypeCode::_nil (void)
-{
-  return &tc_null;
-}
-
-static CORBA::TypeCode tc_void (CORBA::tk_void);
-TAO_Export CORBA::TypeCode_ptr CORBA::_tc_void = &tc_void;
-
-// Basic numeric types:  short, long, longlong, and unsigned variants
-
-static CORBA::TypeCode tc_short (CORBA::tk_short);
-TAO_Export CORBA::TypeCode_ptr CORBA::_tc_short = &tc_short;
-
-static CORBA::TypeCode tc_long (CORBA::tk_long);
-TAO_Export CORBA::TypeCode_ptr CORBA::_tc_long = &tc_long;
-
-static CORBA::TypeCode tc_longlong (CORBA::tk_longlong);
-TAO_Export CORBA::TypeCode_ptr CORBA::_tc_longlong = &tc_longlong;
-
-static CORBA::TypeCode tc_ushort (CORBA::tk_ushort);
-TAO_Export CORBA::TypeCode_ptr CORBA::_tc_ushort = &tc_ushort;
-
-static CORBA::TypeCode tc_ulong (CORBA::tk_ulong);
-TAO_Export CORBA::TypeCode_ptr CORBA::_tc_ulong = &tc_ulong;
-
-static CORBA::TypeCode tc_ulonglong (CORBA::tk_ulonglong);
-TAO_Export CORBA::TypeCode_ptr CORBA::_tc_ulonglong = &tc_ulonglong;
-
-// Floating point types:  single, double, quad precision
-
-static CORBA::TypeCode tc_float (CORBA::tk_float);
-TAO_Export CORBA::TypeCode_ptr CORBA::_tc_float = &tc_float;
-
-static CORBA::TypeCode tc_double (CORBA::tk_double);
-TAO_Export CORBA::TypeCode_ptr CORBA::_tc_double = &tc_double;
-
-static CORBA::TypeCode tc_longdouble (CORBA::tk_longdouble);
-TAO_Export CORBA::TypeCode_ptr CORBA::_tc_longdouble = &tc_longdouble;
-
-// Various simple quantities
-
-static CORBA::TypeCode tc_boolean (CORBA::tk_boolean);
-TAO_Export CORBA::TypeCode_ptr CORBA::_tc_boolean = &tc_boolean;
-
-static CORBA::TypeCode tc_octet (CORBA::tk_octet);
-TAO_Export CORBA::TypeCode_ptr CORBA::_tc_octet = &tc_octet;
-
-// Internationalization-related data types: ISO Latin/1 and "wide"
-// characters, and strings of each.  "wchar" is probably Unicode 1.1,
-// "wstring" being null-terminated sets thereof.
-
-static CORBA::TypeCode tc_char (CORBA::tk_char);
-TAO_Export CORBA::TypeCode_ptr CORBA::_tc_char = &tc_char;
-
-static CORBA::TypeCode tc_wchar (CORBA::tk_wchar);
-TAO_Export CORBA::TypeCode_ptr CORBA::_tc_wchar = &tc_wchar;
-
-// a string/wstring have a simple parameter list that indicates the length
-static const CORBA::Long _oc_string [] =
-{	// CDR typecode octets
-  TAO_ENCAP_BYTE_ORDER,				// native endian + padding; "tricky"
-  0				// ... unbounded string
-};
-static CORBA::TypeCode tc_string (CORBA::tk_string,
-			  sizeof _oc_string,
-			  (u_char *) &_oc_string,
-			  CORBA::B_FALSE);
-TAO_Export CORBA::TypeCode_ptr CORBA::_tc_string = &tc_string;
-
-static const CORBA::Long _oc_wstring [] =
-{	// CDR typecode octets
-  TAO_ENCAP_BYTE_ORDER,				// native endian + padding; "tricky"
-  0				// ... unbounded string
-};
-static CORBA::TypeCode tc_wstring (CORBA::tk_wstring,
-			  sizeof _oc_wstring,
-			  (u_char *) &_oc_wstring,
-			  CORBA::B_FALSE);
-TAO_Export CORBA::TypeCode_ptr CORBA::_tc_wstring = &tc_wstring;
-
-//
-// Various things that can be passed as "general" parameters:
-// Any, TypeCode_ptr, Principal_ptr, Object_ptr
-//
-static CORBA::TypeCode tc_any (CORBA::tk_any);
-TAO_Export CORBA::TypeCode_ptr CORBA::_tc_any = &tc_any;
-
-static CORBA::TypeCode tc_typecode (CORBA::tk_TypeCode);
-TAO_Export CORBA::TypeCode_ptr CORBA::_tc_TypeCode = &tc_typecode;
-
-static CORBA::TypeCode tc_principal (CORBA::tk_Principal);
-TAO_Export CORBA::TypeCode_ptr CORBA::_tc_Principal = &tc_principal;
-
-// typecode for objref is complex, has two string parameters
-//
-// NOTE:  Must be four-byte aligned
-
-static const u_char oc_objref [] =
-{
-  0, 0, 0, 0,			// big endian encoding (+ padding)
-  0, 0, 0, 29,                  // 29 char string + 3 pad bytes
-  'I', 'D', 'L', ':',
-  'o', 'm', 'g', '.',
-  'o', 'r', 'g', '/',
-  'C', 'O', 'R', 'B',
-  'A', '/', 'O', 'b',
-  'j', 'e', 'c', 't',
-  ':', '1', '.', '0',
-  '\0', 0, 0, 0,
-  0, 0, 0, 7,			// 7 chars "Object" + 1 pad byte
-  'O', 'b', 'j', 'e',
-  'c', 't', '\0', 0,
-};
-
-static CORBA::TypeCode tc_objref (CORBA::tk_objref,
-				 sizeof oc_objref,
-				 (u_char *) &oc_objref,
-				 CORBA::B_FALSE);
-
-TAO_Export CORBA::TypeCode_ptr CORBA::_tc_Object = &tc_objref;
diff --git a/TAO/tao/typecode.cpp b/TAO/tao/typecode.cpp
deleted file mode 100644
index 9016bdc4ec2..00000000000
--- a/TAO/tao/typecode.cpp
+++ /dev/null
@@ -1,1547 +0,0 @@
-// @ (#)typecode.cpp	1.4 95/09/19
-// Copyright 1994-1995 by Sun Microsystems Inc.
-// All Rights Reserved
-//
-// TYPECODE:	basic implementation of TypeCodes
-//
-// Typecodes essentially consist of just the CDR octets that get
-// marshaled and unmarshaled, and this code knows how to parse those
-// octets and answer questions CORBA's TypeCode APIs require.
-//
-// NOTE: This isn't well tuned performance-wise.  Given how much is
-// variable (byte order, alignment) it's clear tuning has its limits
-// with respect to CDR bytecode interpretation.
-//
-// THREADING NOTE: Typecodes are readonly data structures, and the
-// only mutual exclusion relates to reference counting and
-// construction.
-
-#include "tao/corba.h"
-
-// @@ This is a botch...
-// @@ Can you please explain why?
-size_t
-calc_key_union_attributes (CDR *stream,
-			   size_t &alignment,
-			   size_t &size_with_pad,
-			   CORBA::Environment &env);
-
-// Constructor for all other typecodes, including constants with
-// non-empty parameter lists.  See "corba.hh" for details.
-
-CORBA_TypeCode::CORBA_TypeCode (CORBA::TCKind kind,
-				CORBA::ULong length,
-				CORBA::Octet *buffer,
-				CORBA::Boolean orb_owns_tc,
-				CORBA::TypeCode_ptr parent)
-  : length_ (length),
-    //    buffer_ (buffer),
-    kind_ (kind),
-    parent_ (parent),
-    refcount_ (1),
-    _delete_flag (CORBA::B_FALSE),
-    _orb_owns (orb_owns_tc),
-    private_state_ (new TC_Private_State (kind))
-{
-  // The CDR code used to interpret TypeCodes requires in-memory
-  // alignments to match the "on-the-wire" alignments, simplifying
-  // algorithms used to marshal/unmarshal.
-  //
-  // However, it's often hard to get compilers (in particular) to
-  // generate data that's so aligned, since C++ doesn't provide
-  // primitives giving control at that low a level.  Although there
-  // are ways to get that alignment which work in almost all cases, we
-  // need to ensure adequate alignment in _all_ cases.
-  //
-  // This code exists to ensure such alignment; since the constructor
-  // is intended only for use by an IDL compiler or ORB code, it's not
-  // currently a priority to ensure the allocated code is freed.
-
-#if 0
-  if ((((ptr_arith_t) buffer) & 0x03) != 0)
-    {
-      ptr_arith_t temp;
-
-      temp = (ptr_arith_t) ACE_OS::malloc (length + 4);
-      temp += 3;
-      temp &= ~0x03;
-      buffer_ = (CORBA::Octet *) temp;
-
-      (void) ACE_OS::memcpy (buffer_, buffer, (size_t) length);
-      _orb_owns = CORBA::B_FALSE;	// XXX may leak
-    }
-#endif /* 0 */
-
-  // TAO comments:
-
-  // For free standing typecodes, we choose to always make a copy of
-  // the buffer passed in. That way, our destructor doesn't have to
-  // deal with the case where the buffer was either allocated in which
-  // case it must be freed or the case where our buffer just points to
-  // the buffer passed in.
-
-  if (!parent_)
-    {
-      // No parent. We are free standing.
-      ptr_arith_t temp;
-
-      // Allocate a buffer to hold the encapsulated stream. We
-      // allocate extra space since we need a buffer that is aligned
-      // on a 4 byte word boundary. As a result, it is quite possible
-      // that we may start accessing the buffer from a position
-      // shifted to the right in the allocated buffer. As a result,
-      // during destruction, we do not want part of the allocated heap
-      // to remain dangling. Hence we save a handle to the original
-      // allocated buffer.
-
-      non_aligned_buffer_ = new CORBA::Octet [length + 4];
-
-      temp = (ptr_arith_t) non_aligned_buffer_;
-      temp += 3;
-      temp &= ~0x03;
-      buffer_ = (CORBA::Octet *) temp;
-
-      (void) ACE_OS::memcpy (buffer_, buffer, (size_t) length);
-
-      // The ORB does not own this typecode.
-      _orb_owns = CORBA::B_FALSE;
-    }
-  else
-    {
-      // We are a child. We do not allocate a new buffer, but share it
-      // with our parent. We know that our parent's buffer was
-      // properly aligned.
-      buffer_ = buffer;
-    }
-}
-
-// Destructor.  For "indirected" typecodes and children, the typecode
-// reuses the buffer owned by its parent.
-
-void
-CORBA_TypeCode::operator delete (void* p)
-{
-  if (!((CORBA_TypeCode *) p)->_orb_owns)
-    ::delete p;
-}
-
-CORBA_TypeCode::~CORBA_TypeCode (void)
-{
-  if (_orb_owns)
-    // we are constants, don't do anything
-    return;
-  else if (parent_) // check if we have a parent
-    {
-      // We have a parent which means that we were not directly
-      // created by IDL compiler generated code, but by the
-      // precomputation logic. We should delete ourselves and the
-      // subtree below us only if our parent was in the process of
-      // deleteing itself
-      if (parent_->_delete_flag)
-        // Parent is deleteing, so we have to go.
-	{
-          // Set our delete flag to TRUE so that our children (if any)
-          // will know that we have initiated our destruction
-	  _delete_flag = CORBA::B_TRUE;
-
-          // Delete any private state we have and thus free up the
-          // children.
-	  delete private_state_;
-
-	  // We share the buffer octets of our parent. Hence we don't
-	  // deallocate it.
-	  buffer_ = 0;
-	}
-      // Else, somebody maliciously tried to delete us, but we won't
-      // get deleted.
-    }
-  else
-    {
-      // We are free standing (IDL compiler generated code) and are to
-      // be deleted.  We indicate to our children that we are getting
-      // deleted.
-      _delete_flag = CORBA::B_TRUE;
-
-      // Free up our children.
-      delete private_state_;
-
-      // Delete the original, possibly nonaligned, buffer.
-      delete [] non_aligned_buffer_;
-      buffer_ = 0;
-    }
-}
-
-// decreases the refcount and deletes when refcount reaches 0
-
-void CORBA::release (CORBA::TypeCode_ptr tc)
-{
-  if (tc)
-    tc->Release ();
-}
-
-// returns true if the typecode is NULL
-CORBA::Boolean CORBA::is_nil (CORBA::TypeCode_ptr tc)
-{
-  return (CORBA::Boolean) tc == 0;
-}
-
-// COM's IUnknown support
-
-// {A201E4C1-F258-11ce-9598-0000C07CA898}
-DEFINE_GUID (IID_CORBA_TypeCode,
-0xa201e4c1, 0xf258, 0x11ce, 0x95, 0x98, 0x0, 0x0, 0xc0, 0x7c, 0xa8, 0x98);
-
-// COM stuff
-u_long __stdcall
-CORBA_TypeCode::AddRef (void)
-{
-  ACE_MT (ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, guard, lock_, 0));
-
-  assert (this != 0);
-
-  if (_orb_owns)
-    return refcount_; // this better be 1
-  else if (parent_)
-    // we are owned by the parent
-    //	  return parent_->Addref ();
-    return refcount_; // 1
-  else
-    return refcount_++;
-}
-
-// COM stuff
-u_long __stdcall
-CORBA_TypeCode::Release (void)
-{
-  // This code is subtle since we need to make sure that we don't try
-  // to release the lock after we've deleted this...
-  ACE_MT (this->lock_.acquire ());
-
-  ACE_ASSERT (this != 0);
-
-  u_long result;
-
-  if (_orb_owns)
-    result = refcount_; // 1
-  else if (parent_)
-    // return parent_->Release ();
-    result = refcount_; // 1
-  else
-    {
-      result = --refcount_;
-      ACE_MT (this->lock_.release ());
-
-      if (result == 0)
-        delete this;
-
-      return result;
-    }
-
-  ACE_MT (this->lock_.release ());
-  return result;
-}
-
-// constructor for the private state
-TC_Private_State::TC_Private_State (CORBA::TCKind kind)
-  : tc_kind_ (kind),
-    tc_id_known_ (CORBA::B_FALSE),
-    tc_name_known_ (CORBA::B_FALSE),
-    tc_member_count_known_ (CORBA::B_FALSE),
-    tc_member_type_list_known_ (CORBA::B_FALSE),
-    tc_member_label_list_known_ (CORBA::B_FALSE),
-    tc_discriminator_type_known_ (CORBA::B_FALSE),
-    tc_default_index_used_known_ (CORBA::B_FALSE),
-    tc_length_known_ (CORBA::B_FALSE),
-    tc_content_type_known_ (CORBA::B_FALSE),
-    tc_size_known_ (CORBA::B_FALSE),
-    tc_alignment_known_ (CORBA::B_FALSE),
-    tc_discrim_pad_size_known_ (CORBA::B_FALSE),
-    tc_id_ (0),
-    tc_name_ (0),
-    tc_member_count_ (0),
-    tc_member_type_list_ (0),
-    tc_member_label_list_ (0),
-    tc_discriminator_type_ (0),
-    tc_default_index_used_ (0),
-    tc_length_ (0),
-    tc_content_type_ (0),
-    tc_size_ (0),
-    tc_alignment_ (0),
-    tc_discrim_pad_size_ (0)
-{
-}
-
-// destructor for the private state. In effect, this cleans up all the children
-// and the subtree we hold.
-TC_Private_State::~TC_Private_State (void)
-{
-  // the following two just point into the buffer. So we just make it point to NULL
-  tc_id_ = 0;
-  tc_name_ = 0;
-
-  // determine what kind of children we may have and free the space accordingly
-  switch (tc_kind_)
-    {
-    case CORBA::tk_struct:
-    case CORBA::tk_except:
-      {
-        // free up member type list
-        for (CORBA::ULong i = 0;
-             i < tc_member_count_;
-             i++)
-          {
-            // free up the memory allocated for the typecode
-            delete tc_member_type_list_[i];
-          }
-        // now free up the array
-        delete [] tc_member_type_list_;
-        tc_member_count_ = 0;
-      }
-      break;
-    case CORBA::tk_sequence:
-    case CORBA::tk_array:
-    case CORBA::tk_alias:
-      // delete the content type
-      delete tc_content_type_;
-      break;
-    case CORBA::tk_union:
-      {
-        // Free up type list, label list, and finally the discriminator
-        if (tc_member_type_list_known_)
-          {
-            for (CORBA::ULong i = 0;
-                 i < tc_member_count_;
-                 i++)
-              {
-                // free up the memory allocated for the typecode
-                delete tc_member_type_list_[i];
-              }
-            // now free up the array
-            delete [] tc_member_type_list_;
-          }
-        if (tc_member_label_list_known_)
-          {
-            for (CORBA::ULong i = 0;
-                 i < tc_member_count_;
-                 i++)
-              {
-                // free up the label (Any_ptr)
-                delete tc_member_label_list_[i];
-              }
-            delete [] tc_member_label_list_;
-          }
-        tc_member_count_ = 0;
-        // Discriminator must come last b/c it will be inside the Any
-        // in each element of the label list.
-        delete tc_discriminator_type_;
-      }
-      break;
-    default:
-      // nothing to do
-      break;
-    }
-}
-
-// COM stuff
-HRESULT __stdcall
-CORBA_TypeCode::QueryInterface (REFIID riid,
-				void **ppv)
-{
-  *ppv = 0;
-
-  if (IID_CORBA_TypeCode == riid || IID_IUnknown == riid)
-    *ppv = this;
-
-  if (*ppv == 0)
-    return ResultFromScode (E_NOINTERFACE);
-
- (void) AddRef ();
-  return NOERROR;
-}
-
-// This method is not yet implemented completely - low priority task
-CORBA::Boolean
-CORBA_TypeCode::private_equal (CORBA::TypeCode_ptr,
-			       CORBA::Environment &) const
-{
-  // We come in here only if the typecode kinds of both are same
-  // Handle each complex typecode separately.
-  switch (kind_)
-    {
-    case CORBA::tk_null:
-    case CORBA::tk_void:
-    case CORBA::tk_short:
-    case CORBA::tk_ushort:
-    case CORBA::tk_long:
-    case CORBA::tk_ulong:
-    case CORBA::tk_float:
-    case CORBA::tk_double:
-    case CORBA::tk_longlong:
-    case CORBA::tk_longdouble:
-    case CORBA::tk_boolean:
-    case CORBA::tk_octet:
-    case CORBA::tk_char:
-    case CORBA::tk_wchar:
-    case CORBA::tk_TypeCode:
-    case CORBA::tk_Principal:
-      // all these are simple typecodes and the comparison is based solely on
-      // the kind_ field
-      return CORBA::B_TRUE;
-    case CORBA::tk_objref:
-      //      return private_equal_objref (tc, env);
-    case CORBA::tk_struct:
-      //      return private_equal_struct (tc, env);
-    case CORBA::tk_union:
-      //      return private_equal_union (tc, env);
-    case CORBA::tk_enum:
-      //      return private_equal_enum (tc, env);
-    case CORBA::tk_string:
-      //      return private_equal_string (tc, env);
-    case CORBA::tk_wstring:
-      //      return private_equal_string (tc, env);
-    case CORBA::tk_sequence:
-      //      return private_equal_sequence (tc, env);
-    case CORBA::tk_array:
-      //      return private_equal_array (tc, env);
-    case CORBA::tk_alias:
-      //      return private_equal_alias (tc, env);
-    case CORBA::tk_except:
-      //      return private_equal_except (tc, env);
-    default:
-      // Not implemented yet
-      return CORBA::B_TRUE;
-    }
-}
-
-// Return the type ID (RepositoryId) for the TypeCode; it may be empty.
-//
-// NOTE the string returned here is owned by the typecode!!
-//
-// Valid only for objref, struct, union, enum, alias, and except. Raises
-// BadKind exception for the rest of the cases.
-TAO_CONST CORBA::String
-CORBA_TypeCode::private_id (CORBA::Environment &env) const
-{
-  env.clear ();
-
-  switch (kind_)
-    {
-      // These are all complex typecodes, which have as their first
-      // parameter (number zero) a repository/type ID string encoded
-      // per CDR rules.  That means we can just return a pointer to
-      // that string directly!
-
-    case CORBA::tk_objref:
-    case CORBA::tk_struct:
-    case CORBA::tk_union:
-    case CORBA::tk_enum:
-    case CORBA::tk_alias:
-    case CORBA::tk_except:
-      {
-	private_state_->tc_id_known_ = CORBA::B_TRUE;
-	private_state_->tc_id_ = (CORBA::String) (buffer_
-						 + 4	// skip byte order flag
-							// and padding
-						 + 4);	// skip (strlen + 1)
-	return private_state_->tc_id_; // this is OK because the strings in the
-				       // CDR stream are NULL terminated
-      }
-    // No other typecodes ever have type IDs
-    default:
-      env.exception (new CORBA::TypeCode::BadKind ());
-      return 0;
-    }
-}
-
-// return the name. The string is owned by the typecode
-TAO_CONST CORBA::String
-CORBA_TypeCode::private_name (CORBA::Environment &env) const
-{
-  env.clear ();
-
-  switch (kind_)
-    {
-      // These are all complex typecodes, which have as their second
-      // parameter (number one) a name string encoded
-      // per CDR rules.  That means we can just return a pointer to
-      // that string directly!
-
-    case CORBA::tk_objref:
-    case CORBA::tk_struct:
-    case CORBA::tk_union:
-    case CORBA::tk_enum:
-    case CORBA::tk_alias:
-    case CORBA::tk_except:
-      {
-	CDR stream;
-
-	stream.setup_encapsulation (buffer_, (size_t) length_);
-
-	// skip the typecode ID
-	if (stream.skip_string ())  // ID
-	  {
-	    private_state_->tc_name_known_ = CORBA::B_TRUE;
-
-	    // skip past the length field.
-	    private_state_->tc_name_ = (CORBA::String) (stream.next + CDR::LONG_SIZE);
-
-	    return private_state_->tc_name_;
-	  }
-	else
-	  {
-	    env.exception (new CORBA::INTERNAL (CORBA::COMPLETED_NO));
-	    return (CORBA::String)0;
-	  }
-      }
-    // No other typecodes ever have type IDs
-    default:
-      env.exception (new CORBA::TypeCode::BadKind ());
-      return (CORBA::String)0;
-    }
-}
-
-// Return the number of members defined by this typecode
-//
-// Applicable to struct, union, enum, alias, and except
-// For the rest of the cases, raises the BadKind exception.
-
-CORBA::ULong
-CORBA_TypeCode::private_member_count (CORBA::Environment &env) const
-{
-  env.clear ();
-
-  switch (kind_)
-    {
-    case CORBA::tk_alias:
-      //      tc_member_count_known_ = CORBA::B_TRUE;
-      //tc_member_count_ = 1;
-      return 1;
-
-    case CORBA::tk_enum:
-    case CORBA::tk_except:
-    case CORBA::tk_struct:
-      {
-	CORBA::ULong members;
-	CDR stream;
-
-	stream.setup_encapsulation (buffer_, (size_t) length_);
-
-	// skip rest of header (type ID and name) and collect the
-	// number of struct members
-	if (!stream.skip_string ()	    	    // ID
-	    || !stream.skip_string ()  	    // struct name
-	    || !stream.get_ulong (members))
-	  {
-	    env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO));
-	    return 0;
-	  }
-
-	private_state_->tc_member_count_known_ = CORBA::B_TRUE;
-	private_state_->tc_member_count_ = members;
-	return private_state_->tc_member_count_;
-      }
-    case CORBA::tk_union:
-      {
-	CORBA::ULong members;
-	CDR stream;
-
-	stream.setup_encapsulation (buffer_, (size_t) length_);
-
-	// skip rest of header (type ID, name, etc...) and collect the
-	// number of struct members
-	if (!stream.skip_string ()			// ID
-	    || !stream.skip_string ()		// struct name
-	    || !skip_typecode (stream)		// discriminant TC
-	    || !stream.get_ulong (members)	// default used
-	    || !stream.get_ulong (members))	// real member count
-	  {
-	    // this is a system exception indicating something is wrong with
-	    // the typecode itself.
-	    env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO));
-	    return 0;
-	  }
-
-	private_state_->tc_member_count_known_ = CORBA::B_TRUE;
-	private_state_->tc_member_count_ = members;
-	return private_state_->tc_member_count_;
-      }
-    default:
-      env.exception (new CORBA::TypeCode::BadKind ());
-      return 0;
-    }
-}
-
-// Return the name for the nth member
-// Applicable only to CORBA::tk_struct, CORBA::tk_union, and CORBA::tk_except
-TAO_CONST CORBA::String
-CORBA_TypeCode::member_name (CORBA::ULong,
-			     CORBA::Environment &) const
-{
-  // not implemented - low priority task
-  return 0;
-}
-
-// NOTE special calling convention for stream.decode () when we're
-// potentially deencapsulating an indirected typecode: the "data2"
-// value indicates that this typecode is the parent.  See comments at
-// stream.decode () for further details.
-//
-// Applicable only to struct, union, and except
-//
-
-CORBA::TypeCode_ptr
-CORBA_TypeCode::private_member_type (CORBA::ULong index,
-				     CORBA::Environment &env) const
-{
-  CORBA::ULong temp, mcount;
-
-  // Build the de-encapsulating CDR stream, bypassing the stringent
-  // alignment tests (we're a bit looser in what we need here, and we
-  // _know_ we're OK).  Then skip the byte order code.
-  CDR stream;
-  CORBA::TypeCode_ptr tc = 0;
-
-  stream.setup_encapsulation (buffer_, (size_t) length_);
-
-  switch (kind_)
-    {
-    case CORBA::tk_except:
-    case CORBA::tk_struct:		// index from 0
-      mcount = member_count (env);		// clears env
-      if (env.exception () == 0)
-	{
-	  // the first time in. Precompute and store types of all members
-
-	  // Allocate a list to hold the member typecodes
-	  private_state_->tc_member_type_list_ = new CORBA::TypeCode_ptr [mcount];
-
-	  if (private_state_->tc_member_type_list_)
-	    {
-	      // skip the id, name, and member_count part
-	      if (!stream.skip_string ()	// type ID, hidden
-		  || !stream.skip_string ()	// typedef name
-		  || !stream.get_ulong (temp))  // member count
-		{
-		  env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO));
-		  return (CORBA::TypeCode_ptr)0;
-		}
-	      else
-		{
-		  // compute the typecodes for all the members and
-		  // return the required one.
-		  for (CORBA::ULong i = 0; i < mcount; i++)
-		    {
-		      // the ith entry will have the typecode of the ith guy
-		      if (!stream.skip_string ()  // skip the name
-			  || stream.decode (CORBA::_tc_TypeCode,
-					    // the typecode will be retrieved
-					    // at the i-th location. The decode
-					    // routine will allocate the
-					    // storage to hold a typecode
-					    &private_state_->tc_member_type_list_[i],
-					    this,  // pass ourselves since we
-						   // will be
-						   // the parent. This is the
-						   // case where the 3rd
-						   // parameter is used in a
-						   // decode method
-					    env) != CORBA::TypeCode::TRAVERSE_CONTINUE)
-			{
-			  env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO));
-			  return 0;
-			}
-		    }
-
-		  private_state_->tc_member_type_list_known_ = CORBA::B_TRUE;
-
-		  if (index < mcount)
-		    return private_state_->tc_member_type_list_[index];
-		  else
-		    {
-		      env.exception (new CORBA::TypeCode::Bounds ());
-		      return (CORBA::TypeCode_ptr)0;
-		    }
-		}
-	    }
-	  else  // no memory for the member_list
-	    {
-	      env.exception (new CORBA::NO_MEMORY (CORBA::COMPLETED_NO));
-	      return (CORBA::TypeCode_ptr)0;
-	    }
-	}
-      else // out of bounds
-	{
-	  env.exception (new CORBA::TypeCode::Bounds ());
-	  return (CORBA::TypeCode_ptr)0;
-	}
-    case CORBA::tk_union:            // index from 0
-      mcount = member_count (env);		// clears env
-      if (env.exception () == 0)
-	{
-	  // the first time in. Precompute and store types of all members
-	  private_state_->tc_member_type_list_ = new CORBA::TypeCode_ptr [mcount];
-	  if (private_state_->tc_member_type_list_)
-	    {
-	      // skip the id, name, and discrimant type part
-	      if (!stream.skip_string ()	// type ID, hidden
-		  || !stream.skip_string ()	// typedef name
-		  || !skip_typecode (stream))   // skip typecode for discriminant
-		{
-		  env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO));
-		  return (CORBA::TypeCode_ptr)0;
-		}
-	      else if (!stream.get_ulong (temp)	    // default used
-		       || !stream.get_ulong (temp)) // member count
-		{
-		  env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO));
-		  return 0;
-		}
-	      else
-		{
-		  CORBA::Long scratch; // always big enough because labels can
-				      // only be of a few different types of
-				      // which "long" has the largest size
-
-		  // get the typecode for the discriminator
-		  tc = discriminator_type (env);
-		  // compute the typecodes for all the members and return the
-		  // required one
-
-		  for (CORBA::ULong i = 0; i < mcount; i++)
-		    {
-		      // the ith entry will have the typecode of the ith guy
-		      if (stream.decode (tc, &scratch, this,  env) // member label
-			  != CORBA::TypeCode::TRAVERSE_CONTINUE
-			  || !stream.skip_string ()  // skip the name
-			  || stream.decode (CORBA::_tc_TypeCode,  // get the typecode
-					    &private_state_->tc_member_type_list_[i],
-					    this,
-					    env) !=
-			  CORBA::TypeCode::TRAVERSE_CONTINUE)
-			{
-			  env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO));
-			  return 0;
-			}
-		    }
-		  private_state_->tc_member_type_list_known_ = CORBA::B_TRUE;
-
-		  if (index < mcount)
-		    return private_state_->tc_member_type_list_[index];
-		  else
-		    {
-		      env.exception (new CORBA::TypeCode::Bounds ());
-		      return (CORBA::TypeCode_ptr)0;
-		    }
-		}
-	    }
-	  else  // no memory for the member_list
-	    {
-	      env.exception (new CORBA::NO_MEMORY (CORBA::COMPLETED_NO));
-	      return (CORBA::TypeCode_ptr)0;
-	    }
-	}
-      else // out of bounds
-	{
-	  env.exception (new CORBA::TypeCode::Bounds ());
-	  return (CORBA::TypeCode_ptr)0;
-	}
-
-    default:
-      // bad kind
-      env.exception (new CORBA::TypeCode::BadKind ());
-      return (CORBA::TypeCode_ptr)0;
-    }
-}
-
-// Return member labels for CORBA::tk_union typecodes.
-CORBA::Any_ptr
-CORBA_TypeCode::private_member_label (CORBA::ULong n,
-			      CORBA::Environment &env) const
-{
-  env.clear ();
-
-  // this function is only applicable to the CORBA::tk_union TC
-  if (kind_ == CORBA::tk_union)
-    {
-      CDR stream;
-
-      stream.setup_encapsulation (buffer_, (size_t) length_);
-
-      // skip ID and name, and then get the discriminant TC
-      CORBA::TypeCode_ptr    tc = 0;
-
-      if (!stream.skip_string ()       // type ID, hidden
-	  || !stream.skip_string ()    // typedef name
-	  || !skip_typecode (stream))  // skip discriminant typecode
-	{
-	  env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO));
-	  return 0;
-	}
-
-      // skip default used, and get member count
-      CORBA::ULong member_count;
-
-      if (!stream.get_ulong (member_count)	// default used
-	  || !stream.get_ulong (member_count))  // member count
-	{
-	  env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO));
-	  dmsg ("TypeCode::private_member_label -- error reading from stream");
-	  return 0;
-	}
-
-      // member labels are of type Any. However, the actual types are
-      // restricted to simple types
-      private_state_->tc_member_label_list_ = new CORBA::Any_ptr [member_count];
-      if (private_state_->tc_member_label_list_)
-	{
-	  tc = discriminator_type (env); // retrieve the discriminator type as
-					 // this decides what the label is
-	  for (CORBA::ULong i = 0; i < member_count; i++)
-	    {
-	      // allocate buffer to hold the member label value
-	      void *buf = new CORBA::Octet [tc->size (env)];
-	      if (stream.decode (tc, buf, this,  env)
-		  != CORBA::TypeCode::TRAVERSE_CONTINUE
-		  || !stream.skip_string ()   	    // member name
-		  || !skip_typecode (stream)) // member type
-		{	    // member TC
-		  dmsg1 ("TypeCode::private_member_label -- error getting typecode for member %d",i);
-		  delete [] buf;
-		  // XXXASG: free this list on error
-		  env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO));
-		  return 0;
-		}
-	      else
-		{
-		  private_state_->tc_member_label_list_[i] = new CORBA::Any (tc,
-									    buf, CORBA::B_TRUE);
-		}
-	    }
-	}
-      else
-	{
-	  env.exception (new CORBA::NO_MEMORY (CORBA::COMPLETED_NO));
-	  return 0;
-	}
-
-      private_state_->tc_member_label_list_known_ = CORBA::B_TRUE;
-
-      // If caller asked for the label for a nonexistent member, they get
-      // an error report!
-      if (n >= member_count)
-	{
-	  env.exception (new CORBA::TypeCode::Bounds ());
-	  return 0;
-	}
-      else
-	return private_state_->tc_member_label_list_[n];
-    }
-  else // wrong typecode
-    {
-      env.exception (new CORBA::TypeCode::BadKind ());
-      return 0;
-    }
-}
-
-CORBA::TypeCode_ptr
-CORBA_TypeCode::private_discriminator_type (CORBA::Environment &env) const
-{
-  CDR stream;
-
-  stream.setup_encapsulation (buffer_, (size_t) length_);
-
-  // skip ID and name, and then get the discriminant TC
-
-  if (!stream.skip_string ()		// type ID, hidden
-      || !stream.skip_string ()	        // typedef name
-      || stream.decode (CORBA::_tc_TypeCode,
-			&private_state_->tc_discriminator_type_, this,  env) !=
-      CORBA::TypeCode::TRAVERSE_CONTINUE)
-    {
-      env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO));
-      return 0;
-    }
-  else
-    {
-      private_state_->tc_discriminator_type_known_ = CORBA::B_TRUE;
-      return private_state_->tc_discriminator_type_;
-    }
-}
-
-CORBA::Long
-CORBA_TypeCode::private_default_index (CORBA::Environment &env) const
-{
-  CDR stream;
-
-  stream.setup_encapsulation (buffer_, (size_t) length_);
-
-  // skip ID and name, and then get the discriminant TC
-
-  if (!stream.skip_string ()		// type ID, hidden
-      || !stream.skip_string ()	        // typedef name
-      || !skip_typecode (stream)        // skip discriminant
-      || !stream.get_long (private_state_->tc_default_index_used_))
-
-    {
-      env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO));
-      return 0;
-    }
-  else
-    {
-      private_state_->tc_default_index_used_known_ = CORBA::B_TRUE;
-      return private_state_->tc_default_index_used_;
-    }
-}
-
-CORBA::Long
-CORBA_TypeCode::privatelength_ (CORBA::Environment &env) const
-{
-  CDR stream;
-#if defined(TAO_NEEDS_UNUSED_VARIABLES)
-  CORBA::TypeCode_ptr tc = 0;
-#endif /* TAO_NEEDS_UNUSED_VARIABLES */
-
-  stream.setup_encapsulation (buffer_, (size_t) length_);
-  switch (kind_)
-    {
-    case CORBA::tk_sequence:
-    case CORBA::tk_array:
-      {
-	// skip the typecode of the element and get the bounds
-	if (!skip_typecode (stream) // skip typecode
-	    || !stream.get_ulong (private_state_->tc_length_))
-	  {
-	    env.exception (new CORBA::BAD_PARAM (CORBA::COMPLETED_NO));
-	    return 0;
-	  }
-	else
-	  {
-	    private_state_->tc_length_known_ = CORBA::B_TRUE;
-	    return private_state_->tc_length_;
-	  }
-      case CORBA::tk_string:
-      case CORBA::tk_wstring:
-	{
-	  if (stream.get_ulong (private_state_->tc_length_))
-	    {
-	      private_state_->tc_length_known_ = CORBA::B_TRUE;
-	      return private_state_->tc_length_;
-	    }
-	  else
-	    {
-	      env.exception (new CORBA::BAD_PARAM (CORBA::COMPLETED_NO));
-	      return 0;
-	    }
-	}
-      default:
-	env.exception (new CORBA::TypeCode::BadKind);
-	return 0;
-      }
-    }
-}
-
-CORBA::TypeCode_ptr
-CORBA_TypeCode::private_content_type (CORBA::Environment &env) const
-{
-  CDR stream;
-
-  stream.setup_encapsulation (buffer_, (size_t) length_);
-  switch (kind_)
-    {
-    case CORBA::tk_sequence:
-    case CORBA::tk_array:
-      {
-	// retrieve the content type
-	if (stream.decode (CORBA::_tc_TypeCode, &private_state_->tc_content_type_,
-			   this,  env) !=
-	    CORBA::TypeCode::TRAVERSE_CONTINUE) // element type
-	  {
-	    env.exception (new CORBA::BAD_PARAM (CORBA::COMPLETED_NO));
-	    return 0;
-	  }
-	else
-	  {
-	    private_state_->tc_content_type_known_ = CORBA::B_TRUE;
-	    return private_state_->tc_content_type_;
-	  }
-      case CORBA::tk_alias:
-	{
-	  if (!stream.skip_string ()  // typeID
-	      || !stream.skip_string () // name
-	      || stream.decode (CORBA::_tc_TypeCode,
-				&private_state_->tc_content_type_, this,  env) !=
-	      CORBA::TypeCode::TRAVERSE_CONTINUE)
-	    {
-	      env.exception (new CORBA::BAD_PARAM (CORBA::COMPLETED_NO));
-	      return 0;
-	    }
-	  else
-	    {
-	      private_state_->tc_content_type_known_ = CORBA::B_TRUE;
-	      return private_state_->tc_content_type_;
-	    }
-	}
-      default:
-	env.exception (new CORBA::TypeCode::BadKind);
-	return 0;
-      }
-    }
-}
-
-CORBA::ULong
-CORBA_TypeCode::private_discrim_pad_size (CORBA::Environment &env)
-{
-  CDR stream;
-  size_t discrim_size,
-    overall_align;
-
-  stream.setup_encapsulation (buffer_, (size_t) length_);
-
- (void) calc_key_union_attributes (&stream, overall_align, discrim_size, env);
-
-  if (env. exception () == 0)
-    {
-      private_state_->tc_discrim_pad_size_known_ = CORBA::B_TRUE;
-      private_state_->tc_discrim_pad_size_ = discrim_size;
-      return discrim_size;
-    }
-  else
-    return 0;
-}
-// ************ The following are deprecated ****************
-
-// say how many parameters this typecode has; normally a fixed number,
-// some are variable length.
-//
-// NOTE: This refers to "real" parameters, not what shows up in the
-// IFR spec !!  That is, "hidden" parameters are counted here, this
-// doesn't strictly comply with what CORBA says "param_count"
-// provides.
-
-CORBA::ULong
-CORBA_TypeCode::param_count (CORBA::Environment &env) const
-{
-  env.clear ();
-
-  switch (kind_)
-    {
-    default:
-      return 0;
-
-    case CORBA::tk_string:
-    case CORBA::tk_wstring:
-      return 1;
-
-    case CORBA::tk_objref:
-    case CORBA::tk_sequence:
-    case CORBA::tk_array:
-      return 2;
-
-    case CORBA::tk_alias:
-      return 3;
-
-    case CORBA::tk_except:
-    case CORBA::tk_struct:
-      {
-	CORBA::ULong members;
-	CDR stream;
-
-	stream.setup_encapsulation (buffer_, (size_t) length_);
-
-	// skip rest of header (type ID and name) and collect the
-	// number of struct members
-	if (!stream.skip_string ()	    	    // ID
-	    || !stream.skip_string ()  	    // struct name
-	    || !stream.get_ulong (members))
-	  {
-	    env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO));
-	    return 0;
-	  }
-
-	return 3 + 2 * members;
-      }
-    case CORBA::tk_enum:
-      {
-	CORBA::ULong members;
-	CDR stream;
-
-	stream.setup_encapsulation (buffer_, (size_t) length_);
-
-	// skip rest of header (type ID and name) and collect the
-	// number of struct members
-	if (!stream.skip_string ()			// ID
-	    || !stream.skip_string ()		// typedef name
-	    || !stream.get_ulong (members))
-	  {
-	    env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO));
-	    return 0;
-	  }
-
-	return 3 + members;
-      }
-    case CORBA::tk_union:
-      {
-	CORBA::ULong members;
-	CDR stream;
-
-	stream.setup_encapsulation (buffer_, (size_t) length_);
-
-	// skip rest of header (type ID, name, etc...) and collect the
-	// number of struct members
-	if (!stream.skip_string ()			// ID
-	    || !stream.skip_string ()		// struct name
-	    || !skip_typecode (stream)		// discriminant TC
-	    || !stream.get_ulong (members)	// default used
-	    || !stream.get_ulong (members))	// real member count
-	  {
-	    env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO));
-	    return 0;
-	  }
-
-	return 5 + 3 * members;
-      }
-    }
-}
-
-
-// Internal hack, used until member_count () and length () are
-// implemented.  Doesn't support all the types that those routines
-// support.
-
-CORBA::ULong
-CORBA_TypeCode::ulong_param (CORBA::ULong n,
-			     CORBA::Environment &env) const
-{
-  CORBA::ULong temp;
-
-  temp = param_count (env);		// clears env
-  if (env.exception ())
-    return 0;
-
-  if (temp < n)
-    {
-      env.exception (new CORBA::TypeCode::Bounds);
-      return 0;
-    }
-
-  // Get parameters for non-empty typecodes; their parameter lists are
-  // encapsulated CDR (for complex ones) or inlined (for simple ones).
-  switch (kind_)
-    {
-    default:				// most have no long params
-      break;
-
-      // Array, sequence ... complex parameter lists
-    case CORBA::tk_array:		// param 1 is an integer
-    case CORBA::tk_sequence:		// ... identical content
-      {
-	if (n == 0)
-	  break;
-
-	// Build CDR stream for encapsulated params, and skip the
-	// typecode up front.
-	CDR stream;
-
-	stream.setup_encapsulation (buffer_, (size_t) length_);
-	if (!skip_typecode (stream))
-	  {
-	    env.exception (new CORBA::BAD_PARAM (CORBA::COMPLETED_NO));
-	    return 0;
-	  }
-
-	// Then comes the "bounds" parameter.
-	if (!stream.get_ulong (temp))
-	  env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO));
-	return temp;
-      }
-
-    // string, wstring ... simple parameter lists, containing just the
-    // string bounds (zero indicates unbounded).  Stored specially
-    case CORBA::tk_string:
-    case CORBA::tk_wstring:
-      if (n != 0)
-	break;
-      return length_;
-    }
-  env.exception (new CORBA::BAD_PARAM (CORBA::COMPLETED_NO));
-  return 0;
-}
-
-// Internal hack, used until member_type (), discriminator_type (),
-// and content_type () are implemented.
-//
-// NOTE special calling convention for stream.decode () when we're
-// potentially deencapsulating an indirected typecode: the "data2"
-// value indicates that this typecode is the parent.  See comments at
-// stream.decode () for further details.
-
-CORBA::TypeCode_ptr
-CORBA_TypeCode::typecode_param (CORBA::ULong n,
-				CORBA::Environment &env) const
-{
-  CORBA::ULong temp;
-
-  temp = param_count (env);		// clears env
-  if (env.exception ())
-    return 0;
-
-  if (temp < n)
-    {
-      env.exception (new CORBA::TypeCode::Bounds);
-      return 0;
-    }
-
-  // Build the de-encapsulating CDR stream, bypassing the stringent
-  // alignment tests (we're a bit looser in what we need here, and we
-  // _know_ we're OK).  Then skip the byte order code.
-
-  CDR stream;
-  CORBA::TypeCode_ptr tc = 0;
-
-  stream.setup_encapsulation (buffer_, (size_t) length_);
-
-  switch (kind_)
-    {
-    default:				// most have no tc params
-      break;
-
-    case CORBA::tk_sequence:		// param 0 is a tc
-    case CORBA::tk_array:
-      if (n != 0)
-	break;
-      if (stream.decode (CORBA::_tc_TypeCode,
-			 &tc,
-			 this,
-			 env) != CORBA::TypeCode::TRAVERSE_CONTINUE)
-	{
-	  env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO));
-	  return 0;
-	}
-      return tc;
-
-    case CORBA::tk_alias:		// #1 is a tc
-      if (n != 2)
-	break;
-      if (!stream.skip_string ()		// type ID, hidden
-	  || !stream.skip_string ()	// typedef name
-	  || stream.decode (CORBA::_tc_TypeCode, &tc, this,  env)
-	  != CORBA::TypeCode::TRAVERSE_CONTINUE)
-	{
-	  env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO));
-	  return 0;
-	}
-      return tc;
-
-    case CORBA::tk_except:
-    case CORBA::tk_struct:		// #5 and up are tc, index from 0
-      if (n < 4 || n & 0x1)
-	{	// tc is at odd number of param list
-	  env.exception (new CORBA::TypeCode::Bounds);
-	  return 0;
-	}
-
-      if (!stream.skip_string ()		// type ID, hidden
-	  || !stream.skip_string ()	// typedef name
-	  || !stream.get_ulong (temp))
-	{ 	// member count
-	  env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO));
-	  return 0;
-	}
-      else
-	{
-	  temp = (n - 3) / 2;
-
-	  // skip member pairs to the one we want
-	  for (CORBA::ULong i = 0; i < temp; i++)
-	    {
-	      // skip to the member being asked
-	      if (!stream.skip_string ()	// member name
-		  || !skip_typecode (stream))
-		{
-		  env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO));
-		  return 0;
-		}
-	    }
-
-	  if (!stream.skip_string ()
-	      || stream.decode (CORBA::_tc_TypeCode, &tc, this,
-			       env)!= CORBA::TypeCode::TRAVERSE_CONTINUE)
-	    {
-	      env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO));
-	      return 0;
-	    }
-	  return tc;
-	}
-
-    case CORBA::tk_union:            // #6 and up are tc, index from 0
-      if (n != 2 && (n < 7 || (n - 7) % 3))
-	{
-	  env.exception (new CORBA::TypeCode::Bounds);
-	  return 0;
-	}
-
-      if (!stream.skip_string ()		// type ID, hidden
-	  || !stream.skip_string ()	// typedef name
-	  || stream.decode (CORBA::_tc_TypeCode,
-			   &tc, this,
-			    env) != CORBA::TypeCode::TRAVERSE_CONTINUE)  // TC
-	{
-	  env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO));
-	  return 0;
-	}
-      else if (!stream.get_ulong (temp)	// default used
-		 || !stream.get_ulong (temp))	// member count
-	{
-	  tc->Release ();
-	  env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO));
-	  return 0;
-	}
-
-      if (n == 2)
-	return tc;
-
-      temp = (n - 7) / 3;
-
-      // skip to the member requested
-
-      CORBA::Long scratch;		// always big enough
-
-      for (CORBA::ULong i = 0; i < temp; i++)
-	{
-	  if (stream.decode (tc, &scratch, this,  env) // member label
-	      != CORBA::TypeCode::TRAVERSE_CONTINUE
-	      || !stream.skip_string ()		// member name
-	      || !skip_typecode (stream))
-	    {	// member typecode
-	      tc->Release ();
-	      env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO));
-	      return 0;
-	    }
-	}
-
-      // member label
-      if (stream.decode (tc,
-			&scratch, this,
-			 env) != CORBA::TypeCode::TRAVERSE_CONTINUE
-	  || !stream.skip_string ())		// member name
-	{
-	  tc->Release ();
-	  env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO));
-	  return 0;
-	}
-      tc->Release ();
-
-      if (stream.decode (CORBA::_tc_TypeCode,
-			&tc, this,
-			 env) != CORBA::TypeCode::TRAVERSE_CONTINUE)
-	{
-	  env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO));
-	  return 0;
-	}
-      return tc;
-    }
-
-  env.exception (new CORBA::BAD_PARAM (CORBA::COMPLETED_NO));
-  return 0;
-}
-
-// skip a typecode encoding in a given CDR stream
-// This is just a helper function
-CORBA::Boolean
-CORBA_TypeCode::skip_typecode (CDR &stream)
-{
-  CORBA::ULong kind;
-  CORBA::ULong temp;
-
-  if (stream.get_ulong (kind)
-      && (kind < CORBA::TC_KIND_COUNT || kind == ~CORBA::ULong(0)))
-    {
-
-      switch (kind)
-	{
-	  // Most TypeCodes have empty parameter lists, nothing to skip
-	default:
-	  break;
-
-	  // Some have single integer parameters, easy to skip.  Some have
-	  // preallocated constants that could be used.
-	case CORBA::tk_string:
-	case CORBA::tk_wstring:
-	case ~0:
-	  return stream.get_ulong (temp);
-
-	  // The rest have "complex" parameter lists that are
-	  // encoded as bulk octets ... just skip them.
-	case CORBA::tk_objref:
-	case CORBA::tk_struct:
-	case CORBA::tk_union:
-	case CORBA::tk_enum:
-	case CORBA::tk_sequence:
-	case CORBA::tk_array:
-	case CORBA::tk_alias:
-	case CORBA::tk_except:
-	  return stream.get_ulong (temp) != CORBA::B_FALSE
-	    && stream.skip_bytes (temp) != CORBA::B_FALSE;
-	}
-
-      return CORBA::B_TRUE;
-    }
-  else
-    return CORBA::B_FALSE;
-}
-
-// Constructor for CONSTANT typecodes with empty parameter lists.
-// These are only created once, and those constants are shared.
-
-CORBA_TypeCode::CORBA_TypeCode (CORBA::TCKind kind)
-  : length_ (0),
-    buffer_ (0),
-    kind_ (kind),
-    parent_ (0),
-    refcount_ (1),
-    _delete_flag (CORBA::B_FALSE),
-    _orb_owns (CORBA::B_TRUE),
-    private_state_ (new TC_Private_State (kind)),
-    non_aligned_buffer_ (0)
-{
-}
-
-// Return the i-th member typecode if it exists, else raise an
-// exception. Possible exceptions are BadKind and Bounds.
-//
-// Applicable only to struct, union, and except
-
-CORBA::TypeCode_ptr
-CORBA_TypeCode::member_type (CORBA::ULong index,
-			     CORBA::Environment &env) const
-{
-  if (private_state_->tc_member_count_known_
-      && private_state_->tc_member_type_list_known_)
-    {
-      if (index < private_state_->tc_member_count_)
-        return private_state_->tc_member_type_list_[index];
-      else
-        {
-          env.exception (new CORBA::TypeCode::Bounds ());
-          return 0;
-        }
-    }
-  else
-    return private_member_type (index, env);
-}
-
-// Return the label of the i-th member.  Applicable only to CORBA::tk_union
-CORBA::Any_ptr
-CORBA_TypeCode::member_label (CORBA::ULong index,
-                              CORBA::Environment &env) const
-{
-  if (private_state_->tc_member_count_known_
-      && private_state_->tc_member_label_list_known_)
-    {
-      if (index < private_state_->tc_member_count_)
-        return private_state_->tc_member_label_list_[index];
-      else
-        {
-          env.exception (new CORBA::TypeCode::Bounds ());
-          return 0;
-        }
-    }
-  else
-    return private_member_label (index, env);
-}
-
-// only applicable to CORBA::tk_unions
-CORBA::TypeCode_ptr
-CORBA_TypeCode::discriminator_type (CORBA::Environment &env) const
-{
-  if (kind_ == CORBA::tk_union)
-    {
-      if (private_state_->tc_discriminator_type_known_)
-        return private_state_->tc_discriminator_type_;
-      else
-          return private_discriminator_type (env);
-    }
-  else
-    {
-      env.exception (new CORBA::TypeCode::BadKind ());
-      return (CORBA::TypeCode_ptr)0;
-    }
-}
-
-// only applicable to CORBA::tk_unions
-CORBA::Long
-CORBA_TypeCode::default_index (CORBA::Environment &env) const
-{
-  if (kind_ == CORBA::tk_union)
-    {
-      if (private_state_->tc_default_index_used_known_)
-        return private_state_->tc_default_index_used_;
-      else
-        return private_default_index (env);
-    }
-  else
-    {
-      env.exception (new CORBA::TypeCode::BadKind ());
-      return 0;
-    }
-}
-
-// returns the length. Applicable only to string, sequence, and arrays
-CORBA::ULong
-CORBA_TypeCode::length (CORBA::Environment &env) const
-{
-  // a switch stmt, unfortunately, doesn't get inlined
-  if (kind_ == CORBA::tk_sequence
-      || kind_ == CORBA::tk_array
-      || kind_ == CORBA::tk_string
-      || kind_ == CORBA::tk_wstring)
-    {
-      if (private_state_->tc_length_known_)
-        return private_state_->tc_length_;
-      else
-        return privatelength_ (env);
-    }
-  else
-    {
-      env.exception (new CORBA::TypeCode::BadKind ());
-      return 0;
-    }
-}
-
-// returns the length. Applicable only to string, sequence, and arrays
-CORBA::TypeCode_ptr
-CORBA_TypeCode::content_type (CORBA::Environment &env) const
-{
-  if (kind_ == CORBA::tk_sequence
-      || kind_ == CORBA::tk_array
-      || kind_ == CORBA::tk_alias)
-    {
-      if (private_state_->tc_content_type_known_)
-        return private_state_->tc_content_type_;
-      else
-        return private_content_type (env);
-    }
-  else
-    {
-      env.exception (new CORBA::TypeCode::BadKind ());
-      return 0;
-    }
-}
-
-// compute the padded size of the discriminant
-CORBA::ULong
-CORBA_TypeCode::TAO_discrim_pad_size (CORBA::Environment &env)
-{
-  if (kind_ == CORBA::tk_union)
-    {
-      if (private_state_->tc_discrim_pad_size_known_)
-        return private_state_->tc_discrim_pad_size_;
-      else
-        return private_discrim_pad_size (env);
-    }
-  else
-    {
-      env.exception (new CORBA::TypeCode::BadKind ());
-      return 0;
-    }
-}
diff --git a/TAO/tao/typecode.h b/TAO/tao/typecode.h
deleted file mode 100644
index bc19c3d46b0..00000000000
--- a/TAO/tao/typecode.h
+++ /dev/null
@@ -1,443 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO
-//
-// = FILENAME
-//    typecode.h
-//
-// = DESCRIPTION
-//
-//    Header file for Win32 C/C++/COM interface to CORBA's "TypeCode" type.
-//
-// = AUTHOR
-//     Copyright 1994-1995 by Sun Microsystems, Inc.
-//
-// ============================================================================
-
-#if !defined (TAO_TYPECODE_H)
-#  define TAO_TYPECODE_H
-
-// = Kinds of typecodes.
-
-// @@ What does this comment refer to?  I don't see any enums in this
-// file.  Can you please move this to the right place?
-
-// Do not change these enum values, or duplicate them if you need to
-// add values.  They are used to index tables, and if you change the
-// values you'll need to find and update all of those tables.  The
-// values are also part of the Common Data Representation, and hence
-// are part of IIOP and other ORB protocols.
-
-struct CDR;
-
-// Two "user exceptions" are defined for manipulating TypeCodes. These two
-// classes are really to be defined inside the TypeCode class
-
-//extern CORBA::TypeCode_ptr CORBA::_tc_Bounds;
-class CORBA_Bounds : public CORBA_UserException
-{
-public:
-  CORBA_Bounds (void)
-    : CORBA_UserException (CORBA::_tc_Bounds) {}
-};
-
-//extern CORBA::TypeCode_ptr CORBA::_tc_BadKind;
-class CORBA_BadKind : public CORBA_UserException
-{
-public:
-  CORBA_BadKind (void)
-    : CORBA_UserException (CORBA::_tc_BadKind) {}
-};
-
-// A TypeCode describes data.  This one's as thin a wrapper around CDR
-// octet sequences as is practical.  There are guesses here about how
-// the OMG C++ mapping and CORBA 2.0 IFR specification will interact.
-//
-// NOTE: Use TypeCode_ptr, except in code (e.g. output of and OMG-IDL
-// compiler) that needs to create typecodes from their octet-sequence
-// encodings.
-
-class TC_Private_State;
-
-class TAO_Export CORBA_TypeCode : public IUnknown
-  // = TITLE
-  //   The CORBA TypeCode class. It maintains the in-memory
-  //   representation of any OMG CORBA IDL data type.
-  //
-  // = DESCRIPTION
-  //   Implements the CORBA::TypeCode interface specified by CORBA 2.0
-  //   spec.
-{
-public:
-  // Help debug free-non-heap-memory problems
-  void operator delete (void*);
-
-  typedef CORBA_Bounds Bounds;
-  typedef CORBA_BadKind BadKind;
-  // As per the spec, these two exception classes are supposed to be
-  // nested inside the TypeCode class. Since we are trying to avoid
-  // nesting of classes, we use the above typedef.
-
-  static CORBA::TypeCode_ptr _duplicate (CORBA::TypeCode_ptr tc);
-  // duplicates i.e., increments ref count
-
-  static CORBA::TypeCode_ptr _nil (void);
-  // returns a NULL typecode
-
-  CORBA::Boolean equal (const CORBA::TypeCode_ptr,
-                        CORBA::Environment &env) const;
-  // compares two typecodes
-
-  CORBA::TCKind  kind (CORBA::Environment &) const;
-  // For all TypeCode kinds, returns the "kind" of the typecode
-
-  TAO_CONST CORBA::String id (CORBA::Environment &) const;
-  // For tk_{objref,struct,union,enum,alias,except}. Returns the
-  // repository ID, raises BadKind.
-
-  TAO_CONST CORBA::String name (CORBA::Environment &) const;
-  // returns name (), raises (BadKind)
-
-  CORBA::ULong member_count (CORBA::Environment &) const;
-  // returns member_count (), raises (BadKind). Useful for tk_struct,
-  // tk_union, tk_enum, tk_alias, and tk_except.
-
-  TAO_CONST CORBA::String member_name (CORBA::ULong index,
-                                       CORBA::Environment &) const;
-  // returns member_name (...), raises (BadKind, Bounds); Useful for
-  // tk_struct, tk_union, tk_enum, tk_alias, and tk_except.
-
-  CORBA::TypeCode_ptr member_type (CORBA::ULong index,
-                                   CORBA::Environment &) const;
-  // returns member_type (...), raises (BadKind, Bounds); Useful for
-  // tk_struct, tk_union, and tk_except
-
-  CORBA::Any_ptr member_label (CORBA::ULong n,
-                               CORBA::Environment&) const;
-  // For tk_union. Returns the label. Raises BadKind, Bounds.
-
-  CORBA::TypeCode_ptr discriminator_type (CORBA::Environment &) const;
-  // returns the discriminator type for tk_union. raises (BadKind);
-
-  CORBA::Long default_index (CORBA::Environment &) const;
-  // returns the default index for the tk_union. Raises (BadKind);
-
-  CORBA::ULong length (CORBA::Environment &) const;
-  // returns length, raises (BadKind). Used for tk_string,
-  // tk_sequence, and tk_array
-
-  CORBA::TypeCode_ptr content_type (CORBA::Environment &) const;
-  // returns the content type (element type). Raises (BadKind); Useful
-  // for tk_sequence, tk_array, and tk_alias
-
-  CORBA::ULong TAO_discrim_pad_size (CORBA::Environment &);
-  // Calculates the padded size of discriminant type TAO Extension
-
-  // =Following three are deprecated
-
-  CORBA::ULong param_count (CORBA::Environment &) const;
-  // Deprecated, CORBA 1.2, not fully usable. Returns the number of
-  // parameters that the typecode takes.
-
-  CORBA::ULong ulong_param (CORBA::ULong n,
-                            CORBA::Environment &) const;
-
-  CORBA::TypeCode_ptr typecode_param (CORBA::ULong n,
-                                      CORBA::Environment &) const;
-  // Internal utilities, pending CORBA 2.0 IFR APIs; just enough to
-  // make array and sequence typecode interpretation cheap
-
-  // = Creation/refcounting
-
-  // These aren't really public APIs, but an IDL compiler will need to
-  // be able to create TypeCodes as part of creating stubs.
-
-  CORBA_TypeCode (CORBA::TCKind kind);
-  // This constructor is used only for built-in TypeCode constants,
-  // with no parameters.
-
-  CORBA_TypeCode (CORBA::TCKind kind,
-                  CORBA::ULong length,
-                  CORBA::Octet *buffer,
-                  CORBA::Boolean orb_owns_tc,
-		  CORBA::TypeCode_ptr parent = 0);
-  // This constructor is used both for typecode constants and for
-  // heap-allocated TypeCodes.  The two are distinguished by the
-  // orb_owns_tc flag passed in by the creator.
-  //
-  // For simple param lists with a single numeric parameter, only
-  // 'length' matters.
-  //
-  // For complex param lists, or simple param lists for which the
-  // parameter is a string or typecode, length _and_ buffer matter.
-  //
-  // For typecodes that are precomputed from the encapsulation stream
-  // of the parent, even the "parent" argument matters because this
-  // implies that all children will share the octet buffers of its
-  // parent
-
-  // = Class-specific allocation.
-  void *operator new (size_t, void *p);
-  void *operator new (size_t s);
-
-  virtual ~CORBA_TypeCode (void);
-  // destructor
-
-  enum traverse_status
-  {
-    TRAVERSE_STOP,
-    TRAVERSE_CONTINUE
-  };
-  // these are used to indicate the status of marshaling
-
-  // = The following traverse function is unused in TAO.
-  typedef traverse_status (_FAR * VisitRoutine) (CORBA::TypeCode_ptr tc,
-                                                 const void *value1,
-                                                 const void *value2,
-                                                 void *context,
-                                                 CORBA::Environment &env);
-
-  traverse_status traverse (const void *value1,
-                            const void *value2,
-                            VisitRoutine visit,
-                            void *context,
-                            CORBA::Environment &env);
-  // This routine calls visit () on each component of one (or two)
-  // structurally equivalent data values.  "Components" are either
-  // primitive (long, string, ...) or constructed (struct, ...)  data
-  // elements.
-  //
-  // It will NOT descend into those nodes if they're constructed; it's
-  // the job of the visit () routine to do that as needed.
-  //
-  // "Context" can be used to hold state used by the visit () routine.
-  // To terminate traversal "early", visit () returns TRAVERSE_STOP.
-  //
-  // The "value1" and "value2" parameters are pointers to data values
-  // of the structure described by the TypeCode.  Using the normal
-  // size, alignment, and padding rules used by the compilers on a
-  // given platform, the visit () routine is called with pointers to
-  // subsidiary elements.
-  //
-  // As all this routine does is appropriate pointer adjustments, it
-  // any value at all can be passed in as "value1" or "value2".  You
-  // could ignore one value and examine a data structure; copy from
-  // one to the other; compare one to the other; and more.
-  //
-  // Normal usage is to have application code call its visit () routine
-  // directly, and have that decide whether to use the typecode
-  // interpereter's knowledge of data structure layout through mutual
-  // recursion.
-
-  size_t size (CORBA::Environment &env);
-  // returns the size. Used by the IIOP marshaling engine.
-
-  size_t alignment (CORBA::Environment &env);
-  // returns the alignment requirements for this typecode. used by the
-  // IIOP marshaling engine.
-
-  // Stuff required for COM IUnknown support
-  ULONG __stdcall AddRef (void);
-  ULONG __stdcall Release (void);
-  HRESULT __stdcall QueryInterface (REFIID riid,
-                                    void **ppv);
-  // private:
-  //
-  // = The guts of the typecode implementation class
-
-  // This is implemented as a counted set of bytes, in marshaled CDR
-  // format.
-
-  CORBA::ULong length_;
-  // length of the encapsulated stream
-
-  CORBA::Octet *buffer_;
-  // the encapsulated stream
-
-  CORBA::TCKind kind_;
-  // the TypeCode kind
-
-  CORBA::TypeCode_ptr parent_;
-  // Indirected typecodes share "buffer" with a parent, and hold a
-  // reference to that parent to ensure its memory is not freed
-  // inappropriately.
-
-  static CORBA::Boolean skip_typecode (CDR &stream);
-  // skip a typecode encoding in a given CDR stream.  This is just a
-  // helper function.
-
-private:
-  // All the private/helper methods
-
-  CORBA::Boolean private_equal (CORBA::TypeCode_ptr tc,
-                                CORBA::Environment &env) const;
-  // Compares the typecodes.
-
-  TAO_CONST CORBA::String private_id (CORBA::Environment &) const;
-  // For tk_{objref,struct,union,enum,alias,except}. Returns the
-  // repository ID, raises BadKind.
-
-  TAO_CONST CORBA::String private_name (CORBA::Environment &) const;
-  // returns name (), raises (BadKind)
-
-  CORBA::ULong private_member_count (CORBA::Environment &) const;
-  // returns member_count (), raises (BadKind). Useful for tk_struct,
-  // tk_union, tk_enum, tk_alias, and tk_except.
-
-  CORBA::TypeCode_ptr private_member_type (CORBA::ULong index,
-                                           CORBA::Environment &) const;
-  // returns member_type (...), raises (BadKind, Bounds); Useful for
-  // tk_struct, tk_union, and tk_except
-
-  //  CORBA::TypeCode_ptr private_member_label (CORBA::ULong index,
-  //                                  CORBA::Environment &) const;
-  // returns member_label (...), raises (BadKind, Bounds); Useful for tk_union
-
-  CORBA::Any_ptr private_member_label (CORBA::ULong n,
-                                       CORBA::Environment&) const;
-  // For tk_union. Returns the label. Raises BadKind, Bounds.
-
-  CORBA::TypeCode_ptr private_discriminator_type (CORBA::Environment &) const;
-  // returns the discriminator type for tk_union. raises (BadKind);
-
-  CORBA::Long private_default_index (CORBA::Environment &) const;
-  // returns the default index for the tk_union. Raises (BadKind);
-
-  CORBA::Long privatelength_ (CORBA::Environment &) const;
-  // returns length, raises (BadKind). Used for tk_string,
-  // tk_sequence, and tk_array
-
-  CORBA::TypeCode_ptr private_content_type (CORBA::Environment &) const;
-  // returns the content type (element type). Raises (BadKind); Useful
-  // for tk_sequence, tk_array, and tk_alias
-
-  size_t private_size (CORBA::Environment &env);
-  // returns the size. Used by the IIOP marshaling engine.
-
-  size_t private_alignment (CORBA::Environment &env);
-  // returns the alignment requirements for this typecode. used by the
-  // IIOP marshaling engine.
-
-  CORBA::ULong private_discrim_pad_size (CORBA::Environment &);
-  // Calculates the padded size of discriminant type TAO Extension
-
-  u_int refcount_;
-  // if refcount reaches 0, free this typecode
-
-  ACE_SYNCH_MUTEX lock_;
-  // Protect access to the reference count.
-
-  CORBA::Boolean _delete_flag;
-  // indicates if we are freeing ourselves
-
-  CORBA::Boolean _orb_owns;
-  // TAO's approach differs from the SunSoft IIOP. Constant typecodes
-  // are owned by the ORB and get freed only when the ORB dies.
-
-  // If "orb_owns" is false, the value is a not a constant typecode
-  // with both the typecode and the buffer allocated (typically, this
-  // will be created by the IDL compiler generated code)
-
-  TC_Private_State *private_state_;
-  // maintains precomputed state. We need a separate class that
-  // maintains the precomputed state since most of the TypeCode class
-  // operations keep the state of the object constant. However, for
-  // the purpose of precomputation, we need to update the state. We
-  // cannot update state directly in the TypeCode class as that
-  // defeats the constness. However, we can keep an object in our
-  // typecode class that remains constant, but we can update its
-  // state.
-
-  // = No copy constructor or assignment operator supported;
-
-  // Use TypeCode_ptr values, duplicate (), release ().
-  CORBA_TypeCode (const CORBA::TypeCode &src);
-  CORBA_TypeCode &operator = (const CORBA::TypeCode &src);
-
-  CORBA::Octet *non_aligned_buffer_;
-  // original buffer that may possibly be non-aligned. We still need a
-  // handle to the allocated memory so that all of it can be freed by
-  // the destructor
-};
-
-class TAO_Export TC_Private_State
-  // = TITLE
-  //   Private state of the TypeCode.
-  //
-  // = DESCRIPTION
-  //   Used to store precomputed values
-{
-public:
-  TC_Private_State (CORBA::TCKind kind);
-  // constructor
-
-  ~TC_Private_State (void);
-  // destructor
-
-  CORBA::TCKind  tc_kind_;
-  // our kind that will determine what kind of children we may have
-
-  // = data members that indicate if the desired quantify was precomputed or not.
-  CORBA::Boolean tc_id_known_;
-  CORBA::Boolean tc_name_known_;
-  CORBA::Boolean tc_member_count_known_;
-  CORBA::Boolean tc_member_type_list_known_;
-  CORBA::Boolean tc_member_label_list_known_;
-  CORBA::Boolean tc_discriminator_type_known_;
-  CORBA::Boolean tc_default_index_used_known_;
-  CORBA::Boolean tc_length_known_;
-  CORBA::Boolean tc_content_type_known_;
-  CORBA::Boolean tc_size_known_;
-  CORBA::Boolean tc_alignment_known_;
-  CORBA::Boolean tc_discrim_pad_size_known_;
-
-  // = These data members store the precomputed values
-  CORBA::String  tc_id_;
-  CORBA::String  tc_name_;
-  CORBA::ULong   tc_member_count_;
-  CORBA::TypeCode_ptr *tc_member_type_list_;
-  CORBA::Any_ptr *tc_member_label_list_;
-  CORBA::TypeCode_ptr tc_discriminator_type_;
-  CORBA::Long   tc_default_index_used_;
-  CORBA::ULong   tc_length_;
-  CORBA::TypeCode_ptr  tc_content_type_;
-  CORBA::ULong  tc_size_;
-  CORBA::ULong  tc_alignment_;
-  CORBA::ULong  tc_discrim_pad_size_;
-};
-
-#if 0
-// =TypeCode constants, which are always accessible in all ORB runtimes.
-
-extern TAO_Export CORBA::TypeCode_ptr _tc_CORBA_Null;
-extern TAO_Export CORBA::TypeCode_ptr _tc_CORBA_Void;
-extern TAO_Export CORBA::TypeCode_ptr _tc_CORBA_Short;
-extern TAO_Export CORBA::TypeCode_ptr _tc_CORBA_Long;
-extern TAO_Export CORBA::TypeCode_ptr _tc_CORBA_LongLong;
-extern TAO_Export CORBA::TypeCode_ptr _tc_CORBA_UShort;
-extern TAO_Export CORBA::TypeCode_ptr _tc_CORBA_ULong;
-extern TAO_Export CORBA::TypeCode_ptr _tc_CORBA_ULongLong;
-
-extern TAO_Export CORBA::TypeCode_ptr _tc_CORBA_Float;
-extern TAO_Export CORBA::TypeCode_ptr _tc_CORBA_Double;
-extern TAO_Export CORBA::TypeCode_ptr _tc_CORBA_LongDouble;
-
-extern TAO_Export CORBA::TypeCode_ptr _tc_CORBA_Boolean;
-extern TAO_Export CORBA::TypeCode_ptr _tc_CORBA_Octet;
-
-extern TAO_Export CORBA::TypeCode_ptr _tc_CORBA_Char;
-extern TAO_Export CORBA::TypeCode_ptr _tc_CORBA_String;
-extern TAO_Export CORBA::TypeCode_ptr _tc_CORBA_WChar;
-extern TAO_Export CORBA::TypeCode_ptr _tc_CORBA_WString;
-
-extern TAO_Export CORBA::TypeCode_ptr _tc_CORBA_Any;
-extern TAO_Export CORBA::TypeCode_ptr _tc_CORBA_TypeCode;
-extern TAO_Export CORBA::TypeCode_ptr _tc_CORBA_Principal;
-
-extern TAO_Export CORBA::TypeCode_ptr _tc_CORBA_Object;
-#endif /* 0 */
-
-#endif /* TAO_TYPECODE_H */
diff --git a/TAO/tao/typecode.i b/TAO/tao/typecode.i
deleted file mode 100644
index 2a7481eaca9..00000000000
--- a/TAO/tao/typecode.i
+++ /dev/null
@@ -1,102 +0,0 @@
-ACE_INLINE CORBA::TCKind
-CORBA_TypeCode::kind (CORBA::Environment &env) const
-{
-  env.clear ();
-  return kind_;
-}
-
-// Returns true if the two typecodes are identical
-ACE_INLINE CORBA::Boolean 
-CORBA_TypeCode::equal (const CORBA::TypeCode_ptr tc,
-                       CORBA::Environment &env) const
-{
-  if (this->kind_ != tc->kind (env))
-    // simple case
-    return CORBA::B_FALSE;
-  else
-    return this->private_equal (tc, env);
-}
-
-// just fetch the 'kind' field out of the typecode
-ACE_INLINE void *
-CORBA_TypeCode::operator new (size_t s)
-{ 
-  return ::operator new (s); 
-}
-
-ACE_INLINE CORBA::TypeCode_ptr
-CORBA_TypeCode::_duplicate (CORBA::TypeCode_ptr tc)
-{
-  if (tc)
-    tc->AddRef ();
-  return tc;
-}
-
-// returns the Repository ID
-ACE_INLINE TAO_CONST CORBA::String
-CORBA_TypeCode::id (CORBA::Environment &env) const
-{
-  env.clear ();
-
-  // if already precomputed
-  if (private_state_->tc_id_known_)
-    return private_state_->tc_id_;
-  else
-    return private_id (env);
-}
-
-// returns the string name
-ACE_INLINE TAO_CONST CORBA::String
-CORBA_TypeCode::name (CORBA::Environment &env) const
-{
-  env.clear ();
-
-  // if already precomputed
-  if (private_state_->tc_name_known_)
-    return private_state_->tc_name_;
-  else
-    return private_name (env);
-}
-
-// Return the number of members defined by this typecode
-//
-// Applicable to struct, union, enum, alias, and except
-// For the rest of the cases, raises the BadKind exception.
-
-ACE_INLINE CORBA::ULong
-CORBA_TypeCode::member_count (CORBA::Environment &env) const
-{
-  env.clear ();
-
-  // if already precomputed
-  if (private_state_->tc_member_count_known_)
-    return private_state_->tc_member_count_;
-  else
-    return private_member_count (env);
-}
-
-// calculate size of the typecode
-ACE_INLINE size_t
-CORBA_TypeCode::size (CORBA::Environment &env)
-{
-  if (private_state_->tc_size_known_)
-    return private_state_->tc_size_;
-  else
-    return private_size (env);
-}
-
-// calculate alignment requirements of the typecode
-ACE_INLINE size_t
-CORBA_TypeCode::alignment (CORBA::Environment &env)
-{
-  if (private_state_->tc_alignment_known_)
-    return private_state_->tc_alignment_;
-  else
-    return private_alignment (env);
-}
-
-ACE_INLINE void *
-CORBA_TypeCode::operator new (size_t, void *p)
-{ 
-  return p; 
-}
diff --git a/TAO/tao/varout.h b/TAO/tao/varout.h
deleted file mode 100644
index 53267ae973c..00000000000
--- a/TAO/tao/varout.h
+++ /dev/null
@@ -1,625 +0,0 @@
-/* -*- C++ -*- */
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO
-// 
-// = FILENAME
-//    varout.h
-//
-// = DESCRIPTION
-//     Templates for _var and _out types
-//
-// = AUTHOR
-//
-//   Aniruddha Gokhale 
-// ============================================================================
-
-#if !defined (TAO_VAROUT_H)
-#define TAO_VAROUT_H
-
-template <class T>
-class TAO_Fixed_var
-  // = TITLE
-  //    template<class T> TAO_Fixed_var
-  //
-  // = DESCRIPTION
-  //    Provides a parametrized version of the _var class for fixed
-  //    length data structs and unions.
-{
-public:
-  // = Operations
-
-  TAO_Fixed_var (void);
-  // default constructor
-
-  TAO_Fixed_var (T *);
-  // constructor from a pointer to T
-
-  TAO_Fixed_var (const TAO_Fixed_var<T> &);
-  // copy constructor
-
-  ~TAO_Fixed_var (void);
-  // destructor
-
-  TAO_Fixed_var<T> &operator= (T *);
-  // assignment from a pointer to T
-
-  TAO_Fixed_var<T> &operator= (const TAO_Fixed_var<T> &);
-  // assignment from a TAO_Fixed_var
-
-  T *operator-> (void);
-  // smart pointer
-
-  const T *operator-> (void) const;
-  // smart pointer (const)
-
-  operator const T *&() const;
-  // cast operator
-
-  operator T *&();
-  // cast operator
-
-  // = Operations for parameter passing modes.
-
-  const T &in (void);
-  // for in type parameter
-
-  T &inout (void);
-  // for inout type parameter
-
-  T &out (void);
-  // for out parameter
-
-  T _retn (void);
-  // for return type
-
-private:
-  T *ptr_;
-  // instance
-};
-
-template <class T>
-class TAO_Variable_var
-  // = TITLE
-  //   template<class T> TAO_Variable_var
-  //
-  // = DESCRIPTION
-  //   Provides a parametrized version of the _var class for Variable
-  //   length data structs and unions.
-{
-public:
-  // = Operations
-
-  TAO_Variable_var (void);
-  // default constructor
-
-  TAO_Variable_var (T *);
-  // constructor from a pointer to T
-
-  TAO_Variable_var (const TAO_Variable_var<T> &);
-  // copy constructor
-
-  ~TAO_Variable_var (void);
-  // destructor
-
-  TAO_Variable_var<T> &operator= (T *);
-  // assignment from a pointer to T
-
-  TAO_Variable_var<T> &operator= (const TAO_Variable_var<T> &);
-  // assignment from a TAO_Variable_var
-
-  T *operator-> (void);
-  // smart pointer
-
-  const T *operator-> (void) const;
-  // smart pointer (const)
-
-  operator const T *&() const;
-  // cast operator
-
-  operator T *&();
-  // cast operator
-
-  // = operations for parameter passing modes
-
-  const T &in (void);
-  // for in type parameter
-
-  T &inout (void);
-  // for inout type parameter
-
-  T *&out (void);
-  // for out parameter
-
-  T *_retn (void);
-  // for return type
-
-private:
-  T *ptr_;
-};
-
-template <class T>
-class TAO_Sequence_var
-  // = TITLE
-  //   template<class T> TAO_Sequence_var
-  //
-  // = DESCRIPTION
-  //   Provides a parametrized version of the _var class for Sequence
-  //   data type.  CORBA sequences are considered to always be
-  //   variable length.
-{
-public:
-  // = Operations
-
-  TAO_Sequence_var (void);
-  // default constructor
-
-  TAO_Sequence_var (T *);
-  // constructor from a pointer to T
-
-  TAO_Sequence_var (const TAO_Sequence_var &);
-  // copy constructor
-
-  ~TAO_Sequence_var (void);
-  // destructor
-
-  TAO_Sequence_var<T> &operator= (T *);
-  // assignment from a pointer to T
-
-  TAO_Sequence_var<T> &operator= (const TAO_Sequence_var &);
-  // assignment from a TAO_Sequence_var
-
-  T *operator-> (void);
-  // smart pointer
-
-  const T *operator-> (void) const;
-  // smart pointer (const)
-
-  operator const T *&() const;
-  // cast operator
-
-  operator T *&();
-  // cast operator
-
-  // = additional operators for sequence
-
-  T::ElemType &operator[] (CORBA::ULong);
-  // operator [] that passes the argument to the [] operator of T
-
-  // = operations for parameter passing modes
-
-  const T &in (void);
-  // for in type parameter
-
-  T &inout (void);
-  // for inout type parameter
-
-  T *&out (void);
-  // for out parameter
-
-  T *_retn (void);
-  // for return type
-
-private:
-  T *ptr_;
-  // seq instance
-};
-
-template <class T_ptr>
-class TAO_Object_var
-  // = TITLE
-  //   template<class T, class T_ptr> TAO_Object_var
-  //
-  // = DESCRIPTION
-  //   Provides a parametrized version of the _var class for obj
-  //   references.
-{
-public:
-  // =Operations
-
-  TAO_Object_var (void);
-  // default constructor
-
-  TAO_Object_var (T_ptr);
-  // constructor from a pointer to T
-
-  TAO_Object_var (const TAO_Object_var<T_ptr> &);
-  // copy constructor
-
-  ~TAO_Object_var (void);
-  // destructor
-
-  TAO_Object_var<T_ptr> &operator= (T_ptr);
-  // assignment from a pointer to T
-
-  TAO_Object_var<T_ptr> &operator= (const TAO_Object_var<T_ptr> &);
-  // assignment from a TAO_Object_var
-
-  T_ptr operator-> (void) const;
-  // smart pointer (const)
-
-  operator const T_ptr &() const;
-  // cast operator
-
-  operator T_ptr &();
-  // cast operator
-
-  // = operations for parameter passing modes
-
-  const T_ptr &in (void);
-  // for in type parameter
-
-  T_ptr &inout (void);
-  // for inout type parameter
-
-  T_ptr &out (void);
-  // for out parameter
-
-  T_ptr _retn (void);
-  // for return type
-
-private:
-  T_ptr ptr_;
-};
-
-template <class T, class T_slice>
-class TAO_FixedArray_var
-  // = TITLE
-  //   template<class T, class T_slice> TAO_FixedArray_var
-  //
-  // = DESCRIPTION
-  //   Provides a parametrized version of the _var class for obj
-  //   references.
-{
-public:
-  // = Operations
-
-  TAO_FixedArray_var (void);
-  // default constructor
-
-  TAO_FixedArray_var (T_slice *);
-  // constructor from a pointer to T
-
-  TAO_FixedArray_var (const TAO_FixedArray_var<T, T_slice> &);
-  // copy constructor
-
-  ~TAO_FixedArray_var (void);
-  // destructor
-
-  TAO_FixedArray_var<T, T_slice> &operator= (T_slice *);
-  // assignment from a pointer to T
-
-  TAO_FixedArray_var<T, T_slice> &operator= (const TAO_FixedArray_var<T, T_slice> &);
-  // assignment from a TAO_FixedArray_var
-
-  T_slice &operator[] (CORBA::ULong);
-  // index
-
-  const T_slice &operator[] (CORBA::ULong) const;
-  // index
-
-  operator const T_slice &() const;
-  // cast operator
-
-  operator T_slice &();
-  // cast operator
-
-  // = operations for parameter passing modes
-
-  const T &in (void);
-  // for in type parameter
-
-  T &inout (void);
-  // for inout type parameter
-
-  T &out (void);
-  // for out parameter
-
-  T_slice *_retn (void);
-  // for return type
-
-private:
-  T_slice *ptr_;
-};
-
-template <class T, class T_slice>
-class TAO_VariableArray_var
-  // = TITLE
-  //   template<class T, class T_slice> TAO_VariableArray_var
-  //
-  // = DESCRIPTION
-  //   Provides a parametrized version of the _var class for obj
-  //   references.
-{
-public:
-  // = Operations
-
-  TAO_VariableArray_var (void);
-  // default constructor
-
-  TAO_VariableArray_var (T_slice *);
-  // constructor from a pointer to T
-
-  TAO_VariableArray_var (const TAO_VariableArray_var<T, T_slice> &);
-  // copy constructor
-
-  ~TAO_VariableArray_var (void);
-  // destructor
-
-  TAO_VariableArray_var<T, T_slice> &operator= (T_slice *);
-  // assignment from a pointer to T
-
-  TAO_VariableArray_var<T, T_slice> &operator= (const TAO_VariableArray_var<T, T_slice> &);
-  // assignment from a TAO_VariableArray_var
-
-  T_slice &operator[] (CORBA::ULong);
-  // index
-
-  const T_slice &operator[] (CORBA::ULong) const;
-  // index
-
-  operator const T_slice &() const;
-  // cast operator
-
-  operator T_slice &();
-  // cast operator
-
-  // = operations for parameter passing modes
-
-  const T &in (void);
-  // for in type parameter
-
-  T &inout (void);
-  // for inout type parameter
-
-  T_slice *&out (void);
-  // for out parameter
-
-  T_slice *_retn (void);
-  // for return type
-
-private:
-  T_slice *ptr_;
-};
-
-template <class T, class T_slice>
-class TAO_FixedArray_forany
-  // = TITLE
-  //   template<class T, class T_slice> TAO_FixedArray_forany
-  //
-  // = DESCRIPTION
-  //   Provides a parametrized version of the _var class for obj
-  //   references.
-{
-public:
-  // =Operations
-
-  TAO_FixedArray_forany (void);
-  // default constructor
-
-  TAO_FixedArray_forany (T_slice *, CORBA::Boolean nocopy=0);
-  // constructor from a pointer to T slice
-
-  TAO_FixedArray_forany (const TAO_FixedArray_forany<T, T_slice> &);
-  // copy constructor
-
-  ~TAO_FixedArray_forany (void);
-  // destructor
-
-  TAO_FixedArray_forany<T, T_slice> &operator= (T_slice *);
-  // assignment from a pointer to T
-
-  TAO_FixedArray_forany<T, T_slice> &operator= (const TAO_FixedArray_forany<T, T_slice> &);
-  // assignment from a TAO_FixedArray_forany
-
-  T_slice &operator[] (CORBA::ULong);
-  // index
-
-  const T_slice &operator[] (CORBA::ULong) const;
-  // index
-
-  operator const T_slice &() const;
-  // cast operator
-
-  operator T_slice &();
-  // cast operator
-
-  // =operations for parameter passing modes
-
-  const T &in (void);
-  // for in type parameter
-
-  T &inout (void);
-  // for inout type parameter
-
-  T &out (void);
-  // for out parameter
-
-  T_slice *_retn (void);
-  // for return type
-
-private:
-  T_slice *ptr_;
-};
-
-template <class T, class T_slice>
-class TAO_VariableArray_forany
-  // = TITLE
-  //   template<class T, class T_slice> TAO_VariableArray_forany
-  //
-  // = DESCRIPTION
-  //   Provides a parametrized version of the _var class for obj
-  //   references.
-{
-public:
-  // =Operations
-
-  TAO_VariableArray_forany (void);
-  // default constructor
-
-  TAO_VariableArray_forany (T_slice *, CORBA::Boolean nocopy=0);
-  // constructor from a pointer to T slice
-
-  TAO_VariableArray_forany (const TAO_VariableArray_forany<T, T_slice> &);
-  // copy constructor
-
-  ~TAO_VariableArray_forany (void);
-  // destructor
-
-  TAO_VariableArray_forany<T, T_slice> &operator= (T_slice *);
-  // assignment from a pointer to T
-
-  TAO_VariableArray_forany<T, T_slice> &operator= (const TAO_VariableArray_forany<T, T_slice> &);
-  // assignment from a TAO_VariableArray_forany
-
-  T_slice &operator[] (CORBA::ULong);
-  // index
-
-  const T_slice &operator[] (CORBA::ULong) const;
-  // index
-
-  operator const T_slice &() const;
-  // cast operator
-
-  operator T_slice &();
-  // cast operator
-
-  // =operations for parameter passing modes
-
-  const T &in (void);
-  // for in type parameter
-
-  T &inout (void);
-  // for inout type parameter
-
-  T_slice *&out (void);
-  // for out parameter
-
-  T_slice *_retn (void);
-  // for return type
-
-private:
-  T_slice *ptr_;
-};
-
-template <class T, class T_var>
-class TAO_Variable_out
-  // = TITLE
-  //   TAO_Variable_out
-  //
-  // = Description
-  //  _out class definition for variable size struct/union.
-{
-public:
-  TAO_Variable_out (T *&);
-  // constructor
-
-  TAO_Variable_out (T_var &);
-  // constructor
-
-  TAO_Variable_out (TAO_Variable_out <T,T_var> &);
-  // copy constructor
-
-  TAO_Variable_out<T,T_var> &operator= (TAO_Variable_out<T,T_var> &);
-  // assignment operator
-
-  TAO_Variable_out<T,T_var> &operator= (T *);
-  // assignment
-
-  operator T *&();
-  // cast
-
-  T *&ptr (void);
-  // ptr method, returns a pointer to class T
-
-  T *operator-> (void);
-  // arrow operator (smart pointer)
-
-private:
-  T *&ptr_;
-};
-
-template <class T, class T_var>
-class TAO_Sequence_out
-  // = TITLE
-  //   TAO_Sequence_out
-  //
-  // = Description
-  //   _out class definition for Sequence
-{
-public:
-  TAO_Sequence_out (T *&);
-  // constructor
-
-  TAO_Sequence_out (T_var &);
-  // constructor
-
-  TAO_Sequence_out (TAO_Sequence_out <T,T_var> &);
-  // copy constructor
-
-  TAO_Sequence_out<T,T_var> &operator= (TAO_Sequence_out<T,T_var> &);
-  // assignment operator
-
-  TAO_Sequence_out<T,T_var> &operator= (T *);
-  // assignment
-
-  operator T *&();
-  // cast
-
-  T *&ptr (void);
-  // ptr method, returns a pointer to class T
-
-  T *operator-> (void);
-  // arrow operator (smart pointer)
-
-  T::ElemType operator[] (CORBA::ULong);
-  // return the element at index i
-
-private:
-  T *&ptr_;
-};
-
-template <class T_ptr, class T_var>
-class TAO_Object_out
-{
-  // = TITLE
-  //   TAO_Object_out
-  //
-  // = Description
-  //   _out class definition for Object
-public:
-  TAO_Object_out (T_ptr &);
-  // constructor
-
-  TAO_Object_out (T_var &);
-  // constructor
-
-  TAO_Object_out (TAO_Object_out <T_ptr,T_var> &);
-  // copy constructor
-
-  TAO_Object_out<T_ptr,T_var> &operator= (TAO_Object_out<T_ptr,T_var> &);
-  // assignment operator
-
-  TAO_Object_out<T_ptr,T_var> &operator= (const T_var &);
-  // assignment operator
-
-  TAO_Object_out<T_ptr,T_var> &operator= (T_ptr);
-  // assignment
-
-  operator T_ptr &();
-  // cast
-
-  T_ptr &ptr (void);
-  // ptr method, returns a pointer to class T
-
-  T_ptr operator-> (void);
-  // arrow operator (smart pointer)
-
-private:
-  T_ptr &ptr_;
-};
-
-#endif /* TAO_VAROUT_H */
-
diff --git a/TAO/tao/xdr.cpp b/TAO/tao/xdr.cpp
deleted file mode 100644
index 113d68a589f..00000000000
--- a/TAO/tao/xdr.cpp
+++ /dev/null
@@ -1,772 +0,0 @@
-// @(#)xdr.cpp	1.3 95/11/07
-// Copyright 1995 by Sun Microsystems, Inc.
-//
-// XDR/TCP ORB Marshaler/unmarshaler
-//
-// Includes functions to encode 64 and 128 bit quantities, interpretive
-// encoder/decoder.
-//
-// XXX note -- this is incomplete (see xdr.hh) and doesn't do
-// exactly what the Prelude protocol does, particularly in the
-// area of typecodes.
-//
-// XXX implement the put/get primitives for 64 and 128 bit data types
-//
-// XXX strings, principals, typecodes, char arrays, char seqs, and
-// same for octets ... all should marshal the bulk characters tightly
-// packed, four to a word, else this violates the XDR spec.
-//
-// XXX optimization 1:  allowed by current XDR spec, when marshaling
-// true bulk data could eliminate a buffer copy by writing long
-// buffers (bigger than 'remainder of current fragment') in single
-// large chunks ... weigh cost of an extra kernel write against data
-// copy getting added.  Applies to byte-structured bulk data only,
-// not (portably) to arrays of longs etc.
-//
-// XXX optimization 2:  modifies current XDR spec:  when marshaling
-// arrays of "short" data (e.g. unicode strings) pack tightly.
-//
-
-#include "tao/orb.h"
-#include "tao/debug.h"
-#include "tao/principa.h"
-#include "tao/xdr.h"
-
-// I/O for 64 bit quantities -- integers, doubles
-
-CORBA_Boolean
-XDR_stream::put_longlong (const CORBA_LongLong &)
-THROWS_NOTHING
-{
-  return CORBA_B_FALSE;
-}
-
-CORBA_Boolean
-XDR_stream::get_longlong (CORBA_LongLong &)
-THROWS_NOTHING
-{
-  return CORBA_B_FALSE;
-}
-
-// I/O for 128 bit quantities -- long doubles
-
-CORBA_Boolean
-XDR_stream::put_longdouble (const CORBA_LongDouble &)
-THROWS_NOTHING
-{
-  return CORBA_B_FALSE;
-}
-
-CORBA_Boolean
-XDR_stream::get_longdouble (CORBA_LongDouble &)
-THROWS_NOTHING
-{
-  return CORBA_B_FALSE;
-}
-
-// Encode instances of arbitrary data types based only on typecode.
-// "data" points to the data type; if it's not a primitve data type,
-// the TypeCode interpreter is used to recursively encode its
-// components.  "context" is the marshaling stream on which to encode
-// the data value.
-//
-// This is a fairly typical TypeCode interpreter visit() routine; it
-// works on a single data value in conjunction with context
-// information, and must handle all IDL data types.
-
-CORBA_TypeCode::traverse_status
-XDR_stream::encoder (CORBA_TypeCode_ptr  tc,
-		     const void		*data,
-		     const void		*,
-		     void		*context,
-		     CORBA_Environment	&env)
-  THROWS_NOTHING
-{
-  CORBA_Boolean	continue_encoding = CORBA_B_TRUE;
-  XDR_stream		*stream = (XDR_stream *)context;
-
-  switch (tc->kind_) 
-    {
-    case tk_null:
-    case tk_void:
-      // nothing to encode!
-      break;
-      
-    case tk_char:
-    case tk_octet:
-      continue_encoding = stream->put_char (*(char *)data);
-      break;
-
-    case tk_short:
-    case tk_ushort:
-      continue_encoding = stream->put_short (*(short *)data);
-      break;
-
-    case tk_long:
-    case tk_ulong:
-    case tk_float:
-      continue_encoding = stream->put_long (*(CORBA_Long *)data);
-      break;
-
-    case tk_double:
-    case tk_longlong:
-    case tk_ulonglong:
-      continue_encoding = stream->put_longlong (*(CORBA_LongLong *)data);
-      break;
-
-    case tk_boolean:
-      continue_encoding = stream->put_boolean (*(CORBA_Boolean *)data);
-      break;
-
-    case tk_enum:
-      {
-	// NOTE assumption that this is in-range.
-	//
-	// XXX should check this, it's a hard-to-recover error
-	// for the other side
-	u_int	value = *(u_int *)data;
-	continue_encoding = stream->put_ulong (value);
-      }
-    break;
-
-    case tk_any:
-      {
-	CORBA_Any	*any = (CORBA_Any *)data;
-
-	tc = any->type ();
-	if (encoder (_tc_CORBA_TypeCode, &tc, 0, context, env)
-	    != CORBA_TypeCode::TRAVERSE_CONTINUE)
-	  return CORBA_TypeCode::TRAVERSE_STOP;
-
-	data = any->value ();
-	return encoder (tc, data, 0, context, env);
-      }
-    // NOTREACHED
-
-    case tk_TypeCode:
-      {
-	CORBA_TypeCode_ptr	tc2;
-
-	tc2 = *(CORBA_TypeCode_ptr *)data;
-
-	continue_encoding = stream->put_ulong ((CORBA_ULong) tc2->kind_);
-	if (continue_encoding == CORBA_B_FALSE)
-	  break;
-
-	switch (tc2->kind_) 
-	  {
-	    // Most TypeCodes have empty parameter lists
-	  default:
-	    break;
-
-	    //
-	    // A few have "simple" parameter lists
-	    //
-	  case tk_string:
-	  case tk_wstring:
-	    continue_encoding = stream->put_ulong (tc2->length_);
-	    break;
-
-	    //
-	    // Indirected typecodes can't occur at "top level" like
-	    // this, only nested inside others!
-	    //
-	  case ~0:
-	    dmsg ("indirected typecode at top level!");
-	    continue_encoding = CORBA_B_FALSE;
-	    break;
-
-	    //
-	    // The rest have "complex" parameter lists that are already
-	    // encoded as bulk octets ... put length, then octets
-	    //
-	  case tk_objref:
-	  case tk_struct:
-	  case tk_union:
-	  case tk_enum:
-	  case tk_sequence:
-	  case tk_array:
-	  case tk_alias:
-	  case tk_except:
-	    {
-	      u_int 	i;
-
-	      continue_encoding = stream->put_ulong (tc2->length_);
-	      for (i = 0; i < tc2->length_ && continue_encoding; i++)
-		continue_encoding =
-		  stream->put_octet (tc2->_buffer [i]);
-	    }
-	  }
-      }
-    break;
-
-    case tk_Principal:
-      {
-	CORBA_Principal_ptr	p = *(CORBA_Principal_ptr*) data;
-	u_int			i;
-
-	if (p != 0) 
-	  {
-	    continue_encoding = stream->put_long (p->id.length);
-	    for (i = 0; continue_encoding && i < p->id.length; i++)
-	      continue_encoding = stream->put_octet (p->id.buffer [i]);
-	  } 
-	else
-	  continue_encoding = stream->put_long (0);
-      }
-    break;
-
-    case tk_objref:
-      // XXX implement me
-      break;
-
-    case tk_sequence:
-      {
-	// First marshal the sequence length, verifying that it's
-	// within the sequence bounds ...
-	CORBA_OctetSeq 		*seq = (CORBA_OctetSeq *) data;
-	CORBA_ULong		len = seq ? seq->length : 0;
-
-	if (len > 0) 
-	  {
-	    CORBA_ULong		bounds;
-
-	    bounds = tc->ulong_param (1, env);
-	    if (env.exception () != 0)
-	      return CORBA_TypeCode::TRAVERSE_STOP;
-
-	    if (bounds != 0 && len > bounds) 
-	      {
-		env.exception (new CORBA_BAD_PARAM (COMPLETED_MAYBE));
-		return CORBA_TypeCode::TRAVERSE_STOP;
-	      }
-	  }
-	continue_encoding = stream->put_ulong (len);
-
-	// Fast exit on error or empty sequence
-	if (!continue_encoding || len == 0)
-	  break;
-      }
-    // FALLTHROUGH
-
-    case tk_struct:
-    case tk_union:
-    case tk_array:
-    case tk_alias:
-      //
-      // Marshal each member in order.
-      //
-      return tc->traverse (data, 0, encoder, context, env);
-
-    case tk_except:
-      // Convert the the "hidden" TypeCode at the beginning of the
-      // exception into an on-the-wire ID, then marshal the members in
-      // order (traversal skips that hidden typecode, and more).
-      //
-      // NOTE: This is asymmetric with respect to decoding the
-      // exception, since whoever decodes must pull off the ID and map
-      // it to the typecode to be used to unmarshal it (search among
-      // legal choices).
-      {
-	CORBA_String	id = tc->id (env);
-
-	if (env.exception () == 0) 
-	  {
-	    continue_encoding =
-	      encoder (_tc_CORBA_String, &id, 0, context, env)
-	      == CORBA_TypeCode::TRAVERSE_CONTINUE
-	      && tc->traverse (data, 0, encoder, context, env);
-	  } 
-	else
-	  continue_encoding = CORBA_B_FALSE;
-      }
-    break;
-
-    case tk_string:
-      {
-	CORBA_String	str = *(CORBA_String *) data;
-	CORBA_ULong	len, bounds;
-
-	// Be nice to programmers: treat nulls as empty strings not
-	// errors.  (OMG-IDL supports languages that don't use the
-	// C/C++ notion of null v. empty strings; nulls aren't part of
-	// the OMG-IDL string model.)
-	if (str == 0) 
-	  {
-	    stream->put_ulong (1);
-	    stream->put_char (0);
-	    break;
-	  }
-
-	// Verify string satisfies bounds requirements.  We're not so
-	// permissive as to send messages violating the interface spec
-	// by having excessively long strings!
-	bounds = tc->ulong_param (0, env);
-	if (env.exception () != 0)
-	  return CORBA_TypeCode::TRAVERSE_STOP;
-	len = ACE_OS::strlen ((char *)str);
-
-	if (bounds != 0 && len > bounds) {
-	  continue_encoding = CORBA_B_FALSE;
-	  break;
-	}
-
-	// Encode the string, followed by a NUL character.
-	continue_encoding = stream->put_ulong (len + 1);
-	while (continue_encoding != CORBA_B_FALSE && *str)
-	  continue_encoding = stream->put_char (*str++);
-	stream->put_char (0);
-      }
-    break;
-
-    case tk_wstring:
-      {
-	wchar_t *str = *(wchar_t **) data;
-	CORBA_ULong len, bounds;
-
-	// Be nice to programmers: treat nulls as empty strings not
-	// errors.  (OMG-IDL supports languages that don't use the
-	// C/C++ notion of null v. empty strings; nulls aren't part of
-	// the OMG-IDL string model.)
-
-	if (str == 0) 
-	  {
-	    stream->put_ulong (1);
-	    stream->put_wchar (0);
-	    break;
-	  }
-
-	// Verify wide string satisfies bounds requirements.  We're
-	// not so permissive as to send messages violating the
-	// interface spec by having excessively long strings!
-	bounds = tc->ulong_param (0, env);
-	if (env.exception () != 0)
-	  return CORBA_TypeCode::TRAVERSE_STOP;
-	len = ACE_OS::strlen (str);
-	if (bounds != 0 && len > bounds) 
-	  {
-	    continue_encoding = CORBA_B_FALSE;
-	    break;
-	  }
-
-	// Encode the wide string, followed by a NUL character.
-	continue_encoding = stream->put_ulong (ACE_OS::strlen (str) + 1);
-	while (continue_encoding != CORBA_B_FALSE && *str)
-	  continue_encoding = stream->put_wchar (*str++);
-	stream->put_wchar (0);
-      }
-    break;
-
-    case tk_longdouble:
-      continue_encoding =
-	stream->put_longdouble (*(CORBA_LongDouble *)data);
-      break;
-
-    case tk_wchar:
-      continue_encoding = stream->put_wchar (*(wchar_t *)data);
-      break;
-	
-      // case ~0:
-    default:
-      dmsg ("encoder default case ?");
-      continue_encoding = CORBA_B_FALSE;
-      break;
-    }
-
-  if (continue_encoding == CORBA_B_FALSE) 
-    {
-      env.exception (new CORBA_MARSHAL (COMPLETED_MAYBE));
-      dmsg ("marshaling encoder detected error");
-      return CORBA_TypeCode::TRAVERSE_STOP;
-    }
-  return CORBA_TypeCode::TRAVERSE_CONTINUE;
-}
-
-// Array of typecodes used to unmarshal ...
-
-extern CORBA_TypeCode_ptr __tc_consts [TC_KIND_COUNT];
-
-CORBA_TypeCode::traverse_status
-XDR_stream::decoder (CORBA_TypeCode_ptr  tc,
-		     const void		*data,
-		     const void		*,
-		     void		*context,
-		     CORBA_Environment	&env)
-  THROWS_NOTHING
-{
-  CORBA_Boolean	continue_decoding = CORBA_B_TRUE;
-  XDR_stream			*stream = (XDR_stream *)context;
-
-  switch (tc->kind_) 
-    {
-    case tk_null:
-    case tk_void:
-      // nothing to decode!
-      break;
-      
-    case tk_char:
-    case tk_octet:
-      continue_decoding = stream->get_char (*(CORBA_Char *)data);
-      break;
-
-    case tk_short:
-    case tk_ushort:
-      continue_decoding = stream->get_short (*(short *)data);
-      break;
-
-    case tk_long:
-    case tk_ulong:
-    case tk_float:
-      continue_decoding = stream->get_long (*(CORBA_Long *)data);
-      break;
-
-    case tk_longlong:
-    case tk_ulonglong:
-    case tk_double:
-      continue_decoding = stream->get_longlong (*(CORBA_LongLong *)data);
-      break;
-
-    case tk_boolean:
-      continue_decoding = stream->get_boolean (*(CORBA_Boolean *)data);
-      break;
-
-    case tk_enum:
-      {
-	CORBA_ULong	val;
-
-	// NOTE assumption that this is in-range.
-	//
-	// XXX should check this, it's rather hard to recover from
-	// such errors since they "do not occur" and are essentially
-	// never tested for.
-	continue_decoding = stream->get_ulong (val);
-	*(u_int *)data = (u_int) val;
-      }
-    break;
-
-    case tk_any:
-      {
-	CORBA_Any *any = (CORBA_Any *)data;
-	CORBA_TypeCode_ptr	tc2;
-	void *value;
-
-	if (decoder (_tc_CORBA_TypeCode, &tc2, 0, context, env)
-	    != CORBA_TypeCode::TRAVERSE_CONTINUE)
-	  return CORBA_TypeCode::TRAVERSE_STOP;
-
-	value = new CORBA_Octet [tc2->size (env)];
-
-	if (decoder (tc2, value, 0, context, env)
-	    != CORBA_TypeCode::TRAVERSE_CONTINUE) 
-	  {
-	    delete value;
-	    CORBA_release (tc2);
-	    return CORBA_TypeCode::TRAVERSE_STOP;
-	  }
-	(void) new (any) CORBA_Any (tc2, value, CORBA_B_TRUE);
-      }
-    break;
-
-    case tk_TypeCode:
-      {
-	CORBA_ULong		kind;
-	CORBA_TypeCode_ptr	*tcp;
-
-	continue_decoding = stream->get_ulong (kind);
-	if (continue_decoding == CORBA_B_FALSE)
-	  break;
-	if (kind >= TC_KIND_COUNT) 
-	  {
-	    continue_decoding = CORBA_B_FALSE;
-	    break;
-	  }
-	    
-	tcp = (CORBA_TypeCode_ptr *)data;
-
-	// Typecodes with empty parameter lists all have preallocated
-	// constants.  We use those to reduce memory consumption and
-	// heap access ... also, to speed things up!
-	if (((*tcp) = __tc_consts [(u_int) kind]) != 0) 
-	  {
-	    *tcp = __tc_consts [(u_int) kind];
-	    break;
-	  } 
-	else switch (kind) 
-	  {
-	    // Need special handling for all kinds of typecodes that
-	    // have nonempty parameter lists ...
-	  default:			// error: missed a case! 
-	    env.exception (new CORBA_INTERNAL (COMPLETED_MAYBE));
-	    return CORBA_TypeCode::TRAVERSE_STOP;
-
-	    // Some have "simple" parameter lists ... some of these also
-	    // have preallocated constants that could be used.
-	  case tk_string:
-	  case tk_wstring:
-	    {
-	      CORBA_ULong	bound;
-
-	      continue_decoding = stream->get_ulong (bound);
-	      if (continue_decoding) 
-		{
-		  if (bound == 0) 
-		    {
-		      if (kind == tk_string)
-			*tcp = _tc_CORBA_String;
-		      else
-			*tcp = _tc_CORBA_WString;
-		    } 
-		  else 
-		    *tcp = new CORBA_TypeCode ((CORBA_TCKind) kind,
-					       bound, 0, CORBA_B_TRUE);
-		}
-	    }
-	  break;
-
-	  // Indirected typecodes, illegal at "top level" but we allow
-	  // unmarshaling of them here because we use the same code to
-	  // read "off the wire" (where they're illegal) and to read
-	  // out of an encapsulation stream.  We distinguish the case
-	  // where this is legal as described above.
-
-	  case ~0:
-	    // XXX implement me
-	    break;
-
-	    // The rest have "complex" parameter lists that are
-	    // encoded as bulk octets ...
-	  case tk_objref:
-	  case tk_struct:
-	  case tk_union:
-	  case tk_enum:
-	  case tk_sequence:
-	  case tk_array:
-	  case tk_alias:
-	  case tk_except:
-	    {
-	      u_int		len, i;
-	      CORBA_ULong	length;
-	      CORBA_Octet	*buffer;
-
-	      continue_decoding = stream->get_ulong (length);
-	      if (!continue_decoding)
-		break;
-
-	      // if length > MAXUNSIGNED, error ...
-	      len = (u_int) length;
-
-	      buffer = new CORBA_Octet [len];
-
-	      for (i = 0; i < len && continue_decoding; i++)
-		continue_decoding = stream->get_octet (buffer [i]);
-
-	      if (!continue_decoding) 
-		{
-		  delete [] buffer;
-		  break;
-		}
-	      *tcp = new CORBA_TypeCode ((CORBA_TCKind)kind,
-					 len, buffer, CORBA_B_TRUE);
-	    }
-	  }
-      }
-    break;
-
-    case tk_Principal:
-      {
-	CORBA_Principal_ptr	*pp = (CORBA_Principal_ptr *)data;
-	CORBA_ULong	len;
-
-	continue_decoding = stream->get_ulong (len);
-	if (len == 0)
-	  *pp = 0;
-	else 
-	  {
-	    *pp = new CORBA_Principal;
-	    (*pp)->id.buffer = new CORBA_Octet [(size_t) len];
-	    (*pp)->id.maximum = (*pp)->id.length = len;
-
-	    for (u_int i = 0;
-		 continue_decoding != CORBA_B_FALSE && i < len;
-		 i++)
-	      continue_decoding =
-		stream->get_octet ((*pp)->id.buffer [i]);
-	  }
-      }
-    break;
-
-    case tk_objref:
-      // XXX implement me
-      break;
-
-    case tk_sequence:
-      {
-	// First unmarshal the sequence length ... we trust it to be
-	// right here, on the "be gracious in what you accept"
-	// principle.  We don't generate illegal sequences
-	// (i.e. length > bounds).
-	CORBA_OctetSeq 		*seq = (CORBA_OctetSeq *) data;
-
-	continue_decoding = stream->get_ulong (seq->length);
-	seq->maximum = seq->length;
-	seq->buffer = 0;
-
-	// Fast exit on empty sequences or errors
-	if (!continue_decoding || seq->length == 0)
-	  break;
-
-	// ... then allocate the memory into which we'll unmarshal
-	CORBA_TypeCode_ptr	tc2;
-	size_t			size;
-
-	tc2 = tc->typecode_param (0, env);
-	if (env.exception ())
-	  return CORBA_TypeCode::TRAVERSE_STOP;
-
-	size = tc2->size (env);
-	if (env.exception ())
-	  return CORBA_TypeCode::TRAVERSE_STOP;
-
-	tc2->Release ();
-
-	seq->buffer = new CORBA_Octet [size * (size_t) seq->maximum];
-      }
-    // FALLTHROUGH
-
-    case tk_struct:
-    case tk_union:
-    case tk_array:
-    case tk_alias:
-      // Unmarshal all the individual elements using the per-member
-      // description held in the "parent" TypeCode.
-	
-      // FALLTHROUGH
-
-    case tk_except:
-      // For exceptions, the "hidden" type ID near the front of the
-      // on-wire representation was previously unmarshaled and mapped
-      // to the "tc" typcode we're using to traverse the memory ...
-      // at the same time its vtable, refcount, and other state was
-      // established.
-      //
-      // NOTE:  This is asymmetric with respect to encoding exceptions.
-      return tc->traverse (data, 0, decoder, context, env);
-
-    case tk_string:
-      {
-	CORBA_String	str;
-	CORBA_ULong	len = 0;
-
-	// On decode, omit the check against specified string bounds,
-	// and cope with illegal "zero length" strings (all lengths on
-	// the wire must include a NUL).
-	//
-	// This is on the principle of being gracious in what we
-	// accept; we don't generate messages that fail to comply with
-	// protocol specs, but we will accept them when it's clear how
-	// to do so.
-
-	continue_decoding = stream->get_ulong (len);
-	*((CORBA_String*)data) = str = new CORBA_Char [(size_t) (len)];
-	if (len != 0)
-	  while (continue_decoding != CORBA_B_FALSE && len-- != 0) 
-	    {
-	      continue_decoding = stream->get_char (*(CORBA_Char *)str);
-	      str++;
-	    }
-	break;
-      }
-
-    case tk_wstring:
-      {
-	wchar_t		*str;
-	CORBA_ULong	len = 0;
-
-	// On decode, omit the check against specified wstring bounds,
-	// and cope with illegal "zero length" strings (all lengths on
-	// the wire must include a NUL).
-	//
-	// This is on the principle of being gracious in what we accept;
-	// we don't generate messages that fail to comply with protocol
-	// specs, but we will accept them when it's clear how to do so.
-
-	continue_decoding = stream->get_ulong (len);
-	*((wchar_t **)data) = str = new wchar_t [(size_t) (len)];
-	if (len != 0) 
-	  while (continue_decoding != CORBA_B_FALSE && len--) 
-	    {
-	      continue_decoding = stream->get_wchar (*str);
-	      str++;
-	    }
-      }
-    break;
-
-    case tk_longdouble:
-      continue_decoding =
-	stream->get_longdouble (*(CORBA_LongDouble *)data);
-      break;
-
-    case tk_wchar:
-      continue_decoding = stream->get_wchar (*(wchar_t *)data);
-      break;
-
-      // case ~0:
-    default:
-      continue_decoding = CORBA_B_FALSE;
-      dmsg ("decode, default case?");
-      break;
-    }
-
-  if (continue_decoding == CORBA_B_FALSE) 
-    {
-      env.exception (new CORBA_MARSHAL (COMPLETED_NO));
-      dmsg ("marshaling decoder detected error");
-      return CORBA_TypeCode::TRAVERSE_STOP;
-    }
-  return CORBA_TypeCode::TRAVERSE_CONTINUE;
-}
-
-// Write an XDR message fragment out on the stream.
-
-CORBA_Boolean
-XDR_stream::flush_frag (CORBA_Boolean /* is_last */)
-  THROWS_NOTHING
-{
-  return CORBA_B_FALSE;
-
-#if	0
-  int			status;
-  CORBA_ULong		size, header;
-
-  size = index * sizeof (CORBA_ULong);	// byte length of msg
-  if (is_last)
-    header = 0x80000000 | size;		// indicates last frag
-  else
-    header = size;
-  buffer [0] = htonl (header);
-
-  //
-  // XXX for portability, loop until there's no error.  Some
-  // platforms/mode don't guarantee full TCP writes even when
-  // async (or nonblocking) mode was not set on this socket.
-  //
-  size += sizeof (CORBA_ULong);
-  status = ACE_OS::write (fd, &buffer [0], size);
-
-  index = 0;
-
-  return (status == size);
-#endif /* 0 */
-}
-
-// Read an XDR message fragment in from the stream.
-
-CORBA_Boolean
-XDR_stream::read_frag (void)
-  THROWS_NOTHING
-{
-  // read cookie, split out size and "is last" flag
-  // read rest of buffer
-
-  return CORBA_B_FALSE;
-}
diff --git a/TAO/tao/xdr.h b/TAO/tao/xdr.h
deleted file mode 100644
index db089c16291..00000000000
--- a/TAO/tao/xdr.h
+++ /dev/null
@@ -1,335 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO
-// 
-// = FILENAME
-//    xdr.h
-//
-// = DESCRIPTION
-//     
-//    XDR stream interface and implementation (partially implemented)
-//
-// = AUTHOR
-//     Copyright 1994-1995 by Sun Microsystems, Inc.
-// 
-// ============================================================================
-
-#if !defined (TAO_XDR_H)
-#define	TAO_XDR_H
-
-#include "ace/OS.h"
-
-#include "tao/typecode.h"
-
-// Define on systems that fully support exceptions ... excluding
-// some very common platforms like G++ and VC++ 2.2
-//
-// #define	THROWS_NOTHING	throw()
-
-//
-// On DevPro's 4.0.1a compilers, null throw specs carry a big
-// performance penalty:  slower by about 25% here.  Disable!!
-
-#define	THROWS_NOTHING
-
-class XDR_stream
-// = TITLE
-// XXX as of 3-Nov-95 XDR_stream should only be relied on to marshal
-// the simplest primitives ... not objrefs, typecodes, etc.  Also, the
-// handling of sequences of chars/octets/shorts/wchars is wrong.
-{
-public:
-  enum 
-  {
-    STANDARD_BUFSIZE = 4096,	
-    // ~3 enet packets with TCP
-    BUFFER_LEN = 1 + (STANDARD_BUFSIZE / sizeof (CORBA_Long))
-  };
-
-  XDR_stream (ACE_HANDLE _fd) THROWS_NOTHING 
-  : fd (_fd)
-  {
-    index = 0;
-    decode_flag = CORBA_B_FALSE;
-    max_index = 0;
-    is_last_frag = CORBA_B_FALSE;
-  }
-
-  ~XDR_stream (void) THROWS_NOTHING {}
-
-  // Write the last bit of an encoded message ... or tell if we've
-  // decoded all the data in an encoded message we're processing.
-  //
-  // NOTE:  these assume the mode is appropriate for these operations.
-
-  CORBA_Boolean output_msg_at_end (void) THROWS_NOTHING;
-  CORBA_Boolean input_msg_at_end (void) THROWS_NOTHING
-  { return is_last_frag && index == max_index; }
-
-  // Tell if we're decoding or encoding data.
-
-  CORBA_Boolean is_decoding (void) THROWS_NOTHING
-  { return decode_flag; }
-  CORBA_Boolean is_encoding (void) THROWS_NOTHING
-  { return !is_decoding (); }
-    
-  // private ... iff there's a routine to set it!
-  CORBA_Boolean decode_flag;	
-  // true iff decoding
-
-  // ENCODING SUPPORT ... 
-
-  CORBA_Boolean put32 (CORBA_Long word) THROWS_NOTHING;
-
-  CORBA_Boolean put_byte (char c) THROWS_NOTHING;
-  CORBA_Boolean put_short (CORBA_Short s) THROWS_NOTHING;
-  CORBA_Boolean put_long (CORBA_Long l) THROWS_NOTHING;
-
-  CORBA_Boolean put_longlong (const CORBA_LongLong &ll)
-    THROWS_NOTHING;
-
-  CORBA_Boolean put_char (CORBA_Char c) THROWS_NOTHING;
-
-  CORBA_Boolean put_wchar (wchar_t wc) THROWS_NOTHING;
-  CORBA_Boolean put_boolean (CORBA_Boolean b) THROWS_NOTHING;
-  CORBA_Boolean put_octet (CORBA_Octet o) THROWS_NOTHING;
-  CORBA_Boolean put_ushort (CORBA_UShort s) THROWS_NOTHING;
-  CORBA_Boolean put_ulong (CORBA_ULong l) THROWS_NOTHING;
-  CORBA_Boolean	put_ulonglong (const CORBA_ULongLong &ll) THROWS_NOTHING;
-  CORBA_Boolean	put_float (float f) THROWS_NOTHING;
-  CORBA_Boolean	put_double (const double &d) THROWS_NOTHING;
-  CORBA_Boolean put_longdouble (const CORBA_LongDouble &ld) THROWS_NOTHING;
-
-  // marshaling interpreter ... 'context' really points to a stream.
-
-  static CORBA_TypeCode::traverse_status
-  encoder (CORBA_TypeCode_ptr tc,
-	   const void *data,
-	   const void *,
-	   void *context,
-	   CORBA_Environment &env) THROWS_NOTHING;
-
-  // DECODING SUPPORT
-  //
-  // XXX fix lack of error reporting here !!
-
-  CORBA_Long get32 (void) THROWS_NOTHING
-  {
-    if (index <= max_index
-	|| read_frag () == CORBA_B_TRUE)
-      return ntohl (buffer [index++]);
-    else
-      return 0;
-  }
-
-
-  CORBA_Boolean get_byte (char &c) THROWS_NOTHING
-  {
-    c = (char) get32();
-    return CORBA_B_TRUE;
-  }
-
-  CORBA_Boolean get_short (CORBA_Short &s) THROWS_NOTHING
-  {
-    s = (short) get32();
-    return CORBA_B_TRUE;
-  }
-
-  CORBA_Boolean get_long (CORBA_Long &l) THROWS_NOTHING
-  {
-    l = get32();
-    return CORBA_B_TRUE;
-  }
-
-  CORBA_Boolean get_longlong (CORBA_LongLong &ll)
-    THROWS_NOTHING;
-
-  inline CORBA_Boolean	get_char (CORBA_Char &o) THROWS_NOTHING
-  { return get_byte ((char &) o); }
-
-  inline CORBA_Boolean	get_wchar (wchar_t &wc) THROWS_NOTHING
-  {
-    short s;
-
-    // wchar_t isn't always "short"
-
-    CORBA_Boolean retval = get_short (s);
-    wc = s;
-    return retval;
-  }
-
-  inline CORBA_Boolean	get_boolean (CORBA_Boolean &b) THROWS_NOTHING
-  {
-    CORBA_Char c;
-
-    // CORBA_Boolean is rarely 'char'
-
-    CORBA_Boolean retval = get_char (c);
-    b = (c == 1);
-    return retval;
-  }
-
-  inline CORBA_Boolean	get_octet (CORBA_Octet &o) THROWS_NOTHING
-  { return get_byte ((char &) o); }
-
-  inline CORBA_Boolean	get_ushort (CORBA_UShort &s) THROWS_NOTHING
-  { return get_short ((short&) s); }
-
-  inline CORBA_Boolean	get_ulong (CORBA_ULong &l) THROWS_NOTHING
-  { return get_long ((CORBA_Long &) l); }
-
-  inline CORBA_Boolean	get_ulonglong (const CORBA_ULongLong &ull)
-    THROWS_NOTHING
-  { return get_longlong ((CORBA_LongLong &) ull); }
-
-  inline CORBA_Boolean	get_float (float &f) THROWS_NOTHING
-  { return get_long ((CORBA_Long &) f); }
-
-  inline CORBA_Boolean	get_double (double &d) THROWS_NOTHING
-  { return get_longlong ((CORBA_LongLong &) d); }
-
-  CORBA_Boolean get_longdouble (CORBA_LongDouble &ld) THROWS_NOTHING;
-
-  // Unmarshaling interpreter ... 'context' really points to a buffer.
-
-  static CORBA_TypeCode::traverse_status
-
-  decoder (CORBA_TypeCode_ptr tc,
-	   const void *data,
-	   const void *,
-	   void *context,
-	   CORBA_Environment &env) THROWS_NOTHING;
-
-private:
-  // Low level I/O primitives ... flush a fragment (maybe as the last
-  // one), read a fragment in.
-
-  CORBA_Boolean flush_frag (CORBA_Boolean is_last) THROWS_NOTHING;
-  CORBA_Boolean read_frag (void) THROWS_NOTHING;
-
-  // The actual buffer and the index to the current entry.  (Next
-  // buffer entry read/written is index+1 ...)
-
-  CORBA_Long buffer [BUFFER_LEN];
-  CORBA_Long index;
-
-  // The (TCP) stream on which this writes its message fragments.
-
-  const ACE_HANDLE fd;
-
-  // Used when reading fragments ... max_index controls where the end
-  // of the fragment is recorded to be, and is_last_frag says if it's
-  // OK to read_frag() to get the next fragment.
-  //
-  // To move to the next message in the stream, create a new XDR
-  // stream (e.g. on the stack).
-
-  CORBA_Long max_index;
-  CORBA_Boolean is_last_frag;
-
-  //
-  // Two operations not supported by this class.
-  //
-  XDR_stream (const XDR_stream &);
-  XDR_stream &operator = (const XDR_stream &);
-};
-
-inline CORBA_Boolean
-XDR_stream::output_msg_at_end (void) THROWS_NOTHING
-{
-  return flush_frag (CORBA_B_TRUE);
-}
-
-inline CORBA_Boolean
-XDR_stream::put32 (CORBA_Long word) THROWS_NOTHING
-{
-  if (index < (BUFFER_LEN - 1)
-      || (flush_frag (CORBA_B_FALSE) == CORBA_B_TRUE)) 
-    {
-      buffer [++index] = htonl (word);
-      return CORBA_B_TRUE;
-    } 
-  else
-    return CORBA_B_FALSE;
-}
-
-inline CORBA_Boolean
-XDR_stream::put_byte (char c) THROWS_NOTHING
-{ 
-  return put32 (c); 
-}
-
-inline CORBA_Boolean 
-XDR_stream::put_short (CORBA_Short s) THROWS_NOTHING
-{ 
-  return put32 (s); 
-}
-
-inline CORBA_Boolean 
-XDR_stream::put_long (CORBA_Long l) THROWS_NOTHING
-{ 
-  return put32 (l); 
-}
-
-inline CORBA_Boolean 
-XDR_stream::put_char (CORBA_Char c) THROWS_NOTHING
-{ 
-  return put_byte ((char) c); 
-}
-
-inline CORBA_Boolean 
-XDR_stream::put_wchar (wchar_t wc) THROWS_NOTHING
-{
-  // "wchar_t" isn't always 2 bytes, such systems might need further
-  // conversion (e.g. hosts with multibyte characters native, rather
-  // than UNICODE)
-
-  return put_short ((short) wc);
-}
-    
-inline CORBA_Boolean 
-XDR_stream::put_boolean (CORBA_Boolean b) THROWS_NOTHING
-{ 
-  return put_byte ((char) (b != CORBA_B_FALSE)); 
-}
-
-inline CORBA_Boolean 
-XDR_stream::put_octet (CORBA_Octet o) THROWS_NOTHING
-{ 
-  return put_byte ((char) o); 
-}
-
-inline CORBA_Boolean 
-XDR_stream::put_ushort (CORBA_UShort s) THROWS_NOTHING
-{ 
-  return put_short ((CORBA_Short) s); 
-}
-
-inline CORBA_Boolean 
-XDR_stream::put_ulong (CORBA_ULong l) THROWS_NOTHING
-{ 
-  return put_long ((CORBA_Long) l); 
-}
-
-inline CORBA_Boolean	
-XDR_stream::put_ulonglong (const CORBA_ULongLong &ll) THROWS_NOTHING
-{ 
-  return put_longlong ((CORBA_LongLong &) ll); 
-}
-				    
-inline CORBA_Boolean	
-XDR_stream::put_float (float f) THROWS_NOTHING
-{ 
-  return put_long (*(CORBA_Long *) &f); 
-}
-
-inline CORBA_Boolean	
-XDR_stream::put_double (const double &d) THROWS_NOTHING
-{ 
-  return put_longlong (*(CORBA_LongLong *) &d); 
-}
-
-#endif	/* TAO_XDR_H */
diff --git a/TAO/tests/Cubit/COOL/Makefile b/TAO/tests/Cubit/COOL/Makefile
deleted file mode 100644
index e836d36fb7f..00000000000
--- a/TAO/tests/Cubit/COOL/Makefile
+++ /dev/null
@@ -1,229 +0,0 @@
-#----------------------------------------------------------------------------
-#	@(#)Makefile	1.1	10/18/96
-#
-#	Makefile for the ACE_MT_CORBA_Handler tests
-#----------------------------------------------------------------------------
-
-#----------------------------------------------------------------------------
-#	Local macros
-#----------------------------------------------------------------------------
-
-SRC = cubit_impl.cpp server.cpp client.cpp Task_Client.cpp cubit.cpp
-
-SVR_OBJS = cubit_impl.o server.o 
-
-CLT_OBJS = Task_Client.o client.o cubit.o
-
-LDLIBS	 = -lm -lOrb-mt
-
-VLDLIBS	 = $(LDLIBS:%=%$(VAR))
-
-#----------------------------------------------------------------------------
-#	Include macros and targets
-#----------------------------------------------------------------------------
-
-include		$(WRAPPER_ROOT)/include/makeinclude/wrapper_macros.GNU
-include		$(WRAPPER_ROOT)/include/makeinclude/macros.GNU
-include		$(WRAPPER_ROOT)/include/makeinclude/rules.common.GNU
-include		$(WRAPPER_ROOT)/include/makeinclude/rules.nonested.GNU
-include		$(WRAPPER_ROOT)/include/makeinclude/rules.lib.GNU
-include		$(WRAPPER_ROOT)/include/makeinclude/rules.bin.GNU
-include		$(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU
-
-#----------------------------------------------------------------------------
-#	Orbix related macros and target settings.
-#----------------------------------------------------------------------------
-
-
-#ORBIX_BINDIR    = $(ORBIX_ROOT)/bin
-CHORUS_LIBDIR    = $(CHORUS_ROOT)/lib
-CHORUS_INCDIR    = $(CHORUS_ROOT)/include
-
-CPPFLAGS += -I$(CHORUS_INCDIR) -I$(CHORUS_ROOT)
-LDFLAGS  += -L$(CHORUS_LIBDIR) -R $(CHORUS_LIBDIR) -L$(ACE)/ace
-
-IDLFLAGS = -s S.cpp -c C.cpp -B
-
-#----------------------------------------------------------------------------
-#	Local targets
-#----------------------------------------------------------------------------
-
-all: server client
-
-server: $(addprefix $(VDIR),$(SVR_OBJS))
-	$(LINK.cc) -o server $(addprefix $(VDIR),$(SVR_OBJS)) $(LDFLAGS) $(ITIIOP) $(ITSRV) $(VLDLIBS)
-
-client: $(addprefix $(VDIR),$(CLT_OBJS))
-	$(LINK.cc) -o client $(addprefix $(VDIR),$(CLT_OBJS)) $(LDFLAGS) $(ITIIOP) $(ITCLT) $(VLDLIBS)
-
-
-#----------------------------------------------------------------------------
-#	Dependencies
-#----------------------------------------------------------------------------
-# DO NOT DELETE THIS LINE -- g++dep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-
-.obj/cubit_impl.o .shobj/cubit_impl.so: cubit_impl.cpp cubit_impl.h cubit.H \
- /project/doc/sumedh/chorus_4.1/include/corba/cool.H
-.obj/server.o .shobj/server.so: server.cpp cubit.H cubit.C cubit_impl.h sk_cubit.H \
- sk_cubit.C $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/stdcpp.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i
-.obj/client.o .shobj/client.so: client.cpp $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/stdcpp.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/Task_T.i \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i \
- /project/doc/sumedh/chorus_4.1/include/api/api.H cubit.H \
- Task_Client.h
-.obj/Task_Client.o .shobj/Task_Client.so: Task_Client.cpp Task_Client.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/stdcpp.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/Task_T.i \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i \
- /project/doc/sumedh/chorus_4.1/include/api/api.H cubit.H
-.obj/cubit.o .shobj/cubit.so: cubit.cpp cubit.H
-
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/tests/Cubit/COOL/Task_Client.cpp b/TAO/tests/Cubit/COOL/Task_Client.cpp
deleted file mode 100644
index 7c0b4691ceb..00000000000
--- a/TAO/tests/Cubit/COOL/Task_Client.cpp
+++ /dev/null
@@ -1,272 +0,0 @@
-#include "Task_Client.h"
-
-int
-activity (void *obj)
-{
-  Client *client = (Client *) obj;
-  client->svc ();
-  return 0;
-}
-
-Client::Client (char *hostname,
-                unsigned int n_threads, 
-                unsigned int loop_count)
-  : // ACE_Task<ACE_MT_SYNCH> (ACE_Thread_Manager::instance ()),
-    hostname_ (hostname),
-    start_count_ (0),
-    loop_count_ (loop_count)
-{
-  barrier_ = new ACE_Barrier (n_threads);
-  latency_ = new long [n_threads];
-  CORBA_Environment env;
-  int argc = 0;
-  CORBA_ORB_ptr orb = CORBA_ORB_init (argc, 0, 0, env);
-  
-  if (env.exception ()) {
-    ACE_ERROR ((LM_ERROR, "ORB_init failed..\n"));
-  }
-  
-  COOL_Activity_ptr *new_activity = new COOL_Activity_ptr [n_threads];
-  for (int i = 0; i < n_threads; i++)
-    {
-      if (thisCapsule->createActivity ((COOL_ActivityFunc) activity,
-                                       (void *) this, 
-                                       new_activity [i]) != C_OK)
-        {
-        ACE_ERROR ((LM_ERROR, "%p\n", "activate failed"));
-        }
-    }
-
-    CORBA_Long status;
-    for (i = 0; i < n_threads; i++)
-      {
-        if (new_activity [i]->join (status) != C_OK)
-          {
-            ACE_ERROR ((LM_ERROR, "%p\n", "join failed"));
-          }
-      }
-      
-  //  if (this->activate (THR_BOUND | THR_NEW_LWP, n_threads) == -1)
-  //    ACE_ERROR ((LM_ERROR, "%p\n", "activate failed"));
-}
-
-void Client::put_latency (long latency, unsigned int thread_id) {
-  lock_.acquire (); 
-  latency_[thread_id] = latency; 
-  ACE_DEBUG ((LM_DEBUG,
-              "(%t) My latency was %d\n", latency)); 
-  lock_.release (); 
-}
-
-double
-Client::get_high_priority_latency () {
-  return (double) latency_[0] / 1000;
-}
-
-double
-Client::get_low_priority_latency () {
-  double l = 0;
-  for (int i = 1; i < start_count_; i++)
-    l += (double) latency_[i];
-  return l / (double)(1000 * (start_count_ - 1));
-}
-
-int
-Client::svc ()
-{
-  int thread_id;
-  {
-  ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, lock_, -1);
-  ACE_DEBUG ((LM_DEBUG, "(%t) Thread created\n"));
-
-  char server_name [1024];
-  thread_id = start_count_;
-  start_count_++;
-  if (thread_id == 0) 
-    {
-      strcpy (server_name, "HP_Cubit");
-      ACE_DEBUG ((LM_DEBUG, "(%t) Im the high priority client.\n"));
-    }
-  else 
-    {
-      strcpy (server_name, "LP_Cubit");
-      ACE_DEBUG ((LM_DEBUG, "(%t) Im a low priority client.\n"));
-    }
-
-  //
-  // Initialise client's binding to an
-  // arbitrary cubit server (at some host)
-  //
-  CORBA_Environment env;
-  COOL_NamingService_var naming = thisCapsule->naming_service (env);
-  CORBA_Object_ptr obj;
-  naming->import (server_name, obj, env);
-  
-  if (env.exception ()) 
-    {
-      ACE_ERROR ((LM_ERROR, "naming->import failed..\n"));
-      return -1;
-    }
-  
-  cb_ = Cubit::_narrow (obj);
-  
-  CORBA_release (obj);
-  
-  if (CORBA_is_nil (cb_) == CORBA_TRUE) 
-    {
-      ACE_ERROR ((LM_ERROR, "(%t) Wrong interface imported.\n"));
-      return 1;
-    }
-  
-  ACE_DEBUG ((LM_DEBUG, "(%t) Binding succeeded\n"));
-
-
-  }
-
-  
-  ACE_DEBUG ((LM_DEBUG, 
-              "(%t) Waiting for other threads..\n"));
-  barrier_->wait ();
-  ACE_DEBUG ((LM_DEBUG, "(%t) Everyone's done, here I go!!\n"));
-  run_tests (cb_, loop_count_, thread_id);
-  return 0;
-}
-
-void
-Client::run_tests (Cubit_ptr cb, int loop_count, unsigned int thread_id) 
-{
-    //
-  // Make the calls in a loop.
-  //
-  unsigned i;
-  unsigned call_count, error_count;
-
-  call_count = 0;
-  error_count = 0;
-
-  ACE_Time_Value before, after;
-
-  before = ACE_OS::gettimeofday();
-  
-  CORBA_Environment env;
-  //
-  // Cube an octet.
-  //
-  
-  for (i = 0; i < loop_count; i++)
-    {
-
-      call_count++;
-
-      CORBA::Octet arg_octet = func (i), ret_octet;
-
-      ret_octet = cb->cube_octet (arg_octet, env);
-      if (env.exception ())
-        {
-          cerr << "Call failed: " << endl;
-          error_count++;
-        } 
-      arg_octet = arg_octet * arg_octet * arg_octet;
-      if (arg_octet != ret_octet) 
-        {
-          ACE_OS::printf ("** cube_octet(%d)  (--> %d)\n", arg_octet , ret_octet);
-          error_count++;
-        }
-    
-  
-  //
-  // Cube a short.
-  //
-      call_count++;
-
-      CORBA::Short arg_short = func (i), ret_short;
-
-      ret_short = cb->cube_short (arg_short, env);
-      if (env.exception ())
-        {
-          cerr << "Call failed: " << endl;
-          error_count++;
-        }
-      arg_short = arg_short * arg_short * arg_short;
-      if (arg_short != ret_short) {
-        ACE_OS::printf ("** cube_short(%d)  (--> %d)\n", arg_short , ret_short);
-        error_count++;
-      }
-
-  //
-  // Cube a long.
-  //
-  
-      call_count++;
-
-      CORBA::Long arg_long = func (i), ret_long;
-
-      ret_long = cb->cube_long (arg_long, env);
-      if (env.exception ())
-        {
-        cerr << "Call failed: " << endl;
-        error_count++;
-        } 
-      arg_long = arg_long * arg_long * arg_long;
-      if (arg_long != ret_long) 
-        {
-          ACE_OS::printf ("** cube_long(%d)  (--> %d)\n", arg_long , ret_long);
-          error_count++;
-        }
-
-
-      //
-      // Cube a "struct" ...
-      //
-      Cubit::Many	arg_struct, ret_struct;
-      
-       call_count++;
-       
-       arg_struct.l = func (i);
-       arg_struct.s = func (i);
-       arg_struct.o = func (i);
-       
-       ret_struct = cb->cube_struct (arg_struct, env);
-       if (env.exception ())
-         {
-           cerr << "Call failed: " << endl;
-           error_count++;
-         } 
-       arg_struct.l = arg_struct.l  * arg_struct.l  * arg_struct.l ;
-       arg_struct.s = arg_struct.s  * arg_struct.s  * arg_struct.s ;
-       arg_struct.o = arg_struct.o  * arg_struct.o  * arg_struct.o ;
-       
-       if (arg_struct.l  != ret_struct.l 
-           || arg_struct.s  != ret_struct.s 
-           || arg_struct.o  != ret_struct.o )
-         {
-           cerr << "** cube_struct ERROR\n";
-           error_count++;
-         }
-    }
-  cerr << "im done" << endl;
-  
-  after = ACE_OS::gettimeofday();
-  
-  if (call_count > 0) 
-    {
-      if (error_count == 0)
-        {
-          ACE_Time_Value diff = after - before;
-          unsigned long	us = diff.sec() * 1000 * 1000 + diff.usec();
-          
-          us /= call_count;
-          
-          if (us > 0) {
-//             ACE_OS::printf ("cube average call ACE_OS::time\t= %ld.%.03ldms, \t"
-//                             "%ld calls/second\n",
-//                             us / 1000, us % 1000,
-//                             1000000L / us);
-            this->put_latency (us, thread_id);
-          }
-      
-        }
-      //      ACE_OS::printf ("%d calls, %d errors\n", call_count, error_count);
-    }
-}
-
diff --git a/TAO/tests/Cubit/COOL/Task_Client.h b/TAO/tests/Cubit/COOL/Task_Client.h
deleted file mode 100644
index 344fa7bd973..00000000000
--- a/TAO/tests/Cubit/COOL/Task_Client.h
+++ /dev/null
@@ -1,29 +0,0 @@
-#include "ace/Synch.h"
-#include "ace/Task.h"
-#include "ace/Thread_Manager.h"
-#include "ace/Get_Opt.h"
-#include "api/api.H"
-#include "cubit.H"
-
-inline int func (unsigned i) { return i - 117; }
-
-class Client // : ACE_Task<ACE_MT_SYNCH> 
-{
-public:
-  Client (char *hostname, 
-          unsigned int n_threads, 
-          unsigned int loop_count_);
-  int svc (void);
-  double get_high_priority_latency ();
-  double get_low_priority_latency ();
-private:
-  ACE_Barrier *barrier_;
-  void run_tests (Cubit_ptr, int, unsigned int);
-  void put_latency (long latency, unsigned int);
-  unsigned int start_count_;
-  unsigned int loop_count_;
-  char *hostname_;
-  long *latency_;
-  Cubit_ptr cb_;
-  ACE_Thread_Mutex lock_;
-};
diff --git a/TAO/tests/Cubit/COOL/client.cpp b/TAO/tests/Cubit/COOL/client.cpp
deleted file mode 100644
index 3b3518c15a8..00000000000
--- a/TAO/tests/Cubit/COOL/client.cpp
+++ /dev/null
@@ -1,85 +0,0 @@
-//**************************************************************************
-//
-// NAME :   client.C 
-// DESCRIPTION:  
-//
-// Client for the Cubit example
-//
-//****************************************************************************
-
-#include "ace/Task.h"
-#include "ace/Thread_Manager.h"
-#include "ace/Get_Opt.h"
-#include "api/api.H"
-#include "cubit.H"
-#include "Task_Client.h"
-
-int LOOP_COUNT=100;
-char SERVER_HOST [1024];
-unsigned int THREAD_COUNT=1;
-
-// = TITLE
-//     Parses the command line arguments and returns an error status
-//
-// = DESCRIPTION
-//     This method parses the command line arguments
-int parse_args(int argc, char *argv[])
-{
-  ACE_OS::strcpy (SERVER_HOST, "localhost");
-  ACE_Get_Opt opts (argc, argv, "n:t:");
-  int			c;
-  
-  while ((c = opts ()) != -1)
-    switch (c) {
-    case 'h':
-      ACE_OS::strcpy (SERVER_HOST, opts.optarg);
-      continue;
-    case 'n':			// loop count
-      LOOP_COUNT = (unsigned) ACE_OS::atoi (opts.optarg);
-      continue;
-    case 't':
-      THREAD_COUNT = (unsigned) ACE_OS::atoi (opts.optarg);
-      continue;
-    case '?':
-    default:
-      ACE_OS::fprintf (stderr, "usage:  %s"
-                       " [-d]"
-                       " [-n loopcount]"
-                       " [-h SERVER_HOST]"
-                       " [-x]"
-                       " [-t num_threads]"
-                       "\n", argv [0]
-                       );
-      return 1;
-    }
-  
-  return 0;  // Indicates successful parsing of command line
-}
-
-
-//
-// Mainline
-//
-int
-main (int argc, char *argv [])
-{
-  CORBA_Environment env;
-  CORBA_ORB_ptr orb = CORBA_ORB_init (argc, argv, 0, env);
-
-  if (parse_args (argc, argv) != 0)
-    return -1;
-
-  if (env.exception ()) {
-    ACE_ERROR ((LM_ERROR, "ORB_init failed..\n"));
-    return -1;
-  }
-
-  Client clients (SERVER_HOST, THREAD_COUNT, LOOP_COUNT);
-  //  ACE_Thread_Manager::instance ()->wait ();
-  ACE_OS::printf ("Test done.\n"
-                  "High priority client latency : %f msec\n"
-                  "Low priority client latency : %f msec\n",
-                  clients.get_high_priority_latency (),
-                  clients.get_low_priority_latency ());
-
-}
diff --git a/TAO/tests/Cubit/COOL/cubit.C b/TAO/tests/Cubit/COOL/cubit.C
deleted file mode 100644
index 984b7d54e2a..00000000000
--- a/TAO/tests/Cubit/COOL/cubit.C
+++ /dev/null
@@ -1,670 +0,0 @@
-/*
- * File generated by CHIC (CHIC-COMMON-970407)
- *        from: cubit.idl
-*/
-#include <corba/cool.H>
-#include "cubit.H"
-
-
-
-//=========================================================
-//    interface Cubit
-//=========================================================
-
-
-
-class _TypeCodeImpl_Cubit  {
-public:
-        static void
-    push(COOL_Marshaler& marshaler, const void* t);
-        static void*
-    pop(COOL_Marshaler& marshaler);
-        static size_t
-    size(COOL_Marshaler& marshaler, const void* t);
-        static void*
-    copy(const void* from);
-        static void
-    release(void* t);
-
-    static CORBA_TypeCode          constant;
-    static const _COOL_TypeDefImpl typeDefImpl;
-    static const void*const        parameters[];
-};
-
-const _COOL_TypeDefImpl _TypeCodeImpl_Cubit::typeDefImpl = {
-    _TypeCodeImpl_Cubit::push,
-    _TypeCodeImpl_Cubit::pop,
-    _TypeCodeImpl_Cubit::size,
-    _TypeCodeImpl_Cubit::copy,
-    _TypeCodeImpl_Cubit::release
-};
-
-    void
-_TypeCodeImpl_Cubit::push(COOL_Marshaler& marshaler, const void* t)
-{
-    const Cubit_ptr obj = *(const Cubit_ptr*) t;
-    marshaler.put_Object(obj);
-}
-    void*
-_TypeCodeImpl_Cubit::pop(COOL_Marshaler& marshaler)
-{
-    Cubit_ptr* t = new Cubit_ptr;
-    *t = (Cubit_ptr) NULL;
-    CubitMarshaler::get(marshaler, *t);
-    return (void*) t;
-}    
-    size_t
-_TypeCodeImpl_Cubit::size(COOL_Marshaler& marshaler, const void* t)
-{
-    const Cubit_ptr obj = *(const Cubit_ptr*)t;
-    return marshaler.size_Object(obj);
-}
-    void*
-_TypeCodeImpl_Cubit::copy(const void* from)
-{
-    Cubit_ptr* to  = new Cubit_ptr;
-    *to = Cubit::_duplicate(*(const Cubit_ptr*)from);
-    return (void*) to;
-}    
-    void
-_TypeCodeImpl_Cubit::release(void* t)
-{
-    CORBA_release(*(Cubit_ptr*)t);
-}
-
-
-const void*const _TypeCodeImpl_Cubit::parameters[] = {
-    (const void*) "IDL:Cubit:1.0",
-    (const void*) "Cubit"
-};
-
-
-CORBA_TypeCode _TypeCodeImpl_Cubit::constant(
-    CORBA_tk_objref,
-    0x00750aa6,
-    &_TypeCodeImpl_Cubit::typeDefImpl,
-    _TypeCodeImpl_Cubit::parameters
-);
-const CORBA_TypeCode_ptr _tc_Cubit = &_TypeCodeImpl_Cubit::constant;
-
-
-    Cubit_ptr
-Cubit_proxy::operator =(Cubit_ptr ptr) 
-{
-    if (*ptr_ != ptr) {
-        if (release_ == CORBA_TRUE) CORBA_release(*ptr_);
-        *ptr_ = ptr;
-    }
-    return ptr;
-}
-    Cubit_ptr
-Cubit_proxy::_duplicate(Cubit_ptr ptr)
-{
-    return Cubit::_duplicate(ptr);
-}
-    void
-Cubit_proxy::_release(Cubit_ptr ptr)
-{
-    CORBA_release(ptr);
-}
-    Cubit_ptr
-Cubit_proxy::_nil()
-{
-    return Cubit::_nil();
-}
-
-    void
-CubitMarshaler::put(COOL_Marshaler& marshaler,
-    const Cubit_ptr ptr)
-{
-    marshaler.put_Object(ptr);
-}
-    void
-CubitMarshaler::get(COOL_Marshaler& marshaler,
-    Cubit_ptr& ptr)
-{
-    CORBA_release(ptr);
-    Cubit_ptr obj = new Cubit;
-    if (marshaler.get_Object(obj) == CORBA_FALSE) {
-        obj = Cubit::_nil();
-    }
-    ptr = obj;
-}
-    size_t
-CubitMarshaler::size(COOL_Marshaler& marshaler,
-    const Cubit_ptr ptr)
-{
-    return marshaler.size_Object(ptr);
-}
-static const _COOL_OperationDesc Cubit_desc[] = {
-  { "cube_long", 2, (const CORBA_TypeCode_ptr*const*const) 0 },
-  { "cube_octet", 0, (const CORBA_TypeCode_ptr*const*const) 0 },
-  { "cube_short", 1, (const CORBA_TypeCode_ptr*const*const) 0 },
-  { "cube_struct", 3, (const CORBA_TypeCode_ptr*const*const) 0 },
-  { "cube_union", 4, (const CORBA_TypeCode_ptr*const*const) 0 },
-  { "please_exit", 5, (const CORBA_TypeCode_ptr*const*const) 0 }
-};
-const _COOL_InterfaceDesc Cubit::coOperations = {
-    "IDL:Cubit:1.0", 0x00750aa6, 6, Cubit_desc
-};
-
-const _COOL_FullInterfaceDesc Cubit::coInterfaceDef[] = {
-    { &Cubit::coOperations, 0},
-    { (const _COOL_InterfaceDesc*const) 0, 0}
-};
-Cubit Cubit::coNilObject(Cubit::coInterfaceDef);
-
-Cubit::~Cubit()
-{
-}
-
-    int
-Cubit::_shiftVtbl(CORBA_Environment& _env) const
-{
-    return switchLocal(this, coOperations.typeId, _env);
-}
-
-//
-// RPC fct: Cubit::cube_octet()
-//
-    CORBA_Octet
-Cubit::cube_octet(CORBA_Octet o,
-                  CORBA_Environment& _env) const
-{
-    int _error = _shiftVtbl(_env);
-    if (_error == C_OK) {
-        return cube_octet(o, _env);
-    }
-    CORBA_Octet _returnValue = 0;
-    if (_error == C_EUNKNOWN) {
-        return _returnValue;
-    }
-    _COOL_Request _req(this, coOperations, 1, 1, 0, _env);
-    if (_env.exception()) {
-        return _returnValue;
-    }
-    _req.put_Octet(o);
-
-    if (_req.invoke(_env) != C_OK) {
-        return _returnValue;
-    }
-    _returnValue = _req.get_Octet();
-    return _returnValue;
-}
-
-
-//
-// RPC fct: Cubit::cube_short()
-//
-    CORBA_Short
-Cubit::cube_short(CORBA_Short s,
-                  CORBA_Environment& _env) const
-{
-    int _error = _shiftVtbl(_env);
-    if (_error == C_OK) {
-        return cube_short(s, _env);
-    }
-    CORBA_Short _returnValue = 0;
-    if (_error == C_EUNKNOWN) {
-        return _returnValue;
-    }
-    _COOL_Request _req(this, coOperations, 2, 2, 0, _env);
-    if (_env.exception()) {
-        return _returnValue;
-    }
-    _req.put_Short(s);
-
-    if (_req.invoke(_env) != C_OK) {
-        return _returnValue;
-    }
-    _returnValue = _req.get_Short();
-    return _returnValue;
-}
-
-
-//
-// RPC fct: Cubit::cube_long()
-//
-    CORBA_Long
-Cubit::cube_long(CORBA_Long l,
-                 CORBA_Environment& _env) const
-{
-    int _error = _shiftVtbl(_env);
-    if (_error == C_OK) {
-        return cube_long(l, _env);
-    }
-    CORBA_Long _returnValue = 0;
-    if (_error == C_EUNKNOWN) {
-        return _returnValue;
-    }
-    _COOL_Request _req(this, coOperations, 0, 4, 0, _env);
-    if (_env.exception()) {
-        return _returnValue;
-    }
-    _req.put_Long(l);
-
-    if (_req.invoke(_env) != C_OK) {
-        return _returnValue;
-    }
-    _returnValue = _req.get_Long();
-    return _returnValue;
-}
-
-
-//=========================================================
-//    Structure Many
-//=========================================================
-
-
-
-class _TypeCodeImpl_Cubit_Many  {
-public:
-        static void
-    push(COOL_Marshaler& marshaler, const void* t);
-        static void*
-    pop(COOL_Marshaler& marshaler);
-        static size_t
-    size(COOL_Marshaler& marshaler, const void* t);
-        static void*
-    copy(const void* from);
-        static void
-    release(void* t);
-
-    static CORBA_TypeCode          constant;
-    static const _COOL_TypeDefImpl typeDefImpl;
-    static const void*const        parameters[];
-};
-
-const _COOL_TypeDefImpl _TypeCodeImpl_Cubit_Many::typeDefImpl = {
-    _TypeCodeImpl_Cubit_Many::push,
-    _TypeCodeImpl_Cubit_Many::pop,
-    _TypeCodeImpl_Cubit_Many::size,
-    _TypeCodeImpl_Cubit_Many::copy,
-    _TypeCodeImpl_Cubit_Many::release
-};
-
-    void
-_TypeCodeImpl_Cubit_Many::push(COOL_Marshaler& marshaler, const void* t)
-{
-    Cubit::ManyMarshaler::put(marshaler, *(const Cubit::Many*)t);
-}
-    void*
-_TypeCodeImpl_Cubit_Many::pop(COOL_Marshaler& marshaler)
-{
-    Cubit::Many* t = new Cubit::Many;
-    Cubit::ManyMarshaler::get(marshaler, *t);
-    return (void*) t;
-}    
-    size_t
-_TypeCodeImpl_Cubit_Many::size(COOL_Marshaler&, const void*)
-{
-    return 10;
-}
-    void*
-_TypeCodeImpl_Cubit_Many::copy(const void* from)
-{
-    Cubit::Many* to = new Cubit::Many(*(const Cubit::Many*)from);
-    return (void*) to;
-}    
-    void
-_TypeCodeImpl_Cubit_Many::release(void* t)
-{
-    delete (Cubit::Many*)t;
-}
-
-
-const void*const _TypeCodeImpl_Cubit_Many::parameters[] = {
-    (const void*) "IDL:Eng.SUN.COM/Cubit/Many:1.0",
-    (const void*) "Many",
-    (const void*) 3UL,
-    (const void*) "o", (const void*) &CORBA__tc_octet,
-    (const void*) "l", (const void*) &CORBA__tc_long,
-    (const void*) "s", (const void*) &CORBA__tc_short
-};
-
-
-CORBA_TypeCode _TypeCodeImpl_Cubit_Many::constant(
-    CORBA_tk_struct,
-    0x004e6a97,
-    &_TypeCodeImpl_Cubit_Many::typeDefImpl,
-    _TypeCodeImpl_Cubit_Many::parameters
-);
- CORBA_TypeCode_ptr Cubit::_tc_Many = &_TypeCodeImpl_Cubit_Many::constant;
-
-
-    void
-
-Cubit::ManyMarshaler::put(COOL_Marshaler& marshaler,
-    const Cubit::Many& obj)
-{
-     marshaler.put_Octet(obj.o);
-     marshaler.put_Long(obj.l);
-     marshaler.put_Short(obj.s);
-}
-
-    void
-Cubit::ManyMarshaler::get(COOL_Marshaler& marshaler,
-    Cubit::Many& obj)
-{
-    obj.o =  marshaler.get_Octet();
-    obj.l =  marshaler.get_Long();
-    obj.s =  marshaler.get_Short();
-}
-
-
-//
-// RPC fct: Cubit::cube_struct()
-//
-    Cubit::Many
-Cubit::cube_struct(const Cubit::Many& values,
-                   CORBA_Environment& _env) const
-{
-    int _error = _shiftVtbl(_env);
-    if (_error == C_OK) {
-        return cube_struct(values, _env);
-    }
-    Cubit::Many _returnValue;
-    if (_error == C_EUNKNOWN) {
-        return _returnValue;
-    }
-    _COOL_Request _req(this, coOperations, 3, 10, 0, _env);
-    if (_env.exception()) {
-        return _returnValue;
-    }
-    Cubit::ManyMarshaler::put(_req, values);
-
-    if (_req.invoke(_env) != C_OK) {
-        return _returnValue;
-    }
-    Cubit::ManyMarshaler::get(_req, _returnValue);
-    return _returnValue;
-}
-
-
-//=========================================================
-//    Enum discrim
-//=========================================================
-
-
-
-class _TypeCodeImpl_Cubit_discrim  {
-public:
-        static void
-    push(COOL_Marshaler& marshaler, const void* t);
-        static void*
-    pop(COOL_Marshaler& marshaler);
-        static size_t
-    size(COOL_Marshaler& marshaler, const void* t);
-        static void*
-    copy(const void* from);
-        static void
-    release(void* t);
-
-    static CORBA_TypeCode          constant;
-    static const _COOL_TypeDefImpl typeDefImpl;
-    static const void*const        parameters[];
-};
-
-const _COOL_TypeDefImpl _TypeCodeImpl_Cubit_discrim::typeDefImpl = {
-    _TypeCodeImpl_Cubit_discrim::push,
-    _TypeCodeImpl_Cubit_discrim::pop,
-    _TypeCodeImpl_Cubit_discrim::size,
-    _TypeCodeImpl_Cubit_discrim::copy,
-    _TypeCodeImpl_Cubit_discrim::release
-};
-
-    void
-_TypeCodeImpl_Cubit_discrim::push(COOL_Marshaler& marshaler, const void* t)
-{
-    marshaler.put_ULong((CORBA_ULong) *(const Cubit::discrim*)t);
-
-}
-    void*
-_TypeCodeImpl_Cubit_discrim::pop(COOL_Marshaler& marshaler)
-{
-    Cubit::discrim* t = new Cubit::discrim;
-    *t = (Cubit::discrim) marshaler.get_ULong();
-    return (void*) t;
-}    
-    size_t
-_TypeCodeImpl_Cubit_discrim::size(COOL_Marshaler& marshaler, const void*)
-{
-    return marshaler.size_ULong();
-}
-    void*
-_TypeCodeImpl_Cubit_discrim::copy(const void* from)
-{
-    Cubit::discrim* to = new Cubit::discrim(*(const Cubit::discrim*)from);
-    return (void*) to;
-}    
-    void
-_TypeCodeImpl_Cubit_discrim::release(void* t)
-{
-    delete (Cubit::discrim*)t;
-}
-
-
-const void*const _TypeCodeImpl_Cubit_discrim::parameters[] = {
-    (const void*) "IDL:Eng.SUN.COM/Cubit/discrim:1.0",
-    (const void*) "discrim",
-    (const void*) 6UL,
-    (const void*) "e_0th",
-    (const void*) "e_1st",
-    (const void*) "e_2nd",
-    (const void*) "e_3rd",
-    (const void*) "e_4th",
-    (const void*) "e_5th"
-};
-
-
-CORBA_TypeCode _TypeCodeImpl_Cubit_discrim::constant(
-    CORBA_tk_enum,
-    0x006e1395,
-    &_TypeCodeImpl_Cubit_discrim::typeDefImpl,
-    _TypeCodeImpl_Cubit_discrim::parameters
-);
- CORBA_TypeCode_ptr Cubit::_tc_discrim = &_TypeCodeImpl_Cubit_discrim::constant;
-
-    void
-Cubit::oneof::_d(Cubit::discrim val)
-{
-    switch(val) {
-    case Cubit::e_0th:
-        if (initialized_ == 1) discriminant_ = val;
-        break;
-    case Cubit::e_1st:
-        if (initialized_ == 2) discriminant_ = val;
-        break;
-    case Cubit::e_2nd:
-        if (initialized_ == 3) discriminant_ = val;
-        break;
-    case Cubit::e_3rd:
-    default:
-        if (initialized_ == 4) discriminant_ = val;
-        break;
-    }
-}
-    void
-Cubit::oneof::build(const oneof& val)
-{
-    memcpy(this, &val, sizeof(oneof));
-}
-    void
-Cubit::oneofMarshaler::put(COOL_Marshaler& req, const Cubit::oneof& obj)
-{
-    req.put_ULong((CORBA_ULong) obj.discriminant_);
-    switch(obj.initialized_) {
-    case 1:
-        req.put_Octet(*((CORBA_Octet*) obj.value_));
-        break;
-    case 2:
-        req.put_Short(*((CORBA_Short*) obj.value_));
-        break;
-    case 3:
-        req.put_Long(*((CORBA_Long*) obj.value_));
-        break;
-    case 4:
-        Cubit::ManyMarshaler::put(req, *((Cubit::Many*) obj.value_));
-        break;
-    }
-}
-    void
-Cubit::oneofMarshaler::get(COOL_Marshaler& req, Cubit::oneof& obj)
-{
-    obj.discriminant_ = (Cubit::discrim) req.get_ULong();
-    switch(obj.discriminant_) {
-    case Cubit::e_0th:
-        obj.initialized_ = (CORBA_ULong) 1;
-        *((CORBA_Octet*) obj.value_) = req.get_Octet();
-        break;
-    case Cubit::e_1st:
-        obj.initialized_ = (CORBA_ULong) 2;
-        *((CORBA_Short*) obj.value_) = req.get_Short();
-        break;
-    case Cubit::e_2nd:
-        obj.initialized_ = (CORBA_ULong) 3;
-        *((CORBA_Long*) obj.value_) = req.get_Long();
-        break;
-    case Cubit::e_3rd:
-    default:
-        obj.initialized_ = (CORBA_ULong) 4;
-        new(obj.value_, _new_placement)Cubit::Many();
-        Cubit::ManyMarshaler::get(req, *((Cubit::Many*) obj.value_));
-        break;
-    }
-}
-
-
-class _TypeCodeImpl_Cubit_oneof  {
-public:
-        static void
-    push(COOL_Marshaler& marshaler, const void* t);
-        static void*
-    pop(COOL_Marshaler& marshaler);
-        static size_t
-    size(COOL_Marshaler& marshaler, const void* t);
-        static void*
-    copy(const void* from);
-        static void
-    release(void* t);
-
-    static CORBA_TypeCode          constant;
-    static const _COOL_TypeDefImpl typeDefImpl;
-    static const void*const        parameters[];
-};
-
-const _COOL_TypeDefImpl _TypeCodeImpl_Cubit_oneof::typeDefImpl = {
-    _TypeCodeImpl_Cubit_oneof::push,
-    _TypeCodeImpl_Cubit_oneof::pop,
-    _TypeCodeImpl_Cubit_oneof::size,
-    _TypeCodeImpl_Cubit_oneof::copy,
-    _TypeCodeImpl_Cubit_oneof::release
-};
-
-    void
-_TypeCodeImpl_Cubit_oneof::push(COOL_Marshaler& marshaler, const void* t)
-{
-    Cubit::oneofMarshaler::put(marshaler, *(const Cubit::oneof*)t);
-}
-    void*
-_TypeCodeImpl_Cubit_oneof::pop(COOL_Marshaler& marshaler)
-{
-    Cubit::oneof* t = new Cubit::oneof;
-    Cubit::oneofMarshaler::get(marshaler, *t);
-    return (void*) t;
-}    
-    size_t
-_TypeCodeImpl_Cubit_oneof::size(COOL_Marshaler&, const void*)
-{
-    return 14;
-}
-    void*
-_TypeCodeImpl_Cubit_oneof::copy(const void* from)
-{
-    Cubit::oneof* to = new Cubit::oneof(*(const Cubit::oneof*)from);
-    return (void*) to;
-}    
-    void
-_TypeCodeImpl_Cubit_oneof::release(void* t)
-{
-    delete (Cubit::oneof*)t;
-}
-
-
-const void*const _TypeCodeImpl_Cubit_oneof::parameters[] = {
-    (const void*) "IDL:Eng.SUN.COM/Cubit/oneof:1.0",
-    (const void*) "oneof", 
-    (const void*) &Cubit::_tc_discrim,
-    (const void*) 4L,
-    (const void*) 5UL,
-    (const void*) (Cubit::discrim) Cubit::e_0th,
-        (const void*) "o", (const void*) &CORBA__tc_octet,
-    (const void*) (Cubit::discrim) Cubit::e_1st,
-        (const void*) "s", (const void*) &CORBA__tc_short,
-    (const void*) (Cubit::discrim) Cubit::e_2nd,
-        (const void*) "l", (const void*) &CORBA__tc_long,
-    (const void*) (Cubit::discrim) Cubit::e_3rd,
-        (const void*) "cm", (const void*) &Cubit::_tc_Many,
-    (const void*) (Cubit::discrim) 4,
-        (const void*) "cm", (const void*) &Cubit::_tc_Many
-};
-
-
-CORBA_TypeCode _TypeCodeImpl_Cubit_oneof::constant(
-    CORBA_tk_union,
-    0x0070cd3e,
-    &_TypeCodeImpl_Cubit_oneof::typeDefImpl,
-    _TypeCodeImpl_Cubit_oneof::parameters
-);
- CORBA_TypeCode_ptr Cubit::_tc_oneof = &_TypeCodeImpl_Cubit_oneof::constant;
-
-
-//
-// RPC fct: Cubit::cube_union()
-//
-    Cubit::oneof
-Cubit::cube_union(const Cubit::oneof& values,
-                  CORBA_Environment& _env) const
-{
-    int _error = _shiftVtbl(_env);
-    if (_error == C_OK) {
-        return cube_union(values, _env);
-    }
-    Cubit::oneof _returnValue;
-    if (_error == C_EUNKNOWN) {
-        return _returnValue;
-    }
-    _COOL_Request _req(this, coOperations, 4, 14, 0, _env);
-    if (_env.exception()) {
-        return _returnValue;
-    }
-    Cubit::oneofMarshaler::put(_req, values);
-
-    if (_req.invoke(_env) != C_OK) {
-        return _returnValue;
-    }
-    Cubit::oneofMarshaler::get(_req, _returnValue);
-    return _returnValue;
-}
-
-
-//
-// RPC fct: Cubit::please_exit()
-//
-    void
-Cubit::please_exit(CORBA_Environment& _env) const
-{
-    int _error = _shiftVtbl(_env);
-    if (_error == C_OK) {
-        please_exit(_env);
-        return;
-    }
-    if (_error == C_EUNKNOWN) {
-        return;
-    }
-    _COOL_Request _req(this, coOperations, 5, 0, 1, _env);
-
-    _req.send(_env);
-}
-
-
diff --git a/TAO/tests/Cubit/COOL/cubit.H b/TAO/tests/Cubit/COOL/cubit.H
deleted file mode 100644
index 5f44b484dcd..00000000000
--- a/TAO/tests/Cubit/COOL/cubit.H
+++ /dev/null
@@ -1,598 +0,0 @@
-/*
- * File generated by CHIC (CHIC-COMMON-970407)
- *        from: cubit.idl
-*/
-#ifndef _CUBIT_IDL_H
-#define _CUBIT_IDL_H
-#include "corba/cool.H"
-// Copyright 1994-1995 by Sun Microsystems, Inc.
-
-
-//=========================================================
-//    interface Cubit
-//=========================================================
-
-class Cubit;
-typedef Cubit* Cubit_ptr;
-
-
-#ifndef _declare_Cubit_var
-#define _declare_Cubit_var
-class CubitMarshaler;
-class Cubit_var : public CORBA__var {
-    friend class CubitMarshaler;
-    Cubit_ptr ptr_;
-public:
-        inline
-    Cubit_var();
-    Cubit_var(Cubit* ptr)
-        : ptr_(ptr) {}
-        inline
-    Cubit_var(const Cubit_var& var);
-        inline
-    ~Cubit_var();
-        inline void
-    destroy();
-        inline Cubit_var&
-    operator =(const Cubit_var& var);
-        inline Cubit_var& 
-    operator =(Cubit_ptr ptr);
-    operator Cubit_ptr() const
-    {
-        return ptr_;
-    }
-        Cubit_ptr 
-    operator->() const
-    {
-        return ptr_;
-    }
-};
-#endif
-
-
-#ifndef _declare_Cubit_proxy
-#define _declare_Cubit_proxy
-class Cubit_proxy {
-    Cubit_ptr* ptr_;
-    CORBA_Boolean release_;
-public:
-    Cubit_proxy(Cubit_ptr* ptr, CORBA_Boolean rel)
-        : ptr_(ptr), release_(rel) {}
-        Cubit_ptr       
-    operator =(Cubit_ptr ptr);
-    operator Cubit_ptr() 
-    {
-        return *ptr_; 
-    }
-        static Cubit_ptr
-    _duplicate(Cubit_ptr ptr);
-        static void
-    _release(Cubit_ptr ptr);
-        static Cubit_ptr
-    _nil();
-};
-#endif
-
-
-#ifndef _declare_CubitMarshaler
-#define _declare_CubitMarshaler
-class CubitMarshaler {
-public:
-        static void 
-    get(COOL_Marshaler& marshaler, Cubit_ptr& obj);
-        static void 
-    get(COOL_Marshaler& marshaler, Cubit_var& obj) 
-    {
-        CubitMarshaler::get(marshaler, obj.ptr_);
-    }
-        static void 
-    put(COOL_Marshaler& marshaler, const Cubit_ptr obj);
-        static void 
-    put(COOL_Marshaler& marshaler, const Cubit_var& obj)
-    {
-        CubitMarshaler::put(marshaler, obj.ptr_);
-    }
-        static size_t
-    size(COOL_Marshaler& marshaler, const Cubit_ptr obj);
-        static size_t
-    size(COOL_Marshaler& marshaler, const Cubit_var& obj)
-    {
-        return CubitMarshaler::size(marshaler, obj.ptr_);
-    }
-};
-#endif
-
-class Cubit : public virtual CORBA_Object {
-public:
-
-        virtual CORBA_Octet
-    cube_octet(CORBA_Octet o,
-               CORBA_Environment& env = _environment) const;
-
-
-        virtual CORBA_Short
-    cube_short(CORBA_Short s,
-               CORBA_Environment& env = _environment) const;
-
-
-        virtual CORBA_Long
-    cube_long(CORBA_Long l,
-              CORBA_Environment& env = _environment) const;
-
-
-    //=========================================================
-    // Structure Many
-    //=========================================================
-
-    class Many {
-    public:
-        CORBA_Octet     o;              // + 3 bytes padding (normally) ...
-        CORBA_Long      l;
-        CORBA_Short     s;              // + 2 bytes padding (normally) ...
-    };
-
-    class ManyMarshaler;
-    class Many_var {
-        friend class ManyMarshaler; 
-        Many* ptr_;
-    public:
-        Many_var() 
-            : ptr_(0) {}
-        Many_var(Many* ptr) 
-            : ptr_(ptr) {}
-        Many_var(const Many_var& var)
-            : ptr_(var.ptr_ ? new Many(*var.ptr_) : 0) {}
-        ~Many_var() 
-        {
-            if (ptr_) delete ptr_;
-        }
-            Many_var&
-        operator =(Many* ptr) 
-        {
-            if (ptr != ptr_) {        
-                if (ptr_) delete ptr_;
-                ptr_ = ptr;
-            }
-            return *this;
-        }
-            Many_var&
-        operator =(const Many_var& var) 
-        {
-            if (var.ptr_ != ptr_) {
-                if (ptr_) delete ptr_;
-                ptr_ = var.ptr_ ? new Many(*(var.ptr_)) : 0;
-            }
-            return *this;
-        }
-            Many*
-        operator ->() const 
-        {
-            return ptr_;
-        }
-        COOL_CONST_OPERATOR(Many);
-        operator Many&() 
-        {
-            return *ptr_;
-        }
-    };
-
-
-    class ManyMarshaler {
-    public:
-            static void 
-        put(COOL_Marshaler& marshaler, const Many& obj);
-            static void 
-        put(COOL_Marshaler& marshaler, const Many* ptr)
-        {
-            ManyMarshaler::put(marshaler, *ptr);
-        }
-            static void 
-        get(COOL_Marshaler& marshaler, Many& obj);
-            static void 
-        get(COOL_Marshaler& marshaler, Many*& ptr)
-        {
-            ptr = new Many;
-            ManyMarshaler::get(marshaler, *ptr);
-        }
-            static size_t
-        size(COOL_Marshaler&)
-        {
-            return 10;
-        }
-    };
-
-    static CORBA_TypeCode_ptr _tc_Many;
-
-        virtual Many
-    cube_struct(const Many& values,
-                CORBA_Environment& env = _environment) const;
-
-    
-    //=========================================================
-    //    Enum discrim
-    //=========================================================
-
-    enum discrim {
-        e_0th,
-        e_1st,
-        e_2nd,
-        e_3rd,
-        e_4th,
-        e_5th
-    };
-    static CORBA_TypeCode_ptr _tc_discrim;
-    class oneofMarshaler;
-    class oneof {
-    friend class oneofMarshaler;
-public:
-private:
-    discrim discriminant_;
-    CORBA_ULong initialized_;
-    union {
-        double align_;
-        char value_[1];
-            char value1_[sizeof(CORBA_Octet)];
-            char value2_[sizeof(CORBA_Short)];
-            char value3_[sizeof(CORBA_Long)];
-            char value4_[sizeof(Many)];
-            };
-public:
-        void
-    destroy()
-    {}
-        void
-    build(const oneof&); 
-    oneof()
-    {
-        initialized_ = 0;
-    }
-    ~oneof()
-    {
-    }
-    oneof(const oneof& u)
-    {
-        if (u.initialized_ > 0) {
-            build(u);
-        } else {
-            initialized_ = 0;
-        }
-    }
-        oneof&
-    operator=(const oneof& u)
-    {
-        if (u.initialized_ > 0) {
-            build(u);
-        } else {
-            initialized_ = 0;
-        }
-        return *this;
-    }
-        discrim
-    _d() const 
-    {
-        return discriminant_;
-    }
-        void
-    _d(discrim val);
-        void
-    o(CORBA_Octet val)
-    {
-        initialized_ = (CORBA_ULong) 1;
-        discriminant_ = (discrim) e_0th;
-        *((CORBA_Octet*)value_) = val;
-    }
-        CORBA_Octet
-    o() const
-    {
-        return *((CORBA_Octet*)value_);
-    }
-        void
-    s(CORBA_Short val)
-    {
-        initialized_ = (CORBA_ULong) 2;
-        discriminant_ = (discrim) e_1st;
-        *((CORBA_Short*)value_) = val;
-    }
-        CORBA_Short
-    s() const
-    {
-        return *((CORBA_Short*)value_);
-    }
-        void
-    l(CORBA_Long val)
-    {
-        initialized_ = (CORBA_ULong) 3;
-        discriminant_ = (discrim) e_2nd;
-        *((CORBA_Long*)value_) = val;
-    }
-        CORBA_Long
-    l() const
-    {
-        return *((CORBA_Long*)value_);
-    }
-        void
-    cm(const Many& val)
-    {
-        initialized_ = (CORBA_ULong) 4;
-        discriminant_ = (discrim) 4;
-        new(value_,_new_placement) Many(val);
-    }
-        const Many&
-    cm() const
-    {
-        return *((Many*)value_);
-    }
-        Many&
-    cm()
-    {
-         return *((Many*)value_);
-     }
-    };
-
-    class oneof_var {
-        friend class oneofMarshaler;
-        oneof* ptr_;
-    public:
-        oneof_var() 
-            : ptr_(0) {}    
-        oneof_var(oneof* ptr) 
-            : ptr_(ptr) {}
-        oneof_var(const oneof_var& var) 
-            : ptr_(var.ptr_ ? new oneof(*var.ptr_) : 0) {}
-        ~oneof_var() 
-        {
-            if (ptr_) delete ptr_;
-        }
-            oneof_var&
-        operator =(oneof* ptr) 
-        {
-            if (ptr != ptr_) {
-                if (ptr_) delete ptr_;
-                ptr_ = ptr;
-            }
-            return *this;
-        }
-            oneof_var&
-        operator =(const oneof_var& var)
-        {
-            if (var.ptr_ != ptr_) {
-                if (ptr_) delete ptr_;
-                ptr_ = var.ptr_ ? new oneof(*(var.ptr_)) : 0;
-            }
-            return *this;
-        }
-            oneof*
-        operator ->() const 
-        {
-            return ptr_;
-        }
-        COOL_CONST_OPERATOR(oneof);
-        operator oneof&() 
-        {
-            return *ptr_;
-        }
-    };
-
-
-    class oneofMarshaler {
-    public:
-            static void 
-        put(COOL_Marshaler& marshaler, const oneof& obj);
-            static void 
-        put(COOL_Marshaler& marshaler, const oneof* ptr)
-        {
-            oneofMarshaler::put(marshaler, *ptr);
-        }
-            static void 
-        get(COOL_Marshaler& marshaler, oneof& obj);
-            static void 
-        get(COOL_Marshaler& marshaler, oneof*& ptr)
-        {
-            ptr = new oneof;
-            oneofMarshaler::get(marshaler, *ptr);
-        }
-            static size_t
-        size(COOL_Marshaler&)
-        {
-            return 14;
-        }
-    };
-
-    static CORBA_TypeCode_ptr _tc_oneof;
-
-        virtual oneof
-    cube_union(const oneof& values,
-               CORBA_Environment& env = _environment) const;
-
-
-        virtual void
-    please_exit(CORBA_Environment& env = _environment) const;
-
-    static const _COOL_InterfaceDesc coOperations;
-    static const _COOL_FullInterfaceDesc coInterfaceDef[];
-private:
-    static Cubit coNilObject;
-        virtual int
-    _shiftVtbl(CORBA_Environment& _env) const;
-protected:
-    Cubit(const CORBA_Object& t)
-        : CORBA_Object(t)
-    {}
-public:
-    Cubit(_EmptyCtor)
-        : CORBA_Object(_emptyCtor)
-    {}
-    Cubit(const _COOL_FullInterfaceDesc* idesc)
-        : CORBA_Object(idesc)
-    {}
-    Cubit()
-    {
-        coInterface = coInterfaceDef;
-    }
-    Cubit(const Cubit& t)
-        : CORBA_Object(t)
-    {}
-        virtual
-    ~Cubit();
-        Cubit*
-    operator ->()
-    {
-        return this;
-    }
-        static Cubit_ptr
-    _nil()
-    {
-        return &coNilObject;
-    }
-        static Cubit_ptr
-    _duplicate(const Cubit_ptr obj)
-    {
-        return CORBA_is_nil(obj) == CORBA_TRUE ? _nil() : new Cubit(*obj);
-    }
-        static Cubit_ptr
-    _narrow(const CORBA_Object_ptr obj)
-    {
-        return checkNarrow(obj, coInterfaceDef)
-                   ? new Cubit(*obj) : _nil();
-    }
-        static Cubit_ptr
-    _bind(const COOL_BindingData& bindingData,
-          CORBA_Environment& _env = _environment)
-    {
-        Cubit_ptr obj = new Cubit();
-        return bindObject(obj, bindingData, _env) == CORBA_TRUE ?       obj : _nil();}
-};
-extern const CORBA_TypeCode_ptr _tc_Cubit;
-
-
-    inline void
-operator <<=(CORBA_Any& any, const Cubit_ptr ptr)
-{
-    any.replace(_tc_Cubit, (void*) &ptr);
-}
-
-
-    inline CORBA_Boolean
-operator >>=(const CORBA_Any& any, Cubit_ptr& ptr)
-{
-    return (any._type()->equal(_tc_Cubit) == CORBA_TRUE)
-        ? (ptr = *(Cubit_ptr*) any.value(), CORBA_TRUE)
-        : (ptr = (Cubit_ptr) NULL, CORBA_FALSE);
-}
-
-
-
-#ifndef _declare_Cubit_var_impl
-#define _declare_Cubit_var_impl
-    inline
-Cubit_var::Cubit_var()
- : ptr_(Cubit::_nil())
-{
-}
-    inline
-Cubit_var::Cubit_var(const Cubit_var& var)
- : ptr_(Cubit::_duplicate(var.ptr_))
-{
-}
-    inline
-Cubit_var::~Cubit_var()
-{
-    CORBA_release(ptr_);
-}
-    inline void
-Cubit_var::destroy()
-{
-    CORBA_release(ptr_);
-}
-    inline Cubit_var&
-Cubit_var::operator =(const Cubit_var& var)
-{
-    if (ptr_ != var.ptr_) {
-        CORBA_release(ptr_);
-        ptr_ = Cubit::_duplicate(var.ptr_);
-    }
-    return *this;
-}
-    inline Cubit_var& 
-Cubit_var::operator =(Cubit* ptr)
-{
-    if (ptr_ != ptr) {
-        CORBA_release(ptr_);
-        ptr_ = ptr;
-    }
-    return *this;
-}
-#endif
-
-
-
-    inline void
-operator <<=(CORBA_Any& any, const Cubit::Many& s)
-{
-    any.replace(Cubit::_tc_Many, (void*) &s);
-}
-
-
-    inline void
-operator <<=(CORBA_Any& any, Cubit::Many* s)
-{
-    any.replace(Cubit::_tc_Many, (void*) s, CORBA_TRUE);
-}
-
-
-    inline CORBA_Boolean
-operator >>=(const CORBA_Any& any, Cubit::Many*& p)
-{
-    return (any._type()->equal(Cubit::_tc_Many) == CORBA_TRUE)
-        ? (p = (Cubit::Many*) any.value(), CORBA_TRUE)
-        : (p = (Cubit::Many*) NULL, CORBA_FALSE);
-}
-
-
-
-
-    inline void
-operator <<=(CORBA_Any& any, const Cubit::discrim s)
-{
-    any.replace(Cubit::_tc_discrim, (void*) &s);
-}
-
-
-    inline CORBA_Boolean
-operator >>=(const CORBA_Any& any, Cubit::discrim& obj)
-{
-    return (any._type()->equal(Cubit::_tc_discrim) == CORBA_TRUE)
-        ? (obj = *(Cubit::discrim*) any.value(), CORBA_TRUE)
-        : CORBA_FALSE;
-}
-
-
-
-
-    inline void
-operator <<=(CORBA_Any& any, const Cubit::oneof& s)
-{
-    any.replace(Cubit::_tc_oneof, (void*) &s);
-}
-
-
-    inline void
-operator <<=(CORBA_Any& any, Cubit::oneof* s)
-{
-    any.replace(Cubit::_tc_oneof, (void*) s, CORBA_TRUE);
-}
-
-
-    inline CORBA_Boolean
-operator >>=(const CORBA_Any& any, Cubit::oneof*& p)
-{
-    return (any._type()->equal(Cubit::_tc_oneof) == CORBA_TRUE)
-        ? (p = (Cubit::oneof*) any.value(), CORBA_TRUE)
-        : (p = (Cubit::oneof*) NULL, CORBA_FALSE);
-}
-
-
-
-
-#endif
-
diff --git a/TAO/tests/Cubit/COOL/cubit.cpp b/TAO/tests/Cubit/COOL/cubit.cpp
deleted file mode 100644
index 984b7d54e2a..00000000000
--- a/TAO/tests/Cubit/COOL/cubit.cpp
+++ /dev/null
@@ -1,670 +0,0 @@
-/*
- * File generated by CHIC (CHIC-COMMON-970407)
- *        from: cubit.idl
-*/
-#include <corba/cool.H>
-#include "cubit.H"
-
-
-
-//=========================================================
-//    interface Cubit
-//=========================================================
-
-
-
-class _TypeCodeImpl_Cubit  {
-public:
-        static void
-    push(COOL_Marshaler& marshaler, const void* t);
-        static void*
-    pop(COOL_Marshaler& marshaler);
-        static size_t
-    size(COOL_Marshaler& marshaler, const void* t);
-        static void*
-    copy(const void* from);
-        static void
-    release(void* t);
-
-    static CORBA_TypeCode          constant;
-    static const _COOL_TypeDefImpl typeDefImpl;
-    static const void*const        parameters[];
-};
-
-const _COOL_TypeDefImpl _TypeCodeImpl_Cubit::typeDefImpl = {
-    _TypeCodeImpl_Cubit::push,
-    _TypeCodeImpl_Cubit::pop,
-    _TypeCodeImpl_Cubit::size,
-    _TypeCodeImpl_Cubit::copy,
-    _TypeCodeImpl_Cubit::release
-};
-
-    void
-_TypeCodeImpl_Cubit::push(COOL_Marshaler& marshaler, const void* t)
-{
-    const Cubit_ptr obj = *(const Cubit_ptr*) t;
-    marshaler.put_Object(obj);
-}
-    void*
-_TypeCodeImpl_Cubit::pop(COOL_Marshaler& marshaler)
-{
-    Cubit_ptr* t = new Cubit_ptr;
-    *t = (Cubit_ptr) NULL;
-    CubitMarshaler::get(marshaler, *t);
-    return (void*) t;
-}    
-    size_t
-_TypeCodeImpl_Cubit::size(COOL_Marshaler& marshaler, const void* t)
-{
-    const Cubit_ptr obj = *(const Cubit_ptr*)t;
-    return marshaler.size_Object(obj);
-}
-    void*
-_TypeCodeImpl_Cubit::copy(const void* from)
-{
-    Cubit_ptr* to  = new Cubit_ptr;
-    *to = Cubit::_duplicate(*(const Cubit_ptr*)from);
-    return (void*) to;
-}    
-    void
-_TypeCodeImpl_Cubit::release(void* t)
-{
-    CORBA_release(*(Cubit_ptr*)t);
-}
-
-
-const void*const _TypeCodeImpl_Cubit::parameters[] = {
-    (const void*) "IDL:Cubit:1.0",
-    (const void*) "Cubit"
-};
-
-
-CORBA_TypeCode _TypeCodeImpl_Cubit::constant(
-    CORBA_tk_objref,
-    0x00750aa6,
-    &_TypeCodeImpl_Cubit::typeDefImpl,
-    _TypeCodeImpl_Cubit::parameters
-);
-const CORBA_TypeCode_ptr _tc_Cubit = &_TypeCodeImpl_Cubit::constant;
-
-
-    Cubit_ptr
-Cubit_proxy::operator =(Cubit_ptr ptr) 
-{
-    if (*ptr_ != ptr) {
-        if (release_ == CORBA_TRUE) CORBA_release(*ptr_);
-        *ptr_ = ptr;
-    }
-    return ptr;
-}
-    Cubit_ptr
-Cubit_proxy::_duplicate(Cubit_ptr ptr)
-{
-    return Cubit::_duplicate(ptr);
-}
-    void
-Cubit_proxy::_release(Cubit_ptr ptr)
-{
-    CORBA_release(ptr);
-}
-    Cubit_ptr
-Cubit_proxy::_nil()
-{
-    return Cubit::_nil();
-}
-
-    void
-CubitMarshaler::put(COOL_Marshaler& marshaler,
-    const Cubit_ptr ptr)
-{
-    marshaler.put_Object(ptr);
-}
-    void
-CubitMarshaler::get(COOL_Marshaler& marshaler,
-    Cubit_ptr& ptr)
-{
-    CORBA_release(ptr);
-    Cubit_ptr obj = new Cubit;
-    if (marshaler.get_Object(obj) == CORBA_FALSE) {
-        obj = Cubit::_nil();
-    }
-    ptr = obj;
-}
-    size_t
-CubitMarshaler::size(COOL_Marshaler& marshaler,
-    const Cubit_ptr ptr)
-{
-    return marshaler.size_Object(ptr);
-}
-static const _COOL_OperationDesc Cubit_desc[] = {
-  { "cube_long", 2, (const CORBA_TypeCode_ptr*const*const) 0 },
-  { "cube_octet", 0, (const CORBA_TypeCode_ptr*const*const) 0 },
-  { "cube_short", 1, (const CORBA_TypeCode_ptr*const*const) 0 },
-  { "cube_struct", 3, (const CORBA_TypeCode_ptr*const*const) 0 },
-  { "cube_union", 4, (const CORBA_TypeCode_ptr*const*const) 0 },
-  { "please_exit", 5, (const CORBA_TypeCode_ptr*const*const) 0 }
-};
-const _COOL_InterfaceDesc Cubit::coOperations = {
-    "IDL:Cubit:1.0", 0x00750aa6, 6, Cubit_desc
-};
-
-const _COOL_FullInterfaceDesc Cubit::coInterfaceDef[] = {
-    { &Cubit::coOperations, 0},
-    { (const _COOL_InterfaceDesc*const) 0, 0}
-};
-Cubit Cubit::coNilObject(Cubit::coInterfaceDef);
-
-Cubit::~Cubit()
-{
-}
-
-    int
-Cubit::_shiftVtbl(CORBA_Environment& _env) const
-{
-    return switchLocal(this, coOperations.typeId, _env);
-}
-
-//
-// RPC fct: Cubit::cube_octet()
-//
-    CORBA_Octet
-Cubit::cube_octet(CORBA_Octet o,
-                  CORBA_Environment& _env) const
-{
-    int _error = _shiftVtbl(_env);
-    if (_error == C_OK) {
-        return cube_octet(o, _env);
-    }
-    CORBA_Octet _returnValue = 0;
-    if (_error == C_EUNKNOWN) {
-        return _returnValue;
-    }
-    _COOL_Request _req(this, coOperations, 1, 1, 0, _env);
-    if (_env.exception()) {
-        return _returnValue;
-    }
-    _req.put_Octet(o);
-
-    if (_req.invoke(_env) != C_OK) {
-        return _returnValue;
-    }
-    _returnValue = _req.get_Octet();
-    return _returnValue;
-}
-
-
-//
-// RPC fct: Cubit::cube_short()
-//
-    CORBA_Short
-Cubit::cube_short(CORBA_Short s,
-                  CORBA_Environment& _env) const
-{
-    int _error = _shiftVtbl(_env);
-    if (_error == C_OK) {
-        return cube_short(s, _env);
-    }
-    CORBA_Short _returnValue = 0;
-    if (_error == C_EUNKNOWN) {
-        return _returnValue;
-    }
-    _COOL_Request _req(this, coOperations, 2, 2, 0, _env);
-    if (_env.exception()) {
-        return _returnValue;
-    }
-    _req.put_Short(s);
-
-    if (_req.invoke(_env) != C_OK) {
-        return _returnValue;
-    }
-    _returnValue = _req.get_Short();
-    return _returnValue;
-}
-
-
-//
-// RPC fct: Cubit::cube_long()
-//
-    CORBA_Long
-Cubit::cube_long(CORBA_Long l,
-                 CORBA_Environment& _env) const
-{
-    int _error = _shiftVtbl(_env);
-    if (_error == C_OK) {
-        return cube_long(l, _env);
-    }
-    CORBA_Long _returnValue = 0;
-    if (_error == C_EUNKNOWN) {
-        return _returnValue;
-    }
-    _COOL_Request _req(this, coOperations, 0, 4, 0, _env);
-    if (_env.exception()) {
-        return _returnValue;
-    }
-    _req.put_Long(l);
-
-    if (_req.invoke(_env) != C_OK) {
-        return _returnValue;
-    }
-    _returnValue = _req.get_Long();
-    return _returnValue;
-}
-
-
-//=========================================================
-//    Structure Many
-//=========================================================
-
-
-
-class _TypeCodeImpl_Cubit_Many  {
-public:
-        static void
-    push(COOL_Marshaler& marshaler, const void* t);
-        static void*
-    pop(COOL_Marshaler& marshaler);
-        static size_t
-    size(COOL_Marshaler& marshaler, const void* t);
-        static void*
-    copy(const void* from);
-        static void
-    release(void* t);
-
-    static CORBA_TypeCode          constant;
-    static const _COOL_TypeDefImpl typeDefImpl;
-    static const void*const        parameters[];
-};
-
-const _COOL_TypeDefImpl _TypeCodeImpl_Cubit_Many::typeDefImpl = {
-    _TypeCodeImpl_Cubit_Many::push,
-    _TypeCodeImpl_Cubit_Many::pop,
-    _TypeCodeImpl_Cubit_Many::size,
-    _TypeCodeImpl_Cubit_Many::copy,
-    _TypeCodeImpl_Cubit_Many::release
-};
-
-    void
-_TypeCodeImpl_Cubit_Many::push(COOL_Marshaler& marshaler, const void* t)
-{
-    Cubit::ManyMarshaler::put(marshaler, *(const Cubit::Many*)t);
-}
-    void*
-_TypeCodeImpl_Cubit_Many::pop(COOL_Marshaler& marshaler)
-{
-    Cubit::Many* t = new Cubit::Many;
-    Cubit::ManyMarshaler::get(marshaler, *t);
-    return (void*) t;
-}    
-    size_t
-_TypeCodeImpl_Cubit_Many::size(COOL_Marshaler&, const void*)
-{
-    return 10;
-}
-    void*
-_TypeCodeImpl_Cubit_Many::copy(const void* from)
-{
-    Cubit::Many* to = new Cubit::Many(*(const Cubit::Many*)from);
-    return (void*) to;
-}    
-    void
-_TypeCodeImpl_Cubit_Many::release(void* t)
-{
-    delete (Cubit::Many*)t;
-}
-
-
-const void*const _TypeCodeImpl_Cubit_Many::parameters[] = {
-    (const void*) "IDL:Eng.SUN.COM/Cubit/Many:1.0",
-    (const void*) "Many",
-    (const void*) 3UL,
-    (const void*) "o", (const void*) &CORBA__tc_octet,
-    (const void*) "l", (const void*) &CORBA__tc_long,
-    (const void*) "s", (const void*) &CORBA__tc_short
-};
-
-
-CORBA_TypeCode _TypeCodeImpl_Cubit_Many::constant(
-    CORBA_tk_struct,
-    0x004e6a97,
-    &_TypeCodeImpl_Cubit_Many::typeDefImpl,
-    _TypeCodeImpl_Cubit_Many::parameters
-);
- CORBA_TypeCode_ptr Cubit::_tc_Many = &_TypeCodeImpl_Cubit_Many::constant;
-
-
-    void
-
-Cubit::ManyMarshaler::put(COOL_Marshaler& marshaler,
-    const Cubit::Many& obj)
-{
-     marshaler.put_Octet(obj.o);
-     marshaler.put_Long(obj.l);
-     marshaler.put_Short(obj.s);
-}
-
-    void
-Cubit::ManyMarshaler::get(COOL_Marshaler& marshaler,
-    Cubit::Many& obj)
-{
-    obj.o =  marshaler.get_Octet();
-    obj.l =  marshaler.get_Long();
-    obj.s =  marshaler.get_Short();
-}
-
-
-//
-// RPC fct: Cubit::cube_struct()
-//
-    Cubit::Many
-Cubit::cube_struct(const Cubit::Many& values,
-                   CORBA_Environment& _env) const
-{
-    int _error = _shiftVtbl(_env);
-    if (_error == C_OK) {
-        return cube_struct(values, _env);
-    }
-    Cubit::Many _returnValue;
-    if (_error == C_EUNKNOWN) {
-        return _returnValue;
-    }
-    _COOL_Request _req(this, coOperations, 3, 10, 0, _env);
-    if (_env.exception()) {
-        return _returnValue;
-    }
-    Cubit::ManyMarshaler::put(_req, values);
-
-    if (_req.invoke(_env) != C_OK) {
-        return _returnValue;
-    }
-    Cubit::ManyMarshaler::get(_req, _returnValue);
-    return _returnValue;
-}
-
-
-//=========================================================
-//    Enum discrim
-//=========================================================
-
-
-
-class _TypeCodeImpl_Cubit_discrim  {
-public:
-        static void
-    push(COOL_Marshaler& marshaler, const void* t);
-        static void*
-    pop(COOL_Marshaler& marshaler);
-        static size_t
-    size(COOL_Marshaler& marshaler, const void* t);
-        static void*
-    copy(const void* from);
-        static void
-    release(void* t);
-
-    static CORBA_TypeCode          constant;
-    static const _COOL_TypeDefImpl typeDefImpl;
-    static const void*const        parameters[];
-};
-
-const _COOL_TypeDefImpl _TypeCodeImpl_Cubit_discrim::typeDefImpl = {
-    _TypeCodeImpl_Cubit_discrim::push,
-    _TypeCodeImpl_Cubit_discrim::pop,
-    _TypeCodeImpl_Cubit_discrim::size,
-    _TypeCodeImpl_Cubit_discrim::copy,
-    _TypeCodeImpl_Cubit_discrim::release
-};
-
-    void
-_TypeCodeImpl_Cubit_discrim::push(COOL_Marshaler& marshaler, const void* t)
-{
-    marshaler.put_ULong((CORBA_ULong) *(const Cubit::discrim*)t);
-
-}
-    void*
-_TypeCodeImpl_Cubit_discrim::pop(COOL_Marshaler& marshaler)
-{
-    Cubit::discrim* t = new Cubit::discrim;
-    *t = (Cubit::discrim) marshaler.get_ULong();
-    return (void*) t;
-}    
-    size_t
-_TypeCodeImpl_Cubit_discrim::size(COOL_Marshaler& marshaler, const void*)
-{
-    return marshaler.size_ULong();
-}
-    void*
-_TypeCodeImpl_Cubit_discrim::copy(const void* from)
-{
-    Cubit::discrim* to = new Cubit::discrim(*(const Cubit::discrim*)from);
-    return (void*) to;
-}    
-    void
-_TypeCodeImpl_Cubit_discrim::release(void* t)
-{
-    delete (Cubit::discrim*)t;
-}
-
-
-const void*const _TypeCodeImpl_Cubit_discrim::parameters[] = {
-    (const void*) "IDL:Eng.SUN.COM/Cubit/discrim:1.0",
-    (const void*) "discrim",
-    (const void*) 6UL,
-    (const void*) "e_0th",
-    (const void*) "e_1st",
-    (const void*) "e_2nd",
-    (const void*) "e_3rd",
-    (const void*) "e_4th",
-    (const void*) "e_5th"
-};
-
-
-CORBA_TypeCode _TypeCodeImpl_Cubit_discrim::constant(
-    CORBA_tk_enum,
-    0x006e1395,
-    &_TypeCodeImpl_Cubit_discrim::typeDefImpl,
-    _TypeCodeImpl_Cubit_discrim::parameters
-);
- CORBA_TypeCode_ptr Cubit::_tc_discrim = &_TypeCodeImpl_Cubit_discrim::constant;
-
-    void
-Cubit::oneof::_d(Cubit::discrim val)
-{
-    switch(val) {
-    case Cubit::e_0th:
-        if (initialized_ == 1) discriminant_ = val;
-        break;
-    case Cubit::e_1st:
-        if (initialized_ == 2) discriminant_ = val;
-        break;
-    case Cubit::e_2nd:
-        if (initialized_ == 3) discriminant_ = val;
-        break;
-    case Cubit::e_3rd:
-    default:
-        if (initialized_ == 4) discriminant_ = val;
-        break;
-    }
-}
-    void
-Cubit::oneof::build(const oneof& val)
-{
-    memcpy(this, &val, sizeof(oneof));
-}
-    void
-Cubit::oneofMarshaler::put(COOL_Marshaler& req, const Cubit::oneof& obj)
-{
-    req.put_ULong((CORBA_ULong) obj.discriminant_);
-    switch(obj.initialized_) {
-    case 1:
-        req.put_Octet(*((CORBA_Octet*) obj.value_));
-        break;
-    case 2:
-        req.put_Short(*((CORBA_Short*) obj.value_));
-        break;
-    case 3:
-        req.put_Long(*((CORBA_Long*) obj.value_));
-        break;
-    case 4:
-        Cubit::ManyMarshaler::put(req, *((Cubit::Many*) obj.value_));
-        break;
-    }
-}
-    void
-Cubit::oneofMarshaler::get(COOL_Marshaler& req, Cubit::oneof& obj)
-{
-    obj.discriminant_ = (Cubit::discrim) req.get_ULong();
-    switch(obj.discriminant_) {
-    case Cubit::e_0th:
-        obj.initialized_ = (CORBA_ULong) 1;
-        *((CORBA_Octet*) obj.value_) = req.get_Octet();
-        break;
-    case Cubit::e_1st:
-        obj.initialized_ = (CORBA_ULong) 2;
-        *((CORBA_Short*) obj.value_) = req.get_Short();
-        break;
-    case Cubit::e_2nd:
-        obj.initialized_ = (CORBA_ULong) 3;
-        *((CORBA_Long*) obj.value_) = req.get_Long();
-        break;
-    case Cubit::e_3rd:
-    default:
-        obj.initialized_ = (CORBA_ULong) 4;
-        new(obj.value_, _new_placement)Cubit::Many();
-        Cubit::ManyMarshaler::get(req, *((Cubit::Many*) obj.value_));
-        break;
-    }
-}
-
-
-class _TypeCodeImpl_Cubit_oneof  {
-public:
-        static void
-    push(COOL_Marshaler& marshaler, const void* t);
-        static void*
-    pop(COOL_Marshaler& marshaler);
-        static size_t
-    size(COOL_Marshaler& marshaler, const void* t);
-        static void*
-    copy(const void* from);
-        static void
-    release(void* t);
-
-    static CORBA_TypeCode          constant;
-    static const _COOL_TypeDefImpl typeDefImpl;
-    static const void*const        parameters[];
-};
-
-const _COOL_TypeDefImpl _TypeCodeImpl_Cubit_oneof::typeDefImpl = {
-    _TypeCodeImpl_Cubit_oneof::push,
-    _TypeCodeImpl_Cubit_oneof::pop,
-    _TypeCodeImpl_Cubit_oneof::size,
-    _TypeCodeImpl_Cubit_oneof::copy,
-    _TypeCodeImpl_Cubit_oneof::release
-};
-
-    void
-_TypeCodeImpl_Cubit_oneof::push(COOL_Marshaler& marshaler, const void* t)
-{
-    Cubit::oneofMarshaler::put(marshaler, *(const Cubit::oneof*)t);
-}
-    void*
-_TypeCodeImpl_Cubit_oneof::pop(COOL_Marshaler& marshaler)
-{
-    Cubit::oneof* t = new Cubit::oneof;
-    Cubit::oneofMarshaler::get(marshaler, *t);
-    return (void*) t;
-}    
-    size_t
-_TypeCodeImpl_Cubit_oneof::size(COOL_Marshaler&, const void*)
-{
-    return 14;
-}
-    void*
-_TypeCodeImpl_Cubit_oneof::copy(const void* from)
-{
-    Cubit::oneof* to = new Cubit::oneof(*(const Cubit::oneof*)from);
-    return (void*) to;
-}    
-    void
-_TypeCodeImpl_Cubit_oneof::release(void* t)
-{
-    delete (Cubit::oneof*)t;
-}
-
-
-const void*const _TypeCodeImpl_Cubit_oneof::parameters[] = {
-    (const void*) "IDL:Eng.SUN.COM/Cubit/oneof:1.0",
-    (const void*) "oneof", 
-    (const void*) &Cubit::_tc_discrim,
-    (const void*) 4L,
-    (const void*) 5UL,
-    (const void*) (Cubit::discrim) Cubit::e_0th,
-        (const void*) "o", (const void*) &CORBA__tc_octet,
-    (const void*) (Cubit::discrim) Cubit::e_1st,
-        (const void*) "s", (const void*) &CORBA__tc_short,
-    (const void*) (Cubit::discrim) Cubit::e_2nd,
-        (const void*) "l", (const void*) &CORBA__tc_long,
-    (const void*) (Cubit::discrim) Cubit::e_3rd,
-        (const void*) "cm", (const void*) &Cubit::_tc_Many,
-    (const void*) (Cubit::discrim) 4,
-        (const void*) "cm", (const void*) &Cubit::_tc_Many
-};
-
-
-CORBA_TypeCode _TypeCodeImpl_Cubit_oneof::constant(
-    CORBA_tk_union,
-    0x0070cd3e,
-    &_TypeCodeImpl_Cubit_oneof::typeDefImpl,
-    _TypeCodeImpl_Cubit_oneof::parameters
-);
- CORBA_TypeCode_ptr Cubit::_tc_oneof = &_TypeCodeImpl_Cubit_oneof::constant;
-
-
-//
-// RPC fct: Cubit::cube_union()
-//
-    Cubit::oneof
-Cubit::cube_union(const Cubit::oneof& values,
-                  CORBA_Environment& _env) const
-{
-    int _error = _shiftVtbl(_env);
-    if (_error == C_OK) {
-        return cube_union(values, _env);
-    }
-    Cubit::oneof _returnValue;
-    if (_error == C_EUNKNOWN) {
-        return _returnValue;
-    }
-    _COOL_Request _req(this, coOperations, 4, 14, 0, _env);
-    if (_env.exception()) {
-        return _returnValue;
-    }
-    Cubit::oneofMarshaler::put(_req, values);
-
-    if (_req.invoke(_env) != C_OK) {
-        return _returnValue;
-    }
-    Cubit::oneofMarshaler::get(_req, _returnValue);
-    return _returnValue;
-}
-
-
-//
-// RPC fct: Cubit::please_exit()
-//
-    void
-Cubit::please_exit(CORBA_Environment& _env) const
-{
-    int _error = _shiftVtbl(_env);
-    if (_error == C_OK) {
-        please_exit(_env);
-        return;
-    }
-    if (_error == C_EUNKNOWN) {
-        return;
-    }
-    _COOL_Request _req(this, coOperations, 5, 0, 1, _env);
-
-    _req.send(_env);
-}
-
-
diff --git a/TAO/tests/Cubit/COOL/cubit.idl b/TAO/tests/Cubit/COOL/cubit.idl
deleted file mode 100644
index d9b38c34a2a..00000000000
--- a/TAO/tests/Cubit/COOL/cubit.idl
+++ /dev/null
@@ -1,40 +0,0 @@
-// @(#)cubit.idl	1.1 95/09/10
-// Copyright 1994-1995 by Sun Microsystems, Inc.
-
-#pragma prefix	"Eng.SUN.COM"
-#pragma version Cubit 1.1
-
-interface Cubit {
-    octet	cube_octet (in octet o);
-    short	cube_short (in short s);
-    long	cube_long (in long l);
-
-    struct Many {
-	octet	o;		// + 3 bytes padding (normally) ...
-	long	l;
-	short	s;		// + 2 bytes padding (normally) ...
-    };
-
-    Many	cube_struct (in Many values);
-
-    enum discrim {e_0th, e_1st, e_2nd, e_3rd, e_4th, e_5th};
-
-    union oneof
-    switch (discrim) {
-	// this is an easy union to interpret; no padding
-	// is needed between discriminant and value.
-      case e_0th:
-        octet		o;
-      case e_1st:
-        short		s;
-      case e_2nd:
-        long		l;
-      case e_3rd:
-      default:
-        Many		cm;
-    };
-
-    oneof	cube_union (in oneof values);
-
-    oneway void	please_exit ();
-};
diff --git a/TAO/tests/Cubit/COOL/cubit_impl.cpp b/TAO/tests/Cubit/COOL/cubit_impl.cpp
deleted file mode 100644
index 8d3137215cd..00000000000
--- a/TAO/tests/Cubit/COOL/cubit_impl.cpp
+++ /dev/null
@@ -1,46 +0,0 @@
-#include "cubit_impl.h"
-
-CORBA::Octet Cubit_Impl:: cube_octet (CORBA::Octet o, CORBA::Environment &IT_env)  {
-  return (CORBA::Octet) (o * o * o); 
-}
-
-CORBA::Short Cubit_Impl:: cube_short (CORBA::Short s, CORBA::Environment &IT_env)  {
-  return (CORBA::Short) (s * s * s);
-}
-
-CORBA::Long Cubit_Impl:: cube_long (CORBA::Long l, CORBA::Environment &IT_env)  {
-  return (CORBA::Long) (l * l * l);
-}
-
-Cubit::Many Cubit_Impl:: cube_struct (const Cubit::Many& values, CORBA::Environment &IT_env)  {
-  Cubit::Many out_values;
-  out_values.o = values.o * values.o * values.o;
-  out_values.s = values.s * values.s * values.s;
-  out_values.l = values.l * values.l * values.l;
-  return out_values; 
-}
-
-Cubit::oneof Cubit_Impl:: cube_union (const Cubit::oneof& values, CORBA::Environment &IT_env)  {
-  Cubit::oneof out_values;
-   switch (values._d ()) {
-   case Cubit::e_0th:
-     out_values.o (values.o () * values.o ()  * values.o ());
-     break;
-   case Cubit::e_1st:
-     out_values.s (values.s () * values.s () * values.s ());
-     break;
-   case Cubit::e_2nd:
-     out_values.l (values.l () * values.l () * values.l ());
-     break;
-   case Cubit::e_3rd:
-   default:
-     out_values.cm ().o = values.cm ().o * values.cm ().o * values.cm ().o ;
-     out_values.cm ().s = values.cm ().s * values.cm ().s * values.cm ().s ;
-     out_values.cm ().l = values.cm ().l * values.cm ().l * values.cm ().l ;
-     break;
-   }
-   return out_values;  
-}
-
-void Cubit_Impl:: please_exit (CORBA::Environment &IT_env)  {
-}
diff --git a/TAO/tests/Cubit/COOL/cubit_impl.h b/TAO/tests/Cubit/COOL/cubit_impl.h
deleted file mode 100644
index f6651687b88..00000000000
--- a/TAO/tests/Cubit/COOL/cubit_impl.h
+++ /dev/null
@@ -1,19 +0,0 @@
-
-#ifndef cubit_ih
-#define cubit_ih
-
-#include "cubit.H"
-
-class Cubit_Impl {
-
-public:
-        virtual CORBA_Octet cube_octet (CORBA_Octet o, CORBA_Environment &IT_env=_environment);
-        virtual CORBA_Short cube_short (CORBA_Short s, CORBA_Environment &IT_env=_environment);
-        virtual CORBA_Long cube_long (CORBA_Long l, CORBA_Environment &IT_env=_environment);
-        virtual Cubit::Many cube_struct (const Cubit::Many& values, CORBA_Environment &IT_env=_environment);
-        virtual Cubit::oneof cube_union (const Cubit::oneof& values, CORBA_Environment &IT_env=_environment);
-        virtual void please_exit (CORBA_Environment &IT_env=_environment);
-};
-
-
-#endif
diff --git a/TAO/tests/Cubit/COOL/server.cpp b/TAO/tests/Cubit/COOL/server.cpp
deleted file mode 100644
index 24ed7da1c50..00000000000
--- a/TAO/tests/Cubit/COOL/server.cpp
+++ /dev/null
@@ -1,100 +0,0 @@
-//**************************************************************************
-//
-// NAME :   tpr_server.cpp 
-// DESCRIPTION:  
-//
-// Server mainline
-//
-//****************************************************************************
-
-#include <api/api.H>
-#include "cubit.H"
-#include "cubit.C"
-#include "cubit_impl.h"		// server header file
-#include "sk_cubit.H"
-#include "sk_cubit.C"
-#include "ace/OS.h"
-
-CORBA_BOA_ptr boa;
-
-int
-create_servant (void *arg)
-{
-  char name [1024];
-  int i = * (int *)arg;
-
-  if (i == 0)
-    strcpy (name, "HP_Cubit");
-  else
-    strcpy (name, "LP_Cubit");
-
-  CORBA_Environment env;
-  Cubit_ptr cubit;
-  Cubit_Impl cubit_impl;
-
-  COOL_bind (cubit_impl, cubit, env);
-
-  if (env.exception ()) 
-    {
-      ACE_DEBUG ((LM_ERROR, "Bind failed.."));
-      return -1;
-    }
-  
-  COOL_NamingService_var naming = 
-    thisCapsule->naming_service (env);
-
-  naming->export (name, cubit, env);
-
-  if (env.exception ()) {
-    ACE_DEBUG ((LM_ERROR, "Object Reference Export Failed.."));
-    return -1;
-  }
-
-  ACE_DEBUG ((LM_DEBUG, "Entering boa->run ()\n"));
-  boa->run ();
-  return 0;
-}
-
-
-int 
-main (int argc, char** argv)
-{
-
-  CORBA_Environment env;
-  CORBA_ORB_ptr orb = CORBA_ORB_init (argc, argv, 0, env);
-  if (env.exception ()) {
-    ACE_DEBUG ((LM_ERROR, "ORB_init failed.."));
-    return -1;
-  }
-
-  boa = orb->OA_init (argc, argv, 0, env);
-  if (env.exception ()) 
-    {
-      ACE_DEBUG ((LM_ERROR, "OA_init failed.."));
-      return -1;
-    }
-
-  COOL_Activity_ptr new_activity [2];
-
-  for (int i = 0; i < 2; i++)
-    {
-      if (thisCapsule->createActivity ((COOL_ActivityFunc) create_servant,
-                                       (void *) &i, 
-                                       new_activity [i]) != C_OK)
-        {
-        ACE_ERROR ((LM_ERROR, "%p\n", "activate failed"));
-        }
-    }
-
-  CORBA_Long status;
-  for (i = 0; i < 2; i++)
-    {
-      if (new_activity [i]->join (status) != C_OK)
-        {
-          ACE_ERROR ((LM_ERROR, "%p\n", "join failed"));
-        }
-    }
-  
-  ACE_DEBUG ((LM_DEBUG, "Cubit server is exiting\n"));
-  return 0;
-}
diff --git a/TAO/tests/Cubit/COOL/sk_cubit.C b/TAO/tests/Cubit/COOL/sk_cubit.C
deleted file mode 100644
index af60f56ff56..00000000000
--- a/TAO/tests/Cubit/COOL/sk_cubit.C
+++ /dev/null
@@ -1,267 +0,0 @@
-/*
- * File generated by CHIC (CHIC-COMMON-970407)
- *        from: cubit.idl
-*/
-
-//=========================================================
-// Binding upcall class between Cubit_Impl and Cubit
-//=========================================================
-class _COOL_Bind_Cubit_Cubit_Impl {
-public:
-        static int
-    dispatch(void*, _COOL_ServerRequest&, CORBA_Environment&);
-        static int
-    loadLocalVtbl(const void*, const _InterfaceId);
-};
-static const _COOL_UpCall  _u_Bind_Cubit_Cubit_Impl = {
-    Cubit::coInterfaceDef,
-    _COOL_Bind_Cubit_Cubit_Impl::dispatch,
-    _COOL_Bind_Cubit_Cubit_Impl::loadLocalVtbl,
-    1
-};
-
-#ifndef _COOL_localCubit_Cubit_Impl
-#define _COOL_localCubit_Cubit_Impl
-
-    //=========================================================
-    // Local Invocation class between Cubit and Cubit_Impl
-    //=========================================================
-class _localCubit_Cubit_Impl : public virtual CORBA_Object {
-
-public:
-        virtual CORBA_Octet
-    cube_octet(CORBA_Octet o,
-               CORBA_Environment& _env = _environment);
-            virtual CORBA_Short
-    cube_short(CORBA_Short s,
-               CORBA_Environment& _env = _environment);
-            virtual CORBA_Long
-    cube_long(CORBA_Long l,
-              CORBA_Environment& _env = _environment);
-            virtual Cubit::Many
-    cube_struct(const Cubit::Many& values,
-                CORBA_Environment& _env = _environment);
-            virtual Cubit::oneof
-    cube_union(const Cubit::oneof& values,
-               CORBA_Environment& _env = _environment);
-            virtual void
-    please_exit(CORBA_Environment& _env = _environment);
-    
-    _localCubit_Cubit_Impl() : CORBA_Object(_emptyCtor)
-    {}
-protected:
-        virtual int
-    _shiftVtbl() const;
-        virtual
-    ~_localCubit_Cubit_Impl();
-
-};
-
-#endif
-
-    int
-_localCubit_Cubit_Impl::_shiftVtbl() const
-{
-    return C_OK;
-}
-
-_localCubit_Cubit_Impl::~_localCubit_Cubit_Impl()
-{
-}
-
-    void
-COOL_bind(const Cubit_Impl& server, Cubit_ptr& inter,
-          const COOL_BindingData& bindingData,
-          CORBA_Environment& _env)
-{
-    inter = new Cubit;
-    int result = CORBA_Object::bindObject(&server, inter,
-                                          _u_Bind_Cubit_Cubit_Impl,
-                                          bindingData, _env);
-    if (result != C_OK) {
-        inter = Cubit::_nil();
-    }
-}
-
-    int
-_COOL_Bind_Cubit_Cubit_Impl::dispatch(void* _impl,
-                                      _COOL_ServerRequest& _req,
-                                      CORBA_Environment& _env)
-{
-
-    switch (_req.operation()) {
-
-        // Cubit::cube_octet
-    case 0: {
-        CORBA_Octet o;
-        o = _req.get_Octet();
-        CORBA_Octet _returnValue = 
-        ((Cubit_Impl*)_impl)->cube_octet(o, _env);
-        if (_req.initialize(1, _env) != C_OK) {
-            return C_ENOMEM;
-        }
-        _req.put_Octet(_returnValue);
-        return C_OK;
-    }
-
-        // Cubit::cube_short
-    case 1: {
-        CORBA_Short s;
-        s = _req.get_Short();
-        CORBA_Short _returnValue = 
-        ((Cubit_Impl*)_impl)->cube_short(s, _env);
-        if (_req.initialize(2, _env) != C_OK) {
-            return C_ENOMEM;
-        }
-        _req.put_Short(_returnValue);
-        return C_OK;
-    }
-
-        // Cubit::cube_long
-    case 2: {
-        CORBA_Long l;
-        l = _req.get_Long();
-        CORBA_Long _returnValue = 
-        ((Cubit_Impl*)_impl)->cube_long(l, _env);
-        if (_req.initialize(4, _env) != C_OK) {
-            return C_ENOMEM;
-        }
-        _req.put_Long(_returnValue);
-        return C_OK;
-    }
-
-        // Cubit::cube_struct
-    case 3: {
-        Cubit::Many values;
-        Cubit::ManyMarshaler::get(_req, values);
-        Cubit::Many _returnValue = 
-        ((Cubit_Impl*)_impl)->cube_struct(values, _env);
-        if (_req.initialize(10, _env) != C_OK) {
-            return C_ENOMEM;
-        }
-        Cubit::ManyMarshaler::put(_req, _returnValue);
-        return C_OK;
-    }
-
-        // Cubit::cube_union
-    case 4: {
-        Cubit::oneof values;
-        Cubit::oneofMarshaler::get(_req, values);
-        Cubit::oneof _returnValue = 
-        ((Cubit_Impl*)_impl)->cube_union(values, _env);
-        if (_req.initialize(14, _env) != C_OK) {
-            return C_ENOMEM;
-        }
-        Cubit::oneofMarshaler::put(_req, _returnValue);
-        return C_OK;
-    }
-
-        // Cubit::please_exit
-    case 5: {
-        ((Cubit_Impl*)_impl)->please_exit(_env);
-        return C_EPOSTPONED;
-    }
-    default:
-        return C_EBADOPERATION;
-    }
-}
-
-#ifdef _COOL_WINDOWS_NEW
-#  undef new
-#endif
-    int
-_COOL_Bind_Cubit_Cubit_Impl::loadLocalVtbl(const void* obj,
-                                           const _InterfaceId interfaceId)
-{
-    switch (interfaceId) {
-    case 0x00750aa6:    // Cubit
-        ::new ((void*)obj,_new_placement) _localCubit_Cubit_Impl;
-        break;
-    default:
-        return C_EFAIL;
-    }
-    return C_OK;
-}
-#ifdef _COOL_WINDOWS_NEW
-#  define new _COOL_WINDOWS_NEW
-#endif
-
-    CORBA_Octet
-_localCubit_Cubit_Impl::cube_octet(CORBA_Octet o,
-                                   CORBA_Environment& _env)
-{
-    _COOL_ImplLock _implLock;
-    if (lockImplementation(_implLock, _env) != C_OK) {
-        return 0;
-    }
-    CORBA_Octet _returnValue = ((Cubit_Impl*)_implLock.implAddr())->cube_octet(o, _env);
-    unlockImplementation(_implLock, _env);
-    return _returnValue;
-}
-
-    CORBA_Short
-_localCubit_Cubit_Impl::cube_short(CORBA_Short s,
-                                   CORBA_Environment& _env)
-{
-    _COOL_ImplLock _implLock;
-    if (lockImplementation(_implLock, _env) != C_OK) {
-        return 0;
-    }
-    CORBA_Short _returnValue = ((Cubit_Impl*)_implLock.implAddr())->cube_short(s, _env);
-    unlockImplementation(_implLock, _env);
-    return _returnValue;
-}
-
-    CORBA_Long
-_localCubit_Cubit_Impl::cube_long(CORBA_Long l,
-                                  CORBA_Environment& _env)
-{
-    _COOL_ImplLock _implLock;
-    if (lockImplementation(_implLock, _env) != C_OK) {
-        return 0;
-    }
-    CORBA_Long _returnValue = ((Cubit_Impl*)_implLock.implAddr())->cube_long(l, _env);
-    unlockImplementation(_implLock, _env);
-    return _returnValue;
-}
-
-    Cubit::Many
-_localCubit_Cubit_Impl::cube_struct(const Cubit::Many& values,
-                                    CORBA_Environment& _env)
-{
-    _COOL_ImplLock _implLock;
-    if (lockImplementation(_implLock, _env) != C_OK) {
-        Cubit::Many _returnValue;
-        return _returnValue;
-    }
-    Cubit::Many _returnValue = ((Cubit_Impl*)_implLock.implAddr())->cube_struct(values, _env);
-    unlockImplementation(_implLock, _env);
-    return _returnValue;
-}
-
-    Cubit::oneof
-_localCubit_Cubit_Impl::cube_union(const Cubit::oneof& values,
-                                   CORBA_Environment& _env)
-{
-    _COOL_ImplLock _implLock;
-    if (lockImplementation(_implLock, _env) != C_OK) {
-        Cubit::oneof _returnValue;
-        return _returnValue;
-    }
-    Cubit::oneof _returnValue = ((Cubit_Impl*)_implLock.implAddr())->cube_union(values, _env);
-    unlockImplementation(_implLock, _env);
-    return _returnValue;
-}
-
-    void
-_localCubit_Cubit_Impl::please_exit(CORBA_Environment& _env)
-{
-    _COOL_ImplLock _implLock;
-    if (lockImplementation(_implLock, _env) != C_OK) {
-        return;
-    }
-    ((Cubit_Impl*)_implLock.implAddr())->please_exit(_env);
-    unlockImplementation(_implLock, _env);
-}
-
-
diff --git a/TAO/tests/Cubit/COOL/sk_cubit.H b/TAO/tests/Cubit/COOL/sk_cubit.H
deleted file mode 100644
index 7be4fb76222..00000000000
--- a/TAO/tests/Cubit/COOL/sk_cubit.H
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * File generated by CHIC (CHIC-COMMON-970407)
- *        from: cubit.idl
-*/
-#ifndef _SK_CUBIT_H
-#define _SK_CUBIT_H
-
-//=========================================================
-// Binding function between Cubit_Impl and Cubit
-//=========================================================
-
-class Cubit_Impl;
-    void
-COOL_bind(const Cubit_Impl& server, Cubit_ptr& inter,
-          const COOL_BindingData& bindingData,
-          CORBA_Environment& _env = _environment);
-
-    inline void
-COOL_bind(const Cubit_Impl& server, Cubit_ptr& inter,
-          CORBA_Environment& _env = _environment)
-{
-    COOL_bind(server, inter, *_bindingData, _env);
-}
-
-
-
-#endif
-
diff --git a/TAO/tests/Cubit/COOL/sk_cubit.cpp b/TAO/tests/Cubit/COOL/sk_cubit.cpp
deleted file mode 100644
index af60f56ff56..00000000000
--- a/TAO/tests/Cubit/COOL/sk_cubit.cpp
+++ /dev/null
@@ -1,267 +0,0 @@
-/*
- * File generated by CHIC (CHIC-COMMON-970407)
- *        from: cubit.idl
-*/
-
-//=========================================================
-// Binding upcall class between Cubit_Impl and Cubit
-//=========================================================
-class _COOL_Bind_Cubit_Cubit_Impl {
-public:
-        static int
-    dispatch(void*, _COOL_ServerRequest&, CORBA_Environment&);
-        static int
-    loadLocalVtbl(const void*, const _InterfaceId);
-};
-static const _COOL_UpCall  _u_Bind_Cubit_Cubit_Impl = {
-    Cubit::coInterfaceDef,
-    _COOL_Bind_Cubit_Cubit_Impl::dispatch,
-    _COOL_Bind_Cubit_Cubit_Impl::loadLocalVtbl,
-    1
-};
-
-#ifndef _COOL_localCubit_Cubit_Impl
-#define _COOL_localCubit_Cubit_Impl
-
-    //=========================================================
-    // Local Invocation class between Cubit and Cubit_Impl
-    //=========================================================
-class _localCubit_Cubit_Impl : public virtual CORBA_Object {
-
-public:
-        virtual CORBA_Octet
-    cube_octet(CORBA_Octet o,
-               CORBA_Environment& _env = _environment);
-            virtual CORBA_Short
-    cube_short(CORBA_Short s,
-               CORBA_Environment& _env = _environment);
-            virtual CORBA_Long
-    cube_long(CORBA_Long l,
-              CORBA_Environment& _env = _environment);
-            virtual Cubit::Many
-    cube_struct(const Cubit::Many& values,
-                CORBA_Environment& _env = _environment);
-            virtual Cubit::oneof
-    cube_union(const Cubit::oneof& values,
-               CORBA_Environment& _env = _environment);
-            virtual void
-    please_exit(CORBA_Environment& _env = _environment);
-    
-    _localCubit_Cubit_Impl() : CORBA_Object(_emptyCtor)
-    {}
-protected:
-        virtual int
-    _shiftVtbl() const;
-        virtual
-    ~_localCubit_Cubit_Impl();
-
-};
-
-#endif
-
-    int
-_localCubit_Cubit_Impl::_shiftVtbl() const
-{
-    return C_OK;
-}
-
-_localCubit_Cubit_Impl::~_localCubit_Cubit_Impl()
-{
-}
-
-    void
-COOL_bind(const Cubit_Impl& server, Cubit_ptr& inter,
-          const COOL_BindingData& bindingData,
-          CORBA_Environment& _env)
-{
-    inter = new Cubit;
-    int result = CORBA_Object::bindObject(&server, inter,
-                                          _u_Bind_Cubit_Cubit_Impl,
-                                          bindingData, _env);
-    if (result != C_OK) {
-        inter = Cubit::_nil();
-    }
-}
-
-    int
-_COOL_Bind_Cubit_Cubit_Impl::dispatch(void* _impl,
-                                      _COOL_ServerRequest& _req,
-                                      CORBA_Environment& _env)
-{
-
-    switch (_req.operation()) {
-
-        // Cubit::cube_octet
-    case 0: {
-        CORBA_Octet o;
-        o = _req.get_Octet();
-        CORBA_Octet _returnValue = 
-        ((Cubit_Impl*)_impl)->cube_octet(o, _env);
-        if (_req.initialize(1, _env) != C_OK) {
-            return C_ENOMEM;
-        }
-        _req.put_Octet(_returnValue);
-        return C_OK;
-    }
-
-        // Cubit::cube_short
-    case 1: {
-        CORBA_Short s;
-        s = _req.get_Short();
-        CORBA_Short _returnValue = 
-        ((Cubit_Impl*)_impl)->cube_short(s, _env);
-        if (_req.initialize(2, _env) != C_OK) {
-            return C_ENOMEM;
-        }
-        _req.put_Short(_returnValue);
-        return C_OK;
-    }
-
-        // Cubit::cube_long
-    case 2: {
-        CORBA_Long l;
-        l = _req.get_Long();
-        CORBA_Long _returnValue = 
-        ((Cubit_Impl*)_impl)->cube_long(l, _env);
-        if (_req.initialize(4, _env) != C_OK) {
-            return C_ENOMEM;
-        }
-        _req.put_Long(_returnValue);
-        return C_OK;
-    }
-
-        // Cubit::cube_struct
-    case 3: {
-        Cubit::Many values;
-        Cubit::ManyMarshaler::get(_req, values);
-        Cubit::Many _returnValue = 
-        ((Cubit_Impl*)_impl)->cube_struct(values, _env);
-        if (_req.initialize(10, _env) != C_OK) {
-            return C_ENOMEM;
-        }
-        Cubit::ManyMarshaler::put(_req, _returnValue);
-        return C_OK;
-    }
-
-        // Cubit::cube_union
-    case 4: {
-        Cubit::oneof values;
-        Cubit::oneofMarshaler::get(_req, values);
-        Cubit::oneof _returnValue = 
-        ((Cubit_Impl*)_impl)->cube_union(values, _env);
-        if (_req.initialize(14, _env) != C_OK) {
-            return C_ENOMEM;
-        }
-        Cubit::oneofMarshaler::put(_req, _returnValue);
-        return C_OK;
-    }
-
-        // Cubit::please_exit
-    case 5: {
-        ((Cubit_Impl*)_impl)->please_exit(_env);
-        return C_EPOSTPONED;
-    }
-    default:
-        return C_EBADOPERATION;
-    }
-}
-
-#ifdef _COOL_WINDOWS_NEW
-#  undef new
-#endif
-    int
-_COOL_Bind_Cubit_Cubit_Impl::loadLocalVtbl(const void* obj,
-                                           const _InterfaceId interfaceId)
-{
-    switch (interfaceId) {
-    case 0x00750aa6:    // Cubit
-        ::new ((void*)obj,_new_placement) _localCubit_Cubit_Impl;
-        break;
-    default:
-        return C_EFAIL;
-    }
-    return C_OK;
-}
-#ifdef _COOL_WINDOWS_NEW
-#  define new _COOL_WINDOWS_NEW
-#endif
-
-    CORBA_Octet
-_localCubit_Cubit_Impl::cube_octet(CORBA_Octet o,
-                                   CORBA_Environment& _env)
-{
-    _COOL_ImplLock _implLock;
-    if (lockImplementation(_implLock, _env) != C_OK) {
-        return 0;
-    }
-    CORBA_Octet _returnValue = ((Cubit_Impl*)_implLock.implAddr())->cube_octet(o, _env);
-    unlockImplementation(_implLock, _env);
-    return _returnValue;
-}
-
-    CORBA_Short
-_localCubit_Cubit_Impl::cube_short(CORBA_Short s,
-                                   CORBA_Environment& _env)
-{
-    _COOL_ImplLock _implLock;
-    if (lockImplementation(_implLock, _env) != C_OK) {
-        return 0;
-    }
-    CORBA_Short _returnValue = ((Cubit_Impl*)_implLock.implAddr())->cube_short(s, _env);
-    unlockImplementation(_implLock, _env);
-    return _returnValue;
-}
-
-    CORBA_Long
-_localCubit_Cubit_Impl::cube_long(CORBA_Long l,
-                                  CORBA_Environment& _env)
-{
-    _COOL_ImplLock _implLock;
-    if (lockImplementation(_implLock, _env) != C_OK) {
-        return 0;
-    }
-    CORBA_Long _returnValue = ((Cubit_Impl*)_implLock.implAddr())->cube_long(l, _env);
-    unlockImplementation(_implLock, _env);
-    return _returnValue;
-}
-
-    Cubit::Many
-_localCubit_Cubit_Impl::cube_struct(const Cubit::Many& values,
-                                    CORBA_Environment& _env)
-{
-    _COOL_ImplLock _implLock;
-    if (lockImplementation(_implLock, _env) != C_OK) {
-        Cubit::Many _returnValue;
-        return _returnValue;
-    }
-    Cubit::Many _returnValue = ((Cubit_Impl*)_implLock.implAddr())->cube_struct(values, _env);
-    unlockImplementation(_implLock, _env);
-    return _returnValue;
-}
-
-    Cubit::oneof
-_localCubit_Cubit_Impl::cube_union(const Cubit::oneof& values,
-                                   CORBA_Environment& _env)
-{
-    _COOL_ImplLock _implLock;
-    if (lockImplementation(_implLock, _env) != C_OK) {
-        Cubit::oneof _returnValue;
-        return _returnValue;
-    }
-    Cubit::oneof _returnValue = ((Cubit_Impl*)_implLock.implAddr())->cube_union(values, _env);
-    unlockImplementation(_implLock, _env);
-    return _returnValue;
-}
-
-    void
-_localCubit_Cubit_Impl::please_exit(CORBA_Environment& _env)
-{
-    _COOL_ImplLock _implLock;
-    if (lockImplementation(_implLock, _env) != C_OK) {
-        return;
-    }
-    ((Cubit_Impl*)_implLock.implAddr())->please_exit(_env);
-    unlockImplementation(_implLock, _env);
-}
-
-
diff --git a/TAO/tests/Cubit/Makefile b/TAO/tests/Cubit/Makefile
deleted file mode 100644
index cf39ed0f8e9..00000000000
--- a/TAO/tests/Cubit/Makefile
+++ /dev/null
@@ -1,26 +0,0 @@
-#----------------------------------------------------------------------------
-#	@(#)Makefile	1.1	10/18/96
-#
-#	Makefile for the TAO tests
-#----------------------------------------------------------------------------
-
-#----------------------------------------------------------------------------
-#	Local macros
-#----------------------------------------------------------------------------
-
-DIRS  = TAO 
-
-# These are disabled by default...
-# Orbix \
-# VisiBroker
-
-#----------------------------------------------------------------------------
-#	Include macros and targets
-#----------------------------------------------------------------------------
-
-include	$(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-include	$(ACE_ROOT)/include/makeinclude/macros.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.common.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.nested.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.nolocal.GNU
-
diff --git a/TAO/tests/Cubit/Orbix/Makefile b/TAO/tests/Cubit/Orbix/Makefile
deleted file mode 100644
index 96935fb78fc..00000000000
--- a/TAO/tests/Cubit/Orbix/Makefile
+++ /dev/null
@@ -1,28 +0,0 @@
-#----------------------------------------------------------------------------
-#	@(#)Makefile	1.1	10/18/96
-#
-#	Makefile for the Gateway application
-#----------------------------------------------------------------------------
-
-#----------------------------------------------------------------------------
-#	Local macros
-#----------------------------------------------------------------------------
-
-INFO  = README
-
-DIRS  =	base_server \
-	client \
-	tpr \
-	tpool \
-	tps
-
-#----------------------------------------------------------------------------
-#	Include macros and targets
-#----------------------------------------------------------------------------
-
-include	$(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-include	$(ACE_ROOT)/include/makeinclude/macros.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.common.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.nested.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.nolocal.GNU
-
diff --git a/TAO/tests/Cubit/Orbix/base_server/Makefile b/TAO/tests/Cubit/Orbix/base_server/Makefile
deleted file mode 100644
index dc3604d3f35..00000000000
--- a/TAO/tests/Cubit/Orbix/base_server/Makefile
+++ /dev/null
@@ -1,89 +0,0 @@
-#----------------------------------------------------------------------------
-#	@(#)Makefile	1.1	10/18/96
-#
-#	Makefile for the ACE_MT_CORBA_Handler tests
-#----------------------------------------------------------------------------
-
-#----------------------------------------------------------------------------
-#	Local macros
-#----------------------------------------------------------------------------
-
-SRC = cubitS.cpp cubit_impl.cpp server.cpp
-
-SVR_OBJS = cubitS.o cubit_impl.o server.o
-
-LDLIBS	 = 
-
-VLDLIBS	 = $(LDLIBS:%=%$(VAR))
-
-#----------------------------------------------------------------------------
-#	Include macros and targets
-#----------------------------------------------------------------------------
-
-include		$(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-include		$(ACE_ROOT)/include/makeinclude/macros.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.common.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.lib.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.bin.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
-
-#----------------------------------------------------------------------------
-#	Orbix related macros and target settings.
-#----------------------------------------------------------------------------
-
-
-ORBIX_BINDIR    = $(ORBIX_ROOT)/bin
-ORBIX_LIBDIR    = $(ORBIX_ROOT)/corba2/lib
-ORBIX_INCDIR    = $(ORBIX_ROOT)/corba2/include
-
-# Remove -DCubit_USE_BOA from below to use the TIE approach
-
-CPPFLAGS += -DEXCEPTIONS -I$(ORBIX_INCDIR) -DWANT_ORBIX_FDS -DCubit_USE_BOA
-LDFLAGS  += -L$(ORBIX_LIBDIR) -R $(ORBIX_LIBDIR) -L$(ACE)/ace
-
-IDLFLAGS = -s S.cpp -c C.cpp -B
-
-#----------------------------------------------------------------------------
-#	Local targets
-#----------------------------------------------------------------------------
-
-all: server
-
-server: $(addprefix $(VDIR),$(SVR_OBJS))
-	$(LINK.cc) -o server $(addprefix $(VDIR),$(SVR_OBJS)) $(LDFLAGS) $(ITIIOP) $(ITSRV) $(VLDLIBS)
-
-#----------------------------------------------------------------------------
-#	Dependencies
-#----------------------------------------------------------------------------
-# DO NOT DELETE THIS LINE -- g++dep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-
-.obj/cubit_impl.o .shobj/cubit_impl.so: cubit_impl.cpp cubit_impl.h cubit.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/config-sunos5.5-sunc++-4.x.h \
- $(ACE_ROOT)/ace/stdcpp.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i
-.obj/server.o .shobj/server.so: server.cpp cubit_impl.h cubit.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/config-sunos5.5-sunc++-4.x.h \
- $(ACE_ROOT)/ace/stdcpp.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i
-
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/tests/Cubit/Orbix/base_server/cubit.h b/TAO/tests/Cubit/Orbix/base_server/cubit.h
deleted file mode 100644
index 1c868a6597d..00000000000
--- a/TAO/tests/Cubit/Orbix/base_server/cubit.h
+++ /dev/null
@@ -1,727 +0,0 @@
-
-#ifndef cubit_hh
-#define cubit_hh
-
-#include "ace/OS.h"
-#include <CORBA.h>
-
-
-#ifndef _Cubit_defined
-#define _Cubit_defined
-class Cubit_dispatch : public virtual CORBA::PPTR {
-public:
-
-      Cubit_dispatch (void *IT_p, CORBA::Object* IT_o, const char *IT_m, 
-        CORBA::LoaderClass *IT_l, char *IT_i, void* IT_im)
-       : PPTR (IT_p,IT_o,IT_m,IT_l,IT_i,IT_im) {}
-
-
-   Cubit_dispatch (char *IT_OR, void *IT_p, CORBA::Object *IT_o)
-       : PPTR (IT_OR,IT_p,IT_o) {}
-
-
-   Cubit_dispatch () {}
-
-   Cubit_dispatch (ObjectReference *IT_OR, void *IT_p, CORBA::Object *IT_o)
-       : PPTR (IT_OR,IT_p,IT_o) {}
-
-
-   Cubit_dispatch (void *IT_p, CORBA::Object *IT_o, const char *IT_m, 
-        char *IT_i, CORBA::Object* IT_ob, void* IT_im)
-       : PPTR (IT_p,IT_o,IT_m,IT_i,IT_ob,IT_im) {}
-
-
-   virtual unsigned char dispatch (CORBA::Request &IT_r, 
-        unsigned char IT_isTarget, void* IT_pp=NULL);
-
-
-};
-
-class Cubit;
-
-#ifndef CubitPtr
-#define CubitPtr
-
-typedef Cubit* Cubit_ptr;
-
-typedef Cubit* CubitRef;
-
-#endif
-
-
-#ifndef CubitForwH
-#define CubitForwH
-CORBA::ObjectRef Cubit_getBase (void *);
-void Cubit_release (Cubit *, CORBA::Environment &IT_env);
-void Cubit_release (Cubit_ptr);
-Cubit* Cubit_duplicate (Cubit_ptr, CORBA::Environment &IT_env);
-Cubit* Cubit_duplicate (Cubit_ptr );
-Cubit_ptr Cubit_nil (CORBA::Environment &IT_env);
-Cubit_ptr Cubit_nil ();
-#endif
-#define Cubit_IMPL "Cubit"
-
-
-class Cubit;
-
-typedef Cubit CubitProxy;
-#define Cubit_IR "Cubit$v1.1"
-#define Cubit_IMPL "Cubit"
-
-#ifndef CubitPtr
-#define CubitPtr
-
-typedef Cubit* Cubit_ptr;
-
-typedef Cubit* CubitRef;
-
-#endif
-
-class Cubit: public virtual CORBA::Object  {
-public:
-        Cubit (char *IT_OR);
-    Cubit (ObjectReference *IT_OR);
-    Cubit () : CORBA::Object  (1) {}
-protected:
-    Cubit_ptr __duplicate(
-            CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) {
-       CORBA::Object::__duplicate (IT_env);
-       return this;
-    }
-public:
-    static Cubit_ptr _duplicate(
-            Cubit_ptr, 
-            CORBA::Environment &IT_pEnv=CORBA::IT_chooseDefaultEnv ());
-public:
-   static Cubit* _bind (const char* IT_markerServer, const char* host,
-		const CORBA::Context &IT_c, 
-		CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-   static Cubit* _bind (CORBA::Environment &IT_env);
-   static Cubit* _bind (const char* IT_markerServer=NULL, const char* host=NULL,
-                 CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-    static Cubit* _narrow (CORBA::Object* , CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-    static Cubit_ptr _nil (CORBA::Environment &IT_pEnv=CORBA::IT_chooseDefaultEnv ()) {
-        CORBA::EnvExcRaiser IT_raise;
-        CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-        return (Cubit_ptr) CORBA::OBJECT_NIL;}
-
-#ifndef Cubit_Many_defined
-#define Cubit_Many_defined
-
-struct Many {
-    CORBA::Octet o;
-    CORBA::Long l;
-    CORBA::Short s;
-
-    void encodeOp (CORBA::Request &IT_r) const;
-    void decodeOp (CORBA::Request &IT_r);
-    void decodeInOutOp (CORBA::Request &IT_r);
-    Many(const Many &);
-    Many();
-    ~Many();
-    Many& operator= (const Many&);
-};
-
-#ifndef Cubit_ManyVarH
-#define Cubit_ManyVarH
-
-#ifndef Cubit_ManyvPtr
-#define Cubit_ManyvPtr
-typedef Many* Many_vPtr;
-typedef const Many* Many_cvPtr;
-#endif
-
-class Many_var : public CORBA::_var
-{
-    private:
-
-    unsigned char copyHelper (const Many_var &IT_s) {
-        if (!IT_s._ptr) {
-            _ptr = IT_s._ptr;
-        } else
-        {
-            _ptr = new Many;
-            *(_ptr) =  *(IT_s._ptr);
-        }
-        return 1;
-    }
-
-    public:
-
-    Many_var (const Many_var &IT_s) {
-        (void) copyHelper (IT_s);
-    }
-
-    Many_var () {
-        _ptr =  new Many;
-;
-    }
-
-    Many_var (Many *IT_p) {
-        _ptr = IT_p;
-    }
-
-    Many_var &operator= (Many *IT_p) {
-        if (_ptr != IT_p) {
-            delete _ptr;
-        }
-        _ptr = IT_p;
-        return (*this);
-    }
-
-    Many_var &operator= (const Many_var &IT_s) {
-        if (_ptr != IT_s._ptr) {
-            delete _ptr;
-        }
-        _ptr = new Many;
-        *(_ptr) =  *(IT_s._ptr);
-        return (*this);
-    }
-
-    ~Many_var () {
-        delete _ptr;
-    }
-
-    Many* operator-> () {
-        return _ptr;
-    }
-
-    operator Many_cvPtr () const { return _ptr;}
-    operator Many_vPtr& () { return _ptr;}
-    operator Many& () const { return * _ptr;}
-
-    protected:
-    Many *_ptr;
-    private:
-    Many_var &operator= (const CORBA::_var &IT_s);
-    Many_var (const CORBA::_var &IT_s);
-};
-
-#endif
-
-
-#endif
-
-enum discrim {e_0th,e_1st,e_2nd,e_3rd,e_4th,e_5th, IT__ENUM_Cubit_discrim=CORBA_ULONG_MAX};
-
-#ifndef Cubit_oneof_defined
-#define Cubit_oneof_defined
-
-struct oneof {
-    private:
-
-    discrim __d;
-    union {
-        CORBA::Octet _o_;
-        CORBA::Short _s_;
-        CORBA::Long _l_;
-        Many * _cm_;
-    };
-
-    public:
-
-    void encodeOp (CORBA::Request &IT_r) const;
-    void decodeOp (CORBA::Request &IT_r);
-    void decodeInOutOp (CORBA::Request &IT_r);
-
-    private:
-
-    unsigned char isSet;
-
-    public:
-
-    discrim _d () const { return __d; }
-
-    CORBA::Octet o () const {
-      return _o_;
-    }
-
-    void o (CORBA::Octet IT_member) {
-        if (isSet && (__d != Cubit::e_0th))
-        {
-            this-> oneof::~oneof();
-            memset(this, 0, sizeof(*this));
-        }
-
-        __d = Cubit::e_0th;
-        isSet = 1;
-        _o_ = IT_member;
-    }
-
-    CORBA::Short s () const {
-        return _s_;
-    }
-
-    void s (CORBA::Short IT_member) {
-        if (isSet && (__d != Cubit::e_1st))
-        {
-            this-> oneof::~oneof();
-            memset(this, 0, sizeof(*this));
-        }
-
-        __d = Cubit::e_1st;
-        isSet = 1;
-        _s_ = IT_member;
-    }
-
-    CORBA::Long l () const {
-        return _l_;
-    }
-
-    void l (CORBA::Long IT_member) {
-        if (isSet && (__d != Cubit::e_2nd))
-        {
-            this-> oneof::~oneof();
-            memset(this, 0, sizeof(*this));
-        }
-
-        __d = Cubit::e_2nd;
-        isSet = 1;
-        _l_ = IT_member;
-    }
-
-    Many& cm () {
-        return (*_cm_);
-    }
-
-    const Many& cm () const {
-        return (*_cm_);
-    }
-
-    void cm (const Many& IT_member) {
-        if (isSet && (__d != Cubit::e_3rd))
-        {
-            this-> oneof::~oneof();
-            memset(this, 0, sizeof(*this));
-        }
-
-        __d = Cubit::e_3rd;
-
-        if (!isSet) {
-            _cm_ = new Many;
-            isSet = 1;
-        }
-        *(_cm_) = IT_member;
-    }
-
-
-    oneof();
-    oneof(const oneof &);
-    ~oneof();
-    oneof& operator= (const oneof&);
-};
-
-#ifndef Cubit_oneofVarH
-#define Cubit_oneofVarH
-
-#ifndef Cubit_oneofvPtr
-#define Cubit_oneofvPtr
-typedef oneof* oneof_vPtr;
-typedef const oneof* oneof_cvPtr;
-#endif
-
-class oneof_var : public CORBA::_var
-{
-    private:
-
-    unsigned char copyHelper (const oneof_var &IT_s) {
-        if (!IT_s._ptr) {
-            _ptr = IT_s._ptr;
-        } else
-        {
-            _ptr = new oneof;
-            *(_ptr) =  *(IT_s._ptr);
-        }
-        return 1;
-    }
-
-    public:
-
-    oneof_var (const oneof_var &IT_s) {
-        (void) copyHelper (IT_s);
-    }
-
-    oneof_var () {
-        _ptr = NULL;
-    }
-
-    oneof_var (oneof *IT_p) {
-        _ptr = IT_p;
-    }
-
-    oneof_var &operator= (oneof *IT_p) {
-        if (_ptr != IT_p) {
-            delete _ptr;
-        }
-        _ptr = IT_p;
-        return (*this);
-    }
-
-    oneof_var &operator= (const oneof_var &IT_s) {
-        if (_ptr != IT_s._ptr) {
-            delete _ptr;
-        }
-        _ptr = new oneof;
-        *(_ptr) =  *(IT_s._ptr);
-        return (*this);
-    }
-
-    ~oneof_var () {
-        delete _ptr;
-    }
-
-    oneof* operator-> () {
-        return _ptr;
-    }
-
-    operator oneof_cvPtr () const { return _ptr;}
-    operator oneof_vPtr& () { return _ptr;}
-    operator oneof& () const { return * _ptr;}
-
-    protected:
-    oneof *_ptr;
-    private:
-    oneof_var &operator= (const CORBA::_var &IT_s);
-    oneof_var (const CORBA::_var &IT_s);
-};
-
-#endif
-
-
-#endif
-        virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual Many cube_struct (const Many& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual oneof cube_union (const oneof& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual void please_exit (CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-};
-
-#ifndef CubitVarH
-#define CubitVarH
-
-#ifndef CubitvPtr
-#define CubitvPtr
-typedef Cubit* Cubit_vPtr;
-typedef const Cubit* Cubit_cvPtr;
-#endif
-
-class Cubit_var : public CORBA::_var
-{
-    private:
-
-    unsigned char copyHelper (const Cubit_var &IT_s) {
-        {
-            _ptr = Cubit_duplicate (IT_s._ptr);
-        }
-        return 1;
-    }
-
-    public:
-
-    Cubit_var (const Cubit_var &IT_s) {
-        (void) copyHelper (IT_s);
-    }
-
-    Cubit_var () {
-        _ptr = Cubit_nil ();
-    }
-
-    Cubit_var (Cubit *IT_p) {
-        _ptr = IT_p;
-    }
-
-    Cubit_var &operator= (Cubit *IT_p) {
-        Cubit_release (_ptr);
-        _ptr = IT_p;
-        return (*this);
-    }
-
-    Cubit_var &operator= (const Cubit_var &IT_s) {
-        Cubit_release (_ptr);
-        _ptr = Cubit_duplicate (IT_s._ptr);
-        return (*this);
-    }
-
-    ~Cubit_var () {
-        Cubit_release (_ptr);
-    }
-
-    Cubit* operator-> () {
-        return _ptr;
-    }
-
-    operator Cubit_cvPtr () const { return _ptr;}
-    operator Cubit_vPtr& () { return _ptr;}
-
-    protected:
-    Cubit *_ptr;
-    private:
-    Cubit_var &operator= (const CORBA::_var &IT_s);
-    Cubit_var (const CORBA::_var &IT_s);
-    Cubit_var &operator= (const CORBA::_mgr &IT_s);
-    Cubit_var &operator= (const CORBA::_SeqElem &IT_s);
-    Cubit_var (const CORBA::_mgr &IT_s);
-    Cubit_var (const CORBA::_SeqElem &IT_s);
-};
-
-#endif
-
-
-#ifndef CubitMgrH
-#define CubitMgrH
-
-class Cubit_mgr : public CORBA::_mgr
-{
-    public:
-
-    Cubit_mgr () {
-        _ptr = Cubit_nil ();
-        _release = 1;
-    }
-
-    Cubit_mgr (const Cubit_mgr &IT_s) {
-        _ptr = Cubit_duplicate (IT_s._ptr);
-        _release = 1;
-    }
-
-    Cubit_mgr &operator= (Cubit *IT_p) {
-        if (_ptr && _release)
-            Cubit_release (_ptr);
-        _ptr = IT_p;
-        _release = 1;
-        return (*this);
-    }
-
-    Cubit_mgr &operator= (const Cubit_mgr &IT_s) {
-        if (_ptr && _release)
-            Cubit_release (_ptr);
-        _ptr = Cubit_duplicate(IT_s._ptr);
-        _release = 1;
-        return (*this);
-    }
-
-    Cubit_mgr &operator= (Cubit_var &IT_s) {
-        if (_ptr && _release)
-            Cubit_release (_ptr);
-        _ptr = Cubit_duplicate(IT_s);
-        _release = 1;
-        return (*this);
-    }
-
-    ~Cubit_mgr () {
-        if (_release)
-            Cubit_release (_ptr);
-    }
-
-    unsigned char release () {
-        return _release;
-    }
-
-    void release (unsigned char rel) {
-        _release = rel;
-    }
-
-    operator int () const {
-        return (((CORBA::Object_ptr) _ptr) ? 1 : 0);
-    }
-
-    operator void* () const {
-        return _ptr;
-    }
-
-    operator CORBA::Object * () const {
-        return (CORBA::Object *) _ptr;
-    }
-
-    operator Cubit* () const {
-        return (Cubit*) _ptr;
-    }
-
-    Cubit_ptr operator-> () const {
-        return _ptr;
-    }
-
-    Cubit *_ptr;
-
-    protected:
-
-    unsigned char _release;
-};
-
-typedef Cubit_mgr Cubit_mgr_IT_const;
-#endif
-
-#ifndef CubitSeqElemH
-#define CubitSeqElemH
-
-class Cubit_SeqElem : public CORBA::_SeqElem
-{
-    public:
-
-    Cubit_SeqElem (Cubit_ptr* IT_p, unsigned char rel) {
-        _ptr = IT_p;
-        _release = rel;
-    }
-
-    Cubit_SeqElem &operator= (Cubit_ptr IT_p) {
-        if (_ptr) {
-            if (*(_ptr) && _release)
-                Cubit_release (*(_ptr));
-            *(_ptr) = IT_p;
-        }
-        return (*this);
-    }
-
-    Cubit_SeqElem &operator= (const Cubit_SeqElem &IT_s) {
-        if (_ptr && IT_s._ptr) {
-            if (*(_ptr) && _release)
-                Cubit_release (*(_ptr));
-            *(_ptr) = Cubit_duplicate(*(IT_s._ptr));
-        }
-        return (*this);
-    }
-
-    operator Cubit_ptr () const {
-        return _ptr ? (Cubit_ptr) (*_ptr) : Cubit_nil(); 
-    }
-
-    Cubit_ptr operator->() const { return *_ptr;}
-
-    protected:
-    Cubit_ptr *_ptr;
-    unsigned char _release;
-};
-
-#endif
-
-
-#define TIE_Cubit(X) Cubit##X
-
-#define DEF_TIE_Cubit(X) \
-	class Cubit##X : public virtual Cubit {		\
-	  X* m_obj;						\
-	public:							\
-								\
-								\
-	   Cubit##X  (X *objp, const char* m="", CORBA::LoaderClass *l=0)\
-		: Cubit(), m_obj(objp) {	\
-		m_pptr = new Cubit_dispatch		\
-			(( Cubit*)this,(CORBA::Object*)this,m,l,Cubit_IR,m_obj);	\
-	   }								\
-	   Cubit##X  (CORBA::Object *IT_p, const char* IT_m="", void *IT_q=0)\
-		: Cubit() {	\
-		m_pptr = new Cubit_dispatch		\
-			(( Cubit*)this,(CORBA::Object*)this,IT_m,Cubit_IR,IT_p,IT_q);	\
-		m_obj = (X*)(m_pptr->getImplObj ());			\
-	   }								\
-								\
-	   virtual ~Cubit##X  () {				\
-		if (_okToDeleteImpl ()) delete m_obj; }					\
-	   virtual void* _deref () {					\
-		return m_obj; }					\
-								\
-virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_octet (  o,IT_env);\
-}\
-	\
-virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_short (  s,IT_env);\
-}\
-	\
-virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_long (  l,IT_env);\
-}\
-	\
-virtual Cubit::Many cube_struct (const Cubit::Many& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_struct (  values,IT_env);\
-}\
-	\
-virtual Cubit::oneof cube_union (const Cubit::oneof& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_union (  values,IT_env);\
-}\
-	\
-virtual void please_exit (CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-m_obj->please_exit (IT_env);\
-}\
-								\
-	};						\
-
-
-#define QUALS_Cubit	\
-virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_octet (  o,IT_env);\
-}\
-	\
-virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_short (  s,IT_env);\
-}\
-	\
-virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_long (  l,IT_env);\
-}\
-	\
-virtual Many cube_struct (const Many& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_struct (  values,IT_env);\
-}\
-	\
-virtual oneof cube_union (const oneof& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_union (  values,IT_env);\
-}\
-	\
-virtual void please_exit (CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-m_obj->please_exit (IT_env);\
-}\
-
-
-
-
-class CubitProxyFactoryClass : public virtual CORBA::ObjectFactoryClass {
-public:
-   CubitProxyFactoryClass (unsigned char IT_p=0)
-		: CORBA::ProxyFactory (Cubit_IR, IT_p) {}
-
-    virtual void* New (char *IT_OR, CORBA::Environment&);
-
-    virtual void* New (ObjectReference *IT_OR, CORBA::Environment&);
-
-    virtual void* New2 (); 
-
-    virtual CORBA::Object* NewObject (char *IT_OR, CORBA::Environment&);
-
-    virtual CORBA::Object* NewObject (ObjectReference *IT_OR, CORBA::Environment&);
-
-    virtual CORBA::Object* New2Object (); 
-
-    virtual void* IT_castUp (void *IT_p, char* IT_s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-
-    virtual CORBA::PPTR* pptr (void *IT_p);
-
-    virtual void baseInterfaces (_IDL_SEQUENCE_string&);
-
-
-};
-
-extern CubitProxyFactoryClass CubitProxyFactory;
-
-class CubitBOAImpl : public virtual Cubit  {
-public:
-    CubitBOAImpl (const char *m="", CORBA::LoaderClass *l=NULL) {
-  if (CORBA::PPTR::isOK (m_pptr, Cubit_IR))
-    m_pptr = new Cubit_dispatch ( (Cubit*)this,
-   	 (CORBA::Object*)this, m, l, Cubit_IR, this);
-}
-
-        virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual Many cube_struct (const Many& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual oneof cube_union (const oneof& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual void please_exit (CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-};
-
-
-#endif
-
-
-#endif
diff --git a/TAO/tests/Cubit/Orbix/base_server/cubit.idl b/TAO/tests/Cubit/Orbix/base_server/cubit.idl
deleted file mode 100644
index d9b38c34a2a..00000000000
--- a/TAO/tests/Cubit/Orbix/base_server/cubit.idl
+++ /dev/null
@@ -1,40 +0,0 @@
-// @(#)cubit.idl	1.1 95/09/10
-// Copyright 1994-1995 by Sun Microsystems, Inc.
-
-#pragma prefix	"Eng.SUN.COM"
-#pragma version Cubit 1.1
-
-interface Cubit {
-    octet	cube_octet (in octet o);
-    short	cube_short (in short s);
-    long	cube_long (in long l);
-
-    struct Many {
-	octet	o;		// + 3 bytes padding (normally) ...
-	long	l;
-	short	s;		// + 2 bytes padding (normally) ...
-    };
-
-    Many	cube_struct (in Many values);
-
-    enum discrim {e_0th, e_1st, e_2nd, e_3rd, e_4th, e_5th};
-
-    union oneof
-    switch (discrim) {
-	// this is an easy union to interpret; no padding
-	// is needed between discriminant and value.
-      case e_0th:
-        octet		o;
-      case e_1st:
-        short		s;
-      case e_2nd:
-        long		l;
-      case e_3rd:
-      default:
-        Many		cm;
-    };
-
-    oneof	cube_union (in oneof values);
-
-    oneway void	please_exit ();
-};
diff --git a/TAO/tests/Cubit/Orbix/base_server/cubitC.cpp b/TAO/tests/Cubit/Orbix/base_server/cubitC.cpp
deleted file mode 100644
index c47e38f26ee..00000000000
--- a/TAO/tests/Cubit/Orbix/base_server/cubitC.cpp
+++ /dev/null
@@ -1,557 +0,0 @@
-#include "cubit.h"
-
-Cubit::Cubit (char *IT_OR) {
-      m_pptr = new Cubit_dispatch (IT_OR, this,(CORBA::Object*)this);
-} 
-Cubit::Cubit (ObjectReference *IT_OR) {
-      m_pptr = new Cubit_dispatch (IT_OR, this,(CORBA::Object*)this);
-} 
-
-#ifndef CubitForwC
-#define CubitForwC
-CORBA::ObjectRef Cubit_getBase(void *IT_p){
-    return (Cubit*) IT_p;}
-
-void Cubit_release (Cubit_ptr IT_p, CORBA::Environment &IT_env) {
-    CORBA::release(IT_p, IT_env);}
-
-void Cubit_release (Cubit_ptr IT_p) {
-    Cubit_release (IT_p, CORBA::IT_chooseDefaultEnv ()); }
-
-Cubit_ptr Cubit_nil (CORBA::Environment &) {
-    return Cubit:: _nil ();}
-
-Cubit_ptr Cubit_nil () {
-    return Cubit_nil (CORBA::IT_chooseDefaultEnv ());}
-
-Cubit_ptr Cubit_duplicate (Cubit_ptr IT_p, CORBA::Environment &IT_env) {
-    return (Cubit::_duplicate(IT_p, IT_env)); }
-Cubit_ptr Cubit_duplicate (Cubit_ptr IT_p) {
-    return Cubit_duplicate (IT_p, CORBA::IT_chooseDefaultEnv ()); }
-#endif
-
-Cubit_ptr Cubit::_duplicate(Cubit_ptr obj, CORBA::Environment& IT_pEnv) {
-        CORBA::EnvExcRaiser IT_raise;
-        CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-       if (!obj) {
-          return (obj);
-       }
-       Cubit_ptr IT_obj = obj->__duplicate (IT_env);
-       return IT_obj;
-}
-
-
-
-Cubit* Cubit:: _bind (const char* IT_markerServer, const char* host,
-		const CORBA::Context &IT_c, 
-		CORBA::Environment &IT_env) {
-       return (Cubit*)CORBA::Factory.New (IT_markerServer, IT_env, IT_c, host, 
-		Cubit_IMPL, Cubit_IR);
-}
-
-
-
-Cubit* Cubit:: _bind (CORBA::Environment &IT_env) {
-       return _bind (NULL,NULL,CORBA::Context(), IT_env); }
-
-
-Cubit* Cubit:: _bind (const char* IT_markerServer, const char* host,
-                CORBA::Environment &IT_env) {
-       return _bind (IT_markerServer, host, CORBA::Context (), IT_env); }
-Cubit* Cubit::_narrow (CORBA::Object* IT_obj, CORBA::Environment &IT_pEnv) {
-        CORBA::EnvExcRaiser IT_raise;
-        CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-        if (CORBA::is_nil (IT_obj)) {
-                return Cubit:: _nil();
-        }
-
-       Cubit* IT_p = (Cubit*)CORBA::Object::_castDown (IT_obj, Cubit_IR, IT_env);
-        IT_p = IT_p ? IT_p->__duplicate(IT_env) : NULL;
-        if ((IT_env) &&(!strcmp(IT_env.exception()->id(), "CORBA::StExcep::BAD_PARAM")) && (((CORBA::BAD_PARAM*)IT_env.exception())-> minor() == NARROW_FAILED)) {
-                IT_env.exception_free();
-        }
-        return IT_p;
-   }
-
-
-#ifndef Cubit_Many_Ops
-#define Cubit_Many_Ops
-
-void Cubit::Many:: encodeOp (CORBA::Request &IT_r) const {
-
-    IT_r.insertOctet (o);
-
-    IT_r << l;
-
-    IT_r << s;
-}
-
-void Cubit::Many:: decodeOp (CORBA::Request &IT_r) {
-
-    IT_r.extractOctet (o);
-
-    IT_r >> l;
-
-    IT_r >> s;
-}
-
-void Cubit::Many:: decodeInOutOp (CORBA::Request &IT_r) {
-
-    IT_r.extractOctet (o);
-
-    IT_r >> l;
-
-    IT_r >> s;
-}
-
-Cubit::Many ::~Many () {
-}
-
-Cubit::Many:: Many (const Cubit::Many &IT_s) 
-	 {
-    o = IT_s.o;
-    l = IT_s.l;
-    s = IT_s.s;
-}
-
-Cubit::Many:: Many () {
-}
-
-Cubit::Many &Cubit::Many:: operator= (const Cubit::Many& IT_s) {
-    if (this == &IT_s) return *this;
-    o = IT_s.o;
-    l = IT_s.l;
-    s = IT_s.s;
-    return *this;
-}
-
-
-#endif
-
-
-#ifndef Cubit_oneof_Ops
-#define Cubit_oneof_Ops
-void Cubit::oneof:: encodeOp (CORBA::Request &IT_r) const {
-    if (!isSet) return;
-    {
-    CORBA::ULong IT_0 = (CORBA::ULong) __d;
-    IT_r << IT_0;
-    }
-    switch (__d) {
-        case Cubit::e_0th: 
-        IT_r.insertOctet (_o_);
-        break;
-        case Cubit::e_1st: 
-        IT_r << _s_;
-        break;
-        case Cubit::e_2nd: 
-        IT_r << _l_;
-        break;
-        case Cubit::e_3rd: 
-        default: 
-        (*_cm_).encodeOp (IT_r);
-        break;
-    }
-
-}
-
-void Cubit::oneof:: decodeOp (CORBA::Request &IT_r) {
-    isSet = 0;
-    {
-    CORBA::ULong IT_1;
-    IT_r >> IT_1;
-    __d = Cubit::discrim(IT_1);
-    }
-    switch (__d) {
-        case Cubit::e_0th: 
-        if (!isSet) {
-            isSet = 1;
-        }
-        IT_r.extractOctet (_o_);
-        break;
-        case Cubit::e_1st: 
-        if (!isSet) {
-            isSet = 1;
-        }
-        IT_r >> _s_;
-        break;
-        case Cubit::e_2nd: 
-        if (!isSet) {
-            isSet = 1;
-        }
-        IT_r >> _l_;
-        break;
-        case Cubit::e_3rd: 
-        default: 
-        if (!isSet) {
-            _cm_ = new Cubit::Many;
-            isSet = 1;
-        }
-        (*_cm_).decodeOp (IT_r);
-        break;
-    }
-
-}
-void Cubit::oneof:: decodeInOutOp (CORBA::Request &IT_r) {
-    Cubit::discrim IT_d;
-    {
-    CORBA::ULong IT_2;
-    IT_r >> IT_2;
-    IT_d = Cubit::discrim(IT_2);
-    }
-    if (IT_d == __d)
-        switch (__d) {
-            case Cubit::e_0th: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r.extractOctet (_o_);
-            break;
-            case Cubit::e_1st: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r >> _s_;
-            break;
-            case Cubit::e_2nd: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r >> _l_;
-            break;
-            case Cubit::e_3rd: 
-            default: 
-            if (!isSet) {
-                _cm_ = new Cubit::Many;
-                isSet = 1;
-            }
-            (*_cm_).decodeInOutOp (IT_r);
-            break;
-        }
-
-    else {
-        this->oneof:: ~oneof();
-        memset(this, 0, sizeof(*this));
-        __d = IT_d;
-        switch (__d) {
-            case Cubit::e_0th: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r.extractOctet (_o_);
-            break;
-            case Cubit::e_1st: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r >> _s_;
-            break;
-            case Cubit::e_2nd: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r >> _l_;
-            break;
-            case Cubit::e_3rd: 
-            default: 
-            if (!isSet) {
-                _cm_ = new Cubit::Many;
-                isSet = 1;
-            }
-            (*_cm_).decodeOp (IT_r);
-            break;
-        }
-        isSet = 1;
-    }
-
-}
-
-Cubit::oneof:: oneof() { 
-    memset(this, 0, sizeof(*this));
-    isSet = 0;
-}
-
-Cubit::oneof ::~oneof() {
-    if (!isSet) return;
-    switch (__d) { 
-        case Cubit::e_0th:         break;
-        case Cubit::e_1st:         break;
-        case Cubit::e_2nd:         break;
-        case Cubit::e_3rd: 
-        default:         if (_cm_) delete _cm_;
-        break;
-    }
-
-    isSet = 0;
-}
-
-Cubit::oneof:: oneof (const Cubit::oneof &IT_s) {
-    isSet = 0;
-    memset(this, 0, sizeof(*this));
-    __d = IT_s.__d;
-    switch (__d) {
-        case Cubit::e_0th:         isSet = 1;
-        _o_ = IT_s._o_;
-        break;
-        case Cubit::e_1st:         isSet = 1;
-        _s_ = IT_s._s_;
-        break;
-        case Cubit::e_2nd:         isSet = 1;
-        _l_ = IT_s._l_;
-        break;
-        case Cubit::e_3rd: 
-        default: 
-        if (!isSet) {
-            _cm_ = new Cubit::Many;
-            isSet = 1;
-        }
-        *(_cm_) = *(IT_s._cm_);
-        break;
-    }
-    isSet = 1;
-}
-
-Cubit::oneof& Cubit::oneof:: operator= (const Cubit::oneof & IT_s) {
-    if (this == &IT_s) return *this;
-    if (isSet && (__d != IT_s.__d))
-    {
-        this-> oneof::~oneof();
-        memset(this, 0, sizeof(*this));
-    }
-
-    __d = IT_s.__d;
-    switch (__d) {
-        case Cubit::e_0th:         isSet = 1;
-        _o_ = IT_s._o_;
-        break;
-        case Cubit::e_1st:         isSet = 1;
-        _s_ = IT_s._s_;
-        break;
-        case Cubit::e_2nd:         isSet = 1;
-        _l_ = IT_s._l_;
-        break;
-        case Cubit::e_3rd: 
-        default: 
-        if (!isSet) {
-            _cm_ = new Cubit::Many;
-            isSet = 1;
-        }
-        *(_cm_) = *(IT_s._cm_);
-        break;
-    }
-    isSet = 1;
-    return *this;
-}
-
-
-#endif
-
-void* CubitProxyFactoryClass::New (char *IT_OR, CORBA::Environment&) {
-        return  new class Cubit(IT_OR);}
-
-void* CubitProxyFactoryClass::New (ObjectReference *IT_OR, CORBA::Environment&) {
-        return  new class Cubit(IT_OR);}
-
-void* CubitProxyFactoryClass::New2 () {
-        return  new class Cubit((char*)0);}
-
-CORBA::Object* CubitProxyFactoryClass::NewObject (char *IT_OR, CORBA::Environment&) {
-        return  new class Cubit(IT_OR);}
-
-CORBA::Object* CubitProxyFactoryClass::NewObject (ObjectReference *IT_OR, CORBA::Environment&) {
-        return  new class Cubit(IT_OR);}
-
-CORBA::Object* CubitProxyFactoryClass::New2Object () {
-        return  new class Cubit((char*)0);}
-
-void* CubitProxyFactoryClass::IT_castUp (void *IT_p, char* IT_s, CORBA::Environment &IT_env) {
-      void *IT_l;
-      if (!CORBA::_interfaceCmp (IT_s,Cubit_IR, IT_env))
-         return IT_p;
-      else if (IT_l=CORBA::ObjectFactoryClass::IT_castUp((CORBA::Object*)((class Cubit*)IT_p),IT_s, IT_env))
-         return IT_l;
-      else return NULL;
-    }
-
-
-CORBA::PPTR* CubitProxyFactoryClass::pptr (void *IT_p) {
-       return ((class Cubit*)IT_p)->_pptr ();}
-
-void CubitProxyFactoryClass::baseInterfaces (_IDL_SEQUENCE_string& seq) {
-      add (seq, Cubit_IR);
-      CORBA::ObjectFactoryClass::baseInterfaces (seq);
-}
-
-CubitProxyFactoryClass CubitProxyFactory(1);
-
-CORBA::Octet Cubit:: cube_octet (CORBA::Octet o, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        return 0;
-    }
-    CORBA::Request IT_r (this, "cube_octet",IT_env,1,0);
-    if (!IT_r.isException (IT_env)) {
-
-        IT_r.insertOctet (o);
-    }
-
-    IT_r.invoke (CORBA::Flags(0),IT_env);
-    if (!IT_r.isException (IT_env)) {
-        CORBA::Octet IT_result;
-        IT_r.extractOctet (IT_result);
-        IT_r.checkEnv (IT_env);
-        return IT_result;
-    }
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-    return 0;
-}
-
-CORBA::Short Cubit:: cube_short (CORBA::Short s, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        return 0;
-    }
-    CORBA::Request IT_r (this, "cube_short",IT_env,1,0);
-    if (!IT_r.isException (IT_env)) {
-
-        IT_r << s;
-    }
-
-    IT_r.invoke (CORBA::Flags(0),IT_env);
-    if (!IT_r.isException (IT_env)) {
-        CORBA::Short IT_result;
-        IT_r >> IT_result;
-        IT_r.checkEnv (IT_env);
-        return IT_result;
-    }
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-    return 0;
-}
-
-CORBA::Long Cubit:: cube_long (CORBA::Long l, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        return 0;
-    }
-    CORBA::Request IT_r (this, "cube_long",IT_env,1,0);
-    if (!IT_r.isException (IT_env)) {
-
-        IT_r << l;
-    }
-
-    IT_r.invoke (CORBA::Flags(0),IT_env);
-    if (!IT_r.isException (IT_env)) {
-        CORBA::Long IT_result;
-        IT_r >> IT_result;
-        IT_r.checkEnv (IT_env);
-        return IT_result;
-    }
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-    return 0;
-}
-
-Cubit::Many Cubit:: cube_struct (const Cubit::Many& values, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        { 
-            Cubit::Many IT_l0;
-            return IT_l0;
-        }
-    }
-    CORBA::Request IT_r (this, "cube_struct",IT_env,1,0);
-    if (!IT_r.isException (IT_env)) {
-
-        values.encodeOp (IT_r);
-    }
-
-    IT_r.invoke (CORBA::Flags(0),IT_env);
-    if (!IT_r.isException (IT_env)) {
-        Cubit::Many IT_result;
-        IT_result.decodeOp (IT_r);
-        IT_r.checkEnv (IT_env);
-        return IT_result;
-    }
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-    { 
-        Cubit::Many IT_l1;
-        return IT_l1;
-    }
-}
-
-Cubit::oneof Cubit:: cube_union (const Cubit::oneof& values, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        { 
-            Cubit::oneof IT_l0;
-            return IT_l0;
-        }
-    }
-    CORBA::Request IT_r (this, "cube_union",IT_env,1,0);
-    if (!IT_r.isException (IT_env)) {
-
-        values.encodeOp (IT_r);
-    }
-
-    IT_r.invoke (CORBA::Flags(0),IT_env);
-    if (!IT_r.isException (IT_env)) {
-        Cubit::oneof IT_result;
-        IT_result.decodeOp (IT_r);
-        IT_r.checkEnv (IT_env);
-        return IT_result;
-    }
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-    { 
-        Cubit::oneof IT_l1;
-        return IT_l1;
-    }
-}
-
-void Cubit:: please_exit (CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        return ;
-    }
-    CORBA::Request IT_r (this, "please_exit",IT_env,1,1);
-
-    IT_r.invoke (CORBA::Flags(CORBA::INV_NO_RESPONSE), IT_env);
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-}
-
-
-
-
-
-#ifndef Cubit_dispatch_impl
-
-unsigned char Cubit_dispatch::dispatch (CORBA::Request &IT_r, 
-    unsigned char, void *) {
-      IT_r.makeRuntimeException1 ("Cubit");
-      return 0;
-}
- 
-#endif
-
diff --git a/TAO/tests/Cubit/Orbix/base_server/cubitC.h b/TAO/tests/Cubit/Orbix/base_server/cubitC.h
deleted file mode 100644
index 15247168d3c..00000000000
--- a/TAO/tests/Cubit/Orbix/base_server/cubitC.h
+++ /dev/null
@@ -1,343 +0,0 @@
-#ifndef _cubitC_h
-#define _cubitC_h
-
-/************************************************************************/
-/*                                                                      */
-/* This file is automatically generated by ORBeline IDL compiler        */
-/* Do not modify this file.                                             */
-/*                                                                      */
-/* ORBeline (c) is copyrighted by PostModern Computing, Inc.            */
-/*                                                                      */
-/* The generated code conforms to OMG's IDL C++ mapping as              */
-/* specified in OMG Document Number: 94-9-14.                           */
-/*                                                                      */
-/************************************************************************/
-
-#include "corba.h"
-
-
-
-class Cubit;
-typedef Cubit *Cubit_ptr;
-typedef Cubit_ptr CubitRef;
-
-#ifndef _Cubit_var_
-#define _Cubit_var_
-class Cubit_var
-{
-    public:
-	Cubit_var();
-	Cubit_var(Cubit_ptr);
-	Cubit_var(const Cubit_var&);
-	~Cubit_var();
-	Cubit_var& operator=(Cubit_ptr);
-	operator Cubit_ptr() const { return _ptr; }
-#if defined(_HPCC_BUG)
-	operator Cubit *&() { return _ptr; }
-#else
-	operator Cubit_ptr&() { return _ptr; }
-#endif
-	Cubit_ptr operator->() const { return _ptr;}
-	friend NCistream& operator>>(NCistream&, Cubit_var&);
-	friend NCostream& operator<<(NCostream&, const Cubit_var&);
-	friend istream& operator>>(istream&, Cubit_var&);
-	friend ostream& operator<<(ostream&, const Cubit_var&);
-    private:
-	Cubit_ptr	_ptr;
-	void operator=(const Cubit_var&) {}
-};
-#endif
-class Cubit: public virtual CORBA_Object
-{
-    private:
-	static const CORBA::TypeInfo _class_info;
-	Cubit(const Cubit&) {}
-	void operator=(const Cubit&){}
-    public:
-	static const CORBA::TypeInfo *_desc();
-	virtual const CORBA::TypeInfo *_type_info() const;
-	virtual void *_safe_narrow(const CORBA::TypeInfo& ) const;
-	static CORBA::Object *_factory();
-    protected:
-	Cubit(const char *obj_name = NULL) :CORBA_Object(obj_name, 1) {}
-	Cubit(NCistream& strm) :CORBA_Object(strm) {}
-	virtual ~Cubit() {}
-    public:
-	static Cubit_ptr _duplicate(Cubit_ptr obj) {
-		if (obj ) obj->_ref();
-		return obj;
-	}
-	static Cubit_ptr _nil() { return (Cubit_ptr)NULL;}
-	static Cubit_ptr _narrow(CORBA::Object *obj);
-	static Cubit_ptr _clone(Cubit_ptr obj) {
-		CORBA::Object_var obj_var(__clone(obj));
-
-#if defined(_HPCC_BUG)
-		return _narrow(obj_var.operator CORBA::Object_ptr());
-#else
-		return _narrow(obj_var);
-#endif
-	}
-	static Cubit_ptr _bind(const char *object_name = NULL,
-		const char *host_name = NULL,
-		const CORBA::BindOptions* opt = NULL); 
-
-	virtual CORBA::Octet cube_octet(CORBA::Octet o);
-	
-	virtual CORBA::Short cube_short(CORBA::Short s);
-	
-	virtual CORBA::Long cube_long(CORBA::Long l);
-	
-	struct Many {
-		CORBA::Octet	o;
-		CORBA::Long	l;
-		CORBA::Short	s;
-	};
-	friend NCostream& operator<<(NCostream&, const Many& );
-	friend NCistream& operator>>(NCistream&, Many& );
-	
-	friend ostream& operator<<(ostream&, const Many& );
-	inline friend istream& operator>>(istream& _strm, Many& _obj) {
-		NCistream _istrm(_strm);
-		_istrm >> _obj;
-		return _strm;
-	}
-	
-	
-	typedef Many *Many_ptr;
-	class Many_var
-	{
-	    public:
-		Many_var() { _ptr = (Many*)NULL;}
-		Many_var(Many *ptr) {
-			_ptr = ptr;
-		}
-		Many_var(const Many_var& var) {
-			if (var._ptr)
-				_ptr = new Many(*var._ptr);
-			else
-				_ptr = (Many *)NULL;
-		}
-		~Many_var() {
-			if (_ptr != (Many *)NULL) delete _ptr;
-		}
-		Many_var& operator=(Many *ptr) {
-			if (_ptr != (Many *)NULL) delete _ptr;
-			_ptr = ptr;
-			return *this;
-		}
-		Many_var& operator=(const Many_var& var) {
-			if (_ptr != (Many *)NULL) delete _ptr;
-			if (var._ptr)
-				_ptr = new Many(*var._ptr);
-			else
-				_ptr = (Many *)NULL;
-			return *this;
-		}
-		Many *operator->() { return _ptr; }
-		operator Many () const { return *_ptr; }
-		operator Many& () { return *_ptr; }
-		inline friend NCostream& operator<<(NCostream& strm,
-				const Many_var& var) {
-			if (var._ptr == (Many *)NULL) {
-				throw CORBA::BAD_PARAM();
-			}
-			else
-				strm << *var._ptr;
-			return strm;
-		}
-		inline friend NCistream& operator>>(NCistream& strm,
-				Many_var& var) {
-			if ( ! var._ptr)
-				var._ptr = new Many;
-			strm >> *var._ptr;
-			return strm;
-		}
-	    private:
-		Many *_ptr;
-	};
-	
-	
-	virtual Cubit::Many cube_struct(const Cubit::Many& values);
-	
-	enum discrim {
-		e_0th,
-		e_1st,
-		e_2nd,
-		e_3rd,
-		e_4th,
-		e_5th
-	};
-	inline friend NCostream& operator<<(NCostream& _strm, discrim _enum_type) {
-		_strm << (CORBA::ULong)_enum_type;
-		return _strm;
-	}
-	inline friend NCistream& operator>>(NCistream& _strm, discrim& _enum_type) {
-		CORBA::ULong _temp;
-		_strm >> _temp;
-		if (_temp >= 6)
-			throw CORBA::BAD_PARAM();
-		_enum_type = discrim(_temp);
-		return _strm;
-	}
-	inline friend ostream& operator<<(ostream& _strm, discrim _enum_type) {
-		if( &_strm == &cout || &_strm == &cerr || &_strm == &clog) {
-			_strm << "discrim:";
-			switch(_enum_type) {
-				case e_0th:
-					_strm << "e_0th" << endl;
-					break;
-				case e_1st:
-					_strm << "e_1st" << endl;
-					break;
-				case e_2nd:
-					_strm << "e_2nd" << endl;
-					break;
-				case e_3rd:
-					_strm << "e_3rd" << endl;
-					break;
-				case e_4th:
-					_strm << "e_4th" << endl;
-					break;
-				case e_5th:
-					_strm << "e_5th" << endl;
-					break;
-			}
-		}
-		else 
-			_strm << (CORBA::ULong)_enum_type;
-		return _strm;
-	}
-	inline friend istream& operator>>(istream& _strm, discrim& _enum_type) {
-		CORBA::ULong _temp;
-		_strm >> _temp;
-		_enum_type = discrim(_temp);
-		return _strm;
-	}
-	
-	
-	class oneof
-	{
-	    public:
-	    private:
-		discrim	_disc;
-		CORBA::Octet	__o;
-		CORBA::Short	__s;
-		CORBA::Long	__l;
-		Cubit::Many	__cm;
-	    public:
-		oneof() : _disc(discrim(0)) {}
-		~oneof() {}
-		oneof(const oneof& obj);
-		oneof& operator=(const oneof& obj);
-	
-		void _d(discrim val) { _disc = val; }
-		discrim _d() const { return _disc; }
-	
-		void o(CORBA::Octet val) {
-			__o = val;
-			_disc = Cubit::e_0th;
-		}
-		CORBA::Octet o() const { return __o; }
-	
-		void s(CORBA::Short val) {
-			__s = val;
-			_disc = Cubit::e_1st;
-		}
-		CORBA::Short s() const { return __s; }
-	
-		void l(CORBA::Long val) {
-			__l = val;
-			_disc = Cubit::e_2nd;
-		}
-		CORBA::Long l() const { return __l; }
-	
-		void cm(const Cubit::Many& val) {
-			__cm = val;
-			_disc = Cubit::e_3rd;
-		}
-		const Cubit::Many& cm() const { return __cm; }
-		Cubit::Many& cm() { return __cm; }
-	
-		friend NCostream& operator<<(NCostream&, const oneof& );
-		friend NCistream& operator>>(NCistream&, oneof& );
-		friend ostream& operator<<(ostream&, const oneof&);
-		inline friend istream& operator>>(istream& strm, oneof& obj) {
-			NCistream istrm(strm);
-			strm >> obj;
-			return strm;
-		}
-	};
-	
-	typedef oneof *oneof_ptr;
-	class oneof_var
-	{
-	    public:
-		oneof_var() { _ptr = (oneof*)NULL;}
-		oneof_var(oneof *ptr) {
-			_ptr = ptr;
-		}
-		oneof_var(const oneof_var& var) {
-			_ptr = new oneof(*var._ptr);
-		}
-		~oneof_var() {
-			if (_ptr != (oneof *)NULL) delete _ptr;
-		}
-		oneof_var& operator=(oneof *ptr) {
-			if (_ptr != (oneof *)NULL) delete _ptr;
-			_ptr = ptr;
-			return *this;
-		}
-		oneof_var& operator=(const oneof_var& var) {
-			if (_ptr != (oneof *)NULL) delete _ptr;
-			_ptr = new oneof(*var._ptr);
-			return *this;
-		}
-		oneof *operator->() { return _ptr; }
-		operator oneof () const { return *_ptr; }
-		operator oneof& () { return *_ptr; }
-		inline friend NCostream& operator<<(NCostream& strm,
-				const oneof_var& var) {
-			if (var._ptr == (oneof *)NULL) {
-				throw CORBA::BAD_PARAM();
-			}
-			else
-				strm << *var._ptr;
-			return strm;
-		}
-		inline friend NCistream& operator>>(NCistream& strm,
-				oneof_var& var) {
-			if ( ! var._ptr)
-				var._ptr = new oneof;
-			strm >> *var._ptr;
-			return strm;
-		}
-	    private:
-		oneof *_ptr;
-	};
-	
-	
-	virtual Cubit::oneof cube_union(const Cubit::oneof& values);
-	
-	virtual void please_exit();
-	
-	inline friend NCistream& operator>>(NCistream& strm, Cubit_ptr& obj) {
-		CORBA::Object_var _obj(obj);
-		_obj = CORBA::Object::_read(strm, Cubit::_desc());
-		obj = Cubit::_narrow(_obj);
-		return strm;
-	}
-	inline friend ostream& operator<<(ostream& strm, const Cubit_ptr obj) {
-		strm << (CORBA::Object_ptr)obj;
-		return strm;
-	}
-	inline friend istream& operator>>(istream& strm, Cubit_ptr& obj) {
-		NCistream istrm(strm);
-		istrm >> obj;
-		return strm;
-	}
-};
-
-
-#endif
-
diff --git a/TAO/tests/Cubit/Orbix/base_server/cubitS.cpp b/TAO/tests/Cubit/Orbix/base_server/cubitS.cpp
deleted file mode 100644
index 449a8c23548..00000000000
--- a/TAO/tests/Cubit/Orbix/base_server/cubitS.cpp
+++ /dev/null
@@ -1,226 +0,0 @@
-#include "cubit.h"
-
-
-#define Cubit_dispatch_impl
-
-unsigned char Cubit_dispatch::dispatch (CORBA::Request &IT_r, 
- unsigned char IT_isTarget, void *IT_pp) {
-    if (!IT_pp)
-       IT_pp = m_obj;
-    const char *IT_s = IT_r.getOperation ();
-    if (!strcmp(IT_s,"cube_octet")) {
-        CORBA::Octet IT_result;
-        CORBA::Environment IT_env (IT_r);
-        CORBA::Filter* IT_f = CORBA::Orbix.getFilter ();
-        if (!IT_r.tcAssert ("\
-Ro~cube_octet~+o{o},>{o},N{}\
-"))
-            return 1;
-        CORBA::Octet o;
-
-        IT_r.extractOctet (o);
-
-        if (IT_f && !IT_r.isException (IT_env))
-        	IT_f->inRequestPostM (IT_r, IT_env);
-        if (!IT_r.isException (IT_env)) {
-            try {
-                	IT_result = ((Cubit*)IT_pp)->cube_octet (  o, IT_env);
-
-            } catch (CORBA::SystemException &IT_exSys) {
-            IT_env.propagate (&IT_exSys);
-            } catch (CORBA::UserException &IT_exUsr) {
-            IT_env.propagate (&IT_exUsr);
-            }
-        }
-
-        if (!IT_r.isException (IT_env)) {
-            if (!IT_r.convertToReply ("\
-o\
-", IT_env)) return 1;
-            IT_r.insertOctet (IT_result);
-            }
-
-        else IT_r.makeSystemException (IT_env);
-        return 1;
-    }
-
-    if (!strcmp(IT_s,"cube_short")) {
-        CORBA::Short IT_result;
-        CORBA::Environment IT_env (IT_r);
-        CORBA::Filter* IT_f = CORBA::Orbix.getFilter ();
-        if (!IT_r.tcAssert ("\
-Ro~cube_short~+s{s},>{s},N{}\
-"))
-            return 1;
-        CORBA::Short s;
-
-        IT_r >> s;
-
-        if (IT_f && !IT_r.isException (IT_env))
-        	IT_f->inRequestPostM (IT_r, IT_env);
-        if (!IT_r.isException (IT_env)) {
-            try {
-                	IT_result = ((Cubit*)IT_pp)->cube_short (  s, IT_env);
-
-            } catch (CORBA::SystemException &IT_exSys) {
-            IT_env.propagate (&IT_exSys);
-            } catch (CORBA::UserException &IT_exUsr) {
-            IT_env.propagate (&IT_exUsr);
-            }
-        }
-
-        if (!IT_r.isException (IT_env)) {
-            if (!IT_r.convertToReply ("\
-s\
-", IT_env)) return 1;
-            IT_r << IT_result;
-            }
-
-        else IT_r.makeSystemException (IT_env);
-        return 1;
-    }
-
-    if (!strcmp(IT_s,"cube_long")) {
-        CORBA::Long IT_result;
-        CORBA::Environment IT_env (IT_r);
-        CORBA::Filter* IT_f = CORBA::Orbix.getFilter ();
-        if (!IT_r.tcAssert ("\
-Ro~cube_long~+l{l},>{l},N{}\
-"))
-            return 1;
-        CORBA::Long l;
-
-        IT_r >> l;
-
-        if (IT_f && !IT_r.isException (IT_env))
-        	IT_f->inRequestPostM (IT_r, IT_env);
-        if (!IT_r.isException (IT_env)) {
-            try {
-                	IT_result = ((Cubit*)IT_pp)->cube_long (  l, IT_env);
-
-            } catch (CORBA::SystemException &IT_exSys) {
-            IT_env.propagate (&IT_exSys);
-            } catch (CORBA::UserException &IT_exUsr) {
-            IT_env.propagate (&IT_exUsr);
-            }
-        }
-
-        if (!IT_r.isException (IT_env)) {
-            if (!IT_r.convertToReply ("\
-l\
-", IT_env)) return 1;
-            IT_r << IT_result;
-            }
-
-        else IT_r.makeSystemException (IT_env);
-        return 1;
-    }
-
-    if (!strcmp(IT_s,"cube_struct")) {
-        Cubit::Many IT_result;
-        CORBA::Environment IT_env (IT_r);
-        CORBA::Filter* IT_f = CORBA::Orbix.getFilter ();
-        if (!IT_r.tcAssert ("\
-Ro~cube_struct~+values{R~Cubit::Many~o{o},l{l},s{s}},>{R~Cubit::Many~o{o},l{l},s{s}},N{}\
-"))
-            return 1;
-        Cubit::Many values;
-
-        values.decodeOp (IT_r);
-
-        if (IT_f && !IT_r.isException (IT_env))
-        	IT_f->inRequestPostM (IT_r, IT_env);
-        if (!IT_r.isException (IT_env)) {
-            try {
-                	IT_result = ((Cubit*)IT_pp)->cube_struct (  values, IT_env);
-
-            } catch (CORBA::SystemException &IT_exSys) {
-            IT_env.propagate (&IT_exSys);
-            } catch (CORBA::UserException &IT_exUsr) {
-            IT_env.propagate (&IT_exUsr);
-            }
-        }
-
-        if (!IT_r.isException (IT_env)) {
-            if (!IT_r.convertToReply ("\
-R~Cubit::Many~o{o},l{l},s{s}\
-", IT_env)) return 1;
-            IT_result.encodeOp (IT_r);
-            }
-
-        else IT_r.makeSystemException (IT_env);
-        return 1;
-    }
-
-    if (!strcmp(IT_s,"cube_union")) {
-        Cubit::oneof IT_result;
-        CORBA::Environment IT_env (IT_r);
-        CORBA::Filter* IT_f = CORBA::Orbix.getFilter ();
-        IT_r.tcPreAssert (
-"\
-Ro~cube_union~+values{U~Cubit::oneof~{E~Cubit::discrim~e_0th,e_1st,e_2nd,e_3rd,e_4th,e_5th}~Cubit::e_0th o{o};Cubit::e_1st s{s};Cubit::e_2nd l{l};Cubit::e_3rd,$ cm{R~Cubit::Many~o{o},l{l},s{s}}},>{U~Cubit::oneof~{E~Cubit::discrim~e_0th,e_1st,e_2nd,e_3rd,\
-");
-        if (!IT_r.tcAssert ("\
-e_4th,e_5th}~Cubit::e_0th o{o};Cubit::e_1st s{s};Cubit::e_2nd l{l};Cubit::e_3rd,$ cm{R~Cubit::Many~o{o},l{l},s{s}}},N{}\
-"))
-            return 1;
-        Cubit::oneof values;
-
-        values.decodeOp (IT_r);
-
-        if (IT_f && !IT_r.isException (IT_env))
-        	IT_f->inRequestPostM (IT_r, IT_env);
-        if (!IT_r.isException (IT_env)) {
-            try {
-                	IT_result = ((Cubit*)IT_pp)->cube_union (  values, IT_env);
-
-            } catch (CORBA::SystemException &IT_exSys) {
-            IT_env.propagate (&IT_exSys);
-            } catch (CORBA::UserException &IT_exUsr) {
-            IT_env.propagate (&IT_exUsr);
-            }
-        }
-
-        if (!IT_r.isException (IT_env)) {
-            if (!IT_r.convertToReply ("\
-U~Cubit::oneof~{E~Cubit::discrim~e_0th,e_1st,e_2nd,e_3rd,e_4th,e_5th}~Cubit::e_0th o{o};Cubit::e_1st s{s};Cubit::e_2nd l{l};Cubit::e_3rd,$ cm{R~Cubit::Many~o{o},l{l},s{s}}\
-", IT_env)) return 1;
-            IT_result.encodeOp (IT_r);
-            }
-
-        else IT_r.makeSystemException (IT_env);
-        return 1;
-    }
-
-    if (!strcmp(IT_s,"please_exit")) {
-        CORBA::Environment IT_env (IT_r);
-        CORBA::Filter* IT_f = CORBA::Orbix.getFilter ();
-        if (!IT_r.tcAssert ("\
-Ro~please_exit~>{v},O{}\
-"))
-            return 1;
-
-        if (IT_f && !IT_r.isException (IT_env))
-        	IT_f->inRequestPostM (IT_r, IT_env);
-        if (!IT_r.isException (IT_env)) {
-            try {
-                ((Cubit*)IT_pp)->please_exit (IT_env);
-
-            } catch (CORBA::SystemException &IT_exSys) {
-            IT_env.propagate (&IT_exSys);
-            } catch (CORBA::UserException &IT_exUsr) {
-            IT_env.propagate (&IT_exUsr);
-            }
-        }
-        IT_r.replyNoResults (CORBA::Flags(CORBA::INV_NO_RESPONSE),IT_env);
-        return 1;
-    }
-
-    if (IT_isTarget)
-        IT_r.makeRuntimeException2 ();
-
-    return 0;
-}
-
-#include "cubitC.cpp"
-
diff --git a/TAO/tests/Cubit/Orbix/base_server/cubitS.h b/TAO/tests/Cubit/Orbix/base_server/cubitS.h
deleted file mode 100644
index 757af4664ad..00000000000
--- a/TAO/tests/Cubit/Orbix/base_server/cubitS.h
+++ /dev/null
@@ -1,118 +0,0 @@
-#ifndef _cubitS_h
-#define _cubitS_h
-
-#include "cubitC.h"
-
-/************************************************************************/
-/*                                                                      */
-/* This file is automatically generated by ORBeline IDL compiler        */
-/* Do not modify this file.                                             */
-/*                                                                      */
-/* ORBeline (c) is copyrighted by PostModern Computing, Inc.            */
-/*                                                                      */
-/* The generated code conforms to OMG's IDL C++ mapping as              */
-/* specified in OMG Document Number: 94-9-14.                           */
-/*                                                                      */
-/************************************************************************/
-
-class _sk_Cubit : public Cubit
-{
-    protected:
-	_sk_Cubit(const char *object_name = (const char *)NULL);
-	_sk_Cubit(const char *service_name, const CORBA::ReferenceData& data);
-	virtual ~_sk_Cubit() {}
-    public:
-	static const CORBA::TypeInfo _skel_info;
-
-	// The following operations need to be implemented by the server.
-	virtual CORBA::Octet cube_octet(CORBA::Octet o) = 0;
-	virtual CORBA::Short cube_short(CORBA::Short s) = 0;
-	virtual CORBA::Long cube_long(CORBA::Long l) = 0;
-	virtual Cubit::Many cube_struct(const Cubit::Many& values) = 0;
-	virtual Cubit::oneof cube_union(const Cubit::oneof& values) = 0;
-	virtual void please_exit() = 0;
-	
-	// Skeleton Operations implemented automatically
-	
-	static void _cube_octet(void *obj,
-			CORBA::MarshalStream &strm,
-			CORBA::Principal_ptr principal,
-			const char *oper,
-			void *priv_data);
-	
-	static void _cube_short(void *obj,
-			CORBA::MarshalStream &strm,
-			CORBA::Principal_ptr principal,
-			const char *oper,
-			void *priv_data);
-	
-	static void _cube_long(void *obj,
-			CORBA::MarshalStream &strm,
-			CORBA::Principal_ptr principal,
-			const char *oper,
-			void *priv_data);
-	
-	static void _cube_struct(void *obj,
-			CORBA::MarshalStream &strm,
-			CORBA::Principal_ptr principal,
-			const char *oper,
-			void *priv_data);
-	
-	static void _cube_union(void *obj,
-			CORBA::MarshalStream &strm,
-			CORBA::Principal_ptr principal,
-			const char *oper,
-			void *priv_data);
-	
-	static void _please_exit(void *obj,
-			CORBA::MarshalStream &strm,
-			CORBA::Principal_ptr principal,
-			const char *oper,
-			void *priv_data);
-	
-};
-template <class T>
-class _tie_Cubit : public Cubit
-{
-    public:
-	_tie_Cubit(T& t, const char *obj_name=(char*)NULL) : 
-			Cubit(obj_name), 
-			_ref(t) {
-		_object_name(obj_name);
-	}
-	_tie_Cubit(T& t, const char *service_name,
-			const CORBA::ReferenceData& id)
-			:_ref(t) {
-		_service(service_name, id);
-	}
-	~_tie_Cubit() {}
-	CORBA::Octet cube_octet(CORBA::Octet o) {
-		return _ref.cube_octet(
-		o);
-	}
-	CORBA::Short cube_short(CORBA::Short s) {
-		return _ref.cube_short(
-		s);
-	}
-	CORBA::Long cube_long(CORBA::Long l) {
-		return _ref.cube_long(
-		l);
-	}
-	Cubit::Many cube_struct(const Cubit::Many& values) {
-		return _ref.cube_struct(
-		values);
-	}
-	Cubit::oneof cube_union(const Cubit::oneof& values) {
-		return _ref.cube_union(
-		values);
-	}
-	void please_exit() {
-		_ref.please_exit();
-	}
-
-    private:
-	T& _ref;
-};
-
-#endif
-
diff --git a/TAO/tests/Cubit/Orbix/base_server/cubit_impl.cpp b/TAO/tests/Cubit/Orbix/base_server/cubit_impl.cpp
deleted file mode 100644
index e35f1084118..00000000000
--- a/TAO/tests/Cubit/Orbix/base_server/cubit_impl.cpp
+++ /dev/null
@@ -1,46 +0,0 @@
-#include "cubit_impl.h"
-
-CORBA::Octet Cubit_Impl:: cube_octet (CORBA::Octet o, CORBA::Environment &IT_env) throw (CORBA::SystemException) {
-  return (CORBA::Octet) (o * o * o); 
-}
-
-CORBA::Short Cubit_Impl:: cube_short (CORBA::Short s, CORBA::Environment &IT_env) throw (CORBA::SystemException) {
-  return (CORBA::Short) (s * s * s);
-}
-
-CORBA::Long Cubit_Impl:: cube_long (CORBA::Long l, CORBA::Environment &IT_env) throw (CORBA::SystemException) {
-   return (CORBA::Long) (l * l * l);
-}
-
-Cubit::Many Cubit_Impl:: cube_struct (const Cubit::Many& values, CORBA::Environment &IT_env) throw (CORBA::SystemException) {
-  Cubit::Many out_values;
-  out_values.o = values.o * values.o * values.o;
-  out_values.s = values.s * values.s * values.s;
-  out_values.l = values.l * values.l * values.l;
-  return out_values; 
-}
-
-Cubit::oneof Cubit_Impl:: cube_union (const Cubit::oneof& values, CORBA::Environment &IT_env) throw (CORBA::SystemException) {
-  Cubit::oneof out_values;
-   switch (values._d ()) {
-   case Cubit::e_0th:
-     out_values.o (values.o () * values.o ()  * values.o ());
-     break;
-   case Cubit::e_1st:
-     out_values.s (values.s () * values.s () * values.s ());
-     break;
-   case Cubit::e_2nd:
-     out_values.l (values.l () * values.l () * values.l ());
-     break;
-   case Cubit::e_3rd:
-   default:
-     out_values.cm ().o = values.cm ().o * values.cm ().o * values.cm ().o ;
-     out_values.cm ().s = values.cm ().s * values.cm ().s * values.cm ().s ;
-     out_values.cm ().l = values.cm ().l * values.cm ().l * values.cm ().l ;
-     break;
-   }
-   return out_values;  
-}
-
-void Cubit_Impl:: please_exit (CORBA::Environment &IT_env) throw (CORBA::SystemException) {
-}
diff --git a/TAO/tests/Cubit/Orbix/base_server/cubit_impl.h b/TAO/tests/Cubit/Orbix/base_server/cubit_impl.h
deleted file mode 100644
index 1e710bb15d1..00000000000
--- a/TAO/tests/Cubit/Orbix/base_server/cubit_impl.h
+++ /dev/null
@@ -1,27 +0,0 @@
-
-#ifndef cubit_ih
-#define cubit_ih
-
-#include "cubit.h"
-
-
-#ifdef Cubit_USE_BOA
-class Cubit_Impl : public virtual CubitBOAImpl {
-#else
-class Cubit_Impl {
-#endif /* Cubit_USE_BOA */
-
-public:
-        virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env=CORBA::default_environment) throw (CORBA::SystemException);
-        virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env=CORBA::default_environment) throw (CORBA::SystemException);
-        virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env=CORBA::default_environment) throw (CORBA::SystemException);
-        virtual Cubit::Many cube_struct (const Cubit::Many& values, CORBA::Environment &IT_env=CORBA::default_environment) throw (CORBA::SystemException);
-        virtual Cubit::oneof cube_union (const Cubit::oneof& values, CORBA::Environment &IT_env=CORBA::default_environment) throw (CORBA::SystemException);
-        virtual void please_exit (CORBA::Environment &IT_env=CORBA::default_environment) throw (CORBA::SystemException);
-};
-
-#ifndef Cubit_USE_BOA
-DEF_TIE_Cubit (Cubit_Impl)
-#endif /* Cubit_USE_BOA */
-
-#endif
diff --git a/TAO/tests/Cubit/Orbix/base_server/server.cpp b/TAO/tests/Cubit/Orbix/base_server/server.cpp
deleted file mode 100644
index 96117fe3e0d..00000000000
--- a/TAO/tests/Cubit/Orbix/base_server/server.cpp
+++ /dev/null
@@ -1,40 +0,0 @@
-//**************************************************************************
-//
-// NAME :   tpr_server.cpp 
-// DESCRIPTION:  
-//
-// Server mainline
-//
-//****************************************************************************
-#define IT_EX_MACROS
-
-#include "cubit_impl.h"		// server header file
-
-int 
-main (int , char**)
-{
-
-#ifdef Cubit_USE_BOA
-  Cubit_var cb = new Cubit_Impl;
-  cout << "Using BOA approach" << endl;
-#else
-  Cubit_var cb = new TIE_Cubit (Cubit_Impl) (new Cubit_Impl);
-  cout << "Using TIE approach" << endl;
-#endif /* Cubit_USE_BOA */
-  
-  //
-  // Go get some work to do....
-  //
-  IT_TRY {
-      CORBA::Orbix.impl_is_ready("Cubit", IT_X);
-  }
-  IT_CATCHANY {
-     cout << IT_X << endl;
-  }
-  IT_ENDTRY;
-
-  cout << "Cubit server is exiting." << endl;
-
-
-  return 0;
-}
diff --git a/TAO/tests/Cubit/Orbix/base_server/tpr.cpp b/TAO/tests/Cubit/Orbix/base_server/tpr.cpp
deleted file mode 100644
index 415410aea9f..00000000000
--- a/TAO/tests/Cubit/Orbix/base_server/tpr.cpp
+++ /dev/null
@@ -1,26 +0,0 @@
-#include "tpr.h"
-
-void *
-worker(void *vp)
-{
-  ACE_Thread_Control tc (ACE_Thread_Manager::instance ());
-  CORBA::Orbix.continueThreadDispatch (*(CORBA::Request *)vp);
-  return NULL;
-}
-
-
-int
-tpr_filter::inRequestPreMarshal(CORBA::Request &r,  CORBA::Environment&)
-{
-//   thread_t	tid;
-//   thr_create(NULL, 0, worker, (void *)&r, THR_DETACHED, &tid);
-
-  ACE_Thread_Manager *thr_mgr = ACE_Thread_Manager::instance ();
-  thr_mgr->spawn (ACE_THR_FUNC (worker),
-                  (void *) &r, 
-                  THR_DETACHED);
-
-  return -1;
-}
-
-tpr_filter tpr_dispatcher;
diff --git a/TAO/tests/Cubit/Orbix/base_server/tpr.h b/TAO/tests/Cubit/Orbix/base_server/tpr.h
deleted file mode 100644
index 38c2ccc7069..00000000000
--- a/TAO/tests/Cubit/Orbix/base_server/tpr.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#include "cubit.h"
-#include "ace/Service_Config.h"
-#include "ace/Thread_Manager.h"
-
-//
-// Create a thread filter to dispatch incoming calls
-//
-class tpr_filter : public CORBA::ThreadFilter {
-	virtual int inRequestPreMarshal(CORBA::Request &, CORBA::Environment&);
-};
diff --git a/TAO/tests/Cubit/Orbix/client/Makefile b/TAO/tests/Cubit/Orbix/client/Makefile
deleted file mode 100644
index 70b3257447d..00000000000
--- a/TAO/tests/Cubit/Orbix/client/Makefile
+++ /dev/null
@@ -1,89 +0,0 @@
-#----------------------------------------------------------------------------
-#	@(#)Makefile	1.1	10/18/96
-#
-#	Makefile for the ACE_MT_CORBA_Handler tests
-#----------------------------------------------------------------------------
-
-#----------------------------------------------------------------------------
-#	Local macros
-#----------------------------------------------------------------------------
-
-SRC = cubitC.cpp client.cpp
-
-CLT_OBJS = cubitC.o client.o
-
-LDLIBS	 = 
-
-VLDLIBS	 = $(LDLIBS:%=%$(VAR))
-
-#----------------------------------------------------------------------------
-#	Include macros and targets
-#----------------------------------------------------------------------------
-
-include		$(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-include		$(ACE_ROOT)/include/makeinclude/macros.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.common.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.lib.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.bin.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
-
-#----------------------------------------------------------------------------
-#	Orbix related macros and target settings.
-#----------------------------------------------------------------------------
-
-
-ORBIX_BINDIR    = $(ORBIX_ROOT)/bin
-ORBIX_LIBDIR    = $(ORBIX_ROOT)/corba2/lib
-ORBIX_INCDIR    = $(ORBIX_ROOT)/corba2/include
-
-CPPFLAGS += -DEXCEPTIONS -I$(ORBIX_INCDIR) -DWANT_ORBIX_FDS
-LDFLAGS  += -L$(ORBIX_LIBDIR) -R $(ORBIX_LIBDIR) -L$(ACE)/ace
-
-IDLFLAGS = -s S.cpp -c C.cpp -B
-
-#----------------------------------------------------------------------------
-#	Local targets
-#----------------------------------------------------------------------------
-
-all: client 
-
-client: $(addprefix $(VDIR),$(CLT_OBJS))
-	$(LINK.cc) -o client $(addprefix $(VDIR),$(CLT_OBJS)) $(LDFLAGS) $(ITIIOP) $(ITCLT) $(VLDLIBS)
-
-
-#----------------------------------------------------------------------------
-#	Dependencies
-#----------------------------------------------------------------------------
-# DO NOT DELETE THIS LINE -- g++dep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-
-.obj/cubitC.o .shobj/cubitC.so: cubitC.cpp cubit.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/config-sunos5.5-sunc++-4.x.h \
- $(ACE_ROOT)/ace/stdcpp.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i
-.obj/client.o .shobj/client.so: client.cpp $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/config-sunos5.5-sunc++-4.x.h \
- $(ACE_ROOT)/ace/stdcpp.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i cubit.h
-
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/tests/Cubit/Orbix/client/client.cpp b/TAO/tests/Cubit/Orbix/client/client.cpp
deleted file mode 100644
index 50bda0fd40c..00000000000
--- a/TAO/tests/Cubit/Orbix/client/client.cpp
+++ /dev/null
@@ -1,295 +0,0 @@
-//**************************************************************************
-//
-// NAME :   client.C 
-// DESCRIPTION:  
-//
-// Client for the Cubit example
-//
-//****************************************************************************
-
-#include "ace/OS.h"
-#include "ace/Get_Opt.h"
-#include "cubit.h"
-
-int LOOP_COUNT;
-char SERVER_HOST [1024];
-
-inline int func (unsigned i) { return i - 117; }
-void run_tests (Cubit_var, int);
-
-// = TITLE
-//     Parses the command line arguments and returns an error status
-//
-// = DESCRIPTION
-//     This method parses the command line arguments
-int parse_args(int argc, char *argv[])
-{
-  ACE_OS::strcpy (SERVER_HOST, "localhost");
-  ACE_Get_Opt opts (argc, argv, "dh:n:O:x");
-  int			c;
-  
-  while ((c = opts ()) != -1)
-    switch (c) {
-    case 'h':
-      ACE_OS::strcpy (SERVER_HOST, opts.optarg);
-      continue;
-    case 'd':  // debug flag
-      continue;
-      
-    case 'n':			// loop count
-      LOOP_COUNT = (unsigned) ACE_OS::atoi (opts.optarg);
-      continue;
-      
-    case 'O':			// stringified objref
-      continue;
-      
-    case 'x':
-      continue;
-      
-    case '?':
-    default:
-      ACE_OS::fprintf (stderr, "usage:  %s"
-                       " [-d]"
-                       " [-n loopcount]"
-                       " [-h SERVER_HOST]"
-                       " [-x]"
-                       "\n", argv [0]
-                       );
-      return 1;
-    }
-  
-  return 0;  // Indicates successful parsing of command line
-}
-
-
-//
-// Mainline
-//
-int
-main (int argc, char *argv[])
-{
-  if (parse_args (argc, argv) != 0)
-    return -1;
-
-  Cubit_var cb;
-  // cout << "attempting to contact server at host " << SERVER_HOST << '\n' ;
- 
-  //
-  // Initialise client's binding to an
-  // arbitrary cubit server (at some host)
-  // 
-  TRY {
-    cb = Cubit::_bind ("", SERVER_HOST, IT_X);
-  }
-  CATCHANY {
-    cerr << "Binding failed: " << IT_X;
-  }
-  ENDTRY;
-  
-  run_tests (cb, LOOP_COUNT);
-  return 0;
-}
-
-
-void
-run_tests (Cubit_var cb, int loop_count) 
-{
-  //
-  // Make the calls in a loop.
-  //
-  unsigned i;
-  unsigned call_count, error_count;
-
-  ACE_Time_Value before, after;
-
-  
-  //
-  // Cube an octet.
-  //
-  
-  call_count = 0;
-  error_count = 0;
-  before = ACE_OS::gettimeofday();
-
-  for (i = 0; i < loop_count; i++)
-    {
-
-      call_count++;
-
-      CORBA::Octet arg_octet = func (i), ret_octet;
-
-      TRY {
-        ret_octet = cb->cube_octet (arg_octet);
-      } 
-      CATCHANY {
-        cerr << "Call failed: " << IT_X;
-        error_count++;
-      } 
-      ENDTRY;
-      arg_octet = arg_octet * arg_octet * arg_octet;
-      if (arg_octet != ret_octet) {
-        ACE_OS::printf ("** cube_octet(%d)  (--> %d)\n", arg_octet , ret_octet);
-        error_count++;
-      }
-    }
-  
-  //
-  // Cube a short.
-  //
-  call_count = 0;
-  error_count = 0;
-  before = ACE_OS::gettimeofday();
-
-  for (i = 0; i < loop_count; i++)
-    {
-      call_count++;
-
-      CORBA::Short arg_short = func (i), ret_short;
-
-      TRY {
-        ret_short = cb->cube_short (arg_short);
-      } 
-      CATCHANY {
-        cerr << "Call failed: " << IT_X;
-        error_count++;
-      } 
-      ENDTRY;
-      arg_short = arg_short * arg_short * arg_short;
-      if (arg_short != ret_short) {
-        ACE_OS::printf ("** cube_short(%d)  (--> %d)\n", arg_short , ret_short);
-        error_count++;
-      }
-
-    }
-  after = ACE_OS::gettimeofday();
-  
-  if (call_count > 0) 
-    {
-      if (error_count == 0)
-        {
-          ACE_Time_Value diff = after - before;
-          unsigned long	us = diff.sec() * 1000 * 1000 + diff.usec();
-          
-          us /= call_count;
-          
-          if (us > 0)
-            ACE_OS::printf ("cube average call ACE_OS::time\t= %ld.%.03ldms, \t"
-                            "%ld calls/second\n",
-                            us / 1000, us % 1000,
-                            1000000L / us);
-        }
-      
-      ACE_OS::printf ("%d calls, %d errors\n", call_count, error_count);
-    }
-
-  //
-  // Cube a long.
-  //
-  
-  call_count = 0;
-  error_count = 0;
-  before = ACE_OS::gettimeofday();
-
-  for (i = 0; i < loop_count; i++)
-    {
-
-      call_count++;
-
-      CORBA::Long arg_long = func (i), ret_long;
-
-      TRY {
-        ret_long = cb->cube_long (arg_long);
-      } 
-      CATCHANY {
-        cerr << "Call failed: " << IT_X;
-      } 
-      ENDTRY;
-      arg_long = arg_long * arg_long * arg_long;
-      if (arg_long != ret_long) {
-        ACE_OS::printf ("** cube_long(%d)  (--> %d)\n", arg_long , ret_long);
-        error_count++;
-      }
-
-    }
-  after = ACE_OS::gettimeofday();
-  
-  if (call_count > 0) 
-    {
-      if (error_count == 0)
-        {
-          ACE_Time_Value diff = after - before;
-          unsigned long	us = diff.sec() * 1000 * 1000 + diff.usec();
-          
-          us /= call_count;
-          
-          if (us > 0)
-            ACE_OS::printf ("cube average call ACE_OS::time\t= %ld.%.03ldms, \t"
-                            "%ld calls/second\n",
-                            us / 1000, us % 1000,
-                            1000000L / us);
-        }
-      
-      ACE_OS::printf ("%d calls, %d errors\n", call_count, error_count);
-    }
-
-  //
-  // Cube a "struct" ...
-  //
-  Cubit::Many	arg_struct, ret_struct;
-      
-  call_count = 0;
-  error_count = 0;
-  before = ACE_OS::gettimeofday();
-
-  for (i = 0; i < loop_count; i++)
-    {
-
-      call_count++;
-       
-      arg_struct.l = func (i);
-      arg_struct.s = func (i);
-      arg_struct.o = func (i);
-       
-      TRY {
-        ret_struct = cb->cube_struct (arg_struct);
-      }
-      CATCHANY {
-        cerr << "Call failed: " << IT_X;
-        error_count++;
-      } 
-      ENDTRY;
-      arg_struct.l = arg_struct.l  * arg_struct.l  * arg_struct.l ;
-      arg_struct.s = arg_struct.s  * arg_struct.s  * arg_struct.s ;
-      arg_struct.o = arg_struct.o  * arg_struct.o  * arg_struct.o ;
-       
-      if (arg_struct.l  != ret_struct.l 
-          || arg_struct.s  != ret_struct.s 
-          || arg_struct.o  != ret_struct.o )
-        {
-          cerr << "** cube_struct ERROR\n";
-          error_count++;
-        }
-    }
-    
-  after = ACE_OS::gettimeofday();
-  
-  if (call_count > 0) 
-    {
-      if (error_count == 0)
-        {
-          ACE_Time_Value diff = after - before;
-          unsigned long	us = diff.sec() * 1000 * 1000 + diff.usec();
-          
-          us /= call_count;
-          
-          if (us > 0)
-            ACE_OS::printf ("cube average call ACE_OS::time\t= %ld.%.03ldms, \t"
-                            "%ld calls/second\n",
-                            us / 1000, us % 1000,
-                            1000000L / us);
-        }
-      
-      ACE_OS::printf ("%d calls, %d errors\n", call_count, error_count);
-    }
-  
-}
diff --git a/TAO/tests/Cubit/Orbix/client/cubit.h b/TAO/tests/Cubit/Orbix/client/cubit.h
deleted file mode 100644
index 1c868a6597d..00000000000
--- a/TAO/tests/Cubit/Orbix/client/cubit.h
+++ /dev/null
@@ -1,727 +0,0 @@
-
-#ifndef cubit_hh
-#define cubit_hh
-
-#include "ace/OS.h"
-#include <CORBA.h>
-
-
-#ifndef _Cubit_defined
-#define _Cubit_defined
-class Cubit_dispatch : public virtual CORBA::PPTR {
-public:
-
-      Cubit_dispatch (void *IT_p, CORBA::Object* IT_o, const char *IT_m, 
-        CORBA::LoaderClass *IT_l, char *IT_i, void* IT_im)
-       : PPTR (IT_p,IT_o,IT_m,IT_l,IT_i,IT_im) {}
-
-
-   Cubit_dispatch (char *IT_OR, void *IT_p, CORBA::Object *IT_o)
-       : PPTR (IT_OR,IT_p,IT_o) {}
-
-
-   Cubit_dispatch () {}
-
-   Cubit_dispatch (ObjectReference *IT_OR, void *IT_p, CORBA::Object *IT_o)
-       : PPTR (IT_OR,IT_p,IT_o) {}
-
-
-   Cubit_dispatch (void *IT_p, CORBA::Object *IT_o, const char *IT_m, 
-        char *IT_i, CORBA::Object* IT_ob, void* IT_im)
-       : PPTR (IT_p,IT_o,IT_m,IT_i,IT_ob,IT_im) {}
-
-
-   virtual unsigned char dispatch (CORBA::Request &IT_r, 
-        unsigned char IT_isTarget, void* IT_pp=NULL);
-
-
-};
-
-class Cubit;
-
-#ifndef CubitPtr
-#define CubitPtr
-
-typedef Cubit* Cubit_ptr;
-
-typedef Cubit* CubitRef;
-
-#endif
-
-
-#ifndef CubitForwH
-#define CubitForwH
-CORBA::ObjectRef Cubit_getBase (void *);
-void Cubit_release (Cubit *, CORBA::Environment &IT_env);
-void Cubit_release (Cubit_ptr);
-Cubit* Cubit_duplicate (Cubit_ptr, CORBA::Environment &IT_env);
-Cubit* Cubit_duplicate (Cubit_ptr );
-Cubit_ptr Cubit_nil (CORBA::Environment &IT_env);
-Cubit_ptr Cubit_nil ();
-#endif
-#define Cubit_IMPL "Cubit"
-
-
-class Cubit;
-
-typedef Cubit CubitProxy;
-#define Cubit_IR "Cubit$v1.1"
-#define Cubit_IMPL "Cubit"
-
-#ifndef CubitPtr
-#define CubitPtr
-
-typedef Cubit* Cubit_ptr;
-
-typedef Cubit* CubitRef;
-
-#endif
-
-class Cubit: public virtual CORBA::Object  {
-public:
-        Cubit (char *IT_OR);
-    Cubit (ObjectReference *IT_OR);
-    Cubit () : CORBA::Object  (1) {}
-protected:
-    Cubit_ptr __duplicate(
-            CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) {
-       CORBA::Object::__duplicate (IT_env);
-       return this;
-    }
-public:
-    static Cubit_ptr _duplicate(
-            Cubit_ptr, 
-            CORBA::Environment &IT_pEnv=CORBA::IT_chooseDefaultEnv ());
-public:
-   static Cubit* _bind (const char* IT_markerServer, const char* host,
-		const CORBA::Context &IT_c, 
-		CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-   static Cubit* _bind (CORBA::Environment &IT_env);
-   static Cubit* _bind (const char* IT_markerServer=NULL, const char* host=NULL,
-                 CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-    static Cubit* _narrow (CORBA::Object* , CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-    static Cubit_ptr _nil (CORBA::Environment &IT_pEnv=CORBA::IT_chooseDefaultEnv ()) {
-        CORBA::EnvExcRaiser IT_raise;
-        CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-        return (Cubit_ptr) CORBA::OBJECT_NIL;}
-
-#ifndef Cubit_Many_defined
-#define Cubit_Many_defined
-
-struct Many {
-    CORBA::Octet o;
-    CORBA::Long l;
-    CORBA::Short s;
-
-    void encodeOp (CORBA::Request &IT_r) const;
-    void decodeOp (CORBA::Request &IT_r);
-    void decodeInOutOp (CORBA::Request &IT_r);
-    Many(const Many &);
-    Many();
-    ~Many();
-    Many& operator= (const Many&);
-};
-
-#ifndef Cubit_ManyVarH
-#define Cubit_ManyVarH
-
-#ifndef Cubit_ManyvPtr
-#define Cubit_ManyvPtr
-typedef Many* Many_vPtr;
-typedef const Many* Many_cvPtr;
-#endif
-
-class Many_var : public CORBA::_var
-{
-    private:
-
-    unsigned char copyHelper (const Many_var &IT_s) {
-        if (!IT_s._ptr) {
-            _ptr = IT_s._ptr;
-        } else
-        {
-            _ptr = new Many;
-            *(_ptr) =  *(IT_s._ptr);
-        }
-        return 1;
-    }
-
-    public:
-
-    Many_var (const Many_var &IT_s) {
-        (void) copyHelper (IT_s);
-    }
-
-    Many_var () {
-        _ptr =  new Many;
-;
-    }
-
-    Many_var (Many *IT_p) {
-        _ptr = IT_p;
-    }
-
-    Many_var &operator= (Many *IT_p) {
-        if (_ptr != IT_p) {
-            delete _ptr;
-        }
-        _ptr = IT_p;
-        return (*this);
-    }
-
-    Many_var &operator= (const Many_var &IT_s) {
-        if (_ptr != IT_s._ptr) {
-            delete _ptr;
-        }
-        _ptr = new Many;
-        *(_ptr) =  *(IT_s._ptr);
-        return (*this);
-    }
-
-    ~Many_var () {
-        delete _ptr;
-    }
-
-    Many* operator-> () {
-        return _ptr;
-    }
-
-    operator Many_cvPtr () const { return _ptr;}
-    operator Many_vPtr& () { return _ptr;}
-    operator Many& () const { return * _ptr;}
-
-    protected:
-    Many *_ptr;
-    private:
-    Many_var &operator= (const CORBA::_var &IT_s);
-    Many_var (const CORBA::_var &IT_s);
-};
-
-#endif
-
-
-#endif
-
-enum discrim {e_0th,e_1st,e_2nd,e_3rd,e_4th,e_5th, IT__ENUM_Cubit_discrim=CORBA_ULONG_MAX};
-
-#ifndef Cubit_oneof_defined
-#define Cubit_oneof_defined
-
-struct oneof {
-    private:
-
-    discrim __d;
-    union {
-        CORBA::Octet _o_;
-        CORBA::Short _s_;
-        CORBA::Long _l_;
-        Many * _cm_;
-    };
-
-    public:
-
-    void encodeOp (CORBA::Request &IT_r) const;
-    void decodeOp (CORBA::Request &IT_r);
-    void decodeInOutOp (CORBA::Request &IT_r);
-
-    private:
-
-    unsigned char isSet;
-
-    public:
-
-    discrim _d () const { return __d; }
-
-    CORBA::Octet o () const {
-      return _o_;
-    }
-
-    void o (CORBA::Octet IT_member) {
-        if (isSet && (__d != Cubit::e_0th))
-        {
-            this-> oneof::~oneof();
-            memset(this, 0, sizeof(*this));
-        }
-
-        __d = Cubit::e_0th;
-        isSet = 1;
-        _o_ = IT_member;
-    }
-
-    CORBA::Short s () const {
-        return _s_;
-    }
-
-    void s (CORBA::Short IT_member) {
-        if (isSet && (__d != Cubit::e_1st))
-        {
-            this-> oneof::~oneof();
-            memset(this, 0, sizeof(*this));
-        }
-
-        __d = Cubit::e_1st;
-        isSet = 1;
-        _s_ = IT_member;
-    }
-
-    CORBA::Long l () const {
-        return _l_;
-    }
-
-    void l (CORBA::Long IT_member) {
-        if (isSet && (__d != Cubit::e_2nd))
-        {
-            this-> oneof::~oneof();
-            memset(this, 0, sizeof(*this));
-        }
-
-        __d = Cubit::e_2nd;
-        isSet = 1;
-        _l_ = IT_member;
-    }
-
-    Many& cm () {
-        return (*_cm_);
-    }
-
-    const Many& cm () const {
-        return (*_cm_);
-    }
-
-    void cm (const Many& IT_member) {
-        if (isSet && (__d != Cubit::e_3rd))
-        {
-            this-> oneof::~oneof();
-            memset(this, 0, sizeof(*this));
-        }
-
-        __d = Cubit::e_3rd;
-
-        if (!isSet) {
-            _cm_ = new Many;
-            isSet = 1;
-        }
-        *(_cm_) = IT_member;
-    }
-
-
-    oneof();
-    oneof(const oneof &);
-    ~oneof();
-    oneof& operator= (const oneof&);
-};
-
-#ifndef Cubit_oneofVarH
-#define Cubit_oneofVarH
-
-#ifndef Cubit_oneofvPtr
-#define Cubit_oneofvPtr
-typedef oneof* oneof_vPtr;
-typedef const oneof* oneof_cvPtr;
-#endif
-
-class oneof_var : public CORBA::_var
-{
-    private:
-
-    unsigned char copyHelper (const oneof_var &IT_s) {
-        if (!IT_s._ptr) {
-            _ptr = IT_s._ptr;
-        } else
-        {
-            _ptr = new oneof;
-            *(_ptr) =  *(IT_s._ptr);
-        }
-        return 1;
-    }
-
-    public:
-
-    oneof_var (const oneof_var &IT_s) {
-        (void) copyHelper (IT_s);
-    }
-
-    oneof_var () {
-        _ptr = NULL;
-    }
-
-    oneof_var (oneof *IT_p) {
-        _ptr = IT_p;
-    }
-
-    oneof_var &operator= (oneof *IT_p) {
-        if (_ptr != IT_p) {
-            delete _ptr;
-        }
-        _ptr = IT_p;
-        return (*this);
-    }
-
-    oneof_var &operator= (const oneof_var &IT_s) {
-        if (_ptr != IT_s._ptr) {
-            delete _ptr;
-        }
-        _ptr = new oneof;
-        *(_ptr) =  *(IT_s._ptr);
-        return (*this);
-    }
-
-    ~oneof_var () {
-        delete _ptr;
-    }
-
-    oneof* operator-> () {
-        return _ptr;
-    }
-
-    operator oneof_cvPtr () const { return _ptr;}
-    operator oneof_vPtr& () { return _ptr;}
-    operator oneof& () const { return * _ptr;}
-
-    protected:
-    oneof *_ptr;
-    private:
-    oneof_var &operator= (const CORBA::_var &IT_s);
-    oneof_var (const CORBA::_var &IT_s);
-};
-
-#endif
-
-
-#endif
-        virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual Many cube_struct (const Many& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual oneof cube_union (const oneof& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual void please_exit (CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-};
-
-#ifndef CubitVarH
-#define CubitVarH
-
-#ifndef CubitvPtr
-#define CubitvPtr
-typedef Cubit* Cubit_vPtr;
-typedef const Cubit* Cubit_cvPtr;
-#endif
-
-class Cubit_var : public CORBA::_var
-{
-    private:
-
-    unsigned char copyHelper (const Cubit_var &IT_s) {
-        {
-            _ptr = Cubit_duplicate (IT_s._ptr);
-        }
-        return 1;
-    }
-
-    public:
-
-    Cubit_var (const Cubit_var &IT_s) {
-        (void) copyHelper (IT_s);
-    }
-
-    Cubit_var () {
-        _ptr = Cubit_nil ();
-    }
-
-    Cubit_var (Cubit *IT_p) {
-        _ptr = IT_p;
-    }
-
-    Cubit_var &operator= (Cubit *IT_p) {
-        Cubit_release (_ptr);
-        _ptr = IT_p;
-        return (*this);
-    }
-
-    Cubit_var &operator= (const Cubit_var &IT_s) {
-        Cubit_release (_ptr);
-        _ptr = Cubit_duplicate (IT_s._ptr);
-        return (*this);
-    }
-
-    ~Cubit_var () {
-        Cubit_release (_ptr);
-    }
-
-    Cubit* operator-> () {
-        return _ptr;
-    }
-
-    operator Cubit_cvPtr () const { return _ptr;}
-    operator Cubit_vPtr& () { return _ptr;}
-
-    protected:
-    Cubit *_ptr;
-    private:
-    Cubit_var &operator= (const CORBA::_var &IT_s);
-    Cubit_var (const CORBA::_var &IT_s);
-    Cubit_var &operator= (const CORBA::_mgr &IT_s);
-    Cubit_var &operator= (const CORBA::_SeqElem &IT_s);
-    Cubit_var (const CORBA::_mgr &IT_s);
-    Cubit_var (const CORBA::_SeqElem &IT_s);
-};
-
-#endif
-
-
-#ifndef CubitMgrH
-#define CubitMgrH
-
-class Cubit_mgr : public CORBA::_mgr
-{
-    public:
-
-    Cubit_mgr () {
-        _ptr = Cubit_nil ();
-        _release = 1;
-    }
-
-    Cubit_mgr (const Cubit_mgr &IT_s) {
-        _ptr = Cubit_duplicate (IT_s._ptr);
-        _release = 1;
-    }
-
-    Cubit_mgr &operator= (Cubit *IT_p) {
-        if (_ptr && _release)
-            Cubit_release (_ptr);
-        _ptr = IT_p;
-        _release = 1;
-        return (*this);
-    }
-
-    Cubit_mgr &operator= (const Cubit_mgr &IT_s) {
-        if (_ptr && _release)
-            Cubit_release (_ptr);
-        _ptr = Cubit_duplicate(IT_s._ptr);
-        _release = 1;
-        return (*this);
-    }
-
-    Cubit_mgr &operator= (Cubit_var &IT_s) {
-        if (_ptr && _release)
-            Cubit_release (_ptr);
-        _ptr = Cubit_duplicate(IT_s);
-        _release = 1;
-        return (*this);
-    }
-
-    ~Cubit_mgr () {
-        if (_release)
-            Cubit_release (_ptr);
-    }
-
-    unsigned char release () {
-        return _release;
-    }
-
-    void release (unsigned char rel) {
-        _release = rel;
-    }
-
-    operator int () const {
-        return (((CORBA::Object_ptr) _ptr) ? 1 : 0);
-    }
-
-    operator void* () const {
-        return _ptr;
-    }
-
-    operator CORBA::Object * () const {
-        return (CORBA::Object *) _ptr;
-    }
-
-    operator Cubit* () const {
-        return (Cubit*) _ptr;
-    }
-
-    Cubit_ptr operator-> () const {
-        return _ptr;
-    }
-
-    Cubit *_ptr;
-
-    protected:
-
-    unsigned char _release;
-};
-
-typedef Cubit_mgr Cubit_mgr_IT_const;
-#endif
-
-#ifndef CubitSeqElemH
-#define CubitSeqElemH
-
-class Cubit_SeqElem : public CORBA::_SeqElem
-{
-    public:
-
-    Cubit_SeqElem (Cubit_ptr* IT_p, unsigned char rel) {
-        _ptr = IT_p;
-        _release = rel;
-    }
-
-    Cubit_SeqElem &operator= (Cubit_ptr IT_p) {
-        if (_ptr) {
-            if (*(_ptr) && _release)
-                Cubit_release (*(_ptr));
-            *(_ptr) = IT_p;
-        }
-        return (*this);
-    }
-
-    Cubit_SeqElem &operator= (const Cubit_SeqElem &IT_s) {
-        if (_ptr && IT_s._ptr) {
-            if (*(_ptr) && _release)
-                Cubit_release (*(_ptr));
-            *(_ptr) = Cubit_duplicate(*(IT_s._ptr));
-        }
-        return (*this);
-    }
-
-    operator Cubit_ptr () const {
-        return _ptr ? (Cubit_ptr) (*_ptr) : Cubit_nil(); 
-    }
-
-    Cubit_ptr operator->() const { return *_ptr;}
-
-    protected:
-    Cubit_ptr *_ptr;
-    unsigned char _release;
-};
-
-#endif
-
-
-#define TIE_Cubit(X) Cubit##X
-
-#define DEF_TIE_Cubit(X) \
-	class Cubit##X : public virtual Cubit {		\
-	  X* m_obj;						\
-	public:							\
-								\
-								\
-	   Cubit##X  (X *objp, const char* m="", CORBA::LoaderClass *l=0)\
-		: Cubit(), m_obj(objp) {	\
-		m_pptr = new Cubit_dispatch		\
-			(( Cubit*)this,(CORBA::Object*)this,m,l,Cubit_IR,m_obj);	\
-	   }								\
-	   Cubit##X  (CORBA::Object *IT_p, const char* IT_m="", void *IT_q=0)\
-		: Cubit() {	\
-		m_pptr = new Cubit_dispatch		\
-			(( Cubit*)this,(CORBA::Object*)this,IT_m,Cubit_IR,IT_p,IT_q);	\
-		m_obj = (X*)(m_pptr->getImplObj ());			\
-	   }								\
-								\
-	   virtual ~Cubit##X  () {				\
-		if (_okToDeleteImpl ()) delete m_obj; }					\
-	   virtual void* _deref () {					\
-		return m_obj; }					\
-								\
-virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_octet (  o,IT_env);\
-}\
-	\
-virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_short (  s,IT_env);\
-}\
-	\
-virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_long (  l,IT_env);\
-}\
-	\
-virtual Cubit::Many cube_struct (const Cubit::Many& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_struct (  values,IT_env);\
-}\
-	\
-virtual Cubit::oneof cube_union (const Cubit::oneof& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_union (  values,IT_env);\
-}\
-	\
-virtual void please_exit (CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-m_obj->please_exit (IT_env);\
-}\
-								\
-	};						\
-
-
-#define QUALS_Cubit	\
-virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_octet (  o,IT_env);\
-}\
-	\
-virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_short (  s,IT_env);\
-}\
-	\
-virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_long (  l,IT_env);\
-}\
-	\
-virtual Many cube_struct (const Many& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_struct (  values,IT_env);\
-}\
-	\
-virtual oneof cube_union (const oneof& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_union (  values,IT_env);\
-}\
-	\
-virtual void please_exit (CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-m_obj->please_exit (IT_env);\
-}\
-
-
-
-
-class CubitProxyFactoryClass : public virtual CORBA::ObjectFactoryClass {
-public:
-   CubitProxyFactoryClass (unsigned char IT_p=0)
-		: CORBA::ProxyFactory (Cubit_IR, IT_p) {}
-
-    virtual void* New (char *IT_OR, CORBA::Environment&);
-
-    virtual void* New (ObjectReference *IT_OR, CORBA::Environment&);
-
-    virtual void* New2 (); 
-
-    virtual CORBA::Object* NewObject (char *IT_OR, CORBA::Environment&);
-
-    virtual CORBA::Object* NewObject (ObjectReference *IT_OR, CORBA::Environment&);
-
-    virtual CORBA::Object* New2Object (); 
-
-    virtual void* IT_castUp (void *IT_p, char* IT_s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-
-    virtual CORBA::PPTR* pptr (void *IT_p);
-
-    virtual void baseInterfaces (_IDL_SEQUENCE_string&);
-
-
-};
-
-extern CubitProxyFactoryClass CubitProxyFactory;
-
-class CubitBOAImpl : public virtual Cubit  {
-public:
-    CubitBOAImpl (const char *m="", CORBA::LoaderClass *l=NULL) {
-  if (CORBA::PPTR::isOK (m_pptr, Cubit_IR))
-    m_pptr = new Cubit_dispatch ( (Cubit*)this,
-   	 (CORBA::Object*)this, m, l, Cubit_IR, this);
-}
-
-        virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual Many cube_struct (const Many& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual oneof cube_union (const oneof& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual void please_exit (CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-};
-
-
-#endif
-
-
-#endif
diff --git a/TAO/tests/Cubit/Orbix/client/cubit.idl b/TAO/tests/Cubit/Orbix/client/cubit.idl
deleted file mode 100644
index d9b38c34a2a..00000000000
--- a/TAO/tests/Cubit/Orbix/client/cubit.idl
+++ /dev/null
@@ -1,40 +0,0 @@
-// @(#)cubit.idl	1.1 95/09/10
-// Copyright 1994-1995 by Sun Microsystems, Inc.
-
-#pragma prefix	"Eng.SUN.COM"
-#pragma version Cubit 1.1
-
-interface Cubit {
-    octet	cube_octet (in octet o);
-    short	cube_short (in short s);
-    long	cube_long (in long l);
-
-    struct Many {
-	octet	o;		// + 3 bytes padding (normally) ...
-	long	l;
-	short	s;		// + 2 bytes padding (normally) ...
-    };
-
-    Many	cube_struct (in Many values);
-
-    enum discrim {e_0th, e_1st, e_2nd, e_3rd, e_4th, e_5th};
-
-    union oneof
-    switch (discrim) {
-	// this is an easy union to interpret; no padding
-	// is needed between discriminant and value.
-      case e_0th:
-        octet		o;
-      case e_1st:
-        short		s;
-      case e_2nd:
-        long		l;
-      case e_3rd:
-      default:
-        Many		cm;
-    };
-
-    oneof	cube_union (in oneof values);
-
-    oneway void	please_exit ();
-};
diff --git a/TAO/tests/Cubit/Orbix/client/cubitC.cpp b/TAO/tests/Cubit/Orbix/client/cubitC.cpp
deleted file mode 100644
index c47e38f26ee..00000000000
--- a/TAO/tests/Cubit/Orbix/client/cubitC.cpp
+++ /dev/null
@@ -1,557 +0,0 @@
-#include "cubit.h"
-
-Cubit::Cubit (char *IT_OR) {
-      m_pptr = new Cubit_dispatch (IT_OR, this,(CORBA::Object*)this);
-} 
-Cubit::Cubit (ObjectReference *IT_OR) {
-      m_pptr = new Cubit_dispatch (IT_OR, this,(CORBA::Object*)this);
-} 
-
-#ifndef CubitForwC
-#define CubitForwC
-CORBA::ObjectRef Cubit_getBase(void *IT_p){
-    return (Cubit*) IT_p;}
-
-void Cubit_release (Cubit_ptr IT_p, CORBA::Environment &IT_env) {
-    CORBA::release(IT_p, IT_env);}
-
-void Cubit_release (Cubit_ptr IT_p) {
-    Cubit_release (IT_p, CORBA::IT_chooseDefaultEnv ()); }
-
-Cubit_ptr Cubit_nil (CORBA::Environment &) {
-    return Cubit:: _nil ();}
-
-Cubit_ptr Cubit_nil () {
-    return Cubit_nil (CORBA::IT_chooseDefaultEnv ());}
-
-Cubit_ptr Cubit_duplicate (Cubit_ptr IT_p, CORBA::Environment &IT_env) {
-    return (Cubit::_duplicate(IT_p, IT_env)); }
-Cubit_ptr Cubit_duplicate (Cubit_ptr IT_p) {
-    return Cubit_duplicate (IT_p, CORBA::IT_chooseDefaultEnv ()); }
-#endif
-
-Cubit_ptr Cubit::_duplicate(Cubit_ptr obj, CORBA::Environment& IT_pEnv) {
-        CORBA::EnvExcRaiser IT_raise;
-        CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-       if (!obj) {
-          return (obj);
-       }
-       Cubit_ptr IT_obj = obj->__duplicate (IT_env);
-       return IT_obj;
-}
-
-
-
-Cubit* Cubit:: _bind (const char* IT_markerServer, const char* host,
-		const CORBA::Context &IT_c, 
-		CORBA::Environment &IT_env) {
-       return (Cubit*)CORBA::Factory.New (IT_markerServer, IT_env, IT_c, host, 
-		Cubit_IMPL, Cubit_IR);
-}
-
-
-
-Cubit* Cubit:: _bind (CORBA::Environment &IT_env) {
-       return _bind (NULL,NULL,CORBA::Context(), IT_env); }
-
-
-Cubit* Cubit:: _bind (const char* IT_markerServer, const char* host,
-                CORBA::Environment &IT_env) {
-       return _bind (IT_markerServer, host, CORBA::Context (), IT_env); }
-Cubit* Cubit::_narrow (CORBA::Object* IT_obj, CORBA::Environment &IT_pEnv) {
-        CORBA::EnvExcRaiser IT_raise;
-        CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-        if (CORBA::is_nil (IT_obj)) {
-                return Cubit:: _nil();
-        }
-
-       Cubit* IT_p = (Cubit*)CORBA::Object::_castDown (IT_obj, Cubit_IR, IT_env);
-        IT_p = IT_p ? IT_p->__duplicate(IT_env) : NULL;
-        if ((IT_env) &&(!strcmp(IT_env.exception()->id(), "CORBA::StExcep::BAD_PARAM")) && (((CORBA::BAD_PARAM*)IT_env.exception())-> minor() == NARROW_FAILED)) {
-                IT_env.exception_free();
-        }
-        return IT_p;
-   }
-
-
-#ifndef Cubit_Many_Ops
-#define Cubit_Many_Ops
-
-void Cubit::Many:: encodeOp (CORBA::Request &IT_r) const {
-
-    IT_r.insertOctet (o);
-
-    IT_r << l;
-
-    IT_r << s;
-}
-
-void Cubit::Many:: decodeOp (CORBA::Request &IT_r) {
-
-    IT_r.extractOctet (o);
-
-    IT_r >> l;
-
-    IT_r >> s;
-}
-
-void Cubit::Many:: decodeInOutOp (CORBA::Request &IT_r) {
-
-    IT_r.extractOctet (o);
-
-    IT_r >> l;
-
-    IT_r >> s;
-}
-
-Cubit::Many ::~Many () {
-}
-
-Cubit::Many:: Many (const Cubit::Many &IT_s) 
-	 {
-    o = IT_s.o;
-    l = IT_s.l;
-    s = IT_s.s;
-}
-
-Cubit::Many:: Many () {
-}
-
-Cubit::Many &Cubit::Many:: operator= (const Cubit::Many& IT_s) {
-    if (this == &IT_s) return *this;
-    o = IT_s.o;
-    l = IT_s.l;
-    s = IT_s.s;
-    return *this;
-}
-
-
-#endif
-
-
-#ifndef Cubit_oneof_Ops
-#define Cubit_oneof_Ops
-void Cubit::oneof:: encodeOp (CORBA::Request &IT_r) const {
-    if (!isSet) return;
-    {
-    CORBA::ULong IT_0 = (CORBA::ULong) __d;
-    IT_r << IT_0;
-    }
-    switch (__d) {
-        case Cubit::e_0th: 
-        IT_r.insertOctet (_o_);
-        break;
-        case Cubit::e_1st: 
-        IT_r << _s_;
-        break;
-        case Cubit::e_2nd: 
-        IT_r << _l_;
-        break;
-        case Cubit::e_3rd: 
-        default: 
-        (*_cm_).encodeOp (IT_r);
-        break;
-    }
-
-}
-
-void Cubit::oneof:: decodeOp (CORBA::Request &IT_r) {
-    isSet = 0;
-    {
-    CORBA::ULong IT_1;
-    IT_r >> IT_1;
-    __d = Cubit::discrim(IT_1);
-    }
-    switch (__d) {
-        case Cubit::e_0th: 
-        if (!isSet) {
-            isSet = 1;
-        }
-        IT_r.extractOctet (_o_);
-        break;
-        case Cubit::e_1st: 
-        if (!isSet) {
-            isSet = 1;
-        }
-        IT_r >> _s_;
-        break;
-        case Cubit::e_2nd: 
-        if (!isSet) {
-            isSet = 1;
-        }
-        IT_r >> _l_;
-        break;
-        case Cubit::e_3rd: 
-        default: 
-        if (!isSet) {
-            _cm_ = new Cubit::Many;
-            isSet = 1;
-        }
-        (*_cm_).decodeOp (IT_r);
-        break;
-    }
-
-}
-void Cubit::oneof:: decodeInOutOp (CORBA::Request &IT_r) {
-    Cubit::discrim IT_d;
-    {
-    CORBA::ULong IT_2;
-    IT_r >> IT_2;
-    IT_d = Cubit::discrim(IT_2);
-    }
-    if (IT_d == __d)
-        switch (__d) {
-            case Cubit::e_0th: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r.extractOctet (_o_);
-            break;
-            case Cubit::e_1st: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r >> _s_;
-            break;
-            case Cubit::e_2nd: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r >> _l_;
-            break;
-            case Cubit::e_3rd: 
-            default: 
-            if (!isSet) {
-                _cm_ = new Cubit::Many;
-                isSet = 1;
-            }
-            (*_cm_).decodeInOutOp (IT_r);
-            break;
-        }
-
-    else {
-        this->oneof:: ~oneof();
-        memset(this, 0, sizeof(*this));
-        __d = IT_d;
-        switch (__d) {
-            case Cubit::e_0th: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r.extractOctet (_o_);
-            break;
-            case Cubit::e_1st: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r >> _s_;
-            break;
-            case Cubit::e_2nd: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r >> _l_;
-            break;
-            case Cubit::e_3rd: 
-            default: 
-            if (!isSet) {
-                _cm_ = new Cubit::Many;
-                isSet = 1;
-            }
-            (*_cm_).decodeOp (IT_r);
-            break;
-        }
-        isSet = 1;
-    }
-
-}
-
-Cubit::oneof:: oneof() { 
-    memset(this, 0, sizeof(*this));
-    isSet = 0;
-}
-
-Cubit::oneof ::~oneof() {
-    if (!isSet) return;
-    switch (__d) { 
-        case Cubit::e_0th:         break;
-        case Cubit::e_1st:         break;
-        case Cubit::e_2nd:         break;
-        case Cubit::e_3rd: 
-        default:         if (_cm_) delete _cm_;
-        break;
-    }
-
-    isSet = 0;
-}
-
-Cubit::oneof:: oneof (const Cubit::oneof &IT_s) {
-    isSet = 0;
-    memset(this, 0, sizeof(*this));
-    __d = IT_s.__d;
-    switch (__d) {
-        case Cubit::e_0th:         isSet = 1;
-        _o_ = IT_s._o_;
-        break;
-        case Cubit::e_1st:         isSet = 1;
-        _s_ = IT_s._s_;
-        break;
-        case Cubit::e_2nd:         isSet = 1;
-        _l_ = IT_s._l_;
-        break;
-        case Cubit::e_3rd: 
-        default: 
-        if (!isSet) {
-            _cm_ = new Cubit::Many;
-            isSet = 1;
-        }
-        *(_cm_) = *(IT_s._cm_);
-        break;
-    }
-    isSet = 1;
-}
-
-Cubit::oneof& Cubit::oneof:: operator= (const Cubit::oneof & IT_s) {
-    if (this == &IT_s) return *this;
-    if (isSet && (__d != IT_s.__d))
-    {
-        this-> oneof::~oneof();
-        memset(this, 0, sizeof(*this));
-    }
-
-    __d = IT_s.__d;
-    switch (__d) {
-        case Cubit::e_0th:         isSet = 1;
-        _o_ = IT_s._o_;
-        break;
-        case Cubit::e_1st:         isSet = 1;
-        _s_ = IT_s._s_;
-        break;
-        case Cubit::e_2nd:         isSet = 1;
-        _l_ = IT_s._l_;
-        break;
-        case Cubit::e_3rd: 
-        default: 
-        if (!isSet) {
-            _cm_ = new Cubit::Many;
-            isSet = 1;
-        }
-        *(_cm_) = *(IT_s._cm_);
-        break;
-    }
-    isSet = 1;
-    return *this;
-}
-
-
-#endif
-
-void* CubitProxyFactoryClass::New (char *IT_OR, CORBA::Environment&) {
-        return  new class Cubit(IT_OR);}
-
-void* CubitProxyFactoryClass::New (ObjectReference *IT_OR, CORBA::Environment&) {
-        return  new class Cubit(IT_OR);}
-
-void* CubitProxyFactoryClass::New2 () {
-        return  new class Cubit((char*)0);}
-
-CORBA::Object* CubitProxyFactoryClass::NewObject (char *IT_OR, CORBA::Environment&) {
-        return  new class Cubit(IT_OR);}
-
-CORBA::Object* CubitProxyFactoryClass::NewObject (ObjectReference *IT_OR, CORBA::Environment&) {
-        return  new class Cubit(IT_OR);}
-
-CORBA::Object* CubitProxyFactoryClass::New2Object () {
-        return  new class Cubit((char*)0);}
-
-void* CubitProxyFactoryClass::IT_castUp (void *IT_p, char* IT_s, CORBA::Environment &IT_env) {
-      void *IT_l;
-      if (!CORBA::_interfaceCmp (IT_s,Cubit_IR, IT_env))
-         return IT_p;
-      else if (IT_l=CORBA::ObjectFactoryClass::IT_castUp((CORBA::Object*)((class Cubit*)IT_p),IT_s, IT_env))
-         return IT_l;
-      else return NULL;
-    }
-
-
-CORBA::PPTR* CubitProxyFactoryClass::pptr (void *IT_p) {
-       return ((class Cubit*)IT_p)->_pptr ();}
-
-void CubitProxyFactoryClass::baseInterfaces (_IDL_SEQUENCE_string& seq) {
-      add (seq, Cubit_IR);
-      CORBA::ObjectFactoryClass::baseInterfaces (seq);
-}
-
-CubitProxyFactoryClass CubitProxyFactory(1);
-
-CORBA::Octet Cubit:: cube_octet (CORBA::Octet o, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        return 0;
-    }
-    CORBA::Request IT_r (this, "cube_octet",IT_env,1,0);
-    if (!IT_r.isException (IT_env)) {
-
-        IT_r.insertOctet (o);
-    }
-
-    IT_r.invoke (CORBA::Flags(0),IT_env);
-    if (!IT_r.isException (IT_env)) {
-        CORBA::Octet IT_result;
-        IT_r.extractOctet (IT_result);
-        IT_r.checkEnv (IT_env);
-        return IT_result;
-    }
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-    return 0;
-}
-
-CORBA::Short Cubit:: cube_short (CORBA::Short s, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        return 0;
-    }
-    CORBA::Request IT_r (this, "cube_short",IT_env,1,0);
-    if (!IT_r.isException (IT_env)) {
-
-        IT_r << s;
-    }
-
-    IT_r.invoke (CORBA::Flags(0),IT_env);
-    if (!IT_r.isException (IT_env)) {
-        CORBA::Short IT_result;
-        IT_r >> IT_result;
-        IT_r.checkEnv (IT_env);
-        return IT_result;
-    }
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-    return 0;
-}
-
-CORBA::Long Cubit:: cube_long (CORBA::Long l, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        return 0;
-    }
-    CORBA::Request IT_r (this, "cube_long",IT_env,1,0);
-    if (!IT_r.isException (IT_env)) {
-
-        IT_r << l;
-    }
-
-    IT_r.invoke (CORBA::Flags(0),IT_env);
-    if (!IT_r.isException (IT_env)) {
-        CORBA::Long IT_result;
-        IT_r >> IT_result;
-        IT_r.checkEnv (IT_env);
-        return IT_result;
-    }
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-    return 0;
-}
-
-Cubit::Many Cubit:: cube_struct (const Cubit::Many& values, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        { 
-            Cubit::Many IT_l0;
-            return IT_l0;
-        }
-    }
-    CORBA::Request IT_r (this, "cube_struct",IT_env,1,0);
-    if (!IT_r.isException (IT_env)) {
-
-        values.encodeOp (IT_r);
-    }
-
-    IT_r.invoke (CORBA::Flags(0),IT_env);
-    if (!IT_r.isException (IT_env)) {
-        Cubit::Many IT_result;
-        IT_result.decodeOp (IT_r);
-        IT_r.checkEnv (IT_env);
-        return IT_result;
-    }
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-    { 
-        Cubit::Many IT_l1;
-        return IT_l1;
-    }
-}
-
-Cubit::oneof Cubit:: cube_union (const Cubit::oneof& values, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        { 
-            Cubit::oneof IT_l0;
-            return IT_l0;
-        }
-    }
-    CORBA::Request IT_r (this, "cube_union",IT_env,1,0);
-    if (!IT_r.isException (IT_env)) {
-
-        values.encodeOp (IT_r);
-    }
-
-    IT_r.invoke (CORBA::Flags(0),IT_env);
-    if (!IT_r.isException (IT_env)) {
-        Cubit::oneof IT_result;
-        IT_result.decodeOp (IT_r);
-        IT_r.checkEnv (IT_env);
-        return IT_result;
-    }
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-    { 
-        Cubit::oneof IT_l1;
-        return IT_l1;
-    }
-}
-
-void Cubit:: please_exit (CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        return ;
-    }
-    CORBA::Request IT_r (this, "please_exit",IT_env,1,1);
-
-    IT_r.invoke (CORBA::Flags(CORBA::INV_NO_RESPONSE), IT_env);
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-}
-
-
-
-
-
-#ifndef Cubit_dispatch_impl
-
-unsigned char Cubit_dispatch::dispatch (CORBA::Request &IT_r, 
-    unsigned char, void *) {
-      IT_r.makeRuntimeException1 ("Cubit");
-      return 0;
-}
- 
-#endif
-
diff --git a/TAO/tests/Cubit/Orbix/factory_client/Makefile b/TAO/tests/Cubit/Orbix/factory_client/Makefile
deleted file mode 100644
index de2877537b6..00000000000
--- a/TAO/tests/Cubit/Orbix/factory_client/Makefile
+++ /dev/null
@@ -1,77 +0,0 @@
-#----------------------------------------------------------------------------
-#	@(#)Makefile	1.1	10/18/96
-#
-#	Makefile for the ACE_MT_CORBA_Handler tests
-#----------------------------------------------------------------------------
-
-#----------------------------------------------------------------------------
-#	Local macros
-#----------------------------------------------------------------------------
-
-SRC = cubitC.cpp client.cpp
-
-CLT_OBJS = cubitC.o client.o
-
-LDLIBS	 = 
-
-VLDLIBS	 = $(LDLIBS:%=%$(VAR))
-
-#----------------------------------------------------------------------------
-#	Include macros and targets
-#----------------------------------------------------------------------------
-
-include		$(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-include		$(ACE_ROOT)/include/makeinclude/macros.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.common.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.lib.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.bin.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
-
-#----------------------------------------------------------------------------
-#	Orbix related macros and target settings.
-#----------------------------------------------------------------------------
-
-
-ORBIX_BINDIR    = $(ORBIX_ROOT)/bin
-ORBIX_LIBDIR    = $(ORBIX_ROOT)/corba2/lib
-ORBIX_INCDIR    = $(ORBIX_ROOT)/corba2/include
-
-CPPFLAGS += -DEXCEPTIONS -I$(ORBIX_INCDIR) -DWANT_ORBIX_FDS
-LDFLAGS  += -L$(ORBIX_LIBDIR) -R $(ORBIX_LIBDIR) -L$(ACE)/ace
-
-IDLFLAGS = -s S.cpp -c C.cpp -B
-
-#----------------------------------------------------------------------------
-#	Local targets
-#----------------------------------------------------------------------------
-
-all: client 
-
-client: $(addprefix $(VDIR),$(CLT_OBJS))
-	$(LINK.cc) -o client $(addprefix $(VDIR),$(CLT_OBJS)) $(LDFLAGS) $(ITIIOP) $(ITCLT) $(VLDLIBS)
-
-
-#----------------------------------------------------------------------------
-#	Dependencies
-#----------------------------------------------------------------------------
-# DO NOT DELETE THIS LINE -- g++dep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-
-.obj/cubitC.o .shobj/cubitC.so: cubitC.cpp cubit.h
-.obj/client.o .shobj/client.so: client.cpp $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/config-sunos5.5-sunc++-4.x.h \
- $(ACE_ROOT)/ace/stdcpp.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i cubit.h
-
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/tests/Cubit/Orbix/factory_client/client.cpp b/TAO/tests/Cubit/Orbix/factory_client/client.cpp
deleted file mode 100644
index c61cfbc85a5..00000000000
--- a/TAO/tests/Cubit/Orbix/factory_client/client.cpp
+++ /dev/null
@@ -1,235 +0,0 @@
-//**************************************************************************
-//
-// NAME :   client.C 
-// DESCRIPTION:  
-//
-// Client for the Cubit example
-//
-//****************************************************************************
-
-#include "ace/OS.h"
-#include "ace/Get_Opt.h"
-#include "cubit.h"
-
-int LOOP_COUNT;
-char SERVER_HOST [1024];
-
-inline int func (unsigned i) { return i - 117; }
-void run_tests (Cubit_var, int);
-
-// = TITLE
-//     Parses the command line arguments and returns an error status
-//
-// = DESCRIPTION
-//     This method parses the command line arguments
-int parse_args(int argc, char *argv[])
-{
-  ACE_OS::strcpy (SERVER_HOST, "localhost");
-  ACE_Get_Opt opts (argc, argv, "dh:n:O:x");
-  int			c;
-  
-  while ((c = opts ()) != -1)
-    switch (c) {
-    case 'h':
-      ACE_OS::strcpy (SERVER_HOST, opts.optarg);
-      continue;
-    case 'd':  // debug flag
-      continue;
-      
-    case 'n':			// loop count
-      LOOP_COUNT = (unsigned) ACE_OS::atoi (opts.optarg);
-      continue;
-      
-    case 'O':			// stringified objref
-      continue;
-      
-    case 'x':
-      continue;
-      
-    case '?':
-    default:
-      ACE_OS::fprintf (stderr, "usage:  %s"
-                       " [-d]"
-                       " [-n loopcount]"
-                       " [-h SERVER_HOST]"
-                       " [-x]"
-                       "\n", argv [0]
-                       );
-      return 1;
-    }
-  
-  return 0;  // Indicates successful parsing of command line
-}
-
-
-//
-// Mainline
-//
-int
-main (int argc, char *argv[])
-{
-  if (parse_args (argc, argv) != 0)
-    return -1;
-
-  Cubit_var cb;
-  Cubit_Factory_var cf;
-  
-  // cout << "attempting to contact server at host " << SERVER_HOST << '\n' ;
- 
-  //
-  // Initialise client's binding to an
-  // arbitrary cubit server (at some host)
-  // 
-  TRY {
-    cf = Cubit_Factory::_bind ("", SERVER_HOST, IT_X);
-  }
-  CATCHANY {
-    cerr << "Binding failed: " << IT_X;
-  }
-  ENDTRY;
-  cb = cf->create_cubit ("My_Cubit");
-  
-  run_tests (cb, LOOP_COUNT);
-  return 0;
-}
-
-
-void
-run_tests (Cubit_var cb, int loop_count) 
-{
-    //
-  // Make the calls in a loop.
-  //
-  unsigned i;
-  unsigned call_count, error_count;
-
-  call_count = 0;
-  error_count = 0;
-
-  ACE_Time_Value before, after;
-
-  before = ACE_OS::gettimeofday();
-  
-  //
-  // Cube an octet.
-  //
-  
-  for (i = 0; i < loop_count; i++)
-    {
-
-      call_count++;
-
-      CORBA::Octet arg_octet = func (i), ret_octet;
-
-      TRY {
-      ret_octet = cb->cube_octet (arg_octet);
-      } 
-      CATCHANY {
-        cerr << "Call failed: " << IT_X;
-        error_count++;
-      } 
-      ENDTRY;
-      arg_octet = arg_octet * arg_octet * arg_octet;
-      if (arg_octet != ret_octet) {
-        ACE_OS::printf ("** cube_octet(%d)  (--> %d)\n", arg_octet , ret_octet);
-        error_count++;
-      }
-    
-  
-  //
-  // Cube a short.
-  //
-      call_count++;
-
-      CORBA::Short arg_short = func (i), ret_short;
-
-      TRY {
-      ret_short = cb->cube_short (arg_short);
-      } 
-      CATCHANY {
-        cerr << "Call failed: " << IT_X;
-        error_count++;
-      } 
-      ENDTRY;
-      arg_short = arg_short * arg_short * arg_short;
-      if (arg_short != ret_short) {
-        ACE_OS::printf ("** cube_short(%d)  (--> %d)\n", arg_short , ret_short);
-        error_count++;
-      }
-
-  //
-  // Cube a long.
-  //
-  
-      call_count++;
-
-      CORBA::Long arg_long = func (i), ret_long;
-
-      TRY {
-      ret_long = cb->cube_long (arg_long);
-      } 
-      CATCHANY {
-        cerr << "Call failed: " << IT_X;
-      } 
-      ENDTRY;
-      arg_long = arg_long * arg_long * arg_long;
-      if (arg_long != ret_long) {
-        ACE_OS::printf ("** cube_long(%d)  (--> %d)\n", arg_long , ret_long);
-        error_count++;
-      }
-
-
-      //
-      // Cube a "struct" ...
-      //
-      Cubit::Many	arg_struct, ret_struct;
-      
-       call_count++;
-       
-       arg_struct.l = func (i);
-       arg_struct.s = func (i);
-       arg_struct.o = func (i);
-       
-       TRY {
-         ret_struct = cb->cube_struct (arg_struct);
-       }
-       CATCHANY {
-         cerr << "Call failed: " << IT_X;
-         error_count++;
-       } 
-       ENDTRY;
-       arg_struct.l = arg_struct.l  * arg_struct.l  * arg_struct.l ;
-       arg_struct.s = arg_struct.s  * arg_struct.s  * arg_struct.s ;
-       arg_struct.o = arg_struct.o  * arg_struct.o  * arg_struct.o ;
-       
-       if (arg_struct.l  != ret_struct.l 
-           || arg_struct.s  != ret_struct.s 
-           || arg_struct.o  != ret_struct.o )
-         {
-           cerr << "** cube_struct ERROR\n";
-           error_count++;
-         }
-    }
-    
-  
-  after = ACE_OS::gettimeofday();
-  
-  if (call_count > 0) 
-    {
-      if (error_count == 0)
-        {
-          ACE_Time_Value diff = after - before;
-          unsigned long	us = diff.sec() * 1000 * 1000 + diff.usec();
-          
-          us /= call_count;
-          
-          if (us > 0)
-            ACE_OS::printf ("cube average call ACE_OS::time\t= %ld.%.03ldms, \t"
-                            "%ld calls/second\n",
-                            us / 1000, us % 1000,
-                            1000000L / us);
-        }
-      
-      ACE_OS::printf ("%d calls, %d errors\n", call_count, error_count);
-    }
-}
diff --git a/TAO/tests/Cubit/Orbix/factory_client/cubit.h b/TAO/tests/Cubit/Orbix/factory_client/cubit.h
deleted file mode 100644
index 72e2fb81395..00000000000
--- a/TAO/tests/Cubit/Orbix/factory_client/cubit.h
+++ /dev/null
@@ -1,1111 +0,0 @@
-
-#ifndef cubit_hh
-#define cubit_hh
-
-#include <CORBA.h>
-
-#include <string.h>
-
-
-#ifndef _Cubit_defined
-#define _Cubit_defined
-class Cubit_dispatch : public virtual CORBA::PPTR {
-public:
-
-      Cubit_dispatch (void *IT_p, CORBA::Object* IT_o, const char *IT_m, 
-        CORBA::LoaderClass *IT_l, char *IT_i, void* IT_im)
-       : PPTR (IT_p,IT_o,IT_m,IT_l,IT_i,IT_im) {}
-
-
-   Cubit_dispatch (char *IT_OR, void *IT_p, CORBA::Object *IT_o)
-       : PPTR (IT_OR,IT_p,IT_o) {}
-
-
-   Cubit_dispatch () {}
-
-   Cubit_dispatch (ObjectReference *IT_OR, void *IT_p, CORBA::Object *IT_o)
-       : PPTR (IT_OR,IT_p,IT_o) {}
-
-
-   Cubit_dispatch (void *IT_p, CORBA::Object *IT_o, const char *IT_m, 
-        char *IT_i, CORBA::Object* IT_ob, void* IT_im)
-       : PPTR (IT_p,IT_o,IT_m,IT_i,IT_ob,IT_im) {}
-
-
-   virtual unsigned char dispatch (CORBA::Request &IT_r, 
-        unsigned char IT_isTarget, void* IT_pp=NULL);
-
-
-};
-
-class Cubit;
-
-#ifndef CubitPtr
-#define CubitPtr
-
-typedef Cubit* Cubit_ptr;
-
-typedef Cubit* CubitRef;
-
-#endif
-
-
-#ifndef CubitForwH
-#define CubitForwH
-CORBA::ObjectRef Cubit_getBase (void *);
-void Cubit_release (Cubit *, CORBA::Environment &IT_env);
-void Cubit_release (Cubit_ptr);
-Cubit* Cubit_duplicate (Cubit_ptr, CORBA::Environment &IT_env);
-Cubit* Cubit_duplicate (Cubit_ptr );
-Cubit_ptr Cubit_nil (CORBA::Environment &IT_env);
-Cubit_ptr Cubit_nil ();
-#endif
-#define Cubit_IMPL "Cubit"
-
-
-class Cubit;
-
-typedef Cubit CubitProxy;
-#define Cubit_IR "Cubit$v1.1"
-#define Cubit_IMPL "Cubit"
-
-#ifndef CubitPtr
-#define CubitPtr
-
-typedef Cubit* Cubit_ptr;
-
-typedef Cubit* CubitRef;
-
-#endif
-
-class Cubit: public virtual CORBA::Object  {
-public:
-        Cubit (char *IT_OR);
-    Cubit (ObjectReference *IT_OR);
-    Cubit () : CORBA::Object  (1) {}
-protected:
-    Cubit_ptr __duplicate(
-            CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) {
-       CORBA::Object::__duplicate (IT_env);
-       return this;
-    }
-public:
-    static Cubit_ptr _duplicate(
-            Cubit_ptr, 
-            CORBA::Environment &IT_pEnv=CORBA::IT_chooseDefaultEnv ());
-public:
-   static Cubit* _bind (const char* IT_markerServer, const char* host,
-		const CORBA::Context &IT_c, 
-		CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-   static Cubit* _bind (CORBA::Environment &IT_env);
-   static Cubit* _bind (const char* IT_markerServer=NULL, const char* host=NULL,
-                 CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-    static Cubit* _narrow (CORBA::Object* , CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-    static Cubit_ptr _nil (CORBA::Environment &IT_pEnv=CORBA::IT_chooseDefaultEnv ()) {
-        CORBA::EnvExcRaiser IT_raise;
-        CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-        return (Cubit_ptr) CORBA::OBJECT_NIL;}
-
-#ifndef Cubit_Many_defined
-#define Cubit_Many_defined
-
-struct Many {
-    CORBA::Octet o;
-    CORBA::Long l;
-    CORBA::Short s;
-
-    void encodeOp (CORBA::Request &IT_r) const;
-    void decodeOp (CORBA::Request &IT_r);
-    void decodeInOutOp (CORBA::Request &IT_r);
-    Many(const Many &);
-    Many();
-    ~Many();
-    Many& operator= (const Many&);
-};
-
-#ifndef Cubit_ManyVarH
-#define Cubit_ManyVarH
-
-#ifndef Cubit_ManyvPtr
-#define Cubit_ManyvPtr
-typedef Many* Many_vPtr;
-typedef const Many* Many_cvPtr;
-#endif
-
-class Many_var : public CORBA::_var
-{
-    private:
-
-    unsigned char copyHelper (const Many_var &IT_s) {
-        if (!IT_s._ptr) {
-            _ptr = IT_s._ptr;
-        } else
-        {
-            _ptr = new Many;
-            *(_ptr) =  *(IT_s._ptr);
-        }
-        return 1;
-    }
-
-    public:
-
-    Many_var (const Many_var &IT_s) {
-        (void) copyHelper (IT_s);
-    }
-
-    Many_var () {
-        _ptr =  new Many;
-;
-    }
-
-    Many_var (Many *IT_p) {
-        _ptr = IT_p;
-    }
-
-    Many_var &operator= (Many *IT_p) {
-        if (_ptr != IT_p) {
-            delete _ptr;
-        }
-        _ptr = IT_p;
-        return (*this);
-    }
-
-    Many_var &operator= (const Many_var &IT_s) {
-        if (_ptr != IT_s._ptr) {
-            delete _ptr;
-        }
-        _ptr = new Many;
-        *(_ptr) =  *(IT_s._ptr);
-        return (*this);
-    }
-
-    ~Many_var () {
-        delete _ptr;
-    }
-
-    Many* operator-> () {
-        return _ptr;
-    }
-
-    operator Many_cvPtr () const { return _ptr;}
-    operator Many_vPtr& () { return _ptr;}
-    operator Many& () const { return * _ptr;}
-
-    protected:
-    Many *_ptr;
-    private:
-    Many_var &operator= (const CORBA::_var &IT_s);
-    Many_var (const CORBA::_var &IT_s);
-};
-
-#endif
-
-
-#endif
-
-enum discrim {e_0th,e_1st,e_2nd,e_3rd,e_4th,e_5th, IT__ENUM_Cubit_discrim=CORBA_ULONG_MAX};
-
-#ifndef Cubit_oneof_defined
-#define Cubit_oneof_defined
-
-struct oneof {
-    private:
-
-    discrim __d;
-    union {
-        CORBA::Octet _o_;
-        CORBA::Short _s_;
-        CORBA::Long _l_;
-        Many * _cm_;
-    };
-
-    public:
-
-    void encodeOp (CORBA::Request &IT_r) const;
-    void decodeOp (CORBA::Request &IT_r);
-    void decodeInOutOp (CORBA::Request &IT_r);
-
-    private:
-
-    unsigned char isSet;
-
-    public:
-
-    discrim _d () const { return __d; }
-
-    CORBA::Octet o () const {
-        return _o_;
-    }
-
-    void o (CORBA::Octet IT_member) {
-        if (isSet && (__d != Cubit::e_0th))
-        {
-            this-> oneof::~oneof();
-            memset(this, 0, sizeof(*this));
-        }
-
-        __d = Cubit::e_0th;
-        isSet = 1;
-        _o_ = IT_member;
-    }
-
-    CORBA::Short s () const {
-        return _s_;
-    }
-
-    void s (CORBA::Short IT_member) {
-        if (isSet && (__d != Cubit::e_1st))
-        {
-            this-> oneof::~oneof();
-            memset(this, 0, sizeof(*this));
-        }
-
-        __d = Cubit::e_1st;
-        isSet = 1;
-        _s_ = IT_member;
-    }
-
-    CORBA::Long l () const {
-        return _l_;
-    }
-
-    void l (CORBA::Long IT_member) {
-        if (isSet && (__d != Cubit::e_2nd))
-        {
-            this-> oneof::~oneof();
-            memset(this, 0, sizeof(*this));
-        }
-
-        __d = Cubit::e_2nd;
-        isSet = 1;
-        _l_ = IT_member;
-    }
-
-    Many& cm () {
-        return (*_cm_);
-    }
-
-    const Many& cm () const {
-        return (*_cm_);
-    }
-
-    void cm (const Many& IT_member) {
-        if (isSet && (__d != Cubit::e_3rd))
-        {
-            this-> oneof::~oneof();
-            memset(this, 0, sizeof(*this));
-        }
-
-        __d = Cubit::e_3rd;
-
-        if (!isSet) {
-            _cm_ = new Many;
-            isSet = 1;
-        }
-        *(_cm_) = IT_member;
-    }
-
-
-    oneof();
-    oneof(const oneof &);
-    ~oneof();
-    oneof& operator= (const oneof&);
-};
-
-#ifndef Cubit_oneofVarH
-#define Cubit_oneofVarH
-
-#ifndef Cubit_oneofvPtr
-#define Cubit_oneofvPtr
-typedef oneof* oneof_vPtr;
-typedef const oneof* oneof_cvPtr;
-#endif
-
-class oneof_var : public CORBA::_var
-{
-    private:
-
-    unsigned char copyHelper (const oneof_var &IT_s) {
-        if (!IT_s._ptr) {
-            _ptr = IT_s._ptr;
-        } else
-        {
-            _ptr = new oneof;
-            *(_ptr) =  *(IT_s._ptr);
-        }
-        return 1;
-    }
-
-    public:
-
-    oneof_var (const oneof_var &IT_s) {
-        (void) copyHelper (IT_s);
-    }
-
-    oneof_var () {
-        _ptr = NULL;
-    }
-
-    oneof_var (oneof *IT_p) {
-        _ptr = IT_p;
-    }
-
-    oneof_var &operator= (oneof *IT_p) {
-        if (_ptr != IT_p) {
-            delete _ptr;
-        }
-        _ptr = IT_p;
-        return (*this);
-    }
-
-    oneof_var &operator= (const oneof_var &IT_s) {
-        if (_ptr != IT_s._ptr) {
-            delete _ptr;
-        }
-        _ptr = new oneof;
-        *(_ptr) =  *(IT_s._ptr);
-        return (*this);
-    }
-
-    ~oneof_var () {
-        delete _ptr;
-    }
-
-    oneof* operator-> () {
-        return _ptr;
-    }
-
-    operator oneof_cvPtr () const { return _ptr;}
-    operator oneof_vPtr& () { return _ptr;}
-    operator oneof& () const { return * _ptr;}
-
-    protected:
-    oneof *_ptr;
-    private:
-    oneof_var &operator= (const CORBA::_var &IT_s);
-    oneof_var (const CORBA::_var &IT_s);
-};
-
-#endif
-
-
-#endif
-        virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual Many cube_struct (const Many& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual oneof cube_union (const oneof& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual void please_exit (CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-};
-
-#ifndef CubitVarH
-#define CubitVarH
-
-#ifndef CubitvPtr
-#define CubitvPtr
-typedef Cubit* Cubit_vPtr;
-typedef const Cubit* Cubit_cvPtr;
-#endif
-
-class Cubit_var : public CORBA::_var
-{
-    private:
-
-    unsigned char copyHelper (const Cubit_var &IT_s) {
-        {
-            _ptr = Cubit_duplicate (IT_s._ptr);
-        }
-        return 1;
-    }
-
-    public:
-
-    Cubit_var (const Cubit_var &IT_s) {
-        (void) copyHelper (IT_s);
-    }
-
-    Cubit_var () {
-        _ptr = Cubit_nil ();
-    }
-
-    Cubit_var (Cubit *IT_p) {
-        _ptr = IT_p;
-    }
-
-    Cubit_var &operator= (Cubit *IT_p) {
-        Cubit_release (_ptr);
-        _ptr = IT_p;
-        return (*this);
-    }
-
-    Cubit_var &operator= (const Cubit_var &IT_s) {
-        Cubit_release (_ptr);
-        _ptr = Cubit_duplicate (IT_s._ptr);
-        return (*this);
-    }
-
-    ~Cubit_var () {
-        Cubit_release (_ptr);
-    }
-
-    Cubit* operator-> () {
-        return _ptr;
-    }
-
-    operator Cubit_cvPtr () const { return _ptr;}
-    operator Cubit_vPtr& () { return _ptr;}
-
-    protected:
-    Cubit *_ptr;
-    private:
-    Cubit_var &operator= (const CORBA::_var &IT_s);
-    Cubit_var (const CORBA::_var &IT_s);
-    Cubit_var &operator= (const CORBA::_mgr &IT_s);
-    Cubit_var &operator= (const CORBA::_SeqElem &IT_s);
-    Cubit_var (const CORBA::_mgr &IT_s);
-    Cubit_var (const CORBA::_SeqElem &IT_s);
-};
-
-#endif
-
-
-#ifndef CubitMgrH
-#define CubitMgrH
-
-class Cubit_mgr : public CORBA::_mgr
-{
-    public:
-
-    Cubit_mgr () {
-        _ptr = Cubit_nil ();
-        _release = 1;
-    }
-
-    Cubit_mgr (const Cubit_mgr &IT_s) {
-        _ptr = Cubit_duplicate (IT_s._ptr);
-        _release = 1;
-    }
-
-    Cubit_mgr &operator= (Cubit *IT_p) {
-        if (_ptr && _release)
-            Cubit_release (_ptr);
-        _ptr = IT_p;
-        _release = 1;
-        return (*this);
-    }
-
-    Cubit_mgr &operator= (const Cubit_mgr &IT_s) {
-        if (_ptr && _release)
-            Cubit_release (_ptr);
-        _ptr = Cubit_duplicate(IT_s._ptr);
-        _release = 1;
-        return (*this);
-    }
-
-    Cubit_mgr &operator= (Cubit_var &IT_s) {
-        if (_ptr && _release)
-            Cubit_release (_ptr);
-        _ptr = Cubit_duplicate(IT_s);
-        _release = 1;
-        return (*this);
-    }
-
-    ~Cubit_mgr () {
-        if (_release)
-            Cubit_release (_ptr);
-    }
-
-    unsigned char release () {
-        return _release;
-    }
-
-    void release (unsigned char rel) {
-        _release = rel;
-    }
-
-    operator int () const {
-        return (((CORBA::Object_ptr) _ptr) ? 1 : 0);
-    }
-
-    operator void* () const {
-        return _ptr;
-    }
-
-    operator CORBA::Object * () const {
-        return (CORBA::Object *) _ptr;
-    }
-
-    operator Cubit* () const {
-        return (Cubit*) _ptr;
-    }
-
-    Cubit_ptr operator-> () const {
-        return _ptr;
-    }
-
-    Cubit *_ptr;
-
-    protected:
-
-    unsigned char _release;
-};
-
-typedef Cubit_mgr Cubit_mgr_IT_const;
-#endif
-
-#ifndef CubitSeqElemH
-#define CubitSeqElemH
-
-class Cubit_SeqElem : public CORBA::_SeqElem
-{
-    public:
-
-    Cubit_SeqElem (Cubit_ptr* IT_p, unsigned char rel) {
-        _ptr = IT_p;
-        _release = rel;
-    }
-
-    Cubit_SeqElem &operator= (Cubit_ptr IT_p) {
-        if (_ptr) {
-            if (*(_ptr) && _release)
-                Cubit_release (*(_ptr));
-            *(_ptr) = IT_p;
-        }
-        return (*this);
-    }
-
-    Cubit_SeqElem &operator= (const Cubit_SeqElem &IT_s) {
-        if (_ptr && IT_s._ptr) {
-            if (*(_ptr) && _release)
-                Cubit_release (*(_ptr));
-            *(_ptr) = Cubit_duplicate(*(IT_s._ptr));
-        }
-        return (*this);
-    }
-
-    operator Cubit_ptr () const {
-        return _ptr ? (Cubit_ptr) (*_ptr) : Cubit_nil(); 
-    }
-
-    Cubit_ptr operator->() const { return *_ptr;}
-
-    protected:
-    Cubit_ptr *_ptr;
-    unsigned char _release;
-};
-
-#endif
-
-
-#define TIE_Cubit(X) Cubit##X
-
-#define DEF_TIE_Cubit(X) \
-	class Cubit##X : public virtual Cubit {		\
-	  X* m_obj;						\
-	public:							\
-								\
-								\
-	   Cubit##X  (X *objp, const char* m="", CORBA::LoaderClass *l=0)\
-		: Cubit(), m_obj(objp) {	\
-		m_pptr = new Cubit_dispatch		\
-			(( Cubit*)this,(CORBA::Object*)this,m,l,Cubit_IR,m_obj);	\
-	   }								\
-	   Cubit##X  (CORBA::Object *IT_p, const char* IT_m="", void *IT_q=0)\
-		: Cubit() {	\
-		m_pptr = new Cubit_dispatch		\
-			(( Cubit*)this,(CORBA::Object*)this,IT_m,Cubit_IR,IT_p,IT_q);	\
-		m_obj = (X*)(m_pptr->getImplObj ());			\
-	   }								\
-								\
-	   virtual ~Cubit##X  () {				\
-		if (_okToDeleteImpl ()) delete m_obj; }					\
-	   virtual void* _deref () {					\
-		return m_obj; }					\
-								\
-virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_octet (  o,IT_env);\
-}\
-	\
-virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_short (  s,IT_env);\
-}\
-	\
-virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_long (  l,IT_env);\
-}\
-	\
-virtual Cubit::Many cube_struct (const Cubit::Many& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_struct (  values,IT_env);\
-}\
-	\
-virtual Cubit::oneof cube_union (const Cubit::oneof& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_union (  values,IT_env);\
-}\
-	\
-virtual void please_exit (CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-m_obj->please_exit (IT_env);\
-}\
-								\
-	};						\
-
-
-#define QUALS_Cubit	\
-virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_octet (  o,IT_env);\
-}\
-	\
-virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_short (  s,IT_env);\
-}\
-	\
-virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_long (  l,IT_env);\
-}\
-	\
-virtual Many cube_struct (const Many& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_struct (  values,IT_env);\
-}\
-	\
-virtual oneof cube_union (const oneof& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_union (  values,IT_env);\
-}\
-	\
-virtual void please_exit (CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-m_obj->please_exit (IT_env);\
-}\
-
-
-
-
-class CubitProxyFactoryClass : public virtual CORBA::ObjectFactoryClass {
-public:
-   CubitProxyFactoryClass (unsigned char IT_p=0)
-		: CORBA::ProxyFactory (Cubit_IR, IT_p) {}
-
-    virtual void* New (char *IT_OR, CORBA::Environment&);
-
-    virtual void* New (ObjectReference *IT_OR, CORBA::Environment&);
-
-    virtual void* New2 (); 
-
-    virtual CORBA::Object* NewObject (char *IT_OR, CORBA::Environment&);
-
-    virtual CORBA::Object* NewObject (ObjectReference *IT_OR, CORBA::Environment&);
-
-    virtual CORBA::Object* New2Object (); 
-
-    virtual void* IT_castUp (void *IT_p, char* IT_s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-
-    virtual CORBA::PPTR* pptr (void *IT_p);
-
-    virtual void baseInterfaces (_IDL_SEQUENCE_string&);
-
-
-};
-
-extern CubitProxyFactoryClass CubitProxyFactory;
-
-class CubitBOAImpl : public virtual Cubit  {
-public:
-    CubitBOAImpl (const char *m="", CORBA::LoaderClass *l=NULL) {
-  if (CORBA::PPTR::isOK (m_pptr, Cubit_IR))
-    m_pptr = new Cubit_dispatch ( (Cubit*)this,
-   	 (CORBA::Object*)this, m, l, Cubit_IR, this);
-}
-
-        virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual Many cube_struct (const Many& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual oneof cube_union (const oneof& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual void please_exit (CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-};
-
-
-#endif
-
-
-#ifndef _Cubit_Factory_defined
-#define _Cubit_Factory_defined
-class Cubit_Factory_dispatch : public virtual CORBA::PPTR {
-public:
-
-      Cubit_Factory_dispatch (void *IT_p, CORBA::Object* IT_o, const char *IT_m, 
-        CORBA::LoaderClass *IT_l, char *IT_i, void* IT_im)
-       : PPTR (IT_p,IT_o,IT_m,IT_l,IT_i,IT_im) {}
-
-
-   Cubit_Factory_dispatch (char *IT_OR, void *IT_p, CORBA::Object *IT_o)
-       : PPTR (IT_OR,IT_p,IT_o) {}
-
-
-   Cubit_Factory_dispatch () {}
-
-   Cubit_Factory_dispatch (ObjectReference *IT_OR, void *IT_p, CORBA::Object *IT_o)
-       : PPTR (IT_OR,IT_p,IT_o) {}
-
-
-   Cubit_Factory_dispatch (void *IT_p, CORBA::Object *IT_o, const char *IT_m, 
-        char *IT_i, CORBA::Object* IT_ob, void* IT_im)
-       : PPTR (IT_p,IT_o,IT_m,IT_i,IT_ob,IT_im) {}
-
-
-   virtual unsigned char dispatch (CORBA::Request &IT_r, 
-        unsigned char IT_isTarget, void* IT_pp=NULL);
-
-
-};
-
-class Cubit_Factory;
-
-#ifndef Cubit_FactoryPtr
-#define Cubit_FactoryPtr
-
-typedef Cubit_Factory* Cubit_Factory_ptr;
-
-typedef Cubit_Factory* Cubit_FactoryRef;
-
-#endif
-
-
-#ifndef Cubit_FactoryForwH
-#define Cubit_FactoryForwH
-CORBA::ObjectRef Cubit_Factory_getBase (void *);
-void Cubit_Factory_release (Cubit_Factory *, CORBA::Environment &IT_env);
-void Cubit_Factory_release (Cubit_Factory_ptr);
-Cubit_Factory* Cubit_Factory_duplicate (Cubit_Factory_ptr, CORBA::Environment &IT_env);
-Cubit_Factory* Cubit_Factory_duplicate (Cubit_Factory_ptr );
-Cubit_Factory_ptr Cubit_Factory_nil (CORBA::Environment &IT_env);
-Cubit_Factory_ptr Cubit_Factory_nil ();
-#endif
-#define Cubit_Factory_IMPL "Cubit_Factory"
-
-
-class Cubit_Factory;
-
-typedef Cubit_Factory Cubit_FactoryProxy;
-#define Cubit_Factory_IR "Cubit_Factory"
-#define Cubit_Factory_IMPL "Cubit_Factory"
-
-#ifndef Cubit_FactoryPtr
-#define Cubit_FactoryPtr
-
-typedef Cubit_Factory* Cubit_Factory_ptr;
-
-typedef Cubit_Factory* Cubit_FactoryRef;
-
-#endif
-
-class Cubit_Factory: public virtual CORBA::Object  {
-public:
-        Cubit_Factory (char *IT_OR);
-    Cubit_Factory (ObjectReference *IT_OR);
-    Cubit_Factory () : CORBA::Object  (1) {}
-protected:
-    Cubit_Factory_ptr __duplicate(
-            CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) {
-       CORBA::Object::__duplicate (IT_env);
-       return this;
-    }
-public:
-    static Cubit_Factory_ptr _duplicate(
-            Cubit_Factory_ptr, 
-            CORBA::Environment &IT_pEnv=CORBA::IT_chooseDefaultEnv ());
-public:
-   static Cubit_Factory* _bind (const char* IT_markerServer, const char* host,
-		const CORBA::Context &IT_c, 
-		CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-   static Cubit_Factory* _bind (CORBA::Environment &IT_env);
-   static Cubit_Factory* _bind (const char* IT_markerServer=NULL, const char* host=NULL,
-                 CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-    static Cubit_Factory* _narrow (CORBA::Object* , CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-    static Cubit_Factory_ptr _nil (CORBA::Environment &IT_pEnv=CORBA::IT_chooseDefaultEnv ()) {
-        CORBA::EnvExcRaiser IT_raise;
-        CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-        return (Cubit_Factory_ptr) CORBA::OBJECT_NIL;}
-        virtual Cubit_ptr create_cubit (const char * name, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-};
-
-#ifndef Cubit_FactoryVarH
-#define Cubit_FactoryVarH
-
-#ifndef Cubit_FactoryvPtr
-#define Cubit_FactoryvPtr
-typedef Cubit_Factory* Cubit_Factory_vPtr;
-typedef const Cubit_Factory* Cubit_Factory_cvPtr;
-#endif
-
-class Cubit_Factory_var : public CORBA::_var
-{
-    private:
-
-    unsigned char copyHelper (const Cubit_Factory_var &IT_s) {
-        {
-            _ptr = Cubit_Factory_duplicate (IT_s._ptr);
-        }
-        return 1;
-    }
-
-    public:
-
-    Cubit_Factory_var (const Cubit_Factory_var &IT_s) {
-        (void) copyHelper (IT_s);
-    }
-
-    Cubit_Factory_var () {
-        _ptr = Cubit_Factory_nil ();
-    }
-
-    Cubit_Factory_var (Cubit_Factory *IT_p) {
-        _ptr = IT_p;
-    }
-
-    Cubit_Factory_var &operator= (Cubit_Factory *IT_p) {
-        Cubit_Factory_release (_ptr);
-        _ptr = IT_p;
-        return (*this);
-    }
-
-    Cubit_Factory_var &operator= (const Cubit_Factory_var &IT_s) {
-        Cubit_Factory_release (_ptr);
-        _ptr = Cubit_Factory_duplicate (IT_s._ptr);
-        return (*this);
-    }
-
-    ~Cubit_Factory_var () {
-        Cubit_Factory_release (_ptr);
-    }
-
-    Cubit_Factory* operator-> () {
-        return _ptr;
-    }
-
-    operator Cubit_Factory_cvPtr () const { return _ptr;}
-    operator Cubit_Factory_vPtr& () { return _ptr;}
-
-    protected:
-    Cubit_Factory *_ptr;
-    private:
-    Cubit_Factory_var &operator= (const CORBA::_var &IT_s);
-    Cubit_Factory_var (const CORBA::_var &IT_s);
-    Cubit_Factory_var &operator= (const CORBA::_mgr &IT_s);
-    Cubit_Factory_var &operator= (const CORBA::_SeqElem &IT_s);
-    Cubit_Factory_var (const CORBA::_mgr &IT_s);
-    Cubit_Factory_var (const CORBA::_SeqElem &IT_s);
-};
-
-#endif
-
-
-#ifndef Cubit_FactoryMgrH
-#define Cubit_FactoryMgrH
-
-class Cubit_Factory_mgr : public CORBA::_mgr
-{
-    public:
-
-    Cubit_Factory_mgr () {
-        _ptr = Cubit_Factory_nil ();
-        _release = 1;
-    }
-
-    Cubit_Factory_mgr (const Cubit_Factory_mgr &IT_s) {
-        _ptr = Cubit_Factory_duplicate (IT_s._ptr);
-        _release = 1;
-    }
-
-    Cubit_Factory_mgr &operator= (Cubit_Factory *IT_p) {
-        if (_ptr && _release)
-            Cubit_Factory_release (_ptr);
-        _ptr = IT_p;
-        _release = 1;
-        return (*this);
-    }
-
-    Cubit_Factory_mgr &operator= (const Cubit_Factory_mgr &IT_s) {
-        if (_ptr && _release)
-            Cubit_Factory_release (_ptr);
-        _ptr = Cubit_Factory_duplicate(IT_s._ptr);
-        _release = 1;
-        return (*this);
-    }
-
-    Cubit_Factory_mgr &operator= (Cubit_Factory_var &IT_s) {
-        if (_ptr && _release)
-            Cubit_Factory_release (_ptr);
-        _ptr = Cubit_Factory_duplicate(IT_s);
-        _release = 1;
-        return (*this);
-    }
-
-    ~Cubit_Factory_mgr () {
-        if (_release)
-            Cubit_Factory_release (_ptr);
-    }
-
-    unsigned char release () {
-        return _release;
-    }
-
-    void release (unsigned char rel) {
-        _release = rel;
-    }
-
-    operator int () const {
-        return (((CORBA::Object_ptr) _ptr) ? 1 : 0);
-    }
-
-    operator void* () const {
-        return _ptr;
-    }
-
-    operator CORBA::Object * () const {
-        return (CORBA::Object *) _ptr;
-    }
-
-    operator Cubit_Factory* () const {
-        return (Cubit_Factory*) _ptr;
-    }
-
-    Cubit_Factory_ptr operator-> () const {
-        return _ptr;
-    }
-
-    Cubit_Factory *_ptr;
-
-    protected:
-
-    unsigned char _release;
-};
-
-typedef Cubit_Factory_mgr Cubit_Factory_mgr_IT_const;
-#endif
-
-#ifndef Cubit_FactorySeqElemH
-#define Cubit_FactorySeqElemH
-
-class Cubit_Factory_SeqElem : public CORBA::_SeqElem
-{
-    public:
-
-    Cubit_Factory_SeqElem (Cubit_Factory_ptr* IT_p, unsigned char rel) {
-        _ptr = IT_p;
-        _release = rel;
-    }
-
-    Cubit_Factory_SeqElem &operator= (Cubit_Factory_ptr IT_p) {
-        if (_ptr) {
-            if (*(_ptr) && _release)
-                Cubit_Factory_release (*(_ptr));
-            *(_ptr) = IT_p;
-        }
-        return (*this);
-    }
-
-    Cubit_Factory_SeqElem &operator= (const Cubit_Factory_SeqElem &IT_s) {
-        if (_ptr && IT_s._ptr) {
-            if (*(_ptr) && _release)
-                Cubit_Factory_release (*(_ptr));
-            *(_ptr) = Cubit_Factory_duplicate(*(IT_s._ptr));
-        }
-        return (*this);
-    }
-
-    operator Cubit_Factory_ptr () const {
-        return _ptr ? (Cubit_Factory_ptr) (*_ptr) : Cubit_Factory_nil(); 
-    }
-
-    Cubit_Factory_ptr operator->() const { return *_ptr;}
-
-    protected:
-    Cubit_Factory_ptr *_ptr;
-    unsigned char _release;
-};
-
-#endif
-
-
-#define TIE_Cubit_Factory(X) Cubit_Factory##X
-
-#define DEF_TIE_Cubit_Factory(X) \
-	class Cubit_Factory##X : public virtual Cubit_Factory {		\
-	  X* m_obj;						\
-	public:							\
-								\
-								\
-	   Cubit_Factory##X  (X *objp, const char* m="", CORBA::LoaderClass *l=0)\
-		: Cubit_Factory(), m_obj(objp) {	\
-		m_pptr = new Cubit_Factory_dispatch		\
-			(( Cubit_Factory*)this,(CORBA::Object*)this,m,l,Cubit_Factory_IR,m_obj);	\
-	   }								\
-	   Cubit_Factory##X  (CORBA::Object *IT_p, const char* IT_m="", void *IT_q=0)\
-		: Cubit_Factory() {	\
-		m_pptr = new Cubit_Factory_dispatch		\
-			(( Cubit_Factory*)this,(CORBA::Object*)this,IT_m,Cubit_Factory_IR,IT_p,IT_q);	\
-		m_obj = (X*)(m_pptr->getImplObj ());			\
-	   }								\
-								\
-	   virtual ~Cubit_Factory##X  () {				\
-		if (_okToDeleteImpl ()) delete m_obj; }					\
-	   virtual void* _deref () {					\
-		return m_obj; }					\
-								\
-virtual Cubit_ptr create_cubit (const char * name, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->create_cubit (  name,IT_env);\
-}\
-								\
-	};						\
-
-
-#define QUALS_Cubit_Factory	\
-virtual Cubit_ptr create_cubit (const char * name, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->create_cubit (  name,IT_env);\
-}\
-
-
-
-
-class Cubit_FactoryProxyFactoryClass : public virtual CORBA::ObjectFactoryClass {
-public:
-   Cubit_FactoryProxyFactoryClass (unsigned char IT_p=0)
-		: CORBA::ProxyFactory (Cubit_Factory_IR, IT_p) {}
-
-    virtual void* New (char *IT_OR, CORBA::Environment&);
-
-    virtual void* New (ObjectReference *IT_OR, CORBA::Environment&);
-
-    virtual void* New2 (); 
-
-    virtual CORBA::Object* NewObject (char *IT_OR, CORBA::Environment&);
-
-    virtual CORBA::Object* NewObject (ObjectReference *IT_OR, CORBA::Environment&);
-
-    virtual CORBA::Object* New2Object (); 
-
-    virtual void* IT_castUp (void *IT_p, char* IT_s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-
-    virtual CORBA::PPTR* pptr (void *IT_p);
-
-    virtual void baseInterfaces (_IDL_SEQUENCE_string&);
-
-
-};
-
-extern Cubit_FactoryProxyFactoryClass Cubit_FactoryProxyFactory;
-
-class Cubit_FactoryBOAImpl : public virtual Cubit_Factory  {
-public:
-    Cubit_FactoryBOAImpl (const char *m="", CORBA::LoaderClass *l=NULL) {
-  if (CORBA::PPTR::isOK (m_pptr, Cubit_Factory_IR))
-    m_pptr = new Cubit_Factory_dispatch ( (Cubit_Factory*)this,
-   	 (CORBA::Object*)this, m, l, Cubit_Factory_IR, this);
-}
-
-        virtual Cubit_ptr create_cubit (const char * name, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-};
-
-
-#endif
-
-
-#endif
diff --git a/TAO/tests/Cubit/Orbix/factory_client/cubit.hh b/TAO/tests/Cubit/Orbix/factory_client/cubit.hh
deleted file mode 100644
index 72e2fb81395..00000000000
--- a/TAO/tests/Cubit/Orbix/factory_client/cubit.hh
+++ /dev/null
@@ -1,1111 +0,0 @@
-
-#ifndef cubit_hh
-#define cubit_hh
-
-#include <CORBA.h>
-
-#include <string.h>
-
-
-#ifndef _Cubit_defined
-#define _Cubit_defined
-class Cubit_dispatch : public virtual CORBA::PPTR {
-public:
-
-      Cubit_dispatch (void *IT_p, CORBA::Object* IT_o, const char *IT_m, 
-        CORBA::LoaderClass *IT_l, char *IT_i, void* IT_im)
-       : PPTR (IT_p,IT_o,IT_m,IT_l,IT_i,IT_im) {}
-
-
-   Cubit_dispatch (char *IT_OR, void *IT_p, CORBA::Object *IT_o)
-       : PPTR (IT_OR,IT_p,IT_o) {}
-
-
-   Cubit_dispatch () {}
-
-   Cubit_dispatch (ObjectReference *IT_OR, void *IT_p, CORBA::Object *IT_o)
-       : PPTR (IT_OR,IT_p,IT_o) {}
-
-
-   Cubit_dispatch (void *IT_p, CORBA::Object *IT_o, const char *IT_m, 
-        char *IT_i, CORBA::Object* IT_ob, void* IT_im)
-       : PPTR (IT_p,IT_o,IT_m,IT_i,IT_ob,IT_im) {}
-
-
-   virtual unsigned char dispatch (CORBA::Request &IT_r, 
-        unsigned char IT_isTarget, void* IT_pp=NULL);
-
-
-};
-
-class Cubit;
-
-#ifndef CubitPtr
-#define CubitPtr
-
-typedef Cubit* Cubit_ptr;
-
-typedef Cubit* CubitRef;
-
-#endif
-
-
-#ifndef CubitForwH
-#define CubitForwH
-CORBA::ObjectRef Cubit_getBase (void *);
-void Cubit_release (Cubit *, CORBA::Environment &IT_env);
-void Cubit_release (Cubit_ptr);
-Cubit* Cubit_duplicate (Cubit_ptr, CORBA::Environment &IT_env);
-Cubit* Cubit_duplicate (Cubit_ptr );
-Cubit_ptr Cubit_nil (CORBA::Environment &IT_env);
-Cubit_ptr Cubit_nil ();
-#endif
-#define Cubit_IMPL "Cubit"
-
-
-class Cubit;
-
-typedef Cubit CubitProxy;
-#define Cubit_IR "Cubit$v1.1"
-#define Cubit_IMPL "Cubit"
-
-#ifndef CubitPtr
-#define CubitPtr
-
-typedef Cubit* Cubit_ptr;
-
-typedef Cubit* CubitRef;
-
-#endif
-
-class Cubit: public virtual CORBA::Object  {
-public:
-        Cubit (char *IT_OR);
-    Cubit (ObjectReference *IT_OR);
-    Cubit () : CORBA::Object  (1) {}
-protected:
-    Cubit_ptr __duplicate(
-            CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) {
-       CORBA::Object::__duplicate (IT_env);
-       return this;
-    }
-public:
-    static Cubit_ptr _duplicate(
-            Cubit_ptr, 
-            CORBA::Environment &IT_pEnv=CORBA::IT_chooseDefaultEnv ());
-public:
-   static Cubit* _bind (const char* IT_markerServer, const char* host,
-		const CORBA::Context &IT_c, 
-		CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-   static Cubit* _bind (CORBA::Environment &IT_env);
-   static Cubit* _bind (const char* IT_markerServer=NULL, const char* host=NULL,
-                 CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-    static Cubit* _narrow (CORBA::Object* , CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-    static Cubit_ptr _nil (CORBA::Environment &IT_pEnv=CORBA::IT_chooseDefaultEnv ()) {
-        CORBA::EnvExcRaiser IT_raise;
-        CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-        return (Cubit_ptr) CORBA::OBJECT_NIL;}
-
-#ifndef Cubit_Many_defined
-#define Cubit_Many_defined
-
-struct Many {
-    CORBA::Octet o;
-    CORBA::Long l;
-    CORBA::Short s;
-
-    void encodeOp (CORBA::Request &IT_r) const;
-    void decodeOp (CORBA::Request &IT_r);
-    void decodeInOutOp (CORBA::Request &IT_r);
-    Many(const Many &);
-    Many();
-    ~Many();
-    Many& operator= (const Many&);
-};
-
-#ifndef Cubit_ManyVarH
-#define Cubit_ManyVarH
-
-#ifndef Cubit_ManyvPtr
-#define Cubit_ManyvPtr
-typedef Many* Many_vPtr;
-typedef const Many* Many_cvPtr;
-#endif
-
-class Many_var : public CORBA::_var
-{
-    private:
-
-    unsigned char copyHelper (const Many_var &IT_s) {
-        if (!IT_s._ptr) {
-            _ptr = IT_s._ptr;
-        } else
-        {
-            _ptr = new Many;
-            *(_ptr) =  *(IT_s._ptr);
-        }
-        return 1;
-    }
-
-    public:
-
-    Many_var (const Many_var &IT_s) {
-        (void) copyHelper (IT_s);
-    }
-
-    Many_var () {
-        _ptr =  new Many;
-;
-    }
-
-    Many_var (Many *IT_p) {
-        _ptr = IT_p;
-    }
-
-    Many_var &operator= (Many *IT_p) {
-        if (_ptr != IT_p) {
-            delete _ptr;
-        }
-        _ptr = IT_p;
-        return (*this);
-    }
-
-    Many_var &operator= (const Many_var &IT_s) {
-        if (_ptr != IT_s._ptr) {
-            delete _ptr;
-        }
-        _ptr = new Many;
-        *(_ptr) =  *(IT_s._ptr);
-        return (*this);
-    }
-
-    ~Many_var () {
-        delete _ptr;
-    }
-
-    Many* operator-> () {
-        return _ptr;
-    }
-
-    operator Many_cvPtr () const { return _ptr;}
-    operator Many_vPtr& () { return _ptr;}
-    operator Many& () const { return * _ptr;}
-
-    protected:
-    Many *_ptr;
-    private:
-    Many_var &operator= (const CORBA::_var &IT_s);
-    Many_var (const CORBA::_var &IT_s);
-};
-
-#endif
-
-
-#endif
-
-enum discrim {e_0th,e_1st,e_2nd,e_3rd,e_4th,e_5th, IT__ENUM_Cubit_discrim=CORBA_ULONG_MAX};
-
-#ifndef Cubit_oneof_defined
-#define Cubit_oneof_defined
-
-struct oneof {
-    private:
-
-    discrim __d;
-    union {
-        CORBA::Octet _o_;
-        CORBA::Short _s_;
-        CORBA::Long _l_;
-        Many * _cm_;
-    };
-
-    public:
-
-    void encodeOp (CORBA::Request &IT_r) const;
-    void decodeOp (CORBA::Request &IT_r);
-    void decodeInOutOp (CORBA::Request &IT_r);
-
-    private:
-
-    unsigned char isSet;
-
-    public:
-
-    discrim _d () const { return __d; }
-
-    CORBA::Octet o () const {
-        return _o_;
-    }
-
-    void o (CORBA::Octet IT_member) {
-        if (isSet && (__d != Cubit::e_0th))
-        {
-            this-> oneof::~oneof();
-            memset(this, 0, sizeof(*this));
-        }
-
-        __d = Cubit::e_0th;
-        isSet = 1;
-        _o_ = IT_member;
-    }
-
-    CORBA::Short s () const {
-        return _s_;
-    }
-
-    void s (CORBA::Short IT_member) {
-        if (isSet && (__d != Cubit::e_1st))
-        {
-            this-> oneof::~oneof();
-            memset(this, 0, sizeof(*this));
-        }
-
-        __d = Cubit::e_1st;
-        isSet = 1;
-        _s_ = IT_member;
-    }
-
-    CORBA::Long l () const {
-        return _l_;
-    }
-
-    void l (CORBA::Long IT_member) {
-        if (isSet && (__d != Cubit::e_2nd))
-        {
-            this-> oneof::~oneof();
-            memset(this, 0, sizeof(*this));
-        }
-
-        __d = Cubit::e_2nd;
-        isSet = 1;
-        _l_ = IT_member;
-    }
-
-    Many& cm () {
-        return (*_cm_);
-    }
-
-    const Many& cm () const {
-        return (*_cm_);
-    }
-
-    void cm (const Many& IT_member) {
-        if (isSet && (__d != Cubit::e_3rd))
-        {
-            this-> oneof::~oneof();
-            memset(this, 0, sizeof(*this));
-        }
-
-        __d = Cubit::e_3rd;
-
-        if (!isSet) {
-            _cm_ = new Many;
-            isSet = 1;
-        }
-        *(_cm_) = IT_member;
-    }
-
-
-    oneof();
-    oneof(const oneof &);
-    ~oneof();
-    oneof& operator= (const oneof&);
-};
-
-#ifndef Cubit_oneofVarH
-#define Cubit_oneofVarH
-
-#ifndef Cubit_oneofvPtr
-#define Cubit_oneofvPtr
-typedef oneof* oneof_vPtr;
-typedef const oneof* oneof_cvPtr;
-#endif
-
-class oneof_var : public CORBA::_var
-{
-    private:
-
-    unsigned char copyHelper (const oneof_var &IT_s) {
-        if (!IT_s._ptr) {
-            _ptr = IT_s._ptr;
-        } else
-        {
-            _ptr = new oneof;
-            *(_ptr) =  *(IT_s._ptr);
-        }
-        return 1;
-    }
-
-    public:
-
-    oneof_var (const oneof_var &IT_s) {
-        (void) copyHelper (IT_s);
-    }
-
-    oneof_var () {
-        _ptr = NULL;
-    }
-
-    oneof_var (oneof *IT_p) {
-        _ptr = IT_p;
-    }
-
-    oneof_var &operator= (oneof *IT_p) {
-        if (_ptr != IT_p) {
-            delete _ptr;
-        }
-        _ptr = IT_p;
-        return (*this);
-    }
-
-    oneof_var &operator= (const oneof_var &IT_s) {
-        if (_ptr != IT_s._ptr) {
-            delete _ptr;
-        }
-        _ptr = new oneof;
-        *(_ptr) =  *(IT_s._ptr);
-        return (*this);
-    }
-
-    ~oneof_var () {
-        delete _ptr;
-    }
-
-    oneof* operator-> () {
-        return _ptr;
-    }
-
-    operator oneof_cvPtr () const { return _ptr;}
-    operator oneof_vPtr& () { return _ptr;}
-    operator oneof& () const { return * _ptr;}
-
-    protected:
-    oneof *_ptr;
-    private:
-    oneof_var &operator= (const CORBA::_var &IT_s);
-    oneof_var (const CORBA::_var &IT_s);
-};
-
-#endif
-
-
-#endif
-        virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual Many cube_struct (const Many& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual oneof cube_union (const oneof& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual void please_exit (CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-};
-
-#ifndef CubitVarH
-#define CubitVarH
-
-#ifndef CubitvPtr
-#define CubitvPtr
-typedef Cubit* Cubit_vPtr;
-typedef const Cubit* Cubit_cvPtr;
-#endif
-
-class Cubit_var : public CORBA::_var
-{
-    private:
-
-    unsigned char copyHelper (const Cubit_var &IT_s) {
-        {
-            _ptr = Cubit_duplicate (IT_s._ptr);
-        }
-        return 1;
-    }
-
-    public:
-
-    Cubit_var (const Cubit_var &IT_s) {
-        (void) copyHelper (IT_s);
-    }
-
-    Cubit_var () {
-        _ptr = Cubit_nil ();
-    }
-
-    Cubit_var (Cubit *IT_p) {
-        _ptr = IT_p;
-    }
-
-    Cubit_var &operator= (Cubit *IT_p) {
-        Cubit_release (_ptr);
-        _ptr = IT_p;
-        return (*this);
-    }
-
-    Cubit_var &operator= (const Cubit_var &IT_s) {
-        Cubit_release (_ptr);
-        _ptr = Cubit_duplicate (IT_s._ptr);
-        return (*this);
-    }
-
-    ~Cubit_var () {
-        Cubit_release (_ptr);
-    }
-
-    Cubit* operator-> () {
-        return _ptr;
-    }
-
-    operator Cubit_cvPtr () const { return _ptr;}
-    operator Cubit_vPtr& () { return _ptr;}
-
-    protected:
-    Cubit *_ptr;
-    private:
-    Cubit_var &operator= (const CORBA::_var &IT_s);
-    Cubit_var (const CORBA::_var &IT_s);
-    Cubit_var &operator= (const CORBA::_mgr &IT_s);
-    Cubit_var &operator= (const CORBA::_SeqElem &IT_s);
-    Cubit_var (const CORBA::_mgr &IT_s);
-    Cubit_var (const CORBA::_SeqElem &IT_s);
-};
-
-#endif
-
-
-#ifndef CubitMgrH
-#define CubitMgrH
-
-class Cubit_mgr : public CORBA::_mgr
-{
-    public:
-
-    Cubit_mgr () {
-        _ptr = Cubit_nil ();
-        _release = 1;
-    }
-
-    Cubit_mgr (const Cubit_mgr &IT_s) {
-        _ptr = Cubit_duplicate (IT_s._ptr);
-        _release = 1;
-    }
-
-    Cubit_mgr &operator= (Cubit *IT_p) {
-        if (_ptr && _release)
-            Cubit_release (_ptr);
-        _ptr = IT_p;
-        _release = 1;
-        return (*this);
-    }
-
-    Cubit_mgr &operator= (const Cubit_mgr &IT_s) {
-        if (_ptr && _release)
-            Cubit_release (_ptr);
-        _ptr = Cubit_duplicate(IT_s._ptr);
-        _release = 1;
-        return (*this);
-    }
-
-    Cubit_mgr &operator= (Cubit_var &IT_s) {
-        if (_ptr && _release)
-            Cubit_release (_ptr);
-        _ptr = Cubit_duplicate(IT_s);
-        _release = 1;
-        return (*this);
-    }
-
-    ~Cubit_mgr () {
-        if (_release)
-            Cubit_release (_ptr);
-    }
-
-    unsigned char release () {
-        return _release;
-    }
-
-    void release (unsigned char rel) {
-        _release = rel;
-    }
-
-    operator int () const {
-        return (((CORBA::Object_ptr) _ptr) ? 1 : 0);
-    }
-
-    operator void* () const {
-        return _ptr;
-    }
-
-    operator CORBA::Object * () const {
-        return (CORBA::Object *) _ptr;
-    }
-
-    operator Cubit* () const {
-        return (Cubit*) _ptr;
-    }
-
-    Cubit_ptr operator-> () const {
-        return _ptr;
-    }
-
-    Cubit *_ptr;
-
-    protected:
-
-    unsigned char _release;
-};
-
-typedef Cubit_mgr Cubit_mgr_IT_const;
-#endif
-
-#ifndef CubitSeqElemH
-#define CubitSeqElemH
-
-class Cubit_SeqElem : public CORBA::_SeqElem
-{
-    public:
-
-    Cubit_SeqElem (Cubit_ptr* IT_p, unsigned char rel) {
-        _ptr = IT_p;
-        _release = rel;
-    }
-
-    Cubit_SeqElem &operator= (Cubit_ptr IT_p) {
-        if (_ptr) {
-            if (*(_ptr) && _release)
-                Cubit_release (*(_ptr));
-            *(_ptr) = IT_p;
-        }
-        return (*this);
-    }
-
-    Cubit_SeqElem &operator= (const Cubit_SeqElem &IT_s) {
-        if (_ptr && IT_s._ptr) {
-            if (*(_ptr) && _release)
-                Cubit_release (*(_ptr));
-            *(_ptr) = Cubit_duplicate(*(IT_s._ptr));
-        }
-        return (*this);
-    }
-
-    operator Cubit_ptr () const {
-        return _ptr ? (Cubit_ptr) (*_ptr) : Cubit_nil(); 
-    }
-
-    Cubit_ptr operator->() const { return *_ptr;}
-
-    protected:
-    Cubit_ptr *_ptr;
-    unsigned char _release;
-};
-
-#endif
-
-
-#define TIE_Cubit(X) Cubit##X
-
-#define DEF_TIE_Cubit(X) \
-	class Cubit##X : public virtual Cubit {		\
-	  X* m_obj;						\
-	public:							\
-								\
-								\
-	   Cubit##X  (X *objp, const char* m="", CORBA::LoaderClass *l=0)\
-		: Cubit(), m_obj(objp) {	\
-		m_pptr = new Cubit_dispatch		\
-			(( Cubit*)this,(CORBA::Object*)this,m,l,Cubit_IR,m_obj);	\
-	   }								\
-	   Cubit##X  (CORBA::Object *IT_p, const char* IT_m="", void *IT_q=0)\
-		: Cubit() {	\
-		m_pptr = new Cubit_dispatch		\
-			(( Cubit*)this,(CORBA::Object*)this,IT_m,Cubit_IR,IT_p,IT_q);	\
-		m_obj = (X*)(m_pptr->getImplObj ());			\
-	   }								\
-								\
-	   virtual ~Cubit##X  () {				\
-		if (_okToDeleteImpl ()) delete m_obj; }					\
-	   virtual void* _deref () {					\
-		return m_obj; }					\
-								\
-virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_octet (  o,IT_env);\
-}\
-	\
-virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_short (  s,IT_env);\
-}\
-	\
-virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_long (  l,IT_env);\
-}\
-	\
-virtual Cubit::Many cube_struct (const Cubit::Many& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_struct (  values,IT_env);\
-}\
-	\
-virtual Cubit::oneof cube_union (const Cubit::oneof& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_union (  values,IT_env);\
-}\
-	\
-virtual void please_exit (CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-m_obj->please_exit (IT_env);\
-}\
-								\
-	};						\
-
-
-#define QUALS_Cubit	\
-virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_octet (  o,IT_env);\
-}\
-	\
-virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_short (  s,IT_env);\
-}\
-	\
-virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_long (  l,IT_env);\
-}\
-	\
-virtual Many cube_struct (const Many& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_struct (  values,IT_env);\
-}\
-	\
-virtual oneof cube_union (const oneof& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_union (  values,IT_env);\
-}\
-	\
-virtual void please_exit (CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-m_obj->please_exit (IT_env);\
-}\
-
-
-
-
-class CubitProxyFactoryClass : public virtual CORBA::ObjectFactoryClass {
-public:
-   CubitProxyFactoryClass (unsigned char IT_p=0)
-		: CORBA::ProxyFactory (Cubit_IR, IT_p) {}
-
-    virtual void* New (char *IT_OR, CORBA::Environment&);
-
-    virtual void* New (ObjectReference *IT_OR, CORBA::Environment&);
-
-    virtual void* New2 (); 
-
-    virtual CORBA::Object* NewObject (char *IT_OR, CORBA::Environment&);
-
-    virtual CORBA::Object* NewObject (ObjectReference *IT_OR, CORBA::Environment&);
-
-    virtual CORBA::Object* New2Object (); 
-
-    virtual void* IT_castUp (void *IT_p, char* IT_s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-
-    virtual CORBA::PPTR* pptr (void *IT_p);
-
-    virtual void baseInterfaces (_IDL_SEQUENCE_string&);
-
-
-};
-
-extern CubitProxyFactoryClass CubitProxyFactory;
-
-class CubitBOAImpl : public virtual Cubit  {
-public:
-    CubitBOAImpl (const char *m="", CORBA::LoaderClass *l=NULL) {
-  if (CORBA::PPTR::isOK (m_pptr, Cubit_IR))
-    m_pptr = new Cubit_dispatch ( (Cubit*)this,
-   	 (CORBA::Object*)this, m, l, Cubit_IR, this);
-}
-
-        virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual Many cube_struct (const Many& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual oneof cube_union (const oneof& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual void please_exit (CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-};
-
-
-#endif
-
-
-#ifndef _Cubit_Factory_defined
-#define _Cubit_Factory_defined
-class Cubit_Factory_dispatch : public virtual CORBA::PPTR {
-public:
-
-      Cubit_Factory_dispatch (void *IT_p, CORBA::Object* IT_o, const char *IT_m, 
-        CORBA::LoaderClass *IT_l, char *IT_i, void* IT_im)
-       : PPTR (IT_p,IT_o,IT_m,IT_l,IT_i,IT_im) {}
-
-
-   Cubit_Factory_dispatch (char *IT_OR, void *IT_p, CORBA::Object *IT_o)
-       : PPTR (IT_OR,IT_p,IT_o) {}
-
-
-   Cubit_Factory_dispatch () {}
-
-   Cubit_Factory_dispatch (ObjectReference *IT_OR, void *IT_p, CORBA::Object *IT_o)
-       : PPTR (IT_OR,IT_p,IT_o) {}
-
-
-   Cubit_Factory_dispatch (void *IT_p, CORBA::Object *IT_o, const char *IT_m, 
-        char *IT_i, CORBA::Object* IT_ob, void* IT_im)
-       : PPTR (IT_p,IT_o,IT_m,IT_i,IT_ob,IT_im) {}
-
-
-   virtual unsigned char dispatch (CORBA::Request &IT_r, 
-        unsigned char IT_isTarget, void* IT_pp=NULL);
-
-
-};
-
-class Cubit_Factory;
-
-#ifndef Cubit_FactoryPtr
-#define Cubit_FactoryPtr
-
-typedef Cubit_Factory* Cubit_Factory_ptr;
-
-typedef Cubit_Factory* Cubit_FactoryRef;
-
-#endif
-
-
-#ifndef Cubit_FactoryForwH
-#define Cubit_FactoryForwH
-CORBA::ObjectRef Cubit_Factory_getBase (void *);
-void Cubit_Factory_release (Cubit_Factory *, CORBA::Environment &IT_env);
-void Cubit_Factory_release (Cubit_Factory_ptr);
-Cubit_Factory* Cubit_Factory_duplicate (Cubit_Factory_ptr, CORBA::Environment &IT_env);
-Cubit_Factory* Cubit_Factory_duplicate (Cubit_Factory_ptr );
-Cubit_Factory_ptr Cubit_Factory_nil (CORBA::Environment &IT_env);
-Cubit_Factory_ptr Cubit_Factory_nil ();
-#endif
-#define Cubit_Factory_IMPL "Cubit_Factory"
-
-
-class Cubit_Factory;
-
-typedef Cubit_Factory Cubit_FactoryProxy;
-#define Cubit_Factory_IR "Cubit_Factory"
-#define Cubit_Factory_IMPL "Cubit_Factory"
-
-#ifndef Cubit_FactoryPtr
-#define Cubit_FactoryPtr
-
-typedef Cubit_Factory* Cubit_Factory_ptr;
-
-typedef Cubit_Factory* Cubit_FactoryRef;
-
-#endif
-
-class Cubit_Factory: public virtual CORBA::Object  {
-public:
-        Cubit_Factory (char *IT_OR);
-    Cubit_Factory (ObjectReference *IT_OR);
-    Cubit_Factory () : CORBA::Object  (1) {}
-protected:
-    Cubit_Factory_ptr __duplicate(
-            CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) {
-       CORBA::Object::__duplicate (IT_env);
-       return this;
-    }
-public:
-    static Cubit_Factory_ptr _duplicate(
-            Cubit_Factory_ptr, 
-            CORBA::Environment &IT_pEnv=CORBA::IT_chooseDefaultEnv ());
-public:
-   static Cubit_Factory* _bind (const char* IT_markerServer, const char* host,
-		const CORBA::Context &IT_c, 
-		CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-   static Cubit_Factory* _bind (CORBA::Environment &IT_env);
-   static Cubit_Factory* _bind (const char* IT_markerServer=NULL, const char* host=NULL,
-                 CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-    static Cubit_Factory* _narrow (CORBA::Object* , CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-    static Cubit_Factory_ptr _nil (CORBA::Environment &IT_pEnv=CORBA::IT_chooseDefaultEnv ()) {
-        CORBA::EnvExcRaiser IT_raise;
-        CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-        return (Cubit_Factory_ptr) CORBA::OBJECT_NIL;}
-        virtual Cubit_ptr create_cubit (const char * name, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-};
-
-#ifndef Cubit_FactoryVarH
-#define Cubit_FactoryVarH
-
-#ifndef Cubit_FactoryvPtr
-#define Cubit_FactoryvPtr
-typedef Cubit_Factory* Cubit_Factory_vPtr;
-typedef const Cubit_Factory* Cubit_Factory_cvPtr;
-#endif
-
-class Cubit_Factory_var : public CORBA::_var
-{
-    private:
-
-    unsigned char copyHelper (const Cubit_Factory_var &IT_s) {
-        {
-            _ptr = Cubit_Factory_duplicate (IT_s._ptr);
-        }
-        return 1;
-    }
-
-    public:
-
-    Cubit_Factory_var (const Cubit_Factory_var &IT_s) {
-        (void) copyHelper (IT_s);
-    }
-
-    Cubit_Factory_var () {
-        _ptr = Cubit_Factory_nil ();
-    }
-
-    Cubit_Factory_var (Cubit_Factory *IT_p) {
-        _ptr = IT_p;
-    }
-
-    Cubit_Factory_var &operator= (Cubit_Factory *IT_p) {
-        Cubit_Factory_release (_ptr);
-        _ptr = IT_p;
-        return (*this);
-    }
-
-    Cubit_Factory_var &operator= (const Cubit_Factory_var &IT_s) {
-        Cubit_Factory_release (_ptr);
-        _ptr = Cubit_Factory_duplicate (IT_s._ptr);
-        return (*this);
-    }
-
-    ~Cubit_Factory_var () {
-        Cubit_Factory_release (_ptr);
-    }
-
-    Cubit_Factory* operator-> () {
-        return _ptr;
-    }
-
-    operator Cubit_Factory_cvPtr () const { return _ptr;}
-    operator Cubit_Factory_vPtr& () { return _ptr;}
-
-    protected:
-    Cubit_Factory *_ptr;
-    private:
-    Cubit_Factory_var &operator= (const CORBA::_var &IT_s);
-    Cubit_Factory_var (const CORBA::_var &IT_s);
-    Cubit_Factory_var &operator= (const CORBA::_mgr &IT_s);
-    Cubit_Factory_var &operator= (const CORBA::_SeqElem &IT_s);
-    Cubit_Factory_var (const CORBA::_mgr &IT_s);
-    Cubit_Factory_var (const CORBA::_SeqElem &IT_s);
-};
-
-#endif
-
-
-#ifndef Cubit_FactoryMgrH
-#define Cubit_FactoryMgrH
-
-class Cubit_Factory_mgr : public CORBA::_mgr
-{
-    public:
-
-    Cubit_Factory_mgr () {
-        _ptr = Cubit_Factory_nil ();
-        _release = 1;
-    }
-
-    Cubit_Factory_mgr (const Cubit_Factory_mgr &IT_s) {
-        _ptr = Cubit_Factory_duplicate (IT_s._ptr);
-        _release = 1;
-    }
-
-    Cubit_Factory_mgr &operator= (Cubit_Factory *IT_p) {
-        if (_ptr && _release)
-            Cubit_Factory_release (_ptr);
-        _ptr = IT_p;
-        _release = 1;
-        return (*this);
-    }
-
-    Cubit_Factory_mgr &operator= (const Cubit_Factory_mgr &IT_s) {
-        if (_ptr && _release)
-            Cubit_Factory_release (_ptr);
-        _ptr = Cubit_Factory_duplicate(IT_s._ptr);
-        _release = 1;
-        return (*this);
-    }
-
-    Cubit_Factory_mgr &operator= (Cubit_Factory_var &IT_s) {
-        if (_ptr && _release)
-            Cubit_Factory_release (_ptr);
-        _ptr = Cubit_Factory_duplicate(IT_s);
-        _release = 1;
-        return (*this);
-    }
-
-    ~Cubit_Factory_mgr () {
-        if (_release)
-            Cubit_Factory_release (_ptr);
-    }
-
-    unsigned char release () {
-        return _release;
-    }
-
-    void release (unsigned char rel) {
-        _release = rel;
-    }
-
-    operator int () const {
-        return (((CORBA::Object_ptr) _ptr) ? 1 : 0);
-    }
-
-    operator void* () const {
-        return _ptr;
-    }
-
-    operator CORBA::Object * () const {
-        return (CORBA::Object *) _ptr;
-    }
-
-    operator Cubit_Factory* () const {
-        return (Cubit_Factory*) _ptr;
-    }
-
-    Cubit_Factory_ptr operator-> () const {
-        return _ptr;
-    }
-
-    Cubit_Factory *_ptr;
-
-    protected:
-
-    unsigned char _release;
-};
-
-typedef Cubit_Factory_mgr Cubit_Factory_mgr_IT_const;
-#endif
-
-#ifndef Cubit_FactorySeqElemH
-#define Cubit_FactorySeqElemH
-
-class Cubit_Factory_SeqElem : public CORBA::_SeqElem
-{
-    public:
-
-    Cubit_Factory_SeqElem (Cubit_Factory_ptr* IT_p, unsigned char rel) {
-        _ptr = IT_p;
-        _release = rel;
-    }
-
-    Cubit_Factory_SeqElem &operator= (Cubit_Factory_ptr IT_p) {
-        if (_ptr) {
-            if (*(_ptr) && _release)
-                Cubit_Factory_release (*(_ptr));
-            *(_ptr) = IT_p;
-        }
-        return (*this);
-    }
-
-    Cubit_Factory_SeqElem &operator= (const Cubit_Factory_SeqElem &IT_s) {
-        if (_ptr && IT_s._ptr) {
-            if (*(_ptr) && _release)
-                Cubit_Factory_release (*(_ptr));
-            *(_ptr) = Cubit_Factory_duplicate(*(IT_s._ptr));
-        }
-        return (*this);
-    }
-
-    operator Cubit_Factory_ptr () const {
-        return _ptr ? (Cubit_Factory_ptr) (*_ptr) : Cubit_Factory_nil(); 
-    }
-
-    Cubit_Factory_ptr operator->() const { return *_ptr;}
-
-    protected:
-    Cubit_Factory_ptr *_ptr;
-    unsigned char _release;
-};
-
-#endif
-
-
-#define TIE_Cubit_Factory(X) Cubit_Factory##X
-
-#define DEF_TIE_Cubit_Factory(X) \
-	class Cubit_Factory##X : public virtual Cubit_Factory {		\
-	  X* m_obj;						\
-	public:							\
-								\
-								\
-	   Cubit_Factory##X  (X *objp, const char* m="", CORBA::LoaderClass *l=0)\
-		: Cubit_Factory(), m_obj(objp) {	\
-		m_pptr = new Cubit_Factory_dispatch		\
-			(( Cubit_Factory*)this,(CORBA::Object*)this,m,l,Cubit_Factory_IR,m_obj);	\
-	   }								\
-	   Cubit_Factory##X  (CORBA::Object *IT_p, const char* IT_m="", void *IT_q=0)\
-		: Cubit_Factory() {	\
-		m_pptr = new Cubit_Factory_dispatch		\
-			(( Cubit_Factory*)this,(CORBA::Object*)this,IT_m,Cubit_Factory_IR,IT_p,IT_q);	\
-		m_obj = (X*)(m_pptr->getImplObj ());			\
-	   }								\
-								\
-	   virtual ~Cubit_Factory##X  () {				\
-		if (_okToDeleteImpl ()) delete m_obj; }					\
-	   virtual void* _deref () {					\
-		return m_obj; }					\
-								\
-virtual Cubit_ptr create_cubit (const char * name, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->create_cubit (  name,IT_env);\
-}\
-								\
-	};						\
-
-
-#define QUALS_Cubit_Factory	\
-virtual Cubit_ptr create_cubit (const char * name, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->create_cubit (  name,IT_env);\
-}\
-
-
-
-
-class Cubit_FactoryProxyFactoryClass : public virtual CORBA::ObjectFactoryClass {
-public:
-   Cubit_FactoryProxyFactoryClass (unsigned char IT_p=0)
-		: CORBA::ProxyFactory (Cubit_Factory_IR, IT_p) {}
-
-    virtual void* New (char *IT_OR, CORBA::Environment&);
-
-    virtual void* New (ObjectReference *IT_OR, CORBA::Environment&);
-
-    virtual void* New2 (); 
-
-    virtual CORBA::Object* NewObject (char *IT_OR, CORBA::Environment&);
-
-    virtual CORBA::Object* NewObject (ObjectReference *IT_OR, CORBA::Environment&);
-
-    virtual CORBA::Object* New2Object (); 
-
-    virtual void* IT_castUp (void *IT_p, char* IT_s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-
-    virtual CORBA::PPTR* pptr (void *IT_p);
-
-    virtual void baseInterfaces (_IDL_SEQUENCE_string&);
-
-
-};
-
-extern Cubit_FactoryProxyFactoryClass Cubit_FactoryProxyFactory;
-
-class Cubit_FactoryBOAImpl : public virtual Cubit_Factory  {
-public:
-    Cubit_FactoryBOAImpl (const char *m="", CORBA::LoaderClass *l=NULL) {
-  if (CORBA::PPTR::isOK (m_pptr, Cubit_Factory_IR))
-    m_pptr = new Cubit_Factory_dispatch ( (Cubit_Factory*)this,
-   	 (CORBA::Object*)this, m, l, Cubit_Factory_IR, this);
-}
-
-        virtual Cubit_ptr create_cubit (const char * name, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-};
-
-
-#endif
-
-
-#endif
diff --git a/TAO/tests/Cubit/Orbix/factory_client/cubit.idl b/TAO/tests/Cubit/Orbix/factory_client/cubit.idl
deleted file mode 100644
index 7dba408d0db..00000000000
--- a/TAO/tests/Cubit/Orbix/factory_client/cubit.idl
+++ /dev/null
@@ -1,46 +0,0 @@
-// @(#)cubit.idl	1.1 95/09/10
-// Copyright 1994-1995 by Sun Microsystems, Inc.
-
-#pragma prefix	"Eng.SUN.COM"
-#pragma version Cubit 1.1
-
-  interface Cubit {
-    octet	cube_octet (in octet o);
-    short	cube_short (in short s);
-    long	cube_long (in long l);
-    
-    struct Many {
-      octet	o;		// + 3 bytes padding (normally) ...
-      long	l;
-      short	s;		// + 2 bytes padding (normally) ...
-    };
-    
-    Many	cube_struct (in Many values);
-    
-    enum discrim {e_0th, e_1st, e_2nd, e_3rd, e_4th, e_5th};
-    
-    union oneof
-      switch (discrim) {
-	// this is an easy union to interpret; no padding
-	// is needed between discriminant and value.
-      case e_0th:
-        octet		o;
-      case e_1st:
-        short		s;
-      case e_2nd:
-        long		l;
-      case e_3rd:
-      default:
-        Many		cm;
-      };
-    
-    oneof	cube_union (in oneof values);
-    
-    oneway void	please_exit ();
-  };
-
-
-  interface Cubit_Factory {
-    Cubit create_cubit (in string name);
-  };
-
diff --git a/TAO/tests/Cubit/Orbix/factory_client/cubitC.cpp b/TAO/tests/Cubit/Orbix/factory_client/cubitC.cpp
deleted file mode 100644
index c439fc4c800..00000000000
--- a/TAO/tests/Cubit/Orbix/factory_client/cubitC.cpp
+++ /dev/null
@@ -1,710 +0,0 @@
-
-
-#include "cubit.h"
-
-Cubit::Cubit (char *IT_OR) {
-      m_pptr = new Cubit_dispatch (IT_OR, this,(CORBA::Object*)this);
-} 
-Cubit::Cubit (ObjectReference *IT_OR) {
-      m_pptr = new Cubit_dispatch (IT_OR, this,(CORBA::Object*)this);
-} 
-
-#ifndef CubitForwC
-#define CubitForwC
-CORBA::ObjectRef Cubit_getBase(void *IT_p){
-    return (Cubit*) IT_p;}
-
-void Cubit_release (Cubit_ptr IT_p, CORBA::Environment &IT_env) {
-    CORBA::release(IT_p, IT_env);}
-
-void Cubit_release (Cubit_ptr IT_p) {
-    Cubit_release (IT_p, CORBA::IT_chooseDefaultEnv ()); }
-
-Cubit_ptr Cubit_nil (CORBA::Environment &) {
-    return Cubit:: _nil ();}
-
-Cubit_ptr Cubit_nil () {
-    return Cubit_nil (CORBA::IT_chooseDefaultEnv ());}
-
-Cubit_ptr Cubit_duplicate (Cubit_ptr IT_p, CORBA::Environment &IT_env) {
-    return (Cubit::_duplicate(IT_p, IT_env)); }
-Cubit_ptr Cubit_duplicate (Cubit_ptr IT_p) {
-    return Cubit_duplicate (IT_p, CORBA::IT_chooseDefaultEnv ()); }
-#endif
-
-Cubit_ptr Cubit::_duplicate(Cubit_ptr obj, CORBA::Environment& IT_pEnv) {
-        CORBA::EnvExcRaiser IT_raise;
-        CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-       if (!obj) {
-          return (obj);
-       }
-       Cubit_ptr IT_obj = obj->__duplicate (IT_env);
-       return IT_obj;
-}
-
-
-
-Cubit* Cubit:: _bind (const char* IT_markerServer, const char* host,
-		const CORBA::Context &IT_c, 
-		CORBA::Environment &IT_env) {
-       return (Cubit*)CORBA::Factory.New (IT_markerServer, IT_env, IT_c, host, 
-		Cubit_IMPL, Cubit_IR);
-}
-
-
-
-Cubit* Cubit:: _bind (CORBA::Environment &IT_env) {
-       return _bind (NULL,NULL,CORBA::Context(), IT_env); }
-
-
-Cubit* Cubit:: _bind (const char* IT_markerServer, const char* host,
-                CORBA::Environment &IT_env) {
-       return _bind (IT_markerServer, host, CORBA::Context (), IT_env); }
-Cubit* Cubit::_narrow (CORBA::Object* IT_obj, CORBA::Environment &IT_pEnv) {
-        CORBA::EnvExcRaiser IT_raise;
-        CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-        if (CORBA::is_nil (IT_obj)) {
-                return Cubit:: _nil();
-        }
-
-       Cubit* IT_p = (Cubit*)CORBA::Object::_castDown (IT_obj, Cubit_IR, IT_env);
-        IT_p = IT_p ? IT_p->__duplicate(IT_env) : NULL;
-        if ((IT_env) &&(!strcmp(IT_env.exception()->id(), "CORBA::StExcep::BAD_PARAM")) && (((CORBA::BAD_PARAM*)IT_env.exception())-> minor() == NARROW_FAILED)) {
-                IT_env.exception_free();
-        }
-        return IT_p;
-   }
-
-
-#ifndef Cubit_Many_Ops
-#define Cubit_Many_Ops
-
-void Cubit::Many:: encodeOp (CORBA::Request &IT_r) const {
-
-    IT_r.insertOctet (o);
-
-    IT_r << l;
-
-    IT_r << s;
-}
-
-void Cubit::Many:: decodeOp (CORBA::Request &IT_r) {
-
-    IT_r.extractOctet (o);
-
-    IT_r >> l;
-
-    IT_r >> s;
-}
-
-void Cubit::Many:: decodeInOutOp (CORBA::Request &IT_r) {
-
-    IT_r.extractOctet (o);
-
-    IT_r >> l;
-
-    IT_r >> s;
-}
-
-Cubit::Many ::~Many () {
-}
-
-Cubit::Many:: Many (const Cubit::Many &IT_s) 
-	 {
-    o = IT_s.o;
-    l = IT_s.l;
-    s = IT_s.s;
-}
-
-Cubit::Many:: Many () {
-}
-
-Cubit::Many &Cubit::Many:: operator= (const Cubit::Many& IT_s) {
-    if (this == &IT_s) return *this;
-    o = IT_s.o;
-    l = IT_s.l;
-    s = IT_s.s;
-    return *this;
-}
-
-
-#endif
-
-
-#ifndef Cubit_oneof_Ops
-#define Cubit_oneof_Ops
-void Cubit::oneof:: encodeOp (CORBA::Request &IT_r) const {
-    if (!isSet) return;
-    {
-    CORBA::ULong IT_0 = (CORBA::ULong) __d;
-    IT_r << IT_0;
-    }
-    switch (__d) {
-        case Cubit::e_0th: 
-        IT_r.insertOctet (_o_);
-        break;
-        case Cubit::e_1st: 
-        IT_r << _s_;
-        break;
-        case Cubit::e_2nd: 
-        IT_r << _l_;
-        break;
-        case Cubit::e_3rd: 
-        default: 
-        (*_cm_).encodeOp (IT_r);
-        break;
-    }
-
-}
-
-void Cubit::oneof:: decodeOp (CORBA::Request &IT_r) {
-    isSet = 0;
-    {
-    CORBA::ULong IT_1;
-    IT_r >> IT_1;
-    __d = Cubit::discrim(IT_1);
-    }
-    switch (__d) {
-        case Cubit::e_0th: 
-        if (!isSet) {
-            isSet = 1;
-        }
-        IT_r.extractOctet (_o_);
-        break;
-        case Cubit::e_1st: 
-        if (!isSet) {
-            isSet = 1;
-        }
-        IT_r >> _s_;
-        break;
-        case Cubit::e_2nd: 
-        if (!isSet) {
-            isSet = 1;
-        }
-        IT_r >> _l_;
-        break;
-        case Cubit::e_3rd: 
-        default: 
-        if (!isSet) {
-            _cm_ = new Cubit::Many;
-            isSet = 1;
-        }
-        (*_cm_).decodeOp (IT_r);
-        break;
-    }
-
-}
-void Cubit::oneof:: decodeInOutOp (CORBA::Request &IT_r) {
-    Cubit::discrim IT_d;
-    {
-    CORBA::ULong IT_2;
-    IT_r >> IT_2;
-    IT_d = Cubit::discrim(IT_2);
-    }
-    if (IT_d == __d)
-        switch (__d) {
-            case Cubit::e_0th: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r.extractOctet (_o_);
-            break;
-            case Cubit::e_1st: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r >> _s_;
-            break;
-            case Cubit::e_2nd: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r >> _l_;
-            break;
-            case Cubit::e_3rd: 
-            default: 
-            if (!isSet) {
-                _cm_ = new Cubit::Many;
-                isSet = 1;
-            }
-            (*_cm_).decodeInOutOp (IT_r);
-            break;
-        }
-
-    else {
-        this->oneof:: ~oneof();
-        memset(this, 0, sizeof(*this));
-        __d = IT_d;
-        switch (__d) {
-            case Cubit::e_0th: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r.extractOctet (_o_);
-            break;
-            case Cubit::e_1st: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r >> _s_;
-            break;
-            case Cubit::e_2nd: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r >> _l_;
-            break;
-            case Cubit::e_3rd: 
-            default: 
-            if (!isSet) {
-                _cm_ = new Cubit::Many;
-                isSet = 1;
-            }
-            (*_cm_).decodeOp (IT_r);
-            break;
-        }
-        isSet = 1;
-    }
-
-}
-
-Cubit::oneof:: oneof() { 
-    memset(this, 0, sizeof(*this));
-    isSet = 0;
-}
-
-Cubit::oneof ::~oneof() {
-    if (!isSet) return;
-    switch (__d) { 
-        case Cubit::e_0th:         break;
-        case Cubit::e_1st:         break;
-        case Cubit::e_2nd:         break;
-        case Cubit::e_3rd: 
-        default:         if (_cm_) delete _cm_;
-        break;
-    }
-
-    isSet = 0;
-}
-
-Cubit::oneof:: oneof (const Cubit::oneof &IT_s) {
-    isSet = 0;
-    memset(this, 0, sizeof(*this));
-    __d = IT_s.__d;
-    switch (__d) {
-        case Cubit::e_0th:         isSet = 1;
-        _o_ = IT_s._o_;
-        break;
-        case Cubit::e_1st:         isSet = 1;
-        _s_ = IT_s._s_;
-        break;
-        case Cubit::e_2nd:         isSet = 1;
-        _l_ = IT_s._l_;
-        break;
-        case Cubit::e_3rd: 
-        default: 
-        if (!isSet) {
-            _cm_ = new Cubit::Many;
-            isSet = 1;
-        }
-        *(_cm_) = *(IT_s._cm_);
-        break;
-    }
-    isSet = 1;
-}
-
-Cubit::oneof& Cubit::oneof:: operator= (const Cubit::oneof & IT_s) {
-    if (this == &IT_s) return *this;
-    if (isSet && (__d != IT_s.__d))
-    {
-        this-> oneof::~oneof();
-        memset(this, 0, sizeof(*this));
-    }
-
-    __d = IT_s.__d;
-    switch (__d) {
-        case Cubit::e_0th:         isSet = 1;
-        _o_ = IT_s._o_;
-        break;
-        case Cubit::e_1st:         isSet = 1;
-        _s_ = IT_s._s_;
-        break;
-        case Cubit::e_2nd:         isSet = 1;
-        _l_ = IT_s._l_;
-        break;
-        case Cubit::e_3rd: 
-        default: 
-        if (!isSet) {
-            _cm_ = new Cubit::Many;
-            isSet = 1;
-        }
-        *(_cm_) = *(IT_s._cm_);
-        break;
-    }
-    isSet = 1;
-    return *this;
-}
-
-
-#endif
-
-void* CubitProxyFactoryClass::New (char *IT_OR, CORBA::Environment&) {
-        return  new class Cubit(IT_OR);}
-
-void* CubitProxyFactoryClass::New (ObjectReference *IT_OR, CORBA::Environment&) {
-        return  new class Cubit(IT_OR);}
-
-void* CubitProxyFactoryClass::New2 () {
-        return  new class Cubit((char*)0);}
-
-CORBA::Object* CubitProxyFactoryClass::NewObject (char *IT_OR, CORBA::Environment&) {
-        return  new class Cubit(IT_OR);}
-
-CORBA::Object* CubitProxyFactoryClass::NewObject (ObjectReference *IT_OR, CORBA::Environment&) {
-        return  new class Cubit(IT_OR);}
-
-CORBA::Object* CubitProxyFactoryClass::New2Object () {
-        return  new class Cubit((char*)0);}
-
-void* CubitProxyFactoryClass::IT_castUp (void *IT_p, char* IT_s, CORBA::Environment &IT_env) {
-      void *IT_l;
-      if (!CORBA::_interfaceCmp (IT_s,Cubit_IR, IT_env))
-         return IT_p;
-      else if (IT_l=CORBA::ObjectFactoryClass::IT_castUp((CORBA::Object*)((class Cubit*)IT_p),IT_s, IT_env))
-         return IT_l;
-      else return NULL;
-    }
-
-
-CORBA::PPTR* CubitProxyFactoryClass::pptr (void *IT_p) {
-       return ((class Cubit*)IT_p)->_pptr ();}
-
-void CubitProxyFactoryClass::baseInterfaces (_IDL_SEQUENCE_string& seq) {
-      add (seq, Cubit_IR);
-      CORBA::ObjectFactoryClass::baseInterfaces (seq);
-}
-
-CubitProxyFactoryClass CubitProxyFactory(1);
-
-CORBA::Octet Cubit:: cube_octet (CORBA::Octet o, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        return 0;
-    }
-    CORBA::Request IT_r (this, "cube_octet",IT_env,1,0);
-    if (!IT_r.isException (IT_env)) {
-
-        IT_r.insertOctet (o);
-    }
-
-    IT_r.invoke (CORBA::Flags(0),IT_env);
-    if (!IT_r.isException (IT_env)) {
-        CORBA::Octet IT_result;
-        IT_r.extractOctet (IT_result);
-        IT_r.checkEnv (IT_env);
-        return IT_result;
-    }
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-    return 0;
-}
-
-CORBA::Short Cubit:: cube_short (CORBA::Short s, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        return 0;
-    }
-    CORBA::Request IT_r (this, "cube_short",IT_env,1,0);
-    if (!IT_r.isException (IT_env)) {
-
-        IT_r << s;
-    }
-
-    IT_r.invoke (CORBA::Flags(0),IT_env);
-    if (!IT_r.isException (IT_env)) {
-        CORBA::Short IT_result;
-        IT_r >> IT_result;
-        IT_r.checkEnv (IT_env);
-        return IT_result;
-    }
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-    return 0;
-}
-
-CORBA::Long Cubit:: cube_long (CORBA::Long l, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        return 0;
-    }
-    CORBA::Request IT_r (this, "cube_long",IT_env,1,0);
-    if (!IT_r.isException (IT_env)) {
-
-        IT_r << l;
-    }
-
-    IT_r.invoke (CORBA::Flags(0),IT_env);
-    if (!IT_r.isException (IT_env)) {
-        CORBA::Long IT_result;
-        IT_r >> IT_result;
-        IT_r.checkEnv (IT_env);
-        return IT_result;
-    }
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-    return 0;
-}
-
-Cubit::Many Cubit:: cube_struct (const Cubit::Many& values, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        { 
-            Cubit::Many IT_l0;
-            return IT_l0;
-        }
-    }
-    CORBA::Request IT_r (this, "cube_struct",IT_env,1,0);
-    if (!IT_r.isException (IT_env)) {
-
-        values.encodeOp (IT_r);
-    }
-
-    IT_r.invoke (CORBA::Flags(0),IT_env);
-    if (!IT_r.isException (IT_env)) {
-        Cubit::Many IT_result;
-        IT_result.decodeOp (IT_r);
-        IT_r.checkEnv (IT_env);
-        return IT_result;
-    }
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-    { 
-        Cubit::Many IT_l1;
-        return IT_l1;
-    }
-}
-
-Cubit::oneof Cubit:: cube_union (const Cubit::oneof& values, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        { 
-            Cubit::oneof IT_l0;
-            return IT_l0;
-        }
-    }
-    CORBA::Request IT_r (this, "cube_union",IT_env,1,0);
-    if (!IT_r.isException (IT_env)) {
-
-        values.encodeOp (IT_r);
-    }
-
-    IT_r.invoke (CORBA::Flags(0),IT_env);
-    if (!IT_r.isException (IT_env)) {
-        Cubit::oneof IT_result;
-        IT_result.decodeOp (IT_r);
-        IT_r.checkEnv (IT_env);
-        return IT_result;
-    }
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-    { 
-        Cubit::oneof IT_l1;
-        return IT_l1;
-    }
-}
-
-void Cubit:: please_exit (CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        return ;
-    }
-    CORBA::Request IT_r (this, "please_exit",IT_env,1,1);
-
-    IT_r.invoke (CORBA::Flags(CORBA::INV_NO_RESPONSE), IT_env);
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-}
-
-
-
-
-
-#ifndef Cubit_dispatch_impl
-
-unsigned char Cubit_dispatch::dispatch (CORBA::Request &IT_r, 
-    unsigned char, void *) {
-      IT_r.makeRuntimeException1 ("Cubit");
-      return 0;
-}
- 
-#endif
-
-Cubit_Factory::Cubit_Factory (char *IT_OR) {
-      m_pptr = new Cubit_Factory_dispatch (IT_OR, this,(CORBA::Object*)this);
-} 
-Cubit_Factory::Cubit_Factory (ObjectReference *IT_OR) {
-      m_pptr = new Cubit_Factory_dispatch (IT_OR, this,(CORBA::Object*)this);
-} 
-
-#ifndef Cubit_FactoryForwC
-#define Cubit_FactoryForwC
-CORBA::ObjectRef Cubit_Factory_getBase(void *IT_p){
-    return (Cubit_Factory*) IT_p;}
-
-void Cubit_Factory_release (Cubit_Factory_ptr IT_p, CORBA::Environment &IT_env) {
-    CORBA::release(IT_p, IT_env);}
-
-void Cubit_Factory_release (Cubit_Factory_ptr IT_p) {
-    Cubit_Factory_release (IT_p, CORBA::IT_chooseDefaultEnv ()); }
-
-Cubit_Factory_ptr Cubit_Factory_nil (CORBA::Environment &) {
-    return Cubit_Factory:: _nil ();}
-
-Cubit_Factory_ptr Cubit_Factory_nil () {
-    return Cubit_Factory_nil (CORBA::IT_chooseDefaultEnv ());}
-
-Cubit_Factory_ptr Cubit_Factory_duplicate (Cubit_Factory_ptr IT_p, CORBA::Environment &IT_env) {
-    return (Cubit_Factory::_duplicate(IT_p, IT_env)); }
-Cubit_Factory_ptr Cubit_Factory_duplicate (Cubit_Factory_ptr IT_p) {
-    return Cubit_Factory_duplicate (IT_p, CORBA::IT_chooseDefaultEnv ()); }
-#endif
-
-Cubit_Factory_ptr Cubit_Factory::_duplicate(Cubit_Factory_ptr obj, CORBA::Environment& IT_pEnv) {
-        CORBA::EnvExcRaiser IT_raise;
-        CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-       if (!obj) {
-          return (obj);
-       }
-       Cubit_Factory_ptr IT_obj = obj->__duplicate (IT_env);
-       return IT_obj;
-}
-
-
-
-Cubit_Factory* Cubit_Factory:: _bind (const char* IT_markerServer, const char* host,
-		const CORBA::Context &IT_c, 
-		CORBA::Environment &IT_env) {
-       return (Cubit_Factory*)CORBA::Factory.New (IT_markerServer, IT_env, IT_c, host, 
-		Cubit_Factory_IMPL, Cubit_Factory_IR);
-}
-
-
-
-Cubit_Factory* Cubit_Factory:: _bind (CORBA::Environment &IT_env) {
-       return _bind (NULL,NULL,CORBA::Context(), IT_env); }
-
-
-Cubit_Factory* Cubit_Factory:: _bind (const char* IT_markerServer, const char* host,
-                CORBA::Environment &IT_env) {
-       return _bind (IT_markerServer, host, CORBA::Context (), IT_env); }
-Cubit_Factory* Cubit_Factory::_narrow (CORBA::Object* IT_obj, CORBA::Environment &IT_pEnv) {
-        CORBA::EnvExcRaiser IT_raise;
-        CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-        if (CORBA::is_nil (IT_obj)) {
-                return Cubit_Factory:: _nil();
-        }
-
-       Cubit_Factory* IT_p = (Cubit_Factory*)CORBA::Object::_castDown (IT_obj, Cubit_Factory_IR, IT_env);
-        IT_p = IT_p ? IT_p->__duplicate(IT_env) : NULL;
-        if ((IT_env) &&(!strcmp(IT_env.exception()->id(), "CORBA::StExcep::BAD_PARAM")) && (((CORBA::BAD_PARAM*)IT_env.exception())-> minor() == NARROW_FAILED)) {
-                IT_env.exception_free();
-        }
-        return IT_p;
-   }
-
-void* Cubit_FactoryProxyFactoryClass::New (char *IT_OR, CORBA::Environment&) {
-        return  new class Cubit_Factory(IT_OR);}
-
-void* Cubit_FactoryProxyFactoryClass::New (ObjectReference *IT_OR, CORBA::Environment&) {
-        return  new class Cubit_Factory(IT_OR);}
-
-void* Cubit_FactoryProxyFactoryClass::New2 () {
-        return  new class Cubit_Factory((char*)0);}
-
-CORBA::Object* Cubit_FactoryProxyFactoryClass::NewObject (char *IT_OR, CORBA::Environment&) {
-        return  new class Cubit_Factory(IT_OR);}
-
-CORBA::Object* Cubit_FactoryProxyFactoryClass::NewObject (ObjectReference *IT_OR, CORBA::Environment&) {
-        return  new class Cubit_Factory(IT_OR);}
-
-CORBA::Object* Cubit_FactoryProxyFactoryClass::New2Object () {
-        return  new class Cubit_Factory((char*)0);}
-
-void* Cubit_FactoryProxyFactoryClass::IT_castUp (void *IT_p, char* IT_s, CORBA::Environment &IT_env) {
-      void *IT_l;
-      if (!CORBA::_interfaceCmp (IT_s,Cubit_Factory_IR, IT_env))
-         return IT_p;
-      else if (IT_l=CORBA::ObjectFactoryClass::IT_castUp((CORBA::Object*)((class Cubit_Factory*)IT_p),IT_s, IT_env))
-         return IT_l;
-      else return NULL;
-    }
-
-
-CORBA::PPTR* Cubit_FactoryProxyFactoryClass::pptr (void *IT_p) {
-       return ((class Cubit_Factory*)IT_p)->_pptr ();}
-
-void Cubit_FactoryProxyFactoryClass::baseInterfaces (_IDL_SEQUENCE_string& seq) {
-      add (seq, Cubit_Factory_IR);
-      CORBA::ObjectFactoryClass::baseInterfaces (seq);
-}
-
-Cubit_FactoryProxyFactoryClass Cubit_FactoryProxyFactory(1);
-
-Cubit_ptr Cubit_Factory:: create_cubit (const char * name, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        return new Cubit;
-    }
-    CORBA::Request IT_r (this, "create_cubit",IT_env,1,0);
-    if (!IT_r.isException (IT_env)) {
-
-        IT_r.encodeStringOp (name);
-    }
-
-    IT_r.invoke (CORBA::Flags(0),IT_env);
-    if (!IT_r.isException (IT_env)) {
-        Cubit_ptr IT_result;
-        IT_result = (Cubit*) IT_r.decodeObjRef (Cubit_IR);
-        IT_r.checkEnv (IT_env);
-        return IT_result;
-    }
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-    return new Cubit;
-}
-
-
-
-
-
-#ifndef Cubit_Factory_dispatch_impl
-
-unsigned char Cubit_Factory_dispatch::dispatch (CORBA::Request &IT_r, 
-    unsigned char, void *) {
-      IT_r.makeRuntimeException1 ("Cubit_Factory");
-      return 0;
-}
- 
-#endif
-
diff --git a/TAO/tests/Cubit/Orbix/factory_client/cubitS.cpp b/TAO/tests/Cubit/Orbix/factory_client/cubitS.cpp
deleted file mode 100644
index 2f0459962b8..00000000000
--- a/TAO/tests/Cubit/Orbix/factory_client/cubitS.cpp
+++ /dev/null
@@ -1,282 +0,0 @@
-
-
-#include "cubit.hh"
-
-
-#define Cubit_dispatch_impl
-
-unsigned char Cubit_dispatch::dispatch (CORBA::Request &IT_r, 
- unsigned char IT_isTarget, void *IT_pp) {
-    if (!IT_pp)
-       IT_pp = m_obj;
-    const char *IT_s = IT_r.getOperation ();
-    if (!strcmp(IT_s,"cube_octet")) {
-        CORBA::Octet IT_result;
-        CORBA::Environment IT_env (IT_r);
-        CORBA::Filter* IT_f = CORBA::Orbix.getFilter ();
-        if (!IT_r.tcAssert ("\
-Ro~cube_octet~+o{o},>{o},N{}\
-"))
-            return 1;
-        CORBA::Octet o;
-
-        IT_r.extractOctet (o);
-
-        if (IT_f && !IT_r.isException (IT_env))
-        	IT_f->inRequestPostM (IT_r, IT_env);
-        if (!IT_r.isException (IT_env)) {
-            try {
-                	IT_result = ((Cubit*)IT_pp)->cube_octet (  o, IT_env);
-
-            } catch (CORBA::SystemException &IT_exSys) {
-            IT_env.propagate (&IT_exSys);
-            } catch (CORBA::UserException &IT_exUsr) {
-            IT_env.propagate (&IT_exUsr);
-            }
-        }
-
-        if (!IT_r.isException (IT_env)) {
-            if (!IT_r.convertToReply ("\
-o\
-", IT_env)) return 1;
-            IT_r.insertOctet (IT_result);
-            }
-
-        else IT_r.makeSystemException (IT_env);
-        return 1;
-    }
-
-    if (!strcmp(IT_s,"cube_short")) {
-        CORBA::Short IT_result;
-        CORBA::Environment IT_env (IT_r);
-        CORBA::Filter* IT_f = CORBA::Orbix.getFilter ();
-        if (!IT_r.tcAssert ("\
-Ro~cube_short~+s{s},>{s},N{}\
-"))
-            return 1;
-        CORBA::Short s;
-
-        IT_r >> s;
-
-        if (IT_f && !IT_r.isException (IT_env))
-        	IT_f->inRequestPostM (IT_r, IT_env);
-        if (!IT_r.isException (IT_env)) {
-            try {
-                	IT_result = ((Cubit*)IT_pp)->cube_short (  s, IT_env);
-
-            } catch (CORBA::SystemException &IT_exSys) {
-            IT_env.propagate (&IT_exSys);
-            } catch (CORBA::UserException &IT_exUsr) {
-            IT_env.propagate (&IT_exUsr);
-            }
-        }
-
-        if (!IT_r.isException (IT_env)) {
-            if (!IT_r.convertToReply ("\
-s\
-", IT_env)) return 1;
-            IT_r << IT_result;
-            }
-
-        else IT_r.makeSystemException (IT_env);
-        return 1;
-    }
-
-    if (!strcmp(IT_s,"cube_long")) {
-        CORBA::Long IT_result;
-        CORBA::Environment IT_env (IT_r);
-        CORBA::Filter* IT_f = CORBA::Orbix.getFilter ();
-        if (!IT_r.tcAssert ("\
-Ro~cube_long~+l{l},>{l},N{}\
-"))
-            return 1;
-        CORBA::Long l;
-
-        IT_r >> l;
-
-        if (IT_f && !IT_r.isException (IT_env))
-        	IT_f->inRequestPostM (IT_r, IT_env);
-        if (!IT_r.isException (IT_env)) {
-            try {
-                	IT_result = ((Cubit*)IT_pp)->cube_long (  l, IT_env);
-
-            } catch (CORBA::SystemException &IT_exSys) {
-            IT_env.propagate (&IT_exSys);
-            } catch (CORBA::UserException &IT_exUsr) {
-            IT_env.propagate (&IT_exUsr);
-            }
-        }
-
-        if (!IT_r.isException (IT_env)) {
-            if (!IT_r.convertToReply ("\
-l\
-", IT_env)) return 1;
-            IT_r << IT_result;
-            }
-
-        else IT_r.makeSystemException (IT_env);
-        return 1;
-    }
-
-    if (!strcmp(IT_s,"cube_struct")) {
-        Cubit::Many IT_result;
-        CORBA::Environment IT_env (IT_r);
-        CORBA::Filter* IT_f = CORBA::Orbix.getFilter ();
-        if (!IT_r.tcAssert ("\
-Ro~cube_struct~+values{R~Cubit::Many~o{o},l{l},s{s}},>{R~Cubit::Many~o{o},l{l},s{s}},N{}\
-"))
-            return 1;
-        Cubit::Many values;
-
-        values.decodeOp (IT_r);
-
-        if (IT_f && !IT_r.isException (IT_env))
-        	IT_f->inRequestPostM (IT_r, IT_env);
-        if (!IT_r.isException (IT_env)) {
-            try {
-                	IT_result = ((Cubit*)IT_pp)->cube_struct (  values, IT_env);
-
-            } catch (CORBA::SystemException &IT_exSys) {
-            IT_env.propagate (&IT_exSys);
-            } catch (CORBA::UserException &IT_exUsr) {
-            IT_env.propagate (&IT_exUsr);
-            }
-        }
-
-        if (!IT_r.isException (IT_env)) {
-            if (!IT_r.convertToReply ("\
-R~Cubit::Many~o{o},l{l},s{s}\
-", IT_env)) return 1;
-            IT_result.encodeOp (IT_r);
-            }
-
-        else IT_r.makeSystemException (IT_env);
-        return 1;
-    }
-
-    if (!strcmp(IT_s,"cube_union")) {
-        Cubit::oneof IT_result;
-        CORBA::Environment IT_env (IT_r);
-        CORBA::Filter* IT_f = CORBA::Orbix.getFilter ();
-        IT_r.tcPreAssert (
-"\
-Ro~cube_union~+values{U~Cubit::oneof~{E~Cubit::discrim~e_0th,e_1st,e_2nd,e_3rd,e_4th,e_5th}~Cubit::e_0th o{o};Cubit::e_1st s{s};Cubit::e_2nd l{l};Cubit::e_3rd,$ cm{R~Cubit::Many~o{o},l{l},s{s}}},>{U~Cubit::oneof~{E~Cubit::discrim~e_0th,e_1st,e_2nd,e_3rd,\
-");
-        if (!IT_r.tcAssert ("\
-e_4th,e_5th}~Cubit::e_0th o{o};Cubit::e_1st s{s};Cubit::e_2nd l{l};Cubit::e_3rd,$ cm{R~Cubit::Many~o{o},l{l},s{s}}},N{}\
-"))
-            return 1;
-        Cubit::oneof values;
-
-        values.decodeOp (IT_r);
-
-        if (IT_f && !IT_r.isException (IT_env))
-        	IT_f->inRequestPostM (IT_r, IT_env);
-        if (!IT_r.isException (IT_env)) {
-            try {
-                	IT_result = ((Cubit*)IT_pp)->cube_union (  values, IT_env);
-
-            } catch (CORBA::SystemException &IT_exSys) {
-            IT_env.propagate (&IT_exSys);
-            } catch (CORBA::UserException &IT_exUsr) {
-            IT_env.propagate (&IT_exUsr);
-            }
-        }
-
-        if (!IT_r.isException (IT_env)) {
-            if (!IT_r.convertToReply ("\
-U~Cubit::oneof~{E~Cubit::discrim~e_0th,e_1st,e_2nd,e_3rd,e_4th,e_5th}~Cubit::e_0th o{o};Cubit::e_1st s{s};Cubit::e_2nd l{l};Cubit::e_3rd,$ cm{R~Cubit::Many~o{o},l{l},s{s}}\
-", IT_env)) return 1;
-            IT_result.encodeOp (IT_r);
-            }
-
-        else IT_r.makeSystemException (IT_env);
-        return 1;
-    }
-
-    if (!strcmp(IT_s,"please_exit")) {
-        CORBA::Environment IT_env (IT_r);
-        CORBA::Filter* IT_f = CORBA::Orbix.getFilter ();
-        if (!IT_r.tcAssert ("\
-Ro~please_exit~>{v},O{}\
-"))
-            return 1;
-
-        if (IT_f && !IT_r.isException (IT_env))
-        	IT_f->inRequestPostM (IT_r, IT_env);
-        if (!IT_r.isException (IT_env)) {
-            try {
-                ((Cubit*)IT_pp)->please_exit (IT_env);
-
-            } catch (CORBA::SystemException &IT_exSys) {
-            IT_env.propagate (&IT_exSys);
-            } catch (CORBA::UserException &IT_exUsr) {
-            IT_env.propagate (&IT_exUsr);
-            }
-        }
-        IT_r.replyNoResults (CORBA::Flags(CORBA::INV_NO_RESPONSE),IT_env);
-        return 1;
-    }
-
-    if (IT_isTarget)
-        IT_r.makeRuntimeException2 ();
-
-    return 0;
-}
-
-#define Cubit_Factory_dispatch_impl
-
-unsigned char Cubit_Factory_dispatch::dispatch (CORBA::Request &IT_r, 
- unsigned char IT_isTarget, void *IT_pp) {
-    if (!IT_pp)
-       IT_pp = m_obj;
-    const char *IT_s = IT_r.getOperation ();
-    if (!strcmp(IT_s,"create_cubit")) {
-        Cubit_ptr IT_result;
-        CORBA::Environment IT_env (IT_r);
-        CORBA::Filter* IT_f = CORBA::Orbix.getFilter ();
-        if (!IT_r.tcAssert ("\
-Ro~create_cubit~+name{0},>{O~Cubit},N{}\
-"))
-            return 1;
-        char * name;
-
-        IT_r.decodeStringOp(name);
-
-        if (IT_f && !IT_r.isException (IT_env))
-        	IT_f->inRequestPostM (IT_r, IT_env);
-        if (!IT_r.isException (IT_env)) {
-            try {
-                	IT_result = ((Cubit_Factory*)IT_pp)->create_cubit (  name, IT_env);
-
-            } catch (CORBA::SystemException &IT_exSys) {
-            IT_env.propagate (&IT_exSys);
-            } catch (CORBA::UserException &IT_exUsr) {
-            IT_env.propagate (&IT_exUsr);
-            }
-        }
-        CORBA::string_free (name);
-
-        if (!IT_r.isException (IT_env)) {
-            if (!IT_r.convertToReply ("\
-O~Cubit\
-", IT_env)) return 1;
-            {
-                CORBA::Object* IT_l1 = (CORBA::Object*) IT_result;
-                IT_r << IT_l1;
-            }
-            if (IT_result) Cubit_release (IT_result);
-            }
-
-        else IT_r.makeSystemException (IT_env);
-        return 1;
-    }
-
-    if (IT_isTarget)
-        IT_r.makeRuntimeException2 ();
-
-    return 0;
-}
-
-#include "cubitC.cpp"
-
diff --git a/TAO/tests/Cubit/Orbix/orb.mk b/TAO/tests/Cubit/Orbix/orb.mk
deleted file mode 100644
index cf7b12d3b1b..00000000000
--- a/TAO/tests/Cubit/Orbix/orb.mk
+++ /dev/null
@@ -1,146 +0,0 @@
-# ------------------------------------------------------------
-# Orbix 2.2 implicit rules for SunOS/GNU Make
-# ------------------------------------------------------------
-#
-# If you cut'n'paste this into your /usr/include/make/default.mk
-# file, beware! This is not officially supported by Iona
-# Technologies, and you may want to be a bit of a Makefile hacker
-# to make it integrate well with your site's setup.
-
-# The best thing to do would be put it in a standard place and
-# anyone who wants the Orbix implicit rule set can include
-# it with an "include <pathname>/orbix.mk" line in their
-# Makefile. A good place to put it might be /usr/include/make.
-
-# These rules define default C++, C++FLAGS and C++SUFFIX.
-# C++ is the C++ compiler to use; C++FLAGS are command-line
-# flags to the C++ compiler for use in compiling C++ source
-# files into objects; C++SUFFIX is the filename suffix
-# indicating C++ source. By default, it's set to "C" for AT&T C++,
-# and "cc" for GNU g++.
-
-# Feel free to override these in your Makefiles *after*
-# including this file.
-
-# IMPORTANT: If the -M switch is specified in IDLFLAGS, the IDL
-# compiler appends to the user-specified file. The dependency for
-# specified_file.o in the linking target should appear _after_ any use
-# of the IDL compiler which takes the -M flag.  Putting it _last_
-# is normally the best approach.
-
-# Note that these rule definitions use pattern matching,
-# and therefore only work with SunOS make and GNU make.
-
-# They may not work with other vendor's versions of make.
-# If they do not, you may wish to try using GNU make, which
-# is free software produced by the Free Software Foundation.
-
-# If the version of make you wish to use does not support
-# pattern matching, use the sample explicit rule set in
-# the comments at the end of this file.
-
-# ------------------------------------------------------------
-# Essential: set these to the locations into which you
-#		have installed Orbix' components:
-
-ORBIX_BINDIR    = /opt/Orbix_2.2MT/corba2/bin
-ORBIX_LIBDIR    = /opt/Orbix_2.2MT/corba2/lib
-ORBIX_INCDIR    = /opt/Orbix_2.2MT/corba2/include
-
-#-------------------------------------------------------------
-# To compile the demos, you should change these values as
-# appropriate for your particular system installation
-#-------------------------------------------------------------
-
-X11BASE         = /usr/openwin
-X11INCDIR       = $(X11BASE)/include
-X11LIBDIR       = $(X11BASE)/lib
-
-# C++             = CC
-# C++FLAGS        = -I$(ORBIX_INCDIR) -I. -mt -D_REENTRANT
-# C++SUFFIX       = cpp
-
-# ------------------------------------------------------------
-# ITCLT, IRCLT and ITSRV can be either statically or dynamically linked
-# Use -Bdynamic or -Bstatic as appropriate.
-# ------------------------------------------------------------
-
-ITCLT 		= -Bstatic -lorbixmt
-IRCLT 		= -Bstatic -lIRcltmt
-ITSRV 		= -Bstatic -lorbixmt
-ITIIOP          = -Bstatic -liiopmt
-ITDSI           = -Bstatic -lDSImt
-ITIFR		= -Bstatic -lifrmt
-
-# ------------------------------------------------------------
-# SYSLIBS must be dynamically linked; otherwise you can expect to
-# get linkage errors for symbols in the nsl library
-# ------------------------------------------------------------
-
-LDFLAGS         += -L$(ORBIX_LIBDIR)
-SYSLIBS         = -Bdynamic -lnsl -lsocket
-
-IDL             = $(ORBIX_BINDIR)/idl 
-IDLFLAGS        =
-
-# ------------------------------------------------------------
-# The following section defines implicit rules for creating
-# *.{C,S}.C files, rules for compiling those
-# into objects, and even a rule for compiling C++ source into
-# objects (in case one isn't already defined).
-
-# ------------------------------------------------------------
-# first, put the new suffixes at the *head* of the suffix list,
-# overriding any existing .C compilation method.
-.SUFFIXES:
-.SUFFIXES: .$(C++SUFFIX) .idl $(SUFFIXES)
-
-# .SUFFIXES: .$(C++SUFFIX) .idl .hh $(SUFFIXES)
-# ------------------------------------------------------------
-# *[CS].o must be compiled here, and depends
-# mostly on the C++ files produced from the IDL file.
-
-%C.o: %C.$(C++SUFFIX)
-	$(C++) -c $(C++FLAGS) $<
-
-%S.o: %S.$(C++SUFFIX)
-	$(C++) -c $(C++FLAGS) $<
-
-%.o: %.$(C++SUFFIX)
-	$(C++) -c $(C++FLAGS) $<
-
-# and here's how to compile C++ files from the IDL file.
-# only ONE of these rules will be run at make-time,
-
-%S.$(C++SUFFIX): %.idl
-	$(IDL) $(IDLFLAGS) $<
-
-%C.$(C++SUFFIX): %.idl
-	$(IDL) $(IDLFLAGS) $<
-
-%.hh: %.idl
-	$(IDL) $(IDLFLAGS) $<
-
-# ------------------------------------------------------------
-# If the version of make you wish to use does not support
-# pattern matching, here's a sample of an explicit rule set.
-
-# We assume the IDL file is called "foobar.idl", we wish
-# to compile "foobarC.o", "foobarS.o", and
-# "foobar.hh", and the C++ file suffix.
-# ------------------------------------------------------------
-
-# foobarC.o: foobar.hh foobarC.C
-#	$(C++) -c ($C++FLAGS) foobarC.C
-#
-# foobarS.o: foobar.hh foobarS.C
-#	$(C++) -c ($C++FLAGS) foobarS.C
-#
-# foobarC.C: foobar.idl
-#	$(IDL) -c ($IDLFLAGS) foobar.idl
-#
-# foobarS.C: foobar.idl
-#	$(IDL) -c ($IDLFLAGS) foobar.idl
-#
-# foobar.hh: foobar.idl
-#	$(IDL) -c ($IDLFLAGS) foobar.idl
diff --git a/TAO/tests/Cubit/Orbix/tpool/Makefile b/TAO/tests/Cubit/Orbix/tpool/Makefile
deleted file mode 100644
index d4cbaacb6bd..00000000000
--- a/TAO/tests/Cubit/Orbix/tpool/Makefile
+++ /dev/null
@@ -1,89 +0,0 @@
-#----------------------------------------------------------------------------
-#	@(#)Makefile	1.1	10/18/96
-#
-#	Makefile for the ACE_MT_CORBA_Handler tests
-#----------------------------------------------------------------------------
-
-#----------------------------------------------------------------------------
-#	Local macros
-#----------------------------------------------------------------------------
-
-SRC = cubitS.cpp cubit_impl.cpp server.cpp tpool.cpp
-
-SVR_OBJS = cubitS.o cubit_impl.o server.o tpool.o
-
-LDLIBS	 = 
-
-VLDLIBS	 = $(LDLIBS:%=%$(VAR))
-
-#----------------------------------------------------------------------------
-#	Include macros and targets
-#----------------------------------------------------------------------------
-
-include		$(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-include		$(ACE_ROOT)/include/makeinclude/macros.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.common.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.lib.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.bin.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
-
-#----------------------------------------------------------------------------
-#	Orbix related macros and target settings.
-#----------------------------------------------------------------------------
-
-
-ORBIX_BINDIR    = $(ORBIX_ROOT)/bin
-ORBIX_LIBDIR    = $(ORBIX_ROOT)/corba2/lib
-ORBIX_INCDIR    = $(ORBIX_ROOT)/corba2/include
-
-# Remove -DCubit_USE_BOA from below to use the TIE approach
-
-CPPFLAGS += -DEXCEPTIONS -I$(ORBIX_INCDIR) -DWANT_ORBIX_FDS -DCubit_USE_BOA
-LDFLAGS  += -L$(ORBIX_LIBDIR) -R $(ORBIX_LIBDIR) -L$(ACE)/ace
-
-IDLFLAGS = -s S.cpp -c C.cpp -B
-
-#----------------------------------------------------------------------------
-#	Local targets
-#----------------------------------------------------------------------------
-
-all: server
-
-server: $(addprefix $(VDIR),$(SVR_OBJS))
-	$(LINK.cc) -o server $(addprefix $(VDIR),$(SVR_OBJS)) $(LDFLAGS) $(ITIIOP) $(ITSRV) $(VLDLIBS)
-
-#----------------------------------------------------------------------------
-#	Dependencies
-#----------------------------------------------------------------------------
-# DO NOT DELETE THIS LINE -- g++dep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-
-.obj/cubit_impl.o .shobj/cubit_impl.so: cubit_impl.cpp cubit_impl.h cubit.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/config-sunos5.5-sunc++-4.x.h \
- $(ACE_ROOT)/ace/stdcpp.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i
-.obj/server.o .shobj/server.so: server.cpp cubit_impl.h cubit.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/config-sunos5.5-sunc++-4.x.h \
- $(ACE_ROOT)/ace/stdcpp.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i
-
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/tests/Cubit/Orbix/tpool/cubit.h b/TAO/tests/Cubit/Orbix/tpool/cubit.h
deleted file mode 100644
index 1c868a6597d..00000000000
--- a/TAO/tests/Cubit/Orbix/tpool/cubit.h
+++ /dev/null
@@ -1,727 +0,0 @@
-
-#ifndef cubit_hh
-#define cubit_hh
-
-#include "ace/OS.h"
-#include <CORBA.h>
-
-
-#ifndef _Cubit_defined
-#define _Cubit_defined
-class Cubit_dispatch : public virtual CORBA::PPTR {
-public:
-
-      Cubit_dispatch (void *IT_p, CORBA::Object* IT_o, const char *IT_m, 
-        CORBA::LoaderClass *IT_l, char *IT_i, void* IT_im)
-       : PPTR (IT_p,IT_o,IT_m,IT_l,IT_i,IT_im) {}
-
-
-   Cubit_dispatch (char *IT_OR, void *IT_p, CORBA::Object *IT_o)
-       : PPTR (IT_OR,IT_p,IT_o) {}
-
-
-   Cubit_dispatch () {}
-
-   Cubit_dispatch (ObjectReference *IT_OR, void *IT_p, CORBA::Object *IT_o)
-       : PPTR (IT_OR,IT_p,IT_o) {}
-
-
-   Cubit_dispatch (void *IT_p, CORBA::Object *IT_o, const char *IT_m, 
-        char *IT_i, CORBA::Object* IT_ob, void* IT_im)
-       : PPTR (IT_p,IT_o,IT_m,IT_i,IT_ob,IT_im) {}
-
-
-   virtual unsigned char dispatch (CORBA::Request &IT_r, 
-        unsigned char IT_isTarget, void* IT_pp=NULL);
-
-
-};
-
-class Cubit;
-
-#ifndef CubitPtr
-#define CubitPtr
-
-typedef Cubit* Cubit_ptr;
-
-typedef Cubit* CubitRef;
-
-#endif
-
-
-#ifndef CubitForwH
-#define CubitForwH
-CORBA::ObjectRef Cubit_getBase (void *);
-void Cubit_release (Cubit *, CORBA::Environment &IT_env);
-void Cubit_release (Cubit_ptr);
-Cubit* Cubit_duplicate (Cubit_ptr, CORBA::Environment &IT_env);
-Cubit* Cubit_duplicate (Cubit_ptr );
-Cubit_ptr Cubit_nil (CORBA::Environment &IT_env);
-Cubit_ptr Cubit_nil ();
-#endif
-#define Cubit_IMPL "Cubit"
-
-
-class Cubit;
-
-typedef Cubit CubitProxy;
-#define Cubit_IR "Cubit$v1.1"
-#define Cubit_IMPL "Cubit"
-
-#ifndef CubitPtr
-#define CubitPtr
-
-typedef Cubit* Cubit_ptr;
-
-typedef Cubit* CubitRef;
-
-#endif
-
-class Cubit: public virtual CORBA::Object  {
-public:
-        Cubit (char *IT_OR);
-    Cubit (ObjectReference *IT_OR);
-    Cubit () : CORBA::Object  (1) {}
-protected:
-    Cubit_ptr __duplicate(
-            CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) {
-       CORBA::Object::__duplicate (IT_env);
-       return this;
-    }
-public:
-    static Cubit_ptr _duplicate(
-            Cubit_ptr, 
-            CORBA::Environment &IT_pEnv=CORBA::IT_chooseDefaultEnv ());
-public:
-   static Cubit* _bind (const char* IT_markerServer, const char* host,
-		const CORBA::Context &IT_c, 
-		CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-   static Cubit* _bind (CORBA::Environment &IT_env);
-   static Cubit* _bind (const char* IT_markerServer=NULL, const char* host=NULL,
-                 CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-    static Cubit* _narrow (CORBA::Object* , CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-    static Cubit_ptr _nil (CORBA::Environment &IT_pEnv=CORBA::IT_chooseDefaultEnv ()) {
-        CORBA::EnvExcRaiser IT_raise;
-        CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-        return (Cubit_ptr) CORBA::OBJECT_NIL;}
-
-#ifndef Cubit_Many_defined
-#define Cubit_Many_defined
-
-struct Many {
-    CORBA::Octet o;
-    CORBA::Long l;
-    CORBA::Short s;
-
-    void encodeOp (CORBA::Request &IT_r) const;
-    void decodeOp (CORBA::Request &IT_r);
-    void decodeInOutOp (CORBA::Request &IT_r);
-    Many(const Many &);
-    Many();
-    ~Many();
-    Many& operator= (const Many&);
-};
-
-#ifndef Cubit_ManyVarH
-#define Cubit_ManyVarH
-
-#ifndef Cubit_ManyvPtr
-#define Cubit_ManyvPtr
-typedef Many* Many_vPtr;
-typedef const Many* Many_cvPtr;
-#endif
-
-class Many_var : public CORBA::_var
-{
-    private:
-
-    unsigned char copyHelper (const Many_var &IT_s) {
-        if (!IT_s._ptr) {
-            _ptr = IT_s._ptr;
-        } else
-        {
-            _ptr = new Many;
-            *(_ptr) =  *(IT_s._ptr);
-        }
-        return 1;
-    }
-
-    public:
-
-    Many_var (const Many_var &IT_s) {
-        (void) copyHelper (IT_s);
-    }
-
-    Many_var () {
-        _ptr =  new Many;
-;
-    }
-
-    Many_var (Many *IT_p) {
-        _ptr = IT_p;
-    }
-
-    Many_var &operator= (Many *IT_p) {
-        if (_ptr != IT_p) {
-            delete _ptr;
-        }
-        _ptr = IT_p;
-        return (*this);
-    }
-
-    Many_var &operator= (const Many_var &IT_s) {
-        if (_ptr != IT_s._ptr) {
-            delete _ptr;
-        }
-        _ptr = new Many;
-        *(_ptr) =  *(IT_s._ptr);
-        return (*this);
-    }
-
-    ~Many_var () {
-        delete _ptr;
-    }
-
-    Many* operator-> () {
-        return _ptr;
-    }
-
-    operator Many_cvPtr () const { return _ptr;}
-    operator Many_vPtr& () { return _ptr;}
-    operator Many& () const { return * _ptr;}
-
-    protected:
-    Many *_ptr;
-    private:
-    Many_var &operator= (const CORBA::_var &IT_s);
-    Many_var (const CORBA::_var &IT_s);
-};
-
-#endif
-
-
-#endif
-
-enum discrim {e_0th,e_1st,e_2nd,e_3rd,e_4th,e_5th, IT__ENUM_Cubit_discrim=CORBA_ULONG_MAX};
-
-#ifndef Cubit_oneof_defined
-#define Cubit_oneof_defined
-
-struct oneof {
-    private:
-
-    discrim __d;
-    union {
-        CORBA::Octet _o_;
-        CORBA::Short _s_;
-        CORBA::Long _l_;
-        Many * _cm_;
-    };
-
-    public:
-
-    void encodeOp (CORBA::Request &IT_r) const;
-    void decodeOp (CORBA::Request &IT_r);
-    void decodeInOutOp (CORBA::Request &IT_r);
-
-    private:
-
-    unsigned char isSet;
-
-    public:
-
-    discrim _d () const { return __d; }
-
-    CORBA::Octet o () const {
-      return _o_;
-    }
-
-    void o (CORBA::Octet IT_member) {
-        if (isSet && (__d != Cubit::e_0th))
-        {
-            this-> oneof::~oneof();
-            memset(this, 0, sizeof(*this));
-        }
-
-        __d = Cubit::e_0th;
-        isSet = 1;
-        _o_ = IT_member;
-    }
-
-    CORBA::Short s () const {
-        return _s_;
-    }
-
-    void s (CORBA::Short IT_member) {
-        if (isSet && (__d != Cubit::e_1st))
-        {
-            this-> oneof::~oneof();
-            memset(this, 0, sizeof(*this));
-        }
-
-        __d = Cubit::e_1st;
-        isSet = 1;
-        _s_ = IT_member;
-    }
-
-    CORBA::Long l () const {
-        return _l_;
-    }
-
-    void l (CORBA::Long IT_member) {
-        if (isSet && (__d != Cubit::e_2nd))
-        {
-            this-> oneof::~oneof();
-            memset(this, 0, sizeof(*this));
-        }
-
-        __d = Cubit::e_2nd;
-        isSet = 1;
-        _l_ = IT_member;
-    }
-
-    Many& cm () {
-        return (*_cm_);
-    }
-
-    const Many& cm () const {
-        return (*_cm_);
-    }
-
-    void cm (const Many& IT_member) {
-        if (isSet && (__d != Cubit::e_3rd))
-        {
-            this-> oneof::~oneof();
-            memset(this, 0, sizeof(*this));
-        }
-
-        __d = Cubit::e_3rd;
-
-        if (!isSet) {
-            _cm_ = new Many;
-            isSet = 1;
-        }
-        *(_cm_) = IT_member;
-    }
-
-
-    oneof();
-    oneof(const oneof &);
-    ~oneof();
-    oneof& operator= (const oneof&);
-};
-
-#ifndef Cubit_oneofVarH
-#define Cubit_oneofVarH
-
-#ifndef Cubit_oneofvPtr
-#define Cubit_oneofvPtr
-typedef oneof* oneof_vPtr;
-typedef const oneof* oneof_cvPtr;
-#endif
-
-class oneof_var : public CORBA::_var
-{
-    private:
-
-    unsigned char copyHelper (const oneof_var &IT_s) {
-        if (!IT_s._ptr) {
-            _ptr = IT_s._ptr;
-        } else
-        {
-            _ptr = new oneof;
-            *(_ptr) =  *(IT_s._ptr);
-        }
-        return 1;
-    }
-
-    public:
-
-    oneof_var (const oneof_var &IT_s) {
-        (void) copyHelper (IT_s);
-    }
-
-    oneof_var () {
-        _ptr = NULL;
-    }
-
-    oneof_var (oneof *IT_p) {
-        _ptr = IT_p;
-    }
-
-    oneof_var &operator= (oneof *IT_p) {
-        if (_ptr != IT_p) {
-            delete _ptr;
-        }
-        _ptr = IT_p;
-        return (*this);
-    }
-
-    oneof_var &operator= (const oneof_var &IT_s) {
-        if (_ptr != IT_s._ptr) {
-            delete _ptr;
-        }
-        _ptr = new oneof;
-        *(_ptr) =  *(IT_s._ptr);
-        return (*this);
-    }
-
-    ~oneof_var () {
-        delete _ptr;
-    }
-
-    oneof* operator-> () {
-        return _ptr;
-    }
-
-    operator oneof_cvPtr () const { return _ptr;}
-    operator oneof_vPtr& () { return _ptr;}
-    operator oneof& () const { return * _ptr;}
-
-    protected:
-    oneof *_ptr;
-    private:
-    oneof_var &operator= (const CORBA::_var &IT_s);
-    oneof_var (const CORBA::_var &IT_s);
-};
-
-#endif
-
-
-#endif
-        virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual Many cube_struct (const Many& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual oneof cube_union (const oneof& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual void please_exit (CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-};
-
-#ifndef CubitVarH
-#define CubitVarH
-
-#ifndef CubitvPtr
-#define CubitvPtr
-typedef Cubit* Cubit_vPtr;
-typedef const Cubit* Cubit_cvPtr;
-#endif
-
-class Cubit_var : public CORBA::_var
-{
-    private:
-
-    unsigned char copyHelper (const Cubit_var &IT_s) {
-        {
-            _ptr = Cubit_duplicate (IT_s._ptr);
-        }
-        return 1;
-    }
-
-    public:
-
-    Cubit_var (const Cubit_var &IT_s) {
-        (void) copyHelper (IT_s);
-    }
-
-    Cubit_var () {
-        _ptr = Cubit_nil ();
-    }
-
-    Cubit_var (Cubit *IT_p) {
-        _ptr = IT_p;
-    }
-
-    Cubit_var &operator= (Cubit *IT_p) {
-        Cubit_release (_ptr);
-        _ptr = IT_p;
-        return (*this);
-    }
-
-    Cubit_var &operator= (const Cubit_var &IT_s) {
-        Cubit_release (_ptr);
-        _ptr = Cubit_duplicate (IT_s._ptr);
-        return (*this);
-    }
-
-    ~Cubit_var () {
-        Cubit_release (_ptr);
-    }
-
-    Cubit* operator-> () {
-        return _ptr;
-    }
-
-    operator Cubit_cvPtr () const { return _ptr;}
-    operator Cubit_vPtr& () { return _ptr;}
-
-    protected:
-    Cubit *_ptr;
-    private:
-    Cubit_var &operator= (const CORBA::_var &IT_s);
-    Cubit_var (const CORBA::_var &IT_s);
-    Cubit_var &operator= (const CORBA::_mgr &IT_s);
-    Cubit_var &operator= (const CORBA::_SeqElem &IT_s);
-    Cubit_var (const CORBA::_mgr &IT_s);
-    Cubit_var (const CORBA::_SeqElem &IT_s);
-};
-
-#endif
-
-
-#ifndef CubitMgrH
-#define CubitMgrH
-
-class Cubit_mgr : public CORBA::_mgr
-{
-    public:
-
-    Cubit_mgr () {
-        _ptr = Cubit_nil ();
-        _release = 1;
-    }
-
-    Cubit_mgr (const Cubit_mgr &IT_s) {
-        _ptr = Cubit_duplicate (IT_s._ptr);
-        _release = 1;
-    }
-
-    Cubit_mgr &operator= (Cubit *IT_p) {
-        if (_ptr && _release)
-            Cubit_release (_ptr);
-        _ptr = IT_p;
-        _release = 1;
-        return (*this);
-    }
-
-    Cubit_mgr &operator= (const Cubit_mgr &IT_s) {
-        if (_ptr && _release)
-            Cubit_release (_ptr);
-        _ptr = Cubit_duplicate(IT_s._ptr);
-        _release = 1;
-        return (*this);
-    }
-
-    Cubit_mgr &operator= (Cubit_var &IT_s) {
-        if (_ptr && _release)
-            Cubit_release (_ptr);
-        _ptr = Cubit_duplicate(IT_s);
-        _release = 1;
-        return (*this);
-    }
-
-    ~Cubit_mgr () {
-        if (_release)
-            Cubit_release (_ptr);
-    }
-
-    unsigned char release () {
-        return _release;
-    }
-
-    void release (unsigned char rel) {
-        _release = rel;
-    }
-
-    operator int () const {
-        return (((CORBA::Object_ptr) _ptr) ? 1 : 0);
-    }
-
-    operator void* () const {
-        return _ptr;
-    }
-
-    operator CORBA::Object * () const {
-        return (CORBA::Object *) _ptr;
-    }
-
-    operator Cubit* () const {
-        return (Cubit*) _ptr;
-    }
-
-    Cubit_ptr operator-> () const {
-        return _ptr;
-    }
-
-    Cubit *_ptr;
-
-    protected:
-
-    unsigned char _release;
-};
-
-typedef Cubit_mgr Cubit_mgr_IT_const;
-#endif
-
-#ifndef CubitSeqElemH
-#define CubitSeqElemH
-
-class Cubit_SeqElem : public CORBA::_SeqElem
-{
-    public:
-
-    Cubit_SeqElem (Cubit_ptr* IT_p, unsigned char rel) {
-        _ptr = IT_p;
-        _release = rel;
-    }
-
-    Cubit_SeqElem &operator= (Cubit_ptr IT_p) {
-        if (_ptr) {
-            if (*(_ptr) && _release)
-                Cubit_release (*(_ptr));
-            *(_ptr) = IT_p;
-        }
-        return (*this);
-    }
-
-    Cubit_SeqElem &operator= (const Cubit_SeqElem &IT_s) {
-        if (_ptr && IT_s._ptr) {
-            if (*(_ptr) && _release)
-                Cubit_release (*(_ptr));
-            *(_ptr) = Cubit_duplicate(*(IT_s._ptr));
-        }
-        return (*this);
-    }
-
-    operator Cubit_ptr () const {
-        return _ptr ? (Cubit_ptr) (*_ptr) : Cubit_nil(); 
-    }
-
-    Cubit_ptr operator->() const { return *_ptr;}
-
-    protected:
-    Cubit_ptr *_ptr;
-    unsigned char _release;
-};
-
-#endif
-
-
-#define TIE_Cubit(X) Cubit##X
-
-#define DEF_TIE_Cubit(X) \
-	class Cubit##X : public virtual Cubit {		\
-	  X* m_obj;						\
-	public:							\
-								\
-								\
-	   Cubit##X  (X *objp, const char* m="", CORBA::LoaderClass *l=0)\
-		: Cubit(), m_obj(objp) {	\
-		m_pptr = new Cubit_dispatch		\
-			(( Cubit*)this,(CORBA::Object*)this,m,l,Cubit_IR,m_obj);	\
-	   }								\
-	   Cubit##X  (CORBA::Object *IT_p, const char* IT_m="", void *IT_q=0)\
-		: Cubit() {	\
-		m_pptr = new Cubit_dispatch		\
-			(( Cubit*)this,(CORBA::Object*)this,IT_m,Cubit_IR,IT_p,IT_q);	\
-		m_obj = (X*)(m_pptr->getImplObj ());			\
-	   }								\
-								\
-	   virtual ~Cubit##X  () {				\
-		if (_okToDeleteImpl ()) delete m_obj; }					\
-	   virtual void* _deref () {					\
-		return m_obj; }					\
-								\
-virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_octet (  o,IT_env);\
-}\
-	\
-virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_short (  s,IT_env);\
-}\
-	\
-virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_long (  l,IT_env);\
-}\
-	\
-virtual Cubit::Many cube_struct (const Cubit::Many& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_struct (  values,IT_env);\
-}\
-	\
-virtual Cubit::oneof cube_union (const Cubit::oneof& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_union (  values,IT_env);\
-}\
-	\
-virtual void please_exit (CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-m_obj->please_exit (IT_env);\
-}\
-								\
-	};						\
-
-
-#define QUALS_Cubit	\
-virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_octet (  o,IT_env);\
-}\
-	\
-virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_short (  s,IT_env);\
-}\
-	\
-virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_long (  l,IT_env);\
-}\
-	\
-virtual Many cube_struct (const Many& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_struct (  values,IT_env);\
-}\
-	\
-virtual oneof cube_union (const oneof& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_union (  values,IT_env);\
-}\
-	\
-virtual void please_exit (CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-m_obj->please_exit (IT_env);\
-}\
-
-
-
-
-class CubitProxyFactoryClass : public virtual CORBA::ObjectFactoryClass {
-public:
-   CubitProxyFactoryClass (unsigned char IT_p=0)
-		: CORBA::ProxyFactory (Cubit_IR, IT_p) {}
-
-    virtual void* New (char *IT_OR, CORBA::Environment&);
-
-    virtual void* New (ObjectReference *IT_OR, CORBA::Environment&);
-
-    virtual void* New2 (); 
-
-    virtual CORBA::Object* NewObject (char *IT_OR, CORBA::Environment&);
-
-    virtual CORBA::Object* NewObject (ObjectReference *IT_OR, CORBA::Environment&);
-
-    virtual CORBA::Object* New2Object (); 
-
-    virtual void* IT_castUp (void *IT_p, char* IT_s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-
-    virtual CORBA::PPTR* pptr (void *IT_p);
-
-    virtual void baseInterfaces (_IDL_SEQUENCE_string&);
-
-
-};
-
-extern CubitProxyFactoryClass CubitProxyFactory;
-
-class CubitBOAImpl : public virtual Cubit  {
-public:
-    CubitBOAImpl (const char *m="", CORBA::LoaderClass *l=NULL) {
-  if (CORBA::PPTR::isOK (m_pptr, Cubit_IR))
-    m_pptr = new Cubit_dispatch ( (Cubit*)this,
-   	 (CORBA::Object*)this, m, l, Cubit_IR, this);
-}
-
-        virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual Many cube_struct (const Many& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual oneof cube_union (const oneof& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual void please_exit (CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-};
-
-
-#endif
-
-
-#endif
diff --git a/TAO/tests/Cubit/Orbix/tpool/cubit.idl b/TAO/tests/Cubit/Orbix/tpool/cubit.idl
deleted file mode 100644
index d9b38c34a2a..00000000000
--- a/TAO/tests/Cubit/Orbix/tpool/cubit.idl
+++ /dev/null
@@ -1,40 +0,0 @@
-// @(#)cubit.idl	1.1 95/09/10
-// Copyright 1994-1995 by Sun Microsystems, Inc.
-
-#pragma prefix	"Eng.SUN.COM"
-#pragma version Cubit 1.1
-
-interface Cubit {
-    octet	cube_octet (in octet o);
-    short	cube_short (in short s);
-    long	cube_long (in long l);
-
-    struct Many {
-	octet	o;		// + 3 bytes padding (normally) ...
-	long	l;
-	short	s;		// + 2 bytes padding (normally) ...
-    };
-
-    Many	cube_struct (in Many values);
-
-    enum discrim {e_0th, e_1st, e_2nd, e_3rd, e_4th, e_5th};
-
-    union oneof
-    switch (discrim) {
-	// this is an easy union to interpret; no padding
-	// is needed between discriminant and value.
-      case e_0th:
-        octet		o;
-      case e_1st:
-        short		s;
-      case e_2nd:
-        long		l;
-      case e_3rd:
-      default:
-        Many		cm;
-    };
-
-    oneof	cube_union (in oneof values);
-
-    oneway void	please_exit ();
-};
diff --git a/TAO/tests/Cubit/Orbix/tpool/cubitC.cpp b/TAO/tests/Cubit/Orbix/tpool/cubitC.cpp
deleted file mode 100644
index c47e38f26ee..00000000000
--- a/TAO/tests/Cubit/Orbix/tpool/cubitC.cpp
+++ /dev/null
@@ -1,557 +0,0 @@
-#include "cubit.h"
-
-Cubit::Cubit (char *IT_OR) {
-      m_pptr = new Cubit_dispatch (IT_OR, this,(CORBA::Object*)this);
-} 
-Cubit::Cubit (ObjectReference *IT_OR) {
-      m_pptr = new Cubit_dispatch (IT_OR, this,(CORBA::Object*)this);
-} 
-
-#ifndef CubitForwC
-#define CubitForwC
-CORBA::ObjectRef Cubit_getBase(void *IT_p){
-    return (Cubit*) IT_p;}
-
-void Cubit_release (Cubit_ptr IT_p, CORBA::Environment &IT_env) {
-    CORBA::release(IT_p, IT_env);}
-
-void Cubit_release (Cubit_ptr IT_p) {
-    Cubit_release (IT_p, CORBA::IT_chooseDefaultEnv ()); }
-
-Cubit_ptr Cubit_nil (CORBA::Environment &) {
-    return Cubit:: _nil ();}
-
-Cubit_ptr Cubit_nil () {
-    return Cubit_nil (CORBA::IT_chooseDefaultEnv ());}
-
-Cubit_ptr Cubit_duplicate (Cubit_ptr IT_p, CORBA::Environment &IT_env) {
-    return (Cubit::_duplicate(IT_p, IT_env)); }
-Cubit_ptr Cubit_duplicate (Cubit_ptr IT_p) {
-    return Cubit_duplicate (IT_p, CORBA::IT_chooseDefaultEnv ()); }
-#endif
-
-Cubit_ptr Cubit::_duplicate(Cubit_ptr obj, CORBA::Environment& IT_pEnv) {
-        CORBA::EnvExcRaiser IT_raise;
-        CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-       if (!obj) {
-          return (obj);
-       }
-       Cubit_ptr IT_obj = obj->__duplicate (IT_env);
-       return IT_obj;
-}
-
-
-
-Cubit* Cubit:: _bind (const char* IT_markerServer, const char* host,
-		const CORBA::Context &IT_c, 
-		CORBA::Environment &IT_env) {
-       return (Cubit*)CORBA::Factory.New (IT_markerServer, IT_env, IT_c, host, 
-		Cubit_IMPL, Cubit_IR);
-}
-
-
-
-Cubit* Cubit:: _bind (CORBA::Environment &IT_env) {
-       return _bind (NULL,NULL,CORBA::Context(), IT_env); }
-
-
-Cubit* Cubit:: _bind (const char* IT_markerServer, const char* host,
-                CORBA::Environment &IT_env) {
-       return _bind (IT_markerServer, host, CORBA::Context (), IT_env); }
-Cubit* Cubit::_narrow (CORBA::Object* IT_obj, CORBA::Environment &IT_pEnv) {
-        CORBA::EnvExcRaiser IT_raise;
-        CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-        if (CORBA::is_nil (IT_obj)) {
-                return Cubit:: _nil();
-        }
-
-       Cubit* IT_p = (Cubit*)CORBA::Object::_castDown (IT_obj, Cubit_IR, IT_env);
-        IT_p = IT_p ? IT_p->__duplicate(IT_env) : NULL;
-        if ((IT_env) &&(!strcmp(IT_env.exception()->id(), "CORBA::StExcep::BAD_PARAM")) && (((CORBA::BAD_PARAM*)IT_env.exception())-> minor() == NARROW_FAILED)) {
-                IT_env.exception_free();
-        }
-        return IT_p;
-   }
-
-
-#ifndef Cubit_Many_Ops
-#define Cubit_Many_Ops
-
-void Cubit::Many:: encodeOp (CORBA::Request &IT_r) const {
-
-    IT_r.insertOctet (o);
-
-    IT_r << l;
-
-    IT_r << s;
-}
-
-void Cubit::Many:: decodeOp (CORBA::Request &IT_r) {
-
-    IT_r.extractOctet (o);
-
-    IT_r >> l;
-
-    IT_r >> s;
-}
-
-void Cubit::Many:: decodeInOutOp (CORBA::Request &IT_r) {
-
-    IT_r.extractOctet (o);
-
-    IT_r >> l;
-
-    IT_r >> s;
-}
-
-Cubit::Many ::~Many () {
-}
-
-Cubit::Many:: Many (const Cubit::Many &IT_s) 
-	 {
-    o = IT_s.o;
-    l = IT_s.l;
-    s = IT_s.s;
-}
-
-Cubit::Many:: Many () {
-}
-
-Cubit::Many &Cubit::Many:: operator= (const Cubit::Many& IT_s) {
-    if (this == &IT_s) return *this;
-    o = IT_s.o;
-    l = IT_s.l;
-    s = IT_s.s;
-    return *this;
-}
-
-
-#endif
-
-
-#ifndef Cubit_oneof_Ops
-#define Cubit_oneof_Ops
-void Cubit::oneof:: encodeOp (CORBA::Request &IT_r) const {
-    if (!isSet) return;
-    {
-    CORBA::ULong IT_0 = (CORBA::ULong) __d;
-    IT_r << IT_0;
-    }
-    switch (__d) {
-        case Cubit::e_0th: 
-        IT_r.insertOctet (_o_);
-        break;
-        case Cubit::e_1st: 
-        IT_r << _s_;
-        break;
-        case Cubit::e_2nd: 
-        IT_r << _l_;
-        break;
-        case Cubit::e_3rd: 
-        default: 
-        (*_cm_).encodeOp (IT_r);
-        break;
-    }
-
-}
-
-void Cubit::oneof:: decodeOp (CORBA::Request &IT_r) {
-    isSet = 0;
-    {
-    CORBA::ULong IT_1;
-    IT_r >> IT_1;
-    __d = Cubit::discrim(IT_1);
-    }
-    switch (__d) {
-        case Cubit::e_0th: 
-        if (!isSet) {
-            isSet = 1;
-        }
-        IT_r.extractOctet (_o_);
-        break;
-        case Cubit::e_1st: 
-        if (!isSet) {
-            isSet = 1;
-        }
-        IT_r >> _s_;
-        break;
-        case Cubit::e_2nd: 
-        if (!isSet) {
-            isSet = 1;
-        }
-        IT_r >> _l_;
-        break;
-        case Cubit::e_3rd: 
-        default: 
-        if (!isSet) {
-            _cm_ = new Cubit::Many;
-            isSet = 1;
-        }
-        (*_cm_).decodeOp (IT_r);
-        break;
-    }
-
-}
-void Cubit::oneof:: decodeInOutOp (CORBA::Request &IT_r) {
-    Cubit::discrim IT_d;
-    {
-    CORBA::ULong IT_2;
-    IT_r >> IT_2;
-    IT_d = Cubit::discrim(IT_2);
-    }
-    if (IT_d == __d)
-        switch (__d) {
-            case Cubit::e_0th: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r.extractOctet (_o_);
-            break;
-            case Cubit::e_1st: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r >> _s_;
-            break;
-            case Cubit::e_2nd: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r >> _l_;
-            break;
-            case Cubit::e_3rd: 
-            default: 
-            if (!isSet) {
-                _cm_ = new Cubit::Many;
-                isSet = 1;
-            }
-            (*_cm_).decodeInOutOp (IT_r);
-            break;
-        }
-
-    else {
-        this->oneof:: ~oneof();
-        memset(this, 0, sizeof(*this));
-        __d = IT_d;
-        switch (__d) {
-            case Cubit::e_0th: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r.extractOctet (_o_);
-            break;
-            case Cubit::e_1st: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r >> _s_;
-            break;
-            case Cubit::e_2nd: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r >> _l_;
-            break;
-            case Cubit::e_3rd: 
-            default: 
-            if (!isSet) {
-                _cm_ = new Cubit::Many;
-                isSet = 1;
-            }
-            (*_cm_).decodeOp (IT_r);
-            break;
-        }
-        isSet = 1;
-    }
-
-}
-
-Cubit::oneof:: oneof() { 
-    memset(this, 0, sizeof(*this));
-    isSet = 0;
-}
-
-Cubit::oneof ::~oneof() {
-    if (!isSet) return;
-    switch (__d) { 
-        case Cubit::e_0th:         break;
-        case Cubit::e_1st:         break;
-        case Cubit::e_2nd:         break;
-        case Cubit::e_3rd: 
-        default:         if (_cm_) delete _cm_;
-        break;
-    }
-
-    isSet = 0;
-}
-
-Cubit::oneof:: oneof (const Cubit::oneof &IT_s) {
-    isSet = 0;
-    memset(this, 0, sizeof(*this));
-    __d = IT_s.__d;
-    switch (__d) {
-        case Cubit::e_0th:         isSet = 1;
-        _o_ = IT_s._o_;
-        break;
-        case Cubit::e_1st:         isSet = 1;
-        _s_ = IT_s._s_;
-        break;
-        case Cubit::e_2nd:         isSet = 1;
-        _l_ = IT_s._l_;
-        break;
-        case Cubit::e_3rd: 
-        default: 
-        if (!isSet) {
-            _cm_ = new Cubit::Many;
-            isSet = 1;
-        }
-        *(_cm_) = *(IT_s._cm_);
-        break;
-    }
-    isSet = 1;
-}
-
-Cubit::oneof& Cubit::oneof:: operator= (const Cubit::oneof & IT_s) {
-    if (this == &IT_s) return *this;
-    if (isSet && (__d != IT_s.__d))
-    {
-        this-> oneof::~oneof();
-        memset(this, 0, sizeof(*this));
-    }
-
-    __d = IT_s.__d;
-    switch (__d) {
-        case Cubit::e_0th:         isSet = 1;
-        _o_ = IT_s._o_;
-        break;
-        case Cubit::e_1st:         isSet = 1;
-        _s_ = IT_s._s_;
-        break;
-        case Cubit::e_2nd:         isSet = 1;
-        _l_ = IT_s._l_;
-        break;
-        case Cubit::e_3rd: 
-        default: 
-        if (!isSet) {
-            _cm_ = new Cubit::Many;
-            isSet = 1;
-        }
-        *(_cm_) = *(IT_s._cm_);
-        break;
-    }
-    isSet = 1;
-    return *this;
-}
-
-
-#endif
-
-void* CubitProxyFactoryClass::New (char *IT_OR, CORBA::Environment&) {
-        return  new class Cubit(IT_OR);}
-
-void* CubitProxyFactoryClass::New (ObjectReference *IT_OR, CORBA::Environment&) {
-        return  new class Cubit(IT_OR);}
-
-void* CubitProxyFactoryClass::New2 () {
-        return  new class Cubit((char*)0);}
-
-CORBA::Object* CubitProxyFactoryClass::NewObject (char *IT_OR, CORBA::Environment&) {
-        return  new class Cubit(IT_OR);}
-
-CORBA::Object* CubitProxyFactoryClass::NewObject (ObjectReference *IT_OR, CORBA::Environment&) {
-        return  new class Cubit(IT_OR);}
-
-CORBA::Object* CubitProxyFactoryClass::New2Object () {
-        return  new class Cubit((char*)0);}
-
-void* CubitProxyFactoryClass::IT_castUp (void *IT_p, char* IT_s, CORBA::Environment &IT_env) {
-      void *IT_l;
-      if (!CORBA::_interfaceCmp (IT_s,Cubit_IR, IT_env))
-         return IT_p;
-      else if (IT_l=CORBA::ObjectFactoryClass::IT_castUp((CORBA::Object*)((class Cubit*)IT_p),IT_s, IT_env))
-         return IT_l;
-      else return NULL;
-    }
-
-
-CORBA::PPTR* CubitProxyFactoryClass::pptr (void *IT_p) {
-       return ((class Cubit*)IT_p)->_pptr ();}
-
-void CubitProxyFactoryClass::baseInterfaces (_IDL_SEQUENCE_string& seq) {
-      add (seq, Cubit_IR);
-      CORBA::ObjectFactoryClass::baseInterfaces (seq);
-}
-
-CubitProxyFactoryClass CubitProxyFactory(1);
-
-CORBA::Octet Cubit:: cube_octet (CORBA::Octet o, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        return 0;
-    }
-    CORBA::Request IT_r (this, "cube_octet",IT_env,1,0);
-    if (!IT_r.isException (IT_env)) {
-
-        IT_r.insertOctet (o);
-    }
-
-    IT_r.invoke (CORBA::Flags(0),IT_env);
-    if (!IT_r.isException (IT_env)) {
-        CORBA::Octet IT_result;
-        IT_r.extractOctet (IT_result);
-        IT_r.checkEnv (IT_env);
-        return IT_result;
-    }
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-    return 0;
-}
-
-CORBA::Short Cubit:: cube_short (CORBA::Short s, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        return 0;
-    }
-    CORBA::Request IT_r (this, "cube_short",IT_env,1,0);
-    if (!IT_r.isException (IT_env)) {
-
-        IT_r << s;
-    }
-
-    IT_r.invoke (CORBA::Flags(0),IT_env);
-    if (!IT_r.isException (IT_env)) {
-        CORBA::Short IT_result;
-        IT_r >> IT_result;
-        IT_r.checkEnv (IT_env);
-        return IT_result;
-    }
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-    return 0;
-}
-
-CORBA::Long Cubit:: cube_long (CORBA::Long l, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        return 0;
-    }
-    CORBA::Request IT_r (this, "cube_long",IT_env,1,0);
-    if (!IT_r.isException (IT_env)) {
-
-        IT_r << l;
-    }
-
-    IT_r.invoke (CORBA::Flags(0),IT_env);
-    if (!IT_r.isException (IT_env)) {
-        CORBA::Long IT_result;
-        IT_r >> IT_result;
-        IT_r.checkEnv (IT_env);
-        return IT_result;
-    }
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-    return 0;
-}
-
-Cubit::Many Cubit:: cube_struct (const Cubit::Many& values, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        { 
-            Cubit::Many IT_l0;
-            return IT_l0;
-        }
-    }
-    CORBA::Request IT_r (this, "cube_struct",IT_env,1,0);
-    if (!IT_r.isException (IT_env)) {
-
-        values.encodeOp (IT_r);
-    }
-
-    IT_r.invoke (CORBA::Flags(0),IT_env);
-    if (!IT_r.isException (IT_env)) {
-        Cubit::Many IT_result;
-        IT_result.decodeOp (IT_r);
-        IT_r.checkEnv (IT_env);
-        return IT_result;
-    }
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-    { 
-        Cubit::Many IT_l1;
-        return IT_l1;
-    }
-}
-
-Cubit::oneof Cubit:: cube_union (const Cubit::oneof& values, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        { 
-            Cubit::oneof IT_l0;
-            return IT_l0;
-        }
-    }
-    CORBA::Request IT_r (this, "cube_union",IT_env,1,0);
-    if (!IT_r.isException (IT_env)) {
-
-        values.encodeOp (IT_r);
-    }
-
-    IT_r.invoke (CORBA::Flags(0),IT_env);
-    if (!IT_r.isException (IT_env)) {
-        Cubit::oneof IT_result;
-        IT_result.decodeOp (IT_r);
-        IT_r.checkEnv (IT_env);
-        return IT_result;
-    }
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-    { 
-        Cubit::oneof IT_l1;
-        return IT_l1;
-    }
-}
-
-void Cubit:: please_exit (CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        return ;
-    }
-    CORBA::Request IT_r (this, "please_exit",IT_env,1,1);
-
-    IT_r.invoke (CORBA::Flags(CORBA::INV_NO_RESPONSE), IT_env);
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-}
-
-
-
-
-
-#ifndef Cubit_dispatch_impl
-
-unsigned char Cubit_dispatch::dispatch (CORBA::Request &IT_r, 
-    unsigned char, void *) {
-      IT_r.makeRuntimeException1 ("Cubit");
-      return 0;
-}
- 
-#endif
-
diff --git a/TAO/tests/Cubit/Orbix/tpool/cubitS.cpp b/TAO/tests/Cubit/Orbix/tpool/cubitS.cpp
deleted file mode 100644
index 449a8c23548..00000000000
--- a/TAO/tests/Cubit/Orbix/tpool/cubitS.cpp
+++ /dev/null
@@ -1,226 +0,0 @@
-#include "cubit.h"
-
-
-#define Cubit_dispatch_impl
-
-unsigned char Cubit_dispatch::dispatch (CORBA::Request &IT_r, 
- unsigned char IT_isTarget, void *IT_pp) {
-    if (!IT_pp)
-       IT_pp = m_obj;
-    const char *IT_s = IT_r.getOperation ();
-    if (!strcmp(IT_s,"cube_octet")) {
-        CORBA::Octet IT_result;
-        CORBA::Environment IT_env (IT_r);
-        CORBA::Filter* IT_f = CORBA::Orbix.getFilter ();
-        if (!IT_r.tcAssert ("\
-Ro~cube_octet~+o{o},>{o},N{}\
-"))
-            return 1;
-        CORBA::Octet o;
-
-        IT_r.extractOctet (o);
-
-        if (IT_f && !IT_r.isException (IT_env))
-        	IT_f->inRequestPostM (IT_r, IT_env);
-        if (!IT_r.isException (IT_env)) {
-            try {
-                	IT_result = ((Cubit*)IT_pp)->cube_octet (  o, IT_env);
-
-            } catch (CORBA::SystemException &IT_exSys) {
-            IT_env.propagate (&IT_exSys);
-            } catch (CORBA::UserException &IT_exUsr) {
-            IT_env.propagate (&IT_exUsr);
-            }
-        }
-
-        if (!IT_r.isException (IT_env)) {
-            if (!IT_r.convertToReply ("\
-o\
-", IT_env)) return 1;
-            IT_r.insertOctet (IT_result);
-            }
-
-        else IT_r.makeSystemException (IT_env);
-        return 1;
-    }
-
-    if (!strcmp(IT_s,"cube_short")) {
-        CORBA::Short IT_result;
-        CORBA::Environment IT_env (IT_r);
-        CORBA::Filter* IT_f = CORBA::Orbix.getFilter ();
-        if (!IT_r.tcAssert ("\
-Ro~cube_short~+s{s},>{s},N{}\
-"))
-            return 1;
-        CORBA::Short s;
-
-        IT_r >> s;
-
-        if (IT_f && !IT_r.isException (IT_env))
-        	IT_f->inRequestPostM (IT_r, IT_env);
-        if (!IT_r.isException (IT_env)) {
-            try {
-                	IT_result = ((Cubit*)IT_pp)->cube_short (  s, IT_env);
-
-            } catch (CORBA::SystemException &IT_exSys) {
-            IT_env.propagate (&IT_exSys);
-            } catch (CORBA::UserException &IT_exUsr) {
-            IT_env.propagate (&IT_exUsr);
-            }
-        }
-
-        if (!IT_r.isException (IT_env)) {
-            if (!IT_r.convertToReply ("\
-s\
-", IT_env)) return 1;
-            IT_r << IT_result;
-            }
-
-        else IT_r.makeSystemException (IT_env);
-        return 1;
-    }
-
-    if (!strcmp(IT_s,"cube_long")) {
-        CORBA::Long IT_result;
-        CORBA::Environment IT_env (IT_r);
-        CORBA::Filter* IT_f = CORBA::Orbix.getFilter ();
-        if (!IT_r.tcAssert ("\
-Ro~cube_long~+l{l},>{l},N{}\
-"))
-            return 1;
-        CORBA::Long l;
-
-        IT_r >> l;
-
-        if (IT_f && !IT_r.isException (IT_env))
-        	IT_f->inRequestPostM (IT_r, IT_env);
-        if (!IT_r.isException (IT_env)) {
-            try {
-                	IT_result = ((Cubit*)IT_pp)->cube_long (  l, IT_env);
-
-            } catch (CORBA::SystemException &IT_exSys) {
-            IT_env.propagate (&IT_exSys);
-            } catch (CORBA::UserException &IT_exUsr) {
-            IT_env.propagate (&IT_exUsr);
-            }
-        }
-
-        if (!IT_r.isException (IT_env)) {
-            if (!IT_r.convertToReply ("\
-l\
-", IT_env)) return 1;
-            IT_r << IT_result;
-            }
-
-        else IT_r.makeSystemException (IT_env);
-        return 1;
-    }
-
-    if (!strcmp(IT_s,"cube_struct")) {
-        Cubit::Many IT_result;
-        CORBA::Environment IT_env (IT_r);
-        CORBA::Filter* IT_f = CORBA::Orbix.getFilter ();
-        if (!IT_r.tcAssert ("\
-Ro~cube_struct~+values{R~Cubit::Many~o{o},l{l},s{s}},>{R~Cubit::Many~o{o},l{l},s{s}},N{}\
-"))
-            return 1;
-        Cubit::Many values;
-
-        values.decodeOp (IT_r);
-
-        if (IT_f && !IT_r.isException (IT_env))
-        	IT_f->inRequestPostM (IT_r, IT_env);
-        if (!IT_r.isException (IT_env)) {
-            try {
-                	IT_result = ((Cubit*)IT_pp)->cube_struct (  values, IT_env);
-
-            } catch (CORBA::SystemException &IT_exSys) {
-            IT_env.propagate (&IT_exSys);
-            } catch (CORBA::UserException &IT_exUsr) {
-            IT_env.propagate (&IT_exUsr);
-            }
-        }
-
-        if (!IT_r.isException (IT_env)) {
-            if (!IT_r.convertToReply ("\
-R~Cubit::Many~o{o},l{l},s{s}\
-", IT_env)) return 1;
-            IT_result.encodeOp (IT_r);
-            }
-
-        else IT_r.makeSystemException (IT_env);
-        return 1;
-    }
-
-    if (!strcmp(IT_s,"cube_union")) {
-        Cubit::oneof IT_result;
-        CORBA::Environment IT_env (IT_r);
-        CORBA::Filter* IT_f = CORBA::Orbix.getFilter ();
-        IT_r.tcPreAssert (
-"\
-Ro~cube_union~+values{U~Cubit::oneof~{E~Cubit::discrim~e_0th,e_1st,e_2nd,e_3rd,e_4th,e_5th}~Cubit::e_0th o{o};Cubit::e_1st s{s};Cubit::e_2nd l{l};Cubit::e_3rd,$ cm{R~Cubit::Many~o{o},l{l},s{s}}},>{U~Cubit::oneof~{E~Cubit::discrim~e_0th,e_1st,e_2nd,e_3rd,\
-");
-        if (!IT_r.tcAssert ("\
-e_4th,e_5th}~Cubit::e_0th o{o};Cubit::e_1st s{s};Cubit::e_2nd l{l};Cubit::e_3rd,$ cm{R~Cubit::Many~o{o},l{l},s{s}}},N{}\
-"))
-            return 1;
-        Cubit::oneof values;
-
-        values.decodeOp (IT_r);
-
-        if (IT_f && !IT_r.isException (IT_env))
-        	IT_f->inRequestPostM (IT_r, IT_env);
-        if (!IT_r.isException (IT_env)) {
-            try {
-                	IT_result = ((Cubit*)IT_pp)->cube_union (  values, IT_env);
-
-            } catch (CORBA::SystemException &IT_exSys) {
-            IT_env.propagate (&IT_exSys);
-            } catch (CORBA::UserException &IT_exUsr) {
-            IT_env.propagate (&IT_exUsr);
-            }
-        }
-
-        if (!IT_r.isException (IT_env)) {
-            if (!IT_r.convertToReply ("\
-U~Cubit::oneof~{E~Cubit::discrim~e_0th,e_1st,e_2nd,e_3rd,e_4th,e_5th}~Cubit::e_0th o{o};Cubit::e_1st s{s};Cubit::e_2nd l{l};Cubit::e_3rd,$ cm{R~Cubit::Many~o{o},l{l},s{s}}\
-", IT_env)) return 1;
-            IT_result.encodeOp (IT_r);
-            }
-
-        else IT_r.makeSystemException (IT_env);
-        return 1;
-    }
-
-    if (!strcmp(IT_s,"please_exit")) {
-        CORBA::Environment IT_env (IT_r);
-        CORBA::Filter* IT_f = CORBA::Orbix.getFilter ();
-        if (!IT_r.tcAssert ("\
-Ro~please_exit~>{v},O{}\
-"))
-            return 1;
-
-        if (IT_f && !IT_r.isException (IT_env))
-        	IT_f->inRequestPostM (IT_r, IT_env);
-        if (!IT_r.isException (IT_env)) {
-            try {
-                ((Cubit*)IT_pp)->please_exit (IT_env);
-
-            } catch (CORBA::SystemException &IT_exSys) {
-            IT_env.propagate (&IT_exSys);
-            } catch (CORBA::UserException &IT_exUsr) {
-            IT_env.propagate (&IT_exUsr);
-            }
-        }
-        IT_r.replyNoResults (CORBA::Flags(CORBA::INV_NO_RESPONSE),IT_env);
-        return 1;
-    }
-
-    if (IT_isTarget)
-        IT_r.makeRuntimeException2 ();
-
-    return 0;
-}
-
-#include "cubitC.cpp"
-
diff --git a/TAO/tests/Cubit/Orbix/tpool/cubit_impl.cpp b/TAO/tests/Cubit/Orbix/tpool/cubit_impl.cpp
deleted file mode 100644
index e35f1084118..00000000000
--- a/TAO/tests/Cubit/Orbix/tpool/cubit_impl.cpp
+++ /dev/null
@@ -1,46 +0,0 @@
-#include "cubit_impl.h"
-
-CORBA::Octet Cubit_Impl:: cube_octet (CORBA::Octet o, CORBA::Environment &IT_env) throw (CORBA::SystemException) {
-  return (CORBA::Octet) (o * o * o); 
-}
-
-CORBA::Short Cubit_Impl:: cube_short (CORBA::Short s, CORBA::Environment &IT_env) throw (CORBA::SystemException) {
-  return (CORBA::Short) (s * s * s);
-}
-
-CORBA::Long Cubit_Impl:: cube_long (CORBA::Long l, CORBA::Environment &IT_env) throw (CORBA::SystemException) {
-   return (CORBA::Long) (l * l * l);
-}
-
-Cubit::Many Cubit_Impl:: cube_struct (const Cubit::Many& values, CORBA::Environment &IT_env) throw (CORBA::SystemException) {
-  Cubit::Many out_values;
-  out_values.o = values.o * values.o * values.o;
-  out_values.s = values.s * values.s * values.s;
-  out_values.l = values.l * values.l * values.l;
-  return out_values; 
-}
-
-Cubit::oneof Cubit_Impl:: cube_union (const Cubit::oneof& values, CORBA::Environment &IT_env) throw (CORBA::SystemException) {
-  Cubit::oneof out_values;
-   switch (values._d ()) {
-   case Cubit::e_0th:
-     out_values.o (values.o () * values.o ()  * values.o ());
-     break;
-   case Cubit::e_1st:
-     out_values.s (values.s () * values.s () * values.s ());
-     break;
-   case Cubit::e_2nd:
-     out_values.l (values.l () * values.l () * values.l ());
-     break;
-   case Cubit::e_3rd:
-   default:
-     out_values.cm ().o = values.cm ().o * values.cm ().o * values.cm ().o ;
-     out_values.cm ().s = values.cm ().s * values.cm ().s * values.cm ().s ;
-     out_values.cm ().l = values.cm ().l * values.cm ().l * values.cm ().l ;
-     break;
-   }
-   return out_values;  
-}
-
-void Cubit_Impl:: please_exit (CORBA::Environment &IT_env) throw (CORBA::SystemException) {
-}
diff --git a/TAO/tests/Cubit/Orbix/tpool/cubit_impl.h b/TAO/tests/Cubit/Orbix/tpool/cubit_impl.h
deleted file mode 100644
index 1e710bb15d1..00000000000
--- a/TAO/tests/Cubit/Orbix/tpool/cubit_impl.h
+++ /dev/null
@@ -1,27 +0,0 @@
-
-#ifndef cubit_ih
-#define cubit_ih
-
-#include "cubit.h"
-
-
-#ifdef Cubit_USE_BOA
-class Cubit_Impl : public virtual CubitBOAImpl {
-#else
-class Cubit_Impl {
-#endif /* Cubit_USE_BOA */
-
-public:
-        virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env=CORBA::default_environment) throw (CORBA::SystemException);
-        virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env=CORBA::default_environment) throw (CORBA::SystemException);
-        virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env=CORBA::default_environment) throw (CORBA::SystemException);
-        virtual Cubit::Many cube_struct (const Cubit::Many& values, CORBA::Environment &IT_env=CORBA::default_environment) throw (CORBA::SystemException);
-        virtual Cubit::oneof cube_union (const Cubit::oneof& values, CORBA::Environment &IT_env=CORBA::default_environment) throw (CORBA::SystemException);
-        virtual void please_exit (CORBA::Environment &IT_env=CORBA::default_environment) throw (CORBA::SystemException);
-};
-
-#ifndef Cubit_USE_BOA
-DEF_TIE_Cubit (Cubit_Impl)
-#endif /* Cubit_USE_BOA */
-
-#endif
diff --git a/TAO/tests/Cubit/Orbix/tpool/server.cpp b/TAO/tests/Cubit/Orbix/tpool/server.cpp
deleted file mode 100644
index 8cae4135876..00000000000
--- a/TAO/tests/Cubit/Orbix/tpool/server.cpp
+++ /dev/null
@@ -1,46 +0,0 @@
-//**************************************************************************
-//
-// NAME :   tpr_server.cpp 
-// DESCRIPTION:  
-//
-// Server mainline
-//
-//****************************************************************************
-#define IT_EX_MACROS
-
-#include "cubit_impl.h"		// server header file
-#include "tpool.h"
-
-int 
-main (int argc, char** argv)
-{
-
-
-#ifdef Cubit_USE_BOA
-  Cubit_var cb = new Cubit_Impl;
-  cout << "Using BOA approach" << endl;
-#else
-  Cubit_var cb = new TIE_Cubit (Cubit_Impl) (new Cubit_Impl);
-  cout << "Using TIE approach" << endl;
-#endif /* Cubit_USE_BOA */
-
-  // Register our thread-pool dispatcher
-  int n_threads = argc > 1 ? ACE_OS::atoi (argv[1]) : ACE_DEFAULT_THREADS;
-  Thread_Pool tpool_dispatcher (n_threads);
- 
-  //
-  // Go get some work to do....
-  //
-  IT_TRY {
-      CORBA::Orbix.impl_is_ready("Cubit", IT_X);
-  }
-  IT_CATCHANY {
-     cout << IT_X << endl;
-  }
-  IT_ENDTRY;
-
-  cout << "Cubit server is exiting." << endl;
-
-
-  return 0;
-}
diff --git a/TAO/tests/Cubit/Orbix/tpool/tpool.cpp b/TAO/tests/Cubit/Orbix/tpool/tpool.cpp
deleted file mode 100644
index 5d1fbd1a638..00000000000
--- a/TAO/tests/Cubit/Orbix/tpool/tpool.cpp
+++ /dev/null
@@ -1,42 +0,0 @@
-#include "tpool.h"
-
-Thread_Pool::Thread_Pool (int n_threads)
-  : ACE_Task<ACE_MT_SYNCH> (ACE_Thread_Manager::instance ())
-{
-  if (this->activate (THR_DETACHED | THR_NEW_LWP, n_threads) == -1)
-    ACE_ERROR ((LM_ERROR, "%p\n", "activate failed"));
-}    
-
-int
-Thread_Pool::svc (void)
-{
-  cout << "Pool thread activated" << endl;
-  while (1) 
-    {
-      // Dequeue message
-      ACE_Message_Block *mb;
-      this->msg_queue ()->dequeue_head (mb);
-      CORBA::Request *vp = (CORBA::Request *) mb->base ();
-      mb->release ();
-      // Hand it off to Orbix
-      CORBA::Orbix.continueThreadDispatch (*vp);
-    }
-  return -1;
-}
-
-
-int
-Thread_Pool::inRequestPreMarshal(CORBA::Request &r,  CORBA::Environment&)
-{
-//   thread_t	tid;
-//   thr_create(NULL, 0, worker, (void *)&r, THR_DETACHED, &tid);
-
-  // Enqueue the request
-  ACE_Message_Block *mb = new ACE_Message_Block ( (char *) (&r));
-  this->msg_queue ()->enqueue (mb);
-  // Done
-  return -1;
-}
-
-
-                             
diff --git a/TAO/tests/Cubit/Orbix/tpool/tpool.h b/TAO/tests/Cubit/Orbix/tpool/tpool.h
deleted file mode 100644
index 3087ce42052..00000000000
--- a/TAO/tests/Cubit/Orbix/tpool/tpool.h
+++ /dev/null
@@ -1,15 +0,0 @@
-#include "cubit.h"
-#include "ace/Service_Config.h"
-#include "ace/Thread_Manager.h"
-#include "ace/Task.h"
-
-class Thread_Pool : public ACE_Task<ACE_MT_SYNCH>, public CORBA::ThreadFilter
-{
-public:
-  Thread_Pool (int n_threads);
-  virtual int inRequestPreMarshal(CORBA::Request &, CORBA::Environment&);
-  virtual int svc (void);
-
-};
-
-
diff --git a/TAO/tests/Cubit/Orbix/tpr/Makefile b/TAO/tests/Cubit/Orbix/tpr/Makefile
deleted file mode 100644
index cf6149643d3..00000000000
--- a/TAO/tests/Cubit/Orbix/tpr/Makefile
+++ /dev/null
@@ -1,89 +0,0 @@
-#----------------------------------------------------------------------------
-#	@(#)Makefile	1.1	10/18/96
-#
-#	Makefile for the ACE_MT_CORBA_Handler tests
-#----------------------------------------------------------------------------
-
-#----------------------------------------------------------------------------
-#	Local macros
-#----------------------------------------------------------------------------
-
-SRC = cubitS.cpp cubit_impl.cpp server.cpp tpr.cpp
-
-SVR_OBJS = cubitS.o cubit_impl.o server.o tpr.o
-
-LDLIBS	 = 
-
-VLDLIBS	 = $(LDLIBS:%=%$(VAR))
-
-#----------------------------------------------------------------------------
-#	Include macros and targets
-#----------------------------------------------------------------------------
-
-include		$(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-include		$(ACE_ROOT)/include/makeinclude/macros.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.common.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.lib.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.bin.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
-
-#----------------------------------------------------------------------------
-#	Orbix related macros and target settings.
-#----------------------------------------------------------------------------
-
-
-ORBIX_BINDIR    = $(ORBIX_ROOT)/bin
-ORBIX_LIBDIR    = $(ORBIX_ROOT)/corba2/lib
-ORBIX_INCDIR    = $(ORBIX_ROOT)/corba2/include
-
-# Remove -DCubit_USE_BOA from below to use the TIE approach
-
-CPPFLAGS += -DEXCEPTIONS -I$(ORBIX_INCDIR) -DWANT_ORBIX_FDS -DCubit_USE_BOA
-LDFLAGS  += -L$(ORBIX_LIBDIR) -R $(ORBIX_LIBDIR) -L$(ACE)/ace
-
-IDLFLAGS = -s S.cpp -c C.cpp -B
-
-#----------------------------------------------------------------------------
-#	Local targets
-#----------------------------------------------------------------------------
-
-all: server
-
-server: $(addprefix $(VDIR),$(SVR_OBJS))
-	$(LINK.cc) -o server $(addprefix $(VDIR),$(SVR_OBJS)) $(LDFLAGS) $(ITIIOP) $(ITSRV) $(VLDLIBS)
-
-#----------------------------------------------------------------------------
-#	Dependencies
-#----------------------------------------------------------------------------
-# DO NOT DELETE THIS LINE -- g++dep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-
-.obj/cubit_impl.o .shobj/cubit_impl.so: cubit_impl.cpp cubit_impl.h cubit.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/config-sunos5.5-sunc++-4.x.h \
- $(ACE_ROOT)/ace/stdcpp.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i
-.obj/server.o .shobj/server.so: server.cpp cubit_impl.h cubit.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/config-sunos5.5-sunc++-4.x.h \
- $(ACE_ROOT)/ace/stdcpp.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i
-
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/tests/Cubit/Orbix/tpr/cubit.h b/TAO/tests/Cubit/Orbix/tpr/cubit.h
deleted file mode 100644
index 1c868a6597d..00000000000
--- a/TAO/tests/Cubit/Orbix/tpr/cubit.h
+++ /dev/null
@@ -1,727 +0,0 @@
-
-#ifndef cubit_hh
-#define cubit_hh
-
-#include "ace/OS.h"
-#include <CORBA.h>
-
-
-#ifndef _Cubit_defined
-#define _Cubit_defined
-class Cubit_dispatch : public virtual CORBA::PPTR {
-public:
-
-      Cubit_dispatch (void *IT_p, CORBA::Object* IT_o, const char *IT_m, 
-        CORBA::LoaderClass *IT_l, char *IT_i, void* IT_im)
-       : PPTR (IT_p,IT_o,IT_m,IT_l,IT_i,IT_im) {}
-
-
-   Cubit_dispatch (char *IT_OR, void *IT_p, CORBA::Object *IT_o)
-       : PPTR (IT_OR,IT_p,IT_o) {}
-
-
-   Cubit_dispatch () {}
-
-   Cubit_dispatch (ObjectReference *IT_OR, void *IT_p, CORBA::Object *IT_o)
-       : PPTR (IT_OR,IT_p,IT_o) {}
-
-
-   Cubit_dispatch (void *IT_p, CORBA::Object *IT_o, const char *IT_m, 
-        char *IT_i, CORBA::Object* IT_ob, void* IT_im)
-       : PPTR (IT_p,IT_o,IT_m,IT_i,IT_ob,IT_im) {}
-
-
-   virtual unsigned char dispatch (CORBA::Request &IT_r, 
-        unsigned char IT_isTarget, void* IT_pp=NULL);
-
-
-};
-
-class Cubit;
-
-#ifndef CubitPtr
-#define CubitPtr
-
-typedef Cubit* Cubit_ptr;
-
-typedef Cubit* CubitRef;
-
-#endif
-
-
-#ifndef CubitForwH
-#define CubitForwH
-CORBA::ObjectRef Cubit_getBase (void *);
-void Cubit_release (Cubit *, CORBA::Environment &IT_env);
-void Cubit_release (Cubit_ptr);
-Cubit* Cubit_duplicate (Cubit_ptr, CORBA::Environment &IT_env);
-Cubit* Cubit_duplicate (Cubit_ptr );
-Cubit_ptr Cubit_nil (CORBA::Environment &IT_env);
-Cubit_ptr Cubit_nil ();
-#endif
-#define Cubit_IMPL "Cubit"
-
-
-class Cubit;
-
-typedef Cubit CubitProxy;
-#define Cubit_IR "Cubit$v1.1"
-#define Cubit_IMPL "Cubit"
-
-#ifndef CubitPtr
-#define CubitPtr
-
-typedef Cubit* Cubit_ptr;
-
-typedef Cubit* CubitRef;
-
-#endif
-
-class Cubit: public virtual CORBA::Object  {
-public:
-        Cubit (char *IT_OR);
-    Cubit (ObjectReference *IT_OR);
-    Cubit () : CORBA::Object  (1) {}
-protected:
-    Cubit_ptr __duplicate(
-            CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) {
-       CORBA::Object::__duplicate (IT_env);
-       return this;
-    }
-public:
-    static Cubit_ptr _duplicate(
-            Cubit_ptr, 
-            CORBA::Environment &IT_pEnv=CORBA::IT_chooseDefaultEnv ());
-public:
-   static Cubit* _bind (const char* IT_markerServer, const char* host,
-		const CORBA::Context &IT_c, 
-		CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-   static Cubit* _bind (CORBA::Environment &IT_env);
-   static Cubit* _bind (const char* IT_markerServer=NULL, const char* host=NULL,
-                 CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-    static Cubit* _narrow (CORBA::Object* , CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-    static Cubit_ptr _nil (CORBA::Environment &IT_pEnv=CORBA::IT_chooseDefaultEnv ()) {
-        CORBA::EnvExcRaiser IT_raise;
-        CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-        return (Cubit_ptr) CORBA::OBJECT_NIL;}
-
-#ifndef Cubit_Many_defined
-#define Cubit_Many_defined
-
-struct Many {
-    CORBA::Octet o;
-    CORBA::Long l;
-    CORBA::Short s;
-
-    void encodeOp (CORBA::Request &IT_r) const;
-    void decodeOp (CORBA::Request &IT_r);
-    void decodeInOutOp (CORBA::Request &IT_r);
-    Many(const Many &);
-    Many();
-    ~Many();
-    Many& operator= (const Many&);
-};
-
-#ifndef Cubit_ManyVarH
-#define Cubit_ManyVarH
-
-#ifndef Cubit_ManyvPtr
-#define Cubit_ManyvPtr
-typedef Many* Many_vPtr;
-typedef const Many* Many_cvPtr;
-#endif
-
-class Many_var : public CORBA::_var
-{
-    private:
-
-    unsigned char copyHelper (const Many_var &IT_s) {
-        if (!IT_s._ptr) {
-            _ptr = IT_s._ptr;
-        } else
-        {
-            _ptr = new Many;
-            *(_ptr) =  *(IT_s._ptr);
-        }
-        return 1;
-    }
-
-    public:
-
-    Many_var (const Many_var &IT_s) {
-        (void) copyHelper (IT_s);
-    }
-
-    Many_var () {
-        _ptr =  new Many;
-;
-    }
-
-    Many_var (Many *IT_p) {
-        _ptr = IT_p;
-    }
-
-    Many_var &operator= (Many *IT_p) {
-        if (_ptr != IT_p) {
-            delete _ptr;
-        }
-        _ptr = IT_p;
-        return (*this);
-    }
-
-    Many_var &operator= (const Many_var &IT_s) {
-        if (_ptr != IT_s._ptr) {
-            delete _ptr;
-        }
-        _ptr = new Many;
-        *(_ptr) =  *(IT_s._ptr);
-        return (*this);
-    }
-
-    ~Many_var () {
-        delete _ptr;
-    }
-
-    Many* operator-> () {
-        return _ptr;
-    }
-
-    operator Many_cvPtr () const { return _ptr;}
-    operator Many_vPtr& () { return _ptr;}
-    operator Many& () const { return * _ptr;}
-
-    protected:
-    Many *_ptr;
-    private:
-    Many_var &operator= (const CORBA::_var &IT_s);
-    Many_var (const CORBA::_var &IT_s);
-};
-
-#endif
-
-
-#endif
-
-enum discrim {e_0th,e_1st,e_2nd,e_3rd,e_4th,e_5th, IT__ENUM_Cubit_discrim=CORBA_ULONG_MAX};
-
-#ifndef Cubit_oneof_defined
-#define Cubit_oneof_defined
-
-struct oneof {
-    private:
-
-    discrim __d;
-    union {
-        CORBA::Octet _o_;
-        CORBA::Short _s_;
-        CORBA::Long _l_;
-        Many * _cm_;
-    };
-
-    public:
-
-    void encodeOp (CORBA::Request &IT_r) const;
-    void decodeOp (CORBA::Request &IT_r);
-    void decodeInOutOp (CORBA::Request &IT_r);
-
-    private:
-
-    unsigned char isSet;
-
-    public:
-
-    discrim _d () const { return __d; }
-
-    CORBA::Octet o () const {
-      return _o_;
-    }
-
-    void o (CORBA::Octet IT_member) {
-        if (isSet && (__d != Cubit::e_0th))
-        {
-            this-> oneof::~oneof();
-            memset(this, 0, sizeof(*this));
-        }
-
-        __d = Cubit::e_0th;
-        isSet = 1;
-        _o_ = IT_member;
-    }
-
-    CORBA::Short s () const {
-        return _s_;
-    }
-
-    void s (CORBA::Short IT_member) {
-        if (isSet && (__d != Cubit::e_1st))
-        {
-            this-> oneof::~oneof();
-            memset(this, 0, sizeof(*this));
-        }
-
-        __d = Cubit::e_1st;
-        isSet = 1;
-        _s_ = IT_member;
-    }
-
-    CORBA::Long l () const {
-        return _l_;
-    }
-
-    void l (CORBA::Long IT_member) {
-        if (isSet && (__d != Cubit::e_2nd))
-        {
-            this-> oneof::~oneof();
-            memset(this, 0, sizeof(*this));
-        }
-
-        __d = Cubit::e_2nd;
-        isSet = 1;
-        _l_ = IT_member;
-    }
-
-    Many& cm () {
-        return (*_cm_);
-    }
-
-    const Many& cm () const {
-        return (*_cm_);
-    }
-
-    void cm (const Many& IT_member) {
-        if (isSet && (__d != Cubit::e_3rd))
-        {
-            this-> oneof::~oneof();
-            memset(this, 0, sizeof(*this));
-        }
-
-        __d = Cubit::e_3rd;
-
-        if (!isSet) {
-            _cm_ = new Many;
-            isSet = 1;
-        }
-        *(_cm_) = IT_member;
-    }
-
-
-    oneof();
-    oneof(const oneof &);
-    ~oneof();
-    oneof& operator= (const oneof&);
-};
-
-#ifndef Cubit_oneofVarH
-#define Cubit_oneofVarH
-
-#ifndef Cubit_oneofvPtr
-#define Cubit_oneofvPtr
-typedef oneof* oneof_vPtr;
-typedef const oneof* oneof_cvPtr;
-#endif
-
-class oneof_var : public CORBA::_var
-{
-    private:
-
-    unsigned char copyHelper (const oneof_var &IT_s) {
-        if (!IT_s._ptr) {
-            _ptr = IT_s._ptr;
-        } else
-        {
-            _ptr = new oneof;
-            *(_ptr) =  *(IT_s._ptr);
-        }
-        return 1;
-    }
-
-    public:
-
-    oneof_var (const oneof_var &IT_s) {
-        (void) copyHelper (IT_s);
-    }
-
-    oneof_var () {
-        _ptr = NULL;
-    }
-
-    oneof_var (oneof *IT_p) {
-        _ptr = IT_p;
-    }
-
-    oneof_var &operator= (oneof *IT_p) {
-        if (_ptr != IT_p) {
-            delete _ptr;
-        }
-        _ptr = IT_p;
-        return (*this);
-    }
-
-    oneof_var &operator= (const oneof_var &IT_s) {
-        if (_ptr != IT_s._ptr) {
-            delete _ptr;
-        }
-        _ptr = new oneof;
-        *(_ptr) =  *(IT_s._ptr);
-        return (*this);
-    }
-
-    ~oneof_var () {
-        delete _ptr;
-    }
-
-    oneof* operator-> () {
-        return _ptr;
-    }
-
-    operator oneof_cvPtr () const { return _ptr;}
-    operator oneof_vPtr& () { return _ptr;}
-    operator oneof& () const { return * _ptr;}
-
-    protected:
-    oneof *_ptr;
-    private:
-    oneof_var &operator= (const CORBA::_var &IT_s);
-    oneof_var (const CORBA::_var &IT_s);
-};
-
-#endif
-
-
-#endif
-        virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual Many cube_struct (const Many& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual oneof cube_union (const oneof& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual void please_exit (CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-};
-
-#ifndef CubitVarH
-#define CubitVarH
-
-#ifndef CubitvPtr
-#define CubitvPtr
-typedef Cubit* Cubit_vPtr;
-typedef const Cubit* Cubit_cvPtr;
-#endif
-
-class Cubit_var : public CORBA::_var
-{
-    private:
-
-    unsigned char copyHelper (const Cubit_var &IT_s) {
-        {
-            _ptr = Cubit_duplicate (IT_s._ptr);
-        }
-        return 1;
-    }
-
-    public:
-
-    Cubit_var (const Cubit_var &IT_s) {
-        (void) copyHelper (IT_s);
-    }
-
-    Cubit_var () {
-        _ptr = Cubit_nil ();
-    }
-
-    Cubit_var (Cubit *IT_p) {
-        _ptr = IT_p;
-    }
-
-    Cubit_var &operator= (Cubit *IT_p) {
-        Cubit_release (_ptr);
-        _ptr = IT_p;
-        return (*this);
-    }
-
-    Cubit_var &operator= (const Cubit_var &IT_s) {
-        Cubit_release (_ptr);
-        _ptr = Cubit_duplicate (IT_s._ptr);
-        return (*this);
-    }
-
-    ~Cubit_var () {
-        Cubit_release (_ptr);
-    }
-
-    Cubit* operator-> () {
-        return _ptr;
-    }
-
-    operator Cubit_cvPtr () const { return _ptr;}
-    operator Cubit_vPtr& () { return _ptr;}
-
-    protected:
-    Cubit *_ptr;
-    private:
-    Cubit_var &operator= (const CORBA::_var &IT_s);
-    Cubit_var (const CORBA::_var &IT_s);
-    Cubit_var &operator= (const CORBA::_mgr &IT_s);
-    Cubit_var &operator= (const CORBA::_SeqElem &IT_s);
-    Cubit_var (const CORBA::_mgr &IT_s);
-    Cubit_var (const CORBA::_SeqElem &IT_s);
-};
-
-#endif
-
-
-#ifndef CubitMgrH
-#define CubitMgrH
-
-class Cubit_mgr : public CORBA::_mgr
-{
-    public:
-
-    Cubit_mgr () {
-        _ptr = Cubit_nil ();
-        _release = 1;
-    }
-
-    Cubit_mgr (const Cubit_mgr &IT_s) {
-        _ptr = Cubit_duplicate (IT_s._ptr);
-        _release = 1;
-    }
-
-    Cubit_mgr &operator= (Cubit *IT_p) {
-        if (_ptr && _release)
-            Cubit_release (_ptr);
-        _ptr = IT_p;
-        _release = 1;
-        return (*this);
-    }
-
-    Cubit_mgr &operator= (const Cubit_mgr &IT_s) {
-        if (_ptr && _release)
-            Cubit_release (_ptr);
-        _ptr = Cubit_duplicate(IT_s._ptr);
-        _release = 1;
-        return (*this);
-    }
-
-    Cubit_mgr &operator= (Cubit_var &IT_s) {
-        if (_ptr && _release)
-            Cubit_release (_ptr);
-        _ptr = Cubit_duplicate(IT_s);
-        _release = 1;
-        return (*this);
-    }
-
-    ~Cubit_mgr () {
-        if (_release)
-            Cubit_release (_ptr);
-    }
-
-    unsigned char release () {
-        return _release;
-    }
-
-    void release (unsigned char rel) {
-        _release = rel;
-    }
-
-    operator int () const {
-        return (((CORBA::Object_ptr) _ptr) ? 1 : 0);
-    }
-
-    operator void* () const {
-        return _ptr;
-    }
-
-    operator CORBA::Object * () const {
-        return (CORBA::Object *) _ptr;
-    }
-
-    operator Cubit* () const {
-        return (Cubit*) _ptr;
-    }
-
-    Cubit_ptr operator-> () const {
-        return _ptr;
-    }
-
-    Cubit *_ptr;
-
-    protected:
-
-    unsigned char _release;
-};
-
-typedef Cubit_mgr Cubit_mgr_IT_const;
-#endif
-
-#ifndef CubitSeqElemH
-#define CubitSeqElemH
-
-class Cubit_SeqElem : public CORBA::_SeqElem
-{
-    public:
-
-    Cubit_SeqElem (Cubit_ptr* IT_p, unsigned char rel) {
-        _ptr = IT_p;
-        _release = rel;
-    }
-
-    Cubit_SeqElem &operator= (Cubit_ptr IT_p) {
-        if (_ptr) {
-            if (*(_ptr) && _release)
-                Cubit_release (*(_ptr));
-            *(_ptr) = IT_p;
-        }
-        return (*this);
-    }
-
-    Cubit_SeqElem &operator= (const Cubit_SeqElem &IT_s) {
-        if (_ptr && IT_s._ptr) {
-            if (*(_ptr) && _release)
-                Cubit_release (*(_ptr));
-            *(_ptr) = Cubit_duplicate(*(IT_s._ptr));
-        }
-        return (*this);
-    }
-
-    operator Cubit_ptr () const {
-        return _ptr ? (Cubit_ptr) (*_ptr) : Cubit_nil(); 
-    }
-
-    Cubit_ptr operator->() const { return *_ptr;}
-
-    protected:
-    Cubit_ptr *_ptr;
-    unsigned char _release;
-};
-
-#endif
-
-
-#define TIE_Cubit(X) Cubit##X
-
-#define DEF_TIE_Cubit(X) \
-	class Cubit##X : public virtual Cubit {		\
-	  X* m_obj;						\
-	public:							\
-								\
-								\
-	   Cubit##X  (X *objp, const char* m="", CORBA::LoaderClass *l=0)\
-		: Cubit(), m_obj(objp) {	\
-		m_pptr = new Cubit_dispatch		\
-			(( Cubit*)this,(CORBA::Object*)this,m,l,Cubit_IR,m_obj);	\
-	   }								\
-	   Cubit##X  (CORBA::Object *IT_p, const char* IT_m="", void *IT_q=0)\
-		: Cubit() {	\
-		m_pptr = new Cubit_dispatch		\
-			(( Cubit*)this,(CORBA::Object*)this,IT_m,Cubit_IR,IT_p,IT_q);	\
-		m_obj = (X*)(m_pptr->getImplObj ());			\
-	   }								\
-								\
-	   virtual ~Cubit##X  () {				\
-		if (_okToDeleteImpl ()) delete m_obj; }					\
-	   virtual void* _deref () {					\
-		return m_obj; }					\
-								\
-virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_octet (  o,IT_env);\
-}\
-	\
-virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_short (  s,IT_env);\
-}\
-	\
-virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_long (  l,IT_env);\
-}\
-	\
-virtual Cubit::Many cube_struct (const Cubit::Many& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_struct (  values,IT_env);\
-}\
-	\
-virtual Cubit::oneof cube_union (const Cubit::oneof& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_union (  values,IT_env);\
-}\
-	\
-virtual void please_exit (CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-m_obj->please_exit (IT_env);\
-}\
-								\
-	};						\
-
-
-#define QUALS_Cubit	\
-virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_octet (  o,IT_env);\
-}\
-	\
-virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_short (  s,IT_env);\
-}\
-	\
-virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_long (  l,IT_env);\
-}\
-	\
-virtual Many cube_struct (const Many& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_struct (  values,IT_env);\
-}\
-	\
-virtual oneof cube_union (const oneof& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_union (  values,IT_env);\
-}\
-	\
-virtual void please_exit (CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-m_obj->please_exit (IT_env);\
-}\
-
-
-
-
-class CubitProxyFactoryClass : public virtual CORBA::ObjectFactoryClass {
-public:
-   CubitProxyFactoryClass (unsigned char IT_p=0)
-		: CORBA::ProxyFactory (Cubit_IR, IT_p) {}
-
-    virtual void* New (char *IT_OR, CORBA::Environment&);
-
-    virtual void* New (ObjectReference *IT_OR, CORBA::Environment&);
-
-    virtual void* New2 (); 
-
-    virtual CORBA::Object* NewObject (char *IT_OR, CORBA::Environment&);
-
-    virtual CORBA::Object* NewObject (ObjectReference *IT_OR, CORBA::Environment&);
-
-    virtual CORBA::Object* New2Object (); 
-
-    virtual void* IT_castUp (void *IT_p, char* IT_s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-
-    virtual CORBA::PPTR* pptr (void *IT_p);
-
-    virtual void baseInterfaces (_IDL_SEQUENCE_string&);
-
-
-};
-
-extern CubitProxyFactoryClass CubitProxyFactory;
-
-class CubitBOAImpl : public virtual Cubit  {
-public:
-    CubitBOAImpl (const char *m="", CORBA::LoaderClass *l=NULL) {
-  if (CORBA::PPTR::isOK (m_pptr, Cubit_IR))
-    m_pptr = new Cubit_dispatch ( (Cubit*)this,
-   	 (CORBA::Object*)this, m, l, Cubit_IR, this);
-}
-
-        virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual Many cube_struct (const Many& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual oneof cube_union (const oneof& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual void please_exit (CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-};
-
-
-#endif
-
-
-#endif
diff --git a/TAO/tests/Cubit/Orbix/tpr/cubit.idl b/TAO/tests/Cubit/Orbix/tpr/cubit.idl
deleted file mode 100644
index d9b38c34a2a..00000000000
--- a/TAO/tests/Cubit/Orbix/tpr/cubit.idl
+++ /dev/null
@@ -1,40 +0,0 @@
-// @(#)cubit.idl	1.1 95/09/10
-// Copyright 1994-1995 by Sun Microsystems, Inc.
-
-#pragma prefix	"Eng.SUN.COM"
-#pragma version Cubit 1.1
-
-interface Cubit {
-    octet	cube_octet (in octet o);
-    short	cube_short (in short s);
-    long	cube_long (in long l);
-
-    struct Many {
-	octet	o;		// + 3 bytes padding (normally) ...
-	long	l;
-	short	s;		// + 2 bytes padding (normally) ...
-    };
-
-    Many	cube_struct (in Many values);
-
-    enum discrim {e_0th, e_1st, e_2nd, e_3rd, e_4th, e_5th};
-
-    union oneof
-    switch (discrim) {
-	// this is an easy union to interpret; no padding
-	// is needed between discriminant and value.
-      case e_0th:
-        octet		o;
-      case e_1st:
-        short		s;
-      case e_2nd:
-        long		l;
-      case e_3rd:
-      default:
-        Many		cm;
-    };
-
-    oneof	cube_union (in oneof values);
-
-    oneway void	please_exit ();
-};
diff --git a/TAO/tests/Cubit/Orbix/tpr/cubitC.cpp b/TAO/tests/Cubit/Orbix/tpr/cubitC.cpp
deleted file mode 100644
index c47e38f26ee..00000000000
--- a/TAO/tests/Cubit/Orbix/tpr/cubitC.cpp
+++ /dev/null
@@ -1,557 +0,0 @@
-#include "cubit.h"
-
-Cubit::Cubit (char *IT_OR) {
-      m_pptr = new Cubit_dispatch (IT_OR, this,(CORBA::Object*)this);
-} 
-Cubit::Cubit (ObjectReference *IT_OR) {
-      m_pptr = new Cubit_dispatch (IT_OR, this,(CORBA::Object*)this);
-} 
-
-#ifndef CubitForwC
-#define CubitForwC
-CORBA::ObjectRef Cubit_getBase(void *IT_p){
-    return (Cubit*) IT_p;}
-
-void Cubit_release (Cubit_ptr IT_p, CORBA::Environment &IT_env) {
-    CORBA::release(IT_p, IT_env);}
-
-void Cubit_release (Cubit_ptr IT_p) {
-    Cubit_release (IT_p, CORBA::IT_chooseDefaultEnv ()); }
-
-Cubit_ptr Cubit_nil (CORBA::Environment &) {
-    return Cubit:: _nil ();}
-
-Cubit_ptr Cubit_nil () {
-    return Cubit_nil (CORBA::IT_chooseDefaultEnv ());}
-
-Cubit_ptr Cubit_duplicate (Cubit_ptr IT_p, CORBA::Environment &IT_env) {
-    return (Cubit::_duplicate(IT_p, IT_env)); }
-Cubit_ptr Cubit_duplicate (Cubit_ptr IT_p) {
-    return Cubit_duplicate (IT_p, CORBA::IT_chooseDefaultEnv ()); }
-#endif
-
-Cubit_ptr Cubit::_duplicate(Cubit_ptr obj, CORBA::Environment& IT_pEnv) {
-        CORBA::EnvExcRaiser IT_raise;
-        CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-       if (!obj) {
-          return (obj);
-       }
-       Cubit_ptr IT_obj = obj->__duplicate (IT_env);
-       return IT_obj;
-}
-
-
-
-Cubit* Cubit:: _bind (const char* IT_markerServer, const char* host,
-		const CORBA::Context &IT_c, 
-		CORBA::Environment &IT_env) {
-       return (Cubit*)CORBA::Factory.New (IT_markerServer, IT_env, IT_c, host, 
-		Cubit_IMPL, Cubit_IR);
-}
-
-
-
-Cubit* Cubit:: _bind (CORBA::Environment &IT_env) {
-       return _bind (NULL,NULL,CORBA::Context(), IT_env); }
-
-
-Cubit* Cubit:: _bind (const char* IT_markerServer, const char* host,
-                CORBA::Environment &IT_env) {
-       return _bind (IT_markerServer, host, CORBA::Context (), IT_env); }
-Cubit* Cubit::_narrow (CORBA::Object* IT_obj, CORBA::Environment &IT_pEnv) {
-        CORBA::EnvExcRaiser IT_raise;
-        CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-        if (CORBA::is_nil (IT_obj)) {
-                return Cubit:: _nil();
-        }
-
-       Cubit* IT_p = (Cubit*)CORBA::Object::_castDown (IT_obj, Cubit_IR, IT_env);
-        IT_p = IT_p ? IT_p->__duplicate(IT_env) : NULL;
-        if ((IT_env) &&(!strcmp(IT_env.exception()->id(), "CORBA::StExcep::BAD_PARAM")) && (((CORBA::BAD_PARAM*)IT_env.exception())-> minor() == NARROW_FAILED)) {
-                IT_env.exception_free();
-        }
-        return IT_p;
-   }
-
-
-#ifndef Cubit_Many_Ops
-#define Cubit_Many_Ops
-
-void Cubit::Many:: encodeOp (CORBA::Request &IT_r) const {
-
-    IT_r.insertOctet (o);
-
-    IT_r << l;
-
-    IT_r << s;
-}
-
-void Cubit::Many:: decodeOp (CORBA::Request &IT_r) {
-
-    IT_r.extractOctet (o);
-
-    IT_r >> l;
-
-    IT_r >> s;
-}
-
-void Cubit::Many:: decodeInOutOp (CORBA::Request &IT_r) {
-
-    IT_r.extractOctet (o);
-
-    IT_r >> l;
-
-    IT_r >> s;
-}
-
-Cubit::Many ::~Many () {
-}
-
-Cubit::Many:: Many (const Cubit::Many &IT_s) 
-	 {
-    o = IT_s.o;
-    l = IT_s.l;
-    s = IT_s.s;
-}
-
-Cubit::Many:: Many () {
-}
-
-Cubit::Many &Cubit::Many:: operator= (const Cubit::Many& IT_s) {
-    if (this == &IT_s) return *this;
-    o = IT_s.o;
-    l = IT_s.l;
-    s = IT_s.s;
-    return *this;
-}
-
-
-#endif
-
-
-#ifndef Cubit_oneof_Ops
-#define Cubit_oneof_Ops
-void Cubit::oneof:: encodeOp (CORBA::Request &IT_r) const {
-    if (!isSet) return;
-    {
-    CORBA::ULong IT_0 = (CORBA::ULong) __d;
-    IT_r << IT_0;
-    }
-    switch (__d) {
-        case Cubit::e_0th: 
-        IT_r.insertOctet (_o_);
-        break;
-        case Cubit::e_1st: 
-        IT_r << _s_;
-        break;
-        case Cubit::e_2nd: 
-        IT_r << _l_;
-        break;
-        case Cubit::e_3rd: 
-        default: 
-        (*_cm_).encodeOp (IT_r);
-        break;
-    }
-
-}
-
-void Cubit::oneof:: decodeOp (CORBA::Request &IT_r) {
-    isSet = 0;
-    {
-    CORBA::ULong IT_1;
-    IT_r >> IT_1;
-    __d = Cubit::discrim(IT_1);
-    }
-    switch (__d) {
-        case Cubit::e_0th: 
-        if (!isSet) {
-            isSet = 1;
-        }
-        IT_r.extractOctet (_o_);
-        break;
-        case Cubit::e_1st: 
-        if (!isSet) {
-            isSet = 1;
-        }
-        IT_r >> _s_;
-        break;
-        case Cubit::e_2nd: 
-        if (!isSet) {
-            isSet = 1;
-        }
-        IT_r >> _l_;
-        break;
-        case Cubit::e_3rd: 
-        default: 
-        if (!isSet) {
-            _cm_ = new Cubit::Many;
-            isSet = 1;
-        }
-        (*_cm_).decodeOp (IT_r);
-        break;
-    }
-
-}
-void Cubit::oneof:: decodeInOutOp (CORBA::Request &IT_r) {
-    Cubit::discrim IT_d;
-    {
-    CORBA::ULong IT_2;
-    IT_r >> IT_2;
-    IT_d = Cubit::discrim(IT_2);
-    }
-    if (IT_d == __d)
-        switch (__d) {
-            case Cubit::e_0th: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r.extractOctet (_o_);
-            break;
-            case Cubit::e_1st: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r >> _s_;
-            break;
-            case Cubit::e_2nd: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r >> _l_;
-            break;
-            case Cubit::e_3rd: 
-            default: 
-            if (!isSet) {
-                _cm_ = new Cubit::Many;
-                isSet = 1;
-            }
-            (*_cm_).decodeInOutOp (IT_r);
-            break;
-        }
-
-    else {
-        this->oneof:: ~oneof();
-        memset(this, 0, sizeof(*this));
-        __d = IT_d;
-        switch (__d) {
-            case Cubit::e_0th: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r.extractOctet (_o_);
-            break;
-            case Cubit::e_1st: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r >> _s_;
-            break;
-            case Cubit::e_2nd: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r >> _l_;
-            break;
-            case Cubit::e_3rd: 
-            default: 
-            if (!isSet) {
-                _cm_ = new Cubit::Many;
-                isSet = 1;
-            }
-            (*_cm_).decodeOp (IT_r);
-            break;
-        }
-        isSet = 1;
-    }
-
-}
-
-Cubit::oneof:: oneof() { 
-    memset(this, 0, sizeof(*this));
-    isSet = 0;
-}
-
-Cubit::oneof ::~oneof() {
-    if (!isSet) return;
-    switch (__d) { 
-        case Cubit::e_0th:         break;
-        case Cubit::e_1st:         break;
-        case Cubit::e_2nd:         break;
-        case Cubit::e_3rd: 
-        default:         if (_cm_) delete _cm_;
-        break;
-    }
-
-    isSet = 0;
-}
-
-Cubit::oneof:: oneof (const Cubit::oneof &IT_s) {
-    isSet = 0;
-    memset(this, 0, sizeof(*this));
-    __d = IT_s.__d;
-    switch (__d) {
-        case Cubit::e_0th:         isSet = 1;
-        _o_ = IT_s._o_;
-        break;
-        case Cubit::e_1st:         isSet = 1;
-        _s_ = IT_s._s_;
-        break;
-        case Cubit::e_2nd:         isSet = 1;
-        _l_ = IT_s._l_;
-        break;
-        case Cubit::e_3rd: 
-        default: 
-        if (!isSet) {
-            _cm_ = new Cubit::Many;
-            isSet = 1;
-        }
-        *(_cm_) = *(IT_s._cm_);
-        break;
-    }
-    isSet = 1;
-}
-
-Cubit::oneof& Cubit::oneof:: operator= (const Cubit::oneof & IT_s) {
-    if (this == &IT_s) return *this;
-    if (isSet && (__d != IT_s.__d))
-    {
-        this-> oneof::~oneof();
-        memset(this, 0, sizeof(*this));
-    }
-
-    __d = IT_s.__d;
-    switch (__d) {
-        case Cubit::e_0th:         isSet = 1;
-        _o_ = IT_s._o_;
-        break;
-        case Cubit::e_1st:         isSet = 1;
-        _s_ = IT_s._s_;
-        break;
-        case Cubit::e_2nd:         isSet = 1;
-        _l_ = IT_s._l_;
-        break;
-        case Cubit::e_3rd: 
-        default: 
-        if (!isSet) {
-            _cm_ = new Cubit::Many;
-            isSet = 1;
-        }
-        *(_cm_) = *(IT_s._cm_);
-        break;
-    }
-    isSet = 1;
-    return *this;
-}
-
-
-#endif
-
-void* CubitProxyFactoryClass::New (char *IT_OR, CORBA::Environment&) {
-        return  new class Cubit(IT_OR);}
-
-void* CubitProxyFactoryClass::New (ObjectReference *IT_OR, CORBA::Environment&) {
-        return  new class Cubit(IT_OR);}
-
-void* CubitProxyFactoryClass::New2 () {
-        return  new class Cubit((char*)0);}
-
-CORBA::Object* CubitProxyFactoryClass::NewObject (char *IT_OR, CORBA::Environment&) {
-        return  new class Cubit(IT_OR);}
-
-CORBA::Object* CubitProxyFactoryClass::NewObject (ObjectReference *IT_OR, CORBA::Environment&) {
-        return  new class Cubit(IT_OR);}
-
-CORBA::Object* CubitProxyFactoryClass::New2Object () {
-        return  new class Cubit((char*)0);}
-
-void* CubitProxyFactoryClass::IT_castUp (void *IT_p, char* IT_s, CORBA::Environment &IT_env) {
-      void *IT_l;
-      if (!CORBA::_interfaceCmp (IT_s,Cubit_IR, IT_env))
-         return IT_p;
-      else if (IT_l=CORBA::ObjectFactoryClass::IT_castUp((CORBA::Object*)((class Cubit*)IT_p),IT_s, IT_env))
-         return IT_l;
-      else return NULL;
-    }
-
-
-CORBA::PPTR* CubitProxyFactoryClass::pptr (void *IT_p) {
-       return ((class Cubit*)IT_p)->_pptr ();}
-
-void CubitProxyFactoryClass::baseInterfaces (_IDL_SEQUENCE_string& seq) {
-      add (seq, Cubit_IR);
-      CORBA::ObjectFactoryClass::baseInterfaces (seq);
-}
-
-CubitProxyFactoryClass CubitProxyFactory(1);
-
-CORBA::Octet Cubit:: cube_octet (CORBA::Octet o, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        return 0;
-    }
-    CORBA::Request IT_r (this, "cube_octet",IT_env,1,0);
-    if (!IT_r.isException (IT_env)) {
-
-        IT_r.insertOctet (o);
-    }
-
-    IT_r.invoke (CORBA::Flags(0),IT_env);
-    if (!IT_r.isException (IT_env)) {
-        CORBA::Octet IT_result;
-        IT_r.extractOctet (IT_result);
-        IT_r.checkEnv (IT_env);
-        return IT_result;
-    }
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-    return 0;
-}
-
-CORBA::Short Cubit:: cube_short (CORBA::Short s, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        return 0;
-    }
-    CORBA::Request IT_r (this, "cube_short",IT_env,1,0);
-    if (!IT_r.isException (IT_env)) {
-
-        IT_r << s;
-    }
-
-    IT_r.invoke (CORBA::Flags(0),IT_env);
-    if (!IT_r.isException (IT_env)) {
-        CORBA::Short IT_result;
-        IT_r >> IT_result;
-        IT_r.checkEnv (IT_env);
-        return IT_result;
-    }
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-    return 0;
-}
-
-CORBA::Long Cubit:: cube_long (CORBA::Long l, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        return 0;
-    }
-    CORBA::Request IT_r (this, "cube_long",IT_env,1,0);
-    if (!IT_r.isException (IT_env)) {
-
-        IT_r << l;
-    }
-
-    IT_r.invoke (CORBA::Flags(0),IT_env);
-    if (!IT_r.isException (IT_env)) {
-        CORBA::Long IT_result;
-        IT_r >> IT_result;
-        IT_r.checkEnv (IT_env);
-        return IT_result;
-    }
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-    return 0;
-}
-
-Cubit::Many Cubit:: cube_struct (const Cubit::Many& values, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        { 
-            Cubit::Many IT_l0;
-            return IT_l0;
-        }
-    }
-    CORBA::Request IT_r (this, "cube_struct",IT_env,1,0);
-    if (!IT_r.isException (IT_env)) {
-
-        values.encodeOp (IT_r);
-    }
-
-    IT_r.invoke (CORBA::Flags(0),IT_env);
-    if (!IT_r.isException (IT_env)) {
-        Cubit::Many IT_result;
-        IT_result.decodeOp (IT_r);
-        IT_r.checkEnv (IT_env);
-        return IT_result;
-    }
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-    { 
-        Cubit::Many IT_l1;
-        return IT_l1;
-    }
-}
-
-Cubit::oneof Cubit:: cube_union (const Cubit::oneof& values, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        { 
-            Cubit::oneof IT_l0;
-            return IT_l0;
-        }
-    }
-    CORBA::Request IT_r (this, "cube_union",IT_env,1,0);
-    if (!IT_r.isException (IT_env)) {
-
-        values.encodeOp (IT_r);
-    }
-
-    IT_r.invoke (CORBA::Flags(0),IT_env);
-    if (!IT_r.isException (IT_env)) {
-        Cubit::oneof IT_result;
-        IT_result.decodeOp (IT_r);
-        IT_r.checkEnv (IT_env);
-        return IT_result;
-    }
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-    { 
-        Cubit::oneof IT_l1;
-        return IT_l1;
-    }
-}
-
-void Cubit:: please_exit (CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        return ;
-    }
-    CORBA::Request IT_r (this, "please_exit",IT_env,1,1);
-
-    IT_r.invoke (CORBA::Flags(CORBA::INV_NO_RESPONSE), IT_env);
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-}
-
-
-
-
-
-#ifndef Cubit_dispatch_impl
-
-unsigned char Cubit_dispatch::dispatch (CORBA::Request &IT_r, 
-    unsigned char, void *) {
-      IT_r.makeRuntimeException1 ("Cubit");
-      return 0;
-}
- 
-#endif
-
diff --git a/TAO/tests/Cubit/Orbix/tpr/cubitC.h b/TAO/tests/Cubit/Orbix/tpr/cubitC.h
deleted file mode 100644
index 15247168d3c..00000000000
--- a/TAO/tests/Cubit/Orbix/tpr/cubitC.h
+++ /dev/null
@@ -1,343 +0,0 @@
-#ifndef _cubitC_h
-#define _cubitC_h
-
-/************************************************************************/
-/*                                                                      */
-/* This file is automatically generated by ORBeline IDL compiler        */
-/* Do not modify this file.                                             */
-/*                                                                      */
-/* ORBeline (c) is copyrighted by PostModern Computing, Inc.            */
-/*                                                                      */
-/* The generated code conforms to OMG's IDL C++ mapping as              */
-/* specified in OMG Document Number: 94-9-14.                           */
-/*                                                                      */
-/************************************************************************/
-
-#include "corba.h"
-
-
-
-class Cubit;
-typedef Cubit *Cubit_ptr;
-typedef Cubit_ptr CubitRef;
-
-#ifndef _Cubit_var_
-#define _Cubit_var_
-class Cubit_var
-{
-    public:
-	Cubit_var();
-	Cubit_var(Cubit_ptr);
-	Cubit_var(const Cubit_var&);
-	~Cubit_var();
-	Cubit_var& operator=(Cubit_ptr);
-	operator Cubit_ptr() const { return _ptr; }
-#if defined(_HPCC_BUG)
-	operator Cubit *&() { return _ptr; }
-#else
-	operator Cubit_ptr&() { return _ptr; }
-#endif
-	Cubit_ptr operator->() const { return _ptr;}
-	friend NCistream& operator>>(NCistream&, Cubit_var&);
-	friend NCostream& operator<<(NCostream&, const Cubit_var&);
-	friend istream& operator>>(istream&, Cubit_var&);
-	friend ostream& operator<<(ostream&, const Cubit_var&);
-    private:
-	Cubit_ptr	_ptr;
-	void operator=(const Cubit_var&) {}
-};
-#endif
-class Cubit: public virtual CORBA_Object
-{
-    private:
-	static const CORBA::TypeInfo _class_info;
-	Cubit(const Cubit&) {}
-	void operator=(const Cubit&){}
-    public:
-	static const CORBA::TypeInfo *_desc();
-	virtual const CORBA::TypeInfo *_type_info() const;
-	virtual void *_safe_narrow(const CORBA::TypeInfo& ) const;
-	static CORBA::Object *_factory();
-    protected:
-	Cubit(const char *obj_name = NULL) :CORBA_Object(obj_name, 1) {}
-	Cubit(NCistream& strm) :CORBA_Object(strm) {}
-	virtual ~Cubit() {}
-    public:
-	static Cubit_ptr _duplicate(Cubit_ptr obj) {
-		if (obj ) obj->_ref();
-		return obj;
-	}
-	static Cubit_ptr _nil() { return (Cubit_ptr)NULL;}
-	static Cubit_ptr _narrow(CORBA::Object *obj);
-	static Cubit_ptr _clone(Cubit_ptr obj) {
-		CORBA::Object_var obj_var(__clone(obj));
-
-#if defined(_HPCC_BUG)
-		return _narrow(obj_var.operator CORBA::Object_ptr());
-#else
-		return _narrow(obj_var);
-#endif
-	}
-	static Cubit_ptr _bind(const char *object_name = NULL,
-		const char *host_name = NULL,
-		const CORBA::BindOptions* opt = NULL); 
-
-	virtual CORBA::Octet cube_octet(CORBA::Octet o);
-	
-	virtual CORBA::Short cube_short(CORBA::Short s);
-	
-	virtual CORBA::Long cube_long(CORBA::Long l);
-	
-	struct Many {
-		CORBA::Octet	o;
-		CORBA::Long	l;
-		CORBA::Short	s;
-	};
-	friend NCostream& operator<<(NCostream&, const Many& );
-	friend NCistream& operator>>(NCistream&, Many& );
-	
-	friend ostream& operator<<(ostream&, const Many& );
-	inline friend istream& operator>>(istream& _strm, Many& _obj) {
-		NCistream _istrm(_strm);
-		_istrm >> _obj;
-		return _strm;
-	}
-	
-	
-	typedef Many *Many_ptr;
-	class Many_var
-	{
-	    public:
-		Many_var() { _ptr = (Many*)NULL;}
-		Many_var(Many *ptr) {
-			_ptr = ptr;
-		}
-		Many_var(const Many_var& var) {
-			if (var._ptr)
-				_ptr = new Many(*var._ptr);
-			else
-				_ptr = (Many *)NULL;
-		}
-		~Many_var() {
-			if (_ptr != (Many *)NULL) delete _ptr;
-		}
-		Many_var& operator=(Many *ptr) {
-			if (_ptr != (Many *)NULL) delete _ptr;
-			_ptr = ptr;
-			return *this;
-		}
-		Many_var& operator=(const Many_var& var) {
-			if (_ptr != (Many *)NULL) delete _ptr;
-			if (var._ptr)
-				_ptr = new Many(*var._ptr);
-			else
-				_ptr = (Many *)NULL;
-			return *this;
-		}
-		Many *operator->() { return _ptr; }
-		operator Many () const { return *_ptr; }
-		operator Many& () { return *_ptr; }
-		inline friend NCostream& operator<<(NCostream& strm,
-				const Many_var& var) {
-			if (var._ptr == (Many *)NULL) {
-				throw CORBA::BAD_PARAM();
-			}
-			else
-				strm << *var._ptr;
-			return strm;
-		}
-		inline friend NCistream& operator>>(NCistream& strm,
-				Many_var& var) {
-			if ( ! var._ptr)
-				var._ptr = new Many;
-			strm >> *var._ptr;
-			return strm;
-		}
-	    private:
-		Many *_ptr;
-	};
-	
-	
-	virtual Cubit::Many cube_struct(const Cubit::Many& values);
-	
-	enum discrim {
-		e_0th,
-		e_1st,
-		e_2nd,
-		e_3rd,
-		e_4th,
-		e_5th
-	};
-	inline friend NCostream& operator<<(NCostream& _strm, discrim _enum_type) {
-		_strm << (CORBA::ULong)_enum_type;
-		return _strm;
-	}
-	inline friend NCistream& operator>>(NCistream& _strm, discrim& _enum_type) {
-		CORBA::ULong _temp;
-		_strm >> _temp;
-		if (_temp >= 6)
-			throw CORBA::BAD_PARAM();
-		_enum_type = discrim(_temp);
-		return _strm;
-	}
-	inline friend ostream& operator<<(ostream& _strm, discrim _enum_type) {
-		if( &_strm == &cout || &_strm == &cerr || &_strm == &clog) {
-			_strm << "discrim:";
-			switch(_enum_type) {
-				case e_0th:
-					_strm << "e_0th" << endl;
-					break;
-				case e_1st:
-					_strm << "e_1st" << endl;
-					break;
-				case e_2nd:
-					_strm << "e_2nd" << endl;
-					break;
-				case e_3rd:
-					_strm << "e_3rd" << endl;
-					break;
-				case e_4th:
-					_strm << "e_4th" << endl;
-					break;
-				case e_5th:
-					_strm << "e_5th" << endl;
-					break;
-			}
-		}
-		else 
-			_strm << (CORBA::ULong)_enum_type;
-		return _strm;
-	}
-	inline friend istream& operator>>(istream& _strm, discrim& _enum_type) {
-		CORBA::ULong _temp;
-		_strm >> _temp;
-		_enum_type = discrim(_temp);
-		return _strm;
-	}
-	
-	
-	class oneof
-	{
-	    public:
-	    private:
-		discrim	_disc;
-		CORBA::Octet	__o;
-		CORBA::Short	__s;
-		CORBA::Long	__l;
-		Cubit::Many	__cm;
-	    public:
-		oneof() : _disc(discrim(0)) {}
-		~oneof() {}
-		oneof(const oneof& obj);
-		oneof& operator=(const oneof& obj);
-	
-		void _d(discrim val) { _disc = val; }
-		discrim _d() const { return _disc; }
-	
-		void o(CORBA::Octet val) {
-			__o = val;
-			_disc = Cubit::e_0th;
-		}
-		CORBA::Octet o() const { return __o; }
-	
-		void s(CORBA::Short val) {
-			__s = val;
-			_disc = Cubit::e_1st;
-		}
-		CORBA::Short s() const { return __s; }
-	
-		void l(CORBA::Long val) {
-			__l = val;
-			_disc = Cubit::e_2nd;
-		}
-		CORBA::Long l() const { return __l; }
-	
-		void cm(const Cubit::Many& val) {
-			__cm = val;
-			_disc = Cubit::e_3rd;
-		}
-		const Cubit::Many& cm() const { return __cm; }
-		Cubit::Many& cm() { return __cm; }
-	
-		friend NCostream& operator<<(NCostream&, const oneof& );
-		friend NCistream& operator>>(NCistream&, oneof& );
-		friend ostream& operator<<(ostream&, const oneof&);
-		inline friend istream& operator>>(istream& strm, oneof& obj) {
-			NCistream istrm(strm);
-			strm >> obj;
-			return strm;
-		}
-	};
-	
-	typedef oneof *oneof_ptr;
-	class oneof_var
-	{
-	    public:
-		oneof_var() { _ptr = (oneof*)NULL;}
-		oneof_var(oneof *ptr) {
-			_ptr = ptr;
-		}
-		oneof_var(const oneof_var& var) {
-			_ptr = new oneof(*var._ptr);
-		}
-		~oneof_var() {
-			if (_ptr != (oneof *)NULL) delete _ptr;
-		}
-		oneof_var& operator=(oneof *ptr) {
-			if (_ptr != (oneof *)NULL) delete _ptr;
-			_ptr = ptr;
-			return *this;
-		}
-		oneof_var& operator=(const oneof_var& var) {
-			if (_ptr != (oneof *)NULL) delete _ptr;
-			_ptr = new oneof(*var._ptr);
-			return *this;
-		}
-		oneof *operator->() { return _ptr; }
-		operator oneof () const { return *_ptr; }
-		operator oneof& () { return *_ptr; }
-		inline friend NCostream& operator<<(NCostream& strm,
-				const oneof_var& var) {
-			if (var._ptr == (oneof *)NULL) {
-				throw CORBA::BAD_PARAM();
-			}
-			else
-				strm << *var._ptr;
-			return strm;
-		}
-		inline friend NCistream& operator>>(NCistream& strm,
-				oneof_var& var) {
-			if ( ! var._ptr)
-				var._ptr = new oneof;
-			strm >> *var._ptr;
-			return strm;
-		}
-	    private:
-		oneof *_ptr;
-	};
-	
-	
-	virtual Cubit::oneof cube_union(const Cubit::oneof& values);
-	
-	virtual void please_exit();
-	
-	inline friend NCistream& operator>>(NCistream& strm, Cubit_ptr& obj) {
-		CORBA::Object_var _obj(obj);
-		_obj = CORBA::Object::_read(strm, Cubit::_desc());
-		obj = Cubit::_narrow(_obj);
-		return strm;
-	}
-	inline friend ostream& operator<<(ostream& strm, const Cubit_ptr obj) {
-		strm << (CORBA::Object_ptr)obj;
-		return strm;
-	}
-	inline friend istream& operator>>(istream& strm, Cubit_ptr& obj) {
-		NCistream istrm(strm);
-		istrm >> obj;
-		return strm;
-	}
-};
-
-
-#endif
-
diff --git a/TAO/tests/Cubit/Orbix/tpr/cubitS.cpp b/TAO/tests/Cubit/Orbix/tpr/cubitS.cpp
deleted file mode 100644
index 449a8c23548..00000000000
--- a/TAO/tests/Cubit/Orbix/tpr/cubitS.cpp
+++ /dev/null
@@ -1,226 +0,0 @@
-#include "cubit.h"
-
-
-#define Cubit_dispatch_impl
-
-unsigned char Cubit_dispatch::dispatch (CORBA::Request &IT_r, 
- unsigned char IT_isTarget, void *IT_pp) {
-    if (!IT_pp)
-       IT_pp = m_obj;
-    const char *IT_s = IT_r.getOperation ();
-    if (!strcmp(IT_s,"cube_octet")) {
-        CORBA::Octet IT_result;
-        CORBA::Environment IT_env (IT_r);
-        CORBA::Filter* IT_f = CORBA::Orbix.getFilter ();
-        if (!IT_r.tcAssert ("\
-Ro~cube_octet~+o{o},>{o},N{}\
-"))
-            return 1;
-        CORBA::Octet o;
-
-        IT_r.extractOctet (o);
-
-        if (IT_f && !IT_r.isException (IT_env))
-        	IT_f->inRequestPostM (IT_r, IT_env);
-        if (!IT_r.isException (IT_env)) {
-            try {
-                	IT_result = ((Cubit*)IT_pp)->cube_octet (  o, IT_env);
-
-            } catch (CORBA::SystemException &IT_exSys) {
-            IT_env.propagate (&IT_exSys);
-            } catch (CORBA::UserException &IT_exUsr) {
-            IT_env.propagate (&IT_exUsr);
-            }
-        }
-
-        if (!IT_r.isException (IT_env)) {
-            if (!IT_r.convertToReply ("\
-o\
-", IT_env)) return 1;
-            IT_r.insertOctet (IT_result);
-            }
-
-        else IT_r.makeSystemException (IT_env);
-        return 1;
-    }
-
-    if (!strcmp(IT_s,"cube_short")) {
-        CORBA::Short IT_result;
-        CORBA::Environment IT_env (IT_r);
-        CORBA::Filter* IT_f = CORBA::Orbix.getFilter ();
-        if (!IT_r.tcAssert ("\
-Ro~cube_short~+s{s},>{s},N{}\
-"))
-            return 1;
-        CORBA::Short s;
-
-        IT_r >> s;
-
-        if (IT_f && !IT_r.isException (IT_env))
-        	IT_f->inRequestPostM (IT_r, IT_env);
-        if (!IT_r.isException (IT_env)) {
-            try {
-                	IT_result = ((Cubit*)IT_pp)->cube_short (  s, IT_env);
-
-            } catch (CORBA::SystemException &IT_exSys) {
-            IT_env.propagate (&IT_exSys);
-            } catch (CORBA::UserException &IT_exUsr) {
-            IT_env.propagate (&IT_exUsr);
-            }
-        }
-
-        if (!IT_r.isException (IT_env)) {
-            if (!IT_r.convertToReply ("\
-s\
-", IT_env)) return 1;
-            IT_r << IT_result;
-            }
-
-        else IT_r.makeSystemException (IT_env);
-        return 1;
-    }
-
-    if (!strcmp(IT_s,"cube_long")) {
-        CORBA::Long IT_result;
-        CORBA::Environment IT_env (IT_r);
-        CORBA::Filter* IT_f = CORBA::Orbix.getFilter ();
-        if (!IT_r.tcAssert ("\
-Ro~cube_long~+l{l},>{l},N{}\
-"))
-            return 1;
-        CORBA::Long l;
-
-        IT_r >> l;
-
-        if (IT_f && !IT_r.isException (IT_env))
-        	IT_f->inRequestPostM (IT_r, IT_env);
-        if (!IT_r.isException (IT_env)) {
-            try {
-                	IT_result = ((Cubit*)IT_pp)->cube_long (  l, IT_env);
-
-            } catch (CORBA::SystemException &IT_exSys) {
-            IT_env.propagate (&IT_exSys);
-            } catch (CORBA::UserException &IT_exUsr) {
-            IT_env.propagate (&IT_exUsr);
-            }
-        }
-
-        if (!IT_r.isException (IT_env)) {
-            if (!IT_r.convertToReply ("\
-l\
-", IT_env)) return 1;
-            IT_r << IT_result;
-            }
-
-        else IT_r.makeSystemException (IT_env);
-        return 1;
-    }
-
-    if (!strcmp(IT_s,"cube_struct")) {
-        Cubit::Many IT_result;
-        CORBA::Environment IT_env (IT_r);
-        CORBA::Filter* IT_f = CORBA::Orbix.getFilter ();
-        if (!IT_r.tcAssert ("\
-Ro~cube_struct~+values{R~Cubit::Many~o{o},l{l},s{s}},>{R~Cubit::Many~o{o},l{l},s{s}},N{}\
-"))
-            return 1;
-        Cubit::Many values;
-
-        values.decodeOp (IT_r);
-
-        if (IT_f && !IT_r.isException (IT_env))
-        	IT_f->inRequestPostM (IT_r, IT_env);
-        if (!IT_r.isException (IT_env)) {
-            try {
-                	IT_result = ((Cubit*)IT_pp)->cube_struct (  values, IT_env);
-
-            } catch (CORBA::SystemException &IT_exSys) {
-            IT_env.propagate (&IT_exSys);
-            } catch (CORBA::UserException &IT_exUsr) {
-            IT_env.propagate (&IT_exUsr);
-            }
-        }
-
-        if (!IT_r.isException (IT_env)) {
-            if (!IT_r.convertToReply ("\
-R~Cubit::Many~o{o},l{l},s{s}\
-", IT_env)) return 1;
-            IT_result.encodeOp (IT_r);
-            }
-
-        else IT_r.makeSystemException (IT_env);
-        return 1;
-    }
-
-    if (!strcmp(IT_s,"cube_union")) {
-        Cubit::oneof IT_result;
-        CORBA::Environment IT_env (IT_r);
-        CORBA::Filter* IT_f = CORBA::Orbix.getFilter ();
-        IT_r.tcPreAssert (
-"\
-Ro~cube_union~+values{U~Cubit::oneof~{E~Cubit::discrim~e_0th,e_1st,e_2nd,e_3rd,e_4th,e_5th}~Cubit::e_0th o{o};Cubit::e_1st s{s};Cubit::e_2nd l{l};Cubit::e_3rd,$ cm{R~Cubit::Many~o{o},l{l},s{s}}},>{U~Cubit::oneof~{E~Cubit::discrim~e_0th,e_1st,e_2nd,e_3rd,\
-");
-        if (!IT_r.tcAssert ("\
-e_4th,e_5th}~Cubit::e_0th o{o};Cubit::e_1st s{s};Cubit::e_2nd l{l};Cubit::e_3rd,$ cm{R~Cubit::Many~o{o},l{l},s{s}}},N{}\
-"))
-            return 1;
-        Cubit::oneof values;
-
-        values.decodeOp (IT_r);
-
-        if (IT_f && !IT_r.isException (IT_env))
-        	IT_f->inRequestPostM (IT_r, IT_env);
-        if (!IT_r.isException (IT_env)) {
-            try {
-                	IT_result = ((Cubit*)IT_pp)->cube_union (  values, IT_env);
-
-            } catch (CORBA::SystemException &IT_exSys) {
-            IT_env.propagate (&IT_exSys);
-            } catch (CORBA::UserException &IT_exUsr) {
-            IT_env.propagate (&IT_exUsr);
-            }
-        }
-
-        if (!IT_r.isException (IT_env)) {
-            if (!IT_r.convertToReply ("\
-U~Cubit::oneof~{E~Cubit::discrim~e_0th,e_1st,e_2nd,e_3rd,e_4th,e_5th}~Cubit::e_0th o{o};Cubit::e_1st s{s};Cubit::e_2nd l{l};Cubit::e_3rd,$ cm{R~Cubit::Many~o{o},l{l},s{s}}\
-", IT_env)) return 1;
-            IT_result.encodeOp (IT_r);
-            }
-
-        else IT_r.makeSystemException (IT_env);
-        return 1;
-    }
-
-    if (!strcmp(IT_s,"please_exit")) {
-        CORBA::Environment IT_env (IT_r);
-        CORBA::Filter* IT_f = CORBA::Orbix.getFilter ();
-        if (!IT_r.tcAssert ("\
-Ro~please_exit~>{v},O{}\
-"))
-            return 1;
-
-        if (IT_f && !IT_r.isException (IT_env))
-        	IT_f->inRequestPostM (IT_r, IT_env);
-        if (!IT_r.isException (IT_env)) {
-            try {
-                ((Cubit*)IT_pp)->please_exit (IT_env);
-
-            } catch (CORBA::SystemException &IT_exSys) {
-            IT_env.propagate (&IT_exSys);
-            } catch (CORBA::UserException &IT_exUsr) {
-            IT_env.propagate (&IT_exUsr);
-            }
-        }
-        IT_r.replyNoResults (CORBA::Flags(CORBA::INV_NO_RESPONSE),IT_env);
-        return 1;
-    }
-
-    if (IT_isTarget)
-        IT_r.makeRuntimeException2 ();
-
-    return 0;
-}
-
-#include "cubitC.cpp"
-
diff --git a/TAO/tests/Cubit/Orbix/tpr/cubitS.h b/TAO/tests/Cubit/Orbix/tpr/cubitS.h
deleted file mode 100644
index 757af4664ad..00000000000
--- a/TAO/tests/Cubit/Orbix/tpr/cubitS.h
+++ /dev/null
@@ -1,118 +0,0 @@
-#ifndef _cubitS_h
-#define _cubitS_h
-
-#include "cubitC.h"
-
-/************************************************************************/
-/*                                                                      */
-/* This file is automatically generated by ORBeline IDL compiler        */
-/* Do not modify this file.                                             */
-/*                                                                      */
-/* ORBeline (c) is copyrighted by PostModern Computing, Inc.            */
-/*                                                                      */
-/* The generated code conforms to OMG's IDL C++ mapping as              */
-/* specified in OMG Document Number: 94-9-14.                           */
-/*                                                                      */
-/************************************************************************/
-
-class _sk_Cubit : public Cubit
-{
-    protected:
-	_sk_Cubit(const char *object_name = (const char *)NULL);
-	_sk_Cubit(const char *service_name, const CORBA::ReferenceData& data);
-	virtual ~_sk_Cubit() {}
-    public:
-	static const CORBA::TypeInfo _skel_info;
-
-	// The following operations need to be implemented by the server.
-	virtual CORBA::Octet cube_octet(CORBA::Octet o) = 0;
-	virtual CORBA::Short cube_short(CORBA::Short s) = 0;
-	virtual CORBA::Long cube_long(CORBA::Long l) = 0;
-	virtual Cubit::Many cube_struct(const Cubit::Many& values) = 0;
-	virtual Cubit::oneof cube_union(const Cubit::oneof& values) = 0;
-	virtual void please_exit() = 0;
-	
-	// Skeleton Operations implemented automatically
-	
-	static void _cube_octet(void *obj,
-			CORBA::MarshalStream &strm,
-			CORBA::Principal_ptr principal,
-			const char *oper,
-			void *priv_data);
-	
-	static void _cube_short(void *obj,
-			CORBA::MarshalStream &strm,
-			CORBA::Principal_ptr principal,
-			const char *oper,
-			void *priv_data);
-	
-	static void _cube_long(void *obj,
-			CORBA::MarshalStream &strm,
-			CORBA::Principal_ptr principal,
-			const char *oper,
-			void *priv_data);
-	
-	static void _cube_struct(void *obj,
-			CORBA::MarshalStream &strm,
-			CORBA::Principal_ptr principal,
-			const char *oper,
-			void *priv_data);
-	
-	static void _cube_union(void *obj,
-			CORBA::MarshalStream &strm,
-			CORBA::Principal_ptr principal,
-			const char *oper,
-			void *priv_data);
-	
-	static void _please_exit(void *obj,
-			CORBA::MarshalStream &strm,
-			CORBA::Principal_ptr principal,
-			const char *oper,
-			void *priv_data);
-	
-};
-template <class T>
-class _tie_Cubit : public Cubit
-{
-    public:
-	_tie_Cubit(T& t, const char *obj_name=(char*)NULL) : 
-			Cubit(obj_name), 
-			_ref(t) {
-		_object_name(obj_name);
-	}
-	_tie_Cubit(T& t, const char *service_name,
-			const CORBA::ReferenceData& id)
-			:_ref(t) {
-		_service(service_name, id);
-	}
-	~_tie_Cubit() {}
-	CORBA::Octet cube_octet(CORBA::Octet o) {
-		return _ref.cube_octet(
-		o);
-	}
-	CORBA::Short cube_short(CORBA::Short s) {
-		return _ref.cube_short(
-		s);
-	}
-	CORBA::Long cube_long(CORBA::Long l) {
-		return _ref.cube_long(
-		l);
-	}
-	Cubit::Many cube_struct(const Cubit::Many& values) {
-		return _ref.cube_struct(
-		values);
-	}
-	Cubit::oneof cube_union(const Cubit::oneof& values) {
-		return _ref.cube_union(
-		values);
-	}
-	void please_exit() {
-		_ref.please_exit();
-	}
-
-    private:
-	T& _ref;
-};
-
-#endif
-
diff --git a/TAO/tests/Cubit/Orbix/tpr/cubit_impl.cpp b/TAO/tests/Cubit/Orbix/tpr/cubit_impl.cpp
deleted file mode 100644
index e35f1084118..00000000000
--- a/TAO/tests/Cubit/Orbix/tpr/cubit_impl.cpp
+++ /dev/null
@@ -1,46 +0,0 @@
-#include "cubit_impl.h"
-
-CORBA::Octet Cubit_Impl:: cube_octet (CORBA::Octet o, CORBA::Environment &IT_env) throw (CORBA::SystemException) {
-  return (CORBA::Octet) (o * o * o); 
-}
-
-CORBA::Short Cubit_Impl:: cube_short (CORBA::Short s, CORBA::Environment &IT_env) throw (CORBA::SystemException) {
-  return (CORBA::Short) (s * s * s);
-}
-
-CORBA::Long Cubit_Impl:: cube_long (CORBA::Long l, CORBA::Environment &IT_env) throw (CORBA::SystemException) {
-   return (CORBA::Long) (l * l * l);
-}
-
-Cubit::Many Cubit_Impl:: cube_struct (const Cubit::Many& values, CORBA::Environment &IT_env) throw (CORBA::SystemException) {
-  Cubit::Many out_values;
-  out_values.o = values.o * values.o * values.o;
-  out_values.s = values.s * values.s * values.s;
-  out_values.l = values.l * values.l * values.l;
-  return out_values; 
-}
-
-Cubit::oneof Cubit_Impl:: cube_union (const Cubit::oneof& values, CORBA::Environment &IT_env) throw (CORBA::SystemException) {
-  Cubit::oneof out_values;
-   switch (values._d ()) {
-   case Cubit::e_0th:
-     out_values.o (values.o () * values.o ()  * values.o ());
-     break;
-   case Cubit::e_1st:
-     out_values.s (values.s () * values.s () * values.s ());
-     break;
-   case Cubit::e_2nd:
-     out_values.l (values.l () * values.l () * values.l ());
-     break;
-   case Cubit::e_3rd:
-   default:
-     out_values.cm ().o = values.cm ().o * values.cm ().o * values.cm ().o ;
-     out_values.cm ().s = values.cm ().s * values.cm ().s * values.cm ().s ;
-     out_values.cm ().l = values.cm ().l * values.cm ().l * values.cm ().l ;
-     break;
-   }
-   return out_values;  
-}
-
-void Cubit_Impl:: please_exit (CORBA::Environment &IT_env) throw (CORBA::SystemException) {
-}
diff --git a/TAO/tests/Cubit/Orbix/tpr/cubit_impl.h b/TAO/tests/Cubit/Orbix/tpr/cubit_impl.h
deleted file mode 100644
index 1e710bb15d1..00000000000
--- a/TAO/tests/Cubit/Orbix/tpr/cubit_impl.h
+++ /dev/null
@@ -1,27 +0,0 @@
-
-#ifndef cubit_ih
-#define cubit_ih
-
-#include "cubit.h"
-
-
-#ifdef Cubit_USE_BOA
-class Cubit_Impl : public virtual CubitBOAImpl {
-#else
-class Cubit_Impl {
-#endif /* Cubit_USE_BOA */
-
-public:
-        virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env=CORBA::default_environment) throw (CORBA::SystemException);
-        virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env=CORBA::default_environment) throw (CORBA::SystemException);
-        virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env=CORBA::default_environment) throw (CORBA::SystemException);
-        virtual Cubit::Many cube_struct (const Cubit::Many& values, CORBA::Environment &IT_env=CORBA::default_environment) throw (CORBA::SystemException);
-        virtual Cubit::oneof cube_union (const Cubit::oneof& values, CORBA::Environment &IT_env=CORBA::default_environment) throw (CORBA::SystemException);
-        virtual void please_exit (CORBA::Environment &IT_env=CORBA::default_environment) throw (CORBA::SystemException);
-};
-
-#ifndef Cubit_USE_BOA
-DEF_TIE_Cubit (Cubit_Impl)
-#endif /* Cubit_USE_BOA */
-
-#endif
diff --git a/TAO/tests/Cubit/Orbix/tpr/server.cpp b/TAO/tests/Cubit/Orbix/tpr/server.cpp
deleted file mode 100644
index 96117fe3e0d..00000000000
--- a/TAO/tests/Cubit/Orbix/tpr/server.cpp
+++ /dev/null
@@ -1,40 +0,0 @@
-//**************************************************************************
-//
-// NAME :   tpr_server.cpp 
-// DESCRIPTION:  
-//
-// Server mainline
-//
-//****************************************************************************
-#define IT_EX_MACROS
-
-#include "cubit_impl.h"		// server header file
-
-int 
-main (int , char**)
-{
-
-#ifdef Cubit_USE_BOA
-  Cubit_var cb = new Cubit_Impl;
-  cout << "Using BOA approach" << endl;
-#else
-  Cubit_var cb = new TIE_Cubit (Cubit_Impl) (new Cubit_Impl);
-  cout << "Using TIE approach" << endl;
-#endif /* Cubit_USE_BOA */
-  
-  //
-  // Go get some work to do....
-  //
-  IT_TRY {
-      CORBA::Orbix.impl_is_ready("Cubit", IT_X);
-  }
-  IT_CATCHANY {
-     cout << IT_X << endl;
-  }
-  IT_ENDTRY;
-
-  cout << "Cubit server is exiting." << endl;
-
-
-  return 0;
-}
diff --git a/TAO/tests/Cubit/Orbix/tpr/tpr.cpp b/TAO/tests/Cubit/Orbix/tpr/tpr.cpp
deleted file mode 100644
index 415410aea9f..00000000000
--- a/TAO/tests/Cubit/Orbix/tpr/tpr.cpp
+++ /dev/null
@@ -1,26 +0,0 @@
-#include "tpr.h"
-
-void *
-worker(void *vp)
-{
-  ACE_Thread_Control tc (ACE_Thread_Manager::instance ());
-  CORBA::Orbix.continueThreadDispatch (*(CORBA::Request *)vp);
-  return NULL;
-}
-
-
-int
-tpr_filter::inRequestPreMarshal(CORBA::Request &r,  CORBA::Environment&)
-{
-//   thread_t	tid;
-//   thr_create(NULL, 0, worker, (void *)&r, THR_DETACHED, &tid);
-
-  ACE_Thread_Manager *thr_mgr = ACE_Thread_Manager::instance ();
-  thr_mgr->spawn (ACE_THR_FUNC (worker),
-                  (void *) &r, 
-                  THR_DETACHED);
-
-  return -1;
-}
-
-tpr_filter tpr_dispatcher;
diff --git a/TAO/tests/Cubit/Orbix/tpr/tpr.h b/TAO/tests/Cubit/Orbix/tpr/tpr.h
deleted file mode 100644
index 38c2ccc7069..00000000000
--- a/TAO/tests/Cubit/Orbix/tpr/tpr.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#include "cubit.h"
-#include "ace/Service_Config.h"
-#include "ace/Thread_Manager.h"
-
-//
-// Create a thread filter to dispatch incoming calls
-//
-class tpr_filter : public CORBA::ThreadFilter {
-	virtual int inRequestPreMarshal(CORBA::Request &, CORBA::Environment&);
-};
diff --git a/TAO/tests/Cubit/Orbix/tps/Makefile b/TAO/tests/Cubit/Orbix/tps/Makefile
deleted file mode 100644
index f7e949578c2..00000000000
--- a/TAO/tests/Cubit/Orbix/tps/Makefile
+++ /dev/null
@@ -1,349 +0,0 @@
-#----------------------------------------------------------------------------
-#	@(#)Makefile	1.1	10/18/96
-#
-#	Makefile for the ACE_MT_CORBA_Handler tests
-#----------------------------------------------------------------------------
-
-#----------------------------------------------------------------------------
-#	Local macros
-#----------------------------------------------------------------------------
-
-SRC = cubitS.cpp cubit_impl.cpp server.cpp tps.cpp
-
-SVR_OBJS = cubitS.o cubit_impl.o server.o tps.o
-
-LDLIBS	 = 
-
-VLDLIBS	 = $(LDLIBS:%=%$(VAR))
-
-#----------------------------------------------------------------------------
-#	Include macros and targets
-#----------------------------------------------------------------------------
-
-include		$(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-include		$(ACE_ROOT)/include/makeinclude/macros.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.common.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.lib.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.bin.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
-
-#----------------------------------------------------------------------------
-#	Orbix related macros and target settings.
-#----------------------------------------------------------------------------
-
-
-ORBIX_BINDIR    = $(ORBIX_ROOT)/bin
-ORBIX_LIBDIR    = $(ORBIX_ROOT)/corba2/lib
-ORBIX_INCDIR    = $(ORBIX_ROOT)/corba2/include
-
-# Remove -DCubit_USE_BOA from below to use the TIE approach
-
-CPPFLAGS += -DEXCEPTIONS -I$(ORBIX_INCDIR) -DWANT_ORBIX_FDS -DCubit_USE_BOA
-LDFLAGS  += -L$(ORBIX_LIBDIR) -R $(ORBIX_LIBDIR) -L$(ACE)/ace
-
-IDLFLAGS = -s S.cpp -c C.cpp -B
-
-#----------------------------------------------------------------------------
-#	Local targets
-#----------------------------------------------------------------------------
-
-all: server
-
-server: $(addprefix $(VDIR),$(SVR_OBJS))
-	$(LINK.cc) -o server $(addprefix $(VDIR),$(SVR_OBJS)) $(LDFLAGS) $(ITIIOP) $(ITSRV) $(VLDLIBS)
-
-#----------------------------------------------------------------------------
-#	Dependencies
-#----------------------------------------------------------------------------
-# DO NOT DELETE THIS LINE -- g++dep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-
-.obj/cubitS.o .shobj/cubitS.so: cubitS.cpp cubit.h cubitC.cpp
-.obj/cubit_impl.o .shobj/cubit_impl.so: cubit_impl.cpp cubit_impl.h cubit.h \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/config-sunos5.5-sunc++-4.x.h \
- $(ACE_ROOT)/ace/stdcpp.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Token.h \
- $(ACE_ROOT)/ace/Token.i \
- $(ACE_ROOT)/ace/Pipe.h \
- $(ACE_ROOT)/ace/Pipe.i \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Proactor.h \
- $(ACE_ROOT)/ace/Asynch_IO.h \
- $(ACE_ROOT)/ace/Timer_List.h \
- $(ACE_ROOT)/ace/Timer_List_T.h \
- $(ACE_ROOT)/ace/Timer_Heap.h \
- $(ACE_ROOT)/ace/Timer_Heap_T.h \
- $(ACE_ROOT)/ace/Timer_Wheel.h \
- $(ACE_ROOT)/ace/Timer_Wheel_T.h \
- $(ACE_ROOT)/ace/ReactorEx.h \
- $(ACE_ROOT)/ace/ReactorEx.i \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/Task_T.i
-.obj/server.o .shobj/server.so: server.cpp cubit_impl.h cubit.h \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/config-sunos5.5-sunc++-4.x.h \
- $(ACE_ROOT)/ace/stdcpp.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Token.h \
- $(ACE_ROOT)/ace/Token.i \
- $(ACE_ROOT)/ace/Pipe.h \
- $(ACE_ROOT)/ace/Pipe.i \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Proactor.h \
- $(ACE_ROOT)/ace/Asynch_IO.h \
- $(ACE_ROOT)/ace/Timer_List.h \
- $(ACE_ROOT)/ace/Timer_List_T.h \
- $(ACE_ROOT)/ace/Timer_Heap.h \
- $(ACE_ROOT)/ace/Timer_Heap_T.h \
- $(ACE_ROOT)/ace/Timer_Wheel.h \
- $(ACE_ROOT)/ace/Timer_Wheel_T.h \
- $(ACE_ROOT)/ace/ReactorEx.h \
- $(ACE_ROOT)/ace/ReactorEx.i \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/Task_T.i
-.obj/tps.o .shobj/tps.so: tps.cpp tps.h cubit.h cubit_impl.h \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/config-sunos5.5-sunc++-4.x.h \
- $(ACE_ROOT)/ace/stdcpp.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Token.h \
- $(ACE_ROOT)/ace/Token.i \
- $(ACE_ROOT)/ace/Pipe.h \
- $(ACE_ROOT)/ace/Pipe.i \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Proactor.h \
- $(ACE_ROOT)/ace/Asynch_IO.h \
- $(ACE_ROOT)/ace/Timer_List.h \
- $(ACE_ROOT)/ace/Timer_List_T.h \
- $(ACE_ROOT)/ace/Timer_Heap.h \
- $(ACE_ROOT)/ace/Timer_Heap_T.h \
- $(ACE_ROOT)/ace/Timer_Wheel.h \
- $(ACE_ROOT)/ace/Timer_Wheel_T.h \
- $(ACE_ROOT)/ace/ReactorEx.h \
- $(ACE_ROOT)/ace/ReactorEx.i \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/Task_T.i
-
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/tests/Cubit/Orbix/tps/cubit.h b/TAO/tests/Cubit/Orbix/tps/cubit.h
deleted file mode 100644
index 72e2fb81395..00000000000
--- a/TAO/tests/Cubit/Orbix/tps/cubit.h
+++ /dev/null
@@ -1,1111 +0,0 @@
-
-#ifndef cubit_hh
-#define cubit_hh
-
-#include <CORBA.h>
-
-#include <string.h>
-
-
-#ifndef _Cubit_defined
-#define _Cubit_defined
-class Cubit_dispatch : public virtual CORBA::PPTR {
-public:
-
-      Cubit_dispatch (void *IT_p, CORBA::Object* IT_o, const char *IT_m, 
-        CORBA::LoaderClass *IT_l, char *IT_i, void* IT_im)
-       : PPTR (IT_p,IT_o,IT_m,IT_l,IT_i,IT_im) {}
-
-
-   Cubit_dispatch (char *IT_OR, void *IT_p, CORBA::Object *IT_o)
-       : PPTR (IT_OR,IT_p,IT_o) {}
-
-
-   Cubit_dispatch () {}
-
-   Cubit_dispatch (ObjectReference *IT_OR, void *IT_p, CORBA::Object *IT_o)
-       : PPTR (IT_OR,IT_p,IT_o) {}
-
-
-   Cubit_dispatch (void *IT_p, CORBA::Object *IT_o, const char *IT_m, 
-        char *IT_i, CORBA::Object* IT_ob, void* IT_im)
-       : PPTR (IT_p,IT_o,IT_m,IT_i,IT_ob,IT_im) {}
-
-
-   virtual unsigned char dispatch (CORBA::Request &IT_r, 
-        unsigned char IT_isTarget, void* IT_pp=NULL);
-
-
-};
-
-class Cubit;
-
-#ifndef CubitPtr
-#define CubitPtr
-
-typedef Cubit* Cubit_ptr;
-
-typedef Cubit* CubitRef;
-
-#endif
-
-
-#ifndef CubitForwH
-#define CubitForwH
-CORBA::ObjectRef Cubit_getBase (void *);
-void Cubit_release (Cubit *, CORBA::Environment &IT_env);
-void Cubit_release (Cubit_ptr);
-Cubit* Cubit_duplicate (Cubit_ptr, CORBA::Environment &IT_env);
-Cubit* Cubit_duplicate (Cubit_ptr );
-Cubit_ptr Cubit_nil (CORBA::Environment &IT_env);
-Cubit_ptr Cubit_nil ();
-#endif
-#define Cubit_IMPL "Cubit"
-
-
-class Cubit;
-
-typedef Cubit CubitProxy;
-#define Cubit_IR "Cubit$v1.1"
-#define Cubit_IMPL "Cubit"
-
-#ifndef CubitPtr
-#define CubitPtr
-
-typedef Cubit* Cubit_ptr;
-
-typedef Cubit* CubitRef;
-
-#endif
-
-class Cubit: public virtual CORBA::Object  {
-public:
-        Cubit (char *IT_OR);
-    Cubit (ObjectReference *IT_OR);
-    Cubit () : CORBA::Object  (1) {}
-protected:
-    Cubit_ptr __duplicate(
-            CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) {
-       CORBA::Object::__duplicate (IT_env);
-       return this;
-    }
-public:
-    static Cubit_ptr _duplicate(
-            Cubit_ptr, 
-            CORBA::Environment &IT_pEnv=CORBA::IT_chooseDefaultEnv ());
-public:
-   static Cubit* _bind (const char* IT_markerServer, const char* host,
-		const CORBA::Context &IT_c, 
-		CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-   static Cubit* _bind (CORBA::Environment &IT_env);
-   static Cubit* _bind (const char* IT_markerServer=NULL, const char* host=NULL,
-                 CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-    static Cubit* _narrow (CORBA::Object* , CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-    static Cubit_ptr _nil (CORBA::Environment &IT_pEnv=CORBA::IT_chooseDefaultEnv ()) {
-        CORBA::EnvExcRaiser IT_raise;
-        CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-        return (Cubit_ptr) CORBA::OBJECT_NIL;}
-
-#ifndef Cubit_Many_defined
-#define Cubit_Many_defined
-
-struct Many {
-    CORBA::Octet o;
-    CORBA::Long l;
-    CORBA::Short s;
-
-    void encodeOp (CORBA::Request &IT_r) const;
-    void decodeOp (CORBA::Request &IT_r);
-    void decodeInOutOp (CORBA::Request &IT_r);
-    Many(const Many &);
-    Many();
-    ~Many();
-    Many& operator= (const Many&);
-};
-
-#ifndef Cubit_ManyVarH
-#define Cubit_ManyVarH
-
-#ifndef Cubit_ManyvPtr
-#define Cubit_ManyvPtr
-typedef Many* Many_vPtr;
-typedef const Many* Many_cvPtr;
-#endif
-
-class Many_var : public CORBA::_var
-{
-    private:
-
-    unsigned char copyHelper (const Many_var &IT_s) {
-        if (!IT_s._ptr) {
-            _ptr = IT_s._ptr;
-        } else
-        {
-            _ptr = new Many;
-            *(_ptr) =  *(IT_s._ptr);
-        }
-        return 1;
-    }
-
-    public:
-
-    Many_var (const Many_var &IT_s) {
-        (void) copyHelper (IT_s);
-    }
-
-    Many_var () {
-        _ptr =  new Many;
-;
-    }
-
-    Many_var (Many *IT_p) {
-        _ptr = IT_p;
-    }
-
-    Many_var &operator= (Many *IT_p) {
-        if (_ptr != IT_p) {
-            delete _ptr;
-        }
-        _ptr = IT_p;
-        return (*this);
-    }
-
-    Many_var &operator= (const Many_var &IT_s) {
-        if (_ptr != IT_s._ptr) {
-            delete _ptr;
-        }
-        _ptr = new Many;
-        *(_ptr) =  *(IT_s._ptr);
-        return (*this);
-    }
-
-    ~Many_var () {
-        delete _ptr;
-    }
-
-    Many* operator-> () {
-        return _ptr;
-    }
-
-    operator Many_cvPtr () const { return _ptr;}
-    operator Many_vPtr& () { return _ptr;}
-    operator Many& () const { return * _ptr;}
-
-    protected:
-    Many *_ptr;
-    private:
-    Many_var &operator= (const CORBA::_var &IT_s);
-    Many_var (const CORBA::_var &IT_s);
-};
-
-#endif
-
-
-#endif
-
-enum discrim {e_0th,e_1st,e_2nd,e_3rd,e_4th,e_5th, IT__ENUM_Cubit_discrim=CORBA_ULONG_MAX};
-
-#ifndef Cubit_oneof_defined
-#define Cubit_oneof_defined
-
-struct oneof {
-    private:
-
-    discrim __d;
-    union {
-        CORBA::Octet _o_;
-        CORBA::Short _s_;
-        CORBA::Long _l_;
-        Many * _cm_;
-    };
-
-    public:
-
-    void encodeOp (CORBA::Request &IT_r) const;
-    void decodeOp (CORBA::Request &IT_r);
-    void decodeInOutOp (CORBA::Request &IT_r);
-
-    private:
-
-    unsigned char isSet;
-
-    public:
-
-    discrim _d () const { return __d; }
-
-    CORBA::Octet o () const {
-        return _o_;
-    }
-
-    void o (CORBA::Octet IT_member) {
-        if (isSet && (__d != Cubit::e_0th))
-        {
-            this-> oneof::~oneof();
-            memset(this, 0, sizeof(*this));
-        }
-
-        __d = Cubit::e_0th;
-        isSet = 1;
-        _o_ = IT_member;
-    }
-
-    CORBA::Short s () const {
-        return _s_;
-    }
-
-    void s (CORBA::Short IT_member) {
-        if (isSet && (__d != Cubit::e_1st))
-        {
-            this-> oneof::~oneof();
-            memset(this, 0, sizeof(*this));
-        }
-
-        __d = Cubit::e_1st;
-        isSet = 1;
-        _s_ = IT_member;
-    }
-
-    CORBA::Long l () const {
-        return _l_;
-    }
-
-    void l (CORBA::Long IT_member) {
-        if (isSet && (__d != Cubit::e_2nd))
-        {
-            this-> oneof::~oneof();
-            memset(this, 0, sizeof(*this));
-        }
-
-        __d = Cubit::e_2nd;
-        isSet = 1;
-        _l_ = IT_member;
-    }
-
-    Many& cm () {
-        return (*_cm_);
-    }
-
-    const Many& cm () const {
-        return (*_cm_);
-    }
-
-    void cm (const Many& IT_member) {
-        if (isSet && (__d != Cubit::e_3rd))
-        {
-            this-> oneof::~oneof();
-            memset(this, 0, sizeof(*this));
-        }
-
-        __d = Cubit::e_3rd;
-
-        if (!isSet) {
-            _cm_ = new Many;
-            isSet = 1;
-        }
-        *(_cm_) = IT_member;
-    }
-
-
-    oneof();
-    oneof(const oneof &);
-    ~oneof();
-    oneof& operator= (const oneof&);
-};
-
-#ifndef Cubit_oneofVarH
-#define Cubit_oneofVarH
-
-#ifndef Cubit_oneofvPtr
-#define Cubit_oneofvPtr
-typedef oneof* oneof_vPtr;
-typedef const oneof* oneof_cvPtr;
-#endif
-
-class oneof_var : public CORBA::_var
-{
-    private:
-
-    unsigned char copyHelper (const oneof_var &IT_s) {
-        if (!IT_s._ptr) {
-            _ptr = IT_s._ptr;
-        } else
-        {
-            _ptr = new oneof;
-            *(_ptr) =  *(IT_s._ptr);
-        }
-        return 1;
-    }
-
-    public:
-
-    oneof_var (const oneof_var &IT_s) {
-        (void) copyHelper (IT_s);
-    }
-
-    oneof_var () {
-        _ptr = NULL;
-    }
-
-    oneof_var (oneof *IT_p) {
-        _ptr = IT_p;
-    }
-
-    oneof_var &operator= (oneof *IT_p) {
-        if (_ptr != IT_p) {
-            delete _ptr;
-        }
-        _ptr = IT_p;
-        return (*this);
-    }
-
-    oneof_var &operator= (const oneof_var &IT_s) {
-        if (_ptr != IT_s._ptr) {
-            delete _ptr;
-        }
-        _ptr = new oneof;
-        *(_ptr) =  *(IT_s._ptr);
-        return (*this);
-    }
-
-    ~oneof_var () {
-        delete _ptr;
-    }
-
-    oneof* operator-> () {
-        return _ptr;
-    }
-
-    operator oneof_cvPtr () const { return _ptr;}
-    operator oneof_vPtr& () { return _ptr;}
-    operator oneof& () const { return * _ptr;}
-
-    protected:
-    oneof *_ptr;
-    private:
-    oneof_var &operator= (const CORBA::_var &IT_s);
-    oneof_var (const CORBA::_var &IT_s);
-};
-
-#endif
-
-
-#endif
-        virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual Many cube_struct (const Many& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual oneof cube_union (const oneof& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-        virtual void please_exit (CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-};
-
-#ifndef CubitVarH
-#define CubitVarH
-
-#ifndef CubitvPtr
-#define CubitvPtr
-typedef Cubit* Cubit_vPtr;
-typedef const Cubit* Cubit_cvPtr;
-#endif
-
-class Cubit_var : public CORBA::_var
-{
-    private:
-
-    unsigned char copyHelper (const Cubit_var &IT_s) {
-        {
-            _ptr = Cubit_duplicate (IT_s._ptr);
-        }
-        return 1;
-    }
-
-    public:
-
-    Cubit_var (const Cubit_var &IT_s) {
-        (void) copyHelper (IT_s);
-    }
-
-    Cubit_var () {
-        _ptr = Cubit_nil ();
-    }
-
-    Cubit_var (Cubit *IT_p) {
-        _ptr = IT_p;
-    }
-
-    Cubit_var &operator= (Cubit *IT_p) {
-        Cubit_release (_ptr);
-        _ptr = IT_p;
-        return (*this);
-    }
-
-    Cubit_var &operator= (const Cubit_var &IT_s) {
-        Cubit_release (_ptr);
-        _ptr = Cubit_duplicate (IT_s._ptr);
-        return (*this);
-    }
-
-    ~Cubit_var () {
-        Cubit_release (_ptr);
-    }
-
-    Cubit* operator-> () {
-        return _ptr;
-    }
-
-    operator Cubit_cvPtr () const { return _ptr;}
-    operator Cubit_vPtr& () { return _ptr;}
-
-    protected:
-    Cubit *_ptr;
-    private:
-    Cubit_var &operator= (const CORBA::_var &IT_s);
-    Cubit_var (const CORBA::_var &IT_s);
-    Cubit_var &operator= (const CORBA::_mgr &IT_s);
-    Cubit_var &operator= (const CORBA::_SeqElem &IT_s);
-    Cubit_var (const CORBA::_mgr &IT_s);
-    Cubit_var (const CORBA::_SeqElem &IT_s);
-};
-
-#endif
-
-
-#ifndef CubitMgrH
-#define CubitMgrH
-
-class Cubit_mgr : public CORBA::_mgr
-{
-    public:
-
-    Cubit_mgr () {
-        _ptr = Cubit_nil ();
-        _release = 1;
-    }
-
-    Cubit_mgr (const Cubit_mgr &IT_s) {
-        _ptr = Cubit_duplicate (IT_s._ptr);
-        _release = 1;
-    }
-
-    Cubit_mgr &operator= (Cubit *IT_p) {
-        if (_ptr && _release)
-            Cubit_release (_ptr);
-        _ptr = IT_p;
-        _release = 1;
-        return (*this);
-    }
-
-    Cubit_mgr &operator= (const Cubit_mgr &IT_s) {
-        if (_ptr && _release)
-            Cubit_release (_ptr);
-        _ptr = Cubit_duplicate(IT_s._ptr);
-        _release = 1;
-        return (*this);
-    }
-
-    Cubit_mgr &operator= (Cubit_var &IT_s) {
-        if (_ptr && _release)
-            Cubit_release (_ptr);
-        _ptr = Cubit_duplicate(IT_s);
-        _release = 1;
-        return (*this);
-    }
-
-    ~Cubit_mgr () {
-        if (_release)
-            Cubit_release (_ptr);
-    }
-
-    unsigned char release () {
-        return _release;
-    }
-
-    void release (unsigned char rel) {
-        _release = rel;
-    }
-
-    operator int () const {
-        return (((CORBA::Object_ptr) _ptr) ? 1 : 0);
-    }
-
-    operator void* () const {
-        return _ptr;
-    }
-
-    operator CORBA::Object * () const {
-        return (CORBA::Object *) _ptr;
-    }
-
-    operator Cubit* () const {
-        return (Cubit*) _ptr;
-    }
-
-    Cubit_ptr operator-> () const {
-        return _ptr;
-    }
-
-    Cubit *_ptr;
-
-    protected:
-
-    unsigned char _release;
-};
-
-typedef Cubit_mgr Cubit_mgr_IT_const;
-#endif
-
-#ifndef CubitSeqElemH
-#define CubitSeqElemH
-
-class Cubit_SeqElem : public CORBA::_SeqElem
-{
-    public:
-
-    Cubit_SeqElem (Cubit_ptr* IT_p, unsigned char rel) {
-        _ptr = IT_p;
-        _release = rel;
-    }
-
-    Cubit_SeqElem &operator= (Cubit_ptr IT_p) {
-        if (_ptr) {
-            if (*(_ptr) && _release)
-                Cubit_release (*(_ptr));
-            *(_ptr) = IT_p;
-        }
-        return (*this);
-    }
-
-    Cubit_SeqElem &operator= (const Cubit_SeqElem &IT_s) {
-        if (_ptr && IT_s._ptr) {
-            if (*(_ptr) && _release)
-                Cubit_release (*(_ptr));
-            *(_ptr) = Cubit_duplicate(*(IT_s._ptr));
-        }
-        return (*this);
-    }
-
-    operator Cubit_ptr () const {
-        return _ptr ? (Cubit_ptr) (*_ptr) : Cubit_nil(); 
-    }
-
-    Cubit_ptr operator->() const { return *_ptr;}
-
-    protected:
-    Cubit_ptr *_ptr;
-    unsigned char _release;
-};
-
-#endif
-
-
-#define TIE_Cubit(X) Cubit##X
-
-#define DEF_TIE_Cubit(X) \
-	class Cubit##X : public virtual Cubit {		\
-	  X* m_obj;						\
-	public:							\
-								\
-								\
-	   Cubit##X  (X *objp, const char* m="", CORBA::LoaderClass *l=0)\
-		: Cubit(), m_obj(objp) {	\
-		m_pptr = new Cubit_dispatch		\
-			(( Cubit*)this,(CORBA::Object*)this,m,l,Cubit_IR,m_obj);	\
-	   }								\
-	   Cubit##X  (CORBA::Object *IT_p, const char* IT_m="", void *IT_q=0)\
-		: Cubit() {	\
-		m_pptr = new Cubit_dispatch		\
-			(( Cubit*)this,(CORBA::Object*)this,IT_m,Cubit_IR,IT_p,IT_q);	\
-		m_obj = (X*)(m_pptr->getImplObj ());			\
-	   }								\
-								\
-	   virtual ~Cubit##X  () {				\
-		if (_okToDeleteImpl ()) delete m_obj; }					\
-	   virtual void* _deref () {					\
-		return m_obj; }					\
-								\
-virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_octet (  o,IT_env);\
-}\
-	\
-virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_short (  s,IT_env);\
-}\
-	\
-virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_long (  l,IT_env);\
-}\
-	\
-virtual Cubit::Many cube_struct (const Cubit::Many& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_struct (  values,IT_env);\
-}\
-	\
-virtual Cubit::oneof cube_union (const Cubit::oneof& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_union (  values,IT_env);\
-}\
-	\
-virtual void please_exit (CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-m_obj->please_exit (IT_env);\
-}\
-								\
-	};						\
-
-
-#define QUALS_Cubit	\
-virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_octet (  o,IT_env);\
-}\
-	\
-virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_short (  s,IT_env);\
-}\
-	\
-virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_long (  l,IT_env);\
-}\
-	\
-virtual Many cube_struct (const Many& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_struct (  values,IT_env);\
-}\
-	\
-virtual oneof cube_union (const oneof& values, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->cube_union (  values,IT_env);\
-}\
-	\
-virtual void please_exit (CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-m_obj->please_exit (IT_env);\
-}\
-
-
-
-
-class CubitProxyFactoryClass : public virtual CORBA::ObjectFactoryClass {
-public:
-   CubitProxyFactoryClass (unsigned char IT_p=0)
-		: CORBA::ProxyFactory (Cubit_IR, IT_p) {}
-
-    virtual void* New (char *IT_OR, CORBA::Environment&);
-
-    virtual void* New (ObjectReference *IT_OR, CORBA::Environment&);
-
-    virtual void* New2 (); 
-
-    virtual CORBA::Object* NewObject (char *IT_OR, CORBA::Environment&);
-
-    virtual CORBA::Object* NewObject (ObjectReference *IT_OR, CORBA::Environment&);
-
-    virtual CORBA::Object* New2Object (); 
-
-    virtual void* IT_castUp (void *IT_p, char* IT_s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-
-    virtual CORBA::PPTR* pptr (void *IT_p);
-
-    virtual void baseInterfaces (_IDL_SEQUENCE_string&);
-
-
-};
-
-extern CubitProxyFactoryClass CubitProxyFactory;
-
-class CubitBOAImpl : public virtual Cubit  {
-public:
-    CubitBOAImpl (const char *m="", CORBA::LoaderClass *l=NULL) {
-  if (CORBA::PPTR::isOK (m_pptr, Cubit_IR))
-    m_pptr = new Cubit_dispatch ( (Cubit*)this,
-   	 (CORBA::Object*)this, m, l, Cubit_IR, this);
-}
-
-        virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual Many cube_struct (const Many& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual oneof cube_union (const oneof& values, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-        virtual void please_exit (CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-};
-
-
-#endif
-
-
-#ifndef _Cubit_Factory_defined
-#define _Cubit_Factory_defined
-class Cubit_Factory_dispatch : public virtual CORBA::PPTR {
-public:
-
-      Cubit_Factory_dispatch (void *IT_p, CORBA::Object* IT_o, const char *IT_m, 
-        CORBA::LoaderClass *IT_l, char *IT_i, void* IT_im)
-       : PPTR (IT_p,IT_o,IT_m,IT_l,IT_i,IT_im) {}
-
-
-   Cubit_Factory_dispatch (char *IT_OR, void *IT_p, CORBA::Object *IT_o)
-       : PPTR (IT_OR,IT_p,IT_o) {}
-
-
-   Cubit_Factory_dispatch () {}
-
-   Cubit_Factory_dispatch (ObjectReference *IT_OR, void *IT_p, CORBA::Object *IT_o)
-       : PPTR (IT_OR,IT_p,IT_o) {}
-
-
-   Cubit_Factory_dispatch (void *IT_p, CORBA::Object *IT_o, const char *IT_m, 
-        char *IT_i, CORBA::Object* IT_ob, void* IT_im)
-       : PPTR (IT_p,IT_o,IT_m,IT_i,IT_ob,IT_im) {}
-
-
-   virtual unsigned char dispatch (CORBA::Request &IT_r, 
-        unsigned char IT_isTarget, void* IT_pp=NULL);
-
-
-};
-
-class Cubit_Factory;
-
-#ifndef Cubit_FactoryPtr
-#define Cubit_FactoryPtr
-
-typedef Cubit_Factory* Cubit_Factory_ptr;
-
-typedef Cubit_Factory* Cubit_FactoryRef;
-
-#endif
-
-
-#ifndef Cubit_FactoryForwH
-#define Cubit_FactoryForwH
-CORBA::ObjectRef Cubit_Factory_getBase (void *);
-void Cubit_Factory_release (Cubit_Factory *, CORBA::Environment &IT_env);
-void Cubit_Factory_release (Cubit_Factory_ptr);
-Cubit_Factory* Cubit_Factory_duplicate (Cubit_Factory_ptr, CORBA::Environment &IT_env);
-Cubit_Factory* Cubit_Factory_duplicate (Cubit_Factory_ptr );
-Cubit_Factory_ptr Cubit_Factory_nil (CORBA::Environment &IT_env);
-Cubit_Factory_ptr Cubit_Factory_nil ();
-#endif
-#define Cubit_Factory_IMPL "Cubit_Factory"
-
-
-class Cubit_Factory;
-
-typedef Cubit_Factory Cubit_FactoryProxy;
-#define Cubit_Factory_IR "Cubit_Factory"
-#define Cubit_Factory_IMPL "Cubit_Factory"
-
-#ifndef Cubit_FactoryPtr
-#define Cubit_FactoryPtr
-
-typedef Cubit_Factory* Cubit_Factory_ptr;
-
-typedef Cubit_Factory* Cubit_FactoryRef;
-
-#endif
-
-class Cubit_Factory: public virtual CORBA::Object  {
-public:
-        Cubit_Factory (char *IT_OR);
-    Cubit_Factory (ObjectReference *IT_OR);
-    Cubit_Factory () : CORBA::Object  (1) {}
-protected:
-    Cubit_Factory_ptr __duplicate(
-            CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) {
-       CORBA::Object::__duplicate (IT_env);
-       return this;
-    }
-public:
-    static Cubit_Factory_ptr _duplicate(
-            Cubit_Factory_ptr, 
-            CORBA::Environment &IT_pEnv=CORBA::IT_chooseDefaultEnv ());
-public:
-   static Cubit_Factory* _bind (const char* IT_markerServer, const char* host,
-		const CORBA::Context &IT_c, 
-		CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-   static Cubit_Factory* _bind (CORBA::Environment &IT_env);
-   static Cubit_Factory* _bind (const char* IT_markerServer=NULL, const char* host=NULL,
-                 CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-    static Cubit_Factory* _narrow (CORBA::Object* , CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-    static Cubit_Factory_ptr _nil (CORBA::Environment &IT_pEnv=CORBA::IT_chooseDefaultEnv ()) {
-        CORBA::EnvExcRaiser IT_raise;
-        CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-        return (Cubit_Factory_ptr) CORBA::OBJECT_NIL;}
-        virtual Cubit_ptr create_cubit (const char * name, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException);
-};
-
-#ifndef Cubit_FactoryVarH
-#define Cubit_FactoryVarH
-
-#ifndef Cubit_FactoryvPtr
-#define Cubit_FactoryvPtr
-typedef Cubit_Factory* Cubit_Factory_vPtr;
-typedef const Cubit_Factory* Cubit_Factory_cvPtr;
-#endif
-
-class Cubit_Factory_var : public CORBA::_var
-{
-    private:
-
-    unsigned char copyHelper (const Cubit_Factory_var &IT_s) {
-        {
-            _ptr = Cubit_Factory_duplicate (IT_s._ptr);
-        }
-        return 1;
-    }
-
-    public:
-
-    Cubit_Factory_var (const Cubit_Factory_var &IT_s) {
-        (void) copyHelper (IT_s);
-    }
-
-    Cubit_Factory_var () {
-        _ptr = Cubit_Factory_nil ();
-    }
-
-    Cubit_Factory_var (Cubit_Factory *IT_p) {
-        _ptr = IT_p;
-    }
-
-    Cubit_Factory_var &operator= (Cubit_Factory *IT_p) {
-        Cubit_Factory_release (_ptr);
-        _ptr = IT_p;
-        return (*this);
-    }
-
-    Cubit_Factory_var &operator= (const Cubit_Factory_var &IT_s) {
-        Cubit_Factory_release (_ptr);
-        _ptr = Cubit_Factory_duplicate (IT_s._ptr);
-        return (*this);
-    }
-
-    ~Cubit_Factory_var () {
-        Cubit_Factory_release (_ptr);
-    }
-
-    Cubit_Factory* operator-> () {
-        return _ptr;
-    }
-
-    operator Cubit_Factory_cvPtr () const { return _ptr;}
-    operator Cubit_Factory_vPtr& () { return _ptr;}
-
-    protected:
-    Cubit_Factory *_ptr;
-    private:
-    Cubit_Factory_var &operator= (const CORBA::_var &IT_s);
-    Cubit_Factory_var (const CORBA::_var &IT_s);
-    Cubit_Factory_var &operator= (const CORBA::_mgr &IT_s);
-    Cubit_Factory_var &operator= (const CORBA::_SeqElem &IT_s);
-    Cubit_Factory_var (const CORBA::_mgr &IT_s);
-    Cubit_Factory_var (const CORBA::_SeqElem &IT_s);
-};
-
-#endif
-
-
-#ifndef Cubit_FactoryMgrH
-#define Cubit_FactoryMgrH
-
-class Cubit_Factory_mgr : public CORBA::_mgr
-{
-    public:
-
-    Cubit_Factory_mgr () {
-        _ptr = Cubit_Factory_nil ();
-        _release = 1;
-    }
-
-    Cubit_Factory_mgr (const Cubit_Factory_mgr &IT_s) {
-        _ptr = Cubit_Factory_duplicate (IT_s._ptr);
-        _release = 1;
-    }
-
-    Cubit_Factory_mgr &operator= (Cubit_Factory *IT_p) {
-        if (_ptr && _release)
-            Cubit_Factory_release (_ptr);
-        _ptr = IT_p;
-        _release = 1;
-        return (*this);
-    }
-
-    Cubit_Factory_mgr &operator= (const Cubit_Factory_mgr &IT_s) {
-        if (_ptr && _release)
-            Cubit_Factory_release (_ptr);
-        _ptr = Cubit_Factory_duplicate(IT_s._ptr);
-        _release = 1;
-        return (*this);
-    }
-
-    Cubit_Factory_mgr &operator= (Cubit_Factory_var &IT_s) {
-        if (_ptr && _release)
-            Cubit_Factory_release (_ptr);
-        _ptr = Cubit_Factory_duplicate(IT_s);
-        _release = 1;
-        return (*this);
-    }
-
-    ~Cubit_Factory_mgr () {
-        if (_release)
-            Cubit_Factory_release (_ptr);
-    }
-
-    unsigned char release () {
-        return _release;
-    }
-
-    void release (unsigned char rel) {
-        _release = rel;
-    }
-
-    operator int () const {
-        return (((CORBA::Object_ptr) _ptr) ? 1 : 0);
-    }
-
-    operator void* () const {
-        return _ptr;
-    }
-
-    operator CORBA::Object * () const {
-        return (CORBA::Object *) _ptr;
-    }
-
-    operator Cubit_Factory* () const {
-        return (Cubit_Factory*) _ptr;
-    }
-
-    Cubit_Factory_ptr operator-> () const {
-        return _ptr;
-    }
-
-    Cubit_Factory *_ptr;
-
-    protected:
-
-    unsigned char _release;
-};
-
-typedef Cubit_Factory_mgr Cubit_Factory_mgr_IT_const;
-#endif
-
-#ifndef Cubit_FactorySeqElemH
-#define Cubit_FactorySeqElemH
-
-class Cubit_Factory_SeqElem : public CORBA::_SeqElem
-{
-    public:
-
-    Cubit_Factory_SeqElem (Cubit_Factory_ptr* IT_p, unsigned char rel) {
-        _ptr = IT_p;
-        _release = rel;
-    }
-
-    Cubit_Factory_SeqElem &operator= (Cubit_Factory_ptr IT_p) {
-        if (_ptr) {
-            if (*(_ptr) && _release)
-                Cubit_Factory_release (*(_ptr));
-            *(_ptr) = IT_p;
-        }
-        return (*this);
-    }
-
-    Cubit_Factory_SeqElem &operator= (const Cubit_Factory_SeqElem &IT_s) {
-        if (_ptr && IT_s._ptr) {
-            if (*(_ptr) && _release)
-                Cubit_Factory_release (*(_ptr));
-            *(_ptr) = Cubit_Factory_duplicate(*(IT_s._ptr));
-        }
-        return (*this);
-    }
-
-    operator Cubit_Factory_ptr () const {
-        return _ptr ? (Cubit_Factory_ptr) (*_ptr) : Cubit_Factory_nil(); 
-    }
-
-    Cubit_Factory_ptr operator->() const { return *_ptr;}
-
-    protected:
-    Cubit_Factory_ptr *_ptr;
-    unsigned char _release;
-};
-
-#endif
-
-
-#define TIE_Cubit_Factory(X) Cubit_Factory##X
-
-#define DEF_TIE_Cubit_Factory(X) \
-	class Cubit_Factory##X : public virtual Cubit_Factory {		\
-	  X* m_obj;						\
-	public:							\
-								\
-								\
-	   Cubit_Factory##X  (X *objp, const char* m="", CORBA::LoaderClass *l=0)\
-		: Cubit_Factory(), m_obj(objp) {	\
-		m_pptr = new Cubit_Factory_dispatch		\
-			(( Cubit_Factory*)this,(CORBA::Object*)this,m,l,Cubit_Factory_IR,m_obj);	\
-	   }								\
-	   Cubit_Factory##X  (CORBA::Object *IT_p, const char* IT_m="", void *IT_q=0)\
-		: Cubit_Factory() {	\
-		m_pptr = new Cubit_Factory_dispatch		\
-			(( Cubit_Factory*)this,(CORBA::Object*)this,IT_m,Cubit_Factory_IR,IT_p,IT_q);	\
-		m_obj = (X*)(m_pptr->getImplObj ());			\
-	   }								\
-								\
-	   virtual ~Cubit_Factory##X  () {				\
-		if (_okToDeleteImpl ()) delete m_obj; }					\
-	   virtual void* _deref () {					\
-		return m_obj; }					\
-								\
-virtual Cubit_ptr create_cubit (const char * name, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->create_cubit (  name,IT_env);\
-}\
-								\
-	};						\
-
-
-#define QUALS_Cubit_Factory	\
-virtual Cubit_ptr create_cubit (const char * name, CORBA::Environment &IT_env) throw (CORBA::SystemException){\
-return m_obj->create_cubit (  name,IT_env);\
-}\
-
-
-
-
-class Cubit_FactoryProxyFactoryClass : public virtual CORBA::ObjectFactoryClass {
-public:
-   Cubit_FactoryProxyFactoryClass (unsigned char IT_p=0)
-		: CORBA::ProxyFactory (Cubit_Factory_IR, IT_p) {}
-
-    virtual void* New (char *IT_OR, CORBA::Environment&);
-
-    virtual void* New (ObjectReference *IT_OR, CORBA::Environment&);
-
-    virtual void* New2 (); 
-
-    virtual CORBA::Object* NewObject (char *IT_OR, CORBA::Environment&);
-
-    virtual CORBA::Object* NewObject (ObjectReference *IT_OR, CORBA::Environment&);
-
-    virtual CORBA::Object* New2Object (); 
-
-    virtual void* IT_castUp (void *IT_p, char* IT_s, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ());
-
-    virtual CORBA::PPTR* pptr (void *IT_p);
-
-    virtual void baseInterfaces (_IDL_SEQUENCE_string&);
-
-
-};
-
-extern Cubit_FactoryProxyFactoryClass Cubit_FactoryProxyFactory;
-
-class Cubit_FactoryBOAImpl : public virtual Cubit_Factory  {
-public:
-    Cubit_FactoryBOAImpl (const char *m="", CORBA::LoaderClass *l=NULL) {
-  if (CORBA::PPTR::isOK (m_pptr, Cubit_Factory_IR))
-    m_pptr = new Cubit_Factory_dispatch ( (Cubit_Factory*)this,
-   	 (CORBA::Object*)this, m, l, Cubit_Factory_IR, this);
-}
-
-        virtual Cubit_ptr create_cubit (const char * name, CORBA::Environment &IT_env=CORBA::IT_chooseDefaultEnv ()) throw (CORBA::SystemException) =0;
-};
-
-
-#endif
-
-
-#endif
diff --git a/TAO/tests/Cubit/Orbix/tps/cubit.idl b/TAO/tests/Cubit/Orbix/tps/cubit.idl
deleted file mode 100644
index 7dba408d0db..00000000000
--- a/TAO/tests/Cubit/Orbix/tps/cubit.idl
+++ /dev/null
@@ -1,46 +0,0 @@
-// @(#)cubit.idl	1.1 95/09/10
-// Copyright 1994-1995 by Sun Microsystems, Inc.
-
-#pragma prefix	"Eng.SUN.COM"
-#pragma version Cubit 1.1
-
-  interface Cubit {
-    octet	cube_octet (in octet o);
-    short	cube_short (in short s);
-    long	cube_long (in long l);
-    
-    struct Many {
-      octet	o;		// + 3 bytes padding (normally) ...
-      long	l;
-      short	s;		// + 2 bytes padding (normally) ...
-    };
-    
-    Many	cube_struct (in Many values);
-    
-    enum discrim {e_0th, e_1st, e_2nd, e_3rd, e_4th, e_5th};
-    
-    union oneof
-      switch (discrim) {
-	// this is an easy union to interpret; no padding
-	// is needed between discriminant and value.
-      case e_0th:
-        octet		o;
-      case e_1st:
-        short		s;
-      case e_2nd:
-        long		l;
-      case e_3rd:
-      default:
-        Many		cm;
-      };
-    
-    oneof	cube_union (in oneof values);
-    
-    oneway void	please_exit ();
-  };
-
-
-  interface Cubit_Factory {
-    Cubit create_cubit (in string name);
-  };
-
diff --git a/TAO/tests/Cubit/Orbix/tps/cubitC.cpp b/TAO/tests/Cubit/Orbix/tps/cubitC.cpp
deleted file mode 100644
index c439fc4c800..00000000000
--- a/TAO/tests/Cubit/Orbix/tps/cubitC.cpp
+++ /dev/null
@@ -1,710 +0,0 @@
-
-
-#include "cubit.h"
-
-Cubit::Cubit (char *IT_OR) {
-      m_pptr = new Cubit_dispatch (IT_OR, this,(CORBA::Object*)this);
-} 
-Cubit::Cubit (ObjectReference *IT_OR) {
-      m_pptr = new Cubit_dispatch (IT_OR, this,(CORBA::Object*)this);
-} 
-
-#ifndef CubitForwC
-#define CubitForwC
-CORBA::ObjectRef Cubit_getBase(void *IT_p){
-    return (Cubit*) IT_p;}
-
-void Cubit_release (Cubit_ptr IT_p, CORBA::Environment &IT_env) {
-    CORBA::release(IT_p, IT_env);}
-
-void Cubit_release (Cubit_ptr IT_p) {
-    Cubit_release (IT_p, CORBA::IT_chooseDefaultEnv ()); }
-
-Cubit_ptr Cubit_nil (CORBA::Environment &) {
-    return Cubit:: _nil ();}
-
-Cubit_ptr Cubit_nil () {
-    return Cubit_nil (CORBA::IT_chooseDefaultEnv ());}
-
-Cubit_ptr Cubit_duplicate (Cubit_ptr IT_p, CORBA::Environment &IT_env) {
-    return (Cubit::_duplicate(IT_p, IT_env)); }
-Cubit_ptr Cubit_duplicate (Cubit_ptr IT_p) {
-    return Cubit_duplicate (IT_p, CORBA::IT_chooseDefaultEnv ()); }
-#endif
-
-Cubit_ptr Cubit::_duplicate(Cubit_ptr obj, CORBA::Environment& IT_pEnv) {
-        CORBA::EnvExcRaiser IT_raise;
-        CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-       if (!obj) {
-          return (obj);
-       }
-       Cubit_ptr IT_obj = obj->__duplicate (IT_env);
-       return IT_obj;
-}
-
-
-
-Cubit* Cubit:: _bind (const char* IT_markerServer, const char* host,
-		const CORBA::Context &IT_c, 
-		CORBA::Environment &IT_env) {
-       return (Cubit*)CORBA::Factory.New (IT_markerServer, IT_env, IT_c, host, 
-		Cubit_IMPL, Cubit_IR);
-}
-
-
-
-Cubit* Cubit:: _bind (CORBA::Environment &IT_env) {
-       return _bind (NULL,NULL,CORBA::Context(), IT_env); }
-
-
-Cubit* Cubit:: _bind (const char* IT_markerServer, const char* host,
-                CORBA::Environment &IT_env) {
-       return _bind (IT_markerServer, host, CORBA::Context (), IT_env); }
-Cubit* Cubit::_narrow (CORBA::Object* IT_obj, CORBA::Environment &IT_pEnv) {
-        CORBA::EnvExcRaiser IT_raise;
-        CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-        if (CORBA::is_nil (IT_obj)) {
-                return Cubit:: _nil();
-        }
-
-       Cubit* IT_p = (Cubit*)CORBA::Object::_castDown (IT_obj, Cubit_IR, IT_env);
-        IT_p = IT_p ? IT_p->__duplicate(IT_env) : NULL;
-        if ((IT_env) &&(!strcmp(IT_env.exception()->id(), "CORBA::StExcep::BAD_PARAM")) && (((CORBA::BAD_PARAM*)IT_env.exception())-> minor() == NARROW_FAILED)) {
-                IT_env.exception_free();
-        }
-        return IT_p;
-   }
-
-
-#ifndef Cubit_Many_Ops
-#define Cubit_Many_Ops
-
-void Cubit::Many:: encodeOp (CORBA::Request &IT_r) const {
-
-    IT_r.insertOctet (o);
-
-    IT_r << l;
-
-    IT_r << s;
-}
-
-void Cubit::Many:: decodeOp (CORBA::Request &IT_r) {
-
-    IT_r.extractOctet (o);
-
-    IT_r >> l;
-
-    IT_r >> s;
-}
-
-void Cubit::Many:: decodeInOutOp (CORBA::Request &IT_r) {
-
-    IT_r.extractOctet (o);
-
-    IT_r >> l;
-
-    IT_r >> s;
-}
-
-Cubit::Many ::~Many () {
-}
-
-Cubit::Many:: Many (const Cubit::Many &IT_s) 
-	 {
-    o = IT_s.o;
-    l = IT_s.l;
-    s = IT_s.s;
-}
-
-Cubit::Many:: Many () {
-}
-
-Cubit::Many &Cubit::Many:: operator= (const Cubit::Many& IT_s) {
-    if (this == &IT_s) return *this;
-    o = IT_s.o;
-    l = IT_s.l;
-    s = IT_s.s;
-    return *this;
-}
-
-
-#endif
-
-
-#ifndef Cubit_oneof_Ops
-#define Cubit_oneof_Ops
-void Cubit::oneof:: encodeOp (CORBA::Request &IT_r) const {
-    if (!isSet) return;
-    {
-    CORBA::ULong IT_0 = (CORBA::ULong) __d;
-    IT_r << IT_0;
-    }
-    switch (__d) {
-        case Cubit::e_0th: 
-        IT_r.insertOctet (_o_);
-        break;
-        case Cubit::e_1st: 
-        IT_r << _s_;
-        break;
-        case Cubit::e_2nd: 
-        IT_r << _l_;
-        break;
-        case Cubit::e_3rd: 
-        default: 
-        (*_cm_).encodeOp (IT_r);
-        break;
-    }
-
-}
-
-void Cubit::oneof:: decodeOp (CORBA::Request &IT_r) {
-    isSet = 0;
-    {
-    CORBA::ULong IT_1;
-    IT_r >> IT_1;
-    __d = Cubit::discrim(IT_1);
-    }
-    switch (__d) {
-        case Cubit::e_0th: 
-        if (!isSet) {
-            isSet = 1;
-        }
-        IT_r.extractOctet (_o_);
-        break;
-        case Cubit::e_1st: 
-        if (!isSet) {
-            isSet = 1;
-        }
-        IT_r >> _s_;
-        break;
-        case Cubit::e_2nd: 
-        if (!isSet) {
-            isSet = 1;
-        }
-        IT_r >> _l_;
-        break;
-        case Cubit::e_3rd: 
-        default: 
-        if (!isSet) {
-            _cm_ = new Cubit::Many;
-            isSet = 1;
-        }
-        (*_cm_).decodeOp (IT_r);
-        break;
-    }
-
-}
-void Cubit::oneof:: decodeInOutOp (CORBA::Request &IT_r) {
-    Cubit::discrim IT_d;
-    {
-    CORBA::ULong IT_2;
-    IT_r >> IT_2;
-    IT_d = Cubit::discrim(IT_2);
-    }
-    if (IT_d == __d)
-        switch (__d) {
-            case Cubit::e_0th: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r.extractOctet (_o_);
-            break;
-            case Cubit::e_1st: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r >> _s_;
-            break;
-            case Cubit::e_2nd: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r >> _l_;
-            break;
-            case Cubit::e_3rd: 
-            default: 
-            if (!isSet) {
-                _cm_ = new Cubit::Many;
-                isSet = 1;
-            }
-            (*_cm_).decodeInOutOp (IT_r);
-            break;
-        }
-
-    else {
-        this->oneof:: ~oneof();
-        memset(this, 0, sizeof(*this));
-        __d = IT_d;
-        switch (__d) {
-            case Cubit::e_0th: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r.extractOctet (_o_);
-            break;
-            case Cubit::e_1st: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r >> _s_;
-            break;
-            case Cubit::e_2nd: 
-            if (!isSet) {
-                isSet = 1;
-            }
-            IT_r >> _l_;
-            break;
-            case Cubit::e_3rd: 
-            default: 
-            if (!isSet) {
-                _cm_ = new Cubit::Many;
-                isSet = 1;
-            }
-            (*_cm_).decodeOp (IT_r);
-            break;
-        }
-        isSet = 1;
-    }
-
-}
-
-Cubit::oneof:: oneof() { 
-    memset(this, 0, sizeof(*this));
-    isSet = 0;
-}
-
-Cubit::oneof ::~oneof() {
-    if (!isSet) return;
-    switch (__d) { 
-        case Cubit::e_0th:         break;
-        case Cubit::e_1st:         break;
-        case Cubit::e_2nd:         break;
-        case Cubit::e_3rd: 
-        default:         if (_cm_) delete _cm_;
-        break;
-    }
-
-    isSet = 0;
-}
-
-Cubit::oneof:: oneof (const Cubit::oneof &IT_s) {
-    isSet = 0;
-    memset(this, 0, sizeof(*this));
-    __d = IT_s.__d;
-    switch (__d) {
-        case Cubit::e_0th:         isSet = 1;
-        _o_ = IT_s._o_;
-        break;
-        case Cubit::e_1st:         isSet = 1;
-        _s_ = IT_s._s_;
-        break;
-        case Cubit::e_2nd:         isSet = 1;
-        _l_ = IT_s._l_;
-        break;
-        case Cubit::e_3rd: 
-        default: 
-        if (!isSet) {
-            _cm_ = new Cubit::Many;
-            isSet = 1;
-        }
-        *(_cm_) = *(IT_s._cm_);
-        break;
-    }
-    isSet = 1;
-}
-
-Cubit::oneof& Cubit::oneof:: operator= (const Cubit::oneof & IT_s) {
-    if (this == &IT_s) return *this;
-    if (isSet && (__d != IT_s.__d))
-    {
-        this-> oneof::~oneof();
-        memset(this, 0, sizeof(*this));
-    }
-
-    __d = IT_s.__d;
-    switch (__d) {
-        case Cubit::e_0th:         isSet = 1;
-        _o_ = IT_s._o_;
-        break;
-        case Cubit::e_1st:         isSet = 1;
-        _s_ = IT_s._s_;
-        break;
-        case Cubit::e_2nd:         isSet = 1;
-        _l_ = IT_s._l_;
-        break;
-        case Cubit::e_3rd: 
-        default: 
-        if (!isSet) {
-            _cm_ = new Cubit::Many;
-            isSet = 1;
-        }
-        *(_cm_) = *(IT_s._cm_);
-        break;
-    }
-    isSet = 1;
-    return *this;
-}
-
-
-#endif
-
-void* CubitProxyFactoryClass::New (char *IT_OR, CORBA::Environment&) {
-        return  new class Cubit(IT_OR);}
-
-void* CubitProxyFactoryClass::New (ObjectReference *IT_OR, CORBA::Environment&) {
-        return  new class Cubit(IT_OR);}
-
-void* CubitProxyFactoryClass::New2 () {
-        return  new class Cubit((char*)0);}
-
-CORBA::Object* CubitProxyFactoryClass::NewObject (char *IT_OR, CORBA::Environment&) {
-        return  new class Cubit(IT_OR);}
-
-CORBA::Object* CubitProxyFactoryClass::NewObject (ObjectReference *IT_OR, CORBA::Environment&) {
-        return  new class Cubit(IT_OR);}
-
-CORBA::Object* CubitProxyFactoryClass::New2Object () {
-        return  new class Cubit((char*)0);}
-
-void* CubitProxyFactoryClass::IT_castUp (void *IT_p, char* IT_s, CORBA::Environment &IT_env) {
-      void *IT_l;
-      if (!CORBA::_interfaceCmp (IT_s,Cubit_IR, IT_env))
-         return IT_p;
-      else if (IT_l=CORBA::ObjectFactoryClass::IT_castUp((CORBA::Object*)((class Cubit*)IT_p),IT_s, IT_env))
-         return IT_l;
-      else return NULL;
-    }
-
-
-CORBA::PPTR* CubitProxyFactoryClass::pptr (void *IT_p) {
-       return ((class Cubit*)IT_p)->_pptr ();}
-
-void CubitProxyFactoryClass::baseInterfaces (_IDL_SEQUENCE_string& seq) {
-      add (seq, Cubit_IR);
-      CORBA::ObjectFactoryClass::baseInterfaces (seq);
-}
-
-CubitProxyFactoryClass CubitProxyFactory(1);
-
-CORBA::Octet Cubit:: cube_octet (CORBA::Octet o, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        return 0;
-    }
-    CORBA::Request IT_r (this, "cube_octet",IT_env,1,0);
-    if (!IT_r.isException (IT_env)) {
-
-        IT_r.insertOctet (o);
-    }
-
-    IT_r.invoke (CORBA::Flags(0),IT_env);
-    if (!IT_r.isException (IT_env)) {
-        CORBA::Octet IT_result;
-        IT_r.extractOctet (IT_result);
-        IT_r.checkEnv (IT_env);
-        return IT_result;
-    }
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-    return 0;
-}
-
-CORBA::Short Cubit:: cube_short (CORBA::Short s, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        return 0;
-    }
-    CORBA::Request IT_r (this, "cube_short",IT_env,1,0);
-    if (!IT_r.isException (IT_env)) {
-
-        IT_r << s;
-    }
-
-    IT_r.invoke (CORBA::Flags(0),IT_env);
-    if (!IT_r.isException (IT_env)) {
-        CORBA::Short IT_result;
-        IT_r >> IT_result;
-        IT_r.checkEnv (IT_env);
-        return IT_result;
-    }
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-    return 0;
-}
-
-CORBA::Long Cubit:: cube_long (CORBA::Long l, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        return 0;
-    }
-    CORBA::Request IT_r (this, "cube_long",IT_env,1,0);
-    if (!IT_r.isException (IT_env)) {
-
-        IT_r << l;
-    }
-
-    IT_r.invoke (CORBA::Flags(0),IT_env);
-    if (!IT_r.isException (IT_env)) {
-        CORBA::Long IT_result;
-        IT_r >> IT_result;
-        IT_r.checkEnv (IT_env);
-        return IT_result;
-    }
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-    return 0;
-}
-
-Cubit::Many Cubit:: cube_struct (const Cubit::Many& values, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        { 
-            Cubit::Many IT_l0;
-            return IT_l0;
-        }
-    }
-    CORBA::Request IT_r (this, "cube_struct",IT_env,1,0);
-    if (!IT_r.isException (IT_env)) {
-
-        values.encodeOp (IT_r);
-    }
-
-    IT_r.invoke (CORBA::Flags(0),IT_env);
-    if (!IT_r.isException (IT_env)) {
-        Cubit::Many IT_result;
-        IT_result.decodeOp (IT_r);
-        IT_r.checkEnv (IT_env);
-        return IT_result;
-    }
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-    { 
-        Cubit::Many IT_l1;
-        return IT_l1;
-    }
-}
-
-Cubit::oneof Cubit:: cube_union (const Cubit::oneof& values, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        { 
-            Cubit::oneof IT_l0;
-            return IT_l0;
-        }
-    }
-    CORBA::Request IT_r (this, "cube_union",IT_env,1,0);
-    if (!IT_r.isException (IT_env)) {
-
-        values.encodeOp (IT_r);
-    }
-
-    IT_r.invoke (CORBA::Flags(0),IT_env);
-    if (!IT_r.isException (IT_env)) {
-        Cubit::oneof IT_result;
-        IT_result.decodeOp (IT_r);
-        IT_r.checkEnv (IT_env);
-        return IT_result;
-    }
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-    { 
-        Cubit::oneof IT_l1;
-        return IT_l1;
-    }
-}
-
-void Cubit:: please_exit (CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        return ;
-    }
-    CORBA::Request IT_r (this, "please_exit",IT_env,1,1);
-
-    IT_r.invoke (CORBA::Flags(CORBA::INV_NO_RESPONSE), IT_env);
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-}
-
-
-
-
-
-#ifndef Cubit_dispatch_impl
-
-unsigned char Cubit_dispatch::dispatch (CORBA::Request &IT_r, 
-    unsigned char, void *) {
-      IT_r.makeRuntimeException1 ("Cubit");
-      return 0;
-}
- 
-#endif
-
-Cubit_Factory::Cubit_Factory (char *IT_OR) {
-      m_pptr = new Cubit_Factory_dispatch (IT_OR, this,(CORBA::Object*)this);
-} 
-Cubit_Factory::Cubit_Factory (ObjectReference *IT_OR) {
-      m_pptr = new Cubit_Factory_dispatch (IT_OR, this,(CORBA::Object*)this);
-} 
-
-#ifndef Cubit_FactoryForwC
-#define Cubit_FactoryForwC
-CORBA::ObjectRef Cubit_Factory_getBase(void *IT_p){
-    return (Cubit_Factory*) IT_p;}
-
-void Cubit_Factory_release (Cubit_Factory_ptr IT_p, CORBA::Environment &IT_env) {
-    CORBA::release(IT_p, IT_env);}
-
-void Cubit_Factory_release (Cubit_Factory_ptr IT_p) {
-    Cubit_Factory_release (IT_p, CORBA::IT_chooseDefaultEnv ()); }
-
-Cubit_Factory_ptr Cubit_Factory_nil (CORBA::Environment &) {
-    return Cubit_Factory:: _nil ();}
-
-Cubit_Factory_ptr Cubit_Factory_nil () {
-    return Cubit_Factory_nil (CORBA::IT_chooseDefaultEnv ());}
-
-Cubit_Factory_ptr Cubit_Factory_duplicate (Cubit_Factory_ptr IT_p, CORBA::Environment &IT_env) {
-    return (Cubit_Factory::_duplicate(IT_p, IT_env)); }
-Cubit_Factory_ptr Cubit_Factory_duplicate (Cubit_Factory_ptr IT_p) {
-    return Cubit_Factory_duplicate (IT_p, CORBA::IT_chooseDefaultEnv ()); }
-#endif
-
-Cubit_Factory_ptr Cubit_Factory::_duplicate(Cubit_Factory_ptr obj, CORBA::Environment& IT_pEnv) {
-        CORBA::EnvExcRaiser IT_raise;
-        CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-       if (!obj) {
-          return (obj);
-       }
-       Cubit_Factory_ptr IT_obj = obj->__duplicate (IT_env);
-       return IT_obj;
-}
-
-
-
-Cubit_Factory* Cubit_Factory:: _bind (const char* IT_markerServer, const char* host,
-		const CORBA::Context &IT_c, 
-		CORBA::Environment &IT_env) {
-       return (Cubit_Factory*)CORBA::Factory.New (IT_markerServer, IT_env, IT_c, host, 
-		Cubit_Factory_IMPL, Cubit_Factory_IR);
-}
-
-
-
-Cubit_Factory* Cubit_Factory:: _bind (CORBA::Environment &IT_env) {
-       return _bind (NULL,NULL,CORBA::Context(), IT_env); }
-
-
-Cubit_Factory* Cubit_Factory:: _bind (const char* IT_markerServer, const char* host,
-                CORBA::Environment &IT_env) {
-       return _bind (IT_markerServer, host, CORBA::Context (), IT_env); }
-Cubit_Factory* Cubit_Factory::_narrow (CORBA::Object* IT_obj, CORBA::Environment &IT_pEnv) {
-        CORBA::EnvExcRaiser IT_raise;
-        CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-        if (CORBA::is_nil (IT_obj)) {
-                return Cubit_Factory:: _nil();
-        }
-
-       Cubit_Factory* IT_p = (Cubit_Factory*)CORBA::Object::_castDown (IT_obj, Cubit_Factory_IR, IT_env);
-        IT_p = IT_p ? IT_p->__duplicate(IT_env) : NULL;
-        if ((IT_env) &&(!strcmp(IT_env.exception()->id(), "CORBA::StExcep::BAD_PARAM")) && (((CORBA::BAD_PARAM*)IT_env.exception())-> minor() == NARROW_FAILED)) {
-                IT_env.exception_free();
-        }
-        return IT_p;
-   }
-
-void* Cubit_FactoryProxyFactoryClass::New (char *IT_OR, CORBA::Environment&) {
-        return  new class Cubit_Factory(IT_OR);}
-
-void* Cubit_FactoryProxyFactoryClass::New (ObjectReference *IT_OR, CORBA::Environment&) {
-        return  new class Cubit_Factory(IT_OR);}
-
-void* Cubit_FactoryProxyFactoryClass::New2 () {
-        return  new class Cubit_Factory((char*)0);}
-
-CORBA::Object* Cubit_FactoryProxyFactoryClass::NewObject (char *IT_OR, CORBA::Environment&) {
-        return  new class Cubit_Factory(IT_OR);}
-
-CORBA::Object* Cubit_FactoryProxyFactoryClass::NewObject (ObjectReference *IT_OR, CORBA::Environment&) {
-        return  new class Cubit_Factory(IT_OR);}
-
-CORBA::Object* Cubit_FactoryProxyFactoryClass::New2Object () {
-        return  new class Cubit_Factory((char*)0);}
-
-void* Cubit_FactoryProxyFactoryClass::IT_castUp (void *IT_p, char* IT_s, CORBA::Environment &IT_env) {
-      void *IT_l;
-      if (!CORBA::_interfaceCmp (IT_s,Cubit_Factory_IR, IT_env))
-         return IT_p;
-      else if (IT_l=CORBA::ObjectFactoryClass::IT_castUp((CORBA::Object*)((class Cubit_Factory*)IT_p),IT_s, IT_env))
-         return IT_l;
-      else return NULL;
-    }
-
-
-CORBA::PPTR* Cubit_FactoryProxyFactoryClass::pptr (void *IT_p) {
-       return ((class Cubit_Factory*)IT_p)->_pptr ();}
-
-void Cubit_FactoryProxyFactoryClass::baseInterfaces (_IDL_SEQUENCE_string& seq) {
-      add (seq, Cubit_Factory_IR);
-      CORBA::ObjectFactoryClass::baseInterfaces (seq);
-}
-
-Cubit_FactoryProxyFactoryClass Cubit_FactoryProxyFactory(1);
-
-Cubit_ptr Cubit_Factory:: create_cubit (const char * name, CORBA::Environment &IT_pEnv) throw (CORBA::SystemException) {
-
-    CORBA::EnvExcRaiser IT_raise;
-    CORBA::Environment &IT_env = IT_raise.registerEnv (&IT_pEnv);
-    if (IT_env || m_isNull) {
-        return new Cubit;
-    }
-    CORBA::Request IT_r (this, "create_cubit",IT_env,1,0);
-    if (!IT_r.isException (IT_env)) {
-
-        IT_r.encodeStringOp (name);
-    }
-
-    IT_r.invoke (CORBA::Flags(0),IT_env);
-    if (!IT_r.isException (IT_env)) {
-        Cubit_ptr IT_result;
-        IT_result = (Cubit*) IT_r.decodeObjRef (Cubit_IR);
-        IT_r.checkEnv (IT_env);
-        return IT_result;
-    }
-    if (IT_r.exceptionKind () == CORBA::SYSTEM_EXCEPTION) {
-        IT_r.checkEnv (IT_env);
-    }
-    return new Cubit;
-}
-
-
-
-
-
-#ifndef Cubit_Factory_dispatch_impl
-
-unsigned char Cubit_Factory_dispatch::dispatch (CORBA::Request &IT_r, 
-    unsigned char, void *) {
-      IT_r.makeRuntimeException1 ("Cubit_Factory");
-      return 0;
-}
- 
-#endif
-
diff --git a/TAO/tests/Cubit/Orbix/tps/cubitS.cpp b/TAO/tests/Cubit/Orbix/tps/cubitS.cpp
deleted file mode 100644
index a2898e12914..00000000000
--- a/TAO/tests/Cubit/Orbix/tps/cubitS.cpp
+++ /dev/null
@@ -1,282 +0,0 @@
-
-
-#include "cubit.h"
-
-
-#define Cubit_dispatch_impl
-
-unsigned char Cubit_dispatch::dispatch (CORBA::Request &IT_r, 
- unsigned char IT_isTarget, void *IT_pp) {
-    if (!IT_pp)
-       IT_pp = m_obj;
-    const char *IT_s = IT_r.getOperation ();
-    if (!strcmp(IT_s,"cube_octet")) {
-        CORBA::Octet IT_result;
-        CORBA::Environment IT_env (IT_r);
-        CORBA::Filter* IT_f = CORBA::Orbix.getFilter ();
-        if (!IT_r.tcAssert ("\
-Ro~cube_octet~+o{o},>{o},N{}\
-"))
-            return 1;
-        CORBA::Octet o;
-
-        IT_r.extractOctet (o);
-
-        if (IT_f && !IT_r.isException (IT_env))
-        	IT_f->inRequestPostM (IT_r, IT_env);
-        if (!IT_r.isException (IT_env)) {
-            try {
-                	IT_result = ((Cubit*)IT_pp)->cube_octet (  o, IT_env);
-
-            } catch (CORBA::SystemException &IT_exSys) {
-            IT_env.propagate (&IT_exSys);
-            } catch (CORBA::UserException &IT_exUsr) {
-            IT_env.propagate (&IT_exUsr);
-            }
-        }
-
-        if (!IT_r.isException (IT_env)) {
-            if (!IT_r.convertToReply ("\
-o\
-", IT_env)) return 1;
-            IT_r.insertOctet (IT_result);
-            }
-
-        else IT_r.makeSystemException (IT_env);
-        return 1;
-    }
-
-    if (!strcmp(IT_s,"cube_short")) {
-        CORBA::Short IT_result;
-        CORBA::Environment IT_env (IT_r);
-        CORBA::Filter* IT_f = CORBA::Orbix.getFilter ();
-        if (!IT_r.tcAssert ("\
-Ro~cube_short~+s{s},>{s},N{}\
-"))
-            return 1;
-        CORBA::Short s;
-
-        IT_r >> s;
-
-        if (IT_f && !IT_r.isException (IT_env))
-        	IT_f->inRequestPostM (IT_r, IT_env);
-        if (!IT_r.isException (IT_env)) {
-            try {
-                	IT_result = ((Cubit*)IT_pp)->cube_short (  s, IT_env);
-
-            } catch (CORBA::SystemException &IT_exSys) {
-            IT_env.propagate (&IT_exSys);
-            } catch (CORBA::UserException &IT_exUsr) {
-            IT_env.propagate (&IT_exUsr);
-            }
-        }
-
-        if (!IT_r.isException (IT_env)) {
-            if (!IT_r.convertToReply ("\
-s\
-", IT_env)) return 1;
-            IT_r << IT_result;
-            }
-
-        else IT_r.makeSystemException (IT_env);
-        return 1;
-    }
-
-    if (!strcmp(IT_s,"cube_long")) {
-        CORBA::Long IT_result;
-        CORBA::Environment IT_env (IT_r);
-        CORBA::Filter* IT_f = CORBA::Orbix.getFilter ();
-        if (!IT_r.tcAssert ("\
-Ro~cube_long~+l{l},>{l},N{}\
-"))
-            return 1;
-        CORBA::Long l;
-
-        IT_r >> l;
-
-        if (IT_f && !IT_r.isException (IT_env))
-        	IT_f->inRequestPostM (IT_r, IT_env);
-        if (!IT_r.isException (IT_env)) {
-            try {
-                	IT_result = ((Cubit*)IT_pp)->cube_long (  l, IT_env);
-
-            } catch (CORBA::SystemException &IT_exSys) {
-            IT_env.propagate (&IT_exSys);
-            } catch (CORBA::UserException &IT_exUsr) {
-            IT_env.propagate (&IT_exUsr);
-            }
-        }
-
-        if (!IT_r.isException (IT_env)) {
-            if (!IT_r.convertToReply ("\
-l\
-", IT_env)) return 1;
-            IT_r << IT_result;
-            }
-
-        else IT_r.makeSystemException (IT_env);
-        return 1;
-    }
-
-    if (!strcmp(IT_s,"cube_struct")) {
-        Cubit::Many IT_result;
-        CORBA::Environment IT_env (IT_r);
-        CORBA::Filter* IT_f = CORBA::Orbix.getFilter ();
-        if (!IT_r.tcAssert ("\
-Ro~cube_struct~+values{R~Cubit::Many~o{o},l{l},s{s}},>{R~Cubit::Many~o{o},l{l},s{s}},N{}\
-"))
-            return 1;
-        Cubit::Many values;
-
-        values.decodeOp (IT_r);
-
-        if (IT_f && !IT_r.isException (IT_env))
-        	IT_f->inRequestPostM (IT_r, IT_env);
-        if (!IT_r.isException (IT_env)) {
-            try {
-                	IT_result = ((Cubit*)IT_pp)->cube_struct (  values, IT_env);
-
-            } catch (CORBA::SystemException &IT_exSys) {
-            IT_env.propagate (&IT_exSys);
-            } catch (CORBA::UserException &IT_exUsr) {
-            IT_env.propagate (&IT_exUsr);
-            }
-        }
-
-        if (!IT_r.isException (IT_env)) {
-            if (!IT_r.convertToReply ("\
-R~Cubit::Many~o{o},l{l},s{s}\
-", IT_env)) return 1;
-            IT_result.encodeOp (IT_r);
-            }
-
-        else IT_r.makeSystemException (IT_env);
-        return 1;
-    }
-
-    if (!strcmp(IT_s,"cube_union")) {
-        Cubit::oneof IT_result;
-        CORBA::Environment IT_env (IT_r);
-        CORBA::Filter* IT_f = CORBA::Orbix.getFilter ();
-        IT_r.tcPreAssert (
-"\
-Ro~cube_union~+values{U~Cubit::oneof~{E~Cubit::discrim~e_0th,e_1st,e_2nd,e_3rd,e_4th,e_5th}~Cubit::e_0th o{o};Cubit::e_1st s{s};Cubit::e_2nd l{l};Cubit::e_3rd,$ cm{R~Cubit::Many~o{o},l{l},s{s}}},>{U~Cubit::oneof~{E~Cubit::discrim~e_0th,e_1st,e_2nd,e_3rd,\
-");
-        if (!IT_r.tcAssert ("\
-e_4th,e_5th}~Cubit::e_0th o{o};Cubit::e_1st s{s};Cubit::e_2nd l{l};Cubit::e_3rd,$ cm{R~Cubit::Many~o{o},l{l},s{s}}},N{}\
-"))
-            return 1;
-        Cubit::oneof values;
-
-        values.decodeOp (IT_r);
-
-        if (IT_f && !IT_r.isException (IT_env))
-        	IT_f->inRequestPostM (IT_r, IT_env);
-        if (!IT_r.isException (IT_env)) {
-            try {
-                	IT_result = ((Cubit*)IT_pp)->cube_union (  values, IT_env);
-
-            } catch (CORBA::SystemException &IT_exSys) {
-            IT_env.propagate (&IT_exSys);
-            } catch (CORBA::UserException &IT_exUsr) {
-            IT_env.propagate (&IT_exUsr);
-            }
-        }
-
-        if (!IT_r.isException (IT_env)) {
-            if (!IT_r.convertToReply ("\
-U~Cubit::oneof~{E~Cubit::discrim~e_0th,e_1st,e_2nd,e_3rd,e_4th,e_5th}~Cubit::e_0th o{o};Cubit::e_1st s{s};Cubit::e_2nd l{l};Cubit::e_3rd,$ cm{R~Cubit::Many~o{o},l{l},s{s}}\
-", IT_env)) return 1;
-            IT_result.encodeOp (IT_r);
-            }
-
-        else IT_r.makeSystemException (IT_env);
-        return 1;
-    }
-
-    if (!strcmp(IT_s,"please_exit")) {
-        CORBA::Environment IT_env (IT_r);
-        CORBA::Filter* IT_f = CORBA::Orbix.getFilter ();
-        if (!IT_r.tcAssert ("\
-Ro~please_exit~>{v},O{}\
-"))
-            return 1;
-
-        if (IT_f && !IT_r.isException (IT_env))
-        	IT_f->inRequestPostM (IT_r, IT_env);
-        if (!IT_r.isException (IT_env)) {
-            try {
-                ((Cubit*)IT_pp)->please_exit (IT_env);
-
-            } catch (CORBA::SystemException &IT_exSys) {
-            IT_env.propagate (&IT_exSys);
-            } catch (CORBA::UserException &IT_exUsr) {
-            IT_env.propagate (&IT_exUsr);
-            }
-        }
-        IT_r.replyNoResults (CORBA::Flags(CORBA::INV_NO_RESPONSE),IT_env);
-        return 1;
-    }
-
-    if (IT_isTarget)
-        IT_r.makeRuntimeException2 ();
-
-    return 0;
-}
-
-#define Cubit_Factory_dispatch_impl
-
-unsigned char Cubit_Factory_dispatch::dispatch (CORBA::Request &IT_r, 
- unsigned char IT_isTarget, void *IT_pp) {
-    if (!IT_pp)
-       IT_pp = m_obj;
-    const char *IT_s = IT_r.getOperation ();
-    if (!strcmp(IT_s,"create_cubit")) {
-        Cubit_ptr IT_result;
-        CORBA::Environment IT_env (IT_r);
-        CORBA::Filter* IT_f = CORBA::Orbix.getFilter ();
-        if (!IT_r.tcAssert ("\
-Ro~create_cubit~+name{0},>{O~Cubit},N{}\
-"))
-            return 1;
-        char * name;
-
-        IT_r.decodeStringOp(name);
-
-        if (IT_f && !IT_r.isException (IT_env))
-        	IT_f->inRequestPostM (IT_r, IT_env);
-        if (!IT_r.isException (IT_env)) {
-            try {
-                	IT_result = ((Cubit_Factory*)IT_pp)->create_cubit (  name, IT_env);
-
-            } catch (CORBA::SystemException &IT_exSys) {
-            IT_env.propagate (&IT_exSys);
-            } catch (CORBA::UserException &IT_exUsr) {
-            IT_env.propagate (&IT_exUsr);
-            }
-        }
-        CORBA::string_free (name);
-
-        if (!IT_r.isException (IT_env)) {
-            if (!IT_r.convertToReply ("\
-O~Cubit\
-", IT_env)) return 1;
-            {
-                CORBA::Object* IT_l1 = (CORBA::Object*) IT_result;
-                IT_r << IT_l1;
-            }
-            if (IT_result) Cubit_release (IT_result);
-            }
-
-        else IT_r.makeSystemException (IT_env);
-        return 1;
-    }
-
-    if (IT_isTarget)
-        IT_r.makeRuntimeException2 ();
-
-    return 0;
-}
-
-#include "cubitC.cpp"
-
diff --git a/TAO/tests/Cubit/Orbix/tps/cubit_impl.cpp b/TAO/tests/Cubit/Orbix/tps/cubit_impl.cpp
deleted file mode 100644
index 27ee125e4df..00000000000
--- a/TAO/tests/Cubit/Orbix/tps/cubit_impl.cpp
+++ /dev/null
@@ -1,81 +0,0 @@
-#include "cubit_impl.h"
-
-CORBA::Octet Cubit_Impl:: cube_octet (CORBA::Octet o, CORBA::Environment &) throw (CORBA::SystemException) {
-  return (CORBA::Octet) (o * o * o); 
-}
-
-CORBA::Short Cubit_Impl:: cube_short (CORBA::Short s, CORBA::Environment &) throw (CORBA::SystemException) {
-  return (CORBA::Short) (s * s * s);
-}
-
-CORBA::Long Cubit_Impl:: cube_long (CORBA::Long l, CORBA::Environment &) throw (CORBA::SystemException) {
-   return (CORBA::Long) (l * l * l);
-}
-
-Cubit::Many Cubit_Impl:: cube_struct (const Cubit::Many& values, CORBA::Environment &) throw (CORBA::SystemException) {
-  Cubit::Many out_values;
-  out_values.o = values.o * values.o * values.o;
-  out_values.s = values.s * values.s * values.s;
-  out_values.l = values.l * values.l * values.l;
-  return out_values; 
-}
-
-Cubit::oneof Cubit_Impl:: cube_union (const Cubit::oneof& values, CORBA::Environment &) throw (CORBA::SystemException) {
-  Cubit::oneof out_values;
-   switch (values._d ()) {
-   case Cubit::e_0th:
-     out_values.o (values.o () * values.o ()  * values.o ());
-     break;
-   case Cubit::e_1st:
-     out_values.s (values.s () * values.s () * values.s ());
-     break;
-   case Cubit::e_2nd:
-     out_values.l (values.l () * values.l () * values.l ());
-     break;
-   case Cubit::e_3rd:
-   default:
-     out_values.cm ().o = values.cm ().o * values.cm ().o * values.cm ().o ;
-     out_values.cm ().s = values.cm ().s * values.cm ().s * values.cm ().s ;
-     out_values.cm ().l = values.cm ().l * values.cm ().l * values.cm ().l ;
-     break;
-   }
-   return out_values;  
-}
-
-void Cubit_Impl:: please_exit (CORBA::Environment &) throw (CORBA::SystemException) {
-}
-
-Cubit_ptr Cubit_Factory_Impl:: create_cubit (const char * name, CORBA::Environment &) throw (CORBA::SystemException) {
-  cerr << "Creating Cubit for " << name << endl;
-
-#ifdef Cubit_USE_BOA
-  Cubit_Impl_Task *cubit = new Cubit_Impl_Task ();
-#else
-  Cubit_Impl_Task *cubit = new TIE_Cubit (Cubit_Impl) (new Cubit_Impl_Task);
-#endif
-  Cubit::_duplicate ((Cubit *)cubit);
-  cubit->activate (1);
-  return (Cubit *) cubit;
-}
-
-int
-Cubit_Impl_Task::svc (void) 
-{
-  while (1) 
-    {
-      // Dequeue message
-      ACE_Message_Block *mb;
-      this->msg_queue ()->dequeue_head (mb);
-      CORBA::Request *vp = (CORBA::Request *) mb->base ();
-      mb->release ();
-      // Hand it off to Orbix
-      CORBA::Orbix.continueThreadDispatch (*vp);
-    }
-  return 0;
-}
-
-void *
-Cubit_Impl_Task::_deref (void) 
-{
-  return this;
-}
diff --git a/TAO/tests/Cubit/Orbix/tps/cubit_impl.h b/TAO/tests/Cubit/Orbix/tps/cubit_impl.h
deleted file mode 100644
index 31a8874f07b..00000000000
--- a/TAO/tests/Cubit/Orbix/tps/cubit_impl.h
+++ /dev/null
@@ -1,46 +0,0 @@
-
-#ifndef cubit_ih
-#define cubit_ih
-
-#include "cubit.h"
-#include "ace/Task.h"
-
-#ifdef Cubit_USE_BOA
-class Cubit_Impl : public virtual CubitBOAImpl {
-#else
-class Cubit_Impl {
-#endif /* Cubit_USE_BOA */
-public:
-  virtual CORBA::Octet cube_octet (CORBA::Octet o, CORBA::Environment &IT_env=CORBA::default_environment) throw (CORBA::SystemException);
-  virtual CORBA::Short cube_short (CORBA::Short s, CORBA::Environment &IT_env=CORBA::default_environment) throw (CORBA::SystemException);
-  virtual CORBA::Long cube_long (CORBA::Long l, CORBA::Environment &IT_env=CORBA::default_environment) throw (CORBA::SystemException);
-  virtual Cubit::Many cube_struct (const Cubit::Many& values, CORBA::Environment &IT_env=CORBA::default_environment) throw (CORBA::SystemException);
-  virtual Cubit::oneof cube_union (const Cubit::oneof& values, CORBA::Environment &IT_env=CORBA::default_environment) throw (CORBA::SystemException);
-  virtual void please_exit (CORBA::Environment &IT_env=CORBA::default_environment) throw (CORBA::SystemException);
-
-};
-
-#ifdef Cubit_USE_BOA
-class Cubit_Factory_Impl : public virtual Cubit_FactoryBOAImpl {
-#else
-class Cubit_Factory_Impl {
-#endif
-
-public:
-        virtual Cubit_ptr create_cubit (const char * name, CORBA::Environment &IT_env=CORBA::default_environment) throw (CORBA::SystemException);
-};
-
-class Cubit_Impl_Task : public virtual Cubit_Impl, public virtual ACE_Task<ACE_MT_SYNCH> {
-public:
-  // For ACE_Task
-  int svc (void);
-  // for narrowing
-  virtual void *_deref ();
-};
-
-#ifndef Cubit_USE_BOA
-DEF_TIE_Cubit (Cubit_Impl)
-DEF_TIE_Cubit_Factory (Cubit_Factory_Impl)
-#endif /* Cubit_USE_BOA */
-
-#endif
diff --git a/TAO/tests/Cubit/Orbix/tps/tps.cpp b/TAO/tests/Cubit/Orbix/tps/tps.cpp
deleted file mode 100644
index 1035f1e503f..00000000000
--- a/TAO/tests/Cubit/Orbix/tps/tps.cpp
+++ /dev/null
@@ -1,26 +0,0 @@
-#include "tps.h"
-
-int
-TPS_Filter::inRequestPreMarshal(CORBA::Request &r,  CORBA::Environment& env)
-{
-  // Get target
-  CORBA::Object_ptr obj = r.target ();
-  Cubit * cb = Cubit::_narrow (obj, env);
-
-  if (env) // Not for our object!!
-    return 1; // continue in the same thread
-  
-  // Enqueue the request
-  Cubit_Impl_Task *ct;
-  if (CORBA::is_nil (cb))
-      return 1;
-  ct = (Cubit_Impl_Task *) DEREF(cb);
-  if (ct) {
-    ACE_Message_Block *mb = new ACE_Message_Block ( (char *) (&r));
-    ct->msg_queue ()->enqueue (mb);
-  }
-  // Done
-  return -1;
-}
-
-TPS_Filter tps_filter;
diff --git a/TAO/tests/Cubit/Orbix/tps/tps.h b/TAO/tests/Cubit/Orbix/tps/tps.h
deleted file mode 100644
index 272bc90f20d..00000000000
--- a/TAO/tests/Cubit/Orbix/tps/tps.h
+++ /dev/null
@@ -1,11 +0,0 @@
-#include "cubit.h"
-#include "cubit_impl.h"
-#include "ace/Service_Config.h"
-#include "ace/Thread_Manager.h"
-#include "ace/Task.h"
-
-class TPS_Filter : public ACE_Task<ACE_MT_SYNCH>, public CORBA::ThreadFilter
-{
-public:
-  virtual int inRequestPreMarshal(CORBA::Request &, CORBA::Environment&);
-};
diff --git a/TAO/tests/Cubit/README b/TAO/tests/Cubit/README
deleted file mode 100644
index 6f20322a2ed..00000000000
--- a/TAO/tests/Cubit/README
+++ /dev/null
@@ -1,4 +0,0 @@
-This is the example from the SunSoft's IIOP 1.4 distribution modified
-to work with TAO, Orbix, and VisiBroker.
-
-Benchmarking results are under results and tnf directories.
diff --git a/TAO/tests/Cubit/TAO/DII_Cubit/DII_Cubit.dsw b/TAO/tests/Cubit/TAO/DII_Cubit/DII_Cubit.dsw
deleted file mode 100644
index f6006d20cb7..00000000000
--- a/TAO/tests/Cubit/TAO/DII_Cubit/DII_Cubit.dsw
+++ /dev/null
@@ -1,41 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 5.00

-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!

-

-###############################################################################

-

-Project: "client"=.\client.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "server"=.\server.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Global:

-

-Package=<5>

-{{{

-}}}

-

-Package=<3>

-{{{

-}}}

-

-###############################################################################

-

diff --git a/TAO/tests/Cubit/TAO/DII_Cubit/Makefile b/TAO/tests/Cubit/TAO/DII_Cubit/Makefile
deleted file mode 100644
index 114256ddd39..00000000000
--- a/TAO/tests/Cubit/TAO/DII_Cubit/Makefile
+++ /dev/null
@@ -1,1218 +0,0 @@
-#----------------------------------------------------------------------------
-#	$Id$
-#
-#	Top-level Makefile for the ACE-ified Sun Ref. implementation
-#	of IIOP ORB
-#----------------------------------------------------------------------------
-
-#----------------------------------------------------------------------------
-#	Local macros
-#----------------------------------------------------------------------------
-
-LDLIBS     =  -lTAO
-
-PROG_SRCS =	svr.cpp clnt.cpp cubit.cpp \
-		test1.cpp test1_clnt.cpp test1_svr.cpp \
-		echo_clnt.cpp echo_svr.cpp
-
-LSRC = $(PROG_SRCS)
-
-CUBIT_SVR_OBJS = svr.o cubit_i.o cubitS.o
-CUBIT_CLT_OBJS = clnt.o cubitC.o
-
-BASIC_SVR_OBJS = test1.o test1_svr.o
-BASIC_CLT_OBJS = test1.o test1_clnt.o
-
-ECHO_SVR_OBJS = test1.o echo_svr.o
-ECHO_CLT_OBJS = test1.o echo_clnt.o
-
-BIN = svr clnt
-BUILD = $(BIN)
-VLDLIBS = $(LDLIBS:%=%$(VAR))
-VBIN = $(BIN:%=%$(VAR))
-
-#----------------------------------------------------------------------------
-#	Include macros and targets
-#----------------------------------------------------------------------------
-
-include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-include $(ACE_ROOT)/include/makeinclude/macros.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
-#include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
-
-# Local modifications to variables imported by includes above.
-#LDFLAGS    += -L../../../proto/lib
-#CPPFLAGS   += -I../../../proto/include -DUSE_ACE_EVENT_HANDLING -DDEBUG
-ifndef TAO_ROOT
-TAO_ROOT = $(ACE_ROOT)/TAO
-endif
-TSS_ORB_FLAG = #-DTAO_HAS_TSS_ORBCORE
-DCFLAGS = -g
-OCFLAGS = 
-LDFLAGS += -L$(TAO_ROOT)/tao
-CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/tao/compat $(TSS_ORB_FLAG)#-H
-
-svr:	$(addprefix $(VDIR),$(CUBIT_SVR_OBJS))
-	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS)
-
-clnt:	$(addprefix $(VDIR),$(CUBIT_CLT_OBJS))
-	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS)
-
-test1_svr:	$(addprefix $(VDIR),$(BASIC_SVR_OBJS))
-	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS)
-
-test1_clnt:	$(addprefix $(VDIR),$(BASIC_CLT_OBJS))
-	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS)
-
-########
-# Sanity check builds by running basic functionality tests.
-#
-# "sleep 5" in the server startup is usually enough to get the
-# objref into the file so the client can read it.
-#
-check:	$(TESTS)
-	@echo "testing with 'cube' calls, stub + DII, IOR strings"
-	@./svr -i30 -o non-internet > obj.1 & sleep 5
-	@./clnt -n250 -O `cat obj.1` -x
-	@echo ''
-	@echo "testing request forwarding with 'cube' calls, stub + DII"
-	@./svr -f -i30 > obj.2 & sleep 5
-	@./clnt -n250 -O `cat obj.2` -x
-	@echo ''
-	@echo "testing transmission of primitive data types"
-	@./test1_svr -i30 > obj.3 & sleep 5
-	@./test1_clnt -n50 -O `cat obj.3` -x
-	@echo ''
-#	@echo "testing echo of primitive data values"
-#	@./echo_svr -i30 > obj.4 & sleep 5
-#	@./echo_clnt -O `cat obj.4` -x
-#	@echo ''
-	@echo "testing with 'cube' calls, MT-ized (no forwarding)"
-	@./svr -t -i30 -o non-internet > obj.5 & sleep 5
-	@./clnt -n250 -O `cat obj.5` -x
-	@echo ''
-
-ifdef LOCALRULES
-########
-# CUBIT test
-svr:		svr.o cubit.o
-	$(LINK.cc) -o svr svr.o cubit.o $(LDLIBS)
-clnt:		cubit.o clnt.o
-	$(LINK.cc) -o clnt clnt.o cubit.o $(LDLIBS)
-
-########
-# BASIC DATATYPES test
-test1_clnt:	test1.o test1_clnt.o
-	$(LINK.cc) -o test1_clnt test1_clnt.o test1.o $(LDLIBS)
-test1_svr:	test1.o test1_svr.o
-	$(LINK.cc) -o test1_svr test1_svr.o test1.o $(LDLIBS)
-
-########
-# ECHO test ... "test1" where the operation semantics are violated;
-# this aids some porting work, but is a less rigorous test
-echo_clnt:	test1.o echo_clnt.o
-	$(LINK.cc) -o echo_clnt echo_clnt.o test1.o $(LDLIBS)
-echo_svr:	test1.o echo_svr.o
-	$(LINK.cc) -o echo_svr echo_svr.o test1.o $(LDLIBS)
-endif
-
-	-rm -rf *.o Log $(BIN) obj.* core Templates.DB .make.state
-
-	-@echo "Nothing to install, these are tests!"
-
-
-
-
-
-# DO NOT DELETE THIS LINE -- g++dep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-
-.obj/svr.o .shobj/svr.: svr.cpp $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/stdcpp.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Get_Opt.i \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.cpp \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers.cpp \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Strategies_T.cpp \
- $(ACE_ROOT)/ace/Service_Types.h \
- $(ACE_ROOT)/ace/Service_Types.i \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/Message_Queue.cpp \
- $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Map_Manager.cpp \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Task_T.i \
- $(ACE_ROOT)/ace/Task_T.cpp \
- $(ACE_ROOT)/ace/Module.h \
- $(ACE_ROOT)/ace/Module.i \
- $(ACE_ROOT)/ace/Module.cpp \
- $(ACE_ROOT)/ace/Stream_Modules.h \
- $(ACE_ROOT)/ace/Stream_Modules.i \
- $(ACE_ROOT)/ace/Stream_Modules.cpp \
- $(ACE_ROOT)/ace/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(TAO_ROOT)/tao/orbconf.h \
- $(TAO_ROOT)/tao/align.h \
- $(TAO_ROOT)/tao/corbacom.h \
- $(TAO_ROOT)/tao/sequence.h \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/any.h \
- $(TAO_ROOT)/tao/poa.h \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/client_factory.h \
- $(TAO_ROOT)/tao/server_factory.h \
- $(TAO_ROOT)/tao/default_client.h \
- $(TAO_ROOT)/tao/default_server.h \
- $(TAO_ROOT)/tao/except.h \
- $(TAO_ROOT)/tao/orbobj.h \
- $(TAO_ROOT)/tao/connect.h \
- $(TAO_ROOT)/tao/nvlist.h \
- $(TAO_ROOT)/tao/object.h \
- $(TAO_ROOT)/tao/principa.h \
- $(TAO_ROOT)/tao/request.h \
- $(TAO_ROOT)/tao/svrrqst.h \
- $(TAO_ROOT)/tao/typecode.h \
- $(TAO_ROOT)/tao/marshal.h \
- $(TAO_ROOT)/tao/cdr.h \
- $(TAO_ROOT)/tao/stub.h \
- $(TAO_ROOT)/tao/iiopobj.h \
- $(TAO_ROOT)/tao/iioporb.h \
- $(TAO_ROOT)/tao/giop.h \
- $(TAO_ROOT)/tao/orb_core.h \
- $(TAO_ROOT)/tao/objtable.h \
- $(TAO_ROOT)/tao/optable.h \
- $(TAO_ROOT)/tao/debug.h \
- $(TAO_ROOT)/tao/orb_core.i \
- $(TAO_ROOT)/tao/corbacom.i \
- $(TAO_ROOT)/tao/sequence.i \
- $(TAO_ROOT)/tao/typecode.i \
- $(TAO_ROOT)/tao/any.i \
- $(TAO_ROOT)/tao/cdr.i \
- $(TAO_ROOT)/tao/stub.i \
- $(TAO_ROOT)/tao/object.i \
- $(TAO_ROOT)/tao/orbobj.i \
- $(TAO_ROOT)/tao/marshal.i \
- $(TAO_ROOT)/tao/client_factory.i \
- $(TAO_ROOT)/tao/poa.i \
- $(TAO_ROOT)/tao/giop.i \
- $(TAO_ROOT)/tao/svrrqst.i \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/server_factory.i \
- $(TAO_ROOT)/tao/default_client.i \
- $(TAO_ROOT)/tao/default_server.i \
- $(TAO_ROOT)/tao/connect.i \
- $(TAO_ROOT)/tao/iioporb.i \
- $(TAO_ROOT)/tao/iiopobj.i \
- $(TAO_ROOT)/tao/singletons.h cubit_i.h cubitS.h \
- cubitC.h
-.obj/clnt.o .shobj/clnt.: clnt.cpp $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/stdcpp.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Get_Opt.i \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.cpp \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers.cpp \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Strategies_T.cpp \
- $(ACE_ROOT)/ace/Service_Types.h \
- $(ACE_ROOT)/ace/Service_Types.i \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/Message_Queue.cpp \
- $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Map_Manager.cpp \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Task_T.i \
- $(ACE_ROOT)/ace/Task_T.cpp \
- $(ACE_ROOT)/ace/Module.h \
- $(ACE_ROOT)/ace/Module.i \
- $(ACE_ROOT)/ace/Module.cpp \
- $(ACE_ROOT)/ace/Stream_Modules.h \
- $(ACE_ROOT)/ace/Stream_Modules.i \
- $(ACE_ROOT)/ace/Stream_Modules.cpp \
- $(ACE_ROOT)/ace/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(TAO_ROOT)/tao/orbconf.h \
- $(TAO_ROOT)/tao/align.h \
- $(TAO_ROOT)/tao/corbacom.h \
- $(TAO_ROOT)/tao/sequence.h \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/any.h \
- $(TAO_ROOT)/tao/poa.h \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/client_factory.h \
- $(TAO_ROOT)/tao/server_factory.h \
- $(TAO_ROOT)/tao/default_client.h \
- $(TAO_ROOT)/tao/default_server.h \
- $(TAO_ROOT)/tao/except.h \
- $(TAO_ROOT)/tao/orbobj.h \
- $(TAO_ROOT)/tao/connect.h \
- $(TAO_ROOT)/tao/nvlist.h \
- $(TAO_ROOT)/tao/object.h \
- $(TAO_ROOT)/tao/principa.h \
- $(TAO_ROOT)/tao/request.h \
- $(TAO_ROOT)/tao/svrrqst.h \
- $(TAO_ROOT)/tao/typecode.h \
- $(TAO_ROOT)/tao/marshal.h \
- $(TAO_ROOT)/tao/cdr.h \
- $(TAO_ROOT)/tao/stub.h \
- $(TAO_ROOT)/tao/iiopobj.h \
- $(TAO_ROOT)/tao/iioporb.h \
- $(TAO_ROOT)/tao/giop.h \
- $(TAO_ROOT)/tao/orb_core.h \
- $(TAO_ROOT)/tao/objtable.h \
- $(TAO_ROOT)/tao/optable.h \
- $(TAO_ROOT)/tao/debug.h \
- $(TAO_ROOT)/tao/orb_core.i \
- $(TAO_ROOT)/tao/corbacom.i \
- $(TAO_ROOT)/tao/sequence.i \
- $(TAO_ROOT)/tao/typecode.i \
- $(TAO_ROOT)/tao/any.i \
- $(TAO_ROOT)/tao/cdr.i \
- $(TAO_ROOT)/tao/stub.i \
- $(TAO_ROOT)/tao/object.i \
- $(TAO_ROOT)/tao/orbobj.i \
- $(TAO_ROOT)/tao/marshal.i \
- $(TAO_ROOT)/tao/client_factory.i \
- $(TAO_ROOT)/tao/poa.i \
- $(TAO_ROOT)/tao/giop.i \
- $(TAO_ROOT)/tao/svrrqst.i \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/server_factory.i \
- $(TAO_ROOT)/tao/default_client.i \
- $(TAO_ROOT)/tao/default_server.i \
- $(TAO_ROOT)/tao/connect.i \
- $(TAO_ROOT)/tao/iioporb.i \
- $(TAO_ROOT)/tao/iiopobj.i \
- $(TAO_ROOT)/tao/singletons.h cubitC.h
-.obj/cubit.o .shobj/cubit.: cubit.cpp cubit.h $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/stdcpp.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.cpp \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers.cpp \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Strategies_T.cpp \
- $(ACE_ROOT)/ace/Service_Types.h \
- $(ACE_ROOT)/ace/Service_Types.i \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/Message_Queue.cpp \
- $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Map_Manager.cpp \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Task_T.i \
- $(ACE_ROOT)/ace/Task_T.cpp \
- $(ACE_ROOT)/ace/Module.h \
- $(ACE_ROOT)/ace/Module.i \
- $(ACE_ROOT)/ace/Module.cpp \
- $(ACE_ROOT)/ace/Stream_Modules.h \
- $(ACE_ROOT)/ace/Stream_Modules.i \
- $(ACE_ROOT)/ace/Stream_Modules.cpp \
- $(ACE_ROOT)/ace/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(TAO_ROOT)/tao/orbconf.h \
- $(TAO_ROOT)/tao/align.h \
- $(TAO_ROOT)/tao/corbacom.h \
- $(TAO_ROOT)/tao/sequence.h \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/any.h \
- $(TAO_ROOT)/tao/poa.h \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/client_factory.h \
- $(TAO_ROOT)/tao/server_factory.h \
- $(TAO_ROOT)/tao/default_client.h \
- $(TAO_ROOT)/tao/default_server.h \
- $(TAO_ROOT)/tao/except.h \
- $(TAO_ROOT)/tao/orbobj.h \
- $(TAO_ROOT)/tao/connect.h \
- $(TAO_ROOT)/tao/nvlist.h \
- $(TAO_ROOT)/tao/object.h \
- $(TAO_ROOT)/tao/principa.h \
- $(TAO_ROOT)/tao/request.h \
- $(TAO_ROOT)/tao/svrrqst.h \
- $(TAO_ROOT)/tao/typecode.h \
- $(TAO_ROOT)/tao/marshal.h \
- $(TAO_ROOT)/tao/cdr.h \
- $(TAO_ROOT)/tao/stub.h \
- $(TAO_ROOT)/tao/iiopobj.h \
- $(TAO_ROOT)/tao/iioporb.h \
- $(TAO_ROOT)/tao/giop.h \
- $(TAO_ROOT)/tao/orb_core.h \
- $(TAO_ROOT)/tao/objtable.h \
- $(TAO_ROOT)/tao/optable.h \
- $(TAO_ROOT)/tao/debug.h \
- $(TAO_ROOT)/tao/orb_core.i \
- $(TAO_ROOT)/tao/corbacom.i \
- $(TAO_ROOT)/tao/sequence.i \
- $(TAO_ROOT)/tao/typecode.i \
- $(TAO_ROOT)/tao/any.i \
- $(TAO_ROOT)/tao/cdr.i \
- $(TAO_ROOT)/tao/stub.i \
- $(TAO_ROOT)/tao/object.i \
- $(TAO_ROOT)/tao/orbobj.i \
- $(TAO_ROOT)/tao/marshal.i \
- $(TAO_ROOT)/tao/client_factory.i \
- $(TAO_ROOT)/tao/poa.i \
- $(TAO_ROOT)/tao/giop.i \
- $(TAO_ROOT)/tao/svrrqst.i \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/server_factory.i \
- $(TAO_ROOT)/tao/default_client.i \
- $(TAO_ROOT)/tao/default_server.i \
- $(TAO_ROOT)/tao/connect.i \
- $(TAO_ROOT)/tao/iioporb.i \
- $(TAO_ROOT)/tao/iiopobj.i \
- $(TAO_ROOT)/tao/singletons.h
-.obj/test1.o .shobj/test1.: test1.cpp test1.h $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/stdcpp.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/Version.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.cpp \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers.cpp \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Strategies_T.cpp \
- $(ACE_ROOT)/ace/Service_Types.h \
- $(ACE_ROOT)/ace/Service_Types.i \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/Message_Queue.cpp \
- $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Map_Manager.cpp \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Task_T.i \
- $(ACE_ROOT)/ace/Task_T.cpp \
- $(ACE_ROOT)/ace/Module.h \
- $(ACE_ROOT)/ace/Module.i \
- $(ACE_ROOT)/ace/Module.cpp \
- $(ACE_ROOT)/ace/Stream_Modules.h \
- $(ACE_ROOT)/ace/Stream_Modules.i \
- $(ACE_ROOT)/ace/Stream_Modules.cpp \
- $(ACE_ROOT)/ace/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(TAO_ROOT)/tao/orbconf.h \
- $(TAO_ROOT)/tao/align.h \
- $(TAO_ROOT)/tao/corbacom.h \
- $(TAO_ROOT)/tao/sequence.h \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/any.h \
- $(TAO_ROOT)/tao/poa.h \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/client_factory.h \
- $(TAO_ROOT)/tao/server_factory.h \
- $(TAO_ROOT)/tao/default_client.h \
- $(TAO_ROOT)/tao/default_server.h \
- $(TAO_ROOT)/tao/except.h \
- $(TAO_ROOT)/tao/orbobj.h \
- $(TAO_ROOT)/tao/connect.h \
- $(TAO_ROOT)/tao/nvlist.h \
- $(TAO_ROOT)/tao/object.h \
- $(TAO_ROOT)/tao/principa.h \
- $(TAO_ROOT)/tao/request.h \
- $(TAO_ROOT)/tao/svrrqst.h \
- $(TAO_ROOT)/tao/typecode.h \
- $(TAO_ROOT)/tao/marshal.h \
- $(TAO_ROOT)/tao/cdr.h \
- $(TAO_ROOT)/tao/stub.h \
- $(TAO_ROOT)/tao/iiopobj.h \
- $(TAO_ROOT)/tao/iioporb.h \
- $(TAO_ROOT)/tao/giop.h \
- $(TAO_ROOT)/tao/orb_core.h \
- $(TAO_ROOT)/tao/objtable.h \
- $(TAO_ROOT)/tao/optable.h \
- $(TAO_ROOT)/tao/debug.h \
- $(TAO_ROOT)/tao/orb_core.i \
- $(TAO_ROOT)/tao/corbacom.i \
- $(TAO_ROOT)/tao/sequence.i \
- $(TAO_ROOT)/tao/typecode.i \
- $(TAO_ROOT)/tao/any.i \
- $(TAO_ROOT)/tao/cdr.i \
- $(TAO_ROOT)/tao/stub.i \
- $(TAO_ROOT)/tao/object.i \
- $(TAO_ROOT)/tao/orbobj.i \
- $(TAO_ROOT)/tao/marshal.i \
- $(TAO_ROOT)/tao/client_factory.i \
- $(TAO_ROOT)/tao/poa.i \
- $(TAO_ROOT)/tao/giop.i \
- $(TAO_ROOT)/tao/svrrqst.i \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/server_factory.i \
- $(TAO_ROOT)/tao/default_client.i \
- $(TAO_ROOT)/tao/default_server.i \
- $(TAO_ROOT)/tao/connect.i \
- $(TAO_ROOT)/tao/iioporb.i \
- $(TAO_ROOT)/tao/iiopobj.i \
- $(TAO_ROOT)/tao/singletons.h
-.obj/test1_clnt.o .shobj/test1_clnt.: test1_clnt.cpp test1.h \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.cpp \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers.cpp \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Strategies_T.cpp \
- $(ACE_ROOT)/ace/Service_Types.h \
- $(ACE_ROOT)/ace/Service_Types.i \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/Message_Queue.cpp \
- $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Map_Manager.cpp \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Task_T.i \
- $(ACE_ROOT)/ace/Task_T.cpp \
- $(ACE_ROOT)/ace/Module.h \
- $(ACE_ROOT)/ace/Module.i \
- $(ACE_ROOT)/ace/Module.cpp \
- $(ACE_ROOT)/ace/Stream_Modules.h \
- $(ACE_ROOT)/ace/Stream_Modules.i \
- $(ACE_ROOT)/ace/Stream_Modules.cpp \
- $(ACE_ROOT)/ace/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(TAO_ROOT)/tao/orbconf.h \
- $(TAO_ROOT)/tao/align.h \
- $(TAO_ROOT)/tao/corbacom.h \
- $(TAO_ROOT)/tao/sequence.h \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/any.h \
- $(TAO_ROOT)/tao/poa.h \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/client_factory.h \
- $(TAO_ROOT)/tao/server_factory.h \
- $(TAO_ROOT)/tao/default_client.h \
- $(TAO_ROOT)/tao/default_server.h \
- $(TAO_ROOT)/tao/except.h \
- $(TAO_ROOT)/tao/orbobj.h \
- $(TAO_ROOT)/tao/connect.h \
- $(TAO_ROOT)/tao/nvlist.h \
- $(TAO_ROOT)/tao/object.h \
- $(TAO_ROOT)/tao/principa.h \
- $(TAO_ROOT)/tao/request.h \
- $(TAO_ROOT)/tao/svrrqst.h \
- $(TAO_ROOT)/tao/typecode.h \
- $(TAO_ROOT)/tao/marshal.h \
- $(TAO_ROOT)/tao/cdr.h \
- $(TAO_ROOT)/tao/stub.h \
- $(TAO_ROOT)/tao/iiopobj.h \
- $(TAO_ROOT)/tao/iioporb.h \
- $(TAO_ROOT)/tao/giop.h \
- $(TAO_ROOT)/tao/orb_core.h \
- $(TAO_ROOT)/tao/objtable.h \
- $(TAO_ROOT)/tao/optable.h \
- $(TAO_ROOT)/tao/debug.h \
- $(TAO_ROOT)/tao/orb_core.i \
- $(TAO_ROOT)/tao/corbacom.i \
- $(TAO_ROOT)/tao/sequence.i \
- $(TAO_ROOT)/tao/typecode.i \
- $(TAO_ROOT)/tao/any.i \
- $(TAO_ROOT)/tao/cdr.i \
- $(TAO_ROOT)/tao/stub.i \
- $(TAO_ROOT)/tao/object.i \
- $(TAO_ROOT)/tao/orbobj.i \
- $(TAO_ROOT)/tao/marshal.i \
- $(TAO_ROOT)/tao/client_factory.i \
- $(TAO_ROOT)/tao/poa.i \
- $(TAO_ROOT)/tao/giop.i \
- $(TAO_ROOT)/tao/svrrqst.i \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/server_factory.i \
- $(TAO_ROOT)/tao/default_client.i \
- $(TAO_ROOT)/tao/default_server.i \
- $(TAO_ROOT)/tao/connect.i \
- $(TAO_ROOT)/tao/iioporb.i \
- $(TAO_ROOT)/tao/iiopobj.i \
- $(TAO_ROOT)/tao/singletons.h
-.obj/test1_svr.o .shobj/test1_svr.: test1_svr.cpp test1.h \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.cpp \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers.cpp \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Strategies_T.cpp \
- $(ACE_ROOT)/ace/Service_Types.h \
- $(ACE_ROOT)/ace/Service_Types.i \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/Message_Queue.cpp \
- $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Map_Manager.cpp \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Task_T.i \
- $(ACE_ROOT)/ace/Task_T.cpp \
- $(ACE_ROOT)/ace/Module.h \
- $(ACE_ROOT)/ace/Module.i \
- $(ACE_ROOT)/ace/Module.cpp \
- $(ACE_ROOT)/ace/Stream_Modules.h \
- $(ACE_ROOT)/ace/Stream_Modules.i \
- $(ACE_ROOT)/ace/Stream_Modules.cpp \
- $(ACE_ROOT)/ace/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(TAO_ROOT)/tao/orbconf.h \
- $(TAO_ROOT)/tao/align.h \
- $(TAO_ROOT)/tao/corbacom.h \
- $(TAO_ROOT)/tao/sequence.h \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/any.h \
- $(TAO_ROOT)/tao/poa.h \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/client_factory.h \
- $(TAO_ROOT)/tao/server_factory.h \
- $(TAO_ROOT)/tao/default_client.h \
- $(TAO_ROOT)/tao/default_server.h \
- $(TAO_ROOT)/tao/except.h \
- $(TAO_ROOT)/tao/orbobj.h \
- $(TAO_ROOT)/tao/connect.h \
- $(TAO_ROOT)/tao/nvlist.h \
- $(TAO_ROOT)/tao/object.h \
- $(TAO_ROOT)/tao/principa.h \
- $(TAO_ROOT)/tao/request.h \
- $(TAO_ROOT)/tao/svrrqst.h \
- $(TAO_ROOT)/tao/typecode.h \
- $(TAO_ROOT)/tao/marshal.h \
- $(TAO_ROOT)/tao/cdr.h \
- $(TAO_ROOT)/tao/stub.h \
- $(TAO_ROOT)/tao/iiopobj.h \
- $(TAO_ROOT)/tao/iioporb.h \
- $(TAO_ROOT)/tao/giop.h \
- $(TAO_ROOT)/tao/orb_core.h \
- $(TAO_ROOT)/tao/objtable.h \
- $(TAO_ROOT)/tao/optable.h \
- $(TAO_ROOT)/tao/debug.h \
- $(TAO_ROOT)/tao/orb_core.i \
- $(TAO_ROOT)/tao/corbacom.i \
- $(TAO_ROOT)/tao/sequence.i \
- $(TAO_ROOT)/tao/typecode.i \
- $(TAO_ROOT)/tao/any.i \
- $(TAO_ROOT)/tao/cdr.i \
- $(TAO_ROOT)/tao/stub.i \
- $(TAO_ROOT)/tao/object.i \
- $(TAO_ROOT)/tao/orbobj.i \
- $(TAO_ROOT)/tao/marshal.i \
- $(TAO_ROOT)/tao/client_factory.i \
- $(TAO_ROOT)/tao/poa.i \
- $(TAO_ROOT)/tao/giop.i \
- $(TAO_ROOT)/tao/svrrqst.i \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/server_factory.i \
- $(TAO_ROOT)/tao/default_client.i \
- $(TAO_ROOT)/tao/default_server.i \
- $(TAO_ROOT)/tao/connect.i \
- $(TAO_ROOT)/tao/iioporb.i \
- $(TAO_ROOT)/tao/iiopobj.i \
- $(TAO_ROOT)/tao/singletons.h
-
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/tests/Cubit/TAO/DII_Cubit/README b/TAO/tests/Cubit/TAO/DII_Cubit/README
deleted file mode 100644
index 2b5cefa071b..00000000000
--- a/TAO/tests/Cubit/TAO/DII_Cubit/README
+++ /dev/null
@@ -1,30 +0,0 @@
-This is the cubit example that uses hand-generated stubs and
-skeletons.  Once we've got a real DII C++ mapping in TAO, we'll modify
-this to use that mapping.
-
-You can either run the server in the background in the same window as
-the client or open a separate window for the client and server.
-
-server:
--------
-
-% svr [-d] -ORBhost <serverhost> [-orbport <portnum>]
-
-When the server is started and you have used the -d flag, you should
-see as the first line of output something that looks like
-iiop:1.0//serverhost:10013/key00.  You will need this when you run the
-client.
-
-Using -d turns on debugging messages.  It is additive, i.e., the more
--d options provided, the more debugging you can get.  At the moment,
-only 2 levels of debugging are implemented, and more than 2 -d options
-are ignored.
-
-client:
--------
-
-% clnt [-d] -n <iterations> -O <IOR string displayed by server>
-
-In another window (on the same machine or a different machine) type in
-client -O IIOP where IIOP is the name that the server gave you.
-
diff --git a/TAO/tests/Cubit/TAO/DII_Cubit/client.dsp b/TAO/tests/Cubit/TAO/DII_Cubit/client.dsp
deleted file mode 100644
index 9dc2f92888a..00000000000
--- a/TAO/tests/Cubit/TAO/DII_Cubit/client.dsp
+++ /dev/null
@@ -1,109 +0,0 @@
-# Microsoft Developer Studio Project File - Name="client" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 5.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Console Application" 0x0103

-

-CFG=client - Win32 Release

-!MESSAGE This is not a valid makefile. To build this project using NMAKE,

-!MESSAGE use the Export Makefile command and run

-!MESSAGE 

-!MESSAGE NMAKE /f "client.mak".

-!MESSAGE 

-!MESSAGE You can specify a configuration when running NMAKE

-!MESSAGE by defining the macro CFG on the command line. For example:

-!MESSAGE 

-!MESSAGE NMAKE /f "client.mak" CFG="client - Win32 Release"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "client - Win32 Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "client - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE 

-

-# Begin Project

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

-

-!IF  "$(CFG)" == "client - Win32 Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir ".\client\Release"

-# PROP BASE Intermediate_Dir ".\client\Release"

-# PROP BASE Target_Dir ".\client"

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir ""

-# PROP Intermediate_Dir ".\Release"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ".\client"

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\..\\" /I "..\..\..\..\..\\" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /YX /FD /c

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 ace.lib tao.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\tao\\" /libpath:"..\..\..\..\..\ace"

-

-!ELSEIF  "$(CFG)" == "client - Win32 Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir ".\client\Debug"

-# PROP BASE Intermediate_Dir ".\client\Debug"

-# PROP BASE Target_Dir ".\client"

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir ""

-# PROP Intermediate_Dir ".\Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ".\client"

-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\..\\" /I "..\..\..\..\..\\" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /YX /FD /c

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386

-# ADD LINK32 aced.lib TAO.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\..\ace"

-

-!ENDIF 

-

-# Begin Target

-

-# Name "client - Win32 Release"

-# Name "client - Win32 Debug"

-# Begin Group "Source Files"

-

-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

-# Begin Source File

-

-SOURCE=.\clnt.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\cubitC.cpp

-# End Source File

-# End Group

-# Begin Group "Header Files"

-

-# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"

-# Begin Source File

-

-SOURCE=.\cubitC.h

-# End Source File

-# End Group

-# Begin Group "Resource Files"

-

-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe"

-# End Group

-# End Target

-# End Project

diff --git a/TAO/tests/Cubit/TAO/DII_Cubit/clnt.bld b/TAO/tests/Cubit/TAO/DII_Cubit/clnt.bld
deleted file mode 100644
index e9bd0318b5c..00000000000
--- a/TAO/tests/Cubit/TAO/DII_Cubit/clnt.bld
+++ /dev/null
@@ -1,11 +0,0 @@
-#!build
-default:
-	program
-	:debuglevel=multi
-cubitC.cpp
-	C++
-clnt.cpp
-	C++
-/home/m225527/vme/src/sockem.c
-	C
-	:c_option=slashcomment
diff --git a/TAO/tests/Cubit/TAO/DII_Cubit/clnt.cpp b/TAO/tests/Cubit/TAO/DII_Cubit/clnt.cpp
deleted file mode 100644
index 5bb1e2dc995..00000000000
--- a/TAO/tests/Cubit/TAO/DII_Cubit/clnt.cpp
+++ /dev/null
@@ -1,656 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/DII_Cubit
-//
-// = FILENAME
-//    clnt.cpp
-//
-// = DESCRIPTION
-//      This class implements a simple "cube" CORBA client for the Cubit
-//      example using stubs generated by the TAO ORB IDL compiler.
-//
-// = AUTHORS
-//      Andy Gokhale, Sumedh Mungee, and Sergio Flores-Gaitan
-//
-// ============================================================================
-#include "ace/Profile_Timer.h"
-#include "ace/Get_Opt.h"
-#include "tao/corba.h"
-#include "cubitC.h"
-#include "clnt.h"
-
-// Constructor.
-
-Cubit_Client::Cubit_Client (void)
-  : loop_count_ (250),
-    exit_later_ (0),
-    objref_ (CORBA::Object::_nil ()),
-    cubit_ (Cubit::_nil ()),
-    orb_ptr_ (0),
-    call_count_ (0),
-    error_count_ (0),
-    cubit_key_ ("key00"),
-    hostname_ (ACE_DEFAULT_SERVER_HOST),
-    portnum_ (TAO_DEFAULT_SERVER_PORT)
-{
-}
-
-// destructor
-
-Cubit_Client::~Cubit_Client (void)
-{
-  // Free resources
-  CORBA::release (this->cubit_);
-  CORBA::release (this->objref_);
-  CORBA::release (this->orb_ptr_);
-}
-
-// Simple function that returns the substraction of 117 from the
-// parameter.
-
-int
-Cubit_Client::func (u_int i)
-{
-  return i - 117;
-}
-
-// Parses the command line arguments and returns an error status.
-
-int
-Cubit_Client::parse_args (void)
-{
-  ACE_Get_Opt opts (argc_, argv_, "dn:k:h:p:x");
-  int c;
-   
-  while ((c = opts ()) != -1)
-    switch (c) 
-      {
-      case 'd':  // debug flag
-	TAO_debug_level++;
-	break;
-      case 'n':			// loop count
-	loop_count_ = (u_int) ACE_OS::atoi (opts.optarg);
-	break;
-      case 'h':
-        hostname_ = ACE_OS::strdup (opts.optarg);
-        break;
-      case 'p':
-        portnum_ = ACE_OS::atoi (opts.optarg);
-        break;
-      case 'k':			// stringified objref
-        cubit_key_ = ACE_OS::strdup (opts.optarg);
-        break;
-      case 'x':
-	exit_later_++;
-	break;
-      case '?':
-      default:
-	ACE_ERROR_RETURN ((LM_ERROR,
-			   "usage:  %s"
-			   " [-d]"
-			   " [-n loopcount]"
-                           " [-k cubit-obj-ref-key]"
-                           " [-h hostname]"
-                           " [-p port]"
-			   " [-x]"
-			   "\n", argv_ [0]
-			   ), -1);
-      }
-   
-  return 0;  // Indicates successful parsing of command line
-}
-
-void
-Cubit_Client::cube_union_stub (void)
-{
-  this->cubit_ = Cubit::_narrow (this->objref_);
-
-  Cubit_oneof u, *r;
-   
-  this->call_count_++;
-   
-  u._disc = e_2nd;
-  u.l = 3;
-   
-  // Cube a "union" ...
-  r = this->cubit_->Cubit_cube_union (u, this->env_);
-
-  if (this->env_.exception () != 0) 
-    {
-      this->env_.print_exception ("from cube_union");
-      this->error_count_++;
-    } 
-  else 
-    {
-      dmsg ("cube union ...");
-      u.l = u.l * u.l * u.l ;
-      
-      if (u.l != r->l) 
-	{
-	  ACE_DEBUG ((LM_DEBUG, "** cube_union ERROR\n"));
-	  this->error_count_++;
-	}
-      
-      delete r;
-    }
-   
-  this->call_count_++;
-   
-  u._disc = e_5th;
-#if 0
-  u.cm.l = this->func (i);
-  u.cm.s = this->func (i);
-  u.cm.o = this->func (i);
-#endif
-   
-  u.cm.l = 7;
-  u.cm.s = 5;
-  u.cm.o = 3;
-   
-  // Cube another "union" which uses the default arm ...
-  r = this->cubit_->Cubit_cube_union (u, this->env_);
-
-  if (this->env_.exception () != 0) 
-    {
-      this->env_.print_exception ("from cube_union");
-      this->error_count_++;
-    } 
-  else 
-    {
-      dmsg ("cube union ...");
-      u.cm.l = u.cm.l * u.cm.l * u.cm.l;
-      u.cm.s = u.cm.s * u.cm.s * u.cm.s;
-      u.cm.o = u.cm.o * u.cm.o * u.cm.o;
-      
-      if (u.cm.l != r->cm.l
-	  || u.cm.s != r->cm.s
-	  || u.cm.o != r->cm.o) 
-	{
-	  ACE_DEBUG ((LM_DEBUG, "** cube_union ERROR\n"));
-	  this->error_count_++;
-	}
-      
-      delete r;
-    }
-}
-
-void
-Cubit_Client::cube_union_dii (void)
-{
-  // Create the request ...
-  CORBA::Request_ptr req;
-   
-  this->call_count_++;
-
-  req = this->objref_->_request ((CORBA::String) "cube_union", this->env_);
-
-  if (this->env_.exception () != 0) 
-    {
-      this->error_count_++;
-
-      this->env_.print_exception ("cube_union_dii request create");
-      return;
-    }
-
-  // ... initialise the argument list and result ...
-  Cubit_oneof u, *r;
-   
-  u._disc = e_3rd;
-  u.cm.l = 5;
-  u.cm.s = -7;
-  u.cm.o = 3;
-
-  CORBA::Any tmp_arg (TC_Cubit_oneof, &u, CORBA::B_FALSE);
-   
-  req->arguments ()->add_value (0, tmp_arg, CORBA::ARG_IN, this->env_);
-
-  if (this->env_.exception () != 0) 
-    {
-      this->error_count_++;
-      this->env_.print_exception ("cube_union_dii request arg add");
-      CORBA::release (req);
-      return;
-    }
-	
-  req->result ()->value ()->replace (TC_Cubit_oneof, 0, CORBA::B_TRUE, this->env_);
-
-  if (this->env_.exception () != 0) 
-    {
-      this->error_count_++;
-      this->env_.print_exception ("cube_union_dii result type");
-      CORBA::release (req);
-      return;
-    }
-
-  // Make the invocation, verify the result.
-
-  req->invoke ();
-
-  if (req->env ()->exception () != 0) 
-    {
-      this->error_count_++;
-      req->env ()->print_exception ("cube_union_dii invoke");
-      CORBA::release (req);
-      return;
-    }
-
-  r = (Cubit_oneof *) req->result ()->value ()->value ();
-   
-  if (r->cm.o != 27 || r->cm.l != 125 || r->cm.s != -343) 
-    {
-      this->error_count_++;
-      ACE_ERROR ((LM_ERROR, "cube_union_dii -- bad results\n"));
-    }
-  else
-    dmsg ("cube_union_dii ... success!!");
-   
-  CORBA::release (req);
-}
-
-// Cube an octet
-
-void
-Cubit_Client::cube_octet (int i)
-{
-  CORBA::Octet arg_octet = this->func (i);
-
-   // Cube an octet.
-  CORBA::Octet ret_octet = this->cubit_->Cubit_cube_octet (arg_octet, this->env_);
-
-  this->call_count_++;
-
-  if (this->env_.exception () != 0)
-    {
-      this->env_.print_exception ("from cube_octet");
-      this->error_count_++;
-    }
-  else
-    {
-      dmsg2 ("cube octet:  %d --> %d\n", arg_octet, ret_octet);
-      arg_octet = arg_octet * arg_octet * arg_octet;
-      if (arg_octet != ret_octet) {
-	ACE_DEBUG ((LM_DEBUG,
-		    "** cube_octet (%d) ERROR (--> %d)\n",
-		    (CORBA::Octet) this->func (i),
-		    ret_octet));
-	this->error_count_++;
-      }
-    }
-}
-
-
-// calculate the cube from a long
-
-void
-Cubit_Client::cube_long (int i)
-{
-  CORBA::Long arg_long = this->func (i);
-
-  // Cube a long.
-  CORBA::Long ret_long = this->cubit_->Cubit_cube_long (arg_long, this->env_);
-
-  this->call_count_++;
-
-  if (this->env_.exception () != 0)
-    {
-      this->env_.print_exception ("from cube_long");
-      this->error_count_++;
-    }
-  else
-    {
-      dmsg2 ("cube long:  %d --> %d\n", arg_long, ret_long);
-      arg_long = arg_long * arg_long * arg_long;
-      if (arg_long != ret_long) {
-	ACE_ERROR ((LM_ERROR,
-		    "** cube_long (%ld) ERROR (--> %ld)\n",
-		    (CORBA::Long) this->func (i),
-		    ret_long));
-	this->error_count_++;
-      }
-    }
-}
-
-// Cube a short.
-
-void
-Cubit_Client::cube_short (int i)
-{
-  CORBA::Short arg_short = this->func (i);
-  // Cube a short.
-  CORBA::Short ret_short = cubit_->Cubit_cube_short (arg_short, this->env_);
-
-  this->call_count_++;
-
-  if (this->env_.exception () != 0)
-    {
-      this->env_.print_exception ("from cube_short");
-      this->error_count_++;
-    }
-  else
-    {
-      dmsg2 ("cube short:  %d --> %d\n",
-	     arg_short,
-	     ret_short);
-      arg_short = arg_short * arg_short * arg_short;
-
-      if (arg_short != ret_short)
-	{
-	  ACE_ERROR ((LM_ERROR, "** cube_short (%d) ERROR (--> %d)\n",
-		      (CORBA::Short) this->func (i),
-		      ret_short));
-	  this->error_count_++;
-	}
-    }
-}
-
-// Cube the numbers in a struct
-
-void
-Cubit_Client::cube_struct (int i)
-{
-  Cubit_Many arg_struct;
-  Cubit_Many *ret_struct;
-
-  this->call_count_++;
-
-  arg_struct.l = this->func (i);
-  arg_struct.s = this->func (i);
-  arg_struct.o = this->func (i);
-
-  // Cube a "struct" ...
-  ret_struct = this->cubit_->Cubit_cube_struct (arg_struct, this->env_);
-
-  if (this->env_.exception () != 0)
-    {
-      this->env_.print_exception ("from cube_struct");
-      this->error_count_++;
-    }
-  else
-    {
-      dmsg ("cube struct ...");
-      arg_struct.l = arg_struct.l * arg_struct.l * arg_struct.l;
-      arg_struct.s = arg_struct.s * arg_struct.s * arg_struct.s;
-      arg_struct.o = arg_struct.o * arg_struct.o * arg_struct.o;
-
-      if (arg_struct.l != ret_struct->l
-	  || arg_struct.s != ret_struct->s
-	  || arg_struct.o != ret_struct->o)
-	{
-	  ACE_ERROR ((LM_ERROR, "** cube_struct ERROR\n"));
-	  this->error_count_++;
-	}
-    }
-  delete ret_struct;
-}
-
-int
-Cubit_Client::init (int argc, char **argv)
-{
-  this->argc_ = argc;
-  this->argv_ = argv;
-
-  // Parse command line and verify parameters.
-  if (this->parse_args () == -1)
-    return -1;
-  
-  // construct the TAO ior for the Cubit object reference
-  ACE_OS::sprintf (this->buf_, 
-		   "iiop:1.0//%s:%d/%s", 
-		   this->hostname_, 
-		   this->portnum_, 
-		   this->cubit_key_);
-
-  // Retrieve the ORB.
-  this->orb_ptr_ = CORBA::ORB_init (this->argc_,
-                                    this->argv_,
-                                    "internet",
-                                    this->env_);
-
-  if (this->env_.exception () != 0)
-    {
-      this->env_.print_exception ("ORB initialization");
-      return -1;
-    }
-
-  this->objref_ = this->orb_ptr_->string_to_object ((CORBA::String) this->buf_, 
-						    this->env_);
-
-  if (this->env_.exception () != 0)
-    {
-      this->env_.print_exception ("string2object");
-      return 1;
-    }
-
-  if (CORBA::is_nil (this->objref_) == CORBA::B_TRUE)
-    ACE_ERROR_RETURN ((LM_ERROR,
-		       "%s:  must identify non-null target objref\n",
-		       this->argv_ [0]),
-		      -1);
-
-  // Narrow the CORBA::Object reference to the stub object, checking
-  // the type along the way using _is_a.
-  this->cubit_ = Cubit::_narrow (this->objref_);
-
-  if (this->cubit_ == 0)
-    ACE_ERROR_RETURN ((LM_ERROR,
-		       " (%P|%t) Unable to narrow object reference to a Cubit_ptr.\n"),
-		      -1);
-
-  return 0;
-}
-
-// Simple test for DII: call "cube_struct". 
-
-void
-Cubit_Client::cube_struct_dii (void)
-{
-  // Create the request ...
-
-  CORBA::Request_ptr	req = 
-    this->objref_->_request ((CORBA::String) "cube_struct", this->env_);
-
-  if (this->env_.exception () != 0) 
-    {
-      this->env_.print_exception ("DII request create");
-      return;
-    }
-
-  // ... initialise the argument list and result ...
-  Cubit_Many arg, *result;
-       
-  arg.o = 3;
-  arg.l = 5;
-  arg.s = -7;
-       
-  CORBA::Any	tmp_arg (TC_Cubit_Many, &arg, CORBA::B_FALSE);
-       
-  req->arguments ()->add_value (0, tmp_arg, CORBA::ARG_IN, this->env_);
-
-  if (this->env_.exception () != 0) 
-    {
-      this->env_.print_exception ("DII request arg add");
-      CORBA::release (req);
-      return;
-    }
-       
-  req->result ()->value ()->replace (TC_Cubit_Many, 0, CORBA::B_TRUE, this->env_);
-
-  if (this->env_.exception () != 0) 
-    {
-      this->env_.print_exception ("DII request result type");
-      CORBA::release (req);
-      return;
-    }
-
-  // Make the invocation, verify the result
-
-  this->call_count_++;
-  req->invoke ();
-
-  if (req->env ()->exception () != 0) 
-    {
-      req->env ()->print_exception ("DII invoke");
-      CORBA::release (req);
-      return;
-    }
-       
-  result = (Cubit_Many *) req->result ()->value ()->value ();
-       
-  if (result->o != 27 || result->l != 125 || result->s != -343)
-    ACE_ERROR ((LM_ERROR, "DII cube_struct -- bad results\n"));
-  else
-    dmsg ("DII cube_struct ... success!!");
-       
-  CORBA::release (req);
-}
-
-// prints time statistics
-
-void
-Cubit_Client::print_stats (const char *call_name, ACE_Profile_Timer::ACE_Elapsed_Time &elapsed_time)
-{
-  double tmp;
-
-  ACE_DEBUG ((LM_DEBUG,
-	      "%s:\n",
-	      call_name));
-  
-  if (this->call_count_ > 0  &&  this->error_count_ == 0)
-    {
-      tmp = 1000 / elapsed_time.real_time;
-
-      elapsed_time.real_time *= ACE_ONE_SECOND_IN_MSECS;
-      elapsed_time.user_time *= ACE_ONE_SECOND_IN_MSECS;
-      elapsed_time.system_time *= ACE_ONE_SECOND_IN_MSECS;
-
-      elapsed_time.real_time /= this->call_count_;
-      elapsed_time.user_time /= this->call_count_;
-      elapsed_time.system_time /= this->call_count_;
-
-      tmp = 1000 / elapsed_time.real_time;
-
-      ACE_DEBUG ((LM_DEBUG,
-		  "\treal_time\t= %0.06f ms, \n\t"
-		  "user_time\t= %0.06f ms, \n\t"
-		  "system_time\t= %0.06f ms\n"
-		  "\t%0.00f calls/second\n",
-		  elapsed_time.real_time < 0.0? 0.0:elapsed_time.real_time,
-		  elapsed_time.user_time < 0.0? 0.0:elapsed_time.user_time,
-		  elapsed_time.system_time < 0.0? 0.0:elapsed_time.system_time,
-		  tmp < 0.0? 0.0 : tmp));
-    }
-  else
-    {
-      ACE_ERROR ((LM_ERROR, "\tNo time stats printed.  Call count zero or error ocurred.\n"));
-    }
-
-  ACE_DEBUG ((LM_DEBUG,
-	      "\t%d calls, %d errors\n",
-	      this->call_count_,
-	      this->error_count_));
-}
-
-// Execute client example code.
-
-int
-Cubit_Client::run (void)
-{
-  u_int i;
-
-  ACE_Profile_Timer timer;
-  ACE_Profile_Timer::ACE_Elapsed_Time elapsed_time;
-
-  //  ACE_Time_Value before;
-
-  // We start an ACE_Profile_Timer here...
-  timer.start ();
-
-  // Make the calls in a loop.
-  for (i = 0; i < this->loop_count_; i++)
-    {
-      this->cube_short (i);
-      this->cube_octet (i);
-      this->cube_long (i);
-      this->cube_struct (i);
-    }
-
-  // stop the timer.
-  timer.stop ();
-
-  timer.elapsed_time (elapsed_time);  
-  // compute call average call time.
-  this->print_stats ("cube average call", elapsed_time);
-
-  // Simple test for DII: call "cube_struct". (It's not timed since
-  // the copious mallocation of DII would bias numbers against typical
-  // stub-based calls).
-  this->call_count_ = 0;
-  this->error_count_ = 0;
-
-  timer.start ();
-  // Make the calls in a loop.
-  for (i = 0; i < this->loop_count_; i++)
-    {
-      this->cube_struct_dii ();
-    }
-  timer.stop ();
-
-  timer.elapsed_time (elapsed_time);  
-  // compute call average call time.
-  this->print_stats ("cube_struct_dii call", elapsed_time);
-
-  this->call_count_ = 0;
-  this->error_count_ = 0;
-
-  timer.start ();
-  // Make the calls in a loop.
-  for (i = 0; i < this->loop_count_; i++)
-    {
-      this->cube_union_stub ();
-    }
-  timer.stop ();
-
-  timer.elapsed_time (elapsed_time);  
-  // compute call average call time.
-  this->print_stats ("cube_union_stub call", elapsed_time);
-
-  this->call_count_ = 0;
-  this->error_count_ = 0;
-
-  timer.start ();
-  // Make the calls in a loop.
-  for (i = 0; i < this->loop_count_; i++)
-    {
-      this->cube_union_dii ();
-    }
-  timer.stop ();
-
-  timer.elapsed_time (elapsed_time);  
-  // compute call average call time.
-  this->print_stats ("cube_union_dii call", elapsed_time);
-
-  if (this->exit_later_)
-    {
-      this->cubit_->Cubit_please_exit (this->env_);
-      dexc (this->env_, "server, please ACE_OS::exit");
-    }
-
-  return this->error_count_ == 0 ? 0 : 1;
-}
-
-
-// This function runs the test.
-
-int
-main (int argc, char **argv)
-{
-  Cubit_Client cubit_client;
- 
-  if (cubit_client.init (argc, argv) == -1)
-    return 1;
-  else
-    return cubit_client.run ();
-}
diff --git a/TAO/tests/Cubit/TAO/DII_Cubit/clnt.h b/TAO/tests/Cubit/TAO/DII_Cubit/clnt.h
deleted file mode 100644
index 058e44283c5..00000000000
--- a/TAO/tests/Cubit/TAO/DII_Cubit/clnt.h
+++ /dev/null
@@ -1,138 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/DII_Cubit
-//
-// = FILENAME
-//    clnt.h
-//
-// = DESCRIPTION
-//      This class implements a simple wrapper around the "cube" CORBA 
-//      client for the Cubit example using stubs generated by the TAO 
-//      ORB IDL compiler.
-//
-// = AUTHORS
-//      Sergio Flores-Gaitan
-//
-// ============================================================================
-
-#include "ace/Get_Opt.h"
-#include "tao/corba.h"
-#include "cubitC.h"
-
-class ACE_winsock_proper_shutdown
-// @@ We need this helper class to properly shutdown
-// WinSock before we figure out how to do this properly.
-{
-public:
-  ~ACE_winsock_proper_shutdown (void)
-  {
-    ACE_OS::socket_fini ();
-  }
-};
-
-class Cubit_Client 
-  // = TITLE
-  //    Defines a class that encapsulates behaviour of the Cubit client
-  //    example.  Provides a better understanding of the logic in an 
-  //    object oriented way.
-  //
-  // = DESCRIPTION
-  //    This class declares an interface to run the example client for
-  //    Cubit CORBA server.  All the complexity for initializing the 
-  //    server is hidden in the class.  Just the run() interface is needed.
-{
-public:
-  // = Constructor and destructor.
-  Cubit_Client (void);
-  ~Cubit_Client (void);
-
-  int run (void);
-  // Execute client example code.
-
-  int init (int argc, char **argv);
-  // Initialize the client communication endpoint with server.
-
-private:
-  int func (u_int i);
-  // simple function that returns the substraction of 117 from the parameter.
-
-  int parse_args (void);
-  // Parses the arguments passed on the command line.
-
-  void print_stats (const char *call_name, ACE_Profile_Timer::ACE_Elapsed_Time &elapsed_time);
-  // prints the time stats
-
-  void cube_union_stub (void);
-  // Exercise the union.  Cube a union.
-  
-  void cube_union_dii (void);
-  // Exercise the union using dii.
-
-  void cube_struct (int i);
-  // calculate the cube from a struct.
-
-  void cube_long (int i);
-  // calculate the cube from a long
-
-  void cube_octet (int i);
-  // Cube an octet
-
-  void cube_short (int i);
-  // Cube a short.
-
-  void cube_struct_dii (void);
-  // Cube the numbers in a struct
-
-  // private member variables.
-
-  int argc_;
-  // # of arguments on the command line.
-
-  char **argv_;
-  // arguments from command line.
-
-  u_int loop_count_;
-  // Number of times to do the cube operations.
-
-  int exit_later_;
-  // Flag to tell server to not exit immediately
-
-  CORBA::Object_ptr objref_;
-  // storage of the factory objref
-  
-  CORBA::Environment env_;
-  // Environment variable
-
-  Cubit_ptr cubit_;
-  // Cubit obj ref
-
-  CORBA::ORB_ptr orb_ptr_;
-  // Remember our orb
-
-  u_int call_count_;
-  // # of calls made to functions
-
-  u_int error_count_;
-  // #  of errors incurred in the lifetime of the application.
-
-  ACE_winsock_proper_shutdown shutdown_object;
-  // Winsock shutdown object.  
-
-  const char *TAO_arg_ior_;
-  // pointer to object reference string.
-
-  char *cubit_key_;
-  // Key of the obj ref to be retrieved via the factory.
-
-  char *hostname_;
-  // Hostname of server.
-
-  CORBA::ULong portnum_;
-  // default port number of server.
-
-  char buf_[BUFSIZ];
-  // buffer for temporary use
-};
diff --git a/TAO/tests/Cubit/TAO/DII_Cubit/cubit.cpp b/TAO/tests/Cubit/TAO/DII_Cubit/cubit.cpp
deleted file mode 100644
index cf7ef472641..00000000000
--- a/TAO/tests/Cubit/TAO/DII_Cubit/cubit.cpp
+++ /dev/null
@@ -1,560 +0,0 @@
-// @(#)cubit.cpp	1.2 95/09/29
-// Copyright 1994-1995 by Sun Microsystems Inc.
-// All Rights Reserved
-//
-// TEST:	hand-written C-style "Cubit" stubs and "skeletons"
-//
-// NOTE:  these "skeletons" are really the methods, using DSI.  No real
-// ORB would be implemented in this particular way.  Several things would
-// be more typical of real (static) skeletons:
-//
-//	* Most of the "in" (and much of the "out") parameter data would
-//	  be preallocated on the stack, not heap allocated.  (Static
-//	  preallocation doesnt' really work in a multithreaded system,
-//	  and moreover can waste a lot of space.)
-//
-//	* The ORB core wouldn't be told about parameters using heap
-//	  allocated data structures (e.g. NVList).
-//
-//	* Skeletons would need to some kind of "marshal the response NOW"
-//	  API so that stack-allocated "out" values wouldn't become invalid
-//	  up until they were safely marshaled.
-//
-//	* They'd handle exceptions rather than just generating debugging
-//	  messages when they happen.
-//
-//	* Method code would be called by the skeletons, not written as
-//	  part of the "skeleton" itself!
-//
-// A key part of turning this code into a complete ORB would be to ensure
-// that skeletons were always efficient and correct.  They might not need
-// to be sharable between different implementations of the same OMG-IDL
-// object interface, but many ORBs choose to be structured that way.
-
-#include "cubit.h"		// for stubs ...
-#include "tao/corba.h"		// ... and skeletons
-
-// CUBE OCTET
-
-static const TAO_Param_Data Cubit_cube_octet_params [] = 
-{
-  { CORBA::_tc_octet, PARAM_RETURN, 0 },
-  { CORBA::_tc_octet, PARAM_IN, 0 }
-};
-
-static const TAO_Call_Data Cubit_cube_octet_calldata = 
-{
-  "cube_octet", CORBA::B_TRUE,
-  2, &Cubit_cube_octet_params [0],
-  0, 0
-};
-
-CORBA::Octet
-Cubit_cube_octet (Cubit_ptr target,
-		  CORBA::Octet o,
-		  CORBA::Environment &env)
-{
-  CORBA::Octet retval = 0;
-  STUB_Object *data;
-
-  if (target->QueryInterface (IID_STUB_Object, (void **) &data) != NOERROR)
-    env.exception (new CORBA::INV_OBJREF (COMPLETED_NO));
-  else 
-    {
-      data->do_call (env, &Cubit_cube_octet_calldata,
-		     &retval, &o);
-      data->Release ();
-    }
-
-  return retval;
-}
-
-static void
-_cube_octet_skel (CORBA::ServerRequest &req,    
-		  CORBA::Object_ptr obj,
-		  CORBA::Environment &env)
-{
-  CORBA::NVList_ptr nvlist;
-  CORBA::NamedValue_ptr nv;
-  CORBA::Any temp_value (CORBA::_tc_octet);
-
-  req.orb ()->create_list (0, nvlist);
-  nv = nvlist->add_value (0, temp_value, CORBA::ARG_IN, env);
-  dexc (env, "cube_octet, add value");
-
-  req.params (nvlist, env);
-  dexc (env, "cube_octet, get params");
-
-  CORBA::Octet* value = new CORBA::Octet;
-
-  *value = *(CORBA::Octet *)nv->value ()->value ();
-  // dmsg1 ("cube octet, parameter '%d'", *value);
-
-  *value = (CORBA::Octet) ((*value) * (*value) * (*value));
-  // dmsg1 ("cube octet, result '%d'", *value);
-
-  CORBA::Any* any =
-    new CORBA::Any (CORBA::_tc_octet, value, CORBA::B_TRUE);
-
-  req.result (any, env);
-  dexc (env, "cube_octet, result");
-}
-
-// CUBE SHORT
-
-static const TAO_Param_Data Cubit_cube_short_params [] = 
-{
-  { CORBA::_tc_short, PARAM_RETURN, 0 },
-  { CORBA::_tc_short, PARAM_IN, 0 }
-};
-
-static const TAO_Call_Data Cubit_cube_short_calldata = 
-{
-  "cube_short", CORBA::B_TRUE,
-  2, &Cubit_cube_short_params [0],
-  0, 0
-};
-
-CORBA::Short
-Cubit_cube_short (Cubit_ptr target,
-		  CORBA::Short s,
-		  CORBA::Environment &env)
-{
-  CORBA::Short retval;
-  STUB_Object *data;
-
-  if (target->QueryInterface (IID_STUB_Object, (void **) &data) != NOERROR)
-    env.exception (new CORBA::INV_OBJREF (COMPLETED_NO));
-  else 
-    {
-      data->do_call (env, &Cubit_cube_short_calldata,
-		     &retval, &s);
-      data->Release ();
-    }
-  return retval;
-}
-
-static void
-_cube_short_skel (CORBA::ServerRequest &req,
-		  CORBA::Object_ptr obj,
-		  CORBA::Environment &env)
-{
-  CORBA::NVList_ptr nvlist;
-  CORBA::NamedValue_ptr nv;
-  CORBA::Any temp_value (CORBA::_tc_short);
-
-  req.orb ()->create_list (0, nvlist);
-  nv = nvlist->add_value (0, temp_value, CORBA::ARG_IN, env);
-  dexc (env, "cube_short, add_value");
-
-  req.params (nvlist, env);
-  dexc (env, "cube_short, get params");
-
-  CORBA::Short* value = new CORBA::Short;
-
-  *value = *(CORBA::Short *)nv->value ()->value ();
-  // dmsg1 ("cube short, parameter '%d'", *value);
-
-  *value =(CORBA::Short) ((*value) * (*value) * (*value));
-  // dmsg1 ("cube short, result '%d'", *value);
-
-  CORBA::Any* any =
-    new CORBA::Any (CORBA::_tc_short, value, CORBA::B_TRUE);
-
-  req.result (any, env);
-  dexc (env, "cube_short, result");
-}
-
-// CUBE LONG
-
-static const TAO_Param_Data Cubit_cube_long_params [] = 
-{
-  { CORBA::_tc_long, PARAM_RETURN, 0 },
-  { CORBA::_tc_long, PARAM_IN, 0 }
-};
-
-static const TAO_Call_Data Cubit_cube_long_calldata = 
-{
-  "cube_long", CORBA::B_TRUE,
-  2, &Cubit_cube_long_params [0],
-  0, 0
-};
-
-CORBA::Long
-Cubit_cube_long (Cubit_ptr target,
-		 CORBA::Long l,
-		 CORBA::Environment &env)
-{
-  CORBA::Long retval;
-  STUB_Object *data;
-
-  if (target->QueryInterface (IID_STUB_Object, (void **)&data) != NOERROR)
-    env.exception (new CORBA::INV_OBJREF (COMPLETED_NO));
-  else
-    {
-      data->do_call (env, &Cubit_cube_long_calldata,
-		     &retval, &l);
-      data->Release ();
-    }
-  return retval;
-}
-
-static void
-_cube_long_skel (CORBA::ServerRequest &req,
-		 CORBA::Object_ptr obj,
-		 CORBA::Environment &env)
-{
-  CORBA::NVList_ptr nvlist;
-  CORBA::NamedValue_ptr	nv;
-  CORBA::Any temp_value (CORBA::_tc_long);
-
-  req.orb ()->create_list (0, nvlist);
-  nv = nvlist->add_value (0, temp_value, CORBA::ARG_IN, env);
-  dexc (env, "cube_long, add_value");
-
-  req.params (nvlist, env);
-  dexc (env, "cube_long, get params");
-
-  CORBA::Long* value = new CORBA::Long;
-
-  *value = *(CORBA::Long *)nv->value ()->value ();
-  // dmsg1 ("cube long, parameter '%d'", *value);
-
-  *value = (*value) * (*value) * (*value);
-  // dmsg1 ("cube long, result '%d'", *value);
-
-  CORBA::Any* any =
-    new CORBA::Any (CORBA::_tc_long, value, CORBA::B_TRUE);
-
-  req.result (any, env);
-  dexc (env, "cube_long, result");
-}
-
-// Encapsulated parameters for struct "Cubit_Many" typecode.
-// None of these parameters is complicated, so this is just
-// a linear sequence of element encodings
-//
-// NOTE:  it's important that this be longword aligned!!
-
-static const CORBA::Long _oc_Cubit_Many [] = 
-{ 
-  MY_BYTE_SEX,				// byte order flag (TRICKY!)
-
-  1, 0,			// empty string:  repository/type ID
-  1, 0,			// empty string:  struct name
-
-  3,				// three struct elements
-
-  // First structure element:  name, typecode for Octet
-  1, 0,			// empty string:  name "o"
-  tk_octet,
-
-  // Second structure element:  name, typecode for Long
-  1, 0,			// empty string:  name "l"
-  tk_long,
-
-  // Third structure element:  name, typecode for Short
-  1, 0,			// empty string:  name "s"
-  tk_short,
-};
-
-static CORBA::TypeCode _tc_Cubit_Many (tk_struct,
-				      sizeof _oc_Cubit_Many,
-				      (u_char *) &_oc_Cubit_Many,
-				      CORBA::B_FALSE);
-
-CORBA::TypeCode_ptr TC_Cubit_Many = &_tc_Cubit_Many;
-
-// CUBE STRUCT
-
-static const TAO_Param_Data Cubit_cube_struct_params [] = 
-{
-  { &_tc_Cubit_Many, PARAM_RETURN, sizeof (Cubit_Many) },
-  { &_tc_Cubit_Many, PARAM_IN, 0 }
-};
-
-static const TAO_Call_Data Cubit_cube_struct_calldata = 
-{
-  "cube_struct", CORBA::B_TRUE,
-  2, &Cubit_cube_struct_params [0],
-  0, 0
-};
-
-Cubit_Many *
-Cubit_cube_struct (Cubit_ptr target,
-		   Cubit_Many &values,
-		   CORBA::Environment &env)
-{
-  Cubit_Many *retval;
-  STUB_Object *data;
-
-  if (target->QueryInterface (IID_STUB_Object, (void **) &data) != NOERROR)
-    env.exception (new CORBA::INV_OBJREF (COMPLETED_NO));
-  else
-    {
-      data->do_call (env, &Cubit_cube_struct_calldata,
-		     &retval, &values);
-      data->Release ();
-    }
-  return retval;
-}
-
-static void
-_cube_struct_skel (CORBA::ServerRequest &req,
-		   CORBA::Object_ptr obj,
-		   CORBA::Environment &env)
-{
-  CORBA::NVList_ptr nvlist;
-  CORBA::NamedValue_ptr	nv;
-  CORBA::Any temp_value (TC_Cubit_Many);
-
-  req.orb ()->create_list (0, nvlist);
-  nv = nvlist->add_value (0, temp_value, CORBA::ARG_IN, env);
-  dexc (env, "cube_struct, add_value");
-
-  req.params (nvlist, env);
-  dexc (env, "cube_struct, get params");
-
-  Cubit_Many *value;
-  Cubit_Many *retval = new Cubit_Many;
-
-  value = (Cubit_Many *)nv->value ()->value ();
-
-  retval->o = (CORBA::Octet) (value->o * value->o * value->o);
-  retval->s = (CORBA::Short) (value->s * value->s * value->s);
-  retval->l = value->l * value->l * value->l;
-
-  // dmsg2 ("cube struct.o, %d -> %d", value->o, retval->o);
-  // dmsg2 ("cube struct.s, %d -> %d", value->s, retval->s);
-  // dmsg2 ("cube struct.l, %d -> %d", value->l, retval->l);
-
-  CORBA::Any *any =
-    new CORBA::Any (TC_Cubit_Many, retval, CORBA::B_TRUE);
-
-  req.result (any, env);
-  dexc (env, "cube_struct, result");
-}
-
-// CUBE UNION
-
-// NOTE: not all union typecodes can be encoded as an array of "long
-// "values, but this one can.  Ones with discriminants that are one or
-// two bytes long can't easily be coded portably.
-//
-// The benefit of doing it as an array of "long" values is twofold:
-// (a) easier to read; (b) on most systems it's then adequately
-// aligned for the typecode interpreter to use, so no additional
-// runtime copy needs to be made.
-
-static const CORBA::Long _oc_Cubit_oneof [] = 
-{
-  MY_BYTE_SEX,				// byte order flag (TRICKY)
-  1, 0,			// omitted repository/type ID
-  1, 0,			// omitted struct name, "oneof"
-
-  // discriminant typecode:
-  tk_enum,		// tk_enum
-  72,			// encapsulation length
-
-  MY_BYTE_SEX,			// byte order flag (TRICKY)
-  1, 0,			// omitted repository/type ID
-  1, 0,			// omitted enum name, "discrim"
-  6,			// 5 elements in the enum
-
-  1, 0,			// omitted member name, "e_0th"
-  1, 0,			// omitted member name, "e_1st"
-  1, 0,			// omitted member name, "e_2nd"
-  1, 0,			// omitted member name, "e_3rd" 
-  1, 0,			// omitted member name, "e_4th" 
-  1, 0,			// omitted member name, "e_5th" 
-
-  4,				// default member index (zero based)
-  5,				// number of union members
-
-  // the 1st union branch arm
-  e_0th,			// member label value
-  1, 0,			// omitted member name, "o"
-  tk_octet,		// member typecode
-
-  // the 2nd union branch arm
-  e_1st,			// member label value
-  1, 0,			// omitted member name, "s"
-  tk_short,		// member typecode
-
-  // the 3rd union branch arm
-  e_2nd,			// member label value
-  1, 0,			// omitted member name, "l"
-  tk_long,		// member typecode
-
-  // the 4th union branch arm
-  e_3rd,			// member label value
-  1, 0,			// omitted member name, "cm"
-
-  // the 4th union member typecode
-  tk_struct,		// tk_struct
-  60,			// encap length
-
-  MY_BYTE_SEX,			// byte order flag (TRICKY)
-  1, 0,			// omitted repository/type ID
-  1, 0,			// omitted struct name, "Many"
-  3,			// three struct members
-
-  // First structure element
-  1, 0,			// omitted member name, "o"
-  tk_octet,	// member type, tk_octet
-
-  // Second structure element
-  1, 0,			// omitted member name, "l"
-  tk_long,	// member type, tk_long
-
-  // Third structure element
-  1, 0,			// omitted member name, "s"
-  tk_short,	// member type, tk_short
-
-  // the 5th union branch arm
-  4,				// the 5th member label value
-  1, 0,			// omitted member name, "cm"
-  ~0,				// indirected typecode (~0)
-  -84			// offset to struct "Many" typecode
-};
-
-static CORBA::TypeCode _tc_Cubit_oneof (tk_union,
-				       (sizeof _oc_Cubit_oneof),
-				       (u_char *) &_oc_Cubit_oneof,
-				       CORBA::B_FALSE);
-
-CORBA::TypeCode_ptr TC_Cubit_oneof = &_tc_Cubit_oneof;
-
-static const TAO_Param_Data Cubit_cube_union_params [] = 
-{
-  { &_tc_Cubit_oneof, PARAM_RETURN, sizeof (Cubit_oneof) },
-  { &_tc_Cubit_oneof, PARAM_IN, 0 }
-};
-
-static const TAO_Call_Data Cubit_cube_union_calldata = 
-{
-  "cube_union", CORBA::B_TRUE,
-  2, &Cubit_cube_union_params [0],
-  0, 0
-};
-
-Cubit_oneof *
-Cubit_cube_union (Cubit_ptr target,
-		  Cubit_oneof &values,
-		  CORBA::Environment &env)
-{
-  Cubit_oneof *retval;
-  STUB_Object *data;
-
-  if (target->QueryInterface (IID_STUB_Object, (void **) &data) != NOERROR)
-    env.exception (new CORBA::INV_OBJREF (COMPLETED_NO));
-  else
-    {
-      data->do_call (env, &Cubit_cube_union_calldata,
-		     &retval, &values);
-      data->Release ();
-    }
-  return retval;
-}
-
-static void
-cube_union_skel (CORBA::ServerRequest &req,
-		 CORBA::Object_ptr obj,
-		 CORBA::Environment &env)
-{
-  CORBA::NVList_ptr nvlist;
-  CORBA::NamedValue_ptr nv;
-  CORBA::Any temp_value (TC_Cubit_oneof);
-
-  req.orb ()->create_list (0, nvlist);
-  nv = nvlist->add_value (0, temp_value, CORBA::ARG_IN, env);
-  dexc (env, "cube_union_3rd, add_value");
-
-  req.params (nvlist, env);
-  dexc (env, "cube_union_3rd, get params");
-
-  Cubit_oneof *v;
-  Cubit_oneof *r = new Cubit_oneof;
-
-  v = (Cubit_oneof *)nv->value ()->value ();
-  r->_disc = v->_disc;
-
-  switch (v->_disc) 
-    {
-    case e_0th:
-      r->o = (CORBA::Octet) (v->o * v->o * v->o);
-      break;
-
-    case e_1st:
-      r->s = (CORBA::Short) (v->s * v->s * v->s);
-      break;
-
-    case e_2nd:
-      r->l = v->l * v->l * v->l;
-      break;
-
-    case e_3rd:
-    default:
-      r->cm.o = (CORBA::Octet) (v->cm.o * v->cm.o * v->cm.o);
-      r->cm.s = (CORBA::Short) (v->cm.s * v->cm.s * v->cm.s);
-      r->cm.l = v->cm.l * v->cm.l * v->cm.l;
-      break;
-    }
-
-  CORBA::Any *any = new CORBA::Any (TC_Cubit_oneof, r, CORBA::B_TRUE);
-
-  req.result (any, env);
-  dexc (env, "cube_struct, result");
-}
-
-// PLEASE EXIT
-
-static const TAO_Call_Data Cubit_please_exit_calldata = 
-{
-  "please_exit", CORBA::B_FALSE,
-  0, 0,
-  0, 0
-};
-
-void
-Cubit_please_exit (Cubit_ptr target,
-		   CORBA::Environment &env)
-{
-  STUB_Object *data;
-
-  if (target->QueryInterface (IID_STUB_Object, (void **) &data) != NOERROR)
-    env.exception (new CORBA::INV_OBJREF (COMPLETED_NO));
-  else 
-    {
-      data->do_call (env, &Cubit_please_exit_calldata);
-      data->Release ();
-    }
-}
-
-static void
-_please_exit_skel (CORBA::ServerRequest &req,
-		   CORBA::Object_ptr obj,
-		   CORBA::Environment &env)
-{
-  dmsg ("I've been asked to shut down...");
-  req.oa ()->please_shutdown (env);
-  dexc (env, "please_exit, please_shutdown");
-}
-
-const CORBA::Char *Cubit__id = (CORBA::Char *) "IDL:Eng.SUN.COM/Cubit:1.1";
-
-// table of all operations, used by operation dispatch to get to the
-// right skeleton ... could be sorted by the IDL compiler so bsearch
-// is effective, perhaps with help from opname hashes and a small
-// cache (e.g. like Obj-C?).  for now, just lsearch.
-
-const TAO_Skel_Entry Cubit_operations [] = 
-{
-  { &Cubit_cube_octet_calldata, _cube_octet_skel },
-  { &Cubit_cube_short_calldata, _cube_short_skel },
-  { &Cubit_cube_long_calldata, _cube_long_skel },
-  { &Cubit_cube_struct_calldata, _cube_struct_skel },
-  { &Cubit_cube_union_calldata, _cube_union_skel },
-  { &Cubit_please_exit_calldata, _please_exit_skel },
-  { 0, 0 } // last entry
-};
diff --git a/TAO/tests/Cubit/TAO/DII_Cubit/cubit.h b/TAO/tests/Cubit/TAO/DII_Cubit/cubit.h
deleted file mode 100644
index f587f6802f1..00000000000
--- a/TAO/tests/Cubit/TAO/DII_Cubit/cubit.h
+++ /dev/null
@@ -1,105 +0,0 @@
-// @(#)cubit.hh	1.1 95/09/10
-// Copyright 1994-1995 by Sun Microsystems Inc.
-// All Rights Reserved
-//
-// Hand-crafted C language binding glue ...
-//
-// This doesn't use C++ since doing the obvious derivation (all parent
-// interfaces are virtual public parents) makes object references have
-// different "views".  That is, a pointer to a Cubit (i.e. a
-// Cubit_ptr) would not have the same binary value as a pointer to a
-// CORBA::Object (i.e. a CORBA::Object_ptr, generic objref).  That'd
-// mean lots of narrowing/widening/RTTI infrastructure.
-
-#ifndef	_CUBIT_HH
-#define	_CUBIT_HH
-
-#ifdef	_MSC_VER
-#pragma	pack (push, 1)			// VC++, known padding rules
-#endif	// VC++
-
-#include "tao/corba.h"
-
-//
-// C style binding
-//
-
-typedef CORBA::Object	Cubit;
-typedef Cubit *Cubit_ptr, *CubitRef;
-
-extern CORBA::TypeCode_ptr	TC_Cubit_Many;
-extern CORBA::TypeCode_ptr	TC_Cubit_oneof;
-
-struct Cubit_Many 
-{
-  CORBA::Octet	o;
-  CORBA::Long	l;
-  CORBA::Short	s;
-};
-
-enum Cubit_discrim {e_0th = 0, e_1st = 1, e_2nd = 2,
-                    e_3rd = 3, e_4th = 4, e_5th = 5};
-
-struct Cubit_oneof 
-{
-  Cubit_discrim _disc;
-
-  union 
-  {
-    CORBA::Octet	o;
-    CORBA::Short	s;
-    CORBA::Long	l;
-    Cubit_Many      cm;
-  };
-};
-
-CORBA::Octet
-Cubit_cube_octet (
-    Cubit_ptr		target,
-    CORBA::Octet	o,
-    CORBA::Environment	&env
-);
-
-CORBA::Short
-Cubit_cube_short (
-    Cubit_ptr		target,
-    CORBA::Short	s,
-    CORBA::Environment	&env
-);
-
-CORBA::Long
-Cubit_cube_long (
-    Cubit_ptr		target,
-    CORBA::Long		l,
-    CORBA::Environment	&env
-);
-
-Cubit_Many *
-Cubit_cube_struct (
-    Cubit_ptr		target,
-    Cubit_Many		&values,
-    CORBA::Environment	&env
-);
-
-Cubit_oneof *
-Cubit_cube_union (
-    Cubit_ptr		target,
-    Cubit_oneof         &values,
-    CORBA::Environment	&env
-);
-
-void
-Cubit_please_exit (
-    Cubit_ptr		target,
-    CORBA::Environment	&env
-);
-
-extern const CORBA::Char *Cubit__id;		// type ID
-
-extern const TAO_Skel_Entry Cubit_operations [];
-
-#ifdef	_MSC_VER
-#pragma	pack (pop)			// VC++, go back to other padding rules
-#endif	// VC++
-
-#endif	// _CUBIT_HH
diff --git a/TAO/tests/Cubit/TAO/DII_Cubit/cubit.idl b/TAO/tests/Cubit/TAO/DII_Cubit/cubit.idl
deleted file mode 100644
index a424b9e5c1c..00000000000
--- a/TAO/tests/Cubit/TAO/DII_Cubit/cubit.idl
+++ /dev/null
@@ -1,42 +0,0 @@
-// @(#)cubit.idl	1.1 95/09/10
-// Copyright 1994-1995 by Sun Microsystems, Inc.
-
-#pragma prefix	"Eng.SUN.COM"
-#pragma version Cubit 1.1
-
-interface Cubit 
-{
-  octet	cube_octet (in octet o);
-  short	cube_short (in short s);
-  long	cube_long (in long l);
-
-  struct Many 
-  {
-    octet	o;		// + 3 bytes padding (normally) ...
-    long	l;
-    short	s;		// + 2 bytes padding (normally) ...
-  };
-
-  Many	cube_struct (in Many values);
-
-  enum discrim {e_0th, e_1st, e_2nd, e_3rd, e_4th, e_5th};
-
-  union oneof switch (discrim) 
-    {
-      // this is an easy union to interpret; no padding
-      // is needed between discriminant and value.
-    case e_0th:
-      octet		o;
-    case e_1st:
-      short		s;
-    case e_2nd:
-      long		l;
-    case e_3rd:
-    default:
-      Many		cm;
-    };
-
-  oneof	cube_union (in oneof values);
-
-  oneway void please_exit ();
-};
diff --git a/TAO/tests/Cubit/TAO/DII_Cubit/cubitC.cpp b/TAO/tests/Cubit/TAO/DII_Cubit/cubitC.cpp
deleted file mode 100644
index d8956f625ea..00000000000
--- a/TAO/tests/Cubit/TAO/DII_Cubit/cubitC.cpp
+++ /dev/null
@@ -1,385 +0,0 @@
-// @ (#)cubitC.cpp	05/14/97
-// Copyright 1994-1995 by Sun Microsystems Inc.
-// All Rights Reserved
-//
-// Modified version of Cubit Example written by Sun Microsystems Inc.
-// Modified by: Brian Mendel
-
-#include "cubitC.h"		// for stubs ...
-
-Cubit_ptr Cubit::_duplicate (Cubit_ptr obj)
-{
-  if (obj)
-    obj->AddRef ();
-
-  return obj;
-}
-
-Cubit_ptr Cubit::_narrow (CORBA::Object_ptr obj)
-{
-  CORBA::Environment env;
-
-  if (obj->_is_a ("IDL:Cubit:1.0", env))
-    {
-      obj->Release (); // Release the reference grabbed by _is_a ()
-
-      STUB_Object *istub;
-
-      if (obj->QueryInterface (IID_STUB_Object, (void **) &istub) != NOERROR)
-	return Cubit::_nil ();
-
-      obj->Release ();
-      Cubit_ptr new_obj = new Cubit (istub);
-      return Cubit::_duplicate (new_obj);
-    }
-  else
-    ;// Do we need to do an obj->Release () here if _is_a () failed?
-
-  return Cubit::_nil ();
-}
-
-Cubit_ptr Cubit::_nil (void)
-{
-  return (Cubit_ptr)NULL;
-}
-
-// CUBE OCTET
-
-static const TAO_Param_Data Cubit_cube_octet_params [] =
-{
-  { CORBA::_tc_octet, PARAM_RETURN, 0 },
-  { CORBA::_tc_octet, PARAM_IN, 0 }
-};
-
-static const TAO_Call_Data Cubit_cube_octet_calldata =
-{
-  "cube_octet", CORBA::B_TRUE,
-  2, &Cubit_cube_octet_params [0],
-  0, 0
-};
-
-CORBA::Octet
-Cubit::Cubit_cube_octet (CORBA::Octet o,
-			 CORBA::Environment &env)
-{
-  CORBA::Octet retval;
-
-  STUB_Object *istub;
-
-  if (this->QueryInterface (IID_STUB_Object, (void **) &istub) != NOERROR)
-    {
-      env.exception (new CORBA::DATA_CONVERSION (CORBA::COMPLETED_NO));
-      return 0;
-    }
-
-  this->Release ();
-
-  istub->do_call (env, &Cubit_cube_octet_calldata,
-		  &retval, &o);
-  istub->Release ();
-
-  return retval;
-}
-
-// CUBE SHORT
-
-static const TAO_Param_Data Cubit_cube_short_params [] =
-{
-  { CORBA::_tc_short, PARAM_RETURN, 0 },
-  { CORBA::_tc_short, PARAM_IN, 0 }
-};
-
-static const TAO_Call_Data Cubit_cube_short_calldata =
-{
-  "cube_short", CORBA::B_TRUE,
-  2, &Cubit_cube_short_params [0],
-  0, 0
-};
-
-
-CORBA::Short
-Cubit::Cubit_cube_short (CORBA::Short s,
-			 CORBA::Environment &env)
-{
-  CORBA::Short retval;
-
-  STUB_Object *istub;
-
-  if (this->QueryInterface (IID_STUB_Object, (void **) &istub) != NOERROR)
-    {
-      env.exception (new CORBA::DATA_CONVERSION (CORBA::COMPLETED_NO));
-      return 0;
-    }
-
-  this->Release ();
-
-  istub->do_call (env, &Cubit_cube_short_calldata,
-                  &retval, &s);
-
-  istub->Release ();
-
-  return retval;
-}
-
-// CUBE LONG
-
-static const TAO_Param_Data Cubit_cube_long_params [] =
-{
-  { CORBA::_tc_long, PARAM_RETURN, 0 },
-  { CORBA::_tc_long, PARAM_IN, 0 }
-};
-
-static const TAO_Call_Data Cubit_cube_long_calldata =
-{
-  "cube_long", CORBA::B_TRUE,
-  2, &Cubit_cube_long_params [0],
-  0, 0
-};
-
-CORBA::Long
-Cubit::Cubit_cube_long (CORBA::Long l,
-			CORBA::Environment &env)
-{
-  CORBA::Long retval;
-
-  STUB_Object *istub;
-
-  if (this->QueryInterface (IID_STUB_Object, (void **) &istub) != NOERROR)
-    {
-      env.exception (new CORBA::DATA_CONVERSION (CORBA::COMPLETED_NO));
-      return 0;
-    }
-
-  this->Release ();
-
-  istub->do_call (env, &Cubit_cube_long_calldata,
-                  &retval, &l);
-  istub->Release ();
-
-  return retval;
-}
-
-// Encapsulated parameters for struct "Cubit_Many" typecode.  None of
-// these parameters is complicated, so this is just a linear sequence
-// of element encodings
-//
-// NOTE:  it's important that this be longword aligned!!
-
-static const CORBA::Long _oc_Cubit_Many [] =
-{
-  TAO_ENCAP_BYTE_ORDER,          // byte order flag (TRICKY!)
-
-  1, 0,       // empty string:  repository/type ID
-  1, 0,       // empty string:  struct name
-
-  3,          // three struct elements
-
-  // First structure element:  name, typecode for Octet
-  1, 0,       // empty string:  name "o"
-  CORBA::tk_octet,
-
-  // Second structure element:  name, typecode for Long
-  1, 0,       // empty string:  name "l"
-  CORBA::tk_long,
-
-  // Third structure element:  name, typecode for Short
-  1, 0,       // empty string:  name "s"
-  CORBA::tk_short,
-};
-
-static CORBA::TypeCode _tc_Cubit_Many (CORBA::tk_struct,
-                                      sizeof _oc_Cubit_Many,
-				      (u_char *) &_oc_Cubit_Many,
-                                      CORBA::B_FALSE);
-CORBA::TypeCode_ptr TC_Cubit_Many = &_tc_Cubit_Many;
-
-// CUBE STRUCT
-
-static const TAO_Param_Data Cubit_cube_struct_params [] =
-{
-  { &_tc_Cubit_Many, PARAM_RETURN, sizeof (Cubit_Many) },
-  { &_tc_Cubit_Many, PARAM_IN, 0 }
-};
-
-static const TAO_Call_Data Cubit_cube_struct_calldata =
-{
-  "cube_struct", CORBA::B_TRUE,
-  2, &Cubit_cube_struct_params [0],
-  0, 0
-};
-
-Cubit_Many*
-Cubit::Cubit_cube_struct (Cubit_Many &values,
-                          CORBA::Environment &env)
-{
-  Cubit_Many *retval;
-
-  STUB_Object *istub;
-
-  if (this->QueryInterface (IID_STUB_Object, (void **) &istub) != NOERROR)
-    {
-      env.exception (new CORBA::DATA_CONVERSION (CORBA::COMPLETED_NO));
-      return 0;
-    }
-
-  this->Release ();
-
-  istub->do_call (env, &Cubit_cube_struct_calldata,
-		  &retval, &values);
-  istub->Release ();
-
-  return retval;
-}
-
-// CUBE UNION
-
-// NOTE: not all union typecodes can be encoded as an array of "long
-// "values, but this one can.  Ones with discriminants that are one or
-// two bytes long can't easily be coded portably.
-//
-// The benefit of doing it as an array of "long" values is twofold:
-// (a) easier to read; (b) on most systems it's then adequately
-// aligned for the typecode interpreter to use, so no additional
-// runtime copy needs to be made.
-
-static const CORBA::Long _oc_Cubit_oneof [] =
-{
-  TAO_ENCAP_BYTE_ORDER,          // byte order flag (TRICKY)
-  1, 0,       // omitted repository/type ID
-  1, 0,       // omitted struct name, "oneof"
-
-  //
-  // discriminant typecode:
-  //
-  CORBA::tk_enum,    // CORBA::tk_enum
-  72,         // encapsulation length
-
-  TAO_ENCAP_BYTE_ORDER,          // byte order flag (TRICKY)
-  1, 0,       // omitted repository/type ID
-  1, 0,       // omitted enum name, "discrim"
-  6,          // 5 elements in the enum
-
-  1, 0,       // omitted member name, "e_0th"
-  1, 0,       // omitted member name, "e_1st"
-  1, 0,       // omitted member name, "e_2nd"
-  1, 0,       // omitted member name, "e_3rd"
-  1, 0,       // omitted member name, "e_4th"
-  1, 0,       // omitted member name, "e_5th"
-
-  4,       	// default member index (zero based)
-  5,       	// number of union members
-
-  // the 1st union branch arm
-  e_0th,       // member label value
-  1, 0,        // omitted member name, "o"
-  CORBA::tk_octet,    // member typecode
-
-  // the 2nd union branch arm
-  e_1st,      // member label value
-  1, 0,       // omitted member name, "s"
-  CORBA::tk_short,   // member typecode
-
-  // the 3rd union branch arm
-  e_2nd,      // member label value
-  1, 0,       // omitted member name, "l"
-  CORBA::tk_long,    // member typecode
-
-  // the 4th union branch arm
-  e_3rd,      // member label value
-  1, 0,       // omitted member name, "cm"
-
-  // the 4th union member typecode
-  CORBA::tk_struct,  // CORBA::tk_struct
-  60,         // encap length
-
-  TAO_ENCAP_BYTE_ORDER,          // byte order flag (TRICKY)
-  1, 0,       // omitted repository/type ID
-  1, 0,       // omitted struct name, "Many"
-  3,          // three struct members
-
-  // First structure element
-  1, 0,       // omitted member name, "o"
-  CORBA::tk_octet,   // member type, CORBA::tk_octet
-
-  // Second structure element
-  1, 0,       // omitted member name, "l"
-  CORBA::tk_long,    // member type, CORBA::tk_long
-
-  // Third structure element
-  1, 0,       // omitted member name, "s"
-  CORBA::tk_short,   // member type, CORBA::tk_short
-
-  // the 5th union branch arm
-  4,          // the 5th member label value
-  1, 0,       // omitted member name, "cm"
-  ~0,         // indirected typecode (~0)
-  -88         // offset to struct "Many" typecode
-};
-
-static CORBA::TypeCode _tc_Cubit_oneof (CORBA::tk_union,
-				       (sizeof _oc_Cubit_oneof),
-				       (u_char *) &_oc_Cubit_oneof,
-                                       CORBA::B_FALSE);
-CORBA::TypeCode_ptr TC_Cubit_oneof = &_tc_Cubit_oneof;
-
-static const TAO_Param_Data Cubit_cube_union_params [] =
-{
-  { &_tc_Cubit_oneof, PARAM_RETURN, sizeof (Cubit_oneof) },
-  { &_tc_Cubit_oneof, PARAM_IN, 0 }
-};
-
-static const TAO_Call_Data Cubit_cube_union_calldata =
-{
-  "cube_union", CORBA::B_TRUE,
-  2, &Cubit_cube_union_params [0],
-  0, 0
-};
-
-Cubit_oneof *
-Cubit::Cubit_cube_union (Cubit_oneof &values,
-			 CORBA::Environment &env)
-{
-  Cubit_oneof *retval;
-
-  STUB_Object *istub;
-
-  if (this->QueryInterface (IID_STUB_Object, (void **) &istub) != NOERROR)
-    {
-      env.exception (new CORBA::DATA_CONVERSION (CORBA::COMPLETED_NO));
-      return 0;
-    }
-
-  this->Release ();
-
-  istub->do_call (env, &Cubit_cube_union_calldata,
-                  &retval, &values);
-  istub->Release ();
-
-  return retval;
-}
-
-// PLEASE EXIT
-
-static const TAO_Call_Data Cubit_please_exit_calldata =
-{
-  "please_exit", CORBA::B_FALSE,
-  0, 0,
-  0, 0
-};
-
-void
-Cubit::Cubit_please_exit (CORBA::Environment &env)
-{
-  STUB_Object *istub;
-
-  if (this->QueryInterface (IID_STUB_Object, (void **) &istub) != NOERROR)
-    {
-      env.exception (new CORBA::DATA_CONVERSION (CORBA::COMPLETED_NO));
-      return;
-    }
-
-  this->Release ();
-
-  istub->do_call (env, &Cubit_please_exit_calldata);
-  istub->Release ();
-}
diff --git a/TAO/tests/Cubit/TAO/DII_Cubit/cubitC.h b/TAO/tests/Cubit/TAO/DII_Cubit/cubitC.h
deleted file mode 100644
index 26c44f7b546..00000000000
--- a/TAO/tests/Cubit/TAO/DII_Cubit/cubitC.h
+++ /dev/null
@@ -1,101 +0,0 @@
-// @(#)cubitC.h 05/14/97
-// Copyright 1994-1995 by Sun Microsystems Inc.
-// All Rights Reserved
-//
-// Modified version of Cubit Example written by Sun Microsystems Inc.
-// Modified by: Brian Mendel
-
-/**************************************************************************
-This file has been hand-crafted to work with the ORB API of the SUN's IIOP
-implementation 
-***************************************************************************/
-
-#ifndef	_CUBIT_HH
-#define	_CUBIT_HH
-
-#ifdef	_MSC_VER
-#pragma	pack (push, 1)			// VC++, known padding rules
-#endif	// VC++
-
-#include "tao/corba.h"
-
-#include <iostream.h>
-
-extern CORBA::TypeCode_ptr	TC_Cubit_Many;
-extern CORBA::TypeCode_ptr	TC_Cubit_oneof;
-
-struct Cubit_Many 
-{
-  CORBA::Octet o;
-  CORBA::Long  l;
-  CORBA::Short s;
-};
-
-enum Cubit_discrim
-{ 
-  e_0th = 0,
-  e_1st = 1,
-  e_2nd = 2,
-  e_3rd = 3,
-  e_4th = 4,
-  e_5th = 5 
-};
-
-struct Cubit_oneof 
-{
-  Cubit_discrim  _disc;
-   
-  union 
-  {    
-    CORBA::Octet o;
-    CORBA::Short s;
-    CORBA::Long  l;
-    Cubit_Many  cm;
-  };
-};
-
-class Cubit;
-typedef Cubit *Cubit_ptr;
-typedef Cubit_ptr Cubit_ref;
-
-class Cubit : public virtual CORBA_Object
-{
-public:
- 
-  static Cubit_ptr _duplicate(Cubit_ptr obj);
-  static Cubit_ptr _narrow(CORBA::Object_ptr obj);
-  static Cubit_ptr _nil();
-
-  virtual CORBA::Octet Cubit_cube_octet (CORBA::Octet       o,
-					CORBA::Environment &env);
-
-  virtual CORBA::Short Cubit_cube_short (CORBA::Short       s,
-					CORBA::Environment &env);
-  
-  virtual CORBA::Long Cubit_cube_long (CORBA::Long        l,
-				      CORBA::Environment &env);
-  
-  virtual Cubit_Many* Cubit_cube_struct (Cubit_Many        &values,
-					 CORBA::Environment &env);
-  
-  virtual Cubit_oneof* Cubit_cube_union (Cubit_oneof       &values,
-					 CORBA::Environment &env);
-  
-  virtual void Cubit_please_exit (CORBA::Environment &env);
-
-protected:
-  Cubit (void) { }
-  Cubit (STUB_Object *objref)
-    : CORBA_Object (objref) { }
-  virtual ~Cubit (void) { }
-};
-
-extern const CORBA::Char *Cubit__id;		// type ID
-
-#ifdef	_MSC_VER
-#pragma	pack (pop)			// VC++, go back to other padding rules
-#endif	// VC++
-
-#endif	// _CUBIT_HH
-
-
diff --git a/TAO/tests/Cubit/TAO/DII_Cubit/cubitS.cpp b/TAO/tests/Cubit/TAO/DII_Cubit/cubitS.cpp
deleted file mode 100644
index 0e313d7e7c8..00000000000
--- a/TAO/tests/Cubit/TAO/DII_Cubit/cubitS.cpp
+++ /dev/null
@@ -1,226 +0,0 @@
-// @(#)cubitS.cpp	05/14/97
-// Copyright 1994-1995 by Sun Microsystems Inc.
-// All Rights Reserved
-//
-// TEST:	hand-written C-style "Cubit" stubs and "skeletons"
-//
-
-#include "tao/corba.h"
-
-#include "cubitS.h"
-#include "cubitC.cpp"
-
-#include "method_db.i"
-
-TAO_Dynamic_Hash_OpTable tao_cubit_optable (cubit_operations, 7, 14);  // Dynamic Operation Table
-
-_skel_Cubit::_skel_Cubit (const char *obj_name)
-{
-  const char* mn = "_skel_Cubit::_skel_Cubit ()";
-  
-  char *type_id = "IDL:Cubit:1.0";
-  IIOP_Object *data;
-  TAO_ORB_Core *ocp = TAO_ORB_Core_instance ();
-  CORBA::POA_ptr oa = ocp->root_poa ();
-  CORBA::ORB_ptr orb = ocp->orb ();
-
-  if (oa == 0)
-    {
-      // We just have to assume that oa will be good, or we have to
-      // throw an exception.  For now we "assume", but we'll
-      ACE_ERROR ((LM_ERROR, " (%P|%t) %s Unable to locate a valid object adapter\n", mn));
-      return;
-    }
-   
-  this->optable_ = &tao_cubit_optable;
-  data = new IIOP_Object (type_id);
-
-  data->profile.iiop_version.major = IIOP::MY_MAJOR;
-  data->profile.iiop_version.minor = IIOP::MY_MINOR;
-  const ACE_INET_Addr& addr = ocp->orb_params ()->addr ();
-  data->profile.host = ACE_OS::strdup (addr.get_host_name ());
-  data->profile.port = addr.get_port_number ();
-  data->profile.object_key.length =  ACE_OS::strlen (obj_name);
-  data->profile.object_key.maximum = data->profile.object_key.length;
-  data->profile.object_key.buffer =
-    new CORBA::Octet[(size_t)data->profile.object_key.length + 1];
-   
-  ACE_OS::memcpy (data->profile.object_key.buffer,
-		  obj_name,
-		  data->profile.object_key.length+1);
-
-  this->set_parent (data);
-  this->sub_ = this;
-
-  if (oa->bind (data->profile.object_key, this) == -1)
-    ACE_ERROR ((LM_ERROR,
-		" (%P|%t) %s Unable to bind object to key '%s': %p\n",
-		mn,
-		data->profile.object_key.buffer));
-}
-
-void
-_skel_Cubit::_cube_octet_skel (CORBA::ServerRequest &req,
-			       CORBA::Object_ptr    obj,
-			       CORBA::Environment   &env)
-{
-  CORBA::NVList_ptr nvlist;
-  CORBA::NamedValue_ptr	nv;
-  CORBA::Any temp_value (CORBA::_tc_octet);
-   
-  req.orb ()->create_list (0, nvlist);
-  nv = nvlist->add_value (0, temp_value, CORBA::ARG_IN, env);
-  dexc (env, "cube_octet, add value");
-   
-  req.params (nvlist, env);
-  dexc (env, "cube_octet, get params");
-   
-  // Call Implementation
-  CORBA::Octet *value = new CORBA::Octet;
-  Cubit *the_cubit = (Cubit *) obj->get_subclass ();
-
-  *value = the_cubit->Cubit_cube_octet (*(CORBA::Octet *) nv->value ()->value (), env);
-
-  CORBA::Any *any = new CORBA::Any (CORBA::_tc_octet, value, CORBA::B_TRUE);
-   
-  req.result (any, env);
-  dexc (env, "cube_octet, result");
-}
-
-void
-_skel_Cubit::_cube_short_skel (CORBA::ServerRequest &req,
-                               CORBA::Object_ptr    obj,
-                               CORBA::Environment   &env)
-{
-  CORBA::NVList_ptr nvlist;
-  CORBA::NamedValue_ptr nv;
-  CORBA::Any temp_value (CORBA::_tc_short);
-   
-  req.orb ()->create_list (0, nvlist);
-  nv = nvlist->add_value (0, temp_value, CORBA::ARG_IN, env);
-  dexc (env, "cube_short, add_value");
-   
-  req.params (nvlist, env);
-  dexc (env, "cube_short, get params");
-   
-  // Call Implementation
-  CORBA::Short *value = new CORBA::Short;
-  Cubit *the_cubit = (Cubit *) obj->get_subclass ();
-  *value = the_cubit->Cubit_cube_short (*(CORBA::Short *) nv->value ()->value (), env);
-   
-  CORBA::Any *any = new CORBA::Any (CORBA::_tc_short, value, CORBA::B_TRUE);
-   
-  req.result (any, env);
-  dexc (env, "cube_short, result");
-}
-
-void
-_skel_Cubit::_cube_long_skel (CORBA::ServerRequest &req,
-                              CORBA::Object_ptr    obj,
-                              CORBA::Environment   &env)
-{
-  CORBA::NVList_ptr nvlist;
-  CORBA::NamedValue_ptr nv;
-  CORBA::Any temp_value (CORBA::_tc_long);
-   
-  req.orb ()->create_list (0, nvlist);
-  nv = nvlist->add_value (0, temp_value, CORBA::ARG_IN, env);
-  dexc (env, "cube_long, add_value");
-   
-  req.params (nvlist, env);
-  dexc (env, "cube_long, get params");
-   
-  // Call Implementation
-  CORBA::Long *value = new CORBA::Long;
-  Cubit *the_cubit = (Cubit *) obj->get_subclass ();
-  *value = the_cubit->Cubit_cube_long (*(CORBA::Long *) nv->value ()->value (), env);
-   
-  CORBA::Any  		*any =
-    new CORBA::Any (CORBA::_tc_long, value, CORBA::B_TRUE);
-   
-  req.result (any, env);
-  dexc (env, "cube_long, result");
-}
-
-void
-_skel_Cubit::_cube_struct_skel (CORBA::ServerRequest &req,
-                                CORBA::Object_ptr    obj,
-                                CORBA::Environment   &env)
-{
-  CORBA::NVList_ptr nvlist;
-  CORBA::NamedValue_ptr nv;
-  CORBA::Any temp_value (TC_Cubit_Many);
-   
-  req.orb ()->create_list (0, nvlist);
-  nv = nvlist->add_value (0, temp_value, CORBA::ARG_IN, env);
-  dexc (env, "cube_struct, add_value");
-   
-  req.params (nvlist, env);
-  dexc (env, "cube_struct, get params");
-   
-  // Call Implementation
-  Cubit_Many *value;
-  Cubit *the_cubit = (Cubit *) obj->get_subclass ();
-  value = the_cubit->Cubit_cube_struct (*(Cubit_Many *) nv->value ()->value (), env);
-   
-  Cubit_Many *retval = new Cubit_Many;
-  retval->o = (CORBA::Octet)value->o;
-  retval->s = (CORBA::Short)value->s;
-  retval->l = value->l;
-   
-  // dmsg2 ("cube struct.o, %d -> %d", value->o, retval->o);
-  // dmsg2 ("cube struct.s, %d -> %d", value->s, retval->s);
-  // dmsg2 ("cube struct.l, %d -> %d", value->l, retval->l);
-   
-  CORBA::Any *any = new CORBA::Any (TC_Cubit_Many, retval, CORBA::B_TRUE);
-   
-  req.result (any, env);
-  dexc (env, "cube_struct, result");
-}
-
-void
-_skel_Cubit::_cube_union_skel (CORBA::ServerRequest	&req,
-                               CORBA::Object_ptr    obj,
-                               CORBA::Environment   &env)
-{
-  CORBA::NVList_ptr nvlist;
-  CORBA::NamedValue_ptr nv;
-  CORBA::Any temp_value (TC_Cubit_oneof);
-   
-  req.orb ()->create_list (0, nvlist);
-  nv = nvlist->add_value (0, temp_value, CORBA::ARG_IN, env);
-  dexc (env, "cube_union_3rd, add_value");
-   
-  req.params (nvlist, env);
-  dexc (env, "cube_union_3rd, get params");
-   
-  // Call Implementation
-  Cubit_oneof *v;
-  Cubit *the_cubit = (Cubit *) obj->get_subclass ();
-  v = the_cubit->Cubit_cube_union (*(Cubit_oneof *) nv->value ()->value (), env);
-
-  Cubit_oneof *r = new Cubit_oneof;
-  r->_disc = v->_disc;
-  r->o = (CORBA::Octet) (v->o);
-  r->s = (CORBA::Short) (v->s);
-  r->l = v->l;
-  r->cm.o = (CORBA::Octet) (v->cm.o);
-  r->cm.s = (CORBA::Short) (v->cm.s);
-  r->cm.l =  v->cm.l;
-   
-  CORBA::Any *any = new CORBA::Any (TC_Cubit_oneof, r, CORBA::B_TRUE);
-   
-  req.result (any, env);
-  dexc (env, "cube_struct, result");
-}
-
-void
-_skel_Cubit::_please_exit_skel (CORBA::ServerRequest &req,
-                                CORBA::Object_ptr    obj,
-                                CORBA::Environment   &env)
-{
-  ACE_UNUSED_ARG (req);
-  
-  Cubit *the_cubit = (Cubit *) obj->get_subclass ();
-  the_cubit->Cubit_please_exit (env);
-}
diff --git a/TAO/tests/Cubit/TAO/DII_Cubit/cubitS.h b/TAO/tests/Cubit/TAO/DII_Cubit/cubitS.h
deleted file mode 100644
index bf7dbf12363..00000000000
--- a/TAO/tests/Cubit/TAO/DII_Cubit/cubitS.h
+++ /dev/null
@@ -1,82 +0,0 @@
-// @(#)cubitS.h 05/14/97
-// Copyright 1994-1995 by Sun Microsystems Inc.
-// All Rights Reserved
-//
-// Modified version of Cubit Example written by Sun Microsystems Inc.
-// Modified by: Brian Mendel
-
-/**************************************************************************
-This file has been hand-crafted to work with the ORB API of the SUN's IIOP
-implementation 
-***************************************************************************/
-
-#ifndef	_SKEL_CUBIT_HH
-#define	_SKEL_CUBIT_HH
-
-#include "cubitC.h"
-#include "tao/corba.h"
-
-class _skel_Cubit;
-typedef _skel_Cubit *_skel_Cubit_ptr;
-typedef _skel_Cubit_ptr _skel_Cubit_ref;
-
-class _skel_Cubit : public Cubit
-{
-public:
-  virtual
-  CORBA::Octet Cubit_cube_octet (CORBA::Octet       o,
-				CORBA::Environment &env) = 0;
-  static 
-  void _cube_octet_skel(CORBA::ServerRequest &req,
-			CORBA::Object_ptr    obj,
-			CORBA::Environment   &env);
-
-  virtual
-  CORBA::Short Cubit_cube_short (CORBA::Short       s,
-				CORBA::Environment &env) = 0;
-  
-  static
-  void _cube_short_skel (CORBA::ServerRequest &req,
-			 CORBA::Object_ptr    obj,
-			 CORBA::Environment   &env);
-
-  virtual
-  CORBA::Long Cubit_cube_long (CORBA::Long        l,
-			      CORBA::Environment &env) = 0;
-  
-  static 
-  void _cube_long_skel (CORBA::ServerRequest &req,
-			CORBA::Object_ptr    obj,
-			CORBA::Environment   &env);
-
-  virtual
-  Cubit_Many* Cubit_cube_struct (Cubit_Many        &values,
-				 CORBA::Environment &env) = 0;
-  
-  static 
-  void _cube_struct_skel (CORBA::ServerRequest &req,
-			  CORBA::Object_ptr    obj,
-			  CORBA::Environment   &env);
-
-  virtual 
-  Cubit_oneof* Cubit_cube_union (Cubit_oneof       &values,
-				 CORBA::Environment &env) = 0;
-  
-  static 
-  void _cube_union_skel (CORBA::ServerRequest &req,
-			 CORBA::Object_ptr    obj,
-			 CORBA::Environment   &env);
-
-  virtual 
-  void Cubit_please_exit (CORBA::Environment &env) = 0;
-
-  static 
-  void _please_exit_skel (CORBA::ServerRequest  &req,
-			  CORBA::Object_ptr     obj,
-			  CORBA::Environment    &env);
-protected:
-  _skel_Cubit (const char* obj_name = 0);
-  virtual ~_skel_Cubit (void) { }
-};
-
-#endif	// _SKEL_CUBIT_HH
diff --git a/TAO/tests/Cubit/TAO/DII_Cubit/cubit_i.cpp b/TAO/tests/Cubit/TAO/DII_Cubit/cubit_i.cpp
deleted file mode 100644
index d15c4b71df0..00000000000
--- a/TAO/tests/Cubit/TAO/DII_Cubit/cubit_i.cpp
+++ /dev/null
@@ -1,87 +0,0 @@
-// @(#)cubit_i.cpp 05/14/97
-// Copyright 1994-1995 by Sun Microsystems Inc.
-// All Rights Reserved
-//
-// TEST:	hand-written Cubit Implementation
-//
-// Modified version of Cubit Example written by Sun Microsystems Inc.
-// Modified by: Brian Mendel
-
-#include "tao/corba.h"    // ... and skeletons
-#include "cubit_i.h"
-
-Cubit_i::Cubit_i (const char *obj_name)
-  : _skel_Cubit (obj_name)
-{
-}
-
-Cubit_i::~Cubit_i (void)
-{
-}
-
-CORBA::Octet
-Cubit_i::Cubit_cube_octet (CORBA::Octet       o,
-                           CORBA::Environment &env)
-{
-  ACE_UNUSED_ARG (env);
-  return (CORBA::Octet) (o * o * o);
-}
-
-CORBA::Short
-Cubit_i::Cubit_cube_short (CORBA::Short       s, 
-                           CORBA::Environment &env)
-{
-  ACE_UNUSED_ARG (env);
-  return (CORBA::Short) (s * s * s);
-}
-
-CORBA::Long
-Cubit_i::Cubit_cube_long (CORBA::Long        l,
-                          CORBA::Environment &env)
-{
-  ACE_UNUSED_ARG (env);
-  return (CORBA::Long) (l * l * l);
-}
-
-Cubit_Many *
-Cubit_i::Cubit_cube_struct (Cubit_Many        &values,
-                            CORBA::Environment &env)
-{
-  ACE_UNUSED_ARG (env);
-  values.o = values.o * values.o * values.o;
-  values.s = values.s * values.s * values.s;
-  values.l = values.l * values.l * values.l;
-   
-  return &values;
-}
-
-Cubit_oneof *
-Cubit_i::Cubit_cube_union (Cubit_oneof &values,
-                           CORBA::Environment &env)
-{
-  ACE_UNUSED_ARG (env);
-  switch (values._disc)
-    {
-    case e_0th:
-      values.o = (CORBA::Octet) (values.o * values.o * values.o);
-      break;
-    case e_1st:
-      values.s = (CORBA::Short) (values.s * values.s * values.s);
-      break;
-    case e_2nd:
-      values.l = values.l * values.l * values.l;
-      break;
-    case e_3rd:
-    default:
-      values.cm.o = (CORBA::Octet) (values.cm.o * values.cm.o * values.cm.o);
-      values.cm.s = (CORBA::Short) (values.cm.s * values.cm.s * values.cm.s);
-      values.cm.l = values.cm.l * values.cm.l * values.cm.l;
-    }
-  return &values;
-}
-
-void Cubit_i::Cubit_please_exit (CORBA::Environment &)
-{
-  ACE_DEBUG ((LM_DEBUG, "(%P|%t) Cubit_please_exit: I've been asked to shut down.\n"));
-  TAO_ORB_Core_instance()->orb ()->shutdown ();
-}
diff --git a/TAO/tests/Cubit/TAO/DII_Cubit/cubit_i.h b/TAO/tests/Cubit/TAO/DII_Cubit/cubit_i.h
deleted file mode 100644
index e2178d65fd5..00000000000
--- a/TAO/tests/Cubit/TAO/DII_Cubit/cubit_i.h
+++ /dev/null
@@ -1,54 +0,0 @@
-// @(#)cubit_i.cpp 05/14/97
-// Copyright 1994-1995 by Sun Microsystems Inc.
-// All Rights Reserved
-//
-// TEST:	hand-written Cubit Implementation
-//
-// Modified version of Cubit Example written by Sun Microsystems Inc.
-// Modified by: Brian Mendel
-
-/**************************************************************************
-This file has been hand-crafted to work with the ORB API of the SUN's IIOP
-implementation 
-***************************************************************************/
-
-#ifndef	_CUBIT_I_HH
-#define	_CUBIT_I_HH
-
-#include "cubitS.h"
-
-class Cubit_i;
-typedef Cubit_i *Cubit_i_ptr;
-typedef Cubit_i_ptr Cubit_i_ref;
-
-class Cubit_i : public _skel_Cubit
-{
-public:
-  Cubit_i (const char *obj_name = 0);
-  ~Cubit_i (void);
-   
-  virtual
-  CORBA::Octet Cubit_cube_octet (CORBA::Octet       o,
-				CORBA::Environment &env);
-
-  virtual
-  CORBA::Short Cubit_cube_short (CORBA::Short       s,
-				CORBA::Environment &env);
-  
-  virtual
-  CORBA::Long Cubit_cube_long (CORBA::Long        l,
-			      CORBA::Environment &env);
-  
-  virtual
-  Cubit_Many *Cubit_cube_struct (Cubit_Many        &values,
-				 CORBA::Environment &env);
-  
-  virtual
-  Cubit_oneof *Cubit_cube_union (Cubit_oneof       &values,
-				 CORBA::Environment &env);
-  
-  virtual
-  void Cubit_please_exit (CORBA::Environment &env);
-};
-
-#endif	// _CUBIT_I_HH
diff --git a/TAO/tests/Cubit/TAO/DII_Cubit/default.bld b/TAO/tests/Cubit/TAO/DII_Cubit/default.bld
deleted file mode 100644
index 196d95eb950..00000000000
--- a/TAO/tests/Cubit/TAO/DII_Cubit/default.bld
+++ /dev/null
@@ -1,35 +0,0 @@
-#!build
-default:
-	nobuild
-	:c_option=slashcomment
-	:cx_e_option=msgnumbers
-	:optimize=standard
-	:optimize=memory
-	:optimize=algorithmic
-	:optimize=loop
-	:object_dir=./.obj
-	:target=vxwppc
-	:cx_silent=21
-	:cx_silent=191
-	:cx_silent=610
-	:sourcedirs=VME_DRV/src
-	:sourcedirs=VME_DRV/api/include
-	:sourcedirs=../../../..
-	:sourcedirs=/home/ace/ACE_wrappers.vxworks
-	:sourcedirs=../../../../tao/compat
-	:libdirs=VME_DRV/vmeXportu
-	:libdirs=../../../../tao
-	:libdirs=/home/ace/ACE_wrappers.vxworks/ace
-	:libraries=vmeXport.a
-	:libraries=tao.a
-	:libraries=libACE.a
-	:libraries=/appl/newgreen/vxppc603/ghsbltin.o
-	:libraries=/appl/newgreen/vxppc603/ghsmath.o
-	:defines=DEBUG
-	:defines=FORCE_ARGS
-	:defines=VME_DRIVER
-clnt.bld
-	program
-svr.bld
-	program
-	:defines=USE_ACE_EVENT_HANDLING
diff --git a/TAO/tests/Cubit/TAO/DII_Cubit/method_db.i b/TAO/tests/Cubit/TAO/DII_Cubit/method_db.i
deleted file mode 100644
index 8a1b474fc9e..00000000000
--- a/TAO/tests/Cubit/TAO/DII_Cubit/method_db.i
+++ /dev/null
@@ -1,57 +0,0 @@
-// @ (#)method_db.i 05/14/97
-
-// This file provides a way of initializing the method database
-// Written by: Brian Mendel
-
-#include	"cubitS.h"
-
-static void
-is_a_skel (CORBA::ServerRequest &req,
-           CORBA::Object_ptr    obj,
-           CORBA::Environment   &env)
-{
-  ACE_UNUSED_ARG (obj);
-  
-  CORBA::NVList_ptr nvlist;
-  CORBA::NamedValue_ptr nv;
-  CORBA::Any temp_value (CORBA::_tc_string);
-
-  req.orb ()->create_list (0, nvlist);
-  nv = nvlist->add_value (0, temp_value, CORBA::ARG_IN, env);
-
-  req.params (nvlist, env);
-
-  if (env.exception () != 0) 
-    {
-      dexc (env, "is_a_skel, get params");
-      return;
-    }
-
-  CORBA::Boolean *retval;
-  CORBA::String value = * (CORBA::String *) nv->value ()->value ();
-
-  if (ACE_OS::strcmp ( (char*)value, "IDL:Cubit:1.0") == 0
-      || ACE_OS::strcmp ( (char *)value, CORBA::_tc_Object->id (env)) == 0)
-    retval = new CORBA::Boolean (CORBA::B_TRUE);
-  else
-    retval = new CORBA::Boolean (CORBA::B_FALSE);
-
-  CORBA::Any *any = new CORBA::Any (CORBA::_tc_boolean, retval, CORBA::B_TRUE);
-
-  req.result (any, env);
-  dexc (env, "_is_a, result");
-}
-
-static const TAO_operation_db_entry cubit_operations[] = 
-{
-  { "_is_a", &is_a_skel },
-  { "cube_octet", &_skel_Cubit::_cube_octet_skel },
-  { "cube_short", &_skel_Cubit::_cube_short_skel },
-  { "cube_long", &_skel_Cubit::_cube_long_skel },
-  { "cube_struct", &_skel_Cubit::_cube_struct_skel },
-  { "cube_union", &_skel_Cubit::_cube_union_skel },
-  { "please_exit", &_skel_Cubit::_please_exit_skel },
-  { 0, 0 }
-};
-   
-
diff --git a/TAO/tests/Cubit/TAO/DII_Cubit/server.dsp b/TAO/tests/Cubit/TAO/DII_Cubit/server.dsp
deleted file mode 100644
index 5826465b371..00000000000
--- a/TAO/tests/Cubit/TAO/DII_Cubit/server.dsp
+++ /dev/null
@@ -1,117 +0,0 @@
-# Microsoft Developer Studio Project File - Name="server" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 5.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Console Application" 0x0103

-

-CFG=server - Win32 Release

-!MESSAGE This is not a valid makefile. To build this project using NMAKE,

-!MESSAGE use the Export Makefile command and run

-!MESSAGE 

-!MESSAGE NMAKE /f "server.mak".

-!MESSAGE 

-!MESSAGE You can specify a configuration when running NMAKE

-!MESSAGE by defining the macro CFG on the command line. For example:

-!MESSAGE 

-!MESSAGE NMAKE /f "server.mak" CFG="server - Win32 Release"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "server - Win32 Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "server - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE 

-

-# Begin Project

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

-

-!IF  "$(CFG)" == "server - Win32 Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir ".\server\Release"

-# PROP BASE Intermediate_Dir ".\server\Release"

-# PROP BASE Target_Dir ".\server"

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir ""

-# PROP Intermediate_Dir ".\Release"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ".\server"

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\..\\" /I "..\..\..\..\..\\" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /YX /FD /c

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 ace.lib tao.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\tao\\" /libpath:"..\..\..\..\..\ace"

-

-!ELSEIF  "$(CFG)" == "server - Win32 Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir ".\server\Debug"

-# PROP BASE Intermediate_Dir ".\server\Debug"

-# PROP BASE Target_Dir ".\server"

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir ""

-# PROP Intermediate_Dir ".\Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ".\server"

-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\..\\" /I "..\..\..\..\..\\" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /YX /FD /c

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386

-# ADD LINK32 aced.lib TAO.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\..\ace"

-

-!ENDIF 

-

-# Begin Target

-

-# Name "server - Win32 Release"

-# Name "server - Win32 Debug"

-# Begin Group "Source Files"

-

-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

-# Begin Source File

-

-SOURCE=.\cubit_i.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\cubitS.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\svr.cpp

-# End Source File

-# End Group

-# Begin Group "Header Files"

-

-# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"

-# Begin Source File

-

-SOURCE=.\cubit_i.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\cubitS.h

-# End Source File

-# End Group

-# Begin Group "Resource Files"

-

-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe"

-# End Group

-# End Target

-# End Project

diff --git a/TAO/tests/Cubit/TAO/DII_Cubit/svc.conf b/TAO/tests/Cubit/TAO/DII_Cubit/svc.conf
deleted file mode 100644
index 43c6a486c92..00000000000
--- a/TAO/tests/Cubit/TAO/DII_Cubit/svc.conf
+++ /dev/null
@@ -1,49 +0,0 @@
-# $Id$
-#
-# This file contains a sample ACE_Service_Config configuration
-# file specifying the strategy factories utilized by an application
-# using TAO.  There are currently only two possible factories:
-# Client_Strategy_Factory and Server_Strategy_Factory.  These names
-# must be used as the second argument to their corresponding line,
-# because that's what the ORB uses to find the desired factory.
-#
-# Note that there are two unordinary characteristics of the way *this*
-# file is set up:
-#   - both client and server strategies are specified in the same
-#     file, which would only make sense for co-located clients & servers
-#   - both of the factories are actually sourced out of libTAO.so
-#     (TAO.DLL on Win32), and they would normally be in a separate
-#     dll from the TAO ORB Core.
-#
-# The options which can be passed to the Resource Factory are:
-#
-#   -ORBresources <which>
-#       where <which> can be 'global' to specify globally-held resources,
-#       or 'tss' to specify thread-specific resources.
-#
-# The options which can be passed to the Client are:
-#     <none currently>
-#
-# The options which can be passed to the Server are:
-#
-#   -ORBconcurrency <which>
-#       where <which> can be 'thread-per-connection' to specify
-#       use of the ACE_Threaded_Strategy concurrency strategy,
-#       or 'reactive' to specify use of the ACE_Reactive_Strategy
-#       concurrency strategy.
-#
-#   -ORBthreadflags  <flags>
-#       specifies the default thread flags to use, where <flags> is a
-#       logical OR'ing of the flags THR_DETACHED, THR_BOUND, THR_NEW_LWP,
-#       THR_SUSPENDED, or THR_DAEMON.  Note that not every flag may be valid
-#       on every platform.
-#
-#   -ORBdemuxstrategy <which>
-#       where <which> can be one of 'dynamic', 'linear', 'active', or 'user',
-#       and specifies the type of object lookup strategy used internally.
-#   -ORBtablesize <unsigned>
-#       specifies the size of the object table
-#
-dynamic Resource_Factory Service_Object * TAO:_make_TAO_Resource_Factory() "-ORBresources global"
-dynamic Client_Strategy_Factory Service_Object * TAO:_make_TAO_Default_Client_Strategy_Factory()
-dynamic Server_Strategy_Factory Service_Object * TAO:_make_TAO_Default_Server_Strategy_Factory() "-ORBconcurrency reactive -ORBdemuxstrategy dynamic -ORBtablesize 128"
diff --git a/TAO/tests/Cubit/TAO/DII_Cubit/svr.bld b/TAO/tests/Cubit/TAO/DII_Cubit/svr.bld
deleted file mode 100644
index 33ca5152c92..00000000000
--- a/TAO/tests/Cubit/TAO/DII_Cubit/svr.bld
+++ /dev/null
@@ -1,12 +0,0 @@
-#!build
-default:
-	program
-	:debuglevel=multi
-cubit_i.cpp
-	C++
-cubitS.cpp
-	C++
-svr.cpp
-	C++
-/home/m225527/vme/src/sockem.c
-	C
diff --git a/TAO/tests/Cubit/TAO/DII_Cubit/svr.cpp b/TAO/tests/Cubit/TAO/DII_Cubit/svr.cpp
deleted file mode 100644
index 1151df9e0fd..00000000000
--- a/TAO/tests/Cubit/TAO/DII_Cubit/svr.cpp
+++ /dev/null
@@ -1,151 +0,0 @@
-// @(#)svr.cpp	05/14/97
-// Copyright 1994-1995 by Sun Microsystems Inc.
-// All Rights Reserved
-//
-// TEST:	simple IIOP server for "cubit.idl" interface.
-//
-// Starts up, builds an objref, prints its string in debug mode,
-// listens for messages, responds to them.
-//
-// Modified version of Cubit Example written by Sun Microsystems Inc.
-// Modified by: Brian Mendel
-
-#include "ace/Get_Opt.h"
-#include "ace/Log_Msg.h"
-
-#include "tao/corba.h"
-
-#include "cubit_i.h"
-
-// Global Variables
-static CORBA::String key = (CORBA::String) "key0";
-
-static int num_of_objs = 1;
-
-// Parses the command line arguments and returns an error status
-
-static int 
-parse_args (int argc, char *argv[])
-{
-  ACE_Get_Opt opts (argc, argv, "dk:n:");
-  int			c;
-   
-  while ((c = opts ()) != -1)
-    switch (c) 
-      {
-      case 'd':  // debug flag
-	TAO_debug_level++;
-	break;
-      case 'k':			// key (str)
-	key = (CORBA::String) opts.optarg;
-	break;
-      case 'n':			// idle seconds b4 exit
-	num_of_objs = ACE_OS::atoi (opts.optarg);
-	break;
-      case '?':
-      default:
-	ACE_ERROR_RETURN ((LM_ERROR,
-			   "usage:  %s"
-			   " [-d]"
-			   " [-k {object_key}]"
-			   "\n", argv [0]), 1);
-      }
-   
-  return 0;  // Indicates successful parsing of command line
-}
-
-// Standard command line parsing utilities used.
-
-int
-main (int argc, char *argv[])
-{
-  CORBA::Environment env;
-  char *orb_name = "internet";
-
-  CORBA::ORB_ptr orb_ptr = CORBA::ORB_init (argc, argv, orb_name, env);
-
-  if (env.exception () != 0) 
-    {
-      env.print_exception ("ORB init");
-      return 1;
-    }
-
-  // Initialize the Basic Object Adapter
-  CORBA::POA_ptr oa_ptr = orb_ptr->POA_init (argc, argv);
-
-  if (oa_ptr == 0)
-    ACE_ERROR_RETURN ((LM_ERROR, " (%P|%t) Unable to initialize the POA.\n"), 1);
-
-  // Parse remaining command line and verify parameters.
-
-  parse_args (argc, argv);
-  
-  // Create implementation object with user specified key.
-  Cubit_i_ptr *my_cubit = new Cubit_i_ptr[num_of_objs];
-
-  for (int i = 0; i < num_of_objs; i++)
-    {
-      CORBA::String obj_str = CORBA::string_alloc (ACE_OS::strlen ((char *) key)+2);
-
-      ::sprintf (obj_str, "%s%d", (char *) key, i);
-
-      my_cubit[i] = new Cubit_i (obj_str);
-
-      if (my_cubit[i] == 0)
-        ACE_ERROR_RETURN ((LM_ERROR,
-			   " (%P|%t) Unable to create implementation object&d\n",
-			   i),
-			  2);
-
-      if (TAO_debug_level > 0)
-	{
-	  // Why are we getting the POA_ptr from here when we've
-	  // already got it above?
-
-	  CORBA::OctetSeq obj_key;
-	  obj_key.buffer = (CORBA::Octet *) obj_str;
-	  obj_key.length = obj_key.maximum = ACE_OS::strlen (obj_str);
-     
-#if 0
-	  CORBA::Object_ptr obj = 0;
-
-	  if (oa_ptr->find (obj_key, obj) == -1)
-	    ACE_ERROR_RETURN ((LM_ERROR,
-			       " (%P|%t) Unable to locate object with key '%s', %p\n", 
-			       key),
-			      3);
-#endif
-     
- 	  // Stringify the objref we'll be implementing, and print it
-	  // to stdout.  Someone will take that string and give it to
-	  // some client.  Then release the object.
-
-	  CORBA::String str;
-         
-	  str = orb_ptr->object_to_string (my_cubit[i], env);
-
-	  if (env.exception () != 0) 
-	    {
-              env.print_exception ("object2string");
-	      return 1;
-	    }
-
-	  ACE_OS::puts ((char *) str);
-	  ACE_OS::fflush (stdout);
-	  //dmsg1 ("Object Created at: '%ul'", obj);
-	  dmsg1 ("listening as object '%s'", str);
-	}
-
-      CORBA::string_free (obj_str);  
-    }
-
-  // Handle requests for this object until we're killed, or one of the
-  // methods asks us to exit.
-  if (orb_ptr->run () == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "run"), -1);
-
-  // Free resources
-  CORBA::release (orb_ptr);
-
-  return 0;
-}
diff --git a/TAO/tests/Cubit/TAO/DII_Cubit/test.mak b/TAO/tests/Cubit/TAO/DII_Cubit/test.mak
deleted file mode 100644
index 5fd62ea9ef6..00000000000
--- a/TAO/tests/Cubit/TAO/DII_Cubit/test.mak
+++ /dev/null
@@ -1,1596 +0,0 @@
-# Microsoft Developer Studio Generated NMAKE File, Format Version 4.20

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Console Application" 0x0103

-

-!IF "$(CFG)" == ""

-CFG=server - Win32 Debug

-!MESSAGE No configuration specified.  Defaulting to server - Win32 Debug.

-!ENDIF 

-

-!IF "$(CFG)" != "client - Win32 Release" && "$(CFG)" != "client - Win32 Debug"\

- && "$(CFG)" != "server - Win32 Release" && "$(CFG)" != "server - Win32 Debug"

-!MESSAGE Invalid configuration "$(CFG)" specified.

-!MESSAGE You can specify a configuration when running NMAKE on this makefile

-!MESSAGE by defining the macro CFG on the command line.  For example:

-!MESSAGE 

-!MESSAGE NMAKE /f "test.mak" CFG="server - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "client - Win32 Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "client - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE "server - Win32 Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "server - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE 

-!ERROR An invalid configuration is specified.

-!ENDIF 

-

-!IF "$(OS)" == "Windows_NT"

-NULL=

-!ELSE 

-NULL=nul

-!ENDIF 

-################################################################################

-# Begin Project

-# PROP Target_Last_Scanned "server - Win32 Debug"

-RSC=rc.exe

-CPP=cl.exe

-

-!IF  "$(CFG)" == "client - Win32 Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "client\Release"

-# PROP BASE Intermediate_Dir "client\Release"

-# PROP BASE Target_Dir "client"

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir ""

-# PROP Intermediate_Dir "Release"

-# PROP Target_Dir "client"

-OUTDIR=.

-INTDIR=.\Release

-

-ALL : "$(OUTDIR)\client-r.exe"

-

-CLEAN : 

-	-@erase "$(INTDIR)\clnt.obj"

-	-@erase "$(INTDIR)\cubitC.obj"

-	-@erase "$(OUTDIR)\client-r.exe"

-

-"$(INTDIR)" :

-    if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"

-

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "__ACE_INLINE__" /YX /c

-CPP_PROJ=/nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D\

- "__ACE_INLINE__" /Fp"$(INTDIR)/client.pch" /YX /Fo"$(INTDIR)/" /c 

-CPP_OBJS=.\Release/

-CPP_SBRS=.\.

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-BSC32_FLAGS=/nologo /o"$(OUTDIR)/client.bsc" 

-BSC32_SBRS= \

-	

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 ace.lib TAO.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 /out:"client-r.exe"

-LINK32_FLAGS=ace.lib TAO.lib kernel32.lib user32.lib gdi32.lib winspool.lib\

- comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib\

- odbc32.lib odbccp32.lib /nologo /subsystem:console /incremental:no\

- /pdb:"$(OUTDIR)/client-r.pdb" /machine:I386 /out:"$(OUTDIR)/client-r.exe" 

-LINK32_OBJS= \

-	"$(INTDIR)\clnt.obj" \

-	"$(INTDIR)\cubitC.obj"

-

-"$(OUTDIR)\client-r.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)

-    $(LINK32) @<<

-  $(LINK32_FLAGS) $(LINK32_OBJS)

-<<

-

-!ELSEIF  "$(CFG)" == "client - Win32 Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "client\Debug"

-# PROP BASE Intermediate_Dir "client\Debug"

-# PROP BASE Target_Dir "client"

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir ""

-# PROP Intermediate_Dir "Debug"

-# PROP Target_Dir "client"

-OUTDIR=.

-INTDIR=.\Debug

-

-ALL : "$(OUTDIR)\client.exe"

-

-CLEAN : 

-	-@erase "$(INTDIR)\clnt.obj"

-	-@erase "$(INTDIR)\cubitC.obj"

-	-@erase "$(INTDIR)\vc40.idb"

-	-@erase "$(INTDIR)\vc40.pdb"

-	-@erase "$(OUTDIR)\client.exe"

-	-@erase "$(OUTDIR)\client.ilk"

-	-@erase "$(OUTDIR)\client.pdb"

-

-"$(INTDIR)" :

-    if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"

-

-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\proto\include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c

-CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\proto\include" /D "WIN32" /D\

- "_DEBUG" /D "_CONSOLE" /Fp"$(INTDIR)/client.pch" /YX /Fo"$(INTDIR)/"\

- /Fd"$(INTDIR)/" /c 

-CPP_OBJS=.\Debug/

-CPP_SBRS=.\.

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-BSC32_FLAGS=/nologo /o"$(OUTDIR)/client.bsc" 

-BSC32_SBRS= \

-	

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386

-# ADD LINK32 aced.lib TAO.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386

-LINK32_FLAGS=aced.lib TAO.lib kernel32.lib user32.lib gdi32.lib winspool.lib\

- comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib\

- odbc32.lib odbccp32.lib /nologo /subsystem:console /incremental:yes\

- /pdb:"$(OUTDIR)/client.pdb" /debug /machine:I386 /out:"$(OUTDIR)/client.exe" 

-LINK32_OBJS= \

-	"$(INTDIR)\clnt.obj" \

-	"$(INTDIR)\cubitC.obj"

-

-"$(OUTDIR)\client.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)

-    $(LINK32) @<<

-  $(LINK32_FLAGS) $(LINK32_OBJS)

-<<

-

-!ELSEIF  "$(CFG)" == "server - Win32 Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "server\Release"

-# PROP BASE Intermediate_Dir "server\Release"

-# PROP BASE Target_Dir "server"

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir ""

-# PROP Intermediate_Dir "Release"

-# PROP Target_Dir "server"

-OUTDIR=.

-INTDIR=.\Release

-

-ALL : "$(OUTDIR)\server-r.exe"

-

-CLEAN : 

-	-@erase "$(INTDIR)\cubit_i.obj"

-	-@erase "$(INTDIR)\cubitS.obj"

-	-@erase "$(INTDIR)\svr.obj"

-	-@erase "$(OUTDIR)\server-r.exe"

-

-"$(INTDIR)" :

-    if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"

-

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "__ACE_INLINE__" /YX /c

-CPP_PROJ=/nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D\

- "__ACE_INLINE__" /Fp"$(INTDIR)/server.pch" /YX /Fo"$(INTDIR)/" /c 

-CPP_OBJS=.\Release/

-CPP_SBRS=.\.

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-BSC32_FLAGS=/nologo /o"$(OUTDIR)/server.bsc" 

-BSC32_SBRS= \

-	

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 ace.lib TAO.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 /out:"server-r.exe"

-LINK32_FLAGS=ace.lib TAO.lib kernel32.lib user32.lib gdi32.lib winspool.lib\

- comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib\

- odbc32.lib odbccp32.lib /nologo /subsystem:console /incremental:no\

- /pdb:"$(OUTDIR)/server-r.pdb" /machine:I386 /out:"$(OUTDIR)/server-r.exe" 

-LINK32_OBJS= \

-	"$(INTDIR)\cubit_i.obj" \

-	"$(INTDIR)\cubitS.obj" \

-	"$(INTDIR)\svr.obj"

-

-"$(OUTDIR)\server-r.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)

-    $(LINK32) @<<

-  $(LINK32_FLAGS) $(LINK32_OBJS)

-<<

-

-!ELSEIF  "$(CFG)" == "server - Win32 Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "server\Debug"

-# PROP BASE Intermediate_Dir "server\Debug"

-# PROP BASE Target_Dir "server"

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir ""

-# PROP Intermediate_Dir "Debug"

-# PROP Target_Dir "server"

-OUTDIR=.

-INTDIR=.\Debug

-

-ALL : "$(OUTDIR)\server.exe"

-

-CLEAN : 

-	-@erase "$(INTDIR)\cubit_i.obj"

-	-@erase "$(INTDIR)\cubitS.obj"

-	-@erase "$(INTDIR)\svr.obj"

-	-@erase "$(INTDIR)\vc40.idb"

-	-@erase "$(INTDIR)\vc40.pdb"

-	-@erase "$(OUTDIR)\server.exe"

-	-@erase "$(OUTDIR)\server.ilk"

-	-@erase "$(OUTDIR)\server.pdb"

-

-"$(INTDIR)" :

-    if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"

-

-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\proto\include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c

-CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\proto\include" /D "WIN32" /D\

- "_DEBUG" /D "_CONSOLE" /Fp"$(INTDIR)/server.pch" /YX /Fo"$(INTDIR)/"\

- /Fd"$(INTDIR)/" /c 

-CPP_OBJS=.\Debug/

-CPP_SBRS=.\.

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-BSC32_FLAGS=/nologo /o"$(OUTDIR)/server.bsc" 

-BSC32_SBRS= \

-	

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386

-# ADD LINK32 aced.lib TAO.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386

-LINK32_FLAGS=aced.lib TAO.lib kernel32.lib user32.lib gdi32.lib winspool.lib\

- comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib\

- odbc32.lib odbccp32.lib /nologo /subsystem:console /incremental:yes\

- /pdb:"$(OUTDIR)/server.pdb" /debug /machine:I386 /out:"$(OUTDIR)/server.exe" 

-LINK32_OBJS= \

-	"$(INTDIR)\cubit_i.obj" \

-	"$(INTDIR)\cubitS.obj" \

-	"$(INTDIR)\svr.obj"

-

-"$(OUTDIR)\server.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)

-    $(LINK32) @<<

-  $(LINK32_FLAGS) $(LINK32_OBJS)

-<<

-

-!ENDIF 

-

-.c{$(CPP_OBJS)}.obj:

-   $(CPP) $(CPP_PROJ) $<  

-

-.cpp{$(CPP_OBJS)}.obj:

-   $(CPP) $(CPP_PROJ) $<  

-

-.cxx{$(CPP_OBJS)}.obj:

-   $(CPP) $(CPP_PROJ) $<  

-

-.c{$(CPP_SBRS)}.sbr:

-   $(CPP) $(CPP_PROJ) $<  

-

-.cpp{$(CPP_SBRS)}.sbr:

-   $(CPP) $(CPP_PROJ) $<  

-

-.cxx{$(CPP_SBRS)}.sbr:

-   $(CPP) $(CPP_PROJ) $<  

-

-################################################################################

-# Begin Target

-

-# Name "client - Win32 Release"

-# Name "client - Win32 Debug"

-

-!IF  "$(CFG)" == "client - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "client - Win32 Debug"

-

-!ENDIF 

-

-################################################################################

-# Begin Source File

-

-SOURCE=.\clnt.cpp

-

-!IF  "$(CFG)" == "client - Win32 Release"

-

-DEP_CPP_CLNT_=\

-	".\clnt.h"\

-	".\cubitC.h"\

-	{$(INCLUDE)}"\ace\Acceptor.cpp"\

-	{$(INCLUDE)}"\ace\Acceptor.h"\

-	{$(INCLUDE)}"\ace\Acceptor.i"\

-	{$(INCLUDE)}"\ace\ACE.h"\

-	{$(INCLUDE)}"\ace\ACE.i"\

-	{$(INCLUDE)}"\ace\Addr.h"\

-	{$(INCLUDE)}"\ace\Addr.i"\

-	{$(INCLUDE)}"\ace\Atomic_Op.i"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.cpp"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.h"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.i"\

-	{$(INCLUDE)}"\ace\config-win32-common.h"\

-	{$(INCLUDE)}"\ace\config-win32.h"\

-	{$(INCLUDE)}"\ace\config.h"\

-	{$(INCLUDE)}"\ace\Connector.cpp"\

-	{$(INCLUDE)}"\ace\Connector.h"\

-	{$(INCLUDE)}"\ace\Connector.i"\

-	{$(INCLUDE)}"\ace\Containers.cpp"\

-	{$(INCLUDE)}"\ace\Containers.h"\

-	{$(INCLUDE)}"\ace\Containers.i"\

-	{$(INCLUDE)}"\ace\Dynamic.h"\

-	{$(INCLUDE)}"\ace\Dynamic.i"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.cpp"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.i"\

-	{$(INCLUDE)}"\ace\Free_List.cpp"\

-	{$(INCLUDE)}"\ace\Free_List.h"\

-	{$(INCLUDE)}"\ace\Free_List.i"\

-	{$(INCLUDE)}"\ace\Get_Opt.h"\

-	{$(INCLUDE)}"\ace\Get_Opt.i"\

-	{$(INCLUDE)}"\ace\Handle_Set.h"\

-	{$(INCLUDE)}"\ace\Handle_Set.i"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.h"\

-	{$(INCLUDE)}"\ace\High_Res_Timer.h"\

-	{$(INCLUDE)}"\ace\High_Res_Timer.i"\

-	{$(INCLUDE)}"\ace\INET_Addr.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.i"\

-	{$(INCLUDE)}"\ace\IO_Cntl_Msg.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.i"\

-	{$(INCLUDE)}"\ace\Log_Msg.h"\

-	{$(INCLUDE)}"\ace\Log_Priority.h"\

-	{$(INCLUDE)}"\ace\Log_Record.h"\

-	{$(INCLUDE)}"\ace\Log_Record.i"\

-	{$(INCLUDE)}"\ace\Malloc.h"\

-	{$(INCLUDE)}"\ace\Malloc.i"\

-	{$(INCLUDE)}"\ace\Malloc_T.cpp"\

-	{$(INCLUDE)}"\ace\Malloc_T.h"\

-	{$(INCLUDE)}"\ace\Malloc_T.i"\

-	{$(INCLUDE)}"\ace\Managed_Object.cpp"\

-	{$(INCLUDE)}"\ace\Managed_Object.h"\

-	{$(INCLUDE)}"\ace\Managed_Object.i"\

-	{$(INCLUDE)}"\ace\Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Map_Manager.h"\

-	{$(INCLUDE)}"\ace\Map_Manager.i"\

-	{$(INCLUDE)}"\ace\Mem_Map.h"\

-	{$(INCLUDE)}"\ace\Mem_Map.i"\

-	{$(INCLUDE)}"\ace\Memory_Pool.h"\

-	{$(INCLUDE)}"\ace\Memory_Pool.i"\

-	{$(INCLUDE)}"\ace\Message_Block.h"\

-	{$(INCLUDE)}"\ace\Message_Block.i"\

-	{$(INCLUDE)}"\ace\Message_Queue.cpp"\

-	{$(INCLUDE)}"\ace\Message_Queue.h"\

-	{$(INCLUDE)}"\ace\Message_Queue.i"\

-	{$(INCLUDE)}"\ace\Module.cpp"\

-	{$(INCLUDE)}"\ace\Module.h"\

-	{$(INCLUDE)}"\ace\Module.i"\

-	{$(INCLUDE)}"\ace\Object_Manager.h"\

-	{$(INCLUDE)}"\ace\Object_Manager.i"\

-	{$(INCLUDE)}"\ace\OS.h"\

-	{$(INCLUDE)}"\ace\OS.i"\

-	{$(INCLUDE)}"\ace\Profile_Timer.h"\

-	{$(INCLUDE)}"\ace\Profile_Timer.i"\

-	{$(INCLUDE)}"\ace\Reactor.h"\

-	{$(INCLUDE)}"\ace\Reactor.i"\

-	{$(INCLUDE)}"\ace\Reactor_Impl.h"\

-	{$(INCLUDE)}"\ace\Service_Config.h"\

-	{$(INCLUDE)}"\ace\Service_Config.i"\

-	{$(INCLUDE)}"\ace\Service_Object.h"\

-	{$(INCLUDE)}"\ace\Service_Object.i"\

-	{$(INCLUDE)}"\ace\Service_Repository.h"\

-	{$(INCLUDE)}"\ace\Service_Repository.i"\

-	{$(INCLUDE)}"\ace\Service_Types.h"\

-	{$(INCLUDE)}"\ace\Service_Types.i"\

-	{$(INCLUDE)}"\ace\Shared_Object.h"\

-	{$(INCLUDE)}"\ace\Shared_Object.i"\

-	{$(INCLUDE)}"\ace\Signal.h"\

-	{$(INCLUDE)}"\ace\Signal.i"\

-	{$(INCLUDE)}"\ace\Singleton.cpp"\

-	{$(INCLUDE)}"\ace\Singleton.h"\

-	{$(INCLUDE)}"\ace\Singleton.i"\

-	{$(INCLUDE)}"\ace\SOCK.h"\

-	{$(INCLUDE)}"\ace\SOCK.i"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.h"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.i"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.h"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.i"\

-	{$(INCLUDE)}"\ace\SOCK_IO.h"\

-	{$(INCLUDE)}"\ace\SOCK_IO.i"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.h"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.i"\

-	{$(INCLUDE)}"\ace\SString.h"\

-	{$(INCLUDE)}"\ace\SString.i"\

-	{$(INCLUDE)}"\ace\stdcpp.h"\

-	{$(INCLUDE)}"\ace\Strategies.h"\

-	{$(INCLUDE)}"\ace\Strategies_T.cpp"\

-	{$(INCLUDE)}"\ace\Strategies_T.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.cpp"\

-	{$(INCLUDE)}"\ace\Stream_Modules.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.i"\

-	{$(INCLUDE)}"\ace\Svc_Conf_Tokens.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.cpp"\

-	{$(INCLUDE)}"\ace\Svc_Handler.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.i"\

-	{$(INCLUDE)}"\ace\Synch.h"\

-	{$(INCLUDE)}"\ace\Synch.i"\

-	{$(INCLUDE)}"\ace\Synch_Options.h"\

-	{$(INCLUDE)}"\ace\Synch_T.cpp"\

-	{$(INCLUDE)}"\ace\Synch_T.h"\

-	{$(INCLUDE)}"\ace\Synch_T.i"\

-	{$(INCLUDE)}"\ace\Task.h"\

-	{$(INCLUDE)}"\ace\Task.i"\

-	{$(INCLUDE)}"\ace\Task_T.cpp"\

-	{$(INCLUDE)}"\ace\Task_T.h"\

-	{$(INCLUDE)}"\ace\Task_T.i"\

-	{$(INCLUDE)}"\ace\Thread.h"\

-	{$(INCLUDE)}"\ace\Thread.i"\

-	{$(INCLUDE)}"\ace\Thread_Manager.h"\

-	{$(INCLUDE)}"\ace\Thread_Manager.i"\

-	{$(INCLUDE)}"\ace\Time_Value.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.cpp"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.i"\

-	{$(INCLUDE)}"\ace\Trace.h"\

-	{$(INCLUDE)}"\ace\Version.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.i"\

-	{$(INCLUDE)}"\ace\ws2tcpip.h"\

-	{$(INCLUDE)}"\tao\align.h"\

-	{$(INCLUDE)}"\tao\any.h"\

-	{$(INCLUDE)}"\tao\any.i"\

-	{$(INCLUDE)}"\tao\cdr.h"\

-	{$(INCLUDE)}"\tao\cdr.i"\

-	{$(INCLUDE)}"\tao\client_factory.h"\

-	{$(INCLUDE)}"\tao\connect.h"\

-	{$(INCLUDE)}"\tao\connect.i"\

-	{$(INCLUDE)}"\tao\corba.h"\

-	{$(INCLUDE)}"\tao\corbacom.h"\

-	{$(INCLUDE)}"\tao\corbacom.i"\

-	{$(INCLUDE)}"\tao\debug.h"\

-	{$(INCLUDE)}"\tao\default_client.h"\

-	{$(INCLUDE)}"\tao\default_client.i"\

-	{$(INCLUDE)}"\tao\default_server.h"\

-	{$(INCLUDE)}"\tao\default_server.i"\

-	{$(INCLUDE)}"\tao\except.h"\

-	{$(INCLUDE)}"\tao\giop.h"\

-	{$(INCLUDE)}"\tao\giop.i"\

-	{$(INCLUDE)}"\tao\iiopobj.h"\

-	{$(INCLUDE)}"\tao\iiopobj.i"\

-	{$(INCLUDE)}"\tao\iioporb.h"\

-	{$(INCLUDE)}"\tao\iioporb.i"\

-	{$(INCLUDE)}"\tao\marshal.h"\

-	{$(INCLUDE)}"\tao\marshal.i"\

-	{$(INCLUDE)}"\tao\nvlist.h"\

-	{$(INCLUDE)}"\tao\object.h"\

-	{$(INCLUDE)}"\tao\object.i"\

-	{$(INCLUDE)}"\tao\objtable.h"\

-	{$(INCLUDE)}"\tao\optable.h"\

-	{$(INCLUDE)}"\tao\orb.h"\

-	{$(INCLUDE)}"\tao\orb_core.h"\

-	{$(INCLUDE)}"\tao\orb_core.i"\

-	{$(INCLUDE)}"\tao\orbconf.h"\

-	{$(INCLUDE)}"\tao\orbobj.h"\

-	{$(INCLUDE)}"\tao\orbobj.i"\

-	{$(INCLUDE)}"\tao\params.h"\

-	{$(INCLUDE)}"\tao\params.i"\

-	{$(INCLUDE)}"\tao\poa.h"\

-	{$(INCLUDE)}"\tao\poa.i"\

-	{$(INCLUDE)}"\tao\principa.h"\

-	{$(INCLUDE)}"\tao\request.h"\

-	{$(INCLUDE)}"\tao\sequence.h"\

-	{$(INCLUDE)}"\tao\sequence.i"\

-	{$(INCLUDE)}"\tao\server_factory.h"\

-	{$(INCLUDE)}"\tao\server_factory.i"\

-	{$(INCLUDE)}"\tao\singletons.h"\

-	{$(INCLUDE)}"\tao\stub.h"\

-	{$(INCLUDE)}"\tao\stub.i"\

-	{$(INCLUDE)}"\tao\svrrqst.h"\

-	{$(INCLUDE)}"\tao\typecode.h"\

-	{$(INCLUDE)}"\tao\typecode.i"\

-	{$(INCLUDE)}"\tao\varout.h"\

-	

-

-"$(INTDIR)\clnt.obj" : $(SOURCE) $(DEP_CPP_CLNT_) "$(INTDIR)"

-

-

-!ELSEIF  "$(CFG)" == "client - Win32 Debug"

-

-DEP_CPP_CLNT_=\

-	".\clnt.h"\

-	".\cubitC.h"\

-	{$(INCLUDE)}"\ace\Acceptor.cpp"\

-	{$(INCLUDE)}"\ace\Acceptor.h"\

-	{$(INCLUDE)}"\ace\Acceptor.i"\

-	{$(INCLUDE)}"\ace\ACE.h"\

-	{$(INCLUDE)}"\ace\ACE.i"\

-	{$(INCLUDE)}"\ace\Addr.h"\

-	{$(INCLUDE)}"\ace\Addr.i"\

-	{$(INCLUDE)}"\ace\Atomic_Op.i"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.cpp"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.h"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.i"\

-	{$(INCLUDE)}"\ace\config-win32-common.h"\

-	{$(INCLUDE)}"\ace\config-win32.h"\

-	{$(INCLUDE)}"\ace\config.h"\

-	{$(INCLUDE)}"\ace\Connector.cpp"\

-	{$(INCLUDE)}"\ace\Connector.h"\

-	{$(INCLUDE)}"\ace\Connector.i"\

-	{$(INCLUDE)}"\ace\Containers.cpp"\

-	{$(INCLUDE)}"\ace\Containers.h"\

-	{$(INCLUDE)}"\ace\Containers.i"\

-	{$(INCLUDE)}"\ace\Dynamic.h"\

-	{$(INCLUDE)}"\ace\Dynamic.i"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.cpp"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.i"\

-	{$(INCLUDE)}"\ace\Free_List.cpp"\

-	{$(INCLUDE)}"\ace\Free_List.h"\

-	{$(INCLUDE)}"\ace\Free_List.i"\

-	{$(INCLUDE)}"\ace\Get_Opt.h"\

-	{$(INCLUDE)}"\ace\Get_Opt.i"\

-	{$(INCLUDE)}"\ace\Handle_Set.h"\

-	{$(INCLUDE)}"\ace\Handle_Set.i"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.h"\

-	{$(INCLUDE)}"\ace\High_Res_Timer.h"\

-	{$(INCLUDE)}"\ace\High_Res_Timer.i"\

-	{$(INCLUDE)}"\ace\INET_Addr.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.i"\

-	{$(INCLUDE)}"\ace\IO_Cntl_Msg.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.i"\

-	{$(INCLUDE)}"\ace\Log_Msg.h"\

-	{$(INCLUDE)}"\ace\Log_Priority.h"\

-	{$(INCLUDE)}"\ace\Log_Record.h"\

-	{$(INCLUDE)}"\ace\Log_Record.i"\

-	{$(INCLUDE)}"\ace\Malloc.h"\

-	{$(INCLUDE)}"\ace\Malloc.i"\

-	{$(INCLUDE)}"\ace\Malloc_T.cpp"\

-	{$(INCLUDE)}"\ace\Malloc_T.h"\

-	{$(INCLUDE)}"\ace\Malloc_T.i"\

-	{$(INCLUDE)}"\ace\Managed_Object.cpp"\

-	{$(INCLUDE)}"\ace\Managed_Object.h"\

-	{$(INCLUDE)}"\ace\Managed_Object.i"\

-	{$(INCLUDE)}"\ace\Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Map_Manager.h"\

-	{$(INCLUDE)}"\ace\Map_Manager.i"\

-	{$(INCLUDE)}"\ace\Mem_Map.h"\

-	{$(INCLUDE)}"\ace\Mem_Map.i"\

-	{$(INCLUDE)}"\ace\Memory_Pool.h"\

-	{$(INCLUDE)}"\ace\Memory_Pool.i"\

-	{$(INCLUDE)}"\ace\Message_Block.h"\

-	{$(INCLUDE)}"\ace\Message_Block.i"\

-	{$(INCLUDE)}"\ace\Message_Queue.cpp"\

-	{$(INCLUDE)}"\ace\Message_Queue.h"\

-	{$(INCLUDE)}"\ace\Message_Queue.i"\

-	{$(INCLUDE)}"\ace\Module.cpp"\

-	{$(INCLUDE)}"\ace\Module.h"\

-	{$(INCLUDE)}"\ace\Module.i"\

-	{$(INCLUDE)}"\ace\Object_Manager.h"\

-	{$(INCLUDE)}"\ace\Object_Manager.i"\

-	{$(INCLUDE)}"\ace\OS.h"\

-	{$(INCLUDE)}"\ace\OS.i"\

-	{$(INCLUDE)}"\ace\Profile_Timer.h"\

-	{$(INCLUDE)}"\ace\Profile_Timer.i"\

-	{$(INCLUDE)}"\ace\Reactor.h"\

-	{$(INCLUDE)}"\ace\Reactor.i"\

-	{$(INCLUDE)}"\ace\Reactor_Impl.h"\

-	{$(INCLUDE)}"\ace\Service_Config.h"\

-	{$(INCLUDE)}"\ace\Service_Config.i"\

-	{$(INCLUDE)}"\ace\Service_Object.h"\

-	{$(INCLUDE)}"\ace\Service_Object.i"\

-	{$(INCLUDE)}"\ace\Service_Repository.h"\

-	{$(INCLUDE)}"\ace\Service_Repository.i"\

-	{$(INCLUDE)}"\ace\Service_Types.h"\

-	{$(INCLUDE)}"\ace\Service_Types.i"\

-	{$(INCLUDE)}"\ace\Shared_Object.h"\

-	{$(INCLUDE)}"\ace\Shared_Object.i"\

-	{$(INCLUDE)}"\ace\Signal.h"\

-	{$(INCLUDE)}"\ace\Signal.i"\

-	{$(INCLUDE)}"\ace\Singleton.cpp"\

-	{$(INCLUDE)}"\ace\Singleton.h"\

-	{$(INCLUDE)}"\ace\Singleton.i"\

-	{$(INCLUDE)}"\ace\SOCK.h"\

-	{$(INCLUDE)}"\ace\SOCK.i"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.h"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.i"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.h"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.i"\

-	{$(INCLUDE)}"\ace\SOCK_IO.h"\

-	{$(INCLUDE)}"\ace\SOCK_IO.i"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.h"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.i"\

-	{$(INCLUDE)}"\ace\SString.h"\

-	{$(INCLUDE)}"\ace\SString.i"\

-	{$(INCLUDE)}"\ace\stdcpp.h"\

-	{$(INCLUDE)}"\ace\Strategies.h"\

-	{$(INCLUDE)}"\ace\Strategies_T.cpp"\

-	{$(INCLUDE)}"\ace\Strategies_T.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.cpp"\

-	{$(INCLUDE)}"\ace\Stream_Modules.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.i"\

-	{$(INCLUDE)}"\ace\Svc_Conf_Tokens.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.cpp"\

-	{$(INCLUDE)}"\ace\Svc_Handler.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.i"\

-	{$(INCLUDE)}"\ace\Synch.h"\

-	{$(INCLUDE)}"\ace\Synch.i"\

-	{$(INCLUDE)}"\ace\Synch_Options.h"\

-	{$(INCLUDE)}"\ace\Synch_T.cpp"\

-	{$(INCLUDE)}"\ace\Synch_T.h"\

-	{$(INCLUDE)}"\ace\Synch_T.i"\

-	{$(INCLUDE)}"\ace\Task.h"\

-	{$(INCLUDE)}"\ace\Task.i"\

-	{$(INCLUDE)}"\ace\Task_T.cpp"\

-	{$(INCLUDE)}"\ace\Task_T.h"\

-	{$(INCLUDE)}"\ace\Task_T.i"\

-	{$(INCLUDE)}"\ace\Thread.h"\

-	{$(INCLUDE)}"\ace\Thread.i"\

-	{$(INCLUDE)}"\ace\Thread_Manager.h"\

-	{$(INCLUDE)}"\ace\Thread_Manager.i"\

-	{$(INCLUDE)}"\ace\Time_Value.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.cpp"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.i"\

-	{$(INCLUDE)}"\ace\Trace.h"\

-	{$(INCLUDE)}"\ace\Version.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.i"\

-	{$(INCLUDE)}"\ace\ws2tcpip.h"\

-	{$(INCLUDE)}"\tao\align.h"\

-	{$(INCLUDE)}"\tao\any.h"\

-	{$(INCLUDE)}"\tao\any.i"\

-	{$(INCLUDE)}"\tao\cdr.h"\

-	{$(INCLUDE)}"\tao\cdr.i"\

-	{$(INCLUDE)}"\tao\client_factory.h"\

-	{$(INCLUDE)}"\tao\connect.h"\

-	{$(INCLUDE)}"\tao\connect.i"\

-	{$(INCLUDE)}"\tao\corba.h"\

-	{$(INCLUDE)}"\tao\corbacom.h"\

-	{$(INCLUDE)}"\tao\corbacom.i"\

-	{$(INCLUDE)}"\tao\debug.h"\

-	{$(INCLUDE)}"\tao\default_client.h"\

-	{$(INCLUDE)}"\tao\default_client.i"\

-	{$(INCLUDE)}"\tao\default_server.h"\

-	{$(INCLUDE)}"\tao\default_server.i"\

-	{$(INCLUDE)}"\tao\except.h"\

-	{$(INCLUDE)}"\tao\giop.h"\

-	{$(INCLUDE)}"\tao\giop.i"\

-	{$(INCLUDE)}"\tao\iiopobj.h"\

-	{$(INCLUDE)}"\tao\iiopobj.i"\

-	{$(INCLUDE)}"\tao\iioporb.h"\

-	{$(INCLUDE)}"\tao\iioporb.i"\

-	{$(INCLUDE)}"\tao\marshal.h"\

-	{$(INCLUDE)}"\tao\marshal.i"\

-	{$(INCLUDE)}"\tao\nvlist.h"\

-	{$(INCLUDE)}"\tao\object.h"\

-	{$(INCLUDE)}"\tao\object.i"\

-	{$(INCLUDE)}"\tao\objtable.h"\

-	{$(INCLUDE)}"\tao\optable.h"\

-	{$(INCLUDE)}"\tao\orb.h"\

-	{$(INCLUDE)}"\tao\orb_core.h"\

-	{$(INCLUDE)}"\tao\orb_core.i"\

-	{$(INCLUDE)}"\tao\orbconf.h"\

-	{$(INCLUDE)}"\tao\orbobj.h"\

-	{$(INCLUDE)}"\tao\orbobj.i"\

-	{$(INCLUDE)}"\tao\params.h"\

-	{$(INCLUDE)}"\tao\params.i"\

-	{$(INCLUDE)}"\tao\poa.h"\

-	{$(INCLUDE)}"\tao\poa.i"\

-	{$(INCLUDE)}"\tao\principa.h"\

-	{$(INCLUDE)}"\tao\request.h"\

-	{$(INCLUDE)}"\tao\sequence.h"\

-	{$(INCLUDE)}"\tao\sequence.i"\

-	{$(INCLUDE)}"\tao\server_factory.h"\

-	{$(INCLUDE)}"\tao\server_factory.i"\

-	{$(INCLUDE)}"\tao\singletons.h"\

-	{$(INCLUDE)}"\tao\stub.h"\

-	{$(INCLUDE)}"\tao\stub.i"\

-	{$(INCLUDE)}"\tao\svrrqst.h"\

-	{$(INCLUDE)}"\tao\typecode.h"\

-	{$(INCLUDE)}"\tao\typecode.i"\

-	{$(INCLUDE)}"\tao\varout.h"\

-	

-

-"$(INTDIR)\clnt.obj" : $(SOURCE) $(DEP_CPP_CLNT_) "$(INTDIR)"

-

-

-!ENDIF 

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\cubitC.cpp

-DEP_CPP_CUBIT=\

-	".\cubitC.h"\

-	{$(INCLUDE)}"\ace\Acceptor.cpp"\

-	{$(INCLUDE)}"\ace\Acceptor.h"\

-	{$(INCLUDE)}"\ace\Acceptor.i"\

-	{$(INCLUDE)}"\ace\ACE.h"\

-	{$(INCLUDE)}"\ace\ACE.i"\

-	{$(INCLUDE)}"\ace\Addr.h"\

-	{$(INCLUDE)}"\ace\Addr.i"\

-	{$(INCLUDE)}"\ace\Atomic_Op.i"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.cpp"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.h"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.i"\

-	{$(INCLUDE)}"\ace\config-win32-common.h"\

-	{$(INCLUDE)}"\ace\config-win32.h"\

-	{$(INCLUDE)}"\ace\config.h"\

-	{$(INCLUDE)}"\ace\Connector.cpp"\

-	{$(INCLUDE)}"\ace\Connector.h"\

-	{$(INCLUDE)}"\ace\Connector.i"\

-	{$(INCLUDE)}"\ace\Containers.cpp"\

-	{$(INCLUDE)}"\ace\Containers.h"\

-	{$(INCLUDE)}"\ace\Containers.i"\

-	{$(INCLUDE)}"\ace\Dynamic.h"\

-	{$(INCLUDE)}"\ace\Dynamic.i"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.cpp"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.i"\

-	{$(INCLUDE)}"\ace\Free_List.cpp"\

-	{$(INCLUDE)}"\ace\Free_List.h"\

-	{$(INCLUDE)}"\ace\Free_List.i"\

-	{$(INCLUDE)}"\ace\Get_Opt.h"\

-	{$(INCLUDE)}"\ace\Get_Opt.i"\

-	{$(INCLUDE)}"\ace\Handle_Set.h"\

-	{$(INCLUDE)}"\ace\Handle_Set.i"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.i"\

-	{$(INCLUDE)}"\ace\IO_Cntl_Msg.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.i"\

-	{$(INCLUDE)}"\ace\Log_Msg.h"\

-	{$(INCLUDE)}"\ace\Log_Priority.h"\

-	{$(INCLUDE)}"\ace\Log_Record.h"\

-	{$(INCLUDE)}"\ace\Log_Record.i"\

-	{$(INCLUDE)}"\ace\Malloc.h"\

-	{$(INCLUDE)}"\ace\Malloc.i"\

-	{$(INCLUDE)}"\ace\Malloc_T.cpp"\

-	{$(INCLUDE)}"\ace\Malloc_T.h"\

-	{$(INCLUDE)}"\ace\Malloc_T.i"\

-	{$(INCLUDE)}"\ace\Managed_Object.cpp"\

-	{$(INCLUDE)}"\ace\Managed_Object.h"\

-	{$(INCLUDE)}"\ace\Managed_Object.i"\

-	{$(INCLUDE)}"\ace\Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Map_Manager.h"\

-	{$(INCLUDE)}"\ace\Map_Manager.i"\

-	{$(INCLUDE)}"\ace\Mem_Map.h"\

-	{$(INCLUDE)}"\ace\Mem_Map.i"\

-	{$(INCLUDE)}"\ace\Memory_Pool.h"\

-	{$(INCLUDE)}"\ace\Memory_Pool.i"\

-	{$(INCLUDE)}"\ace\Message_Block.h"\

-	{$(INCLUDE)}"\ace\Message_Block.i"\

-	{$(INCLUDE)}"\ace\Message_Queue.cpp"\

-	{$(INCLUDE)}"\ace\Message_Queue.h"\

-	{$(INCLUDE)}"\ace\Message_Queue.i"\

-	{$(INCLUDE)}"\ace\Module.cpp"\

-	{$(INCLUDE)}"\ace\Module.h"\

-	{$(INCLUDE)}"\ace\Module.i"\

-	{$(INCLUDE)}"\ace\Object_Manager.h"\

-	{$(INCLUDE)}"\ace\Object_Manager.i"\

-	{$(INCLUDE)}"\ace\OS.h"\

-	{$(INCLUDE)}"\ace\OS.i"\

-	{$(INCLUDE)}"\ace\Reactor.h"\

-	{$(INCLUDE)}"\ace\Reactor.i"\

-	{$(INCLUDE)}"\ace\Reactor_Impl.h"\

-	{$(INCLUDE)}"\ace\Service_Config.h"\

-	{$(INCLUDE)}"\ace\Service_Config.i"\

-	{$(INCLUDE)}"\ace\Service_Object.h"\

-	{$(INCLUDE)}"\ace\Service_Object.i"\

-	{$(INCLUDE)}"\ace\Service_Repository.h"\

-	{$(INCLUDE)}"\ace\Service_Repository.i"\

-	{$(INCLUDE)}"\ace\Service_Types.h"\

-	{$(INCLUDE)}"\ace\Service_Types.i"\

-	{$(INCLUDE)}"\ace\Shared_Object.h"\

-	{$(INCLUDE)}"\ace\Shared_Object.i"\

-	{$(INCLUDE)}"\ace\Signal.h"\

-	{$(INCLUDE)}"\ace\Signal.i"\

-	{$(INCLUDE)}"\ace\Singleton.cpp"\

-	{$(INCLUDE)}"\ace\Singleton.h"\

-	{$(INCLUDE)}"\ace\Singleton.i"\

-	{$(INCLUDE)}"\ace\SOCK.h"\

-	{$(INCLUDE)}"\ace\SOCK.i"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.h"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.i"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.h"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.i"\

-	{$(INCLUDE)}"\ace\SOCK_IO.h"\

-	{$(INCLUDE)}"\ace\SOCK_IO.i"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.h"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.i"\

-	{$(INCLUDE)}"\ace\SString.h"\

-	{$(INCLUDE)}"\ace\SString.i"\

-	{$(INCLUDE)}"\ace\stdcpp.h"\

-	{$(INCLUDE)}"\ace\Strategies.h"\

-	{$(INCLUDE)}"\ace\Strategies_T.cpp"\

-	{$(INCLUDE)}"\ace\Strategies_T.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.cpp"\

-	{$(INCLUDE)}"\ace\Stream_Modules.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.i"\

-	{$(INCLUDE)}"\ace\Svc_Conf_Tokens.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.cpp"\

-	{$(INCLUDE)}"\ace\Svc_Handler.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.i"\

-	{$(INCLUDE)}"\ace\Synch.h"\

-	{$(INCLUDE)}"\ace\Synch.i"\

-	{$(INCLUDE)}"\ace\Synch_Options.h"\

-	{$(INCLUDE)}"\ace\Synch_T.cpp"\

-	{$(INCLUDE)}"\ace\Synch_T.h"\

-	{$(INCLUDE)}"\ace\Synch_T.i"\

-	{$(INCLUDE)}"\ace\Task.h"\

-	{$(INCLUDE)}"\ace\Task.i"\

-	{$(INCLUDE)}"\ace\Task_T.cpp"\

-	{$(INCLUDE)}"\ace\Task_T.h"\

-	{$(INCLUDE)}"\ace\Task_T.i"\

-	{$(INCLUDE)}"\ace\Thread.h"\

-	{$(INCLUDE)}"\ace\Thread.i"\

-	{$(INCLUDE)}"\ace\Thread_Manager.h"\

-	{$(INCLUDE)}"\ace\Thread_Manager.i"\

-	{$(INCLUDE)}"\ace\Time_Value.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.cpp"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.i"\

-	{$(INCLUDE)}"\ace\Trace.h"\

-	{$(INCLUDE)}"\ace\Version.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.i"\

-	{$(INCLUDE)}"\ace\ws2tcpip.h"\

-	{$(INCLUDE)}"\tao\align.h"\

-	{$(INCLUDE)}"\tao\any.h"\

-	{$(INCLUDE)}"\tao\any.i"\

-	{$(INCLUDE)}"\tao\cdr.h"\

-	{$(INCLUDE)}"\tao\cdr.i"\

-	{$(INCLUDE)}"\tao\client_factory.h"\

-	{$(INCLUDE)}"\tao\client_factory.i"\

-	{$(INCLUDE)}"\tao\connect.h"\

-	{$(INCLUDE)}"\tao\connect.i"\

-	{$(INCLUDE)}"\tao\corba.h"\

-	{$(INCLUDE)}"\tao\corbacom.h"\

-	{$(INCLUDE)}"\tao\corbacom.i"\

-	{$(INCLUDE)}"\tao\debug.h"\

-	{$(INCLUDE)}"\tao\default_client.h"\

-	{$(INCLUDE)}"\tao\default_client.i"\

-	{$(INCLUDE)}"\tao\default_server.h"\

-	{$(INCLUDE)}"\tao\default_server.i"\

-	{$(INCLUDE)}"\tao\except.h"\

-	{$(INCLUDE)}"\tao\giop.h"\

-	{$(INCLUDE)}"\tao\giop.i"\

-	{$(INCLUDE)}"\tao\iiopobj.h"\

-	{$(INCLUDE)}"\tao\iiopobj.i"\

-	{$(INCLUDE)}"\tao\iioporb.h"\

-	{$(INCLUDE)}"\tao\iioporb.i"\

-	{$(INCLUDE)}"\tao\marshal.h"\

-	{$(INCLUDE)}"\tao\marshal.i"\

-	{$(INCLUDE)}"\tao\nvlist.h"\

-	{$(INCLUDE)}"\tao\object.h"\

-	{$(INCLUDE)}"\tao\object.i"\

-	{$(INCLUDE)}"\tao\objtable.h"\

-	{$(INCLUDE)}"\tao\optable.h"\

-	{$(INCLUDE)}"\tao\orb.h"\

-	{$(INCLUDE)}"\tao\orb_core.h"\

-	{$(INCLUDE)}"\tao\orb_core.i"\

-	{$(INCLUDE)}"\tao\orbconf.h"\

-	{$(INCLUDE)}"\tao\orbobj.h"\

-	{$(INCLUDE)}"\tao\orbobj.i"\

-	{$(INCLUDE)}"\tao\params.h"\

-	{$(INCLUDE)}"\tao\params.i"\

-	{$(INCLUDE)}"\tao\poa.h"\

-	{$(INCLUDE)}"\tao\poa.i"\

-	{$(INCLUDE)}"\tao\principa.h"\

-	{$(INCLUDE)}"\tao\request.h"\

-	{$(INCLUDE)}"\tao\sequence.h"\

-	{$(INCLUDE)}"\tao\sequence.i"\

-	{$(INCLUDE)}"\tao\server_factory.h"\

-	{$(INCLUDE)}"\tao\server_factory.i"\

-	{$(INCLUDE)}"\tao\singletons.h"\

-	{$(INCLUDE)}"\tao\stub.h"\

-	{$(INCLUDE)}"\tao\stub.i"\

-	{$(INCLUDE)}"\tao\svrrqst.h"\

-	{$(INCLUDE)}"\tao\svrrqst.i"\

-	{$(INCLUDE)}"\tao\typecode.h"\

-	{$(INCLUDE)}"\tao\typecode.i"\

-	{$(INCLUDE)}"\tao\varout.h"\

-	

-NODEP_CPP_CUBIT=\

-	"..\..\..\..\tao\tao\factories.h"\

-	

-

-"$(INTDIR)\cubitC.obj" : $(SOURCE) $(DEP_CPP_CUBIT) "$(INTDIR)"

-

-

-# End Source File

-# End Target

-################################################################################

-# Begin Target

-

-# Name "server - Win32 Release"

-# Name "server - Win32 Debug"

-

-!IF  "$(CFG)" == "server - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "server - Win32 Debug"

-

-!ENDIF 

-

-################################################################################

-# Begin Source File

-

-SOURCE=.\cubitS.cpp

-DEP_CPP_CUBITS=\

-	".\cubitC.cpp"\

-	".\cubitC.h"\

-	".\cubitS.h"\

-	".\method_db.i"\

-	{$(INCLUDE)}"\ace\Acceptor.cpp"\

-	{$(INCLUDE)}"\ace\Acceptor.h"\

-	{$(INCLUDE)}"\ace\Acceptor.i"\

-	{$(INCLUDE)}"\ace\ACE.h"\

-	{$(INCLUDE)}"\ace\ACE.i"\

-	{$(INCLUDE)}"\ace\Addr.h"\

-	{$(INCLUDE)}"\ace\Addr.i"\

-	{$(INCLUDE)}"\ace\Atomic_Op.i"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.cpp"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.h"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.i"\

-	{$(INCLUDE)}"\ace\config-win32-common.h"\

-	{$(INCLUDE)}"\ace\config-win32.h"\

-	{$(INCLUDE)}"\ace\config.h"\

-	{$(INCLUDE)}"\ace\Connector.cpp"\

-	{$(INCLUDE)}"\ace\Connector.h"\

-	{$(INCLUDE)}"\ace\Connector.i"\

-	{$(INCLUDE)}"\ace\Containers.cpp"\

-	{$(INCLUDE)}"\ace\Containers.h"\

-	{$(INCLUDE)}"\ace\Containers.i"\

-	{$(INCLUDE)}"\ace\Dynamic.h"\

-	{$(INCLUDE)}"\ace\Dynamic.i"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.cpp"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.i"\

-	{$(INCLUDE)}"\ace\Free_List.cpp"\

-	{$(INCLUDE)}"\ace\Free_List.h"\

-	{$(INCLUDE)}"\ace\Free_List.i"\

-	{$(INCLUDE)}"\ace\Get_Opt.h"\

-	{$(INCLUDE)}"\ace\Get_Opt.i"\

-	{$(INCLUDE)}"\ace\Handle_Set.h"\

-	{$(INCLUDE)}"\ace\Handle_Set.i"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.i"\

-	{$(INCLUDE)}"\ace\IO_Cntl_Msg.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.i"\

-	{$(INCLUDE)}"\ace\Log_Msg.h"\

-	{$(INCLUDE)}"\ace\Log_Priority.h"\

-	{$(INCLUDE)}"\ace\Log_Record.h"\

-	{$(INCLUDE)}"\ace\Log_Record.i"\

-	{$(INCLUDE)}"\ace\Malloc.h"\

-	{$(INCLUDE)}"\ace\Malloc.i"\

-	{$(INCLUDE)}"\ace\Malloc_T.cpp"\

-	{$(INCLUDE)}"\ace\Malloc_T.h"\

-	{$(INCLUDE)}"\ace\Malloc_T.i"\

-	{$(INCLUDE)}"\ace\Managed_Object.cpp"\

-	{$(INCLUDE)}"\ace\Managed_Object.h"\

-	{$(INCLUDE)}"\ace\Managed_Object.i"\

-	{$(INCLUDE)}"\ace\Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Map_Manager.h"\

-	{$(INCLUDE)}"\ace\Map_Manager.i"\

-	{$(INCLUDE)}"\ace\Mem_Map.h"\

-	{$(INCLUDE)}"\ace\Mem_Map.i"\

-	{$(INCLUDE)}"\ace\Memory_Pool.h"\

-	{$(INCLUDE)}"\ace\Memory_Pool.i"\

-	{$(INCLUDE)}"\ace\Message_Block.h"\

-	{$(INCLUDE)}"\ace\Message_Block.i"\

-	{$(INCLUDE)}"\ace\Message_Queue.cpp"\

-	{$(INCLUDE)}"\ace\Message_Queue.h"\

-	{$(INCLUDE)}"\ace\Message_Queue.i"\

-	{$(INCLUDE)}"\ace\Module.cpp"\

-	{$(INCLUDE)}"\ace\Module.h"\

-	{$(INCLUDE)}"\ace\Module.i"\

-	{$(INCLUDE)}"\ace\Object_Manager.h"\

-	{$(INCLUDE)}"\ace\Object_Manager.i"\

-	{$(INCLUDE)}"\ace\OS.h"\

-	{$(INCLUDE)}"\ace\OS.i"\

-	{$(INCLUDE)}"\ace\Reactor.h"\

-	{$(INCLUDE)}"\ace\Reactor.i"\

-	{$(INCLUDE)}"\ace\Reactor_Impl.h"\

-	{$(INCLUDE)}"\ace\Service_Config.h"\

-	{$(INCLUDE)}"\ace\Service_Config.i"\

-	{$(INCLUDE)}"\ace\Service_Object.h"\

-	{$(INCLUDE)}"\ace\Service_Object.i"\

-	{$(INCLUDE)}"\ace\Service_Repository.h"\

-	{$(INCLUDE)}"\ace\Service_Repository.i"\

-	{$(INCLUDE)}"\ace\Service_Types.h"\

-	{$(INCLUDE)}"\ace\Service_Types.i"\

-	{$(INCLUDE)}"\ace\Shared_Object.h"\

-	{$(INCLUDE)}"\ace\Shared_Object.i"\

-	{$(INCLUDE)}"\ace\Signal.h"\

-	{$(INCLUDE)}"\ace\Signal.i"\

-	{$(INCLUDE)}"\ace\Singleton.cpp"\

-	{$(INCLUDE)}"\ace\Singleton.h"\

-	{$(INCLUDE)}"\ace\Singleton.i"\

-	{$(INCLUDE)}"\ace\SOCK.h"\

-	{$(INCLUDE)}"\ace\SOCK.i"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.h"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.i"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.h"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.i"\

-	{$(INCLUDE)}"\ace\SOCK_IO.h"\

-	{$(INCLUDE)}"\ace\SOCK_IO.i"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.h"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.i"\

-	{$(INCLUDE)}"\ace\SString.h"\

-	{$(INCLUDE)}"\ace\SString.i"\

-	{$(INCLUDE)}"\ace\stdcpp.h"\

-	{$(INCLUDE)}"\ace\Strategies.h"\

-	{$(INCLUDE)}"\ace\Strategies_T.cpp"\

-	{$(INCLUDE)}"\ace\Strategies_T.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.cpp"\

-	{$(INCLUDE)}"\ace\Stream_Modules.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.i"\

-	{$(INCLUDE)}"\ace\Svc_Conf_Tokens.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.cpp"\

-	{$(INCLUDE)}"\ace\Svc_Handler.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.i"\

-	{$(INCLUDE)}"\ace\Synch.h"\

-	{$(INCLUDE)}"\ace\Synch.i"\

-	{$(INCLUDE)}"\ace\Synch_Options.h"\

-	{$(INCLUDE)}"\ace\Synch_T.cpp"\

-	{$(INCLUDE)}"\ace\Synch_T.h"\

-	{$(INCLUDE)}"\ace\Synch_T.i"\

-	{$(INCLUDE)}"\ace\Task.h"\

-	{$(INCLUDE)}"\ace\Task.i"\

-	{$(INCLUDE)}"\ace\Task_T.cpp"\

-	{$(INCLUDE)}"\ace\Task_T.h"\

-	{$(INCLUDE)}"\ace\Task_T.i"\

-	{$(INCLUDE)}"\ace\Thread.h"\

-	{$(INCLUDE)}"\ace\Thread.i"\

-	{$(INCLUDE)}"\ace\Thread_Manager.h"\

-	{$(INCLUDE)}"\ace\Thread_Manager.i"\

-	{$(INCLUDE)}"\ace\Time_Value.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.cpp"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.i"\

-	{$(INCLUDE)}"\ace\Trace.h"\

-	{$(INCLUDE)}"\ace\Version.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.i"\

-	{$(INCLUDE)}"\ace\ws2tcpip.h"\

-	{$(INCLUDE)}"\tao\align.h"\

-	{$(INCLUDE)}"\tao\any.h"\

-	{$(INCLUDE)}"\tao\any.i"\

-	{$(INCLUDE)}"\tao\cdr.h"\

-	{$(INCLUDE)}"\tao\cdr.i"\

-	{$(INCLUDE)}"\tao\client_factory.h"\

-	{$(INCLUDE)}"\tao\client_factory.i"\

-	{$(INCLUDE)}"\tao\connect.h"\

-	{$(INCLUDE)}"\tao\connect.i"\

-	{$(INCLUDE)}"\tao\corba.h"\

-	{$(INCLUDE)}"\tao\corbacom.h"\

-	{$(INCLUDE)}"\tao\corbacom.i"\

-	{$(INCLUDE)}"\tao\debug.h"\

-	{$(INCLUDE)}"\tao\default_client.h"\

-	{$(INCLUDE)}"\tao\default_client.i"\

-	{$(INCLUDE)}"\tao\default_server.h"\

-	{$(INCLUDE)}"\tao\default_server.i"\

-	{$(INCLUDE)}"\tao\except.h"\

-	{$(INCLUDE)}"\tao\giop.h"\

-	{$(INCLUDE)}"\tao\giop.i"\

-	{$(INCLUDE)}"\tao\iiopobj.h"\

-	{$(INCLUDE)}"\tao\iiopobj.i"\

-	{$(INCLUDE)}"\tao\iioporb.h"\

-	{$(INCLUDE)}"\tao\iioporb.i"\

-	{$(INCLUDE)}"\tao\marshal.h"\

-	{$(INCLUDE)}"\tao\marshal.i"\

-	{$(INCLUDE)}"\tao\nvlist.h"\

-	{$(INCLUDE)}"\tao\object.h"\

-	{$(INCLUDE)}"\tao\object.i"\

-	{$(INCLUDE)}"\tao\objtable.h"\

-	{$(INCLUDE)}"\tao\optable.h"\

-	{$(INCLUDE)}"\tao\orb.h"\

-	{$(INCLUDE)}"\tao\orb_core.h"\

-	{$(INCLUDE)}"\tao\orb_core.i"\

-	{$(INCLUDE)}"\tao\orbconf.h"\

-	{$(INCLUDE)}"\tao\orbobj.h"\

-	{$(INCLUDE)}"\tao\orbobj.i"\

-	{$(INCLUDE)}"\tao\params.h"\

-	{$(INCLUDE)}"\tao\params.i"\

-	{$(INCLUDE)}"\tao\poa.h"\

-	{$(INCLUDE)}"\tao\poa.i"\

-	{$(INCLUDE)}"\tao\principa.h"\

-	{$(INCLUDE)}"\tao\request.h"\

-	{$(INCLUDE)}"\tao\sequence.h"\

-	{$(INCLUDE)}"\tao\sequence.i"\

-	{$(INCLUDE)}"\tao\server_factory.h"\

-	{$(INCLUDE)}"\tao\server_factory.i"\

-	{$(INCLUDE)}"\tao\singletons.h"\

-	{$(INCLUDE)}"\tao\stub.h"\

-	{$(INCLUDE)}"\tao\stub.i"\

-	{$(INCLUDE)}"\tao\svrrqst.h"\

-	{$(INCLUDE)}"\tao\svrrqst.i"\

-	{$(INCLUDE)}"\tao\typecode.h"\

-	{$(INCLUDE)}"\tao\typecode.i"\

-	{$(INCLUDE)}"\tao\varout.h"\

-	

-NODEP_CPP_CUBITS=\

-	"..\..\..\..\tao\tao\factories.h"\

-	

-

-"$(INTDIR)\cubitS.obj" : $(SOURCE) $(DEP_CPP_CUBITS) "$(INTDIR)"

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\cubit_i.cpp

-DEP_CPP_CUBIT_=\

-	".\cubit_i.h"\

-	".\cubitC.h"\

-	".\cubitS.h"\

-	{$(INCLUDE)}"\ace\Acceptor.cpp"\

-	{$(INCLUDE)}"\ace\Acceptor.h"\

-	{$(INCLUDE)}"\ace\Acceptor.i"\

-	{$(INCLUDE)}"\ace\ACE.h"\

-	{$(INCLUDE)}"\ace\ACE.i"\

-	{$(INCLUDE)}"\ace\Addr.h"\

-	{$(INCLUDE)}"\ace\Addr.i"\

-	{$(INCLUDE)}"\ace\Atomic_Op.i"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.cpp"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.h"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.i"\

-	{$(INCLUDE)}"\ace\config-win32-common.h"\

-	{$(INCLUDE)}"\ace\config-win32.h"\

-	{$(INCLUDE)}"\ace\config.h"\

-	{$(INCLUDE)}"\ace\Connector.cpp"\

-	{$(INCLUDE)}"\ace\Connector.h"\

-	{$(INCLUDE)}"\ace\Connector.i"\

-	{$(INCLUDE)}"\ace\Containers.cpp"\

-	{$(INCLUDE)}"\ace\Containers.h"\

-	{$(INCLUDE)}"\ace\Containers.i"\

-	{$(INCLUDE)}"\ace\Dynamic.h"\

-	{$(INCLUDE)}"\ace\Dynamic.i"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.cpp"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.i"\

-	{$(INCLUDE)}"\ace\Free_List.cpp"\

-	{$(INCLUDE)}"\ace\Free_List.h"\

-	{$(INCLUDE)}"\ace\Free_List.i"\

-	{$(INCLUDE)}"\ace\Get_Opt.h"\

-	{$(INCLUDE)}"\ace\Get_Opt.i"\

-	{$(INCLUDE)}"\ace\Handle_Set.h"\

-	{$(INCLUDE)}"\ace\Handle_Set.i"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.i"\

-	{$(INCLUDE)}"\ace\IO_Cntl_Msg.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.i"\

-	{$(INCLUDE)}"\ace\Log_Msg.h"\

-	{$(INCLUDE)}"\ace\Log_Priority.h"\

-	{$(INCLUDE)}"\ace\Log_Record.h"\

-	{$(INCLUDE)}"\ace\Log_Record.i"\

-	{$(INCLUDE)}"\ace\Malloc.h"\

-	{$(INCLUDE)}"\ace\Malloc.i"\

-	{$(INCLUDE)}"\ace\Malloc_T.cpp"\

-	{$(INCLUDE)}"\ace\Malloc_T.h"\

-	{$(INCLUDE)}"\ace\Malloc_T.i"\

-	{$(INCLUDE)}"\ace\Managed_Object.cpp"\

-	{$(INCLUDE)}"\ace\Managed_Object.h"\

-	{$(INCLUDE)}"\ace\Managed_Object.i"\

-	{$(INCLUDE)}"\ace\Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Map_Manager.h"\

-	{$(INCLUDE)}"\ace\Map_Manager.i"\

-	{$(INCLUDE)}"\ace\Mem_Map.h"\

-	{$(INCLUDE)}"\ace\Mem_Map.i"\

-	{$(INCLUDE)}"\ace\Memory_Pool.h"\

-	{$(INCLUDE)}"\ace\Memory_Pool.i"\

-	{$(INCLUDE)}"\ace\Message_Block.h"\

-	{$(INCLUDE)}"\ace\Message_Block.i"\

-	{$(INCLUDE)}"\ace\Message_Queue.cpp"\

-	{$(INCLUDE)}"\ace\Message_Queue.h"\

-	{$(INCLUDE)}"\ace\Message_Queue.i"\

-	{$(INCLUDE)}"\ace\Module.cpp"\

-	{$(INCLUDE)}"\ace\Module.h"\

-	{$(INCLUDE)}"\ace\Module.i"\

-	{$(INCLUDE)}"\ace\Object_Manager.h"\

-	{$(INCLUDE)}"\ace\Object_Manager.i"\

-	{$(INCLUDE)}"\ace\OS.h"\

-	{$(INCLUDE)}"\ace\OS.i"\

-	{$(INCLUDE)}"\ace\Reactor.h"\

-	{$(INCLUDE)}"\ace\Reactor.i"\

-	{$(INCLUDE)}"\ace\Reactor_Impl.h"\

-	{$(INCLUDE)}"\ace\Service_Config.h"\

-	{$(INCLUDE)}"\ace\Service_Config.i"\

-	{$(INCLUDE)}"\ace\Service_Object.h"\

-	{$(INCLUDE)}"\ace\Service_Object.i"\

-	{$(INCLUDE)}"\ace\Service_Repository.h"\

-	{$(INCLUDE)}"\ace\Service_Repository.i"\

-	{$(INCLUDE)}"\ace\Service_Types.h"\

-	{$(INCLUDE)}"\ace\Service_Types.i"\

-	{$(INCLUDE)}"\ace\Shared_Object.h"\

-	{$(INCLUDE)}"\ace\Shared_Object.i"\

-	{$(INCLUDE)}"\ace\Signal.h"\

-	{$(INCLUDE)}"\ace\Signal.i"\

-	{$(INCLUDE)}"\ace\Singleton.cpp"\

-	{$(INCLUDE)}"\ace\Singleton.h"\

-	{$(INCLUDE)}"\ace\Singleton.i"\

-	{$(INCLUDE)}"\ace\SOCK.h"\

-	{$(INCLUDE)}"\ace\SOCK.i"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.h"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.i"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.h"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.i"\

-	{$(INCLUDE)}"\ace\SOCK_IO.h"\

-	{$(INCLUDE)}"\ace\SOCK_IO.i"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.h"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.i"\

-	{$(INCLUDE)}"\ace\SString.h"\

-	{$(INCLUDE)}"\ace\SString.i"\

-	{$(INCLUDE)}"\ace\stdcpp.h"\

-	{$(INCLUDE)}"\ace\Strategies.h"\

-	{$(INCLUDE)}"\ace\Strategies_T.cpp"\

-	{$(INCLUDE)}"\ace\Strategies_T.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.cpp"\

-	{$(INCLUDE)}"\ace\Stream_Modules.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.i"\

-	{$(INCLUDE)}"\ace\Svc_Conf_Tokens.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.cpp"\

-	{$(INCLUDE)}"\ace\Svc_Handler.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.i"\

-	{$(INCLUDE)}"\ace\Synch.h"\

-	{$(INCLUDE)}"\ace\Synch.i"\

-	{$(INCLUDE)}"\ace\Synch_Options.h"\

-	{$(INCLUDE)}"\ace\Synch_T.cpp"\

-	{$(INCLUDE)}"\ace\Synch_T.h"\

-	{$(INCLUDE)}"\ace\Synch_T.i"\

-	{$(INCLUDE)}"\ace\Task.h"\

-	{$(INCLUDE)}"\ace\Task.i"\

-	{$(INCLUDE)}"\ace\Task_T.cpp"\

-	{$(INCLUDE)}"\ace\Task_T.h"\

-	{$(INCLUDE)}"\ace\Task_T.i"\

-	{$(INCLUDE)}"\ace\Thread.h"\

-	{$(INCLUDE)}"\ace\Thread.i"\

-	{$(INCLUDE)}"\ace\Thread_Manager.h"\

-	{$(INCLUDE)}"\ace\Thread_Manager.i"\

-	{$(INCLUDE)}"\ace\Time_Value.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.cpp"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.i"\

-	{$(INCLUDE)}"\ace\Trace.h"\

-	{$(INCLUDE)}"\ace\Version.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.i"\

-	{$(INCLUDE)}"\ace\ws2tcpip.h"\

-	{$(INCLUDE)}"\tao\align.h"\

-	{$(INCLUDE)}"\tao\any.h"\

-	{$(INCLUDE)}"\tao\any.i"\

-	{$(INCLUDE)}"\tao\cdr.h"\

-	{$(INCLUDE)}"\tao\cdr.i"\

-	{$(INCLUDE)}"\tao\client_factory.h"\

-	{$(INCLUDE)}"\tao\client_factory.i"\

-	{$(INCLUDE)}"\tao\connect.h"\

-	{$(INCLUDE)}"\tao\connect.i"\

-	{$(INCLUDE)}"\tao\corba.h"\

-	{$(INCLUDE)}"\tao\corbacom.h"\

-	{$(INCLUDE)}"\tao\corbacom.i"\

-	{$(INCLUDE)}"\tao\debug.h"\

-	{$(INCLUDE)}"\tao\default_client.h"\

-	{$(INCLUDE)}"\tao\default_client.i"\

-	{$(INCLUDE)}"\tao\default_server.h"\

-	{$(INCLUDE)}"\tao\default_server.i"\

-	{$(INCLUDE)}"\tao\except.h"\

-	{$(INCLUDE)}"\tao\giop.h"\

-	{$(INCLUDE)}"\tao\giop.i"\

-	{$(INCLUDE)}"\tao\iiopobj.h"\

-	{$(INCLUDE)}"\tao\iiopobj.i"\

-	{$(INCLUDE)}"\tao\iioporb.h"\

-	{$(INCLUDE)}"\tao\iioporb.i"\

-	{$(INCLUDE)}"\tao\marshal.h"\

-	{$(INCLUDE)}"\tao\marshal.i"\

-	{$(INCLUDE)}"\tao\nvlist.h"\

-	{$(INCLUDE)}"\tao\object.h"\

-	{$(INCLUDE)}"\tao\object.i"\

-	{$(INCLUDE)}"\tao\objtable.h"\

-	{$(INCLUDE)}"\tao\optable.h"\

-	{$(INCLUDE)}"\tao\orb.h"\

-	{$(INCLUDE)}"\tao\orb_core.h"\

-	{$(INCLUDE)}"\tao\orb_core.i"\

-	{$(INCLUDE)}"\tao\orbconf.h"\

-	{$(INCLUDE)}"\tao\orbobj.h"\

-	{$(INCLUDE)}"\tao\orbobj.i"\

-	{$(INCLUDE)}"\tao\params.h"\

-	{$(INCLUDE)}"\tao\params.i"\

-	{$(INCLUDE)}"\tao\poa.h"\

-	{$(INCLUDE)}"\tao\poa.i"\

-	{$(INCLUDE)}"\tao\principa.h"\

-	{$(INCLUDE)}"\tao\request.h"\

-	{$(INCLUDE)}"\tao\sequence.h"\

-	{$(INCLUDE)}"\tao\sequence.i"\

-	{$(INCLUDE)}"\tao\server_factory.h"\

-	{$(INCLUDE)}"\tao\server_factory.i"\

-	{$(INCLUDE)}"\tao\singletons.h"\

-	{$(INCLUDE)}"\tao\stub.h"\

-	{$(INCLUDE)}"\tao\stub.i"\

-	{$(INCLUDE)}"\tao\svrrqst.h"\

-	{$(INCLUDE)}"\tao\svrrqst.i"\

-	{$(INCLUDE)}"\tao\typecode.h"\

-	{$(INCLUDE)}"\tao\typecode.i"\

-	{$(INCLUDE)}"\tao\varout.h"\

-	

-NODEP_CPP_CUBIT_=\

-	"..\..\..\..\tao\tao\factories.h"\

-	

-

-"$(INTDIR)\cubit_i.obj" : $(SOURCE) $(DEP_CPP_CUBIT_) "$(INTDIR)"

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\svr.cpp

-DEP_CPP_SVR_C=\

-	".\cubit_i.h"\

-	".\cubitC.h"\

-	".\cubitS.h"\

-	{$(INCLUDE)}"\ace\Acceptor.cpp"\

-	{$(INCLUDE)}"\ace\Acceptor.h"\

-	{$(INCLUDE)}"\ace\Acceptor.i"\

-	{$(INCLUDE)}"\ace\ACE.h"\

-	{$(INCLUDE)}"\ace\ACE.i"\

-	{$(INCLUDE)}"\ace\Addr.h"\

-	{$(INCLUDE)}"\ace\Addr.i"\

-	{$(INCLUDE)}"\ace\Atomic_Op.i"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.cpp"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.h"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.i"\

-	{$(INCLUDE)}"\ace\config-win32-common.h"\

-	{$(INCLUDE)}"\ace\config-win32.h"\

-	{$(INCLUDE)}"\ace\config.h"\

-	{$(INCLUDE)}"\ace\Connector.cpp"\

-	{$(INCLUDE)}"\ace\Connector.h"\

-	{$(INCLUDE)}"\ace\Connector.i"\

-	{$(INCLUDE)}"\ace\Containers.cpp"\

-	{$(INCLUDE)}"\ace\Containers.h"\

-	{$(INCLUDE)}"\ace\Containers.i"\

-	{$(INCLUDE)}"\ace\Dynamic.h"\

-	{$(INCLUDE)}"\ace\Dynamic.i"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.cpp"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.i"\

-	{$(INCLUDE)}"\ace\Free_List.cpp"\

-	{$(INCLUDE)}"\ace\Free_List.h"\

-	{$(INCLUDE)}"\ace\Free_List.i"\

-	{$(INCLUDE)}"\ace\Get_Opt.h"\

-	{$(INCLUDE)}"\ace\Get_Opt.i"\

-	{$(INCLUDE)}"\ace\Handle_Set.h"\

-	{$(INCLUDE)}"\ace\Handle_Set.i"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.i"\

-	{$(INCLUDE)}"\ace\IO_Cntl_Msg.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.i"\

-	{$(INCLUDE)}"\ace\Log_Msg.h"\

-	{$(INCLUDE)}"\ace\Log_Priority.h"\

-	{$(INCLUDE)}"\ace\Log_Record.h"\

-	{$(INCLUDE)}"\ace\Log_Record.i"\

-	{$(INCLUDE)}"\ace\Malloc.h"\

-	{$(INCLUDE)}"\ace\Malloc.i"\

-	{$(INCLUDE)}"\ace\Malloc_T.cpp"\

-	{$(INCLUDE)}"\ace\Malloc_T.h"\

-	{$(INCLUDE)}"\ace\Malloc_T.i"\

-	{$(INCLUDE)}"\ace\Managed_Object.cpp"\

-	{$(INCLUDE)}"\ace\Managed_Object.h"\

-	{$(INCLUDE)}"\ace\Managed_Object.i"\

-	{$(INCLUDE)}"\ace\Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Map_Manager.h"\

-	{$(INCLUDE)}"\ace\Map_Manager.i"\

-	{$(INCLUDE)}"\ace\Mem_Map.h"\

-	{$(INCLUDE)}"\ace\Mem_Map.i"\

-	{$(INCLUDE)}"\ace\Memory_Pool.h"\

-	{$(INCLUDE)}"\ace\Memory_Pool.i"\

-	{$(INCLUDE)}"\ace\Message_Block.h"\

-	{$(INCLUDE)}"\ace\Message_Block.i"\

-	{$(INCLUDE)}"\ace\Message_Queue.cpp"\

-	{$(INCLUDE)}"\ace\Message_Queue.h"\

-	{$(INCLUDE)}"\ace\Message_Queue.i"\

-	{$(INCLUDE)}"\ace\Module.cpp"\

-	{$(INCLUDE)}"\ace\Module.h"\

-	{$(INCLUDE)}"\ace\Module.i"\

-	{$(INCLUDE)}"\ace\Object_Manager.h"\

-	{$(INCLUDE)}"\ace\Object_Manager.i"\

-	{$(INCLUDE)}"\ace\OS.h"\

-	{$(INCLUDE)}"\ace\OS.i"\

-	{$(INCLUDE)}"\ace\Reactor.h"\

-	{$(INCLUDE)}"\ace\Reactor.i"\

-	{$(INCLUDE)}"\ace\Reactor_Impl.h"\

-	{$(INCLUDE)}"\ace\Service_Config.h"\

-	{$(INCLUDE)}"\ace\Service_Config.i"\

-	{$(INCLUDE)}"\ace\Service_Object.h"\

-	{$(INCLUDE)}"\ace\Service_Object.i"\

-	{$(INCLUDE)}"\ace\Service_Repository.h"\

-	{$(INCLUDE)}"\ace\Service_Repository.i"\

-	{$(INCLUDE)}"\ace\Service_Types.h"\

-	{$(INCLUDE)}"\ace\Service_Types.i"\

-	{$(INCLUDE)}"\ace\Shared_Object.h"\

-	{$(INCLUDE)}"\ace\Shared_Object.i"\

-	{$(INCLUDE)}"\ace\Signal.h"\

-	{$(INCLUDE)}"\ace\Signal.i"\

-	{$(INCLUDE)}"\ace\Singleton.cpp"\

-	{$(INCLUDE)}"\ace\Singleton.h"\

-	{$(INCLUDE)}"\ace\Singleton.i"\

-	{$(INCLUDE)}"\ace\SOCK.h"\

-	{$(INCLUDE)}"\ace\SOCK.i"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.h"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.i"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.h"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.i"\

-	{$(INCLUDE)}"\ace\SOCK_IO.h"\

-	{$(INCLUDE)}"\ace\SOCK_IO.i"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.h"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.i"\

-	{$(INCLUDE)}"\ace\SString.h"\

-	{$(INCLUDE)}"\ace\SString.i"\

-	{$(INCLUDE)}"\ace\stdcpp.h"\

-	{$(INCLUDE)}"\ace\Strategies.h"\

-	{$(INCLUDE)}"\ace\Strategies_T.cpp"\

-	{$(INCLUDE)}"\ace\Strategies_T.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.cpp"\

-	{$(INCLUDE)}"\ace\Stream_Modules.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.i"\

-	{$(INCLUDE)}"\ace\Svc_Conf_Tokens.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.cpp"\

-	{$(INCLUDE)}"\ace\Svc_Handler.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.i"\

-	{$(INCLUDE)}"\ace\Synch.h"\

-	{$(INCLUDE)}"\ace\Synch.i"\

-	{$(INCLUDE)}"\ace\Synch_Options.h"\

-	{$(INCLUDE)}"\ace\Synch_T.cpp"\

-	{$(INCLUDE)}"\ace\Synch_T.h"\

-	{$(INCLUDE)}"\ace\Synch_T.i"\

-	{$(INCLUDE)}"\ace\Task.h"\

-	{$(INCLUDE)}"\ace\Task.i"\

-	{$(INCLUDE)}"\ace\Task_T.cpp"\

-	{$(INCLUDE)}"\ace\Task_T.h"\

-	{$(INCLUDE)}"\ace\Task_T.i"\

-	{$(INCLUDE)}"\ace\Thread.h"\

-	{$(INCLUDE)}"\ace\Thread.i"\

-	{$(INCLUDE)}"\ace\Thread_Manager.h"\

-	{$(INCLUDE)}"\ace\Thread_Manager.i"\

-	{$(INCLUDE)}"\ace\Time_Value.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.cpp"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.i"\

-	{$(INCLUDE)}"\ace\Trace.h"\

-	{$(INCLUDE)}"\ace\Version.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.i"\

-	{$(INCLUDE)}"\ace\ws2tcpip.h"\

-	{$(INCLUDE)}"\tao\align.h"\

-	{$(INCLUDE)}"\tao\any.h"\

-	{$(INCLUDE)}"\tao\any.i"\

-	{$(INCLUDE)}"\tao\cdr.h"\

-	{$(INCLUDE)}"\tao\cdr.i"\

-	{$(INCLUDE)}"\tao\client_factory.h"\

-	{$(INCLUDE)}"\tao\client_factory.i"\

-	{$(INCLUDE)}"\tao\connect.h"\

-	{$(INCLUDE)}"\tao\connect.i"\

-	{$(INCLUDE)}"\tao\corba.h"\

-	{$(INCLUDE)}"\tao\corbacom.h"\

-	{$(INCLUDE)}"\tao\corbacom.i"\

-	{$(INCLUDE)}"\tao\debug.h"\

-	{$(INCLUDE)}"\tao\default_client.h"\

-	{$(INCLUDE)}"\tao\default_client.i"\

-	{$(INCLUDE)}"\tao\default_server.h"\

-	{$(INCLUDE)}"\tao\default_server.i"\

-	{$(INCLUDE)}"\tao\except.h"\

-	{$(INCLUDE)}"\tao\giop.h"\

-	{$(INCLUDE)}"\tao\giop.i"\

-	{$(INCLUDE)}"\tao\iiopobj.h"\

-	{$(INCLUDE)}"\tao\iiopobj.i"\

-	{$(INCLUDE)}"\tao\iioporb.h"\

-	{$(INCLUDE)}"\tao\iioporb.i"\

-	{$(INCLUDE)}"\tao\marshal.h"\

-	{$(INCLUDE)}"\tao\marshal.i"\

-	{$(INCLUDE)}"\tao\nvlist.h"\

-	{$(INCLUDE)}"\tao\object.h"\

-	{$(INCLUDE)}"\tao\object.i"\

-	{$(INCLUDE)}"\tao\objtable.h"\

-	{$(INCLUDE)}"\tao\optable.h"\

-	{$(INCLUDE)}"\tao\orb.h"\

-	{$(INCLUDE)}"\tao\orb_core.h"\

-	{$(INCLUDE)}"\tao\orb_core.i"\

-	{$(INCLUDE)}"\tao\orbconf.h"\

-	{$(INCLUDE)}"\tao\orbobj.h"\

-	{$(INCLUDE)}"\tao\orbobj.i"\

-	{$(INCLUDE)}"\tao\params.h"\

-	{$(INCLUDE)}"\tao\params.i"\

-	{$(INCLUDE)}"\tao\poa.h"\

-	{$(INCLUDE)}"\tao\poa.i"\

-	{$(INCLUDE)}"\tao\principa.h"\

-	{$(INCLUDE)}"\tao\request.h"\

-	{$(INCLUDE)}"\tao\sequence.h"\

-	{$(INCLUDE)}"\tao\sequence.i"\

-	{$(INCLUDE)}"\tao\server_factory.h"\

-	{$(INCLUDE)}"\tao\server_factory.i"\

-	{$(INCLUDE)}"\tao\singletons.h"\

-	{$(INCLUDE)}"\tao\stub.h"\

-	{$(INCLUDE)}"\tao\stub.i"\

-	{$(INCLUDE)}"\tao\svrrqst.h"\

-	{$(INCLUDE)}"\tao\svrrqst.i"\

-	{$(INCLUDE)}"\tao\typecode.h"\

-	{$(INCLUDE)}"\tao\typecode.i"\

-	{$(INCLUDE)}"\tao\varout.h"\

-	

-NODEP_CPP_SVR_C=\

-	"..\..\..\..\tao\tao\factories.h"\

-	

-

-"$(INTDIR)\svr.obj" : $(SOURCE) $(DEP_CPP_SVR_C) "$(INTDIR)"

-

-

-# End Source File

-# End Target

-# End Project

-################################################################################

diff --git a/TAO/tests/Cubit/TAO/DII_Cubit/test.mdp b/TAO/tests/Cubit/TAO/DII_Cubit/test.mdp
deleted file mode 100644
index 50425134c35..00000000000
--- a/TAO/tests/Cubit/TAO/DII_Cubit/test.mdp
+++ /dev/null
diff --git a/TAO/tests/Cubit/TAO/DII_Cubit/test1.cpp b/TAO/tests/Cubit/TAO/DII_Cubit/test1.cpp
deleted file mode 100644
index 2548eb10008..00000000000
--- a/TAO/tests/Cubit/TAO/DII_Cubit/test1.cpp
+++ /dev/null
@@ -1,390 +0,0 @@
-// @(#)test1.cpp	1.4 95/09/28
-// Copyright 1995 by Sun Microsystems, Inc.
-// All Rights Reserved
-//
-// TEST		stubs for "test1"
-//
-
-#include <stdio.h>
-
-#include "test1.h"
-
-
-//
-// Define all the stubs ... it's a lot less error prone to do it with
-// macros than by hand!
-//
-// NOTE:  the "calldata" is exported for use by the skeletons.  At some
-// point skeletons will probably be fully abstracted; for now they aren't.
-//
-// Also, for some reason, name mangling is changed by the explicit
-// declaration as "extern" -- if it's not done, linking fails.
-//
-#define	DEFINE_TEST3(typename, truetype, truetypename) \
-    static const TAO_Param_Data test1_ ## typename ## _paramdata [4] = { \
-    { CORBA::_tc_ ## truetypename, PARAM_RETURN, 0 }, \
-    { CORBA::_tc_ ## truetypename, PARAM_IN, 0 }, \
-    { CORBA::_tc_ ## truetypename, PARAM_OUT, 0 }, \
-    { CORBA::_tc_ ## truetypename, PARAM_INOUT, 0 }, \
-    }; \
-    \
-    extern const TAO_Call_Data test1_ ## typename ## _calldata; \
-    \
-    const TAO_Call_Data test1_ ## typename ## _calldata = { \
-	"test_" #typename, CORBA::B_TRUE, \
-	4, &test1_ ## typename ## _paramdata [0], \
-	0, 0, \
-    }; \
-    \
-    CORBA:: ## truetype \
-    test1_test_ ## typename (test1_ptr target, \
-		CORBA:: ## truetype in_a1, \
-		CORBA:: ## truetype &out_a2, \
-		CORBA:: ## truetype &inout_a3, \
-		CORBA::Environment &env) { \
-	CORBA:: ## truetype _retval; \
-	STUB_Object	*_obj; \
-	if (target->QueryInterface (IID_STUB_Object, (void **)&_obj) \
-		!= NOERROR) \
-	    env.exception (new CORBA::INV_OBJREF (COMPLETED_NO)); \
-	else { \
-	    _obj->do_call (env, &test1_ ## typename ## _calldata, \
-		&_retval, &in_a1, &out_a2, &inout_a3); \
-	    _obj->Release (); \
-	} \
-	return _retval; \
-    }
-
-//  changed extern const calldata test1_ ## typename ## _calldata;
-//  to     const calldata test1_ ## typename ## _calldata; \
-
-//	changed CORBA:: ## truetype _retval = 0; to changed CORBA:: ## truetype _retval;
-
-#define	DEFINE_TEST(typename, truetype) \
-	DEFINE_TEST3(typename, truetype, truetype)
-
-
-//
-// Generate a system exception, passing an operation ID that's
-// not allowed by IIOP (much less this interface) and verifying
-// that the server returns some kind of system exception.
-//
-static const TAO_Call_Data illegal_calldata = {
-    "+_illegal", CORBA::B_TRUE,
-    0, 0,
-    0, 0
-};
-
-void
-test_illegal (test1_ptr target, CORBA::Environment &env)
-{
-    STUB_Object		*data;
-
-    if (target->QueryInterface (IID_STUB_Object, (void **)&data)
-	    != NOERROR)
-	env.exception (new CORBA::INV_OBJREF (COMPLETED_NO));
-    else {
-	data->do_call (env, &illegal_calldata
-	    );
-	data->Release ();
-    }
-}
-
-
-extern const TAO_Call_Data test1_void_calldata;
-const TAO_Call_Data test1_void_calldata = {
-    "test_void", CORBA::B_TRUE,
-    0, 0,
-    0, 0
-};
-
-void
-test1_test_void (test1_ptr target, CORBA::Environment &env)
-{
-    STUB_Object		*data;
-
-    if (target->QueryInterface (IID_STUB_Object, (void **)&data)
-	    != NOERROR)
-	env.exception (new CORBA::INV_OBJREF (COMPLETED_NO));
-    else {
-	data->do_call (env, &test1_void_calldata
-	    );
-	data->Release ();
-    }
-}
-
-DEFINE_TEST (short, Short);
-DEFINE_TEST (long, Long);
-DEFINE_TEST (ushort, UShort);
-DEFINE_TEST (ulong, ULong);
-
-#if	defined(MIPS)
-//
-// NOTE:  C/C++ compilers as a rule pass a "float" in the space that
-// a "double" takes up.  Conversions are evidently optional; portability
-// forces the following "explicit temporary" hack to work on at least
-// one MIPS platform, which converts the parameter to "double" and
-// hence changes the binary representation.  (Even if that is a compiler
-// bug, it's probably required by now for binary compatibility!)
-//
-// A "-k ansi" compiler flag may be needed to get correct behaviour;
-// passing the "in" parameters by reference apparently works too.  At
-// this time, none of these solutions is used by default.
-//
-// This stub-level hackery seems like it could be replaced inside of the
-// stub interpreter, which could just manually convert "float" parameters
-// (all of them) as special cases.  But of course, that would slow the
-// interpreter down on _every_ call, not just the ones that require it
-// (such as this one).  Tradeoffs!
-//
-static const TAO_Param_Data test1_float_paramdata [4] = {
-    { CORBA::_tc_float , PARAM_RETURN , 0 },
-    { CORBA::_tc_float , PARAM_IN , 0 },
-    { CORBA::_tc_float , PARAM_OUT , 0 },
-    { CORBA::_tc_float , PARAM_INOUT , 0 }
-};
-
-extern const TAO_Call_Data test1_float_calldata;
-
-const TAO_Call_Data test1_float_calldata = {
-    "test_float", CORBA::B_TRUE,
-    4 , &test1_float_paramdata [0],
-    0 , 0
-};
-
-CORBA::Float
-test1_test_float (
-    test1_ptr		target,
-    CORBA::Float	in_a1,
-    CORBA::Float	&out_a2,
-    CORBA::Float	&inout_a3,
-    CORBA::Environment	&env
-)
-{
-    CORBA::Float	_retval;
-
-    // These three temporaries required due to MIPS compiler bug
-    CORBA::Float	_in_a1 = in_a1;
-    CORBA::Float	_out_a2 = out_a2;
-    CORBA::Float	_inout_a3 = inout_a3;
-
-    target -> data -> do_call (env,
-	&test1_float_calldata,
-	&_retval,
-	&_in_a1,
-	&_out_a2,
-	&_inout_a3);
-    return _retval;
-}
-
-#else
-DEFINE_TEST (float, Float);
-#endif	// MIPS
-
-
-DEFINE_TEST (double, Double);
-DEFINE_TEST (boolean, Boolean);
-DEFINE_TEST (char, Char);
-DEFINE_TEST (octet, Octet);
-
-/*
-CORBA::Any *
-test1_test_any (test1_ptr target,
-	const CORBA::Any &in_a1,
-	CORBA::Any *&out_a2,
-	CORBA::Any &inout_a3,
-	CORBA::Environment &env)
-{
-    // XXX implement this stub! ... annoying that C++ mapping
-    // calls for so much special casing
-}
-*/
-
-
-DEFINE_TEST3 (TypeCode, TypeCode_ptr, TypeCode);
-DEFINE_TEST3 (Principal, Principal_ptr, Principal);
-DEFINE_TEST3 (Object, Object_ptr, Object);
-
-// NOTE:  C++ mapping has "in" strings as "const", which doesn't
-// show up in this macro ...
-DEFINE_TEST3 (string, Char *, String);
-
-DEFINE_TEST (longlong, LongLong);
-DEFINE_TEST (ulonglong, ULongLong);
-DEFINE_TEST (wchar, WChar);
-
-// NOTE:  C++ mapping has "in" strings as "const", which doesn't
-// show up in this macro ...
-DEFINE_TEST3 (wstring, WChar *, WString);
-
-#if !defined(NONNATIVE_LONGDOUBLE)
-DEFINE_TEST (longdouble, LongDouble);
-#endif
-
-#undef	DEFINE_TEST
-
-
-//
-// Utility macros used to construct octet codes that are aligned
-// on longword boundaries, and with a known byte order.  This
-// happens to use big endian encoding since it was convenient.
-// (Longword alignment is a happy accident of the specification
-// of OMG-IDL ... it could have been much worse!)
-//
-// It'd be much simpler to lay out such data in assembler!
-//
-
-#if	defined (WORDS_BIGENDIAN)
-#	define	MAKE_BIG_LONG(a,b,c,d) \
-	    ((((a) & 0xff) << 24) | (((b) & 0xff) << 16) \
-	     | (((c) & 0xff) <<  8) | ((d) & 0xff))
-#	define	BIG_ENDIAN_LONG(x)	(x)
-
-#else	// LITTLE_ENDIAN
-#	define	MAKE_BIG_LONG(a,b,c,d) \
-	    ((((d) & 0xff) << 24) | (((c) & 0xff) << 16) \
-	     | (((b) & 0xff) <<  8) | ((a) & 0xff))
-#	define BYTE_FROM(n,integer)    (((integer)>>(8*(n)))&0xff)
-#	define BIG_ENDIAN_LONG(integer) \
-	    MAKE_BIG_LONG (BYTE_FROM(3,integer), BYTE_FROM(2,integer),\
-		BYTE_FROM(1,integer), BYTE_FROM(0,integer))
-#endif
-
-
-
-//
-// "x1" exception typecode ... must be longword aligned
-//
-static CORBA::Long oc_x1 [] = {
-    0,					// big endian flag + padding
-    BIG_ENDIAN_LONG (29),		// length of ID string + NUL
-    MAKE_BIG_LONG ('I', 'D', 'L', ':'),	// bytes of ID string
-    MAKE_BIG_LONG ('E', 'n', 'g', '.'),
-    MAKE_BIG_LONG ('S', 'U', 'N', '.'),
-    MAKE_BIG_LONG ('C', 'O', 'M', '/'),
-    MAKE_BIG_LONG ('t', 'e', 's', 't'),
-    MAKE_BIG_LONG ('1', '/', 'x', '1'),
-    MAKE_BIG_LONG (':', '1', '.', '0'),
-    0,
-    BIG_ENDIAN_LONG (1),		// (empty) namelen + NUL
-    0,
-    BIG_ENDIAN_LONG (1),		// only one struct member
-    BIG_ENDIAN_LONG (1),		// (empty) member name + NUL
-    0,
-    BIG_ENDIAN_LONG (tk_long)
-};
-static CORBA::TypeCode tc_x1 (tk_except, sizeof oc_x1,
-	    (unsigned char *)&oc_x1, CORBA::B_FALSE);
-CORBA::TypeCode_ptr	_tc_test1_x1 = &tc_x1;
-
-
-
-//
-// "x2" exception typecode ... must be longword aligned
-//
-static CORBA::Long oc_x2 [] = {
-    0,					// big endian flag + padding
-    BIG_ENDIAN_LONG (29),		// length of ID string + NUL
-    MAKE_BIG_LONG ('I', 'D', 'L', ':'),	// bytes of ID string
-    MAKE_BIG_LONG ('E', 'n', 'g', '.'),
-    MAKE_BIG_LONG ('S', 'U', 'N', '.'),
-    MAKE_BIG_LONG ('C', 'O', 'M', '/'),
-    MAKE_BIG_LONG ('t', 'e', 's', 't'),
-    MAKE_BIG_LONG ('1', '/', 'x', '2'),
-    MAKE_BIG_LONG (':', '1', '.', '0'),
-    0,
-    BIG_ENDIAN_LONG (1),		// (empty) namelen + NUL
-    0,
-    BIG_ENDIAN_LONG (2),		// two struct members
-
-    BIG_ENDIAN_LONG (1),		// (empty) member name + NUL
-    0,
-    BIG_ENDIAN_LONG (tk_objref),
-    BIG_ENDIAN_LONG (29),		// type ID + NUL
-    MAKE_BIG_LONG ('I', 'D', 'L', ':'),	// bytes of ID string
-    MAKE_BIG_LONG ('o', 'm', 'g', '.'),
-    MAKE_BIG_LONG ('o', 'r', 'g', '/'),
-    MAKE_BIG_LONG ('C', 'O', 'R', 'B'),
-    MAKE_BIG_LONG ('A', '/', 'O', 'b'),
-    MAKE_BIG_LONG ('j', 'e', 'c', 't'),
-    MAKE_BIG_LONG (':', '1', '.', '0'),
-    0,
-
-    BIG_ENDIAN_LONG (1),		// (empty) member name + NUL
-    0,
-    BIG_ENDIAN_LONG (tk_long)
-};
-static CORBA::TypeCode tc_x2 (tk_except, sizeof oc_x2,
-	    (unsigned char *)&oc_x2, CORBA::B_FALSE);
-CORBA::TypeCode_ptr	_tc_test1_x2 = &tc_x2;
-
-
-//
-// parameter, exception, and call descriptions for "test_throw"
-//
-static const TAO_Param_Data test1_test_throw_paramdata [1] = {
-    { CORBA::_tc_long, PARAM_IN, 0 }
-};
-
-static CORBA::TypeCode_ptr test1_test_throw_excepts [2] = {
-    &tc_x1, &tc_x2
-};
-
-extern const TAO_Call_Data test1_test_throw_calldata;
-
-const TAO_Call_Data test1_test_throw_calldata = {
-    "test_throw", CORBA::B_TRUE,
-    1, &test1_test_throw_paramdata [0],
-    2, &test1_test_throw_excepts [0]
-};
-
-//
-// "test_throw" stub
-//
-void
-test1_test_throw (
-    test1_ptr		target,
-    CORBA::Long	case_num,
-    CORBA::Environment	&env		// throw (x1, x2)
-)
-{
-    STUB_Object		*data;
-
-    if (target->QueryInterface (IID_STUB_Object, (void **)&data)
-	    != NOERROR)
-	env.exception (new CORBA::INV_OBJREF (COMPLETED_NO));
-    else {
-	data->do_call (env, &test1_test_throw_calldata,
-	    &case_num);
-	data->Release ();
-    }
-}
-
-//
-// PLEASE EXIT
-//
-
-static const TAO_Call_Data test1_please_exit_calldata = {
-    "please_exit", CORBA::B_FALSE,
-    0, 0,
-    0, 0
-};
-
-void
-test1_please_exit (
-    test1_ptr		target,
-    CORBA::Environment	&env
-)
-{
-    STUB_Object		*data;
-
-    if (target->QueryInterface (IID_STUB_Object, (void **)&data)
-	    != NOERROR)
-	env.exception (new CORBA::INV_OBJREF (COMPLETED_NO));
-    else {
-	data->do_call (env, &test1_please_exit_calldata
-	    );
-	data->Release ();
-    }
-}
-
diff --git a/TAO/tests/Cubit/TAO/DII_Cubit/test1.h b/TAO/tests/Cubit/TAO/DII_Cubit/test1.h
deleted file mode 100644
index c3f35de198c..00000000000
--- a/TAO/tests/Cubit/TAO/DII_Cubit/test1.h
+++ /dev/null
@@ -1,122 +0,0 @@
-// @(#)test1.hh	1.2 95/09/12
-// Copyright 1995 by Sun Microsystems, Inc.
-// All Rights Reserved
-//
-// TEST		interface for "test1"
-//
-
-#ifndef	_TEST1_HH
-#define	_TEST1_HH
-
-#include "tao/corba.h"
-
-#ifdef	_MSC_VER
-#pragma	pack (push, 1)			// VC++, known padding rules
-#endif	// VC++
-
-typedef CORBA::UShort		test1_ushort;
-typedef CORBA::ULong		test1_ulong;
-
-typedef CORBA::LongLong	test1_longlong;
-typedef CORBA::ULongLong 	test1_ulonglong;
-typedef CORBA::LongDouble	test1_longdouble;
-
-typedef CORBA::Object		test1;
-typedef test1			*test1_ptr;
-
-#define	DECL_TEST(typename, truetype) \
-    truetype \
-    test1_test_ ## typename ( \
-	test1_ptr		target, \
-	truetype		in_a1, \
-	truetype		&out_a2, \
-	truetype		&inout_a3, \
-	CORBA::Environment	&env \
-    )
-
-void test_illegal (test1_ptr target, CORBA::Environment &env);
-void test1_test_void (test1_ptr target, CORBA::Environment &env);
-
-DECL_TEST (short, CORBA::Short);
-DECL_TEST (long, CORBA::Long);
-DECL_TEST (ushort, CORBA::UShort);
-DECL_TEST (ulong, CORBA::ULong);
-DECL_TEST (float, CORBA::Float);
-DECL_TEST (double, CORBA::Double);
-DECL_TEST (boolean, CORBA::Boolean);
-DECL_TEST (char, CORBA::Char);
-DECL_TEST (octet, CORBA::Octet);
-
-CORBA::Any *
-test1_test_any (
-    test1_ptr		target,
-    const CORBA::Any	&in_a1,
-    CORBA::Any		*&out_a2,
-    CORBA::Any		&inout_a3,
-    CORBA::Environment	&env
-);
-
-DECL_TEST (TypeCode, CORBA::TypeCode_ptr);
-DECL_TEST (Principal, CORBA::Principal_ptr);
-DECL_TEST (Object, CORBA::Object_ptr);
-
-// NOTE:  CORBA C++ mapping says the "in" string is const
-DECL_TEST (string, CORBA::String);
-
-DECL_TEST (longlong, CORBA::LongLong);
-DECL_TEST (ulonglong, CORBA::ULongLong);
-DECL_TEST (wchar, CORBA::WChar);
-
-// NOTE:  CORBA C++ mapping says the "in" string is const
-DECL_TEST (wstring, CORBA::WString);
-
-DECL_TEST (longdouble, CORBA::LongDouble);
-
-#undef	DECL_TEST
-
-extern CORBA::TypeCode_ptr	_tc_test1_x1;
-
-class test1_x1 : public CORBA::UserException {
-  public:
-    CORBA::Long	case_num;
-			
-			test1_x1 (CORBA::Long n)
-			: CORBA::UserException (_tc_test1_x1), case_num (n)
-			{ }
-};
-
-extern CORBA::TypeCode_ptr	_tc_test1_x2;
-
-class test1_x2 : public CORBA::UserException {
-  public:
-    CORBA::Object_ptr	obj;
-    CORBA::Long	case_num;
-
-			test1_x2 (CORBA::Object_ptr obj1,
-				CORBA::Long n)
-			: CORBA::UserException (_tc_test1_x2),
-			    obj (obj1), case_num (n) { }
-
-			~test1_x2 ()
-			{ CORBA::release (obj); }
-};
-
-void
-test1_test_throw (
-    test1_ptr		target,
-    CORBA::Long	case_num,
-    CORBA::Environment	&env		// throw (x1, x2)
-);
-
-void
-test1_please_exit (
-    test1_ptr		target,
-    CORBA::Environment	&env
-);
-
-#ifdef	_MSC_VER
-#pragma	pack (pop)			// VC++, go back to other padding rules
-#endif	// VC++
-
-#endif	// _TEST1_HH
-
diff --git a/TAO/tests/Cubit/TAO/DII_Cubit/test1.idl b/TAO/tests/Cubit/TAO/DII_Cubit/test1.idl
deleted file mode 100644
index e6cf20cd2de..00000000000
--- a/TAO/tests/Cubit/TAO/DII_Cubit/test1.idl
+++ /dev/null
@@ -1,78 +0,0 @@
-// @(#)test1.idl	1.1 95/09/11
-// Copyright 1994-1995 by Sun Microsystems, Inc.
-//
-// TEST		basic marshaling tests for all IDL primitive types, modes
-//
-// This test omits constructed types (struct, union, enum, sequence, and
-// array types), and only tests very simple user defined exceptions.
-//
-// Values returned are well defined functions of the input values:
-//
-//	* For numeric types (octet, short, long, longlong, float, double,
-//	  longdouble, and unsigned variants) the value is cubed.
-//	* For Boolean, it's the negation.
-//	* For Any, TypeCode, Principal, Object, char and wchar,
-//	  string and wstring, it's the input value.
-//
-// The "return" and "out" parameter is the function of the "in" parameter;
-// the "inout" parameter is the function of its original value.
-//
-// The "echo" test has all output values be the input values, with no
-// changes to the bit patterns originally transmitted.  While easier to
-// use to identify some kinds of problem, it is not as complete a test.
-//
-
-#define	DECL_TEST(type) \
-    type test_ ## type ( in type a1, out type a2, inout type a3)
-
-#pragma	prefix	"Eng.SUN.COM"	// only for Sun-defined interfaces
-
-interface test1 {
-    void	test_void ();
-
-    typedef unsigned short ushort;
-    typedef unsigned long ulong;
-
-    typedef long long longlong;
-    typedef unsigned long long ulonglong;
-    typedef long double longdouble;
-
-    DECL_TEST (short);
-    DECL_TEST (long);
-    DECL_TEST (ushort);
-    DECL_TEST (ulong);
-    DECL_TEST (float);
-    DECL_TEST (double);
-    DECL_TEST (boolean);
-    DECL_TEST (char);
-    DECL_TEST (octet);
-    DECL_TEST (any);
-    DECL_TEST (TypeCode);
-    DECL_TEST (Principal);
-    DECL_TEST (Object);		// CORBA::Object
-    DECL_TEST (string);		// unbounded string
-
-    DECL_TEST (longlong);
-    DECL_TEST (ulonglong);
-    DECL_TEST (wchar);
-    DECL_TEST (wstring);	// unbounded wstring
-    DECL_TEST (longdouble);
-
-    //
-    // All cases, "case_num" in the exception is the same as the 'in' param
-    //	* negative or zero, throws x1
-    //	* positive even cases, throws x2 with obj = null objref
-    //	* positive odd cases, throws x2 with obj = target objref
-    //
-    exception x1 { long case_num; };
-    exception x2 { Object obj; long case_num; };
-
-    void test_throw (in long case_num) raises (x1, x2);
-
-    //
-    // Aid for test cleanup in case server's not told to quit after
-    // being idle for some time period
-    //
-    oneway void please_exit ();
-};
-
diff --git a/TAO/tests/Cubit/TAO/DII_Cubit/test1_clnt.cpp b/TAO/tests/Cubit/TAO/DII_Cubit/test1_clnt.cpp
deleted file mode 100644
index 1b6d1abbc2d..00000000000
--- a/TAO/tests/Cubit/TAO/DII_Cubit/test1_clnt.cpp
+++ /dev/null
@@ -1,635 +0,0 @@
-// @(#)test1_clnt.cpp	1.5 95/09/24
-// Copyright 1995 by Sun Microsystems, Inc.
-// All Rights Reserved
-//
-// TEST		client driver for "test1"
-//
-
-#ifdef	USE_IOSTREAM
-#include <iostream.h>
-#endif
-
-#include <stdio.h>
-#include <string.h>
-#include <ace/Get_Opt.h>
-
-#if	unix
-#	include	<unistd.h>
-
-#else	// windows
-
-#endif	// unix
-
-#include "test1.h"
-#include "tao/corba.h"
-
-#if !defined (_WIN32)
-extern char 	*optarg;	// missing on some platforms
-#endif
-
-extern void
-print_exception (const CORBA::Exception *, const char *, FILE *f=stdout);
-
-
-//
-// All tests are specified so that the return value and "out" (second)
-// parameters are easily tested functions of the "in" (first) parameter,
-// and the "inout" (third) parameter is the same function the its
-// initial value.   Caller is expected to specify two different "in"
-// values.   This helps make the marshaled bits vary, and turn up a class
-// of potential problems that'd be hidden if parameter order had no
-// effect on the test.
-//
-// PERFORM_TEST calls a test for a given type, reporting in cases where
-// the ORB or operation failed.  The COMPARE symbol can be redefined
-// to achieve different functions -- e.g. cubing numbers, identity,
-// negation, etc.  It should return true iff the correct result was
-// returned.
-//
-// BAD_COMPARE_VALUES is to produce diagnostics when a test fails,
-// showing the actual and expected values of returned parameters.
-// This helps diagnose specific porting problems.
-//
-// The RELEASE symbol may be defined to free memory, eliminating client
-// side memory leaks in the test.
-//
-#define	RELEASE(X)		// NOP by default
-#define	PERFORM_TEST(name,type,value1,value2) \
-    { \
-	CORBA:: ## type	v1, v2, v3; \
- 	\
-	v1 = (CORBA:: ## type)(value1); \
-	v2 = 0; \
-	v3 = (CORBA:: ## type)(value2); \
- 	\
-	test_count++; \
-	v1 = test1_test_ ## name (target, v1, v2, v3, env); \
-	if (env.exception () != 0) { \
-	    print_exception (env.exception (), "perform test_" #name); \
-	    error_count++; \
-	} else if (!COMPARE (CORBA:: ## type, v1, value1) \
-		|| !COMPARE (CORBA:: ## type, v2, value1) \
-		|| !COMPARE (CORBA:: ## type, v3, value2) ) { \
-	    ACE_OS::fprintf (stderr, "bad comparison, test_" #name "\n"); \
-	    BAD_COMPARE_VALUES(type,v1,v2,v3,value1,value2) \
-	    error_count++; \
-	} \
-	RELEASE (v1); RELEASE (v2); RELEASE (v3); \
-    }
-
-//
-// This messing about is because the ostream op << cannot always
-// be used with all kinds of data ... e.g. LongDouble, TypeCode.
-//
-#ifdef	USE_IOSTREAM
-#	define	DO_IO(x) x
-#else
-#	define	DO_IO(x)
-#endif
-#define BAD_COMPARE_VALUE_OUT(type,v1,v2,v3,value1,value2) \
-	    DO_IO( cerr << " v1=" << v1; \
-            cerr << " expecting " << EXPVAL(CORBA:: ## type, value1) << "\n"; \
-	    cerr << " v2=" << v2; \
-            cerr << " expecting " << EXPVAL(CORBA:: ## type, value1) << "\n"; \
-	    cerr << " v3=" << v3; \
-	    cerr << " expecting " << EXPVAL(CORBA:: ## type, value2) << "\n");
-#define BAD_COMPARE_VALUES(type,v1,v2,v3,value1,value2) \
-    BAD_COMPARE_VALUE_OUT(type,v1,v2,v3,value1,value2)
-
-
-//
-// test utility -- should be able to just use is_equivalent() directly
-// but this implementation uses null pointers for nil, so this must
-// check for nulls first.  (May be noncompliant with C++ mapping!)
-//
-static CORBA::Boolean
-compare_objrefs (
-    CORBA::Object_ptr	v1,
-    CORBA::Object_ptr	v2
-)
-{
-    CORBA::Boolean	temp;
-    CORBA::Environment	env;
-
-    if (v1 == v2)
-	return CORBA::B_TRUE;
-
-    if (CORBA::is_nil (v1))
-	return CORBA::is_nil (v2);
-
-    temp = v1->_is_equivalent (v2, env);
-    if (env.exception () != 0) {
-	print_exception (env.exception (), "compare objref");
-	return CORBA::B_FALSE;
-    }
-    return temp;
-}
-
-
-//
-// Helper routine to help sure math (especially for floating point)
-// gets done correctly.
-//
-template <class Type>
-Type cube (Type arg)
-{
-    Type temp = arg;
-
-    temp = temp * arg;
-    temp = temp * arg;
-    return temp;
-}
-
-
-static int	skip_longdouble = 0;
-
-//
-// This just performs the tests ...
-//
-void
-do_tests (
-    test1_ptr	target,
-    unsigned	loop_count,
-    unsigned	&test_count,
-    unsigned	&error_count
-)
-{
-    int		count;
-
-    for (count = 0; count < loop_count; count++) {
-	CORBA::Environment	env;
-	CORBA::Environment	env2;	// XXX
-
-	//
-	// test_void
-	//
-	test_count++;
-	test1_test_void (target, env);
-	if (env.exception () != 0) { 
-	    print_exception (env.exception (), "perform test_void");
-	    error_count++;
-	}
-
-	//
-	// Numeric tests ... try some variety in computation, no real
-	// rationale in the choice of initial parameter values except
-	// not to use the same values all the time.
-	//
-#define EXPVAL(type,original_value) ((type) cube((type)(original_value)))
-#define COMPARE(type,retval,original_value) \
-	((retval) == EXPVAL(type, original_value))
-
-	PERFORM_TEST (octet, Octet, count + 29, count - 22);
-
-	PERFORM_TEST (short, Short, count - 23, count + 19);
-	PERFORM_TEST (ushort, UShort, count + 23, count - 19);
-
-    	PERFORM_TEST (long, Long, count - 17, count + 20);
-    	PERFORM_TEST (ulong, ULong, count + 17, count - 20);
-
-#if	!defined (NONNATIVE_LONGLONG)
-	// don't try this on platforms that don't support
-	// math on longlongs ...
-	PERFORM_TEST (longlong, LongLong, count - 177, count + 3);
-	PERFORM_TEST (ulonglong, ULongLong, count + 177, count - 3);
-#endif	// !NONNATIVE_LONGLONG
-
-#if	!defined (i386)
-	//
-	// XXX not sure what's wrong with the COMPARE macro with respect to
-	// floating point on x86, since fprintf shows the values basically
-	// look correct ... but these float/double tests fail.
-	//
-	PERFORM_TEST (float, Float, count - 0.29, count + 3.14159);
-	PERFORM_TEST (double, Double, count * 1.77, count * 2.71);
-#endif	// !defined (i386)
-
-
-#ifndef	NONNATIVE_LONGDOUBLE
-#undef	BAD_COMPARE_VALUES
-#define BAD_COMPARE_VALUES(type,v1,v2,v3,value1,value2) // NOP
-
-	//
-	// don't try this between two platforms that don't provide
-	// arithmetic support for LongDouble values ...
-	//
-	if (!skip_longdouble) {
-	    PERFORM_TEST (longdouble, LongDouble,
-		    count - 2.33, count * 3.14159);
-	}
-
-#  undef BAD_COMPARE_VALUES
-#  define BAD_COMPARE_VALUES(type,v1,v2,v3,value1,value2) \
-    BAD_COMPARE_VALUE_OUT(type,v1,v2,v3,value1,value2)
-#endif	// !NONNATIVE_LONGDOUBLE
-
-#undef	COMPARE
-#undef	EXPVAL
-
-
-	//
-	// Boolean -- negation
-	//
-#define EXPVAL(type,original_value) (!(type)(original_value))
-#define COMPARE(type,retval,original_value) \
-		(((type)(retval)) == EXPVAL(type,original_value))
-
-	PERFORM_TEST (boolean, Boolean,
-		(count & 0x01) != 0, (count & 0x01) == 0);
-#undef	COMPARE
-#undef	EXPVAL
-
-	//
-	// Char, WChar -- identity
-	//
-#define EXPVAL(type,original_value) ((type)(original_value))
-#define COMPARE(type,retval,original_value) \
-		(((type)(retval)) == EXPVAL(type,original_value))
-
-	PERFORM_TEST (char, Char, count + 26, count - 5);
-	PERFORM_TEST (wchar, WChar, count, count + 25);
-#undef	COMPARE
-#undef	EXPVAL
-
-	//
-	// Object_ptr -- identity (special comparision)
-	//
-#define EXPVAL(type,original_value) ((type)(original_value))
-#define COMPARE(type,retval,original_value) \
-	    (compare_objrefs (retval, original_value) == CORBA::B_TRUE)
-#undef	RELEASE
-#define	RELEASE(obj) \
-	    { CORBA::release (obj); }
-
-	PERFORM_TEST (Object, Object_ptr, target, CORBA::Object::_nil ());
-#undef	COMPARE
-#undef	EXPVAL
-
-	//
-	// TypeCode_ptr -- identity (special comparision), and verifies
-	// that most of the built-in typecode constants exist.
-	//
-	// XXX should try this on all standard and system exceptions!
-	//
-	// XXX  this currently tests only marshaling/unmarshaling of
-	// "no parameter" TypeCodes ... complex ones (objref, struct,
-	// union, enum, sequence, array, alias, exception) are _NOT_
-	// currently attempted.
-	//
-	// XXX  for the simple typecodes (string, wstring), the single
-	// "bound" parameter isn't exercised/verified as it should be.
-	//
-#define EXPVAL(type,original_value) ((type)(original_value))
-#define	COMPARE(type,retval,original) \
-	    (((retval) == (original)) || \
-		((retval)->_kind == (original)->_kind))
-
-#undef	RELEASE
-#define	RELEASE(tc) \
-	    { CORBA::release (tc); }
-
-#undef	BAD_COMPARE_VALUES
-#define BAD_COMPARE_VALUES(type,v1,v2,v3,value1,value2) // NOP
-
-	{
-	    PERFORM_TEST (TypeCode, TypeCode_ptr,
-		    CORBA::_tc_null, _tc_CORBA_Void);
-
-	    PERFORM_TEST (TypeCode, TypeCode_ptr,
-		    CORBA::_tc_short, _tc_CORBA_UShort);
-	    PERFORM_TEST (TypeCode, TypeCode_ptr,
-		    CORBA::_tc_long, _tc_CORBA_ULong);
-	    PERFORM_TEST (TypeCode, TypeCode_ptr,
-		    CORBA::_tc_longLong, _tc_CORBA_ULongLong);
-
-	    PERFORM_TEST (TypeCode, TypeCode_ptr,
-		    CORBA::_tc_float, _tc_CORBA_Double);
-
-	    PERFORM_TEST (TypeCode, TypeCode_ptr,
-		    CORBA::_tc_boolean, _tc_CORBA_Octet);
-
-	    PERFORM_TEST (TypeCode, TypeCode_ptr,
-		    CORBA::_tc_any, _tc_CORBA_TypeCode);
-
-	    PERFORM_TEST (TypeCode, TypeCode_ptr,
-		    CORBA::_tc_longDouble, _tc_CORBA_Principal);
-
-	    PERFORM_TEST (TypeCode, TypeCode_ptr,
-		    CORBA::_tc_char, _tc_CORBA_String);
-	    PERFORM_TEST (TypeCode, TypeCode_ptr,
-		    CORBA::_tc_wChar, _tc_CORBA_WString);
-
-	    PERFORM_TEST (TypeCode, TypeCode_ptr,
-		    CORBA::_tc_longDouble, _tc_CORBA_Octet);
-
-	    //
-	    // Try all of the standard exception typecodes.
-	    //
-	    PERFORM_TEST (TypeCode, TypeCode_ptr,
-		    CORBA::_tc_uNKNOWN, _tc_CORBA_BAD_PARAM);
-	    PERFORM_TEST (TypeCode, TypeCode_ptr,
-		    CORBA::_tc_nO_MEMORY, _tc_CORBA_IMP_LIMIT);
-	    PERFORM_TEST (TypeCode, TypeCode_ptr,
-		    CORBA::_tc_cOMM_FAILURE, _tc_CORBA_INV_OBJREF);
-	    PERFORM_TEST (TypeCode, TypeCode_ptr,
-		    CORBA::_tc_oBJECT_NOT_EXIST, _tc_CORBA_NO_PERMISSION);
-	    PERFORM_TEST (TypeCode, TypeCode_ptr,
-		    CORBA::_tc_iNTERNAL, _tc_CORBA_MARSHAL);
-	    PERFORM_TEST (TypeCode, TypeCode_ptr,
-		    CORBA::_tc_iNITIALIZE, _tc_CORBA_NO_IMPLEMENT);
-	    PERFORM_TEST (TypeCode, TypeCode_ptr,
-		    CORBA::_tc_bAD_TYPECODE, _tc_CORBA_BAD_OPERATION);
-	    PERFORM_TEST (TypeCode, TypeCode_ptr,
-		    CORBA::_tc_nO_RESOURCES, _tc_CORBA_NO_RESPONSE);
-	    PERFORM_TEST (TypeCode, TypeCode_ptr,
-		    CORBA::_tc_pERSIST_STORE, _tc_CORBA_BAD_INV_ORDER);
-	    PERFORM_TEST (TypeCode, TypeCode_ptr,
-		    CORBA::_tc_tRANSIENT, _tc_CORBA_FREE_MEM);
-	    PERFORM_TEST (TypeCode, TypeCode_ptr,
-		    CORBA::_tc_iNV_IDENT, _tc_CORBA_INV_FLAG);
-	    PERFORM_TEST (TypeCode, TypeCode_ptr,
-		    CORBA::_tc_iNTF_REPOS, _tc_CORBA_BAD_CONTEXT);
-	    PERFORM_TEST (TypeCode, TypeCode_ptr,
-		    CORBA::_tc_oBJ_ADAPTER, _tc_CORBA_DATA_CONVERSION);
-
-	    //
-	    // All the built-in "user defined" system exceptions.
-	    //
-	    PERFORM_TEST (TypeCode, TypeCode_ptr,
-		    CORBA::_tc_badKind, _tc_CORBA_Bounds);
-	}
-#undef	COMPARE
-#undef	RELEASE
-
-	//
-	// string (unbounded)-- identity (special comparision)
-	//
-#define COMPARE(type,retval,original_value) \
-	    (strcmp ((char *)(retval), (char*)(original_value)) == 0)
-#undef	RELEASE
-#define	RELEASE(obj) CORBA::string_free(obj)
-	static const CORBA::Char str1 [] = "small";
-	static const CORBA::Char str2 [] =
-			"relatively long string, constructed"
-			" with the aid of C++ implicit string"
-			" catenation, which simplifies much stuff";
-	PERFORM_TEST (string, String, str1, str2);
-#undef	COMPARE
-#undef	RELEASE
-
-
-	// XXX any, principal, wstring ... output _is_ input
-
-
-	//
-	// Three test cases involve throwing user-defined exceptions.
-	//
-	{
-	    CORBA::Exception	*xp;
-
-	    //
-	    // Case one:  with parameter <= zero, must throw
-	    // an "x1" exception whose "case_num" is that parameter
-	    //
-	    test_count++;
-
-	    test1_test_throw (target, -5, env);
-	    if (env.exception () != 0) {
-		xp = env.exception ();
-
-		if (strcmp ((char *)xp->id (),
-			(char *) _tc_test1_x1->id (env2)) != 0) {
-		    error_count++;
-		    ACE_OS::fprintf (stderr, "test_throw case 1, "
-			    "wrong exception thrown (id = '%s')\n",
-			    xp->id ());
-		} else {
-		    test1_x1	*xp2 = (test1_x1 *) xp;
-
-		    if (xp2->case_num != -5) {
-			error_count++;
-			ACE_OS::fprintf (stderr, "test_throw case 1, "
-				"wrong value (case_num = '%ld')\n",
-				xp2->case_num);
-		    }
-		    
-		    // else, right exception was thrown
-		}
-	    } else {
-		error_count++;
-		ACE_OS::fprintf (stderr, "test_throw case 1, "
-			"no exception thrown !!\n");
-	    }
-
-
-	    //
-	    // Case two:  with positive odd parameter, must throw
-	    // an "x2" exception whose obj is null, and whose case_num
-	    // is that parameter
-	    //
-	    test_count++;
-
-	    test1_test_throw (target, 101, env);
-	    if (env.exception () != 0) {
-		xp = env.exception ();
-
-		if (strcmp ((char *)xp->id (),
-			(char *) _tc_test1_x2->id (env2)) != 0) {
-		    error_count++;
-		    ACE_OS::fprintf (stderr, "test_throw case 2, "
-			    "wrong exception thrown (id = '%s')\n",
-			    xp->id ());
-		} else {
-		    test1_x2	*xp2 = (test1_x2 *) xp;
-
-		    if (xp2->case_num != 101) {
-			error_count++;
-			ACE_OS::fprintf (stderr, "test_throw case 2, "
-				"wrong value (case_num = '%ld')\n",
-				xp2->case_num);
-		    }
-
-		    if (!CORBA::is_nil (xp2->obj)) {
-			error_count++;
-			ACE_OS::fprintf (stderr, "test_throw case 2, "
-				"non-null objref thrown\n");
-		    }
-		    
-		    // else, right exception was thrown
-		}
-	    } else {
-		error_count++;
-		ACE_OS::fprintf (stderr, "test_throw case 2, "
-			"no exception thrown !!\n");
-	    }
-
-
-#if	0
-// 18-sept-95:  commented this out.  Work remains to be done in
-// this area:  (a) ServerRequest::target operation unimplemented,
-// so for the servers of current interest this test is no help;
-// (b) probable pointer leak in exceptions holding data.
-
-	    //
-	    // Case three:  with positive even parameter, must throw
-	    // an "x2" exception whose obj is the target, and whose
-	    // case_num is that parameter
-	    //
-	    test_count++;
-
-	    test1_test_throw (target, 42, env);
-	    if (env.exception () != 0) {
-		xp = env.exception ();
-
-		if (strcmp ((char *)xp->id (),
-			(char *) _tc_test1_x2->id (env2)) != 0) {
-		    error_count++;
-		    ACE_OS::fprintf (stderr, "test_throw case 3, "
-			    "wrong exception thrown (id = '%s')\n",
-			    xp->id ());
-		} else {
-		    test1_x2	*xp2 = (test1_x2 *) xp;
-
-		    if (xp2->case_num != 42) {
-			error_count++;
-			ACE_OS::fprintf (stderr, "test_throw case 3, "
-				"wrong value (case_num = '%ld')\n",
-				xp2->case_num);
-		    }
-
-		    CORBA::Boolean	status;
-
-		    status = target->_is_equivalent (xp2->obj, env);
-
-		    if (env.exception () != 0) {
-			error_count++;
-			print_exception (env.exception (),
-				"test_throw/3 call to is_equivalent");
-		    } else if (status != CORBA::B_TRUE) {
-			error_count++;
-			ACE_OS::fprintf (stderr, "test_throw case 3, "
-				"non-equivalent objref thrown\n");
-		    }
-		    
-		    // else, right exception was thrown
-		}
-	    } else {
-		error_count++;
-		ACE_OS::fprintf (stderr, "test_throw case 3, "
-			"no exception thrown !!\n");
-	    }
-
-	    env.clear ();
-#endif	// 0
-
-	}
-
-	//
-	// test_illegal -- generate a BAD_OPERATION system exception
-	// from the remote process
-	//
-	test_count++;
-	test_illegal (target, env);
-	if (env.exception () == 0
-		|| ACE_OS::strcmp ((char *) env.exception()->id(),
-			(char *) CORBA::_tc_bAD_OPERATION->id (env2)) != 0) { 
-	    ACE_OS::fprintf (stderr, "couldn't generate BAD_OPERATION exception\n");
-	    error_count++;
-	}
-    }
-}
-
-
-int
-main (int    argc, char   *argv[])
-{
-    CORBA::ORB_ptr	orb_ptr;
-    CORBA::Environment	env;
-    CORBA::Object_ptr	objref = CORBA::Object::_nil();
-    unsigned		loop_count = 1;
-    unsigned		tests = 0, errors = 0;
-    int			exit_later = 0;
-
-    orb_ptr = CORBA_ORB_init (argc, argv, "internet", env);
-    if (env.exception () != 0) {
-	dexc (env, "ORB initialisation");
-	return 1;
-    }
-
-    //
-    // Parse and verify parameters.
-    //
-    ACE_Get_Opt get_opt (argc, argv, "dln:O:x");
-    int			c;
-
-    while ((c = get_opt ()) != -1)
-	switch (c) {
-	  case 'd':			// debug flag
-	    TAO_debug_level++;
-	    continue;
-
-	  case 'l':			// skip "long double" test
-	    skip_longdouble++;
-	    continue;
-
-	  case 'n':			// loop count
-	    loop_count = (unsigned) ACE_OS::atoi (get_opt.optarg);
-	    continue;
-
-	  case 'O':			// stringified objref
-	    {
-		objref = orb_ptr->string_to_object (
-			(CORBA::String)get_opt.optarg, env);
-		if (env.exception () != 0) {
-		    dexc (env, "string2object");
-		    return 1;
-		}
-	    }
-	    continue;
-
-	  case 'x':
-	    exit_later++;
-	    continue;
-
-	  case '?':
-	  default:
-	    ACE_OS::fprintf (stderr, "usage:  %s"
-			    " [-d]"
-			    " [-l]"
-			    " [-n loopcount]"
-			    " [-O objref]"
-			    " [-x]"
-			    "\n", argv [0]
-			    );
-	    return 1;
-        }
-    
-    if (CORBA::is_nil (objref) == CORBA::B_TRUE) {
-	ACE_OS::fprintf (stderr, "%s:  must identify non-null target objref\n",
-		argv [0]);
-	return 1;
-    }
-
-
-    do_tests (objref, loop_count, tests, errors);
-
-    char		*progname = ACE_OS::strrchr (argv [0], '/');
-
-    if (progname != 0)
-	progname += 1;
-    else
-	progname = argv [0];
-
-    ACE_OS::fprintf (stderr, "%s:  %d loops, %d tests (%d errors)\n",
-	progname, loop_count, tests, errors);
-
-    if (exit_later) {
-	test1_please_exit (objref, env);
-	if (env.exception () != 0)
-	    print_exception (env.exception (), "test1_please_exit");
-    }
-
-    CORBA::release (objref);
-
-    return errors != 0;
-}
diff --git a/TAO/tests/Cubit/TAO/DII_Cubit/test1_svr.cpp b/TAO/tests/Cubit/TAO/DII_Cubit/test1_svr.cpp
deleted file mode 100644
index bcabdf79e30..00000000000
--- a/TAO/tests/Cubit/TAO/DII_Cubit/test1_svr.cpp
+++ /dev/null
@@ -1,666 +0,0 @@
-// @(#)test1_svr.cpp	1.7 95/09/25
-// Copyright 1995 by Sun Microsystems Inc.
-// All Rights Reserved
-//
-// TEST:	simple IIOP server for "test1.idl" interface.
-//
-// Starts up, builds an objref, prints its string, listens for
-// messages, responds to them.
-//
-
-#include <stdio.h>
-#include <string.h>
-#include <ace/Get_Opt.h>
-
-#if	unix
-#	include	<unistd.h>		// for getopt on some systems
-
-#else	// windows
-
-#endif
-
-#include "test1.h"
-#include "tao/corba.h"
-
-
-#if !defined (_WIN32)
-extern char 	*optarg;	// missing on some platforms
-#endif
-
-//
-// Skeleton code ... just a macro for a bunch of DSI-based method code,
-// in lieu of having an IDL compmiler generate static skeletons.  Static
-// skeletons would be more efficient; most mallocation could go away.
-//
-// Use by:  defining OPERATION macro, call DEFINE_SKEL3 as needed, then
-// undef OPERATION.
-//
-// NOTE:  "v1_copy" below is needed to work around a bug with the
-// HP9000 G++ 2.6.3 compiler, with "LongLong".
-//
-// XXX this could probably be a template ... or could even be merged
-// directly into the Dynamic Implementation Routine below.
-//
-// XXX we must currently use IN_COPY_VALUE since the memory consumed
-// by the parameters must be deallocated by the ORB.  When we get an
-// updated version of DSI which provides "send it now" semantics,
-// these should preallocate the values and not use IN_COPY_VALUE.  A
-// net decrease in malloc overhead can be had that way.  (NVList should
-// also get a public constructor, and a way to provide the buffer.)
-//
-#define	DEFINE_SKEL3(name,truetype,truetypename) \
-    static void \
-    _test1_test_ ## name ( \
-	CORBA::ServerRequest	&req, \
-        CORBA::Object_ptr        obj, \
-	CORBA::Environment	&env \
-    ) \
-    { \
-	CORBA::NVList_ptr	nvlist; \
-	CORBA:: ## truetype	scratch = 0; \
-	CORBA::Any		temp_value (CORBA::_tc_ ## truetypename, \
-				    &scratch, CORBA::B_FALSE); \
- 	\
-	req.orb ()->create_list (3, nvlist); \
-	(void) nvlist->add_value (0, temp_value, \
-		CORBA::IN_COPY_VALUE|CORBA::ARG_IN, env); \
-	(void) nvlist->add_value (0, temp_value, \
-		CORBA::IN_COPY_VALUE|CORBA::ARG_OUT, env); \
-	(void) nvlist->add_value (0, temp_value, \
-		CORBA::IN_COPY_VALUE|CORBA::ARG_INOUT, env); \
-	 \
-	req.params (nvlist, env); \
-	if (env.exception () != 0) { \
-	    dexc (env, "test1_test_" # name "skeleton, req.params"); \
-	    return; \
-	} \
- 	\
-	CORBA:: ## truetype 	*v1, *v2, *retval; \
- 	\
-	v1 = (CORBA:: ## truetype *) nvlist->item (0)->value ()->value (); \
-	v2 = new CORBA:: ## truetype; \
-	*v2 = (CORBA:: ## truetype) OPERATION (*v1); \
-	retval = new CORBA:: ## truetype; \
-	*retval = (CORBA:: ## truetype) OPERATION (*v1); \
- 	\
-	CORBA::Any_ptr		any_val; \
- 	\
-	any_val = nvlist->item (1)->value (); \
-	any_val->replace (any_val->type (), v2, CORBA::B_TRUE, env); \
-	if (env.exception () != 0) { \
-	    dexc (env, "test1_test_" # name "skeleton, val2 replace"); \
-	    return; \
-	} \
- 	\
-	v1 = (CORBA:: ## truetype *) nvlist->item (2)->value ()->value (); \
-    	CORBA:: ## truetype v1copy = *v1; \
-	*v1 = (CORBA:: ## truetype) OPERATION (v1copy); \
- 	\
-	any_val = new CORBA::Any (CORBA::_tc_ ## truetypename, \
-		retval, CORBA::B_TRUE); \
-	req.result (any_val, env); \
-	if (env.exception () != 0) { \
-	    dexc (env, "test1_test_" # name "skeleton, result"); \
-	    return; \
-	} \
-    } \
-    extern TAO_Call_Data test1_ ## name ## _calldata;
-
-
-extern const TAO_Call_Data test1_void_calldata;
-
-static void
-_test1_test_void (CORBA::ServerRequest &req,
-		  CORBA::Object_ptr obj,
-		  CORBA::Environment &env)
-{
-  CORBA::NVList_ptr nvlist;
-
-  req.orb ()->create_list (0, nvlist);
-  req.params (nvlist, env);
-
-  if (env.exception () != 0)
-    dexc (env, "test_throw, get params");
-}
-
-
-//
-// Dynamic Skeleton methods for numeric types ... these all just
-// cube their parameters in various permutations
-//
-template <class Type>
-Type cube (Type arg)
-{
-    Type temp = arg;
-
-    temp = temp * arg;
-    temp = temp * arg;
-    return temp;
-}
-
-#define	OPERATION(n)	cube(n)
-
-DEFINE_SKEL3 (octet, Octet, Octet)
-
-DEFINE_SKEL3 (short, Short, Short)
-DEFINE_SKEL3 (ushort, UShort, UShort)
-
-DEFINE_SKEL3 (long, Long, Long)
-DEFINE_SKEL3 (ulong, ULong, ULong)
-
-#if	!defined (NONNATIVE_LONGLONG)
-	// don't try this on platforms that don't support
-	// math on longlongs ...
-DEFINE_SKEL3 (longlong, LongLong, LongLong)
-DEFINE_SKEL3 (ulonglong, ULongLong, ULongLong)
-#endif	// !NONNATIVE_LONGLONG
-
-DEFINE_SKEL3 (float, Float, Float)
-DEFINE_SKEL3 (double, Double, Double)
-
-#if	!defined (NONNATIVE_LONGDOUBLE)
-	// don't try this on platforms that don't support
-	// math on long doubles ...
-DEFINE_SKEL3 (longdouble, LongDouble, LongDouble)
-#endif	// !NONNATIVE_LONGDOUBLE
-
-#undef	OPERATION
-
-//
-// Dynamic Skeleton methods for Boolean type ... just negates its
-// parameters 
-//
-#define	OPERATION(x)	(!(x))
-DEFINE_SKEL3 (boolean, Boolean, Boolean)
-#undef	OPERATION
-
-//
-// For character types, output is same as input, no magic needed.
-//
-#define	OPERATION(x)	(x)
-DEFINE_SKEL3 (char, Char, Char)
-DEFINE_SKEL3 (wchar, WChar, WChar)
-#undef	OPERATION
-
-//
-// For objref, typecode, output is same as input but duplication
-// is needed
-//
-#define	OPERATION(x)	((x) ? (x)->AddRef() : 0, x)
-DEFINE_SKEL3 (Object, Object_ptr, Object)
-DEFINE_SKEL3 (TypeCode, TypeCode_ptr, TypeCode)
-#undef	OPERATION
-
-//
-// For string, output is copy of input
-//
-#define	OPERATION(x)	(CORBA::string_copy(x))
-DEFINE_SKEL3 (string, String, String)
-#undef	OPERATION
-
-//
-// For wstring, output is copy of input
-//
-#define	OPERATION(x)	(CORBA::wstring_copy(x))
-DEFINE_SKEL3 (wstring, WString, WString)
-#undef	OPERATION
-
-//
-// XXX IMPLEMENT THE REST OF THE DATA TYPES
-//
-// any, principal -- out is in
-//
-
-
-//
-// All cases, "case_num" in the exception is the same as the 'in' param
-//	* negative or zero, throws x1
-//	* positive even cases, throws x2 with obj = null objref
-//	* positive odd cases, throws x2 with obj = target objref
-//
-// exception x1 { long case_num; };
-// exception x2 { Object obj; long case_num; };
-// 
-// void test_throw (in long case_num) raises (x1, x2);
-//
-
-extern const TAO_Call_Data test1_test_throw_calldata;
-
-static void
-_test1_test_throw (CORBA::ServerRequest &req,
-		   CORBA::Object_ptr obj,
-		   CORBA::Environment &env)
-{
-  CORBA::NVList_ptr nvlist;
-  CORBA::NamedValue_ptr nv;
-  CORBA::Any temp_value (CORBA::_tc_long);
-  CORBA::Long value;
-
-  req.orb ()->create_list (0, nvlist);
-  nv = nvlist->add_value (0, temp_value, CORBA::ARG_IN, env);
-
-  req.params (nvlist, env);
-  if (env.exception () != 0)
-    {
-      dexc (env, "test_throw, get params");
-      return;
-    }
-
-  value = *(CORBA::Long *)nv->value ()->value ();
-  if (env.exception () != 0)
-    {
-      dexc (env, "test_throw, param value");
-      return;
-    }
-
-  CORBA::Any_ptr any;
-
-  if (value <= 0) 
-    {
-      test1_x1		*x;
-
-      x = new test1_x1 (value);
-      any = new CORBA::Any (_tc_test1_x1, x, CORBA::B_TRUE);
-
-    }
-  else if (value & 0x01)
-    {
-      test1_x2		*x;
-
-      x = new test1_x2 (CORBA::Object::_nil (), value);
-      any = new CORBA::Any (_tc_test1_x2, x, CORBA::B_TRUE);
-
-    } 
-  else
-    {
-#if	0
-      test1_x2		*x;
-
-      x = new test1_x2 (req.oa()->target (), value);
-      any = new CORBA::Any (_tc_test1_x2, x, CORBA::B_TRUE);
-#else
-      //
-      // XXX right now, we don't have a target() operation on the
-      // POA ... needs to be added.  Verify the client side memory
-      // leak of pointers embedded in user exceptions is fixed, too.
-      //
-      env.exception (new CORBA::IMP_LIMIT (COMPLETED_NO));
-      return;
-#endif
-    }
-
-  req.exception (USER_EXCEPTION, any, env);
-}
-
-
-//
-// This table is used to associate operation names with the Dynamic
-// Skeleton method ... someday it could return static skeletons.
-//
-#define	DECL_SKEL(name) \
-	{ & test1_ ## name ## _calldata, _test1_test_ ## name }
-
-static const TAO_Skel_Entry test1_operations [] = {
-    DECL_SKEL (void),
-
-    DECL_SKEL (octet),
-    DECL_SKEL (char),
-
-    DECL_SKEL (wchar),
-
-    DECL_SKEL (short),
-    DECL_SKEL (ushort),
-    DECL_SKEL (long),
-    DECL_SKEL (ulong),
-
-#if	!defined (NONNATIVE_LONGLONG)
-    // don't try this on platforms that don't support
-    // math on longlongs ...
-    DECL_SKEL (longlong),
-    DECL_SKEL (ulonglong),
-#endif
-
-    DECL_SKEL (float),
-    DECL_SKEL (double),
-
-#if	!defined (NONNATIVE_LONGDOUBLE)
-	// don't try this on platforms that don't support
-	// math on long doubles ...
-    DECL_SKEL (longdouble),
-#endif	// !NONNATIVE_LONGDOUBLE
-
-    DECL_SKEL (boolean),
-
-    DECL_SKEL (Object),
-    DECL_SKEL (TypeCode),
-
-    DECL_SKEL (string),
-    DECL_SKEL (wstring),
-
-    { & test1_test_throw_calldata, _test1_test_throw },
-
-    { 0, 0 }
-};
-
-
-//
-// Dispatch to method code ...
-//
-// Knows how to interpret "context" to get target objref, and where to
-// get second level skeletons for that target.  Both of those operations
-// will generally be abstracted (into library and stub code) so the main
-// body of this routine would be invisible to most applications.
-//
-// However, there are applications that need to do this stuff themselves
-// (like bridging between environments, e.g. different ORBs, languages, or
-// other object systems).  Everything needed to work without using an IDL
-// compiler is a public, supported API.
-//
-static void
-level1_skeleton (
-    CORBA::OctetSeq		&key,
-    CORBA::ServerRequest		&req,
-    void			*context,
-    CORBA::Environment		&env
-)
-{
-  //
-  // Verify that the target object and "this" object have the
-  // same key.  Normally, this would be used to figure out
-  // which object was the target, and hence which operations
-  // vector to dispatch the request.
-  //
-  CORBA::OctetSeq		*obj_key;
-
-  obj_key = (CORBA::OctetSeq *) context;
-  if (obj_key->length != key.length
-      || ACE_OS::memcmp (obj_key->buffer, key.buffer,
-			 obj_key->length) != 0)
-    {
-    env.exception (new CORBA::OBJECT_NOT_EXIST (COMPLETED_NO));
-#ifdef	DEBUG
-    if (TAO_debug_level)
-      dmsg_opaque ("request to nonexistent object, key = ",
-		   key.buffer, key.length);
-#endif
-    return;
-  }
-
-  //
-  // Find a "level 2 skeleton" for this operation, then
-  // call it with the right per-object state.
-  //
-  const TAO_Skel_Entry	*entry;
-  CORBA::String		opname;
-
-  opname = req.op_name ();
-  for (entry = &test1_operations [0]; entry->op_descriptor; entry++)
-    {
-    if (strcmp ((char *)opname, entry->op_descriptor->opname) == 0)
-      {
-      // We pass a bogus object because this version of the cubit example is
-      // so tightly coupled that it doesn't use it.  Future modifications will,
-      // hopefully!
-      CORBA::Object_ptr bogus_object = 0;
-      entry->impl_skeleton (req, bogus_object, env);
-      return;
-    }
-  }
-
-  //
-  // XXX True top-level skeleton code would also have to understand
-  // the built-in operations:
-  //
-  // * _is_a (for narrowing tests) ... can be derived by searching an
-  //	 appropriately structured graph of level2 skeletons.
-  //
-  // * _non_existent ... if the level1 skeleton consults a module
-  //	 which understands object lifespans, this should be simple.
-  // 
-  // * _get_interface ... could either (a) fail; (b) return the ref
-  //   from some IFR; or most interestingly (c) return a ref to some
-  //	 code in this process that can answer all IFR queries from the
-  //	 skeleton data structures.
-  //
-  // * _get_implementation  ... return some administrative hook to
-  //   the object implementation:
-  //
-  // No other legal operations start with a character that's not an
-  // ASCII alphanumeric, for what it's worth.
-  //
-  // The skeleton might want to use data in the object key to find
-  // the objref's type; if it's integrated with object creation, and
-  // an per-process implementation repository, this should be easy.
-  //
-
-  //
-  // bypass level 2 skeletons for this one ...
-  //
-  if (strcmp ((char *) opname, "please_exit") == 0)
-    {
-    dmsg ("I've been asked to shut down...");
-    req.oa ()->please_shutdown (env);
-    dexc (env, "please_exit, please_shutdown");
-    return;
-  }
-
-  //
-  // No match.  Operation not implemented; say so.
-  //
-  dmsg1 ("unknown operation, %s", opname);
-  env.exception (new CORBA::BAD_OPERATION (COMPLETED_NO));
-}
-
-
-//
-// Create and print the objref, listen for calls on it until done.
-//
-extern void
-print_exception (const CORBA::Exception *, const char *, FILE *f=stdout);
-
-int
-OA_listen (CORBA::ORB_ptr orb_ptr,
-	   CORBA::POA_ptr oa_ptr,
-	   CORBA::String key,
-	   int idle)
-{
-  //
-  // Create the object we'll be implementing.
-  //
-  CORBA::OctetSeq	obj_key;
-  CORBA::Object_ptr	obj;
-  CORBA::Environment	env;
-
-  obj_key.buffer = (CORBA::Octet *) key;
-  obj_key.length = obj_key.maximum = ACE_OS::strlen (key);
-
-  obj = oa_ptr->create (obj_key, (CORBA::String) "", env);
-  if (env.exception () != 0)
-    {
-      print_exception (env.exception (), "POA::create");
-      return 1;
-    }
-
-  //
-  // Stringify the objref we'll be implementing, and
-  // print it to stdout.  Someone will take that string
-  // and give it to some client.
-  //
-  CORBA::String	str;
-
-  str = orb_ptr->object_to_string (obj, env);
-  if (env.exception () != 0)
-    {
-      print_exception (env.exception (), "object2string");
-      return 1;
-    }
-  ACE_OS::puts ((char *)str);
-  ACE_OS::fflush (stdout);
-  dmsg1 ("listening as object '%s'", str);
-
-  //
-  // Clean up -- "key" is sufficient to dispatch all requests.
-  //
-  CORBA::release (obj);
-  CORBA::string_free (str);
-  env.clear ();
-
-  //
-  // Handle requests for this object until we're killed, or one of
-  // the methods makes us exit.
-  //
-  // NOTE:  apart from registering the top level skeleton, the rest
-  // of this loop is exactly what POA::run() does.  It's here to
-  // show there's no magic.
-  //
-#if 0
-  oa_ptr->register_dir (level1_skeleton, &obj_key, env);
-#else
-  oa_ptr->register_dir (oa_ptr->dispatch, &obj_key, env);
-#endif
-  if (env.exception () != 0)
-    {
-      print_exception (env.exception (), "register_dir");
-      return 1;
-    }
-
-  for (;;) {
-    if (idle == -1)
-      oa_ptr->get_request (CORBA::B_FALSE, 0, env);
-    else
-      {
-	timeval		tv;
-
-	tv.tv_sec = idle;
-	tv.tv_usec = 0;
-	oa_ptr->get_request (CORBA::B_FALSE, &tv, env);
-      }
-
-    CORBA::Exception_ptr	xp;
-
-    if ((xp = env.exception ()) != 0)
-      {
-	CORBA::Environment env2;	// XXX
-	char *id;
-
-	id = env.exception ()->id ();
-
-	//
-	// We get BAD_INV_ORDER if we call get_request() after
-	// shutdown was initiated.  Simpler to rely on that
-	// than to arrange any handshaking in this simple app.
-	//
-	if (strcmp (id, CORBA::_tc_bAD_INV_ORDER->id (env2)) == 0)
-	  {
-	    break;
-
-	    //
-	    // Other exceptions are errors.
-	    //
-	  }
-	else
-	  {
-	    print_exception (env.exception (), "POA::get_request");
-	    return 1;
-	  }
-      }
-    env.clear ();
-  }
-
-  //
-  // Shut down the OA -- recycles all underlying resources (e.g. file
-  // descriptors, etc).
-  //
-  // XXX shutdown is not quite the same as release, unless we want mem
-  // leaks to cause some rude failure modes.  POA just hasn't been
-  // updated yet to have any handshake about this though.
-  //
-  oa_ptr->Release ();
-  return 0;
-}
-
-
-//
-// Standard command line parsing utilities used.
-//
-int
-main (int    argc, char   *argv[])
-{
-  CORBA::Environment	env;
-  CORBA::ORB_ptr	orb_ptr;
-  CORBA::POA_ptr		oa_ptr;
-  CORBA::String	key = (CORBA::String) "elvis";
-  char		*oa_name = 0;
-  char		*orb_name = "internet";
-  int			idle = -1;
-
-  //
-  // Parse the command line, get options
-  //
-  ACE_Get_Opt get_opt (argc, argv, "dln:O:x");
-  int			c;
-
-  while ((c = get_opt ()) != -1)
-    switch (c)
-      {
-      case 'd':			// more debug noise
-	TAO_debug_level++;
-	continue;
-
-      case 'i':			// idle seconds b4 exit
-	idle = ACE_OS::atoi (get_opt.optarg);
-	continue;
-
-      case 'k':			// key (str)
-	key = (CORBA::String) get_opt.optarg;
-	continue;
-
-      case 'o':			// orb name
-	orb_name = get_opt.optarg;
-	continue;
-
-      case 'p':			// portnum
-	oa_name = get_opt.optarg;
-	continue;
-
-	// XXX set debug filters ...
-
-	//
-	// XXX ignore OMG-specified options ... hope nobody ever tries
-	// to use that "-ORB* param" and "-OA* param" syntax, it flies
-	// in the face of standard command parsing algorithms which
-	// require single-character option specifiers.
-	//
-
-
-      case '?':
-      default:
-	ACE_OS::fprintf (stderr, "usage:  %s"
-			 " [-d]"
-			 " [-i idle_seconds]"
-			 " [-k object_key=elvis]"
-			 " [-o orbname=internet]"
-			 " [-p oa_name]"
-			 "\n", argv [0]
-			 );
-	return 1;
-      }
-
-  orb_ptr = CORBA_ORB_init (argc, argv, orb_name, env);
-  if (env.exception () != 0) {
-    print_exception (env.exception (), "ORB init");
-    return 1;
-  }
-
-  //
-  // The POA may or may not actually be named ...
-  //
-  oa_ptr = CORBA::POA::get_named_boa (orb_ptr, oa_name, env);
-  if (env.exception () != 0) {
-    print_exception (env.exception (), "OA init");
-    return 1;
-  }
-
-  return OA_listen (orb_ptr, oa_ptr, key, idle);
-}
-
diff --git a/TAO/tests/Cubit/TAO/IDL_Cubit/Cubit.mak b/TAO/tests/Cubit/TAO/IDL_Cubit/Cubit.mak
deleted file mode 100644
index afa815291e8..00000000000
--- a/TAO/tests/Cubit/TAO/IDL_Cubit/Cubit.mak
+++ /dev/null
@@ -1,2068 +0,0 @@
-# Microsoft Developer Studio Generated NMAKE File, Format Version 4.20

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Console Application" 0x0103

-

-!IF "$(CFG)" == ""

-CFG=client - Win32 Debug

-!MESSAGE No configuration specified.  Defaulting to client - Win32 Debug.

-!ENDIF 

-

-!IF "$(CFG)" != "server - Win32 Release" && "$(CFG)" != "server - Win32 Debug"\

- && "$(CFG)" != "client - Win32 Release" && "$(CFG)" != "client - Win32 Debug"

-!MESSAGE Invalid configuration "$(CFG)" specified.

-!MESSAGE You can specify a configuration when running NMAKE on this makefile

-!MESSAGE by defining the macro CFG on the command line.  For example:

-!MESSAGE 

-!MESSAGE NMAKE /f "Cubit.mak" CFG="client - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "server - Win32 Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "server - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE "client - Win32 Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "client - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE 

-!ERROR An invalid configuration is specified.

-!ENDIF 

-

-!IF "$(OS)" == "Windows_NT"

-NULL=

-!ELSE 

-NULL=nul

-!ENDIF 

-################################################################################

-# Begin Project

-# PROP Target_Last_Scanned "client - Win32 Debug"

-RSC=rc.exe

-CPP=cl.exe

-

-!IF  "$(CFG)" == "server - Win32 Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "server\Release"

-# PROP BASE Intermediate_Dir "server\Release"

-# PROP BASE Target_Dir "server"

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir ""

-# PROP Intermediate_Dir "Release"

-# PROP Target_Dir "server"

-OUTDIR=.

-INTDIR=.\Release

-

-ALL : "$(OUTDIR)\server.exe"

-

-CLEAN : 

-	-@erase "$(INTDIR)\cubit_i.obj"

-	-@erase "$(INTDIR)\cubitC.obj"

-	-@erase "$(INTDIR)\cubitS.obj"

-	-@erase "$(INTDIR)\svr.obj"

-	-@erase "$(OUTDIR)\server.exe"

-	-@erase ".\cubitC.cpp"

-	-@erase ".\cubitC.h"

-	-@erase ".\cubitC.i"

-	-@erase ".\cubitS.cpp"

-	-@erase ".\cubitS.h"

-	-@erase ".\cubitS.i"

-

-"$(INTDIR)" :

-    if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"

-

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-CPP_PROJ=/nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE"\

- /Fp"$(INTDIR)/server.pch" /YX /Fo"$(INTDIR)/" /c 

-CPP_OBJS=.\Release/

-CPP_SBRS=.\.

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-BSC32_FLAGS=/nologo /o"$(OUTDIR)/server.bsc" 

-BSC32_SBRS= \

-	

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 ace.lib TAO.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-LINK32_FLAGS=ace.lib TAO.lib kernel32.lib user32.lib gdi32.lib winspool.lib\

- comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib\

- odbc32.lib odbccp32.lib /nologo /subsystem:console /incremental:no\

- /pdb:"$(OUTDIR)/server.pdb" /machine:I386 /out:"$(OUTDIR)/server.exe" 

-LINK32_OBJS= \

-	"$(INTDIR)\cubit_i.obj" \

-	"$(INTDIR)\cubitC.obj" \

-	"$(INTDIR)\cubitS.obj" \

-	"$(INTDIR)\svr.obj"

-

-"$(OUTDIR)\server.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)

-    $(LINK32) @<<

-  $(LINK32_FLAGS) $(LINK32_OBJS)

-<<

-

-!ELSEIF  "$(CFG)" == "server - Win32 Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "server\Debug"

-# PROP BASE Intermediate_Dir "server\Debug"

-# PROP BASE Target_Dir "server"

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir ""

-# PROP Intermediate_Dir "Debug"

-# PROP Target_Dir "server"

-OUTDIR=.

-INTDIR=.\Debug

-

-ALL : "$(OUTDIR)\server.exe"

-

-CLEAN : 

-	-@erase "$(INTDIR)\cubit_i.obj"

-	-@erase "$(INTDIR)\cubitC.obj"

-	-@erase "$(INTDIR)\cubitS.obj"

-	-@erase "$(INTDIR)\svr.obj"

-	-@erase "$(INTDIR)\vc40.idb"

-	-@erase "$(INTDIR)\vc40.pdb"

-	-@erase "$(OUTDIR)\server.exe"

-	-@erase "$(OUTDIR)\server.ilk"

-	-@erase "$(OUTDIR)\server.pdb"

-	-@erase ".\cubitC.cpp"

-	-@erase ".\cubitC.h"

-	-@erase ".\cubitC.i"

-	-@erase ".\cubitS.cpp"

-	-@erase ".\cubitS.h"

-	-@erase ".\cubitS.i"

-

-"$(INTDIR)" :

-    if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"

-

-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c

-CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE"\

- /Fp"$(INTDIR)/server.pch" /YX /Fo"$(INTDIR)/" /Fd"$(INTDIR)/" /c 

-CPP_OBJS=.\Debug/

-CPP_SBRS=.\.

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-BSC32_FLAGS=/nologo /o"$(OUTDIR)/server.bsc" 

-BSC32_SBRS= \

-	

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386

-# ADD LINK32 aced.lib TAO.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386

-LINK32_FLAGS=aced.lib TAO.lib kernel32.lib user32.lib gdi32.lib winspool.lib\

- comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib\

- odbc32.lib odbccp32.lib /nologo /subsystem:console /incremental:yes\

- /pdb:"$(OUTDIR)/server.pdb" /debug /machine:I386 /out:"$(OUTDIR)/server.exe" 

-LINK32_OBJS= \

-	"$(INTDIR)\cubit_i.obj" \

-	"$(INTDIR)\cubitC.obj" \

-	"$(INTDIR)\cubitS.obj" \

-	"$(INTDIR)\svr.obj"

-

-"$(OUTDIR)\server.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)

-    $(LINK32) @<<

-  $(LINK32_FLAGS) $(LINK32_OBJS)

-<<

-

-!ELSEIF  "$(CFG)" == "client - Win32 Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "client\Release"

-# PROP BASE Intermediate_Dir "client\Release"

-# PROP BASE Target_Dir "client"

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir ""

-# PROP Intermediate_Dir "Release"

-# PROP Target_Dir "client"

-OUTDIR=.

-INTDIR=.\Release

-

-ALL : "$(OUTDIR)\client.exe"

-

-CLEAN : 

-	-@erase "$(INTDIR)\clnt.obj"

-	-@erase "$(INTDIR)\cubitC.obj"

-	-@erase "$(OUTDIR)\client.exe"

-

-"$(INTDIR)" :

-    if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"

-

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-CPP_PROJ=/nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE"\

- /Fp"$(INTDIR)/client.pch" /YX /Fo"$(INTDIR)/" /c 

-CPP_OBJS=.\Release/

-CPP_SBRS=.\.

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-BSC32_FLAGS=/nologo /o"$(OUTDIR)/client.bsc" 

-BSC32_SBRS= \

-	

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 ace.lib TAO.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-LINK32_FLAGS=ace.lib TAO.lib kernel32.lib user32.lib gdi32.lib winspool.lib\

- comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib\

- odbc32.lib odbccp32.lib /nologo /subsystem:console /incremental:no\

- /pdb:"$(OUTDIR)/client.pdb" /machine:I386 /out:"$(OUTDIR)/client.exe" 

-LINK32_OBJS= \

-	"$(INTDIR)\clnt.obj" \

-	"$(INTDIR)\cubitC.obj"

-

-"$(OUTDIR)\client.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)

-    $(LINK32) @<<

-  $(LINK32_FLAGS) $(LINK32_OBJS)

-<<

-

-!ELSEIF  "$(CFG)" == "client - Win32 Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "client\Debug"

-# PROP BASE Intermediate_Dir "client\Debug"

-# PROP BASE Target_Dir "client"

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir ""

-# PROP Intermediate_Dir "Debug"

-# PROP Target_Dir "client"

-OUTDIR=.

-INTDIR=.\Debug

-

-ALL : "$(OUTDIR)\client.exe"

-

-CLEAN : 

-	-@erase "$(INTDIR)\clnt.obj"

-	-@erase "$(INTDIR)\cubitC.obj"

-	-@erase "$(INTDIR)\vc40.idb"

-	-@erase "$(INTDIR)\vc40.pdb"

-	-@erase "$(OUTDIR)\client.exe"

-	-@erase "$(OUTDIR)\client.ilk"

-	-@erase "$(OUTDIR)\client.pdb"

-

-"$(INTDIR)" :

-    if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"

-

-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c

-CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE"\

- /Fp"$(INTDIR)/client.pch" /YX /Fo"$(INTDIR)/" /Fd"$(INTDIR)/" /c 

-CPP_OBJS=.\Debug/

-CPP_SBRS=.\.

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-BSC32_FLAGS=/nologo /o"$(OUTDIR)/client.bsc" 

-BSC32_SBRS= \

-	

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386

-# ADD LINK32 aced.lib TAO.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386

-LINK32_FLAGS=aced.lib TAO.lib kernel32.lib user32.lib gdi32.lib winspool.lib\

- comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib\

- odbc32.lib odbccp32.lib /nologo /subsystem:console /incremental:yes\

- /pdb:"$(OUTDIR)/client.pdb" /debug /machine:I386 /out:"$(OUTDIR)/client.exe" 

-LINK32_OBJS= \

-	"$(INTDIR)\clnt.obj" \

-	"$(INTDIR)\cubitC.obj"

-

-"$(OUTDIR)\client.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)

-    $(LINK32) @<<

-  $(LINK32_FLAGS) $(LINK32_OBJS)

-<<

-

-!ENDIF 

-

-.c{$(CPP_OBJS)}.obj:

-   $(CPP) $(CPP_PROJ) $<  

-

-.cpp{$(CPP_OBJS)}.obj:

-   $(CPP) $(CPP_PROJ) $<  

-

-.cxx{$(CPP_OBJS)}.obj:

-   $(CPP) $(CPP_PROJ) $<  

-

-.c{$(CPP_SBRS)}.sbr:

-   $(CPP) $(CPP_PROJ) $<  

-

-.cpp{$(CPP_SBRS)}.sbr:

-   $(CPP) $(CPP_PROJ) $<  

-

-.cxx{$(CPP_SBRS)}.sbr:

-   $(CPP) $(CPP_PROJ) $<  

-

-################################################################################

-# Begin Target

-

-# Name "server - Win32 Release"

-# Name "server - Win32 Debug"

-

-!IF  "$(CFG)" == "server - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "server - Win32 Debug"

-

-!ENDIF 

-

-################################################################################

-# Begin Source File

-

-SOURCE=.\svr.cpp

-DEP_CPP_SVR_C=\

-	".\cubit_i.h"\

-	".\cubitC.h"\

-	".\cubitC.i"\

-	".\cubitS.h"\

-	".\cubitS.i"\

-	{$(INCLUDE)}"\ace\Acceptor.cpp"\

-	{$(INCLUDE)}"\ace\Acceptor.h"\

-	{$(INCLUDE)}"\ace\Acceptor.i"\

-	{$(INCLUDE)}"\ace\ACE.h"\

-	{$(INCLUDE)}"\ace\ACE.i"\

-	{$(INCLUDE)}"\ace\Addr.h"\

-	{$(INCLUDE)}"\ace\Addr.i"\

-	{$(INCLUDE)}"\ace\Atomic_Op.i"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.cpp"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.h"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.i"\

-	{$(INCLUDE)}"\ace\config-win32-common.h"\

-	{$(INCLUDE)}"\ace\config-win32.h"\

-	{$(INCLUDE)}"\ace\config.h"\

-	{$(INCLUDE)}"\ace\Connector.cpp"\

-	{$(INCLUDE)}"\ace\Connector.h"\

-	{$(INCLUDE)}"\ace\Connector.i"\

-	{$(INCLUDE)}"\ace\Containers.cpp"\

-	{$(INCLUDE)}"\ace\Containers.h"\

-	{$(INCLUDE)}"\ace\Containers.i"\

-	{$(INCLUDE)}"\ace\Dynamic.h"\

-	{$(INCLUDE)}"\ace\Dynamic.i"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.cpp"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.i"\

-	{$(INCLUDE)}"\ace\Free_List.cpp"\

-	{$(INCLUDE)}"\ace\Free_List.h"\

-	{$(INCLUDE)}"\ace\Free_List.i"\

-	{$(INCLUDE)}"\ace\Get_Opt.h"\

-	{$(INCLUDE)}"\ace\Get_Opt.i"\

-	{$(INCLUDE)}"\ace\Handle_Set.h"\

-	{$(INCLUDE)}"\ace\Handle_Set.i"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.i"\

-	{$(INCLUDE)}"\ace\IO_Cntl_Msg.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.i"\

-	{$(INCLUDE)}"\ace\Log_Msg.h"\

-	{$(INCLUDE)}"\ace\Log_Priority.h"\

-	{$(INCLUDE)}"\ace\Log_Record.h"\

-	{$(INCLUDE)}"\ace\Log_Record.i"\

-	{$(INCLUDE)}"\ace\Malloc.h"\

-	{$(INCLUDE)}"\ace\Malloc.i"\

-	{$(INCLUDE)}"\ace\Malloc_T.cpp"\

-	{$(INCLUDE)}"\ace\Malloc_T.h"\

-	{$(INCLUDE)}"\ace\Malloc_T.i"\

-	{$(INCLUDE)}"\ace\Managed_Object.cpp"\

-	{$(INCLUDE)}"\ace\Managed_Object.h"\

-	{$(INCLUDE)}"\ace\Managed_Object.i"\

-	{$(INCLUDE)}"\ace\Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Map_Manager.h"\

-	{$(INCLUDE)}"\ace\Map_Manager.i"\

-	{$(INCLUDE)}"\ace\Mem_Map.h"\

-	{$(INCLUDE)}"\ace\Mem_Map.i"\

-	{$(INCLUDE)}"\ace\Memory_Pool.h"\

-	{$(INCLUDE)}"\ace\Memory_Pool.i"\

-	{$(INCLUDE)}"\ace\Message_Block.h"\

-	{$(INCLUDE)}"\ace\Message_Block.i"\

-	{$(INCLUDE)}"\ace\Message_Queue.cpp"\

-	{$(INCLUDE)}"\ace\Message_Queue.h"\

-	{$(INCLUDE)}"\ace\Message_Queue.i"\

-	{$(INCLUDE)}"\ace\Module.cpp"\

-	{$(INCLUDE)}"\ace\Module.h"\

-	{$(INCLUDE)}"\ace\Module.i"\

-	{$(INCLUDE)}"\ace\Object_Manager.h"\

-	{$(INCLUDE)}"\ace\Object_Manager.i"\

-	{$(INCLUDE)}"\ace\OS.h"\

-	{$(INCLUDE)}"\ace\OS.i"\

-	{$(INCLUDE)}"\ace\Reactor.h"\

-	{$(INCLUDE)}"\ace\Reactor.i"\

-	{$(INCLUDE)}"\ace\Reactor_Impl.h"\

-	{$(INCLUDE)}"\ace\Service_Config.h"\

-	{$(INCLUDE)}"\ace\Service_Config.i"\

-	{$(INCLUDE)}"\ace\Service_Object.h"\

-	{$(INCLUDE)}"\ace\Service_Object.i"\

-	{$(INCLUDE)}"\ace\Service_Repository.h"\

-	{$(INCLUDE)}"\ace\Service_Repository.i"\

-	{$(INCLUDE)}"\ace\Service_Types.h"\

-	{$(INCLUDE)}"\ace\Service_Types.i"\

-	{$(INCLUDE)}"\ace\Shared_Object.h"\

-	{$(INCLUDE)}"\ace\Shared_Object.i"\

-	{$(INCLUDE)}"\ace\Signal.h"\

-	{$(INCLUDE)}"\ace\Signal.i"\

-	{$(INCLUDE)}"\ace\Singleton.cpp"\

-	{$(INCLUDE)}"\ace\Singleton.h"\

-	{$(INCLUDE)}"\ace\Singleton.i"\

-	{$(INCLUDE)}"\ace\SOCK.h"\

-	{$(INCLUDE)}"\ace\SOCK.i"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.h"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.i"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.h"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.i"\

-	{$(INCLUDE)}"\ace\SOCK_IO.h"\

-	{$(INCLUDE)}"\ace\SOCK_IO.i"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.h"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.i"\

-	{$(INCLUDE)}"\ace\SString.h"\

-	{$(INCLUDE)}"\ace\SString.i"\

-	{$(INCLUDE)}"\ace\stdcpp.h"\

-	{$(INCLUDE)}"\ace\Strategies.h"\

-	{$(INCLUDE)}"\ace\Strategies_T.cpp"\

-	{$(INCLUDE)}"\ace\Strategies_T.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.cpp"\

-	{$(INCLUDE)}"\ace\Stream_Modules.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.i"\

-	{$(INCLUDE)}"\ace\Svc_Conf_Tokens.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.cpp"\

-	{$(INCLUDE)}"\ace\Svc_Handler.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.i"\

-	{$(INCLUDE)}"\ace\Synch.h"\

-	{$(INCLUDE)}"\ace\Synch.i"\

-	{$(INCLUDE)}"\ace\Synch_Options.h"\

-	{$(INCLUDE)}"\ace\Synch_T.cpp"\

-	{$(INCLUDE)}"\ace\Synch_T.h"\

-	{$(INCLUDE)}"\ace\Synch_T.i"\

-	{$(INCLUDE)}"\ace\Task.h"\

-	{$(INCLUDE)}"\ace\Task.i"\

-	{$(INCLUDE)}"\ace\Task_T.cpp"\

-	{$(INCLUDE)}"\ace\Task_T.h"\

-	{$(INCLUDE)}"\ace\Task_T.i"\

-	{$(INCLUDE)}"\ace\Thread.h"\

-	{$(INCLUDE)}"\ace\Thread.i"\

-	{$(INCLUDE)}"\ace\Thread_Manager.h"\

-	{$(INCLUDE)}"\ace\Thread_Manager.i"\

-	{$(INCLUDE)}"\ace\Time_Value.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.cpp"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.i"\

-	{$(INCLUDE)}"\ace\Trace.h"\

-	{$(INCLUDE)}"\ace\Version.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.i"\

-	{$(INCLUDE)}"\ace\ws2tcpip.h"\

-	{$(INCLUDE)}"\tao\align.h"\

-	{$(INCLUDE)}"\tao\any.h"\

-	{$(INCLUDE)}"\tao\any.i"\

-	{$(INCLUDE)}"\tao\cdr.h"\

-	{$(INCLUDE)}"\tao\cdr.i"\

-	{$(INCLUDE)}"\tao\client_factory.h"\

-	{$(INCLUDE)}"\tao\client_factory.i"\

-	{$(INCLUDE)}"\tao\connect.h"\

-	{$(INCLUDE)}"\tao\connect.i"\

-	{$(INCLUDE)}"\tao\corba.h"\

-	{$(INCLUDE)}"\tao\corbacom.h"\

-	{$(INCLUDE)}"\tao\corbacom.i"\

-	{$(INCLUDE)}"\tao\debug.h"\

-	{$(INCLUDE)}"\tao\default_client.h"\

-	{$(INCLUDE)}"\tao\default_client.i"\

-	{$(INCLUDE)}"\tao\default_server.h"\

-	{$(INCLUDE)}"\tao\default_server.i"\

-	{$(INCLUDE)}"\tao\except.h"\

-	{$(INCLUDE)}"\tao\giop.h"\

-	{$(INCLUDE)}"\tao\giop.i"\

-	{$(INCLUDE)}"\tao\iiopobj.h"\

-	{$(INCLUDE)}"\tao\iiopobj.i"\

-	{$(INCLUDE)}"\tao\iioporb.h"\

-	{$(INCLUDE)}"\tao\iioporb.i"\

-	{$(INCLUDE)}"\tao\marshal.h"\

-	{$(INCLUDE)}"\tao\marshal.i"\

-	{$(INCLUDE)}"\tao\nvlist.h"\

-	{$(INCLUDE)}"\tao\object.h"\

-	{$(INCLUDE)}"\tao\object.i"\

-	{$(INCLUDE)}"\tao\objtable.h"\

-	{$(INCLUDE)}"\tao\optable.h"\

-	{$(INCLUDE)}"\tao\orb.h"\

-	{$(INCLUDE)}"\tao\orb_core.h"\

-	{$(INCLUDE)}"\tao\orb_core.i"\

-	{$(INCLUDE)}"\tao\orbconf.h"\

-	{$(INCLUDE)}"\tao\orbobj.h"\

-	{$(INCLUDE)}"\tao\orbobj.i"\

-	{$(INCLUDE)}"\tao\params.h"\

-	{$(INCLUDE)}"\tao\params.i"\

-	{$(INCLUDE)}"\tao\poa.h"\

-	{$(INCLUDE)}"\tao\poa.i"\

-	{$(INCLUDE)}"\tao\principa.h"\

-	{$(INCLUDE)}"\tao\request.h"\

-	{$(INCLUDE)}"\tao\sequence.h"\

-	{$(INCLUDE)}"\tao\sequence.i"\

-	{$(INCLUDE)}"\tao\server_factory.h"\

-	{$(INCLUDE)}"\tao\server_factory.i"\

-	{$(INCLUDE)}"\tao\singletons.h"\

-	{$(INCLUDE)}"\tao\stub.h"\

-	{$(INCLUDE)}"\tao\stub.i"\

-	{$(INCLUDE)}"\tao\svrrqst.h"\

-	{$(INCLUDE)}"\tao\svrrqst.i"\

-	{$(INCLUDE)}"\tao\typecode.h"\

-	{$(INCLUDE)}"\tao\typecode.i"\

-	{$(INCLUDE)}"\tao\varout.h"\

-	

-NODEP_CPP_SVR_C=\

-	"..\..\..\..\tao\tao\factories.h"\

-	

-

-"$(INTDIR)\svr.obj" : $(SOURCE) $(DEP_CPP_SVR_C) "$(INTDIR)" ".\cubitC.h"\

- ".\cubitC.i" ".\cubitS.h" ".\cubitS.i"

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\cubitS.cpp

-DEP_CPP_CUBIT=\

-	".\cubitC.h"\

-	".\cubitC.i"\

-	".\cubitS.h"\

-	".\cubitS.i"\

-	{$(INCLUDE)}"\ace\Acceptor.cpp"\

-	{$(INCLUDE)}"\ace\Acceptor.h"\

-	{$(INCLUDE)}"\ace\Acceptor.i"\

-	{$(INCLUDE)}"\ace\ACE.h"\

-	{$(INCLUDE)}"\ace\ACE.i"\

-	{$(INCLUDE)}"\ace\Addr.h"\

-	{$(INCLUDE)}"\ace\Addr.i"\

-	{$(INCLUDE)}"\ace\Atomic_Op.i"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.cpp"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.h"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.i"\

-	{$(INCLUDE)}"\ace\config-win32-common.h"\

-	{$(INCLUDE)}"\ace\config-win32.h"\

-	{$(INCLUDE)}"\ace\config.h"\

-	{$(INCLUDE)}"\ace\Connector.cpp"\

-	{$(INCLUDE)}"\ace\Connector.h"\

-	{$(INCLUDE)}"\ace\Connector.i"\

-	{$(INCLUDE)}"\ace\Containers.cpp"\

-	{$(INCLUDE)}"\ace\Containers.h"\

-	{$(INCLUDE)}"\ace\Containers.i"\

-	{$(INCLUDE)}"\ace\Dynamic.h"\

-	{$(INCLUDE)}"\ace\Dynamic.i"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.cpp"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.i"\

-	{$(INCLUDE)}"\ace\Free_List.cpp"\

-	{$(INCLUDE)}"\ace\Free_List.h"\

-	{$(INCLUDE)}"\ace\Free_List.i"\

-	{$(INCLUDE)}"\ace\Get_Opt.h"\

-	{$(INCLUDE)}"\ace\Get_Opt.i"\

-	{$(INCLUDE)}"\ace\Handle_Set.h"\

-	{$(INCLUDE)}"\ace\Handle_Set.i"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.i"\

-	{$(INCLUDE)}"\ace\IO_Cntl_Msg.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.i"\

-	{$(INCLUDE)}"\ace\Log_Msg.h"\

-	{$(INCLUDE)}"\ace\Log_Priority.h"\

-	{$(INCLUDE)}"\ace\Log_Record.h"\

-	{$(INCLUDE)}"\ace\Log_Record.i"\

-	{$(INCLUDE)}"\ace\Malloc.h"\

-	{$(INCLUDE)}"\ace\Malloc.i"\

-	{$(INCLUDE)}"\ace\Malloc_T.cpp"\

-	{$(INCLUDE)}"\ace\Malloc_T.h"\

-	{$(INCLUDE)}"\ace\Malloc_T.i"\

-	{$(INCLUDE)}"\ace\Managed_Object.cpp"\

-	{$(INCLUDE)}"\ace\Managed_Object.h"\

-	{$(INCLUDE)}"\ace\Managed_Object.i"\

-	{$(INCLUDE)}"\ace\Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Map_Manager.h"\

-	{$(INCLUDE)}"\ace\Map_Manager.i"\

-	{$(INCLUDE)}"\ace\Mem_Map.h"\

-	{$(INCLUDE)}"\ace\Mem_Map.i"\

-	{$(INCLUDE)}"\ace\Memory_Pool.h"\

-	{$(INCLUDE)}"\ace\Memory_Pool.i"\

-	{$(INCLUDE)}"\ace\Message_Block.h"\

-	{$(INCLUDE)}"\ace\Message_Block.i"\

-	{$(INCLUDE)}"\ace\Message_Queue.cpp"\

-	{$(INCLUDE)}"\ace\Message_Queue.h"\

-	{$(INCLUDE)}"\ace\Message_Queue.i"\

-	{$(INCLUDE)}"\ace\Module.cpp"\

-	{$(INCLUDE)}"\ace\Module.h"\

-	{$(INCLUDE)}"\ace\Module.i"\

-	{$(INCLUDE)}"\ace\Object_Manager.h"\

-	{$(INCLUDE)}"\ace\Object_Manager.i"\

-	{$(INCLUDE)}"\ace\OS.h"\

-	{$(INCLUDE)}"\ace\OS.i"\

-	{$(INCLUDE)}"\ace\Reactor.h"\

-	{$(INCLUDE)}"\ace\Reactor.i"\

-	{$(INCLUDE)}"\ace\Reactor_Impl.h"\

-	{$(INCLUDE)}"\ace\Service_Config.h"\

-	{$(INCLUDE)}"\ace\Service_Config.i"\

-	{$(INCLUDE)}"\ace\Service_Object.h"\

-	{$(INCLUDE)}"\ace\Service_Object.i"\

-	{$(INCLUDE)}"\ace\Service_Repository.h"\

-	{$(INCLUDE)}"\ace\Service_Repository.i"\

-	{$(INCLUDE)}"\ace\Service_Types.h"\

-	{$(INCLUDE)}"\ace\Service_Types.i"\

-	{$(INCLUDE)}"\ace\Shared_Object.h"\

-	{$(INCLUDE)}"\ace\Shared_Object.i"\

-	{$(INCLUDE)}"\ace\Signal.h"\

-	{$(INCLUDE)}"\ace\Signal.i"\

-	{$(INCLUDE)}"\ace\Singleton.cpp"\

-	{$(INCLUDE)}"\ace\Singleton.h"\

-	{$(INCLUDE)}"\ace\Singleton.i"\

-	{$(INCLUDE)}"\ace\SOCK.h"\

-	{$(INCLUDE)}"\ace\SOCK.i"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.h"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.i"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.h"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.i"\

-	{$(INCLUDE)}"\ace\SOCK_IO.h"\

-	{$(INCLUDE)}"\ace\SOCK_IO.i"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.h"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.i"\

-	{$(INCLUDE)}"\ace\SString.h"\

-	{$(INCLUDE)}"\ace\SString.i"\

-	{$(INCLUDE)}"\ace\stdcpp.h"\

-	{$(INCLUDE)}"\ace\Strategies.h"\

-	{$(INCLUDE)}"\ace\Strategies_T.cpp"\

-	{$(INCLUDE)}"\ace\Strategies_T.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.cpp"\

-	{$(INCLUDE)}"\ace\Stream_Modules.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.i"\

-	{$(INCLUDE)}"\ace\Svc_Conf_Tokens.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.cpp"\

-	{$(INCLUDE)}"\ace\Svc_Handler.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.i"\

-	{$(INCLUDE)}"\ace\Synch.h"\

-	{$(INCLUDE)}"\ace\Synch.i"\

-	{$(INCLUDE)}"\ace\Synch_Options.h"\

-	{$(INCLUDE)}"\ace\Synch_T.cpp"\

-	{$(INCLUDE)}"\ace\Synch_T.h"\

-	{$(INCLUDE)}"\ace\Synch_T.i"\

-	{$(INCLUDE)}"\ace\Task.h"\

-	{$(INCLUDE)}"\ace\Task.i"\

-	{$(INCLUDE)}"\ace\Task_T.cpp"\

-	{$(INCLUDE)}"\ace\Task_T.h"\

-	{$(INCLUDE)}"\ace\Task_T.i"\

-	{$(INCLUDE)}"\ace\Thread.h"\

-	{$(INCLUDE)}"\ace\Thread.i"\

-	{$(INCLUDE)}"\ace\Thread_Manager.h"\

-	{$(INCLUDE)}"\ace\Thread_Manager.i"\

-	{$(INCLUDE)}"\ace\Time_Value.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.cpp"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.i"\

-	{$(INCLUDE)}"\ace\Trace.h"\

-	{$(INCLUDE)}"\ace\Version.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.i"\

-	{$(INCLUDE)}"\ace\ws2tcpip.h"\

-	{$(INCLUDE)}"\tao\align.h"\

-	{$(INCLUDE)}"\tao\any.h"\

-	{$(INCLUDE)}"\tao\any.i"\

-	{$(INCLUDE)}"\tao\cdr.h"\

-	{$(INCLUDE)}"\tao\cdr.i"\

-	{$(INCLUDE)}"\tao\client_factory.h"\

-	{$(INCLUDE)}"\tao\client_factory.i"\

-	{$(INCLUDE)}"\tao\connect.h"\

-	{$(INCLUDE)}"\tao\connect.i"\

-	{$(INCLUDE)}"\tao\corba.h"\

-	{$(INCLUDE)}"\tao\corbacom.h"\

-	{$(INCLUDE)}"\tao\corbacom.i"\

-	{$(INCLUDE)}"\tao\debug.h"\

-	{$(INCLUDE)}"\tao\default_client.h"\

-	{$(INCLUDE)}"\tao\default_client.i"\

-	{$(INCLUDE)}"\tao\default_server.h"\

-	{$(INCLUDE)}"\tao\default_server.i"\

-	{$(INCLUDE)}"\tao\except.h"\

-	{$(INCLUDE)}"\tao\giop.h"\

-	{$(INCLUDE)}"\tao\giop.i"\

-	{$(INCLUDE)}"\tao\iiopobj.h"\

-	{$(INCLUDE)}"\tao\iiopobj.i"\

-	{$(INCLUDE)}"\tao\iioporb.h"\

-	{$(INCLUDE)}"\tao\iioporb.i"\

-	{$(INCLUDE)}"\tao\marshal.h"\

-	{$(INCLUDE)}"\tao\marshal.i"\

-	{$(INCLUDE)}"\tao\nvlist.h"\

-	{$(INCLUDE)}"\tao\object.h"\

-	{$(INCLUDE)}"\tao\object.i"\

-	{$(INCLUDE)}"\tao\objtable.h"\

-	{$(INCLUDE)}"\tao\optable.h"\

-	{$(INCLUDE)}"\tao\orb.h"\

-	{$(INCLUDE)}"\tao\orb_core.h"\

-	{$(INCLUDE)}"\tao\orb_core.i"\

-	{$(INCLUDE)}"\tao\orbconf.h"\

-	{$(INCLUDE)}"\tao\orbobj.h"\

-	{$(INCLUDE)}"\tao\orbobj.i"\

-	{$(INCLUDE)}"\tao\params.h"\

-	{$(INCLUDE)}"\tao\params.i"\

-	{$(INCLUDE)}"\tao\poa.h"\

-	{$(INCLUDE)}"\tao\poa.i"\

-	{$(INCLUDE)}"\tao\principa.h"\

-	{$(INCLUDE)}"\tao\request.h"\

-	{$(INCLUDE)}"\tao\sequence.h"\

-	{$(INCLUDE)}"\tao\sequence.i"\

-	{$(INCLUDE)}"\tao\server_factory.h"\

-	{$(INCLUDE)}"\tao\server_factory.i"\

-	{$(INCLUDE)}"\tao\singletons.h"\

-	{$(INCLUDE)}"\tao\stub.h"\

-	{$(INCLUDE)}"\tao\stub.i"\

-	{$(INCLUDE)}"\tao\svrrqst.h"\

-	{$(INCLUDE)}"\tao\svrrqst.i"\

-	{$(INCLUDE)}"\tao\typecode.h"\

-	{$(INCLUDE)}"\tao\typecode.i"\

-	{$(INCLUDE)}"\tao\varout.h"\

-	

-NODEP_CPP_CUBIT=\

-	"..\..\..\..\tao\tao\factories.h"\

-	

-

-"$(INTDIR)\cubitS.obj" : $(SOURCE) $(DEP_CPP_CUBIT) "$(INTDIR)" ".\cubitC.h"\

- ".\cubitC.i" ".\cubitS.h" ".\cubitS.i"

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\cubit_i.cpp

-DEP_CPP_CUBIT_=\

-	".\cubit_i.h"\

-	".\cubitC.h"\

-	".\cubitC.i"\

-	".\cubitS.h"\

-	".\cubitS.i"\

-	{$(INCLUDE)}"\ace\Acceptor.cpp"\

-	{$(INCLUDE)}"\ace\Acceptor.h"\

-	{$(INCLUDE)}"\ace\Acceptor.i"\

-	{$(INCLUDE)}"\ace\ACE.h"\

-	{$(INCLUDE)}"\ace\ACE.i"\

-	{$(INCLUDE)}"\ace\Addr.h"\

-	{$(INCLUDE)}"\ace\Addr.i"\

-	{$(INCLUDE)}"\ace\Atomic_Op.i"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.cpp"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.h"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.i"\

-	{$(INCLUDE)}"\ace\config-win32-common.h"\

-	{$(INCLUDE)}"\ace\config-win32.h"\

-	{$(INCLUDE)}"\ace\config.h"\

-	{$(INCLUDE)}"\ace\Connector.cpp"\

-	{$(INCLUDE)}"\ace\Connector.h"\

-	{$(INCLUDE)}"\ace\Connector.i"\

-	{$(INCLUDE)}"\ace\Containers.cpp"\

-	{$(INCLUDE)}"\ace\Containers.h"\

-	{$(INCLUDE)}"\ace\Containers.i"\

-	{$(INCLUDE)}"\ace\Dynamic.h"\

-	{$(INCLUDE)}"\ace\Dynamic.i"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.cpp"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.i"\

-	{$(INCLUDE)}"\ace\Free_List.cpp"\

-	{$(INCLUDE)}"\ace\Free_List.h"\

-	{$(INCLUDE)}"\ace\Free_List.i"\

-	{$(INCLUDE)}"\ace\Get_Opt.h"\

-	{$(INCLUDE)}"\ace\Get_Opt.i"\

-	{$(INCLUDE)}"\ace\Handle_Set.h"\

-	{$(INCLUDE)}"\ace\Handle_Set.i"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.i"\

-	{$(INCLUDE)}"\ace\IO_Cntl_Msg.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.i"\

-	{$(INCLUDE)}"\ace\Log_Msg.h"\

-	{$(INCLUDE)}"\ace\Log_Priority.h"\

-	{$(INCLUDE)}"\ace\Log_Record.h"\

-	{$(INCLUDE)}"\ace\Log_Record.i"\

-	{$(INCLUDE)}"\ace\Malloc.h"\

-	{$(INCLUDE)}"\ace\Malloc.i"\

-	{$(INCLUDE)}"\ace\Malloc_T.cpp"\

-	{$(INCLUDE)}"\ace\Malloc_T.h"\

-	{$(INCLUDE)}"\ace\Malloc_T.i"\

-	{$(INCLUDE)}"\ace\Managed_Object.cpp"\

-	{$(INCLUDE)}"\ace\Managed_Object.h"\

-	{$(INCLUDE)}"\ace\Managed_Object.i"\

-	{$(INCLUDE)}"\ace\Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Map_Manager.h"\

-	{$(INCLUDE)}"\ace\Map_Manager.i"\

-	{$(INCLUDE)}"\ace\Mem_Map.h"\

-	{$(INCLUDE)}"\ace\Mem_Map.i"\

-	{$(INCLUDE)}"\ace\Memory_Pool.h"\

-	{$(INCLUDE)}"\ace\Memory_Pool.i"\

-	{$(INCLUDE)}"\ace\Message_Block.h"\

-	{$(INCLUDE)}"\ace\Message_Block.i"\

-	{$(INCLUDE)}"\ace\Message_Queue.cpp"\

-	{$(INCLUDE)}"\ace\Message_Queue.h"\

-	{$(INCLUDE)}"\ace\Message_Queue.i"\

-	{$(INCLUDE)}"\ace\Module.cpp"\

-	{$(INCLUDE)}"\ace\Module.h"\

-	{$(INCLUDE)}"\ace\Module.i"\

-	{$(INCLUDE)}"\ace\Object_Manager.h"\

-	{$(INCLUDE)}"\ace\Object_Manager.i"\

-	{$(INCLUDE)}"\ace\OS.h"\

-	{$(INCLUDE)}"\ace\OS.i"\

-	{$(INCLUDE)}"\ace\Reactor.h"\

-	{$(INCLUDE)}"\ace\Reactor.i"\

-	{$(INCLUDE)}"\ace\Reactor_Impl.h"\

-	{$(INCLUDE)}"\ace\Service_Config.h"\

-	{$(INCLUDE)}"\ace\Service_Config.i"\

-	{$(INCLUDE)}"\ace\Service_Object.h"\

-	{$(INCLUDE)}"\ace\Service_Object.i"\

-	{$(INCLUDE)}"\ace\Service_Repository.h"\

-	{$(INCLUDE)}"\ace\Service_Repository.i"\

-	{$(INCLUDE)}"\ace\Service_Types.h"\

-	{$(INCLUDE)}"\ace\Service_Types.i"\

-	{$(INCLUDE)}"\ace\Shared_Object.h"\

-	{$(INCLUDE)}"\ace\Shared_Object.i"\

-	{$(INCLUDE)}"\ace\Signal.h"\

-	{$(INCLUDE)}"\ace\Signal.i"\

-	{$(INCLUDE)}"\ace\Singleton.cpp"\

-	{$(INCLUDE)}"\ace\Singleton.h"\

-	{$(INCLUDE)}"\ace\Singleton.i"\

-	{$(INCLUDE)}"\ace\SOCK.h"\

-	{$(INCLUDE)}"\ace\SOCK.i"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.h"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.i"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.h"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.i"\

-	{$(INCLUDE)}"\ace\SOCK_IO.h"\

-	{$(INCLUDE)}"\ace\SOCK_IO.i"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.h"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.i"\

-	{$(INCLUDE)}"\ace\SString.h"\

-	{$(INCLUDE)}"\ace\SString.i"\

-	{$(INCLUDE)}"\ace\stdcpp.h"\

-	{$(INCLUDE)}"\ace\Strategies.h"\

-	{$(INCLUDE)}"\ace\Strategies_T.cpp"\

-	{$(INCLUDE)}"\ace\Strategies_T.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.cpp"\

-	{$(INCLUDE)}"\ace\Stream_Modules.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.i"\

-	{$(INCLUDE)}"\ace\Svc_Conf_Tokens.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.cpp"\

-	{$(INCLUDE)}"\ace\Svc_Handler.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.i"\

-	{$(INCLUDE)}"\ace\Synch.h"\

-	{$(INCLUDE)}"\ace\Synch.i"\

-	{$(INCLUDE)}"\ace\Synch_Options.h"\

-	{$(INCLUDE)}"\ace\Synch_T.cpp"\

-	{$(INCLUDE)}"\ace\Synch_T.h"\

-	{$(INCLUDE)}"\ace\Synch_T.i"\

-	{$(INCLUDE)}"\ace\Task.h"\

-	{$(INCLUDE)}"\ace\Task.i"\

-	{$(INCLUDE)}"\ace\Task_T.cpp"\

-	{$(INCLUDE)}"\ace\Task_T.h"\

-	{$(INCLUDE)}"\ace\Task_T.i"\

-	{$(INCLUDE)}"\ace\Thread.h"\

-	{$(INCLUDE)}"\ace\Thread.i"\

-	{$(INCLUDE)}"\ace\Thread_Manager.h"\

-	{$(INCLUDE)}"\ace\Thread_Manager.i"\

-	{$(INCLUDE)}"\ace\Time_Value.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.cpp"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.i"\

-	{$(INCLUDE)}"\ace\Trace.h"\

-	{$(INCLUDE)}"\ace\Version.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.i"\

-	{$(INCLUDE)}"\ace\ws2tcpip.h"\

-	{$(INCLUDE)}"\tao\align.h"\

-	{$(INCLUDE)}"\tao\any.h"\

-	{$(INCLUDE)}"\tao\any.i"\

-	{$(INCLUDE)}"\tao\cdr.h"\

-	{$(INCLUDE)}"\tao\cdr.i"\

-	{$(INCLUDE)}"\tao\client_factory.h"\

-	{$(INCLUDE)}"\tao\client_factory.i"\

-	{$(INCLUDE)}"\tao\connect.h"\

-	{$(INCLUDE)}"\tao\connect.i"\

-	{$(INCLUDE)}"\tao\corba.h"\

-	{$(INCLUDE)}"\tao\corbacom.h"\

-	{$(INCLUDE)}"\tao\corbacom.i"\

-	{$(INCLUDE)}"\tao\debug.h"\

-	{$(INCLUDE)}"\tao\default_client.h"\

-	{$(INCLUDE)}"\tao\default_client.i"\

-	{$(INCLUDE)}"\tao\default_server.h"\

-	{$(INCLUDE)}"\tao\default_server.i"\

-	{$(INCLUDE)}"\tao\except.h"\

-	{$(INCLUDE)}"\tao\giop.h"\

-	{$(INCLUDE)}"\tao\giop.i"\

-	{$(INCLUDE)}"\tao\iiopobj.h"\

-	{$(INCLUDE)}"\tao\iiopobj.i"\

-	{$(INCLUDE)}"\tao\iioporb.h"\

-	{$(INCLUDE)}"\tao\iioporb.i"\

-	{$(INCLUDE)}"\tao\marshal.h"\

-	{$(INCLUDE)}"\tao\marshal.i"\

-	{$(INCLUDE)}"\tao\nvlist.h"\

-	{$(INCLUDE)}"\tao\object.h"\

-	{$(INCLUDE)}"\tao\object.i"\

-	{$(INCLUDE)}"\tao\objtable.h"\

-	{$(INCLUDE)}"\tao\optable.h"\

-	{$(INCLUDE)}"\tao\orb.h"\

-	{$(INCLUDE)}"\tao\orb_core.h"\

-	{$(INCLUDE)}"\tao\orb_core.i"\

-	{$(INCLUDE)}"\tao\orbconf.h"\

-	{$(INCLUDE)}"\tao\orbobj.h"\

-	{$(INCLUDE)}"\tao\orbobj.i"\

-	{$(INCLUDE)}"\tao\params.h"\

-	{$(INCLUDE)}"\tao\params.i"\

-	{$(INCLUDE)}"\tao\poa.h"\

-	{$(INCLUDE)}"\tao\poa.i"\

-	{$(INCLUDE)}"\tao\principa.h"\

-	{$(INCLUDE)}"\tao\request.h"\

-	{$(INCLUDE)}"\tao\sequence.h"\

-	{$(INCLUDE)}"\tao\sequence.i"\

-	{$(INCLUDE)}"\tao\server_factory.h"\

-	{$(INCLUDE)}"\tao\server_factory.i"\

-	{$(INCLUDE)}"\tao\singletons.h"\

-	{$(INCLUDE)}"\tao\stub.h"\

-	{$(INCLUDE)}"\tao\stub.i"\

-	{$(INCLUDE)}"\tao\svrrqst.h"\

-	{$(INCLUDE)}"\tao\svrrqst.i"\

-	{$(INCLUDE)}"\tao\typecode.h"\

-	{$(INCLUDE)}"\tao\typecode.i"\

-	{$(INCLUDE)}"\tao\varout.h"\

-	

-NODEP_CPP_CUBIT_=\

-	"..\..\..\..\tao\tao\factories.h"\

-	

-

-"$(INTDIR)\cubit_i.obj" : $(SOURCE) $(DEP_CPP_CUBIT_) "$(INTDIR)" ".\cubitC.h"\

- ".\cubitC.i" ".\cubitS.h" ".\cubitS.i"

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\cubitC.cpp

-DEP_CPP_CUBITC=\

-	".\cubitC.h"\

-	".\cubitC.i"\

-	{$(INCLUDE)}"\ace\Acceptor.cpp"\

-	{$(INCLUDE)}"\ace\Acceptor.h"\

-	{$(INCLUDE)}"\ace\Acceptor.i"\

-	{$(INCLUDE)}"\ace\ACE.h"\

-	{$(INCLUDE)}"\ace\ACE.i"\

-	{$(INCLUDE)}"\ace\Addr.h"\

-	{$(INCLUDE)}"\ace\Addr.i"\

-	{$(INCLUDE)}"\ace\Atomic_Op.i"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.cpp"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.h"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.i"\

-	{$(INCLUDE)}"\ace\config-win32-common.h"\

-	{$(INCLUDE)}"\ace\config-win32.h"\

-	{$(INCLUDE)}"\ace\config.h"\

-	{$(INCLUDE)}"\ace\Connector.cpp"\

-	{$(INCLUDE)}"\ace\Connector.h"\

-	{$(INCLUDE)}"\ace\Connector.i"\

-	{$(INCLUDE)}"\ace\Containers.cpp"\

-	{$(INCLUDE)}"\ace\Containers.h"\

-	{$(INCLUDE)}"\ace\Containers.i"\

-	{$(INCLUDE)}"\ace\Dynamic.h"\

-	{$(INCLUDE)}"\ace\Dynamic.i"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.cpp"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.i"\

-	{$(INCLUDE)}"\ace\Free_List.cpp"\

-	{$(INCLUDE)}"\ace\Free_List.h"\

-	{$(INCLUDE)}"\ace\Free_List.i"\

-	{$(INCLUDE)}"\ace\Get_Opt.h"\

-	{$(INCLUDE)}"\ace\Get_Opt.i"\

-	{$(INCLUDE)}"\ace\Handle_Set.h"\

-	{$(INCLUDE)}"\ace\Handle_Set.i"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.i"\

-	{$(INCLUDE)}"\ace\IO_Cntl_Msg.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.i"\

-	{$(INCLUDE)}"\ace\Log_Msg.h"\

-	{$(INCLUDE)}"\ace\Log_Priority.h"\

-	{$(INCLUDE)}"\ace\Log_Record.h"\

-	{$(INCLUDE)}"\ace\Log_Record.i"\

-	{$(INCLUDE)}"\ace\Malloc.h"\

-	{$(INCLUDE)}"\ace\Malloc.i"\

-	{$(INCLUDE)}"\ace\Malloc_T.cpp"\

-	{$(INCLUDE)}"\ace\Malloc_T.h"\

-	{$(INCLUDE)}"\ace\Malloc_T.i"\

-	{$(INCLUDE)}"\ace\Managed_Object.cpp"\

-	{$(INCLUDE)}"\ace\Managed_Object.h"\

-	{$(INCLUDE)}"\ace\Managed_Object.i"\

-	{$(INCLUDE)}"\ace\Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Map_Manager.h"\

-	{$(INCLUDE)}"\ace\Map_Manager.i"\

-	{$(INCLUDE)}"\ace\Mem_Map.h"\

-	{$(INCLUDE)}"\ace\Mem_Map.i"\

-	{$(INCLUDE)}"\ace\Memory_Pool.h"\

-	{$(INCLUDE)}"\ace\Memory_Pool.i"\

-	{$(INCLUDE)}"\ace\Message_Block.h"\

-	{$(INCLUDE)}"\ace\Message_Block.i"\

-	{$(INCLUDE)}"\ace\Message_Queue.cpp"\

-	{$(INCLUDE)}"\ace\Message_Queue.h"\

-	{$(INCLUDE)}"\ace\Message_Queue.i"\

-	{$(INCLUDE)}"\ace\Module.cpp"\

-	{$(INCLUDE)}"\ace\Module.h"\

-	{$(INCLUDE)}"\ace\Module.i"\

-	{$(INCLUDE)}"\ace\Object_Manager.h"\

-	{$(INCLUDE)}"\ace\Object_Manager.i"\

-	{$(INCLUDE)}"\ace\OS.h"\

-	{$(INCLUDE)}"\ace\OS.i"\

-	{$(INCLUDE)}"\ace\Reactor.h"\

-	{$(INCLUDE)}"\ace\Reactor.i"\

-	{$(INCLUDE)}"\ace\Reactor_Impl.h"\

-	{$(INCLUDE)}"\ace\Service_Config.h"\

-	{$(INCLUDE)}"\ace\Service_Config.i"\

-	{$(INCLUDE)}"\ace\Service_Object.h"\

-	{$(INCLUDE)}"\ace\Service_Object.i"\

-	{$(INCLUDE)}"\ace\Service_Repository.h"\

-	{$(INCLUDE)}"\ace\Service_Repository.i"\

-	{$(INCLUDE)}"\ace\Service_Types.h"\

-	{$(INCLUDE)}"\ace\Service_Types.i"\

-	{$(INCLUDE)}"\ace\Shared_Object.h"\

-	{$(INCLUDE)}"\ace\Shared_Object.i"\

-	{$(INCLUDE)}"\ace\Signal.h"\

-	{$(INCLUDE)}"\ace\Signal.i"\

-	{$(INCLUDE)}"\ace\Singleton.cpp"\

-	{$(INCLUDE)}"\ace\Singleton.h"\

-	{$(INCLUDE)}"\ace\Singleton.i"\

-	{$(INCLUDE)}"\ace\SOCK.h"\

-	{$(INCLUDE)}"\ace\SOCK.i"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.h"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.i"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.h"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.i"\

-	{$(INCLUDE)}"\ace\SOCK_IO.h"\

-	{$(INCLUDE)}"\ace\SOCK_IO.i"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.h"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.i"\

-	{$(INCLUDE)}"\ace\SString.h"\

-	{$(INCLUDE)}"\ace\SString.i"\

-	{$(INCLUDE)}"\ace\stdcpp.h"\

-	{$(INCLUDE)}"\ace\Strategies.h"\

-	{$(INCLUDE)}"\ace\Strategies_T.cpp"\

-	{$(INCLUDE)}"\ace\Strategies_T.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.cpp"\

-	{$(INCLUDE)}"\ace\Stream_Modules.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.i"\

-	{$(INCLUDE)}"\ace\Svc_Conf_Tokens.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.cpp"\

-	{$(INCLUDE)}"\ace\Svc_Handler.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.i"\

-	{$(INCLUDE)}"\ace\Synch.h"\

-	{$(INCLUDE)}"\ace\Synch.i"\

-	{$(INCLUDE)}"\ace\Synch_Options.h"\

-	{$(INCLUDE)}"\ace\Synch_T.cpp"\

-	{$(INCLUDE)}"\ace\Synch_T.h"\

-	{$(INCLUDE)}"\ace\Synch_T.i"\

-	{$(INCLUDE)}"\ace\Task.h"\

-	{$(INCLUDE)}"\ace\Task.i"\

-	{$(INCLUDE)}"\ace\Task_T.cpp"\

-	{$(INCLUDE)}"\ace\Task_T.h"\

-	{$(INCLUDE)}"\ace\Task_T.i"\

-	{$(INCLUDE)}"\ace\Thread.h"\

-	{$(INCLUDE)}"\ace\Thread.i"\

-	{$(INCLUDE)}"\ace\Thread_Manager.h"\

-	{$(INCLUDE)}"\ace\Thread_Manager.i"\

-	{$(INCLUDE)}"\ace\Time_Value.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.cpp"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.i"\

-	{$(INCLUDE)}"\ace\Trace.h"\

-	{$(INCLUDE)}"\ace\Version.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.i"\

-	{$(INCLUDE)}"\ace\ws2tcpip.h"\

-	{$(INCLUDE)}"\tao\align.h"\

-	{$(INCLUDE)}"\tao\any.h"\

-	{$(INCLUDE)}"\tao\any.i"\

-	{$(INCLUDE)}"\tao\cdr.h"\

-	{$(INCLUDE)}"\tao\cdr.i"\

-	{$(INCLUDE)}"\tao\client_factory.h"\

-	{$(INCLUDE)}"\tao\client_factory.i"\

-	{$(INCLUDE)}"\tao\connect.h"\

-	{$(INCLUDE)}"\tao\connect.i"\

-	{$(INCLUDE)}"\tao\corba.h"\

-	{$(INCLUDE)}"\tao\corbacom.h"\

-	{$(INCLUDE)}"\tao\corbacom.i"\

-	{$(INCLUDE)}"\tao\debug.h"\

-	{$(INCLUDE)}"\tao\default_client.h"\

-	{$(INCLUDE)}"\tao\default_client.i"\

-	{$(INCLUDE)}"\tao\default_server.h"\

-	{$(INCLUDE)}"\tao\default_server.i"\

-	{$(INCLUDE)}"\tao\except.h"\

-	{$(INCLUDE)}"\tao\giop.h"\

-	{$(INCLUDE)}"\tao\giop.i"\

-	{$(INCLUDE)}"\tao\iiopobj.h"\

-	{$(INCLUDE)}"\tao\iiopobj.i"\

-	{$(INCLUDE)}"\tao\iioporb.h"\

-	{$(INCLUDE)}"\tao\iioporb.i"\

-	{$(INCLUDE)}"\tao\marshal.h"\

-	{$(INCLUDE)}"\tao\marshal.i"\

-	{$(INCLUDE)}"\tao\nvlist.h"\

-	{$(INCLUDE)}"\tao\object.h"\

-	{$(INCLUDE)}"\tao\object.i"\

-	{$(INCLUDE)}"\tao\objtable.h"\

-	{$(INCLUDE)}"\tao\optable.h"\

-	{$(INCLUDE)}"\tao\orb.h"\

-	{$(INCLUDE)}"\tao\orb_core.h"\

-	{$(INCLUDE)}"\tao\orb_core.i"\

-	{$(INCLUDE)}"\tao\orbconf.h"\

-	{$(INCLUDE)}"\tao\orbobj.h"\

-	{$(INCLUDE)}"\tao\orbobj.i"\

-	{$(INCLUDE)}"\tao\params.h"\

-	{$(INCLUDE)}"\tao\params.i"\

-	{$(INCLUDE)}"\tao\poa.h"\

-	{$(INCLUDE)}"\tao\poa.i"\

-	{$(INCLUDE)}"\tao\principa.h"\

-	{$(INCLUDE)}"\tao\request.h"\

-	{$(INCLUDE)}"\tao\sequence.h"\

-	{$(INCLUDE)}"\tao\sequence.i"\

-	{$(INCLUDE)}"\tao\server_factory.h"\

-	{$(INCLUDE)}"\tao\server_factory.i"\

-	{$(INCLUDE)}"\tao\singletons.h"\

-	{$(INCLUDE)}"\tao\stub.h"\

-	{$(INCLUDE)}"\tao\stub.i"\

-	{$(INCLUDE)}"\tao\svrrqst.h"\

-	{$(INCLUDE)}"\tao\svrrqst.i"\

-	{$(INCLUDE)}"\tao\typecode.h"\

-	{$(INCLUDE)}"\tao\typecode.i"\

-	{$(INCLUDE)}"\tao\varout.h"\

-	

-NODEP_CPP_CUBITC=\

-	"..\..\..\..\tao\tao\factories.h"\

-	

-

-"$(INTDIR)\cubitC.obj" : $(SOURCE) $(DEP_CPP_CUBITC) "$(INTDIR)" ".\cubitC.h"\

- ".\cubitC.i"

-

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\cubit.idl

-

-!IF  "$(CFG)" == "server - Win32 Release"

-

-# PROP Exclude_From_Build 0

-# Begin Custom Build - Compiling IDL file(s):

-InputPath=.\cubit.idl

-InputName=cubit

-

-BuildCmds= \

-	..\..\..\..\tao_idl\tao_idl.exe $(InputName).idl \

-	

-

-"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-# End Custom Build

-

-!ELSEIF  "$(CFG)" == "server - Win32 Debug"

-

-# PROP Exclude_From_Build 0

-# Begin Custom Build - Compiling IDL file(s):

-InputPath=.\cubit.idl

-InputName=cubit

-

-BuildCmds= \

-	..\..\..\..\tao_idl\tao_idl.exe $(InputName).idl \

-	

-

-"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-# End Custom Build

-

-!ENDIF 

-

-# End Source File

-# End Target

-################################################################################

-# Begin Target

-

-# Name "client - Win32 Release"

-# Name "client - Win32 Debug"

-

-!IF  "$(CFG)" == "client - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "client - Win32 Debug"

-

-!ENDIF 

-

-################################################################################

-# Begin Source File

-

-SOURCE=.\clnt.cpp

-

-!IF  "$(CFG)" == "client - Win32 Release"

-

-DEP_CPP_CLNT_=\

-	".\clnt.h"\

-	".\cubitC.h"\

-	".\cubitC.i"\

-	{$(INCLUDE)}"\ace\Acceptor.cpp"\

-	{$(INCLUDE)}"\ace\Acceptor.h"\

-	{$(INCLUDE)}"\ace\Acceptor.i"\

-	{$(INCLUDE)}"\ace\ACE.h"\

-	{$(INCLUDE)}"\ace\ACE.i"\

-	{$(INCLUDE)}"\ace\Addr.h"\

-	{$(INCLUDE)}"\ace\Addr.i"\

-	{$(INCLUDE)}"\ace\Atomic_Op.i"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.cpp"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.h"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.i"\

-	{$(INCLUDE)}"\ace\config-win32-common.h"\

-	{$(INCLUDE)}"\ace\config-win32.h"\

-	{$(INCLUDE)}"\ace\config.h"\

-	{$(INCLUDE)}"\ace\Connector.cpp"\

-	{$(INCLUDE)}"\ace\Connector.h"\

-	{$(INCLUDE)}"\ace\Connector.i"\

-	{$(INCLUDE)}"\ace\Containers.cpp"\

-	{$(INCLUDE)}"\ace\Containers.h"\

-	{$(INCLUDE)}"\ace\Containers.i"\

-	{$(INCLUDE)}"\ace\Dynamic.h"\

-	{$(INCLUDE)}"\ace\Dynamic.i"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.cpp"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.i"\

-	{$(INCLUDE)}"\ace\Free_List.cpp"\

-	{$(INCLUDE)}"\ace\Free_List.h"\

-	{$(INCLUDE)}"\ace\Free_List.i"\

-	{$(INCLUDE)}"\ace\Get_Opt.h"\

-	{$(INCLUDE)}"\ace\Get_Opt.i"\

-	{$(INCLUDE)}"\ace\Handle_Set.h"\

-	{$(INCLUDE)}"\ace\Handle_Set.i"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.h"\

-	{$(INCLUDE)}"\ace\High_Res_Timer.h"\

-	{$(INCLUDE)}"\ace\High_Res_Timer.i"\

-	{$(INCLUDE)}"\ace\INET_Addr.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.i"\

-	{$(INCLUDE)}"\ace\IO_Cntl_Msg.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.i"\

-	{$(INCLUDE)}"\ace\Log_Msg.h"\

-	{$(INCLUDE)}"\ace\Log_Priority.h"\

-	{$(INCLUDE)}"\ace\Log_Record.h"\

-	{$(INCLUDE)}"\ace\Log_Record.i"\

-	{$(INCLUDE)}"\ace\Malloc.h"\

-	{$(INCLUDE)}"\ace\Malloc.i"\

-	{$(INCLUDE)}"\ace\Malloc_T.cpp"\

-	{$(INCLUDE)}"\ace\Malloc_T.h"\

-	{$(INCLUDE)}"\ace\Malloc_T.i"\

-	{$(INCLUDE)}"\ace\Managed_Object.cpp"\

-	{$(INCLUDE)}"\ace\Managed_Object.h"\

-	{$(INCLUDE)}"\ace\Managed_Object.i"\

-	{$(INCLUDE)}"\ace\Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Map_Manager.h"\

-	{$(INCLUDE)}"\ace\Map_Manager.i"\

-	{$(INCLUDE)}"\ace\Mem_Map.h"\

-	{$(INCLUDE)}"\ace\Mem_Map.i"\

-	{$(INCLUDE)}"\ace\Memory_Pool.h"\

-	{$(INCLUDE)}"\ace\Memory_Pool.i"\

-	{$(INCLUDE)}"\ace\Message_Block.h"\

-	{$(INCLUDE)}"\ace\Message_Block.i"\

-	{$(INCLUDE)}"\ace\Message_Queue.cpp"\

-	{$(INCLUDE)}"\ace\Message_Queue.h"\

-	{$(INCLUDE)}"\ace\Message_Queue.i"\

-	{$(INCLUDE)}"\ace\Module.cpp"\

-	{$(INCLUDE)}"\ace\Module.h"\

-	{$(INCLUDE)}"\ace\Module.i"\

-	{$(INCLUDE)}"\ace\Object_Manager.h"\

-	{$(INCLUDE)}"\ace\Object_Manager.i"\

-	{$(INCLUDE)}"\ace\OS.h"\

-	{$(INCLUDE)}"\ace\OS.i"\

-	{$(INCLUDE)}"\ace\Profile_Timer.h"\

-	{$(INCLUDE)}"\ace\Profile_Timer.i"\

-	{$(INCLUDE)}"\ace\Reactor.h"\

-	{$(INCLUDE)}"\ace\Reactor.i"\

-	{$(INCLUDE)}"\ace\Reactor_Impl.h"\

-	{$(INCLUDE)}"\ace\Service_Config.h"\

-	{$(INCLUDE)}"\ace\Service_Config.i"\

-	{$(INCLUDE)}"\ace\Service_Object.h"\

-	{$(INCLUDE)}"\ace\Service_Object.i"\

-	{$(INCLUDE)}"\ace\Service_Repository.h"\

-	{$(INCLUDE)}"\ace\Service_Repository.i"\

-	{$(INCLUDE)}"\ace\Service_Types.h"\

-	{$(INCLUDE)}"\ace\Service_Types.i"\

-	{$(INCLUDE)}"\ace\Shared_Object.h"\

-	{$(INCLUDE)}"\ace\Shared_Object.i"\

-	{$(INCLUDE)}"\ace\Signal.h"\

-	{$(INCLUDE)}"\ace\Signal.i"\

-	{$(INCLUDE)}"\ace\Singleton.cpp"\

-	{$(INCLUDE)}"\ace\Singleton.h"\

-	{$(INCLUDE)}"\ace\Singleton.i"\

-	{$(INCLUDE)}"\ace\SOCK.h"\

-	{$(INCLUDE)}"\ace\SOCK.i"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.h"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.i"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.h"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.i"\

-	{$(INCLUDE)}"\ace\SOCK_IO.h"\

-	{$(INCLUDE)}"\ace\SOCK_IO.i"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.h"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.i"\

-	{$(INCLUDE)}"\ace\SString.h"\

-	{$(INCLUDE)}"\ace\SString.i"\

-	{$(INCLUDE)}"\ace\stdcpp.h"\

-	{$(INCLUDE)}"\ace\Strategies.h"\

-	{$(INCLUDE)}"\ace\Strategies_T.cpp"\

-	{$(INCLUDE)}"\ace\Strategies_T.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.cpp"\

-	{$(INCLUDE)}"\ace\Stream_Modules.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.i"\

-	{$(INCLUDE)}"\ace\Svc_Conf_Tokens.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.cpp"\

-	{$(INCLUDE)}"\ace\Svc_Handler.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.i"\

-	{$(INCLUDE)}"\ace\Synch.h"\

-	{$(INCLUDE)}"\ace\Synch.i"\

-	{$(INCLUDE)}"\ace\Synch_Options.h"\

-	{$(INCLUDE)}"\ace\Synch_T.cpp"\

-	{$(INCLUDE)}"\ace\Synch_T.h"\

-	{$(INCLUDE)}"\ace\Synch_T.i"\

-	{$(INCLUDE)}"\ace\Task.h"\

-	{$(INCLUDE)}"\ace\Task.i"\

-	{$(INCLUDE)}"\ace\Task_T.cpp"\

-	{$(INCLUDE)}"\ace\Task_T.h"\

-	{$(INCLUDE)}"\ace\Task_T.i"\

-	{$(INCLUDE)}"\ace\Thread.h"\

-	{$(INCLUDE)}"\ace\Thread.i"\

-	{$(INCLUDE)}"\ace\Thread_Manager.h"\

-	{$(INCLUDE)}"\ace\Thread_Manager.i"\

-	{$(INCLUDE)}"\ace\Time_Value.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.cpp"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.i"\

-	{$(INCLUDE)}"\ace\Trace.h"\

-	{$(INCLUDE)}"\ace\Version.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.i"\

-	{$(INCLUDE)}"\ace\ws2tcpip.h"\

-	{$(INCLUDE)}"\tao\align.h"\

-	{$(INCLUDE)}"\tao\any.h"\

-	{$(INCLUDE)}"\tao\any.i"\

-	{$(INCLUDE)}"\tao\cdr.h"\

-	{$(INCLUDE)}"\tao\cdr.i"\

-	{$(INCLUDE)}"\tao\client_factory.h"\

-	{$(INCLUDE)}"\tao\connect.h"\

-	{$(INCLUDE)}"\tao\connect.i"\

-	{$(INCLUDE)}"\tao\corba.h"\

-	{$(INCLUDE)}"\tao\corbacom.h"\

-	{$(INCLUDE)}"\tao\corbacom.i"\

-	{$(INCLUDE)}"\tao\debug.h"\

-	{$(INCLUDE)}"\tao\default_client.h"\

-	{$(INCLUDE)}"\tao\default_client.i"\

-	{$(INCLUDE)}"\tao\default_server.h"\

-	{$(INCLUDE)}"\tao\default_server.i"\

-	{$(INCLUDE)}"\tao\except.h"\

-	{$(INCLUDE)}"\tao\giop.h"\

-	{$(INCLUDE)}"\tao\giop.i"\

-	{$(INCLUDE)}"\tao\iiopobj.h"\

-	{$(INCLUDE)}"\tao\iiopobj.i"\

-	{$(INCLUDE)}"\tao\iioporb.h"\

-	{$(INCLUDE)}"\tao\iioporb.i"\

-	{$(INCLUDE)}"\tao\marshal.h"\

-	{$(INCLUDE)}"\tao\marshal.i"\

-	{$(INCLUDE)}"\tao\nvlist.h"\

-	{$(INCLUDE)}"\tao\object.h"\

-	{$(INCLUDE)}"\tao\object.i"\

-	{$(INCLUDE)}"\tao\objtable.h"\

-	{$(INCLUDE)}"\tao\optable.h"\

-	{$(INCLUDE)}"\tao\orb.h"\

-	{$(INCLUDE)}"\tao\orb_core.h"\

-	{$(INCLUDE)}"\tao\orb_core.i"\

-	{$(INCLUDE)}"\tao\orbconf.h"\

-	{$(INCLUDE)}"\tao\orbobj.h"\

-	{$(INCLUDE)}"\tao\orbobj.i"\

-	{$(INCLUDE)}"\tao\params.h"\

-	{$(INCLUDE)}"\tao\params.i"\

-	{$(INCLUDE)}"\tao\poa.h"\

-	{$(INCLUDE)}"\tao\poa.i"\

-	{$(INCLUDE)}"\tao\principa.h"\

-	{$(INCLUDE)}"\tao\request.h"\

-	{$(INCLUDE)}"\tao\sequence.h"\

-	{$(INCLUDE)}"\tao\sequence.i"\

-	{$(INCLUDE)}"\tao\server_factory.h"\

-	{$(INCLUDE)}"\tao\server_factory.i"\

-	{$(INCLUDE)}"\tao\singletons.h"\

-	{$(INCLUDE)}"\tao\stub.h"\

-	{$(INCLUDE)}"\tao\stub.i"\

-	{$(INCLUDE)}"\tao\svrrqst.h"\

-	{$(INCLUDE)}"\tao\typecode.h"\

-	{$(INCLUDE)}"\tao\typecode.i"\

-	{$(INCLUDE)}"\tao\varout.h"\

-	

-

-"$(INTDIR)\clnt.obj" : $(SOURCE) $(DEP_CPP_CLNT_) "$(INTDIR)"

-

-

-!ELSEIF  "$(CFG)" == "client - Win32 Debug"

-

-DEP_CPP_CLNT_=\

-	".\clnt.h"\

-	{$(INCLUDE)}"\ace\Acceptor.cpp"\

-	{$(INCLUDE)}"\ace\Acceptor.h"\

-	{$(INCLUDE)}"\ace\Acceptor.i"\

-	{$(INCLUDE)}"\ace\ACE.h"\

-	{$(INCLUDE)}"\ace\ACE.i"\

-	{$(INCLUDE)}"\ace\Addr.h"\

-	{$(INCLUDE)}"\ace\Addr.i"\

-	{$(INCLUDE)}"\ace\Atomic_Op.i"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.cpp"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.h"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.i"\

-	{$(INCLUDE)}"\ace\config-win32-common.h"\

-	{$(INCLUDE)}"\ace\config-win32.h"\

-	{$(INCLUDE)}"\ace\config.h"\

-	{$(INCLUDE)}"\ace\Connector.cpp"\

-	{$(INCLUDE)}"\ace\Connector.h"\

-	{$(INCLUDE)}"\ace\Connector.i"\

-	{$(INCLUDE)}"\ace\Containers.cpp"\

-	{$(INCLUDE)}"\ace\Containers.h"\

-	{$(INCLUDE)}"\ace\Containers.i"\

-	{$(INCLUDE)}"\ace\Dynamic.h"\

-	{$(INCLUDE)}"\ace\Dynamic.i"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.cpp"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.i"\

-	{$(INCLUDE)}"\ace\Free_List.cpp"\

-	{$(INCLUDE)}"\ace\Free_List.h"\

-	{$(INCLUDE)}"\ace\Free_List.i"\

-	{$(INCLUDE)}"\ace\Get_Opt.h"\

-	{$(INCLUDE)}"\ace\Get_Opt.i"\

-	{$(INCLUDE)}"\ace\Handle_Set.h"\

-	{$(INCLUDE)}"\ace\Handle_Set.i"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.h"\

-	{$(INCLUDE)}"\ace\High_Res_Timer.h"\

-	{$(INCLUDE)}"\ace\High_Res_Timer.i"\

-	{$(INCLUDE)}"\ace\INET_Addr.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.i"\

-	{$(INCLUDE)}"\ace\IO_Cntl_Msg.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.i"\

-	{$(INCLUDE)}"\ace\Log_Msg.h"\

-	{$(INCLUDE)}"\ace\Log_Priority.h"\

-	{$(INCLUDE)}"\ace\Log_Record.h"\

-	{$(INCLUDE)}"\ace\Log_Record.i"\

-	{$(INCLUDE)}"\ace\Malloc.h"\

-	{$(INCLUDE)}"\ace\Malloc.i"\

-	{$(INCLUDE)}"\ace\Malloc_T.cpp"\

-	{$(INCLUDE)}"\ace\Malloc_T.h"\

-	{$(INCLUDE)}"\ace\Malloc_T.i"\

-	{$(INCLUDE)}"\ace\Managed_Object.cpp"\

-	{$(INCLUDE)}"\ace\Managed_Object.h"\

-	{$(INCLUDE)}"\ace\Managed_Object.i"\

-	{$(INCLUDE)}"\ace\Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Map_Manager.h"\

-	{$(INCLUDE)}"\ace\Map_Manager.i"\

-	{$(INCLUDE)}"\ace\Mem_Map.h"\

-	{$(INCLUDE)}"\ace\Mem_Map.i"\

-	{$(INCLUDE)}"\ace\Memory_Pool.h"\

-	{$(INCLUDE)}"\ace\Memory_Pool.i"\

-	{$(INCLUDE)}"\ace\Message_Block.h"\

-	{$(INCLUDE)}"\ace\Message_Block.i"\

-	{$(INCLUDE)}"\ace\Message_Queue.cpp"\

-	{$(INCLUDE)}"\ace\Message_Queue.h"\

-	{$(INCLUDE)}"\ace\Message_Queue.i"\

-	{$(INCLUDE)}"\ace\Module.cpp"\

-	{$(INCLUDE)}"\ace\Module.h"\

-	{$(INCLUDE)}"\ace\Module.i"\

-	{$(INCLUDE)}"\ace\Object_Manager.h"\

-	{$(INCLUDE)}"\ace\Object_Manager.i"\

-	{$(INCLUDE)}"\ace\OS.h"\

-	{$(INCLUDE)}"\ace\OS.i"\

-	{$(INCLUDE)}"\ace\Profile_Timer.h"\

-	{$(INCLUDE)}"\ace\Profile_Timer.i"\

-	{$(INCLUDE)}"\ace\Reactor.h"\

-	{$(INCLUDE)}"\ace\Reactor.i"\

-	{$(INCLUDE)}"\ace\Reactor_Impl.h"\

-	{$(INCLUDE)}"\ace\Service_Config.h"\

-	{$(INCLUDE)}"\ace\Service_Config.i"\

-	{$(INCLUDE)}"\ace\Service_Object.h"\

-	{$(INCLUDE)}"\ace\Service_Object.i"\

-	{$(INCLUDE)}"\ace\Service_Repository.h"\

-	{$(INCLUDE)}"\ace\Service_Repository.i"\

-	{$(INCLUDE)}"\ace\Service_Types.h"\

-	{$(INCLUDE)}"\ace\Service_Types.i"\

-	{$(INCLUDE)}"\ace\Shared_Object.h"\

-	{$(INCLUDE)}"\ace\Shared_Object.i"\

-	{$(INCLUDE)}"\ace\Signal.h"\

-	{$(INCLUDE)}"\ace\Signal.i"\

-	{$(INCLUDE)}"\ace\Singleton.cpp"\

-	{$(INCLUDE)}"\ace\Singleton.h"\

-	{$(INCLUDE)}"\ace\Singleton.i"\

-	{$(INCLUDE)}"\ace\SOCK.h"\

-	{$(INCLUDE)}"\ace\SOCK.i"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.h"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.i"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.h"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.i"\

-	{$(INCLUDE)}"\ace\SOCK_IO.h"\

-	{$(INCLUDE)}"\ace\SOCK_IO.i"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.h"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.i"\

-	{$(INCLUDE)}"\ace\SString.h"\

-	{$(INCLUDE)}"\ace\SString.i"\

-	{$(INCLUDE)}"\ace\stdcpp.h"\

-	{$(INCLUDE)}"\ace\Strategies.h"\

-	{$(INCLUDE)}"\ace\Strategies_T.cpp"\

-	{$(INCLUDE)}"\ace\Strategies_T.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.cpp"\

-	{$(INCLUDE)}"\ace\Stream_Modules.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.i"\

-	{$(INCLUDE)}"\ace\Svc_Conf_Tokens.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.cpp"\

-	{$(INCLUDE)}"\ace\Svc_Handler.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.i"\

-	{$(INCLUDE)}"\ace\Synch.h"\

-	{$(INCLUDE)}"\ace\Synch.i"\

-	{$(INCLUDE)}"\ace\Synch_Options.h"\

-	{$(INCLUDE)}"\ace\Synch_T.cpp"\

-	{$(INCLUDE)}"\ace\Synch_T.h"\

-	{$(INCLUDE)}"\ace\Synch_T.i"\

-	{$(INCLUDE)}"\ace\Task.h"\

-	{$(INCLUDE)}"\ace\Task.i"\

-	{$(INCLUDE)}"\ace\Task_T.cpp"\

-	{$(INCLUDE)}"\ace\Task_T.h"\

-	{$(INCLUDE)}"\ace\Task_T.i"\

-	{$(INCLUDE)}"\ace\Thread.h"\

-	{$(INCLUDE)}"\ace\Thread.i"\

-	{$(INCLUDE)}"\ace\Thread_Manager.h"\

-	{$(INCLUDE)}"\ace\Thread_Manager.i"\

-	{$(INCLUDE)}"\ace\Time_Value.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.cpp"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.i"\

-	{$(INCLUDE)}"\ace\Trace.h"\

-	{$(INCLUDE)}"\ace\Version.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.i"\

-	{$(INCLUDE)}"\ace\ws2tcpip.h"\

-	{$(INCLUDE)}"\tao\align.h"\

-	{$(INCLUDE)}"\tao\any.h"\

-	{$(INCLUDE)}"\tao\any.i"\

-	{$(INCLUDE)}"\tao\cdr.h"\

-	{$(INCLUDE)}"\tao\cdr.i"\

-	{$(INCLUDE)}"\tao\client_factory.h"\

-	{$(INCLUDE)}"\tao\connect.h"\

-	{$(INCLUDE)}"\tao\connect.i"\

-	{$(INCLUDE)}"\tao\corba.h"\

-	{$(INCLUDE)}"\tao\corbacom.h"\

-	{$(INCLUDE)}"\tao\corbacom.i"\

-	{$(INCLUDE)}"\tao\debug.h"\

-	{$(INCLUDE)}"\tao\default_client.h"\

-	{$(INCLUDE)}"\tao\default_client.i"\

-	{$(INCLUDE)}"\tao\default_server.h"\

-	{$(INCLUDE)}"\tao\default_server.i"\

-	{$(INCLUDE)}"\tao\except.h"\

-	{$(INCLUDE)}"\tao\giop.h"\

-	{$(INCLUDE)}"\tao\giop.i"\

-	{$(INCLUDE)}"\tao\iiopobj.h"\

-	{$(INCLUDE)}"\tao\iiopobj.i"\

-	{$(INCLUDE)}"\tao\iioporb.h"\

-	{$(INCLUDE)}"\tao\iioporb.i"\

-	{$(INCLUDE)}"\tao\marshal.h"\

-	{$(INCLUDE)}"\tao\marshal.i"\

-	{$(INCLUDE)}"\tao\nvlist.h"\

-	{$(INCLUDE)}"\tao\object.h"\

-	{$(INCLUDE)}"\tao\object.i"\

-	{$(INCLUDE)}"\tao\objtable.h"\

-	{$(INCLUDE)}"\tao\optable.h"\

-	{$(INCLUDE)}"\tao\orb.h"\

-	{$(INCLUDE)}"\tao\orb_core.h"\

-	{$(INCLUDE)}"\tao\orb_core.i"\

-	{$(INCLUDE)}"\tao\orbconf.h"\

-	{$(INCLUDE)}"\tao\orbobj.h"\

-	{$(INCLUDE)}"\tao\orbobj.i"\

-	{$(INCLUDE)}"\tao\params.h"\

-	{$(INCLUDE)}"\tao\params.i"\

-	{$(INCLUDE)}"\tao\poa.h"\

-	{$(INCLUDE)}"\tao\poa.i"\

-	{$(INCLUDE)}"\tao\principa.h"\

-	{$(INCLUDE)}"\tao\request.h"\

-	{$(INCLUDE)}"\tao\sequence.h"\

-	{$(INCLUDE)}"\tao\sequence.i"\

-	{$(INCLUDE)}"\tao\server_factory.h"\

-	{$(INCLUDE)}"\tao\server_factory.i"\

-	{$(INCLUDE)}"\tao\singletons.h"\

-	{$(INCLUDE)}"\tao\stub.h"\

-	{$(INCLUDE)}"\tao\stub.i"\

-	{$(INCLUDE)}"\tao\svrrqst.h"\

-	{$(INCLUDE)}"\tao\typecode.h"\

-	{$(INCLUDE)}"\tao\typecode.i"\

-	{$(INCLUDE)}"\tao\varout.h"\

-	

-

-"$(INTDIR)\clnt.obj" : $(SOURCE) $(DEP_CPP_CLNT_) "$(INTDIR)"

-

-

-!ENDIF 

-

-# End Source File

-################################################################################

-# Begin Source File

-

-SOURCE=.\cubitC.cpp

-

-!IF  "$(CFG)" == "client - Win32 Release"

-

-DEP_CPP_CUBITC=\

-	".\cubitC.h"\

-	".\cubitC.i"\

-	{$(INCLUDE)}"\ace\Acceptor.cpp"\

-	{$(INCLUDE)}"\ace\Acceptor.h"\

-	{$(INCLUDE)}"\ace\Acceptor.i"\

-	{$(INCLUDE)}"\ace\ACE.h"\

-	{$(INCLUDE)}"\ace\ACE.i"\

-	{$(INCLUDE)}"\ace\Addr.h"\

-	{$(INCLUDE)}"\ace\Addr.i"\

-	{$(INCLUDE)}"\ace\Atomic_Op.i"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.cpp"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.h"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.i"\

-	{$(INCLUDE)}"\ace\config-win32-common.h"\

-	{$(INCLUDE)}"\ace\config-win32.h"\

-	{$(INCLUDE)}"\ace\config.h"\

-	{$(INCLUDE)}"\ace\Connector.cpp"\

-	{$(INCLUDE)}"\ace\Connector.h"\

-	{$(INCLUDE)}"\ace\Connector.i"\

-	{$(INCLUDE)}"\ace\Containers.cpp"\

-	{$(INCLUDE)}"\ace\Containers.h"\

-	{$(INCLUDE)}"\ace\Containers.i"\

-	{$(INCLUDE)}"\ace\Dynamic.h"\

-	{$(INCLUDE)}"\ace\Dynamic.i"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.cpp"\

-	{$(INCLUDE)}"\ace\Dynamic_Service.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.i"\

-	{$(INCLUDE)}"\ace\Free_List.cpp"\

-	{$(INCLUDE)}"\ace\Free_List.h"\

-	{$(INCLUDE)}"\ace\Free_List.i"\

-	{$(INCLUDE)}"\ace\Get_Opt.h"\

-	{$(INCLUDE)}"\ace\Get_Opt.i"\

-	{$(INCLUDE)}"\ace\Handle_Set.h"\

-	{$(INCLUDE)}"\ace\Handle_Set.i"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.i"\

-	{$(INCLUDE)}"\ace\IO_Cntl_Msg.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.i"\

-	{$(INCLUDE)}"\ace\Log_Msg.h"\

-	{$(INCLUDE)}"\ace\Log_Priority.h"\

-	{$(INCLUDE)}"\ace\Log_Record.h"\

-	{$(INCLUDE)}"\ace\Log_Record.i"\

-	{$(INCLUDE)}"\ace\Malloc.h"\

-	{$(INCLUDE)}"\ace\Malloc.i"\

-	{$(INCLUDE)}"\ace\Malloc_T.cpp"\

-	{$(INCLUDE)}"\ace\Malloc_T.h"\

-	{$(INCLUDE)}"\ace\Malloc_T.i"\

-	{$(INCLUDE)}"\ace\Managed_Object.cpp"\

-	{$(INCLUDE)}"\ace\Managed_Object.h"\

-	{$(INCLUDE)}"\ace\Managed_Object.i"\

-	{$(INCLUDE)}"\ace\Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Map_Manager.h"\

-	{$(INCLUDE)}"\ace\Map_Manager.i"\

-	{$(INCLUDE)}"\ace\Mem_Map.h"\

-	{$(INCLUDE)}"\ace\Mem_Map.i"\

-	{$(INCLUDE)}"\ace\Memory_Pool.h"\

-	{$(INCLUDE)}"\ace\Memory_Pool.i"\

-	{$(INCLUDE)}"\ace\Message_Block.h"\

-	{$(INCLUDE)}"\ace\Message_Block.i"\

-	{$(INCLUDE)}"\ace\Message_Queue.cpp"\

-	{$(INCLUDE)}"\ace\Message_Queue.h"\

-	{$(INCLUDE)}"\ace\Message_Queue.i"\

-	{$(INCLUDE)}"\ace\Module.cpp"\

-	{$(INCLUDE)}"\ace\Module.h"\

-	{$(INCLUDE)}"\ace\Module.i"\

-	{$(INCLUDE)}"\ace\Object_Manager.h"\

-	{$(INCLUDE)}"\ace\Object_Manager.i"\

-	{$(INCLUDE)}"\ace\OS.h"\

-	{$(INCLUDE)}"\ace\OS.i"\

-	{$(INCLUDE)}"\ace\Reactor.h"\

-	{$(INCLUDE)}"\ace\Reactor.i"\

-	{$(INCLUDE)}"\ace\Reactor_Impl.h"\

-	{$(INCLUDE)}"\ace\Service_Config.h"\

-	{$(INCLUDE)}"\ace\Service_Config.i"\

-	{$(INCLUDE)}"\ace\Service_Object.h"\

-	{$(INCLUDE)}"\ace\Service_Object.i"\

-	{$(INCLUDE)}"\ace\Service_Repository.h"\

-	{$(INCLUDE)}"\ace\Service_Repository.i"\

-	{$(INCLUDE)}"\ace\Service_Types.h"\

-	{$(INCLUDE)}"\ace\Service_Types.i"\

-	{$(INCLUDE)}"\ace\Shared_Object.h"\

-	{$(INCLUDE)}"\ace\Shared_Object.i"\

-	{$(INCLUDE)}"\ace\Signal.h"\

-	{$(INCLUDE)}"\ace\Signal.i"\

-	{$(INCLUDE)}"\ace\Singleton.cpp"\

-	{$(INCLUDE)}"\ace\Singleton.h"\

-	{$(INCLUDE)}"\ace\Singleton.i"\

-	{$(INCLUDE)}"\ace\SOCK.h"\

-	{$(INCLUDE)}"\ace\SOCK.i"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.h"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.i"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.h"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.i"\

-	{$(INCLUDE)}"\ace\SOCK_IO.h"\

-	{$(INCLUDE)}"\ace\SOCK_IO.i"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.h"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.i"\

-	{$(INCLUDE)}"\ace\SString.h"\

-	{$(INCLUDE)}"\ace\SString.i"\

-	{$(INCLUDE)}"\ace\stdcpp.h"\

-	{$(INCLUDE)}"\ace\Strategies.h"\

-	{$(INCLUDE)}"\ace\Strategies_T.cpp"\

-	{$(INCLUDE)}"\ace\Strategies_T.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.cpp"\

-	{$(INCLUDE)}"\ace\Stream_Modules.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.i"\

-	{$(INCLUDE)}"\ace\Svc_Conf_Tokens.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.cpp"\

-	{$(INCLUDE)}"\ace\Svc_Handler.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.i"\

-	{$(INCLUDE)}"\ace\Synch.h"\

-	{$(INCLUDE)}"\ace\Synch.i"\

-	{$(INCLUDE)}"\ace\Synch_Options.h"\

-	{$(INCLUDE)}"\ace\Synch_T.cpp"\

-	{$(INCLUDE)}"\ace\Synch_T.h"\

-	{$(INCLUDE)}"\ace\Synch_T.i"\

-	{$(INCLUDE)}"\ace\Task.h"\

-	{$(INCLUDE)}"\ace\Task.i"\

-	{$(INCLUDE)}"\ace\Task_T.cpp"\

-	{$(INCLUDE)}"\ace\Task_T.h"\

-	{$(INCLUDE)}"\ace\Task_T.i"\

-	{$(INCLUDE)}"\ace\Thread.h"\

-	{$(INCLUDE)}"\ace\Thread.i"\

-	{$(INCLUDE)}"\ace\Thread_Manager.h"\

-	{$(INCLUDE)}"\ace\Thread_Manager.i"\

-	{$(INCLUDE)}"\ace\Time_Value.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.cpp"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.i"\

-	{$(INCLUDE)}"\ace\Trace.h"\

-	{$(INCLUDE)}"\ace\Version.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.i"\

-	{$(INCLUDE)}"\ace\ws2tcpip.h"\

-	{$(INCLUDE)}"\tao\align.h"\

-	{$(INCLUDE)}"\tao\any.h"\

-	{$(INCLUDE)}"\tao\any.i"\

-	{$(INCLUDE)}"\tao\cdr.h"\

-	{$(INCLUDE)}"\tao\cdr.i"\

-	{$(INCLUDE)}"\tao\client_factory.h"\

-	{$(INCLUDE)}"\tao\client_factory.i"\

-	{$(INCLUDE)}"\tao\connect.h"\

-	{$(INCLUDE)}"\tao\connect.i"\

-	{$(INCLUDE)}"\tao\corba.h"\

-	{$(INCLUDE)}"\tao\corbacom.h"\

-	{$(INCLUDE)}"\tao\corbacom.i"\

-	{$(INCLUDE)}"\tao\debug.h"\

-	{$(INCLUDE)}"\tao\default_client.h"\

-	{$(INCLUDE)}"\tao\default_client.i"\

-	{$(INCLUDE)}"\tao\default_server.h"\

-	{$(INCLUDE)}"\tao\default_server.i"\

-	{$(INCLUDE)}"\tao\except.h"\

-	{$(INCLUDE)}"\tao\giop.h"\

-	{$(INCLUDE)}"\tao\giop.i"\

-	{$(INCLUDE)}"\tao\iiopobj.h"\

-	{$(INCLUDE)}"\tao\iiopobj.i"\

-	{$(INCLUDE)}"\tao\iioporb.h"\

-	{$(INCLUDE)}"\tao\iioporb.i"\

-	{$(INCLUDE)}"\tao\marshal.h"\

-	{$(INCLUDE)}"\tao\marshal.i"\

-	{$(INCLUDE)}"\tao\nvlist.h"\

-	{$(INCLUDE)}"\tao\object.h"\

-	{$(INCLUDE)}"\tao\object.i"\

-	{$(INCLUDE)}"\tao\objtable.h"\

-	{$(INCLUDE)}"\tao\optable.h"\

-	{$(INCLUDE)}"\tao\orb.h"\

-	{$(INCLUDE)}"\tao\orb_core.h"\

-	{$(INCLUDE)}"\tao\orb_core.i"\

-	{$(INCLUDE)}"\tao\orbconf.h"\

-	{$(INCLUDE)}"\tao\orbobj.h"\

-	{$(INCLUDE)}"\tao\orbobj.i"\

-	{$(INCLUDE)}"\tao\params.h"\

-	{$(INCLUDE)}"\tao\params.i"\

-	{$(INCLUDE)}"\tao\poa.h"\

-	{$(INCLUDE)}"\tao\poa.i"\

-	{$(INCLUDE)}"\tao\principa.h"\

-	{$(INCLUDE)}"\tao\request.h"\

-	{$(INCLUDE)}"\tao\sequence.h"\

-	{$(INCLUDE)}"\tao\sequence.i"\

-	{$(INCLUDE)}"\tao\server_factory.h"\

-	{$(INCLUDE)}"\tao\server_factory.i"\

-	{$(INCLUDE)}"\tao\singletons.h"\

-	{$(INCLUDE)}"\tao\stub.h"\

-	{$(INCLUDE)}"\tao\stub.i"\

-	{$(INCLUDE)}"\tao\svrrqst.h"\

-	{$(INCLUDE)}"\tao\svrrqst.i"\

-	{$(INCLUDE)}"\tao\typecode.h"\

-	{$(INCLUDE)}"\tao\typecode.i"\

-	{$(INCLUDE)}"\tao\varout.h"\

-	

-NODEP_CPP_CUBITC=\

-	"..\..\..\..\tao\tao\factories.h"\

-	

-

-"$(INTDIR)\cubitC.obj" : $(SOURCE) $(DEP_CPP_CUBITC) "$(INTDIR)"

-

-

-!ELSEIF  "$(CFG)" == "client - Win32 Debug"

-

-DEP_CPP_CUBITC=\

-	".\cubitC.h"\

-	".\cubitC.i"\

-	{$(INCLUDE)}"\ace\Acceptor.cpp"\

-	{$(INCLUDE)}"\ace\Acceptor.h"\

-	{$(INCLUDE)}"\ace\Acceptor.i"\

-	{$(INCLUDE)}"\ace\ACE.h"\

-	{$(INCLUDE)}"\ace\ACE.i"\

-	{$(INCLUDE)}"\ace\Addr.h"\

-	{$(INCLUDE)}"\ace\Addr.i"\

-	{$(INCLUDE)}"\ace\Atomic_Op.i"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.cpp"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.h"\

-	{$(INCLUDE)}"\ace\Auto_Ptr.i"\

-	{$(INCLUDE)}"\ace\config-win32-common.h"\

-	{$(INCLUDE)}"\ace\config-win32.h"\

-	{$(INCLUDE)}"\ace\config.h"\

-	{$(INCLUDE)}"\ace\Connector.cpp"\

-	{$(INCLUDE)}"\ace\Connector.h"\

-	{$(INCLUDE)}"\ace\Connector.i"\

-	{$(INCLUDE)}"\ace\Containers.cpp"\

-	{$(INCLUDE)}"\ace\Containers.h"\

-	{$(INCLUDE)}"\ace\Containers.i"\

-	{$(INCLUDE)}"\ace\Dynamic.h"\

-	{$(INCLUDE)}"\ace\Dynamic.i"\

-	{$(INCLUDE)}"\ace\Event_Handler.h"\

-	{$(INCLUDE)}"\ace\Event_Handler.i"\

-	{$(INCLUDE)}"\ace\Free_List.cpp"\

-	{$(INCLUDE)}"\ace\Free_List.h"\

-	{$(INCLUDE)}"\ace\Free_List.i"\

-	{$(INCLUDE)}"\ace\Get_Opt.h"\

-	{$(INCLUDE)}"\ace\Get_Opt.i"\

-	{$(INCLUDE)}"\ace\Handle_Set.h"\

-	{$(INCLUDE)}"\ace\Handle_Set.i"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.h"\

-	{$(INCLUDE)}"\ace\INET_Addr.i"\

-	{$(INCLUDE)}"\ace\IO_Cntl_Msg.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.h"\

-	{$(INCLUDE)}"\ace\IPC_SAP.i"\

-	{$(INCLUDE)}"\ace\Log_Msg.h"\

-	{$(INCLUDE)}"\ace\Log_Priority.h"\

-	{$(INCLUDE)}"\ace\Log_Record.h"\

-	{$(INCLUDE)}"\ace\Log_Record.i"\

-	{$(INCLUDE)}"\ace\Malloc.h"\

-	{$(INCLUDE)}"\ace\Malloc.i"\

-	{$(INCLUDE)}"\ace\Malloc_T.cpp"\

-	{$(INCLUDE)}"\ace\Malloc_T.h"\

-	{$(INCLUDE)}"\ace\Malloc_T.i"\

-	{$(INCLUDE)}"\ace\Managed_Object.cpp"\

-	{$(INCLUDE)}"\ace\Managed_Object.h"\

-	{$(INCLUDE)}"\ace\Managed_Object.i"\

-	{$(INCLUDE)}"\ace\Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Map_Manager.h"\

-	{$(INCLUDE)}"\ace\Map_Manager.i"\

-	{$(INCLUDE)}"\ace\Mem_Map.h"\

-	{$(INCLUDE)}"\ace\Mem_Map.i"\

-	{$(INCLUDE)}"\ace\Memory_Pool.h"\

-	{$(INCLUDE)}"\ace\Memory_Pool.i"\

-	{$(INCLUDE)}"\ace\Message_Block.h"\

-	{$(INCLUDE)}"\ace\Message_Block.i"\

-	{$(INCLUDE)}"\ace\Message_Queue.cpp"\

-	{$(INCLUDE)}"\ace\Message_Queue.h"\

-	{$(INCLUDE)}"\ace\Message_Queue.i"\

-	{$(INCLUDE)}"\ace\Module.cpp"\

-	{$(INCLUDE)}"\ace\Module.h"\

-	{$(INCLUDE)}"\ace\Module.i"\

-	{$(INCLUDE)}"\ace\Object_Manager.h"\

-	{$(INCLUDE)}"\ace\Object_Manager.i"\

-	{$(INCLUDE)}"\ace\OS.h"\

-	{$(INCLUDE)}"\ace\OS.i"\

-	{$(INCLUDE)}"\ace\Reactor.h"\

-	{$(INCLUDE)}"\ace\Reactor.i"\

-	{$(INCLUDE)}"\ace\Reactor_Impl.h"\

-	{$(INCLUDE)}"\ace\Service_Config.h"\

-	{$(INCLUDE)}"\ace\Service_Config.i"\

-	{$(INCLUDE)}"\ace\Service_Object.h"\

-	{$(INCLUDE)}"\ace\Service_Object.i"\

-	{$(INCLUDE)}"\ace\Service_Types.h"\

-	{$(INCLUDE)}"\ace\Service_Types.i"\

-	{$(INCLUDE)}"\ace\Shared_Object.h"\

-	{$(INCLUDE)}"\ace\Shared_Object.i"\

-	{$(INCLUDE)}"\ace\Signal.h"\

-	{$(INCLUDE)}"\ace\Signal.i"\

-	{$(INCLUDE)}"\ace\Singleton.cpp"\

-	{$(INCLUDE)}"\ace\Singleton.h"\

-	{$(INCLUDE)}"\ace\Singleton.i"\

-	{$(INCLUDE)}"\ace\SOCK.h"\

-	{$(INCLUDE)}"\ace\SOCK.i"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.h"\

-	{$(INCLUDE)}"\ace\SOCK_Acceptor.i"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.h"\

-	{$(INCLUDE)}"\ace\SOCK_Connector.i"\

-	{$(INCLUDE)}"\ace\SOCK_IO.h"\

-	{$(INCLUDE)}"\ace\SOCK_IO.i"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.h"\

-	{$(INCLUDE)}"\ace\SOCK_Stream.i"\

-	{$(INCLUDE)}"\ace\SString.h"\

-	{$(INCLUDE)}"\ace\SString.i"\

-	{$(INCLUDE)}"\ace\stdcpp.h"\

-	{$(INCLUDE)}"\ace\Strategies.h"\

-	{$(INCLUDE)}"\ace\Strategies_T.cpp"\

-	{$(INCLUDE)}"\ace\Strategies_T.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.cpp"\

-	{$(INCLUDE)}"\ace\Stream_Modules.h"\

-	{$(INCLUDE)}"\ace\Stream_Modules.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.i"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.h"\

-	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.i"\

-	{$(INCLUDE)}"\ace\Svc_Conf_Tokens.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.cpp"\

-	{$(INCLUDE)}"\ace\Svc_Handler.h"\

-	{$(INCLUDE)}"\ace\Svc_Handler.i"\

-	{$(INCLUDE)}"\ace\Synch.h"\

-	{$(INCLUDE)}"\ace\Synch.i"\

-	{$(INCLUDE)}"\ace\Synch_Options.h"\

-	{$(INCLUDE)}"\ace\Synch_T.cpp"\

-	{$(INCLUDE)}"\ace\Synch_T.h"\

-	{$(INCLUDE)}"\ace\Synch_T.i"\

-	{$(INCLUDE)}"\ace\Task.h"\

-	{$(INCLUDE)}"\ace\Task.i"\

-	{$(INCLUDE)}"\ace\Task_T.cpp"\

-	{$(INCLUDE)}"\ace\Task_T.h"\

-	{$(INCLUDE)}"\ace\Task_T.i"\

-	{$(INCLUDE)}"\ace\Thread.h"\

-	{$(INCLUDE)}"\ace\Thread.i"\

-	{$(INCLUDE)}"\ace\Thread_Manager.h"\

-	{$(INCLUDE)}"\ace\Thread_Manager.i"\

-	{$(INCLUDE)}"\ace\Time_Value.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.cpp"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.h"\

-	{$(INCLUDE)}"\ace\Timer_Queue_T.i"\

-	{$(INCLUDE)}"\ace\Trace.h"\

-	{$(INCLUDE)}"\ace\Version.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.h"\

-	{$(INCLUDE)}"\ace\WFMO_Reactor.i"\

-	{$(INCLUDE)}"\ace\ws2tcpip.h"\

-	{$(INCLUDE)}"\tao\align.h"\

-	{$(INCLUDE)}"\tao\any.h"\

-	{$(INCLUDE)}"\tao\cdr.h"\

-	{$(INCLUDE)}"\tao\corba.h"\

-	{$(INCLUDE)}"\tao\corbacom.h"\

-	{$(INCLUDE)}"\tao\except.h"\

-	{$(INCLUDE)}"\tao\marshal.h"\

-	{$(INCLUDE)}"\tao\nvlist.h"\

-	{$(INCLUDE)}"\tao\object.h"\

-	{$(INCLUDE)}"\tao\orb.h"\

-	{$(INCLUDE)}"\tao\orbconf.h"\

-	{$(INCLUDE)}"\tao\principa.h"\

-	{$(INCLUDE)}"\tao\request.h"\

-	{$(INCLUDE)}"\tao\sequence.h"\

-	{$(INCLUDE)}"\tao\svrrqst.h"\

-	{$(INCLUDE)}"\tao\typecode.h"\

-	{$(INCLUDE)}"\tao\varout.h"\

-	

-

-"$(INTDIR)\cubitC.obj" : $(SOURCE) $(DEP_CPP_CUBITC) "$(INTDIR)"

-

-

-!ENDIF 

-

-# End Source File

-# End Target

-# End Project

-################################################################################

diff --git a/TAO/tests/Cubit/TAO/IDL_Cubit/Cubit.mdp b/TAO/tests/Cubit/TAO/IDL_Cubit/Cubit.mdp
deleted file mode 100644
index c26de1aa337..00000000000
--- a/TAO/tests/Cubit/TAO/IDL_Cubit/Cubit.mdp
+++ /dev/null
diff --git a/TAO/tests/Cubit/TAO/IDL_Cubit/IDL_Cubit.dsw b/TAO/tests/Cubit/TAO/IDL_Cubit/IDL_Cubit.dsw
deleted file mode 100644
index f6006d20cb7..00000000000
--- a/TAO/tests/Cubit/TAO/IDL_Cubit/IDL_Cubit.dsw
+++ /dev/null
@@ -1,41 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 5.00

-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!

-

-###############################################################################

-

-Project: "client"=.\client.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "server"=.\server.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Global:

-

-Package=<5>

-{{{

-}}}

-

-Package=<3>

-{{{

-}}}

-

-###############################################################################

-

diff --git a/TAO/tests/Cubit/TAO/IDL_Cubit/Makefile b/TAO/tests/Cubit/TAO/IDL_Cubit/Makefile
deleted file mode 100644
index 96334972233..00000000000
--- a/TAO/tests/Cubit/TAO/IDL_Cubit/Makefile
+++ /dev/null
@@ -1,87 +0,0 @@
-#----------------------------------------------------------------------------
-#	$Id$
-#
-#	Top-level Makefile for the ACE-ified Sun Ref. implementation
-#	of IIOP ORB
-#----------------------------------------------------------------------------
-
-#----------------------------------------------------------------------------
-#	Local macros
-#----------------------------------------------------------------------------
-
-LDLIBS     =  -lTAO
-
-IDL_SRC	= cubitC.cpp cubitS.cpp
-PROG_SRCS =	$(IDL_SRC) svr.cpp clnt.cpp
-
-LSRC = $(PROG_SRCS)
-
-CUBIT_SVR_OBJS = cubitC.o cubitS.o svr.o cubit_i.o
-CUBIT_CLT_OBJS = cubitC.o clnt.o
-
-BIN = svr clnt
-BUILD = $(BIN)
-VLDLIBS = $(LDLIBS:%=%$(VAR))
-VBIN = $(BIN:%=%$(VAR))
-
-#----------------------------------------------------------------------------
-#	Include macros and targets
-#----------------------------------------------------------------------------
-
-include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-include $(ACE_ROOT)/include/makeinclude/macros.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
-#include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
-
-ifndef TAO_ROOT
-TAO_ROOT = $(ACE_ROOT)/TAO
-endif
-TSS_ORB_FLAG = #-DTAO_HAS_TSS_ORBCORE
-DCFLAGS = -g
-LDFLAGS += -L$(TAO_ROOT)/tao
-CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/tao/compat $(TSS_ORB_FLAG)#-H
-
-$(IDL_SRC): cubit.idl
-	$(TAO_ROOT)/TAO_IDL/tao_idl cubit.idl
-
-svr:	$(addprefix $(VDIR),$(CUBIT_SVR_OBJS))
-	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS)
-
-clnt:	$(addprefix $(VDIR),$(CUBIT_CLT_OBJS))
-	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS)
-
-########
-# Sanity check builds by running basic functionality tests.
-#
-# "sleep 5" in the server startup is usually enough to get the
-# objref into the file so the client can read it.
-#
-check:	$(TESTS)
-	@echo "testing with 'cube' calls, stub + DII, IOR strings"
-	@./svr -i30 -o non-internet > obj.1 & sleep 5
-	@./clnt -n250 -O `cat obj.1` -x
-	@echo ''
-	@echo "testing request forwarding with 'cube' calls, stub + DII"
-	@./svr -f -i30 > obj.2 & sleep 5
-	@./clnt -n250 -O `cat obj.2` -x
-	@echo ''
-	@echo "testing transmission of primitive data types"
-	@./test1_svr -i30 > obj.3 & sleep 5
-	@./test1_clnt -n50 -O `cat obj.3` -x
-	@echo ''
-#	@echo "testing echo of primitive data values"
-#	@./echo_svr -i30 > obj.4 & sleep 5
-#	@./echo_clnt -O `cat obj.4` -x
-#	@echo ''
-	@echo "testing with 'cube' calls, MT-ized (no forwarding)"
-	@./svr -t -i30 -o non-internet > obj.5 & sleep 5
-	@./clnt -n250 -O `cat obj.5` -x
-	@echo ''
-
-clean:
-	-/bin/rm -rf *.o Log $(BIN) obj.* core Templates.DB .make.state
-
-realclean: clean
-	-/bin/rm -rf cubitC.* cubitS.*
diff --git a/TAO/tests/Cubit/TAO/IDL_Cubit/README b/TAO/tests/Cubit/TAO/IDL_Cubit/README
deleted file mode 100644
index e24968999ae..00000000000
--- a/TAO/tests/Cubit/TAO/IDL_Cubit/README
+++ /dev/null
@@ -1,32 +0,0 @@
-This is the cubit example that uses the TAO IDL compiler to generate
-the stubs and skeletons. Additional features include presence of a
-factory to create Cubit objects and testing the _bind call to get the
-factory object reference.
-
-You can either run the server in the background in the same window as
-the client or open a separate window for the client and server.
-
-server:
--------
-
-% svr [-d] [-ORBhost <serverhost>] [-ORBport <portnum>]
-           [-n <number-of-cubit-objects>]
-
-The server cubit factory maintained num_of_cubit objects (default =
-1). They are assigned keys that look like "key0", "key1", ...
-
-When the server is started and you have used the -d flag, you should
-see as the first line of output something that looks like
-iiop:1.0//serverhost:10013/factory.
-
-Using -d turns on debugging messages.  It is additive, i.e., the more
--d options provided, the more debugging you can get.  At the moment,
-only 2 levels of debugging are implemented, and more than 2 -d options
-are ignored.
-
-client:
--------
-
-% clnt [-d] -h <hostname> -p <port> -k <cubit key> -n <iterations>
-
-cubit_key corresponds to "key0", "key1", ...
diff --git a/TAO/tests/Cubit/TAO/IDL_Cubit/client.dsp b/TAO/tests/Cubit/TAO/IDL_Cubit/client.dsp
deleted file mode 100644
index 5944650e9d5..00000000000
--- a/TAO/tests/Cubit/TAO/IDL_Cubit/client.dsp
+++ /dev/null
@@ -1,154 +0,0 @@
-# Microsoft Developer Studio Project File - Name="client" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 5.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Console Application" 0x0103

-

-CFG=client - Win32 Release

-!MESSAGE This is not a valid makefile. To build this project using NMAKE,

-!MESSAGE use the Export Makefile command and run

-!MESSAGE 

-!MESSAGE NMAKE /f "client.mak".

-!MESSAGE 

-!MESSAGE You can specify a configuration when running NMAKE

-!MESSAGE by defining the macro CFG on the command line. For example:

-!MESSAGE 

-!MESSAGE NMAKE /f "client.mak" CFG="client - Win32 Release"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "client - Win32 Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "client - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE 

-

-# Begin Project

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

-

-!IF  "$(CFG)" == "client - Win32 Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir ".\client\Release"

-# PROP BASE Intermediate_Dir ".\client\Release"

-# PROP BASE Target_Dir ".\client"

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir ""

-# PROP Intermediate_Dir ".\Release"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ".\client"

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\..\\" /I "..\..\..\..\..\\" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /YX /FD /c

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 ace.lib tao.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\tao\\" /libpath:"..\..\..\..\..\ace"

-

-!ELSEIF  "$(CFG)" == "client - Win32 Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir ".\client\Debug"

-# PROP BASE Intermediate_Dir ".\client\Debug"

-# PROP BASE Target_Dir ".\client"

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir ""

-# PROP Intermediate_Dir ".\Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ".\client"

-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\..\\" /I "..\..\..\..\..\\" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /YX /FD /c

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386

-# ADD LINK32 aced.lib TAO.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\..\ace"

-

-!ENDIF 

-

-# Begin Target

-

-# Name "client - Win32 Release"

-# Name "client - Win32 Debug"

-# Begin Group "Source Files"

-

-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

-# Begin Source File

-

-SOURCE=.\clnt.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\cubit.idl

-

-!IF  "$(CFG)" == "client - Win32 Release"

-

-# Begin Custom Build

-InputPath=.\cubit.idl

-InputName=cubit

-

-BuildCmds= \

-	..\..\..\..\tao_idl\tao_idl $(InputName).idl

-

-"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-# End Custom Build

-

-!ELSEIF  "$(CFG)" == "client - Win32 Debug"

-

-# Begin Custom Build

-InputPath=.\cubit.idl

-InputName=cubit

-

-BuildCmds= \

-	..\..\..\..\tao_idl\tao_idl $(InputName).idl

-

-"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-# End Custom Build

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\cubitC.cpp

-# End Source File

-# End Group

-# Begin Group "Header Files"

-

-# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"

-# Begin Source File

-

-SOURCE=.\cubitC.h

-# End Source File

-# End Group

-# Begin Group "Resource Files"

-

-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe"

-# End Group

-# End Target

-# End Project

diff --git a/TAO/tests/Cubit/TAO/IDL_Cubit/clnt.bld b/TAO/tests/Cubit/TAO/IDL_Cubit/clnt.bld
deleted file mode 100755
index 49ecfafcae1..00000000000
--- a/TAO/tests/Cubit/TAO/IDL_Cubit/clnt.bld
+++ /dev/null
@@ -1,10 +0,0 @@
-#!build
-default:
-	program
-	:debuglevel=multi
-cubitC.cpp
-	C++
-clnt.cpp
-	C++
-sockem.c
-	C
diff --git a/TAO/tests/Cubit/TAO/IDL_Cubit/clnt.cpp b/TAO/tests/Cubit/TAO/IDL_Cubit/clnt.cpp
deleted file mode 100644
index c323ff6e101..00000000000
--- a/TAO/tests/Cubit/TAO/IDL_Cubit/clnt.cpp
+++ /dev/null
@@ -1,687 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/IDL_Cubit
-//
-// = FILENAME
-//    clnt.cpp
-//
-// = DESCRIPTION
-//      This class implements a simple "cube" CORBA client for the Cubit
-//      example using stubs generated by the TAO ORB IDL compiler.
-//
-// = AUTHORS
-//      Andy Gokhale, Sumedh Mungee, and Sergio Flores-Gaitan
-//
-// ============================================================================
-
-#include "ace/Profile_Timer.h"
-#include "clnt.h"
-
-// Constructor.
-
-Cubit_Client::Cubit_Client (void)
-  : cubit_factory_key_ ("factory"),
-    cubit_key_ ("key0"),
-    hostname_ (ACE_DEFAULT_SERVER_HOST),
-    portnum_ (TAO_DEFAULT_SERVER_PORT),
-    loop_count_ (250),
-    exit_later_ (0),
-    factory_ (Cubit_Factory::_nil ()),
-    objref_ (CORBA::Object::_nil ()),
-    cubit_ (Cubit::_nil ()),
-    orb_ptr_ (0),
-    call_count_ (0),
-    error_count_ (0)
-{
-}
-
-// Simple function that returns the substraction of 117 from the
-// parameter.
-
-int
-Cubit_Client::func (u_int i)
-{
-  return i - 117;
-}
-
-// Parses the command line arguments and returns an error status.
-
-int
-Cubit_Client::parse_args (void)
-{
-  ACE_Get_Opt get_opts (argc_, argv_, "dn:h:p:k:x");
-  int c;
-
-  while ((c = get_opts ()) != -1)
-    switch (c)
-      {
-      case 'd':  // debug flag
-        TAO_debug_level++;
-        break;
-      case 'n':			// loop count
-        loop_count_ = (u_int) ACE_OS::atoi (get_opts.optarg);
-        break;
-      case 'h':
-        hostname_ = ACE_OS::strdup (get_opts.optarg);
-        break;
-      case 'p':
-        portnum_ = ACE_OS::atoi (get_opts.optarg);
-        break;
-      case 'k':			// stringified objref
-        cubit_key_ = ACE_OS::strdup (get_opts.optarg);
-        break;
-      case 'x':
-        this->exit_later_++;
-        break;
-      case '?':
-      default:
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "usage:  %s"
-                           " [-d]"
-                           " [-n loopcount]"
-                           " [-k cubit-obj-ref-key]"
-                           " [-h hostname]"
-                           " [-p port]"
-                           " [-x]"
-                           "\n",
-                           this->argv_ [0]),
-                          -1);
-      }
-
-  // Indicates successful parsing of command line.
-  return 0;
-}
-
-// Exercise the union.  Cube a union.
-
-void
-Cubit_Client::cube_union_stub (void)
-{
-  CORBA::Environment env;
-  Cubit::oneof u, r;
-
-  this->call_count_++;
-
-  u.l (3); // use the long union branch
-
-  // Cube a "union" ...
-  r = this->cubit_->cube_union (u, this->env_);
-
-  if (this->env_.exception () != 0)
-    {
-      this->env_.print_exception ("from cube_union");
-      this->error_count_++;
-    }
-  else
-    {
-      dmsg ("cube union ...");
-      u.l (u.l () * u.l () * u.l ()) ;
-
-      if (u.l () != r.l ())
-	{
-	  ACE_DEBUG ((LM_DEBUG, "** cube_union ERROR\n"));
-	  this->error_count_++;
-	}
-
-    }
-
-  this->call_count_++;
-
-  u._d (Cubit::e_3rd);
-#if 0
-  u.cm ().l = this->func (i);
-  u.cm ().s = this->func (i);
-  u.cm ().o = this->func (i);
-#endif
-
-  u.cm ().l = 7;
-  u.cm ().s = 5;
-  u.cm ().o = 3;
-
-  // Cube another "union" which uses the default arm ... NOT tested yet
-  r = this->cubit_->cube_union (u, this->env_);
-
-  if (this->env_.exception () != 0)
-    {
-      this->env_.print_exception ("from cube_union");
-      this->error_count_++;
-    }
-  else
-    {
-      dmsg ("cube union ...");
-      u.cm ().l = u.cm ().l * u.cm ().l * u.cm ().l;
-      u.cm ().s = u.cm ().s * u.cm ().s * u.cm ().s;
-      u.cm ().o = u.cm ().o * u.cm ().o * u.cm ().o;
-
-      if (u.cm ().l != r.cm ().l
-	  || u.cm ().s != r.cm ().s
-	  || u.cm ().o != r.cm ().o)
-	{
-	  ACE_DEBUG ((LM_DEBUG, "** cube_union ERROR\n"));
-	  this->error_count_++;
-	}
-    }
-}
-
-// Exercise the union using dii.
-
-void
-Cubit_Client::cube_union_dii (void)
-{
-  // Create the request ...
-  CORBA::Request_ptr req;
-
-  this->call_count_++;
-
-  req = this->cubit_->_request ((CORBA::String) "cube_union", this->env_);
-
-  if (this->env_.exception () != 0)
-    {
-      this->error_count_++;
-
-      this->env_.print_exception ("cube_union_dii request create");
-      return;
-    }
-
-  // ... initialise the argument list and result ...
-  Cubit::oneof	*u, r;
-
-  u = new Cubit::oneof;
-  u->_d (Cubit::e_3rd);
-
-  u->cm ().l = 5;
-  u->cm ().s = -7;
-  u->cm ().o = 3;
-
-  CORBA::Any tmp_arg (Cubit::_tc_oneof, u, CORBA::B_FALSE);
-
-  req->arguments ()->add_value ("values", tmp_arg, CORBA::ARG_IN, this->env_);
-
-  if (this->env_.exception () != 0)
-    {
-      this->error_count_++;
-      this->env_.print_exception ("cube_union_dii request arg add");
-      CORBA::release (req);
-      return;
-    }
-
-  req->result ()->value ()->replace (Cubit::_tc_oneof, 0, CORBA::B_TRUE, this->env_);
-
-  if (this->env_.exception () != 0)
-    {
-      this->error_count_++;
-      this->env_.print_exception ("cube_union_dii result type");
-      CORBA::release (req);
-      return;
-    }
-
-  // Make the invocation, verify the result.
-
-  req->invoke ();
-
-  if (req->env ()->exception () != 0)
-    {
-      this->error_count_++;
-      req->env ()->print_exception ("cube_union_dii invoke");
-      CORBA::release (req);
-      return;
-    }
-
-  r = *(Cubit::oneof *) req->result ()->value ()->value ();
-
-  if (r.cm ().o != 27 || r.cm ().l != 125 || r.cm ().s != -343)
-    {
-      this->error_count_++;
-      ACE_ERROR ((LM_ERROR, "cube_union_dii -- bad results\n"));
-    }
-  else
-    dmsg ("cube_union_dii ... success!!");
-
-  CORBA::release (req);
-  delete u;
-}
-
-// Cube a short.
-
-void
-Cubit_Client::cube_short (int i)
-{
-  CORBA::Short arg_short = this->func (i);
-  // Cube a short.
-  CORBA::Short ret_short = cubit_->cube_short (arg_short, this->env_);
-
-  this->call_count_++;
-
-  if (this->env_.exception () != 0)
-    {
-      this->env_.print_exception ("from cube_short");
-      this->error_count_++;
-    }
-  else
-    {
-      dmsg2 ("cube short:  %d --> %d\n",
-	     arg_short,
-	     ret_short);
-      arg_short = arg_short * arg_short * arg_short;
-
-      if (arg_short != ret_short)
-	{
-	  ACE_ERROR ((LM_ERROR, "** cube_short (%d) ERROR (--> %d)\n",
-		      (CORBA::Short) this->func (i),
-		      ret_short));
-	  this->error_count_++;
-	}
-    }
-}
-
-// Cube an octet
-
-void
-Cubit_Client::cube_octet (int i)
-{
-  CORBA::Octet arg_octet = this->func (i);
-
-   // Cube an octet.
-  CORBA::Octet ret_octet = this->cubit_->cube_octet (arg_octet, this->env_);
-
-  this->call_count_++;
-
-  if (this->env_.exception () != 0)
-    {
-      this->env_.print_exception ("from cube_octet");
-      this->error_count_++;
-    }
-  else
-    {
-      dmsg2 ("cube octet:  %d --> %d\n", arg_octet, ret_octet);
-      arg_octet = arg_octet * arg_octet * arg_octet;
-      if (arg_octet != ret_octet) {
-	ACE_DEBUG ((LM_DEBUG,
-		    "** cube_octet (%d) ERROR (--> %d)\n",
-		    (CORBA::Octet) this->func (i),
-		    ret_octet));
-	this->error_count_++;
-      }
-    }
-}
-
-// calculate the cube from a long
-
-void
-Cubit_Client::cube_long (int i)
-{
-  CORBA::Long arg_long = this->func (i);
-
-  // Cube a long.
-  CORBA::Long ret_long = this->cubit_->cube_long (arg_long, this->env_);;
-
-  this->call_count_++;
-
-  if (this->env_.exception () != 0)
-    {
-      this->env_.print_exception ("from cube_long");
-      this->error_count_++;
-    }
-  else
-    {
-      dmsg2 ("cube long:  %d --> %d\n", arg_long, ret_long);
-      arg_long = arg_long * arg_long * arg_long;
-      if (arg_long != ret_long) {
-	ACE_ERROR ((LM_ERROR,
-		    "** cube_long (%ld) ERROR (--> %ld)\n",
-		    (CORBA::Long) this->func (i),
-		    ret_long));
-	this->error_count_++;
-      }
-    }
-}
-
-// Cube the numbers in a struct
-
-void
-Cubit_Client::cube_struct (int i)
-{
-  Cubit::Many arg_struct;
-  Cubit::Many ret_struct;
-
-  this->call_count_++;
-
-  arg_struct.l = this->func (i);
-  arg_struct.s = this->func (i);
-  arg_struct.o = this->func (i);
-
-  // Cube a "struct" ...
-  ret_struct = this->cubit_->cube_struct (arg_struct, this->env_);
-
-  if (this->env_.exception () != 0)
-    {
-      this->env_.print_exception ("from cube_struct");
-      this->error_count_++;
-    }
-  else
-    {
-      dmsg ("cube struct ...");
-      arg_struct.l = arg_struct.l * arg_struct.l * arg_struct.l;
-      arg_struct.s = arg_struct.s * arg_struct.s * arg_struct.s;
-      arg_struct.o = arg_struct.o * arg_struct.o * arg_struct.o;
-
-      if (arg_struct.l != ret_struct.l
-	  || arg_struct.s != ret_struct.s
-	  || arg_struct.o != ret_struct.o)
-	{
-	  ACE_ERROR ((LM_ERROR, "** cube_struct ERROR\n"));
-	  this->error_count_++;
-	}
-    }
-}
-
-// Cube the numbers in a struct
-
-void
-Cubit_Client::cube_struct_dii (void)
-{
-  // Create the request ...
-  CORBA::Request_ptr req =
-    this->cubit_->_request ((CORBA::String) "cube_struct", this->env_);
-
-  this->call_count_++;
-
-  if (this->env_.exception () != 0)
-    {
-      this->env_.print_exception ("DII request create");
-      return;
-    }
-
-  // ... initialise the argument list and result ...
-  Cubit::Many arg;
-  Cubit::Many result;
-
-  arg.o = 3;
-  arg.l = 5;
-  arg.s = -7;
-
-  CORBA::Any tmp_arg (Cubit::_tc_Many, &arg, CORBA::B_FALSE);
-
-  req->arguments ()->add_value ("values", tmp_arg, CORBA::ARG_IN, this->env_);
-
-  if (this->env_.exception () != 0)
-    {
-      this->env_.print_exception ("DII request arg add");
-      CORBA::release (req);
-      return;
-    }
-
-  req->result ()->value ()->replace (Cubit::_tc_Many, 0, CORBA::B_TRUE, this->env_);
-
-  if (this->env_.exception () != 0)
-    {
-      this->env_.print_exception ("DII request result type");
-      CORBA::release (req);
-      return;
-    }
-
-  // Make the invocation, verify the result
-
-  req->invoke ();
-
-  if (req->env ()->exception () != 0)
-    {
-      req->env ()->print_exception ("DII invoke sending struct");
-      CORBA::release (req);
-      return;
-    }
-
-  result = *(Cubit::Many *) req->result ()->value ()->value ();
-
-  if (result.o != 27 || result.l != 125 || result.s != -343)
-    ACE_ERROR ((LM_ERROR, "DII cube_struct -- bad results\n"));
-  else
-    dmsg ("DII cube_struct ... success!!");
-
-  CORBA::release (req);
-}
-
-void
-Cubit_Client::print_stats (const char *call_name, ACE_Profile_Timer::ACE_Elapsed_Time &elapsed_time)
-{
-  double tmp;
-
-  ACE_DEBUG ((LM_DEBUG,
-	      "%s:\n",
-	      call_name));
-  
-  if (this->call_count_ > 0  &&  this->error_count_ == 0)
-    {
-      tmp = 1000 / elapsed_time.real_time;
-
-      elapsed_time.real_time *= ACE_ONE_SECOND_IN_MSECS;
-      elapsed_time.user_time *= ACE_ONE_SECOND_IN_MSECS;
-      elapsed_time.system_time *= ACE_ONE_SECOND_IN_MSECS;
-
-      elapsed_time.real_time /= this->call_count_;
-      elapsed_time.user_time /= this->call_count_;
-      elapsed_time.system_time /= this->call_count_;
-
-      tmp = 1000 / elapsed_time.real_time;
-
-      ACE_DEBUG ((LM_DEBUG,
-		  "\treal_time\t= %0.06f ms, \n\t"
-		  "user_time\t= %0.06f ms, \n\t"
-		  "system_time\t= %0.06f ms\n"
-		  "\t%0.00f calls/second\n",
-		  elapsed_time.real_time < 0.0? 0.0:elapsed_time.real_time,
-		  elapsed_time.user_time < 0.0? 0.0:elapsed_time.user_time,
-		  elapsed_time.system_time < 0.0? 0.0:elapsed_time.system_time,
-		  tmp < 0.0? 0.0 : tmp));
-    }
-  else
-    {
-      ACE_ERROR ((LM_ERROR, "\tNo time stats printed.  Call count zero or error ocurred.\n"));
-    }
-
-  ACE_DEBUG ((LM_DEBUG,
-	      "\t%d calls, %d errors\n",
-	      this->call_count_,
-	      this->error_count_));
-}
-
-// Execute client example code.
-
-int
-Cubit_Client::run (void)
-{
-  u_int i;
-
-  ACE_Profile_Timer timer;
-  ACE_Profile_Timer::ACE_Elapsed_Time elapsed_time;
-
-  //  ACE_Time_Value before;
-
-  // We start an ACE_Profile_Timer here...
-  timer.start ();
-
-  // Make the calls in a loop.
-  for (i = 0; i < this->loop_count_; i++)
-    {
-      this->cube_short (i);
-      this->cube_octet (i);
-      this->cube_long (i);
-      this->cube_struct (i);
-    }
-
-  // stop the timer.
-  timer.stop ();
-
-  timer.elapsed_time (elapsed_time);  
-  // compute call average call time.
-  this->print_stats ("cube average call", elapsed_time);
-
-  // Simple test for DII: call "cube_struct". (It's not timed since
-  // the copious mallocation of DII would bias numbers against typical
-  // stub-based calls).
-
-  timer.start ();
-
-  this->call_count_ = 0;
-  this->error_count_ = 0;
-  // Make the calls in a loop.
-  for (i = 0; i < this->loop_count_; i++)
-    {
-      this->cube_struct_dii ();
-    }
-  timer.stop ();
-
-  timer.elapsed_time (elapsed_time);
-  // compute call average call time.
-  this->print_stats ("cube_struct_dii call", elapsed_time);
-
-  // ------------------>
-  // Two more tests, using the "cube_union" function
-
-  // unions using stubs
-  timer.start ();
-
-  this->call_count_ = 0;
-  this->error_count_ = 0;
-  // Make the calls in a loop.
-  for (i = 0; i < this->loop_count_; i++)
-    {
-      this->cube_union_stub ();
-    }
-
-  timer.stop ();
-
-  timer.elapsed_time (elapsed_time);
-  // compute call average call time.
-  this->print_stats ("cube_union_stub call", elapsed_time);
-
-  // union DII
-  timer.start ();
-
-  this->call_count_ = 0;
-  this->error_count_ = 0;
-  // Make the calls in a loop.
-  for (i = 0; i < this->loop_count_; i++)
-    {
-      this->cube_union_dii ();
-    }
-
-  timer.stop ();
-
-  timer.elapsed_time (elapsed_time);
-  // compute call average call time.
-  this->print_stats ("cube_union_dii call", elapsed_time);
-
-  if (this->exit_later_)
-    {
-      this->cubit_->please_exit (this->env_);
-      dexc (this->env_, "server, please ACE_OS::exit");
-    }
-
-  return this->error_count_ == 0 ? 0 : 1;
-}
-
-Cubit_Client::~Cubit_Client (void)
-{
-  // Free resources
-  CORBA::release (this->orb_ptr_);
-  this->objref_->Release ();
-  this->factory_->Release ();
-  this->cubit_->Release ();
-}
-
-int
-Cubit_Client::init (int argc, char **argv)
-{
-  this->argc_ = argc;
-  this->argv_ = argv;
-
-  // Parse command line and verify parameters.
-  if (this->parse_args () == -1)
-    return -1;
-
-  // Retrieve the ORB.
-  this->orb_ptr_ = CORBA::ORB_init (this->argc_,
-                                    this->argv_,
-                                    "internet",
-                                    this->env_);
-
-  if (this->env_.exception () != 0)
-    {
-      this->env_.print_exception ("ORB initialization");
-      return -1;
-    }
-
-  if (this->cubit_key_ == 0)
-    ACE_ERROR_RETURN ((LM_ERROR,
-               "%s: must specify an object reference using -k <key>\n",
-		       this->argv_[0]),
-		      -1);
-
-  // Retrieve a factory objref.
-  this->objref_ = Cubit_Factory::_bind (this->hostname_,
-                                        this->portnum_,
-                                        this->cubit_factory_key_,
-                                        this->env_);
-
-  if (this->env_.exception () != 0)
-    {
-      this->env_.print_exception ("Cubit_Factory::_bind");
-      return -1;
-    }
-
-  if (CORBA::is_nil (this->objref_) == CORBA::B_TRUE)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       " _bind returned null object for key (%s), host (%s), port (%d)\n",
-                       this->cubit_factory_key_,
-                       this->hostname_,
-                       this->portnum_),
-                      -1);
-
-  // Narrow the CORBA::Object reference to the stub object, checking
-  // the type along the way using _is_a.  There is really no need to
-  // narrow <objref> because <_bind> will return us the
-  // <Cubit_Factory> pointer.  However, we do it so that we can
-  // explicitly test the _narrow function.
-  this->factory_ = Cubit_Factory::_narrow (this->objref_, this->env_);
-  //CORBA::release (this->objref_);
-  this->objref_->Release ();
-
-  if (this->factory_ == 0)
-    ACE_ERROR_RETURN ((LM_ERROR,
-		       " (%P|%t) Unable to narrow object reference to a Cubit_Factory_ptr.\n"),
-		      -1);
-
-  // Now retrieve the Cubit obj ref corresponding to the key.
-  this->cubit_ = 
-    this->factory_->make_cubit (this->cubit_key_, this->env_);
-
-  if (this->env_.exception () != 0)
-    {
-      this->env_.print_exception ("string2object");
-      return -1;
-    }
-
-  if (CORBA::is_nil (this->cubit_))
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "null cubit objref returned by factory\n"),
-                      -1);
-
-  return 0;
-}
-
-// This function runs the test.
-
-int
-main (int argc, char **argv)
-{
-  Cubit_Client cubit_client;
-
-  if (cubit_client.init (argc, argv) == -1)
-    return 1;
-  else
-    return cubit_client.run ();
-}
diff --git a/TAO/tests/Cubit/TAO/IDL_Cubit/clnt.h b/TAO/tests/Cubit/TAO/IDL_Cubit/clnt.h
deleted file mode 100644
index 77d61e6ae5e..00000000000
--- a/TAO/tests/Cubit/TAO/IDL_Cubit/clnt.h
+++ /dev/null
@@ -1,121 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/IDL_Cubit
-//
-// = FILENAME
-//    clnt.h
-//
-// = DESCRIPTION
-//      This class implements a simple "cube" CORBA client for the Cubit 
-//      example using stubs generated by the TAO ORB IDL compiler.
-//
-// = AUTHORS
-//      Andy Gokhale, Sumedh Mungee, and Sergio Flores-Gaitan
-//
-// ============================================================================
-
-#include "ace/Get_Opt.h"
-#include "tao/corba.h"
-#include "cubitC.h"
-
-class Cubit_Client 
-  // = TITLE
-  //    Defines a class that encapsulates behaviour of the Cubit client
-  //    example.  Provides a better understanding of the logic in an 
-  //    object oriented way.
-  //
-  // = DESCRIPTION
-  //    This class declares an interface to run the example client for
-  //    Cubit CORBA server.  All the complexity for initializing the 
-  //    server is hidden in the class.  Just the run() interface is needed.
-{
-public:
-  // = Constructor and destructor.
-  Cubit_Client (void);
-  ~Cubit_Client (void);
-
-  int run (void);
-  // Execute client example code.
-
-  int init (int argc, char **argv);
-  // Initialize the client communication endpoint with server.
-
-private:
-  int func (u_int i);
-  // simple function that returns the substraction of 117 from the parameter.
-
-  int parse_args (void);
-  // Parses the arguments passed on the command line.
-
-  void print_stats (const char *call_name, ACE_Profile_Timer::ACE_Elapsed_Time &elapsed_time);
-  // prints the time stats
-
-  void cube_union_stub (void);
-  // Exercise the union.  Cube a union.
-  
-  void cube_union_dii (void);
-  // Exercise the union using dii.
-
-  void cube_struct (int i);
-  // calculate the cube from a struct.
-
-  void cube_long (int i);
-  // calculate the cube from a long
-
-  void cube_octet (int i);
-  // Cube an octet
-
-  void cube_short (int i);
-  // Cube a short.
-
-  void cube_struct_dii (void);
-  // Cube the numbers in a struct
-
-  int argc_;
-  // # of arguments on the command line.
-
-  char **argv_;
-  // arguments from command line.
-
-  const char *cubit_factory_key_;
-  // Key of factory obj ref.
-
-  char *cubit_key_;
-  // Key of the obj ref to be retrieved via the factory.
-
-  char *hostname_;
-  // Hostname of server.
-
-  CORBA::ULong portnum_;
-  // default port number of server.
-
-  u_int loop_count_;
-  // Number of times to do the cube operations.
-
-  int exit_later_;
-  // Flag to tell server to not exit immediately
-
-  Cubit_Factory_ptr factory_;
-  // factory pointer for cubit.
-
-  CORBA::Object_ptr objref_;
-  // storage of the factory objref
-  
-  CORBA::Environment env_;
-  // Environment variable
-
-  Cubit_ptr cubit_;
-  // Cubit obj ref
-
-  CORBA::ORB_ptr orb_ptr_;
-  // Remember our orb
-
-  u_int call_count_;
-  // # of calls made to functions
-
-  u_int error_count_;
-  // #  of errors incurred in the lifetime of the application.
-};
diff --git a/TAO/tests/Cubit/TAO/IDL_Cubit/cubit.idl b/TAO/tests/Cubit/TAO/IDL_Cubit/cubit.idl
deleted file mode 100644
index 9ddc2d8954f..00000000000
--- a/TAO/tests/Cubit/TAO/IDL_Cubit/cubit.idl
+++ /dev/null
@@ -1,71 +0,0 @@
-// $Id$
-
-interface Cubit
-  // = TITLE
-  //    Defines an interface that encapsulates operations that cube
-  //    numbers.
-  //
-  // = DESCRIPTION
-  //    This interface encapsulates operations that cube
-  //    octets, shorts, longs, structs and unions.
-
-{
-  octet	cube_octet (in octet o);
-  // cube an octet
-
-  short	cube_short (in short s);
-  // cube a short
-
-  long	cube_long (in long l);
-  // cube a long
-
-  struct Many
-  {
-    octet o;		// + 3 bytes padding (normally) ...
-    long l;
-    short s;		// + 2 bytes padding (normally) ...
-  };
-
-  Many cube_struct (in Many values);
-  // Cube a struct
-
-  enum discrim
-  {
-    e_0th,
-    e_1st,
-    e_2nd,
-    e_3rd
-  };
-  // Enumeration of the different elements in a union.
-
-  union oneof switch (discrim)
-    {
-      // this is an easy union to interpret; no padding
-      // is needed between discriminant and value.
-    case e_0th:
-      octet o;
-    case e_1st:
-      short s;
-    case e_2nd:
-      long l;
-    case e_3rd:
-      Many cm;
-
-      // default:
-      // Many cm;
-    };
-  // Union of different types.
-
-  oneof	cube_union (in oneof values);
-  // cube a union.
-
-  oneway void please_exit ();
-  // shutdown the application.
-};
-
-interface Cubit_Factory
-  // = TITLE
-  //    Creates Cubit objects
-{
-  Cubit make_cubit (in string key);
-};
diff --git a/TAO/tests/Cubit/TAO/IDL_Cubit/cubit_i.cpp b/TAO/tests/Cubit/TAO/IDL_Cubit/cubit_i.cpp
deleted file mode 100644
index a73eabcc202..00000000000
--- a/TAO/tests/Cubit/TAO/IDL_Cubit/cubit_i.cpp
+++ /dev/null
@@ -1,169 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/IDL_Cubit
-//
-// = FILENAME
-//    cubit_i.cpp
-//
-// = AUTHOR
-//    Andy Gokhale, Sumedh Mungee and Sergio Flores-Gaitan
-//
-// ============================================================================
-
-#include "tao/corba.h"
-#include "cubit_i.h"
-
-// Constructor
-
-Cubit_Factory_i::Cubit_Factory_i (const char *key, int numobjs)
-  : POA_Cubit_Factory (key)
-{
-  // Create implementation object with user specified key.
-
-  this->numobjs_ = numobjs;
-  this->my_cubit_ = new Cubit_i_ptr [this->numobjs_];
-
-  static char obj_str [MAXNAMELEN];
-
-  for (u_int i = 0; i < this->numobjs_; i++)
-    {
-      ACE_OS::memset (obj_str, '\0', MAXNAMELEN);
-      ACE_OS::sprintf (obj_str, "key%d", i);
-
-      my_cubit_[i] = new Cubit_i (obj_str);
-
-      if (my_cubit_[i] == 0)
-        ACE_ERROR ((LM_ERROR,
-                    " (%P|%t) Unable to create implementation object%d\n",
-                    i));
-
-    }
-}
-
-// Destructor
-
-Cubit_Factory_i::~Cubit_Factory_i (void)
-{
-  delete [] this->my_cubit_;
-}
-
-Cubit_ptr
-Cubit_Factory_i::make_cubit (const char *key, CORBA::Environment &env)
-{
-  for (size_t i = 0; i < this->numobjs_; i++)
-    {
-      const char *obj_str = this->my_cubit_[i]->_get_name (env);
-
-      // Keys matched.
-      if (!ACE_OS::strcmp (obj_str, key))
-        return Cubit::_duplicate (this->my_cubit_ [i]);
-    }
-
-  return Cubit::_nil ();
-}
-
-// Constructor
-
-Cubit_i::Cubit_i (const char *obj_name)
-  : POA_Cubit (obj_name)
-{
-}
-
-// Destructor
-
-Cubit_i::~Cubit_i (void)
-{
-}
-
-// Cube an octet
-
-CORBA::Octet
-Cubit_i::cube_octet (CORBA::Octet o,
-                     CORBA::Environment &env)
-{
-  ACE_UNUSED_ARG (env);
-  return o * o * o;
-}
-
-// Cube a short.
-
-CORBA::Short
-Cubit_i::cube_short (CORBA::Short s,
-                     CORBA::Environment &env)
-{
-  ACE_UNUSED_ARG (env);
-  return s * s * s;
-}
-
-// Cube a long
-
-CORBA::Long
-Cubit_i::cube_long (CORBA::Long l,
-                    CORBA::Environment &env)
-{
-  ACE_UNUSED_ARG (env);
-  return l * l * l;
-}
-
-// Cube a struct
-
-Cubit::Many
-Cubit_i::cube_struct (const Cubit::Many &values,
-                      CORBA::Environment &env)
-{
-  Cubit::Many temp;
-
-  ACE_UNUSED_ARG (env);
-  temp.o = values.o * values.o * values.o;
-  temp.s = values.s * values.s * values.s;
-  temp.l = values.l * values.l * values.l;
-
-  return temp;
-}
-
-// Cube a union
-
-Cubit::oneof
-Cubit_i::cube_union (const Cubit::oneof &values,
-                     CORBA::Environment &env)
-{
-  Cubit::oneof temp;
-
-  ACE_UNUSED_ARG (env);
-  switch (values._d ())
-    {
-    case e_0th:
-      temp.o (values.o () * values.o () * values.o ());
-      break;
-    case e_1st:
-      temp.s (values.s () * values.s () * values.s ());
-      break;
-    case e_2nd:
-      temp.l (values.l () * values.l () * values.l ());
-      break;
-    case e_3rd:
-    default:
-      temp._d (values._d ()); // set the discriminant
-      // use the read/write accessor
-      temp.cm ().o  = values.cm ().o * values.cm ().o * values.cm ().o;
-      temp.cm ().s  = values.cm ().s * values.cm ().s * values.cm ().s;
-      temp.cm ().l  = values.cm ().l * values.cm ().l * values.cm ().l;
-
-    }
-  return temp;
-}
-
-// Shutdown.
-
-void Cubit_i::please_exit (CORBA::Environment &env)
-{
-  // Macro to avoid "warning: unused parameter" type warning.
-  ACE_UNUSED_ARG (env);
-
-  dmsg ("I've been asked to shut down...");
-  TAO_ORB_Core_instance ()->orb ()->shutdown ();
-  dexc (env, "please_exit, shutdown");
-}
diff --git a/TAO/tests/Cubit/TAO/IDL_Cubit/cubit_i.h b/TAO/tests/Cubit/TAO/IDL_Cubit/cubit_i.h
deleted file mode 100644
index a175f39abdd..00000000000
--- a/TAO/tests/Cubit/TAO/IDL_Cubit/cubit_i.h
+++ /dev/null
@@ -1,94 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/IDL_Cubit
-// 
-// = FILENAME
-//    cubit_i.h
-//
-// = AUTHOR
-//    Andy Gokhale, Sumedh Mungee and Sergio Flores-Gaitan
-// 
-// ============================================================================
-
-#if !defined (_CUBIT_I_HH)
-#define	_CUBIT_I_HH
-
-#include "cubitS.h"
-
-// Forward declarations
-class Cubit_i;
-
-// Typedefs.
-typedef Cubit_i *Cubit_i_ptr;
-typedef Cubit_i_ptr Cubit_i_ref;
-
-class Cubit_i : public POA_Cubit
-  // = TITLE
-  //    Illustrates how to integrate a servant with the
-  //    generated skeleton.
-  // = DESCRIPTION
-  //    Implementation of the cubit example at the servant side.
-  //    Cubes an octet, short, long, struct and union.
-{
-public:
-  Cubit_i (const char *obj_name = 0);
-  // Constructor
-
-  ~Cubit_i (void);
-  // Destructor
-
-  virtual CORBA::Octet cube_octet (CORBA::Octet o,
-                                   CORBA::Environment &env);
-  // Cube an octet
-
-  virtual CORBA::Short cube_short (CORBA::Short s,
-                                   CORBA::Environment &env);
-  // Cube a short
-
-  virtual CORBA::Long cube_long (CORBA::Long l,
-                                 CORBA::Environment &env);
-  // Cube a long
-
-  virtual Cubit::Many cube_struct (const Cubit::Many &values,
-                                   CORBA::Environment &env);
-  // Cube a struct.
-
-  virtual Cubit::oneof cube_union (const Cubit::oneof &values,
-                                   CORBA::Environment &env);
-  // Cube a union.
-
-  virtual void please_exit (CORBA::Environment &env);
-  // Shutdown routine.
-};
-
-
-class Cubit_Factory_i;
-
-typedef Cubit_Factory_i *Cubit_Factory_i_ptr;
-
-class Cubit_Factory_i: public POA_Cubit_Factory
-  // =TITLE
-  //  Cubit_Factory_i
-  //
-  // DESCRIPTION
-  //  factory object returning the cubit objrefs
-{
-public:
-  Cubit_Factory_i (const char *key, int numobjs);
-  // constructor
-
-  ~Cubit_Factory_i (void);
-  // destructor
-
-  virtual Cubit_ptr make_cubit (const char *key, CORBA::Environment &env);
-  // make the cubit object whose key is "key"
-
-private:
-  Cubit_i_ptr *my_cubit_;
-  u_int numobjs_;
-};
-
-#endif /* _CUBIT_I_HH */
diff --git a/TAO/tests/Cubit/TAO/IDL_Cubit/default.bld b/TAO/tests/Cubit/TAO/IDL_Cubit/default.bld
deleted file mode 100644
index 55c2d47db84..00000000000
--- a/TAO/tests/Cubit/TAO/IDL_Cubit/default.bld
+++ /dev/null
@@ -1,30 +0,0 @@
-#!build
-default:
-	nobuild
-	:c_option=slashcomment
-	:cx_e_option=msgnumbers
-	:object_dir=./.obj
-	:target=vxwppc
-	:cx_silent=21
-	:cx_silent=191
-	:cx_silent=610
-	:sourcedirs=VME_DRV/src
-	:sourcedirs=VME_DRV/api/include
-	:sourcedirs=/home/ace/ACE_wrappers.vxworks
-	:sourcedirs=../../../../tao/compat
-	:sourcedirs=../../../..
-	:libdirs=VME_DRV/vmeXportu
-	:libdirs=../../../../tao
-	:libdirs=/home/ace/ACE_wrappers.vxworks/ace
-	:libraries=vmeXport.a
-	:libraries=tao.a
-	:libraries=libACE.a
-	:libraries=/appl/newgreen/vxppc603/ghsbltin.o
-	:defines=DEBUG
-	:defines=FORCE_ARGS
-	:defines=VME_DRIVER
-clnt.bld
-	program
-svr.bld
-	program
-	:defines=USE_ACE_EVENT_HANDLING
diff --git a/TAO/tests/Cubit/TAO/IDL_Cubit/server.dsp b/TAO/tests/Cubit/TAO/IDL_Cubit/server.dsp
deleted file mode 100644
index 5254ba46776..00000000000
--- a/TAO/tests/Cubit/TAO/IDL_Cubit/server.dsp
+++ /dev/null
@@ -1,184 +0,0 @@
-# Microsoft Developer Studio Project File - Name="server" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 5.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Console Application" 0x0103

-

-CFG=server - Win32 Release

-!MESSAGE This is not a valid makefile. To build this project using NMAKE,

-!MESSAGE use the Export Makefile command and run

-!MESSAGE 

-!MESSAGE NMAKE /f "server.mak".

-!MESSAGE 

-!MESSAGE You can specify a configuration when running NMAKE

-!MESSAGE by defining the macro CFG on the command line. For example:

-!MESSAGE 

-!MESSAGE NMAKE /f "server.mak" CFG="server - Win32 Release"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "server - Win32 Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "server - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE 

-

-# Begin Project

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

-

-!IF  "$(CFG)" == "server - Win32 Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir ".\server\Release"

-# PROP BASE Intermediate_Dir ".\server\Release"

-# PROP BASE Target_Dir ".\server"

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir ""

-# PROP Intermediate_Dir ".\Release"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ".\server"

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\..\\" /I "..\..\..\..\..\\" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /YX /FD /c

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 ace.lib tao.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\tao\\" /libpath:"..\..\..\..\..\ace"

-

-!ELSEIF  "$(CFG)" == "server - Win32 Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir ".\server\Debug"

-# PROP BASE Intermediate_Dir ".\server\Debug"

-# PROP BASE Target_Dir ".\server"

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir ""

-# PROP Intermediate_Dir ".\Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ".\server"

-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\..\\" /I "..\..\..\..\..\\" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /YX /FD /c

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386

-# ADD LINK32 aced.lib TAO.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\..\ace"

-

-!ENDIF 

-

-# Begin Target

-

-# Name "server - Win32 Release"

-# Name "server - Win32 Debug"

-# Begin Group "Source Files"

-

-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

-# Begin Source File

-

-SOURCE=.\cubit.idl

-

-!IF  "$(CFG)" == "server - Win32 Release"

-

-# Begin Custom Build

-InputPath=.\cubit.idl

-InputName=cubit

-

-BuildCmds= \

-	..\..\..\..\tao_idl\tao_idl $(InputName).idl

-

-"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-# End Custom Build

-

-!ELSEIF  "$(CFG)" == "server - Win32 Debug"

-

-# Begin Custom Build

-InputPath=.\cubit.idl

-InputName=cubit

-

-BuildCmds= \

-	..\..\..\..\tao_idl\tao_idl $(InputName).idl

-

-"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-# End Custom Build

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\cubit_i.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\cubitC.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\cubitS.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\svr.cpp

-# End Source File

-# End Group

-# Begin Group "Header Files"

-

-# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"

-# Begin Source File

-

-SOURCE=.\cubit_i.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\cubitS.h

-# End Source File

-# End Group

-# Begin Group "Resource Files"

-

-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe"

-# End Group

-# End Target

-# End Project

diff --git a/TAO/tests/Cubit/TAO/IDL_Cubit/svc.conf b/TAO/tests/Cubit/TAO/IDL_Cubit/svc.conf
deleted file mode 100644
index 43c6a486c92..00000000000
--- a/TAO/tests/Cubit/TAO/IDL_Cubit/svc.conf
+++ /dev/null
@@ -1,49 +0,0 @@
-# $Id$
-#
-# This file contains a sample ACE_Service_Config configuration
-# file specifying the strategy factories utilized by an application
-# using TAO.  There are currently only two possible factories:
-# Client_Strategy_Factory and Server_Strategy_Factory.  These names
-# must be used as the second argument to their corresponding line,
-# because that's what the ORB uses to find the desired factory.
-#
-# Note that there are two unordinary characteristics of the way *this*
-# file is set up:
-#   - both client and server strategies are specified in the same
-#     file, which would only make sense for co-located clients & servers
-#   - both of the factories are actually sourced out of libTAO.so
-#     (TAO.DLL on Win32), and they would normally be in a separate
-#     dll from the TAO ORB Core.
-#
-# The options which can be passed to the Resource Factory are:
-#
-#   -ORBresources <which>
-#       where <which> can be 'global' to specify globally-held resources,
-#       or 'tss' to specify thread-specific resources.
-#
-# The options which can be passed to the Client are:
-#     <none currently>
-#
-# The options which can be passed to the Server are:
-#
-#   -ORBconcurrency <which>
-#       where <which> can be 'thread-per-connection' to specify
-#       use of the ACE_Threaded_Strategy concurrency strategy,
-#       or 'reactive' to specify use of the ACE_Reactive_Strategy
-#       concurrency strategy.
-#
-#   -ORBthreadflags  <flags>
-#       specifies the default thread flags to use, where <flags> is a
-#       logical OR'ing of the flags THR_DETACHED, THR_BOUND, THR_NEW_LWP,
-#       THR_SUSPENDED, or THR_DAEMON.  Note that not every flag may be valid
-#       on every platform.
-#
-#   -ORBdemuxstrategy <which>
-#       where <which> can be one of 'dynamic', 'linear', 'active', or 'user',
-#       and specifies the type of object lookup strategy used internally.
-#   -ORBtablesize <unsigned>
-#       specifies the size of the object table
-#
-dynamic Resource_Factory Service_Object * TAO:_make_TAO_Resource_Factory() "-ORBresources global"
-dynamic Client_Strategy_Factory Service_Object * TAO:_make_TAO_Default_Client_Strategy_Factory()
-dynamic Server_Strategy_Factory Service_Object * TAO:_make_TAO_Default_Server_Strategy_Factory() "-ORBconcurrency reactive -ORBdemuxstrategy dynamic -ORBtablesize 128"
diff --git a/TAO/tests/Cubit/TAO/IDL_Cubit/svr.bld b/TAO/tests/Cubit/TAO/IDL_Cubit/svr.bld
deleted file mode 100755
index fa1a05e3a66..00000000000
--- a/TAO/tests/Cubit/TAO/IDL_Cubit/svr.bld
+++ /dev/null
@@ -1,14 +0,0 @@
-#!build
-default:
-	program
-	:debuglevel=multi
-cubit_i.cpp
-	C++
-cubitS.cpp
-	C++
-svr.cpp
-	C++
-cubitC.cpp
-	C++
-sockem.c
-	C
diff --git a/TAO/tests/Cubit/TAO/IDL_Cubit/svr.cpp b/TAO/tests/Cubit/TAO/IDL_Cubit/svr.cpp
deleted file mode 100644
index c716c0b1467..00000000000
--- a/TAO/tests/Cubit/TAO/IDL_Cubit/svr.cpp
+++ /dev/null
@@ -1,117 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/IDL_Cubit
-//
-// = FILENAME
-//    svr.cpp
-//
-// = AUTHOR
-//    Andy Gokhale, Sumedh Mungee and Sergio Flores-Gaitan
-//
-// ============================================================================
-
-#include "ace/Get_Opt.h"
-#include "ace/Log_Msg.h"
-#include "tao/corba.h"
-#include "cubit_i.h"
-
-// Global Variables
-static int num_of_objs = 1;
-
-// Parses the command line arguments and returns an error status
-
-static int
-parse_args (int argc, char *argv[])
-{
-  ACE_Get_Opt get_opts (argc, argv, "dn:");
-  int c;
-
-  while ((c = get_opts ()) != -1)
-    switch (c)
-      {
-      case 'd':  // debug flag
-        TAO_debug_level++;
-        break;
-      case 'n':	// number of cubit objects we hold
-        num_of_objs = ACE_OS::atoi (get_opts.optarg);
-        break;
-      case '?':
-      default:
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "usage:  %s"
-                           " [-d]"
-                           " [-n] <num of cubit objects>"
-                           "\n", argv [0]), 1);
-      }
-
-  return 0;  // Indicates successful parsing of command line
-}
-
-// Standard command line parsing utilities used.
-
-int
-main (int argc, char *argv[])
-{
-  CORBA::Environment env;
-  char *orb_name = "internet";
-
-  CORBA::ORB_ptr orb_ptr = CORBA::ORB_init (argc, argv, orb_name, env);
-
-  if (env.exception () != 0)
-    {
-      env.print_exception ("ORB init");
-      return 1;
-    }
-
-  // Initialize the Object Adapter
-  CORBA::POA_ptr oa_ptr = orb_ptr->POA_init (argc, argv, "POA");
-
-  if (oa_ptr == 0)
-    ACE_ERROR_RETURN ((LM_ERROR,
-		       " (%P|%t) Unable to initialize the POA.\n"),
-		      1);
-
-  // Parse remaining command line and verify parameters.
-  parse_args (argc, argv);
-
-  // create a factory implementation
-  Cubit_Factory_ptr factory;
-
-  ACE_NEW_RETURN (factory, Cubit_Factory_i ("factory", num_of_objs), 1);
-
-  if (TAO_debug_level > 0)
-    {
-      // Stringify the objref we'll be implementing, and print it to
-      // stdout.  Someone will take that string and give it to a
-      // client.  Then release the object.
-
-      CORBA::String str;
-
-      str = orb_ptr->object_to_string (factory, env);
-
-      if (env.exception () != 0)
-        {
-          env.print_exception ("object2string");
-          return 1;
-        }
-
-      ACE_OS::puts ((char *) str);
-      ACE_OS::fflush (stdout);
-      //dmsg1 ("Object Created at: '%ul'", obj);
-      dmsg1 ("listening as object '%s'", str);
-    }
-
-  // Handle requests for this object until we're killed, or one of the
-  // methods asks us to exit.
-  if (orb_ptr->run () == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "run"), -1);
-
-  // Free resources
-  CORBA::release (oa_ptr);
-  CORBA::release (orb_ptr);
-
-  return 0;
-}
diff --git a/TAO/tests/Cubit/TAO/MT_Cubit/MT_Cubit.dsw b/TAO/tests/Cubit/TAO/MT_Cubit/MT_Cubit.dsw
deleted file mode 100644
index 16b01618b33..00000000000
--- a/TAO/tests/Cubit/TAO/MT_Cubit/MT_Cubit.dsw
+++ /dev/null
@@ -1,41 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 5.00

-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!

-

-###############################################################################

-

-Project: "client"=.\client\client.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "server"=.\server\server.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Global:

-

-Package=<5>

-{{{

-}}}

-

-Package=<3>

-{{{

-}}}

-

-###############################################################################

-

diff --git a/TAO/tests/Cubit/TAO/MT_Cubit/Makefile b/TAO/tests/Cubit/TAO/MT_Cubit/Makefile
deleted file mode 100644
index 2d391b27ad6..00000000000
--- a/TAO/tests/Cubit/TAO/MT_Cubit/Makefile
+++ /dev/null
@@ -1,23 +0,0 @@
-#----------------------------------------------------------------------------
-#	@(#)Makefile	1.1	10/18/96
-#
-#	Makefile for the TAO MT-Cubit tests
-#----------------------------------------------------------------------------
-
-#----------------------------------------------------------------------------
-#	Local macros
-#----------------------------------------------------------------------------
-
-DIRS  = client \
-        server
-
-#----------------------------------------------------------------------------
-#	Include macros and targets
-#----------------------------------------------------------------------------
-
-include	$(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-include	$(ACE_ROOT)/include/makeinclude/macros.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.common.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.nested.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.nolocal.GNU
-
diff --git a/TAO/tests/Cubit/TAO/MT_Cubit/README b/TAO/tests/Cubit/TAO/MT_Cubit/README
deleted file mode 100644
index b21889d1c19..00000000000
--- a/TAO/tests/Cubit/TAO/MT_Cubit/README
+++ /dev/null
@@ -1,58 +0,0 @@
-The MT-Cubit example
---------------------
-
-Compiling
----------
-
-Makefiles are provided. Use make to compile.
-
-You can either run the server in the background in the same window as
-the client or open a separate window for the client and server.
-
-server:
--------
-
-./svr -p <port_num> -h <my_hostname>
-
-port_num is the port number at which the server will start the high
-priority servant. The low priority servant will be created at
-(port_num+1).
-
-The server will print the IOR of the high and low priority servants,
-but it is not required by the client.
-
-client:
--------
-
-./client -d <datatype> -p <port_num> -h <server_hostname> -n <num_calls> -t <num_threads>
-
-<datatype> is one of the following:
-
-0 Octet
-1 Short
-2 Long
-3 Struct of the above 3 types
-
-<port_num> is the port number of the high priority servant. The low
-priority servant is assumed to be at (port_num+1).
-
-<server_hostname> is the hostname of the server.
-
-Based on the server_hostname and the port_num, the client constructs
-the IOR's for the high priority servant and the low priority servant.
-
-<num_calls> is the number of CORBA twoway calls to be made
-
-<num_threads> is the total number of concurrent clients to be
-created. One of these clients will be a high priority client (and thus
-send requests to the high priority servant), and the rest will have
-low priority.
-
-The high priority client makes requests at 20Hz, and the low priority
-clients make requests at 10Hz.
-
-Results
--------
-
-The client prints the latency observed by the high priority client,
-and the average latency observed by the low priority client.
diff --git a/TAO/tests/Cubit/TAO/MT_Cubit/clnt.bld b/TAO/tests/Cubit/TAO/MT_Cubit/clnt.bld
deleted file mode 100644
index 8bd06f00178..00000000000
--- a/TAO/tests/Cubit/TAO/MT_Cubit/clnt.bld
+++ /dev/null
@@ -1,10 +0,0 @@
-#!build
-default:
-	program
-	:debuglevel=multi
-client.cpp
-	C++
-Task_Client.cpp
-	C++
-cubitC.cpp
-	C++
diff --git a/TAO/tests/Cubit/TAO/MT_Cubit/default.bld b/TAO/tests/Cubit/TAO/MT_Cubit/default.bld
deleted file mode 100644
index e13ed31e337..00000000000
--- a/TAO/tests/Cubit/TAO/MT_Cubit/default.bld
+++ /dev/null
@@ -1,33 +0,0 @@
-#!build
-default:
-	nobuild
-	:c_option=slashcomment
-	:cx_e_option=msgnumbers
-	:object_dir=./.obj
-	:target=vxwppc
-	:cx_silent=21
-	:cx_silent=191
-	:cx_silent=610
-	:sourcedirs=VME_DRV/src
-	:sourcedirs=VME_DRV/api/include
-	:sourcedirs=../../../..
-	:sourcedirs=/home/ace/ACE_wrappers.vxworks
-	:sourcedirs=../../../../tao/compat
-	:sourcedirs=./client
-	:sourcedirs=./server
-	:libdirs=VME_DRV/vmeXportu
-	:libdirs=../../../../tao
-	:libdirs=/home/ace/ACE_wrappers.vxworks/ace
-	:libraries=vmeXport.a
-	:libraries=tao.a
-	:libraries=libACE.a
-	:libraries=/appl/newgreen/vxppc603/ghsbltin.o
-	:libraries=/appl/newgreen/vxppc603/ghsmath.o
-	:defines=DEBUG
-	:defines=FORCE_ARGS
-	:defines=VME_DRIVER
-clnt.bld
-	program
-svr.bld
-	program
-	:defines=USE_ACE_EVENT_HANDLING
diff --git a/TAO/tests/Cubit/TAO/MT_Cubit/svr.bld b/TAO/tests/Cubit/TAO/MT_Cubit/svr.bld
deleted file mode 100644
index 94b68d515c4..00000000000
--- a/TAO/tests/Cubit/TAO/MT_Cubit/svr.bld
+++ /dev/null
@@ -1,12 +0,0 @@
-#!build
-default:
-	program
-	:debuglevel=multi
-cubit_i.cpp
-	C++
-cubitS.cpp
-	C++
-svr.cpp
-	C++
-cubitC.cpp
-	C++
diff --git a/TAO/tests/Cubit/TAO/Makefile b/TAO/tests/Cubit/TAO/Makefile
deleted file mode 100644
index cf63a5b0b4e..00000000000
--- a/TAO/tests/Cubit/TAO/Makefile
+++ /dev/null
@@ -1,28 +0,0 @@
-#----------------------------------------------------------------------------
-#	@(#)Makefile	1.1	10/18/96
-#
-#	Makefile for the TAO tests
-#----------------------------------------------------------------------------
-
-#----------------------------------------------------------------------------
-#	Local macros
-#----------------------------------------------------------------------------
-
-DIRS  = IDL_Cubit \
-	DII_Cubit \
-	MT_Cubit
-
-# These are disabled by default...
-# Orbix \
-# VisiBroker
-
-#----------------------------------------------------------------------------
-#	Include macros and targets
-#----------------------------------------------------------------------------
-
-include	$(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-include	$(ACE_ROOT)/include/makeinclude/macros.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.common.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.nested.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.nolocal.GNU
-
diff --git a/TAO/tests/Cubit/TAO/README b/TAO/tests/Cubit/TAO/README
deleted file mode 100644
index 61da08408de..00000000000
--- a/TAO/tests/Cubit/TAO/README
+++ /dev/null
@@ -1,20 +0,0 @@
-There are three versions of the Cubit example. Individual README files
-in the respective directories explain these versions in further
-detail.
-
-        . IDL_Cubit
-
-                 Cubit example with tao_idl compiler generated stubs
-                 and skeletons
-
-        . MT_Cubit 
-
-		 Multithreaded real-time Cubit example.
-
-        . DII_Cubit
-                
-                 Cubit example with hand-generated stubs.  When
-                 TAO supports the DII interface this will
-                 illustrate how it works.
-
-
diff --git a/TAO/tests/Cubit/VisiBroker/base_server/Makefile b/TAO/tests/Cubit/VisiBroker/base_server/Makefile
deleted file mode 100644
index 9fdad280ffc..00000000000
--- a/TAO/tests/Cubit/VisiBroker/base_server/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-include stdmk
-
-EXE = server 	
-
-all: $(EXE)
-
-clean:
-	-rm -f core *.o cubitC.* cubitS.* $(EXE) 
-	-rm -rf Templates.DB
-
-cubitS.cpp: cubit.idl
-	$(ORBCC) cubit.idl
-
-cubitC.cpp: cubit.idl
-	$(ORBCC) cubit.idl
-
-server: cubitS.o cubitC.o server.o Profile_Timer.o cubit_impl.o
-	$(CC) -o server cubitS.o cubitC.o cubit_impl.o server.o Profile_Timer.o \
-	$(LIBPATH) $(LIBORB) $(STDCC_LIBS)
diff --git a/TAO/tests/Cubit/VisiBroker/base_server/Profile_Timer.cpp b/TAO/tests/Cubit/VisiBroker/base_server/Profile_Timer.cpp
deleted file mode 100644
index a871b9cf179..00000000000
--- a/TAO/tests/Cubit/VisiBroker/base_server/Profile_Timer.cpp
+++ /dev/null
@@ -1,127 +0,0 @@
-#include "Profile_Timer.h"
-
-/* Initialize interval timer. */
-
-Profile_Timer::Profile_Timer (void)
-{
-  char buf[20];
-  ::sprintf(buf, "/proc/%d", ::getpid ());
-
-  ::memset (&this->end_usage_, 0, sizeof this->end_usage_);
-  ::memset (&this->begin_usage_, 0, sizeof this->begin_usage_);
-  ::memset (&this->last_usage_, 0, sizeof this->last_usage_);
-  if ((this->proc_fd_ = ::open (buf, O_RDONLY, 0)) == -1)
-    ::perror (buf);
-}
-
-/* Terminate the interval timer. */
-Profile_Timer::~Profile_Timer (void)
-{
-  if (::close (this->proc_fd_) == -1)
-    ::perror ("Profile_Timer::~Profile_Timer");
-}
-
-/* Return the resource utilization. */
-
-void
-Profile_Timer::get_rusage (prusage_t &rusage)
-{
-  rusage = this->end_usage_;
-}
-
-/* Compute the amount of resource utilization since the start time. */
-
-void
-Profile_Timer::elapsed_rusage (prusage_t &rusage)
-{
-  rusage.pr_lwpid = this->end_usage_.pr_lwpid - this->last_usage_.pr_lwpid;
-  rusage.pr_count = this->end_usage_.pr_count - this->last_usage_.pr_count;
-  rusage.pr_minf  = this->end_usage_.pr_minf - this->last_usage_.pr_minf;
-  rusage.pr_majf  = this->end_usage_.pr_majf - this->last_usage_.pr_majf;
-  rusage.pr_inblk = this->end_usage_.pr_inblk - this->last_usage_.pr_inblk;
-  rusage.pr_oublk = this->end_usage_.pr_oublk - this->last_usage_.pr_oublk;
-  rusage.pr_msnd  = this->end_usage_.pr_msnd - this->last_usage_.pr_msnd;
-  rusage.pr_mrcv  = this->end_usage_.pr_mrcv - this->last_usage_.pr_mrcv;
-  rusage.pr_sigs  = this->end_usage_.pr_sigs - this->last_usage_.pr_sigs;
-  this->subtract (rusage.pr_wtime, this->end_usage_.pr_wtime, this->last_usage_.pr_wtime);
-  this->subtract (rusage.pr_ltime, this->end_usage_.pr_ltime, this->last_usage_.pr_ltime);
-  this->subtract (rusage.pr_slptime, this->end_usage_.pr_slptime, this->last_usage_.pr_slptime);
-  rusage.pr_vctx  = this->end_usage_.pr_vctx - this->last_usage_.pr_vctx;
-  rusage.pr_ictx  = this->end_usage_.pr_ictx - this->last_usage_.pr_ictx;
-  rusage.pr_sysc  = this->end_usage_.pr_sysc - this->last_usage_.pr_sysc;
-  rusage.pr_ioch  = this->end_usage_.pr_ioch - this->last_usage_.pr_ioch;
-}
-
-/* Compute the elapsed time. */
-
-void
-Profile_Timer::compute_times (Elapsed_Time &et, prusage_t &end, prusage_t &begin)
-{
-  timespec_t td;
-
-  this->subtract (td, end.pr_tstamp, begin.pr_tstamp);
-  et.real_time = td.tv_sec + ((double) td.tv_nsec) / (1000 * 1000 * 1000);
-  this->subtract (td, end.pr_utime, begin.pr_utime);
-  et.user_time = td.tv_sec + ((double) td.tv_nsec) / (1000 * 1000 * 1000);
-  this->subtract (td, end.pr_stime,  begin.pr_stime);
-  et.system_time = td.tv_sec + ((double) td.tv_nsec) / (1000 * 1000 * 1000);
-}
-
-/* Compute the amount of time that has elapsed between start and stop. */
-
-int
-Profile_Timer::elapsed_time (Elapsed_Time &et)
-{
-  this->compute_times (et, this->end_usage_, this->begin_usage_);
-  return 0;
-}
-
-/* Determine the difference between T1 and T2. */
-
-void
-Profile_Timer::subtract (timespec_t &tdiff, timespec_t &t1, timespec_t &t0)
-{
-  tdiff.tv_sec  = t1.tv_sec - t0.tv_sec;
-  tdiff.tv_nsec = t1.tv_nsec - t0.tv_nsec;
-
-  /* Normalize the time. */
-
-  while (tdiff.tv_nsec < 0)
-    {
-      tdiff.tv_sec--;
-      tdiff.tv_nsec += (1000 * 1000 * 1000);
-    }
-}
-
-#if defined (DEBUG)
-#include <stdlib.h>
-extern "C" int gettimeofday (timeval *tp);
-
-const int DEFAULT_ITERATIONS = 1000000;
-
-int
-main (int argc, char *argv[])
-{
-  Profile_Timer timer;
-  int           iterations = argc > 1 ? atoi (argv[1]) : DEFAULT_ITERATIONS;
-  timeval	tv;
-
-  timer.start ();
-
-  for (int i = 0; i < iterations; i++)
-    gettimeofday (&tv);
-
-  timer.stop ();
-
-  Profile_Timer::Elapsed_Time et;
-
-  timer.elapsed_time (et);
-
-  printf ("iterations = %d\n", iterations);
-  printf ("real time = %f secs, user time = %f secs, system time = %f secs\n",
-	  et.real_time, et.user_time, et.system_time);
-
-  printf ("time per call = %f usecs\n", (et.real_time / double (iterations)) * 1000000);
-  return 0;
-}
-#endif /* DEBUG */
diff --git a/TAO/tests/Cubit/VisiBroker/base_server/Profile_Timer.h b/TAO/tests/Cubit/VisiBroker/base_server/Profile_Timer.h
deleted file mode 100644
index f001f59be9a..00000000000
--- a/TAO/tests/Cubit/VisiBroker/base_server/Profile_Timer.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/* -*- C++ -*- */
-/* An interval timer class using C++. */
-
-#if !defined (ACE_PROFILE_TIMER_H)
-#define ACE_PROFILE_TIMER_H
-
-#include <sys/types.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <sys/procfs.h>
-#include <stdio.h>
-#include <memory.h>
-
-class Profile_Timer
-{
-public:
-  struct Elapsed_Time
-    {
-      double real_time;
-      double user_time;
-      double system_time;
-    };
-
-  Profile_Timer (void);
-  ~Profile_Timer (void);
-  int  start (void);
-  int  stop (void);
-  int  elapsed_time (Elapsed_Time &et);
-  void elapsed_rusage (prusage_t &rusage);
-  void get_rusage (prusage_t &rusage);
-
-private:
-  void subtract (timespec_t &tdiff, timespec_t &t0, timespec_t &t1);
-  void compute_times (Elapsed_Time &et, prusage_t &, prusage_t &);
-
-  prusage_t begin_usage_;
-  prusage_t end_usage_;
-  prusage_t last_usage_;
-  int	    proc_fd_;
-};
-
-/* Start timing */
-
-inline int 
-Profile_Timer::start (void) 
-{
-  return ::ioctl (this->proc_fd_, PIOCUSAGE, &this->begin_usage_);
-}
-
-/* Stop timing */
-
-inline int 
-Profile_Timer::stop (void) 
-{
-  this->last_usage_ = this->end_usage_;
-  return ::ioctl (this->proc_fd_, PIOCUSAGE, &this->end_usage_);
-}
-
-#endif /* ACE_PROFILE_TIMER_H */
-
diff --git a/TAO/tests/Cubit/VisiBroker/base_server/cubit.idl b/TAO/tests/Cubit/VisiBroker/base_server/cubit.idl
deleted file mode 100644
index 3e2ea392619..00000000000
--- a/TAO/tests/Cubit/VisiBroker/base_server/cubit.idl
+++ /dev/null
@@ -1,40 +0,0 @@
-// @(#)cubit.idl	1.1 95/09/10
-// Copyright 1994-1995 by Sun Microsystems, Inc.
-//
-//#pragma prefix	"Eng.SUN.COM"
-//#pragma version Cubit 1.1
-
-interface Cubit {
-    octet	cube_octet (in octet o);
-    short	cube_short (in short s);
-    long	cube_long (in long l);
-
-    struct Many {
-	octet	o;		// + 3 bytes padding (normally) ...
-	long	l;
-	short	s;		// + 2 bytes padding (normally) ...
-    };
-
-    Many	cube_struct (in Many values);
-
-    enum discrim {e_0th, e_1st, e_2nd, e_3rd, e_4th, e_5th};
-
-    union oneof
-    switch (discrim) {
-	// this is an easy union to interpret; no padding
-	// is needed between discriminant and value.
-      case e_0th:
-        octet		o;
-      case e_1st:
-        short		s;
-      case e_2nd:
-        long		l;
-      case e_3rd:
-      default:
-        Many		cm;
-    };
-
-    oneof	cube_union (in oneof values);
-
-    oneway void	please_exit ();
-};
diff --git a/TAO/tests/Cubit/VisiBroker/base_server/cubit_impl.cpp b/TAO/tests/Cubit/VisiBroker/base_server/cubit_impl.cpp
deleted file mode 100644
index 63c0bb3105f..00000000000
--- a/TAO/tests/Cubit/VisiBroker/base_server/cubit_impl.cpp
+++ /dev/null
@@ -1,46 +0,0 @@
-#include "cubit_impl.h"
-
-CORBA::Octet Cubit_Impl:: cube_octet (CORBA::Octet o) {
-  return (CORBA::Octet) (o * o * o); 
-}
-
-CORBA::Short Cubit_Impl:: cube_short (CORBA::Short s) {
-  return (CORBA::Short) (s * s * s);
-}
-
-CORBA::Long Cubit_Impl:: cube_long (CORBA::Long l) {
-   return (CORBA::Long) (l * l * l);
-}
-
-Cubit::Many Cubit_Impl:: cube_struct (const Cubit::Many& values) {
-  Cubit::Many out_values;
-  out_values.o = values.o * values.o * values.o;
-  out_values.s = values.s * values.s * values.s;
-  out_values.l = values.l * values.l * values.l;
-  return out_values; 
-}
-
-Cubit::oneof Cubit_Impl:: cube_union (const Cubit::oneof& values) {
-  Cubit::oneof out_values;
-   switch (values._d ()) {
-   case Cubit::e_0th:
-     out_values.o (values.o () * values.o ()  * values.o ());
-     break;
-   case Cubit::e_1st:
-     out_values.s (values.s () * values.s () * values.s ());
-     break;
-   case Cubit::e_2nd:
-     out_values.l (values.l () * values.l () * values.l ());
-     break;
-   case Cubit::e_3rd:
-   default:
-     out_values.cm ().o = values.cm ().o * values.cm ().o * values.cm ().o ;
-     out_values.cm ().s = values.cm ().s * values.cm ().s * values.cm ().s ;
-     out_values.cm ().l = values.cm ().l * values.cm ().l * values.cm ().l ;
-     break;
-   }
-   return out_values;  
-}
-
-void Cubit_Impl:: please_exit () 
-  {}
diff --git a/TAO/tests/Cubit/VisiBroker/base_server/cubit_impl.h b/TAO/tests/Cubit/VisiBroker/base_server/cubit_impl.h
deleted file mode 100644
index 0f6fd7dd6db..00000000000
--- a/TAO/tests/Cubit/VisiBroker/base_server/cubit_impl.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-#ifndef cubit_ih
-#define cubit_ih
-
-#include "cubitS.h"
-
-
-#ifdef Cubit_USE_BOA
-class Cubit_Impl : public virtual _sk_Cubit {
-#else
-class Cubit_Impl {
-#endif /* Cubit_USE_BOA */
-
-public:
-
-#ifdef Cubit_USE_BOA
-  Cubit_Impl (const char *obj_name = NULL) :
-             _sk_Cubit(obj_name)
-    {}
-#else
-  Cubit_Impl (const char *obj_name = NULL)
-    {}
-#endif /* Cubit_USE_BOA */
-
-   virtual CORBA::Octet cube_octet(CORBA::Octet o);
-   virtual CORBA::Short cube_short(CORBA::Short s);
-   virtual CORBA::Long cube_long(CORBA::Long l);
-   virtual Cubit::Many cube_struct(const Cubit::Many& values);
-   virtual Cubit::oneof cube_union(const Cubit::oneof& values);
-   virtual void please_exit();
-};
-
-#endif
diff --git a/TAO/tests/Cubit/VisiBroker/base_server/server.cpp b/TAO/tests/Cubit/VisiBroker/base_server/server.cpp
deleted file mode 100644
index ed74dbf458a..00000000000
--- a/TAO/tests/Cubit/VisiBroker/base_server/server.cpp
+++ /dev/null
@@ -1,49 +0,0 @@
-// **************************************************************************
-//
-// NAME :   tpr_server.cpp 
-// DESCRIPTION:  
-//
-// Server mainline
-//
-// ****************************************************************************
-#include "cubit_impl.h"		// server header file
-
-int 
-main (int argc, char** argv)
-{
-
-  CORBA::ORB_var orb = CORBA::ORB_init(argc, argv);
-  CORBA::BOA_var boa = orb->BOA_init(argc, argv);
-
-#ifdef Cubit_USE_BOA
-  Cubit_Impl cb("Cubit");
-  cout << "Using BOA approach" << endl;
-#else
-  Cubit_Impl tied("Cubit");
-  _tie_Cubit<Cubit_Impl> cb(tied, "Cubit");
-
-  cout << "Using TIE approach" << endl;
-#endif /* Cubit_USE_BOA */
-  
-  //
-  // Go get some work to do....
-  //
-  try {
-
-    boa->obj_is_ready(&cb);
-
-    boa->impl_is_ready();
-
-  } catch (const CORBA::Exception &excep) {
-    cerr << "Server error: " << excep << endl;
-    return -1;
-  } catch (...) {
-    cerr << "Unknown exception" << endl;
-    return -1;
-  }
-
-  cout << "Cubit server is exiting." << endl;
-
-
-  return 0;
-}
diff --git a/TAO/tests/Cubit/VisiBroker/base_server/stdmk b/TAO/tests/Cubit/VisiBroker/base_server/stdmk
deleted file mode 100644
index df4125a38d8..00000000000
--- a/TAO/tests/Cubit/VisiBroker/base_server/stdmk
+++ /dev/null
@@ -1,36 +0,0 @@
-CC = CC
-DEBUG = 
-
-ORBELINEDIR = /project/waltz/Orbeline2.0
-
-ORBCC = $(ORBELINEDIR)/bin/orbeline -v C -m S -c cpp -h h
-
-CCINCLUDES = -I. -I$(ORBELINEDIR)/include -I$(STL_DIR) -I$(ACE_DIR)
-
-CCFLAGS = -g $(CCINCLUDES) $(DEBUG) -DCubit_USE_BOA
-
-LIBPATH = -L$(ORBELINEDIR)/lib -L$(ACE_DIR)/ace
-
-STDCC_LIBS = -lsocket -lnsl -ldl -mt 
-
-LIBORB = -lorb
-
-LIBACE = -lACE
-
-.SUFFIXES: .C .o .h .hh .cc .cpp
-
-.C.o:
-	$(CC) $(CCFLAGS) -c -o $@ $<
- 
-.cc.o:
-	$(CC) $(CCFLAGS) -c -o $@ $<
-.cpp.o:
-	$(CC) $(CCFLAGS) -c -o $@ $<
- 
-.C.cpp:
-	$(CC) -E $(CCFLAGS) $< > $@
- 
-.cc.cpp:
-	$(CC) -E $(CCFLAGS) $< > $@
-
-
diff --git a/TAO/tests/Cubit/VisiBroker/client/Makefile b/TAO/tests/Cubit/VisiBroker/client/Makefile
deleted file mode 100644
index d9c26fe56f0..00000000000
--- a/TAO/tests/Cubit/VisiBroker/client/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-include stdmk
-
-EXE = client 	
-
-all: $(EXE)
-
-clean:
-	-rm -f core *.o cubitC.* cubitS.* $(EXE) 
-	-rm -rf Templates.DB
-
-cubitS.cpp: cubit.idl
-	$(ORBCC) cubit.idl
-
-cubitC.cpp: cubit.idl
-	$(ORBCC) cubit.idl
-
-client: cubitC.o Profile_Timer.o client.o
-	$(CC) -o client cubitC.o Profile_Timer.o client.o \
-	$(LIBPATH) $(LIBORB) $(STDCC_LIBS)
diff --git a/TAO/tests/Cubit/VisiBroker/client/Profile_Timer.cpp b/TAO/tests/Cubit/VisiBroker/client/Profile_Timer.cpp
deleted file mode 100644
index a871b9cf179..00000000000
--- a/TAO/tests/Cubit/VisiBroker/client/Profile_Timer.cpp
+++ /dev/null
@@ -1,127 +0,0 @@
-#include "Profile_Timer.h"
-
-/* Initialize interval timer. */
-
-Profile_Timer::Profile_Timer (void)
-{
-  char buf[20];
-  ::sprintf(buf, "/proc/%d", ::getpid ());
-
-  ::memset (&this->end_usage_, 0, sizeof this->end_usage_);
-  ::memset (&this->begin_usage_, 0, sizeof this->begin_usage_);
-  ::memset (&this->last_usage_, 0, sizeof this->last_usage_);
-  if ((this->proc_fd_ = ::open (buf, O_RDONLY, 0)) == -1)
-    ::perror (buf);
-}
-
-/* Terminate the interval timer. */
-Profile_Timer::~Profile_Timer (void)
-{
-  if (::close (this->proc_fd_) == -1)
-    ::perror ("Profile_Timer::~Profile_Timer");
-}
-
-/* Return the resource utilization. */
-
-void
-Profile_Timer::get_rusage (prusage_t &rusage)
-{
-  rusage = this->end_usage_;
-}
-
-/* Compute the amount of resource utilization since the start time. */
-
-void
-Profile_Timer::elapsed_rusage (prusage_t &rusage)
-{
-  rusage.pr_lwpid = this->end_usage_.pr_lwpid - this->last_usage_.pr_lwpid;
-  rusage.pr_count = this->end_usage_.pr_count - this->last_usage_.pr_count;
-  rusage.pr_minf  = this->end_usage_.pr_minf - this->last_usage_.pr_minf;
-  rusage.pr_majf  = this->end_usage_.pr_majf - this->last_usage_.pr_majf;
-  rusage.pr_inblk = this->end_usage_.pr_inblk - this->last_usage_.pr_inblk;
-  rusage.pr_oublk = this->end_usage_.pr_oublk - this->last_usage_.pr_oublk;
-  rusage.pr_msnd  = this->end_usage_.pr_msnd - this->last_usage_.pr_msnd;
-  rusage.pr_mrcv  = this->end_usage_.pr_mrcv - this->last_usage_.pr_mrcv;
-  rusage.pr_sigs  = this->end_usage_.pr_sigs - this->last_usage_.pr_sigs;
-  this->subtract (rusage.pr_wtime, this->end_usage_.pr_wtime, this->last_usage_.pr_wtime);
-  this->subtract (rusage.pr_ltime, this->end_usage_.pr_ltime, this->last_usage_.pr_ltime);
-  this->subtract (rusage.pr_slptime, this->end_usage_.pr_slptime, this->last_usage_.pr_slptime);
-  rusage.pr_vctx  = this->end_usage_.pr_vctx - this->last_usage_.pr_vctx;
-  rusage.pr_ictx  = this->end_usage_.pr_ictx - this->last_usage_.pr_ictx;
-  rusage.pr_sysc  = this->end_usage_.pr_sysc - this->last_usage_.pr_sysc;
-  rusage.pr_ioch  = this->end_usage_.pr_ioch - this->last_usage_.pr_ioch;
-}
-
-/* Compute the elapsed time. */
-
-void
-Profile_Timer::compute_times (Elapsed_Time &et, prusage_t &end, prusage_t &begin)
-{
-  timespec_t td;
-
-  this->subtract (td, end.pr_tstamp, begin.pr_tstamp);
-  et.real_time = td.tv_sec + ((double) td.tv_nsec) / (1000 * 1000 * 1000);
-  this->subtract (td, end.pr_utime, begin.pr_utime);
-  et.user_time = td.tv_sec + ((double) td.tv_nsec) / (1000 * 1000 * 1000);
-  this->subtract (td, end.pr_stime,  begin.pr_stime);
-  et.system_time = td.tv_sec + ((double) td.tv_nsec) / (1000 * 1000 * 1000);
-}
-
-/* Compute the amount of time that has elapsed between start and stop. */
-
-int
-Profile_Timer::elapsed_time (Elapsed_Time &et)
-{
-  this->compute_times (et, this->end_usage_, this->begin_usage_);
-  return 0;
-}
-
-/* Determine the difference between T1 and T2. */
-
-void
-Profile_Timer::subtract (timespec_t &tdiff, timespec_t &t1, timespec_t &t0)
-{
-  tdiff.tv_sec  = t1.tv_sec - t0.tv_sec;
-  tdiff.tv_nsec = t1.tv_nsec - t0.tv_nsec;
-
-  /* Normalize the time. */
-
-  while (tdiff.tv_nsec < 0)
-    {
-      tdiff.tv_sec--;
-      tdiff.tv_nsec += (1000 * 1000 * 1000);
-    }
-}
-
-#if defined (DEBUG)
-#include <stdlib.h>
-extern "C" int gettimeofday (timeval *tp);
-
-const int DEFAULT_ITERATIONS = 1000000;
-
-int
-main (int argc, char *argv[])
-{
-  Profile_Timer timer;
-  int           iterations = argc > 1 ? atoi (argv[1]) : DEFAULT_ITERATIONS;
-  timeval	tv;
-
-  timer.start ();
-
-  for (int i = 0; i < iterations; i++)
-    gettimeofday (&tv);
-
-  timer.stop ();
-
-  Profile_Timer::Elapsed_Time et;
-
-  timer.elapsed_time (et);
-
-  printf ("iterations = %d\n", iterations);
-  printf ("real time = %f secs, user time = %f secs, system time = %f secs\n",
-	  et.real_time, et.user_time, et.system_time);
-
-  printf ("time per call = %f usecs\n", (et.real_time / double (iterations)) * 1000000);
-  return 0;
-}
-#endif /* DEBUG */
diff --git a/TAO/tests/Cubit/VisiBroker/client/Profile_Timer.h b/TAO/tests/Cubit/VisiBroker/client/Profile_Timer.h
deleted file mode 100644
index f001f59be9a..00000000000
--- a/TAO/tests/Cubit/VisiBroker/client/Profile_Timer.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/* -*- C++ -*- */
-/* An interval timer class using C++. */
-
-#if !defined (ACE_PROFILE_TIMER_H)
-#define ACE_PROFILE_TIMER_H
-
-#include <sys/types.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <sys/procfs.h>
-#include <stdio.h>
-#include <memory.h>
-
-class Profile_Timer
-{
-public:
-  struct Elapsed_Time
-    {
-      double real_time;
-      double user_time;
-      double system_time;
-    };
-
-  Profile_Timer (void);
-  ~Profile_Timer (void);
-  int  start (void);
-  int  stop (void);
-  int  elapsed_time (Elapsed_Time &et);
-  void elapsed_rusage (prusage_t &rusage);
-  void get_rusage (prusage_t &rusage);
-
-private:
-  void subtract (timespec_t &tdiff, timespec_t &t0, timespec_t &t1);
-  void compute_times (Elapsed_Time &et, prusage_t &, prusage_t &);
-
-  prusage_t begin_usage_;
-  prusage_t end_usage_;
-  prusage_t last_usage_;
-  int	    proc_fd_;
-};
-
-/* Start timing */
-
-inline int 
-Profile_Timer::start (void) 
-{
-  return ::ioctl (this->proc_fd_, PIOCUSAGE, &this->begin_usage_);
-}
-
-/* Stop timing */
-
-inline int 
-Profile_Timer::stop (void) 
-{
-  this->last_usage_ = this->end_usage_;
-  return ::ioctl (this->proc_fd_, PIOCUSAGE, &this->end_usage_);
-}
-
-#endif /* ACE_PROFILE_TIMER_H */
-
diff --git a/TAO/tests/Cubit/VisiBroker/client/client.cpp b/TAO/tests/Cubit/VisiBroker/client/client.cpp
deleted file mode 100644
index ccfa9b15696..00000000000
--- a/TAO/tests/Cubit/VisiBroker/client/client.cpp
+++ /dev/null
@@ -1,316 +0,0 @@
-//**************************************************************************
-//
-// NAME :   client.C 
-// DESCRIPTION:  
-//
-// Client for the Cubit example
-//
-//****************************************************************************
-
-#include <iostream.h>
-#include <stdio.h>
-#include <string.h>
-#include <time.h>
-#include <stdlib.h>
-#include "cubitC.h"
-#include "Profile_Timer.h"
-
-int LOOP_COUNT;
-char SERVER_HOST [1024];
-
-inline int func (unsigned i) { return i - 117; }
-void run_tests (Cubit_var, int);
-
-// = TITLE
-//     Parses the command line arguments and returns an error status
-//
-// = DESCRIPTION
-//     This method parses the command line arguments
-int parse_args(int argc, char *argv[])
-{
-  if (argc != 3) {
-    cerr << "Format: client <machine name> <loop count>" << endl;
-    return -1;
-  }
-
-  strcpy(SERVER_HOST, argv[1]);
-
-  LOOP_COUNT = atoi(argv[2]);
-  
-  return 0;  // Indicates successful parsing of command line
-}
-
-
-//
-// Mainline
-//
-int
-main (int argc, char *argv[])
-{
-  if (parse_args (argc, argv) != 0)
-    return -1;
-
-  Cubit_var cb;
-  // cout << "attempting to contact server at host " << SERVER_HOST << '\n' ;
- 
-  //
-  // Initialise client's binding to an
-  // arbitrary cubit server (at some host)
-  // 
-  try {
-    cb = Cubit::_bind ("Cubit", SERVER_HOST);
-
-  } catch (const CORBA::Exception & sysEx) {
-    cerr << "Binding failed: " << endl;
-    cerr << sysEx;
-  } catch (...) {
-    cerr << "Unexpected exception" << endl;
-  }       
-  
-  run_tests (cb, LOOP_COUNT);
-  return 0;
-}
-
-
-void
-run_tests (Cubit_var cb, int loop_count) 
-{
-  //
-  // Make the calls in a loop.
-  //
-  unsigned i;
-  unsigned call_count, error_count;
-
-  Profile_Timer pt;
-  Elapsed_Time et;
-
-  //
-  // Cube an octet.
-  //
-  
-  call_count = 0;
-  error_count = 0;
-  pt.start();
-
-  for (i = 0; i < loop_count; i++)
-    {
-
-      call_count++;
-
-      CORBA::Octet arg_octet = func (i), ret_octet;
-
-      try {
-	ret_octet = cb->cube_octet (arg_octet);
-      
-      } catch (const CORBA::Exception &sysEx) {
-	cerr << "Call failed: " << endl;
-	cerr << sysEx;
-	error_count++;
-      } catch (...) {
-	cerr << "Unexpected exception" << endl;
-	error_count++;
-      }       
-
-      arg_octet = arg_octet * arg_octet * arg_octet;
-      if (arg_octet != ret_octet) {
-        printf ("** cube_octet(%d)  (--> %d)\n", arg_octet , ret_octet);
-        error_count++;
-      }
-    }
-    
-  pt.stop();
-  pt.elapsed_time(et);
-  
-  if (call_count > 0) 
-    {
-      if (error_count == 0)
-        {
-          unsigned long	us = et.real_time * 1000 * 1000;
-          
-          us /= call_count;
-          
-          if (us > 0)
-            printf ("cube octet average call ACE_OS::time\t= %ld.%.03ldms, \t"
-                    "%ld calls/second\n",
-                    us / 1000, us % 1000,
-                    1000000L / us);
-        }
-      
-      printf ("%d calls, %d errors\n", call_count, error_count);
-    }
-    
-  
-  //
-  // Cube a short.
-  //
-  call_count = 0;
-  error_count = 0;
-  pt.start();
-
-  for (i = 0; i < loop_count; i++)
-    {
-
-      call_count++;
-
-      CORBA::Short arg_short = func (i), ret_short;
-
-      try {
-	ret_short = cb->cube_short (arg_short);
-       
-      } catch (const CORBA::Exception &sysEx) {
-	cerr << "Call failed: " << endl;
-	cerr << sysEx;
-	error_count++;
-      } catch (...) {
-	cerr << "Unexpected exception" << endl;
-	error_count++;
-      }       
-
-      arg_short = arg_short * arg_short * arg_short;
-      if (arg_short != ret_short) {
-        printf ("** cube_short(%d)  (--> %d)\n", arg_short , ret_short);
-        error_count++;
-      }
-    }
-    
-  pt.stop();
-  pt.elapsed_time(et);
-  
-  if (call_count > 0) 
-    {
-      if (error_count == 0)
-        {
-          unsigned long	us = et.real_time * 1000 * 1000;
-          
-          us /= call_count;
-          
-          if (us > 0)
-            printf ("cube short average call ACE_OS::time\t= %ld.%.03ldms, \t"
-                    "%ld calls/second\n",
-                    us / 1000, us % 1000,
-                    1000000L / us);
-        }
-      
-      printf ("%d calls, %d errors\n", call_count, error_count);
-    }
-
-  //
-  // Cube a long.
-  //
-  
-  call_count = 0;
-  error_count = 0;
-  pt.start();
-
-  for (i = 0; i < loop_count; i++)
-    {
-
-      call_count++;
-
-      CORBA::Long arg_long = func (i), ret_long;
-
-      try {
-	ret_long = cb->cube_long (arg_long);
-      } catch (const CORBA::Exception &sysEx) {
-	cerr << "Call failed: " << endl;
-	cerr << sysEx;
-	error_count++;
-      } catch (...) {
-	cerr << "Unexpected exception" << endl;
-	error_count++;
-      }       
-
-      arg_long = arg_long * arg_long * arg_long;
-      if (arg_long != ret_long) {
-        printf ("** cube_long(%d)  (--> %d)\n", arg_long , ret_long);
-        error_count++;
-      }
-    }
-    
-  pt.stop();
-  pt.elapsed_time(et);
-  
-  if (call_count > 0) 
-    {
-      if (error_count == 0)
-        {
-          unsigned long	us = et.real_time * 1000 * 1000;
-          
-          us /= call_count;
-          
-          if (us > 0)
-            printf ("cube long average call ACE_OS::time\t= %ld.%.03ldms, \t"
-                    "%ld calls/second\n",
-                    us / 1000, us % 1000,
-                    1000000L / us);
-        }
-      
-      printf ("%d calls, %d errors\n", call_count, error_count);
-    }
-
-
-  //
-  // Cube a "struct" ...
-  //
-  Cubit::Many	arg_struct, ret_struct;
-      
-  call_count = 0;
-  error_count = 0;
-  pt.start();
-
-  for (i = 0; i < loop_count; i++)
-    {
-
-      call_count++;
-       
-      arg_struct.l = func (i);
-      arg_struct.s = func (i);
-      arg_struct.o = func (i);
-       
-      try {
-        ret_struct = cb->cube_struct (arg_struct);
-
-      } catch (const CORBA::Exception &sysEx) {
-        cerr << "Call failed: " << endl;
-        cerr << sysEx;
-        error_count++;
-      } catch (...) {
-        cerr << "Unexpected exception" << endl;
-        error_count++;
-      }       
-
-
-      arg_struct.l = arg_struct.l  * arg_struct.l  * arg_struct.l ;
-      arg_struct.s = arg_struct.s  * arg_struct.s  * arg_struct.s ;
-      arg_struct.o = arg_struct.o  * arg_struct.o  * arg_struct.o ;
-       
-      if (arg_struct.l  != ret_struct.l 
-          || arg_struct.s  != ret_struct.s 
-          || arg_struct.o  != ret_struct.o )
-        {
-          cerr << "** cube_struct ERROR\n";
-          error_count++;
-        }
-    }
-    
-  pt.stop();
-  pt.elapsed_time(et);
-  
-  if (call_count > 0) 
-    {
-      if (error_count == 0)
-        {
-          unsigned long	us = et.real_time * 1000 * 1000;
-          
-          us /= call_count;
-          
-          if (us > 0)
-            printf ("cube struuct average call ACE_OS::time\t= %ld.%.03ldms, \t"
-                    "%ld calls/second\n",
-                    us / 1000, us % 1000,
-                    1000000L / us);
-        }
-      
-      printf ("%d calls, %d errors\n", call_count, error_count);
-    }
-}
diff --git a/TAO/tests/Cubit/VisiBroker/client/cubit.idl b/TAO/tests/Cubit/VisiBroker/client/cubit.idl
deleted file mode 100644
index 3e2ea392619..00000000000
--- a/TAO/tests/Cubit/VisiBroker/client/cubit.idl
+++ /dev/null
@@ -1,40 +0,0 @@
-// @(#)cubit.idl	1.1 95/09/10
-// Copyright 1994-1995 by Sun Microsystems, Inc.
-//
-//#pragma prefix	"Eng.SUN.COM"
-//#pragma version Cubit 1.1
-
-interface Cubit {
-    octet	cube_octet (in octet o);
-    short	cube_short (in short s);
-    long	cube_long (in long l);
-
-    struct Many {
-	octet	o;		// + 3 bytes padding (normally) ...
-	long	l;
-	short	s;		// + 2 bytes padding (normally) ...
-    };
-
-    Many	cube_struct (in Many values);
-
-    enum discrim {e_0th, e_1st, e_2nd, e_3rd, e_4th, e_5th};
-
-    union oneof
-    switch (discrim) {
-	// this is an easy union to interpret; no padding
-	// is needed between discriminant and value.
-      case e_0th:
-        octet		o;
-      case e_1st:
-        short		s;
-      case e_2nd:
-        long		l;
-      case e_3rd:
-      default:
-        Many		cm;
-    };
-
-    oneof	cube_union (in oneof values);
-
-    oneway void	please_exit ();
-};
diff --git a/TAO/tests/Cubit/VisiBroker/client/stdmk b/TAO/tests/Cubit/VisiBroker/client/stdmk
deleted file mode 100644
index df4125a38d8..00000000000
--- a/TAO/tests/Cubit/VisiBroker/client/stdmk
+++ /dev/null
@@ -1,36 +0,0 @@
-CC = CC
-DEBUG = 
-
-ORBELINEDIR = /project/waltz/Orbeline2.0
-
-ORBCC = $(ORBELINEDIR)/bin/orbeline -v C -m S -c cpp -h h
-
-CCINCLUDES = -I. -I$(ORBELINEDIR)/include -I$(STL_DIR) -I$(ACE_DIR)
-
-CCFLAGS = -g $(CCINCLUDES) $(DEBUG) -DCubit_USE_BOA
-
-LIBPATH = -L$(ORBELINEDIR)/lib -L$(ACE_DIR)/ace
-
-STDCC_LIBS = -lsocket -lnsl -ldl -mt 
-
-LIBORB = -lorb
-
-LIBACE = -lACE
-
-.SUFFIXES: .C .o .h .hh .cc .cpp
-
-.C.o:
-	$(CC) $(CCFLAGS) -c -o $@ $<
- 
-.cc.o:
-	$(CC) $(CCFLAGS) -c -o $@ $<
-.cpp.o:
-	$(CC) $(CCFLAGS) -c -o $@ $<
- 
-.C.cpp:
-	$(CC) -E $(CCFLAGS) $< > $@
- 
-.cc.cpp:
-	$(CC) -E $(CCFLAGS) $< > $@
-
-
diff --git a/TAO/tests/Cubit/results/Orbix b/TAO/tests/Cubit/results/Orbix
deleted file mode 100644
index c3abce78d3f..00000000000
--- a/TAO/tests/Cubit/results/Orbix
+++ /dev/null
@@ -1,133 +0,0 @@
-Cubit results over Ethernet with 20,000 calls
----------------------------------------------
-
-                               Clients  Latency (ms)            Calls/Sec
-
-MT-Orbix without filters       1        1.876                   533
-                               2        2.202                   454
-                               3        2.740                   364 
-
-MT-Orbix Thread-Per-Request    1        1.886                   530
-                               2        3.1                     322
-                               3        5.0                     200
-
-MT-Orbix Thread-Pool (25)      1        1.875                   533
-                               2        3.1                     322
-                               3        5.1                     196
-
-MT-Orbix Thread-Per-Session    1        2.002                   499
-                               2        3.306                   302
-                               3        5.15                    194
-        
-
-Cubit results over ATM with 20,000 calls
-----------------------------------------
-
-                               Clients  Latency (ms)            Calls/Sec
-
-MT-Orbix without filters       1        1.818                   550
-                               2        1.968                   508
-                               3        2.803                   356
-
-
-MT-Orbix Thread-Per-Request    1        1.846                   541
-                               2        3.1                     322
-                               3        4.98                    200
-
-MT-Orbix Thread-Pool (25)      1        1.913                   522
-                               2        3.18                    314
-                               3        5.1                     196
-
-MT-Orbix Thread-Per-Session    1        1.959                   510
-                               2        3.29                    303
-                               3        5.15                    194
-
-
-Prime_Factor results over ATM with 20,000 calls
------------------------------------------------
-
-                               Clients  Latency (ms)            Calls/Sec
-
-MT-Orbix without filters       1         7.918                  126
-                               2        14.300                   70                    
-                               3        21.000                   47
-
-
-MT-Orbix Thread-Per-Request    1         8.302                  120
-                               2        10.128                   98
-                               3        13.722                   72
-
-MT-Orbix Thread-Pool (25)      1         8.442                  118
-                               2        15.764                   63  
-                               3        22.595                   44
-
-MT-Orbix Thread-Per-Session    1         8.956                  111
-                               2         9.581                  104
-                               3        16.702                   59
-
-IO-intensive results over ATM with 20,000 calls
------------------------------------------------
-
-                               Clients  Latency (ms)            Calls/Sec
-
-MT-Orbix without filters       1        6.667                   149
-                               2       12.165                    82                    
-                               3       18.634                    54
-                                       
-                                       
-MT-Orbix Thread-Per-Request    1       6.812                    146
-                               2       6.937                    144
-                               3       7.706                    128
-                                       
-MT-Orbix Thread-Pool (25)      1       6.813                    146
-                               2       6.954                    144
-                               3       7.776                    128
-                                       
-MT-Orbix Thread-Per-Session    1       6.85                     145
-                               2       7.253                    137
-                               3       7.645                    130
-
-      TNF client-side profile for MT-Orbix without filters for 20000 calls
-
-Function name         %      self+desc.          mean     max      min     std.
-                     time       ms       calls  ms/call ms/call  ms/call   err
-________________________________________________________________________________
-cond_wait            6.23     4250.242   1824    2.330  106.171    1.205   0.091
-mutex_lock           0.23      159.830  56662    0.003    1.215    0.002   0.000
-mutex_unlock         0.22      146.756  56663    0.003    0.326    0.002   0.000
-cond_signal          0.09       61.030   1825    0.033    0.475    0.009   0.000
-rw_rdlock            0.01        7.179   1826    0.004    0.014    0.003   0.000
-rw_unlock            0.01        6.548   1827    0.004    0.014    0.003   0.000
-rw_wrlock            0.00        0.004      1    0.004    0.004    0.004   0.000
-
-       TNF server-side profile for MT-Orbix without filters for 20000 calls
-
-
-Function name         %      self+desc.          mean     max      min     std.
-                     time       ms       calls  ms/call ms/call  ms/call   err
-________________________________________________________________________________
-cond_timedwait       1.25      923.527    797    1.159   20.219    0.324   0.028
-mutex_lock           0.21      153.839  56435    0.003    4.342    0.002   0.000
-mutex_unlock         0.20      149.208  56433    0.003    3.559    0.002   0.000
-cond_signal          0.03       21.506    809    0.027    1.826    0.003   0.002
-rw_unlock            0.02       16.058   3224    0.005    2.915    0.003   0.001
-rw_rdlock            0.02       11.924   3221    0.004    0.087    0.003   0.000
-rw_wrlock            0.00        0.010      2    0.005    0.005    0.004   0.000
-
-       TNF server-side profile for MT-Orbix with thread-per-request for 20000 calls
-
-
-Function name         %      self+desc.          mean     max      min     std.
-                     time       ms       calls  ms/call ms/call  ms/call   err
-________________________________________________________________________________
-mutex_lock           0.55      797.890  57618    0.014    4.624    0.002   0.000
-cond_timedwait       0.52      748.560    478    1.566    3.918    0.222   0.019
-mutex_unlock         0.36      514.627  57616    0.009    3.975    0.002   0.000
-cond_signal          0.02       24.216   1151    0.021    1.161    0.002   0.001
-rw_rdlock            0.01       13.120   2301    0.006    1.180    0.003   0.001
-rw_unlock            0.01       10.575   2307    0.005    0.316    0.003   0.000
-thr_sigsetmask       0.00        1.949     30    0.065    1.064    0.013   0.035
-rw_wrlock            0.00        0.033      6    0.006    0.008    0.004   0.001
-
-
-
diff --git a/TAO/tests/Cubit/results/TAO b/TAO/tests/Cubit/results/TAO
deleted file mode 100644
index de4a7bf23ae..00000000000
--- a/TAO/tests/Cubit/results/TAO
+++ /dev/null
@@ -1,92 +0,0 @@
-Cubit results over Ethernet with 20,000 calls
----------------------------------------------
-
-                                Clients         Latency (ms)      Calls/Sec
-                
-TAO reactive                    1               1.172             853
-                                2               1.342             745
-                                3               1.902             525
-
-TAO threaded version            1               1.174             851
-                                2               1.219             820
-                                3               1.600             625
-
-
-Cubit results over ATM with 20,000 calls
----------------------------------------------
-
-                                Clients         Latency (ms)      Calls/Sec
-
-TAO reactive                    1               1.161             861
-                                2               1.302             768
-                                3               1.732             577
-
-TAO threaded version            1               1.170             854
-                                2               1.3               769
-                                3               1.600             625
-
-
-Cubit results over ATM after optimizations with 20,000 calls
-------------------------------------------------------------
-
-                                Clients         Latency (ms)      Calls/Sec
-
-TAO reactive                    1               1.127             887
-                                2               1.238             807
-                                3               1.501             666
-
-TAO threaded version            1               1.057             946
-                                2               1.225             816
-                                3               1.471             679
-
-Prime_Factor results over ATM  with 20,000 calls
--------------------------------------------------
-
-                                Clients         Latency (ms)      Calls/Sec
-
-TAO reactive                    1               7.407             135
-                                2              13.7                73
-                                3              19.7                51    
-
-TAO threaded version            1               7.389             135
-                                2               8.080             124
-                                3              10.726              93
-
-IO-bound results over ATM  with 20,000 calls
---------------------------------------------
-
-                                Clients         Latency (ms)      Calls/Sec
-
-TAO reactive                    1               6.404             156
-                                2              11.909              83
-                                3              17.324              57
-                                               
-TAO threaded version            1               6.378             156
-                                2               6.449             155
-                                3               6.500             153
-
-
-
-
-                        Sample client-side profile for TAO for 20000 calls
-
-Function name         %      self+desc.          mean     max      min     std.
-                     time       ms       calls  ms/call ms/call  ms/call   err
-________________________________________________________________________________
-rw_rdlock            0.40      146.579  20006    0.007    1.200    0.005   0.000
-rw_unlock            0.25       91.386  20009    0.005    0.058    0.004   0.000
-mutex_lock           0.06       21.087   5265    0.004    0.178    0.002   0.000
-mutex_unlock         0.04       14.372   5271    0.003    0.075    0.002   0.000
-rw_wrlock            0.00        0.045      3    0.015    0.034    0.005   0.008
-
-
-                       Sample server-side profile for TAO for 20000 calls
-
-Function name         %      self+desc.          mean     max      min     std.
-                     time       ms       calls  ms/call ms/call  ms/call   err
-________________________________________________________________________________
-mutex_lock           1.12      154.491  54507    0.003    0.140    0.002   0.000
-mutex_unlock         1.06      145.638  54508    0.003    0.310    0.002   0.000
-rw_rdlock            0.27       37.265   6813    0.005    0.037    0.004   0.000
-rw_unlock            0.20       27.792   6813    0.004    0.045    0.004   0.000
-
diff --git a/TAO/tests/Cubit/results/Visibroker b/TAO/tests/Cubit/results/Visibroker
deleted file mode 100644
index 8d6bb2457c7..00000000000
--- a/TAO/tests/Cubit/results/Visibroker
+++ /dev/null
@@ -1,79 +0,0 @@
-Cubit results over Ethernet with 20,000 calls
----------------------------------------------
-
-                               Clients  Latency (ms)          Calls/Sec
-
-
-Visibroker reactive            1        1.167                 856
-                               2        1.39                  718
-                               3        1.664                 600
-
-Visibroker thr-per-connection  1        1.077                 928
-                               2        1.228                 814
-                               3        1.789                 558
-        
-
-
-Cubit results over ATM with 20,000 calls
-----------------------------------------
-
-                               Clients  Latency (ms)          Calls/Sec
-
-Visibroker reactive            1        1.195                 836
-                               2        1.241                 805
-                               3        1.56                  641
-
-Visibroker thr-per-connection  1        1.060                 943
-                               2        1.327                 753
-                               3        2.108                 474
-
-
-Prime_Factor results over ATM with 20,000 calls
------------------------------------------------
-
-                               Clients  Latency (ms)            Calls/Sec
-
-Visibroker reactive            1         7.43                   134
-                               2        13.652                   73
-                               3        17.738                   56
-
-Visibroker thr-per-connection  1         7.371                  135
-                               2         8.561                  116
-                               3        11.376                   87
-
-IO-intensive results over ATM with 20,000 calls
------------------------------------------------
-
-                               Clients  Latency (ms)            Calls/Sec
-
-Visibroker reactive            1        6.424                   155
-                               2       11.895                    84
-                               3       17.468                    57
-                                       
-Visibroker thr-per-connection  1       6.41                     156
-                               2       6.496                    154
-                               3       6.524                    153
-
-
-
-
-                        TNF client-side profile for Visibroker for 20000 calls
-
-Function name         %      self+desc.          mean     max      min     std.
-                     time       ms       calls  ms/call ms/call  ms/call   err
-________________________________________________________________________________
-mutex_unlock         1.31      188.930  61797    0.003    1.027    0.002   0.000
-mutex_lock           1.21      175.465  61790    0.003    0.330    0.002   0.000
-
-
-                        TNF server-side profile for Visibroker for 20000 calls
-
-                                     Profile
-
-Function name         %      self+desc.          mean     max      min     std.
-                     time       ms       calls  ms/call ms/call  ms/call   err
-________________________________________________________________________________
-mutex_lock           0.18      165.141  60432    0.003    0.501    0.002   0.000
-mutex_unlock         0.16      153.891  60432    0.003    0.373    0.002   0.000
-
-
diff --git a/TAO/tests/Cubit/results/orbs.xls b/TAO/tests/Cubit/results/orbs.xls
deleted file mode 100644
index 53a7948d182..00000000000
--- a/TAO/tests/Cubit/results/orbs.xls
+++ /dev/null
diff --git a/TAO/tests/Demux_Test/CodeGen/Makefile b/TAO/tests/Demux_Test/CodeGen/Makefile
deleted file mode 100644
index 32ea3aaf73b..00000000000
--- a/TAO/tests/Demux_Test/CodeGen/Makefile
+++ /dev/null
@@ -1,316 +0,0 @@
-#----------------------------------------------------------------------------
-#	$Id$
-#
-#	Makefile to compile the Demux application
-#----------------------------------------------------------------------------
-
-#----------------------------------------------------------------------------
-#	Local macros
-#----------------------------------------------------------------------------
-
-BIN 	= tao
-LIB     = libtao.a
-SHLIB   = libtao.$(SOEXT)
-
-FILES   = tao \
-	  gen \
-	  client \
-	  stub \
-	  skel \
-	  impl \
-	  perf \
-	  objcreate
-
-LSRC    = $(addsuffix .cpp,$(FILES)) 
-LOBJ    = $(addsuffix .o,$(FILES))
-SHOBJ   = $(addsuffix .so,$(FILES))
-
-LDLIBS  = -ltao
-LIBS    = -lACE
-
-VLDLIBS = $(LDLIBS:%=%$(VAR))
-
-#BUILD   = $(VLIB) $(VSHLIB) $(SHLIBA) $(VBIN)
-BUILD   = $(VSHLIB) $(SHLIBA) $(VBIN)
-
-#----------------------------------------------------------------------------
-#	Include macros and targets
-#----------------------------------------------------------------------------
-
-include         $(WRAPPER_ROOT)/include/makeinclude/wrapper_macros.GNU
-include         $(WRAPPER_ROOT)/include/makeinclude/macros.GNU
-include         $(WRAPPER_ROOT)/include/makeinclude/rules.common.GNU
-include         $(WRAPPER_ROOT)/include/makeinclude/rules.nonested.GNU
-include         $(WRAPPER_ROOT)/include/makeinclude/rules.lib.GNU
-include         $(WRAPPER_ROOT)/include/makeinclude/rules.bin.GNU
-include         $(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU
-
-#----------------------------------------------------------------------------
-#	Include macros and targets
-# 	Local modifications to variables imported by includes above.
-#----------------------------------------------------------------------------
-
-CPPFLAGS   += -DDEBUG
-
-#----------------------------------------------------------------------------
-# DO NOT DELETE THIS LINE -- g++dep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-
-.obj/tao.o .shobj/tao.so: tao.cpp tao.h \
- $(WRAPPER_ROOT)/ace/SString.h \
- $(WRAPPER_ROOT)/ace/ACE.h \
- $(WRAPPER_ROOT)/ace/OS.h \
- $(WRAPPER_ROOT)/ace/config.h \
- $(WRAPPER_ROOT)/ace/stdcpp.h \
- $(WRAPPER_ROOT)/ace/OS.i \
- $(WRAPPER_ROOT)/ace/Trace.h \
- $(WRAPPER_ROOT)/ace/Log_Msg.h \
- $(WRAPPER_ROOT)/ace/Log_Record.h \
- $(WRAPPER_ROOT)/ace/Log_Priority.h \
- $(WRAPPER_ROOT)/ace/Log_Record.i \
- $(WRAPPER_ROOT)/ace/ACE.i \
- $(WRAPPER_ROOT)/ace/SString.i \
- $(WRAPPER_ROOT)/ace/Containers.h \
- $(WRAPPER_ROOT)/ace/Containers.i \
- $(WRAPPER_ROOT)/ace/Singleton.h \
- $(WRAPPER_ROOT)/ace/Synch.h \
- $(WRAPPER_ROOT)/ace/SV_Semaphore_Complex.h \
- $(WRAPPER_ROOT)/ace/SV_Semaphore_Simple.h \
- $(WRAPPER_ROOT)/ace/SV_Semaphore_Simple.i \
- $(WRAPPER_ROOT)/ace/SV_Semaphore_Complex.i \
- $(WRAPPER_ROOT)/ace/Synch.i \
- $(WRAPPER_ROOT)/ace/Synch_T.h \
- $(WRAPPER_ROOT)/ace/Event_Handler.h \
- $(WRAPPER_ROOT)/ace/Event_Handler.i \
- $(WRAPPER_ROOT)/ace/Synch_T.i \
- $(WRAPPER_ROOT)/ace/Thread.h \
- $(WRAPPER_ROOT)/ace/Thread.i \
- $(WRAPPER_ROOT)/ace/Singleton.i \
- $(WRAPPER_ROOT)/ace/Get_Opt.h \
- $(WRAPPER_ROOT)/ace/Get_Opt.i
-.obj/gen.o .shobj/gen.so: gen.cpp tao.h \
- $(WRAPPER_ROOT)/ace/SString.h \
- $(WRAPPER_ROOT)/ace/ACE.h \
- $(WRAPPER_ROOT)/ace/OS.h \
- $(WRAPPER_ROOT)/ace/config.h \
- $(WRAPPER_ROOT)/ace/stdcpp.h \
- $(WRAPPER_ROOT)/ace/OS.i \
- $(WRAPPER_ROOT)/ace/Trace.h \
- $(WRAPPER_ROOT)/ace/Log_Msg.h \
- $(WRAPPER_ROOT)/ace/Log_Record.h \
- $(WRAPPER_ROOT)/ace/Log_Priority.h \
- $(WRAPPER_ROOT)/ace/Log_Record.i \
- $(WRAPPER_ROOT)/ace/ACE.i \
- $(WRAPPER_ROOT)/ace/SString.i \
- $(WRAPPER_ROOT)/ace/Containers.h \
- $(WRAPPER_ROOT)/ace/Containers.i \
- $(WRAPPER_ROOT)/ace/Singleton.h \
- $(WRAPPER_ROOT)/ace/Synch.h \
- $(WRAPPER_ROOT)/ace/SV_Semaphore_Complex.h \
- $(WRAPPER_ROOT)/ace/SV_Semaphore_Simple.h \
- $(WRAPPER_ROOT)/ace/SV_Semaphore_Simple.i \
- $(WRAPPER_ROOT)/ace/SV_Semaphore_Complex.i \
- $(WRAPPER_ROOT)/ace/Synch.i \
- $(WRAPPER_ROOT)/ace/Synch_T.h \
- $(WRAPPER_ROOT)/ace/Event_Handler.h \
- $(WRAPPER_ROOT)/ace/Event_Handler.i \
- $(WRAPPER_ROOT)/ace/Synch_T.i \
- $(WRAPPER_ROOT)/ace/Thread.h \
- $(WRAPPER_ROOT)/ace/Thread.i \
- $(WRAPPER_ROOT)/ace/Singleton.i \
- $(WRAPPER_ROOT)/ace/Get_Opt.h \
- $(WRAPPER_ROOT)/ace/Get_Opt.i
-.obj/client.o .shobj/client.so: client.cpp tao.h \
- $(WRAPPER_ROOT)/ace/SString.h \
- $(WRAPPER_ROOT)/ace/ACE.h \
- $(WRAPPER_ROOT)/ace/OS.h \
- $(WRAPPER_ROOT)/ace/config.h \
- $(WRAPPER_ROOT)/ace/stdcpp.h \
- $(WRAPPER_ROOT)/ace/OS.i \
- $(WRAPPER_ROOT)/ace/Trace.h \
- $(WRAPPER_ROOT)/ace/Log_Msg.h \
- $(WRAPPER_ROOT)/ace/Log_Record.h \
- $(WRAPPER_ROOT)/ace/Log_Priority.h \
- $(WRAPPER_ROOT)/ace/Log_Record.i \
- $(WRAPPER_ROOT)/ace/ACE.i \
- $(WRAPPER_ROOT)/ace/SString.i \
- $(WRAPPER_ROOT)/ace/Containers.h \
- $(WRAPPER_ROOT)/ace/Containers.i \
- $(WRAPPER_ROOT)/ace/Singleton.h \
- $(WRAPPER_ROOT)/ace/Synch.h \
- $(WRAPPER_ROOT)/ace/SV_Semaphore_Complex.h \
- $(WRAPPER_ROOT)/ace/SV_Semaphore_Simple.h \
- $(WRAPPER_ROOT)/ace/SV_Semaphore_Simple.i \
- $(WRAPPER_ROOT)/ace/SV_Semaphore_Complex.i \
- $(WRAPPER_ROOT)/ace/Synch.i \
- $(WRAPPER_ROOT)/ace/Synch_T.h \
- $(WRAPPER_ROOT)/ace/Event_Handler.h \
- $(WRAPPER_ROOT)/ace/Event_Handler.i \
- $(WRAPPER_ROOT)/ace/Synch_T.i \
- $(WRAPPER_ROOT)/ace/Thread.h \
- $(WRAPPER_ROOT)/ace/Thread.i \
- $(WRAPPER_ROOT)/ace/Singleton.i \
- $(WRAPPER_ROOT)/ace/Get_Opt.h \
- $(WRAPPER_ROOT)/ace/Get_Opt.i
-.obj/stub.o .shobj/stub.so: stub.cpp tao.h \
- $(WRAPPER_ROOT)/ace/SString.h \
- $(WRAPPER_ROOT)/ace/ACE.h \
- $(WRAPPER_ROOT)/ace/OS.h \
- $(WRAPPER_ROOT)/ace/config.h \
- $(WRAPPER_ROOT)/ace/stdcpp.h \
- $(WRAPPER_ROOT)/ace/OS.i \
- $(WRAPPER_ROOT)/ace/Trace.h \
- $(WRAPPER_ROOT)/ace/Log_Msg.h \
- $(WRAPPER_ROOT)/ace/Log_Record.h \
- $(WRAPPER_ROOT)/ace/Log_Priority.h \
- $(WRAPPER_ROOT)/ace/Log_Record.i \
- $(WRAPPER_ROOT)/ace/ACE.i \
- $(WRAPPER_ROOT)/ace/SString.i \
- $(WRAPPER_ROOT)/ace/Containers.h \
- $(WRAPPER_ROOT)/ace/Containers.i \
- $(WRAPPER_ROOT)/ace/Singleton.h \
- $(WRAPPER_ROOT)/ace/Synch.h \
- $(WRAPPER_ROOT)/ace/SV_Semaphore_Complex.h \
- $(WRAPPER_ROOT)/ace/SV_Semaphore_Simple.h \
- $(WRAPPER_ROOT)/ace/SV_Semaphore_Simple.i \
- $(WRAPPER_ROOT)/ace/SV_Semaphore_Complex.i \
- $(WRAPPER_ROOT)/ace/Synch.i \
- $(WRAPPER_ROOT)/ace/Synch_T.h \
- $(WRAPPER_ROOT)/ace/Event_Handler.h \
- $(WRAPPER_ROOT)/ace/Event_Handler.i \
- $(WRAPPER_ROOT)/ace/Synch_T.i \
- $(WRAPPER_ROOT)/ace/Thread.h \
- $(WRAPPER_ROOT)/ace/Thread.i \
- $(WRAPPER_ROOT)/ace/Singleton.i \
- $(WRAPPER_ROOT)/ace/Get_Opt.h \
- $(WRAPPER_ROOT)/ace/Get_Opt.i
-.obj/skel.o .shobj/skel.so: skel.cpp tao.h \
- $(WRAPPER_ROOT)/ace/SString.h \
- $(WRAPPER_ROOT)/ace/ACE.h \
- $(WRAPPER_ROOT)/ace/OS.h \
- $(WRAPPER_ROOT)/ace/config.h \
- $(WRAPPER_ROOT)/ace/stdcpp.h \
- $(WRAPPER_ROOT)/ace/OS.i \
- $(WRAPPER_ROOT)/ace/Trace.h \
- $(WRAPPER_ROOT)/ace/Log_Msg.h \
- $(WRAPPER_ROOT)/ace/Log_Record.h \
- $(WRAPPER_ROOT)/ace/Log_Priority.h \
- $(WRAPPER_ROOT)/ace/Log_Record.i \
- $(WRAPPER_ROOT)/ace/ACE.i \
- $(WRAPPER_ROOT)/ace/SString.i \
- $(WRAPPER_ROOT)/ace/Containers.h \
- $(WRAPPER_ROOT)/ace/Containers.i \
- $(WRAPPER_ROOT)/ace/Singleton.h \
- $(WRAPPER_ROOT)/ace/Synch.h \
- $(WRAPPER_ROOT)/ace/SV_Semaphore_Complex.h \
- $(WRAPPER_ROOT)/ace/SV_Semaphore_Simple.h \
- $(WRAPPER_ROOT)/ace/SV_Semaphore_Simple.i \
- $(WRAPPER_ROOT)/ace/SV_Semaphore_Complex.i \
- $(WRAPPER_ROOT)/ace/Synch.i \
- $(WRAPPER_ROOT)/ace/Synch_T.h \
- $(WRAPPER_ROOT)/ace/Event_Handler.h \
- $(WRAPPER_ROOT)/ace/Event_Handler.i \
- $(WRAPPER_ROOT)/ace/Synch_T.i \
- $(WRAPPER_ROOT)/ace/Thread.h \
- $(WRAPPER_ROOT)/ace/Thread.i \
- $(WRAPPER_ROOT)/ace/Singleton.i \
- $(WRAPPER_ROOT)/ace/Get_Opt.h \
- $(WRAPPER_ROOT)/ace/Get_Opt.i
-.obj/impl.o .shobj/impl.so: impl.cpp tao.h \
- $(WRAPPER_ROOT)/ace/SString.h \
- $(WRAPPER_ROOT)/ace/ACE.h \
- $(WRAPPER_ROOT)/ace/OS.h \
- $(WRAPPER_ROOT)/ace/config.h \
- $(WRAPPER_ROOT)/ace/stdcpp.h \
- $(WRAPPER_ROOT)/ace/OS.i \
- $(WRAPPER_ROOT)/ace/Trace.h \
- $(WRAPPER_ROOT)/ace/Log_Msg.h \
- $(WRAPPER_ROOT)/ace/Log_Record.h \
- $(WRAPPER_ROOT)/ace/Log_Priority.h \
- $(WRAPPER_ROOT)/ace/Log_Record.i \
- $(WRAPPER_ROOT)/ace/ACE.i \
- $(WRAPPER_ROOT)/ace/SString.i \
- $(WRAPPER_ROOT)/ace/Containers.h \
- $(WRAPPER_ROOT)/ace/Containers.i \
- $(WRAPPER_ROOT)/ace/Singleton.h \
- $(WRAPPER_ROOT)/ace/Synch.h \
- $(WRAPPER_ROOT)/ace/SV_Semaphore_Complex.h \
- $(WRAPPER_ROOT)/ace/SV_Semaphore_Simple.h \
- $(WRAPPER_ROOT)/ace/SV_Semaphore_Simple.i \
- $(WRAPPER_ROOT)/ace/SV_Semaphore_Complex.i \
- $(WRAPPER_ROOT)/ace/Synch.i \
- $(WRAPPER_ROOT)/ace/Synch_T.h \
- $(WRAPPER_ROOT)/ace/Event_Handler.h \
- $(WRAPPER_ROOT)/ace/Event_Handler.i \
- $(WRAPPER_ROOT)/ace/Synch_T.i \
- $(WRAPPER_ROOT)/ace/Thread.h \
- $(WRAPPER_ROOT)/ace/Thread.i \
- $(WRAPPER_ROOT)/ace/Singleton.i \
- $(WRAPPER_ROOT)/ace/Get_Opt.h \
- $(WRAPPER_ROOT)/ace/Get_Opt.i
-.obj/perf.o .shobj/perf.so: perf.cpp tao.h \
- $(WRAPPER_ROOT)/ace/SString.h \
- $(WRAPPER_ROOT)/ace/ACE.h \
- $(WRAPPER_ROOT)/ace/OS.h \
- $(WRAPPER_ROOT)/ace/config.h \
- $(WRAPPER_ROOT)/ace/stdcpp.h \
- $(WRAPPER_ROOT)/ace/OS.i \
- $(WRAPPER_ROOT)/ace/Trace.h \
- $(WRAPPER_ROOT)/ace/Log_Msg.h \
- $(WRAPPER_ROOT)/ace/Log_Record.h \
- $(WRAPPER_ROOT)/ace/Log_Priority.h \
- $(WRAPPER_ROOT)/ace/Log_Record.i \
- $(WRAPPER_ROOT)/ace/ACE.i \
- $(WRAPPER_ROOT)/ace/SString.i \
- $(WRAPPER_ROOT)/ace/Containers.h \
- $(WRAPPER_ROOT)/ace/Containers.i \
- $(WRAPPER_ROOT)/ace/Singleton.h \
- $(WRAPPER_ROOT)/ace/Synch.h \
- $(WRAPPER_ROOT)/ace/SV_Semaphore_Complex.h \
- $(WRAPPER_ROOT)/ace/SV_Semaphore_Simple.h \
- $(WRAPPER_ROOT)/ace/SV_Semaphore_Simple.i \
- $(WRAPPER_ROOT)/ace/SV_Semaphore_Complex.i \
- $(WRAPPER_ROOT)/ace/Synch.i \
- $(WRAPPER_ROOT)/ace/Synch_T.h \
- $(WRAPPER_ROOT)/ace/Event_Handler.h \
- $(WRAPPER_ROOT)/ace/Event_Handler.i \
- $(WRAPPER_ROOT)/ace/Synch_T.i \
- $(WRAPPER_ROOT)/ace/Thread.h \
- $(WRAPPER_ROOT)/ace/Thread.i \
- $(WRAPPER_ROOT)/ace/Singleton.i \
- $(WRAPPER_ROOT)/ace/Get_Opt.h \
- $(WRAPPER_ROOT)/ace/Get_Opt.i
-.obj/objcreate.o .shobj/objcreate.so: objcreate.cpp tao.h \
- $(WRAPPER_ROOT)/ace/SString.h \
- $(WRAPPER_ROOT)/ace/ACE.h \
- $(WRAPPER_ROOT)/ace/OS.h \
- $(WRAPPER_ROOT)/ace/config.h \
- $(WRAPPER_ROOT)/ace/stdcpp.h \
- $(WRAPPER_ROOT)/ace/OS.i \
- $(WRAPPER_ROOT)/ace/Trace.h \
- $(WRAPPER_ROOT)/ace/Log_Msg.h \
- $(WRAPPER_ROOT)/ace/Log_Record.h \
- $(WRAPPER_ROOT)/ace/Log_Priority.h \
- $(WRAPPER_ROOT)/ace/Log_Record.i \
- $(WRAPPER_ROOT)/ace/ACE.i \
- $(WRAPPER_ROOT)/ace/SString.i \
- $(WRAPPER_ROOT)/ace/Containers.h \
- $(WRAPPER_ROOT)/ace/Containers.i \
- $(WRAPPER_ROOT)/ace/Singleton.h \
- $(WRAPPER_ROOT)/ace/Synch.h \
- $(WRAPPER_ROOT)/ace/SV_Semaphore_Complex.h \
- $(WRAPPER_ROOT)/ace/SV_Semaphore_Simple.h \
- $(WRAPPER_ROOT)/ace/SV_Semaphore_Simple.i \
- $(WRAPPER_ROOT)/ace/SV_Semaphore_Complex.i \
- $(WRAPPER_ROOT)/ace/Synch.i \
- $(WRAPPER_ROOT)/ace/Synch_T.h \
- $(WRAPPER_ROOT)/ace/Event_Handler.h \
- $(WRAPPER_ROOT)/ace/Event_Handler.i \
- $(WRAPPER_ROOT)/ace/Synch_T.i \
- $(WRAPPER_ROOT)/ace/Thread.h \
- $(WRAPPER_ROOT)/ace/Thread.i \
- $(WRAPPER_ROOT)/ace/Singleton.i \
- $(WRAPPER_ROOT)/ace/Get_Opt.h \
- $(WRAPPER_ROOT)/ace/Get_Opt.i
-
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/tests/Demux_Test/CodeGen/README b/TAO/tests/Demux_Test/CodeGen/README
deleted file mode 100644
index 13fcae3c48f..00000000000
--- a/TAO/tests/Demux_Test/CodeGen/README
+++ /dev/null
@@ -1,12 +0,0 @@
-This directory contains a code generator that will generate stubs and
-skeletons for an interface called "tao_demux". The number of
-operations in this interface is controlled by the -m option to the
-executable "tao".
-
-Usage:
-
-tao -o <num of objs> -m < num of operations>
-
-The stubs and skeletons are for 2-way calls. The operation names and
-object keys are automatically generated and have arbitrary string
-names. 
\ No newline at end of file
diff --git a/TAO/tests/Demux_Test/CodeGen/client.cpp b/TAO/tests/Demux_Test/CodeGen/client.cpp
deleted file mode 100644
index 9260285ce37..00000000000
--- a/TAO/tests/Demux_Test/CodeGen/client.cpp
+++ /dev/null
@@ -1,39 +0,0 @@
-#include "tao.h"
-
-
-// Generate the client side include file "client.i". This file has a table of
-// function pointers to the the different operations of the
-// interface. Depending on the strategy chosen, we make appropriate calls
-
-long GenClientCode(ACE_Unbounded_Queue<ACE_CString> &arr, int limit)
-{
-  fstream client_incl;
-  int i;
-  ACE_CString *str;
-
-  client_incl.open("client.i", ios::out);
-
-  for(i=0; i < limit; i++){
-    if (arr.get(str, i) == -1)
-      {
-	return -1;
-      }
-    client_incl << "void " << str->rep() << "(tao_demux_ptr obj)" << endl;
-    client_incl << "{" << endl;
-    client_incl << "\tCORBA_Environment env;" << endl << endl;
-    client_incl << "\tobj->" << str->rep() << "(env);" << endl;
-    client_incl << "}" << endl;
-  }
-  client_incl << endl;
-  client_incl << "static const method_db mtbl[] = {" << endl;
-  for (i=0; i < limit; i++){
-    if (arr.get(str, i) == -1)
-      {
-	return -1;
-      }
-    client_incl << "\t" << str->rep() << "," << endl;
-  }
-  client_incl << "};" << endl << endl;
-  client_incl.close();
-}
-
diff --git a/TAO/tests/Demux_Test/CodeGen/gen.cpp b/TAO/tests/Demux_Test/CodeGen/gen.cpp
deleted file mode 100644
index ecc4fd5ce5a..00000000000
--- a/TAO/tests/Demux_Test/CodeGen/gen.cpp
+++ /dev/null
@@ -1,173 +0,0 @@
-#include "tao.h"
-
-static long GenDistinctString(ACE_Unbounded_Queue<ACE_CString> &, int);
-static long GenRand(int, int);
-static long IsPresent(ACE_Unbounded_Queue<ACE_CString> &, int, ACE_CString &);
-static ACE_CString	CreateString(long);
-static char	GetVarChar(int);
-
-// object table generator
-long GenObjectTable(ACE_Unbounded_Queue<ACE_CString> &arr, int limit)
-{
-  int i,j,k;	// indices
-  long	rnd;	// random number
-  int opt;
-  fstream arrfp;
-  ACE_CString *str;
-
-
-  // Generate "limit" distinct strings
-  for (i=0; i < limit; i++)
-    {
-      if (GenDistinctString(arr, i) == -1) // side effect: inserts a new string
-	 return -1;                        // at locn i in array "arr" 
-    }
-	
-  // write the strings into a file whose format will be understood by GPERF
-  arrfp.open("gperf_objects.dat",ios::out);
-  
-  arrfp << "struct object_db {" << endl;
-  arrfp << "\tchar *name; // name of method" << endl;
-  arrfp << "\tCORBA_Object_ptr obj; //fn pointer to obj impl" << endl;
-  arrfp << "};" << endl;
-  arrfp << "%%" << endl;
-
-  for(i=0; i < limit; i++)
-    {
-      if (arr.get(str, i) == -1)
-	{
-	  // error
-	  return -1;
-	}
-      arrfp << str->rep() << ", " << "0" << endl;
-      // we do not know the addresses of the objects. We shall insert them
-      // later. 
-    }
-  arrfp.close();
-  return 0;
-}
-
-// method table generator
-long GenMethodTable(ACE_Unbounded_Queue<ACE_CString> &arr, int limit)
-{
-  int i,j,k;	// indices
-  long	rnd;	// random number
-  int opt;
-  fstream arrfp;
-  ACE_CString *str;
-
-
-  // Generate "limit" distinct strings
-  for (i=0; i < limit; i++){
-    if (GenDistinctString(arr, i) == -1) // side effect: inserts a new string at locn i
-	return -1;			 // in array "arr" 
-  }
-	
-  // write the strings into a file whose format will be understood by GPERF
-  arrfp.open("gperf_methods.dat",ios::out);
-  
-  arrfp << "struct method_db {" << endl;
-  arrfp << "\tchar *name; // name of method" << endl;
-  arrfp << "\tTAO_Skeleton skel_ptr; //fn pointer to skeleton" << endl;
-  arrfp << "};" << endl;
-  arrfp << "%%" << endl;
-
-  for(i=0; i < limit; i++)
-    {
-      if (arr.get(str, i) == -1)
-	{
-	  // error
-	  return -1;
-	}
-      arrfp << (str->rep()) << ", " << "_skel_tao_demux::" <<  str->rep() <<
-	"_skel" << endl;
-    }
-  arrfp.close();
-  return 0;
-}
-
-
-// generate a distinct string and insert it at location "limit"
-long GenDistinctString(ACE_Unbounded_Queue<ACE_CString> &arr, int limit)
-{
-  int i, j;	// indices
-  long rnd;
-  ACE_CString s;
-  long status;
-
-  rnd = GenRand(3,32); // get a random number between 3 and 32 which will be
-  // used as a string length of the distinct string to be
-  // generated. We use 3-32 because certain function
-  // names such as _N, _C cause name conflicts.
-  // Continue generating strings until a distinct one not generated before
-  // is formed
-  do {
-    s = CreateString(rnd);
-    status = IsPresent (arr, limit, s);
-    if (status == -1)
-      return -1;
-  } while (status > 0);
-
-  // save it at this location
-  if (arr.enqueue_tail(s) == -1)
-    {
-      return -1;
-    }  
-  return 0;
-}
-
-// generate a random number in the given limits
-long GenRand(int low, int up)
-{
-  return (lrand48() % (up-low+1)) + low; // rnd will be the size of the 
-}
-
-// check if the given string is present in the array
-long IsPresent(ACE_Unbounded_Queue<ACE_CString> &arr, int limit, ACE_CString &s)
-{
-  ACE_CString *str;
-
-  if (!strcasecmp(s.rep(), "_is_a"))
-    return 1;
-
-  for (int i=0; i < limit; i++){
-    if (arr.get(str, i) == -1)
-      {
-	return -1;
-      }
-    if (!strcasecmp(str->rep(), s.rep()))
-      return 1;  // they are same
-  }
-  return 0; 	// not present
-}
-
-// create a string of length = len
-ACE_CString	CreateString(long len)
-{
-  int i;
-  ACE_CString s;
-  char ch;
-
-  for (i=0; i < len; i++){
-    ch = GetVarChar(i);
-    s += ACE_CString(&ch);
-  }
-  return s;
-}
-
-// Generate a valid character for a C++ variable
-char GetVarChar(int i)
-{
-  // for i == 0, we cannot return a digit as the first character
-  char ch;
-  while(1) {
-    ch = GenRand(48, 122);
-    if (isdigit(ch) || isupper(ch) || islower(ch) || (ch == '_')){
-      if ((i == 0) && (isdigit(ch) || (ch == '_')))
-	continue;
-      break;	//otherwise
-    }
-  }
-  return ch;
-}
-
diff --git a/TAO/tests/Demux_Test/CodeGen/impl.cpp b/TAO/tests/Demux_Test/CodeGen/impl.cpp
deleted file mode 100644
index 6b3c7551558..00000000000
--- a/TAO/tests/Demux_Test/CodeGen/impl.cpp
+++ /dev/null
@@ -1,72 +0,0 @@
-#include "tao.h"
-
-// generate the implementation header
-long GenServantHeader(ACE_Unbounded_Queue<ACE_CString> &arr, int limit)
-{
-  // generate the implementation class
-  fstream hdr;
-  int i;
-  ACE_CString *str;
-
-  hdr.open("tao_demux_i.h", ios::out);
-
-  hdr << "#if !defined(TAO_DEMUX_I_H)" << endl;
-  hdr << "#define TAO_DEMUX_I_H" << endl << endl;
-
-  hdr << "#include \"tao_demuxS.h\"" << endl << endl;
-
-  hdr << "class tao_demux_i: public virtual _skel_tao_demux" << endl;
-  hdr << "{" << endl;
-  hdr << "public:" << endl;
-  hdr << "\ttao_demux_i(char *obj_name);" << endl;
-  hdr << "\t~tao_demux_i();" << endl;
-  hdr << "\t//now all the methods" << endl;
-
-  for(i=0; i < limit; i++)
-    {
-      if (arr.get(str, i) == -1)
-	return -1;
-
-      hdr << "\tvoid " << str->rep() <<
-	"(CORBA_Environment &env);" << endl; 
-    }
-  hdr << "};" << endl; 
-
-  hdr << "#endif" << endl;
-}
-
-
-// generate the implementation
-long GenServantImpl(ACE_Unbounded_Queue<ACE_CString> &arr, int limit)
-{
-  // generate the implementation class
-  fstream impl;
-  int i;
-  ACE_CString *str;
-
-  impl.open("tao_demux_i.cpp", ios::out);
-
-  impl << "#include <iostream.h>" << endl;
-  impl << "#include \"tao_demux_i.h\"" << endl << endl;
-
-  impl << "tao_demux_i::tao_demux_i(char *obj_name)" << endl;
-  impl << "  :_skel_tao_demux(obj_name){}" << endl;
-  impl << "tao_demux_i::~tao_demux_i(){}" << endl;
-  impl << "\t//now all the methods" << endl;
-
-  for(i=0; i < limit; i++)
-    {
-      if (arr.get(str, i) == -1)
-	return -1;
-
-      impl << "void tao_demux_i::" << str->rep() <<
-	"(CORBA_Environment &env)" << endl;
-      impl << "{" << endl;
-      impl << "#ifdef DEBUG" << endl;
-      impl << "   cout << \"Object name = \" << this->_get_name(env) << " <<
-	"\", Operation name = " << str->rep() << "\" << endl;" << endl; 
-      impl << "#endif" << endl;
-      impl << "}" << endl << endl;
-    }
-}
-
diff --git a/TAO/tests/Demux_Test/CodeGen/objcreate.cpp b/TAO/tests/Demux_Test/CodeGen/objcreate.cpp
deleted file mode 100644
index e25dbd947d3..00000000000
--- a/TAO/tests/Demux_Test/CodeGen/objcreate.cpp
+++ /dev/null
@@ -1,51 +0,0 @@
-#include "tao.h"
-
-long GenObjectCreateCode(ACE_Unbounded_Queue<ACE_CString> &arr, int limit)
-{
-  // code for creating objects. The strategy will be based on active demux or
-  // other strategies
-  fstream file;
-  int i;
-  ACE_CString *str;
-
-  file.open("obj_create.i", ios::out);
-
-  file << "\t  if (params->demux_strategy() == " <<
-    "TAO_OA_Parameters::TAO_ACTIVE_DEMUX){" << endl;
-
-  for (i=0; i < limit; i++)
-    {
-      if (arr.get(str, i) == -1)
-	return -1;
-
-      file << "\t\tmymux[" << i << "] = new tao_demux_i(\"" << i << "\");" <<
-	endl; 
-      file << "\t\tstr = orb_ptr->object_to_string(mymux[" << i << "], env);"
-	   << endl;
-      file << "#ifdef DEBUG" << endl;
-      file << "\t\tcout << \"IOR = \" << (char *)str << endl;" << endl;
-      file << "#endif" << endl;
-      file << "\t\tiorfile << (char *)str << endl; " << endl;
-      file << "\t\tCORBA_string_free(str);" << endl;
-    }
-  file << "\t  } else {" << endl;
-  for (i=0; i < limit; i++)
-    {
-      if (arr.get(str, i) == -1)
-	return -1;
-
-      file << "\t\tmymux[" << i << "] = new tao_demux_i(CORBA_string_dup (\""
-	   << str->rep() << "\"));" << endl; 
-      file << "\t\tstr = orb_ptr->object_to_string(mymux[" << i << "], env);"
-	   << endl;
-      file << "#ifdef DEBUG" << endl;
-      file << "\t\tcout << \"IOR = \" << (char *)str << endl;" << endl;
-      file << "#endif" << endl;
-      file << "\t\tiorfile << (char *)str << endl; " << endl;
-      file << "\t\tCORBA_string_free(str);" << endl;
-    }
-  file << "\t  }" << endl;
-
-  file.close();
-  return 0;
-}
diff --git a/TAO/tests/Demux_Test/CodeGen/perf.cpp b/TAO/tests/Demux_Test/CodeGen/perf.cpp
deleted file mode 100644
index ccd2da961ff..00000000000
--- a/TAO/tests/Demux_Test/CodeGen/perf.cpp
+++ /dev/null
@@ -1,21 +0,0 @@
-#include "tao.h"
-
-void GenGPERFCode()
-{
-  char command[500];
-
-  // first generate code for object hash
-  sprintf(command, 
-    "gperf -c -C -D -E -T -f 0 -a -o -t -p -L C++ -Z Method_Hash %s >\
-gperf_method.i", "gperf_methods.dat");
-  system(command);
-  
-  // omit the -C switch for gperf because we will not know the address of the
-  // objects until they are instantiated. But we do know the keys in advance.
-  sprintf(command, 
-    "gperf -c -D -E -T -f 0 -a -o -t -p -L C++ -Z Object_Hash %s >\
-gperf_object.i", "gperf_objects.dat");
-  system(command);
-
-}
-
diff --git a/TAO/tests/Demux_Test/CodeGen/skel.cpp b/TAO/tests/Demux_Test/CodeGen/skel.cpp
deleted file mode 100644
index db48cfeb908..00000000000
--- a/TAO/tests/Demux_Test/CodeGen/skel.cpp
+++ /dev/null
@@ -1,217 +0,0 @@
-#include "tao.h"
-
-long GenServerHeader(ACE_Unbounded_Queue<ACE_CString> &arr, int limit)
-{
-  fstream hdr;
-  int i;
-  ACE_CString *str;
-
-  hdr.open("tao_demuxS.h", ios::out);
-
-  hdr << "#if !defined(TAO_DEMUX_S_H)" << endl;
-  hdr << "#define TAO_DEMUX_S_H" << endl << endl;
-
-  hdr << "#include \"tao_demuxC.h\"" << endl;
-  hdr << "class _skel_tao_demux: public tao_demux" << endl;
-  hdr << "{" << endl;
-  hdr << "protected:" << endl;
-  hdr << "\t_skel_tao_demux(const char *objname=0);" << endl;
-  hdr << "\tvirtual ~_skel_tao_demux() {}" << endl;
-  hdr << "public:" << endl;
-  hdr << "\t//All methods defined on this interface" << endl;
-  for(i=0; i < limit; i++){
-    if (arr.get(str, i) == -1)
-      {
-	return -1;
-      }
-    //generate skeletons
-    hdr << "\tvirtual void " << str->rep() <<
-      "(CORBA_Environment &env) = 0;" << endl;
-  }
-  hdr << endl;
-  hdr << "\t// All skeletons used for dispatching" << endl;
-  for(i=0; i < limit; i++){
-    if (arr.get(str, i) == -1)
-      {
-	return -1;
-      }
-    //generate skeletons
-    hdr << "\tstatic void " << str->rep() <<
-      "_skel(CORBA_ServerRequest &req, CORBA_Object_ptr obj, " <<
-      "CORBA_Environment &env);" << endl;
-  }
-  hdr << "\tstatic void " << 
-    "_is_a_skel(CORBA_ServerRequest &req, CORBA_Object_ptr obj, " <<
-    "CORBA_Environment &env);" << endl;
-  hdr << "};" << endl;
-
-  hdr << "#endif" << endl;
-  hdr.close();
-}
-
-// generate server side skeletons
-long GenServerSkels(ACE_Unbounded_Queue<ACE_CString> &arr, int limit)
-{
-  fstream skel;
-  int i;
-  ACE_CString *str;
-
-  skel.open("tao_demuxS.cpp", ios::out);
-
-  skel << "#include \"tao_demuxS.h\"" << endl;
-  //  skel << "#include \"iiopobj.h\"" << endl;
-  // skel << "#include \"params.h\"" << endl;
-  // skel << "#include \"corba/optable.h\"" << endl;
-  // skel << "#include \"corba/corbacom.h\"" << endl << endl;
-
-  // table of methods
-  skel << "static const TAO_operation_db_entry tao_demux_operations [] = {" << endl;
-  for (i=0; i < limit; i++)
-    {
-      if (arr.get(str, i) == -1)
-	{
-	  return -1;
-	}
-      skel << "\t{\"" << str->rep() << "\", &_skel_tao_demux::" << str->rep() <<
-	"_skel}," << endl;
-      
-    }
-  skel << "\t{\"_is_a\", &_skel_tao_demux::_is_a_skel}" << endl;
-  skel << "};" << endl;
-
-  // table of methods
-  skel << "static const TAO_operation_db_entry tao_active_demux_operations [] = {" << endl;
-  for (i=0; i < limit; i++)
-    {
-      if (arr.get(str, i) == -1)
-	{
-	  return -1;
-	}
-      skel << "\t{\"" << i << "\", &_skel_tao_demux::" << str->rep() <<
-	"_skel}," << endl;
-      
-    }
-  skel << "\t{\"" << limit << "\", &_skel_tao_demux::_is_a_skel}" << endl;
-  skel << "};" << endl;
-
-  // instantiate operation lookup tables
-  skel << "// instantiate a dynamic hash operation table" << endl;
-  skel << "TAO_Dynamic_Hash_OpTable dyn_hash_tao_demux_op_tbl(" <<
-    "tao_demux_operations, " << (limit+1) << ", " << (limit+1)*2 << ");" << endl;
-
-  skel << "// instantiate a linear search based operation table" << endl;
-  skel << "TAO_Linear_OpTable linear_tao_demux_op_tbl(" <<
-    "tao_demux_operations, " << limit+1 << ");" << endl;
-
-  skel << "// instantiate a active demux operation table" << endl;
-  skel << "TAO_Active_Demux_OpTable active_tao_demux_op_tbl(" <<
-    "tao_active_demux_operations, " << limit+1 << ");" << endl;
-
-  skel << "// constructor for skel_tao_demux" << endl;
-  skel << "_skel_tao_demux::_skel_tao_demux(const char *obj_name)" << endl;
-  //  skel << "\t:optable_(&tao_demux_op_tbl)" << endl;
-  skel << "{" << endl;
-  skel << "\tconst char* repoID = \"IDL:tao_demux:1.0\";" << endl;
-  skel << "\tCORBA_String_var  _tao_typeid = repoID;" << endl;
-  skel << "\tIIOP_Object *data; // IIOP object reference" << endl;
-  skel << "\tCORBA_POA_ptr oa = TAO_OA_PARAMS::instance()->oa(); // our OA" << endl;
-  skel << "\tTAO_Operation_Table_Parameters *op_params = " << endl;
-  skel << "\t\tTAO_OP_TABLE_PARAMETERS::instance();" << endl << endl;
-  skel << "\tCORBA_Long i;" << endl;
-  
-  // set the operation table based on user's choice
-  skel << "\tswitch(op_params->lookup_strategy()){" << endl;
-  skel << "\tcase TAO_Operation_Table_Parameters::TAO_ACTIVE_DEMUX:" << endl;
-  skel << "\t\tthis->optable_ = &active_tao_demux_op_tbl;" << endl;
-  skel << "\t\tbreak;" << endl;
-  skel << "\tcase TAO_Operation_Table_Parameters::TAO_LINEAR:" << endl;
-  skel << "\t\tthis->optable_ = &linear_tao_demux_op_tbl;" << endl;
-  skel << "\t\tbreak;" << endl;
-  skel << "\tcase TAO_Operation_Table_Parameters::TAO_DYNAMIC_HASH:" << endl;
-  skel << "\t\tthis->optable_ = &dyn_hash_tao_demux_op_tbl;" << endl;
-  skel << "\t\tbreak;" << endl;
-  skel << "\tcase TAO_Operation_Table_Parameters::TAO_PERFECT_HASH:" << endl;
-  skel << "\t\tthis->optable_ = op_params->concrete_strategy ();" << endl;
-  skel << "\t\tbreak;" << endl;
-  skel << "\tcase TAO_Operation_Table_Parameters::TAO_USER_DEFINED:" << endl;
-  skel << "\t\tthis->optable_ = op_params->concrete_strategy ();" << endl;
-  skel << "\t\tbreak;" << endl;
-  skel << "\t}" << endl << endl;
-
-  // code to create IIOP object
-  skel << "\tdata = new IIOP_Object(CORBA_string_dup(_tao_typeid));" << endl;
-  skel << "\tdata->profile.iiop_version.major = IIOP::MY_MAJOR;" << endl;
-  skel << "\tdata->profile.iiop_version.minor = IIOP::MY_MINOR;" << endl;
-  skel << "\tdata->profile.host = ACE_OS::strdup(oa->get_addr().get_host_name());" << endl;
-  skel << "\tdata->profile.port = oa->get_addr().get_port_number();" << endl;
-  skel << "\tdata->profile.object_key.length = ACE_OS::strlen(obj_name);" << endl;
-  skel << "\tdata->profile.object_key.maximum = " <<
-    "data->profile.object_key.length;" << endl;
-  skel << "\tdata->profile.object_key.buffer = " << 
-    "new CORBA_Octet [(size_t)data->profile.object_key.length+1];" << endl;
-  skel << "\tACE_OS::memcpy(data->profile.object_key.buffer, obj_name, " <<
-    "data->profile.object_key.length);" << endl;
-  skel << "\tthis->set_parent(data);" << endl;
-  skel << "\tthis->sub_ = this;" << endl;
-  skel << "\tif (oa) oa->bind(data->profile.object_key, this);" <<
-    "// register ourselves" << endl;
-  skel << "}" << endl << endl;
-
-  // now the code for each skeleton
-  for(i=0; i < limit; i++){
-    if (arr.get(str, i) == -1)
-      {
-	return -1;
-      }
-    skel << "void _skel_tao_demux::" << str->rep() <<
-      "_skel(CORBA_ServerRequest &req, CORBA_Object_ptr obj, " <<
-      "CORBA_Environment&env)" << endl;
-    skel << "{" << endl;
-    skel << "\tCORBA_NVList_ptr nvlist;" << endl;
-    skel << "\ttao_demux_ptr impl;" << endl << endl;
-
-    // create a NVlist and populate it
-    skel << "\treq.orb()->create_list(0, nvlist);" << endl;
-    skel << "\treq.params(nvlist,env); //useless operation, but required "
-	 << endl; 
-    skel << "\t impl = (tao_demux_ptr) (obj->get_subclass());" << endl;
-    skel << "\t// now the magic of dynamic binding" << endl;
-    skel << "\timpl->" << str->rep() << "(env);" << endl;
-    skel << "}" << endl;
-  }
-
-  // finally the code for _is_a
-  skel << "void _skel_tao_demux::_is_a_skel" <<
-    "(CORBA_ServerRequest &req, CORBA_Object_ptr obj, " <<
-    "CORBA_Environment&env)" << endl;
-  skel << "{" << endl;
-  skel << "\tCORBA_NVList_ptr nvlist;" << endl;
-  skel << "\tCORBA_NamedValue_ptr nv;" << endl;
-  skel << "\tCORBA_Any  temp_value(_tc_CORBA_String);" << endl;
-  skel << "\tchar *_tao_typeid = \"IDL:tao_demux:1.0\";" << endl << endl;
-
-  // create a NVlist and populate it
-  skel << "\treq.orb()->create_list(0, nvlist);" << endl;
-  skel << "\tnv = nvlist->add_value(0, temp_value, CORBA_ARG_IN, env);" << endl;
-  skel << "\treq.params(nvlist,env);" << endl;
-  skel << "\tif (env.exception() != 0)" << endl;
-  skel << "\t  {" << endl;
-  skel << "\t\tdexc(env, \"is_a_skel, params\");" << endl;
-  skel << "\t\treturn;" << endl;
-  skel << "\t  }" << endl << endl;
-  skel << "\tCORBA_Boolean *retval;" << endl;
-  skel << "\tCORBA_String value = *(CORBA_String *)nv->value()->value();" << endl;
-  skel << "\tif (strcmp((char *)value,(char *)_tao_typeid) == 0" << endl;
-  skel << "\t   || strcmp((char *)value, _tc_CORBA_Object->id(env)) == 0)" << endl;
-  skel << "\t\tretval = new CORBA_Boolean(CORBA_B_TRUE);" << endl;
-  skel << "\telse" << endl;
-  skel << "\t\tretval = new CORBA_Boolean(CORBA_B_FALSE);" << endl;
-  skel << "\tCORBA_Any *any = new CORBA_Any(_tc_CORBA_Boolean, retval," <<
-    "CORBA_B_TRUE);" << endl;
-  skel << "\treq.result(any, env);" << endl;
-  skel << "\tdexc(env, \"_is_a, result\");" << endl;
-  skel << "}" << endl;
-  
-  skel.close();
-}
-
diff --git a/TAO/tests/Demux_Test/CodeGen/stub.cpp b/TAO/tests/Demux_Test/CodeGen/stub.cpp
deleted file mode 100644
index 136fbf1116a..00000000000
--- a/TAO/tests/Demux_Test/CodeGen/stub.cpp
+++ /dev/null
@@ -1,155 +0,0 @@
-#include "tao.h"
-
-long GenClientHeader(ACE_Unbounded_Queue<ACE_CString> &arr, int limit)
-{
-  fstream hdr;
-  int i;
-  ACE_CString *str;
-
-  hdr.open("tao_demuxC.h", ios::out);
- 
-  hdr << "//******** Generated by the tool: taoidl ********" << endl << endl;
-
-  hdr << "#if !defined (TAO_DEMUXC_H)" << endl;
-  hdr << "#define TAO_DEMUXC_H" << endl << endl;
-
-  hdr << "#include <stdlib.h>" << endl;
-  hdr << "#include \"tao/corba.h\"" << endl;
-  //  hdr << "#include \"tao/orb.h\"" << endl;
-  //  hdr << "#include \"tao/stub.h\"" << endl;
-  //  hdr << "#include \"tao/optable.h\"" << endl;
-
-  hdr << "class tao_demux;" << endl;
-  hdr << "typedef tao_demux *\ttao_demux_ptr;" << endl;
-  hdr << "class tao_demux: public virtual CORBA_Object" << endl;
-  hdr << "{" << endl;
-  hdr << "public:" << endl;
-  // define the CORBA compliant mapping
-  hdr << "\tstatic tao_demux_ptr _duplicate(tao_demux_ptr obj);" << endl;
-  hdr << "\tstatic tao_demux_ptr _narrow(CORBA_Object_ptr obj);" << endl;
-  hdr << "\tstatic tao_demux_ptr _nil();" << endl << endl;
-
-  // now generate all the methods
-  for(i=0; i < limit; i++)
-    {
-      if (arr.get(str, i) == -1)
-	{
-	  return -1;
-	}
-      hdr << "\tvirtual void " << str->rep() << "(CORBA_Environment &env);" << endl;
-    }
-  hdr << "protected:" << endl;
-  hdr << "\ttao_demux() {}" << endl;
-  hdr << "\ttao_demux(STUB_Object *objref): CORBA_Object(objref) {}" << endl;
-  hdr << "\tvirtual ~tao_demux() {}" << endl;
-  hdr << "private:" << endl;
-  hdr << "\t//copy constructor and assignment operator" << endl;
-  hdr << "\ttao_demux(const tao_demux&) { }" << endl;
-  hdr << "\tvoid operator=(const tao_demux&) { }" << endl;
-  hdr << "};" << endl;
-
-  hdr << "#endif" << endl;
-  hdr.close();
-}
-
-long GenClientStubs(ACE_Unbounded_Queue<ACE_CString> &arr, int limit)
-{
-  fstream stub;
-  int i;
-  ACE_CString *str;
-
-  stub.open("tao_demuxC.cpp", ios::out);
-
-  stub << "#include \"tao_demuxC.h\"" << endl << endl;
-
-  // generate the static functions
-
-  // the _duplicate method
-  stub << "tao_demux_ptr tao_demux::_duplicate(tao_demux_ptr obj)" << endl;
-  stub << "{" << endl;
-  stub << "\tif (obj) obj->AddRef();" << endl;
-  stub << "\treturn obj;" << endl;
-  stub << "}" << endl << endl;
-
-  // the _narrow method
-  stub << "tao_demux_ptr tao_demux::_narrow(CORBA_Object_ptr obj)" << endl;
-  stub << "{" << endl;
-  // check if object "is_a" IDL:tao_demux:1.0 and if so, addref and return a
-  // pointer to it
-  stub << "\tCORBA_Environment env;" << endl;
-  stub << "\tif (obj->_is_a(\"IDL:tao_demux:1.0\", env)){" << endl;
-  stub << "\t  STUB_Object *istub;" << endl;
-  stub << "\t  if (obj->QueryInterface(IID_STUB_Object, (void **)&istub)" <<
-    " != NOERROR){" << endl;
-  stub << "\t\treturn tao_demux::_nil();" << endl;
-  stub << "\t  }" << endl;
-  stub << "\t  tao_demux_ptr new_obj = new tao_demux(istub);" << endl;
-  stub << "\t  return tao_demux::_duplicate(new_obj);" << endl;
-  stub << "\t}" << endl;
-  stub << "\treturn tao_demux::_nil();" << endl;
-  stub << "}" << endl << endl;
-
-  // the _nil method
-  stub << "tao_demux_ptr tao_demux::_nil()" << endl;
-  stub << "{" << endl;
-  stub << "\treturn (tao_demux_ptr)NULL;" << endl;
-  stub << "}" << endl << endl;
-
-  // All the TAO_Param_Data and TAO_Call_Data structures
-  stub <<
-    "// All the TAO_Param_Data and TAO_Call_Data structures required for invoking do_call"
-     << endl; 
-  for(i=0; i < limit; i++){
-    if (arr.get(str, i) == -1)
-      {
-	return -1;
-      }
-
-    // generate TAO_Param_Data structure
-    stub << "static const TAO_Param_Data tao_demux_" << str->rep() <<
-      "_params[] = {" << endl;
-    stub << "\t{_tc_CORBA_Void, PARAM_RETURN, 0}" << endl;
-    stub << "};" << endl;
-
-    // generate TAO_Call_Data structure
-    stub << "static const TAO_Call_Data tao_demux_" << str->rep() << 
-      "_calldata = {" << endl;
-    stub << "\t\"" << str->rep() << "\"," << endl;
-    stub << "\tCORBA_B_TRUE, //twoway" << endl;
-    stub << "\t1, &tao_demux_" << str->rep() << "_params[0]," << endl;
-    stub << "\t0, 0" << endl;
-    stub << "};" << endl;
-
-    // generate TAO_Call_Data structure that uses active demultiplexing
-    stub << "static const TAO_Call_Data tao_demux_" << str->rep() << 
-      "_active_calldata = {" << endl;
-    stub << "\t\"" << i << "\"," << endl;
-    stub << "\tCORBA_B_TRUE, //twoway" << endl;
-    stub << "\t1, &tao_demux_" << str->rep() << "_params[0]," << endl;
-    stub << "\t0, 0" << endl;
-    stub << "};" << endl;
-
-    // now the actual stub
-    stub << "void tao_demux::" << str->rep() << "(CORBA_Environment &env)"
-	 << endl;
-    stub << "{" << endl;
-    stub << "\tSTUB_Object *istub;" << endl;
-    stub << "\tif (this->QueryInterface (IID_STUB_Object, (void **) &istub) "
-	 << "!= NOERROR){" << endl;
-    stub << "\t  env.exception (new CORBA_DATA_CONVERSION (COMPLETED_NO));" << endl;
-    stub << "\t  return;" << endl;
-    stub << "\t}" << endl;
-    stub << "\tTAO_Operation_Table_Parameters *paramTbl = " << endl;
-    stub << "\t\tTAO_OP_TABLE_PARAMETERS::instance();" << endl;
-    stub << "\tif (paramTbl->lookup_strategy() == ";
-    stub << "TAO_Operation_Table_Parameters::TAO_ACTIVE_DEMUX)" << endl;
-    stub << "\t\tistub->do_call(env, &tao_demux_" << str->rep() <<
-      "_active_calldata);" << endl;
-    stub << "\telse" << endl;
-    stub << "\t\tistub->do_call(env, &tao_demux_" << str->rep() <<
-      "_calldata);" << endl;
-    stub << "}" << endl << endl;
-  }
-  stub.close();
-}
-
diff --git a/TAO/tests/Demux_Test/CodeGen/tao.cpp b/TAO/tests/Demux_Test/CodeGen/tao.cpp
deleted file mode 100644
index b01df4002fe..00000000000
--- a/TAO/tests/Demux_Test/CodeGen/tao.cpp
+++ /dev/null
@@ -1,96 +0,0 @@
-#include "tao.h"
-
-int main (int argc, char *argv[])
-{
-  // define the two arrays that will hold generated object keys and method
-  // names of the hypothetical "tao_demux" interface
-  ACE_Unbounded_Queue<ACE_CString> *objectArr, *methodArr;
-
-  // provide default values to the limit on the number of object keys and
-  // method names
-  long objectLimit = 5, 
-    methodLimit = 4;
-
-  // for parsing the arguments
-  ACE_Get_Opt get_opt (argc, argv, "hm:o:");
-
-  for (int c; (c = get_opt ()) != EOF;)
-    {
-      switch (c)
-	{
-	case 'm': // number of methods
-	  methodLimit = ACE_OS::atoi (get_opt.optarg);
-	  break;
-	case 'o': // number of object keys
-	  objectLimit = ACE_OS::atoi (get_opt.optarg);
-	  break;
-	case 'h': // usage
-	default:
-	  Usage ();
-	  return 1;
-	}
-    }
-
-  cout << "Generating code for " << objectLimit << " objects and " <<
-    methodLimit << " methods" << endl;
-  objectArr = new ACE_Unbounded_Queue<ACE_CString> [objectLimit];
-  methodArr = new ACE_Unbounded_Queue<ACE_CString> [methodLimit];
-
-  // generate the object keys
-  if (GenObjectTable (*objectArr, objectLimit) == -1)
-    {
-    }
-
-  // generate method names
-  if (GenMethodTable (*methodArr, methodLimit) == -1)
-    {
-    }
-
-  // generate client side stub headers
-  if (GenClientHeader (*methodArr, methodLimit) == -1)
-    {
-    }
-
-  // generate client stubs
-  if (GenClientStubs (*methodArr, methodLimit) == -1)
-    {
-    }
-
-  // generate include code for client-side main program
-  if (GenClientCode (*methodArr, methodLimit) == -1)
-    {
-    }
-
-  // generate server skeleton header
-  if (GenServerHeader (*methodArr, methodLimit) == -1)
-    {
-    }
-
-  // generate server skeletons
-  if (GenServerSkels (*methodArr, methodLimit) == -1)
-    {
-    }
-
-  // generate th eimpl header
-  if (GenServantHeader (*methodArr, methodLimit) == -1)
-    {
-    }
-
-  // generate impl 
-  if (GenServantImpl (*methodArr, methodLimit) == -1)
-    {
-    }
-
-  // generate code that creates instances of objects
-  if (GenObjectCreateCode (*objectArr, objectLimit) == -1)
-    {
-    }
-
-  GenGPERFCode ();
-}
-
-void Usage (void)
-{
-  cerr << "Usage: tao [-m <#methods>] [-o <#objects>] [-h]" << endl;
-  return;
-}
diff --git a/TAO/tests/Demux_Test/CodeGen/tao.h b/TAO/tests/Demux_Test/CodeGen/tao.h
deleted file mode 100644
index cdabc2a3446..00000000000
--- a/TAO/tests/Demux_Test/CodeGen/tao.h
+++ /dev/null
@@ -1,21 +0,0 @@
-#include <iostream.h>
-#include <fstream.h>
-
-#include "ace/SString.h"
-#include "ace/Containers.h"
-#include "ace/Singleton.h"
-#include "ace/Get_Opt.h"
-
-long GenObjectTable(ACE_Unbounded_Queue<ACE_CString> &arr, int limit);
-long GenMethodTable(ACE_Unbounded_Queue<ACE_CString> &arr, int limit);
-long GenClientHeader(ACE_Unbounded_Queue<ACE_CString> &arr, int limit);
-long GenClientStubs(ACE_Unbounded_Queue<ACE_CString> &arr, int limit);
-long GenClientCode(ACE_Unbounded_Queue<ACE_CString> &arr, int limit);
-long GenObjectCreateCode(ACE_Unbounded_Queue<ACE_CString> &arr, int limit);
-long GenServerHeader(ACE_Unbounded_Queue<ACE_CString> &arr, int limit);
-long GenServerSkels(ACE_Unbounded_Queue<ACE_CString> &arr, int limit);
-long GenServantHeader(ACE_Unbounded_Queue<ACE_CString> &arr, int limit);
-long GenServantImpl(ACE_Unbounded_Queue<ACE_CString> &arr, int limit);
-void GenGPERFCode();
-void Usage();
-
diff --git a/TAO/tests/Demux_Test/Makefile b/TAO/tests/Demux_Test/Makefile
deleted file mode 100755
index c82f055b5c8..00000000000
--- a/TAO/tests/Demux_Test/Makefile
+++ /dev/null
@@ -1,65 +0,0 @@
-#----------------------------------------------------------------------------
-#	$Id$
-#
-#	Top-level Makefile for the CORBA request demultiplexing benchmark
-#----------------------------------------------------------------------------
-
-#----------------------------------------------------------------------------
-#	Local macros
-#----------------------------------------------------------------------------
-
-LDLIBS     	= -lTAO
-
-PROG_SRCS 	= client.cpp tao_demuxC.cpp tao_demuxS.cpp tao_demux_i.cpp server.cpp
-
-LSRC = $(PROG_SRCS)
-
-TAO_DEMUX_CLIENT_OBJS = client.o tao_demuxC.o
-
-TAO_DEMUX_SERVER_OBJS = server.o tao_demuxC.o tao_demuxS.o tao_demux_i.o
-
-BIN = client server
-
-BUILD = $(BIN)
-
-VLDLIBS = $(LDLIBS:%=%$(VAR))
-VBIN = $(BIN:%=%$(VAR))
-
-#----------------------------------------------------------------------------
-#	Include macros and targets
-#----------------------------------------------------------------------------
-
-include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-include $(ACE_ROOT)/include/makeinclude/macros.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.lib.GNU
-#include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
-
-#----------------------------------------------------------------------------
-# Local modifications to variables imported by includes above.
-#----------------------------------------------------------------------------
-
-LDFLAGS    += -lTAO
-LDFLAGS += -L$(TAO_ROOT)/tao
-CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/tao/compat
-
-ifdef quantify
-LDFLAGS	+= -L/pkg/purify/quantify-2.1-solaris2/ -lquantify_stubs
-endif
-
-ifdef debug
-CPPFLAGS += -DDEBUG
-endif
-
-server:	$(addprefix $(VDIR),$(TAO_DEMUX_SERVER_OBJS))
-	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS)
-
-client:	$(addprefix $(VDIR),$(TAO_DEMUX_CLIENT_OBJS))
-	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS)
-
-clean:
-	$(MAKE) realclean
-	rm -fr tao_demux* gperf* *.i client server
-
diff --git a/TAO/tests/Demux_Test/README b/TAO/tests/Demux_Test/README
deleted file mode 100644
index 133758e62e6..00000000000
--- a/TAO/tests/Demux_Test/README
+++ /dev/null
@@ -1,20 +0,0 @@
-
-***** NOTE: This is still under development and will not work *****
-
-
-This test directory tests various demultiplexing strategies used in
-TAO.
-
-Description of various files:
-
-make_all	script that generates executables for different number
-		of objects and methods
-gen_bin		generates the binary for the desired number of objects
-		and methods
-run_client	runs a client
-run_server	runs a server
-run_all_client	runs all clients generated by the make_all
-run_all_server	runs all servers generated by the make_all
-CodeGen		Directory containing the code generator
-server.cpp	server main program
-client.cpp	client main program
diff --git a/TAO/tests/Demux_Test/client.cpp b/TAO/tests/Demux_Test/client.cpp
deleted file mode 100755
index b45b6819b0f..00000000000
--- a/TAO/tests/Demux_Test/client.cpp
+++ /dev/null
@@ -1,309 +0,0 @@
-#include <sys/types.h>
-#include <stdio.h>
-#include <ctype.h>
-#include <stdlib.h>
-#include <string.h>
-#include <time.h>
-
-#include "tao_demuxC.h"
-#include "tao/debug.h"
-
-#include <iostream.h>
-#include <fstream.h>
-
-void print_exception (const CORBA_Exception     *x,
-                      const char                  *info,
-                      FILE                        *stream
-                      );
-
-char Usage[] = "\
-Usage: client options\n\
-options:\n\
--l strategy: operation lookup strategy - a(active), l(linear), d (dyn hash), p (perf)\n\
--i iter: number of iterations \n\
--m num: number of methods \n\
--o num: number of objects \n\
--t type: type can be l(linear), r(random), b (best), w (worst)\n\
-";
-
-#if !defined (__cplusplus)
-typedef void (*SIG_TYP)(); 
-#endif 
-
-#ifdef SVR4
-void
-sigpipe (int foo)
-#else
-  void
-sigpipe ()
-#endif
-{
-}
-
-static const char ior_prefix [] = "IOR:";
-static const char iiop_prefix [] = "iiop:";
-
-enum SendType{
-  LINEAR,
-  BEST,
-  WORST,
-  RANDOM
-};
-
-void do_test(tao_demux_ptr *demux, int olimit, int mlimit, SendType, int iter);
-
-int
-main (int argc, char *argv[])
-{
-    
-  unsigned long addr_tmp;
-  unsigned short done = 0;
-  int c;
-    
-  CORBA_ORB_ptr	orb_ptr;
-  CORBA_Environment	env;
-  CORBA_Object_ptr	objref;
-  tao_demux_ptr        *demux;
-  unsigned		loop_count = 0;
-  int			exit_later = 0;
-  int                   i;
-  int                   ObjectLimit = 5,
-    MethodLimit = 4;
-  int iter= 1; // number of iterations
-  SendType              st = RANDOM;
-  TAO_Operation_Table_Parameters *op_params = TAO_OP_TABLE_PARAMETERS::instance();
-
-  CORBA_String str;
-  fstream iorfile;
-
-  while (!done && ((c = getopt (argc, argv, "i:l:t:m:o:")) !=
-		   -1)){
-    switch(c){
-    case 'i':
-      iter = atoi (optarg);
-      break;
-    case 'l': // op table lookup strategy
-      break;
-    case 'm':
-      MethodLimit = atoi(optarg);
-      break;
-    case 'o':
-      ObjectLimit = atoi(optarg);
-      break;
-    case 't':
-      switch(*optarg){
-      case 'b':
-	st = BEST;
-	break;
-      case 'w':
-	st = WORST;
-	break;
-      case 'l':
-	st = LINEAR;
-	break;
-      case 'r':
-      default:
-	st = RANDOM;
-	break;
-      }
-      break;
-    default:
-      goto usage;
-    }
-  }
-
-  TAO_debug_level = 0;
-  //
-  // Transmitter
-  //
-  orb_ptr = CORBA_ORB_init (argc, argv, "ior", env);
-  if (env.exception () != 0) {
-    print_exception (env.exception (), "ORB initialization", stdout);
-    return 1;
-  }
-
-  str = CORBA_string_alloc (500);
-
-  // read the IOR from the file ior.txt
-  iorfile.open("./ior.txt", ios::in);
-
-  for (;!iorfile.eof ();){
-    memset(str, '\0', 500);
-    iorfile >> ((char *)str);
-    if (iorfile.good ())
-      loop_count++;
-  }
-  iorfile.close();
-
-  ACE_DEBUG ((LM_DEBUG, "Total of %d object references read\n", loop_count));
-  demux = new tao_demux_ptr [loop_count];
-  for (i=0; i < loop_count; i++){
-    demux[i] = 0;
-  }
-
-  // read the IOR from the file ior.txt
-  iorfile.open("./ior.txt", ios::in);
-
-  for (i=0; i < loop_count; i++){
-    ACE_OS::memset (str, '\0', 500);
-    iorfile >> ((char *)str);
-    objref = orb_ptr->string_to_object(str, env);
-    if (env.exception() != 0){
-      print_exception(env.exception(), "string2object", stdout);
-      return 1;
-    }
-
-    cout << "objref " << i << " has key = " << objref->_get_name(env) << endl;
-    if (!CORBA_is_nil(objref)){
-      // narrow to the desired interface type
-      demux[i] = tao_demux::_narrow (objref);
-    }
-  }
-  iorfile.close();
-  CORBA_string_free(str);
-
-
-  // send operations
-  do_test(demux, ObjectLimit, MethodLimit, st, iter);
-
-  for (i=0; i < loop_count; i++){
-    CORBA_release(demux[i]);
-  }
-  delete [] demux;
-  return(0);
-usage:
-  fprintf (stderr, Usage);
-  return 1;
-}
-
-typedef void (*method_ptr)(tao_demux_ptr);
-struct method_db {
-  method_ptr method;
-};
-
-#include "client.i"
-
-void do_test(tao_demux_ptr *demux, int olimit, int mlimit, SendType st, int iter)
-{
-  int i, j, k;
-  int loop = 0;
-  hrtime_t  start, end, sum, diff;
-  fstream result;
-  CORBA_Environment env;
-
-  result.open("result.dat",ios::out|ios::app);
-#ifdef __TAO_ACTIVE__
-  result << "# ACTIVE ";
-#endif
-#ifdef __TAO_GPERF__
-  result << "# GPERF ";
-#endif
-#ifdef __TAO_LINEAR__
-  result << "# LINEAR ";
-#endif
-
-  //  result << "@type xy" << endl;
-  sum = 0;
-  
-  if (st == LINEAR){
-    result << " LINEAR" << endl;
-#ifdef __DEBUG__
-    cout << "Linear strategy for sending" << endl;
-#endif
-    for (k=0; k < iter; k++) {
-      // invoke the jth method on the ith object
-      for (i=0; i < olimit; i++){
-	for (j=0; j < mlimit; j++){
-	  loop++;
-	  start = gethrtime();
-	  mtbl[j].method(demux[i]);
-	  end = gethrtime();
-	  diff = (end - start);
-#ifdef __DEBUG__
-	  cout << "Latency for this request = " << diff/1.0e+06 << endl;
-#endif
-	  sum += diff;
-	  //	result << loop << "\t" << diff/1.e+06 << endl;
-	}
-      }
-    }
-  } else if (st == BEST){
-    result << " BEST" << endl;
-#ifdef __DEBUG__
-    cout << "best strategy for sending" << endl;
-#endif
-    for (k=0; k < iter; k++) {
-      // invoke the jth method on the ith object
-      for (i=0; i < olimit; i++){
-	for (j=0; j < mlimit; j++){
-	  loop++;
-	  start = gethrtime();
-	  mtbl[0].method(demux[0]);
-	  end = gethrtime();
-	  diff = (end - start);
-#ifdef __DEBUG__
-	  cout << "Latency for this request = " << diff/1.0e+06 << endl;
-#endif
-	  sum += diff;
-	  //	result << loop << "\t" << diff/1.e+06 << endl;
-	}
-      }
-    }
-  } else if (st == RANDOM) {
-    result << " RANDOM" << endl;
-#ifdef __DEBUG__
-    cout << "Random strategy for sending" << endl;
-#endif
-    // choose the object and method name randomly
-    srand48(time(NULL));
-    long p, q;
-    for (k=0; k < iter; k++) {
-      for (i=0; i < olimit; i++){
-	for (j=0; j < mlimit; j++){
-	  loop++;
-	  p = lrand48() % olimit;
-	  q = lrand48() % mlimit;
-	  start = gethrtime();
-#ifdef DEBUG
-	  ACE_DEBUG ((LM_DEBUG, "Invoking op %s on object with key %s\n",
-		      mtbl[q], demux[p]->_get_name(env)));
-#endif
-	  mtbl[q].method(demux[p]);
-	  end = gethrtime();
-	  diff = (end - start);
-#ifdef __DEBUG__
-	  cout << "Latency for this request = " << diff/1.0e+06 << endl;
-#endif
-	  sum += diff;
-	  //	result << loop << "\t" << diff/1.e+06 << endl;
-	}
-      }
-    }
-  } else if (st == WORST){
-    result << " WORST" << endl;
-#ifdef __DEBUG__
-    cout << "worst strategy for sending" << endl;
-#endif
-    // invoke the jth method on the ith object
-    for (k=0; k < iter; k++) {
-      for (i=0; i < olimit; i++){
-	for (j=0; j < mlimit; j++){
-	  loop++;
-	  start = gethrtime();
-	  mtbl[mlimit-1].method(demux[olimit-1]);
-	  end = gethrtime();
-	  diff = (end - start);
-#ifdef __DEBUG__
-	  cout << "Latency for this request = " << diff/1.0e+06  << endl;
-#endif
-	  sum += diff;
-	  //	result << loop << "\t" << diff/1.e+06 << endl;
-	}
-      }
-    }
-  }
-  result << olimit << "\t" << mlimit << "\t" << sum/(loop*1000000.0) << endl;
-  cout << olimit << "\t" << mlimit << "\t" << sum/(loop*1000000.0) << endl;
-  result.close();
-}
-
diff --git a/TAO/tests/Demux_Test/gen_bin b/TAO/tests/Demux_Test/gen_bin
deleted file mode 100755
index b0650ff4249..00000000000
--- a/TAO/tests/Demux_Test/gen_bin
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-make clean
-./CodeGen/tao -o $1 -m $2
-make
-mv client client_${1}_${2}
-mv server server_${1}_${2}
diff --git a/TAO/tests/Demux_Test/make_all b/TAO/tests/Demux_Test/make_all
deleted file mode 100755
index 4ac9b18cc3f..00000000000
--- a/TAO/tests/Demux_Test/make_all
+++ /dev/null
@@ -1,19 +0,0 @@
-rm -fr server_*_* client_*_*
-gen_bin 1 1
-gen_bin 1 10
-gen_bin 1 100
-gen_bin 100 1
-gen_bin 100 10
-gen_bin 100 100
-gen_bin 200 1
-gen_bin 200 10
-gen_bin 200 100
-gen_bin 300 1
-gen_bin 300 10
-gen_bin 300 100
-gen_bin 400 1
-gen_bin 400 10
-gen_bin 400 100
-gen_bin 500 1
-gen_bin 500 10
-gen_bin 500 100
diff --git a/TAO/tests/Demux_Test/run_all_client b/TAO/tests/Demux_Test/run_all_client
deleted file mode 100755
index a5a3b61c48f..00000000000
--- a/TAO/tests/Demux_Test/run_all_client
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/sh
-# usage: run_client <num objs> <num methods> <num iters>
-run_client 500 100 1
-sleep 5
-run_client 500 10  1
-sleep 5
-run_client 500 1   1
-sleep 5
-run_client 400 100 1
-sleep 5
-run_client 400 10  1
-sleep 5
-run_client 400 1   1
-sleep 5
-run_client 300 100 1
-sleep 5
-run_client 300 10  1
-sleep 5
-run_client 300 1   1
-sleep 5
-run_client 200 100 1
-sleep 5
-run_client 200 10  1
-sleep 5
-run_client 200 1   1
-sleep 5
-run_client 100 100 1
-sleep 5
-run_client 100 10  1
-sleep 5
-run_client 100 1   1
-sleep 5
-run_client 1   100 1
-sleep 5
-run_client 1   10  10
-sleep 5
-run_client 1   1   100
diff --git a/TAO/tests/Demux_Test/run_all_server b/TAO/tests/Demux_Test/run_all_server
deleted file mode 100755
index 15b4762efcb..00000000000
--- a/TAO/tests/Demux_Test/run_all_server
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/sh
-# usage: run_server <num objs> <num methods> <num iters>
-run_server 500 100 1
-run_server 500 10  1
-run_server 500 1   1
-run_server 400 100 1
-run_server 400 10  1
-run_server 400 1   1
-run_server 300 100 1
-run_server 300 10  1
-run_server 300 1   1
-run_server 200 100 1
-run_server 200 10  1
-run_server 200 1   1
-run_server 100 100 1
-run_server 100 10  1
-run_server 100 1   1
-run_server 1   100 1
-run_server 1   10  10
-run_server 1   1   100 
diff --git a/TAO/tests/Demux_Test/run_client b/TAO/tests/Demux_Test/run_client
deleted file mode 100755
index 19dab08670d..00000000000
--- a/TAO/tests/Demux_Test/run_client
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh
-client_${1}_${2} -o ${1} -m ${2} -t r -i $3
-sleep 5
-client_${1}_${2} -o ${1} -m ${2} -t w -i $3
-sleep 5
-client_${1}_${2} -o ${1} -m ${2} -t r -i $3
-sleep 5
-client_${1}_${2} -o ${1} -m ${2} -t w -i $3
-sleep 5
-client_${1}_${2} -o ${1} -m ${2} -t r -i $3
-sleep 5
-client_${1}_${2} -o ${1} -m ${2} -t w -i $3
-sleep 5
-client_${1}_${2} -o ${1} -m ${2} -t r -i $3
-sleep 5
-client_${1}_${2} -o ${1} -m ${2} -t w -i $3
-sleep 5
diff --git a/TAO/tests/Demux_Test/run_server b/TAO/tests/Demux_Test/run_server
deleted file mode 100755
index 7f2ac61445a..00000000000
--- a/TAO/tests/Demux_Test/run_server
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-server_${1}_${2} -OAhost merengue -OAobjdemux linear -OAtablesize ${1} -o ${1} -m ${2} -t l -i $3
-server_${1}_${2} -OAhost merengue -OAobjdemux linear -OAtablesize ${1} -o ${1} -m ${2} -t l -i $3
-server_${1}_${2} -OAhost merengue -OAobjdemux active_demux -OAtablesize ${1} -o ${1} -m ${2} -t a -i $3
-server_${1}_${2} -OAhost merengue -OAobjdemux active_demux -OAtablesize ${1} -o ${1} -m ${2} -t a -i $3
-server_${1}_${2} -OAhost merengue -OAobjdemux user_def -o ${1} -m ${2} -t g -i $3
-server_${1}_${2} -OAhost merengue -OAobjdemux user_def -o ${1} -m ${2} -t g -i $3
-server_${1}_${2} -OAhost merengue -o ${1} -m ${2} -i $3
-server_${1}_${2} -OAhost merengue -o ${1} -m ${2} -i $3
-
diff --git a/TAO/tests/Demux_Test/server.cpp b/TAO/tests/Demux_Test/server.cpp
deleted file mode 100755
index 1e3931b01c2..00000000000
--- a/TAO/tests/Demux_Test/server.cpp
+++ /dev/null
@@ -1,313 +0,0 @@
-#include "tao_demux_i.h"
-
-#ifdef USE_QUANTIFY
-#include <quantify.h>
-#endif
-
-#include <iostream.h>
-#include <fstream.h>
-
-#include "ace/SString.h"
-
-void print_exception (const CORBA_Exception     *x,
-		      const char                  *info,
-		      FILE                        *stream
-		      );
-
-#if !defined (__cplusplus)
-typedef void (*SIG_TYP)(); 
-#endif 
-
-#ifdef SVR4
-void
-sigpipe (int foo)
-#else
-  void
-sigpipe ()
-#endif
-{
-}
-
-//****************** perf hash for obj lookup *************
-// for perfect hash
-struct object_db 
-{
-  char *name; // name of method
-  CORBA_Object_ptr obj; //fn pointer to obj impl
-};
-
-// include the perfect hash code for objects
-#include "gperf_object.i"
-
-// Perfect hash table class
-class TAO_Perfect_Hash_ObjTable: public TAO_Object_Table
-{
-public:
-  TAO_Perfect_Hash_ObjTable (Object_Hash *oh);
-
-  ~TAO_Perfect_Hash_ObjTable (void);
-
-  virtual int bind (const CORBA_OctetSeq &key, 
-		    CORBA_Object_ptr obj);
-  // Registers a CORBA_Object into the object table and associates the
-  // key with it.  Returns -1 on failure, 0 on success, 1 on
-  // duplicate.
-
-  virtual int find (const CORBA_OctetSeq &key, 
-		    CORBA_Object_ptr &obj);
-  // Looks up an object in the object table using <{key}>.  Returns
-  // non-negative integer on success, or -1 on failure.
-
-private:
-  Object_Hash *hash_;
-};
-
-TAO_Perfect_Hash_ObjTable::TAO_Perfect_Hash_ObjTable (Object_Hash *oh)
-  : hash_ (oh)
-{
-}
-
-TAO_Perfect_Hash_ObjTable::~TAO_Perfect_Hash_ObjTable (void)
-{
-}
-
-int
-TAO_Perfect_Hash_ObjTable::bind (const CORBA_OctetSeq &key, CORBA_Object_ptr obj)
-{
-  struct object_db *entry;
-
-  ACE_CString objkey ((char *)key.buffer, key.length);
-  entry = this->hash_->in_word_set (objkey.rep (), key.length);
-  if (entry != 0)
-    {
-      // now fill up the entry
-      entry->obj = obj;
-    }
-  else
-    {
-      return -1; // error
-    }
-}
-
-int
-TAO_Perfect_Hash_ObjTable::find (const CORBA_OctetSeq &key, CORBA_Object_ptr &obj)
-{
-  struct object_db *entry;
-
-  ACE_CString objkey ((char *)key.buffer, key.length);
-  entry = this->hash_->in_word_set (objkey.rep (), key.length);
-
-  if (entry != 0)
-    {
-      obj = entry->obj;
-      return 0;
-    }
-  else
-    {
-      return -1;
-    }
-}
-
-//****************** perf hash for opname lookup *************
-struct method_db 
-{
-  char *name; // name of method
-  TAO_Skeleton skel_ptr_; //fn pointer to obj impl
-};
-
-#include "gperf_method.i"
-
-// Perfect hash table class
-class TAO_Perfect_Hash_Op_Table: public TAO_Operation_Table
-{
-public:
-  TAO_Perfect_Hash_Op_Table (Method_Hash *mh);
-
-  ~TAO_Perfect_Hash_Op_Table (void);
-
-  virtual int find (const CORBA_String &opname,
-		    TAO_Skeleton &skel_ptr);
-  // Uses <{opname}> to look up the skeleton function and pass it back
-  // in <{skelfunc}>.  Returns non-negative integer on success, or -1
-  // on failure.
-
-  virtual int bind (const CORBA_String &opname,
-		    const TAO_Skeleton skelptr);
-  // Associate the skeleton <{skel_ptr}> with an operation named
-  // <{opname}>.  Returns -1 on failure, 0 on success, 1 on duplicate.
-private:
-  Method_Hash *hash_;
-};
-
-TAO_Perfect_Hash_Op_Table::TAO_Perfect_Hash_Op_Table (Method_Hash *mh)
-  : hash_ (mh)
-{
-}
-
-TAO_Perfect_Hash_Op_Table::~TAO_Perfect_Hash_Op_Table (void)
-{
-}
-
-int
-TAO_Perfect_Hash_Op_Table::bind (const CORBA_String &opname,
-				 const TAO_Skeleton skelptr)
-{
-  return 0; // nothing to do
-}
-
-int
-TAO_Perfect_Hash_Op_Table::find (const CORBA_String &opname,
-				 TAO_Skeleton &skelptr)
-{
-  method_db *entry;
-
-  entry = (method_db*) this->hash_->in_word_set (opname, ACE_OS::strlen (opname));
-  if (entry != 0)
-    {
-      skelptr = entry->skel_ptr_;
-      return 0;
-    }
-  else
-    {
-      return -1;
-    }
-}
-
-//***********************************************************
-char Usage[] = "\
-Usage: server [options] \n\
-Common options:\n\
--t demux_strategy: l(linear), g(GPERF), a (delayered active demux), d (dynamic hash)\n\
--i iter: number of iterations to expect from client \n\
-";
-
-extern CORBA_Double TAO_Avg;
-extern CORBA_Long TAO_HowMany;
-extern CORBA_Long TAO_Loop;
-int
-main (int argc, char *const *argv)
-{
-  unsigned long addr_tmp;
-  int c;
-  unsigned short done = 0;
-  CORBA_Environment env;
-  CORBA_ORB_ptr orb_ptr;
-  CORBA_POA_ptr oa_ptr;
-  int iter = 1;
-  TAO_OA_Parameters    *params = TAO_OA_PARAMS::instance();
-  char                *orb_name = "ior";
-  int                 idle = -1;
-  int use_ior = 0;
-  int terminationStatus = 0;
-  tao_demux_i **mymux;  // array of objects implementing the "demux" interface
-  int  numObjs = 5, numMethods = 4;
-  Object_Hash oh;
-  TAO_Object_Table *objt = new TAO_Perfect_Hash_ObjTable (&oh);
-  Method_Hash mh;
-  TAO_Operation_Table *optbl = new TAO_Perfect_Hash_Op_Table (&mh);
-
-  TAO_Operation_Table_Parameters *op_params =
-     TAO_OP_TABLE_PARAMETERS::instance(); 
-			 
-  fstream iorfile;  // stores the object references of all the objects
-  fstream outfile;
-  CORBA_String str; // scratch area
-
-  params->userdef_lookup_strategy (objt);
-
-  orb_ptr = CORBA_ORB_init (argc, argv, orb_name, env);
-  if (env.exception () != 0) {
-    print_exception (env.exception (), "ORB init", stdout);
-    return 1;
-  }
-
-  oa_ptr = orb_ptr->BOA_init (argc, argv, "ROA");
-  if (env.exception () != 0) {
-    print_exception (env.exception (), "OA init", stdout);
-    return 1;
-  }
-
-  TAO_debug_level = 0;
-  // Now process the options other than Orbix specific options
-  while ((c = getopt (argc, argv, "ui:t:o:m:")) != -1)
-    {
-      switch (c)
-	{
-	case 't':
-	  switch (*optarg)
-	    {
-	    case 'l':
-	      op_params->lookup_strategy
-		(TAO_Operation_Table_Parameters::TAO_LINEAR); 
-	      break;
-	    case 'a':
-	      op_params->lookup_strategy
-		(TAO_Operation_Table_Parameters::TAO_ACTIVE_DEMUX);
-	      break;
-	    case 'g':
-	      op_params->lookup_strategy
-		(TAO_Operation_Table_Parameters::TAO_PERFECT_HASH); 
-	      op_params->concrete_strategy (optbl);
-	      break;
-	    case 'd':
-	    default:
-	      op_params->lookup_strategy
-		(TAO_Operation_Table_Parameters::TAO_DYNAMIC_HASH);
-	      break;
-	    }
-	  break;
-	case 'u':
-	  use_ior = 1;
-	  orb_name = "";
-	  break;
-	case 'i':
-	  iter = atoi (optarg);
-	  break;
-	case 'o':
-	  numObjs = atoi(optarg);
-	  break;
-	case 'm':
-	  numMethods = atoi(optarg);
-	  break;
-	default:
-	  goto usage;
-	}
-    }
-
-  TAO_Avg = 0;
-  TAO_Loop = 0;
-  TAO_HowMany = iter*numObjs*numMethods;
-    
-  //
-  // Receiver
-  //
-
-  iorfile.open ("ior.txt", ios::out);
-  mymux = new tao_demux_i* [numObjs];
-
-  // instantiate objects
-#include "obj_create.i"
-  iorfile.close();
-  cout << "Server ready to handle events" << endl;
-
-#if defined (USE_QUANTIFY)
-  quantify_clear_data();
-  quantify_start_recording_data();
-#endif
-
-  ACE_Service_Config::run_reactor_event_loop();
-
-  outfile.open ("muxcost.dat", ios::out|ios::app);
-  outfile << numObjs << "\t" << numMethods << "\t" << TAO_Avg << endl;
-  outfile.close ();
-  //
-  // Shut down the OA -- recycles all underlying resources (e.g. file
-  // descriptors, etc).
-  //
-  oa_ptr->clean_shutdown (env);
-  return terminationStatus;
-usage:
-  fprintf (stderr, Usage);
-  return(1);
-}
-
diff --git a/TAO/tests/Makefile b/TAO/tests/Makefile
deleted file mode 100644
index 3804087cc0d..00000000000
--- a/TAO/tests/Makefile
+++ /dev/null
@@ -1,26 +0,0 @@
-#----------------------------------------------------------------------------
-#	@(#)Makefile	1.1	10/18/96
-#
-#	Makefile for the TAO tests
-#----------------------------------------------------------------------------
-
-#----------------------------------------------------------------------------
-#	Local macros
-#----------------------------------------------------------------------------
-
-DIRS  = Cubit \
-	Thruput_test 
-
-# The following test hasn't been updated yet
-# Demux_Test
-
-#----------------------------------------------------------------------------
-#	Include macros and targets
-#----------------------------------------------------------------------------
-
-include	$(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-include	$(ACE_ROOT)/include/makeinclude/macros.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.common.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.nested.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.nolocal.GNU
-
diff --git a/TAO/tests/README b/TAO/tests/README
deleted file mode 100644
index 86825081c8e..00000000000
--- a/TAO/tests/README
+++ /dev/null
@@ -1,15 +0,0 @@
-The following tests of TAO are provided in this directory.
-The individual directories contain READMEs on how to run the tests.
-
-    . Demux_test  (*NOTE* This is still under development)
-
-          This tests various demultiplexing strategies used in TAO.
-
-	. Thruput_test
-
-		 Throughput tests for TAO, based on TTCP.
-
-    . Cubit
-
-         Cubit example. The servant returns the cube of the number
-         sent to it by the client.